Date: Wednesday, December 12, 2012 @ 12:16:36 Author: dreisner Revision: 173194
upgpkg: syslog-ng 3.3.7-1 Modified: syslog-ng/trunk/PKGBUILD Deleted: syslog-ng/trunk/0001-afsocket-Fix-compilation-without-spoof-source.patch ----------------------------------------------------------+ 0001-afsocket-Fix-compilation-without-spoof-source.patch | 37 ------------- PKGBUILD | 15 +---- 2 files changed, 5 insertions(+), 47 deletions(-) Deleted: 0001-afsocket-Fix-compilation-without-spoof-source.patch =================================================================== --- 0001-afsocket-Fix-compilation-without-spoof-source.patch 2012-12-12 16:57:29 UTC (rev 173193) +++ 0001-afsocket-Fix-compilation-without-spoof-source.patch 2012-12-12 17:16:36 UTC (rev 173194) @@ -1,37 +0,0 @@ -From 21a9ac3a7e2554f94b8ff8788bc4e82ec3fb58d3 Mon Sep 17 00:00:00 2001 -From: Gergely Nagy <[email protected]> -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 <[email protected]>. - -Signed-off-by: Gergely Nagy <[email protected]> ---- - 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-12-12 16:57:29 UTC (rev 173193) +++ PKGBUILD 2012-12-12 17:16:36 UTC (rev 173194) @@ -4,8 +4,8 @@ # Contributor: Aaron Griffin <[email protected]> pkgname=syslog-ng -pkgver=3.3.6 -pkgrel=3 +pkgver=3.3.7 +pkgrel=1 pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities" arch=('i686' 'x86_64') license=('GPL2') @@ -24,21 +24,16 @@ syslog-ng.conf syslog-ng.conf.d syslog-ng.logrotate - syslog-ng.rc - 0001-afsocket-Fix-compilation-without-spoof-source.patch) -sha1sums=('c2ee74180d640b235665115c5a4b2c61a71a9576' + syslog-ng.rc) +sha1sums=('06f09057c3dfb84eba381e0141f92565673ec0c8' 'db14f4937a821e449b769c938faf2275a7ef188e' '9b2eb6ea9e27c9f1b6c1c855be211ec3da51d3c8' '949128fe3d7f77a7aab99048061f885bc758000c' - '94af81a84e3add6653755122cdd5080694de059d' - '5f0e6a4b01ba59724bba8932c41ac8f70386659e') + '94af81a84e3add6653755122cdd5080694de059d') 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 \
