- rel 3; some earlier vserver patches used the same capability number as CAP_SYSLOG...

Changed files:
    cap_syslog-vserver-workaround.patch -> 1.1
    syslog-ng.spec -> 1.216

diff --git a/cap_syslog-vserver-workaround.patch b/cap_syslog-vserver-workaround.patch
new file mode 100644 (file)
index 0000000..5c96afd
--- /dev/null
+++ b/cap_syslog-vserver-workaround.patch
@@ -0,0 +1,52 @@
+diff -ur syslog-ng-3.2.4.org/lib/gprocess.c syslog-ng-3.2.4/lib/gprocess.c
+--- syslog-ng-3.2.4.org/lib/gprocess.c 2011-09-10 19:11:42.848926449 +0200
++++ syslog-ng-3.2.4/lib/gprocess.c     2011-09-10 19:21:08.665586449 +0200
+@@ -305,10 +305,23 @@
+   return;
+ }
+ 
++#define LINUX_VERSION(x,y,z)    (0x10000*(x) + 0x100*(y) + z)
++
++static int
++get_kernel_version(void) {
++      static struct utsname uts;
++      int x = 0, y = 0, z = 0;
++      if ((uname(&uts) == -1) || (sscanf(uts.release, "%u.%u.%u", &x, &y, &z) < 2)) {
++              msg_error("Unable to retrieve kernel version.", NULL);
++              return -1;
++      }
++      return LINUX_VERSION(x, y, z);
++}
++
+ gboolean
+ g_process_check_cap_syslog(void)
+ {
+-  int ret;
++  int ret, kver;
+ 
+   if (have_capsyslog)
+     return TRUE;
+@@ -320,6 +333,10 @@
+   if (ret == -1)
+     return FALSE;
+ 
++  kver = get_kernel_version();
++  if (kver > 0 && kver < LINUX_VERSION(2,6,38))
++    return FALSE;
++
+   have_capsyslog = TRUE;
+   return TRUE;
+ }
+Tylko w syslog-ng-3.2.4/lib: gprocess.c~
+diff -ur syslog-ng-3.2.4.org/lib/gprocess.h syslog-ng-3.2.4/lib/gprocess.h
+--- syslog-ng-3.2.4.org/lib/gprocess.h 2011-09-10 19:11:42.848926449 +0200
++++ syslog-ng-3.2.4/lib/gprocess.h     2011-09-10 19:15:44.334619870 +0200
+@@ -28,6 +28,7 @@
+ #include "syslog-ng.h"
+ 
+ #include <sys/types.h>
++#include <sys/utsname.h>
+ 
+ #if ENABLE_LINUX_CAPS
+ #  include <sys/capability.h>
+Tylko w syslog-ng-3.2.4/lib: gprocess.h~

diff --git a/syslog-ng.spec b/syslog-ng.spec
index 0df820e1eb133299c68ea3749cf5990565d8ff1d..9bb3f1e777fb4644ecbe01bc1588e3185f911816 100644 (file)
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -22,7 +22,7 @@ Summary(pl.UTF-8):    Syslog-ng - zamiennik syskloga
 Summary(pt_BR.UTF-8):  Daemon de log nova geração
 Name:          syslog-ng
 Version:       3.2.4
-Release:       3
+Release:       4
 License:       GPL v2
 Group:         Daemons
 Source0:       http://www.balabit.com/downloads/files/syslog-ng/sources/%{version}/source/%{name}_%{version}.tar.gz
@@ -36,6 +36,7 @@ Source5:      %{name}-simple.conf
 Source6:       %{name}.upstart
 Patch0:                %{name}-datadir.patch
 Patch1:                cap_syslog.patch
+Patch2:                cap_syslog-vserver-workaround.patch
 URL:           http://www.balabit.com/products/syslog_ng/
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake
@@ -139,6 +140,7 @@ Opis zadania Upstart dla syslog-ng.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 cp -a %{SOURCE4} doc
 cp -a %{SOURCE5} contrib/syslog-ng.conf.simple