Created
May 9, 2012 16:13
-
-
Save anonymous/2646056 to your computer and use it in GitHub Desktop.
syslog-ng.diff
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -Nru syslog-ng/.footprint syslog-ng-new/.footprint | |
--- syslog-ng/.footprint 2012-05-08 21:11:06.000000000 +0300 | |
+++ syslog-ng-new/.footprint 2012-05-09 10:25:29.000000000 +0300 | |
@@ -1,10 +1,11 @@ | |
drwxr-xr-x root/root etc/ | |
--rw-r--r-- root/root etc/modules.conf | |
-drwxr-xr-x root/root etc/patterndb.d/ | |
drwxr-xr-x root/root etc/rc.d/ | |
-rwxr-xr-x root/root etc/rc.d/syslog-ng | |
--rw-r--r-- root/root etc/scl.conf | |
-rw-r--r-- root/root etc/syslog-ng.conf | |
+drwxr-xr-x root/root etc/syslog-ng/ | |
+-rw-r--r-- root/root etc/syslog-ng/modules.conf | |
+drwxr-xr-x root/root etc/syslog-ng/patterndb.d/ | |
+-rw-r--r-- root/root etc/syslog-ng/scl.conf | |
drwxr-xr-x root/root usr/ | |
drwxr-xr-x root/root usr/bin/ | |
-rwxr-xr-x root/root usr/bin/loggen | |
@@ -143,4 +144,5 @@ | |
-rw-r--r-- root/root usr/share/xsd/patterndb-2.xsd | |
-rw-r--r-- root/root usr/share/xsd/patterndb-3.xsd | |
drwxr-xr-x root/root var/ | |
-drwxr-xr-x root/root var/libexec/ | |
+drwxr-xr-x root/root var/run/ | |
+drwxr-xr-x root/root var/run/syslog-ng/ | |
diff -Nru syslog-ng/.md5sum syslog-ng-new/.md5sum | |
--- syslog-ng/.md5sum 2012-05-08 21:10:41.000000000 +0300 | |
+++ syslog-ng-new/.md5sum 2012-05-09 10:27:23.000000000 +0300 | |
@@ -1,3 +1,3 @@ | |
-392646ec851c0f02a5c81147f746effa syslog-ng.conf | |
+dd44dc727e2c678f71b2535d79b64371 syslog-ng.conf | |
9f48c4550aabdb308883dac66f20d7c1 syslog-ng.rc | |
a69e725854301ecda26dbe51f3a10645 syslog-ng_3.3.5.tar.gz | |
diff -Nru syslog-ng/Pkgfile syslog-ng-new/Pkgfile | |
--- syslog-ng/Pkgfile 2012-05-08 21:11:06.000000000 +0300 | |
+++ syslog-ng-new/Pkgfile 2012-05-08 22:59:38.000000000 +0300 | |
@@ -8,23 +8,23 @@ | |
version=3.3.5 | |
release=1 | |
source=(http://balabit.com/downloads/files/syslog-ng/sources/$version/source/${name}_${version}.tar.gz | |
-syslog-ng.rc syslog-ng.conf) | |
+$name.rc $name.conf) | |
build() { | |
cd $name-$version | |
./configure \ | |
--prefix=/usr \ | |
- --sysconfdir=/etc \ | |
- --libexecdir=/var/libexec \ | |
- --localstatedir=/var \ | |
+ --sysconfdir=/etc/$name \ | |
+ --localstatedir=/var/run/$name \ | |
--mandir=/usr/man \ | |
--enable-dynamic-linking | |
- | |
make && make DESTDIR=$PKG install | |
+ rmdir $PKG/usr/libexec | |
+ rm $PKG/etc/$name/$name.conf | |
rm -rf $PKG/usr/doc | |
rm -rf $PKG/usr/share/include/scl/syslogconf/README | |
- install -D -m 644 ../syslog-ng.conf $PKG/etc/syslog-ng.conf | |
- install -D -m 755 ../syslog-ng.rc $PKG/etc/rc.d/syslog-ng | |
+ install -D -m 644 $SRC/$name.conf $PKG/etc/$name.conf | |
+ install -D -m 755 $SRC/$name.rc $PKG/etc/rc.d/$name | |
} | |
diff -Nru syslog-ng/syslog-ng.conf syslog-ng-new/syslog-ng.conf | |
--- syslog-ng/syslog-ng.conf 2011-01-30 00:31:52.000000000 +0200 | |
+++ syslog-ng-new/syslog-ng.conf 2012-05-09 10:26:47.000000000 +0300 | |
@@ -1,5 +1,6 @@ | |
-@version: 3.0 | |
-# | |
+@version: 3.3 | |
+@include "scl.conf" | |
+ | |
# /etc/syslog-ng: syslog-ng(8) configration file, based on a gentoo template | |
# use logger to test new rules: | |
# logger -p daemon.crit testmessage | |
diff -Nru syslog-ng/syslog-ng.rc syslog-ng-new/syslog-ng.rc | |
--- syslog-ng/syslog-ng.rc 2012-03-09 13:39:06.000000000 +0200 | |
+++ syslog-ng-new/syslog-ng.rc 2012-05-09 10:31:58.000000000 +0300 | |
@@ -5,11 +5,11 @@ | |
case $1 in | |
start) | |
- /usr/sbin/syslog-ng -f /etc/syslog-ng.conf -p /var/run/syslog-ng.pid | |
+ /usr/sbin/syslog-ng -f /etc/syslog-ng.conf | |
;; | |
stop) | |
killall -q /usr/sbin/syslog-ng | |
- rm -f /var/run/syslog-ng.pid | |
+ rm -f /var/run/syslog-ng/syslog-ng.pid | |
;; | |
restart) | |
$0 stop |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment