[pkgsrc/trunk]: pkgsrc/security/prelude-manager Use config file framework. Ke...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b4eaf37a75b7
branches:  trunk
changeset: 515229:b4eaf37a75b7
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Jun 28 17:05:50 2006 +0000

description:
Use config file framework. Keep the permission of the original code
for the installed version of the configuration file, but not the
example. Bump revision.

diffstat:

 security/prelude-manager/Makefile         |   9 +++++++--
 security/prelude-manager/PLIST            |   3 ++-
 security/prelude-manager/distinfo         |   3 ++-
 security/prelude-manager/patches/patch-ab |  28 ++++++++++++++++++++++++++++
 4 files changed, 39 insertions(+), 4 deletions(-)

diffs (94 lines):

diff -r 030285a7c64d -r b4eaf37a75b7 security/prelude-manager/Makefile
--- a/security/prelude-manager/Makefile Wed Jun 28 16:28:26 2006 +0000
+++ b/security/prelude-manager/Makefile Wed Jun 28 17:05:50 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2006/06/16 09:45:35 shannonjr Exp $
+# $NetBSD: Makefile,v 1.10 2006/06/28 17:05:50 joerg Exp $
 #
 
 DISTNAME=              prelude-manager-0.9.5
+PKGREVISION=           1
 CATEGORIES=            security
 MASTER_SITES=          http://www.prelude-ids.org/download/releases/
 
@@ -40,6 +41,11 @@
 SUBST_SED.code=         -e 's,@PREFIX@,${PREFIX},g'
 SUBST_SED.code+=        -e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
 
+PKG_SYSCONFSUBDIR=     prelude-manager
+EGDIR=         share/examples/prelude-manager/
+CONF_FILES_PERMS+=     ${EGDIR}/prelude-manager.conf ${PKG_SYSCONFDIR}/prelude-manager.conf \
+                       ${ROOT_USER} ${ROOT_GROUP} 0600
+
 pre-patch:
        ${CP} ${FILESDIR}/run-prelude-manager.c ${WRKSRC}
 
@@ -48,7 +54,6 @@
 
 post-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/run-prelude-manager ${PREFIX}/sbin/run-prelude-manager
-       ${CHMOD} 755 ${PKG_SYSCONFDIR}/prelude-manager
        ${CHOWN} -R ${PRELUDE_USER}:${PRELUDE_GROUP} ${PRELUDE_HOME}
 
 .include "../../security/libprelude/buildlink3.mk"
diff -r 030285a7c64d -r b4eaf37a75b7 security/prelude-manager/PLIST
--- a/security/prelude-manager/PLIST    Wed Jun 28 16:28:26 2006 +0000
+++ b/security/prelude-manager/PLIST    Wed Jun 28 17:05:50 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/06/16 09:45:35 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/06/28 17:05:50 joerg Exp $
 bin/prelude-manager
 include/prelude-manager/prelude-manager.h
 lib/prelude-manager/decodes/normalize.la
@@ -8,6 +8,7 @@
 lib/prelude-manager/reports/relaying.la
 lib/prelude-manager/reports/textmod.la
 sbin/run-prelude-manager
+share/examples/prelude-manager/prelude-manager.conf
 share/examples/rc.d/preludemanager
 @dirrm lib/prelude-manager/reports
 @dirrm lib/prelude-manager/filters
diff -r 030285a7c64d -r b4eaf37a75b7 security/prelude-manager/distinfo
--- a/security/prelude-manager/distinfo Wed Jun 28 16:28:26 2006 +0000
+++ b/security/prelude-manager/distinfo Wed Jun 28 17:05:50 2006 +0000
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2006/06/16 09:45:35 shannonjr Exp $
+$NetBSD: distinfo,v 1.7 2006/06/28 17:05:50 joerg Exp $
 
 SHA1 (prelude-manager-0.9.5.tar.gz) = 0874a055c11f55c16f434dfe45ee17c366e76027
 RMD160 (prelude-manager-0.9.5.tar.gz) = 0a033835b614c184af261251206012cc43604009
 Size (prelude-manager-0.9.5.tar.gz) = 575260 bytes
 SHA1 (patch-aa) = 250034ddeba5188895a6d873ce108b1bf33dfcc5
+SHA1 (patch-ab) = 583290685c9e1ab648ab27ccbf8242a538ea5989
diff -r 030285a7c64d -r b4eaf37a75b7 security/prelude-manager/patches/patch-ab
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/prelude-manager/patches/patch-ab Wed Jun 28 17:05:50 2006 +0000
@@ -0,0 +1,28 @@
+$NetBSD: patch-ab,v 1.1 2006/06/28 17:05:50 joerg Exp $
+
+--- Makefile.in.orig   2006-06-14 08:47:37.000000000 +0000
++++ Makefile.in
+@@ -704,21 +704,11 @@ uninstall-info: uninstall-info-recursive
+ 
+ 
+ install-data-local:
+-      $(INSTALL) -d -m 700 $(DESTDIR)$(configdir);
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(prefix)/share/examples/prelude-manager;
+       $(INSTALL) -d -m 700 $(DESTDIR)$(manager_run_dir);
+       $(INSTALL) -d -m 700 $(DESTDIR)$(manager_scheduler_dir);
+       $(INSTALL) -d -m 700 $(DESTDIR)$(manager_failover_dir);
+-      @if test -f $(DESTDIR)$(configdir)/prelude-manager.conf; then                                                  \
+-              $(INSTALL) -m 600 $(top_srcdir)/prelude-manager.conf $(DESTDIR)$(configdir)/prelude-manager.conf-dist; \
+-              echo "********************************************************************************";                \
+-              echo;                                                                                                   \
+-              echo "$(DESTDIR)$(configdir)/prelude-manager.conf already exist...";                                   \
+-              echo "Installing default configuration in $(DESTDIR)$(configdir)/prelude-manager.conf-dist";           \
+-              echo;                                                                                                   \
+-              echo "********************************************************************************";                \
+-      else                                                                                                            \
+-              $(INSTALL) -m 600 $(top_srcdir)/prelude-manager.conf $(DESTDIR)$(configdir)/;                          \
+-      fi                                                                                                   
++      $(INSTALL) -m 600 $(top_srcdir)/prelude-manager.conf $(DESTDIR)$(prefix)/share/examples/prelude-manager
+ # 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: