pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security/libprelude Use configuration file framework. ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/c6b92cb3bd5e
branches: trunk
changeset: 511272:c6b92cb3bd5e
user: joerg <joerg%pkgsrc.org@localhost>
date: Wed Apr 12 19:40:51 2006 +0000
description:
Use configuration file framework. Bump revision.
diffstat:
security/libprelude/Makefile | 20 ++--
security/libprelude/PLIST | 10 +-
security/libprelude/distinfo | 4 +-
security/libprelude/patches/patch-ac | 130 ++++++++++++++--------------------
4 files changed, 71 insertions(+), 93 deletions(-)
diffs (245 lines):
diff -r 6f3c0ab7f82a -r c6b92cb3bd5e security/libprelude/Makefile
--- a/security/libprelude/Makefile Wed Apr 12 19:28:47 2006 +0000
+++ b/security/libprelude/Makefile Wed Apr 12 19:40:51 2006 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2006/03/10 22:19:29 shannonjr Exp $
+# $NetBSD: Makefile,v 1.8 2006/04/12 19:40:51 joerg Exp $
#
DISTNAME= libprelude-0.9.7
+PKGREVISION= 1
CATEGORIES= security
MASTER_SITES= http://www.prelude-ids.org/download/releases/
@@ -18,7 +19,8 @@
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_TOOLS+= make bison gawk
-CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
+PKG_SYSCONFSUBDIR= prelude
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q}
CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
PRELUDE_USER?= _prelude
@@ -27,16 +29,12 @@
PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP}::Prelude\ IDS:${PRELUDE_HOME}:${NOLOGIN}
PKG_GROUPS= ${PRELUDE_GROUP}
+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
+
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/libprelude/
- ${INSTALL_DATA} ${WRKSRC}/client.conf \
- ${PREFIX}/share/examples/libprelude/client.conf-dist
- ${INSTALL_DATA} ${WRKSRC}/global.conf \
- ${PREFIX}/share/examples/libprelude/global.conf-dist
- ${INSTALL_DATA} ${WRKSRC}/idmef-client.conf \
- ${PREFIX}/share/examples/libprelude/idmef-client.conf-dist
- ${INSTALL_DATA} ${WRKSRC}/tls.conf \
- ${PREFIX}/share/examples/libprelude/tls.conf-dist
${CHOWN} -R ${PRELUDE_USER}:${PRELUDE_GROUP} ${PRELUDE_HOME}
.include "../../security/gnutls/buildlink3.mk"
diff -r 6f3c0ab7f82a -r c6b92cb3bd5e security/libprelude/PLIST
--- a/security/libprelude/PLIST Wed Apr 12 19:28:47 2006 +0000
+++ b/security/libprelude/PLIST Wed Apr 12 19:40:51 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/01/31 10:44:45 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/04/12 19:40:51 joerg Exp $
bin/libprelude-config
bin/prelude-adduser
include/libprelude/common.h
@@ -98,10 +98,10 @@
share/doc/libprelude/right.png
share/doc/libprelude/style.css
share/doc/libprelude/up.png
-share/examples/libprelude/client.conf-dist
-share/examples/libprelude/global.conf-dist
-share/examples/libprelude/idmef-client.conf-dist
-share/examples/libprelude/tls.conf-dist
+share/examples/libprelude/client.conf
+share/examples/libprelude/global.conf
+share/examples/libprelude/idmef-client.conf
+share/examples/libprelude/tls.conf
@dirrm share/examples/libprelude
@dirrm share/doc/libprelude
@dirrm include/libprelude
diff -r 6f3c0ab7f82a -r c6b92cb3bd5e security/libprelude/distinfo
--- a/security/libprelude/distinfo Wed Apr 12 19:28:47 2006 +0000
+++ b/security/libprelude/distinfo Wed Apr 12 19:40:51 2006 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2006/03/10 22:19:29 shannonjr Exp $
+$NetBSD: distinfo,v 1.7 2006/04/12 19:40:51 joerg Exp $
SHA1 (libprelude-0.9.7.tar.gz) = 719f408753d71372665abc8efe9f086a923182a0
RMD160 (libprelude-0.9.7.tar.gz) = 150ef560876238fcd5c18ada2b6bfde97ae12050
Size (libprelude-0.9.7.tar.gz) = 1732925 bytes
SHA1 (patch-aa) = 1d788517feb2ef687777ae6640033d9f177b07f8
SHA1 (patch-ab) = 592f42a6d9217c502eb49e8fb0ba7d17a49f2ada
-SHA1 (patch-ac) = 34f11cdf22cbdc843ed0db6ea017a56b2ec780ca
+SHA1 (patch-ac) = 6d8a95f0ae85071def8a38951e83838cef676c92
diff -r 6f3c0ab7f82a -r c6b92cb3bd5e security/libprelude/patches/patch-ac
--- a/security/libprelude/patches/patch-ac Wed Apr 12 19:28:47 2006 +0000
+++ b/security/libprelude/patches/patch-ac Wed Apr 12 19:40:51 2006 +0000
@@ -1,104 +1,84 @@
-$NetBSD: patch-ac,v 1.1.1.1 2006/01/29 15:54:04 shannonjr Exp $
+$NetBSD: patch-ac,v 1.2 2006/04/12 19:40:51 joerg Exp $
---- Makefile.in.orig 2005-12-13 12:36:41.000000000 -0700
+--- Makefile.in.orig 2006-03-09 13:08:17.000000000 +0000
+++ Makefile.in
-@@ -827,71 +827,71 @@ prelude-config.h: $(top_builddir)/config
- # Spool directory for report saving is mode
+@@ -299,7 +299,7 @@ mkdir_p = @mkdir_p@
+ oldincludedir = @oldincludedir@
+ 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@
+@@ -833,64 +833,12 @@ prelude-config.h: $(top_builddir)/config
install-data-local:
-- $(INSTALL) -d -m 755 $(DESTDIR)$(prelude_spool_dir);
+ $(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 \
-+ $(INSTALL) -d -m 755 $(prelude_spool_dir);
-+ $(INSTALL) -d -m 755 $(prelude_config_dir);
-+ $(INSTALL) -d -m 755 $(prelude_config_dir)/default;
-+ $(INSTALL) -d -m 755 $(prelude_config_dir)/profile;
-+ @if test -f $(prelude_config_dir)/default/client.conf; then \
- echo; \
- echo "********************************************************************************"; \
- echo; \
+- 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 "$(prelude_config_dir)/default/client.conf already exist..."; \
-+ echo "Installing default configuration in $(prelude_config_dir)/default/client.conf-dist"; \
- echo; \
- echo "********************************************************************************"; \
- echo; \
+- echo; \
+- echo "********************************************************************************"; \
+- echo; \
- $(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default/client.conf-dist; \
-+ $(INSTALL) -m 644 $(top_srcdir)/client.conf $(prelude_config_dir)/default/client.conf-dist; \
- else \
+- else \
- $(INSTALL) -m 644 $(top_srcdir)/client.conf $(DESTDIR)$(prelude_config_dir)/default; \
-+ $(INSTALL) -m 644 $(top_srcdir)/client.conf $(prelude_config_dir)/default; \
- fi
-
+- fi
+-
- @if test -f $(DESTDIR)$(prelude_config_dir)/default/global.conf; then \
-+ @if test -f $(prelude_config_dir)/default/global.conf; then \
- echo; \
- echo "********************************************************************************"; \
- echo; \
+- 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 "$(prelude_config_dir)/default/global.conf already exist..."; \
-+ echo "Installing default configuration in $(prelude_config_dir)/default/global.conf-dist"; \
- echo; \
- echo "********************************************************************************"; \
- echo; \
+- echo; \
+- echo "********************************************************************************"; \
+- echo; \
- $(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default/global.conf-dist; \
-+ $(INSTALL) -m 644 $(top_srcdir)/global.conf $(prelude_config_dir)/default/global.conf-dist; \
- else \
+- else \
- $(INSTALL) -m 644 $(top_srcdir)/global.conf $(DESTDIR)$(prelude_config_dir)/default; \
-+ $(INSTALL) -m 644 $(top_srcdir)/global.conf $(prelude_config_dir)/default; \
- fi
-
+- fi
+-
- @if test -f $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf; then \
-+ @if test -f $(prelude_config_dir)/default/idmef-client.conf; then \
- echo; \
- echo "********************************************************************************"; \
- echo; \
+- 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 "$(prelude_config_dir)/default/idmef-client.conf already exist..."; \
-+ echo "Installing default configuration in $(prelude_config_dir)/default/idmef-client.conf-dist"; \
- echo; \
- echo "********************************************************************************"; \
- echo; \
+- echo; \
+- echo "********************************************************************************"; \
+- echo; \
- $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf-dist; \
-+ $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(prelude_config_dir)/default/idmef-client.conf-dist; \
- else \
+- else \
- $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(DESTDIR)$(prelude_config_dir)/default; \
-+ $(INSTALL) -m 644 $(top_srcdir)/idmef-client.conf $(prelude_config_dir)/default; \
- fi
-
+- fi
+-
- @if test -f $(DESTDIR)$(prelude_config_dir)/default/tls.conf; then \
-+ @if test -f $(prelude_config_dir)/default/tls.conf; then \
- echo; \
- echo "********************************************************************************"; \
- echo; \
+- 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 "$(prelude_config_dir)/default/tls.conf already exist..."; \
-+ echo "Installing default configuration in $(prelude_config_dir)/default/tls.conf-dist"; \
- echo; \
- echo "********************************************************************************"; \
- echo; \
+- echo; \
+- echo "********************************************************************************"; \
+- echo; \
- $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default/tls.conf-dist; \
-+ $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(prelude_config_dir)/default/tls.conf-dist; \
- else \
+- else \
- $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(DESTDIR)$(prelude_config_dir)/default; \
-+ $(INSTALL) -m 644 $(top_srcdir)/tls.conf $(prelude_config_dir)/default; \
- fi
+- 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
-- rm -f $(DESTDIR)$(prelude_config_dir)/default/global.conf
-- rm -f $(DESTDIR)$(prelude_config_dir)/default/idmef-client.conf
-- rm -f $(DESTDIR)$(prelude_config_dir)/default/tls.conf
-+ rm -f $(prelude_config_dir)/default/client.conf
-+ rm -f $(prelude_config_dir)/default/global.conf
-+ rm -f $(prelude_config_dir)/default/idmef-client.conf
-+ rm -f $(prelude_config_dir)/default/tls.conf
- # 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:
+ rm -f $(DESTDIR)$(prelude_config_dir)/default/client.conf
Home |
Main Index |
Thread Index |
Old Index