Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

This commit is contained in:
Arne Fitzenreiter
2016-05-11 20:59:15 +02:00
6 changed files with 13 additions and 424 deletions

View File

@@ -24,7 +24,7 @@
include Config
VER = 3.5.17
VER = 3.5.19
THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 2dc73cc01e77b1bd16d9070780ae79b1
$(DL_FILE)_MD5 = a1d990284c429a63ee85d80ee5b3b8b9
install : $(TARGET)
@@ -89,13 +89,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--disable-kqueue \
--disable-esi \
--disable-arch-native \
--disable-ipv6 \
--enable-ipv6 \
--enable-poll \
--enable-ident-lookups \
--enable-storeio="aufs,diskd,ufs" \
--enable-storeio=aufs,diskd,ufs \
--enable-underscores \
--enable-http-violations \
--enable-removal-policies="heap,lru" \
--enable-removal-policies=heap,lru \
--enable-delay-pools \
--enable-linux-netfilter \
--enable-snmp \
@@ -119,11 +119,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
--enable-kill-parent-hack \
--enable-icap-client \
--enable-zph-qos \
--with-pthreads \
--with-dl \
--with-filedescriptors=$$(( 16384 * 64 )) \
--with-large-files \
--with-aio
--with-large-files
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install

View File

@@ -24,7 +24,7 @@
include Config
VER = 0.2.6.9
VER = 0.2.7.6
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 = 15
PAK_VER = 16
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 4a1b334c30d7b37ea72fa33425220d5d
$(DL_FILE)_MD5 = cc19107b57136a68e8c563bf2d35b072
install : $(TARGET)