ports/60020: [maintainer update] security/libprelude: update to 0.8.9 and chase shared library version

Clement LAFORET sheepkiller at cultdeadsheep.org
Sun Dec 7 18:30:22 UTC 2003 

>Number:         60020
>Category:       ports
>Synopsis:       [maintainer update] security/libprelude: update to 0.8.9 and chase shared library version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 07 10:30:16 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Clement Laforet
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
cotds.org
>Environment:
System: FreeBSD lucifer.cultdeadsheep.org 5.2-CURRENT FreeBSD 5.2-CURRENT #0: Sun Dec 7 15:41:23 GMT 2003 root at lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386

	
>Description:
	This patch is against libprelude, prelude-lml, prelude-manager and prelude-nids.

	libprelude:
		- update to 0.8.9
		- respect NOPORTDOCS
	prelude-lml:
		- chase shared library version: libprelude.0 -> libprelude.1
		- bump PORTREVISION
	prelude-manager:
		- chase shared library version: libprelude.0 -> libprelude.1
		- bump PORTREVISION
	prelude-nids:
		- chase shared library version: libprelude.0 -> libprelude.1
		- bump PORTREVISION
		- Fix build on -CURRENT (not always but sometimes...)
			Added files:
				- prelude-nids/files/patch-src::Makefile.in
				- prelude-nids/files/libpcap.diff

>How-To-Repeat:
	N/A.
>Fix:

	

--- prelude-suite.diff begins here ---
Index: libprelude/Makefile
===================================================================
RCS file: /SERVICES/cvs/FreeBSD/ports/security/libprelude/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- libprelude/Makefile	4 Nov 2003 03:05:25 -0000	1.4
+++ libprelude/Makefile	7 Dec 2003 18:10:38 -0000
@@ -4,7 +4,7 @@
 # $FreeBSD: ports/security/libprelude/Makefile,v 1.4 2003/11/04 03:05:25 foxfair Exp $
 
 PORTNAME=	libprelude
-PORTVERSION=	0.8.8
+PORTVERSION=	0.8.9
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/download/releases/
 
@@ -24,6 +24,10 @@
 USE_OPENSSL=		YES
 .endif
 
+.if defined(NOPORTDOCS)
+MAKE_ENV+=	NOPORTDOCS=yes
+.endif
+
 post-extract:
 	@${ECHO} ""
 	@${ECHO} "*------------------------------------------------------------------*"
@@ -32,9 +36,5 @@
 	@${ECHO} "      WITHOUT_SSL=yes         Disable SSL support in libprelude"
 	@${ECHO} "*------------------------------------------------------------------*"
 	@${ECHO} ""
-
-pre-configure:
-	@${REINPLACE_CMD} 's!\$(prefix)/libprelude/include!\$(prefix)/include/libprelude!' \
-			${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
Index: libprelude/distinfo
===================================================================
RCS file: /SERVICES/cvs/FreeBSD/ports/security/libprelude/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- libprelude/distinfo	4 Nov 2003 03:05:25 -0000	1.4
+++ libprelude/distinfo	7 Dec 2003 18:10:38 -0000
@@ -1 +1 @@
-MD5 (libprelude-0.8.8.tar.gz) = 985a823102ec34ac44fc566bc721a558
+MD5 (libprelude-0.8.9.tar.gz) = 079381f3a1d1ddcba5ea3be23319fd1e
Index: libprelude/pkg-plist
===================================================================
RCS file: /SERVICES/cvs/FreeBSD/ports/security/libprelude/pkg-plist,v
retrieving revision 1.3
diff -u -r1.3 pkg-plist
--- libprelude/pkg-plist	4 Nov 2003 03:05:25 -0000	1.3
+++ libprelude/pkg-plist	7 Dec 2003 18:10:38 -0000
@@ -35,50 +35,50 @@
 include/libprelude/extract.h
 include/libprelude/common.h
 include/libprelude/config.h
-lib/libprelude.so.0
+lib/libprelude.so.1
 lib/libprelude.so
 lib/libprelude.la
-%%DOCSDIR%%/c4.html
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/libprelude-prelude-io.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/libprelude-client-ident.html
-%%DOCSDIR%%/libprelude-common.html
-%%DOCSDIR%%/libprelude-config-engine.html
-%%DOCSDIR%%/libprelude-daemonize.html
-%%DOCSDIR%%/libprelude-extract.html
-%%DOCSDIR%%/libprelude-idmef-message-id.html
-%%DOCSDIR%%/libprelude-idmef-msg-send.html
-%%DOCSDIR%%/libprelude-idmef-tree-func.html
-%%DOCSDIR%%/libprelude-idmef-tree.html
-%%DOCSDIR%%/libprelude-list.html
-%%DOCSDIR%%/libprelude-plugin-common-prv.html
-%%DOCSDIR%%/libprelude-plugin-common.html
-%%DOCSDIR%%/libprelude-prelude-async.html
-%%DOCSDIR%%/libprelude-prelude-auth.html
-%%DOCSDIR%%/libprelude-prelude-client-mgr.html
-%%DOCSDIR%%/libprelude-prelude-client.html
-%%DOCSDIR%%/libprelude-prelude-getopt-wide.html
-%%DOCSDIR%%/libprelude-prelude-getopt.html
-%%DOCSDIR%%/libprelude-prelude-ident.html
-%%DOCSDIR%%/libprelude-prelude-inet.html
-%%DOCSDIR%%/libprelude-prelude-list.html
-%%DOCSDIR%%/libprelude-prelude-log.html
-%%DOCSDIR%%/libprelude-prelude-message-buffered.html
-%%DOCSDIR%%/libprelude-prelude-message-id.html
-%%DOCSDIR%%/libprelude-prelude-message.html
-%%DOCSDIR%%/libprelude-prelude-path.html
-%%DOCSDIR%%/libprelude-sensor.html
-%%DOCSDIR%%/libprelude-ssl-gencrypto.html
-%%DOCSDIR%%/libprelude-ssl-registration-msg.html
-%%DOCSDIR%%/libprelude-ssl-settings.html
-%%DOCSDIR%%/libprelude-ssl.html
-%%DOCSDIR%%/libprelude-threads.html
-%%DOCSDIR%%/libprelude-timer.html
-%%DOCSDIR%%/libprelude-variable.html
+%%PORTDOCS%%%%DOCSDIR%%/c4.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-io.html
+%%PORTDOCS%%%%DOCSDIR%%/index.sgml
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-client-ident.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-common.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-config-engine.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-daemonize.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-extract.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-message-id.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-msg-send.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-tree-func.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-idmef-tree.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-list.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-plugin-common-prv.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-plugin-common.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-async.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-auth.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-client-mgr.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-client.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-getopt-wide.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-getopt.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-ident.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-inet.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-list.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-log.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-message-buffered.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-message-id.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-message.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-prelude-path.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-sensor.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-ssl-gencrypto.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-ssl-registration-msg.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-ssl-settings.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-ssl.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-threads.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-timer.html
+%%PORTDOCS%%%%DOCSDIR%%/libprelude-variable.html
 @unexec rmdir %D/etc/prelude-sensors/ssl 2>/dev/null || true
 @unexec rmdir %D/etc/prelude-sensors/plaintext 2>/dev/null || true
 @unexec rmdir %D/etc/prelude-sensors 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/prelude-sensors`` to remove any configuration files left." | fmt
 @dirrm include/libprelude
- at dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rmdir /var/spool/prelude-sensors 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf /var/spool/prelude-sensors`` to remove any files left." | fmt
Index: libprelude/files/patch-Makefile.in
===================================================================
RCS file: /SERVICES/cvs/FreeBSD/ports/security/libprelude/files/patch-Makefile.in,v
retrieving revision 1.2
diff -u -r1.2 patch-Makefile.in
--- libprelude/files/patch-Makefile.in	26 Sep 2003 22:30:57 -0000	1.2
+++ libprelude/files/patch-Makefile.in	7 Dec 2003 18:10:38 -0000
@@ -1,6 +1,27 @@
---- Makefile.in.orig	Mon Sep 22 13:36:05 2003
-+++ Makefile.in	Mon Sep 22 13:35:14 2003
-@@ -633,17 +633,8 @@
+--- Makefile.in.orig	Sat Dec  6 04:52:56 2003
++++ Makefile.in	Sun Dec  7 18:00:01 2003
+@@ -130,7 +130,7 @@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ 
+-includedir = $(prefix)/libprelude/include
++includedir = $(prefix)/include/libprelude
+ infodir = @infodir@
+ install_sh = @install_sh@
+ libdir = @libdir@
+@@ -156,7 +156,11 @@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
++ifndef NOPORTDOCS
+ SUBDIRS = libltdl src sensor-adduser docs
++else
++SUBDIRS = libltdl src sensor-adduser
++endif
+ include_HEADERS = config.h
+ 
+ EXTRA_DIST = COPYING.OpenSSL sensors-default.conf
+@@ -635,17 +639,8 @@
  	$(INSTALL) -d -m 755 $(DESTDIR)$(sensors_config_dir);
  	$(INSTALL) -d -m 755 $(DESTDIR)$(sensors_config_dir)/ssl;
  	$(INSTALL) -d -m 755 $(DESTDIR)$(sensors_config_dir)/plaintext;
Index: prelude-lml/Makefile
===================================================================
RCS file: /SERVICES/cvs/FreeBSD/ports/security/prelude-lml/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- prelude-lml/Makefile	4 Nov 2003 03:06:36 -0000	1.4
+++ prelude-lml/Makefile	7 Dec 2003 18:10:38 -0000
@@ -6,13 +6,14 @@
 
 PORTNAME=	prelude-lml
 PORTVERSION=	0.8.6
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=   http://www.prelude-ids.org/download/releases/
 
 MAINTAINER=	sheepkiller at cultdeadsheep.org
 COMMENT=	Prelude Network Intrusion Detection System Log Monitoring Lackey
 
-LIB_DEPENDS+=	prelude.0:${PORTSDIR}/security/libprelude \
+LIB_DEPENDS+=	prelude.1:${PORTSDIR}/security/libprelude \
 		pcre.0:${PORTSDIR}/devel/pcre
 
 USE_GMAKE=		yes
Index: prelude-manager/Makefile
===================================================================
RCS file: /SERVICES/cvs/FreeBSD/ports/security/prelude-manager/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- prelude-manager/Makefile	4 Nov 2003 03:07:33 -0000	1.5
+++ prelude-manager/Makefile	7 Dec 2003 18:10:38 -0000
@@ -6,14 +6,15 @@
 
 PORTNAME=	prelude-manager
 PORTVERSION=	0.8.9
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.prelude-ids.org/download/releases/
 
 MAINTAINER=	sheepkiller at cultdeadsheep.org
 COMMENT=	Prelude Network Intrusion Detection System central logging point
 
-LIB_DEPENDS+=		prelude.0:${PORTSDIR}/security/libprelude \
-			xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS+=	prelude.1:${PORTSDIR}/security/libprelude \
+		xml2.5:${PORTSDIR}/textproc/libxml2
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
Index: prelude-nids/Makefile
===================================================================
RCS file: /SERVICES/cvs/FreeBSD/ports/security/prelude-nids/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- prelude-nids/Makefile	4 Nov 2003 03:08:31 -0000	1.4
+++ prelude-nids/Makefile	7 Dec 2003 18:10:38 -0000
@@ -6,13 +6,14 @@
 
 PORTNAME=	prelude-nids
 PORTVERSION=	0.8.5
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=   http://www.prelude-ids.org/download/releases/
 
 MAINTAINER=	sheepkiller at cultdeadsheep.org
 COMMENT=	Prelude Network Intrusion Detection System sensor
 
-LIB_DEPENDS=		prelude.0:${PORTSDIR}/security/libprelude
+LIB_DEPENDS=	prelude.1:${PORTSDIR}/security/libprelude
 
 USE_GMAKE=		yes
 USE_LIBTOOL=		yes
@@ -21,5 +22,8 @@
 			--program-prefix=""
 
 MAN8=			prelude-nids.8
+
+post-patch:
+	${CP} ${FILESDIR}/libpcap.diff ${WRKSRC}
 
 .include <bsd.port.mk>
Index: prelude-nids/files/libpcap.diff
===================================================================
RCS file: prelude-nids/files/libpcap.diff
diff -N prelude-nids/files/libpcap.diff
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ prelude-nids/files/libpcap.diff	7 Dec 2003 18:10:38 -0000
@@ -0,0 +1,11 @@
+--- libpcap/pcap-null.c.orig	Sun Dec  7 19:03:41 2003
++++ libpcap/pcap-null.c	Sun Dec  7 19:03:52 2003
+@@ -54,7 +54,7 @@
+ }
+ 
+ pcap_t *
+-pcap_open_live(char *device, int snaplen, int promisc, int to_ms, char *ebuf)
++pcap_open_live(const char *device, int snaplen, int promisc, int to_ms, char *ebuf)
+ {
+ 	(void)strlcpy(ebuf, nosup, PCAP_ERRBUF_SIZE);
+ 	return (NULL);
Index: prelude-nids/files/patch-src::Makefile.in
===================================================================
RCS file: prelude-nids/files/patch-src::Makefile.in
diff -N prelude-nids/files/patch-src::Makefile.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ prelude-nids/files/patch-src::Makefile.in	7 Dec 2003 18:10:38 -0000
@@ -0,0 +1,10 @@
+--- src/Makefile.in.orig	Sun Dec  7 19:04:39 2003
++++ src/Makefile.in	Sun Dec  7 19:05:27 2003
+@@ -640,6 +640,7 @@
+ libpcap-unpack: .libpcap-unpack
+ .libpcap-unpack: $(top_srcdir)/libpcap.tar
+ 	tar xf $(top_srcdir)/libpcap.tar
++	patch -p0 < $(top_srcdir)/libpcap.diff
+ 	@touch .libpcap-unpack
+ 
+ libpcap-configure: libpcap/Makefile
--- prelude-suite.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list