From owner-svn-ports-all@FreeBSD.ORG Tue Sep 4 14:31:49 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 48352106566B; Tue, 4 Sep 2012 14:31:49 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 324AA8FC0C; Tue, 4 Sep 2012 14:31:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q84EVn0Y068731; Tue, 4 Sep 2012 14:31:49 GMT (envelope-from cy@svn.freebsd.org) Received: (from cy@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q84EVmQF068727; Tue, 4 Sep 2012 14:31:48 GMT (envelope-from cy@svn.freebsd.org) Message-Id: <201209041431.q84EVmQF068727@svn.freebsd.org> From: Cy Schubert Date: Tue, 4 Sep 2012 14:31:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r303654 - in head/sysutils/syslog-ng: . files X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Sep 2012 14:31:49 -0000 Author: cy Date: Tue Sep 4 14:31:48 2012 New Revision: 303654 URL: http://svn.freebsd.org/changeset/ports/303654 Log: Fix brokenness. Port now compiles when SPOOF unspecified and no longer spins. Added: head/sysutils/syslog-ng/files/patch-lib-ivykis-modules-spinlock.h (contents, props changed) head/sysutils/syslog-ng/files/patch-modules-afsocket-afinet.c (contents, props changed) Modified: head/sysutils/syslog-ng/Makefile Modified: head/sysutils/syslog-ng/Makefile ============================================================================== --- head/sysutils/syslog-ng/Makefile Tue Sep 4 14:16:01 2012 (r303653) +++ head/sysutils/syslog-ng/Makefile Tue Sep 4 14:31:48 2012 (r303654) @@ -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} \ Added: head/sysutils/syslog-ng/files/patch-lib-ivykis-modules-spinlock.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/syslog-ng/files/patch-lib-ivykis-modules-spinlock.h Tue Sep 4 14:31:48 2012 (r303654) @@ -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) Added: head/sysutils/syslog-ng/files/patch-modules-afsocket-afinet.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/syslog-ng/files/patch-modules-afsocket-afinet.c Tue Sep 4 14:31:48 2012 (r303654) @@ -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