[oe-commits] org.oe.dev tor: add 0.1.1.23, closes #1408
balle commit
openembedded-commits at lists.openembedded.org
Wed Sep 13 21:16:49 UTC 2006
tor: add 0.1.1.23, closes #1408
Author: balle at chaostal.de
Branch: org.openembedded.dev
Revision: b81e0fc4062b4fe7d5e3282606ada3a988c46268
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b81e0fc4062b4fe7d5e3282606ada3a988c46268
Files:
1
packages/tor
packages/tor/files
packages/tor/tor-0.1.1.23
packages/tor/files/tor.init
packages/tor/tor-0.1.1.23/compat.patch
packages/tor/tor-0.1.1.23/configure.patch
packages/tor/tor-0.1.1.23/make.patch
packages/tor/tor-0.1.1.23/openssl.patch
packages/tor/tor_0.1.1.23.bb
mtn:execute
true
Diffs:
#
# mt diff -r2c474ae6b56405a4a5cae2c846dcc686b12989f4 -rb81e0fc4062b4fe7d5e3282606ada3a988c46268
#
#
#
# add_dir "packages/tor"
#
# add_dir "packages/tor/files"
#
# add_dir "packages/tor/tor-0.1.1.23"
#
# add_file "packages/tor/files/tor.init"
# content [f5bf7c46274e75f2a404c47d2c3b7bdd6e67ed38]
#
# add_file "packages/tor/tor-0.1.1.23/compat.patch"
# content [0f8928245d3fa9fc4f90f9ab794c85262f2d14b9]
#
# add_file "packages/tor/tor-0.1.1.23/configure.patch"
# content [86e4f23901b752aedd1db347b6885f2e168b8c9f]
#
# add_file "packages/tor/tor-0.1.1.23/make.patch"
# content [240bec9c78ebe4214b7cf85c7554ae79758cd4c8]
#
# add_file "packages/tor/tor-0.1.1.23/openssl.patch"
# content [41b13f8ae4d9fb24756e6ca5f6db67f4b0b21804]
#
# add_file "packages/tor/tor_0.1.1.23.bb"
# content [8aad232507a2eea89ee857611c86538b1380e430]
#
# set "packages/tor/files/tor.init"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/tor/files/tor.init f5bf7c46274e75f2a404c47d2c3b7bdd6e67ed38
+++ packages/tor/files/tor.init f5bf7c46274e75f2a404c47d2c3b7bdd6e67ed38
@@ -0,0 +1,44 @@
+
+#! /bin/sh
+#
+# This is an init script for Tor on Openzaurus
+#
+
+
+test -f /usr/bin/tor || exit 0
+test -f /etc/tor/tor-tsocks.conf || exit 0
+
+case "$1" in
+ start)
+ echo -n "Starting tor daemon"
+ start-stop-daemon --start --quiet --exec /usr/bin/tor &
+ echo "."
+ ;;
+ stop)
+ echo -n "Stopping tor daemon"
+ start-stop-daemon --stop --quiet --exec /usr/bin/tor &
+ echo "."
+ ;;
+ restart)
+ echo -n "Stopping tor daemon"
+ start-stop-daemon --stop --quiet --exec /usr/bin/tor &
+ sleep 1
+ echo -n "Starting tor daemon"
+ start-stop-daemon --start --quiet --exec /usr/bin/tor &
+ echo "."
+ ;;
+ start_socats)
+ echo "Starting socats"
+ # EXAMPLE
+ socat TCP4-LISTEN:6667,fork SOCKS4A:localhost:irc.freenode.net:6667,socksport=9050 &
+ ;;
+ stop_socats)
+ echo "Stopping all socat processes!"
+ killall socat
+ ;;
+ *)
+ echo "Usage: /etc/init.d/tor {start|stop|restart|start_socats|stop_socats}"
+ exit 1
+esac
+
+exit 0
============================================================
--- packages/tor/tor-0.1.1.23/compat.patch 0f8928245d3fa9fc4f90f9ab794c85262f2d14b9
+++ packages/tor/tor-0.1.1.23/compat.patch 0f8928245d3fa9fc4f90f9ab794c85262f2d14b9
@@ -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 <stdarg.h>
+
+-#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. */
============================================================
--- packages/tor/tor-0.1.1.23/configure.patch 86e4f23901b752aedd1db347b6885f2e168b8c9f
+++ packages/tor/tor-0.1.1.23/configure.patch 86e4f23901b752aedd1db347b6885f2e168b8c9f
@@ -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 <string.h>
+-#include <openssl/rand.h>
+-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 <openssl/opensslv.h>
+-#include <openssl/crypto.h>
+-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
============================================================
--- packages/tor/tor-0.1.1.23/make.patch 240bec9c78ebe4214b7cf85c7554ae79758cd4c8
+++ packages/tor/tor-0.1.1.23/make.patch 240bec9c78ebe4214b7cf85c7554ae79758cd4c8
@@ -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@
============================================================
--- packages/tor/tor-0.1.1.23/openssl.patch 41b13f8ae4d9fb24756e6ca5f6db67f4b0b21804
+++ packages/tor/tor-0.1.1.23/openssl.patch 41b13f8ae4d9fb24756e6ca5f6db67f4b0b21804
@@ -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 <string.h>
+-#include <openssl/rand.h>
+-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 <openssl/opensslv.h>
+-#include <openssl/crypto.h>
+-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
============================================================
--- packages/tor/tor_0.1.1.23.bb 8aad232507a2eea89ee857611c86538b1380e430
+++ packages/tor/tor_0.1.1.23.bb 8aad232507a2eea89ee857611c86538b1380e430
@@ -0,0 +1,25 @@
+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"
+MAINTAINER = "Bastian Ballmann <balle at chaostal.de>"
+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
+}
More information about the Openembedded-commits
mailing list