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. ok aja@
2011-05-11 12:57:47 +00:00 · 2011-05-11 12:57:47 +00:00 · 278e3cc0b0
commit 278e3cc0b0
parent 89ba53aa6d
33 changed files with 73 additions and 66 deletions
--- a/mail/amavisd-new/Makefile
+++ b/mail/amavisd-new/Makefile
@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2011/04/13 12:51:00 giovanni Exp $
+# $OpenBSD: Makefile,v 1.21 2011/05/11 12:57:47 jasper Exp $

 COMMENT=		interface between mailer MTA and content checkers

 DISTNAME=		amavisd-new-2.6.5
+REVISION=		0
 CATEGORIES=		mail security

 HOMEPAGE=		http://www.ijs.si/software/amavisd/
--- a/mail/amavisd-new/pkg/PLIST
+++ b/mail/amavisd-new/pkg/PLIST
@ -1,6 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.11 2010/11/23 18:11:45 giovanni Exp $
+@comment $OpenBSD: PLIST,v 1.12 2011/05/11 12:57:47 jasper Exp $
@newgroup _vscan:530
@newuser _vscan:530:_vscan::Amavisd-new Daemon:/var/empty:/sbin/nologin
+@extraunexec rm -fr /var/amavisd/*
+@extraunexec rm -fr /var/virusmails/*
 bin/amavisd-agent
 bin/amavisd-nanny
 bin/amavisd-release
@ -56,6 +58,4 @@ share/examples/amavisd-new/amavisd.conf-sample
@sample /var/amavisd/db/
@sample /var/amavisd/var/
@sample /var/virusmails/
-@extraunexec rm -fr /var/amavisd/*
-@extraunexec rm -fr /var/virusmails/*
@rcscript ${RCDIR}/amavisd
--- a/mail/archiveopteryx/Makefile
+++ b/mail/archiveopteryx/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.8 2011/04/03 09:04:54 landry Exp $
+# $OpenBSD: Makefile,v 1.9 2011/05/11 12:57:47 jasper Exp $

 COMMENT =		mail server storing messages in a database

 DISTNAME =		archiveopteryx-3.1.3
-REVISION =		4
+REVISION =		5
 CATEGORIES =		mail databases

 HOMEPAGE =		http://www.archiveopteryx.org/
--- a/mail/archiveopteryx/pkg/PLIST
+++ b/mail/archiveopteryx/pkg/PLIST
@ -1,7 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.2 2011/01/14 22:17:03 landry Exp $
+@comment $OpenBSD: PLIST,v 1.3 2011/05/11 12:57:47 jasper Exp $
@conflict avenger-*
@newgroup _aox:661
@newuser _aox:661:661:daemon:Archiveopteryx Daemon:/var/empty:/sbin/nologin
+@extraunexec rm -rf /var/archiveopteryx/*
@bin bin/aox
@bin bin/aoxexport
@bin bin/aoximport
@ -50,5 +51,4 @@ share/examples/archiveopteryx/archiveopteryx.conf
@group
@sample /var/archiveopteryx/jail/
@mode
-@extraunexec rm -rf /var/archiveopteryx
@rcscript ${RCDIR}/aox
--- a/mail/clamnailer/Makefile
+++ b/mail/clamnailer/Makefile
@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.3 2010/11/19 07:23:05 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2011/05/11 12:57:47 jasper Exp $

 COMMENT=	generate ScamNailer spear phishing database in ClamAV format

 DISTNAME=	ClamNailer-1.01
 PKGNAME=	${DISTNAME:L}
+REVISION=	0
 EXTRACT_SUFX=	.gz

 CATEGORIES=	mail security
--- a/mail/clamnailer/pkg/PLIST
+++ b/mail/clamnailer/pkg/PLIST
@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.2 2010/05/27 11:06:54 sthen Exp $
+@comment $OpenBSD: PLIST,v 1.3 2011/05/11 12:57:47 jasper Exp $
+@extraunexec rm -rf /var/db/clamnailer/*
 sbin/clamnailer
@mode 775
@owner _clamav
@group _clamav
@sample /var/db/clamnailer/
-@extraunexec rm -rf /var/db/clamnailer
@extra /var/db/clamav/scamnailer.ndb
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.71 2011/05/09 09:30:26 giovanni Exp $
+# $OpenBSD: Makefile,v 1.72 2011/05/11 12:57:47 jasper Exp $

 COMMENT-main=		imap server for maildir format mailboxes
 COMMENT-pop3=		pop3 server for maildir format mailboxes
@ -9,6 +9,9 @@ PKGNAME-main=		${DISTNAME}
 FULLPKGNAME-pop3=	courier-pop3-${V}
 FULLPKGPATH-pop3=	mail/courier-imap,-pop3

+REVISION-main=		0
+REVISION-pop3=		0
+
 CATEGORIES=		mail

 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=courier/}
--- a/mail/courier-imap/pkg/PLIST-main
+++ b/mail/courier-imap/pkg/PLIST-main
@ -1,9 +1,11 @@
-@comment $OpenBSD: PLIST-main,v 1.4 2010/12/16 17:55:10 giovanni Exp $
+@comment $OpenBSD: PLIST-main,v 1.5 2011/05/11 12:57:47 jasper Exp $
@conflict imap-uw-*
@conflict courier-utils-*
@pkgpath ${BASE_PKGPATH}
@newgroup _courier:571
@newuser _courier:571:571:daemon:Courier Mail Server:/var/empty:/sbin/nologin
+@extraunexec rm -rf ${SYSCONFDIR}/*
+@extraunexec rm -rf ${COURIERSTATE}/*
@bin bin/couriertls
@bin bin/deliverquota
@bin bin/imapd
@ -58,7 +60,5 @@ share/examples/courier/quotawarnmsg.example
@sample ${SYSCONFDIR}/shared.tmp/
@mode 750
@sample ${COURIERSTATE}/
-@extraunexec rm -rf ${SYSCONFDIR}/
-@extraunexec rm -rf ${COURIERSTATE}
@rcscript ${RCDIR}/courier_imap
@rcscript ${RCDIR}/courier_imap-ssl
--- a/mail/courier-imap/pkg/PLIST-pop3
+++ b/mail/courier-imap/pkg/PLIST-pop3
@ -1,9 +1,11 @@
-@comment $OpenBSD: PLIST-pop3,v 1.8 2010/12/16 17:55:10 giovanni Exp $
+@comment $OpenBSD: PLIST-pop3,v 1.9 2011/05/11 12:57:47 jasper Exp $
@pkgpath courier/imap,-pop3,no_trashquota
@pkgpath courier/imap,-pop3,no_trashquota,imap_bugs
@pkgpath courier/imap,-pop3,imap_bugs
@newgroup _courier:571
@newuser _courier:571:571:daemon:Courier Mail Server:/var/empty:/sbin/nologin
+@extraunexec rm -rf ${SYSCONFDIR}/*
+@extraunexec rm -rf ${COURIERSTATE}/*
@bin bin/pop3d
 libexec/pop3d-ssl.rc
 libexec/pop3d.rc
@ -17,7 +19,5 @@ share/examples/courier/pop3d.cnf
@sample ${SYSCONFDIR}/pop3d.cnf
 share/examples/courier/pop3d.dist
@sample ${SYSCONFDIR}/pop3d
-@extraunexec rm -rf ${SYSCONFDIR}/
-@extraunexec rm -rf ${COURIERSTATE}
@rcscript ${RCDIR}/courier_pop3
@rcscript ${RCDIR}/courier_pop3-ssl
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.22 2010/10/18 19:59:15 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2011/05/11 12:57:47 jasper Exp $

 COMMENT=	Cubic Circle's POP3 daemon

 DISTNAME=	cucipop-1.31
+REVISION=	0
 CATEGORIES=	mail

 MASTER_SITES=	ftp://ftp.informatik.rwth-aachen.de/pub/packages/cucipop/
--- a/mail/cucipop/pkg/PLIST
+++ b/mail/cucipop/pkg/PLIST
@ -1,8 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.8 2004/09/22 22:53:07 espie Exp $
+@comment $OpenBSD: PLIST,v 1.9 2011/05/11 12:57:47 jasper Exp $
+@extraunexec rm -rf /var/spool/cucipop/*
 libexec/cucipop
 libexec/makevpopdb
@man man/man8/cucipop.8
@man man/man8/makevpopdb.8
@sample /var/spool/cucipop/
@sample /var/spool/cucipop/bulletins/
-@extraunexec rm -rf /var/spool/cucipop
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.162 2011/03/26 10:05:24 sthen Exp $
+# $OpenBSD: Makefile,v 1.163 2011/05/11 12:57:47 jasper Exp $

 SHARED_ONLY=	Yes

@ -12,7 +12,7 @@ V_MANAGESIEVE=	0.11.12

 PKGNAME=	dovecot-${V_DOVECOT}
 PKGNAME-server=	dovecot-${V_DOVECOT}
-REVISION-server=4
+REVISION-server=5
 FULLPKGNAME-sieve= dovecot-sieve-${V_SIEVE}
 REVISION-sieve=	0
 EPOCH-sieve=	0
--- a/mail/dovecot/pkg/PLIST-server
+++ b/mail/dovecot/pkg/PLIST-server
@ -1,7 +1,8 @@
-@comment $OpenBSD: PLIST-server,v 1.16 2011/03/03 00:40:05 sthen Exp $
+@comment $OpenBSD: PLIST-server,v 1.17 2011/05/11 12:57:48 jasper Exp $
@pkgpath ${BASE_PKGPATH}
@newgroup _dovecot:518
@newuser _dovecot:518:_dovecot:daemon:Dovecot Account:/nonexistent:/sbin/nologin
+@extraunexec rm -rf /var/dovecot/*
 lib/dovecot/
 lib/dovecot/auth/
 lib/dovecot/imap/
@ -330,7 +331,6 @@ share/examples/dovecot/dovecot-openssl.cnf
@mode
@group
 share/examples/dovecot/dovecot-sql-example.conf
-@extraunexec rm -rf /var/dovecot
@extra /etc/ssl/dovecotcert.pem
@extra /etc/ssl/private/dovecot.pem
@rcscript ${RCDIR}/dovecot
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.32 2010/11/19 07:23:06 espie Exp $
+# $OpenBSD: Makefile,v 1.33 2011/05/11 12:57:48 jasper Exp $

 COMMENT=	anti-spam filter

 VERSION=	3.8.0
 DISTNAME=	dspam-${VERSION}
-REVISION=	0
+REVISION=	1
 SHARED_LIBS=	dspam	8.0
 CATEGORIES=	mail

--- a/mail/dspam/pkg/PLIST
+++ b/mail/dspam/pkg/PLIST
@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.7 2006/10/18 05:12:35 aanriot Exp $
+@comment $OpenBSD: PLIST,v 1.8 2011/05/11 12:57:48 jasper Exp $
@newgroup _dspam:540
@newuser _dspam:540:540:daemon:DSPAM Account:/var/dspam:/sbin/nologin
+@extraunexec rm -rf /var/dspam/*
 %%SHARED%%
 bin/dspam
 bin/dspam_2sql
@ -71,4 +72,3 @@ share/examples/dspam/dspam.conf
@group _dspam
@sample /var/dspam/
@sample /var/dspam/data/
-@extraunexec rm -rf /var/dspam
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.81 2011/05/09 14:56:56 fkr Exp $
+# $OpenBSD: Makefile,v 1.82 2011/05/11 12:57:48 jasper Exp $

 CATEGORIES =		mail
 COMMENT-main =		flexible mail transfer agent
@ -8,6 +8,7 @@ DISTNAME =		exim-${VERSION}
 PKGNAME-main =		exim-${VERSION}
 FULLPKGNAME-eximon =	exim-eximon-${VERSION}
 FULLPKGPATH-eximon =	${PKGPATH},-eximon
+REVISION-main = 	0
 MASTER_SITES =		ftp://ftp.exim.org/pub/exim/exim4/ \
 			ftp://ftp.exim.org/pub/exim/exim4/old/ \
 			http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/ \
--- a/mail/exim/pkg/PLIST-main
+++ b/mail/exim/pkg/PLIST-main
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2009/12/15 11:32:18 sthen Exp $
+@comment $OpenBSD: PLIST-main,v 1.2 2011/05/11 12:57:48 jasper Exp $
@pkgpath mail/exim
@pkgpath mail/exim,no_exiscan
@pkgpath mail/exim,no_exiscan,no_x11
@ -9,6 +9,7 @@
@pkgpath mail/exim,iconv,no_x11
@newgroup _exim:521
@newuser _exim:521:_exim:daemon:Exim Account:/var/spool/exim:/sbin/nologin
+@extraunexec rm -rf /var/spool/exim/*
 bin/exicyclog
 bin/exigrep
@mode 4755
@ -38,4 +39,3 @@ share/examples/exim/configure
@owner _exim
@group _exim
@sample /var/spool/exim/
-@extraunexec rm -rf /var/spool/exim/
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.66 2011/03/03 09:50:11 jasper Exp $
+# $OpenBSD: Makefile,v 1.67 2011/05/11 12:57:48 jasper Exp $

 COMMENT=	mailing list manager with web interface

 DISTNAME=	mailman-2.1.14
-REVISION=	9
+REVISION=	10
 CATEGORIES=	mail www

 HOMEPAGE=	http://www.gnu.org/software/mailman/
--- a/mail/mailman/pkg/PLIST
+++ b/mail/mailman/pkg/PLIST
@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.20 2010/11/09 21:46:50 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.21 2011/05/11 12:57:48 jasper Exp $
@newgroup _mailman:504
@newuser _mailman:504:_mailman:daemon:Mailing List Manager:${PREFIX}/lib/mailman:/sbin/nologin
+@extraunexec rm -fr /var/spool/mailman/*
@mode 775
@owner _mailman
@group _mailman
@ -2449,7 +2450,6 @@ share/doc/mailman/UPGRADING
@sample /var/spool/mailman/qfiles/
@sample /var/spool/mailman/spam/
@unexec find %D/lib/mailman -name paths.pyc -exec rm -f {} \;
-@extraunexec rm -fr /var/spool/mailman
@mode
@owner
@group
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.20 2011/02/02 20:15:48 landry Exp $
+# $OpenBSD: Makefile,v 1.21 2011/05/11 12:57:48 jasper Exp $

 COMMENT=	mailing list manager

 DISTNAME=	majordomo-1.94.5
-REVISION =	4
+REVISION =	5
 CATEGORIES=     mail

 HOMEPAGE=	http://www.greatcircle.com/majordomo/
--- a/mail/majordomo/pkg/PLIST
+++ b/mail/majordomo/pkg/PLIST
@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.5 2004/10/31 20:29:32 alek Exp $
+@comment $OpenBSD: PLIST,v 1.6 2011/05/11 12:57:48 jasper Exp $
@newgroup _majordomo:520
@newuser _majordomo:520:_majordomo::Majordomo:/root:/sbin/nologin
+@extraunexec rm -rf /var/spool/majordomo/*
@mode 755
@owner _majordomo
@group _majordomo
@ -64,4 +65,3 @@ share/doc/majordomo/post-install-notes
@sample /var/spool/majordomo/lists/
@sample /var/spool/majordomo/digests/
@sample /var/spool/majordomo/tmp/
-@extraunexec rm -rf /var/spool/majordomo/
--- a/mail/milter-regex/Makefile
+++ b/mail/milter-regex/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.23 2010/12/27 14:50:23 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2011/05/11 12:57:48 jasper Exp $

 COMMENT=	sendmail milter plugin for regular expression filtering

 DISTNAME=	milter-regex-1.8
-REVISION=	2
+REVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/

--- a/mail/milter-regex/pkg/PLIST
+++ b/mail/milter-regex/pkg/PLIST
@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.6 2010/12/09 01:46:05 okan Exp $
+@comment $OpenBSD: PLIST,v 1.7 2011/05/11 12:57:48 jasper Exp $
@newgroup _milter-regex:527
@newuser _milter-regex:527:_milter-regex:daemon:milter-regex Account:/nonexistent:/sbin/nologin
+@extraunexec rm -rf /var/spool/milter-regex/*
@bin libexec/milter-regex
@man man/man8/milter-regex.8
@rcscript ${RCDIR}/milter_regex
@ -8,4 +9,3 @@
@owner _milter-regex
@group _milter-regex
@sample /var/spool/milter-regex/
-@extraunexec rm -rf /var/spool/milter-regex
--- a/mail/milter-spamd/Makefile
+++ b/mail/milter-spamd/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.15 2010/12/27 14:50:23 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.16 2011/05/11 12:57:48 jasper Exp $

 COMMENT=	sendmail milter plugin for SpamAssassin spamd

 DISTNAME=	milter-spamd-0.5
-REVISION =	4
+REVISION =	5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.benzedrine.cx/

--- a/mail/milter-spamd/pkg/PLIST
+++ b/mail/milter-spamd/pkg/PLIST
@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.5 2010/12/09 01:47:31 okan Exp $
+@comment $OpenBSD: PLIST,v 1.6 2011/05/11 12:57:48 jasper Exp $
@newgroup _milter-spamd:532
@newuser _milter-spamd:532:_milter-spamd:daemon:milter-spamd Account:/nonexistent:/sbin/nologin
+@extraunexec rm -rf /var/spool/milter-spamd/*
@bin libexec/milter-spamd
@man man/man8/milter-spamd.8
@rcscript ${RCDIR}/milter_spamd
@ -8,4 +9,3 @@
@owner _milter-spamd
@group _milter-spamd
@sample /var/spool/milter-spamd/
-@extraunexec rm -rf /var/spool/milter-spamd
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.19 2010/12/27 14:50:23 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.20 2011/05/11 12:57:48 jasper Exp $

 COMMENT=	mailfilter to identify and mark spam

 DISTNAME=	mimedefang-2.71
-REVISION=	3
+REVISION=	4
 CATEGORIES=	mail

 HOMEPAGE=	http://www.mimedefang.org/
--- a/mail/mimedefang/pkg/PLIST
+++ b/mail/mimedefang/pkg/PLIST
@ -1,6 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.7 2010/12/07 02:56:19 okan Exp $
+@comment $OpenBSD: PLIST,v 1.8 2011/05/11 12:57:48 jasper Exp $
@newgroup _mdefang:570
@newuser _mdefang:570:_mdefang:daemon:MIMEDefang:/nonexistent:/sbin/nologin
+@extraunexec rm -rf /var/run/mdefang/*
+@extraunexec rm -rf /var/spool/MIMEDefang/*
+@extraunexec rm -rf /var/spool/MD-Quarantine/*
@bin bin/md-mx-ctrl
@bin bin/mimedefang
@bin bin/mimedefang-multiplexor
@ -32,6 +35,3 @@ share/examples/mimedefang/sa-mimedefang.cf
@sample /var/spool/MD-Quarantine/
@mode 0755
@sample /var/run/mdefang/
-@extraunexec rm -rf /var/run/mdefang/*
-@extraunexec rm -rf /var/spool/MIMEDefang/*
-@extraunexec rm -rf /var/spool/MD-Quarantine/*
--- a/mail/smtp-vilter/Makefile
+++ b/mail/smtp-vilter/Makefile
@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.46 2011/04/17 09:10:46 sthen Exp $
+# $OpenBSD: Makefile,v 1.47 2011/05/11 12:57:48 jasper Exp $

 COMMENT=	sendmail milter to scan messages for viruses and spam

 DISTNAME=	smtp-vilter-1.3.6
-REVISION=	11
+REVISION=	12

 CATEGORIES=    	mail

--- a/mail/smtp-vilter/pkg/PLIST
+++ b/mail/smtp-vilter/pkg/PLIST
@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.9 2010/10/29 11:59:22 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.10 2011/05/11 12:57:48 jasper Exp $
@newgroup _vilter:538
@newuser _vilter:538:538:daemon:smtp-vilter:/nonexistent:/sbin/nologin
+@extraunexec rm -fr /var/smtp-vilter/*
 lib/smtp-vilter/
 lib/smtp-vilter/vilter-attachment.so
 lib/smtp-vilter/vilter-clamd.so
@ -32,5 +33,4 @@ share/examples/smtp-vilter/spamd.conf
@owner _vilter
@sample /var/smtp-vilter/tmp/
@owner
-@extraunexec rm -fr /var/smtp-vilter/*
@rcscript ${RCDIR}/smtp_vilter
--- a/mail/solid-pop3d/Makefile
+++ b/mail/solid-pop3d/Makefile
@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.22 2010/11/19 07:23:09 espie Exp $
+# $OpenBSD: Makefile,v 1.23 2011/05/11 12:57:48 jasper Exp $

 COMMENT=	flexible POP3 server

 VERSION=	0.15
 DISTNAME=	solid-pop3d-${VERSION}
-REVISION =	4
+REVISION =	5
 CATEGORIES=	mail
 MASTER_SITES=	ftp://dione.ids.pl/pub/solidpop3d/

--- a/mail/solid-pop3d/pkg/PLIST
+++ b/mail/solid-pop3d/pkg/PLIST
@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.7 2009/08/06 23:40:47 martynas Exp $
+@comment $OpenBSD: PLIST,v 1.8 2011/05/11 12:57:48 jasper Exp $
@newgroup _solid-pop3d:635
@newuser _solid-pop3d:635:_solid-pop3d:daemon:solid-pop3d:/nonexistent:/sbin/nologin
+@extraunexec rm -rf /var/spool/spop3d/*
@man man/man5/dot-spop3d.5
@man man/man5/spop3d.conf.5
@man man/man8/spop3d.8
@ -9,4 +10,3 @@ sbin/spop3d
@sample /var/spool/spop3d/
@sample /var/spool/spop3d/bulletins/
@extra ${SYSCONFDIR}/spop3d.conf
-@extraunexec rm -rf /var/spool/spop3d/
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.13 2011/03/20 09:19:25 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.14 2011/05/11 12:57:48 jasper Exp $

 COMMENT =	mailing list manager with web interface

 VERSION =	6.1.3
 DISTNAME =	sympa-${VERSION}

-REVISION =	2
+REVISION =	3

 CATEGORIES =	mail www

--- a/mail/sympa/pkg/PLIST
+++ b/mail/sympa/pkg/PLIST
@ -1,6 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.4 2010/12/30 17:51:25 landry Exp $
+@comment $OpenBSD: PLIST,v 1.5 2011/05/11 12:57:48 jasper Exp $
@newgroup _sympa:648
@newuser _sympa:648:648:daemon:Sympa Daemon:/var/empty:/sbin/nologin
+@extraunexec rm -rf /var/sympa/*
@mode 755
@owner _sympa
@group _sympa
@ -574,6 +575,5 @@ share/sympa/web_tt2/which.tt2
 share/sympa/web_tt2/your_lists.tt2
@exec cp -r ${PREFIX}/share/sympa/icons /var/www/sympa/
@unexec rm -Rf /var/www/sympa/icons
-@extraunexec rm -rf /var/sympa
@rcscript ${RCDIR}/sympa
@rcscript ${RCDIR}/wwsympa