From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Sep 24 09:00:11 2009 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 273F7106568B for ; Thu, 24 Sep 2009 09:00: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 030368FC14 for ; Thu, 24 Sep 2009 09:00:11 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n8O90AuX081983 for ; Thu, 24 Sep 2009 09:00:10 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n8O90Aie081982; Thu, 24 Sep 2009 09:00:10 GMT (envelope-from gnats) Resent-Date: Thu, 24 Sep 2009 09:00:10 GMT Resent-Message-Id: <200909240900.n8O90Aie081982@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, Vladimir Korkodinov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 81CD21065670 for ; Thu, 24 Sep 2009 08:55:14 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21]) by mx1.freebsd.org (Postfix) with ESMTP id 6F4CC8FC20 for ; Thu, 24 Sep 2009 08:55:14 +0000 (UTC) Received: from www.freebsd.org (localhost [127.0.0.1]) by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n8O8tEpR003261 for ; Thu, 24 Sep 2009 08:55:14 GMT (envelope-from nobody@www.freebsd.org) Received: (from nobody@localhost) by www.freebsd.org (8.14.3/8.14.3/Submit) id n8O8tEbg003260; Thu, 24 Sep 2009 08:55:14 GMT (envelope-from nobody) Message-Id: <200909240855.n8O8tEbg003260@www.freebsd.org> Date: Thu, 24 Sep 2009 08:55:14 GMT From: Vladimir Korkodinov To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/139102: [UPDATE] security/prelude-manager to 0.9.15 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: Thu, 24 Sep 2009 09:00:11 -0000 >Number: 139102 >Category: ports >Synopsis: [UPDATE] security/prelude-manager to 0.9.15 >Confidential: no >Severity: serious >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Thu Sep 24 09:00:09 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Vladimir Korkodinov >Release: 6.4-RELEASE >Organization: >Environment: 6.4-RELEASE FreeBSD 6.4-RELEASE #2: Thu Dec 4 11:29:00 YEKT 2008 root at xxxx:/usr/obj/usr/src/sys/kernel i386 >Description: Update to 0.9.15. Fix build with gnutls >= 2.8.3. The patch is taken from the repository http://git.prelude-ids.com/?p=prelude-manager.git;a=commit;h=2f7e9dcb0718ef4e0f5321d87ab5065955e6d473 >How-To-Repeat: Try install >Fix: apply patch Patch attached with submission follows: diff -ruN prelude-manager.old/Makefile prelude-manager/Makefile --- prelude-manager.old/Makefile 2009-09-24 04:17:10.000000000 +0600 +++ prelude-manager/Makefile 2009-09-24 14:43:47.000000000 +0600 @@ -2,11 +2,11 @@ # Date created: Sun Aug 4 19:31:17 CEST 2002 # Whom: Clement Laforet # -# $FreeBSD: ports/security/prelude-manager/Makefile,v 1.60 2009/09/23 22:17:10 linimon Exp $ +# $FreeBSD: ports/security/prelude-manager/Makefile,v 1.57 2009/02/18 23:36:28 amdmi3 Exp $ PORTNAME= prelude-manager -PORTVERSION= 0.9.14.2 -PORTREVISION= 4 +PORTVERSION= 0.9.15 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= http://www.prelude-ids.com/download/releases/%SUBDIR%/ MASTER_SITE_SUBDIR= ${PORTNAME} ${PORTNAME}/old @@ -21,7 +21,7 @@ USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_RC_SUBR= prelude-manager.sh -CONFIGURE_ARGS= --with-html-dir=${PREFIX}/share/doc \ +CONFIGURE_ARGS= --htmldir=${PREFIX}/share/doc \ --localstatedir=/var PRELUDEUSER?= prelude @@ -60,6 +60,9 @@ PLIST_SUB+= WITH_PRELUDEDB="" .endif +pre-configure: + autoreconf -if ${WRKDIR}/prelude-manager-0.9.15 + post-install: @if [ ! -f ${PREFIX}/etc/prelude-manager/prelude-manager.conf ]; then \ ${CP} -p ${PREFIX}/etc/prelude-manager/prelude-manager.conf-dist \ diff -ruN prelude-manager.old/distinfo prelude-manager/distinfo --- prelude-manager.old/distinfo 2009-02-19 04:36:28.000000000 +0500 +++ prelude-manager/distinfo 2009-09-04 10:55:04.000000000 +0600 @@ -1,3 +1,3 @@ -MD5 (prelude-manager-0.9.14.2.tar.gz) = 4112f1be84cace540d649a6127a46d9c -SHA256 (prelude-manager-0.9.14.2.tar.gz) = b73e299ee3dabc1396f8b432e058c140769383b881b096c7ba964fd8e3ff5d22 -SIZE (prelude-manager-0.9.14.2.tar.gz) = 778280 +MD5 (prelude-manager-0.9.15.tar.gz) = 707c8c1be9976ef13748dad680e7724c +SHA256 (prelude-manager-0.9.15.tar.gz) = 2ee2160e049f99a4ede3a76b1a6872c584f1a2764816394671aa3abd5e711ce2 +SIZE (prelude-manager-0.9.15.tar.gz) = 1008163 diff -ruN prelude-manager.old/files/patch-Makefile.am prelude-manager/files/patch-Makefile.am --- prelude-manager.old/files/patch-Makefile.am 1970-01-01 05:00:00.000000000 +0500 +++ prelude-manager/files/patch-Makefile.am 2009-09-24 14:51:27.000000000 +0600 @@ -0,0 +1,22 @@ +--- Makefile.am.orig 2009-07-10 16:13:29.000000000 +0600 ++++ Makefile.am 2009-09-24 14:51:14.000000000 +0600 +@@ -28,18 +28,7 @@ + $(INSTALL) -d -m 700 $(DESTDIR)$(manager_run_dir); + $(INSTALL) -d -m 700 $(DESTDIR)$(manager_scheduler_dir); + $(INSTALL) -d -m 700 $(DESTDIR)$(manager_failover_dir); +- @if test -f $(DESTDIR)$(configdir)/prelude-manager.conf; then \ +- $(INSTALL) -m 600 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/prelude-manager.conf-dist; \ +- echo "********************************************************************************"; \ +- echo; \ +- echo "$(DESTDIR)$(configdir)/prelude-manager.conf already exist..."; \ +- echo "Installing default configuration in $(DESTDIR)$(configdir)/prelude-manager.conf-dist"; \ +- echo; \ +- echo "********************************************************************************"; \ +- else \ +- $(INSTALL) -m 600 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/; \ +- fi +- ++ $(INSTALL) -m 600 $(top_srcdir)/prelude-manager.conf $(DESTDIR)$(configdir)/prelude-manager.conf-dist + + dist-hook: + @if test -d "$(srcdir)/.git"; then \ diff -ruN prelude-manager.old/files/patch-Makefile.in prelude-manager/files/patch-Makefile.in --- prelude-manager.old/files/patch-Makefile.in 2008-05-13 20:51:51.000000000 +0600 +++ prelude-manager/files/patch-Makefile.in 2009-09-04 11:29:03.000000000 +0600 @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2008-04-28 13:56:31.000000000 +0200 -+++ Makefile.in 2008-04-29 11:30:33.000000000 +0200 -@@ -927,17 +927,8 @@ +--- Makefile.in.orig 2009-07-10 18:02:41.000000000 +0600 ++++ Makefile.in 2009-09-04 11:28:51.000000000 +0600 +@@ -1212,17 +1212,7 @@ $(INSTALL) -d -m 700 $(DESTDIR)$(manager_run_dir); $(INSTALL) -d -m 700 $(DESTDIR)$(manager_scheduler_dir); $(INSTALL) -d -m 700 $(DESTDIR)$(manager_failover_dir); @@ -16,7 +16,6 @@ - $(INSTALL) -m 600 $(top_builddir)/prelude-manager.conf $(DESTDIR)$(configdir)/; \ - fi + $(INSTALL) -m 600 $(top_srcdir)/prelude-manager.conf $(DESTDIR)$(configdir)/prelude-manager.conf-dist -+ - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: + + dist-hook: + @if test -d "$(srcdir)/.git"; then \ diff -ruN prelude-manager.old/files/patch-configure.in prelude-manager/files/patch-configure.in --- prelude-manager.old/files/patch-configure.in 1970-01-01 05:00:00.000000000 +0500 +++ prelude-manager/files/patch-configure.in 2009-09-21 13:26:27.000000000 +0600 @@ -0,0 +1,18 @@ +--- configure.in.orig 2009-07-10 15:49:10.000000000 +0600 ++++ configure.in 2009-09-21 13:12:21.000000000 +0600 +@@ -76,10 +76,11 @@ + dnl ************************************************** + dnl * Check for GnuTLS. * + dnl ************************************************** +-AM_PATH_LIBGNUTLS(1.0.17, gnutls=yes, gnutls=no) +-if test x$gnutls != xyes; then +- AC_MSG_ERROR(libgnutls is required in order to build prelude-manager.) +-fi ++GNUTLS_MIN_VERSION=1.0.17 ++ ++PKG_CHECK_EXISTS(gnutls, ++ [PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= $GNUTLS_MIN_VERSION])], ++ [AM_PATH_LIBGNUTLS($GNUTLS_MIN_VERSION, [], [AC_MSG_ERROR(libgnutls is required in order to build prelude-manager.)])]) + + old_LIBS=$LIBS + old_CPPFLAGS=$CPPFLAGS >Release-Note: >Audit-Trail: >Unformatted: