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: 15-Apr-2008 21:15:50
Branch: HEAD Handle: 2008041520155000
Modified files:
openpkg-src/rsyslog rsyslog.patch rsyslog.spec
Log:
upgrading package: rsyslog 3.17.0 -> 3.17.1
Summary:
Revision Changes Path
1.9 +34 -37 openpkg-src/rsyslog/rsyslog.patch
1.20 +2 -2 openpkg-src/rsyslog/rsyslog.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsyslog/rsyslog.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 rsyslog.patch
--- openpkg-src/rsyslog/rsyslog.patch 9 Apr 2008 20:09:02 -0000 1.8
+++ openpkg-src/rsyslog/rsyslog.patch 15 Apr 2008 19:15:50 -0000 1.9
@@ -1,19 +1,19 @@
Index: config.h.in
---- config.h.in.orig 2008-04-08 18:19:24 +0200
-+++ config.h.in 2008-04-09 11:02:28 +0200
-@@ -1,7 +1,9 @@
- /* config.h.in. Generated from configure.ac by autoheader. */
-
- /* Description */
-+#ifndef BSD
- #undef BSD
+--- 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 @@
+ #undef NO_MINUS_C_MINUS_O
+
+ /* Indicator for a BSD OS */
++#ifndef OS_BSD
+ #undef OS_BSD
+#endif
- /* Defined if debug mode is enabled (its easier to check). */
- #undef DEBUG
+ /* Name of package */
+ #undef PACKAGE
Index: net.h
---- net.h.orig 2008-04-08 16:30:04 +0200
-+++ net.h 2008-04-09 11:02:28 +0200
+--- net.h.orig 2008-04-15 14:24:00 +0200
++++ net.h 2008-04-15 21:05:08 +0200
@@ -23,6 +23,9 @@
#ifndef INCLUDED_NET_H
#define INCLUDED_NET_H
@@ -25,9 +25,9 @@
#include <netinet/in.h>
#include <sys/socket.h> /* this is needed on HP UX -- rgerhards, 2008-03-04
*/
Index: queue.c
---- queue.c.orig 2008-04-08 18:10:41 +0200
-+++ queue.c 2008-04-09 11:02:28 +0200
-@@ -40,6 +40,8 @@
+--- queue.c.orig 2008-04-15 11:07:36 +0200
++++ queue.c 2008-04-15 21:05:08 +0200
+@@ -41,6 +41,8 @@
#include <sys/stat.h> /* required for HP UX */
#include <time.h>
#include <errno.h>
@@ -37,9 +37,9 @@
#include "rsyslog.h"
#include "syslogd.h"
Index: stream.c
---- stream.c.orig 2008-04-08 16:30:04 +0200
-+++ stream.c 2008-04-09 11:02:28 +0200
-@@ -38,6 +38,7 @@
+--- stream.c.orig 2008-04-15 11:03:26 +0200
++++ stream.c 2008-04-15 21:05:08 +0200
+@@ -39,6 +39,7 @@
#include <unistd.h>
#include <sys/stat.h> /* required for HP UX */
#include <errno.h>
@@ -48,49 +48,46 @@
#include "rsyslog.h"
#include "syslogd.h"
Index: syslogd.c
---- syslogd.c.orig 2008-04-08 18:10:41 +0200
-+++ syslogd.c 2008-04-09 11:02:28 +0200
-@@ -206,37 +206,19 @@
- #endif
+--- syslogd.c.orig 2008-04-15 14:24:00 +0200
++++ 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 "/openpkg-dev/etc/rsyslog/rsyslog.conf"
+ #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 "/openpkg-dev/lib/rsyslog/"
++#define _PATH_MODDIR "@l_prefix@/lib/rsyslog/"
#endif
--#if defined(SYSLOGD_PIDNAME)
--# undef _PATH_LOGPID
++#define _PATH_VARRUN "@l_prefix/var/rsyslog/run/"
+ #if defined(SYSLOGD_PIDNAME)
+ # undef _PATH_LOGPID
-# if defined(FSSTND)
--# ifdef BSD
+-# ifdef OS_BSD
-# define _PATH_VARRUN "/var/run/"
-+#ifndef _PATH_VARRUN
-+#define _PATH_VARRUN "/openpkg-dev/var/rsyslog/run/"
- # endif
+-# endif
-# if defined(__sun) || defined(__hpux)
-# define _PATH_VARRUN "/var/run/"
-# endif
--# define _PATH_LOGPID _PATH_VARRUN SYSLOGD_PIDNAME
+ # define _PATH_LOGPID _PATH_VARRUN SYSLOGD_PIDNAME
-# else
-# define _PATH_LOGPID "/etc/" SYSLOGD_PIDNAME
-# endif
--#else
-+
- # ifndef _PATH_LOGPID
+ #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"
++# undef _PATH_LOGPID
+ # define _PATH_LOGPID _PATH_VARRUN "rsyslogd.pid"
-# else
-# define _PATH_LOGPID "/etc/rsyslogd.pid"
-# endif
-# endif
-+#define _PATH_LOGPID "/openpkg-dev/var/rsyslog/run/rsyslog.pid"
#endif
#ifndef _PATH_DEV
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsyslog/rsyslog.spec
============================================================================
$ cvs diff -u -r1.19 -r1.20 rsyslog.spec
--- openpkg-src/rsyslog/rsyslog.spec 9 Apr 2008 20:09:03 -0000 1.19
+++ openpkg-src/rsyslog/rsyslog.spec 15 Apr 2008 19:15:50 -0000 1.20
@@ -31,8 +31,8 @@
Class: EVAL
Group: Logfile
License: GPL
-Version: 3.17.0
-Release: 20080409
+Version: 3.17.1
+Release: 20080415
# package options
%option with_kerberos no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
