Date: Monday, January 19, 2015 @ 11:47:09 Author: spupykin Revision: 126211
upgpkg: squid 3.5.1-1 upd Modified: squid/trunk/PKGBUILD Deleted: squid/trunk/squid-r13407.patch --------------------+ PKGBUILD | 10 ++++---- squid-r13407.patch | 57 --------------------------------------------------- 2 files changed, 5 insertions(+), 62 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-01-19 10:20:18 UTC (rev 126210) +++ PKGBUILD 2015-01-19 10:47:09 UTC (rev 126211) @@ -5,7 +5,7 @@ # Contributor: Kevin Piche <[email protected]> pkgname=squid -pkgver=3.4.11 +pkgver=3.5.1 pkgrel=1 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686') @@ -12,6 +12,7 @@ url='http://www.squid-cache.org' depends=('openssl' 'pam' 'perl' 'libltdl' 'libcap' 'nettle') makedepends=('libcap' 'krb5') +optdepends=('gnutls: for squidclient') license=('GPL') options=('emptydirs') backup=('etc/squid/squid.conf' @@ -20,7 +21,7 @@ 'etc/squid/cachemgr.conf' 'etc/squid/msntauth.conf') install=$pkgname.install -source=("http://www.squid-cache.org/Versions/v3/3.4/$pkgname-$pkgver.tar.bz2"; +source=("http://www.squid-cache.org/Versions/v3/3.5/$pkgname-$pkgver.tar.bz2"; 'squid.pam' 'squid.service' 'squid.tmpfiles' @@ -27,7 +28,7 @@ 'squid.sysusers' 'squid-rotate.service' 'squid-rotate.timer') -md5sums=('9b2c457c889b026ffcada0cfe03c19ae' +md5sums=('3c4d77ae25c7dee1f5ec597a069e0a53' '270977cdd9b47ef44c0c427ab9034777' 'ceeb57c69ebb165676219222f109a24e' 'd243da117c1aee03c0cc6052f023a380' @@ -37,7 +38,6 @@ prepare() { cd "$srcdir/$pkgname-$pkgver" -# patch -p0 <$srcdir/squid-r13407.patch } build() { @@ -61,7 +61,7 @@ --enable-storeio="aufs,ufs,diskd" \ --enable-delay-pools \ --enable-arp-acl \ - --enable-ssl \ + --with-openssl=/usr \ --enable-snmp \ --enable-linux-netfilter \ --enable-ident-lookups \ Deleted: squid-r13407.patch =================================================================== --- squid-r13407.patch 2015-01-19 10:20:18 UTC (rev 126210) +++ squid-r13407.patch 2015-01-19 10:47:09 UTC (rev 126211) @@ -1,57 +0,0 @@ -@@ -, +, @@ - author: Alex Rousskov <[email protected]> - Avoid on-exit crashes when adaptation is enabled. - - After trunk r13269 (Vector refactor) destroyed vector objects still have - positive item counts. This exposes use-after-delete bugs. In this particular - case, global adaptation rule/group/service arrays are destructed by global - destruction sequence first and then again by Adaptation::*::TheConfig objects - destructors. - - This change avoiding static destruction order dependencies by storing those - global adaptation arrays on heap. ---- src/adaptation/AccessRule.cc 2014-06-03 07:05:07 +0000 -+++ src/adaptation/AccessRule.cc 2014-06-29 15:22:19 +0000 -@@ -51,10 +51,10 @@ Adaptation::AccessRule::group() - - Adaptation::AccessRules & - Adaptation::AllRules() - { -- static AccessRules TheRules; -- return TheRules; -+ static AccessRules *TheRules = new AccessRules; -+ return *TheRules; - } - - // TODO: make AccessRules::find work - Adaptation::AccessRule * ---- src/adaptation/Service.cc 2012-08-28 13:00:30 +0000 -+++ src/adaptation/Service.cc 2014-06-29 15:22:19 +0000 -@@ -53,10 +53,10 @@ Adaptation::Service::wants(const Service - - Adaptation::Services & - Adaptation::AllServices() - { -- static Services TheServices; -- return TheServices; -+ static Services *TheServices = new Services; -+ return *TheServices; - } - - Adaptation::ServicePointer - Adaptation::FindService(const Service::Id& key) ---- src/adaptation/ServiceGroups.cc 2013-09-28 13:03:58 +0000 -+++ src/adaptation/ServiceGroups.cc 2014-06-29 15:22:19 +0000 -@@ -314,10 +314,10 @@ Adaptation::ServicePlan::print(std::ostr - - Adaptation::Groups & - Adaptation::AllGroups() - { -- static Groups TheGroups; -- return TheGroups; -+ static Groups *TheGroups = new Groups; -+ return *TheGroups; - } - - Adaptation::ServiceGroupPointer - Adaptation::FindGroup(const ServiceGroup::Id &id)
