From f9538c35622400be91e31f9e245cac2cc994287f Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 29 Apr 2014 14:37:34 +0200 Subject: [PATCH] pound: Update to 2.7c. Also fix multiple initscript symlinks. --- config/rootfiles/packages/pound | 3 --- lfs/pound | 13 ++++--------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/config/rootfiles/packages/pound b/config/rootfiles/packages/pound index a935172a7..02f3d41b9 100644 --- a/config/rootfiles/packages/pound +++ b/config/rootfiles/packages/pound @@ -1,7 +1,4 @@ etc/rc.d/init.d/pound -etc/rc.d/rc0.d/K40pound -etc/rc.d/rc3.d/S60pound -etc/rc.d/rc6.d/K40pound #etc/pound.cfg usr/sbin/pound usr/sbin/poundctl diff --git a/lfs/pound b/lfs/pound index 9305f4595..20e807d18 100644 --- a/lfs/pound +++ b/lfs/pound @@ -24,7 +24,7 @@ include Config -VER = 2.6 +VER = 2.7c 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 = 5 +PAK_VER = 6 DEPS = "" @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 8c913b527332694943c4c67c8f152071 +$(DL_FILE)_MD5 = 56dace6b79c6be1d25b31355269c380a install : $(TARGET) @@ -77,16 +77,11 @@ $(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) && ./configure --prefix=/usr --sysconfdir=/etc 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 -- 2.39.2