Attachment 119766 Details for Bug 162414 – syslog-ng-3.3.1_2.patch

[patch] syslog-ng-3.3.1_2.patch

syslog-ng-3.3.1_2.patch (text/plain), 5.40 KB, created by Jimmy Olgeni on 2011-11-09 21:40:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jimmy Olgeni

Created: 2011-11-09 21:40:10 UTC

Size: 5.40 KB

patch

obsolete

>Index: Makefile
>===================================================================
>RCS file: /home/pcvs/ports/sysutils/syslog-ng/Makefile,v
>retrieving revision 1.45
>diff -u -u -r1.45 Makefile
>--- Makefile	18 Oct 2011 04:29:48 -0000	1.45
>+++ Makefile	9 Nov 2011 21:36:34 -0000
>@@ -1,5 +1,5 @@
> # New ports collection makefile for:	syslog-ng
>-# Date created:		10 november 1006
>+# Date created:		10 november 2006
> # Whom:			Ivan Lago <ivan.lago@ifom-ieo-campus.it>
> #
> # $FreeBSD: ports/sysutils/syslog-ng/Makefile,v 1.45 2011/10/18 04:29:48 cy Exp $
>@@ -7,17 +7,17 @@
> 
> PORTNAME=	syslog-ng
> PORTVERSION=	3.3.1
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	sysutils
>-MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/$(PORTVERSION)/source/
>-DISTFILES=	$(PORTNAME)_$(PORTVERSION).tar.gz
>+MASTER_SITES=	http://www.balabit.com/downloads/files/syslog-ng/sources/${PORTVERSION}/source/
>+DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
> MAINTAINER=	cy@FreeBSD.org
> COMMENT=	A powerful syslogd replacement
> 
> CONFLICTS?=	syslog-ng-[0-9]* syslog-ng[0-9]-[0-9]* \
> 		syslog-ng-devel-[0-9]*
>-WRKSRC=		$(WRKDIR)/$(PORTNAME)-$(PORTVERSION)
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
> OPTIONS=	SYS_SSL "Build with OpenSSL support (from system)" off \
> 		PORTS_SSL "Build with OpenSSL support (from ports)" off \
>@@ -37,6 +37,7 @@
> MAN5=		syslog-ng.conf.5
> MAN8=		syslog-ng.8
> 
>+USE_LDCONFIG=	yes
> USE_RC_SUBR=	syslog-ng.sh
> GNU_CONFIGURE=	yes
> USE_GMAKE=	yes
>@@ -44,26 +45,24 @@
> SUB_FILES=	pkg-message
> 
> CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
>-		--enable-dynamic-linking --with-libnet=${LOCALBASE}/bin
>-CFLAGS+=	`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include
>-LDFLAGS+=	`${LIBNET_CONFIG} --libs`
>+		--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
>-CONFIGURE_ENV+=         OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
>-                        OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
>-PLIST_FILES+=           lib/syslog-ng/libafsocket-tls.la lib/syslog-ng/libafsocket-tls.so
>+USE_OPENSSL=		yes
>+CONFIGURE_ARGS+=	--enable-ssl
>+CONFIGURE_ENV+=		OPENSSL_CFLAGS="${OPENSSL_CFLAGS}" \
>+			OPENSSL_LIBS="${OPENSSL_LDFLAGS} -lcrypto -lssl"
>+PLIST_FILES+=		lib/syslog-ng/libafsocket-tls.la lib/syslog-ng/libafsocket-tls.so
> .else
>-CONFIGURE_ARGS+=        --disable-ssl
>+CONFIGURE_ARGS+=	--disable-ssl
> .endif
> 
> .if defined(WITH_PORTS_SSL)
>-WITH_OPENSSL_PORT=      yes
>+WITH_OPENSSL_PORT=	yes
> .endif
> 
> .include <bsd.port.pre.mk>
>@@ -77,7 +76,9 @@
> .if defined(WITH_SPOOF)
> BUILD_DEPENDS=		${LIBNET_CONFIG}:${PORTSDIR}/net/libnet-devel
> LIBNET_CONFIG?=		${LOCALBASE}/bin/libnet115-config
>-CONFIGURE_ARGS+=	--enable-spoof-source
>+CONFIGURE_ARGS+=	--enable-spoof-source --with-libnet=${LOCALBASE}/bin
>+CFLAGS+=		`${LIBNET_CONFIG} --cflags` -I${LOCALBASE}/include
>+LDFLAGS+=		`${LIBNET_CONFIG} --libs`
> .else
> CONFIGURE_ARGS+=	--disable-spoof-source
> .endif
>@@ -110,18 +111,18 @@
> 
> .if defined(WITH_JSON_GLIB)
> LIB_DEPENDS+=		json-glib-1.0.0:${PORTSDIR}/devel/json-glib
>-CONFIGURE_ARGS+=        --enable-json --with-json=json-glib
>+CONFIGURE_ARGS+=	--enable-json --with-json=json-glib
> PLIST_FILES+=		lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so
> .elif defined(WITH_JSON_C)
> LIB_DEPENDS+=		json.0:${PORTSDIR}/devel/json-c
>-CONFIGURE_ARGS+=        --enable-json --with-json=json-c
>+CONFIGURE_ARGS+=	--enable-json --with-json=json-c
> PLIST_FILES+=		lib/syslog-ng/libtfjson.la lib/syslog-ng/libtfjson.so
> .else
>-CONFIGURE_ARGS+=        --disable-json
>+CONFIGURE_ARGS+=	--disable-json
> .endif
> 
> .if ${OSVERSION} >= 900034
>-CONFIGURE_ARGS+=        --disable-linux-caps
>+CONFIGURE_ARGS+=	--disable-linux-caps
> .endif
> 
> post-patch:
>@@ -135,12 +136,10 @@
> 		${WRKSRC}/lib/utils.c ${WRKSRC}/lib/utils.h
> .endif
> 
>-
> post-install:
> .if !defined(NOPORTDOCS)
> 	${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} \
>-			${PREFIX}/share/doc/syslog-ng \
>-			${PREFIX}/share/doc/syslog-ng/sgml
>+			${PREFIX}/share/doc/syslog-ng
> 	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/syslog-ng
> 	${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/syslog-ng
> 	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${PREFIX}/share/doc/syslog-ng
>Index: pkg-plist
>===================================================================
>RCS file: /home/pcvs/ports/sysutils/syslog-ng/pkg-plist,v
>retrieving revision 1.9
>diff -u -u -r1.9 pkg-plist
>--- pkg-plist	18 Oct 2011 04:29:48 -0000	1.9
>+++ pkg-plist	9 Nov 2011 21:36:34 -0000
>@@ -1,9 +1,9 @@
> @unexec %D/etc/rc.d/syslog-ng.sh stop > /dev/null 2>&1 || true
> etc/modules.conf
> etc/scl.conf
>-@exec test -f %D/etc/syslog-ng.conf || cp -p %D/etc/syslog-ng.conf.sample %D/etc/syslog-ng.conf
> @unexec if cmp -s %D/etc/syslog-ng.conf %D/etc/syslog-ng.conf.dist; then rm -f %D/etc/syslog-ng.conf; fi
> etc/syslog-ng.conf.dist
>+@exec [ -f %B/syslog-ng.conf ] || cp %B/%f %B/syslog-ng.conf
> etc/syslog-ng.conf.sample
> bin/loggen
> bin/pdbtool
>@@ -119,9 +119,7 @@
> %%PORTDOCS%%%%DOCSDIR%%/COPYING
> %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
> %%PORTDOCS%%%%DOCSDIR%%/NEWS
>-%%PORTDOCS%%@dirrm %%DOCSDIR%%/sgml
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
>-@dirrm etc/patterndb.d
> @dirrm include/syslog-ng
> @dirrm lib/syslog-ng
> @dirrm share/include/scl/system
>@@ -131,3 +129,5 @@
> @dirrm share/include
> @dirrmtry share/tools
> @dirrm share/xsd
>+@exec mkdir %D/etc/patterndb.d
>+@dirrmtry etc/patterndb.d

Actions: View | Diff

Attachments on bug 162414: 119766