From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Nov 9 21:40:11 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69E341065675 for ; Wed, 9 Nov 2011 21:40:11 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 3DF5A8FC18 for ; Wed, 9 Nov 2011 21:40:11 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id pA9LeBxi097737 for ; Wed, 9 Nov 2011 21:40:11 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id pA9LeBrn097736; Wed, 9 Nov 2011 21:40:11 GMT (envelope-from gnats) Resent-Date: Wed, 9 Nov 2011 21:40:11 GMT Resent-Message-Id: <201111092140.pA9LeBrn097736@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jimmy Olgeni Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DBD951065670 for ; Wed, 9 Nov 2011 21:38:24 +0000 (UTC) (envelope-from g.olgeni@colby.it) Received: from mail.colby.tv (93-62-141-58.ip22.fastwebnet.it [93.62.141.58]) by mx1.freebsd.org (Postfix) with ESMTP id 5F8A08FC08 for ; Wed, 9 Nov 2011 21:38:23 +0000 (UTC) Received: from server.colby.local (localhost [127.0.0.1]) by server.colby.local (8.14.4/8.14.4) with ESMTP id pA9LcMgd083250; Wed, 9 Nov 2011 22:38:22 +0100 (CET) (envelope-from g.olgeni@colby.it) Received: from exchange.colby.local ([192.168.1.11] helo=exchange.colby.local) with IPv4:25 by server.colby.local; 9 Nov 2011 22:38:22 +0100 Received: from backoffice.colby.local ([192.168.1.56]) by exchange.colby.local over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Wed, 9 Nov 2011 22:38:22 +0100 Received: from backoffice.colby.local (localhost [127.0.0.1]) by backoffice.colby.local (8.14.5/8.14.4) with ESMTP id pA9LcMO3022474; Wed, 9 Nov 2011 22:38:22 +0100 (CET) (envelope-from olgeni@backoffice.colby.local) Received: (from olgeni@localhost) by backoffice.colby.local (8.14.5/8.14.4/Submit) id pA9LcM3R022473; Wed, 9 Nov 2011 22:38:22 +0100 (CET) (envelope-from olgeni) Message-Id: <201111092138.pA9LcM3R022473@backoffice.colby.local> Date: Wed, 9 Nov 2011 22:38:22 +0100 (CET) From: Jimmy Olgeni To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: cy@FreeBSD.org Subject: ports/162414: [PATCH] sysutils/syslog-ng: [SUMMARIZE CHANGES] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 09 Nov 2011 21:40:11 -0000 >Number: 162414 >Category: ports >Synopsis: [PATCH] sysutils/syslog-ng: [SUMMARIZE CHANGES] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Nov 09 21:40:10 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Jimmy Olgeni >Release: FreeBSD 8.2-STABLE amd64 >Organization: >Environment: System: FreeBSD backoffice 8.2-STABLE FreeBSD 8.2-STABLE #1: Wed Oct 12 21:16:42 CEST 2011 >Description: - Fix installation and removal of default configuration: the package installs syslog-ng.conf.sample, but the port installs syslog-ng.conf.dist which is also used in the @unexec test. - Remove empty sgml directory in DOCSDIR (which was not installed by the package and produced warnings on pkg-delete). - Install patterndb.d directory from pkg-plist, and use @dirrmtry to remove it. - Building without libnet produced this log while configuring: ===> Configuring for syslog-ng-3.3.1_1 --cflags: not found --cflags: not found --libs: not found checking for a BSD-compatible install... /usr/bin/install -c -o root -g wheel ...so I moved the libnet stuff under the WITH_SPOOF section. - Pet portlint where applicable (mainly whitespace issues). - Fix "date created" in comment :) PR probably applies to syslog-ng-devel too. portlint complains about: FATAL: Package conflicts with itself. You should remove "syslog-ng-[0-9]*" from CONFLICTS. but I didn't dare to touch it since there are a few syslog-ng ports around. Port maintainer (cy@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- syslog-ng-3.3.1_2.patch begins here --- 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 # # $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 @@ -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 --- syslog-ng-3.3.1_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: