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: 14-Jan-2008 19:50:12
Branch: HEAD Handle: 2008011418501200
Modified files:
openpkg-src/rsyslog rsyslog.patch rsyslog.spec
Log:
upgrading package: rsyslog 2.0.0 -> 3.10.2
Summary:
Revision Changes Path
1.2 +38 -47 openpkg-src/rsyslog/rsyslog.patch
1.5 +2 -3 openpkg-src/rsyslog/rsyslog.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsyslog/rsyslog.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 rsyslog.patch
--- openpkg-src/rsyslog/rsyslog.patch 29 Dec 2007 11:32:46 -0000 1.1
+++ openpkg-src/rsyslog/rsyslog.patch 14 Jan 2008 18:50:12 -0000 1.2
@@ -1,6 +1,6 @@
Index: config.h.in
---- config.h.in.orig 2007-12-27 23:28:51 +0100
-+++ config.h.in 2007-12-29 11:21:50 +0100
+--- config.h.in.orig 2008-01-14 14:00:04 +0100
++++ config.h.in 2008-01-14 19:46:36 +0100
@@ -1,7 +1,9 @@
/* config.h.in. Generated from configure.ac by autoheader. */
@@ -9,12 +9,12 @@
#undef BSD
+#endif
- /* klogd functionality is integrated. */
- #undef FEATURE_KLOGD
+ /* Regular expressions support enabled. */
+ #undef FEATURE_REGEXP
Index: net.h
---- net.h.orig 2007-12-26 10:56:07 +0100
-+++ net.h 2007-12-29 11:21:50 +0100
-@@ -22,6 +22,9 @@
+--- net.h.orig 2007-12-26 12:36:15 +0100
++++ net.h 2008-01-14 19:46:36 +0100
+@@ -23,6 +23,9 @@
#ifndef INCLUDED_NET_H
#define INCLUDED_NET_H
@@ -24,47 +24,38 @@
#ifdef SYSLOG_INET
#include <netinet/in.h>
-Index: syslogd.c
---- syslogd.c.orig 2007-12-26 10:56:01 +0100
-+++ syslogd.c 2007-12-29 11:57:58 +0100
-@@ -267,28 +267,9 @@
- #define _PATH_MODDIR "/lib/rsyslog/"
- #endif
-
--#if defined(SYSLOGD_PIDNAME)
--#undef _PATH_LOGPID
--#if defined(FSSTND)
--#ifdef BSD
--#define _PATH_VARRUN "/var/run/"
--#endif
--#ifdef __sun
--#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(FSSTND)
--#define _PATH_LOGPID _PATH_VARRUN "rsyslogd.pid"
--#else
- #define _PATH_LOGPID "/etc/rsyslogd.pid"
- #endif
--#endif
--#endif
-
- #ifndef _PATH_DEV
- #define _PATH_DEV "/dev/"
-@@ -303,11 +284,7 @@
+Index: obj-types.h
+--- obj-types.h.orig 2008-01-13 12:47:46 +0100
++++ obj-types.h 2008-01-14 19:46:36 +0100
+@@ -110,7 +110,7 @@
+ #else /* non-debug mode, no checks but much faster */
+ # define BEGINobjInstance objInfo_t *pObjInfo;
+ # define ISOBJ_TYPE_assert(pObj, objType)
+-# define ISOBJ_assert(pObj, objType)
++# define ISOBJ_assert(pObj)
#endif
- #ifndef _PATH_LOG
--#ifdef BSD
- #define _PATH_LOG "/var/run/log"
--#else
--#define _PATH_LOG "/dev/log"
--#endif
- #endif
+ #define DEFpropSetMeth(obj, prop, dataType)\
+Index: queue.c
+--- queue.c.orig 2008-01-14 12:57:03 +0100
++++ queue.c 2008-01-14 19:46:36 +0100
+@@ -37,6 +37,8 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <errno.h>
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include "rsyslog.h"
+ #include "syslogd.h"
+Index: syslogd.c
+--- syslogd.c.orig 2008-01-14 19:46:36 +0100
++++ syslogd.c 2008-01-14 19:48:00 +0100
+@@ -134,6 +134,7 @@
+ #include <sys/wait.h>
+ #include <sys/file.h>
+ #include <sys/time.h>
++#include <sys/stat.h>
+ #if HAVE_SYS_TIMESPEC_H
+ # include <sys/timespec.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsyslog/rsyslog.spec
============================================================================
$ cvs diff -u -r1.4 -r1.5 rsyslog.spec
--- openpkg-src/rsyslog/rsyslog.spec 3 Jan 2008 09:12:56 -0000 1.4
+++ openpkg-src/rsyslog/rsyslog.spec 14 Jan 2008 18:50:12 -0000 1.5
@@ -31,8 +31,8 @@
Class: EVAL
Group: Logfile
License: GPL
-Version: 2.0.0
-Release: 20080103
+Version: 3.10.2
+Release: 20080114
# package options
%option with_kerberos no
@@ -93,7 +93,6 @@
-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/;' \
- -e 's;/var/run/log;%{l_prefix}/var/rsyslog/log;' \
syslogd.c
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
