Date: Wednesday, January 14, 2015 @ 12:21:29
Author: spupykin
Revision: 125907
archrelease: copy trunk to community-x86_64, community-i686
Added:
squid/repos/community-i686/PKGBUILD
(from rev 125906, squid/trunk/PKGBUILD)
squid/repos/community-i686/squid-r13407.patch
(from rev 125906, squid/trunk/squid-r13407.patch)
squid/repos/community-i686/squid-rotate.service
(from rev 125906, squid/trunk/squid-rotate.service)
squid/repos/community-i686/squid-rotate.timer
(from rev 125906, squid/trunk/squid-rotate.timer)
squid/repos/community-i686/squid.install
(from rev 125906, squid/trunk/squid.install)
squid/repos/community-i686/squid.pam
(from rev 125906, squid/trunk/squid.pam)
squid/repos/community-i686/squid.service
(from rev 125906, squid/trunk/squid.service)
squid/repos/community-i686/squid.sysusers
(from rev 125906, squid/trunk/squid.sysusers)
squid/repos/community-i686/squid.tmpfiles
(from rev 125906, squid/trunk/squid.tmpfiles)
squid/repos/community-x86_64/PKGBUILD
(from rev 125906, squid/trunk/PKGBUILD)
squid/repos/community-x86_64/squid-r13407.patch
(from rev 125906, squid/trunk/squid-r13407.patch)
squid/repos/community-x86_64/squid-rotate.service
(from rev 125906, squid/trunk/squid-rotate.service)
squid/repos/community-x86_64/squid-rotate.timer
(from rev 125906, squid/trunk/squid-rotate.timer)
squid/repos/community-x86_64/squid.install
(from rev 125906, squid/trunk/squid.install)
squid/repos/community-x86_64/squid.pam
(from rev 125906, squid/trunk/squid.pam)
squid/repos/community-x86_64/squid.service
(from rev 125906, squid/trunk/squid.service)
squid/repos/community-x86_64/squid.sysusers
(from rev 125906, squid/trunk/squid.sysusers)
squid/repos/community-x86_64/squid.tmpfiles
(from rev 125906, squid/trunk/squid.tmpfiles)
Deleted:
squid/repos/community-i686/PKGBUILD
squid/repos/community-i686/squid-r13407.patch
squid/repos/community-i686/squid-rotate.service
squid/repos/community-i686/squid-rotate.timer
squid/repos/community-i686/squid.install
squid/repos/community-i686/squid.pam
squid/repos/community-i686/squid.service
squid/repos/community-i686/squid.sysusers
squid/repos/community-i686/squid.tmpfiles
squid/repos/community-x86_64/PKGBUILD
squid/repos/community-x86_64/squid-r13407.patch
squid/repos/community-x86_64/squid-rotate.service
squid/repos/community-x86_64/squid-rotate.timer
squid/repos/community-x86_64/squid.install
squid/repos/community-x86_64/squid.pam
squid/repos/community-x86_64/squid.service
squid/repos/community-x86_64/squid.sysusers
squid/repos/community-x86_64/squid.tmpfiles
---------------------------------------+
/PKGBUILD | 212 ++++++++++++++++++++++++++++++++
/squid-r13407.patch | 114 +++++++++++++++++
/squid-rotate.service | 18 ++
/squid-rotate.timer | 14 ++
/squid.install | 18 ++
/squid.pam | 8 +
/squid.service | 26 +++
/squid.sysusers | 2
/squid.tmpfiles | 2
community-i686/PKGBUILD | 108 ----------------
community-i686/squid-r13407.patch | 57 --------
community-i686/squid-rotate.service | 9 -
community-i686/squid-rotate.timer | 7 -
community-i686/squid.install | 9 -
community-i686/squid.pam | 4
community-i686/squid.service | 13 -
community-i686/squid.sysusers | 1
community-i686/squid.tmpfiles | 1
community-x86_64/PKGBUILD | 108 ----------------
community-x86_64/squid-r13407.patch | 57 --------
community-x86_64/squid-rotate.service | 9 -
community-x86_64/squid-rotate.timer | 7 -
community-x86_64/squid.install | 9 -
community-x86_64/squid.pam | 4
community-x86_64/squid.service | 13 -
community-x86_64/squid.sysusers | 1
community-x86_64/squid.tmpfiles | 1
27 files changed, 414 insertions(+), 418 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-01-14 11:20:56 UTC (rev 125906)
+++ community-i686/PKGBUILD 2015-01-14 11:21:29 UTC (rev 125907)
@@ -1,108 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: Mark Coolen <mark.coo...@gmail.com>
-# Contributor: Tom Newsom <jeeps...@gmx.co.uk>
-# Contributor: Kevin Piche <ke...@archlinux.org>
-
-pkgname=squid
-pkgver=3.4.10
-pkgrel=1
-pkgdesc='Full-featured Web proxy cache server'
-arch=('x86_64' 'i686')
-url='http://www.squid-cache.org'
-depends=('openssl' 'pam' 'perl' 'libltdl' 'libcap')
-makedepends=('libcap' 'krb5')
-license=('GPL')
-options=('emptydirs')
-backup=('etc/squid/squid.conf'
- 'etc/squid/mime.conf'
- 'etc/squid/errorpage.css'
- '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";
- 'squid.pam'
- 'squid.service'
- 'squid.tmpfiles'
- 'squid.sysusers'
- 'squid-rotate.service'
- 'squid-rotate.timer'
- 'squid-r13407.patch')
-md5sums=('326283b0c37e7dc9b2f90dc0ecd9a8a4'
- '270977cdd9b47ef44c0c427ab9034777'
- 'ceeb57c69ebb165676219222f109a24e'
- 'd243da117c1aee03c0cc6052f023a380'
- '4abff67f9b39db34501025bfdde8794d'
- '5c806290f1c43b53775a9ae31cafb7ce'
- '7f8e79d19d568b359079181ac561645d'
- '06e107bc303aca86550a9041fb0ab7a8')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -p0 <$srcdir/squid-r13407.patch
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --datadir=/usr/share/squid \
- --sysconfdir=/etc/squid \
- --libexecdir=/usr/lib/squid \
- --localstatedir=/var \
- --with-logdir=/var/log/squid \
- --with-pidfile=/run/squid.pid \
- --enable-auth \
- --enable-auth-basic \
- --enable-auth-ntlm \
- --enable-auth-digest \
- --enable-auth-negotiate \
- --enable-removal-policies="lru,heap" \
- --enable-storeio="aufs,ufs,diskd" \
- --enable-delay-pools \
- --enable-arp-acl \
- --enable-ssl \
- --enable-snmp \
- --enable-linux-netfilter \
- --enable-ident-lookups \
- --enable-useragent-log \
- --enable-cache-digests \
- --enable-referer-log \
- --enable-arp-acl \
- --enable-htcp \
- --enable-carp \
- --enable-epoll \
- --with-large-files \
- --enable-arp-acl \
- --with-default-user=proxy \
- --enable-async-io \
- --enable-truncate \
- --enable-icap-client \
- --enable-ssl-crtd \
- --disable-arch-native \
- --disable-strict-error-checking
- make
-}
-
-package() {
- cd "$srcdir"
-
- make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
- install -Dm644 "$srcdir/squid.pam" "$pkgdir/etc/pam.d/squid"
- install -Dm644 "$srcdir/squid.tmpfiles"
"$pkgdir/usr/lib/tmpfiles.d/squid.conf"
- install -Dm644 "$srcdir/squid.sysusers"
"$pkgdir/usr/lib/sysusers.d/squid.conf"
- install -Dm644 "$srcdir/squid.service" \
- "$pkgdir/usr/lib/systemd/system/squid.service"
- install -Dm644 "$srcdir/squid-rotate.service" \
- "$pkgdir/usr/lib/systemd/system/squid-rotate.service"
- install -Dm644 "$srcdir/squid-rotate.timer" \
- "$pkgdir/usr/lib/systemd/system/squid-rotate.timer"
- install -dm755 "$pkgdir/usr/lib/systemd/system/timers.target.wants"
- ln -s ../squid-rotate.timer \
- "$pkgdir/usr/lib/systemd/system/timers.target.wants/squid-rotate.timer"
- rm -rf "$pkgdir/run" "$pkgdir/var/run"
-}
-
-# vim: ts=2 sw=2 et ft=sh
Copied: squid/repos/community-i686/PKGBUILD (from rev 125906,
squid/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-01-14 11:21:29 UTC (rev 125907)
@@ -0,0 +1,106 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Mark Coolen <mark.coo...@gmail.com>
+# Contributor: Tom Newsom <jeeps...@gmx.co.uk>
+# Contributor: Kevin Piche <ke...@archlinux.org>
+
+pkgname=squid
+pkgver=3.4.11
+pkgrel=1
+pkgdesc='Full-featured Web proxy cache server'
+arch=('x86_64' 'i686')
+url='http://www.squid-cache.org'
+depends=('openssl' 'pam' 'perl' 'libltdl' 'libcap')
+makedepends=('libcap' 'krb5')
+license=('GPL')
+options=('emptydirs')
+backup=('etc/squid/squid.conf'
+ 'etc/squid/mime.conf'
+ 'etc/squid/errorpage.css'
+ '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";
+ 'squid.pam'
+ 'squid.service'
+ 'squid.tmpfiles'
+ 'squid.sysusers'
+ 'squid-rotate.service'
+ 'squid-rotate.timer')
+md5sums=('9b2c457c889b026ffcada0cfe03c19ae'
+ '270977cdd9b47ef44c0c427ab9034777'
+ 'ceeb57c69ebb165676219222f109a24e'
+ 'd243da117c1aee03c0cc6052f023a380'
+ '4abff67f9b39db34501025bfdde8794d'
+ '5c806290f1c43b53775a9ae31cafb7ce'
+ '7f8e79d19d568b359079181ac561645d')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+# patch -p0 <$srcdir/squid-r13407.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --datadir=/usr/share/squid \
+ --sysconfdir=/etc/squid \
+ --libexecdir=/usr/lib/squid \
+ --localstatedir=/var \
+ --with-logdir=/var/log/squid \
+ --with-pidfile=/run/squid.pid \
+ --enable-auth \
+ --enable-auth-basic \
+ --enable-auth-ntlm \
+ --enable-auth-digest \
+ --enable-auth-negotiate \
+ --enable-removal-policies="lru,heap" \
+ --enable-storeio="aufs,ufs,diskd" \
+ --enable-delay-pools \
+ --enable-arp-acl \
+ --enable-ssl \
+ --enable-snmp \
+ --enable-linux-netfilter \
+ --enable-ident-lookups \
+ --enable-useragent-log \
+ --enable-cache-digests \
+ --enable-referer-log \
+ --enable-arp-acl \
+ --enable-htcp \
+ --enable-carp \
+ --enable-epoll \
+ --with-large-files \
+ --enable-arp-acl \
+ --with-default-user=proxy \
+ --enable-async-io \
+ --enable-truncate \
+ --enable-icap-client \
+ --enable-ssl-crtd \
+ --disable-arch-native \
+ --disable-strict-error-checking
+ make
+}
+
+package() {
+ cd "$srcdir"
+
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+ install -Dm644 "$srcdir/squid.pam" "$pkgdir/etc/pam.d/squid"
+ install -Dm644 "$srcdir/squid.tmpfiles"
"$pkgdir/usr/lib/tmpfiles.d/squid.conf"
+ install -Dm644 "$srcdir/squid.sysusers"
"$pkgdir/usr/lib/sysusers.d/squid.conf"
+ install -Dm644 "$srcdir/squid.service" \
+ "$pkgdir/usr/lib/systemd/system/squid.service"
+ install -Dm644 "$srcdir/squid-rotate.service" \
+ "$pkgdir/usr/lib/systemd/system/squid-rotate.service"
+ install -Dm644 "$srcdir/squid-rotate.timer" \
+ "$pkgdir/usr/lib/systemd/system/squid-rotate.timer"
+ install -dm755 "$pkgdir/usr/lib/systemd/system/timers.target.wants"
+ ln -s ../squid-rotate.timer \
+ "$pkgdir/usr/lib/systemd/system/timers.target.wants/squid-rotate.timer"
+ rm -rf "$pkgdir/run" "$pkgdir/var/run"
+}
+
+# vim: ts=2 sw=2 et ft=sh
Deleted: community-i686/squid-r13407.patch
===================================================================
--- community-i686/squid-r13407.patch 2015-01-14 11:20:56 UTC (rev 125906)
+++ community-i686/squid-r13407.patch 2015-01-14 11:21:29 UTC (rev 125907)
@@ -1,57 +0,0 @@
-@@ -, +, @@
- author: Alex Rousskov <rouss...@measurement-factory.com>
- 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)
Copied: squid/repos/community-i686/squid-r13407.patch (from rev 125906,
squid/trunk/squid-r13407.patch)
===================================================================
--- community-i686/squid-r13407.patch (rev 0)
+++ community-i686/squid-r13407.patch 2015-01-14 11:21:29 UTC (rev 125907)
@@ -0,0 +1,57 @@
+@@ -, +, @@
+ author: Alex Rousskov <rouss...@measurement-factory.com>
+ 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)
Deleted: community-i686/squid-rotate.service
===================================================================
--- community-i686/squid-rotate.service 2015-01-14 11:20:56 UTC (rev 125906)
+++ community-i686/squid-rotate.service 2015-01-14 11:21:29 UTC (rev 125907)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Squid Rotate
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/squid -k rotate
-Nice=19
-IOSchedulingClass=best-effort
-IOSchedulingPriority=7
Copied: squid/repos/community-i686/squid-rotate.service (from rev 125906,
squid/trunk/squid-rotate.service)
===================================================================
--- community-i686/squid-rotate.service (rev 0)
+++ community-i686/squid-rotate.service 2015-01-14 11:21:29 UTC (rev 125907)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Squid Rotate
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/squid -k rotate
+Nice=19
+IOSchedulingClass=best-effort
+IOSchedulingPriority=7
Deleted: community-i686/squid-rotate.timer
===================================================================
--- community-i686/squid-rotate.timer 2015-01-14 11:20:56 UTC (rev 125906)
+++ community-i686/squid-rotate.timer 2015-01-14 11:21:29 UTC (rev 125907)
@@ -1,7 +0,0 @@
-[Unit]
-Description=Weekly rotation of squid log files
-
-[Timer]
-OnCalendar=weekly
-AccuracySec=1d
-Persistent=true
Copied: squid/repos/community-i686/squid-rotate.timer (from rev 125906,
squid/trunk/squid-rotate.timer)
===================================================================
--- community-i686/squid-rotate.timer (rev 0)
+++ community-i686/squid-rotate.timer 2015-01-14 11:21:29 UTC (rev 125907)
@@ -0,0 +1,7 @@
+[Unit]
+Description=Weekly rotation of squid log files
+
+[Timer]
+OnCalendar=weekly
+AccuracySec=1d
+Persistent=true
Deleted: community-i686/squid.install
===================================================================
--- community-i686/squid.install 2015-01-14 11:20:56 UTC (rev 125906)
+++ community-i686/squid.install 2015-01-14 11:21:29 UTC (rev 125907)
@@ -1,9 +0,0 @@
-post_install() {
- systemd-sysusers squid.conf
- systemd-tmpfiles --create squid.conf
- chown proxy:proxy var/{cache,log}/squid
-}
-
-post_upgrade() {
- post_install
-}
Copied: squid/repos/community-i686/squid.install (from rev 125906,
squid/trunk/squid.install)
===================================================================
--- community-i686/squid.install (rev 0)
+++ community-i686/squid.install 2015-01-14 11:21:29 UTC (rev 125907)
@@ -0,0 +1,9 @@
+post_install() {
+ systemd-sysusers squid.conf
+ systemd-tmpfiles --create squid.conf
+ chown proxy:proxy var/{cache,log}/squid
+}
+
+post_upgrade() {
+ post_install
+}
Deleted: community-i686/squid.pam
===================================================================
--- community-i686/squid.pam 2015-01-14 11:20:56 UTC (rev 125906)
+++ community-i686/squid.pam 2015-01-14 11:21:29 UTC (rev 125907)
@@ -1,4 +0,0 @@
-#/etc/pam.d/squid
-#
-auth required pam_unix.so
-account required pam_unix.so
Copied: squid/repos/community-i686/squid.pam (from rev 125906,
squid/trunk/squid.pam)
===================================================================
--- community-i686/squid.pam (rev 0)
+++ community-i686/squid.pam 2015-01-14 11:21:29 UTC (rev 125907)
@@ -0,0 +1,4 @@
+#/etc/pam.d/squid
+#
+auth required pam_unix.so
+account required pam_unix.so
Deleted: community-i686/squid.service
===================================================================
--- community-i686/squid.service 2015-01-14 11:20:56 UTC (rev 125906)
+++ community-i686/squid.service 2015-01-14 11:21:29 UTC (rev 125907)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Web Proxy Cache Server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/squid.pid
-ExecStart=/usr/bin/squid -sYC
-ExecStop=/usr/bin/squid -k shutdown
-ExecReload=/usr/bin/squid -k reconfigure
-
-[Install]
-WantedBy=multi-user.target
Copied: squid/repos/community-i686/squid.service (from rev 125906,
squid/trunk/squid.service)
===================================================================
--- community-i686/squid.service (rev 0)
+++ community-i686/squid.service 2015-01-14 11:21:29 UTC (rev 125907)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Web Proxy Cache Server
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/squid.pid
+ExecStart=/usr/bin/squid -sYC
+ExecStop=/usr/bin/squid -k shutdown
+ExecReload=/usr/bin/squid -k reconfigure
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-i686/squid.sysusers
===================================================================
--- community-i686/squid.sysusers 2015-01-14 11:20:56 UTC (rev 125906)
+++ community-i686/squid.sysusers 2015-01-14 11:21:29 UTC (rev 125907)
@@ -1 +0,0 @@
-u proxy 15 - /var/empty
Copied: squid/repos/community-i686/squid.sysusers (from rev 125906,
squid/trunk/squid.sysusers)
===================================================================
--- community-i686/squid.sysusers (rev 0)
+++ community-i686/squid.sysusers 2015-01-14 11:21:29 UTC (rev 125907)
@@ -0,0 +1 @@
+u proxy 15 - /var/empty
Deleted: community-i686/squid.tmpfiles
===================================================================
--- community-i686/squid.tmpfiles 2015-01-14 11:20:56 UTC (rev 125906)
+++ community-i686/squid.tmpfiles 2015-01-14 11:21:29 UTC (rev 125907)
@@ -1 +0,0 @@
-d /run/squid 0755 proxy proxy -
Copied: squid/repos/community-i686/squid.tmpfiles (from rev 125906,
squid/trunk/squid.tmpfiles)
===================================================================
--- community-i686/squid.tmpfiles (rev 0)
+++ community-i686/squid.tmpfiles 2015-01-14 11:21:29 UTC (rev 125907)
@@ -0,0 +1 @@
+d /run/squid 0755 proxy proxy -
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-01-14 11:20:56 UTC (rev 125906)
+++ community-x86_64/PKGBUILD 2015-01-14 11:21:29 UTC (rev 125907)
@@ -1,108 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
-# Contributor: Mark Coolen <mark.coo...@gmail.com>
-# Contributor: Tom Newsom <jeeps...@gmx.co.uk>
-# Contributor: Kevin Piche <ke...@archlinux.org>
-
-pkgname=squid
-pkgver=3.4.10
-pkgrel=1
-pkgdesc='Full-featured Web proxy cache server'
-arch=('x86_64' 'i686')
-url='http://www.squid-cache.org'
-depends=('openssl' 'pam' 'perl' 'libltdl' 'libcap')
-makedepends=('libcap' 'krb5')
-license=('GPL')
-options=('emptydirs')
-backup=('etc/squid/squid.conf'
- 'etc/squid/mime.conf'
- 'etc/squid/errorpage.css'
- '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";
- 'squid.pam'
- 'squid.service'
- 'squid.tmpfiles'
- 'squid.sysusers'
- 'squid-rotate.service'
- 'squid-rotate.timer'
- 'squid-r13407.patch')
-md5sums=('326283b0c37e7dc9b2f90dc0ecd9a8a4'
- '270977cdd9b47ef44c0c427ab9034777'
- 'ceeb57c69ebb165676219222f109a24e'
- 'd243da117c1aee03c0cc6052f023a380'
- '4abff67f9b39db34501025bfdde8794d'
- '5c806290f1c43b53775a9ae31cafb7ce'
- '7f8e79d19d568b359079181ac561645d'
- '06e107bc303aca86550a9041fb0ab7a8')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -p0 <$srcdir/squid-r13407.patch
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sbindir=/usr/bin \
- --datadir=/usr/share/squid \
- --sysconfdir=/etc/squid \
- --libexecdir=/usr/lib/squid \
- --localstatedir=/var \
- --with-logdir=/var/log/squid \
- --with-pidfile=/run/squid.pid \
- --enable-auth \
- --enable-auth-basic \
- --enable-auth-ntlm \
- --enable-auth-digest \
- --enable-auth-negotiate \
- --enable-removal-policies="lru,heap" \
- --enable-storeio="aufs,ufs,diskd" \
- --enable-delay-pools \
- --enable-arp-acl \
- --enable-ssl \
- --enable-snmp \
- --enable-linux-netfilter \
- --enable-ident-lookups \
- --enable-useragent-log \
- --enable-cache-digests \
- --enable-referer-log \
- --enable-arp-acl \
- --enable-htcp \
- --enable-carp \
- --enable-epoll \
- --with-large-files \
- --enable-arp-acl \
- --with-default-user=proxy \
- --enable-async-io \
- --enable-truncate \
- --enable-icap-client \
- --enable-ssl-crtd \
- --disable-arch-native \
- --disable-strict-error-checking
- make
-}
-
-package() {
- cd "$srcdir"
-
- make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
- install -Dm644 "$srcdir/squid.pam" "$pkgdir/etc/pam.d/squid"
- install -Dm644 "$srcdir/squid.tmpfiles"
"$pkgdir/usr/lib/tmpfiles.d/squid.conf"
- install -Dm644 "$srcdir/squid.sysusers"
"$pkgdir/usr/lib/sysusers.d/squid.conf"
- install -Dm644 "$srcdir/squid.service" \
- "$pkgdir/usr/lib/systemd/system/squid.service"
- install -Dm644 "$srcdir/squid-rotate.service" \
- "$pkgdir/usr/lib/systemd/system/squid-rotate.service"
- install -Dm644 "$srcdir/squid-rotate.timer" \
- "$pkgdir/usr/lib/systemd/system/squid-rotate.timer"
- install -dm755 "$pkgdir/usr/lib/systemd/system/timers.target.wants"
- ln -s ../squid-rotate.timer \
- "$pkgdir/usr/lib/systemd/system/timers.target.wants/squid-rotate.timer"
- rm -rf "$pkgdir/run" "$pkgdir/var/run"
-}
-
-# vim: ts=2 sw=2 et ft=sh
Copied: squid/repos/community-x86_64/PKGBUILD (from rev 125906,
squid/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-01-14 11:21:29 UTC (rev 125907)
@@ -0,0 +1,106 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com>
+# Contributor: Mark Coolen <mark.coo...@gmail.com>
+# Contributor: Tom Newsom <jeeps...@gmx.co.uk>
+# Contributor: Kevin Piche <ke...@archlinux.org>
+
+pkgname=squid
+pkgver=3.4.11
+pkgrel=1
+pkgdesc='Full-featured Web proxy cache server'
+arch=('x86_64' 'i686')
+url='http://www.squid-cache.org'
+depends=('openssl' 'pam' 'perl' 'libltdl' 'libcap')
+makedepends=('libcap' 'krb5')
+license=('GPL')
+options=('emptydirs')
+backup=('etc/squid/squid.conf'
+ 'etc/squid/mime.conf'
+ 'etc/squid/errorpage.css'
+ '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";
+ 'squid.pam'
+ 'squid.service'
+ 'squid.tmpfiles'
+ 'squid.sysusers'
+ 'squid-rotate.service'
+ 'squid-rotate.timer')
+md5sums=('9b2c457c889b026ffcada0cfe03c19ae'
+ '270977cdd9b47ef44c0c427ab9034777'
+ 'ceeb57c69ebb165676219222f109a24e'
+ 'd243da117c1aee03c0cc6052f023a380'
+ '4abff67f9b39db34501025bfdde8794d'
+ '5c806290f1c43b53775a9ae31cafb7ce'
+ '7f8e79d19d568b359079181ac561645d')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+# patch -p0 <$srcdir/squid-r13407.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --sbindir=/usr/bin \
+ --datadir=/usr/share/squid \
+ --sysconfdir=/etc/squid \
+ --libexecdir=/usr/lib/squid \
+ --localstatedir=/var \
+ --with-logdir=/var/log/squid \
+ --with-pidfile=/run/squid.pid \
+ --enable-auth \
+ --enable-auth-basic \
+ --enable-auth-ntlm \
+ --enable-auth-digest \
+ --enable-auth-negotiate \
+ --enable-removal-policies="lru,heap" \
+ --enable-storeio="aufs,ufs,diskd" \
+ --enable-delay-pools \
+ --enable-arp-acl \
+ --enable-ssl \
+ --enable-snmp \
+ --enable-linux-netfilter \
+ --enable-ident-lookups \
+ --enable-useragent-log \
+ --enable-cache-digests \
+ --enable-referer-log \
+ --enable-arp-acl \
+ --enable-htcp \
+ --enable-carp \
+ --enable-epoll \
+ --with-large-files \
+ --enable-arp-acl \
+ --with-default-user=proxy \
+ --enable-async-io \
+ --enable-truncate \
+ --enable-icap-client \
+ --enable-ssl-crtd \
+ --disable-arch-native \
+ --disable-strict-error-checking
+ make
+}
+
+package() {
+ cd "$srcdir"
+
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+ install -Dm644 "$srcdir/squid.pam" "$pkgdir/etc/pam.d/squid"
+ install -Dm644 "$srcdir/squid.tmpfiles"
"$pkgdir/usr/lib/tmpfiles.d/squid.conf"
+ install -Dm644 "$srcdir/squid.sysusers"
"$pkgdir/usr/lib/sysusers.d/squid.conf"
+ install -Dm644 "$srcdir/squid.service" \
+ "$pkgdir/usr/lib/systemd/system/squid.service"
+ install -Dm644 "$srcdir/squid-rotate.service" \
+ "$pkgdir/usr/lib/systemd/system/squid-rotate.service"
+ install -Dm644 "$srcdir/squid-rotate.timer" \
+ "$pkgdir/usr/lib/systemd/system/squid-rotate.timer"
+ install -dm755 "$pkgdir/usr/lib/systemd/system/timers.target.wants"
+ ln -s ../squid-rotate.timer \
+ "$pkgdir/usr/lib/systemd/system/timers.target.wants/squid-rotate.timer"
+ rm -rf "$pkgdir/run" "$pkgdir/var/run"
+}
+
+# vim: ts=2 sw=2 et ft=sh
Deleted: community-x86_64/squid-r13407.patch
===================================================================
--- community-x86_64/squid-r13407.patch 2015-01-14 11:20:56 UTC (rev 125906)
+++ community-x86_64/squid-r13407.patch 2015-01-14 11:21:29 UTC (rev 125907)
@@ -1,57 +0,0 @@
-@@ -, +, @@
- author: Alex Rousskov <rouss...@measurement-factory.com>
- 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)
Copied: squid/repos/community-x86_64/squid-r13407.patch (from rev 125906,
squid/trunk/squid-r13407.patch)
===================================================================
--- community-x86_64/squid-r13407.patch (rev 0)
+++ community-x86_64/squid-r13407.patch 2015-01-14 11:21:29 UTC (rev 125907)
@@ -0,0 +1,57 @@
+@@ -, +, @@
+ author: Alex Rousskov <rouss...@measurement-factory.com>
+ 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)
Deleted: community-x86_64/squid-rotate.service
===================================================================
--- community-x86_64/squid-rotate.service 2015-01-14 11:20:56 UTC (rev
125906)
+++ community-x86_64/squid-rotate.service 2015-01-14 11:21:29 UTC (rev
125907)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Squid Rotate
-
-[Service]
-Type=oneshot
-ExecStart=/usr/bin/squid -k rotate
-Nice=19
-IOSchedulingClass=best-effort
-IOSchedulingPriority=7
Copied: squid/repos/community-x86_64/squid-rotate.service (from rev 125906,
squid/trunk/squid-rotate.service)
===================================================================
--- community-x86_64/squid-rotate.service (rev 0)
+++ community-x86_64/squid-rotate.service 2015-01-14 11:21:29 UTC (rev
125907)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Squid Rotate
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/squid -k rotate
+Nice=19
+IOSchedulingClass=best-effort
+IOSchedulingPriority=7
Deleted: community-x86_64/squid-rotate.timer
===================================================================
--- community-x86_64/squid-rotate.timer 2015-01-14 11:20:56 UTC (rev 125906)
+++ community-x86_64/squid-rotate.timer 2015-01-14 11:21:29 UTC (rev 125907)
@@ -1,7 +0,0 @@
-[Unit]
-Description=Weekly rotation of squid log files
-
-[Timer]
-OnCalendar=weekly
-AccuracySec=1d
-Persistent=true
Copied: squid/repos/community-x86_64/squid-rotate.timer (from rev 125906,
squid/trunk/squid-rotate.timer)
===================================================================
--- community-x86_64/squid-rotate.timer (rev 0)
+++ community-x86_64/squid-rotate.timer 2015-01-14 11:21:29 UTC (rev 125907)
@@ -0,0 +1,7 @@
+[Unit]
+Description=Weekly rotation of squid log files
+
+[Timer]
+OnCalendar=weekly
+AccuracySec=1d
+Persistent=true
Deleted: community-x86_64/squid.install
===================================================================
--- community-x86_64/squid.install 2015-01-14 11:20:56 UTC (rev 125906)
+++ community-x86_64/squid.install 2015-01-14 11:21:29 UTC (rev 125907)
@@ -1,9 +0,0 @@
-post_install() {
- systemd-sysusers squid.conf
- systemd-tmpfiles --create squid.conf
- chown proxy:proxy var/{cache,log}/squid
-}
-
-post_upgrade() {
- post_install
-}
Copied: squid/repos/community-x86_64/squid.install (from rev 125906,
squid/trunk/squid.install)
===================================================================
--- community-x86_64/squid.install (rev 0)
+++ community-x86_64/squid.install 2015-01-14 11:21:29 UTC (rev 125907)
@@ -0,0 +1,9 @@
+post_install() {
+ systemd-sysusers squid.conf
+ systemd-tmpfiles --create squid.conf
+ chown proxy:proxy var/{cache,log}/squid
+}
+
+post_upgrade() {
+ post_install
+}
Deleted: community-x86_64/squid.pam
===================================================================
--- community-x86_64/squid.pam 2015-01-14 11:20:56 UTC (rev 125906)
+++ community-x86_64/squid.pam 2015-01-14 11:21:29 UTC (rev 125907)
@@ -1,4 +0,0 @@
-#/etc/pam.d/squid
-#
-auth required pam_unix.so
-account required pam_unix.so
Copied: squid/repos/community-x86_64/squid.pam (from rev 125906,
squid/trunk/squid.pam)
===================================================================
--- community-x86_64/squid.pam (rev 0)
+++ community-x86_64/squid.pam 2015-01-14 11:21:29 UTC (rev 125907)
@@ -0,0 +1,4 @@
+#/etc/pam.d/squid
+#
+auth required pam_unix.so
+account required pam_unix.so
Deleted: community-x86_64/squid.service
===================================================================
--- community-x86_64/squid.service 2015-01-14 11:20:56 UTC (rev 125906)
+++ community-x86_64/squid.service 2015-01-14 11:21:29 UTC (rev 125907)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Web Proxy Cache Server
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/squid.pid
-ExecStart=/usr/bin/squid -sYC
-ExecStop=/usr/bin/squid -k shutdown
-ExecReload=/usr/bin/squid -k reconfigure
-
-[Install]
-WantedBy=multi-user.target
Copied: squid/repos/community-x86_64/squid.service (from rev 125906,
squid/trunk/squid.service)
===================================================================
--- community-x86_64/squid.service (rev 0)
+++ community-x86_64/squid.service 2015-01-14 11:21:29 UTC (rev 125907)
@@ -0,0 +1,13 @@
+[Unit]
+Description=Web Proxy Cache Server
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/squid.pid
+ExecStart=/usr/bin/squid -sYC
+ExecStop=/usr/bin/squid -k shutdown
+ExecReload=/usr/bin/squid -k reconfigure
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/squid.sysusers
===================================================================
--- community-x86_64/squid.sysusers 2015-01-14 11:20:56 UTC (rev 125906)
+++ community-x86_64/squid.sysusers 2015-01-14 11:21:29 UTC (rev 125907)
@@ -1 +0,0 @@
-u proxy 15 - /var/empty
Copied: squid/repos/community-x86_64/squid.sysusers (from rev 125906,
squid/trunk/squid.sysusers)
===================================================================
--- community-x86_64/squid.sysusers (rev 0)
+++ community-x86_64/squid.sysusers 2015-01-14 11:21:29 UTC (rev 125907)
@@ -0,0 +1 @@
+u proxy 15 - /var/empty
Deleted: community-x86_64/squid.tmpfiles
===================================================================
--- community-x86_64/squid.tmpfiles 2015-01-14 11:20:56 UTC (rev 125906)
+++ community-x86_64/squid.tmpfiles 2015-01-14 11:21:29 UTC (rev 125907)
@@ -1 +0,0 @@
-d /run/squid 0755 proxy proxy -
Copied: squid/repos/community-x86_64/squid.tmpfiles (from rev 125906,
squid/trunk/squid.tmpfiles)
===================================================================
--- community-x86_64/squid.tmpfiles (rev 0)
+++ community-x86_64/squid.tmpfiles 2015-01-14 11:21:29 UTC (rev 125907)
@@ -0,0 +1 @@
+d /run/squid 0755 proxy proxy -
