diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-10 11:35:18 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-10 11:35:18 +0200 |
commit | 51d25a8023c8dafdbcafd8bcc6adb19979f15ac6 (patch) | |
tree | 3419b254ec8c04b09a938d993fdb768eae03c005 /community/privoxy | |
parent | 11fe0679d59f68c3fbe3d0a205e5087bf694262e (diff) | |
parent | 7b2739f21a7ed0d52497fa381c9a2383e71ab7a8 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/kdemultimedia/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/samba/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/wine/PKGBUILD
staging/kdemultimedia/PKGBUILD
Diffstat (limited to 'community/privoxy')
-rw-r--r-- | community/privoxy/PKGBUILD | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/community/privoxy/PKGBUILD b/community/privoxy/PKGBUILD index 676001e99..10beb55de 100644 --- a/community/privoxy/PKGBUILD +++ b/community/privoxy/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69634 2012-04-20 19:51:27Z lfleischer $ +# $Id: PKGBUILD 72126 2012-06-08 23:13:24Z dreisner $ # 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=3 +pkgrel=4 pkgdesc='A web proxy with advanced filtering capabilities.' arch=('i686' 'x86_64' 'mips64el') url='http://www.privoxy.org' @@ -61,4 +61,7 @@ package() { 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" } |