[Devil-linux-commit] build/scripts/scripts upgrade-config, 1.35, 1.36

[Heiko Z. <smi...@us...>]

Update of /cvsroot/devil-linux/build/scripts/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28767/scripts/scripts

Modified Files:
	upgrade-config 
Log Message:
- updated ImageMagick-6.5.5-8
- updated LPRng-3.8.33
- updated alsa-driver-1.0.21
- updated alsa-lib-1.0.21
- updated alsa-tools-1.0.21
- updated alsa-utils-1.0.21
- updated bash-3.2.48
- updated cdrtools-2.01.01a64
- updated dnsmasq-2.50
- updated dovecot-1.2.4
- updated e2fsprogs-1.41.9
- updated gawk-3.1.7
- updated glib-2.21.6
- updated gmp-4.3.1
- updated gnupg-1.4.10
- updated gnutls-2.8.3
- updated postfix-2.6.5
- updated shorewall-common-4.2.11
- updated shorewall-perl-4.2.11
- updated shorewall-shell-4.2.11
- upgrade-config now corrects the syslog-ng configuration for the new
version


Index: upgrade-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/upgrade-config,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- upgrade-config	10 Jun 2009 15:24:09 -0000	1.35
+++ upgrade-config	9 Sep 2009 19:49:32 -0000	1.36
@@ -332,9 +332,16 @@
 
 # syslog-ng
 # remove all chroot jail entries and replace stream with dgram
+# add compatability for syslog-ng >= 3.0
 sed	-e 's|unix-stream *( *"/jail[^;]*;||g' \
 	-e 's|unix-stream *( *"/dev/log"|unix-dgram("/dev/log"|' \
+	-e 's|sync(0)|flush_lines(0)|g' \
+	-e 's|use_time_recvd (yes);||g' \
+	-e 's|^source src .*;$|source src { file("/proc/kmsg" program_override("kernel: ")); unix-stream("/dev/log" max-connections(1000)); internal(); };|g' \
+	-e 's|^@version.*$||g' \
 		< /etc/syslog-ng/syslog-ng.conf > $TMPD
-mv $TMPD /etc/syslog-ng/syslog-ng.conf
+echo '@version: 3.0' > /etc/syslog-ng/syslog-ng.conf
+cat $TMPD >> /etc/syslog-ng/syslog-ng.conf
+rm $TMPD
 
 rm -fr $TMPD $RESULT $RAMDISKDIR/oldconfig