Merge branch 'next' into kernel-update

This commit is contained in:
Arne Fitzenreiter
2012-04-09 12:22:03 +02:00
17 changed files with 1598 additions and 362 deletions

View File

@@ -25,7 +25,7 @@
include Config
VER = 1.17
DATVER = 06122011
DATVER = 03032012
THISAPP = Geo-IP-PurePerl-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -43,7 +43,7 @@ $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
GeoIP.dat-$(DATVER).gz = $(DL_FROM)/GeoIP.dat-$(DATVER).gz
$(DL_FILE)_MD5 = 42a6b9d4dd2563a20c8998556216e1de
GeoIP.dat-$(DATVER).gz_MD5 = 78baa14e4e271f5fb9f75e5ff1169950
GeoIP.dat-$(DATVER).gz_MD5 = 98ba2a5c177cdfa8da6f9fab524e948d
install : $(TARGET)

View File

@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = pound
PAK_VER = 3
PAK_VER = 4
DEPS = ""
@@ -78,6 +78,7 @@ $(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