|
From: Heiko Z. <smi...@us...> - 2011-10-22 21:36:56
|
Update of /cvsroot/devil-linux/build/scripts/scripts
In directory vz-cvs-3.sog:/tmp/cvs-serv27840/scripts/scripts
Modified Files:
upgrade-config
Log Message:
- updated aide to 0.15.1
- updated aufs3-git to 20111011
- updated binutils to 2.21.1a
- updated clamav to 0.97.3
- added cloog-ppl 0.15.11
- updated cyrus-imapd to 2.4.12
- updated dnsmasq to 2.59
- updated eventlog to 0.2.12
- updated gcc to 4.4.5
- updated giflib to 4.1.6
- updated glibc to 2.12.2
- added knock 0.5
- updated lftp to 4.3.3
- updated libcap to 2.22
- updated mtr to 0.81
- updated pcre to 8.20
- added ppl 0.11.2
- updated radiusplugin to v2.1
- updated scponly to 20110526
- updated strongswan to 4.5.3
- updated syslog-ng to 3.3.1
- updated vsftpd to 2.3.4
- updated wget to 1.13.4
- updated xfsprogs to 3.1.6
Index: upgrade-config
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/scripts/upgrade-config,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- upgrade-config 19 Nov 2010 00:42:47 -0000 1.43
+++ upgrade-config 22 Oct 2011 21:36:53 -0000 1.44
@@ -331,7 +331,7 @@
# syslog-ng
# remove all chroot jail entries and replace stream with dgram
-# add compatability for syslog-ng >= 3.0
+# add compatability for syslog-ng >= 3.3
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' \
@@ -339,9 +339,11 @@
-e 's|pipe.*("/proc/kmsg"|file("/proc/kmsg"|g' \
-e 's|log_prefix|program_override|g' \
-e 's|unix-dgram*("/dev/log"|unix-stream("/dev/log"|g' \
- -e 's|^@version.*$||g' \
+ -e 's|long_hostnames|chain_hostnames|g' \
+ -e 's|unix-stream("/dev/log" max-connections(1000)|unix-stream("/dev/log" max-connections(100)|g' \
+ -e 's|^@version.*$||g' \
< /etc/syslog-ng/syslog-ng.conf > $TMPD
-echo '@version: 3.0' > /etc/syslog-ng/syslog-ng.conf
+echo '@version: 3.3' > /etc/syslog-ng/syslog-ng.conf
cat $TMPD >> /etc/syslog-ng/syslog-ng.conf
rm $TMPD
|