Date: Sunday, September 27, 2015 @ 14:52:32 Author: lfleischer Revision: 141694
archrelease: copy trunk to community-i686, community-x86_64 Added: privoxy/repos/community-i686/PKGBUILD (from rev 141693, privoxy/trunk/PKGBUILD) privoxy/repos/community-i686/privoxy.install (from rev 141693, privoxy/trunk/privoxy.install) privoxy/repos/community-i686/privoxy.logrotate.d (from rev 141693, privoxy/trunk/privoxy.logrotate.d) privoxy/repos/community-i686/privoxy.service (from rev 141693, privoxy/trunk/privoxy.service) privoxy/repos/community-x86_64/PKGBUILD (from rev 141693, privoxy/trunk/PKGBUILD) privoxy/repos/community-x86_64/privoxy.install (from rev 141693, privoxy/trunk/privoxy.install) privoxy/repos/community-x86_64/privoxy.logrotate.d (from rev 141693, privoxy/trunk/privoxy.logrotate.d) privoxy/repos/community-x86_64/privoxy.service (from rev 141693, privoxy/trunk/privoxy.service) Deleted: privoxy/repos/community-i686/PKGBUILD privoxy/repos/community-i686/privoxy.install privoxy/repos/community-i686/privoxy.logrotate.d privoxy/repos/community-i686/privoxy.service privoxy/repos/community-x86_64/PKGBUILD privoxy/repos/community-x86_64/privoxy.install privoxy/repos/community-x86_64/privoxy.logrotate.d privoxy/repos/community-x86_64/privoxy.service --------------------------------------+ /PKGBUILD | 114 +++++++++++++++++++++++++++++++++ /privoxy.install | 24 ++++++ /privoxy.logrotate.d | 16 ++++ /privoxy.service | 26 +++++++ community-i686/PKGBUILD | 58 ---------------- community-i686/privoxy.install | 19 ----- community-i686/privoxy.logrotate.d | 8 -- community-i686/privoxy.service | 13 --- community-x86_64/PKGBUILD | 58 ---------------- community-x86_64/privoxy.install | 19 ----- community-x86_64/privoxy.logrotate.d | 8 -- community-x86_64/privoxy.service | 13 --- 12 files changed, 180 insertions(+), 196 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2015-09-27 12:52:17 UTC (rev 141693) +++ community-i686/PKGBUILD 2015-09-27 12:52:32 UTC (rev 141694) @@ -1,58 +0,0 @@ -# $Id$ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Juergen Hoetzel <juer...@hoetzel.info> -# Contributor: basilburn (basilburn), Paul Bredbury (brebs) - -pkgname=privoxy -pkgver=3.0.23 -pkgrel=1 -pkgdesc='A web proxy with advanced filtering capabilities.' -arch=('i686' 'x86_64') -url='http://www.privoxy.org' -license=('GPL') -depends=('pcre' 'zlib') -makedepends=('autoconf') -backup=('etc/privoxy/'{config,trust,default.action,user.filter,default.filter} - 'etc/privoxy/'{match-all,user}.action - 'etc/logrotate.d/privoxy') -install='privoxy.install' -source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz" - 'privoxy.logrotate.d' - 'privoxy.service') -md5sums=('bbe47d5ff1a54d9f9fc93a160532697f' - 'fc3046377137003726a151ee27b142a2' - '37965b9a52ab1f2cb9f36cee617f5cf9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}-stable" - - autoheader - autoconf - ./configure --prefix=/usr --sysconfdir=/etc/privoxy --enable-compression - - make -} - -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 - - # 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 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" - - # Don't overwrite existing log files and fix log directory permissions. - rm "${pkgdir}/var/log/privoxy/"* - chgrp -R 42 "${pkgdir}/var/log/privoxy/" - - # Avoid conflict with filesystem>=2012.06. - rmdir "$pkgdir/var/run" -} Copied: privoxy/repos/community-i686/PKGBUILD (from rev 141693, privoxy/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2015-09-27 12:52:32 UTC (rev 141694) @@ -0,0 +1,57 @@ +# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> +# Contributor: Juergen Hoetzel <juer...@hoetzel.info> +# Contributor: basilburn (basilburn), Paul Bredbury (brebs) + +pkgname=privoxy +pkgver=3.0.23 +pkgrel=2 +pkgdesc='A web proxy with advanced filtering capabilities.' +arch=('i686' 'x86_64') +url='http://www.privoxy.org' +license=('GPL') +depends=('pcre' 'zlib') +makedepends=('autoconf') +backup=('etc/privoxy/'{config,trust,default.action,user.filter,default.filter} + 'etc/privoxy/'{match-all,user}.action + 'etc/logrotate.d/privoxy') +install='privoxy.install' +source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz" + 'privoxy.logrotate.d' + 'privoxy.service') +md5sums=('bbe47d5ff1a54d9f9fc93a160532697f' + 'fc3046377137003726a151ee27b142a2' + '37965b9a52ab1f2cb9f36cee617f5cf9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}-stable" + + autoheader + autoconf + ./configure --prefix=/usr --sysconfdir=/etc/privoxy --enable-compression + + make +} + +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 + + # 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 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" + + # 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" +} Deleted: community-i686/privoxy.install =================================================================== --- community-i686/privoxy.install 2015-09-27 12:52:17 UTC (rev 141693) +++ community-i686/privoxy.install 2015-09-27 12:52:32 UTC (rev 141694) @@ -1,19 +0,0 @@ -post_install() { - groupadd -g 42 privoxy &>/dev/null - useradd -u 42 -g privoxy -d /var/spool/privoxy -s /bin/false privoxy &>/dev/null - chown -R privoxy:privoxy /etc/privoxy /var/log/privoxy - - if [ ! -d /var/spool/privoxy ]; then - install -dm0770 -o privoxy -g privoxy /var/spool/privoxy - fi -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - userdel privoxy &>/dev/null - groupdel privoxy &>/dev/null - rm -rf var/spool/privoxy -} Copied: privoxy/repos/community-i686/privoxy.install (from rev 141693, privoxy/trunk/privoxy.install) =================================================================== --- community-i686/privoxy.install (rev 0) +++ community-i686/privoxy.install 2015-09-27 12:52:32 UTC (rev 141694) @@ -0,0 +1,12 @@ +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 +} + +post_upgrade() { + post_install $1 +} Deleted: community-i686/privoxy.logrotate.d =================================================================== --- community-i686/privoxy.logrotate.d 2015-09-27 12:52:17 UTC (rev 141693) +++ community-i686/privoxy.logrotate.d 2015-09-27 12:52:32 UTC (rev 141694) @@ -1,8 +0,0 @@ -/var/log/privoxy/logfile { - create 660 root privoxy - notifempty - compress - postrotate - /bin/kill -HUP `cat /var/run/privoxy.pid 2>/dev/null` 2> /dev/null || true - endscript -} Copied: privoxy/repos/community-i686/privoxy.logrotate.d (from rev 141693, privoxy/trunk/privoxy.logrotate.d) =================================================================== --- community-i686/privoxy.logrotate.d (rev 0) +++ community-i686/privoxy.logrotate.d 2015-09-27 12:52:32 UTC (rev 141694) @@ -0,0 +1,8 @@ +/var/log/privoxy/logfile { + create 660 root privoxy + notifempty + compress + postrotate + /bin/kill -HUP `cat /var/run/privoxy.pid 2>/dev/null` 2> /dev/null || true + endscript +} Deleted: community-i686/privoxy.service =================================================================== --- community-i686/privoxy.service 2015-09-27 12:52:17 UTC (rev 141693) +++ community-i686/privoxy.service 2015-09-27 12:52:32 UTC (rev 141694) @@ -1,13 +0,0 @@ -[Unit] -Description=Privoxy Web Proxy With Advanced Filtering Capabilities -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 -PrivateDevices=yes - -[Install] -WantedBy=multi-user.target Copied: privoxy/repos/community-i686/privoxy.service (from rev 141693, privoxy/trunk/privoxy.service) =================================================================== --- community-i686/privoxy.service (rev 0) +++ community-i686/privoxy.service 2015-09-27 12:52:32 UTC (rev 141694) @@ -0,0 +1,13 @@ +[Unit] +Description=Privoxy Web Proxy With Advanced Filtering Capabilities +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 +PrivateDevices=yes + +[Install] +WantedBy=multi-user.target Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2015-09-27 12:52:17 UTC (rev 141693) +++ community-x86_64/PKGBUILD 2015-09-27 12:52:32 UTC (rev 141694) @@ -1,58 +0,0 @@ -# $Id$ -# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> -# Contributor: Juergen Hoetzel <juer...@hoetzel.info> -# Contributor: basilburn (basilburn), Paul Bredbury (brebs) - -pkgname=privoxy -pkgver=3.0.23 -pkgrel=1 -pkgdesc='A web proxy with advanced filtering capabilities.' -arch=('i686' 'x86_64') -url='http://www.privoxy.org' -license=('GPL') -depends=('pcre' 'zlib') -makedepends=('autoconf') -backup=('etc/privoxy/'{config,trust,default.action,user.filter,default.filter} - 'etc/privoxy/'{match-all,user}.action - 'etc/logrotate.d/privoxy') -install='privoxy.install' -source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz" - 'privoxy.logrotate.d' - 'privoxy.service') -md5sums=('bbe47d5ff1a54d9f9fc93a160532697f' - 'fc3046377137003726a151ee27b142a2' - '37965b9a52ab1f2cb9f36cee617f5cf9') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}-stable" - - autoheader - autoconf - ./configure --prefix=/usr --sysconfdir=/etc/privoxy --enable-compression - - make -} - -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 - - # 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 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" - - # Don't overwrite existing log files and fix log directory permissions. - rm "${pkgdir}/var/log/privoxy/"* - chgrp -R 42 "${pkgdir}/var/log/privoxy/" - - # Avoid conflict with filesystem>=2012.06. - rmdir "$pkgdir/var/run" -} Copied: privoxy/repos/community-x86_64/PKGBUILD (from rev 141693, privoxy/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2015-09-27 12:52:32 UTC (rev 141694) @@ -0,0 +1,57 @@ +# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org> +# Contributor: Juergen Hoetzel <juer...@hoetzel.info> +# Contributor: basilburn (basilburn), Paul Bredbury (brebs) + +pkgname=privoxy +pkgver=3.0.23 +pkgrel=2 +pkgdesc='A web proxy with advanced filtering capabilities.' +arch=('i686' 'x86_64') +url='http://www.privoxy.org' +license=('GPL') +depends=('pcre' 'zlib') +makedepends=('autoconf') +backup=('etc/privoxy/'{config,trust,default.action,user.filter,default.filter} + 'etc/privoxy/'{match-all,user}.action + 'etc/logrotate.d/privoxy') +install='privoxy.install' +source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz" + 'privoxy.logrotate.d' + 'privoxy.service') +md5sums=('bbe47d5ff1a54d9f9fc93a160532697f' + 'fc3046377137003726a151ee27b142a2' + '37965b9a52ab1f2cb9f36cee617f5cf9') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}-stable" + + autoheader + autoconf + ./configure --prefix=/usr --sysconfdir=/etc/privoxy --enable-compression + + make +} + +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 + + # 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 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" + + # 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" +} Deleted: community-x86_64/privoxy.install =================================================================== --- community-x86_64/privoxy.install 2015-09-27 12:52:17 UTC (rev 141693) +++ community-x86_64/privoxy.install 2015-09-27 12:52:32 UTC (rev 141694) @@ -1,19 +0,0 @@ -post_install() { - groupadd -g 42 privoxy &>/dev/null - useradd -u 42 -g privoxy -d /var/spool/privoxy -s /bin/false privoxy &>/dev/null - chown -R privoxy:privoxy /etc/privoxy /var/log/privoxy - - if [ ! -d /var/spool/privoxy ]; then - install -dm0770 -o privoxy -g privoxy /var/spool/privoxy - fi -} - -post_upgrade() { - post_install $1 -} - -pre_remove() { - userdel privoxy &>/dev/null - groupdel privoxy &>/dev/null - rm -rf var/spool/privoxy -} Copied: privoxy/repos/community-x86_64/privoxy.install (from rev 141693, privoxy/trunk/privoxy.install) =================================================================== --- community-x86_64/privoxy.install (rev 0) +++ community-x86_64/privoxy.install 2015-09-27 12:52:32 UTC (rev 141694) @@ -0,0 +1,12 @@ +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 +} + +post_upgrade() { + post_install $1 +} Deleted: community-x86_64/privoxy.logrotate.d =================================================================== --- community-x86_64/privoxy.logrotate.d 2015-09-27 12:52:17 UTC (rev 141693) +++ community-x86_64/privoxy.logrotate.d 2015-09-27 12:52:32 UTC (rev 141694) @@ -1,8 +0,0 @@ -/var/log/privoxy/logfile { - create 660 root privoxy - notifempty - compress - postrotate - /bin/kill -HUP `cat /var/run/privoxy.pid 2>/dev/null` 2> /dev/null || true - endscript -} Copied: privoxy/repos/community-x86_64/privoxy.logrotate.d (from rev 141693, privoxy/trunk/privoxy.logrotate.d) =================================================================== --- community-x86_64/privoxy.logrotate.d (rev 0) +++ community-x86_64/privoxy.logrotate.d 2015-09-27 12:52:32 UTC (rev 141694) @@ -0,0 +1,8 @@ +/var/log/privoxy/logfile { + create 660 root privoxy + notifempty + compress + postrotate + /bin/kill -HUP `cat /var/run/privoxy.pid 2>/dev/null` 2> /dev/null || true + endscript +} Deleted: community-x86_64/privoxy.service =================================================================== --- community-x86_64/privoxy.service 2015-09-27 12:52:17 UTC (rev 141693) +++ community-x86_64/privoxy.service 2015-09-27 12:52:32 UTC (rev 141694) @@ -1,13 +0,0 @@ -[Unit] -Description=Privoxy Web Proxy With Advanced Filtering Capabilities -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 -PrivateDevices=yes - -[Install] -WantedBy=multi-user.target Copied: privoxy/repos/community-x86_64/privoxy.service (from rev 141693, privoxy/trunk/privoxy.service) =================================================================== --- community-x86_64/privoxy.service (rev 0) +++ community-x86_64/privoxy.service 2015-09-27 12:52:32 UTC (rev 141694) @@ -0,0 +1,13 @@ +[Unit] +Description=Privoxy Web Proxy With Advanced Filtering Capabilities +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 +PrivateDevices=yes + +[Install] +WantedBy=multi-user.target