Date: Saturday, September 27, 2014 @ 18:08:24 Author: seblu Revision: 119652
upgpkg: squid 3.4.7-2 - move user creation to sysusers.d - use systemd timers (FS#41093) - fix libpcap to libcap Added: squid/trunk/squid-rotate.service squid/trunk/squid-rotate.timer squid/trunk/squid.sysusers Modified: squid/trunk/PKGBUILD squid/trunk/squid.install Deleted: squid/trunk/squid.cron ----------------------+ PKGBUILD | 21 ++++++++++++++++----- squid-rotate.service | 9 +++++++++ squid-rotate.timer | 7 +++++++ squid.cron | 9 --------- squid.install | 13 +------------ squid.sysusers | 1 + 6 files changed, 34 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-09-27 15:01:40 UTC (rev 119651) +++ PKGBUILD 2014-09-27 16:08:24 UTC (rev 119652) @@ -6,11 +6,11 @@ pkgname=squid pkgver=3.4.7 -pkgrel=1 +pkgrel=2 pkgdesc='Full-featured Web proxy cache server' arch=('x86_64' 'i686') url='http://www.squid-cache.org' -depends=('openssl' 'pam' 'cron' 'perl' 'libltdl' 'libpcap') +depends=('openssl' 'pam' 'perl' 'libltdl' 'libcap') makedepends=('libcap' 'krb5') license=('GPL') options=('emptydirs') @@ -22,15 +22,19 @@ install=$pkgname.install source=("http://www.squid-cache.org/Versions/v3/3.4/$pkgname-$pkgver.tar.bz2" 'squid.pam' - 'squid.cron' 'squid.service' 'squid.tmpfiles' + 'squid.sysusers' + 'squid-rotate.service' + 'squid-rotate.timer' 'squid-r13407.patch') md5sums=('9951034b10f7ee0f45a95cfae61c57c2' '270977cdd9b47ef44c0c427ab9034777' - 'a71425c4951f2e5b640d19e6a5048531' 'ceeb57c69ebb165676219222f109a24e' 'd243da117c1aee03c0cc6052f023a380' + 'e6651a2d94d7c3512d876177857f3cac' + '5c806290f1c43b53775a9ae31cafb7ce' + '7f8e79d19d568b359079181ac561645d' '06e107bc303aca86550a9041fb0ab7a8') prepare() { @@ -86,11 +90,18 @@ cd "$srcdir" make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install - install -Dm755 "$srcdir/squid.cron" "$pkgdir/etc/cron.weekly/squid" 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" } Added: squid-rotate.service =================================================================== --- squid-rotate.service (rev 0) +++ squid-rotate.service 2014-09-27 16:08:24 UTC (rev 119652) @@ -0,0 +1,9 @@ +[Unit] +Description=Squid Rotate + +[Service] +Type=oneshot +ExecStart=/usr/bin/squid -k rotate +Nice=19 +IOSchedulingClass=best-effort +IOSchedulingPriority=7 Added: squid-rotate.timer =================================================================== --- squid-rotate.timer (rev 0) +++ squid-rotate.timer 2014-09-27 16:08:24 UTC (rev 119652) @@ -0,0 +1,7 @@ +[Unit] +Description=Weekly rotation of squid log files + +[Timer] +OnCalendar=weekly +AccuracySec=1d +Persistent=true Deleted: squid.cron =================================================================== --- squid.cron 2014-09-27 15:01:40 UTC (rev 119651) +++ squid.cron 2014-09-27 16:08:24 UTC (rev 119652) @@ -1,9 +0,0 @@ -#!/bin/sh - -# exit without error if no pidfile exists -{ read pid </run/squid.pid; } 2>/dev/null || exit 0 - -# make sure found PID really is a squid process -if [ /proc/$pid/exec -ef /usr/bin/squid ]; then - /usr/bin/squid -k rotate -fi Modified: squid.install =================================================================== --- squid.install 2014-09-27 15:01:40 UTC (rev 119651) +++ squid.install 2014-09-27 16:08:24 UTC (rev 119652) @@ -1,15 +1,4 @@ post_install() { - [ -z "$(grep ^proxy: /etc/group)" ] && groupadd -g 15 proxy &>/dev/null - id proxy &>/dev/null || useradd -u 15 -g proxy -d /var/empty proxy - chown proxy.proxy var/{cache,log}/squid + systemd-sysusers squid.conf systemd-tmpfiles --create squid.conf } - -post_upgrade() { - post_install $1 -} - -pre_remove() { - userdel proxy &> /dev/null - [ ! -z "$(grep ^proxy: /etc/group)" ] && groupdel proxy &>/dev/null -} Added: squid.sysusers =================================================================== --- squid.sysusers (rev 0) +++ squid.sysusers 2014-09-27 16:08:24 UTC (rev 119652) @@ -0,0 +1 @@ +u proxy 15 "" /var/empty