[arch-commits] Commit in privoxy/trunk (4 files)

[Sébastien Luttringer]

    Date: Friday, May 31, 2013 @ 03:13:21
  Author: seblu
Revision: 92054

upgpkg: privoxy 3.0.21-1

- upstream release
- /usr merge

Modified:
  privoxy/trunk/PKGBUILD
  privoxy/trunk/privoxy.service
Deleted:
  privoxy/trunk/privoxy
  privoxy/trunk/privoxy.conf.d

-----------------+
 PKGBUILD        |   20 +++++++-------------
 privoxy         |   53 -----------------------------------------------------
 privoxy.conf.d  |   10 ----------
 privoxy.service |    2 +-
 4 files changed, 8 insertions(+), 77 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-31 00:59:49 UTC (rev 92053)
+++ PKGBUILD	2013-05-31 01:13:21 UTC (rev 92054)
@@ -4,29 +4,24 @@
 # 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')
 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 @@
 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#' \

Deleted: privoxy
===================================================================
--- privoxy	2013-05-31 00:59:49 UTC (rev 92053)
+++ privoxy	2013-05-31 01:13:21 UTC (rev 92054)
@@ -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: privoxy.conf.d
===================================================================
--- privoxy.conf.d	2013-05-31 00:59:49 UTC (rev 92053)
+++ privoxy.conf.d	2013-05-31 01:13:21 UTC (rev 92054)
@@ -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"
-

Modified: privoxy.service
===================================================================
--- privoxy.service	2013-05-31 00:59:49 UTC (rev 92053)
+++ privoxy.service	2013-05-31 01:13:21 UTC (rev 92054)
@@ -5,7 +5,7 @@
 [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]