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: 09-Apr-2008 22:09:04
Branch: HEAD Handle: 2008040921090201
Modified files:
openpkg-src/rsyslog rsyslog.patch rsyslog.spec
Log:
upgrading package: rsyslog 3.15.0 -> 3.17.0
Summary:
Revision Changes Path
1.8 +17 -29 openpkg-src/rsyslog/rsyslog.patch
1.19 +4 -4 openpkg-src/rsyslog/rsyslog.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsyslog/rsyslog.patch
============================================================================
$ cvs diff -u -r1.7 -r1.8 rsyslog.patch
--- openpkg-src/rsyslog/rsyslog.patch 1 Apr 2008 20:03:40 -0000 1.7
+++ openpkg-src/rsyslog/rsyslog.patch 9 Apr 2008 20:09:02 -0000 1.8
@@ -1,18 +1,6 @@
-Index: atomic.h
---- atomic.h.orig 2008-03-31 11:07:24 +0200
-+++ atomic.h 2008-04-01 20:38:46 +0200
-@@ -36,7 +36,7 @@
- #define INCLUDED_ATOMIC_H
-
- /* set the following to 1 if we have atomic operations (and #undef it
otherwise) */
--#define DO_HAVE_ATOMICS 1
-+#undef DO_HAVE_ATOMICS
- #define ATOMIC_INC(data) ((void) __sync_fetch_and_add(&data, 1))
- #define ATOMIC_DEC_AND_FETCH(data) __sync_sub_and_fetch(&data, 1)
-
Index: config.h.in
---- config.h.in.orig 2008-04-01 14:06:53 +0200
-+++ config.h.in 2008-04-01 20:00:27 +0200
+--- 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. */
@@ -24,8 +12,8 @@
/* Defined if debug mode is enabled (its easier to check). */
#undef DEBUG
Index: net.h
---- net.h.orig 2008-03-11 17:43:12 +0100
-+++ net.h 2008-04-01 20:00:27 +0200
+--- net.h.orig 2008-04-08 16:30:04 +0200
++++ net.h 2008-04-09 11:02:28 +0200
@@ -23,6 +23,9 @@
#ifndef INCLUDED_NET_H
#define INCLUDED_NET_H
@@ -37,11 +25,11 @@
#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-03-20 10:31:03 +0100
-+++ queue.c 2008-04-01 20:00:27 +0200
-@@ -39,6 +39,8 @@
- #include <unistd.h>
+--- queue.c.orig 2008-04-08 18:10:41 +0200
++++ queue.c 2008-04-09 11:02:28 +0200
+@@ -40,6 +40,8 @@
#include <sys/stat.h> /* required for HP UX */
+ #include <time.h>
#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
@@ -49,8 +37,8 @@
#include "rsyslog.h"
#include "syslogd.h"
Index: stream.c
---- stream.c.orig 2008-03-27 15:58:52 +0100
-+++ stream.c 2008-04-01 20:00:27 +0200
+--- stream.c.orig 2008-04-08 16:30:04 +0200
++++ stream.c 2008-04-09 11:02:28 +0200
@@ -38,6 +38,7 @@
#include <unistd.h>
#include <sys/stat.h> /* required for HP UX */
@@ -60,19 +48,19 @@
#include "rsyslog.h"
#include "syslogd.h"
Index: syslogd.c
---- syslogd.c.orig 2008-03-28 18:21:43 +0100
-+++ syslogd.c 2008-04-01 20:00:27 +0200
-@@ -205,37 +205,19 @@
+--- syslogd.c.orig 2008-04-08 18:10:41 +0200
++++ syslogd.c 2008-04-09 11:02:28 +0200
+@@ -206,37 +206,19 @@
#endif
#ifndef _PATH_LOGCONF
-#define _PATH_LOGCONF "/etc/rsyslog.conf"
-+#define _PATH_LOGCONF "@l_prefix@/etc/rsyslog/rsyslog.conf"
++#define _PATH_LOGCONF "/openpkg-dev/etc/rsyslog/rsyslog.conf"
#endif
#ifndef _PATH_MODDIR
-#define _PATH_MODDIR "/lib/rsyslog/"
-+#define _PATH_MODDIR "@l_prefix@/lib/rsyslog/"
++#define _PATH_MODDIR "/openpkg-dev/lib/rsyslog/"
#endif
-#if defined(SYSLOGD_PIDNAME)
@@ -81,7 +69,7 @@
-# ifdef BSD
-# define _PATH_VARRUN "/var/run/"
+#ifndef _PATH_VARRUN
-+#define _PATH_VARRUN "@l_prefix@/var/rsyslog/run/"
++#define _PATH_VARRUN "/openpkg-dev/var/rsyslog/run/"
# endif
-# if defined(__sun) || defined(__hpux)
-# define _PATH_VARRUN "/var/run/"
@@ -102,7 +90,7 @@
-# define _PATH_LOGPID "/etc/rsyslogd.pid"
-# endif
-# endif
-+#define _PATH_LOGPID "@l_prefix@/var/rsyslog/run/rsyslog.pid"
++#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.18 -r1.19 rsyslog.spec
--- openpkg-src/rsyslog/rsyslog.spec 1 Apr 2008 20:03:40 -0000 1.18
+++ openpkg-src/rsyslog/rsyslog.spec 9 Apr 2008 20:09:03 -0000 1.19
@@ -31,8 +31,8 @@
Class: EVAL
Group: Logfile
License: GPL
-Version: 3.15.0
-Release: 20080401
+Version: 3.17.0
+Release: 20080409
# package options
%option with_kerberos no
@@ -50,8 +50,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823
PreReq: OpenPKG, openpkg >= 20060823
-BuildPreReq: zlib, librelp
-PreReq: zlib, librelp
+BuildPreReq: zlib, librelp >= 0.1.1
+PreReq: zlib, librelp >= 0.1.1
%if "%{with_kerberos}" == "yes"
BuildPreReq: KERBEROS
PreReq: KERBEROS
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
