aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-05-23 07:44:55 +0000
committerBartłomiej Piotrowski <bpiotrowski@alpinelinux.org>2013-07-05 18:52:44 +0200
commitd50240d6165b4c4253a017780041ead810cfc395 (patch)
treeaf644c687660b38a6cbce56cc6b4dfd3a8238e11
parent258186698a46116ef12b0c119a0466b5c3859ce1 (diff)
downloadaports-d50240d6165b4c4253a017780041ead810cfc395.tar.bz2
aports-d50240d6165b4c4253a017780041ead810cfc395.tar.xz
main/squid: upgrade to 3.3.5
-rw-r--r--main/squid/APKBUILD14
-rw-r--r--main/squid/cf_gen-pthread.patch10
2 files changed, 12 insertions, 12 deletions
diff --git a/main/squid/APKBUILD b/main/squid/APKBUILD
index 502a0a4b89..0db5d96a60 100644
--- a/main/squid/APKBUILD
+++ b/main/squid/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=squid
-pkgver=3.3.4
+pkgver=3.3.5
pkgrel=0
pkgdesc="A full-featured Web proxy cache server."
url="http://www.squid-cache.org"
@@ -105,23 +105,23 @@ squid_kerb_auth() {
mv "$pkgdir"/usr/lib/squid/squid_kerb_auth "$subpkgdir"/usr/lib/squid/
}
-md5sums="0ef8e63a980389c62130fa639079fb54 squid-3.3.4.tar.bz2
+md5sums="c7991aa8528034af0e21a69edf26e41b squid-3.3.5.tar.bz2
16e3b38996d4c5858e1478f8eb650876 squid-3.2.0.16-loggable-urlgroup.patch
-c60237de253c02937f272d3b189d7679 cf_gen-pthread.patch
+473f8f6dabaec2bd73134d8288deea3d cf_gen-pthread.patch
9e71076799d334faba6f4954594e7b4a bug-3679.patch
905e57c6d41414f54a75a5c0f9f7fac7 squid.initd
2897c725c201be53d3c9a7db0101bdf0 squid.confd
58823e0b86bc2dc71d270208b7b284b4 squid.logrotate"
-sha256sums="e962c27a294f6dd57a32fdc493e32c16d24687035f03f1140c491fb8c12ce170 squid-3.3.4.tar.bz2
+sha256sums="eb60d37721ac8180269bc3d8b27c0c688ed7fef0412b35cc51875d085e821355 squid-3.3.5.tar.bz2
9963c0f0ef96522d8cbb3379f119635d2b4df0796589211d91f6705935a835d5 squid-3.2.0.16-loggable-urlgroup.patch
-0dce1d6216918856a11de7f37adc39e9b3f645c03c6350f0a5b6dc8f3aef38b9 cf_gen-pthread.patch
+3b05ebd2d4baeb0e01437de768c8fbe76ff446f126d107b73fad6bd0d1968f0c cf_gen-pthread.patch
6b08cd129ea5fef019c78f1818c628e1070fe767e362da14844396b671f5a18d bug-3679.patch
3e5786304f218aecd5c01fa4b81aa05092ee3c7652d914b01112222fb5b2796e squid.initd
ec2a9f3308129354783c5088fb37148eda102fe9397fb7bbe90243d9223ee2e1 squid.confd
b6efdb3261c2e4b5074ef49160af8b96e65f934c7fd64b8954df48aa41cd9b67 squid.logrotate"
-sha512sums="364a4255e69bc7513d24100a2e62ef36ce4e0b09f98c50108771c092c5cf91505ead32d550a5bb4f9f69f1cbd04c4a0e9108c2270c39b0c054187cc4982e0f97 squid-3.3.4.tar.bz2
+sha512sums="dee23757ada983e77bb7e70e9121b567f1253303930bb9ead89b378a79e588f4c84081418134abfac3b26f639f30b7cf82629c32846e0d8729148748007dc962 squid-3.3.5.tar.bz2
1ab18ed43225fcca95f6c2e1554524bfee805f4894d5342acbdcd9faa6dcad5f310ed4ea01c9131f9729197e27399649b62a95666cb4564e30d8b0904f0f1b75 squid-3.2.0.16-loggable-urlgroup.patch
-b148364e21293f7723ad5d7ccc2989d34ca6fb778d6383c45ae6b64450aa8495fdbe70f265f01be270511a042c230de95d26c9425f37d941083e44cc6e6e1603 cf_gen-pthread.patch
+c5a230fe1f4dda8a3ab064f07c2b93a6f6e3ebdf290cb45da262300d06ac28aa4470a80c8f14db5c9ff4dcc478933d9882bef638a566fe8ad66aec1f96f80be3 cf_gen-pthread.patch
b477397f205ba207502a42aae674c85cad85eec831158ea0834361d98ef09a0f103d7a847e101bdd0ece73bbdda9b545960edd5385042bd593733810977e292a bug-3679.patch
d16178aef007bafa976b89def4371fdd05f26c5ab558f6619bf6f6ca915fc783d2314d7d8e96032abfaf7b3f8c8b746031f78a6be1f66245d9303ff3a9feb605 squid.initd
f13b3ab159fdc7cdcccfe10e494a84fa2d67c999820e166a8ad67523094088c147d3712b00e9cfd0d6b7e3c0cc9a4ad3ee7d7f7d42e11f5b5c4b5e4bf5016b31 squid.confd
diff --git a/main/squid/cf_gen-pthread.patch b/main/squid/cf_gen-pthread.patch
index 67387a1a91..6daaceb253 100644
--- a/main/squid/cf_gen-pthread.patch
+++ b/main/squid/cf_gen-pthread.patch
@@ -1,6 +1,6 @@
---- ./src/Makefile.in.orig
-+++ ./src/Makefile.in
-@@ -1963,7 +1963,7 @@
+--- ./src/Makefile.in.orig 2013-05-20 11:50:04.000000000 +0000
++++ ./src/Makefile.in 2013-05-23 07:37:34.364978371 +0000
+@@ -2362,7 +2362,7 @@
noinst_LTLIBRARIES = libsquid.la
cf_gen_SOURCES = cf_gen.cc
nodist_cf_gen_HEADER = cf_gen_defines.cci
@@ -9,10 +9,10 @@
ACL_REGISTRATION_SOURCES = AclRegs.cc AuthReg.cc
DISKIO_SOURCE = \
DiskIO/DiskIOModule.cc \
-@@ -5796,7 +5796,7 @@
+@@ -7295,7 +7295,7 @@
# cf_gen builds the configuration files.
- cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES)
+ cf_gen$(EXEEXT): $(cf_gen_SOURCES) $(cf_gen_DEPENDENCIES) cf_gen_defines.cci
- $(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