Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=8b5c7bc22af5bf6a98b7d35aa52c96730f663b5b
commit 8b5c7bc22af5bf6a98b7d35aa52c96730f663b5b
Author: Miklos Vajna <vmik...@frugalware.org>
Date: Wed Sep 7 11:03:13 2011 +0200
rpcbind-0.2.0-4-i686
- drop no longer needed sysv script
diff --git a/source/network/rpcbind/FrugalBuild
b/source/network/rpcbind/FrugalBuild
index 3efb1b7..9bc4430 100644
--- a/source/network/rpcbind/FrugalBuild
+++ b/source/network/rpcbind/FrugalBuild
@@ -3,7 +3,7 @@
pkgname=rpcbind
pkgver=0.2.0
-pkgrel=3
+pkgrel=4
pkgdesc="A server that converts RPC program numbers into universal addresses."
_F_sourceforge_ext=".tar.bz2"
Finclude sourceforge
@@ -12,18 +12,15 @@ rodepends=('systemd')
replaces=('portmap')
groups=('network')
archs=('i686' 'x86_64' 'ppc' 'arm')
-source=($source rpcbind-sunrpc.patch rc.rpcbind rpcbind.service)
+source=($source rpcbind-sunrpc.patch rpcbind.service)
sha1sums=('02f077372a76a8f9adfa696004aa437212c28617' \
'a25c2295b2e4bf4e3f924f1753350efaccf37c21' \
- 'fc17ecef3b3237e98a3e19a5575fd72180954bb1' \
- '40993ead8799494f157838d46b36f0335cb1235a')
+ '803fd1b30b645f30ebf4df016cf047aea0659a84')
build()
{
Fbuild
- Frcd2 rpcbind
Ffile /lib/systemd/system/rpcbind.service
- Fmkdir /etc/systemd/system/multi-user.target.wants
}
# optimization OK
diff --git a/source/network/rpcbind/rc.rpcbind
b/source/network/rpcbind/rc.rpcbind
deleted file mode 100644
index 9bc35bd..0000000
--- a/source/network/rpcbind/rc.rpcbind
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-# (c) 2010 Miklos Vajna <vmik...@frugalware.org>
-# rc.rpcbind for Frugalware
-# distributed under GPL License
-
-# chkconfig: 345 13 87
-# description: RPC portmapper daemon
-
-source /lib/initscripts/functions
-TEXTDOMAIN=rpcbind
-TEXTDOMAINDIR=/lib/initscripts/messages
-
-actions=(restart start status stop)
-daemon=$"RPC portmapper"
-
-pid="cat /var/run/rpcbind.pid 2>/dev/null"
-
-rc_start()
-{
- start_msg
- if [ -z "$(eval $pid)" ]; then
- /usr/bin/rpcbind
- pidof rpcbind >/var/run/rpcbind.pid
- ok $?
- else
- ok 999
- fi
-}
-
-rc_stop()
-{
- stop_msg
- if [ -n "$(eval $pid)" ]; then
- kill "$(eval $pid)"
- rm -f /var/run/rpcbind.pid
- ok $?
- else
- ok 999
- fi
-}
-
-rc_exec $1
diff --git a/source/network/rpcbind/rpcbind.install
b/source/network/rpcbind/rpcbind.install
index 9e2d802..5ab584e 100644
--- a/source/network/rpcbind/rpcbind.install
+++ b/source/network/rpcbind/rpcbind.install
@@ -1,23 +1,18 @@
post_install()
{
- chkconfig --add rc.rpcbind
systemctl enable rpcbind.service >/dev/null 2>&1
}
post_upgrade()
{
systemctl daemon-reload >/dev/null 2>&1
- if [ `vercmp $2 0.2.0-3` -lt 0 ] ; then
- if chkconfig rc.rpcbind; then
- post_install
- fi
- fi
+ # this can be removed after Frugalware-1.6
+ rm -f /etc/rc.d/rc?.d/???rc.rpcbind
}
pre_remove()
{
- chkconfig --del rc.rpcbind
- systemctl --no-reload disable foobar.service >/dev/null 2>&1
+ systemctl --no-reload disable rpcbind.service >/dev/null 2>&1
systemctl stop rpcbind.service >/dev/null 2>&1
}
diff --git a/source/network/rpcbind/rpcbind.service
b/source/network/rpcbind/rpcbind.service
index 38358fe..e0962ae 100644
--- a/source/network/rpcbind/rpcbind.service
+++ b/source/network/rpcbind/rpcbind.service
@@ -1,6 +1,5 @@
[Unit]
Description=RPC Portmapper Service
-After=syslog.target
[Service]
Type=forking
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
