Use config file framework.

4 files changed, 89 insertions, 28 deletions

diff --git a/security/prelude-lml/Makefile b/security/prelude-lml/Makefile
index deb415e7b2a..c73bdefe577 100644
--- a/security/prelude-lml/Makefile
+++ b/security/prelude-lml/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2006/04/23 00:12:42 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2006/05/20 19:12:32 joerg Exp $
 #
 
 DISTNAME=		prelude-lml-0.9.4
+PKGREVISION=		1
 CATEGORIES=		security
 MASTER_SITES=		http://www.prelude-ids.org/download/releases/
 
@@ -44,6 +45,26 @@ SUBST_FILES.code=       run-prelude-lml.c
 SUBST_SED.code=         -e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.code+=        -e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
 
+PKG_SYSCONFSUBDIR=	prelude-lml
+EGDIR=		share/examples/prelude-lml/
+CONF_FILES_PERM+=	${EGDIR}/plugins.rules ${PKG_SYSCONFDIR}/plugins.rules \
+			${ROOT_USER} ${ROOT_GROUP} 0600
+CONF_FILES_PERM+=	${EGDIR}/prelude-lml.conf ${PKG_SYSCONFDIR}/prelude-lml.conf \
+			${ROOT_USER} ${ROOT_GROUP} 0600
+.for f in apc-emu.rules arbor.rules arpwatch.rules checkpoint.rules \
+	cisco-pix.rules cisco-router.rules cisco-vpn.rules clamav.rules \
+	dell-om.rules f5-bigip.rules grsecurity.rules honeyd.rules \
+	httpd.rules ipchains.rules ipfw.rules ipso.rules linksys-wap11.rules \
+	modsecurity.rules ms-sql.rules nagios.rules navce.rules \
+	netapp-ontap.rules netfilter.rules netscreen.rules ntsyslog.rules \
+	openhostapd.rules pam.rules pcanywhere.rules pcre.rules \
+	portsentry.rules postfix.rules proftpd.rules qpopper.rules \
+	selinux.rules sendmail.rules shadow-utils.rules single.rules \
+	squid.rules ssh.rules sudo.rules tripwire.rules vigor.rules \
+	vpopmail.rules webmin.rules wu-ftp.rules zywall.rules zyxel.rules
+CONF_FILES+=	${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
+.endfor
+
 pre-patch:
 	${CP} ${FILESDIR}/run-prelude-lml.c ${WRKSRC}
 
@@ -52,7 +73,6 @@ post-build:
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/run-prelude-lml ${PREFIX}/sbin/run-prelude-lml
-	${CHMOD} 755 ${PKG_SYSCONFDIR}/prelude-lml
 	${CHOWN} -R ${PRELUDE_USER}:${PRELUDE_GROUP} ${PRELUDE_HOME}
 
 .include "../../security/libprelude/buildlink3.mk"
diff --git a/security/prelude-lml/PLIST b/security/prelude-lml/PLIST
index 6f916f8cbd8..b8cf3fda8a3 100644
--- a/security/prelude-lml/PLIST
+++ b/security/prelude-lml/PLIST
@@ -1,9 +1,59 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/01/29 15:56:42 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/05/20 19:12:32 joerg Exp $
 bin/prelude-lml
 include/prelude-lml/prelude-lml.h
 lib/prelude-lml/debug.la
 lib/prelude-lml/pcre.la
 sbin/run-prelude-lml
 share/examples/rc.d/preludelml
+share/examples/prelude-lml/plugins.rules
+share/examples/prelude-lml/prelude-lml.conf
+share/examples/prelude-lml/ruleset/apc-emu.rules
+share/examples/prelude-lml/ruleset/arbor.rules
+share/examples/prelude-lml/ruleset/arpwatch.rules
+share/examples/prelude-lml/ruleset/checkpoint.rules
+share/examples/prelude-lml/ruleset/cisco-pix.rules
+share/examples/prelude-lml/ruleset/cisco-router.rules
+share/examples/prelude-lml/ruleset/cisco-vpn.rules
+share/examples/prelude-lml/ruleset/clamav.rules
+share/examples/prelude-lml/ruleset/dell-om.rules
+share/examples/prelude-lml/ruleset/f5-bigip.rules
+share/examples/prelude-lml/ruleset/grsecurity.rules
+share/examples/prelude-lml/ruleset/honeyd.rules
+share/examples/prelude-lml/ruleset/httpd.rules
+share/examples/prelude-lml/ruleset/ipchains.rules
+share/examples/prelude-lml/ruleset/ipfw.rules
+share/examples/prelude-lml/ruleset/ipso.rules
+share/examples/prelude-lml/ruleset/linksys-wap11.rules
+share/examples/prelude-lml/ruleset/modsecurity.rules
+share/examples/prelude-lml/ruleset/ms-sql.rules
+share/examples/prelude-lml/ruleset/nagios.rules
+share/examples/prelude-lml/ruleset/navce.rules
+share/examples/prelude-lml/ruleset/netapp-ontap.rules
+share/examples/prelude-lml/ruleset/netfilter.rules
+share/examples/prelude-lml/ruleset/netscreen.rules
+share/examples/prelude-lml/ruleset/ntsyslog.rules
+share/examples/prelude-lml/ruleset/openhostapd.rules
+share/examples/prelude-lml/ruleset/pam.rules
+share/examples/prelude-lml/ruleset/pcanywhere.rules
+share/examples/prelude-lml/ruleset/pcre.rules
+share/examples/prelude-lml/ruleset/portsentry.rules
+share/examples/prelude-lml/ruleset/postfix.rules
+share/examples/prelude-lml/ruleset/proftpd.rules
+share/examples/prelude-lml/ruleset/qpopper.rules
+share/examples/prelude-lml/ruleset/selinux.rules
+share/examples/prelude-lml/ruleset/sendmail.rules
+share/examples/prelude-lml/ruleset/shadow-utils.rules
+share/examples/prelude-lml/ruleset/single.rules
+share/examples/prelude-lml/ruleset/squid.rules
+share/examples/prelude-lml/ruleset/ssh.rules
+share/examples/prelude-lml/ruleset/sudo.rules
+share/examples/prelude-lml/ruleset/tripwire.rules
+share/examples/prelude-lml/ruleset/vigor.rules
+share/examples/prelude-lml/ruleset/vpopmail.rules
+share/examples/prelude-lml/ruleset/webmin.rules
+share/examples/prelude-lml/ruleset/wu-ftp.rules
+share/examples/prelude-lml/ruleset/zywall.rules
+share/examples/prelude-lml/ruleset/zyxel.rules
+@dirrm share/examples/prelude-lml/ruleset
 @dirrm lib/prelude-lml
 @dirrm include/prelude-lml
diff --git a/security/prelude-lml/distinfo b/security/prelude-lml/distinfo
index 39cb61fd63b..dee50c9c73c 100644
--- a/security/prelude-lml/distinfo
+++ b/security/prelude-lml/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2006/03/10 22:49:37 shannonjr Exp $
+$NetBSD: distinfo,v 1.4 2006/05/20 19:12:32 joerg Exp $
 
 SHA1 (prelude-lml-0.9.4.tar.gz) = 8ca87f35d5966155dd224c40d75173cd4e68f808
 RMD160 (prelude-lml-0.9.4.tar.gz) = 2b6d0e7c228b71cdf20a436542bf15fafa1792f9
 Size (prelude-lml-0.9.4.tar.gz) = 537936 bytes
 SHA1 (patch-aa) = 6ed3c426d1b18ff748a3777527fbf0046caaf97f
-SHA1 (patch-ab) = df8bb7777d1938a167e4d27bf5a140e6d55e536b
+SHA1 (patch-ab) = 971e0360ff3732c2fc0e5fce33946d6060c54713
diff --git a/security/prelude-lml/patches/patch-ab b/security/prelude-lml/patches/patch-ab
index 6268f1c4b3b..2883ab1164f 100644
--- a/security/prelude-lml/patches/patch-ab
+++ b/security/prelude-lml/patches/patch-ab
@@ -1,51 +1,42 @@
-$NetBSD: patch-ab,v 1.1.1.1 2006/01/29 15:56:42 shannonjr Exp $
+$NetBSD: patch-ab,v 1.2 2006/05/20 19:12:32 joerg Exp $
 
---- Makefile.in.orig	2005-11-24 04:46:25.000000000 -0700
+--- Makefile.in.orig	2006-05-20 18:51:30.000000000 +0000
 +++ Makefile.in
-@@ -600,33 +600,33 @@ uninstall-info: uninstall-info-recursive
- 
+@@ -695,27 +695,27 @@ uninstall-info: uninstall-info-recursive
  
  install-data-local:
--	$(INSTALL) -m 700 -d $(DESTDIR)$(metadata_dir)
+ 	$(INSTALL) -m 700 -d $(DESTDIR)$(metadata_dir)
 -	@if test -f $(DESTDIR)$(configdir)/prelude-lml.conf; then         					\
-+	$(INSTALL) -m 700 -d $(metadata_dir)
-+	@if test -f $(configdir)/prelude-lml.conf; then         					\
++	@if test -f $(DESTDIR)$(prefix)/share/examples/prelude-lml/prelude-lml.conf; then         					\
  		echo "********************************************************************************"; 	\
                  echo;                                                                                    	\
 -                echo "$(DESTDIR)$(configdir)/prelude-lml.conf already exist...";				\
 -                echo "Installing default configuration in $(DESTDIR)$(configdir)/prelude-lml.conf-dist";        \
-+                echo "$(configdir)/prelude-lml.conf already exist...";				\
-+                echo "Installing default configuration in $(configdir)/prelude-lml.conf-dist";        \
++                echo "$(DESTDIR)$(prefix)/share/examples/prelude-lml/prelude-lml.conf already exist...";				\
++                echo "Installing default configuration in $(DESTDIR)$(prefix)/share/examples/prelude-lml/prelude-lml.conf-dist";        \
                  echo;                                                                                    	\
                  echo "********************************************************************************"; 	\
 -		$(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(configdir)/prelude-lml.conf-dist;  \
-+		$(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(configdir)/prelude-lml.conf-dist;  \
++		$(BSD_INSTALL_DATA) $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(prefix)/share/examples/prelude-lml/prelude-lml.conf-dist;  \
          else                                                                                             	\
 -                $(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(configdir)/;                       \
-+                $(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(configdir)/;                       \
++                $(BSD_INSTALL_DATA) $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(prefix)/share/examples/prelude-lml/;                       \
          fi
 -	@if test -f $(DESTDIR)$(configdir)/plugins.rules; then         					\
-+	@if test -f $(configdir)/plugins.rules; then         					\
++	@if test -f $(DESTDIR)$(prefix)/share/examples/prelude-lml/plugins.rules; then         					\
  		echo "********************************************************************************"; 	\
                  echo;                                                                                    	\
 -                echo "$(DESTDIR)$(configdir)/plugins.rules already exist...";					\
 -                echo "Installing default configuration in $(DESTDIR)$(configdir)/plugins.rules-dist";	        \
-+                echo "$(configdir)/plugins.rules already exist...";					\
-+                echo "Installing default configuration in $(configdir)/plugins.rules-dist";	        \
++                echo "$(DESTDIR)$(prefix)/share/examples/prelude-lml/plugins.rules already exist...";					\
++                echo "Installing default configuration in $(DESTDIR)$(prefix)/share/examples/prelude-lml/plugins.rules-dist";	        \
                  echo;                                                                                    	\
                  echo "********************************************************************************"; 	\
 -		$(INSTALL) -m 600 $(top_srcdir)/plugins.rules $(DESTDIR)$(configdir)/plugins.rules-dist;	\
-+		$(INSTALL) -m 600 $(top_srcdir)/plugins.rules $(configdir)/plugins.rules-dist;	\
++		$(BSD_INSTALL_DATA) $(top_srcdir)/plugins.rules $(DESTDIR)$(prefix)/share/examples/prelude-lml/plugins.rules-dist;	\
          else                                                                                             	\
 -		$(INSTALL) -m 600 $(top_srcdir)/plugins.rules $(DESTDIR)$(configdir)/;				\
-+		$(INSTALL) -m 600 $(top_srcdir)/plugins.rules $(configdir)/;				\
++		$(BSD_INSTALL_DATA) $(top_srcdir)/plugins.rules $(DESTDIR)$(prefix)/share/examples/prelude-lml/;				\
          fi
  
  uninstall-local:
--	rm -f $(DESTDIR)$(configdir)/prelude-lml.conf;	\
--	rm -f $(DESTDIR)$(configdir)/plugin.rules;
-+	rm -f $(configdir)/prelude-lml.conf;	\
-+	rm -f $(configdir)/plugin.rules;
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT: