Syslog-ng 3.3.7 has gone GA:

  - Update syslog-ng from 3.3.6 to 3.3.7.
  - Flag syslog-ng-rc IGNORE, no longer relevant until next release cycle.

Feature safe:	yes

7 files changed, 5 insertions, 44 deletions

diff --git a/sysutils/syslog-ng-rc/Makefile b/sysutils/syslog-ng-rc/Makefile
index d28a4d6c7d54..cb664fb88260 100644
--- a/sysutils/syslog-ng-rc/Makefile
+++ b/sysutils/syslog-ng-rc/Makefile
@@ -15,6 +15,7 @@ DISTFILES=	$(PORTNAME)-3.3.6.91-20121008-v3.3.6.91.tar.gz
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	A powerful syslogd replacement
+IGNORE=		syslog-ng 3.3.7 has gone GA
 
 CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
 		syslog-ng-devel-[0-9]*
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 72f1a46d4c03..c6ff0be72ff9 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	syslog-ng
-PORTVERSION=	3.3.6
-PORTREVISION=	3
+PORTVERSION=	3.3.7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/$(PORTVERSION)/source/
 DISTFILES=	$(PORTNAME)_$(PORTVERSION).tar.gz
diff --git a/sysutils/syslog-ng/distinfo b/sysutils/syslog-ng/distinfo
index cd436096e967..14eb1ef2d9a7 100644
--- a/sysutils/syslog-ng/distinfo
+++ b/sysutils/syslog-ng/distinfo
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.3.6.tar.gz) = e1358d6270f8b3b71b9d73aa5ac4d84ee8ad7730d4eaa3243e6401dfcad8ea10
-SIZE (syslog-ng_3.3.6.tar.gz) = 2593301
+SHA256 (syslog-ng_3.3.7.tar.gz) = 129c91e746751a0a9e743bd6e155c5c1fca4c2eb28375171c20b312822b5117b
+SIZE (syslog-ng_3.3.7.tar.gz) = 2613938
diff --git a/sysutils/syslog-ng/files/patch-lib-ivykis-lib-iv_tls.c b/sysutils/syslog-ng/files/patch-lib-ivykis-lib-iv_tls.c
deleted file mode 100644
index ce05c2e1a6b8..000000000000
--- a/sysutils/syslog-ng/files/patch-lib-ivykis-lib-iv_tls.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/ivykis/lib/iv_tls.c.old
-+++ lib/ivykis/lib/iv_tls.c
-@@ -25,7 +25,7 @@
- #include "iv_private.h"
- 
- static int inited;
--static off_t last_offset;
-+static int last_offset = (sizeof(struct iv_state) + 15) & ~15;
- static struct iv_list_head iv_tls_users = IV_LIST_HEAD_INIT(iv_tls_users);
- 
- void iv_tls_user_register(struct iv_tls_user *itu)
diff --git a/sysutils/syslog-ng/files/patch-lib-ivykis-modules-spinlock.h b/sysutils/syslog-ng/files/patch-lib-ivykis-modules-spinlock.h
deleted file mode 100644
index acec03e07825..000000000000
--- a/sysutils/syslog-ng/files/patch-lib-ivykis-modules-spinlock.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/ivykis/modules/spinlock.h.orig	2012-08-19 09:22:52.000000000 -0700
-+++ lib/ivykis/modules/spinlock.h	2012-09-04 07:23:18.148108582 -0700
-@@ -25,7 +25,7 @@
- 
- static inline void spin_init(spinlock_t *lock)
- {
--	pthread_spin_init(lock, PTHREAD_PROCESS_PRIVATE);
-+	pthread_spin_init(lock, PTHREAD_PROCESS_SHARED);
- }
- 
- static inline void spin_lock(spinlock_t *lock)
diff --git a/sysutils/syslog-ng/files/patch-modules-afsocket-afinet.c b/sysutils/syslog-ng/files/patch-modules-afsocket-afinet.c
deleted file mode 100644
index 0a6ce3b4bc58..000000000000
--- a/sysutils/syslog-ng/files/patch-modules-afsocket-afinet.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- modules/afsocket/afinet.c.orig	2012-09-01 21:03:17.658244740 -0400
-+++ modules/afsocket/afinet.c	2012-09-01 21:03:31.720944758 -0400
-@@ -539,11 +539,13 @@
- 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
diff --git a/sysutils/syslog-ng/pkg-plist b/sysutils/syslog-ng/pkg-plist
index 0d290201ff3a..eb7c0ca69865 100644
--- a/sysutils/syslog-ng/pkg-plist
+++ b/sysutils/syslog-ng/pkg-plist
@@ -75,7 +75,7 @@ include/syslog-ng/utils.h
 include/syslog-ng/value-pairs.h
 lib/libsyslog-ng.la
 lib/libsyslog-ng.so
-lib/libsyslog-ng-3.3.6.so
+lib/libsyslog-ng-3.3.7.so
 libdata/pkgconfig/syslog-ng.pc
 lib/syslog-ng/libaffile.la
 lib/syslog-ng/libaffile.so