[arch-commits] Commit in polipo/repos (14 files)
Daniel Micay
thestinger at nymeria.archlinux.org
Fri Apr 11 03:52:28 UTC 2014
Date: Friday, April 11, 2014 @ 05:52:27
Author: thestinger
Revision: 109177
archrelease: copy trunk to community-i686, community-x86_64
Added:
polipo/repos/community-i686/PKGBUILD
(from rev 109176, polipo/trunk/PKGBUILD)
polipo/repos/community-i686/polipo.install
(from rev 109176, polipo/trunk/polipo.install)
polipo/repos/community-i686/polipo.service
(from rev 109176, polipo/trunk/polipo.service)
polipo/repos/community-x86_64/PKGBUILD
(from rev 109176, polipo/trunk/PKGBUILD)
polipo/repos/community-x86_64/polipo.install
(from rev 109176, polipo/trunk/polipo.install)
polipo/repos/community-x86_64/polipo.service
(from rev 109176, polipo/trunk/polipo.service)
Deleted:
polipo/repos/community-i686/PKGBUILD
polipo/repos/community-i686/polipo.conf.d
polipo/repos/community-i686/polipo.install
polipo/repos/community-i686/polipo.service
polipo/repos/community-x86_64/PKGBUILD
polipo/repos/community-x86_64/polipo.conf.d
polipo/repos/community-x86_64/polipo.install
polipo/repos/community-x86_64/polipo.service
---------------------------------+
/PKGBUILD | 102 ++++++++++++++++++++++++++++++++++++++
/polipo.install | 102 ++++++++++++++++++++++++++++++++++++++
/polipo.service | 20 +++++++
community-i686/PKGBUILD | 52 -------------------
community-i686/polipo.conf.d | 4 -
community-i686/polipo.install | 25 ---------
community-i686/polipo.service | 11 ----
community-x86_64/PKGBUILD | 52 -------------------
community-x86_64/polipo.conf.d | 4 -
community-x86_64/polipo.install | 25 ---------
community-x86_64/polipo.service | 11 ----
11 files changed, 224 insertions(+), 184 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-04-11 03:51:53 UTC (rev 109176)
+++ community-i686/PKGBUILD 2014-04-11 03:52:27 UTC (rev 109177)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Thorsten Töpper <atsutane-tu at freethoughts.de>
-# Contributor: Jelle van der Waa <jelle vdwaa nl>
-# Contributor: Thomas Holmquist <thomas at vorget.com>
-# Contributor: Jan Boehringer <ja(a)bm-boehringer.de>
-# Contributor: Alex Griffin <griffin.aj(a)gmail.com>
-
-pkgname=polipo
-pkgver=1.0.4.1
-pkgrel=10
-pkgdesc="A small and fast caching web proxy."
-arch=('i686' 'x86_64')
-url="http://www.pps.jussieu.fr/~jch/software/polipo/"
-license=('GPL')
-depends=('bash')
-makedepends=('texinfo')
-install=polipo.install
-source=("http://freehaven.net/~chrisd/polipo/polipo-$pkgver.tar.gz"
- "polipo.conf.d" "polipo.service")
-md5sums=('bfc5c85289519658280e093a270d6703'
- '685aa0c6070dee11c701932d23afcc6a'
- '143ef45db99dc745b6c3a606847be9fe')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make PREFIX="$pkgdir/usr" \
- MANDIR="$pkgdir/usr/share/man" \
- INFODIR="$pkgdir/usr/share/info" \
- LOCAL_ROOT="$pkgdir/usr/share/polipo/www" \
- DISK_CACHE_ROOT="$pkgdir/var/cache/polipo" \
- install
-
-
- # install config files
- install -Dm 644 config.sample $pkgdir/etc/polipo/config.sample
- install -Dm 644 forbidden.sample $pkgdir/etc/polipo/forbidden.sample
-
- # install license
- install -Dm644 COPYING $pkgdir/usr/share/licenses/polipo/LICENSE
-
- # install systemd service / cron
- install -Dm 644 $srcdir/polipo.service $pkgdir/usr/lib/systemd/system/polipo.service
- install -Dm 644 $srcdir/polipo.conf.d $pkgdir/etc/conf.d/polipo.conf
-}
-
-# vim:set ts=2 sw=2 et:
Copied: polipo/repos/community-i686/PKGBUILD (from rev 109176, polipo/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-04-11 03:52:27 UTC (rev 109177)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Thorsten Töpper <atsutane-tu at freethoughts.de>
+# Contributor: Jelle van der Waa <jelle vdwaa nl>
+# Contributor: Daniel Micay <danielmicay at gmail.com>
+# Contributor: Thomas Holmquist <thomas at vorget.com>
+# Contributor: Jan Boehringer <ja(a)bm-boehringer.de>
+# Contributor: Alex Griffin <griffin.aj(a)gmail.com>
+
+pkgname=polipo
+pkgver=1.0.4.1
+pkgrel=11
+pkgdesc="A small and fast caching web proxy."
+arch=('i686' 'x86_64')
+url="http://www.pps.jussieu.fr/~jch/software/polipo/"
+license=('GPL')
+depends=('bash')
+makedepends=('texinfo')
+install=polipo.install
+source=("http://freehaven.net/~chrisd/polipo/polipo-$pkgver.tar.gz"
+ polipo.service)
+md5sums=('bfc5c85289519658280e093a270d6703'
+ 'bec010ab5e49e6bdb65a825f11333cfd')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make PREFIX="$pkgdir/usr" \
+ MANDIR="$pkgdir/usr/share/man" \
+ INFODIR="$pkgdir/usr/share/info" \
+ LOCAL_ROOT="$pkgdir/usr/share/polipo/www" \
+ DISK_CACHE_ROOT="$pkgdir/var/cache/polipo" \
+ install
+
+ # install config files
+ install -Dm 644 config.sample "$pkgdir/etc/polipo/config.sample"
+ install -Dm 644 forbidden.sample "$pkgdir/etc/polipo/forbidden.sample"
+
+ # install license
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/polipo/LICENSE"
+
+ # install systemd service
+ install -Dm 644 "$srcdir/polipo.service" "$pkgdir/usr/lib/systemd/system/polipo.service"
+
+ install -dm 700 -o 185 -g 185 "$pkgdir/var/cache/polipo"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/polipo.conf.d
===================================================================
--- community-i686/polipo.conf.d 2014-04-11 03:51:53 UTC (rev 109176)
+++ community-i686/polipo.conf.d 2014-04-11 03:52:27 UTC (rev 109177)
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to polipo
-#
-POLIPO_ARGS="daemonise=true logFile=\"/var/log/polipo.log\""
Deleted: community-i686/polipo.install
===================================================================
--- community-i686/polipo.install 2014-04-11 03:51:53 UTC (rev 109176)
+++ community-i686/polipo.install 2014-04-11 03:52:27 UTC (rev 109177)
@@ -1,25 +0,0 @@
-infodir=/usr/share/info
-filelist=(polipo.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file $infodir/dir 2> /dev/null
- done
- install -d /var/cache/polipo 2> /dev/null
- touch /var/log/polipo.log 2> /dev/null
- chown -R nobody:nobody /var/cache/polipo /var/log/polipo.log 2> /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file $infodir/dir 2> /dev/null
- done
-}
-
-# vim:set ts=2 sw=2 et:
Copied: polipo/repos/community-i686/polipo.install (from rev 109176, polipo/trunk/polipo.install)
===================================================================
--- community-i686/polipo.install (rev 0)
+++ community-i686/polipo.install 2014-04-11 03:52:27 UTC (rev 109177)
@@ -0,0 +1,51 @@
+infodir=/usr/share/info
+filelist=(polipo.info)
+
+create_polipo_user() {
+ getent group polipo &>/dev/null || groupadd -g 185 polipo >/dev/null
+ getent passwd polipo &>/dev/null || useradd -u 185 -g polipo \
+ -d /var/cache/polipo \
+ -c 'Caching web proxy' \
+ -s /bin/nologin polipo >/dev/null
+}
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
+ create_polipo_user
+}
+
+post_upgrade() {
+ if [[ $(vercmp $2 1.0.4.1-11) -le 0 ]]; then
+ echo Stopping polipo service in order to modify the user/group.
+ systemctl stop polipo
+
+ # in case the user/group were already created as recommended by the wiki
+ userdel polipo &>/dev/null
+ groupdel polipo &>/dev/null
+
+ create_polipo_user
+ chown -R 185:185 /var/cache/polipo
+
+ echo You may now restart the polipo service.
+ fi
+
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
+post_remove() {
+ getent passwd polipo &>/dev/null && userdel polipo >/dev/null
+ getent group polipo &>/dev/null && groupdel polipo >/dev/null
+ true
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-i686/polipo.service
===================================================================
--- community-i686/polipo.service 2014-04-11 03:51:53 UTC (rev 109176)
+++ community-i686/polipo.service 2014-04-11 03:52:27 UTC (rev 109177)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Polipo Proxy Server
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/polipo daemonise=true logFile="/var/log/polipo.log"
-User=nobody
-
-[Install]
-WantedBy=multi-user.target
Copied: polipo/repos/community-i686/polipo.service (from rev 109176, polipo/trunk/polipo.service)
===================================================================
--- community-i686/polipo.service (rev 0)
+++ community-i686/polipo.service 2014-04-11 03:52:27 UTC (rev 109177)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Polipo Proxy Server
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/polipo
+User=polipo
+
+[Install]
+WantedBy=multi-user.target
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-04-11 03:51:53 UTC (rev 109176)
+++ community-x86_64/PKGBUILD 2014-04-11 03:52:27 UTC (rev 109177)
@@ -1,52 +0,0 @@
-# $Id$
-# Maintainer: Thorsten Töpper <atsutane-tu at freethoughts.de>
-# Contributor: Jelle van der Waa <jelle vdwaa nl>
-# Contributor: Thomas Holmquist <thomas at vorget.com>
-# Contributor: Jan Boehringer <ja(a)bm-boehringer.de>
-# Contributor: Alex Griffin <griffin.aj(a)gmail.com>
-
-pkgname=polipo
-pkgver=1.0.4.1
-pkgrel=10
-pkgdesc="A small and fast caching web proxy."
-arch=('i686' 'x86_64')
-url="http://www.pps.jussieu.fr/~jch/software/polipo/"
-license=('GPL')
-depends=('bash')
-makedepends=('texinfo')
-install=polipo.install
-source=("http://freehaven.net/~chrisd/polipo/polipo-$pkgver.tar.gz"
- "polipo.conf.d" "polipo.service")
-md5sums=('bfc5c85289519658280e093a270d6703'
- '685aa0c6070dee11c701932d23afcc6a'
- '143ef45db99dc745b6c3a606847be9fe')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make PREFIX="$pkgdir/usr" \
- MANDIR="$pkgdir/usr/share/man" \
- INFODIR="$pkgdir/usr/share/info" \
- LOCAL_ROOT="$pkgdir/usr/share/polipo/www" \
- DISK_CACHE_ROOT="$pkgdir/var/cache/polipo" \
- install
-
-
- # install config files
- install -Dm 644 config.sample $pkgdir/etc/polipo/config.sample
- install -Dm 644 forbidden.sample $pkgdir/etc/polipo/forbidden.sample
-
- # install license
- install -Dm644 COPYING $pkgdir/usr/share/licenses/polipo/LICENSE
-
- # install systemd service / cron
- install -Dm 644 $srcdir/polipo.service $pkgdir/usr/lib/systemd/system/polipo.service
- install -Dm 644 $srcdir/polipo.conf.d $pkgdir/etc/conf.d/polipo.conf
-}
-
-# vim:set ts=2 sw=2 et:
Copied: polipo/repos/community-x86_64/PKGBUILD (from rev 109176, polipo/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-04-11 03:52:27 UTC (rev 109177)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Thorsten Töpper <atsutane-tu at freethoughts.de>
+# Contributor: Jelle van der Waa <jelle vdwaa nl>
+# Contributor: Daniel Micay <danielmicay at gmail.com>
+# Contributor: Thomas Holmquist <thomas at vorget.com>
+# Contributor: Jan Boehringer <ja(a)bm-boehringer.de>
+# Contributor: Alex Griffin <griffin.aj(a)gmail.com>
+
+pkgname=polipo
+pkgver=1.0.4.1
+pkgrel=11
+pkgdesc="A small and fast caching web proxy."
+arch=('i686' 'x86_64')
+url="http://www.pps.jussieu.fr/~jch/software/polipo/"
+license=('GPL')
+depends=('bash')
+makedepends=('texinfo')
+install=polipo.install
+source=("http://freehaven.net/~chrisd/polipo/polipo-$pkgver.tar.gz"
+ polipo.service)
+md5sums=('bfc5c85289519658280e093a270d6703'
+ 'bec010ab5e49e6bdb65a825f11333cfd')
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver"
+ make PREFIX="$pkgdir/usr" \
+ MANDIR="$pkgdir/usr/share/man" \
+ INFODIR="$pkgdir/usr/share/info" \
+ LOCAL_ROOT="$pkgdir/usr/share/polipo/www" \
+ DISK_CACHE_ROOT="$pkgdir/var/cache/polipo" \
+ install
+
+ # install config files
+ install -Dm 644 config.sample "$pkgdir/etc/polipo/config.sample"
+ install -Dm 644 forbidden.sample "$pkgdir/etc/polipo/forbidden.sample"
+
+ # install license
+ install -Dm644 COPYING "$pkgdir/usr/share/licenses/polipo/LICENSE"
+
+ # install systemd service
+ install -Dm 644 "$srcdir/polipo.service" "$pkgdir/usr/lib/systemd/system/polipo.service"
+
+ install -dm 700 -o 185 -g 185 "$pkgdir/var/cache/polipo"
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/polipo.conf.d
===================================================================
--- community-x86_64/polipo.conf.d 2014-04-11 03:51:53 UTC (rev 109176)
+++ community-x86_64/polipo.conf.d 2014-04-11 03:52:27 UTC (rev 109177)
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to polipo
-#
-POLIPO_ARGS="daemonise=true logFile=\"/var/log/polipo.log\""
Deleted: community-x86_64/polipo.install
===================================================================
--- community-x86_64/polipo.install 2014-04-11 03:51:53 UTC (rev 109176)
+++ community-x86_64/polipo.install 2014-04-11 03:52:27 UTC (rev 109177)
@@ -1,25 +0,0 @@
-infodir=/usr/share/info
-filelist=(polipo.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file $infodir/dir 2> /dev/null
- done
- install -d /var/cache/polipo 2> /dev/null
- touch /var/log/polipo.log 2> /dev/null
- chown -R nobody:nobody /var/cache/polipo /var/log/polipo.log 2> /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file $infodir/dir 2> /dev/null
- done
-}
-
-# vim:set ts=2 sw=2 et:
Copied: polipo/repos/community-x86_64/polipo.install (from rev 109176, polipo/trunk/polipo.install)
===================================================================
--- community-x86_64/polipo.install (rev 0)
+++ community-x86_64/polipo.install 2014-04-11 03:52:27 UTC (rev 109177)
@@ -0,0 +1,51 @@
+infodir=/usr/share/info
+filelist=(polipo.info)
+
+create_polipo_user() {
+ getent group polipo &>/dev/null || groupadd -g 185 polipo >/dev/null
+ getent passwd polipo &>/dev/null || useradd -u 185 -g polipo \
+ -d /var/cache/polipo \
+ -c 'Caching web proxy' \
+ -s /bin/nologin polipo >/dev/null
+}
+
+post_install() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info $infodir/$file $infodir/dir 2> /dev/null
+ done
+ create_polipo_user
+}
+
+post_upgrade() {
+ if [[ $(vercmp $2 1.0.4.1-11) -le 0 ]]; then
+ echo Stopping polipo service in order to modify the user/group.
+ systemctl stop polipo
+
+ # in case the user/group were already created as recommended by the wiki
+ userdel polipo &>/dev/null
+ groupdel polipo &>/dev/null
+
+ create_polipo_user
+ chown -R 185:185 /var/cache/polipo
+
+ echo You may now restart the polipo service.
+ fi
+
+ post_install $1
+}
+
+pre_remove() {
+ [ -x usr/bin/install-info ] || return 0
+ for file in ${filelist[@]}; do
+ install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+ done
+}
+
+post_remove() {
+ getent passwd polipo &>/dev/null && userdel polipo >/dev/null
+ getent group polipo &>/dev/null && groupdel polipo >/dev/null
+ true
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: community-x86_64/polipo.service
===================================================================
--- community-x86_64/polipo.service 2014-04-11 03:51:53 UTC (rev 109176)
+++ community-x86_64/polipo.service 2014-04-11 03:52:27 UTC (rev 109177)
@@ -1,11 +0,0 @@
-[Unit]
-Description=Polipo Proxy Server
-After=network.target
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/polipo daemonise=true logFile="/var/log/polipo.log"
-User=nobody
-
-[Install]
-WantedBy=multi-user.target
Copied: polipo/repos/community-x86_64/polipo.service (from rev 109176, polipo/trunk/polipo.service)
===================================================================
--- community-x86_64/polipo.service (rev 0)
+++ community-x86_64/polipo.service 2014-04-11 03:52:27 UTC (rev 109177)
@@ -0,0 +1,10 @@
+[Unit]
+Description=Polipo Proxy Server
+After=network.target
+
+[Service]
+ExecStart=/usr/bin/polipo
+User=polipo
+
+[Install]
+WantedBy=multi-user.target
More information about the arch-commits
mailing list