Date: Tue, 11 Sep 2012 14:05:31 +0000 (UTC) From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r304097 - in head/sysutils: syslog-ng syslog-ng-rc syslog-ng-rc/files syslog-ng/files Message-ID: <201209111405.q8BE5V9L061756@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: cy Date: Tue Sep 11 14:05:31 2012 New Revision: 304097 URL: http://svn.freebsd.org/changeset/ports/304097 Log: Resolve a FreeBSD 7 compile issue. Supplied by: Peter Czanik <czanik@balabit.hu> Added: head/sysutils/syslog-ng-rc/files/patch-lib-ivykis-lib-iv_tls.c (contents, props changed) head/sysutils/syslog-ng-rc/files/patch-lib-ivykis-lib-linclude-iv_tls.h (contents, props changed) head/sysutils/syslog-ng/files/patch-lib-ivykis-lib-include-iv_tls.h (contents, props changed) head/sysutils/syslog-ng/files/patch-lib-ivykis-lib-iv_tls.c (contents, props changed) Modified: head/sysutils/syslog-ng-rc/Makefile head/sysutils/syslog-ng/Makefile Modified: head/sysutils/syslog-ng-rc/Makefile ============================================================================== --- head/sysutils/syslog-ng-rc/Makefile Tue Sep 11 13:31:25 2012 (r304096) +++ head/sysutils/syslog-ng-rc/Makefile Tue Sep 11 14:05:31 2012 (r304097) @@ -7,6 +7,7 @@ PORTNAME= syslog-ng PORTVERSION= 3.3.7 +PORTREVISION= 1 CATEGORIES= sysutils PKGNAMESUFFIX= -rc MASTER_SITES= http://packages.madhouse-project.org/syslog-ng/3.3/3.3.6.90/ @@ -48,10 +49,6 @@ SUB_FILES= pkg-message CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \ --enable-dynamic-linking -.if defined(WITH_SYS_SSL) && defined(WITH_PORTS_SSL) -BROKEN= SYS_SSL and PORTS_SSL are mutually exclusive -.endif - .if defined(WITH_SYS_SSL) || defined(WITH_PORTS_SSL) USE_OPENSSL= yes CONFIGURE_ARGS+= --enable-ssl Added: head/sysutils/syslog-ng-rc/files/patch-lib-ivykis-lib-iv_tls.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/syslog-ng-rc/files/patch-lib-ivykis-lib-iv_tls.c Tue Sep 11 14:05:31 2012 (r304097) @@ -0,0 +1,11 @@ +--- 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 = (sizeof(struct iv_state) + 15) & ~15; ++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) Added: head/sysutils/syslog-ng-rc/files/patch-lib-ivykis-lib-linclude-iv_tls.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/syslog-ng-rc/files/patch-lib-ivykis-lib-linclude-iv_tls.h Tue Sep 11 14:05:31 2012 (r304097) @@ -0,0 +1,11 @@ +--- lib/ivykis/lib/include/iv_tls.h.old ++++ lib/ivykis/lib/include/iv_tls.h +@@ -33,7 +33,7 @@ struct iv_tls_user { + void (*deinit_thread)(void *st); + + struct iv_list_head list; +- off_t state_offset; ++ int state_offset; + }; + + void iv_tls_user_register(struct iv_tls_user *); Modified: head/sysutils/syslog-ng/Makefile ============================================================================== --- head/sysutils/syslog-ng/Makefile Tue Sep 11 13:31:25 2012 (r304096) +++ head/sysutils/syslog-ng/Makefile Tue Sep 11 14:05:31 2012 (r304097) @@ -7,7 +7,7 @@ PORTNAME= syslog-ng PORTVERSION= 3.3.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils MASTER_SITES= http://www.balabit.com/downloads/files/syslog-ng/sources/$(PORTVERSION)/source/ DISTFILES= $(PORTNAME)_$(PORTVERSION).tar.gz Added: head/sysutils/syslog-ng/files/patch-lib-ivykis-lib-include-iv_tls.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/syslog-ng/files/patch-lib-ivykis-lib-include-iv_tls.h Tue Sep 11 14:05:31 2012 (r304097) @@ -0,0 +1,11 @@ +--- lib/ivykis/lib/include/iv_tls.h.old ++++ lib/ivykis/lib/include/iv_tls.h +@@ -33,7 +33,7 @@ struct iv_tls_user { + void (*deinit_thread)(void *st); + + struct iv_list_head list; +- off_t state_offset; ++ int state_offset; + }; + + void iv_tls_user_register(struct iv_tls_user *); Added: head/sysutils/syslog-ng/files/patch-lib-ivykis-lib-iv_tls.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/syslog-ng/files/patch-lib-ivykis-lib-iv_tls.c Tue Sep 11 14:05:31 2012 (r304097) @@ -0,0 +1,11 @@ +--- 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209111405.q8BE5V9L061756>