OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 18-Nov-2008 20:42:58
Branch: HEAD Handle: 2008111819425700
Modified files:
openpkg-src/rsyslog rsyslog.patch rsyslog.spec
Log:
upgrading package: rsyslog 3.21.7 -> 4.1.0
Summary:
Revision Changes Path
1.14 +18 -47 openpkg-src/rsyslog/rsyslog.patch
1.41 +2 -2 openpkg-src/rsyslog/rsyslog.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsyslog/rsyslog.patch
============================================================================
$ cvs diff -u -r1.13 -r1.14 rsyslog.patch
--- openpkg-src/rsyslog/rsyslog.patch 12 Jun 2008 17:53:58 -0000 1.13
+++ openpkg-src/rsyslog/rsyslog.patch 18 Nov 2008 19:42:57 -0000 1.14
@@ -1,7 +1,7 @@
Index: config.h.in
---- config.h.in.orig 2008-04-15 14:29:08 +0200
-+++ config.h.in 2008-04-15 21:05:35 +0200
-@@ -261,7 +261,9 @@
+--- config.h.in.orig 2008-11-18 13:08:01 +0100
++++ config.h.in 2008-11-18 20:01:01 +0100
+@@ -267,7 +267,9 @@
#undef NO_MINUS_C_MINUS_O
/* Indicator for a BSD OS */
@@ -11,47 +11,18 @@
/* Name of package */
#undef PACKAGE
-Index: tools/syslogd.c
---- tools/syslogd.c.orig 2008-04-15 14:24:00 +0200
-+++ tools/syslogd.c 2008-04-15 21:07:54 +0200
-@@ -207,36 +207,20 @@
-
- #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
-
-+#define _PATH_VARRUN "@l_prefix/var/rsyslog/run/"
- #if defined(SYSLOGD_PIDNAME)
- # undef _PATH_LOGPID
--# if defined(FSSTND)
--# ifdef OS_BSD
--# define _PATH_VARRUN "/var/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)
-+# undef _PATH_LOGPID
- # define _PATH_LOGPID _PATH_VARRUN "rsyslogd.pid"
--# else
--# define _PATH_LOGPID "/etc/rsyslogd.pid"
--# endif
--# endif
- #endif
-
- #ifndef _PATH_DEV
+Index: runtime/debug.c
+--- runtime/debug.c.orig 2008-11-18 12:32:46 +0100
++++ runtime/debug.c 2008-11-18 20:14:45 +0100
+@@ -820,7 +820,11 @@
+ }
+
+ // old, reenable TODO lenWriteBuf = snprintf(pszWriteBuf,
sizeof(pszWriteBuf), "%s: ", pszThrdName);
++#ifdef SYS_gettid
+ lenWriteBuf = snprintf(pszWriteBuf, sizeof(pszWriteBuf),
"{%ld}%s: ", (long) syscall(SYS_gettid), pszThrdName);
++#else
++ lenWriteBuf = snprintf(pszWriteBuf, sizeof(pszWriteBuf),
"{%ld}%s: ", (long) 0, pszThrdName);
++#endif
+ if(stddbg != -1) write(stddbg, pszWriteBuf, lenWriteBuf);
+ if(altdbg != -1) write(altdbg, pszWriteBuf, lenWriteBuf);
+ /* print object name header if we have an object */
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsyslog/rsyslog.spec
============================================================================
$ cvs diff -u -r1.40 -r1.41 rsyslog.spec
--- openpkg-src/rsyslog/rsyslog.spec 11 Nov 2008 21:14:59 -0000 1.40
+++ openpkg-src/rsyslog/rsyslog.spec 18 Nov 2008 19:42:57 -0000 1.41
@@ -31,8 +31,8 @@
Class: EVAL
Group: Logfile
License: GPL
-Version: 3.21.7
-Release: 20081111
+Version: 4.1.0
+Release: 20081118
# package options
%option with_kerberos no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
