From robin@yirdis.nl  Thu Dec 21 12:27:44 2006
Return-Path: <robin@yirdis.nl>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 5595616A40F
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 21 Dec 2006 12:27:41 +0000 (UTC)
	(envelope-from robin@yirdis.nl)
Received: from mail.yirdis.nl (82-148-208-109.fiber.unet.nl [82.148.208.109])
	by mx1.freebsd.org (Postfix) with ESMTP id EF22013C428
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 21 Dec 2006 12:27:39 +0000 (UTC)
	(envelope-from robin@yirdis.nl)
Received: from server.yirdis.net (localhost [127.0.0.1])
	by mail.yirdis.nl (8.13.6/8.13.6) with ESMTP id kBLAHp5M073675
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 21 Dec 2006 11:17:51 +0100 (CET)
	(envelope-from robin@server.yirdis.net)
Received: (from robin@localhost)
	by server.yirdis.net (8.13.6/8.13.6/Submit) id kBLAHoCd073674;
	Thu, 21 Dec 2006 11:17:51 +0100 (CET)
	(envelope-from robin)
Message-Id: <200612211017.kBLAHoCd073674@server.yirdis.net>
Date: Thu, 21 Dec 2006 11:17:51 +0100 (CET)
From: Robin Gruyters <r.gruyters@yirdis.nl>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] security/prelude-manager: update to 0.9.7
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         107010
>Category:       ports
>Synopsis:       [MAINTAINER] security/prelude-manager: update to 0.9.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    miwi
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 21 12:30:21 GMT 2006
>Closed-Date:    Thu Dec 21 19:19:27 GMT 2006
>Last-Modified:  Thu Dec 21 19:20:22 GMT 2006
>Originator:     Robin Gruyters
>Release:        FreeBSD 6.1-RELEASE-p10 i386
>Organization:
YIRDIS B.V.
>Environment:
System: FreeBSD server.yirdis.net 6.1-RELEASE-p10 FreeBSD 6.1-RELEASE-p10 #1: Tue Oct 24 10:44:15 CEST 2006
>Description:
- Update to 0.9.7

Changelog prelude-manager-0.9.7:
- Fix a startup problem on system with different address of different family
  mapping to the same IP.
- Fix for system using the GnuLib poll replacement modules. The module was
  broken when used in conjunction with server socket.
- Various portability fixes (this release should compile and run on OSX out of the box).

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- prelude-manager-0.9.7.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/security/prelude-manager/Makefile /data2/FreeBSD/custom_ports/security/prelude-manager/Makefile
--- /usr/ports/security/prelude-manager/Makefile	Thu Nov 30 02:21:20 2006
+++ /data2/FreeBSD/custom_ports/security/prelude-manager/Makefile	Thu Dec 21 11:13:06 2006
@@ -5,7 +5,7 @@
 # $FreeBSD: ports/security/prelude-manager/Makefile,v 1.36 2006/11/27 01:16:41 clsung Exp $
 
 PORTNAME=	prelude-manager
-PORTVERSION=	0.9.6.1
+PORTVERSION=	0.9.7
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/download/releases/ \
 		http://www.prelude-ids.org/download/releases/old/
@@ -13,7 +13,7 @@
 MAINTAINER=	r.gruyters@yirdis.nl
 COMMENT=	Prelude Network Intrusion Detection System central logging point
 
-LIB_DEPENDS+=	prelude.10:${PORTSDIR}/security/libprelude \
+LIB_DEPENDS+=	prelude.12:${PORTSDIR}/security/libprelude \
 		gnutls.13:${PORTSDIR}/security/gnutls
 
 USE_GPG=	yes
@@ -26,6 +26,8 @@
 CONFIGURE_ARGS=		--with-html-dir=${PREFIX}/share/doc \
 			--localstatedir=/var
 
+.include <bsd.port.pre.mk>
+
 .if defined(WITHOUT_XML)
 PLIST_SUB+=	WITH_XML="@comment "
 CONFIGURE_ARGS+=	--disable-xmltest --without-xml
@@ -41,4 +43,10 @@
 PLIST_SUB+=	WITH_DB=""
 .endif
 
-.include <bsd.port.mk>
+post-install:
+	@if [ -f ${PREFIX}/etc/prelude-manager/prelude-manager.conf ]; then
+	   ${CP} -p ${PREFIX}/etc/prelude-manager/prelude-manager.conf-dist \
+	      ${PREFIX}/etc/prelude-manager/prelude-manager.conf ; \
+	fi
+
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/security/prelude-manager/distinfo /data2/FreeBSD/custom_ports/security/prelude-manager/distinfo
--- /usr/ports/security/prelude-manager/distinfo	Thu Oct 12 02:25:54 2006
+++ /data2/FreeBSD/custom_ports/security/prelude-manager/distinfo	Thu Dec 21 10:56:28 2006
@@ -1,3 +1,3 @@
-MD5 (prelude-manager-0.9.6.1.tar.gz) = 97babc1a3c163eced05ace1fa47d011a
-SHA256 (prelude-manager-0.9.6.1.tar.gz) = b30fa5691ddaffada7bc65b074b8855faf6e6d8280fbbbdced67043465867311
-SIZE (prelude-manager-0.9.6.1.tar.gz) = 573156
+MD5 (prelude-manager-0.9.7.tar.gz) = 6265843b38384f5d6c4005f3837af091
+SHA256 (prelude-manager-0.9.7.tar.gz) = 6c3b8edba4aeb4ed13586fc41047e477824f97e625db124e2d2591d411a56106
+SIZE (prelude-manager-0.9.7.tar.gz) = 565775
diff -ruN --exclude=CVS /usr/ports/security/prelude-manager/pkg-plist /data2/FreeBSD/custom_ports/security/prelude-manager/pkg-plist
--- /usr/ports/security/prelude-manager/pkg-plist	Fri Jun 16 18:28:28 2006
+++ /data2/FreeBSD/custom_ports/security/prelude-manager/pkg-plist	Thu Dec 21 11:15:55 2006
@@ -1,6 +1,8 @@
 @comment $FreeBSD: ports/security/prelude-manager/pkg-plist,v 1.9 2006/06/16 16:28:28 pav Exp $
 bin/prelude-manager
+@unexec if cmp -s %D/etc/prelude-manager/prelude-manager.conf %D/etc/prelude-manager/prelude-manager.conf-dist; then rm -f %D/etc/prelude-manager/prelude-manager.conf; fi
 etc/prelude-manager/prelude-manager.conf-dist
+@exec if [ ! -f %D/etc/prelude-manager/prelude-manager.conf ] ; then cp -p %D/%F %B/prelude-manager.conf; fi
 include/prelude-manager/prelude-manager.h
 lib/prelude-manager/filters/idmef-criteria.la
 lib/prelude-manager/filters/idmef-criteria.so
--- prelude-manager-0.9.7.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Thu Dec 21 12:36:38 UTC 2006 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107010 
State-Changed-From-To: open->feedback 
State-Changed-By: miwi 
State-Changed-When: Thu Dec 21 13:59:49 UTC 2006 
State-Changed-Why:  
Ask for maintainer fix. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107010 

From: Robin Gruyters <r.gruyters@yirdis.nl>
To: Martin Wilke <miwi@FreeBSD.org>
Cc: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Subject: Re: ports/107010: [MAINTAINER] security/prelude-manager: update to
	0.9.7
Date: Thu, 21 Dec 2006 15:59:43 +0100

 This message is in MIME format.
 
 --=_5s2y03o14hcs
 Content-Type: text/plain;
 	charset=ISO-8859-1;
 	DelSp="Yes";
 	format="flowed"
 Content-Disposition: inline
 Content-Transfer-Encoding: 7bit
 
 Ok,
 
 Here is an patch to fix the xmlmod.c problem. Please include this  
 patch with the port PR.
 
 Regards,
 
 
 Robin Gruyters
 Network and Security Engineer
 Yirdis B.V.
 I: http://yirdis.com
 P: +31 (0)36 5300394
 F: +31 (0)36 5489119
 
 
 Quoting Martin Wilke <miwi@FreeBSD.org>:
 
 > Synopsis: [MAINTAINER] security/prelude-manager: update to 0.9.7
 >
 > State-Changed-From-To: open->feedback
 > State-Changed-By: miwi
 > State-Changed-When: Thu Dec 21 13:59:49 UTC 2006
 > State-Changed-Why:
 > Ask for maintainer fix.
 >
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=107010
 >
 
 
 
 --=_5s2y03o14hcs
 Content-Type: text/x-csrc;
 	charset=ISO-8859-1;
 	name="patch-plugins_reports_xmlmod_xmlmod.c"
 Content-Disposition: attachment;
 	filename="patch-plugins_reports_xmlmod_xmlmod.c"
 Content-Transfer-Encoding: 7bit
 
 --- plugins/reports/xmlmod/xmlmod.c.orig	Wed Dec 20 15:58:15 2006
 +++ plugins/reports/xmlmod/xmlmod.c	Thu Dec 21 15:50:35 2006
 @@ -58,7 +58,7 @@
          size_t ret;
          
          ret = fwrite(buf, 1, len, context);
 -        if ( ret != (size_t ) len && ferror(context) ) {
 +        if ( ret != (size_t ) len && ferror((FILE *) context) ) {
                  prelude_log(PRELUDE_LOG_ERR, "could not write IDMEF-XML data: '%s'.\n", strerror(errno));
                  return -1;
          }
 
 --=_5s2y03o14hcs--
State-Changed-From-To: feedback->closed 
State-Changed-By: miwi 
State-Changed-When: Thu Dec 21 19:19:26 UTC 2006 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=107010 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/107010: commit references a PR
Date: Thu, 21 Dec 2006 19:14:35 +0000 (UTC)

 miwi        2006-12-21 19:14:24 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/prelude-manager Makefile distinfo pkg-plist 
   Added files:
     security/prelude-manager/files patch-xmlmod.c 
   Log:
   - Update to 0.9.7
   
   Changelog prelude-manager-0.9.7:
   - Fix a startup problem on system with different address of different family
     mapping to the same IP.
   - Fix for system using the GnuLib poll replacement modules. The module was
     broken when used in conjunction with server socket.
   - Various portability fixes (this release should compile and run on OSX out
     of the box).
   
   PR:             ports/107010
   Submitted by:   Robin Gruyters <r.gruyters@yirdis.nl> (maintainer)
   
   Revision  Changes    Path
   1.37      +11 -3     ports/security/prelude-manager/Makefile
   1.15      +3 -3      ports/security/prelude-manager/distinfo
   1.1       +11 -0     ports/security/prelude-manager/files/patch-xmlmod.c (new)
   1.10      +3 -1      ports/security/prelude-manager/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
