From c2efc3f85835ebc5b0c5d9e0273d321b10e8d9e47314065c1e149b6474e31558 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Mon, 12 Apr 2010 10:16:27 +0000
Subject: [PATCH] Accepting request 36797 from home:czanik:branches:Base:System

Copy from home:czanik:branches:Base:System/syslogd via accept of submit request 36797 revision 2.
Request was accepted with message:

OBS-URL: https://build.opensuse.org/request/show/36797
OBS-URL: https://build.opensuse.org/package/show/Base:System/syslogd?expand=0&rev=19
---
 rc.syslog       | 12 ++++++++++++
 syslogd.changes |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/rc.syslog b/rc.syslog
index 2a2b366..23bd122 100644
--- a/rc.syslog
+++ b/rc.syslog
@@ -61,6 +61,7 @@ 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
@@ -142,6 +143,9 @@ case "$1" in
 	          rm -f "$rsocks"
 	          touch "$rsocks"
 	      fi
+	    ;;
+	    (syslog-ng)
+		echo 'source chroots{' > "$ngsocks"
             ;;
 	esac
 	# add additional sockets to params or similar
@@ -154,12 +158,20 @@ case "$1" in
 	                    echo "\$AddUnixListenSocket $value" >> "$rsocks"
 	                fi
 	            ;;
+		    syslog-ng)
+			echo "unix-dgram(\"$value\");" >> "$ngsocks"
+		    ;;
 	            *)
 	                params="$params -a $value"
 	            ;;
 	        esac
 	    }
 	done
+	case $syslog in
+		syslog-ng)
+		   echo "};" >> "$ngsocks"
+		;;
+	esac
 	startproc -p ${syslog_pid} ${syslog_bin} ${params}
 	rc_status
 
diff --git a/syslogd.changes b/syslogd.changes
index 1f71a5d..2a6a97c 100644
--- a/syslogd.changes
+++ b/syslogd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Mar 31 20:47:31 CEST 2010
+
+- modify /etc/init.d/syslog for syslog-ng 3.X
+
 -------------------------------------------------------------------
 Mon Mar 29 16:48:18 CEST 2010 - werner@suse.de