[arch-commits] Commit in squid/repos (18 files)
Antonio Rojas
arojas at archlinux.org
Wed Apr 5 12:07:38 UTC 2017
Date: Wednesday, April 5, 2017 @ 12:07:37
Author: arojas
Revision: 220608
archrelease: copy trunk to community-staging-x86_64, community-staging-i686
Added:
squid/repos/community-staging-i686/
squid/repos/community-staging-i686/PKGBUILD
(from rev 220607, squid/trunk/PKGBUILD)
squid/repos/community-staging-i686/squid-rotate.service
(from rev 220607, squid/trunk/squid-rotate.service)
squid/repos/community-staging-i686/squid-rotate.timer
(from rev 220607, squid/trunk/squid-rotate.timer)
squid/repos/community-staging-i686/squid.install
(from rev 220607, squid/trunk/squid.install)
squid/repos/community-staging-i686/squid.pam
(from rev 220607, squid/trunk/squid.pam)
squid/repos/community-staging-i686/squid.service
(from rev 220607, squid/trunk/squid.service)
squid/repos/community-staging-i686/squid.sysusers
(from rev 220607, squid/trunk/squid.sysusers)
squid/repos/community-staging-i686/squid.tmpfiles
(from rev 220607, squid/trunk/squid.tmpfiles)
squid/repos/community-staging-x86_64/
squid/repos/community-staging-x86_64/PKGBUILD
(from rev 220607, squid/trunk/PKGBUILD)
squid/repos/community-staging-x86_64/squid-rotate.service
(from rev 220607, squid/trunk/squid-rotate.service)
squid/repos/community-staging-x86_64/squid-rotate.timer
(from rev 220607, squid/trunk/squid-rotate.timer)
squid/repos/community-staging-x86_64/squid.install
(from rev 220607, squid/trunk/squid.install)
squid/repos/community-staging-x86_64/squid.pam
(from rev 220607, squid/trunk/squid.pam)
squid/repos/community-staging-x86_64/squid.service
(from rev 220607, squid/trunk/squid.service)
squid/repos/community-staging-x86_64/squid.sysusers
(from rev 220607, squid/trunk/squid.sysusers)
squid/repos/community-staging-x86_64/squid.tmpfiles
(from rev 220607, squid/trunk/squid.tmpfiles)
-----------------------------------------------+
community-staging-i686/PKGBUILD | 108 ++++++++++++++++++++++++
community-staging-i686/squid-rotate.service | 9 ++
community-staging-i686/squid-rotate.timer | 10 ++
community-staging-i686/squid.install | 14 +++
community-staging-i686/squid.pam | 4
community-staging-i686/squid.service | 13 ++
community-staging-i686/squid.sysusers | 1
community-staging-i686/squid.tmpfiles | 2
community-staging-x86_64/PKGBUILD | 108 ++++++++++++++++++++++++
community-staging-x86_64/squid-rotate.service | 9 ++
community-staging-x86_64/squid-rotate.timer | 10 ++
community-staging-x86_64/squid.install | 14 +++
community-staging-x86_64/squid.pam | 4
community-staging-x86_64/squid.service | 13 ++
community-staging-x86_64/squid.sysusers | 1
community-staging-x86_64/squid.tmpfiles | 2
16 files changed, 322 insertions(+)
Copied: squid/repos/community-staging-i686/PKGBUILD (from rev 220607, squid/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2017-04-05 12:07:37 UTC (rev 220608)
@@ -0,0 +1,108 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Mark Coolen <mark.coolen at gmail.com>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Kevin Piche <kevin at archlinux.org>
+
+pkgname=squid
+pkgver=3.5.25
+pkgrel=2
+pkgdesc='Full-featured Web proxy cache server'
+arch=('x86_64' 'i686')
+url='http://www.squid-cache.org'
+depends=('openssl-1.0' 'pam' 'perl' 'libltdl' 'libcap' 'nettle' 'gnutls')
+makedepends=('krb5')
+license=('GPL')
+options=('emptydirs')
+backup=('etc/squid/squid.conf'
+ 'etc/squid/cachemgr.conf'
+ 'etc/squid/errorpage.css'
+ 'etc/squid/mime.conf')
+install=$pkgname.install
+validpgpkeys=('EA31CC5E9488E5168D2DCC5EB268E706FF5CF463')
+source=("http://www.squid-cache.org/Versions/v3/3.5/$pkgname-$pkgver.tar.xz"{,.asc}
+ 'squid.pam'
+ 'squid.service'
+ 'squid.tmpfiles'
+ 'squid.sysusers'
+ 'squid-rotate.service'
+ 'squid-rotate.timer')
+sha256sums=('28959254c32b8cd87e9599b6beb97352cf0638524e0f5ac3e1754f08462f3585'
+ 'SKIP'
+ '11fb388f8679fd6461e0de006810ea608a3686fffda16904b0ed71f412be499c'
+ 'b0cf95652d56c62ae0ceba8912d11ac248bdb3eb91f062bceadd99f80c4b160e'
+ '0d7db4e078a2a6d8d8e46537054aa84523efdf95dd92a78189e81606200f48a5'
+ 'c903eb86e6968b9d3bd0a9ad3335e8ce76a718b6217251e9dd7e66d5cf1ac94a'
+ '3a97aa6bf6dcdc427e73bb2f36afdeaaf2bbf7dd2c0bbb7f1a948850198a8b7c'
+ '8bc77fa1f653a17a4956feac042be9577ba30a8a43480b443fbd67640ae711ee')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig \
+ ./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 \
+ --with-openssl \
+ --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 \
+ --enable-wccpv2
+ 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-staging-i686/squid-rotate.service (from rev 220607, squid/trunk/squid-rotate.service)
===================================================================
--- community-staging-i686/squid-rotate.service (rev 0)
+++ community-staging-i686/squid-rotate.service 2017-04-05 12:07:37 UTC (rev 220608)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Squid Rotate
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/squid -k rotate
+Nice=19
+IOSchedulingClass=best-effort
+IOSchedulingPriority=7
Copied: squid/repos/community-staging-i686/squid-rotate.timer (from rev 220607, squid/trunk/squid-rotate.timer)
===================================================================
--- community-staging-i686/squid-rotate.timer (rev 0)
+++ community-staging-i686/squid-rotate.timer 2017-04-05 12:07:37 UTC (rev 220608)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Weekly rotation of squid log files
+
+[Timer]
+OnCalendar=weekly
+AccuracySec=1d
+Persistent=true
+
+[Install]
+WantedBy=timers.target
Copied: squid/repos/community-staging-i686/squid.install (from rev 220607, squid/trunk/squid.install)
===================================================================
--- community-staging-i686/squid.install (rev 0)
+++ community-staging-i686/squid.install 2017-04-05 12:07:37 UTC (rev 220608)
@@ -0,0 +1,14 @@
+post_install() {
+ chown 15:15 var/{cache,log}/squid
+ echo "- squid-rotate.timer is not enabled by default"
+}
+
+post_upgrade() {
+ post_install
+ if [ `vercmp "$2" "3.5.4-1"` -le 0 ]; then
+ echo "- Add 'dns_v4_first on' option into config unless your provider support ipv6!"
+ fi
+ if [ `vercmp "$2" "3.5.21-1"` -le 0 ]; then
+ echo "- squid-rotate.timer is not enabled by default"
+ fi
+}
Copied: squid/repos/community-staging-i686/squid.pam (from rev 220607, squid/trunk/squid.pam)
===================================================================
--- community-staging-i686/squid.pam (rev 0)
+++ community-staging-i686/squid.pam 2017-04-05 12:07:37 UTC (rev 220608)
@@ -0,0 +1,4 @@
+#/etc/pam.d/squid
+#
+auth required pam_unix.so
+account required pam_unix.so
Copied: squid/repos/community-staging-i686/squid.service (from rev 220607, squid/trunk/squid.service)
===================================================================
--- community-staging-i686/squid.service (rev 0)
+++ community-staging-i686/squid.service 2017-04-05 12:07:37 UTC (rev 220608)
@@ -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
Copied: squid/repos/community-staging-i686/squid.sysusers (from rev 220607, squid/trunk/squid.sysusers)
===================================================================
--- community-staging-i686/squid.sysusers (rev 0)
+++ community-staging-i686/squid.sysusers 2017-04-05 12:07:37 UTC (rev 220608)
@@ -0,0 +1 @@
+u proxy 15 - /var/empty
Copied: squid/repos/community-staging-i686/squid.tmpfiles (from rev 220607, squid/trunk/squid.tmpfiles)
===================================================================
--- community-staging-i686/squid.tmpfiles (rev 0)
+++ community-staging-i686/squid.tmpfiles 2017-04-05 12:07:37 UTC (rev 220608)
@@ -0,0 +1,2 @@
+d /run/squid 0755 proxy proxy -
+d /var/log/squid 0755 proxy proxy -
Copied: squid/repos/community-staging-x86_64/PKGBUILD (from rev 220607, squid/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2017-04-05 12:07:37 UTC (rev 220608)
@@ -0,0 +1,108 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: Mark Coolen <mark.coolen at gmail.com>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Kevin Piche <kevin at archlinux.org>
+
+pkgname=squid
+pkgver=3.5.25
+pkgrel=2
+pkgdesc='Full-featured Web proxy cache server'
+arch=('x86_64' 'i686')
+url='http://www.squid-cache.org'
+depends=('openssl-1.0' 'pam' 'perl' 'libltdl' 'libcap' 'nettle' 'gnutls')
+makedepends=('krb5')
+license=('GPL')
+options=('emptydirs')
+backup=('etc/squid/squid.conf'
+ 'etc/squid/cachemgr.conf'
+ 'etc/squid/errorpage.css'
+ 'etc/squid/mime.conf')
+install=$pkgname.install
+validpgpkeys=('EA31CC5E9488E5168D2DCC5EB268E706FF5CF463')
+source=("http://www.squid-cache.org/Versions/v3/3.5/$pkgname-$pkgver.tar.xz"{,.asc}
+ 'squid.pam'
+ 'squid.service'
+ 'squid.tmpfiles'
+ 'squid.sysusers'
+ 'squid-rotate.service'
+ 'squid-rotate.timer')
+sha256sums=('28959254c32b8cd87e9599b6beb97352cf0638524e0f5ac3e1754f08462f3585'
+ 'SKIP'
+ '11fb388f8679fd6461e0de006810ea608a3686fffda16904b0ed71f412be499c'
+ 'b0cf95652d56c62ae0ceba8912d11ac248bdb3eb91f062bceadd99f80c4b160e'
+ '0d7db4e078a2a6d8d8e46537054aa84523efdf95dd92a78189e81606200f48a5'
+ 'c903eb86e6968b9d3bd0a9ad3335e8ce76a718b6217251e9dd7e66d5cf1ac94a'
+ '3a97aa6bf6dcdc427e73bb2f36afdeaaf2bbf7dd2c0bbb7f1a948850198a8b7c'
+ '8bc77fa1f653a17a4956feac042be9577ba30a8a43480b443fbd67640ae711ee')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig \
+ ./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 \
+ --with-openssl \
+ --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 \
+ --enable-wccpv2
+ 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-staging-x86_64/squid-rotate.service (from rev 220607, squid/trunk/squid-rotate.service)
===================================================================
--- community-staging-x86_64/squid-rotate.service (rev 0)
+++ community-staging-x86_64/squid-rotate.service 2017-04-05 12:07:37 UTC (rev 220608)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Squid Rotate
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/squid -k rotate
+Nice=19
+IOSchedulingClass=best-effort
+IOSchedulingPriority=7
Copied: squid/repos/community-staging-x86_64/squid-rotate.timer (from rev 220607, squid/trunk/squid-rotate.timer)
===================================================================
--- community-staging-x86_64/squid-rotate.timer (rev 0)
+++ community-staging-x86_64/squid-rotate.timer 2017-04-05 12:07:37 UTC (rev 220608)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Weekly rotation of squid log files
+
+[Timer]
+OnCalendar=weekly
+AccuracySec=1d
+Persistent=true
+
+[Install]
+WantedBy=timers.target
Copied: squid/repos/community-staging-x86_64/squid.install (from rev 220607, squid/trunk/squid.install)
===================================================================
--- community-staging-x86_64/squid.install (rev 0)
+++ community-staging-x86_64/squid.install 2017-04-05 12:07:37 UTC (rev 220608)
@@ -0,0 +1,14 @@
+post_install() {
+ chown 15:15 var/{cache,log}/squid
+ echo "- squid-rotate.timer is not enabled by default"
+}
+
+post_upgrade() {
+ post_install
+ if [ `vercmp "$2" "3.5.4-1"` -le 0 ]; then
+ echo "- Add 'dns_v4_first on' option into config unless your provider support ipv6!"
+ fi
+ if [ `vercmp "$2" "3.5.21-1"` -le 0 ]; then
+ echo "- squid-rotate.timer is not enabled by default"
+ fi
+}
Copied: squid/repos/community-staging-x86_64/squid.pam (from rev 220607, squid/trunk/squid.pam)
===================================================================
--- community-staging-x86_64/squid.pam (rev 0)
+++ community-staging-x86_64/squid.pam 2017-04-05 12:07:37 UTC (rev 220608)
@@ -0,0 +1,4 @@
+#/etc/pam.d/squid
+#
+auth required pam_unix.so
+account required pam_unix.so
Copied: squid/repos/community-staging-x86_64/squid.service (from rev 220607, squid/trunk/squid.service)
===================================================================
--- community-staging-x86_64/squid.service (rev 0)
+++ community-staging-x86_64/squid.service 2017-04-05 12:07:37 UTC (rev 220608)
@@ -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
Copied: squid/repos/community-staging-x86_64/squid.sysusers (from rev 220607, squid/trunk/squid.sysusers)
===================================================================
--- community-staging-x86_64/squid.sysusers (rev 0)
+++ community-staging-x86_64/squid.sysusers 2017-04-05 12:07:37 UTC (rev 220608)
@@ -0,0 +1 @@
+u proxy 15 - /var/empty
Copied: squid/repos/community-staging-x86_64/squid.tmpfiles (from rev 220607, squid/trunk/squid.tmpfiles)
===================================================================
--- community-staging-x86_64/squid.tmpfiles (rev 0)
+++ community-staging-x86_64/squid.tmpfiles 2017-04-05 12:07:37 UTC (rev 220608)
@@ -0,0 +1,2 @@
+d /run/squid 0755 proxy proxy -
+d /var/log/squid 0755 proxy proxy -
More information about the arch-commits
mailing list