Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=cc79172902a271fa3c5f5adee8f79ff51eb14d42
commit cc79172902a271fa3c5f5adee8f79ff51eb14d42 Author: Miklos Vajna <[email protected]> Date: Sun Dec 30 18:56:01 2012 +0100 ejabberd-2.1.11-3-x86_64 - drop sysv support diff --git a/source/network-extra/ejabberd/FrugalBuild b/source/network-extra/ejabberd/FrugalBuild index dbbaa34..e909a37 100644 --- a/source/network-extra/ejabberd/FrugalBuild +++ b/source/network-extra/ejabberd/FrugalBuild @@ -3,7 +3,7 @@ pkgname=ejabberd pkgver=2.1.11 -pkgrel=2 +pkgrel=3 pkgdesc="A free and open source instant messaging server written in Erlang." url="http://ejabberd.jabber.ru/"; depends=('erlang>=14A-2') @@ -13,13 +13,11 @@ archs=('i686' 'x86_64') _F_archive_grepv="beta\|rc" up2date="Flasttar http://www.process-one.net/en/ejabberd/archive/"; source=(http://www.process-one.net/downloads/ejabberd/$pkgver/ejabberd-$pkgver.tgz \ - ejabberd.service rc.ejabberd README.Frugalware) + ejabberd.service README.Frugalware) sha1sums=('ae2c521d5e93fbd5bc826052c5524b5222dcfae6' \ 'bbca398359e7ea3dbe1e4efcc86898723a73a63c' \ - 'ecdbed598b714815d46653d88f257a9a82624aed' \ '0d8814dc022a3727d4d63d9f4a0a6604204ba020') _F_systemd_scriptlet="$pkgname.install" -_F_sysvinit_units=(ejabberd) _F_systemd_units=(ejabberd=) Finclude systemd @@ -39,7 +37,6 @@ build() Fdocrel ../doc/* chown -R 41:41 $Fdestdir/{var/log/ejabberd,var/spool/ejabberd,usr/lib/ejabberd,var/lib/ejabberd,usr/sbin/ejabberdctl,etc/ejabberd} Fdoc README.Frugalware - Frcd2 Frm /var/lock Fmkdir /etc/tmpfiles.d cat > $Fdestdir/etc/tmpfiles.d/ejabberd.conf << EOF diff --git a/source/network-extra/ejabberd/ejabberd.install b/source/network-extra/ejabberd/ejabberd.install index cbde12b..958366c 100644 --- a/source/network-extra/ejabberd/ejabberd.install +++ b/source/network-extra/ejabberd/ejabberd.install @@ -1,4 +1,3 @@ -sysvinit_units=(@_F_sysvinit_units@) systemd_units=(@_F_systemd_units@) post_install() @@ -9,10 +8,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 '=') @@ -30,10 +25,6 @@ post_upgrade() getent group ejabberd >/dev/null || /usr/sbin/groupadd -g 41 ejabberd getent passwd ejabberd >/dev/null || /usr/sbin/useradd -u 41 -g ejabberd -d /usr/lib/ejabberd ejabberd - for i in ${sysvinit_units[@]}; do - chkconfig --del rc.$i >/dev/null 2>&1 - done - systemctl daemon-reload >/dev/null 2>&1 } @@ -44,10 +35,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 diff --git a/source/network-extra/ejabberd/rc.ejabberd b/source/network-extra/ejabberd/rc.ejabberd deleted file mode 100644 index 5c6388f..0000000 --- a/source/network-extra/ejabberd/rc.ejabberd +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -# (c) 2007, 2008, 2010 Miklos Vajna <[email protected]> -# rc.ejabberd for Frugalware -# distributed under GPL License - -# chkconfig: 2345 99 01 -# description: Ejabber daemon - -source /lib/initscripts/functions -TEXTDOMAIN=ejabberd -TEXTDOMAINDIR=/lib/initscripts/messages - -actions=(restart status start stop) -daemon=$"Ejabber daemon" - -rc_start() -{ - start_msg - if ! ejabberdctl status >/dev/null; then - su ejabberd -c '/usr/sbin/ejabberdctl start' - ok $? - else - ok 999 - fi -} - -rc_status() -{ - status_msg - if ! ejabberdctl status >/dev/null; then - ok 998 - else - ok 997 - fi -} - -rc_stop() -{ - stop_msg - if ejabberdctl status >/dev/null; then - su ejabberd -c '/usr/sbin/ejabberdctl stop' - ok $? - else - ok 999 - fi -} - -rc_exec $1 _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
