include $(TOPDIR)/rules.mk
PKG_NAME:=tor
-PKG_VERSION:=0.2.1.30
+PKG_VERSION:=0.2.2.35
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.torproject.org/dist \
https://archive.torproject.org/tor-package-archive
-PKG_MD5SUM:=6c6d61e053af5969a245d025c4cfce9d
+PKG_MD5SUM:=dcecf699c4b929319d5f1ce0358d4835
PKG_INSTALL:=1
define Package/tor
$(call Package/tor/Default)
TITLE:=An anonymous Internet communication system
- DEPENDS:=+libevent +libopenssl +libpthread +librt
+ DEPENDS:=+libevent2 +libopenssl +libpthread +librt
endef
define Package/tor-geoip
/etc/tor/torrc
endef
-define Package/tor/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" \
+ --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/install
$(INSTALL_DIR) $(1)/usr/sbin
#!/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
}
-
## The port on which Tor will listen for local connections from Tor
## controller applications, as documented in control-spec.txt.
-@@ -154,3 +154,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