From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Sep 25 18:20:18 2012 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 81AEA1065676 for ; Tue, 25 Sep 2012 18:20:17 +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 BC7148FC15 for ; Tue, 25 Sep 2012 18:20:16 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.5/8.14.5) with ESMTP id q8PIKGwA034916 for ; Tue, 25 Sep 2012 18:20:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.5/8.14.5/Submit) id q8PIKGI1034911; Tue, 25 Sep 2012 18:20:16 GMT (envelope-from gnats) Resent-Date: Tue, 25 Sep 2012 18:20:16 GMT Resent-Message-Id: <201209251820.q8PIKGI1034911@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, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5E43F1065672 for ; Tue, 25 Sep 2012 18:10:52 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa102lp.auone-net.jp (msa102lp.auone-net.jp [222.3.140.165]) by mx1.freebsd.org (Postfix) with ESMTP id 03A6C8FC1F for ; Tue, 25 Sep 2012 18:10:52 +0000 (UTC) Received: from localhost.localdomain (ZT030063.ppp.dion.ne.jp [59.128.30.63]) by msa102lp.auone-net.jp (au one net msa) with ESMTP id DF0D64AC036 for ; Wed, 26 Sep 2012 03:10:47 +0900 (JST) Message-Id: <20120926022628.3da4a578e4e1719e8a352367@yahoo.com> Date: Wed, 26 Sep 2012 02:26:28 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/172056: security/libprelude: Update to version 1.0.1 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: Tue, 25 Sep 2012 18:20:18 -0000 >Number: 172056 >Category: ports >Synopsis: security/libprelude: Update to version 1.0.1 >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: Tue Sep 25 18:20:16 UTC 2012 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p10 i386 >Organization: >Environment: >Description: - Update to version 1.0.1 New file: files/patch-src__include__prelude-plugin.h >How-To-Repeat: >Fix: diff -urN /usr/ports/security/libprelude/Makefile security/libprelude/Makefile --- /usr/ports/security/libprelude/Makefile 2012-08-22 03:28:42.000000000 +0900 +++ security/libprelude/Makefile 2012-09-25 03:41:19.000000000 +0900 @@ -1,54 +1,52 @@ -# New ports collection makefile for: libprelude -# Date created: Sun Aug 4 19:31:17 CEST 2002 -# Whom: Clement Laforet +# Created by: Clement Laforet # $FreeBSD: ports/security/libprelude/Makefile,v 1.67 2012/08/21 18:28:42 beat Exp $ PORTNAME= libprelude -PORTVERSION= 0.9.24.1 -PORTREVISION= 1 +PORTVERSION= 1.0.1 CATEGORIES= security -MASTER_SITES= http://www.prelude-technologies.com/download/releases/${PORTNAME}/ +MASTER_SITES= https://www.prelude-ids.org/attachments/download/241/ MAINTAINER= ports@FreeBSD.org COMMENT= Framework library for Prelude NIDS -LIB_DEPENDS= gnutls.47:${PORTSDIR}/security/gnutls \ - gcrypt.18:${PORTSDIR}/security/libgcrypt +LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls \ + gcrypt:${PORTSDIR}/security/libgcrypt -OPTIONS= PERL "Include Perl bindings" off \ - PYTHON "Include Python bindings" off - -BROKEN= does not configure +OPTIONS_DEFINE= PERL PYTHON DOCS +USE_GNOME= gnomehack USE_GMAKE= yes -GNU_CONFIGURE= yes -USE_LDCONFIG= yes +USE_AUTOTOOLS= libtool libltdl CONFIGURE_ARGS= --localstatedir=/var \ --enable-gtk-doc=no \ --with-html-dir=${PREFIX}/share/doc +USE_LDCONFIG= yes +MAKE_JOBS_SAFE= yes + +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAN1= prelude-admin.1 PORTDOCS= * .include -.if defined(WITH_PERL) -USE_PERL5= yes -.include "${PORTSDIR}/Mk/bsd.perl.mk" -CONFIGURE_ARGS+= --with-perl -PLIST_SUB+= WITH_PERL="" +.if ${PORT_OPTIONS:MPERL} +USE_PERL5= yes +CONFIGURE_ARGS+=--with-perl +PLIST_SUB+= PERL="" .else -CONFIGURE_ARGS+= --without-perl -PLIST_SUB+= WITH_PERL="@comment " +CONFIGURE_ARGS+=--without-perl +PLIST_SUB+= PERL="@comment " .endif -.if defined(WITH_PYTHON) +.if ${PORT_OPTIONS:MPYTHON} USE_PYTHON= yes -CONFIGURE_ARGS+= --with-python -PLIST_SUB+= WITH_PYTHON="" PYTHON_VER=${PYTHON_VER} +CONFIGURE_ARGS+=--with-python +PLIST_SUB+= PYTHON="" PYTHON_VER="${PYTHON_VER}" VERSION="${PORTVERSION}" .else -CONFIGURE_ARGS+= --without-python -PLIST_SUB+= WITH_PYTHON="@comment " +CONFIGURE_ARGS+=--without-python +PLIST_SUB+= PYTHON="@comment " .endif .include @@ -58,38 +56,24 @@ .endif post-patch: - @${REINPLACE_CMD} -e 's|libdir)/pkgconfig|prefix)/libdata/pkgconfig|' ${WRKSRC}/src/Makefile.in + @${REINPLACE_CMD} -e \ + '/^install-data-am:/s|install-data-local||' ${WRKSRC}/docs/api/Makefile.in post-install: -.if !defined(NOPORTDOCS) - ${INSTALL} -d ${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${MAN1PREFIX}/man/man1 +.for f in client.conf global.conf idmef-client.conf tls.conf + ${INSTALL_DATA} ${WRKSRC}/${f} \ + ${PREFIX}/etc/prelude/default/${f}-dist +.if !exists(${PREFIX}/etc/prelude/default/${f}) + (cd ${PREFIX}/etc/prelude/default && ${CP} -p ${f}-dist ${f}) +.endif +.endfor +.if ${PORT_OPTIONS:MPERL} + -@${RM} -f ${PREFIX}/lib/perl5/${PERL_VERSION}/${PERL_ARCH}/perllocal.pod +.endif +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/docs/api/html/* ${DOCSDIR} .endif - @${INSTALL_MAN} ${WRKSRC}/docs/manpages/*.1 ${MAN1PREFIX}/man/man1/ - @${INSTALL_DATA} ${WRKSRC}/client.conf \ - ${PREFIX}/etc/prelude/default/client.conf-dist - @${INSTALL_DATA} ${WRKSRC}/global.conf \ - ${PREFIX}/etc/prelude/default/global.conf-dist - @${INSTALL_DATA} ${WRKSRC}/tls.conf \ - ${PREFIX}/etc/prelude/default/tls.conf-dist - @${INSTALL_DATA} ${WRKSRC}/idmef-client.conf \ - ${PREFIX}/etc/prelude/default/idmef-client.conf-dist - - @if [ ! -f ${PREFIX}/etc/prelude/default/client.conf ]; then \ - ${CP} -p ${PREFIX}/etc/prelude/default/client.conf-dist \ - ${PREFIX}/etc/prelude/default/client.conf ; \ - fi - @if [ ! -f ${PREFIX}/etc/prelude/default/global.conf ]; then \ - ${CP} -p ${PREFIX}/etc/prelude/default/global.conf-dist \ - ${PREFIX}/etc/prelude/default/global.conf ; \ - fi - @if [ ! -f ${PREFIX}/etc/prelude/default/idmef-client.conf ]; then \ - ${CP} -p ${PREFIX}/etc/prelude/default/idmef-client.conf-dist \ - ${PREFIX}/etc/prelude/default/idmef-client.conf ; \ - fi - @if [ ! -f ${PREFIX}/etc/prelude/default/tls.conf ]; then \ - ${CP} -p ${PREFIX}/etc/prelude/default/tls.conf-dist \ - ${PREFIX}/etc/prelude/default/tls.conf ; \ - fi .include diff -urN /usr/ports/security/libprelude/distinfo security/libprelude/distinfo --- /usr/ports/security/libprelude/distinfo 2011-07-03 23:02:55.000000000 +0900 +++ security/libprelude/distinfo 2012-09-11 15:27:27.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (libprelude-0.9.24.1.tar.gz) = 877383ba5e51709aad22a6547dc94b2453fef92a4923661b6fd98a2869875daf -SIZE (libprelude-0.9.24.1.tar.gz) = 2582719 +SHA256 (libprelude-1.0.1.tar.gz) = 852d981e7d23e49ec25a96a7f54c19a7ee72cd786a0d02c43a27e3e770d5cb6b +SIZE (libprelude-1.0.1.tar.gz) = 2791973 diff -urN /usr/ports/security/libprelude/files/patch-src__include__prelude-plugin.h security/libprelude/files/patch-src__include__prelude-plugin.h --- /usr/ports/security/libprelude/files/patch-src__include__prelude-plugin.h 1970-01-01 09:00:00.000000000 +0900 +++ security/libprelude/files/patch-src__include__prelude-plugin.h 2012-09-11 15:47:35.000000000 +0900 @@ -0,0 +1,13 @@ +--- src/include/prelude-plugin.h.orig 2012-06-02 00:12:30.000000000 +0900 ++++ src/include/prelude-plugin.h 2012-09-11 15:46:33.000000000 +0900 +@@ -61,9 +61,9 @@ + */ + #ifdef PRELUDE_APPLICATION_USE_LIBTOOL2 + # define lt_preloaded_symbols lt__PROGRAM__LTX_preloaded_symbols +-#endif + + extern const void *lt_preloaded_symbols[]; ++#endif + + #define PRELUDE_PLUGIN_SET_PRELOADED_SYMBOLS() \ + prelude_plugin_set_preloaded_symbols(lt_preloaded_symbols) diff -urN /usr/ports/security/libprelude/pkg-plist security/libprelude/pkg-plist --- /usr/ports/security/libprelude/pkg-plist 2009-09-18 21:02:00.000000000 +0900 +++ security/libprelude/pkg-plist 2012-09-11 16:20:09.000000000 +0900 @@ -16,9 +16,12 @@ @exec if [ ! -f %D/etc/prelude/default/tls.conf ] ; then cp -p %D/%F %B/tls.conf; fi include/libprelude/common.h include/libprelude/daemonize.h +include/libprelude/idmef.h +include/libprelude/idmef.hxx include/libprelude/idmef-additional-data.h include/libprelude/idmef-class.h include/libprelude/idmef-criteria.h +include/libprelude/idmef-criteria.hxx include/libprelude/idmef-criterion-value.h include/libprelude/idmef-data.h include/libprelude/idmef-message-helpers.h @@ -27,19 +30,29 @@ include/libprelude/idmef-message-read.h include/libprelude/idmef-message-write.h include/libprelude/idmef-path.h +include/libprelude/idmef-path.hxx include/libprelude/idmef-time.h +include/libprelude/idmef-time.hxx include/libprelude/idmef-tree-data.h include/libprelude/idmef-tree-wrap.h -include/libprelude/idmef-value-type.h include/libprelude/idmef-value.h -include/libprelude/idmef.h +include/libprelude/idmef-value.hxx +include/libprelude/idmef-value-type.h +include/libprelude/prelude.h +include/libprelude/prelude.hxx include/libprelude/prelude-async.h -include/libprelude/prelude-client-profile.h include/libprelude/prelude-client.h +include/libprelude/prelude-client.hxx +include/libprelude/prelude-client-easy.hxx +include/libprelude/prelude-client-profile.h +include/libprelude/prelude-client-profile.hxx include/libprelude/prelude-config.h -include/libprelude/prelude-connection-pool.h include/libprelude/prelude-connection.h +include/libprelude/prelude-connection.hxx +include/libprelude/prelude-connection-pool.h +include/libprelude/prelude-connection-pool.hxx include/libprelude/prelude-error.h +include/libprelude/prelude-error.hxx include/libprelude/prelude-extract.h include/libprelude/prelude-failover.h include/libprelude/prelude-hash.h @@ -49,6 +62,7 @@ include/libprelude/prelude-linked-object.h include/libprelude/prelude-list.h include/libprelude/prelude-log.h +include/libprelude/prelude-log.hxx include/libprelude/prelude-message-id.h include/libprelude/prelude-msg.h include/libprelude/prelude-msgbuf.h @@ -58,21 +72,33 @@ include/libprelude/prelude-string.h include/libprelude/prelude-thread.h include/libprelude/prelude-timer.h -include/libprelude/prelude.h +lib/libprelude.a lib/libprelude.la lib/libprelude.so -lib/libprelude.so.20 -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Prelude.pm -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/.packlist -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.bs -%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.so -%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-0.9.24.1-py%%PYTHON_VER%%.egg-info -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.py -%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc +lib/libprelude.so.21 +lib/libpreludecpp.a +lib/libpreludecpp.la +lib/libpreludecpp.so +lib/libpreludecpp.so.3 +%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/Prelude.pm +%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/.packlist +%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.bs +%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude/Prelude.so +%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy/.packlist +%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy/PreludeEasy.bs +%%PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy/PreludeEasy.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy-%%VERSION%%-py%%PYTHON_VER%%.egg-info +%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/PreludeEasy.pyc +%%PYTHON%%%%PYTHON_SITELIBDIR%%/_PreludeEasy.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so +%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-%%VERSION%%-py%%PYTHON_VER%%.egg-info +%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.py +%%PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc libdata/pkgconfig/libprelude.pc share/aclocal/libprelude.m4 +%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy +%%PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Prelude @dirrm include/libprelude @dirrm etc/prelude/default @dirrmtry etc/prelude/profile >Release-Note: >Audit-Trail: >Unformatted: