packages: radvd/radvd.init, radvd/radvd.spec - rel 2; enable privilege sepa...

[arekm]

Author: arekm                        Date: Mon Feb 21 08:11:41 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2; enable privilege separation; add reload to init script

---- Files affected:
packages/radvd:
   radvd.init (1.8 -> 1.9) , radvd.spec (1.54 -> 1.55) 

---- Diffs:

================================================================
Index: packages/radvd/radvd.init
diff -u packages/radvd/radvd.init:1.8 packages/radvd/radvd.init:1.9
--- packages/radvd/radvd.init:1.8	Sun Feb 22 11:52:25 2009
+++ packages/radvd/radvd.init	Mon Feb 21 09:11:36 2011
@@ -41,7 +41,7 @@
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/radvd ]; then
 		msg_starting radvd
-		daemon radvd -m syslog
+		daemon radvd -m syslog -u radvd -p /var/run/radvd/radvd.pid
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/radvd
 	else
@@ -51,7 +51,7 @@
   stop)
 	if [ -f /var/lock/subsys/radvd ]; then
 		msg_stopping radvd
-		killproc radvd
+		killproc --pidfile /var/run/radvd/radvd.pid radvd
 		rm -f /var/lock/subsys/radvd
 	else
 		msg_not_running radvdd
@@ -62,12 +62,22 @@
 	$0 start
 	exit $?
 	;;
+  reload)
+	if [ ! -f /var/lock/subsys/radvd ]; then
+		msg_not_running radvd
+		exit 7
+	fi
+
+	msg_reloading radvd
+	killproc --pidfile /var/run/radvd/radvd.pid radvd -HUP
+	exit $?
+	;;
   status)
 	status radvd
 	exit $?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|force-reload|status}"
+	msg_usage "$0 {start|stop|restart|reload|force-reload|status}"
 	exit 3
 esac
 

================================================================
Index: packages/radvd/radvd.spec
diff -u packages/radvd/radvd.spec:1.54 packages/radvd/radvd.spec:1.55
--- packages/radvd/radvd.spec:1.54	Mon Feb 21 08:43:10 2011
+++ packages/radvd/radvd.spec	Mon Feb 21 09:11:36 2011
@@ -3,7 +3,7 @@
 Summary(pl.UTF-8):	Demon ogłaszania routerów
 Name:		radvd
 Version:	1.7
-Release:	1
+Release:	2
 License:	GPL
 Group:		Networking
 Source0:	http://v6web.litech.org/radvd/dist/%{name}-%{version}.tar.gz
@@ -18,6 +18,8 @@
 BuildRequires:	rpmbuild(macros) >= 1.268
 Requires(post,preun):	/sbin/chkconfig
 Requires:	rc-scripts >= 0.2.0
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/usr/sbin/useradd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -55,7 +57,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{5,8},/etc/rc.d/init.d,}
+install -d $RPM_BUILD_ROOT{%{_sbindir},%{_mandir}/man{5,8},/etc/rc.d/init.d,/var/run/radvd}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/radvd.conf
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/radvd
@@ -66,6 +68,9 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+%useradd -u 260 -d /usr/share/empty -s /bin/false -c "radvd" -g proc radvd
+
 %post
 /sbin/chkconfig --add radvd
 %service radvd restart "radvd server"
@@ -76,10 +81,16 @@
 	/sbin/chkconfig --del radvd
 fi
 
+%postun
+if [ "$1" = "0" ]; then
+        %userremove radvd
+fi
+
 %files
 %defattr(644,root,root,755)
 %doc README TODO CHANGES INTRO.html
 %attr(754,root,root) /etc/rc.d/init.d/radvd
+%attr(755,radvd,root) %dir /var/run/radvd
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/radvd.conf
 %attr(755,root,root) %{_sbindir}/*
 %{_mandir}/man*/*
@@ -90,6 +101,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55  2011/02/21 08:11:36  arekm
+- rel 2; enable privilege separation; add reload to init script
+
 Revision 1.54  2011/02/21 07:43:10  arekm
 - up to 1.7
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/radvd/radvd.init?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/radvd/radvd.spec?r1=1.54&r2=1.55&f=u