Attachment 607221 Details for Bug 852080 – slpd.spec & slpd init patches

[patch] slpd.spec & slpd init patches

slpd_selinux.patch (text/plain), 2.07 KB, created by Miroslav Grepl on 2012-08-27 14:31:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miroslav Grepl

Created: 2012-08-27 14:31:42 UTC

Size: 2.07 KB

patch

obsolete

>diff --git a/openslp.spec b/openslp.spec
>index 4adedef..34bef10 100644
>--- a/openslp.spec
>+++ b/openslp.spec
>@@ -2,7 +2,7 @@
> Summary: Open implementation of Service Location Protocol V2
> Name:    openslp
> Version: 1.2.1
>-Release: 17%{?dist}
>+Release: 17%{?dist}.1
> 
> Group:   System Environment/Libraries
> License: BSD
>@@ -87,6 +87,8 @@ rm -rf $RPM_BUILD_ROOT
> 
> make install DESTDIR=$RPM_BUILD_ROOT
> 
>+mkdir -p $RPM_BUILD_ROOT%{_var}/cache/slpd
>+
> install -p -D -m755  %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/slpd
> 
> # nuke unpackaged/unwanted files
>@@ -132,6 +134,7 @@ fi
> %doc doc/html/UsersGuide
> %doc doc/html/faq*
> %{_sbindir}/slpd
>+%dir %{_var}/cache/slpd
> %config(noreplace) %{_sysconfdir}/slp.reg
> %config(noreplace) %{_sysconfdir}/slp.spi
> %config(noreplace) %{_initrddir}/slpd
>diff --git a/slpd.init b/slpd.init
>index 483e703..5188d78 100644
>--- a/slpd.init
>+++ b/slpd.init
>@@ -43,7 +43,8 @@ multicast_route_set()
>     PING_OPTIONS_1='-c1 -w1'
>     PING_OPTIONS_2='-c1 -i1'
>     MULTICAST_ADDRESS='239.255.255.253'
>-    TMP_FILE=/tmp/route.check
>+    TMP_FILE=route.check
>+	CACHE_DIR=/var/cache/slpd
>     PING_ERROR_NO_ROUTE='unreachable'
> 
>     MSG_FAILED_TO_FIND='Failed to Detect Multicast Route'
>@@ -55,13 +56,13 @@ multicast_route_set()
>     CMD_GET_INTERFACE="netstat -i | awk 'BEGIN{}(NR>2)&&(!/^lo*/){print \$1}'"
>     CMD_ADD_ROUTE="route add -net 224.0.0.0 netmask 240.0.0.0"
> 
>-    ping $PING_OPTIONS_1 $MULTICAST_ADDRESS 2> $TMP_FILE 1> /dev/null
>+    ping $PING_OPTIONS_1 $MULTICAST_ADDRESS 2> $CACHE_DIR/$TMP_FILE 1> /dev/null
> 
>  if [ $? = 2 ]; then
>-        ping $PING_OPTIONS_2 $MULTICAST_ADDRESS 2> $TMP_FILE 1> /dev/null
>+        ping $PING_OPTIONS_2 $MULTICAST_ADDRESS 2> $CACHE_DIR/$TMP_FILE 1> /dev/null
>  fi
> 
>-    grep $PING_ERROR_NO_ROUTE $TMP_FILE > /dev/null 2>&1
>+    grep $PING_ERROR_NO_ROUTE $CACHE_DIR/$TMP_FILE > /dev/null 2>&1
>     err_unreachable_found=$?
> 
>     #If errors, add route. Otherwise, do nothing
>@@ -91,7 +92,7 @@ multicast_route_set()
>         retval=0
>     fi
> 
>-    rm -f $TMP_FILE # Clean up
>+    rm -f $CACHE_DIR/$TMP_FILE # Clean up
>     return $retval
> }
>

Actions: View | Diff

Attachments on bug 852080: 607221