mirror of
https://github.com/void-linux/void-packages.git
synced 2025-07-27 07:52:55 +02:00
squid: update to 5.7
* --sbindir is already defined in common/environment/configure/gnu-configure-args.sh * --enable-useragent-log and --enable-referer-log are obsolete since version 3.2.0.4. * --enable-arp-acl is gone (squid-cache/squid@41b9172011). * --enable-carp is gone, CARP is compiled in (squid-cache/squid@b2ea838f69). * --enable-truncate was removed upstream (squid-cache/squid@b3fb907032). * squid_cv_gnu_atomics is replaced with c++11 std::atomic (squid-cache/squid@ddd4edb743). * squid_opt_enable_large_files is the duplicate of --with-large-files. Apparently Juan RP (aka xtraeme) used this option back in 2016 to fix cross build for arm* and glibc. Now that squid builds completely fine without it, it is safe to assume this option is not needed anymore. * define BUILDCXX properly (CXX_host cannot be set outside of functions). * CVE-2018-1000027 was fixed since version 4.0.23.
This commit is contained in:
parent
514b5235f3
commit
b623e0ad4b
1 changed files with 8 additions and 17 deletions
|
@ -1,10 +1,9 @@
|
||||||
# Template file for 'squid'
|
# Template file for 'squid'
|
||||||
pkgname=squid
|
pkgname=squid
|
||||||
version=5.3
|
version=5.7
|
||||||
revision=1
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="
|
configure_args="
|
||||||
--sbindir=/usr/bin
|
|
||||||
--sysconfdir=/etc/squid
|
--sysconfdir=/etc/squid
|
||||||
--libexecdir=/usr/libexec/squid
|
--libexecdir=/usr/libexec/squid
|
||||||
--datadir=/usr/share/squid
|
--datadir=/usr/share/squid
|
||||||
|
@ -26,28 +25,18 @@ configure_args="
|
||||||
--enable-icmp
|
--enable-icmp
|
||||||
--enable-linux-netfilter
|
--enable-linux-netfilter
|
||||||
--enable-ident-lookups
|
--enable-ident-lookups
|
||||||
--enable-useragent-log
|
|
||||||
--enable-cache-digests
|
--enable-cache-digests
|
||||||
--enable-referer-log
|
|
||||||
--enable-arp-acl
|
|
||||||
--enable-htcp
|
--enable-htcp
|
||||||
--enable-carp
|
|
||||||
--enable-epoll
|
--enable-epoll
|
||||||
--with-large-files
|
--with-large-files
|
||||||
--enable-arp-acl
|
|
||||||
--with-default-user=squid
|
--with-default-user=squid
|
||||||
--enable-async-io
|
--enable-async-io
|
||||||
--enable-truncate
|
|
||||||
--enable-icap-client
|
--enable-icap-client
|
||||||
--enable-ssl-crtd
|
--enable-ssl-crtd
|
||||||
--disable-arch-native
|
--disable-arch-native
|
||||||
--disable-strict-error-checking
|
--disable-strict-error-checking
|
||||||
--enable-wccpv2
|
--enable-wccpv2
|
||||||
--with-build-environment=default
|
--with-build-environment=default"
|
||||||
squid_cv_gnu_atomics=yes
|
|
||||||
squid_opt_enable_large_files=yes
|
|
||||||
BUILDCXX=${CXX_host}
|
|
||||||
BUILDCXXFLAGS=-O2"
|
|
||||||
conf_files="/etc/squid/squid.conf
|
conf_files="/etc/squid/squid.conf
|
||||||
/etc/squid/errorpage.css
|
/etc/squid/errorpage.css
|
||||||
/etc/squid/cachemgr.conf
|
/etc/squid/cachemgr.conf
|
||||||
|
@ -65,7 +54,7 @@ license="GPL-2.0-or-later"
|
||||||
homepage="http://www.squid-cache.org/"
|
homepage="http://www.squid-cache.org/"
|
||||||
changelog="http://www.squid-cache.org/Versions/v5/changesets/"
|
changelog="http://www.squid-cache.org/Versions/v5/changesets/"
|
||||||
distfiles="http://www.squid-cache.org/Versions/v5/squid-${version}.tar.xz"
|
distfiles="http://www.squid-cache.org/Versions/v5/squid-${version}.tar.xz"
|
||||||
checksum=45178588df1311ded41ebadd632840c4d93a8d7f5f60e38e74acf2f1ae2f1715
|
checksum=6b0753aaba4c9c4efd333e67124caecf7ad6cc2d38581f19d2f0321f5b7ecd81
|
||||||
system_accounts="squid"
|
system_accounts="squid"
|
||||||
# squid-conf-tests requires a squid user in the system
|
# squid-conf-tests requires a squid user in the system
|
||||||
make_check=no
|
make_check=no
|
||||||
|
@ -75,6 +64,11 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
|
||||||
LDFLAGS+=" -latomic"
|
LDFLAGS+=" -latomic"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
pre_configure() {
|
||||||
|
export BUILDCXX="${CXX_host}"
|
||||||
|
export BUILDCXXFLAGS="-O2"
|
||||||
|
}
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
chmod u+s \
|
chmod u+s \
|
||||||
${DESTDIR}/usr/libexec/squid/basic_ncsa_auth \
|
${DESTDIR}/usr/libexec/squid/basic_ncsa_auth \
|
||||||
|
@ -82,7 +76,4 @@ post_install() {
|
||||||
${DESTDIR}/usr/libexec/squid/pinger
|
${DESTDIR}/usr/libexec/squid/pinger
|
||||||
vsv squid
|
vsv squid
|
||||||
vinstall ${FILESDIR}/cron.daily 0744 etc/cron.daily squid
|
vinstall ${FILESDIR}/cron.daily 0744 etc/cron.daily squid
|
||||||
|
|
||||||
# CVE-2018-1000027
|
|
||||||
echo 'log_uses_indirect_client off' >> ${DESTDIR}/etc/squid/squid.conf
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue