From a40b0bb707a497524adb52fa19ee3240a75d6eb5 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 5 Feb 2012 16:19:08 +0000 Subject: [PATCH] [packages_10.03.2] tor-alpha: merge r27693, r28158, r28341, r28902, r29177, r29488, r29563 SVN-Revision: 30270 --- net/tor-alpha/Makefile | 69 +++++++++++---------------- net/tor-alpha/files/tor.init | 38 ++++++++------- net/tor-alpha/patches/001-torrc.patch | 3 +- 3 files changed, 49 insertions(+), 61 deletions(-) diff --git a/net/tor-alpha/Makefile b/net/tor-alpha/Makefile index 254205f201..d834a341d3 100644 --- a/net/tor-alpha/Makefile +++ b/net/tor-alpha/Makefile @@ -8,14 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tor-alpha -PKG_VERSION:=0.2.2.24-alpha +PKG_VERSION:=0.2.3.10-alpha PKG_RELEASE:=1 PKG_SOURCE:=tor-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://www.torproject.org/dist \ https://archive.torproject.org/tor-package-archive -PKG_MD5SUM:=4c1e2c7d778f813d09227433fffe3990 +PKG_MD5SUM:=1e5a61aa4411c6ffe32eb5c04fc1f05e +PKG_BUILD_DEPENDS:=libnatpmp PKG_BUILD_DIR:=$(BUILD_DIR)/tor-$(PKG_VERSION) PKG_INSTALL:=1 @@ -38,7 +39,7 @@ endef define Package/tor-alpha $(call Package/tor-alpha/Default) TITLE:=An anonymous Internet communication system - DEPENDS:=+libevent +libopenssl +libpthread +librt +miniupnpc + DEPENDS:=+libevent2 +libevent2-openssl +libpthread +librt endef define Package/tor-alpha/description @@ -46,6 +47,17 @@ $(call Package/tor-alpha/Default/description) This package contains the tor daemon. endef +define Package/tor-alpha-fw-helper +$(call Package/tor-alpha/Default) + TITLE:=Firewall helper for tor + DEPENDS:=+tor-alpha +libnatpmp +endef + +define Package/tor-alpha-fw-helper/description +$(call Package/tor-alpha/Default/description) + This package contains a helper for automatically configuring port forwarding. +endef + define Package/tor-alpha-geoip $(call Package/tor-alpha/Default) TITLE:=GeoIP db for tor @@ -61,53 +73,20 @@ define Package/tor-alpha/conffiles /etc/tor/torrc endef -define Package/tor-alpha/postinst -#!/bin/sh - -name=tor -id=52 - -# do not change below -# # check if we are on real system -if [ -z "$${IPKG_INSTROOT}" ]; then - # create copies of passwd and group, if we use squashfs - rootfs=`mount |awk '/root/ { print $$5 }'` - if [ "$$rootfs" = "squashfs" ]; then - if [ -h /etc/group ]; then - rm /etc/group - cp /rom/etc/group /etc/group - fi - if [ -h /etc/passwd ]; then - rm /etc/passwd - cp /rom/etc/passwd /etc/passwd - fi - fi -fi - -echo "" -if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then - echo "adding group $$name to /etc/group" - echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group -fi - -if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then - echo "adding user $$name to /etc/passwd" - echo "$${name}:x:$${id}:$${id}:$${name}:/tmp/.$${name}:/bin/false" >> $${IPKG_INSTROOT}/etc/passwd -fi -endef - CONFIGURE_ARGS += \ --with-libevent-dir="$(STAGING_DIR)/usr" \ --with-ssl-dir="$(STAGING_DIR)/usr" \ - --enable-upnp \ - --with-libminiupnpc-dir="$(STAGING_DIR)/usr" \ + --enable-nat-pmp \ + --with-libnatpmp-dir="$(STAGING_DIR)/usr" \ + --enable-bufferevents \ + --disable-asciidoc CONFIGURE_VARS += \ - CROSS_COMPILE="yes" \ + CROSS_COMPILE="yes" # pass CFLAGS again to override -O2 set by configure MAKE_FLAGS += \ - CFLAGS="$(TARGET_CFLAGS)" \ + CFLAGS="$(TARGET_CFLAGS)" define Package/tor-alpha/install $(INSTALL_DIR) $(1)/usr/sbin @@ -118,10 +97,16 @@ define Package/tor-alpha/install $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/tor/torrc.sample $(1)/etc/tor/torrc endef +define Package/tor-alpha-fw-helper/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor-fw-helper $(1)/usr/bin/ +endef + define Package/tor-alpha-geoip/install $(INSTALL_DIR) $(1)/usr/share/tor $(CP) $(PKG_INSTALL_DIR)/usr/share/tor/geoip $(1)/usr/share/tor/ endef $(eval $(call BuildPackage,tor-alpha)) +$(eval $(call BuildPackage,tor-alpha-fw-helper)) $(eval $(call BuildPackage,tor-alpha-geoip)) diff --git a/net/tor-alpha/files/tor.init b/net/tor-alpha/files/tor.init index 40d4ecf0a1..8d11089ec2 100644 --- a/net/tor-alpha/files/tor.init +++ b/net/tor-alpha/files/tor.init @@ -1,26 +1,30 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org + START=50 +STOP=50 -BIN=tor -DEFAULT=/etc/default/$BIN -LOG_D=/var/log/$BIN -LIB_D=/var/lib/$BIN -RUN_D=/var/run -PID_F=$RUN_D/$BIN.pid -RUN_USER=$BIN -RUN_GROUP=$BIN +SERVICE_USE_PID=1 start() { - [ -f $DEFAULT ] && . $DEFAULT - [ -d $LOG_D ] || ( mkdir -m 0755 -p $LOG_D && chown $RUN_USER:$RUN_GROUP $LOG_D ) - [ -d $LIB_D ] || ( mkdir -m 0700 -p $LIB_D && chown $RUN_USER:$RUN_GROUP $LIB_D ) - [ -d $RUN_D ] || mkdir -p $RUN_D - [ -f $PID_F ] || ( touch $PID_F && chown $RUN_USER:$RUN_GROUP $PID_F ) - $BIN $OPTIONS + user_exists tor 52 || user_add tor 52 52 /var/lib/tor + group_exists tor 52 || group_add tor 52 + [ -f /var/run/tor.pid ] || { + touch /var/run/tor.pid + chown tor:tor /var/run/tor.pid + } + [ -d /var/lib/tor ] || { + mkdir -m 0755 -p /var/lib/tor + chmod 0700 /var/lib/tor + chown tor:tor /var/lib/tor + } + [ -d /var/log/tor ] || { + mkdir -m 0755 -p /var/log/tor + chown tor:tor /var/log/tor + } + service_start /usr/sbin/tor --PidFile /var/run/tor.pid } stop() { - [ -f $PID_F ] && kill $(cat $PID_F) + service_stop /usr/sbin/tor } - diff --git a/net/tor-alpha/patches/001-torrc.patch b/net/tor-alpha/patches/001-torrc.patch index a390a6e2d8..c788dd0c70 100644 --- a/net/tor-alpha/patches/001-torrc.patch +++ b/net/tor-alpha/patches/001-torrc.patch @@ -14,9 +14,8 @@ ## The port on which Tor will listen for local connections from Tor ## controller applications, as documented in control-spec.txt. -@@ -168,3 +168,5 @@ SocksListenAddress 127.0.0.1 # accept co +@@ -168,3 +168,4 @@ SocksListenAddress 127.0.0.1 # accept co #BridgeRelay 1 #ExitPolicy reject *:* +User tor -+PidFile @LOCALSTATEDIR@/run/tor.pid -- 2.30.2