[arch-commits] Commit in syslog-ng/trunk (2 files)

[Dave Reisner]

    Date: Wednesday, September 5, 2012 @ 23:21:07
  Author: dreisner
Revision: 166318

upgpkg: syslog-ng 3.3.6-1

- backport upstream fix for build failure

Added:
  syslog-ng/trunk/0001-afsocket-Fix-compilation-without-spoof-source.patch
Modified:
  syslog-ng/trunk/PKGBUILD

----------------------------------------------------------+
 0001-afsocket-Fix-compilation-without-spoof-source.patch |   37 +++++++++++++
 PKGBUILD                                                 |   21 +++----
 2 files changed, 47 insertions(+), 11 deletions(-)

Added: 0001-afsocket-Fix-compilation-without-spoof-source.patch
===================================================================
--- 0001-afsocket-Fix-compilation-without-spoof-source.patch	                        (rev 0)
+++ 0001-afsocket-Fix-compilation-without-spoof-source.patch	2012-09-06 03:21:07 UTC (rev 166318)
@@ -0,0 +1,37 @@
+From 21a9ac3a7e2554f94b8ff8788bc4e82ec3fb58d3 Mon Sep 17 00:00:00 2001
+From: Gergely Nagy <algernon at balabit.hu>
+Date: Mon, 3 Sep 2012 11:41:36 +0200
+Subject: [PATCH] afsocket: Fix compilation without spoof-source
+
+AFInetDestDriver->spoof_source is only available when compiling with
+spoof-source enabled, so guard it with an #if.
+
+Reported and patched by Dave Reisner <dreisner at archlinux.org>.
+
+Signed-off-by: Gergely Nagy <algernon at balabit.hu>
+---
+ modules/afsocket/afinet.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/modules/afsocket/afinet.c b/modules/afsocket/afinet.c
+index 5ca9172..98ff8d8 100644
+--- a/modules/afsocket/afinet.c
++++ b/modules/afsocket/afinet.c
+@@ -539,11 +539,13 @@ afinet_dd_setup_socket(AFSocketDestDriver *s, gint fd)
+ static gboolean
+ afinet_dd_init(LogPipe *s)
+ {
+-  AFInetDestDriver *self = (AFInetDestDriver *) s;
++  AFInetDestDriver *self G_GNUC_UNUSED = (AFInetDestDriver *) s;
+   gboolean success;
+ 
++#if ENABLE_SPOOF_SOURCE
+   if (self->spoof_source)
+     self->super.flags &= ~AFSOCKET_KEEP_ALIVE;
++#endif
+ 
+   success = afsocket_dd_init(s);
+ #if ENABLE_SPOOF_SOURCE
+-- 
+1.7.12
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-09-06 01:14:06 UTC (rev 166317)
+++ PKGBUILD	2012-09-06 03:21:07 UTC (rev 166318)
@@ -4,8 +4,8 @@
 # Contributor: Aaron Griffin <aaron at archlinux.org>
 
 pkgname=syslog-ng
-pkgver=3.3.5
-pkgrel=2
+pkgver=3.3.6
+pkgrel=1
 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
 arch=('i686' 'x86_64')
 license=('GPL2')
@@ -25,16 +25,21 @@
         syslog-ng.conf
         syslog-ng.conf.d
         syslog-ng.logrotate
-        syslog-ng.rc)
-sha1sums=('0c8b85079b60c68c4279bcd4124b1e3c6358407b'
+        syslog-ng.rc
+        0001-afsocket-Fix-compilation-without-spoof-source.patch)
+sha1sums=('c2ee74180d640b235665115c5a4b2c61a71a9576'
           '98074e0facfc6ef036202662cc86d04b38a2c142'
           '9b2eb6ea9e27c9f1b6c1c855be211ec3da51d3c8'
           '949128fe3d7f77a7aab99048061f885bc758000c'
-          '94af81a84e3add6653755122cdd5080694de059d')
+          '94af81a84e3add6653755122cdd5080694de059d'
+          '5f0e6a4b01ba59724bba8932c41ac8f70386659e')
 
 build() {
   cd "$pkgname-$pkgver"
 
+  # upstream commit 21a9ac3a7e2554f94b8ff8788bc4e82ec3fb58d3
+  patch -Np1 <"$srcdir"/0001-afsocket-Fix-compilation-without-spoof-source.patch
+
   ./configure \
     --prefix=/usr \
     --sysconfdir=/etc/syslog-ng \
@@ -57,10 +62,4 @@
   install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng"
   install -Dm755 "$srcdir/syslog-ng.rc" "$pkgdir/etc/rc.d/syslog-ng"
   install -Dm644 "$srcdir/syslog-ng.conf.d" "$pkgdir/etc/conf.d/syslog-ng"
-
-  # fix location of systemctl, add Alias=, remove start precondition
-  sed -e 's@/bin/systemctl@/usr&@' \
-      -e '$aAlias=syslog.service' \
-      -e '/^ExecStartPre/d' \
-      -i "$pkgdir/usr/lib/systemd/system/syslog-ng.service"
 }