X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Ftor;h=eb188373d80bd6b03cf34203049f3be4420a91b1;hp=559ca5b027a8469b952bec2fe26d1b68fa0e45ad;hb=57a3100d2dc91fd7dea7204e3c77d17d723d66d1;hpb=b312967ce3f9d66dbc6b8521d70725eafd1b68e3

diff --git a/lfs/tor b/lfs/tor
index 559ca5b027..eb188373d8 100644
--- 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)
 
@@ -88,11 +88,14 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 
-	# Install configuration file.
-	mv /etc/tor/torrc{.sample,}
+	# Install configuration files.
+	mkdir -pv /var/ipfire/tor /var/lib/tor /var/log/tor
+	touch /var/ipfire/tor/settings
+	mv /etc/tor/torrc.sample /var/ipfire/tor/torrc
+	ln -svf /var/ipfire/tor/torrc /etc/tor/torrc
 
-	mkdir -pv /var/lib/tor /var/log/tor
-	chown nobody:nobody /var/lib/tor
+	# Adjust ownerships.
+	chown -R nobody:nobody /var/lib/tor /var/ipfire/tor
 
 	# Logrotate
 	mkdir -pv /etc/logrotate.d
@@ -104,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)