Version-up privoxy, tor, rebuild vidalia for tor

privoxy/PKGBUILD

@@ -0,0 +1,67 @@
+# Chakra Packages for Chakra, part of chakra-project.org
+#
+# contributor (x86_64): Giuseppe Calà <jiveaxe@gmail.com>
+
+# include global config
+source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
+ 
+
+pkgname=privoxy
+pkgver=3.0.17
+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}
+        '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')
+md5sums=('9d363d738a3f3d73e774d6dfeafdb15f'
+         'a799e4d4f0ebb7f08190fa2bc961f439'
+         'a364c34c8dc6eb78c9a6b777237932de'
+         '27830ef79418e277b90c1c1fa933f876')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}-stable"
+
+  autoheader
+  autoconf
+  ./configure --prefix=/usr --sysconfdir=/etc/privoxy
+
+  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 0770 "${pkgdir}/var/log/privoxy"
+}

privoxy/privoxy

@@ -1,48 +1,40 @@
 #!/bin/bash
 
-# source application-specific settings
-[ -f /etc/conf.d/privoxy ] && . /etc/conf.d/privoxy
-
 . /etc/rc.conf
 . /etc/rc.d/functions
 
+# source application-specific settings
+[ -f /etc/conf.d/privoxy ] && . /etc/conf.d/privoxy
+
 PID=`pidof -o %PPID /usr/sbin/privoxy`
 
-start() {
-  stat_busy "Starting Privoxy"
-
-  # create missing logfiles
-  for i in logfile jarfile; do 
-      touch /var/log/privoxy/$i
-      chgrp $PRIVOXY_GROUP /var/log/privoxy/$i
-      chmod 660 /var/log/privoxy/$i
-  done
-  [ -z "$PID" ] && /usr/sbin/privoxy $PRIVOXY_ARGS 2>/dev/null
-  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
-}
-
 case "$1" in
   start)
-    start
+    stat_busy "Starting Privoxy"
+    # create missing logfiles
+    for f in logfile jarfile; do 
+        touch "/var/log/privoxy/${f}"
+        chgrp "${PRIVOXY_GROUP}" "/var/log/privoxy/${f}"
+        chmod 0660 "/var/log/privoxy/${f}"
+    done
+    [ -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)
-    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

privoxy/privoxy.conf.d

@@ -0,0 +1,10 @@
+# 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"
+

privoxy/privoxy.install

@@ -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
+}

tor/PKGBUILD

@@ -7,7 +7,7 @@
 source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=tor
-pkgver=0.2.1.26
+pkgver=0.2.1.28
 pkgrel=1
 pkgdesc="Anonymizing overlay network"
 arch=('i686' 'x86_64')
@@ -19,7 +19,7 @@ install=tor.install
 source=(http://www.torproject.org/dist/${pkgname}-${pkgver}.tar.gz
 	'tor.conf'
 	'tor.rc')
-md5sums=('f7b30a144e1da41aa43f496bd47ffba7'
+md5sums=(''11e8384414623b50fe50ba7da85893db''
          'c97998c760c4351f12ad41d514071a9b'
          '23348b8e3b38c6ed2a45b4be42a7de8e')
 

vidalia/PKGBUILD

@@ -8,7 +8,7 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
 
 pkgname=vidalia
 pkgver=0.2.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Controller GUI for Tor"
 url="https://www.torproject.org/vidalia"
 arch=('i686' 'x86_64')