[arch-commits] Commit in privoxy/repos (18 files)
Lukas Fleischer
lfleischer at archlinux.org
Tue Aug 30 04:57:09 UTC 2016
Date: Tuesday, August 30, 2016 @ 04:57:08
Author: lfleischer
Revision: 188018
archrelease: copy trunk to community-i686, community-x86_64
Added:
privoxy/repos/community-i686/PKGBUILD
(from rev 188017, privoxy/trunk/PKGBUILD)
privoxy/repos/community-i686/privoxy.install
(from rev 188017, privoxy/trunk/privoxy.install)
privoxy/repos/community-i686/privoxy.logrotate.d
(from rev 188017, privoxy/trunk/privoxy.logrotate.d)
privoxy/repos/community-i686/privoxy.service
(from rev 188017, privoxy/trunk/privoxy.service)
privoxy/repos/community-i686/privoxy.sysusers
(from rev 188017, privoxy/trunk/privoxy.sysusers)
privoxy/repos/community-x86_64/PKGBUILD
(from rev 188017, privoxy/trunk/PKGBUILD)
privoxy/repos/community-x86_64/privoxy.install
(from rev 188017, privoxy/trunk/privoxy.install)
privoxy/repos/community-x86_64/privoxy.logrotate.d
(from rev 188017, privoxy/trunk/privoxy.logrotate.d)
privoxy/repos/community-x86_64/privoxy.service
(from rev 188017, privoxy/trunk/privoxy.service)
privoxy/repos/community-x86_64/privoxy.sysusers
(from rev 188017, privoxy/trunk/privoxy.sysusers)
Deleted:
privoxy/repos/community-i686/PKGBUILD
privoxy/repos/community-i686/privoxy.install
privoxy/repos/community-i686/privoxy.logrotate.d
privoxy/repos/community-i686/privoxy.service
privoxy/repos/community-x86_64/PKGBUILD
privoxy/repos/community-x86_64/privoxy.install
privoxy/repos/community-x86_64/privoxy.logrotate.d
privoxy/repos/community-x86_64/privoxy.service
--------------------------------------+
/PKGBUILD | 126 +++++++++++++++++++++++++++++++++
/privoxy.install | 6 +
/privoxy.logrotate.d | 18 ++++
/privoxy.service | 24 ++++++
community-i686/PKGBUILD | 57 --------------
community-i686/privoxy.install | 12 ---
community-i686/privoxy.logrotate.d | 9 --
community-i686/privoxy.service | 13 ---
community-i686/privoxy.sysusers | 1
community-x86_64/PKGBUILD | 57 --------------
community-x86_64/privoxy.install | 12 ---
community-x86_64/privoxy.logrotate.d | 9 --
community-x86_64/privoxy.service | 13 ---
community-x86_64/privoxy.sysusers | 1
14 files changed, 176 insertions(+), 182 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-08-30 04:56:55 UTC (rev 188017)
+++ community-i686/PKGBUILD 2016-08-30 04:57:08 UTC (rev 188018)
@@ -1,57 +0,0 @@
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Juergen Hoetzel <juergen at hoetzel.info>
-# Contributor: basilburn (basilburn), Paul Bredbury (brebs)
-
-pkgname=privoxy
-pkgver=3.0.24
-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')
-install='privoxy.install'
-source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz"
- 'privoxy.logrotate.d'
- 'privoxy.service')
-md5sums=('44a47d1a5000db8cccd61ace0e25e7f7'
- 'e8196e745c765b398b3bfac68f370279'
- '37965b9a52ab1f2cb9f36cee617f5cf9')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}-stable"
-
- autoheader
- autoconf
- ./configure --prefix=/usr --sysconfdir=/etc/privoxy --enable-compression
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}-stable"
-
- 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
-
- # Fix configuration 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"
-
- # Install systemd unit and logrotate configuration.
- install -Dm0644 "${srcdir}/privoxy.service" "${pkgdir}/usr/lib/systemd/system/privoxy.service"
- install -Dm0644 "${srcdir}/privoxy.logrotate.d" "${pkgdir}/etc/logrotate.d/privoxy"
-
- # Don't overwrite existing log files and fix log directory permissions.
- rm "${pkgdir}/var/log/privoxy/"*
- chown -R 42:42 "${pkgdir}"/etc/privoxy "${pkgdir}"/var/log/privoxy
-
- # Avoid conflict with filesystem>=2012.06.
- rmdir "$pkgdir/var/run"
-}
Copied: privoxy/repos/community-i686/PKGBUILD (from rev 188017, privoxy/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2016-08-30 04:57:08 UTC (rev 188018)
@@ -0,0 +1,63 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Juergen Hoetzel <juergen at hoetzel.info>
+# Contributor: basilburn (basilburn), Paul Bredbury (brebs)
+# Contributor: lolilolicon
+
+pkgname=privoxy
+pkgver=3.0.26
+pkgrel=1
+pkgdesc='A web proxy with advanced filtering capabilities.'
+arch=('i686' 'x86_64')
+url='https://www.privoxy.org'
+license=('GPL2')
+depends=('pcre' 'zlib')
+makedepends=('autoconf')
+backup=('etc/privoxy/'{config,trust,match-all.action,{default,user}.{action,filter}}
+ 'etc/logrotate.d/privoxy')
+install='privoxy.install'
+source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz"
+ 'privoxy.logrotate.d'
+ 'privoxy.sysusers'
+ 'privoxy.service')
+md5sums=('8a1c842112ccea68c19b7ceb4a0e999f'
+ 'e8196e745c765b398b3bfac68f370279'
+ 'b16776164ab677282c44a8729743eca1'
+ '99ecefbdab8d2260d9b217895b3adc73')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}-stable"
+
+ autoheader
+ autoconf
+ ./configure --prefix=/usr --sysconfdir=/etc/privoxy --enable-compression
+
+ make
+ sed -i '
+ s+^confdir \.+confdir /etc/privoxy+
+ s+^logdir \.+logdir /var/log/privoxy+
+ s+^#\?user-manual .*+user-manual /usr/share/doc/privoxy/user-manual/+' config
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}-stable"
+
+ install -Dm644 "$srcdir/privoxy.service" "$pkgdir/usr/lib/systemd/system/privoxy.service"
+ install -Dm644 "$srcdir/privoxy.sysusers" "$pkgdir/usr/lib/sysusers.d/privoxy.conf"
+ install -Dm644 "$srcdir/privoxy.logrotate.d" "$pkgdir/etc/logrotate.d/privoxy"
+
+ install -Dm755 {,"$pkgdir"/usr/bin/}privoxy
+ install -Dm644 {,"$pkgdir"/usr/share/man/man1/}privoxy.1
+ install -d -o42 -g42 "$pkgdir"/var/log/privoxy
+
+ install -d "$pkgdir"/etc/privoxy/
+ install -m644 config trust *.{action,filter} "$pkgdir"/etc/privoxy/ # -m0660 upstream
+ find templates -type f -exec install -Dm644 '{}' "$pkgdir"/etc/privoxy/'{}' \;
+
+ (d=$pkgdir/usr/share/doc/privoxy
+ cd doc/webserver
+ install -Dm644 {privoxy-,"$d"/}index.html
+ install -m644 p_doc.css ../../{AUTHORS,README,ChangeLog} "$d"/
+ install -Dm644 {,"$d"/user-manual/}p_doc.css
+ find user-manual developer-manual faq man-page \( -name '*.html' -o -name '*.jpg' \) \
+ -exec install -Dm644 '{}' "$d"/'{}' \;)
+}
Deleted: community-i686/privoxy.install
===================================================================
--- community-i686/privoxy.install 2016-08-30 04:56:55 UTC (rev 188017)
+++ community-i686/privoxy.install 2016-08-30 04:57:08 UTC (rev 188018)
@@ -1,12 +0,0 @@
-post_install() {
- groupadd -g 42 privoxy &>/dev/null
- useradd -u 42 -g privoxy -d /var/spool/privoxy -s /bin/false privoxy &>/dev/null
-
- if [ ! -d /var/spool/privoxy ]; then
- install -dm0770 -o privoxy -g privoxy /var/spool/privoxy
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
Copied: privoxy/repos/community-i686/privoxy.install (from rev 188017, privoxy/trunk/privoxy.install)
===================================================================
--- community-i686/privoxy.install (rev 0)
+++ community-i686/privoxy.install 2016-08-30 04:57:08 UTC (rev 188018)
@@ -0,0 +1,3 @@
+post_install() {
+ systemd-sysusers privoxy.conf
+}
Deleted: community-i686/privoxy.logrotate.d
===================================================================
--- community-i686/privoxy.logrotate.d 2016-08-30 04:56:55 UTC (rev 188017)
+++ community-i686/privoxy.logrotate.d 2016-08-30 04:57:08 UTC (rev 188018)
@@ -1,9 +0,0 @@
-/var/log/privoxy/logfile {
- missingok
- create 660 root privoxy
- notifempty
- compress
- postrotate
- /bin/kill -HUP `cat /var/run/privoxy.pid 2>/dev/null` 2> /dev/null || true
- endscript
-}
Copied: privoxy/repos/community-i686/privoxy.logrotate.d (from rev 188017, privoxy/trunk/privoxy.logrotate.d)
===================================================================
--- community-i686/privoxy.logrotate.d (rev 0)
+++ community-i686/privoxy.logrotate.d 2016-08-30 04:57:08 UTC (rev 188018)
@@ -0,0 +1,9 @@
+/var/log/privoxy/logfile {
+ missingok
+ create 660 root privoxy
+ notifempty
+ compress
+ postrotate
+ /bin/kill -HUP `cat /var/run/privoxy.pid 2>/dev/null` 2> /dev/null || true
+ endscript
+}
Deleted: community-i686/privoxy.service
===================================================================
--- community-i686/privoxy.service 2016-08-30 04:56:55 UTC (rev 188017)
+++ community-i686/privoxy.service 2016-08-30 04:57:08 UTC (rev 188018)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Privoxy Web Proxy With Advanced Filtering Capabilities
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/privoxy.pid
-ExecStart=/usr/bin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config
-SuccessExitStatus=15
-PrivateDevices=yes
-
-[Install]
-WantedBy=multi-user.target
Copied: privoxy/repos/community-i686/privoxy.service (from rev 188017, privoxy/trunk/privoxy.service)
===================================================================
--- community-i686/privoxy.service (rev 0)
+++ community-i686/privoxy.service 2016-08-30 04:57:08 UTC (rev 188018)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Privoxy Web Proxy With Advanced Filtering Capabilities
+After=network.target
+
+[Service]
+User=privoxy
+Type=simple
+ExecStart=/usr/bin/privoxy --no-daemon /etc/privoxy/config
+PrivateDevices=yes
+
+[Install]
+WantedBy=multi-user.target
Copied: privoxy/repos/community-i686/privoxy.sysusers (from rev 188017, privoxy/trunk/privoxy.sysusers)
===================================================================
--- community-i686/privoxy.sysusers (rev 0)
+++ community-i686/privoxy.sysusers 2016-08-30 04:57:08 UTC (rev 188018)
@@ -0,0 +1 @@
+u privoxy 42 "Privoxy"
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-08-30 04:56:55 UTC (rev 188017)
+++ community-x86_64/PKGBUILD 2016-08-30 04:57:08 UTC (rev 188018)
@@ -1,57 +0,0 @@
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Juergen Hoetzel <juergen at hoetzel.info>
-# Contributor: basilburn (basilburn), Paul Bredbury (brebs)
-
-pkgname=privoxy
-pkgver=3.0.24
-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')
-install='privoxy.install'
-source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz"
- 'privoxy.logrotate.d'
- 'privoxy.service')
-md5sums=('44a47d1a5000db8cccd61ace0e25e7f7'
- 'e8196e745c765b398b3bfac68f370279'
- '37965b9a52ab1f2cb9f36cee617f5cf9')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}-stable"
-
- autoheader
- autoconf
- ./configure --prefix=/usr --sysconfdir=/etc/privoxy --enable-compression
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}-stable"
-
- 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
-
- # Fix configuration 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"
-
- # Install systemd unit and logrotate configuration.
- install -Dm0644 "${srcdir}/privoxy.service" "${pkgdir}/usr/lib/systemd/system/privoxy.service"
- install -Dm0644 "${srcdir}/privoxy.logrotate.d" "${pkgdir}/etc/logrotate.d/privoxy"
-
- # Don't overwrite existing log files and fix log directory permissions.
- rm "${pkgdir}/var/log/privoxy/"*
- chown -R 42:42 "${pkgdir}"/etc/privoxy "${pkgdir}"/var/log/privoxy
-
- # Avoid conflict with filesystem>=2012.06.
- rmdir "$pkgdir/var/run"
-}
Copied: privoxy/repos/community-x86_64/PKGBUILD (from rev 188017, privoxy/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-08-30 04:57:08 UTC (rev 188018)
@@ -0,0 +1,63 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Juergen Hoetzel <juergen at hoetzel.info>
+# Contributor: basilburn (basilburn), Paul Bredbury (brebs)
+# Contributor: lolilolicon
+
+pkgname=privoxy
+pkgver=3.0.26
+pkgrel=1
+pkgdesc='A web proxy with advanced filtering capabilities.'
+arch=('i686' 'x86_64')
+url='https://www.privoxy.org'
+license=('GPL2')
+depends=('pcre' 'zlib')
+makedepends=('autoconf')
+backup=('etc/privoxy/'{config,trust,match-all.action,{default,user}.{action,filter}}
+ 'etc/logrotate.d/privoxy')
+install='privoxy.install'
+source=("http://downloads.sourceforge.net/ijbswa/${pkgname}-${pkgver}-stable-src.tar.gz"
+ 'privoxy.logrotate.d'
+ 'privoxy.sysusers'
+ 'privoxy.service')
+md5sums=('8a1c842112ccea68c19b7ceb4a0e999f'
+ 'e8196e745c765b398b3bfac68f370279'
+ 'b16776164ab677282c44a8729743eca1'
+ '99ecefbdab8d2260d9b217895b3adc73')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}-stable"
+
+ autoheader
+ autoconf
+ ./configure --prefix=/usr --sysconfdir=/etc/privoxy --enable-compression
+
+ make
+ sed -i '
+ s+^confdir \.+confdir /etc/privoxy+
+ s+^logdir \.+logdir /var/log/privoxy+
+ s+^#\?user-manual .*+user-manual /usr/share/doc/privoxy/user-manual/+' config
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}-stable"
+
+ install -Dm644 "$srcdir/privoxy.service" "$pkgdir/usr/lib/systemd/system/privoxy.service"
+ install -Dm644 "$srcdir/privoxy.sysusers" "$pkgdir/usr/lib/sysusers.d/privoxy.conf"
+ install -Dm644 "$srcdir/privoxy.logrotate.d" "$pkgdir/etc/logrotate.d/privoxy"
+
+ install -Dm755 {,"$pkgdir"/usr/bin/}privoxy
+ install -Dm644 {,"$pkgdir"/usr/share/man/man1/}privoxy.1
+ install -d -o42 -g42 "$pkgdir"/var/log/privoxy
+
+ install -d "$pkgdir"/etc/privoxy/
+ install -m644 config trust *.{action,filter} "$pkgdir"/etc/privoxy/ # -m0660 upstream
+ find templates -type f -exec install -Dm644 '{}' "$pkgdir"/etc/privoxy/'{}' \;
+
+ (d=$pkgdir/usr/share/doc/privoxy
+ cd doc/webserver
+ install -Dm644 {privoxy-,"$d"/}index.html
+ install -m644 p_doc.css ../../{AUTHORS,README,ChangeLog} "$d"/
+ install -Dm644 {,"$d"/user-manual/}p_doc.css
+ find user-manual developer-manual faq man-page \( -name '*.html' -o -name '*.jpg' \) \
+ -exec install -Dm644 '{}' "$d"/'{}' \;)
+}
Deleted: community-x86_64/privoxy.install
===================================================================
--- community-x86_64/privoxy.install 2016-08-30 04:56:55 UTC (rev 188017)
+++ community-x86_64/privoxy.install 2016-08-30 04:57:08 UTC (rev 188018)
@@ -1,12 +0,0 @@
-post_install() {
- groupadd -g 42 privoxy &>/dev/null
- useradd -u 42 -g privoxy -d /var/spool/privoxy -s /bin/false privoxy &>/dev/null
-
- if [ ! -d /var/spool/privoxy ]; then
- install -dm0770 -o privoxy -g privoxy /var/spool/privoxy
- fi
-}
-
-post_upgrade() {
- post_install $1
-}
Copied: privoxy/repos/community-x86_64/privoxy.install (from rev 188017, privoxy/trunk/privoxy.install)
===================================================================
--- community-x86_64/privoxy.install (rev 0)
+++ community-x86_64/privoxy.install 2016-08-30 04:57:08 UTC (rev 188018)
@@ -0,0 +1,3 @@
+post_install() {
+ systemd-sysusers privoxy.conf
+}
Deleted: community-x86_64/privoxy.logrotate.d
===================================================================
--- community-x86_64/privoxy.logrotate.d 2016-08-30 04:56:55 UTC (rev 188017)
+++ community-x86_64/privoxy.logrotate.d 2016-08-30 04:57:08 UTC (rev 188018)
@@ -1,9 +0,0 @@
-/var/log/privoxy/logfile {
- missingok
- create 660 root privoxy
- notifempty
- compress
- postrotate
- /bin/kill -HUP `cat /var/run/privoxy.pid 2>/dev/null` 2> /dev/null || true
- endscript
-}
Copied: privoxy/repos/community-x86_64/privoxy.logrotate.d (from rev 188017, privoxy/trunk/privoxy.logrotate.d)
===================================================================
--- community-x86_64/privoxy.logrotate.d (rev 0)
+++ community-x86_64/privoxy.logrotate.d 2016-08-30 04:57:08 UTC (rev 188018)
@@ -0,0 +1,9 @@
+/var/log/privoxy/logfile {
+ missingok
+ create 660 root privoxy
+ notifempty
+ compress
+ postrotate
+ /bin/kill -HUP `cat /var/run/privoxy.pid 2>/dev/null` 2> /dev/null || true
+ endscript
+}
Deleted: community-x86_64/privoxy.service
===================================================================
--- community-x86_64/privoxy.service 2016-08-30 04:56:55 UTC (rev 188017)
+++ community-x86_64/privoxy.service 2016-08-30 04:57:08 UTC (rev 188018)
@@ -1,13 +0,0 @@
-[Unit]
-Description=Privoxy Web Proxy With Advanced Filtering Capabilities
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/privoxy.pid
-ExecStart=/usr/bin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config
-SuccessExitStatus=15
-PrivateDevices=yes
-
-[Install]
-WantedBy=multi-user.target
Copied: privoxy/repos/community-x86_64/privoxy.service (from rev 188017, privoxy/trunk/privoxy.service)
===================================================================
--- community-x86_64/privoxy.service (rev 0)
+++ community-x86_64/privoxy.service 2016-08-30 04:57:08 UTC (rev 188018)
@@ -0,0 +1,12 @@
+[Unit]
+Description=Privoxy Web Proxy With Advanced Filtering Capabilities
+After=network.target
+
+[Service]
+User=privoxy
+Type=simple
+ExecStart=/usr/bin/privoxy --no-daemon /etc/privoxy/config
+PrivateDevices=yes
+
+[Install]
+WantedBy=multi-user.target
Copied: privoxy/repos/community-x86_64/privoxy.sysusers (from rev 188017, privoxy/trunk/privoxy.sysusers)
===================================================================
--- community-x86_64/privoxy.sysusers (rev 0)
+++ community-x86_64/privoxy.sysusers 2016-08-30 04:57:08 UTC (rev 188018)
@@ -0,0 +1 @@
+u privoxy 42 "Privoxy"
More information about the arch-commits
mailing list