mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00
Code Issues Releases Activity

Fix brokenness. Port now compiles when SPOOF unspecified and no longer

Browse Source 
spins.
This commit is contained in:
Cy Schubert 2012-09-04 14:31:48 +00:00
parent 2b290633b3
commit 9362b592cb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=303654
3 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sysutils/syslog-ng/Makefile
View File

@ -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} \

11
sysutils/syslog-ng/files/patch-lib-ivykis-modules-spinlock.h Normal file
View File

@ -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)

17
sysutils/syslog-ng/files/patch-modules-afsocket-afinet.c Normal file
View File

@ -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