- update to version 3.1.7 (by Andreas Vögele, with some cleanings)
- use /var/db/spamassassin as homedir for _spamdaemon user - does _not_ remove /var/db/spamassassin when using `pkg_delete -c` "go ahead" steven@
This commit is contained in:
ajacoutot
parent
adeb15f51f
commit
97c1694af7
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.42 2006/10/21 19:26:14 aanriot Exp $
|
||||
# $OpenBSD: Makefile,v 1.43 2006/10/27 10:12:44 ajacoutot Exp $
|
||||
|
||||
COMMENT= "mailfilter to identify and mark spam"
|
||||
|
||||
DISTNAME= Mail-SpamAssassin-3.1.4
|
||||
PKGNAME= p5-${DISTNAME}p1
|
||||
DISTNAME= Mail-SpamAssassin-3.1.7
|
||||
PKGNAME= p5-${DISTNAME}
|
||||
CATEGORIES= mail perl5
|
||||
|
||||
MAINTAINER= Andreas Voegele <andreas@altroot.de>
|
||||
@ -27,29 +27,25 @@ BUILD_DEPENDS= :p5-HTML-Parser->=3.31:www/p5-HTML-Parser \
|
||||
:p5-IO-Socket-SSL-*:security/p5-IO-Socket-SSL \
|
||||
:p5-libwww-*:www/p5-libwww \
|
||||
:p5-Archive-Tar->=1.23:archivers/p5-Archive-Tar \
|
||||
:p5-IO-Zlib->=1.04:archivers/p5-IO-Zlib \
|
||||
:gnupg-*:security/gnupg
|
||||
:p5-IO-Zlib->=1.04:archivers/p5-IO-Zlib
|
||||
|
||||
RUN_DEPENDS= ${BUILD_DEPENDS}
|
||||
RUN_DEPENDS= ${BUILD_DEPENDS} \
|
||||
:gnupg-*:security/gnupg
|
||||
|
||||
MAKE_ENV+= CC="${CC}"
|
||||
|
||||
CONFIGURE_STYLE= perl
|
||||
CONFIGURE_ARGS+= RUN_NET_TESTS="no" \
|
||||
CONFIGURE_ARGS+= DESTDIR=${WRKINST} \
|
||||
SYSCONFDIR=${SYSCONFDIR} \
|
||||
LOCALSTATEDIR=/var/db \
|
||||
LOCALSTATEDIR=${LOCALSTATEDIR} \
|
||||
CONTACT_ADDRESS="the administrator of this system" \
|
||||
ENABLE_SSL="yes"
|
||||
|
||||
CONFDIR= ${SYSCONFDIR}/mail/spamassassin
|
||||
RULES_DIR= ${PREFIX}/share/spamassassin
|
||||
LOCALSTATEDIR= /var/db/spamassassin
|
||||
SAMPLE_CONFDIR= ${PREFIX}/share/examples/SpamAssassin
|
||||
|
||||
SUBST_VARS= CONFDIR SAMPLE_CONFDIR
|
||||
|
||||
FAKE_FLAGS= ${DESTDIRNAME}=${WRKINST} \
|
||||
DEFRULESDIR=${WRKINST}${RULES_DIR} \
|
||||
LOCALRULESDIR=${WRKINST}${SAMPLE_CONFDIR}
|
||||
SUBST_VARS= CONFDIR LOCALSTATEDIR
|
||||
|
||||
# regress insists on creating files in $HOME
|
||||
PORTHOME= ${WRKDIR}/temp-home
|
||||
@ -57,32 +53,20 @@ PORTHOME= ${WRKDIR}/temp-home
|
||||
FAQ= OpenBSD-SpamAssassin-mini-howto.html
|
||||
DOCS= README UPGRADE LICENSE procmailrc.example \
|
||||
sample-nonspam.txt sample-spam.txt
|
||||
LOCALCF= local.cf init.pre v310.pre v312.pre
|
||||
|
||||
pre-configure:
|
||||
@perl -pi -e "s#\@\@LOCAL_RULES_DIR\@\@#${CONFDIR}#" ${WRKSRC}/rules/*
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/SpamAssassin
|
||||
${INSTALL_DATA_DIR} ${SAMPLE_CONFDIR}
|
||||
@sed -e "s|@SYSCONFDIR@|${SYSCONFDIR}|" \
|
||||
-e "s|@PREFIX@|${TRUEPREFIX}|" \
|
||||
${FILESDIR}/${FAQ} > ${WRKSRC}/${FAQ}
|
||||
cd ${WRKSRC} && ${INSTALL_DATA} ${FAQ} ${DOCS} \
|
||||
${PREFIX}/share/doc/SpamAssassin
|
||||
cd ${WRKSRC}/rules && ${INSTALL_DATA} ${LOCALCF} ${SAMPLE_CONFDIR}
|
||||
cd ${WRKSRC} && pod2man --section=1 spamc/spamc.pod > \
|
||||
${PREFIX}/man/man1/spamc.1
|
||||
cd ${WRKSRC} && pod2man --section=8 spamd/spamd > \
|
||||
${PREFIX}/man/man8/spamd.8
|
||||
# Extract the default GnuPG keys for sa-update. The keys will
|
||||
# be installed as config files in ${CONFDIR}/sa-update-keys.
|
||||
# Otherwise, sa-update would install the keys on its first
|
||||
# invocation. The sa-update utility also creates the directory
|
||||
# /var/db/spamassassin.
|
||||
${INSTALL_DATA_DIR} ${SAMPLE_CONFDIR}/sa-update-keys
|
||||
${LOCALBASE}/bin/gpg --homedir=${SAMPLE_CONFDIR}/sa-update-keys --batch --import ${WRKSRC}/rules/sa-update-pubkey.txt
|
||||
rm -f ${SAMPLE_CONFDIR}/sa-update-keys/pubring.gpg~
|
||||
-e "s|@PREFIX@|${TRUEPREFIX}|" \
|
||||
${FILESDIR}/${FAQ} > ${WRKSRC}/${FAQ}
|
||||
pod2man --section=1 ${WRKSRC}/spamc/spamc.pod > \
|
||||
${PREFIX}/man/man1/spamc.1
|
||||
${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${WRKSRC}/rules/*.pre \
|
||||
${SAMPLE_CONFDIR}
|
||||
.for i in ${FAQ} ${DOCS}
|
||||
${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/SpamAssassin
|
||||
.endfor
|
||||
|
||||
pre-regress:
|
||||
mkdir -p ${PORTHOME}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
MD5 (Mail-SpamAssassin-3.1.4.tar.gz) = 6259d1b1c5ce34c37596fc262c0b9663
|
||||
RMD160 (Mail-SpamAssassin-3.1.4.tar.gz) = 8aebcc9fa4ed0eafadab85eaafd2f7b488a7ff91
|
||||
SHA1 (Mail-SpamAssassin-3.1.4.tar.gz) = df88c2e27c1c8ede60a1b967443a3b16cc74cd9f
|
||||
SIZE (Mail-SpamAssassin-3.1.4.tar.gz) = 1142066
|
||||
MD5 (Mail-SpamAssassin-3.1.7.tar.gz) = 4b342c63949d47f3ce56b3fc1c8881c1
|
||||
RMD160 (Mail-SpamAssassin-3.1.7.tar.gz) = b5e5cffdbcfba6e58346bdd51c8adba1547fcca4
|
||||
SHA1 (Mail-SpamAssassin-3.1.7.tar.gz) = 3d31eff0eb9a158fab308958d65cdca81b8944bc
|
||||
SIZE (Mail-SpamAssassin-3.1.7.tar.gz) = 1168183
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-Makefile_PL,v 1.5 2006/06/06 17:33:41 steven Exp $
|
||||
--- Makefile.PL.orig Wed May 24 22:07:30 2006
|
||||
+++ Makefile.PL Fri May 26 08:21:11 2006
|
||||
@@ -857,7 +857,7 @@ sub MY::install {
|
||||
$OpenBSD: patch-Makefile_PL,v 1.6 2006/10/27 10:12:44 ajacoutot Exp $
|
||||
--- Makefile.PL.orig Thu Oct 26 14:47:10 2006
|
||||
+++ Makefile.PL Thu Oct 26 14:47:26 2006
|
||||
@@ -862,7 +862,7 @@ sub MY::install {
|
||||
|
||||
foreach (@code) {
|
||||
# Add our install targets as a dependency to all top-level install targets
|
||||
@ -10,17 +10,3 @@ $OpenBSD: patch-Makefile_PL,v 1.5 2006/06/06 17:33:41 steven Exp $
|
||||
|
||||
# Now do the DESTDIR hack, if necessary.
|
||||
next if !$mm_needs_destdir;
|
||||
@@ -1143,13 +1143,6 @@ qmail/qmail-spamc$(EXE_EXT): spamc/qmail
|
||||
#bin__install: $(INST_SCRIPT)/sa-filter
|
||||
# # $(RM_F) $(B_SCRIPTDIR)/spamassassin
|
||||
# # $(SYMLINK) $(INST_SCRIPT)/sa-filter $(B_SCRIPTDIR)/spamassassin
|
||||
-
|
||||
-conf__install:
|
||||
- -$(MKPATH) $(B_CONFDIR)
|
||||
- $(PERL) -MFile::Copy -e "copy(q{rules/local.cf}, q{$(B_CONFDIR)/local.cf}) unless -f q{$(B_CONFDIR)/local.cf}"
|
||||
- $(PERL) -MFile::Copy -e "copy(q{rules/init.pre}, q{$(B_CONFDIR)/init.pre}) unless -f q{$(B_CONFDIR)/init.pre}"
|
||||
- $(PERL) -MFile::Copy -e "copy(q{rules/v310.pre}, q{$(B_CONFDIR)/v310.pre}) unless -f q{$(B_CONFDIR)/v310.pre}"
|
||||
- $(PERL) -MFile::Copy -e "copy(q{rules/v312.pre}, q{$(B_CONFDIR)/v312.pre}) unless -f q{$(B_CONFDIR)/v312.pre}"
|
||||
|
||||
data__install:
|
||||
-$(MKPATH) $(B_DATADIR)
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- lib/Mail/SpamAssassin.pm.orig Fri Mar 10 20:29:55 2006
|
||||
+++ lib/Mail/SpamAssassin.pm Sun Mar 19 11:59:51 2006
|
||||
@@ -151,6 +151,7 @@ $HOME_URL = "http://spamassassin.apache.
|
||||
'/etc/mail/spamassassin/user_prefs.template',
|
||||
'/usr/local/share/spamassassin/user_prefs.template',
|
||||
'/usr/share/spamassassin/user_prefs.template',
|
||||
+ './rules/user_prefs.template',
|
||||
);
|
||||
|
||||
@default_userprefs_path = (
|
||||
@ -1,12 +1,21 @@
|
||||
$OpenBSD: patch-sa-update_raw,v 1.1 2006/08/10 18:24:45 steven Exp $
|
||||
--- sa-update.raw.orig Wed Jul 26 00:02:20 2006
|
||||
+++ sa-update.raw Sun Jul 30 19:20:01 2006
|
||||
@@ -1197,7 +1197,7 @@ Options:
|
||||
$OpenBSD: patch-sa-update_raw,v 1.2 2006/10/27 10:12:44 ajacoutot Exp $
|
||||
--- sa-update.raw.orig Mon Oct 9 19:34:35 2006
|
||||
+++ sa-update.raw Sun Oct 22 20:36:01 2006
|
||||
@@ -1225,7 +1225,7 @@ Options:
|
||||
|
||||
--updatedir path Directory to place updates, defaults to the
|
||||
SpamAssassin site rules directory (def:
|
||||
- /var/lib/spamassassin/<version>)
|
||||
+ /var/db/spamassassin/<version>)
|
||||
+ @@LOCAL_STATE_DIR@@/<version>)
|
||||
|
||||
--channel channel Retrieve updates from this channel
|
||||
Use multiple times for multiple channels
|
||||
@@ -1263,7 +1263,7 @@ Update archives are verified by default
|
||||
|
||||
By default, C<sa-update> will use the system-wide rules update directory:
|
||||
|
||||
- @@LOCAL_STATE_DIR@@/spamassassin/@@VERSION@@
|
||||
+ @@LOCAL_STATE_DIR@@/@@VERSION@@
|
||||
|
||||
If the updates should be stored in another location, specify it here.
|
||||
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-spamc_spamc_pod,v 1.3 2006/03/20 20:18:30 steven Exp $
|
||||
--- spamc/spamc.pod.orig Fri Mar 10 20:30:13 2006
|
||||
+++ spamc/spamc.pod Sun Mar 19 11:59:51 2006
|
||||
@@ -257,7 +257,7 @@ in an error code. The exit codes used a
|
||||
|
||||
=head1 SEE ALSO
|
||||
|
||||
-spamd(1)
|
||||
+spamd(8)
|
||||
spamassassin(1)
|
||||
Mail::SpamAssassin(3)
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
@comment $OpenBSD: PLIST,v 1.21 2006/10/21 19:26:14 aanriot Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.22 2006/10/27 10:12:44 ajacoutot Exp $
|
||||
@newgroup _spamdaemon:506
|
||||
@newuser _spamdaemon:506:506:daemon:SpamAssassin:/nonexistent:/sbin/nologin
|
||||
@newuser _spamdaemon:506:506:daemon:SpamAssassin:${LOCALSTATEDIR}:/sbin/nologin
|
||||
bin/sa-learn
|
||||
bin/sa-update
|
||||
bin/spamassassin
|
||||
@ -8,6 +8,7 @@ bin/spamc
|
||||
bin/spamd
|
||||
${P5SITE}/Mail/SpamAssassin/
|
||||
${P5SITE}/Mail/SpamAssassin.pm
|
||||
${P5SITE}/Mail/SpamAssassin/AICache.pm
|
||||
${P5SITE}/Mail/SpamAssassin/ArchiveIterator.pm
|
||||
${P5SITE}/Mail/SpamAssassin/AutoWhitelist.pm
|
||||
${P5SITE}/Mail/SpamAssassin/Bayes/
|
||||
@ -94,6 +95,7 @@ ${P5SITE}/spamassassin-run.pod
|
||||
@man man/man1/spamc.1
|
||||
@man man/man1/spamd.1
|
||||
@man man/man3p/Mail::SpamAssassin.3p
|
||||
@man man/man3p/Mail::SpamAssassin::AICache.3p
|
||||
@man man/man3p/Mail::SpamAssassin::ArchiveIterator.3p
|
||||
@man man/man3p/Mail::SpamAssassin::AutoWhitelist.3p
|
||||
@man man/man3p/Mail::SpamAssassin::Bayes.3p
|
||||
@ -144,7 +146,6 @@ ${P5SITE}/spamassassin-run.pod
|
||||
@man man/man3p/Mail::SpamAssassin::Util.3p
|
||||
@man man/man3p/Mail::SpamAssassin::Util::Progress.3p
|
||||
@man man/man3p/spamassassin-run.3p
|
||||
@man man/man8/spamd.8
|
||||
share/doc/SpamAssassin/
|
||||
share/doc/SpamAssassin/LICENSE
|
||||
share/doc/SpamAssassin/OpenBSD-SpamAssassin-mini-howto.html
|
||||
@ -159,16 +160,6 @@ share/examples/SpamAssassin/init.pre
|
||||
@sample ${CONFDIR}/init.pre
|
||||
share/examples/SpamAssassin/local.cf
|
||||
@sample ${CONFDIR}/local.cf
|
||||
share/examples/SpamAssassin/sa-update-keys/
|
||||
@mode go=
|
||||
@sample ${CONFDIR}/sa-update-keys/
|
||||
share/examples/SpamAssassin/sa-update-keys/pubring.gpg
|
||||
@sample ${CONFDIR}/sa-update-keys/pubring.gpg
|
||||
share/examples/SpamAssassin/sa-update-keys/secring.gpg
|
||||
@sample ${CONFDIR}/sa-update-keys/secring.gpg
|
||||
share/examples/SpamAssassin/sa-update-keys/trustdb.gpg
|
||||
@sample ${CONFDIR}/sa-update-keys/trustdb.gpg
|
||||
@mode
|
||||
share/examples/SpamAssassin/v310.pre
|
||||
@sample ${CONFDIR}/v310.pre
|
||||
share/examples/SpamAssassin/v312.pre
|
||||
@ -214,6 +205,7 @@ share/spamassassin/30_text_pt_br.cf
|
||||
share/spamassassin/50_scores.cf
|
||||
share/spamassassin/60_awl.cf
|
||||
share/spamassassin/60_whitelist.cf
|
||||
share/spamassassin/60_whitelist_dk.cf
|
||||
share/spamassassin/60_whitelist_dkim.cf
|
||||
share/spamassassin/60_whitelist_spf.cf
|
||||
share/spamassassin/60_whitelist_subject.cf
|
||||
@ -221,4 +213,7 @@ share/spamassassin/languages
|
||||
share/spamassassin/sa-update-pubkey.txt
|
||||
share/spamassassin/triplets.txt
|
||||
share/spamassassin/user_prefs.template
|
||||
@extraunexec rm -rf /var/db/spamassassin
|
||||
@owner _spamdaemon
|
||||
@group _spamdaemon
|
||||
@sample ${LOCALSTATEDIR}/
|
||||
@extraunexec rm -rf ${CONFDIR}/sa-update-keys
|
||||
|
||||
Loading…
Reference in New Issue
Block a user