Sanitize some @unexec/@extraunexec calls to rm: move them up in the

PLIST and delete everything under the @sample'd directory instead of the directory itself to prevent a warning from pkg_delete(1) trying to remove a non existing directory and to help preventing left-over files and directories.
2011-05-11 08:24:40 +00:00 · 2011-05-11 08:24:40 +00:00 · 2d702b0153
commit 2d702b0153
parent 6e1f352ba4
22 changed files with 58 additions and 50 deletions
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.66 2011/03/02 14:36:49 sthen Exp $
+# $OpenBSD: Makefile,v 1.67 2011/05/11 08:24:40 ajacoutot Exp $

 COMMENT=		virus scanner
 DISTNAME=		clamav-0.97

+REVISION=		0
+
 CATEGORIES=		security
 SHARED_LIBS=		clamav 18.0 \
 			clamunrar 2.0 \
--- a/security/clamav/pkg/PLIST
+++ b/security/clamav/pkg/PLIST
@ -1,6 +1,10 @@
-@comment $OpenBSD: PLIST,v 1.17 2011/01/05 06:06:49 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.18 2011/05/11 08:24:40 ajacoutot Exp $
@newgroup _clamav:539
@newuser _clamav:539:539:daemon:Clam AntiVirus:/nonexistent:/sbin/nologin
+@extraunexec rm -fr /var/db/clamav/*
+@extraunexec rm -fr /var/spool/clamav/*
+@extraunexec rm -fr /var/clamav/quarantine/*
+@extraunexec rm -fr /var/clamav/tmp/*
 bin/clamav-config
@bin bin/clambc
@bin bin/clamconf
@ -48,9 +52,6 @@ share/examples/clamav/clamav-milter.conf
@mode 0700
@sample /var/clamav/quarantine/
@sample /var/clamav/tmp/
-@extraunexec rm -fr /var/db/clamav/*
-@extraunexec rm -fr /var/spool/clamav/*
-@extraunexec rm -fr /var/clamav/*
@mode
@owner
@group
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.57 2010/12/27 14:50:23 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.58 2011/05/11 08:24:40 ajacoutot Exp $

 COMMENT=	RFC 2222 SASL (Simple Authentication and Security Layer)

 DISTNAME=	cyrus-sasl-2.1.23
-REVISION=	5
+REVISION=	6

 SHARED_LIBS=	anonymous	2.22 \
 		crammd5		2.22 \
--- a/security/cyrus-sasl2/pkg/PLIST
+++ b/security/cyrus-sasl2/pkg/PLIST
@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.19 2010/10/28 11:21:05 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.20 2011/05/11 08:24:40 ajacoutot Exp $
@conflict cyrus-sasl-*
+@extraunexec rm -rf /var/sasl2/*
 include/sasl/
 include/sasl/hmac-md5.h
 include/sasl/md5.h
@ -127,5 +128,4 @@ share/examples/sasl2/
 %%sql%%
 %%SHARED%%
@sample /var/sasl2/
-@extraunexec rm -rf /var/sasl2/*
@rcscript ${RCDIR}/saslauthd
--- a/security/ipguard/Makefile
+++ b/security/ipguard/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.9 2011/03/08 06:44:55 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2011/05/11 08:24:40 ajacoutot Exp $

 COMMENT =	protect LAN IP address space by ARP spoofing

 DISTNAME =	ipguard-1.02
 CATEGORIES =	security
-REVISION =	0
+REVISION =	1

 HOMEPAGE =	http://ipguard.deep.perm.ru/
 MASTER_SITES =	${HOMEPAGE}files/
--- a/security/ipguard/pkg/PLIST
+++ b/security/ipguard/pkg/PLIST
@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.4 2008/12/05 22:07:07 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.5 2011/05/11 08:24:40 ajacoutot Exp $
@newgroup _ipguard:612
@newuser _ipguard:612:612:daemon:IPguard User:/var/empty:/sbin/nologin
@man man/man8/ipguard.8
@bin sbin/ipguard
-@extraunexec rm -rf /var/log/ipguard
+@extraunexec rm -rf /var/log/ipguard/*
@group _ipguard
@sample /var/log/ipguard/
--- a/security/logsentry/Makefile
+++ b/security/logsentry/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2010/11/20 17:22:44 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2011/05/11 08:24:41 ajacoutot Exp $

 COMMENT=	logfile auditing tool

 DISTNAME=	logsentry-1.1.1
-REVISION =	2
+REVISION =	3
 CATEGORIES=	security

 MAINTAINER=	Srebrenko Sehic <haver@insecure.dk>
--- a/security/logsentry/pkg/PLIST
+++ b/security/logsentry/pkg/PLIST
@ -1,5 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.7 2004/12/02 21:18:37 alek Exp $
+@comment $OpenBSD: PLIST,v 1.8 2011/05/11 08:24:41 ajacoutot Exp $
@conflict logcheck-1.1.1
+@extraunexec rm -rf /var/tmp/logsentry/*
 bin/logtail
 share/doc/logsentry/
 share/doc/logsentry/CREDITS
@ -31,4 +32,3 @@ share/examples/logsentry/logsentry.violations.ignore
@mode 600
@sample ${SYSCONFDIR}/logsentry/logsentry.violations.ignore
@sample /var/tmp/logsentry/
-@extraunexec rm -rf /var/tmp/logsentry
--- a/security/nessus/core/Makefile
+++ b/security/nessus/core/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.27 2010/11/20 17:22:44 espie Exp $
+# $OpenBSD: Makefile,v 1.28 2011/05/11 08:24:41 ajacoutot Exp $

 COMMENT=	network security scanner
 DISTNAME=	nessus-core-${V}
-REVISION=	7
+REVISION=	8

 FLAVORS=	no_x11
 FLAVOR?=
--- a/security/nessus/core/pkg/PLIST
+++ b/security/nessus/core/pkg/PLIST
@ -1,5 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.5 2006/09/23 08:45:04 aanriot Exp $
+@comment $OpenBSD: PLIST,v 1.6 2011/05/11 08:24:41 ajacoutot Exp $
@conflict nessus-<2.2.4
+@extraunexec rm -fr ${SYSCONFDIR}/nessus/*
+@extraunexec rm -fr /var/nessus/logs/*
+@extraunexec rm -fr /var/nessus/users/*
 bin/nessus
 bin/nessus-fetch
 bin/nessus-mkcert-client
@ -36,6 +39,3 @@ share/examples/nessus/nessus-services
@sample /var/nessus/nessus-services
@sample ${SYSCONFDIR}/nessus/
@extra lib/nessus/plugins/.desc
-@extraunexec rm -fr ${SYSCONFDIR}/nessus/*
-@extraunexec rm -fr /var/nessus/logs/*
-@extraunexec rm -fr /var/nessus/users/*
--- a/security/nessus/libnasl/Makefile
+++ b/security/nessus/libnasl/Makefile
@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.16 2010/11/20 17:22:44 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2011/05/11 08:24:41 ajacoutot Exp $

 COMMENT=	Nessus Attack Scripting Language
 DISTNAME=	libnasl-${V}
-REVISION =	1
+REVISION =	2

 SHARED_LIBS=	nasl	4.7

--- a/security/nessus/libnasl/pkg/PLIST
+++ b/security/nessus/libnasl/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.5 2006/06/01 05:16:32 aanriot Exp $
+@comment $OpenBSD: PLIST,v 1.6 2011/05/11 08:24:41 ajacoutot Exp $
@conflict nessus-<2.2.4
 %%SHARED%%
 bin/nasl
@ -13,4 +13,4 @@ share/examples/nessus/
 share/examples/nessus/nessus_org.pem
@sample /var/nessus/
@sample /var/nessus/nessus_org.pem
-@extraunexec rm -rf /var/nessus/*
+@extra /var/nessus/nessus_org.pem
--- a/security/openct/Makefile
+++ b/security/openct/Makefile
@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.17 2010/11/20 17:22:44 espie Exp $
+# $OpenBSD: Makefile,v 1.18 2011/05/11 08:24:41 ajacoutot Exp $

 COMMENT=	drivers for several smart card readers

 DISTNAME=	openct-0.6.20
 CATEGORIES=	security
 SHARED_LIBS=	openct	1.1
+REVISION=	0

 HOMEPAGE=	http://www.opensc-project.org/openct/

--- a/security/openct/pkg/PLIST
+++ b/security/openct/pkg/PLIST
@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.3 2008/12/23 19:09:32 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.4 2011/05/11 08:24:41 ajacoutot Exp $
@newgroup _openct:614
@newuser _openct:614:_openct:daemon:OpenCT:/nonexistent:/sbin/nologin
+@extraunexec rm -rf /var/run/openct/*
 %%SHARED%%
@bin bin/openct-tool
 include/openct/
@ -40,4 +41,3 @@ share/examples/openct/openct.conf
@sample ${SYSCONFDIR}/openct.conf
@mode 755
@sample /var/run/openct/
-@extraunexec rm -rf /var/run/openct/*
--- a/security/prelude/libprelude/Makefile
+++ b/security/prelude/libprelude/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.29 2011/04/15 16:10:38 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.30 2011/05/11 08:24:41 ajacoutot Exp $

 # XXX fails to build if not using the bundled libtool

@ -8,7 +8,7 @@ MODPY_EGG_VERSION=0.9.24.1
 DISTNAME=	libprelude-${MODPY_EGG_VERSION}
 PKGNAME=	prelude-${DISTNAME}

-REVISION=	3
+REVISION=	4

 MASTER_SITES=	http://www.prelude-ids.com/download/releases/libprelude/

--- a/security/prelude/libprelude/pkg/PLIST
+++ b/security/prelude/libprelude/pkg/PLIST
@ -1,6 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.9 2009/08/30 20:37:16 rui Exp $
+@comment $OpenBSD: PLIST,v 1.10 2011/05/11 08:24:41 ajacoutot Exp $
@newgroup _prelude:564
@newuser _prelude:564:564:daemon:Prelude IDS:/var/empty:/sbin/nologin
+@extraunexec rm -rf ${SYSCONFDIR}/prelude/profile/*
+@extraunexec rm -rf /var/prelude/*
+@extraunexec rm -rf /var/spool/prelude/*
 %%SHARED%%
 bin/libprelude-config
 bin/prelude-adduser
@ -140,6 +143,3 @@ share/gtk-doc/html/libprelude/pt04.html
 share/gtk-doc/html/libprelude/right.png
 share/gtk-doc/html/libprelude/style.css
 share/gtk-doc/html/libprelude/up.png
-@extraunexec rm -rf ${SYSCONFDIR}/prelude/*
-@extraunexec rm -rf /var/prelude/*
-@extraunexec rm -rf /var/spool/prelude/*
--- a/security/prelude/lml/Makefile
+++ b/security/prelude/lml/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2011/04/15 16:10:38 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.21 2011/05/11 08:24:41 ajacoutot Exp $

 COMMENT=	Prelude log analyzer

 DISTNAME=	prelude-lml-0.9.15
-REVISION=	3
+REVISION=	4

 WANTLIB += c gcrypt gnutls gpg-error m tasn1 z pcre prelude
 WANTLIB += gmp hogweed nettle pthread
--- a/security/prelude/lml/pkg/PLIST
+++ b/security/prelude/lml/pkg/PLIST
@ -1,4 +1,6 @@
-@comment $OpenBSD: PLIST,v 1.9 2010/11/16 10:11:51 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.10 2011/05/11 08:24:41 ajacoutot Exp $
+@extraunexec rm -rf /var/prelude-lml/*
+@extraunexec rm -rf /var/spool/prelude-lml/*
 %%SHARED%%
@bin bin/prelude-lml
 include/prelude-lml/
@ -136,5 +138,3 @@ share/examples/prelude-lml/ruleset/wu-ftp.rules
@sample ${SYSCONFDIR}/prelude-lml/ruleset/wu-ftp.rules
@sample /var/prelude-lml/
@sample /var/spool/prelude-lml/
-@extraunexec rm -rf /var/prelude-lml/*
-@extraunexec rm -rf /var/spool/prelude-lml/*
--- a/security/prelude/manager/Makefile
+++ b/security/prelude/manager/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.24 2011/04/15 16:10:38 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.25 2011/05/11 08:24:41 ajacoutot Exp $

 COMMENT=	Prelude manager

 DISTNAME=	prelude-manager-0.9.15
-REVISION=	2
+REVISION=	3

 MASTER_SITES=	http://www.prelude-ids.com/download/releases/prelude-manager/

--- a/security/prelude/manager/pkg/PLIST
+++ b/security/prelude/manager/pkg/PLIST
@ -1,4 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.10 2010/11/16 10:11:51 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.11 2011/05/11 08:24:41 ajacoutot Exp $
+@extraunexec rm -rf /var/prelude/manager/*
+@extraunexec rm -rf /var/spool/prelude/prelude-manager/*
+@extraunexec rm -rf /var/spool/prelude-manager/failover/*
+@extraunexec rm -rf /var/spool/prelude-manager/scheduler/*
 %%SHARED%%
@bin bin/prelude-manager
 include/prelude-manager/
@ -39,6 +43,4 @@ share/prelude-manager/xmlmod/idmef-message.dtd
@sample /var/spool/prelude-manager/
@sample /var/spool/prelude-manager/failover/
@sample /var/spool/prelude-manager/scheduler/
-@extraunexec rm -rf /var/prelude/manager/*
-@extraunexec rm -rf /var/run/prelude-manager/*
-@extraunexec rm -rf /var/spool/prelude/prelude-manager/*
+@extraunexec rm -rf /var/run/prelude-manager/
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.55 2010/11/20 17:22:45 espie Exp $
+# $OpenBSD: Makefile,v 1.56 2011/05/11 08:24:41 ajacoutot Exp $

 COMMENT=	SSL encryption wrapper for standard network daemons

@ -6,6 +6,8 @@ VERSION=	4.28
 DISTNAME=	stunnel-${VERSION}
 CATEGORIES=	security

+REVISION=	0
+
 MAINTAINER=     Jakob Schlyter <jakob@openbsd.org>

 # GPL
--- a/security/stunnel/pkg/PLIST
+++ b/security/stunnel/pkg/PLIST
@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.9 2009/05/28 18:08:49 jakob Exp $
+@comment $OpenBSD: PLIST,v 1.10 2011/05/11 08:24:41 ajacoutot Exp $
@newgroup _stunnel:528
@newuser _stunnel:528:_stunnel:daemon:stunnel account:/var/stunnel:/sbin/nologin
+@extraunexec rm -rf /var/stunnel/*
@man man/man8/stunnel.8
@bin sbin/stunnel
 share/examples/stunnel/
@ -8,5 +9,4 @@ share/examples/stunnel/
 share/examples/stunnel/stunnel.conf-sample
@sample ${SYSCONFDIR}/stunnel/stunnel.conf
@sample /var/stunnel/
-@extraunexec rm -rf /var/stunnel
@extra /var/run/stunnel.pid