From yds@dppl.com  Sat Sep 13 01:19:01 2008
Return-Path: <yds@dppl.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 06125106566B
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 13 Sep 2008 01:19:01 +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 BADBC8FC19
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 13 Sep 2008 01:19:00 +0000 (UTC)
	(envelope-from yds@dppl.com)
Received: by orion.dppl.com (Postfix, from userid 1001)
	id 021206432D91; Fri, 12 Sep 2008 21:19:00 -0400 (EDT)
Message-Id: <20080913011900.021206432D91@orion.dppl.com>
Date: Fri, 12 Sep 2008 21:19:00 -0400 (EDT)
From: Yarema <yds@CoolRat.org>
Reply-To: Yarema <yds@CoolRat.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: r.gruyters@yirdis.nl
Subject: [PATCH] security/libprelude update to 0.9.20.2
X-Send-Pr-Version: 3.113
X-GNATS-Notify: r.gruyters@yirdis.nl

>Number:         127339
>Category:       ports
>Synopsis:       [PATCH] security/libprelude update to 0.9.20.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    beech
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 13 01:20:01 UTC 2008
>Closed-Date:    Mon Sep 29 23:45:38 UTC 2008
>Last-Modified:  Mon Sep 29 23:50:00 UTC 2008
>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/libprelude from 0.9.17.2 to 0.9.20.2

delete files/patch-bindings_perl_Prelude.c

The remaining patch files rerolled though mostly the same.

MASTER_SITES changed from www.prelude-ids.org to www.prelude-ids.com

Fixed PLIST:
new header file
lib version now 17 instead of 14.
Perl and Python binding install new files.
>How-To-Repeat:
>Fix:
diff -u -r -N libprelude-0.9.17.2/Makefile libprelude/Makefile
--- libprelude-0.9.17.2/Makefile	2008-08-21 03:43:09.000000000 -0400
+++ libprelude/Makefile	2008-09-12 20:05:53.191823797 -0400
@@ -4,11 +4,10 @@
 # $FreeBSD: ports/security/libprelude/Makefile,v 1.54 2008/08/21 06:18:17 rafan Exp $
 
 PORTNAME=	libprelude
-PORTVERSION=	0.9.17.2
-PORTREVISION=	1
+PORTVERSION=	0.9.20.2
 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 Prelude NIDS
@@ -40,7 +39,7 @@
 USE_PYTHON=		2.3+
 .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 "
diff -u -r -N libprelude-0.9.17.2/distinfo libprelude/distinfo
--- libprelude-0.9.17.2/distinfo	2008-05-14 04:11:24.000000000 -0400
+++ libprelude/distinfo	2008-09-12 12:58:57.836283749 -0400
@@ -1,3 +1,3 @@
-MD5 (libprelude-0.9.17.2.tar.gz) = 7c769293b4d79be2667993b8a88d42ac
-SHA256 (libprelude-0.9.17.2.tar.gz) = ba6caef5ba1df76a1c6989d71dbcd6f6cc373716e308f5d1b9389e47e302dfc9
-SIZE (libprelude-0.9.17.2.tar.gz) = 2031211
+MD5 (libprelude-0.9.20.2.tar.gz) = 4980065cc9fc7f8d6f0ca25e902b745d
+SHA256 (libprelude-0.9.20.2.tar.gz) = e6df8831fe9b8f12bd12cac92ac2a891b4dfaefedbb4e8c703a696272e188e06
+SIZE (libprelude-0.9.20.2.tar.gz) = 2407849
diff -u -r -N libprelude-0.9.17.2/files/patch-Makefile.in libprelude/files/patch-Makefile.in
--- libprelude-0.9.17.2/files/patch-Makefile.in	2008-05-14 04:11:24.000000000 -0400
+++ libprelude/files/patch-Makefile.in	2008-09-09 04:55:27.000000000 -0400
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2008-04-28 13:30:22.000000000 +0200
-+++ Makefile.in	2008-05-05 08:52:48.000000000 +0200
-@@ -1103,61 +1103,10 @@
+--- Makefile.in.orig	2008-09-09 04:55:27.000000000 -0400
++++ Makefile.in	2008-09-09 04:55:27.000000000 -0400
+@@ -1174,61 +1174,10 @@
  	$(INSTALL) -d -m 755 $(DESTDIR)$(PRELUDE_CONFIG_DIR);
  	$(INSTALL) -d -m 755 $(DESTDIR)$(PRELUDE_CONFIG_DIR)/default;
  	$(INSTALL) -d -m 711 $(DESTDIR)$(PRELUDE_CONFIG_DIR)/profile;
diff -u -r -N libprelude-0.9.17.2/files/patch-bindings_perl_Prelude.c libprelude/files/patch-bindings_perl_Prelude.c
--- libprelude-0.9.17.2/files/patch-bindings_perl_Prelude.c	2006-12-22 04:19:37.000000000 -0500
+++ libprelude/files/patch-bindings_perl_Prelude.c	1969-12-31 19:00:00.000000000 -0500
@@ -1,14 +0,0 @@
---- bindings/perl/Prelude.c.orig	Sat Dec 16 10:04:05 2006
-+++ bindings/perl/Prelude.c	Thu Dec 21 11:02:42 2006
-@@ -15,6 +15,11 @@
-  *  declarations/attributes, and other compiler dependent labels.
-  * ----------------------------------------------------------------------------- */
- 
-+/* workaround to build with perl-5.005 */
-+#ifndef INT2PTR
-+#  define INT2PTR(type, pointer) (type)(pointer)
-+#endif
-+
- /* template workaround for compilers that cannot correctly implement the C++ standard */
- #ifndef SWIGTEMPLATEDISAMBIGUATOR
- # if defined(__SUNPRO_CC)
diff -u -r -N libprelude-0.9.17.2/files/patch-libmissing_Makefile.in libprelude/files/patch-libmissing_Makefile.in
--- libprelude-0.9.17.2/files/patch-libmissing_Makefile.in	2007-02-22 11:26:26.000000000 -0500
+++ libprelude/files/patch-libmissing_Makefile.in	2008-09-09 04:55:25.000000000 -0400
@@ -1,25 +1,25 @@
---- libmissing/Makefile.in.orig	Tue Feb 20 14:15:54 2007
-+++ libmissing/Makefile.in	Thu Feb 22 15:27:37 2007
-@@ -447,7 +447,7 @@
- 	sys/time.h sys/time.h-t time.h time.h-t wchar.h wchar.h-t \
- 	wctype.h wctype.h-t
+--- libmissing/Makefile.in.orig	2008-09-09 04:55:25.000000000 -0400
++++ libmissing/Makefile.in	2008-09-09 04:55:25.000000000 -0400
+@@ -686,7 +686,7 @@
+ 	sys/time.h-t time.h time.h-t unistd.h unistd.h-t wchar.h \
+ 	wchar.h-t wctype.h wctype.h-t
  MOSTLYCLEANDIRS = arpa netinet sys sys
 -CLEANFILES = configmake.h configmake.h-t charset.alias ref-add.sed \
 +CLEANFILES = configmake.h configmake.h-t ref-add.sed \
  	ref-del.sed
  DISTCLEANFILES = 
  MAINTAINERCLEANFILES = 
-@@ -465,8 +465,6 @@
- 	printf-args.c printf-parse.c vasnprintf.c vsnprintf.c
+@@ -709,8 +709,6 @@
+ 	vsnprintf.c
  libmissing_la_LDFLAGS = $(AM_LDFLAGS)
  LINK_WARNING_H = $(top_srcdir)/./link-warning.h
 -charset_alias = $(DESTDIR)$(libdir)/charset.alias
 -charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
  all: $(BUILT_SOURCES)
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
-@@ -833,44 +831,6 @@
- 	} | sed '/""/d' > $@-t
+@@ -1247,44 +1245,6 @@
+ 	} > $@-t
  	mv $@-t $@
  
 -# We need the following in order to install a simple file in $(libdir)
diff -u -r -N libprelude-0.9.17.2/pkg-plist libprelude/pkg-plist
--- libprelude-0.9.17.2/pkg-plist	2008-05-14 04:11:24.000000000 -0400
+++ libprelude/pkg-plist	2008-09-12 19:47:25.008388990 -0400
@@ -21,6 +21,7 @@
 include/libprelude/idmef-criteria.h
 include/libprelude/idmef-criterion-value.h
 include/libprelude/idmef-data.h
+include/libprelude/idmef-message-helpers.h
 include/libprelude/idmef-message-id.h
 include/libprelude/idmef-message-print.h
 include/libprelude/idmef-message-read.h
@@ -61,13 +62,19 @@
 include/libprelude/variable.h
 lib/libprelude.la
 lib/libprelude.so
-lib/libprelude.so.14
+lib/libprelude.so.17
 %%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_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/PreludeEasy.pm
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy/.packlist
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy/PreludeEasy.bs
+%%WITH_PERL%%%%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy/PreludeEasy.so
+%%WITH_PERL%%@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/PreludeEasy
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/_prelude.so
+%%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude-0.0.0-py%%PYTHON_VER%%.egg-info
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.py
 %%WITH_PYTHON%%%%PYTHON_SITELIBDIR%%/prelude.pyc
 share/aclocal/libprelude.m4
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->beech 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Sep 13 01:20:12 UTC 2008 
Responsible-Changed-Why:  
beech@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=127339 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Sat Sep 13 01:20:15 UTC 2008 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: r.gruyters@yirdis.nl
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/127339: [PATCH] security/libprelude update to 0.9.20.2
Date: Sat, 13 Sep 2008 01:20:14 UT

 Maintainer of security/libprelude,
 
 Please note that PR ports/127339 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/127339
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
State-Changed-From-To: feedback->closed 
State-Changed-By: beech 
State-Changed-When: Mon Sep 29 23:45:08 UTC 2008 
State-Changed-Why:  
Committed (maintainer timeout), Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/127339: commit references a PR
Date: Mon, 29 Sep 2008 23:45:00 +0000 (UTC)

 beech       2008-09-29 23:44:51 UTC
 
   FreeBSD ports repository
 
   Modified files:
     security/libprelude  Makefile distinfo pkg-plist 
     security/libprelude/files patch-Makefile.in 
                               patch-libmissing_Makefile.in 
   Removed files:
     security/libprelude/files patch-bindings_perl_Prelude.c 
   Log:
   - Update to 0.9.20.2
   - Fix master sites
   - Fix portdocs handling
   - Perl and Python binding install new files
   
   PR:             ports/127339
   Submitted by:   Yarema <yds@CoolRat.org>
   Approved by:    maintainer timeout (> two weeks)
   
   Revision  Changes    Path
   1.55      +11 -10    ports/security/libprelude/Makefile
   1.30      +3 -3      ports/security/libprelude/distinfo
   1.12      +3 -3      ports/security/libprelude/files/patch-Makefile.in
   1.3       +0 -14     ports/security/libprelude/files/patch-bindings_perl_Prelude.c (dead)
   1.2       +10 -10    ports/security/libprelude/files/patch-libmissing_Makefile.in
   1.23      +9 -53     ports/security/libprelude/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:
