Changeset 16657


Ignore:
Timestamp:
2009-07-02T17:42:31+02:00 (9 years ago)
Author:
florian
Message:

[package] update btpd to 0.15 (#5404)

Location:
packages/net/btpd
Files:
1 added
3 edited

Legend:

Unmodified
Added
Removed
  • packages/net/btpd/Makefile

    r16524 r16657  
     1# 
     2# Copyright (C) 2009 OpenWrt.org 
     3# 
     4# This is free software, licensed under the GNU General Public License v2. 
     5# See /LICENSE for more information. 
     6# 
     7 
    18include $(TOPDIR)/rules.mk 
    29 
    310PKG_NAME:=btpd 
    4 PKG_VERSION:=0.13 
    5 PKG_RELEASE:=2 
     11PKG_VERSION:=0.15 
     12PKG_RELEASE:=1 
    613 
    714PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    815PKG_SOURCE_URL:=http://www.murmeldjur.se/btpd/ 
    9 PRG_MD5SUM:=0d9c4a672eea6f298fa6e44d94da1657 
     16PRG_MD5SUM:=b64e2e8b9936e99685bc1e7246655561 
    1017 
    1118include $(INCLUDE_DIR)/package.mk 
     
    1421  SECTION:=net 
    1522  CATEGORY:=Network 
     23  DEPENDS:=+libopenssl 
    1624  SUBMENU:=BitTorrent 
    1725  TITLE:=btpd - BitTorrent Protocol Daemon 
     
    2735endef 
    2836 
    29 CONFIGURE_ARGS += -C 
     37CONFIGURE_ARGS += -C --with-evloop-method=poll 
    3038 
    3139define Package/btpd/install 
  • packages/net/btpd/files/btpd.init

    r16524 r16657  
    2626btpd() { 
    2727        local cfg="$1" 
     28        append_boot "$cfg" useipv4 "-4" 
     29        append_bool "$cfg" useipv6 "-6" 
    2830        append_bool "$cfg" emptystart "--empty-start" 
    2931        append_parm "$cfg" port "-p" 
  • packages/net/btpd/patches/000-sha1.diff

    r11493 r16657  
    1 diff -purN btpd-0.13/btpd/content.c btpd-0.13-hack/btpd/content.c 
    2 --- btpd-0.13/btpd/content.c    2007-05-18 19:32:01.000000000 +0400 
    3 +++ btpd-0.13-hack/btpd/content.c       2007-09-04 14:59:06.000000000 +0400 
    4 @@ -7,7 +7,7 @@ 
    5  #include <string.h> 
    6  #include <unistd.h> 
     1diff -urN btpd-0.15/btpd/content.c btpd-0.15-new/btpd/content.c 
     2--- btpd-0.15/btpd/content.c    2009-02-03 10:15:01.000000000 -0500 
     3+++ btpd-0.15-new/btpd/content.c        2009-06-19 15:02:48.000000000 -0400 
     4@@ -1,6 +1,6 @@ 
     5 #include "btpd.h" 
    76  
    87-#include <openssl/sha.h> 
    98+#include "sha1.h" 
     9 #include <stream.h> 
     10  
     11 struct content { 
     12diff -urN btpd-0.15/btpd/download_subr.c btpd-0.15-new/btpd/download_subr.c 
     13--- btpd-0.15/btpd/download_subr.c      2009-02-07 16:45:36.000000000 -0500 
     14+++ btpd-0.15-new/btpd/download_subr.c  2009-06-19 15:03:06.000000000 -0400 
     15@@ -21,7 +21,6 @@ 
    1016  
    1117 #include "btpd.h" 
    12  #include "stream.h" 
    13 diff -purN btpd-0.13/btpd/download_subr.c btpd-0.13-hack/btpd/download_subr.c 
    14 --- btpd-0.13/btpd/download_subr.c      2007-05-18 19:32:01.000000000 +0400 
    15 +++ btpd-0.13-hack/btpd/download_subr.c 2007-09-04 15:13:35.000000000 +0400 
    16 @@ -24,8 +24,6 @@ 
    17  #include <string.h> 
    18  #include <unistd.h> 
     18  
     19-#include <openssl/sha.h> 
     20 #include <stream.h> 
     21  
     22 static void 
     23diff -urN btpd-0.15/btpd/torrent.c btpd-0.15-new/btpd/torrent.c 
     24--- btpd-0.15/btpd/torrent.c    2009-01-26 16:15:10.000000000 -0500 
     25+++ btpd-0.15-new/btpd/torrent.c        2009-06-19 15:03:24.000000000 -0400 
     26@@ -1,7 +1,5 @@ 
     27 #include "btpd.h" 
    1928  
    2029-#include <openssl/sha.h> 
    2130- 
    22  #include "btpd.h" 
    23  #include "stream.h" 
    24   
    25 diff -purN btpd-0.13/btpd/Makefile.am btpd-0.13-hack/btpd/Makefile.am 
    26 --- btpd-0.13/btpd/Makefile.am  2007-05-18 19:32:01.000000000 +0400 
    27 +++ btpd-0.13-hack/btpd/Makefile.am     2007-09-04 15:15:17.000000000 +0400 
    28 @@ -16,5 +16,5 @@ btpd_SOURCES=\ 
    29         util.c 
    30   
    31  btpd_LDADD=../misc/libmisc.a ../libevent/libevent.a 
    32 -btpd_CPPFLAGS=-I$(top_srcdir)/misc -I$(top_srcdir)/libevent @openssl_CPPFLAGS@ 
    33 -btpd_LDFLAGS=@openssl_LDFLAGS@ -lcrypto -lm 
    34 +btpd_CPPFLAGS=-I$(top_srcdir)/misc -I$(top_srcdir)/libevent  
    35 +btpd_LDFLAGS=-lm 
    36 diff -purN btpd-0.13/btpd/torrent.c btpd-0.13-hack/btpd/torrent.c 
    37 --- btpd-0.13/btpd/torrent.c    2007-05-19 12:41:32.000000000 +0400 
    38 +++ btpd-0.13-hack/btpd/torrent.c       2007-09-04 15:14:06.000000000 +0400 
    39 @@ -10,8 +10,6 @@ 
    40  #include <string.h> 
    41  #include <unistd.h> 
    42   
    43 -#include <openssl/sha.h> 
    44 - 
    45  #include "btpd.h" 
    46  #include "tracker_req.h" 
    47  #include "stream.h" 
    48 diff -purN btpd-0.13/cli/Makefile.am btpd-0.13-hack/cli/Makefile.am 
    49 --- btpd-0.13/cli/Makefile.am   2007-05-18 19:32:00.000000000 +0400 
    50 +++ btpd-0.13-hack/cli/Makefile.am      2007-09-04 15:14:46.000000000 +0400 
    51 @@ -1,11 +1,11 @@ 
    52  bin_PROGRAMS=btinfo btcli 
    53   
    54  btinfo_SOURCES=btinfo.c 
    55 -btinfo_LDADD=../misc/libmisc.a -lcrypto -lm 
    56 -btinfo_CPPFLAGS=-I$(top_srcdir)/misc @openssl_CPPFLAGS@ 
    57 -btinfo_LDFLAGS=@openssl_LDFLAGS@ 
    58 +btinfo_LDADD=../misc/libmisc.a -lm 
    59 +btinfo_CPPFLAGS=-I$(top_srcdir)/misc 
    60 +btinfo_LDFLAGS= 
    61   
    62  btcli_SOURCES=btcli.c btcli.h add.c del.c list.c kill.c start.c stop.c stat.c 
    63 -btcli_LDADD=../misc/libmisc.a -lcrypto -lm 
    64 -btcli_CPPFLAGS=-I$(top_srcdir)/misc @openssl_CPPFLAGS@ 
    65 -btcli_LDFLAGS=@openssl_LDFLAGS@ 
    66 +btcli_LDADD=../misc/libmisc.a -lm 
    67 +btcli_CPPFLAGS=-I$(top_srcdir)/misc 
    68 +btcli_LDFLAGS= 
    69 diff -urN btpd-0.13.orig/configure btpd-0.13/configure 
    70 --- btpd-0.13.orig/configure    2007-05-19 13:55:14.000000000 -0700 
    71 +++ btpd-0.13/configure 2008-06-14 23:04:33.000000000 -0700 
    72 @@ -2939,80 +2939,6 @@ 
    73  fi; 
    74   
    75  old_LDFLAGS="$LDFLAGS" 
    76 -LDFLAGS="$LDFLAGS $openssl_LDFLAGS" 
    77 - 
    78 -echo "$as_me:$LINENO: checking for SHA1_Final in -lcrypto" >&5 
    79 -echo $ECHO_N "checking for SHA1_Final in -lcrypto... $ECHO_C" >&6 
    80 -if test "${ac_cv_lib_crypto_SHA1_Final+set}" = set; then 
    81 -  echo $ECHO_N "(cached) $ECHO_C" >&6 
    82 -else 
    83 -  ac_check_lib_save_LIBS=$LIBS 
    84 -LIBS="-lcrypto  $LIBS" 
    85 -cat >conftest.$ac_ext <<_ACEOF 
    86 -/* confdefs.h.  */ 
    87 -_ACEOF 
    88 -cat confdefs.h >>conftest.$ac_ext 
    89 -cat >>conftest.$ac_ext <<_ACEOF 
    90 -/* end confdefs.h.  */ 
    91 - 
    92 -/* Override any gcc2 internal prototype to avoid an error.  */ 
    93 -#ifdef __cplusplus 
    94 -extern "C" 
    95 -#endif 
    96 -/* We use char because int might match the return type of a gcc2 
    97 -   builtin and then its argument prototype would still apply.  */ 
    98 -char SHA1_Final (); 
    99 -int 
    100 -main () 
    101 -{ 
    102 -SHA1_Final (); 
    103 -  ; 
    104 -  return 0; 
    105 -} 
    106 -_ACEOF 
    107 -rm -f conftest.$ac_objext conftest$ac_exeext 
    108 -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 
    109 -  (eval $ac_link) 2>conftest.er1 
    110 -  ac_status=$? 
    111 -  grep -v '^ *+' conftest.er1 >conftest.err 
    112 -  rm -f conftest.er1 
    113 -  cat conftest.err >&5 
    114 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    115 -  (exit $ac_status); } && 
    116 -        { ac_try='test -z "$ac_c_werror_flag" 
    117 -                        || test ! -s conftest.err' 
    118 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 
    119 -  (eval $ac_try) 2>&5 
    120 -  ac_status=$? 
    121 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    122 -  (exit $ac_status); }; } && 
    123 -        { ac_try='test -s conftest$ac_exeext' 
    124 -  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 
    125 -  (eval $ac_try) 2>&5 
    126 -  ac_status=$? 
    127 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5 
    128 -  (exit $ac_status); }; }; then 
    129 -  ac_cv_lib_crypto_SHA1_Final=yes 
    130 -else 
    131 -  echo "$as_me: failed program was:" >&5 
    132 -sed 's/^/| /' conftest.$ac_ext >&5 
    133 - 
    134 -ac_cv_lib_crypto_SHA1_Final=no 
    135 -fi 
    136 -rm -f conftest.err conftest.$ac_objext \ 
    137 -      conftest$ac_exeext conftest.$ac_ext 
    138 -LIBS=$ac_check_lib_save_LIBS 
    139 -fi 
    140 -echo "$as_me:$LINENO: result: $ac_cv_lib_crypto_SHA1_Final" >&5 
    141 -echo "${ECHO_T}$ac_cv_lib_crypto_SHA1_Final" >&6 
    142 -if test $ac_cv_lib_crypto_SHA1_Final = yes; then 
    143 -  : 
    144 -else 
    145 -  echo Must have openssl; exit 1 
    146 -fi 
    147 - 
    148 -LDFLAGS=$old_LDFLAGS 
    149 - 
    150   
    151   
    152  subdirs="$subdirs libevent" 
    153 diff -purN btpd-0.13/configure.ac btpd-0.13-hack/configure.ac 
    154 --- btpd-0.13/configure.ac      2007-05-18 19:31:59.000000000 +0400 
    155 +++ btpd-0.13-hack/configure.ac 2007-09-04 15:09:17.000000000 +0400 
    156 @@ -10,14 +10,6 @@ AC_PROG_RANLIB 
    157  CFLAGS="$CFLAGS -std=c99" 
    158  CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64" 
     31 #define SAVE_INTERVAL 300 
     32  
     33 static unsigned m_nghosts; 
     34diff -urN btpd-0.15/configure.ac btpd-0.15-new/configure.ac 
     35--- btpd-0.15/configure.ac      2009-02-09 16:04:53.000000000 -0500 
     36+++ btpd-0.15-new/configure.ac  2009-06-19 15:04:12.000000000 -0400 
     37@@ -29,13 +29,6 @@ 
     38 rm -f conftest.c conftest.$OBJEXT 
     39 [$3])) 
    15940  
    16041-AC_ARG_WITH(openssl, 
    16142-[  --with-openssl=dir      use openssl installed in dir], 
    16243-[ 
    163 -        AC_SUBST(openssl_LDFLAGS,["-L${withval}/lib -Wl,-rpath=${withval}/lib"]) 
    164 -        AC_SUBST(openssl_CPPFLAGS,"-I${withval}/include") 
    165 -], 
    166 -[]) 
     44-    AC_SUBST(openssl_LDFLAGS,["-L${withval}/lib -Wl,-R,${withval}/lib"]) 
     45-    AC_SUBST(openssl_CPPFLAGS,"-I${withval}/include") 
     46-]) 
    16747- 
    168  AC_ARG_WITH(warn, 
    169  [  --with-warn=level       select warning preset (no,all,allerr)], 
    170  [ 
    171 @@ -38,11 +30,6 @@ AC_ARG_WITH(warn, 
    172  ], 
    173  []) 
     48 AC_ARG_WITH(evloop-method, 
     49 [  --with-evloop-method    select evloop method (epoll,poll,kqueue)], 
     50     evloop_methods=$withval, 
     51@@ -76,11 +69,6 @@ 
     52 , 
     53     AC_MSG_RESULT(no)) 
    17454  
    17555-old_LDFLAGS="$LDFLAGS" 
    17656-LDFLAGS="$LDFLAGS $openssl_LDFLAGS" 
    177 -AC_CHECK_LIB(crypto, SHA1_Final, :, echo Must have openssl; exit 1) 
     57-AC_CHECK_LIB(crypto, SHA1_Final,:,AC_MSG_FAILURE(btpd needs openssl's libraries and headers)) 
    17858-LDFLAGS=$old_LDFLAGS 
    17959- 
    180  AC_CONFIG_SUBDIRS([libevent]) 
    181   
    182  AC_OUTPUT 
    183 diff -purN btpd-0.13/libevent/evdns.c btpd-0.13-hack/libevent/evdns.c 
    184 --- btpd-0.13/libevent/evdns.c  2007-05-18 19:32:01.000000000 +0400 
    185 +++ btpd-0.13-hack/libevent/evdns.c     2007-09-04 15:12:38.000000000 +0400 
    186 @@ -47,33 +47,21 @@ 
    187   
    188  #ifndef DNS_USE_CPU_CLOCK_FOR_ID 
    189  #ifndef DNS_USE_GETTIMEOFDAY_FOR_ID 
    190 -#ifndef DNS_USE_OPENSSL_FOR_ID 
    191  #error Must configure at least one id generation method. 
    192  #error Please see the documentation. 
    193  #endif 
    194  #endif 
    195 -#endif 
    196   
    197  // #define _POSIX_C_SOURCE 200507 
    198  #define _GNU_SOURCE 
    199   
    200  #ifdef DNS_USE_CPU_CLOCK_FOR_ID 
    201 -#ifdef DNS_USE_OPENSSL_FOR_ID 
    202 -#error Multiple id options selected 
    203 -#endif 
    204  #ifdef DNS_USE_GETTIMEOFDAY_FOR_ID 
    205  #error Multiple id options selected 
    206  #endif 
    207  #include <time.h> 
    208  #endif 
    209   
    210 -#ifdef DNS_USE_OPENSSL_FOR_ID 
    211 -#ifdef DNS_USE_GETTIMEOFDAY_FOR_ID 
    212 -#error Multiple id options selected 
    213 -#endif 
    214 -#include <openssl/rand.h> 
    215 -#endif 
    216 - 
    217  #define _FORTIFY_SOURCE 3 
    218   
     60 for m in $evloop_methods; do 
     61     case $m in 
     62     epoll) 
     63diff -urN btpd-0.15/Makefile.in btpd-0.15-new/Makefile.in 
     64--- btpd-0.15/Makefile.in       2009-02-09 16:08:59.000000000 -0500 
     65+++ btpd-0.15-new/Makefile.in   2009-06-19 15:21:05.000000000 -0400 
     66@@ -58,7 +58,8 @@ 
     67 am_misc_libmisc_a_OBJECTS = misc/benc.$(OBJEXT) misc/btpd_if.$(OBJEXT) \ 
     68        misc/metainfo.$(OBJEXT) misc/hashtable.$(OBJEXT) \ 
     69        misc/http_client.$(OBJEXT) misc/iobuf.$(OBJEXT) \ 
     70-       misc/stream.$(OBJEXT) misc/subr.$(OBJEXT) 
     71+       misc/stream.$(OBJEXT) misc/subr.$(OBJEXT) \ 
     72+       misc/sha1.$(OBJEXT)  
     73 misc_libmisc_a_OBJECTS = $(am_misc_libmisc_a_OBJECTS) 
     74 am__installdirs = "$(DESTDIR)$(bindir)" 
     75 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) 
     76@@ -213,8 +214,8 @@ 
     77 top_builddir = @top_builddir@ 
     78 top_srcdir = @top_srcdir@ 
     79 AM_CFLAGS = -std=c99 -Wall @WARNNPS@ 
     80-AM_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D@EVLOOP_METHOD@ -I$(top_srcdir)/misc -I$(top_srcdir)/evloop @openssl_CPPFLAGS@ 
     81-AM_LDFLAGS = @openssl_LDFLAGS@ 
     82+AM_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D@EVLOOP_METHOD@ -I$(top_srcdir)/misc -I$(top_srcdir)/evloop  
     83+AM_LDFLAGS =  
     84 noinst_LIBRARIES = misc/libmisc.a evloop/libevloop.a 
     85 EXTRA_DIST = COPYRIGHT CHANGES 
     86  
     87@@ -256,7 +257,8 @@ 
     88        misc/iobuf.c misc/iobuf.h\ 
     89        misc/queue.h\ 
     90        misc/stream.c misc/stream.h\ 
     91-       misc/subr.c misc/subr.h 
     92+       misc/subr.c misc/subr.h\ 
     93+       misc/sha1.c misc/sha1.h 
     94  
     95  
     96 # evloop 
     97@@ -349,6 +351,8 @@ 
     98        misc/$(DEPDIR)/$(am__dirstamp) 
     99 misc/subr.$(OBJEXT): misc/$(am__dirstamp) \ 
     100        misc/$(DEPDIR)/$(am__dirstamp) 
     101+misc/sha1.$(OBJEXT): misc/$(am__dirstamp) \ 
     102+       misc/$(DIPDIR)/$(am__dirstamp) 
     103 misc/libmisc.a: $(misc_libmisc_a_OBJECTS) $(misc_libmisc_a_DEPENDENCIES) misc/$(am__dirstamp) 
     104        -rm -f misc/libmisc.a 
     105        $(misc_libmisc_a_AR) misc/libmisc.a $(misc_libmisc_a_OBJECTS) $(misc_libmisc_a_LIBADD) 
     106@@ -492,6 +496,7 @@ 
     107        -rm -f misc/metainfo.$(OBJEXT) 
     108        -rm -f misc/stream.$(OBJEXT) 
     109        -rm -f misc/subr.$(OBJEXT) 
     110+       -rm -f misc/sha1.$(OBJEXT) 
     111  
     112 distclean-compile: 
     113        -rm -f *.tab.c 
     114@@ -538,6 +543,7 @@ 
     115 @AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/metainfo.Po@am__quote@ 
     116 @AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/stream.Po@am__quote@ 
     117 @AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/subr.Po@am__quote@ 
     118+@AMDEP_TRUE@@am__include@ @am__quote@misc/$(DEPDIR)/sha1.Po@am__quote@ 
     119  
     120 .c.o: 
     121 @am__fastdepCC_TRUE@   depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ 
     122diff -urN btpd-0.15/misc/metainfo.c btpd-0.15-new/misc/metainfo.c 
     123--- btpd-0.15/misc/metainfo.c   2009-01-12 17:43:18.000000000 -0500 
     124+++ btpd-0.15-new/misc/metainfo.c       2009-06-19 15:02:20.000000000 -0400 
     125@@ -6,8 +6,7 @@ 
    219126 #include <string.h> 
    220 @@ -1026,18 +1014,6 @@ transaction_id_pick(void) { 
    221                  trans_id = tv.tv_usec & 0xffff; 
    222  #endif 
    223   
    224 -#ifdef DNS_USE_OPENSSL_FOR_ID 
    225 -               u16 trans_id; 
    226 -               if (RAND_pseudo_bytes((u8 *) &trans_id, 2) == -1) { 
    227 -                       /* // in the case that the RAND call fails we back 
    228 -                       // down to using gettimeofday. 
    229 -                       struct timeval tv; 
    230 -                       gettimeofday(&tv, NULL); 
    231 -                       trans_id = tv.tv_usec & 0xffff; */ 
    232 -                       abort(); 
    233 -               } 
    234 -#endif 
    235 - 
    236                 if (trans_id == 0xffff) continue; 
    237                 // now check to see if that id is already inflight 
    238                 req = started_at = req_head; 
    239 diff -purN btpd-0.13/misc/Makefile.am btpd-0.13-hack/misc/Makefile.am 
    240 --- btpd-0.13/misc/Makefile.am  2007-05-18 19:32:01.000000000 +0400 
    241 +++ btpd-0.13-hack/misc/Makefile.am     2007-09-04 14:57:39.000000000 +0400 
    242 @@ -8,5 +8,6 @@ libmisc_a_SOURCES=\ 
    243         iobuf.c iobuf.h\ 
    244         queue.h\ 
    245         stream.c stream.h\ 
    246 -       subr.c subr.h 
    247 -libmisc_a_CPPFLAGS=-I$(top_srcdir)/libevent @openssl_CPPFLAGS@ 
    248 +       subr.c subr.h\ 
    249 +       sha1.c sha1.h 
    250 +libmisc_a_CPPFLAGS=-I$(top_srcdir)/libevent 
    251 diff -purN btpd-0.13/misc/metainfo.c btpd-0.13-hack/misc/metainfo.c 
    252 --- btpd-0.13/misc/metainfo.c   2007-05-18 19:32:01.000000000 +0400 
    253 +++ btpd-0.13-hack/misc/metainfo.c      2007-09-04 14:58:20.000000000 +0400 
    254 @@ -5,8 +5,7 @@ 
    255  #include <stdlib.h> 
    256  #include <string.h> 
     127 #include <strings.h> 
    257128  
    258129-#include <openssl/sha.h> 
     
    262133 #include "metainfo.h" 
    263134 #include "subr.h" 
    264 @@ -158,7 +157,7 @@ mi_info_hash(const char *p, uint8_t *has 
     135@@ -159,7 +158,7 @@ 
    265136     if (hash == NULL) 
    266137         if ((hash = malloc(20)) == NULL) 
     
    271142  
    272143 char * 
    273 diff -purN btpd-0.13/misc/sha1.c btpd-0.13-hack/misc/sha1.c 
    274 --- btpd-0.13/misc/sha1.c       1970-01-01 03:00:00.000000000 +0300 
    275 +++ btpd-0.13-hack/misc/sha1.c  2007-09-04 14:45:36.000000000 +0400 
     144diff -urN btpd-0.15/misc/sha1.c btpd-0.15-new/misc/sha1.c 
     145--- btpd-0.15/misc/sha1.c       1969-12-31 19:00:00.000000000 -0500 
     146+++ btpd-0.15-new/misc/sha1.c   2009-06-19 15:02:20.000000000 -0400 
    276147@@ -0,0 +1,423 @@ 
    277148+/* sha1.c - Functions to compute SHA1 message digest of files or 
     
    698569+    } 
    699570+} 
    700 diff -purN btpd-0.13/misc/sha1.h btpd-0.13-hack/misc/sha1.h 
    701 --- btpd-0.13/misc/sha1.h       1970-01-01 03:00:00.000000000 +0300 
    702 +++ btpd-0.13-hack/misc/sha1.h  2007-09-04 14:49:48.000000000 +0400 
     571diff -urN btpd-0.15/misc/sha1.h btpd-0.15-new/misc/sha1.h 
     572--- btpd-0.15/misc/sha1.h       1969-12-31 19:00:00.000000000 -0500 
     573+++ btpd-0.15-new/misc/sha1.h   2009-06-19 15:02:20.000000000 -0400 
    703574@@ -0,0 +1,90 @@ 
    704575+/* Declarations of functions and data types used for SHA1 sum 
     
    792663+ 
    793664+#endif 
    794 diff -purN btpd-0.13/misc/stream.c btpd-0.13-hack/misc/stream.c 
    795 --- btpd-0.13/misc/stream.c     2007-05-18 19:32:01.000000000 +0400 
    796 +++ btpd-0.13-hack/misc/stream.c        2007-09-04 14:53:35.000000000 +0400 
     665diff -urN btpd-0.15/misc/stream.c btpd-0.15-new/misc/stream.c 
     666--- btpd-0.15/misc/stream.c     2008-12-22 17:25:36.000000000 -0500 
     667+++ btpd-0.15-new/misc/stream.c 2009-06-19 15:02:20.000000000 -0400 
    797668@@ -5,7 +5,7 @@ 
    798669 #include <stdlib.h> 
     
    804675 #include "metainfo.h" 
    805676 #include "subr.h" 
    806 @@ -161,21 +161,21 @@ bts_put(struct bt_stream *bts, off_t off 
     677@@ -161,21 +161,21 @@ 
    807678 int 
    808679 bts_sha(struct bt_stream *bts, off_t start, off_t length, uint8_t *hash) 
     
    830701 } 
    831702  
     703diff -urN btpd-0.15/.pc/.version btpd-0.15-new/.pc/.version 
     704--- btpd-0.15/.pc/.version      1969-12-31 19:00:00.000000000 -0500 
     705+++ btpd-0.15-new/.pc/.version  2009-06-19 15:00:46.000000000 -0400 
     706@@ -0,0 +1 @@ 
     707+2 
     708diff -urN btpd-0.15/Makefile.am btpd-0.15.new/Makefile.am 
     709--- btpd-0.15/Makefile.am       2009-02-03 12:09:25.000000000 +0100 
     710+++ btpd-0.15.new/Makefile.am   2009-07-02 17:39:47.000000000 +0200 
     711@@ -1,6 +1,6 @@ 
     712 AM_CFLAGS=-std=c99 -Wall @WARNNPS@ 
     713-AM_CPPFLAGS=-D_FILE_OFFSET_BITS=64 -D@EVLOOP_METHOD@ -I$(top_srcdir)/misc -I$(top_srcdir)/evloop @openssl_CPPFLAGS@ 
     714-AM_LDFLAGS=@openssl_LDFLAGS@ 
     715+AM_CPPFLAGS=-D_FILE_OFFSET_BITS=64 -D@EVLOOP_METHOD@ -I$(top_srcdir)/misc -I$(top_srcdir)/evloop 
     716+AM_LDFLAGS= 
     717  
     718 bin_PROGRAMS=btpd/btpd cli/btcli cli/btinfo 
     719 noinst_LIBRARIES=misc/libmisc.a evloop/libevloop.a 
     720@@ -44,7 +44,8 @@ 
     721        misc/iobuf.c misc/iobuf.h\ 
     722        misc/queue.h\ 
     723        misc/stream.c misc/stream.h\ 
     724-       misc/subr.c misc/subr.h 
     725+       misc/subr.c misc/subr.h\ 
     726+       misc/sha1.c misc/sha1.h 
     727  
     728 # evloop 
     729 EXTRA_evloop_libevloop_a_SOURCES=evloop/epoll.c evloop/kqueue.c evloop/poll.c 
Note: See TracChangeset for help on using the changeset viewer.