diff options
| author | cy <cy@FreeBSD.org> | 2012-09-04 22:31:48 +0800 |
|---|---|---|
| committer | cy <cy@FreeBSD.org> | 2012-09-04 22:31:48 +0800 |
| commit | 8cdbf8e20e139f08065d4e68e89dad870b211167 (patch) | |
| tree | 8011284c2e9fc305be111fe162937a96dcbc6354 /sysutils | |
| parent | e55a7b9bf846e961544a63a5a543796b7cd66635 (diff) | |
| download | freebsd-ports-gnome-8cdbf8e20e139f08065d4e68e89dad870b211167.tar.gz freebsd-ports-gnome-8cdbf8e20e139f08065d4e68e89dad870b211167.tar.zst freebsd-ports-gnome-8cdbf8e20e139f08065d4e68e89dad870b211167.zip | |
Fix brokenness. Port now compiles when SPOOF unspecified and no longer
spins.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/syslog-ng/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/syslog-ng/files/patch-lib-ivykis-modules-spinlock.h | 11 | ||||
| -rw-r--r-- | sysutils/syslog-ng/files/patch-modules-afsocket-afinet.c | 17 |
3 files changed, 31 insertions, 5 deletions
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile index 6ca6a46557c0..52e1801d32ad 100644 --- a/sysutils/syslog-ng/Makefile +++ b/sysutils/syslog-ng/Makefile @@ -7,6 +7,7 @@ PORTNAME= syslog-ng PORTVERSION= 3.3.6 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/sources/$(PORTVERSION)/source/ DISTFILES= $(PORTNAME)_$(PORTVERSION).tar.gz @@ -46,8 +47,6 @@ SUB_FILES= pkg-message CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ --enable-dynamic-linking -BROKEN= Fails to build without SPOOF support and hangs with SPOOF support. - .if defined(WITH_SYS_SSL) && defined(WITH_PORTS_SSL) BROKEN= SYS_SSL and PORTS_SSL are mutually exclusive .endif @@ -78,8 +77,8 @@ CONFIGURE_ARGS+= --disable-tcp-wrapper BUILD_DEPENDS= ${LIBNET_CONFIG}:${PORTSDIR}/net/libnet-devel LIBNET_CONFIG?= ${LOCALBASE}/bin/libnet116-config CONFIGURE_ARGS+= --enable-spoof-source --with-libnet=${LOCALBASE}/bin -CFLAGS+= `${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include -LDFLAGS+= `${LIBNET_CONFIG} --libs` +CFLAGS+= -g `${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include +LDFLAGS+= -g `${LIBNET_CONFIG} --libs` .else CONFIGURE_ARGS+= --disable-spoof-source .endif @@ -130,7 +129,6 @@ post-patch: @${REINPLACE_CMD} -e 's:libnet-config:libnet116-config:g' ${WRKSRC}/configure @${LN} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist - post-install: .if !defined(NOPORTDOCS) ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \ diff --git a/sysutils/syslog-ng/files/patch-lib-ivykis-modules-spinlock.h b/sysutils/syslog-ng/files/patch-lib-ivykis-modules-spinlock.h new file mode 100644 index 000000000000..acec03e07825 --- /dev/null +++ b/sysutils/syslog-ng/files/patch-lib-ivykis-modules-spinlock.h @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..0a6ce3b4bc58 --- /dev/null +++ b/sysutils/syslog-ng/files/patch-modules-afsocket-afinet.c @@ -0,0 +1,17 @@ +--- 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 |