pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security Corrected my misunderstanding of CONF_FILES
details: https://anonhg.NetBSD.org/pkgsrc/rev/36fc6a35d81c
branches: trunk
changeset: 532956:36fc6a35d81c
user: shannonjr <shannonjr%pkgsrc.org@localhost>
date: Wed Sep 05 18:58:19 2007 +0000
description:
Corrected my misunderstanding of CONF_FILES
infrastrure. Fixed several configuration file
installation problems.
diffstat:
security/libprelude/Makefile | 10 ++-
security/libprelude/distinfo | 10 +-
security/libprelude/options.mk | 3 +-
security/libprelude/patches/patch-aa | 32 +++++-----
security/prelude-lml/Makefile | 85 ++++++++++++++++++++++++-----
security/prelude-lml/distinfo | 4 +-
security/prelude-lml/patches/patch-ab | 55 +++++++++---------
security/prelude-pflogger/Makefile | 4 +-
security/prelude-pflogger/distinfo | 4 +-
security/prelude-pflogger/patches/patch-aa | 11 +--
10 files changed, 138 insertions(+), 80 deletions(-)
diffs (truncated from 370 to 300 lines):
diff -r 9d54a8e6caff -r 36fc6a35d81c security/libprelude/Makefile
--- a/security/libprelude/Makefile Wed Sep 05 17:06:55 2007 +0000
+++ b/security/libprelude/Makefile Wed Sep 05 18:58:19 2007 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2007/09/03 13:43:40 shannonjr Exp $
+# $NetBSD: Makefile,v 1.25 2007/09/05 18:58:19 shannonjr Exp $
#
-DISTNAME= libprelude-0.9.15.1
+DISTNAME= libprelude-0.9.15.2
+PKGREVISION= 1
CATEGORIES= security
MASTER_SITES= http://www.prelude-ids.org/download/releases/ \
http://www.prelude-ids.org/download/releases/old/
@@ -38,7 +39,10 @@
PKG_GECOS.${PRELUDE_USER}= Prelude IDS
PKG_HOME.${PRELUDE_USER}= ${PRELUDE_HOME}
-REQD_DIRS= ${PREFIX}/share/examples/libprelude
+EGDIR= ${PREFIX}/share/examples/libprelude
+REQD_DIRS= ${EGDIR}
+MAKE_DIRS= ${PKG_SYSCONFDIR}/default ${PKG_SYSCONFDIR}/profile
+MAKE_DIRS_PERMS+= ${PKG_SYSCONFDIR}/profile ${ROOT_USER} ${ROOT_GROUP} 0711
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
diff -r 9d54a8e6caff -r 36fc6a35d81c security/libprelude/distinfo
--- a/security/libprelude/distinfo Wed Sep 05 17:06:55 2007 +0000
+++ b/security/libprelude/distinfo Wed Sep 05 18:58:19 2007 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.17 2007/09/03 13:43:40 shannonjr Exp $
+$NetBSD: distinfo,v 1.18 2007/09/05 18:58:19 shannonjr Exp $
-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 (libprelude-0.9.15.2.tar.gz) = ee11319f2f526318642900fa27da0c3e4bbdf9bc
+RMD160 (libprelude-0.9.15.2.tar.gz) = c69e21175d60fd6c858935b927d85e6043cbb486
+Size (libprelude-0.9.15.2.tar.gz) = 1949284 bytes
+SHA1 (patch-aa) = c8aff1bce0b649b77554eefca4625f69393ac1c2
SHA1 (patch-ab) = 3fa1b01b728cd1210cf22717e2f6c81a3d3b70cc
diff -r 9d54a8e6caff -r 36fc6a35d81c security/libprelude/options.mk
--- a/security/libprelude/options.mk Wed Sep 05 17:06:55 2007 +0000
+++ b/security/libprelude/options.mk Wed Sep 05 18:58:19 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: options.mk,v 1.7 2006/08/31 18:02:41 rillig Exp $
+# $NetBSD: options.mk,v 1.8 2007/09/05 18:58:19 shannonjr Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.libprelude
PKG_SUPPORTED_OPTIONS= perl python
+PKG_OPTIONS.libprelude?=
.include "../../mk/bsd.options.mk"
diff -r 9d54a8e6caff -r 36fc6a35d81c security/libprelude/patches/patch-aa
--- a/security/libprelude/patches/patch-aa Wed Sep 05 17:06:55 2007 +0000
+++ b/security/libprelude/patches/patch-aa Wed Sep 05 18:58:19 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2007/09/03 13:43:40 shannonjr Exp $
+$NetBSD: patch-aa,v 1.4 2007/09/05 18:58:19 shannonjr Exp $
---- Makefile.in.orig 2007-08-29 04:18:17.000000000 -0600
+--- Makefile.in.orig 2007-09-04 08:31:01.000000000 -0600
+++ Makefile.in
@@ -490,7 +490,7 @@ libexecdir = @libexecdir@
libprelude_cflags = @libprelude_cflags@
@@ -11,7 +11,7 @@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
-@@ -1034,64 +1034,19 @@ prelude-config.h: $(top_builddir)/config
+@@ -1034,71 +1034,14 @@ prelude-config.h: $(top_builddir)/config
# Spool directory for report saving is mode
install-data-local:
@@ -73,19 +73,19 @@
- $(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
+ $(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
++ $(BSD_INSTALL_DATA) $(top_srcdir)/client.conf @EGDIR@
++ $(BSD_INSTALL_DATA) $(top_srcdir)/global.conf @EGDIR@
++ $(BSD_INSTALL_DATA) $(top_srcdir)/idmef-client.conf @EGDIR@
++ $(BSD_INSTALL_DATA) $(top_srcdir)/tls.conf @EGDIR@
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
++
+ # 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:
diff -r 9d54a8e6caff -r 36fc6a35d81c security/prelude-lml/Makefile
--- a/security/prelude-lml/Makefile Wed Sep 05 17:06:55 2007 +0000
+++ b/security/prelude-lml/Makefile Wed Sep 05 18:58:19 2007 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2007/09/03 13:46:04 shannonjr Exp $
+# $NetBSD: Makefile,v 1.20 2007/09/05 18:58:41 shannonjr Exp $
#
DISTNAME= prelude-lml-0.9.10.1
+PKGREVISION= 1
CATEGORIES= security
MASTER_SITES= http://www.prelude-ids.org/download/releases/ \
http://www.prelude-ids.org/download/releases/old/
@@ -33,8 +34,13 @@
PRELUDE_LML_PID_DIR= ${VARBASE}/run/prelude-lml
PRELUDE_HOME= ${VARBASE}/prelude-lml
-PKG_GROUPS= ${PRELUDE_GROUP}
-PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP}
+PKG_GROUPS= ${PRELUDE_GROUP}
+PKG_USERS= ${PRELUDE_USER}:${PRELUDE_GROUP}
+
+EGDIR= ${PREFIX}/share/examples/prelude-lml
+REQD_DIRS= ${EGDIR}
+MAKE_DIRS+= ${VARBASE}/prelude-lml PKG_SYSCONFDIR
+MAKE_DIRS_PERMS+= ${VARBASE}/prelude-lml ${PRELUDE_USER} ${PRELUDE_GROUP} 0700
PKG_GECOS.${PRELUDE_USER}= Prelude IDS
PKG_HOME.${PRELUDE_USER}= ${PRELUDE_HOME}
@@ -49,23 +55,72 @@
SUBST_SED.code= -e 's,@PREFIX@,${PREFIX},g'
SUBST_SED.code+= -e 's,@PRELUDE_USER@,${PRELUDE_USER},g'
+SUBST_CLASSES+= make
+SUBST_STAGE.make= post-patch
+SUBST_FILES.make= Makefile.in
+SUBST_SED.make= -e 's,@EGDIR@,${EGDIR},g'
+
PKG_SYSCONFSUBDIR= prelude-lml
-EGDIR= share/examples/prelude-lml/
CONF_FILES_PERMS+= ${EGDIR}/plugins.rules ${PKG_SYSCONFDIR}/plugins.rules \
${ROOT_USER} ${ROOT_GROUP} 0644
CONF_FILES_PERMS+= ${EGDIR}/prelude-lml.conf ${PKG_SYSCONFDIR}/prelude-lml.conf \
${ROOT_USER} ${ROOT_GROUP} 0644
-.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
+
+# From plugins/pcre/ruleset/Makefile.in
+ruleset_DATA = \
+ apc-emu.rules \
+ arbor.rules \
+ arpwatch.rules \
+ bonding.rules \
+ cacti-thold.rules \
+ checkpoint.rules \
+ cisco-asa.rules \
+ cisco-common.rules \
+ cisco-css.rules \
+ cisco-ips.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 \
+ modsecurity.rules \
+ ms-cluster.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 \
+ sonicwall.rules \
+ spamassassin.rules \
+ squid.rules \
+ ssh.rules \
+ sudo.rules \
+ tripwire.rules \
+ vigor.rules \
+ vpopmail.rules \
+ linksys-wap11.rules \
+ webmin.rules \
+ wu-ftp.rules
+.for f in ${ruleset_DATA}
CONF_FILES+= ${EGDIR}/ruleset/${f:Q} ${PKG_SYSCONFDIR}/ruleset/${f:Q}
.endfor
diff -r 9d54a8e6caff -r 36fc6a35d81c security/prelude-lml/distinfo
--- a/security/prelude-lml/distinfo Wed Sep 05 17:06:55 2007 +0000
+++ b/security/prelude-lml/distinfo Wed Sep 05 18:58:19 2007 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.11 2007/09/03 13:46:04 shannonjr Exp $
+$NetBSD: distinfo,v 1.12 2007/09/05 18:58:41 shannonjr Exp $
SHA1 (prelude-lml-0.9.10.1.tar.gz) = 9edffdb2bcddd6ed03a6c1d1a8e8df347d7693d9
RMD160 (prelude-lml-0.9.10.1.tar.gz) = 87700d74e9dc04b9344c38933b1d88d5a3e27a81
Size (prelude-lml-0.9.10.1.tar.gz) = 658499 bytes
SHA1 (patch-aa) = fbb7dcd864ea1bfc39e02c01a451a7992419dfcb
-SHA1 (patch-ab) = 6cfb8e41b822be4bc616f217da85e0f1af458b5b
+SHA1 (patch-ab) = 41ecade30abfb985c3dabfbb43b2cf0bd44a6d9d
SHA1 (patch-ac) = 0980dcf3d203ad759997bd3d1efb36ea6722a4af
SHA1 (patch-ad) = 971e0360ff3732c2fc0e5fce33946d6060c54713
diff -r 9d54a8e6caff -r 36fc6a35d81c security/prelude-lml/patches/patch-ab
--- a/security/prelude-lml/patches/patch-ab Wed Sep 05 17:06:55 2007 +0000
+++ b/security/prelude-lml/patches/patch-ab Wed Sep 05 18:58:19 2007 +0000
@@ -1,42 +1,43 @@
-$NetBSD: patch-ab,v 1.2 2006/05/20 19:12:32 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2007/09/05 18:58:41 shannonjr Exp $
---- Makefile.in.orig 2006-05-20 18:51:30.000000000 +0000
+--- Makefile.in.orig 2007-08-08 09:48:58.000000000 -0600
+++ Makefile.in
-@@ -695,27 +695,27 @@ uninstall-info: uninstall-info-recursive
+@@ -872,34 +872,12 @@ uninstall-info: uninstall-info-recursive
+ uninstall uninstall-am uninstall-info-am uninstall-local
- install-data-local:
- $(INSTALL) -m 700 -d $(DESTDIR)$(metadata_dir)
+
+-install-data-local:
+- $(INSTALL) -m 700 -d $(DESTDIR)$(metadata_dir)
- @if test -f $(DESTDIR)$(configdir)/prelude-lml.conf; then \
-+ @if test -f $(DESTDIR)$(prefix)/share/examples/prelude-lml/prelude-lml.conf; then \
- echo "********************************************************************************"; \
- echo; \
+- echo "********************************************************************************"; \
+- echo; \
- echo "$(DESTDIR)$(configdir)/prelude-lml.conf already exist..."; \
- echo "Installing default configuration in $(DESTDIR)$(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 "********************************************************************************"; \
+- echo; \
+- echo "********************************************************************************"; \
- $(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(configdir)/prelude-lml.conf-dist; \
-+ $(BSD_INSTALL_DATA) $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(prefix)/share/examples/prelude-lml/prelude-lml.conf-dist; \
- else \
+- else \
- $(INSTALL) -m 600 $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(configdir)/; \
-+ $(BSD_INSTALL_DATA) $(top_srcdir)/prelude-lml.conf $(DESTDIR)$(prefix)/share/examples/prelude-lml/; \
- fi
+- fi
- @if test -f $(DESTDIR)$(configdir)/plugins.rules; then \
-+ @if test -f $(DESTDIR)$(prefix)/share/examples/prelude-lml/plugins.rules; then \
- echo "********************************************************************************"; \
- echo; \
+- echo "********************************************************************************"; \
+- echo; \
- echo "$(DESTDIR)$(configdir)/plugins.rules already exist..."; \
- echo "Installing default configuration in $(DESTDIR)$(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 "********************************************************************************"; \
+- echo; \
+- echo "********************************************************************************"; \
- $(INSTALL) -m 600 $(top_srcdir)/plugins.rules $(DESTDIR)$(configdir)/plugins.rules-dist; \
-+ $(BSD_INSTALL_DATA) $(top_srcdir)/plugins.rules $(DESTDIR)$(prefix)/share/examples/prelude-lml/plugins.rules-dist; \
- else \
+- else \
- $(INSTALL) -m 600 $(top_srcdir)/plugins.rules $(DESTDIR)$(configdir)/; \
-+ $(BSD_INSTALL_DATA) $(top_srcdir)/plugins.rules $(DESTDIR)$(prefix)/share/examples/prelude-lml/; \
- fi
+- fi
Home |
Main Index |
Thread Index |
Old Index