From 5b14c17a15bf65e9d3605008a0cf17506c5fdd4c Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Thu, 15 Mar 2007 03:25:40 +0000 Subject: tor: update to 0.1.1.26. Closes 1638. --- packages/tor/tor-0.1.1.23/.mtn2git_empty | 0 packages/tor/tor-0.1.1.23/compat.patch | 14 ---- packages/tor/tor-0.1.1.23/configure.patch | 126 ------------------------------ packages/tor/tor-0.1.1.23/make.patch | 11 --- packages/tor/tor-0.1.1.23/openssl.patch | 71 ----------------- packages/tor/tor-0.1.1.26/.mtn2git_empty | 0 packages/tor/tor-0.1.1.26/compat.patch | 14 ++++ packages/tor/tor-0.1.1.26/configure.patch | 126 ++++++++++++++++++++++++++++++ packages/tor/tor-0.1.1.26/make.patch | 11 +++ packages/tor/tor-0.1.1.26/openssl.patch | 71 +++++++++++++++++ packages/tor/tor_0.1.1.23.bb | 24 ------ packages/tor/tor_0.1.1.26.bb | 24 ++++++ 12 files changed, 246 insertions(+), 246 deletions(-) delete mode 100644 packages/tor/tor-0.1.1.23/.mtn2git_empty delete mode 100644 packages/tor/tor-0.1.1.23/compat.patch delete mode 100644 packages/tor/tor-0.1.1.23/configure.patch delete mode 100644 packages/tor/tor-0.1.1.23/make.patch delete mode 100644 packages/tor/tor-0.1.1.23/openssl.patch create mode 100644 packages/tor/tor-0.1.1.26/.mtn2git_empty create mode 100644 packages/tor/tor-0.1.1.26/compat.patch create mode 100644 packages/tor/tor-0.1.1.26/configure.patch create mode 100644 packages/tor/tor-0.1.1.26/make.patch create mode 100644 packages/tor/tor-0.1.1.26/openssl.patch delete mode 100644 packages/tor/tor_0.1.1.23.bb create mode 100644 packages/tor/tor_0.1.1.26.bb (limited to 'packages') diff --git a/packages/tor/tor-0.1.1.23/.mtn2git_empty b/packages/tor/tor-0.1.1.23/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/tor/tor-0.1.1.23/compat.patch b/packages/tor/tor-0.1.1.23/compat.patch deleted file mode 100644 index 6c54032667..0000000000 --- a/packages/tor/tor-0.1.1.23/compat.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur tor-0.1.1.23/src/common/compat.h tor-0.1.1.23_patched/src/common/compat.h ---- tor-0.1.1.23/src/common/compat.h 2006-07-25 05:52:47.000000000 +0200 -+++ tor-0.1.1.23_patched/src/common/compat.h 2006-09-04 22:26:42.000000000 +0200 -@@ -31,10 +31,6 @@ - #endif - #include - --#ifndef NULL_REP_IS_ZERO_BYTES --#error "It seems your platform does not represent NULL as zero. We can't cope." --#endif -- - /* ===== Compiler compatibility */ - - /* GCC can check printf types on arbitrary functions. */ diff --git a/packages/tor/tor-0.1.1.23/configure.patch b/packages/tor/tor-0.1.1.23/configure.patch deleted file mode 100644 index dcd214feb2..0000000000 --- a/packages/tor/tor-0.1.1.23/configure.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff -Naur tor-0.1.1.23/configure.in tor-0.1.1.23_patched/configure.in ---- tor-0.1.1.23/configure.in 2006-07-30 06:40:28.000000000 +0200 -+++ tor-0.1.1.23_patched/configure.in 2006-09-04 22:18:15.000000000 +0200 -@@ -169,38 +169,6 @@ - fi - fi - --AC_CACHE_CHECK([whether we need extra options to link libevent], -- ac_cv_libevent_linker_option, [ -- saved_LDFLAGS="$LDFLAGS" -- le_runs=no -- linked_with=nothing -- for le_extra in "" "-Wl,-R$le_libdir" "-R$le_libdir" ; do -- LDFLAGS="$le_extra $saved_LDFLAGS" -- AC_TRY_RUN([void *event_init(void); -- int main(int c, char **v) { -- event_init(); return 0; -- }], -- libevent_runs=yes, libevent_runs=no) -- if test $libevent_runs = yes ; then -- if test -z "$le_extra" ; then -- ac_cv_libevent_linker_option='(none)' -- else -- ac_cv_libevent_linker_option=$le_extra -- fi -- le_runs=yes -- break -- fi -- done -- if test $le_runs = no ; then -- AC_MSG_ERROR([Found linkable libevent in $ac_cv_libevent_dir, but it doesn't run, even with -R. Maybe specify another using --with-libevent-dir?]) -- fi -- LDFLAGS="$saved_LDFLAGS" --]) -- --if test $ac_cv_libevent_linker_option != '(none)' ; then -- LDFLAGS="$ac_cv_libevent_linker_option $LDFLAGS" --fi -- - dnl ------------------------------------------------------ - dnl Where do you live, openssl? And how do we call you? - -@@ -266,66 +234,6 @@ - fi - fi - --AC_CACHE_CHECK([whether we need extra options to link OpenSSL], -- ac_cv_openssl_linker_option, [ -- saved_LDFLAGS="$LDFLAGS" -- ssl_runs=no -- linked_with=nothing -- for ssl_extra in "" "-Wl,-R$ssl_libdir" "-R$ssl_libdir" ; do -- LDFLAGS="$ssl_extra $saved_LDFLAGS" -- AC_TRY_RUN([ --#include --#include --int main(void) --{ -- char a[2048]; -- memset(a, 0, sizeof(a)); -- RAND_add(a, sizeof(a), sizeof(a)); -- return(RAND_status() <= 0); --} -- ], -- openssl_runs=yes, openssl_runs=no) -- if test $openssl_runs = yes ; then -- if test "$linked_with" = nothing; then -- linked_with="$ssl_extra" -- fi -- AC_TRY_RUN([ --#include --#include --int main(void) { --return (OPENSSL_VERSION_NUMBER == SSLeay()) == 0; --}], -- right_version=yes, right_version=no) -- if test "$right_version" = yes; then -- if test -z "$ssl_extra" ; then -- ac_cv_openssl_linker_option='(none)' -- else -- ac_cv_openssl_linker_option=$ssl_extra -- fi -- ssl_runs=yes -- break -- fi -- fi -- done -- if test $ssl_runs = no ; then -- if test "$linked_with" = 'nothing' ; then -- AC_MSG_ERROR([Found linkable OpenSSL in $ac_cv_openssl_dir, but it doesn't run, even with -R. Maybe specify another using --with-ssl-dir?]) -- else -- if test -z "$linked_with" ; then -- ac_cv_openssl_linker_option='(none)' -- else -- ac_cv_openssl_linker_option=$linked_with -- fi -- AC_MSG_WARN([I managed to make OpenSSL link and run, but I couldn't make it link against the same version I found header files for.]) -- fi -- fi -- LDFLAGS="$saved_LDFLAGS" --]) -- --if test "$ac_cv_openssl_linker_option" != '(none)' ; then -- LDFLAGS="$ac_cv_openssl_linker_option $LDFLAGS" --fi -- - dnl Make sure to enable support for large off_t if avalable. - - AC_SYS_LARGEFILE -@@ -377,16 +285,6 @@ - AC_CHECK_SIZEOF(__int64) - AC_CHECK_SIZEOF(void *) - AC_CHECK_SIZEOF(time_t) --AC_CACHE_CHECK([whether time_t is signed], tor_cv_time_t_signed, [ --AC_TRY_RUN([ --int main(int c, char**v) { if (((time_t)-1)<0) return 1; else return 0; }], -- tor_cv_time_t_signed=no, tor_cv_time_t_signed=yes) --]) -- --if test $tor_cv_time_t_signed = yes; then -- AC_DEFINE([TIME_T_IS_SIGNED], 1, -- [Define to 1 iff time_t is signed]) --fi - - AC_CHECK_SIZEOF(socklen_t, , [AC_INCLUDES_DEFAULT() - #ifdef HAVE_SYS_SOCKET_H diff --git a/packages/tor/tor-0.1.1.23/make.patch b/packages/tor/tor-0.1.1.23/make.patch deleted file mode 100644 index 8b8851b22b..0000000000 --- a/packages/tor/tor-0.1.1.23/make.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur tor-0.1.1.23/Makefile.in tor-0.1.1.23_patched/Makefile.in ---- tor-0.1.1.23/Makefile.in 2006-07-30 06:42:20.000000000 +0200 -+++ tor-0.1.1.23_patched/Makefile.in 2006-09-04 20:13:51.000000000 +0200 -@@ -65,7 +65,6 @@ - host_alias = @host_alias@ - host_triplet = @host@ - BINDIR = @BINDIR@ --CC = @CC@ - CONFDIR = @CONFDIR@ - HAVE_LIB = @HAVE_LIB@ - LIB = @LIB@ diff --git a/packages/tor/tor-0.1.1.23/openssl.patch b/packages/tor/tor-0.1.1.23/openssl.patch deleted file mode 100644 index e413486273..0000000000 --- a/packages/tor/tor-0.1.1.23/openssl.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -Naur tor-0.1.1.23/configure.in tor-0.1.1.23_patched/configure.in ---- tor-0.1.1.23/configure.in 2006-09-04 20:42:21.000000000 +0200 -+++ tor-0.1.1.23_patched/configure.in 2006-09-04 20:45:09.000000000 +0200 - -@@ -234,66 +234,6 @@ - fi - fi - --AC_CACHE_CHECK([whether we need extra options to link OpenSSL], -- ac_cv_openssl_linker_option, [ -- saved_LDFLAGS="$LDFLAGS" -- ssl_runs=no -- linked_with=nothing -- for ssl_extra in "" "-Wl,-R$ssl_libdir" "-R$ssl_libdir" ; do -- LDFLAGS="$ssl_extra $saved_LDFLAGS" -- AC_TRY_RUN([ --#include --#include --int main(void) --{ -- char a[2048]; -- memset(a, 0, sizeof(a)); -- RAND_add(a, sizeof(a), sizeof(a)); -- return(RAND_status() <= 0); --} -- ], -- openssl_runs=yes, openssl_runs=no) -- if test $openssl_runs = yes ; then -- if test "$linked_with" = nothing; then -- linked_with="$ssl_extra" -- fi -- AC_TRY_RUN([ --#include --#include --int main(void) { --return (OPENSSL_VERSION_NUMBER == SSLeay()) == 0; --}], -- right_version=yes, right_version=no) -- if test "$right_version" = yes; then -- if test -z "$ssl_extra" ; then -- ac_cv_openssl_linker_option='(none)' -- else -- ac_cv_openssl_linker_option=$ssl_extra -- fi -- ssl_runs=yes -- break -- fi -- fi -- done -- if test $ssl_runs = no ; then -- if test "$linked_with" = 'nothing' ; then -- AC_MSG_ERROR([Found linkable OpenSSL in $ac_cv_openssl_dir, but it doesn't run, even with -R. Maybe specify another using --with-ssl-dir?]) -- else -- if test -z "$linked_with" ; then -- ac_cv_openssl_linker_option='(none)' -- else -- ac_cv_openssl_linker_option=$linked_with -- fi -- AC_MSG_WARN([I managed to make OpenSSL link and run, but I couldn't make it link against the same version I found header files for.]) -- fi -- fi -- LDFLAGS="$saved_LDFLAGS" --]) -- --if test "$ac_cv_openssl_linker_option" != '(none)' ; then -- LDFLAGS="$ac_cv_openssl_linker_option $LDFLAGS" --fi -- - dnl Make sure to enable support for large off_t if avalable. - - AC_SYS_LARGEFILE diff --git a/packages/tor/tor-0.1.1.26/.mtn2git_empty b/packages/tor/tor-0.1.1.26/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/tor/tor-0.1.1.26/compat.patch b/packages/tor/tor-0.1.1.26/compat.patch new file mode 100644 index 0000000000..6c54032667 --- /dev/null +++ b/packages/tor/tor-0.1.1.26/compat.patch @@ -0,0 +1,14 @@ +diff -Naur tor-0.1.1.23/src/common/compat.h tor-0.1.1.23_patched/src/common/compat.h +--- tor-0.1.1.23/src/common/compat.h 2006-07-25 05:52:47.000000000 +0200 ++++ tor-0.1.1.23_patched/src/common/compat.h 2006-09-04 22:26:42.000000000 +0200 +@@ -31,10 +31,6 @@ + #endif + #include + +-#ifndef NULL_REP_IS_ZERO_BYTES +-#error "It seems your platform does not represent NULL as zero. We can't cope." +-#endif +- + /* ===== Compiler compatibility */ + + /* GCC can check printf types on arbitrary functions. */ diff --git a/packages/tor/tor-0.1.1.26/configure.patch b/packages/tor/tor-0.1.1.26/configure.patch new file mode 100644 index 0000000000..dcd214feb2 --- /dev/null +++ b/packages/tor/tor-0.1.1.26/configure.patch @@ -0,0 +1,126 @@ +diff -Naur tor-0.1.1.23/configure.in tor-0.1.1.23_patched/configure.in +--- tor-0.1.1.23/configure.in 2006-07-30 06:40:28.000000000 +0200 ++++ tor-0.1.1.23_patched/configure.in 2006-09-04 22:18:15.000000000 +0200 +@@ -169,38 +169,6 @@ + fi + fi + +-AC_CACHE_CHECK([whether we need extra options to link libevent], +- ac_cv_libevent_linker_option, [ +- saved_LDFLAGS="$LDFLAGS" +- le_runs=no +- linked_with=nothing +- for le_extra in "" "-Wl,-R$le_libdir" "-R$le_libdir" ; do +- LDFLAGS="$le_extra $saved_LDFLAGS" +- AC_TRY_RUN([void *event_init(void); +- int main(int c, char **v) { +- event_init(); return 0; +- }], +- libevent_runs=yes, libevent_runs=no) +- if test $libevent_runs = yes ; then +- if test -z "$le_extra" ; then +- ac_cv_libevent_linker_option='(none)' +- else +- ac_cv_libevent_linker_option=$le_extra +- fi +- le_runs=yes +- break +- fi +- done +- if test $le_runs = no ; then +- AC_MSG_ERROR([Found linkable libevent in $ac_cv_libevent_dir, but it doesn't run, even with -R. Maybe specify another using --with-libevent-dir?]) +- fi +- LDFLAGS="$saved_LDFLAGS" +-]) +- +-if test $ac_cv_libevent_linker_option != '(none)' ; then +- LDFLAGS="$ac_cv_libevent_linker_option $LDFLAGS" +-fi +- + dnl ------------------------------------------------------ + dnl Where do you live, openssl? And how do we call you? + +@@ -266,66 +234,6 @@ + fi + fi + +-AC_CACHE_CHECK([whether we need extra options to link OpenSSL], +- ac_cv_openssl_linker_option, [ +- saved_LDFLAGS="$LDFLAGS" +- ssl_runs=no +- linked_with=nothing +- for ssl_extra in "" "-Wl,-R$ssl_libdir" "-R$ssl_libdir" ; do +- LDFLAGS="$ssl_extra $saved_LDFLAGS" +- AC_TRY_RUN([ +-#include +-#include +-int main(void) +-{ +- char a[2048]; +- memset(a, 0, sizeof(a)); +- RAND_add(a, sizeof(a), sizeof(a)); +- return(RAND_status() <= 0); +-} +- ], +- openssl_runs=yes, openssl_runs=no) +- if test $openssl_runs = yes ; then +- if test "$linked_with" = nothing; then +- linked_with="$ssl_extra" +- fi +- AC_TRY_RUN([ +-#include +-#include +-int main(void) { +-return (OPENSSL_VERSION_NUMBER == SSLeay()) == 0; +-}], +- right_version=yes, right_version=no) +- if test "$right_version" = yes; then +- if test -z "$ssl_extra" ; then +- ac_cv_openssl_linker_option='(none)' +- else +- ac_cv_openssl_linker_option=$ssl_extra +- fi +- ssl_runs=yes +- break +- fi +- fi +- done +- if test $ssl_runs = no ; then +- if test "$linked_with" = 'nothing' ; then +- AC_MSG_ERROR([Found linkable OpenSSL in $ac_cv_openssl_dir, but it doesn't run, even with -R. Maybe specify another using --with-ssl-dir?]) +- else +- if test -z "$linked_with" ; then +- ac_cv_openssl_linker_option='(none)' +- else +- ac_cv_openssl_linker_option=$linked_with +- fi +- AC_MSG_WARN([I managed to make OpenSSL link and run, but I couldn't make it link against the same version I found header files for.]) +- fi +- fi +- LDFLAGS="$saved_LDFLAGS" +-]) +- +-if test "$ac_cv_openssl_linker_option" != '(none)' ; then +- LDFLAGS="$ac_cv_openssl_linker_option $LDFLAGS" +-fi +- + dnl Make sure to enable support for large off_t if avalable. + + AC_SYS_LARGEFILE +@@ -377,16 +285,6 @@ + AC_CHECK_SIZEOF(__int64) + AC_CHECK_SIZEOF(void *) + AC_CHECK_SIZEOF(time_t) +-AC_CACHE_CHECK([whether time_t is signed], tor_cv_time_t_signed, [ +-AC_TRY_RUN([ +-int main(int c, char**v) { if (((time_t)-1)<0) return 1; else return 0; }], +- tor_cv_time_t_signed=no, tor_cv_time_t_signed=yes) +-]) +- +-if test $tor_cv_time_t_signed = yes; then +- AC_DEFINE([TIME_T_IS_SIGNED], 1, +- [Define to 1 iff time_t is signed]) +-fi + + AC_CHECK_SIZEOF(socklen_t, , [AC_INCLUDES_DEFAULT() + #ifdef HAVE_SYS_SOCKET_H diff --git a/packages/tor/tor-0.1.1.26/make.patch b/packages/tor/tor-0.1.1.26/make.patch new file mode 100644 index 0000000000..8b8851b22b --- /dev/null +++ b/packages/tor/tor-0.1.1.26/make.patch @@ -0,0 +1,11 @@ +diff -Naur tor-0.1.1.23/Makefile.in tor-0.1.1.23_patched/Makefile.in +--- tor-0.1.1.23/Makefile.in 2006-07-30 06:42:20.000000000 +0200 ++++ tor-0.1.1.23_patched/Makefile.in 2006-09-04 20:13:51.000000000 +0200 +@@ -65,7 +65,6 @@ + host_alias = @host_alias@ + host_triplet = @host@ + BINDIR = @BINDIR@ +-CC = @CC@ + CONFDIR = @CONFDIR@ + HAVE_LIB = @HAVE_LIB@ + LIB = @LIB@ diff --git a/packages/tor/tor-0.1.1.26/openssl.patch b/packages/tor/tor-0.1.1.26/openssl.patch new file mode 100644 index 0000000000..e413486273 --- /dev/null +++ b/packages/tor/tor-0.1.1.26/openssl.patch @@ -0,0 +1,71 @@ +diff -Naur tor-0.1.1.23/configure.in tor-0.1.1.23_patched/configure.in +--- tor-0.1.1.23/configure.in 2006-09-04 20:42:21.000000000 +0200 ++++ tor-0.1.1.23_patched/configure.in 2006-09-04 20:45:09.000000000 +0200 + +@@ -234,66 +234,6 @@ + fi + fi + +-AC_CACHE_CHECK([whether we need extra options to link OpenSSL], +- ac_cv_openssl_linker_option, [ +- saved_LDFLAGS="$LDFLAGS" +- ssl_runs=no +- linked_with=nothing +- for ssl_extra in "" "-Wl,-R$ssl_libdir" "-R$ssl_libdir" ; do +- LDFLAGS="$ssl_extra $saved_LDFLAGS" +- AC_TRY_RUN([ +-#include +-#include +-int main(void) +-{ +- char a[2048]; +- memset(a, 0, sizeof(a)); +- RAND_add(a, sizeof(a), sizeof(a)); +- return(RAND_status() <= 0); +-} +- ], +- openssl_runs=yes, openssl_runs=no) +- if test $openssl_runs = yes ; then +- if test "$linked_with" = nothing; then +- linked_with="$ssl_extra" +- fi +- AC_TRY_RUN([ +-#include +-#include +-int main(void) { +-return (OPENSSL_VERSION_NUMBER == SSLeay()) == 0; +-}], +- right_version=yes, right_version=no) +- if test "$right_version" = yes; then +- if test -z "$ssl_extra" ; then +- ac_cv_openssl_linker_option='(none)' +- else +- ac_cv_openssl_linker_option=$ssl_extra +- fi +- ssl_runs=yes +- break +- fi +- fi +- done +- if test $ssl_runs = no ; then +- if test "$linked_with" = 'nothing' ; then +- AC_MSG_ERROR([Found linkable OpenSSL in $ac_cv_openssl_dir, but it doesn't run, even with -R. Maybe specify another using --with-ssl-dir?]) +- else +- if test -z "$linked_with" ; then +- ac_cv_openssl_linker_option='(none)' +- else +- ac_cv_openssl_linker_option=$linked_with +- fi +- AC_MSG_WARN([I managed to make OpenSSL link and run, but I couldn't make it link against the same version I found header files for.]) +- fi +- fi +- LDFLAGS="$saved_LDFLAGS" +-]) +- +-if test "$ac_cv_openssl_linker_option" != '(none)' ; then +- LDFLAGS="$ac_cv_openssl_linker_option $LDFLAGS" +-fi +- + dnl Make sure to enable support for large off_t if avalable. + + AC_SYS_LARGEFILE diff --git a/packages/tor/tor_0.1.1.23.bb b/packages/tor/tor_0.1.1.23.bb deleted file mode 100644 index 29cda6945f..0000000000 --- a/packages/tor/tor_0.1.1.23.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Tor is a network of virtual tunnels that allows people and groups \ - to improve their privacy and security on the Internet." -SECTION = "console/network" -PRIORITY = "optional" -HOMEPAGE = "http://tor.eff.org" -LICENSE = "BSD" -PR="r0" -DEPENDS = "libevent openssl zlib" - -SRC_URI = "http://tor.eff.org/dist/tor-0.1.1.23.tar.gz \ - file://configure.patch;patch=1;pnum=1 \ - file://make.patch;patch=1;pnum=1 \ - file://compat.patch;patch=1;pnum=1 \ - file://tor.init" - - -inherit autotools update-rc.d - -INITSCRIPT_NAME = "tor" - -do_install_append() { - install -d ${D}${sysconfdir}/init.d - install ${WORKDIR}/tor.init ${D}${sysconfdir}/init.d/tor -} diff --git a/packages/tor/tor_0.1.1.26.bb b/packages/tor/tor_0.1.1.26.bb new file mode 100644 index 0000000000..751182aadb --- /dev/null +++ b/packages/tor/tor_0.1.1.26.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Tor is a network of virtual tunnels that allows people and groups \ + to improve their privacy and security on the Internet." +SECTION = "console/network" +PRIORITY = "optional" +HOMEPAGE = "http://tor.eff.org" +LICENSE = "BSD" +PR="r0" +DEPENDS = "libevent openssl zlib" + +SRC_URI = "http://tor.eff.org/dist/${P}.tar.gz \ + file://configure.patch;patch=1;pnum=1 \ + file://make.patch;patch=1;pnum=1 \ + file://compat.patch;patch=1;pnum=1 \ + file://tor.init" + + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "tor" + +do_install_append() { + install -d ${D}${sysconfdir}/init.d + install ${WORKDIR}/tor.init ${D}${sysconfdir}/init.d/tor +} -- cgit v1.2.3