tor: update to 0.2.6.9

[ipfire-2.x.git] / lfs / tor

diff --git a/lfs/tor b/lfs/tor
index a61ac400f1ee53c573ff7533100eadc757bc4597..eb188373d80bd6b03cf34203049f3be4420a91b1 100644 (file)
--- a/lfs/tor
+++ b/lfs/tor
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2013   IPFire Team   <info@ipfire.org>                   #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 0.2.3.25
+VER        = 0.2.6.9
 
 THISAPP    = tor-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = tor
-PAK_VER    = 1
+PAK_VER    = 12
 
 DEPS       = "libevent2"
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = a1c364189a9a66ed9daa8e6436489daf
+$(DL_FILE)_MD5 = 4a1b334c30d7b37ea72fa33425220d5d
 
 install : $(TARGET)
 
@@ -95,7 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        ln -svf /var/ipfire/tor/torrc /etc/tor/torrc
 
        # Adjust ownerships.
-       chown nobody:nobody /var/lib/tor /var/ipfire/tor
+       chown -R nobody:nobody /var/lib/tor /var/ipfire/tor
 
        # Logrotate
        mkdir -pv /etc/logrotate.d
@@ -107,6 +107,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        install -v -m 644 $(DIR_SRC)/config/tor/defaults-torrc \
                /usr/share/tor/defaults-torrc
 
+       # Install start links and backup include file.
+       ln -sf ../init.d/tor /etc/rc.d/rc3.d/S60tor
+       ln -sf ../init.d/tor /etc/rc.d/rc0.d/K40tor
+       ln -sf ../init.d/tor /etc/rc.d/rc6.d/K40tor
        install -v -m 644 $(DIR_SRC)/config/backup/includes/tor \
                         /var/ipfire/backup/addons/includes/tor
        @rm -rf $(DIR_APP)