OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Christoph Schug
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 27-Mar-2008 08:21:07
Branch: HEAD Handle: 2008032707210600
Modified files:
openpkg-src/rsyslog rc.rsyslog rsyslog.patch rsyslog.spec
Log:
modifying package: rsyslog-3.13.0 20080326 -> 20080327
Summary:
Revision Changes Path
1.2 +2 -2 openpkg-src/rsyslog/rc.rsyslog
1.6 +47 -0 openpkg-src/rsyslog/rsyslog.patch
1.17 +4 -9 openpkg-src/rsyslog/rsyslog.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsyslog/rc.rsyslog
============================================================================
$ cvs diff -u -r1.1 -r1.2 rc.rsyslog
--- openpkg-src/rsyslog/rc.rsyslog 29 Dec 2007 11:32:44 -0000 1.1
+++ openpkg-src/rsyslog/rc.rsyslog 27 Mar 2008 07:21:06 -0000 1.2
@@ -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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsyslog/rsyslog.patch
============================================================================
$ cvs diff -u -r1.5 -r1.6 rsyslog.patch
--- openpkg-src/rsyslog/rsyslog.patch 8 Mar 2008 12:12:03 -0000 1.5
+++ openpkg-src/rsyslog/rsyslog.patch 27 Mar 2008 07:21:06 -0000 1.6
@@ -47,3 +47,50 @@
#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
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsyslog/rsyslog.spec
============================================================================
$ cvs diff -u -r1.16 -r1.17 rsyslog.spec
--- openpkg-src/rsyslog/rsyslog.spec 26 Mar 2008 16:41:33 -0000 1.16
+++ openpkg-src/rsyslog/rsyslog.spec 27 Mar 2008 07:21:06 -0000 1.17
@@ -32,7 +32,7 @@
Group: Logfile
License: GPL
Version: 3.13.0
-Release: 20080326
+Release: 20080327
# package options
%option with_kerberos no
@@ -80,20 +80,15 @@
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 @@
# 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
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
