Merge remote-tracking branch 'earl/tor' into next

This commit is contained in:
Michael Tremer
2013-08-19 13:19:13 +02:00
5 changed files with 93 additions and 23 deletions

View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = tor
PAK_VER = 1
PAK_VER = 2
DEPS = "libevent2"
@@ -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)