###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2012 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
include Config
-VER = 3.4.13
+VER = 4.6
THISAPP = squid-$(VER)
DL_FILE = $(THISAPP).tar.xz
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
+CXXFLAGS+= -Wno-error=format-truncation
+
+ifeq "$(BUILD_ARCH)" "armv5tel"
+ LDFLAGS += -latomic
+endif
+
###############################################################################
# Top-level Rules
###############################################################################
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = a5f6c978b2d7a99b161c8275e1acb470
+$(DL_FILE)_MD5 = e25e7cc37754ad14d8aa368c0c210e54
install : $(TARGET)
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xaf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure \
+ cd $(DIR_APP) && patch -Np0 -i $(DIR_SRC)/src/patches/squid/squid-4.6-fix-max-file-descriptors.patch
+
+ cd $(DIR_APP) && autoreconf -vfi
+ cd $(DIR_APP)/libltdl && autoreconf -vfi
+
+ cd $(DIR_APP) && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+ LDFLAGS="$(LDFLAGS)" ./configure \
--prefix=/usr \
--sysconfdir=/etc/squid \
--datadir=/usr/lib/squid \
--mandir=/usr/share/man \
--libexecdir=/usr/lib/squid \
--localstatedir=/var \
- --disable-ipv6 \
--disable-ssl \
- --enable-poll \
--disable-icmp \
--disable-wccp \
+ --disable-wccpv2 \
+ --disable-kqueue \
+ --disable-esi \
+ --disable-arch-native \
+ --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 \
--enable-url-rewrite-helpers \
--enable-build-info \
--enable-eui \
- --with-pthreads \
- --with-dl \
- --with-filedescriptors=$$(( 16384 * 64 )) \
- --with-large-files \
- --with-aio \
- --enable-async-io=8 \
+ --enable-async-io=16 \
--enable-unlinkd \
--enable-internal-dns \
--enable-epoll \
- --disable-kqueue \
--enable-select \
--enable-cache-digests \
--enable-forw-via-db \
--enable-htcp \
- --enable-linux-netfilter \
--enable-kill-parent-hack \
- --disable-wccpv2 \
--enable-icap-client \
- --disable-esi \
--enable-zph-qos \
- --disable-arch-native
+ --with-dl \
+ --with-filedescriptors=$$(( 16384 * 64 )) \
+ --with-large-files \
+ --without-gnutls \
+ --without-netfilter-conntrack
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
cp -f $(DIR_SRC)/config/updxlrator/lscache /var/ipfire/updatexlrator/bin/lscache
cp -f $(DIR_SRC)/config/updxlrator/checkdeaddl /var/ipfire/updatexlrator/bin/checkdeaddl
- cp -f $(DIR_SRC)/config/updxlrator/updxlrator-lib.pl /var/ipfire/updatexlrator//updxlrator-lib.pl
+ cp -f $(DIR_SRC)/config/updxlrator/updxlrator-lib.pl /var/ipfire/updatexlrator/updxlrator-lib.pl
chmod 755 /usr/sbin/updxlrator /var/ipfire/updatexlrator/bin/checkup \
/var/ipfire/updatexlrator/bin/download \