- up to 1.3.2; use unpriviledged user/group when running bird damons

Changed files:
    bird-ipv4.init -> 1.4
    bird-ipv6.init -> 1.4
    bird.spec -> 1.56

diff --git a/bird-ipv4.init b/bird-ipv4.init
index 2b96b67be30001fdf18d6029cbbef81036d9e9ee..d82b5c5bcc97125586932c12e3574b47e4f04c58 100644 (file)
--- a/bird-ipv4.init
+++ b/bird-ipv4.init
@@ -39,7 +39,7 @@ case "$1" in
        # 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

diff --git a/bird-ipv6.init b/bird-ipv6.init
index 33e12b7692365745037c85c039ee1ebe0d5adffd..e4c13afac2cad5bf3d9a8024c1d0a0e9b32d7686 100644 (file)
--- a/bird-ipv6.init
+++ b/bird-ipv6.init
@@ -39,7 +39,7 @@ case "$1" in
        # 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

diff --git a/bird.spec b/bird.spec
index 846c829541363e1c79bd506aa5eeabdbd318dc7b..c70a034af0424a5564062bdc1792ee41aa7ee5ef 100644 (file)
--- a/bird.spec
+++ b/bird.spec
@@ -9,18 +9,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
@@ -32,6 +32,8 @@ BuildRequires:        rpmbuild(macros) >= 1.268
 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
@@ -158,6 +160,16 @@ install %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/%{name}-ipv6
 %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"