Update to 0.9.15.1. Changes:

- Fix build error on system that use native awk implementation in place of GNU awk
  (Pierre Chifflier <chifflier at inl.fr>), fix #256.
- Avoid a prelude-string fatal assertion, by denying copy/cloning of an empty
  prelude-string.
- Correction to the 'prelude-admin send' help message.
- Convert prelude-string to use prelude_return_if_fail() in place of prelude_log().

6 files changed, 118 insertions, 187 deletions

diff --git a/security/libprelude/Makefile b/security/libprelude/Makefile
index 6259ad95cb3..438f2f496a1 100644
--- a/security/libprelude/Makefile
+++ b/security/libprelude/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.23 2007/07/04 20:54:57 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2007/09/03 13:43:40 shannonjr Exp $
 #
-DISTNAME=		libprelude-0.9.14
-PKGREVISION=		1
+DISTNAME=		libprelude-0.9.15.1
 CATEGORIES=		security
 MASTER_SITES=		http://www.prelude-ids.org/download/releases/ \
 			http://www.prelude-ids.org/download/releases/old/
@@ -39,10 +38,17 @@ PKG_USERS=	${PRELUDE_USER}:${PRELUDE_GROUP}
 PKG_GECOS.${PRELUDE_USER}=	Prelude IDS
 PKG_HOME.${PRELUDE_USER}=	${PRELUDE_HOME}
 
-CONF_FILES+=	${PREFIX}/share/examples/libprelude/client.conf ${PKG_SYSCONFDIR}/client.conf
-CONF_FILES+=	${PREFIX}/share/examples/libprelude/global.conf ${PKG_SYSCONFDIR}/global.conf
-CONF_FILES+=	${PREFIX}/share/examples/libprelude/idmef-client.conf ${PKG_SYSCONFDIR}/idmef-client.conf
-CONF_FILES+=	${PREFIX}/share/examples/libprelude/tls.conf ${PKG_SYSCONFDIR}/tls.conf
+REQD_DIRS=	${PREFIX}/share/examples/libprelude
+
+CONF_FILES+=	${PREFIX}/share/examples/libprelude/client.conf ${PKG_SYSCONFDIR}/default/client.conf
+CONF_FILES+=	${PREFIX}/share/examples/libprelude/global.conf ${PKG_SYSCONFDIR}/default/global.conf
+CONF_FILES+=	${PREFIX}/share/examples/libprelude/idmef-client.conf ${PKG_SYSCONFDIR}/default/idmef-client.conf
+CONF_FILES+=	${PREFIX}/share/examples/libprelude/tls.conf ${PKG_SYSCONFDIR}/default/tls.conf
+
+SUBST_CLASSES+=		make
+SUBST_STAGE.make=	post-patch
+SUBST_FILES.make=	Makefile.in
+SUBST_SED.make=		-e 's,@EGDIR@,${EGDIR},g'
 
 post-install:
 	chown -R ${PRELUDE_USER}:${PRELUDE_GROUP} ${PRELUDE_HOME}
diff --git a/security/libprelude/PLIST b/security/libprelude/PLIST
index 34fe2008fd6..28e819a32b1 100644
--- a/security/libprelude/PLIST
+++ b/security/libprelude/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2006/08/31 13:04:54 rillig Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/09/03 13:43:40 shannonjr Exp $
 bin/libprelude-config
 bin/prelude-adduser
+bin/prelude-admin
 include/libprelude/common.h
 include/libprelude/daemonize.h
 include/libprelude/idmef-additional-data.h
@@ -98,10 +99,7 @@ share/doc/libprelude/pt04.html
 share/doc/libprelude/right.png
 share/doc/libprelude/style.css
 share/doc/libprelude/up.png
-share/examples/libprelude/client.conf
-share/examples/libprelude/global.conf
-share/examples/libprelude/idmef-client.conf
-share/examples/libprelude/tls.conf
+man/man1/prelude-admin.1
 @dirrm share/examples/libprelude
 @dirrm share/doc/libprelude
 @dirrm include/libprelude
diff --git a/security/libprelude/distinfo b/security/libprelude/distinfo
index c4a0485176a..a653ca01bc5 100644
--- a/security/libprelude/distinfo
+++ b/security/libprelude/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.16 2007/05/15 22:40:19 shannonjr Exp $
+$NetBSD: distinfo,v 1.17 2007/09/03 13:43:40 shannonjr Exp $
 
-SHA1 (libprelude-0.9.14.tar.gz) = f85e5dabd8126caf9b64f2cfa27f6b28421c7177
-RMD160 (libprelude-0.9.14.tar.gz) = ee24c059516707b7fa1d4b37a40ca4f609c8edb5
-Size (libprelude-0.9.14.tar.gz) = 1906090 bytes
-SHA1 (patch-aa) = ca8c7f90e08de29f07ba083a91e3cbe59397e72f
-SHA1 (patch-ab) = 592f42a6d9217c502eb49e8fb0ba7d17a49f2ada
-SHA1 (patch-ac) = 9cb75b90f961fd75faca146881d70262a3cf7d1c
+SHA1 (libprelude-0.9.15.1.tar.gz) = a464ae21e412cecfbc60cd132f4cbcbb6a78d4b7
+RMD160 (libprelude-0.9.15.1.tar.gz) = 12d26f8d133d606e7cef39fdf188e566999f26af
+Size (libprelude-0.9.15.1.tar.gz) = 1944953 bytes
+SHA1 (patch-aa) = 3b668aeed553ce54baf9dd50da1fa71331ff7be7
+SHA1 (patch-ab) = 3fa1b01b728cd1210cf22717e2f6c81a3d3b70cc
diff --git a/security/libprelude/patches/patch-aa b/security/libprelude/patches/patch-aa
index e0118f8e181..5aca74292d1 100644
--- a/security/libprelude/patches/patch-aa
+++ b/security/libprelude/patches/patch-aa
@@ -1,80 +1,91 @@
-$NetBSD: patch-aa,v 1.2 2007/02/20 15:13:03 shannonjr Exp $
+$NetBSD: patch-aa,v 1.3 2007/09/03 13:43:40 shannonjr Exp $
 
---- prelude-adduser/prelude-adduser.c.orig	2007-02-20 08:04:42.000000000 -0700
-+++ prelude-adduser/prelude-adduser.c
-@@ -56,6 +56,8 @@
- #include <gnutls/x509.h>
- #include <gnutls/extra.h>
+--- Makefile.in.orig	2007-08-29 04:18:17.000000000 -0600
++++ Makefile.in
+@@ -490,7 +490,7 @@ libexecdir = @libexecdir@
+ libprelude_cflags = @libprelude_cflags@
+ libprelude_libs = @libprelude_libs@
+ libprelude_soname = @libprelude_soname@
+-localedir = @localedir@
++localedir = @prefix@/share/locale
+ localstatedir = @localstatedir@
+ mandir = @mandir@
+ mkdir_p = @mkdir_p@
+@@ -1034,64 +1034,19 @@ prelude-config.h: $(top_builddir)/config
+ # Spool directory for report saving is mode 
  
-+#include <fts.h>
-+
- #include "common.h"
- #include "config-engine.h"
- #include "prelude.h"
-@@ -896,6 +898,66 @@ static int add_analyzer(const char *name
- }
+ install-data-local:
+-	$(INSTALL) -d -m 711 $(DESTDIR)$(prelude_spool_dir);
+-	$(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;
+-	@if test -f $(DESTDIR)$(prelude_config_dir)/default/client.conf; then							\
+-		echo;														\
+-		echo "********************************************************************************";          		\
+-                echo;														\
+-                echo "$(DESTDIR)$(prelude_config_dir)/default/client.conf already exist...";					\
+-                echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist";		\
+-                echo;														\
+-                echo "********************************************************************************";			\
+-		echo;														\
+-		$(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist;		\
+-        else															\
+-                $(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default;				\
+-        fi
+-
+-	@if test -f $(DESTDIR)$(prelude_config_dir)/default/global.conf; then							\
+-		echo;														\
+-		echo "********************************************************************************";          		\
+-                echo;														\
+-                echo "$(DESTDIR)$(prelude_config_dir)/default/global.conf already exist...";					\
+-                echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist";		\
+-                echo;														\
+-                echo "********************************************************************************";			\
+-		echo;														\
+-		$(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist;		\
+-        else															\
+-                $(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default;				\
+-        fi															
+-
+-	@if test -f $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf; then						\
+-		echo;														\
+-		echo "********************************************************************************";          		\
+-                echo;														\
+-                echo "$(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf already exist...";				\
+-                echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist";	\
+-                echo;														\
+-                echo "********************************************************************************";			\
+-		echo;														\
+-		$(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist; \
+-        else															\
+-                $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default;			\
+-        fi
+-
+-	@if test -f $(DESTDIR)$(prelude_config_dir)/default/tls.conf; then							\
+-		echo;														\
+-		echo "********************************************************************************";          		\
+-                echo;														\
+-                echo "$(DESTDIR)$(prelude_config_dir)/default/tls.conf already exist...";					\
+-                echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist";		\
+-                echo;														\
+-                echo "********************************************************************************";			\
+-		echo;														\
+-		$(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist;			\
+-        else															\
+-                $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default;				\
++	$(INSTALL) -d -m 711 $(DESTDIR)$(prelude_spool_dir)
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prelude_config_dir)
++	$(BSD_INSTALL_DATA_DIR)  $(DESTDIR)$(prelude_config_dir)/default
++	$(INSTALL) -d -m 711 $(DESTDIR)$(prelude_config_dir)/profile
++	$(BSD_INSTALL_DATA) $(top_srcdir)/client.conf /
++	$(BSD_INSTALL_DATA) $(top_srcdir)/global.conf /
++	$(BSD_INSTALL_DATA) $(top_srcdir)/idmef-client.conf /
++	$(BSD_INSTALL_DATA) $(top_srcdir)/tls.conf /
++	@if ! test -f $(configdir)/prelude-pflogger.conf; then						\
++	$(BSD_INSTALL_DATA) $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default/;		\
++	$(BSD_INSTALL_DATA) $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default/;		\
++	$(BSD_INSTALL_DATA) $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default/;	\
++	$(BSD_INSTALL_DATA) $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default/;		\
+ 	fi
  
- 
-+int
-+ftw(const char *path, int (*fn)(const char *, const struct stat *, int),
-+    int nfds)
-+{
-+	char * const paths[2] = { (char *)path, NULL };
-+	FTSENT *cur;
-+	FTS *ftsp;
-+	int error = 0, fnflag, sverrno;
-+
-+	/* XXX - nfds is currently unused */
-+	if (nfds < 1 || nfds > OPEN_MAX) {
-+		errno = EINVAL;
-+		return (-1);
-+	}
-+
-+	ftsp = fts_open(paths, FTS_LOGICAL | FTS_COMFOLLOW | FTS_NOCHDIR, NULL);
-+	if (ftsp == NULL)
-+		return (-1);
-+	while ((cur = fts_read(ftsp)) != NULL) {
-+		switch (cur->fts_info) {
-+		case FTS_D:
-+			fnflag = FTW_D;
-+			break;
-+		case FTS_DNR:
-+			fnflag = FTW_DNR;
-+			break;
-+		case FTS_DP:
-+			/* we only visit in preorder */
-+			continue;
-+		case FTS_F:
-+		case FTS_DEFAULT:
-+			fnflag = FTW_F;
-+			break;
-+		case FTS_NS:
-+		case FTS_NSOK:
-+		case FTS_SLNONE:
-+			fnflag = FTW_NS;
-+			break;
-+		case FTS_SL:
-+			fnflag = FTW_SL;
-+			break;
-+		case FTS_DC:
-+			errno = ELOOP;
-+			/* FALLTHROUGH */
-+		default:
-+			error = -1;
-+			goto done;
-+		}
-+		error = fn(cur->fts_path, cur->fts_statp, fnflag);
-+		if (error != 0)
-+			break;
-+	}
-+done:
-+	sverrno = errno;
-+	if (fts_close(ftsp) != 0 && error == 0)
-+		error = -1;
-+	else
-+		errno = sverrno;
-+	return (error);
-+}
- 
- static int add_cmd(int argc, char **argv)
- {
+ uninstall-local:
diff --git a/security/libprelude/patches/patch-ab b/security/libprelude/patches/patch-ab
index 9325f98abf3..36b480c5202 100644
--- a/security/libprelude/patches/patch-ab
+++ b/security/libprelude/patches/patch-ab
@@ -1,16 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/01/29 15:54:04 shannonjr Exp $
---- src/tls-auth.c.orig	Mon Jul 25 15:58:08 2005
-+++ src/tls-auth.c	Mon Aug 15 12:38:00 2005
-@@ -165,6 +165,7 @@ int tls_auth_connection(prelude_client_p
- 	int ret, fd;
+$NetBSD: patch-ab,v 1.2 2007/09/03 13:43:40 shannonjr Exp $
+
+--- src/tls-auth.c.orig	2007-08-23 10:25:39.000000000 -0600
++++ src/tls-auth.c
+@@ -189,6 +189,7 @@ int tls_auth_connection(prelude_client_p
+         int ret, fd;
          void *cred;
          gnutls_session session;
 +	int cipher_list[2];
  
          ret = prelude_client_profile_get_credentials(cp, &cred);
          if ( ret < 0 )
-@@ -172,6 +173,9 @@ int tls_auth_connection(prelude_client_p
-         
+@@ -196,6 +197,9 @@ int tls_auth_connection(prelude_client_p
+ 
          gnutls_init(&session, GNUTLS_CLIENT);
          gnutls_set_default_priority(session);
 +	cipher_list[0] = GNUTLS_CIPHER_AES_128_CBC;
diff --git a/security/libprelude/patches/patch-ac b/security/libprelude/patches/patch-ac
deleted file mode 100644
index 663f5c1625a..00000000000
--- a/security/libprelude/patches/patch-ac
+++ /dev/null
@@ -1,84 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2006/08/17 11:31:40 shannonjr Exp $
-
---- Makefile.in.orig	2006-07-25 05:58:26.000000000 -0600
-+++ Makefile.in
-@@ -304,7 +304,7 @@ oldincludedir = @oldincludedir@
- pdfdir = @pdfdir@
- prefix = @prefix@
- prelude_adduser_libs = @prelude_adduser_libs@
--prelude_config_dir = @prelude_config_dir@
-+prelude_config_dir = $(prefix)/share/examples/libprelude
- prelude_ident_file = @prelude_ident_file@
- prelude_spool_dir = @prelude_spool_dir@
- program_transform_name = @program_transform_name@
-@@ -839,64 +839,12 @@ prelude-config.h: $(top_builddir)/config
- 
- install-data-local:
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(prelude_spool_dir);
--	$(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir);
--	$(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir)/default;
--	$(INSTALL) -d -m 755 $(DESTDIR)$(prelude_config_dir)/profile;
--	@if test -f $(DESTDIR)$(prelude_config_dir)/default/client.conf; then							\
--		echo;														\
--		echo "********************************************************************************";          		\
--                echo;														\
--                echo "$(DESTDIR)$(prelude_config_dir)/default/client.conf already exist...";					\
--                echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist";		\
--                echo;														\
--                echo "********************************************************************************";			\
--		echo;														\
--		$(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist;		\
--        else															\
--                $(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default;				\
--        fi
--
--	@if test -f $(DESTDIR)$(prelude_config_dir)/default/global.conf; then							\
--		echo;														\
--		echo "********************************************************************************";          		\
--                echo;														\
--                echo "$(DESTDIR)$(prelude_config_dir)/default/global.conf already exist...";					\
--                echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist";		\
--                echo;														\
--                echo "********************************************************************************";			\
--		echo;														\
--		$(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist;		\
--        else															\
--                $(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default;				\
--        fi															
--
--	@if test -f $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf; then						\
--		echo;														\
--		echo "********************************************************************************";          		\
--                echo;														\
--                echo "$(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf already exist...";				\
--                echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist";	\
--                echo;														\
--                echo "********************************************************************************";			\
--		echo;														\
--		$(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist; \
--        else															\
--                $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default;			\
--        fi
--
--	@if test -f $(DESTDIR)$(prelude_config_dir)/default/tls.conf; then							\
--		echo;														\
--		echo "********************************************************************************";          		\
--                echo;														\
--                echo "$(DESTDIR)$(prelude_config_dir)/default/tls.conf already exist...";					\
--                echo "Installing default configuration in $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist";		\
--                echo;														\
--                echo "********************************************************************************";			\
--		echo;														\
--		$(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist;			\
--        else															\
--                $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default;				\
--	fi
-+	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prelude_config_dir);
-+	$(BSD_INSTALL_DATA) $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)
-+	$(BSD_INSTALL_DATA) $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)
-+	$(BSD_INSTALL_DATA) $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)
-+	$(BSD_INSTALL_DATA) $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)
-+	$(BSD_INSTALL_DATA) $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(prelude_config_dir)/default/client.conf