diff options
author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 15:25:33 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 15:25:33 -0300 |
commit | cebf33d7109e0157a80f34d6136e212f0a28d274 (patch) | |
tree | a6464302c970f72581105b50ff0896e1f56def3d /community/privoxy | |
parent | 1a65caeb80e2cc8c7b39262d72255124d0c8614e (diff) | |
parent | 5cb95ceee39e4691f768ea2fef60b8a106e92209 (diff) |
Merge branch 'master' of gparabola:abslibre-mips64el
Diffstat (limited to 'community/privoxy')
-rw-r--r-- | community/privoxy/PKGBUILD | 22 | ||||
-rw-r--r-- | community/privoxy/privoxy | 53 | ||||
-rw-r--r-- | community/privoxy/privoxy.conf.d | 10 | ||||
-rw-r--r-- | community/privoxy/privoxy.service | 2 |
4 files changed, 9 insertions, 78 deletions
diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD index ff82d567b..da2bb0532 100644 --- a/community/privoxy/PKGBUILD +++ b/community/privoxy/PKGBUILD @@ -1,32 +1,27 @@ -# $Id: PKGBUILD 80122 2012-11-16 17:01:01Z lfleischer $ +# $Id: PKGBUILD 92055 2013-05-31 01:13:33Z seblu $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: Juergen Hoetzel <juergen@hoetzel.info> # Contributor: basilburn (basilburn), Paul Bredbury (brebs) pkgname=privoxy -pkgver=3.0.19 -pkgrel=7 +pkgver=3.0.21 +pkgrel=1 pkgdesc='A web proxy with advanced filtering capabilities.' arch=('i686' 'x86_64' 'mips64el') 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} +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' 'privoxy.logrotate.d' - 'privoxy.conf.d' 'privoxy.service') -md5sums=('57acc79059565cc42eda67982842785d' - '1b4ed8c4e7e5b04b10ef41b597dc3f3b' +md5sums=('79558f2545cfcf9731f7de611646d837' 'fc3046377137003726a151ee27b142a2' - '27830ef79418e277b90c1c1fa933f876' - '4c154a126ec17b02c623e3d451e062d9') + '358e614190247fc1671bbcadddf500db') build() { cd "${srcdir}/${pkgname}-${pkgver}-stable" @@ -41,15 +36,14 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}-stable" - make prefix="${pkgdir}/usr" MAN_DEST="${pkgdir}/usr/share/man/man1" GROUP=42 \ + 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 -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#' \ diff --git a/community/privoxy/privoxy b/community/privoxy/privoxy deleted file mode 100644 index 754453de5..000000000 --- a/community/privoxy/privoxy +++ /dev/null @@ -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 diff --git a/community/privoxy/privoxy.conf.d b/community/privoxy/privoxy.conf.d deleted file mode 100644 index 9aa11cd67..000000000 --- a/community/privoxy/privoxy.conf.d +++ /dev/null @@ -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" - diff --git a/community/privoxy/privoxy.service b/community/privoxy/privoxy.service index 59a8884f9..e8b04447b 100644 --- a/community/privoxy/privoxy.service +++ b/community/privoxy/privoxy.service @@ -5,7 +5,7 @@ After=network.target [Service] Type=forking PIDFile=/run/privoxy.pid -ExecStart=/usr/sbin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config +ExecStart=/usr/bin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config SuccessExitStatus=15 [Install] |