Changeset 30269


Ignore:
Timestamp:
2012-02-05T17:18:05+01:00 (6 years ago)
Author:
jow
Message:

[packages_10.03.2] tor: merge r28157, r28209, r28340, r28742, r28902, r29177, r29562

Location:
branches/packages_10.03.2/net/tor
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/packages_10.03.2/net/tor/Makefile

    r25819 r30269  
    99 
    1010PKG_NAME:=tor 
    11 PKG_VERSION:=0.2.1.30 
     11PKG_VERSION:=0.2.2.35 
    1212PKG_RELEASE:=1 
    1313 
     
    1515PKG_SOURCE_URL:=https://www.torproject.org/dist \ 
    1616        https://archive.torproject.org/tor-package-archive 
    17 PKG_MD5SUM:=6c6d61e053af5969a245d025c4cfce9d 
     17PKG_MD5SUM:=dcecf699c4b929319d5f1ce0358d4835 
    1818 
    1919PKG_INSTALL:=1 
     
    3838$(call Package/tor/Default) 
    3939  TITLE:=An anonymous Internet communication system 
    40   DEPENDS:=+libevent +libopenssl +libpthread +librt 
     40  DEPENDS:=+libevent2 +libopenssl +libpthread +librt 
    4141endef 
    4242 
     
    5151endef 
    5252 
    53 define Package/tor/postinst 
    54 #!/bin/sh 
    55  
    56 name=tor 
    57 id=52 
    58  
    59 # do not change below 
    60 # # check if we are on real system 
    61 if [ -z "$${IPKG_INSTROOT}" ]; then 
    62         # create copies of passwd and group, if we use squashfs 
    63         rootfs=`mount |awk '/root/ { print $$5 }'` 
    64         if [ "$$rootfs" = "squashfs" ]; then 
    65                 if [ -h /etc/group ]; then 
    66                         rm /etc/group 
    67                         cp /rom/etc/group /etc/group 
    68                 fi 
    69                 if [ -h /etc/passwd ]; then 
    70                         rm /etc/passwd 
    71                         cp /rom/etc/passwd /etc/passwd 
    72                 fi 
    73         fi 
    74 fi 
    75  
    76 echo "" 
    77 if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then 
    78         echo "adding group $$name to /etc/group" 
    79         echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group 
    80 fi 
    81  
    82 if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then 
    83         echo "adding user $$name to /etc/passwd" 
    84         echo "$${name}:x:$${id}:$${id}:$${name}:/tmp/.$${name}:/bin/false" >> $${IPKG_INSTROOT}/etc/passwd 
    85 fi 
    86 endef 
    87  
    8853CONFIGURE_ARGS += \ 
    8954        --with-libevent-dir="$(STAGING_DIR)/usr" \ 
    9055        --with-ssl-dir="$(STAGING_DIR)/usr" \ 
     56        --disable-asciidoc 
    9157 
    9258CONFIGURE_VARS += \ 
    93         CROSS_COMPILE="yes" \ 
     59        CROSS_COMPILE="yes" 
    9460 
    9561# pass CFLAGS again to override -O2 set by configure 
    9662MAKE_FLAGS += \ 
    97         CFLAGS="$(TARGET_CFLAGS)" \ 
     63        CFLAGS="$(TARGET_CFLAGS)" 
    9864 
    9965define Package/tor/install 
  • branches/packages_10.03.2/net/tor/files/tor.init

    r21451 r30269  
    11#!/bin/sh /etc/rc.common 
    2 # Copyright (C) 2006 OpenWrt.org 
     2# Copyright (C) 2006-2011 OpenWrt.org 
     3 
    34START=50 
     5STOP=50 
    46 
    5 BIN=tor 
    6 DEFAULT=/etc/default/$BIN 
    7 LOG_D=/var/log/$BIN 
    8 LIB_D=/var/lib/$BIN 
    9 RUN_D=/var/run 
    10 PID_F=$RUN_D/$BIN.pid 
    11 RUN_USER=$BIN 
    12 RUN_GROUP=$BIN 
     7SERVICE_USE_PID=1 
    138 
    149start() { 
    15         [ -f $DEFAULT ] && . $DEFAULT 
    16         [ -d $LOG_D ] || ( mkdir -m 0755 -p $LOG_D && chown $RUN_USER:$RUN_GROUP $LOG_D ) 
    17         [ -d $LIB_D ] || ( mkdir -m 0700 -p $LIB_D && chown $RUN_USER:$RUN_GROUP $LIB_D ) 
    18         [ -d $RUN_D ] || mkdir -p $RUN_D 
    19         [ -f $PID_F ] || ( touch $PID_F && chown $RUN_USER:$RUN_GROUP $PID_F ) 
    20         $BIN $OPTIONS 
     10        user_exists tor 52 || user_add tor 52 52 /var/lib/tor 
     11        group_exists tor 52 || group_add tor 52 
     12        [ -f /var/run/tor.pid ] || { 
     13                touch /var/run/tor.pid 
     14                chown tor:tor /var/run/tor.pid 
     15        } 
     16        [ -d /var/lib/tor ] || { 
     17                mkdir -m 0755 -p /var/lib/tor 
     18                chmod 0700 /var/lib/tor 
     19                chown tor:tor /var/lib/tor 
     20        } 
     21        [ -d /var/log/tor ] || { 
     22                mkdir -m 0755 -p /var/log/tor 
     23                chown tor:tor /var/log/tor 
     24        } 
     25        service_start /usr/sbin/tor --PidFile /var/run/tor.pid 
    2126} 
    2227 
    2328stop() { 
    24         [ -f $PID_F ] && kill $(cat $PID_F) 
     29        service_stop /usr/sbin/tor 
    2530} 
    26  
  • branches/packages_10.03.2/net/tor/patches/001-torrc.patch

    r18652 r30269  
    1515 ## The port on which Tor will listen for local connections from Tor 
    1616 ## controller applications, as documented in control-spec.txt. 
    17 @@ -154,3 +154,5 @@ SocksListenAddress 127.0.0.1 # accept co 
     17@@ -168,3 +168,4 @@ SocksListenAddress 127.0.0.1 # accept co 
    1818 #BridgeRelay 1 
    1919 #ExitPolicy reject *:* 
    2020  
    2121+User tor 
    22 +PidFile @LOCALSTATEDIR@/run/tor.pid 
Note: See TracChangeset for help on using the changeset viewer.