packages: bird/bird-ipv4.init, bird/bird-ipv6.init, bird/bird.spec - up to ...

[arekm]

Author: arekm                        Date: Mon Jul 11 08:32:54 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.3.2; use unpriviledged user/group when running bird damons

---- Files affected:
packages/bird:
   bird-ipv4.init (1.3 -> 1.4) , bird-ipv6.init (1.3 -> 1.4) , bird.spec (1.55 -> 1.56) 

---- Diffs:

================================================================
Index: packages/bird/bird-ipv4.init
diff -u packages/bird/bird-ipv4.init:1.3 packages/bird/bird-ipv4.init:1.4
--- packages/bird/bird-ipv4.init:1.3	Sat May 21 16:46:56 2011
+++ packages/bird/bird-ipv4.init	Mon Jul 11 10:32:49 2011
@@ -39,7 +39,7 @@
 	# Check if the services are already running?
 	if [ ! -f /var/lock/subsys/bird-ipv4 ]; then
 		msg_starting "bird for IPv4"
-		daemon ${SERVICE_RUN_NICE_LEVEL} /usr/sbin/bird
+		daemon ${SERVICE_RUN_NICE_LEVEL} /usr/sbin/bird -u bird -g bird
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bird-ipv4
 	else

================================================================
Index: packages/bird/bird-ipv6.init
diff -u packages/bird/bird-ipv6.init:1.3 packages/bird/bird-ipv6.init:1.4
--- packages/bird/bird-ipv6.init:1.3	Sat May 21 16:46:56 2011
+++ packages/bird/bird-ipv6.init	Mon Jul 11 10:32:49 2011
@@ -39,7 +39,7 @@
 	# Check if the services are already running?
 	if [ ! -f /var/lock/subsys/bird-ipv6 ]; then
 		msg_starting "bird for IPv6"
-		daemon ${SERVICE_RUN_NICE_LEVEL} /usr/sbin/bird-6
+		daemon ${SERVICE_RUN_NICE_LEVEL} /usr/sbin/bird-6 -u bird -g bird
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/bird-ipv6
 	else

================================================================
Index: packages/bird/bird.spec
diff -u packages/bird/bird.spec:1.55 packages/bird/bird.spec:1.56
--- packages/bird/bird.spec:1.55	Sat May 21 17:01:57 2011
+++ packages/bird/bird.spec	Mon Jul 11 10:32:49 2011
@@ -10,18 +10,18 @@
 Summary:	The BIRD Internet Routing Daemon
 Summary(pl.UTF-8):	Demon BIRD Internetowego Routingu Dynamicznego
 Name:		bird
-Version:	1.3.1
-Release:	3
+Version:	1.3.2
+Release:	1
 License:	GPL v2+
 Group:		Networking/Daemons
 Source0:	ftp://bird.network.cz/pub/bird/%{name}-%{version}.tar.gz
-# Source0-md5:	d11f53b79c7371b76e5c93209dbe2a10
+# Source0-md5:	4fa1fc086799227fc823e15ece046951
 Source1:	%{name}-ipv4.init
 Source2:	%{name}-ipv4.sysconfig
 Source3:	%{name}-ipv6.init
 Source4:	%{name}-ipv6.sysconfig
 Source5:	ftp://bird.network.cz/pub/bird/%{name}-doc-%{version}.tar.gz
-# Source5-md5:	340be3f6c7ade302a0b4b34dd2773957
+# Source5-md5:	4c1cf73ccb2f52619e96c8bca4c466df
 Patch0:		%{name}-allowalien.patch
 URL:		http://bird.network.cz/
 BuildRequires:	autoconf
@@ -33,6 +33,8 @@
 Requires(post,preun):	/sbin/chkconfig
 Requires:	bird-daemon
 Requires:	rc-scripts
+Requires(postun):	/usr/sbin/userdel
+Requires(pre):	/usr/sbin/useradd
 Obsoletes:	gated
 Obsoletes:	mrt
 Obsoletes:	zebra
@@ -159,6 +161,16 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+%groupadd -g 271 bird
+%useradd -u 271 -d /usr/share/empty -s /bin/false -c "bird routing daemon" -g bird bird
+
+%postun
+if [ "$1" = "0" ]; then
+	%userremove bird
+	%groupremove bird
+fi
+
 %post ipv4
 /sbin/chkconfig --add %{name}-ipv4
 %service %{name}-ipv4 restart "routing daemon"
@@ -209,6 +221,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.56  2011/07/11 08:32:49  arekm
+- up to 1.3.2; use unpriviledged user/group when running bird damons
+
 Revision 1.55  2011/05/21 15:01:57  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bird/bird-ipv4.init?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bird/bird-ipv6.init?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/bird/bird.spec?r1=1.55&r2=1.56&f=u