From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Sep 13 03:30:01 2008 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 8EDAB106566B for ; Sat, 13 Sep 2008 03:30:01 +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 6F6168FC15 for ; Sat, 13 Sep 2008 03:30:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.2/8.14.2) with ESMTP id m8D3U15K043362 for ; Sat, 13 Sep 2008 03:30:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.2/8.14.1/Submit) id m8D3U1EN043361; Sat, 13 Sep 2008 03:30:01 GMT (envelope-from gnats) Resent-Date: Sat, 13 Sep 2008 03:30:01 GMT Resent-Message-Id: <200809130330.m8D3U1EN043361@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, Yarema Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 68008106564A for ; Sat, 13 Sep 2008 03:23:40 +0000 (UTC) (envelope-from yds@dppl.com) Received: from orion.dppl.com (orion.dppl.biz [216.182.10.231]) by mx1.freebsd.org (Postfix) with ESMTP id 408F58FC28 for ; Sat, 13 Sep 2008 03:23:40 +0000 (UTC) (envelope-from yds@dppl.com) Received: by orion.dppl.com (Postfix, from userid 1001) id 8A9186432FAC; Fri, 12 Sep 2008 23:23:39 -0400 (EDT) Message-Id: <20080913032339.8A9186432FAC@orion.dppl.com> Date: Fri, 12 Sep 2008 23:23:39 -0400 (EDT) From: Yarema To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: r.gruyters@yirdis.nl Subject: ports/127340: [PATCH] security/libpreludedb update to 0.9.15.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Yarema List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Sep 2008 03:30:01 -0000 >Number: 127340 >Category: ports >Synopsis: [PATCH] security/libpreludedb update to 0.9.15.1 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Sep 13 03:30:00 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Yarema >Release: FreeBSD 6.4-PRERELEASE amd64 >Organization: NYCBUG.org >Environment: System: FreeBSD 6.4-PRERELEASE amd64 FreeBSD 7.1-PRERELEASE amd64 >Description: Update security/libpreludedb from 0.9.14.1 to 0.9.15.1 Reroll patch file(s). Bump LIB_DEPENDS=prelude to 17 to go with http://www.FreeBSD.org/cgi/query-pr.cgi?pr=127339 Rework OPTIONS to autodetect installed SQL libs and default their tunables to "on". Always create DEPENDS on SQL libs if they are found to be installed. Required because configure does not honor --without-* for sql plugins. Without forcing the DEPENDS does not uninstall cleanly if the sql libs happen to be autodetected by configure. Fix PLIST for the Python binding. >How-To-Repeat: >Fix: diff -u -r -N libpreludedb-0.9.14.1/Makefile libpreludedb/Makefile --- libpreludedb-0.9.14.1/Makefile 2008-08-21 03:43:09.000000000 -0400 +++ libpreludedb/Makefile 2008-09-12 23:02:48.614009236 -0400 @@ -4,16 +4,15 @@ # $FreeBSD: ports/security/libpreludedb/Makefile,v 1.30 2008/08/21 06:18:17 rafan Exp $ PORTNAME= libpreludedb -PORTVERSION= 0.9.14.1 -PORTREVISION= 2 +PORTVERSION= 0.9.15.1 CATEGORIES= security -MASTER_SITES= http://www.prelude-ids.org/download/releases/ \ - http://www.prelude-ids.org/download/releases/old/ +MASTER_SITES= http://www.prelude-ids.com/download/releases/%SUBDIR%/ +MASTER_SITE_SUBDIR= ${PORTNAME} ${PORTNAME}/old MAINTAINER= r.gruyters@yirdis.nl COMMENT= Framework library for access to Prelude NIDS database -LIB_DEPENDS= prelude.14:${PORTSDIR}/security/libprelude +LIB_DEPENDS= prelude.17:${PORTSDIR}/security/libprelude USE_GMAKE= yes GNU_CONFIGURE= yes @@ -21,17 +20,35 @@ %%PREFIX%%/lib/libpreludedb/plugins/formats USE_LDCONFIG= yes -OPTIONS= PERL "Include Perl bindings" off \ - PYTHON "Include Python bindings" off \ - MYSQL "Use MySQL backend" on \ - PGSQL "Use PostgreSQL backend" off \ - SQLITE "Use SQLite backend" off - MAN1= preludedb-admin.1 +OPTIONS= PERL "Include Perl bindings" off \ + PYTHON "Include Python bindings" off + .include -.if defined(WITH_PERL) +OPTIONS+= MYSQL "Use MySQL backend" +.if exists(${LOCALBASE}/bin/mysql_config) || defined(WITH_MYSQL) +OPTIONS+=on +.else +OPTIONS+=off +.endif + +OPTIONS+= PGSQL "Use PostgreSQL backend" +.if exists(${LOCALBASE}/bin/pg_config) || defined(WITH_PGSQL) +OPTIONS+=on +.else +OPTIONS+=off +.endif + +OPTIONS+= SQLITE "Use SQLite backend" +.if exists(${LOCALBASE}/lib/libsqlite3.so) || defined(WITH_SQLITE) +OPTIONS+=on +.else +OPTIONS+=off +.endif + +.if defined(WITH_PERL) && !defined(WITHOUT_PERL) USE_PERL5= yes CONFIGURE_ARGS+= --with-perl PLIST_SUB+= WITH_PERL="" @@ -40,18 +57,18 @@ PLIST_SUB+= WITH_PERL="@comment " .endif -.if defined(WITH_PYTHON) +.if defined(WITH_PYTHON) && !defined(WITHOUT_PYTHON) USE_PYTHON= 2.3+ # Need to manually include bsd.python.mk, because USE_PYTHON is defined .include "${PORTSDIR}/Mk/bsd.python.mk" CONFIGURE_ARGS+= --with-python -PLIST_SUB+= WITH_PYTHON="" +PLIST_SUB+= WITH_PYTHON="" PYTHON_VER=${PYTHON_VER} .else CONFIGURE_ARGS+= --without-python PLIST_SUB+= WITH_PYTHON="@comment " .endif -.if !defined(WITHOUT_MYSQL) +.if defined(WITH_MYSQL) || exists(${LOCALBASE}/bin/mysql_config) USE_MYSQL= yes CONFIGURE_ARGS+= --with-mysql PLIST_SUB+= WITH_MYSQL="" @@ -61,7 +78,7 @@ PLIST_SUB+= WITH_MYSQL="@comment " .endif -.if defined(WITH_PGSQL) +.if defined(WITH_PGSQL) || exists(${LOCALBASE}/bin/pg_config) USE_PGSQL= yes CONFIGURE_ARGS+= --with-pgsql PLIST_SUB+= WITH_PGSQL="" @@ -71,7 +88,7 @@ PLIST_SUB+= WITH_PGSQL="@comment " .endif -.if defined(WITH_SQLITE) +.if defined(WITH_SQLITE) || exists(${LOCALBASE}/lib/libsqlite3.so) USE_SQLITE= yes CONFIGURE_ARGS+= --with-sqlite3 PLIST_SUB+= WITH_SQLITE="" diff -u -r -N libpreludedb-0.9.14.1/distinfo libpreludedb/distinfo --- libpreludedb-0.9.14.1/distinfo 2008-02-15 12:36:55.000000000 -0500 +++ libpreludedb/distinfo 2008-09-12 21:42:43.571614657 -0400 @@ -1,3 +1,3 @@ -MD5 (libpreludedb-0.9.14.1.tar.gz) = d5e37cccc32ca54fece68b7eee589f01 -SHA256 (libpreludedb-0.9.14.1.tar.gz) = f52cd9a386f36b85410e071a5ee2f90baceb527402707f2c1165265a2259e9dc -SIZE (libpreludedb-0.9.14.1.tar.gz) = 757477 +MD5 (libpreludedb-0.9.15.1.tar.gz) = 792b6ce058e4b9db44279409dbc662a3 +SHA256 (libpreludedb-0.9.15.1.tar.gz) = 711b453b3528944bed1baa6c4f7fac823c141f0777a8c9c58437b1eb4e11756c +SIZE (libpreludedb-0.9.15.1.tar.gz) = 810742 diff -u -r -N libpreludedb-0.9.14.1/files/patch-Makefile.in libpreludedb/files/patch-Makefile.in --- libpreludedb-0.9.14.1/files/patch-Makefile.in 2006-02-15 04:16:34.000000000 -0500 +++ libpreludedb/files/patch-Makefile.in 2008-09-09 08:18:38.000000000 -0400 @@ -1,6 +1,6 @@ ---- Makefile.in.orig Sat Jan 21 01:56:42 2006 -+++ Makefile.in Sat Jan 21 01:56:54 2006 -@@ -291,7 +291,7 @@ +--- Makefile.in.orig 2008-09-09 08:18:38.000000000 -0400 ++++ Makefile.in 2008-09-09 08:18:38.000000000 -0400 +@@ -519,7 +519,7 @@ ACLOCAL_AMFLAGS = -I m4 -I libmissing/m4 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc EXTRA_DIST = LICENSE.README HACKING.README @@ -8,4 +8,4 @@ +SUBDIRS = m4 libmissing src plugins bindings bin_SCRIPTS = $(top_builddir)/libpreludedb-config distuninstallcheck_listfiles = find . -type f -print | grep -v 'perl' | grep -v '3pm' - AM_CPPFLAGS = @defined@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing + AM_CPPFLAGS = @PCFLAGS@ -I$(top_srcdir)/src/include -I$(top_srcdir)/libmissing @LIBPRELUDE_CFLAGS@ diff -u -r -N libpreludedb-0.9.14.1/pkg-plist libpreludedb/pkg-plist --- libpreludedb-0.9.14.1/pkg-plist 2008-02-15 12:36:55.000000000 -0500 +++ libpreludedb/pkg-plist 2008-09-12 22:27:13.188650622 -0400 @@ -26,6 +26,7 @@ %%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeDB/PreludeDB.so %%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeDB %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/_preludedb.so +%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb-0.0.0-py%%PYTHON_VER%%.egg-info %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.py %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/preludedb.pyc share/aclocal/libpreludedb.m4 >Release-Note: >Audit-Trail: >Unformatted: