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: 01-Apr-2008 22:03:41
Branch: HEAD Handle: 2008040121034000
Modified files:
openpkg-src/rsyslog rsyslog.patch rsyslog.spec
Log:
upgrading package: rsyslog 3.13.0 -> 3.15.0
Summary:
Revision Changes Path
1.7 +26 -14 openpkg-src/rsyslog/rsyslog.patch
1.18 +5 -4 openpkg-src/rsyslog/rsyslog.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/rsyslog/rsyslog.patch
============================================================================
$ cvs diff -u -r1.6 -r1.7 rsyslog.patch
--- openpkg-src/rsyslog/rsyslog.patch 27 Mar 2008 07:21:06 -0000 1.6
+++ openpkg-src/rsyslog/rsyslog.patch 1 Apr 2008 20:03:40 -0000 1.7
@@ -1,6 +1,18 @@
+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-03-07 08:26:54 +0100
-+++ config.h.in 2008-03-08 09:02:05 +0100
+--- config.h.in.orig 2008-04-01 14:06:53 +0200
++++ config.h.in 2008-04-01 20:00:27 +0200
@@ -1,7 +1,9 @@
/* config.h.in. Generated from configure.ac by autoheader. */
@@ -9,11 +21,11 @@
#undef BSD
+#endif
- /* Regular expressions support enabled. */
- #undef FEATURE_REGEXP
+ /* Defined if debug mode is enabled (its easier to check). */
+ #undef DEBUG
Index: net.h
---- net.h.orig 2008-03-07 08:33:15 +0100
-+++ net.h 2008-03-08 09:02:05 +0100
+--- net.h.orig 2008-03-11 17:43:12 +0100
++++ net.h 2008-04-01 20:00:27 +0200
@@ -23,6 +23,9 @@
#ifndef INCLUDED_NET_H
#define INCLUDED_NET_H
@@ -25,8 +37,8 @@
#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-05 11:37:06 +0100
-+++ queue.c 2008-03-08 09:02:05 +0100
+--- 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>
#include <sys/stat.h> /* required for HP UX */
@@ -37,8 +49,8 @@
#include "rsyslog.h"
#include "syslogd.h"
Index: stream.c
---- stream.c.orig 2008-03-06 17:08:23 +0100
-+++ stream.c 2008-03-08 09:02:05 +0100
+--- stream.c.orig 2008-03-27 15:58:52 +0100
++++ stream.c 2008-04-01 20:00:27 +0200
@@ -38,6 +38,7 @@
#include <unistd.h>
#include <sys/stat.h> /* required for HP UX */
@@ -47,10 +59,10 @@
#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 @@
+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 @@
#endif
#ifndef _PATH_LOGCONF
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/rsyslog/rsyslog.spec
============================================================================
$ cvs diff -u -r1.17 -r1.18 rsyslog.spec
--- openpkg-src/rsyslog/rsyslog.spec 27 Mar 2008 07:21:06 -0000 1.17
+++ openpkg-src/rsyslog/rsyslog.spec 1 Apr 2008 20:03:40 -0000 1.18
@@ -31,8 +31,8 @@
Class: EVAL
Group: Logfile
License: GPL
-Version: 3.13.0
-Release: 20080327
+Version: 3.15.0
+Release: 20080401
# package options
%option with_kerberos no
@@ -50,8 +50,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20060823
PreReq: OpenPKG, openpkg >= 20060823
-BuildPreReq: zlib
-PreReq: zlib
+BuildPreReq: zlib, librelp
+PreReq: zlib, librelp
%if "%{with_kerberos}" == "yes"
BuildPreReq: KERBEROS
PreReq: KERBEROS
@@ -99,6 +99,7 @@
./configure \
--prefix=%{l_prefix} \
--mandir=%{l_prefix}/man \
+ --enable-relp \
--enable-regexp \
--enable-zlib \
%if "%{with_kerberos}" == "yes"
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
