Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=c8fc986c1092b0e5a60f4369a86537bc22271fd7
commit c8fc986c1092b0e5a60f4369a86537bc22271fd7 Author: James Buren <[email protected]> Date: Tue Jul 24 01:34:34 2012 -0500 privoxy-3.0.19-1-x86_64 * convert to new systemd schema * remove /var/run and /var/lock directories diff --git a/source/network-extra/privoxy/FrugalBuild b/source/network-extra/privoxy/FrugalBuild index 336d633..45cfc24 100644 --- a/source/network-extra/privoxy/FrugalBuild +++ b/source/network-extra/privoxy/FrugalBuild @@ -2,7 +2,7 @@ # Maintainer: voroskoi <[email protected]> pkgname=privoxy -pkgver=3.0.18 +pkgver=3.0.19 pkgrel=1 pkgdesc="Privoxy is a web proxy with advanced filtering capabilities." _F_sourceforge_dirname="ijbswa" @@ -10,26 +10,37 @@ _F_sourceforge_ext="-stable-src.tar.gz" Finclude sourceforge url="http://www.privoxy.org/"; license="GPL2" -source=($source rc.$pkgname) +source=($source rc.$pkgname $pkgname.service) groups=('network-extra') archs=('i686' 'x86_64') -depends=('glibc') +depends=('pcre') backup=(etc/privoxy/{config,trust,default.{action,filter},{standard,user}.action}) +_F_systemd_scriptlet="$pkgname.install" +_F_sysvinit_units=($pkgname) +_F_systemd_units=($pkgname=) +Finclude systemd build() { Fcd $pkgname-`echo $pkgver | cut -d _ -f 1`-stable autoheader || return 1 autoconf || return 1 - Fmake --sysconfdir=/etc/$pkgname --disable-dynamic-pcre + Fmake --sysconfdir=/etc/$pkgname make prefix="$Fdestdir/usr" MAN_DEST="$Fdestdir/usr/share/man/man1" GROUP=18 \ CONF_BASE="$Fdestdir/etc/privoxy" VAR_DEST="$Fdestdir/var" install || Fdie Fsed "$Fdestdir" "" $Fdestdir/etc/$pkgname/config Fmv /usr/share/doc/$pkgname /usr/share/doc/$pkgname-$pkgver - Fmkdir /var/lock/subsys Fexe /etc/rc.d/rc.$pkgname + Fdirschown /var/log/$pkgname 18 18 + Ffileschown /var/log/$pkgname 18 18 + Ffile /lib/systemd/system/$pkgname.service + Fgenscriptlet + # remove /var/run for new systemd + Frm /var/run } -sha1sums=('ffc797c478f8acac4e4894f4a9cb8a400c87c67c' \ - '24f07724c3add8582a570ae15b5274ab041d80c5') + +sha1sums=('a82287cbf48375ef449d021473a366baeca49250' \ + '24f07724c3add8582a570ae15b5274ab041d80c5' \ + '93cf6270caa82f2de59203a833718cf4af142976') # optimization OK diff --git a/source/network-extra/privoxy/privoxy.install b/source/network-extra/privoxy/privoxy.install index edbbb22..23eff0e 100644 --- a/source/network-extra/privoxy/privoxy.install +++ b/source/network-extra/privoxy/privoxy.install @@ -1,3 +1,6 @@ +sysvinit_units=(@_F_sysvinit_units@) +systemd_units=(@_F_systemd_units@) + post_install() { if ! grep -q '^privoxy:' /etc/group ; then @@ -6,23 +9,65 @@ post_install() if ! grep -q '^privoxy:' /etc/passwd ; then /usr/sbin/useradd -u 18 -g 18 -s /bin/false -d /var/log/privoxy privoxy > /dev/null 2>&1 fi + + local unit + local op + + for i in ${sysvinit_units[@]}; do + chkconfig --del rc.$i >/dev/null 2>&1 + done + + for i in ${systemd_units[@]}; do + unit=$(echo $i | cut -f 1 -d '=') + op=$(echo $i | cut -f 2 -d '=') + if echo $op | grep -q 'e'; then + systemctl enable $unit.service >/dev/null 2>&1 + fi + if echo $op | grep -q 's'; then + systemctl start $unit.service >/dev/null 2>&1 + fi + done } -post_remove() +post_upgrade() { - /usr/sbin/userdel privoxy > /dev/null 2>&1 - /usr/sbin/groupdel privoxy > /dev/null 2>&1 + if ! grep -q '^privoxy:' /etc/group ; then + /usr/sbin/groupadd -g 18 privoxy > /dev/null 2>&1 + fi + if ! grep -q '^privoxy:' /etc/passwd ; then + /usr/sbin/useradd -u 18 -g 18 -s /bin/false -d /var/log/privoxy privoxy > /dev/null 2>&1 + fi + + for i in ${sysvinit_units[@]}; do + chkconfig --del rc.$i >/dev/null 2>&1 + done + + systemctl daemon-reload >/dev/null 2>&1 } pre_remove() { - /usr/sbin/chkconfig --del rc.privoxy 2> /dev/null > /dev/null - /etc/rc.d/rc.privoxy stop 2> /dev/null > /dev/null + local unit + + for i in ${sysvinit_units[@]}; do + chkconfig --del rc.$i >/dev/null 2>&1 + done + + for i in ${systemd_units[@]}; do + unit=$(echo $i | cut -f 1 -d '=') + systemctl --no-reload disable $unit.service >/dev/null 2>&1 + systemctl stop $unit.service >/dev/null 2>&1 + done +} + +post_remove() +{ + /usr/sbin/userdel privoxy > /dev/null 2>&1 + /usr/sbin/groupdel privoxy > /dev/null 2>&1 + + systemctl daemon-reload >/dev/null 2>&1 } op=$1 shift - $op $* - -# vim: ft=sh diff --git a/source/network-extra/privoxy/privoxy.service b/source/network-extra/privoxy/privoxy.service new file mode 100644 index 0000000..db0f430 --- /dev/null +++ b/source/network-extra/privoxy/privoxy.service @@ -0,0 +1,11 @@ +[Unit] +Description=Privoxy Web Proxy With Advanced Filtering Capabilities +After=network.target + +[Service] +Type=forking +PIDFile=/run/privoxy.pid +ExecStart=/usr/sbin/privoxy --pidfile /run/privoxy.pid --user privoxy.privoxy /etc/privoxy/config + +[Install] +WantedBy=multi-user.target _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
