aboutsummaryrefslogtreecommitdiffstats
path: root/main/squid
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2011-11-30 14:48:28 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-11-30 15:14:54 +0000
commit379338be8b4cd31b24080f7f01ae14fe124a84ae (patch)
tree831fe74b71c787a8717661f3d01d569dab06c51a /main/squid
parent059188a6daf943d41e8813c3d710e23a2d87a78d (diff)
downloadaports-379338be8b4cd31b24080f7f01ae14fe124a84ae.tar.bz2
aports-379338be8b4cd31b24080f7f01ae14fe124a84ae.tar.xz
main/squid: fix logdir and default user
ref #843
Diffstat (limited to 'main/squid')
-rw-r--r--main/squid/APKBUILD6
-rw-r--r--main/squid/cf_gen-pthread.patch20
2 files changed, 25 insertions, 1 deletions
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index fa72022b90..56d6a33787 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=squid
pkgver=3.2.0.12
-pkgrel=2
+pkgrel=3
pkgdesc="A full-featured Web proxy cache server."
url="http://www.squid-cache.org"
install="squid.pre-install squid.pre-upgrade squid.post-install"
@@ -20,6 +20,7 @@ langdir="/usr/share/squid/errors"
source="http://www.squid-cache.org/Versions/v3/3.2/squid-$pkgver.tar.bz2
squid-3.2.0.12-loggable-urlgroup.patch
+ cf_gen-pthread.patch
squid.initd
squid.confd
$pkgname.logrotate
@@ -47,6 +48,7 @@ build() {
--sysconfdir=/etc/squid \
--libexecdir=/usr/lib/squid \
--localstatedir=/var \
+ --with-logdir=/var/log/squid \
--disable-strict-error-checking \
--enable-removal-policies="lru,heap" \
--enable-digest-auth-helpers="password" \
@@ -73,6 +75,7 @@ build() {
--enable-poll --with-maxfd=4096 \
--enable-follow-x-forwarded-for \
--with-large-files \
+ --with-default-user=squid \
|| return 1
make || return 1
@@ -102,6 +105,7 @@ squid_kerb_auth() {
md5sums="f11b71b7c58a2a20e87707d4ba441743 squid-3.2.0.12.tar.bz2
084f7b1af1ac0cb8fea35c7a0905a80e squid-3.2.0.12-loggable-urlgroup.patch
+c60237de253c02937f272d3b189d7679 cf_gen-pthread.patch
db05ed77b174271f26c41e7493a0d104 squid.initd
2897c725c201be53d3c9a7db0101bdf0 squid.confd
58823e0b86bc2dc71d270208b7b284b4 squid.logrotate"
diff --git a/main/squid/cf_gen-pthread.patch b/main/squid/cf_gen-pthread.patch
new file mode 100644
index 0000000000..67387a1a91
--- /dev/null
+++ b/main/squid/cf_gen-pthread.patch
@@ -0,0 +1,20 @@
+--- ./src/Makefile.in.orig
++++ ./src/Makefile.in
+@@ -1963,7 +1963,7 @@
+ noinst_LTLIBRARIES = libsquid.la
+ cf_gen_SOURCES = cf_gen.cc
+ nodist_cf_gen_HEADER = cf_gen_defines.cci
+-cf_gen_LDADD =
++cf_gen_LDADD = -lpthread
+ ACL_REGISTRATION_SOURCES = AclRegs.cc AuthReg.cc
+ DISKIO_SOURCE = \
+ DiskIO/DiskIOModule.cc \
+@@ -5796,7 +5796,7 @@
+
+ # cf_gen builds the configuration files.
+ cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
+- $(HOSTCXX) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
++ $(HOSTCXX) $(cf_gen_LDADD) -o $@ $(srcdir)/cf_gen.cc -I$(srcdir) -I$(top_builddir)/include/ -I$(top_builddir)/src
+
+ # squid.conf.default is built by cf_gen when making cf_parser.cci
+ squid.conf.default squid.conf.documented: cf_parser.cci