[arch-commits] Commit in privoxy/repos (20 files)
Sébastien Luttringer
seblu at nymeria.archlinux.org
Fri May 31 01:13:33 UTC 2013
Date: Friday, May 31, 2013 @ 03:13:33
Author: seblu
Revision: 92055
archrelease: copy trunk to community-i686, community-x86_64
Added:
privoxy/repos/community-i686/PKGBUILD
(from rev 92054, privoxy/trunk/PKGBUILD)
privoxy/repos/community-i686/privoxy.install
(from rev 92054, privoxy/trunk/privoxy.install)
privoxy/repos/community-i686/privoxy.logrotate.d
(from rev 92054, privoxy/trunk/privoxy.logrotate.d)
privoxy/repos/community-i686/privoxy.service
(from rev 92054, privoxy/trunk/privoxy.service)
privoxy/repos/community-x86_64/PKGBUILD
(from rev 92054, privoxy/trunk/PKGBUILD)
privoxy/repos/community-x86_64/privoxy.install
(from rev 92054, privoxy/trunk/privoxy.install)
privoxy/repos/community-x86_64/privoxy.logrotate.d
(from rev 92054, privoxy/trunk/privoxy.logrotate.d)
privoxy/repos/community-x86_64/privoxy.service
(from rev 92054, privoxy/trunk/privoxy.service)
Deleted:
privoxy/repos/community-i686/PKGBUILD
privoxy/repos/community-i686/privoxy
privoxy/repos/community-i686/privoxy.conf.d
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
privoxy/repos/community-x86_64/privoxy.conf.d
privoxy/repos/community-x86_64/privoxy.install
privoxy/repos/community-x86_64/privoxy.logrotate.d
privoxy/repos/community-x86_64/privoxy.service
--------------------------------------+
/PKGBUILD | 132 +++++++++++++++++++++++++++++++++
/privoxy.install | 38 +++++++++
/privoxy.logrotate.d | 16 ++++
/privoxy.service | 24 ++++++
community-i686/PKGBUILD | 72 ------------------
community-i686/privoxy | 53 -------------
community-i686/privoxy.conf.d | 10 --
community-i686/privoxy.install | 19 ----
community-i686/privoxy.logrotate.d | 8 --
community-i686/privoxy.service | 12 ---
community-x86_64/PKGBUILD | 72 ------------------
community-x86_64/privoxy | 53 -------------
community-x86_64/privoxy.conf.d | 10 --
community-x86_64/privoxy.install | 19 ----
community-x86_64/privoxy.logrotate.d | 8 --
community-x86_64/privoxy.service | 12 ---
16 files changed, 210 insertions(+), 348 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-05-31 01:13:21 UTC (rev 92054)
+++ community-i686/PKGBUILD 2013-05-31 01:13:33 UTC (rev 92055)
@@ -1,72 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Juergen Hoetzel <juergen at hoetzel.info>
-# Contributor: basilburn (basilburn), Paul Bredbury (brebs)
-
-pkgname=privoxy
-pkgver=3.0.19
-pkgrel=7
-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/conf.d/privoxy'
- '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'
- 'privoxy.logrotate.d'
- 'privoxy.conf.d'
- 'privoxy.service')
-md5sums=('57acc79059565cc42eda67982842785d'
- '1b4ed8c4e7e5b04b10ef41b597dc3f3b'
- 'fc3046377137003726a151ee27b142a2'
- '27830ef79418e277b90c1c1fa933f876'
- '4c154a126ec17b02c623e3d451e062d9')
-
-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" MAN_DEST="${pkgdir}/usr/share/man/man1" GROUP=42 \
- CONF_BASE="${pkgdir}/etc/privoxy" VAR_DEST="${pkgdir}/var" install
-
- # Don't overwrite existing log files!
- rm "${pkgdir}/var/log/privoxy/"*
-
- install -Dm0755 "${srcdir}/privoxy" "${pkgdir}/etc/rc.d/privoxy"
- install -Dm0644 "${srcdir}/privoxy.logrotate.d" "${pkgdir}/etc/logrotate.d/privoxy"
- install -Dm0644 "${srcdir}/privoxy.conf.d" "${pkgdir}/etc/conf.d/privoxy"
-
- # Fix config 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"
-
- # Fix group ownership and permissions.
- chgrp -R 42 "${pkgdir}/etc/privoxy/"
- chgrp -R 42 "${pkgdir}/var/log/privoxy/"
-
- find "${pkgdir}/etc/privoxy/" -type d | xargs chmod 0770
- find "${pkgdir}/etc/privoxy/" -type f | xargs chmod 0660
- chmod 0700 "${pkgdir}/var/log/privoxy"
-
- # avoid conflict with filesystem>=2012.06
- rmdir "$pkgdir/var/run"
-
- # systemd unit file
- install -Dm0644 "${srcdir}/privoxy.service" "${pkgdir}/usr/lib/systemd/system/privoxy.service"
-}
Copied: privoxy/repos/community-i686/PKGBUILD (from rev 92054, privoxy/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-05-31 01:13:33 UTC (rev 92055)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Juergen Hoetzel <juergen at hoetzel.info>
+# Contributor: basilburn (basilburn), Paul Bredbury (brebs)
+
+pkgname=privoxy
+pkgver=3.0.21
+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=('79558f2545cfcf9731f7de611646d837'
+ 'fc3046377137003726a151ee27b142a2'
+ '358e614190247fc1671bbcadddf500db')
+
+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
+
+ # Don't overwrite existing log files!
+ rm "${pkgdir}/var/log/privoxy/"*
+
+ install -Dm0644 "${srcdir}/privoxy.logrotate.d" "${pkgdir}/etc/logrotate.d/privoxy"
+
+ # Fix config 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"
+
+ # Fix group ownership and permissions.
+ chgrp -R 42 "${pkgdir}/etc/privoxy/"
+ chgrp -R 42 "${pkgdir}/var/log/privoxy/"
+
+ find "${pkgdir}/etc/privoxy/" -type d | xargs chmod 0770
+ find "${pkgdir}/etc/privoxy/" -type f | xargs chmod 0660
+ chmod 0700 "${pkgdir}/var/log/privoxy"
+
+ # avoid conflict with filesystem>=2012.06
+ rmdir "$pkgdir/var/run"
+
+ # systemd unit file
+ install -Dm0644 "${srcdir}/privoxy.service" "${pkgdir}/usr/lib/systemd/system/privoxy.service"
+}
Deleted: community-i686/privoxy
===================================================================
--- community-i686/privoxy 2013-05-31 01:13:21 UTC (rev 92054)
+++ community-i686/privoxy 2013-05-31 01:13:33 UTC (rev 92055)
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/privoxy ] && . /etc/conf.d/privoxy
-
-# read logdir and logfile from privoxy config
-prld=`grep ^logdir "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
-[ -n "$prld" ] || prld=/var/log/privoxy
-prlf=`grep ^logfile "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
-[ -n "$prlf" ] || prlf=logfile
-
-PID=`pidof -o %PPID /usr/sbin/privoxy`
-
-case "$1" in
- start)
- stat_busy "Starting Privoxy"
- # create missing logdir and logfile
- [ -d "$prld" ] || mkdir -p "$prld"
- if [ ! -f "$prlf" ]; then
- touch "$prld/$prlf" && chgrp "${PRIVOXY_GROUP}" "$prld/$prlf" && \
- chmod 0660 "$prld/$prlf"
- fi
- [ -z "$PID" ] && /usr/sbin/privoxy --user ${PRIVOXY_USER}.${PRIVOXY_GROUP} \
- ${PRIVOXY_ARGS} ${PRIVOXY_CONF}
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon privoxy
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Privoxy"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon privoxy
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Deleted: community-i686/privoxy.conf.d
===================================================================
--- community-i686/privoxy.conf.d 2013-05-31 01:13:21 UTC (rev 92054)
+++ community-i686/privoxy.conf.d 2013-05-31 01:13:33 UTC (rev 92055)
@@ -1,10 +0,0 @@
-# Location of the config file.
-PRIVOXY_CONF='/etc/privoxy/config'
-
-# User and group that privoxy will be run as.
-PRIVOXY_USER='privoxy'
-PRIVOXY_GROUP='privoxy'
-
-# Additional arguments.
-PRIVOXY_ARGS="--pidfile /var/run/privoxy.pid"
-
Deleted: community-i686/privoxy.install
===================================================================
--- community-i686/privoxy.install 2013-05-31 01:13:21 UTC (rev 92054)
+++ community-i686/privoxy.install 2013-05-31 01:13:33 UTC (rev 92055)
@@ -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 92054, privoxy/trunk/privoxy.install)
===================================================================
--- community-i686/privoxy.install (rev 0)
+++ community-i686/privoxy.install 2013-05-31 01:13:33 UTC (rev 92055)
@@ -0,0 +1,19 @@
+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
+}
Deleted: community-i686/privoxy.logrotate.d
===================================================================
--- community-i686/privoxy.logrotate.d 2013-05-31 01:13:21 UTC (rev 92054)
+++ community-i686/privoxy.logrotate.d 2013-05-31 01:13:33 UTC (rev 92055)
@@ -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 92054, privoxy/trunk/privoxy.logrotate.d)
===================================================================
--- community-i686/privoxy.logrotate.d (rev 0)
+++ community-i686/privoxy.logrotate.d 2013-05-31 01:13:33 UTC (rev 92055)
@@ -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 2013-05-31 01:13:21 UTC (rev 92054)
+++ community-i686/privoxy.service 2013-05-31 01:13:33 UTC (rev 92055)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Privoxy Web Proxy With Advanced Filtering Capabilities
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/privoxy.pid
-ExecStart=/usr/sbin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config
-SuccessExitStatus=15
-
-[Install]
-WantedBy=multi-user.target
Copied: privoxy/repos/community-i686/privoxy.service (from rev 92054, privoxy/trunk/privoxy.service)
===================================================================
--- community-i686/privoxy.service (rev 0)
+++ community-i686/privoxy.service 2013-05-31 01:13:33 UTC (rev 92055)
@@ -0,0 +1,12 @@
+[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
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-05-31 01:13:21 UTC (rev 92054)
+++ community-x86_64/PKGBUILD 2013-05-31 01:13:33 UTC (rev 92055)
@@ -1,72 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: Juergen Hoetzel <juergen at hoetzel.info>
-# Contributor: basilburn (basilburn), Paul Bredbury (brebs)
-
-pkgname=privoxy
-pkgver=3.0.19
-pkgrel=7
-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/conf.d/privoxy'
- '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'
- 'privoxy.logrotate.d'
- 'privoxy.conf.d'
- 'privoxy.service')
-md5sums=('57acc79059565cc42eda67982842785d'
- '1b4ed8c4e7e5b04b10ef41b597dc3f3b'
- 'fc3046377137003726a151ee27b142a2'
- '27830ef79418e277b90c1c1fa933f876'
- '4c154a126ec17b02c623e3d451e062d9')
-
-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" MAN_DEST="${pkgdir}/usr/share/man/man1" GROUP=42 \
- CONF_BASE="${pkgdir}/etc/privoxy" VAR_DEST="${pkgdir}/var" install
-
- # Don't overwrite existing log files!
- rm "${pkgdir}/var/log/privoxy/"*
-
- install -Dm0755 "${srcdir}/privoxy" "${pkgdir}/etc/rc.d/privoxy"
- install -Dm0644 "${srcdir}/privoxy.logrotate.d" "${pkgdir}/etc/logrotate.d/privoxy"
- install -Dm0644 "${srcdir}/privoxy.conf.d" "${pkgdir}/etc/conf.d/privoxy"
-
- # Fix config 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"
-
- # Fix group ownership and permissions.
- chgrp -R 42 "${pkgdir}/etc/privoxy/"
- chgrp -R 42 "${pkgdir}/var/log/privoxy/"
-
- find "${pkgdir}/etc/privoxy/" -type d | xargs chmod 0770
- find "${pkgdir}/etc/privoxy/" -type f | xargs chmod 0660
- chmod 0700 "${pkgdir}/var/log/privoxy"
-
- # avoid conflict with filesystem>=2012.06
- rmdir "$pkgdir/var/run"
-
- # systemd unit file
- install -Dm0644 "${srcdir}/privoxy.service" "${pkgdir}/usr/lib/systemd/system/privoxy.service"
-}
Copied: privoxy/repos/community-x86_64/PKGBUILD (from rev 92054, privoxy/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-05-31 01:13:33 UTC (rev 92055)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Juergen Hoetzel <juergen at hoetzel.info>
+# Contributor: basilburn (basilburn), Paul Bredbury (brebs)
+
+pkgname=privoxy
+pkgver=3.0.21
+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=('79558f2545cfcf9731f7de611646d837'
+ 'fc3046377137003726a151ee27b142a2'
+ '358e614190247fc1671bbcadddf500db')
+
+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
+
+ # Don't overwrite existing log files!
+ rm "${pkgdir}/var/log/privoxy/"*
+
+ install -Dm0644 "${srcdir}/privoxy.logrotate.d" "${pkgdir}/etc/logrotate.d/privoxy"
+
+ # Fix config 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"
+
+ # Fix group ownership and permissions.
+ chgrp -R 42 "${pkgdir}/etc/privoxy/"
+ chgrp -R 42 "${pkgdir}/var/log/privoxy/"
+
+ find "${pkgdir}/etc/privoxy/" -type d | xargs chmod 0770
+ find "${pkgdir}/etc/privoxy/" -type f | xargs chmod 0660
+ chmod 0700 "${pkgdir}/var/log/privoxy"
+
+ # avoid conflict with filesystem>=2012.06
+ rmdir "$pkgdir/var/run"
+
+ # systemd unit file
+ install -Dm0644 "${srcdir}/privoxy.service" "${pkgdir}/usr/lib/systemd/system/privoxy.service"
+}
Deleted: community-x86_64/privoxy
===================================================================
--- community-x86_64/privoxy 2013-05-31 01:13:21 UTC (rev 92054)
+++ community-x86_64/privoxy 2013-05-31 01:13:33 UTC (rev 92055)
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# source application-specific settings
-[ -f /etc/conf.d/privoxy ] && . /etc/conf.d/privoxy
-
-# read logdir and logfile from privoxy config
-prld=`grep ^logdir "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
-[ -n "$prld" ] || prld=/var/log/privoxy
-prlf=`grep ^logfile "$PRIVOXY_CONF" 2>/dev/null | cut -d' ' -f2`
-[ -n "$prlf" ] || prlf=logfile
-
-PID=`pidof -o %PPID /usr/sbin/privoxy`
-
-case "$1" in
- start)
- stat_busy "Starting Privoxy"
- # create missing logdir and logfile
- [ -d "$prld" ] || mkdir -p "$prld"
- if [ ! -f "$prlf" ]; then
- touch "$prld/$prlf" && chgrp "${PRIVOXY_GROUP}" "$prld/$prlf" && \
- chmod 0660 "$prld/$prlf"
- fi
- [ -z "$PID" ] && /usr/sbin/privoxy --user ${PRIVOXY_USER}.${PRIVOXY_GROUP} \
- ${PRIVOXY_ARGS} ${PRIVOXY_CONF}
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon privoxy
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Privoxy"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon privoxy
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
Deleted: community-x86_64/privoxy.conf.d
===================================================================
--- community-x86_64/privoxy.conf.d 2013-05-31 01:13:21 UTC (rev 92054)
+++ community-x86_64/privoxy.conf.d 2013-05-31 01:13:33 UTC (rev 92055)
@@ -1,10 +0,0 @@
-# Location of the config file.
-PRIVOXY_CONF='/etc/privoxy/config'
-
-# User and group that privoxy will be run as.
-PRIVOXY_USER='privoxy'
-PRIVOXY_GROUP='privoxy'
-
-# Additional arguments.
-PRIVOXY_ARGS="--pidfile /var/run/privoxy.pid"
-
Deleted: community-x86_64/privoxy.install
===================================================================
--- community-x86_64/privoxy.install 2013-05-31 01:13:21 UTC (rev 92054)
+++ community-x86_64/privoxy.install 2013-05-31 01:13:33 UTC (rev 92055)
@@ -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 92054, privoxy/trunk/privoxy.install)
===================================================================
--- community-x86_64/privoxy.install (rev 0)
+++ community-x86_64/privoxy.install 2013-05-31 01:13:33 UTC (rev 92055)
@@ -0,0 +1,19 @@
+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
+}
Deleted: community-x86_64/privoxy.logrotate.d
===================================================================
--- community-x86_64/privoxy.logrotate.d 2013-05-31 01:13:21 UTC (rev 92054)
+++ community-x86_64/privoxy.logrotate.d 2013-05-31 01:13:33 UTC (rev 92055)
@@ -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 92054, privoxy/trunk/privoxy.logrotate.d)
===================================================================
--- community-x86_64/privoxy.logrotate.d (rev 0)
+++ community-x86_64/privoxy.logrotate.d 2013-05-31 01:13:33 UTC (rev 92055)
@@ -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 2013-05-31 01:13:21 UTC (rev 92054)
+++ community-x86_64/privoxy.service 2013-05-31 01:13:33 UTC (rev 92055)
@@ -1,12 +0,0 @@
-[Unit]
-Description=Privoxy Web Proxy With Advanced Filtering Capabilities
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/privoxy.pid
-ExecStart=/usr/sbin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config
-SuccessExitStatus=15
-
-[Install]
-WantedBy=multi-user.target
Copied: privoxy/repos/community-x86_64/privoxy.service (from rev 92054, privoxy/trunk/privoxy.service)
===================================================================
--- community-x86_64/privoxy.service (rev 0)
+++ community-x86_64/privoxy.service 2013-05-31 01:13:33 UTC (rev 92055)
@@ -0,0 +1,12 @@
+[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
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list