From f35c896d60da997bc6b4be90a98c2d0aee55e041 Mon Sep 17 00:00:00 2001 Message-Id: From: Philipp Hahn Date: Wed, 28 Jan 2015 09:21:24 +0100 Subject: [PATCH] Bug #36571 base: Replace service "portmap" by "rpcbind" Organization: Univention GmbH, Bremen, Germany "portmap" is replaced by "rpcbind" in Debian Wheezy / UCS-4.0 --- .../conffiles/etc/init.d/portmap | 77 --------------- .../conffiles/etc/init.d/rpcbind | 105 +++++++++++++++++++++ .../base/univention-base-files/debian/changelog | 6 ++ .../univention-base-files/debian/ucslint.overrides | 4 +- .../debian/univention-base-files.maintscripts | 1 + .../debian/univention-base-files.postinst | 2 +- ...nivention-base-files.univention-config-registry | 2 +- .../univention-base-files.univention-service | 12 +-- 8 files changed, 122 insertions(+), 87 deletions(-) delete mode 100755 branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/etc/init.d/portmap create mode 100755 branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/etc/init.d/rpcbind create mode 100644 branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.maintscripts diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/etc/init.d/portmap b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/etc/init.d/portmap deleted file mode 100755 index 2ed14f4..0000000 --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/etc/init.d/portmap +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh -@%@UCRWARNING=# @%@ - -# start/stop portmap daemon. - -### BEGIN INIT INFO -# Provides: portmap -# Required-Start: $network -# Required-Stop: $network -# Should-Start: $named -# Should-Stop: $named -# Default-Start: S 2 3 4 5 -# Default-Stop: 0 1 6 -### END INIT INFO - -test -f /sbin/portmap || exit 0 - -. /lib/lsb/init-functions - -OPTIONS="" -if [ -f /etc/default/portmap ]; then - . /etc/default/portmap -elif [ -f /etc/portmap.conf ]; then - . /etc/portmap.conf -fi - -case "$1" in - start) - # check ucr autostart setting - if [ -f "/usr/share/univention-config-registry/init-autostart.lib" ]; then - . "/usr/share/univention-config-registry/init-autostart.lib" - check_autostart portmap portmap/autostart - fi - log_begin_msg "Starting portmap daemon..." - pid=`pidof portmap` - if [ -n "$pid" ] ; then - log_begin_msg "Already running." - log_end_msg 0 - exit 0 - fi - start-stop-daemon --start --quiet --oknodo --exec /sbin/portmap -- $OPTIONS - log_end_msg $? - - sleep 1 # needs a short pause or pmap_set won't work. :( - if [ -f /var/run/portmap.upgrade-state ]; then - log_begin_msg "Restoring old RPC service information..." - pmap_set /var/run/portmap.state - start-stop-daemon --stop --quiet --oknodo --exec /sbin/portmap - log_end_msg $? - ;; - force-reload) - $0 restart - ;; - restart) - $0 stop - $0 start - ;; - *) - log_success_msg "Usage: /etc/init.d/portmap {start|stop|force-reload|restart}" - exit 1 - ;; -esac - -exit 0 diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/etc/init.d/rpcbind b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/etc/init.d/rpcbind new file mode 100755 index 0000000..2eae2f4 --- /dev/null +++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/conffiles/etc/init.d/rpcbind @@ -0,0 +1,105 @@ +#!/bin/sh +@%@UCRWARNING=# @%@ +# +# start/stop rpcbind daemon. + +### BEGIN INIT INFO +# Provides: rpcbind +# Required-Start: $network $local_fs +# Required-Stop: $network $local_fs +# Default-Start: S 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: RPC portmapper replacement +# Description: rpcbind is a server that converts RPC (Remote +# Procedure Call) program numbers into DARPA +# protocol port numbers. It must be running in +# order to make RPC calls. Services that use +# RPC include NFS and NIS. +### END INIT INFO + +test -f /sbin/rpcbind || exit 0 + +. /lib/lsb/init-functions + +OPTIONS="-w" +STATEDIR=/run/rpcbind +PIDFILE=/run/rpcbind.pid + +if [ -f /etc/default/rpcbind ] +then + . /etc/default/rpcbind +elif [ -f /etc/rpcbind.conf ] +then + . /etc/rpcbind.conf +fi + +start () +{ + # check ucr autostart setting + if [ -f "/usr/share/univention-config-registry/init-autostart.lib" ]; then + . "/usr/share/univention-config-registry/init-autostart.lib" + check_autostart rpcbind rpcbind/autostart + fi + if [ ! -d $STATEDIR ] ; then + mkdir $STATEDIR + fi + if [ ! -O $STATEDIR ] ; then + log_begin_msg "$STATEDIR not owned by root" + log_end_msg 1 + exit 1 + fi + if [ ! -f $STATEDIR/rpcbind.xdr ] + then + touch $STATEDIR/rpcbind.xdr + fi + if [ ! -f $STATEDIR/portmap.xdr ] + then + touch $STATEDIR/portmap.xdr + fi + [ -x /sbin/restorecon ] && /sbin/restorecon $STATEDIR/*.xdr + log_begin_msg "Starting rpcbind daemon..." + pid=$( pidofproc /sbin/rpcbind ) + if [ -n "$pid" ] + then + log_begin_msg "Already running." + log_end_msg 0 + exit 0 + fi + start-stop-daemon --start --quiet --oknodo --exec /sbin/rpcbind -- "$@" + pid=$( pidofproc /sbin/rpcbind ) + echo -n "$pid" >"$PIDFILE" + # /run/sendsigs.omit.d is created by /etc/init.d/mountkernfs.sh + ln -sf "$PIDFILE" /run/sendsigs.omit.d/rpcbind + log_end_msg $? + +} + +stop () +{ + log_begin_msg "Stopping rpcbind daemon..." + start-stop-daemon --stop --quiet --oknodo --exec /sbin/rpcbind + rm -f "$PIDFILE" + log_end_msg $? +} + +case "$1" in + start) + start $OPTIONS + ;; + stop) + stop + ;; + restart|force-reload) + stop + start $OPTIONS + ;; + status) + status_of_proc /sbin/rpcbind rpcbind && exit 0 || exit $? + ;; + *) + log_success_msg "Usage: /etc/init.d/rpcbind {start|stop|force-reload|restart|status}" + exit 1 + ;; +esac + +exit 0 diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/changelog b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/changelog index d650c55..f8b452c 100644 --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/changelog +++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/changelog @@ -1,3 +1,9 @@ +univention-base-files (4.0.6-3) unstable; urgency=low + + * Bug #36571: Replace service "portmap" by "rpcbind" + + -- Philipp Hahn Wed, 28 Jan 2015 09:14:52 +0100 + univention-base-files (4.0.6-2) unstable; urgency=medium * Bug #13811: register mysql/autostart UCR variable diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/ucslint.overrides b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/ucslint.overrides index 6eabf11..41a1027 100644 --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/ucslint.overrides +++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/ucslint.overrides @@ -15,7 +15,7 @@ 0004-56: conffiles/etc/init.d/nscd 0004-56: conffiles/etc/init.d/ntp 0004-56: conffiles/etc/init.d/openbsd-inetd -0004-56: conffiles/etc/init.d/portmap +0004-56: conffiles/etc/init.d/rpcbind 0004-56: conffiles/etc/init.d/rdate 0004-56: conffiles/etc/inputrc 0004-56: conffiles/etc/networks @@ -36,7 +36,7 @@ 0010-2: conffiles/etc/init.d/ntp 0010-2: conffiles/etc/init.d/rdate 0010-2: conffiles/etc/init.d/openbsd-inetd -0010-2: conffiles/etc/init.d/portmap +0010-2: conffiles/etc/init.d/rpcbind 0010-2: conffiles/etc/init.d/cron 0010-2: conffiles/etc/init.d/networking 0010-2: conffiles/etc/init.d/klogd diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.maintscripts b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.maintscripts new file mode 100644 index 0000000..21e46c3 --- /dev/null +++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.maintscripts @@ -0,0 +1 @@ +rm_conffile /etc/univention/templates/files/etc/init.d/portmap 4.0.6-3~ diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.postinst b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.postinst index 751fa1a..e1c033e 100644 --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.postinst +++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.postinst @@ -64,7 +64,7 @@ univention-config-registry set cron/autostart?yes \ nscd/autostart?yes \ ntp/autostart?yes \ sshd/autostart?yes \ - portmap/autostart?yes \ + rpcbind/autostart?yes \ # syslog if [ "$1" = configure -a -z "$2" ]; then diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.univention-config-registry b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.univention-config-registry index 005be1e..c208901 100644 --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.univention-config-registry +++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.univention-config-registry @@ -49,7 +49,7 @@ Type: file File: etc/init.d/cron Type: file -File: etc/init.d/portmap +File: etc/init.d/rpcbind Type: file File: etc/init.d/nscd diff --git a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.univention-service b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.univention-service index 5b0e6a6..5981938 100644 --- a/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.univention-service +++ b/branches/ucs-4.0/ucs-4.0-0/base/univention-base-files/debian/univention-base-files.univention-service @@ -26,12 +26,12 @@ programs=/usr/sbin/ntpd start_type=ntp/autostart icon=service/ntp -[portmap] -Description[de]=Port-Mapper -Description[en]=Port Mapper -programs=/sbin/portmap -start_type=portmap/autostart -icon=service/portmap +[rpcbind] +Description[de]=RPC-bind Dienst +Description[en]=RPC Bind service +programs=/sbin/rpcbind +start_type=rpcbind/autostart +icon=service/rpcbind [ssh] Description[de]=SSH-Server -- 1.9.1