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 10 Dec 2003 11:45:05 -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.10 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 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 10 Dec 2003 11:45:05 -0000 @@ -1 +1 @@ -MD5 (libprelude-0.8.8.tar.gz) = 985a823102ec34ac44fc566bc721a558 +MD5 (libprelude-0.8.10.tar.gz) = 68171b170d1f8ad7e38f949391e6b227 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 10 Dec 2003 11:45:05 -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 -@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 10 Dec 2003 11:45:05 -0000 @@ -1,6 +1,29 @@ ---- 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 Tue Dec 9 04:08:29 2003 ++++ Makefile.in Tue Dec 9 22:42:59 2003 +@@ -65,7 +65,7 @@ + OBJEXT = @OBJEXT@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + +-includedir = $(prefix)/libprelude/include ++includedir = $(prefix)/include/libprelude + AMTAR = @AMTAR@ + AR = @AR@ + AS = @AS@ +@@ -108,9 +108,12 @@ + sensors_config_dir = @sensors_config_dir@ + sensors_ident_file = @sensors_ident_file@ + sensors_spool_dir = @sensors_spool_dir@ ++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 + bin_SCRIPTS = $(top_srcdir)/libprelude-config + subdir = . +@@ -522,17 +525,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 10 Dec 2003 11:45:05 -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@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 10 Dec 2003 11:45:05 -0000 @@ -5,15 +5,15 @@ # $FreeBSD: ports/security/prelude-manager/Makefile,v 1.5 2003/11/04 03:07:33 foxfair Exp $ PORTNAME= prelude-manager -PORTVERSION= 0.8.9 +PORTVERSION= 0.8.10 CATEGORIES= security MASTER_SITES= http://www.prelude-ids.org/download/releases/ MAINTAINER= sheepkiller@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 @@ -37,7 +37,7 @@ .endif .if defined(WITH_POSTGRES) -LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql7 +LIB_DEPENDS+= pq.3:${PORTSDIR}/databases/postgresql-client CONFIGURE_ARGS+= --enable-pgsql PLIST_SUB+= PGSQL="" .else Index: prelude-manager/distinfo =================================================================== RCS file: /SERVICES/cvs/FreeBSD/ports/security/prelude-manager/distinfo,v retrieving revision 1.3 diff -u -r1.3 distinfo --- prelude-manager/distinfo 4 Nov 2003 03:07:33 -0000 1.3 +++ prelude-manager/distinfo 10 Dec 2003 11:45:05 -0000 @@ -1 +1 @@ -MD5 (prelude-manager-0.8.9.tar.gz) = b236090f281c7fb6f8975391c382c448 +MD5 (prelude-manager-0.8.10.tar.gz) = 2cdd10740e8840978ad5a2b41d6e13e1 Index: prelude-manager/pkg-plist =================================================================== RCS file: /SERVICES/cvs/FreeBSD/ports/security/prelude-manager/pkg-plist,v retrieving revision 1.2 diff -u -r1.2 pkg-plist --- prelude-manager/pkg-plist 26 Sep 2003 22:30:58 -0000 1.2 +++ prelude-manager/pkg-plist 10 Dec 2003 11:45:05 -0000 @@ -49,6 +49,7 @@ %%DOCSDIR%%/prelude-manager-ssl.html @unexec rmdir %D/etc/prelude-manager 2>/dev/null || echo "If you are permanently removing this port, you should do a ``rm -rf ${PKG_PREFIX}/etc/prelude-manager`` to remove any configuration files left." | fmt @dirrm include/prelude-manager +@dirrm lib/prelude-manager/db @dirrm lib/prelude-manager/decodes @dirrm lib/prelude-manager/reports @dirrm lib/prelude-manager 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 10 Dec 2003 11:45:05 -0000 @@ -5,14 +5,14 @@ # $FreeBSD: ports/security/prelude-nids/Makefile,v 1.4 2003/11/04 03:08:31 foxfair Exp $ PORTNAME= prelude-nids -PORTVERSION= 0.8.5 +PORTVERSION= 0.8.6 CATEGORIES= security MASTER_SITES= http://www.prelude-ids.org/download/releases/ MAINTAINER= sheepkiller@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 +21,8 @@ --program-prefix="" MAN8= prelude-nids.8 + +post-patch: + ${CP} ${FILESDIR}/libpcap.diff ${WRKSRC} .include Index: prelude-nids/distinfo =================================================================== RCS file: /SERVICES/cvs/FreeBSD/ports/security/prelude-nids/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- prelude-nids/distinfo 4 Nov 2003 03:08:31 -0000 1.4 +++ prelude-nids/distinfo 10 Dec 2003 11:45:05 -0000 @@ -1 +1 @@ -MD5 (prelude-nids-0.8.5.tar.gz) = 02c6d7cbbbd57df4a16b3a3e1b80f20d +MD5 (prelude-nids-0.8.6.tar.gz) = 5be38d1cd8085c6a5555b4975ab81345 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 10 Dec 2003 11:45:05 -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 10 Dec 2003 11:45:05 -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