From 8a145ba33f9de2f07382db757efe7db54c9d5a60 Mon Sep 17 00:00:00 2001
From: Christoph Schug <cs@openpkg.org>
Date: Thu, 27 Mar 2008 07:21:06 +0000
Subject: [PATCH] modifying package: rsyslog-3.13.0 20080326 -> 20080327

---
 rsyslog/rc.rsyslog    |  4 ++--
 rsyslog/rsyslog.patch | 47 +++++++++++++++++++++++++++++++++++++++++++
 rsyslog/rsyslog.spec  | 13 ++++--------
 3 files changed, 53 insertions(+), 11 deletions(-)

diff --git a/rsyslog/rc.rsyslog b/rsyslog/rc.rsyslog
index ee04099da7..0aaca75058 100644
--- a/rsyslog/rc.rsyslog
+++ b/rsyslog/rc.rsyslog
@@ -5,7 +5,7 @@
 
 %config
     rsyslog_enable="$openpkg_rc_def"
-    rsyslog_flags="-o"
+    rsyslog_flags=""
     rsyslog_log_prolog="true"
     rsyslog_log_epilog="true"
     rsyslog_log_numfiles="10"
@@ -31,7 +31,7 @@
 %start -u @l_susr@
     rcService rsyslog enable yes || exit 0
     rcService rsyslog active yes && exit 0
-    @l_prefix@/sbin/rsyslog ${rsyslog_flags}
+    @l_prefix@/sbin/rsyslogd ${rsyslog_flags}
 
 %stop -u @l_susr@
     rcService rsyslog enable yes || exit 0
diff --git a/rsyslog/rsyslog.patch b/rsyslog/rsyslog.patch
index b2c9036c29..b4feb489fc 100644
--- a/rsyslog/rsyslog.patch
+++ b/rsyslog/rsyslog.patch
@@ -47,3 +47,50 @@ Index: stream.c
  
  #include "rsyslog.h"
  #include "syslogd.h"
+Index: syslogd.c	2008-03-25 10:08:25.000000000 +0100
+--- syslogd.c.orig	2008-03-25 10:08:25.000000000 +0100
++++ syslogd.c	2008-03-26 11:01:38.000000000 +0100
+@@ -208,37 +208,19 @@
+ #endif
+ 
+ #ifndef _PATH_LOGCONF 
+-#define _PATH_LOGCONF	"/etc/rsyslog.conf"
++#define _PATH_LOGCONF	"@l_prefix@/etc/rsyslog/rsyslog.conf"
+ #endif
+ 
+ #ifndef _PATH_MODDIR
+-#define _PATH_MODDIR	"/lib/rsyslog/"
++#define _PATH_MODDIR	"@l_prefix@/lib/rsyslog/"
+ #endif
+ 
+-#if defined(SYSLOGD_PIDNAME)
+-#	undef _PATH_LOGPID
+-#	if defined(FSSTND)
+-#		ifdef BSD
+-#			define _PATH_VARRUN "/var/run/"
++#ifndef _PATH_VARRUN
++#define _PATH_VARRUN	"@l_prefix@/var/rsyslog/run/"
+ #		endif
+-#		if defined(__sun) || defined(__hpux)
+-#			define _PATH_VARRUN "/var/run/"
+-#		endif
+-#		define _PATH_LOGPID _PATH_VARRUN SYSLOGD_PIDNAME
+-#	else
+-#		define _PATH_LOGPID "/etc/" SYSLOGD_PIDNAME
+-#	endif
+-#else
++
+ #	ifndef _PATH_LOGPID
+-#		if defined(__sun) || defined(__hpux)
+-#			define _PATH_VARRUN "/var/run/"
+-#		endif
+-#		if defined(FSSTND)
+-#			define _PATH_LOGPID _PATH_VARRUN "rsyslogd.pid"
+-#		else
+-#			define _PATH_LOGPID "/etc/rsyslogd.pid"
+-#		endif
+-#	endif
++#define _PATH_LOGPID	"@l_prefix@/var/rsyslog/run/rsyslog.pid"
+ #endif
+ 
+ #ifndef _PATH_DEV
diff --git a/rsyslog/rsyslog.spec b/rsyslog/rsyslog.spec
index 9df746e626..04c639d9cf 100644
--- a/rsyslog/rsyslog.spec
+++ b/rsyslog/rsyslog.spec
@@ -32,7 +32,7 @@ Class:        EVAL
 Group:        Logfile
 License:      GPL
 Version:      3.13.0
-Release:      20080326
+Release:      20080327
 
 #   package options
 %option       with_kerberos no
@@ -80,20 +80,15 @@ AutoReqProv:  no
     prog rsyslog = {
         version   = %{version}
         url       = http://download.rsyslog.com/rsyslog/
-        regex     = rsyslog-(\d+\.\d+\.\d+)\.tar\.gz
+        regex     = rsyslog-(\d+(\.\d+)+)\.tar\.gz
     }
 
 %prep
     %setup -q
-    %patch -p0
+    %{l_sed} <%{PATCH0} %{l_value -s -a} | %{l_patch} -p0 -b
 
 %build
     #   configure program
-    %{l_shtool} subst \
-        -e 's;/etc/rsyslog.conf;%{l_prefix}/etc/rsyslog.conf;' \
-        -e 's;/etc/rsyslogd.pid;%{l_prefix}/var/rsyslog/run/rsyslog.pid;' \
-        -e 's;/lib/rsyslog/;%{l_prefix}/lib/rsyslog/;' \
-        syslogd.c
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags}" \
@@ -143,7 +138,7 @@ AutoReqProv:  no
     #   install run-command script
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
-    %{l_shtool} install -c -m 644 %{l_value -s -a} \
+    %{l_shtool} install -c -m 755 %{l_value -s -a} \
         %{SOURCE rc.rsyslog} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
 
     #   create run-time directories