Date: Tuesday, August 30, 2016 @ 04:56:55 Author: lfleischer Revision: 188017
upgpkg: privoxy 3.0.26-1 * Upstream update. * PKGBUILD cleanup. Added: privoxy/trunk/privoxy.sysusers Modified: privoxy/trunk/PKGBUILD privoxy/trunk/privoxy.install privoxy/trunk/privoxy.service ------------------+ PKGBUILD | 56 +++++++++++++++++++++++++++++------------------------ privoxy.install | 11 ---------- privoxy.service | 7 ++---- privoxy.sysusers | 1 4 files changed, 36 insertions(+), 39 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-08-30 03:20:49 UTC (rev 188016) +++ PKGBUILD 2016-08-30 04:56:55 UTC (rev 188017) @@ -1,26 +1,28 @@ # Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> # Contributor: Juergen Hoetzel <juer...@hoetzel.info> -# Contributor: basilburn (basilburn), Paul Bredbury (brebs) +# Contributor: basilburn (basilburn), Paul Bredbury (brebs) +# Contributor: lolilolicon pkgname=privoxy -pkgver=3.0.24 -pkgrel=3 +pkgver=3.0.26 +pkgrel=1 pkgdesc='A web proxy with advanced filtering capabilities.' arch=('i686' 'x86_64') -url='http://www.privoxy.org' -license=('GPL') +url='https://www.privoxy.org' +license=('GPL2') depends=('pcre' 'zlib') makedepends=('autoconf') -backup=('etc/privoxy/'{config,trust,default.action,user.filter,default.filter} - 'etc/privoxy/'{match-all,user}.action +backup=('etc/privoxy/'{config,trust,match-all.action,{default,user}.{action,filter}} 'etc/logrotate.d/privoxy') install='privoxy.install' source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz" 'privoxy.logrotate.d' + 'privoxy.sysusers' 'privoxy.service') -md5sums=('44a47d1a5000db8cccd61ace0e25e7f7' +md5sums=('8a1c842112ccea68c19b7ceb4a0e999f' 'e8196e745c765b398b3bfac68f370279' - '37965b9a52ab1f2cb9f36cee617f5cf9') + 'b16776164ab677282c44a8729743eca1' + '99ecefbdab8d2260d9b217895b3adc73') build() { cd "${srcdir}/${pkgname}-${pkgver}-stable" @@ -30,28 +32,32 @@ ./configure --prefix=/usr --sysconfdir=/etc/privoxy --enable-compression make + sed -i ' + s+^confdir \.+confdir /etc/privoxy+ + s+^logdir \.+logdir /var/log/privoxy+ + s+^#\?user-manual .*+user-manual /usr/share/doc/privoxy/user-manual/+' config } package() { cd "${srcdir}/${pkgname}-${pkgver}-stable" - make prefix="${pkgdir}/usr" SBIN_DEST="${pkgdir}/usr/bin" \ - MAN_DEST="${pkgdir}/usr/share/man/man1" GROUP=42 \ - CONF_BASE="${pkgdir}/etc/privoxy" VAR_DEST="${pkgdir}/var" install + install -Dm644 "$srcdir/privoxy.service" "$pkgdir/usr/lib/systemd/system/privoxy.service" + install -Dm644 "$srcdir/privoxy.sysusers" "$pkgdir/usr/lib/sysusers.d/privoxy.conf" + install -Dm644 "$srcdir/privoxy.logrotate.d" "$pkgdir/etc/logrotate.d/privoxy" - # Fix configuration paths. - sed -i -e 's#^confdir.*$#confdir /etc/privoxy#' -e 's#^logdir.*$#logdir /var/log/privoxy#' \ - -e '/^user-manual/s#.*#\#user-manual /usr/share/doc/privoxy/user-manual/#' \ - "${pkgdir}/etc/privoxy/config" + install -Dm755 {,"$pkgdir"/usr/bin/}privoxy + install -Dm644 {,"$pkgdir"/usr/share/man/man1/}privoxy.1 + install -d -o42 -g42 "$pkgdir"/var/log/privoxy - # Install systemd unit and logrotate configuration. - install -Dm0644 "${srcdir}/privoxy.service" "${pkgdir}/usr/lib/systemd/system/privoxy.service" - install -Dm0644 "${srcdir}/privoxy.logrotate.d" "${pkgdir}/etc/logrotate.d/privoxy" + install -d "$pkgdir"/etc/privoxy/ + install -m644 config trust *.{action,filter} "$pkgdir"/etc/privoxy/ # -m0660 upstream + find templates -type f -exec install -Dm644 '{}' "$pkgdir"/etc/privoxy/'{}' \; - # Don't overwrite existing log files and fix log directory permissions. - rm "${pkgdir}/var/log/privoxy/"* - chown -R 42:42 "${pkgdir}"/etc/privoxy "${pkgdir}"/var/log/privoxy - - # Avoid conflict with filesystem>=2012.06. - rmdir "$pkgdir/var/run" + (d=$pkgdir/usr/share/doc/privoxy + cd doc/webserver + install -Dm644 {privoxy-,"$d"/}index.html + install -m644 p_doc.css ../../{AUTHORS,README,ChangeLog} "$d"/ + install -Dm644 {,"$d"/user-manual/}p_doc.css + find user-manual developer-manual faq man-page \( -name '*.html' -o -name '*.jpg' \) \ + -exec install -Dm644 '{}' "$d"/'{}' \;) } Modified: privoxy.install =================================================================== --- privoxy.install 2016-08-30 03:20:49 UTC (rev 188016) +++ privoxy.install 2016-08-30 04:56:55 UTC (rev 188017) @@ -1,12 +1,3 @@ post_install() { - groupadd -g 42 privoxy &>/dev/null - useradd -u 42 -g privoxy -d /var/spool/privoxy -s /bin/false privoxy &>/dev/null - - if [ ! -d /var/spool/privoxy ]; then - install -dm0770 -o privoxy -g privoxy /var/spool/privoxy - fi + systemd-sysusers privoxy.conf } - -post_upgrade() { - post_install $1 -} Modified: privoxy.service =================================================================== --- privoxy.service 2016-08-30 03:20:49 UTC (rev 188016) +++ privoxy.service 2016-08-30 04:56:55 UTC (rev 188017) @@ -3,10 +3,9 @@ After=network.target [Service] -Type=forking -PIDFile=/run/privoxy.pid -ExecStart=/usr/bin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config -SuccessExitStatus=15 +User=privoxy +Type=simple +ExecStart=/usr/bin/privoxy --no-daemon /etc/privoxy/config PrivateDevices=yes [Install] Added: privoxy.sysusers =================================================================== --- privoxy.sysusers (rev 0) +++ privoxy.sysusers 2016-08-30 04:56:55 UTC (rev 188017) @@ -0,0 +1 @@ +u privoxy 42 "Privoxy"