Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=2758f2efcc1e316afea45b76bba57483acb98079
commit 2758f2efcc1e316afea45b76bba57483acb98079 Author: Miklos Vajna <[email protected]> Date: Tue Jan 15 08:44:01 2013 +0100 cyrus-sasl-2.1.25-6-x86_64 - drop sysv script diff --git a/source/network/cyrus-sasl/FrugalBuild b/source/network/cyrus-sasl/FrugalBuild index 4b5f592..783c2a8 100644 --- a/source/network/cyrus-sasl/FrugalBuild +++ b/source/network/cyrus-sasl/FrugalBuild @@ -3,19 +3,18 @@ pkgname=cyrus-sasl pkgver=2.1.25 -pkgrel=5 +pkgrel=6 pkgdesc="SASL Authentication mechanism" url="http://ftp.andrew.cmu.edu/pub/cyrus-mail/"; depends=('openssl>=1.0.0' 'gdbm>=1.10' 'pam' 'systemd') groups=('network') archs=('i686' 'x86_64' 'arm') source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-$pkgver.tar.gz \ - psql.patch rc.saslauthd saslauthd.service saslauthd \ + psql.patch saslauthd.service saslauthd \ README.Frugalware) up2date="lynx -dump 'http://ftp.andrew.cmu.edu/pub/cyrus-mail/?M=D'|grep cyrus-sasl.*tar.gz$|sed -n 's/.*-\(.*\)\.t.*/\1/;1 p'" sha1sums=('b6c34426012d9b5d448d5646cbecd818a5eeacbf' \ 'b4eeaf03a4b672f3153e0b5ef2eec59802d0214d' \ - '0b360c2c59175f8a3f53d9a5ef63b60eb332bd69' \ '8867cae952e6b31d9bb2f4c2976a6f6bae4301e3' \ '5fa8a4fd427eafd732eb9f539e7a7eeab44f234f' \ '50150f268a1c3fd6de37ed88606ba8937f6f2b34') @@ -51,8 +50,6 @@ build() Fsplit saslauthd usr/share/man/man8/saslauthd.* Finstall 0644 saslauthd etc/sysconfig/saslauthd Ffile /lib/systemd/system/saslauthd.service - Frcd2 saslauthd - Fsplit saslauthd etc/rc.d Fsplit saslauthd etc/sysconfig Fsplit saslauthd lib/systemd/system Frm /etc diff --git a/source/network/cyrus-sasl/rc.saslauthd b/source/network/cyrus-sasl/rc.saslauthd deleted file mode 100644 index f36be37..0000000 --- a/source/network/cyrus-sasl/rc.saslauthd +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# (c) 2006 Krisztian VASAS <[email protected]> -# rc.saslauthd for FrugalWare -# distributed under GPL License - -# chkconfig: 2345 79 20 -# description: Starts or stops the SASL authentication daemon - -source /lib/initscripts/functions -TEXTDOMAIN=saslauthd -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(restart start stop status) -daemon=$"SASL authentication daemon" - -pid="pidof saslauthd 2> /dev/null" - -source /etc/sysconfig/saslauthd -[ $SASL_DIE -eq 1 ] && exit; - -rc_start() { - start_msg - if [[ "$(eval ${pid})" == "" ]] ; then - if [ "$auth_mechanism" == "" ]; then - ok 999 - fi - opts="" - if [ "$options" != "" ]; then - opts=$options - fi - /usr/sbin/saslauthd -a $auth_mechanism $opts - ok $? - else - ok 999 - fi -} - -rc_stop() { - stop_msg - if [[ "$(eval ${pid})" != "" ]] ; then - kill `cat /var/run/courier/saslauthd.pid` - ok $? - else - ok 999 - fi -} - -rc_exec $1 diff --git a/source/network/cyrus-sasl/saslauthd.install b/source/network/cyrus-sasl/saslauthd.install index 756c7cc..015cdaf 100644 --- a/source/network/cyrus-sasl/saslauthd.install +++ b/source/network/cyrus-sasl/saslauthd.install @@ -1,4 +1,3 @@ -sysvinit_units=(saslauthd) systemd_units=(saslauthd=) post_install() @@ -6,10 +5,6 @@ post_install() 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 '=') @@ -24,10 +19,6 @@ post_install() post_upgrade() { - for i in ${sysvinit_units[@]}; do - chkconfig --del rc.$i >/dev/null 2>&1 - done - systemctl daemon-reload >/dev/null 2>&1 } @@ -35,10 +26,6 @@ pre_remove() { 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 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
