X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fpound;h=9305f4595239d7c4fc5ea8121f38d3535517e7c9;hp=39ef2cd5e60b3a6ac96dfa48aac1e6ddd388ece3;hb=a7cd6a4a1113f358fe1e496b164e77bae797429e;hpb=e843e8adf08b8d11cae9f9b40346d1680c01c180

diff --git a/lfs/pound b/lfs/pound
index 39ef2cd5e..9305f4595 100644
--- a/lfs/pound
+++ b/lfs/pound
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 2.5
+VER        = 2.6
 
 THISAPP    = Pound-$(VER)
 DL_FILE    = $(THISAPP).tgz
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = pound
-PAK_VER    = 2
+PAK_VER    = 5
 
 DEPS       = ""
 
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 8a39f5902094619afcda7d12d9d8342c
+$(DL_FILE)_MD5 = 8c913b527332694943c4c67c8f152071
 
 install : $(TARGET)
 
@@ -77,10 +77,19 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && patch -p4 < $(DIR_SRC)/src/patches/pound-2.6.patch
+	cd $(DIR_APP) && patch -p1 < $(DIR_SRC)/src/patches/Pound-2.6-reneg-ciphers-altnames-nosslv2.patch
 	cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/etc --enable-cert1l
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
 	install -v -m 644 $(DIR_SRC)/config/backup/includes/pound \
 			 /var/ipfire/backup/addons/includes/pound
+	ln -sf ../init.d/pound /etc/rc.d/rc3.d/S60pound
+	ln -sf ../init.d/pound /etc/rc.d/rc0.d/K40pound
+	ln -sf ../init.d/pound /etc/rc.d/rc6.d/K40pound
+
+	# Remove temporary file.
+	rm -vf /root/.rnd
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)