From d15811504673a2c9f6965e6c4e7d9011465f9ce650633c9ff7f5e69c7cc3d2e9 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Thu, 15 Apr 2010 23:41:19 +0000
Subject: [PATCH] Accepting request 37756 from Base:System

checked in (request 37756)

OBS-URL: https://build.opensuse.org/request/show/37756
OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=21
---
 rc.syslog       | 76 +++++++++++++++++++++----------------------------
 syslogd.changes | 10 -------
 2 files changed, 32 insertions(+), 54 deletions(-)

diff --git a/rc.syslog b/rc.syslog
index 79dd7ee..2a2b366 100644
--- a/rc.syslog
+++ b/rc.syslog
@@ -6,8 +6,8 @@
 #
 # Author: Florian La Roche <florian@suse.de>, 1996
 #	  Werner Fink <werner@suse.de>, 1998-2008
-#	 Stephan Kulow <coolo@suse.de>, 2005-2008
-#	 Marius Tomaschewski <mt@suse.de>, 2001-2008
+#         Stephan Kulow <coolo@suse.de>, 2005-2008
+#         Marius Tomaschewski <mt@suse.de>, 2001-2008
 #
 # /etc/init.d/syslog
 #
@@ -29,9 +29,9 @@ BINDIR=/sbin
 # update $SYSLOG_DAEMON if not up-to-date
 test -n "$SYSLOG_DAEMON" && \
 test -x "${BINDIR}/$SYSLOG_DAEMON" || {
-    for SYSLOG_DAEMON in rsyslogd syslog-ng syslogd ; do
-	test -x "${BINDIR}/$SYSLOG_DAEMON" && break
-    done
+     for SYSLOG_DAEMON in rsyslogd syslog-ng syslogd ; do
+         test -x "${BINDIR}/$SYSLOG_DAEMON" && break
+     done
 }
 
 # set daemon dependent variables
@@ -52,8 +52,8 @@ case "$SYSLOG_DAEMON" in
 	while read one two rest ; do
 	    test "x$one" = 'x$ModLoad'  && \
 	    test "x$two" = 'ximklog.so' && {
-		start_klogd=no
-		break
+	        start_klogd=no
+	        break
 	    }
 	done < $config
 	;;
@@ -61,7 +61,6 @@ case "$SYSLOG_DAEMON" in
 	syslog=syslog-ng
 	config=/etc/syslog-ng/syslog-ng.conf
 	params="$SYSLOG_NG_PARAMS"
-	ngsocks="/var/run/syslog-ng/additional-log-sockets.conf"
 	;;
     *)
 	syslog=syslogd
@@ -116,7 +115,7 @@ case "$1" in
 	    # Syslog service already done
 	    rm -f  /var/lock/subsys/earlysyslog
 	    case "$SYSLOG_DAEMON" in
-		rsyslogd) ;; # switch to normal config
+	        rsyslogd) ;; # switch to normal config
 		*) exit 0 ;;
 	    esac
 	elif test "$2" = "early" ; then
@@ -137,41 +136,30 @@ case "$1" in
 	echo -n "Starting syslog services"
 	test -z "$KERNEL_LOGLEVEL" && KERNEL_LOGLEVEL=1
 
-	case $syslog in
-	    rsyslogd)
-		if test -n "$rsocks" ; then
-		    rm -f "$rsocks"
-		    touch "$rsocks"
-		fi
-		;;
-	    syslog-ng)
-		echo 'source chroots{' > "$ngsocks"
-		;;
+        case $syslog in
+            (rsyslogd)
+	      if [ "x$rsocks" != x ] ; then
+	          rm -f "$rsocks"
+	          touch "$rsocks"
+	      fi
+            ;;
 	esac
 	# add additional sockets to params or similar
 	for variable in ${!SYSLOGD_ADDITIONAL_SOCKET*}; do
 	    eval value=\$$variable
 	    test -n "${value}" && test -d ${value%/*} && {
-		case $syslog in
-		    rsyslogd)
-			if test -n "$rsocks" ; then
-			    echo "\$AddUnixListenSocket $value" >> "$rsocks"
-			fi
-			;;
-		    syslog-ng)
-			echo "unix-dgram(\"$value\");" >> "$ngsocks"
-			;;
-		    *)
-			params="$params -a $value"
-			;;
-		esac
+	        case $syslog in
+	            rsyslogd)
+	                if [ "x$rsocks" != x ] ; then
+	                    echo "\$AddUnixListenSocket $value" >> "$rsocks"
+	                fi
+	            ;;
+	            *)
+	                params="$params -a $value"
+	            ;;
+	        esac
 	    }
 	done
-	case $syslog in
-	    syslog-ng)
-		echo "};" >> "$ngsocks"
-		;;
-	esac
 	startproc -p ${syslog_pid} ${syslog_bin} ${params}
 	rc_status
 
@@ -180,8 +168,8 @@ case "$1" in
 
 	if test $? -eq 0 ; then
 	    if test "$start_klogd" = yes ; then
-		startproc ${klog_bin} -c $KERNEL_LOGLEVEL $KLOGD_PARAMS
-		rc_status
+	        startproc ${klog_bin} -c $KERNEL_LOGLEVEL $KLOGD_PARAMS
+	        rc_status
 	    fi
 	fi
 	rc_status -v
@@ -192,9 +180,9 @@ case "$1" in
 
 	echo -n "Shutting down syslog services"
 	if test "$start_klogd" = yes ; then
-	    killproc		  -TERM ${klog_bin}   ; rc_status
+	    killproc                  -TERM ${klog_bin}   ; rc_status
 	else
-	    killproc		  -TERM ${klog_bin}
+	    killproc                  -TERM ${klog_bin}
 	fi
 	killproc -p ${syslog_use_pid} -TERM ${syslog_use} ; rc_status -v
 	rm -f /var/lock/subsys/syslogd
@@ -219,10 +207,10 @@ case "$1" in
     reload|force-reload)
 	echo -n "Reload syslog service"
 	if test "$start_klogd" = yes ; then
-	    killproc		      -TSTP ${klog_bin}   ; rc_status
+	    killproc                      -TSTP ${klog_bin}   ; rc_status
 	    killproc -p ${syslog_use_pid} -HUP  ${syslog_use} ; rc_status
-	    killproc		      -CONT ${klog_bin}   ; rc_status
-	    killproc		      -USR2 ${klog_bin}   ; rc_status -v
+	    killproc                      -CONT ${klog_bin}   ; rc_status
+	    killproc                      -USR2 ${klog_bin}   ; rc_status -v
 	else
 	    killproc -p ${syslog_use_pid} -HUP  ${syslog_use} ; rc_status -v
 	fi
diff --git a/syslogd.changes b/syslogd.changes
index 919b0b2..1f71a5d 100644
--- a/syslogd.changes
+++ b/syslogd.changes
@@ -1,13 +1,3 @@
--------------------------------------------------------------------
-Mon Apr 12 12:28:46 CEST 2010 - werner@suse.de
-
-- Reformat boot script
-
--------------------------------------------------------------------
-Wed Mar 31 20:47:31 CEST 2010 - pczanik@genesi-usa.com
-
-- modify /etc/init.d/syslog for syslog-ng 3.X
-
 -------------------------------------------------------------------
 Mon Mar 29 16:48:18 CEST 2010 - werner@suse.de