Date: Tuesday, November 3, 2009 @ 13:57:17 Author: giovanni Revision: 58108
Merged revisions 58101 via svnmerge from svn+ssh://gerolde.archlinux.org/srv/svn-packages/privoxy/trunk ........ r58101 | andrea | 2009-11-03 10:18:51 -0800 (mar, 03 nov 2009) | 2 lines upgpkg: privoxy 3.0.12-3 FS#10617 ........ Modified: privoxy/repos/extra-x86_64/ (properties) privoxy/repos/extra-x86_64/PKGBUILD privoxy/repos/extra-x86_64/privoxy.install -----------------+ PKGBUILD | 51 ++++++++++++++++++++++++++------------------------- privoxy.install | 9 +++++++-- 2 files changed, 33 insertions(+), 27 deletions(-) Property changes on: privoxy/repos/extra-x86_64 ___________________________________________________________________ Modified: svnmerge-integrated - /privoxy/trunk:1-46722 + /privoxy/trunk:1-58107 Modified: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2009-11-03 18:54:47 UTC (rev 58107) +++ extra-x86_64/PKGBUILD 2009-11-03 18:57:17 UTC (rev 58108) @@ -1,52 +1,53 @@ # $Id$ -# Maintainer: Juergen Hoetzel <juer...@hoetzel.info> +# Contributor: Juergen Hoetzel <juer...@hoetzel.info> # Contributor: basilburn (basilburn), Paul Bredbury (brebs) pkgname=privoxy pkgver=3.0.12 -pkgrel=2 -pkgdesc="a web proxy with advanced filtering capabilities" -arch=(i686 x86_64) +pkgrel=3 +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) -source=(http://downloads.sourceforge.net/sourceforge/ijbswa/privoxy-$pkgver-stable-src.tar.gz privoxy \ - privoxy.logrotated \ - privoxy.confd) install=privoxy.install +source=(http://downloads.sourceforge.net/ijbswa/$pkgname-$pkgver-stable-src.tar.gz + 'privoxy' + 'privoxy.logrotated' + 'privoxy.confd') +md5sums=('c973e608d27b248ef567b47664308da1' + '3c0f0c3ce941d74f40ddf0f858f7ba8d' + 'a364c34c8dc6eb78c9a6b777237932de' + 'c27cf5aaf0cf89825fd0f7a5a4ebd7c0') build() { GROUP_ID=42 - cd $startdir/src/privoxy-$pkgver-stable + cd $srcdir/$pkgname-$pkgver-stable autoheader && autoconf - ./configure --prefix=/usr --sysconfdir=/etc/privoxy --enable-zlib + ./configure --prefix=/usr --sysconfdir=/etc/privoxy make || return 1 - make prefix=$startdir/pkg/usr MAN_DEST=$startdir/pkg/usr/share/man/man1 \ - GROUP=$GROUP_ID CONF_BASE=$startdir/pkg/etc/privoxy VAR_DEST=$startdir/pkg/var \ + make prefix=$pkgdir/usr MAN_DEST=$pkgdir/usr/share/man/man1 \ + GROUP=$GROUP_ID CONF_BASE=$pkgdir/etc/privoxy VAR_DEST=$pkgdir/var \ install - rm $startdir/pkg/var/log/privoxy/* # don't overwrite existing logfiles! - install -D -m755 ../privoxy $startdir/pkg/etc/rc.d/privoxy - install -D -m644 ../privoxy.logrotated $startdir/pkg/etc/logrotate.d/privoxy - install -D -m644 ../privoxy.confd $startdir/pkg/etc/conf.d/privoxy + rm $pkgdir/var/log/privoxy/* # don't overwrite existing logfiles! + install -D -m755 ${srcdir}/privoxy $pkgdir/etc/rc.d/privoxy + install -D -m644 ${srcdir}/privoxy.logrotated $pkgdir/etc/logrotate.d/privoxy + install -D -m644 ${srcdir}/privoxy.confd $pkgdir/etc/conf.d/privoxy # fix the 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\//' \ - $startdir/pkg/etc/privoxy/config + $pkgdir/etc/privoxy/config # fix permissions - chgrp -R $GROUP_ID $startdir/pkg/etc/privoxy/ - find $startdir/pkg/etc/privoxy/ -type d | xargs chmod 770 - find $startdir/pkg/etc/privoxy/ -type f | xargs chmod 660 - chmod 770 $startdir/pkg/var/log/privoxy - chgrp -R ${GROUP_ID} $startdir/pkg/var/log/privoxy/ + chgrp -R $GROUP_ID $pkgdir/etc/privoxy/ + find $pkgdir/etc/privoxy/ -type d | xargs chmod 770 + find $pkgdir/etc/privoxy/ -type f | xargs chmod 660 + chmod 770 $pkgdir/var/log/privoxy + chgrp -R ${GROUP_ID} $pkgdir/var/log/privoxy/ } -md5sums=('c973e608d27b248ef567b47664308da1' - '3c0f0c3ce941d74f40ddf0f858f7ba8d' - 'a364c34c8dc6eb78c9a6b777237932de' - 'c27cf5aaf0cf89825fd0f7a5a4ebd7c0') Modified: extra-x86_64/privoxy.install =================================================================== --- extra-x86_64/privoxy.install 2009-11-03 18:54:47 UTC (rev 58107) +++ extra-x86_64/privoxy.install 2009-11-03 18:57:17 UTC (rev 58108) @@ -2,7 +2,12 @@ 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 + chown -R privoxy:privoxy etc/privoxy var/log/privoxy + + # create dir if necessary + if [ ! -d var/spool/privoxy ]; then + install -d -m 770 -o privoxy -g privoxy var/spool/privoxy + fi } # arg 1: the new package version @@ -15,9 +20,9 @@ pre_remove() { userdel privoxy &>/dev/null groupdel privoxy &>/dev/null + rm -rf var/spool/privoxy } op=$1 shift - $op $*