Tue Aug 16 14:21:48 2022 UTC ()
spamassassin: update to use latest rules file and install .asc file again

This makes the package break later in 'make install' when it finds out
that updates.spamassassin.org does not exist.

Bump PKGREVISION.


(wiz)
diff -r1.146 -r1.147 pkgsrc/mail/spamassassin/Makefile
diff -r1.23 -r1.24 pkgsrc/mail/spamassassin/PLIST
diff -r1.79 -r1.80 pkgsrc/mail/spamassassin/distinfo
cvs diff -r1.146 -r1.147 pkgsrc/mail/spamassassin/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/spamassassin/Makefile 2022/06/28 11:34:34 1.146
+++ pkgsrc/mail/spamassassin/Makefile 2022/08/16 14:21:48 1.147
@@ -1,44 +1,44 @@ @@ -1,44 +1,44 @@
1# $NetBSD: Makefile,v 1.146 2022/06/28 11:34:34 wiz Exp $ 1# $NetBSD: Makefile,v 1.147 2022/08/16 14:21:48 wiz Exp $
2 2
3VERSION= 3.4.6 3VERSION= 3.4.6
4DISTNAME= Mail-SpamAssassin-${VERSION} 4DISTNAME= Mail-SpamAssassin-${VERSION}
5PKGNAME= spamassassin-${VERSION} 5PKGNAME= spamassassin-${VERSION}
6PKGREVISION= 2 6PKGREVISION= 3
7CATEGORIES= mail perl5 7CATEGORIES= mail perl5
8MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/} 8MASTER_SITES= ${MASTER_SITE_APACHE:=spamassassin/source/}
9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 9DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
10DISTFILES+= ${RULESARCHIVE} 10DISTFILES+= ${RULESARCHIVE}
11#DISTFILES+= ${RULESARCHIVEASC} 11DISTFILES+= ${RULESARCHIVEASC}
12#DISTFILES+= ${RULESARCHIVESHA} 12#DISTFILES+= ${RULESARCHIVESHA}
13EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} 13EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
14 14
15MAINTAINER= pkgsrc-users@NetBSD.org 15MAINTAINER= pkgsrc-users@NetBSD.org
16HOMEPAGE= https://spamassassin.apache.org/ 16HOMEPAGE= https://spamassassin.apache.org/
17COMMENT= Mail filter to identify spam 17COMMENT= Mail filter to identify spam
18LICENSE= apache-2.0 18LICENSE= apache-2.0
19 19
20.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
21 21
22SMF_METHODS= spamassassin 22SMF_METHODS= spamassassin
23 23
24# The RULESARCHIVE path is taken from the link on the Download page 24# The RULESARCHIVE path is taken from the link on the Download page
25# reachable from $HOMEPAGE. 25# reachable from $HOMEPAGE.
26RULESARCHIVE= Mail-SpamAssassin-rules-3.4.4.r1873061.tgz 26RULESARCHIVE= Mail-SpamAssassin-rules-3.4.6.r1888502.tgz
27#RULESARCHIVEASC= ${RULESARCHIVE}.asc 27RULESARCHIVEASC= ${RULESARCHIVE}.asc
28#RULESARCHIVESHA= ${RULESARCHIVE}.sha1 28#RULESARCHIVESHA= ${RULESARCHIVE}.sha1
29FILES_SUBST+= RULESARCHIVE=${RULESDIR}/${RULESARCHIVE} 29FILES_SUBST+= RULESARCHIVE=${RULESDIR}/${RULESARCHIVE}
30PLIST_SUBST+= RULESARCHIVE=${RULESARCHIVE:Q} 30PLIST_SUBST+= RULESARCHIVE=${RULESARCHIVE:Q}
31#PLIST_SUBST+= RULESARCHIVEASC=${RULESARCHIVEASC:Q} 31PLIST_SUBST+= RULESARCHIVEASC=${RULESARCHIVEASC:Q}
32#PLIST_SUBST+= RULESARCHIVESHA=${RULESARCHIVESHA:Q} 32#PLIST_SUBST+= RULESARCHIVESHA=${RULESARCHIVESHA:Q}
33 33
34#DEPENDS+= {perl>=5.9.3,p5-Archive-Tar>=1.23}:../../archivers/p5-Archive-Tar 34#DEPENDS+= {perl>=5.9.3,p5-Archive-Tar>=1.23}:../../archivers/p5-Archive-Tar
35#DEPENDS+= {perl>=5,p5-DB_File-[0-9]*}:../../databases/p5-DB_File 35#DEPENDS+= {perl>=5,p5-DB_File-[0-9]*}:../../databases/p5-DB_File
36DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1 36DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
37DEPENDS+= p5-HTML-Parser>=3.43:../../www/p5-HTML-Parser 37DEPENDS+= p5-HTML-Parser>=3.43:../../www/p5-HTML-Parser
38#DEPENDS+= {perl>=5.9.3,p5-IO-Compress-[0-9]*}:../../devel/p5-IO-Compress # Compress::Zlib>=0 38#DEPENDS+= {perl>=5.9.3,p5-IO-Compress-[0-9]*}:../../devel/p5-IO-Compress # Compress::Zlib>=0
39#DEPENDS+= {perl>=5.9.3,p5-IO-Zlib>=1.04}:../../devel/p5-IO-Zlib 39#DEPENDS+= {perl>=5.9.3,p5-IO-Zlib>=1.04}:../../devel/p5-IO-Zlib
40DEPENDS+= p5-Mail-DKIM>=0.40:../../mail/p5-Mail-DKIM 40DEPENDS+= p5-Mail-DKIM>=0.40:../../mail/p5-Mail-DKIM
41DEPENDS+= p5-Mail-SPF-[0-9]*:../../mail/p5-Mail-SPF 41DEPENDS+= p5-Mail-SPF-[0-9]*:../../mail/p5-Mail-SPF
42#DEPENDS+= {p5-MIME-Base64>=2.11,perl>=5.8.0}:../../converters/p5-MIME-Base64 42#DEPENDS+= {p5-MIME-Base64>=2.11,perl>=5.8.0}:../../converters/p5-MIME-Base64
43DEPENDS+= p5-NetAddr-IP>=4.007:../../net/p5-NetAddr-IP 43DEPENDS+= p5-NetAddr-IP>=4.007:../../net/p5-NetAddr-IP
44DEPENDS+= p5-Net-DNS>=1.01:../../net/p5-Net-DNS 44DEPENDS+= p5-Net-DNS>=1.01:../../net/p5-Net-DNS
@@ -144,32 +144,27 @@ SUBST_STAGE.sa3= pre-configure @@ -144,32 +144,27 @@ SUBST_STAGE.sa3= pre-configure
144SUBST_FILES.sa3= INSTALL UPGRADE USAGE ldap/README 144SUBST_FILES.sa3= INSTALL UPGRADE USAGE ldap/README
145SUBST_FILES.sa3+= spamc/README.qmail spamc/spamc.pod 145SUBST_FILES.sa3+= spamc/README.qmail spamc/spamc.pod
146SUBST_FILES.sa3+= lib/Mail/SpamAssassin/Conf.pm 146SUBST_FILES.sa3+= lib/Mail/SpamAssassin/Conf.pm
147SUBST_FILES.sa3+= lib/Mail/SpamAssassin/Plugin/Test.pm 147SUBST_FILES.sa3+= lib/Mail/SpamAssassin/Plugin/Test.pm
148SUBST_FILES.sa3+= spamd/README spamd/README.vpopmail sql/README 148SUBST_FILES.sa3+= spamd/README spamd/README.vpopmail sql/README
149SUBST_FILES.sa3+= sql/README.awl sa-learn.raw sa-compile.raw sa-update.raw 149SUBST_FILES.sa3+= sql/README.awl sa-learn.raw sa-compile.raw sa-update.raw
150SUBST_SED.sa3= -e s!/usr/share!${PREFIX}/share!g 150SUBST_SED.sa3= -e s!/usr/share!${PREFIX}/share!g
151SUBST_SED.sa3+= -e s!/usr/bin!${PREFIX}/bin!g 151SUBST_SED.sa3+= -e s!/usr/bin!${PREFIX}/bin!g
152SUBST_SED.sa3+= -e s!/usr/local/bin!${PREFIX}/bin!g 152SUBST_SED.sa3+= -e s!/usr/local/bin!${PREFIX}/bin!g
153SUBST_SED.sa3+= -e s!/usr/lib!${PREFIX}/lib!g 153SUBST_SED.sa3+= -e s!/usr/lib!${PREFIX}/lib!g
154SUBST_SED.sa3+= -e s!/etc/mail/spamassassin!${PKG_SYSCONFDIR}!g 154SUBST_SED.sa3+= -e s!/etc/mail/spamassassin!${PKG_SYSCONFDIR}!g
155 155
156.if (${OPSYS} == "NetBSD") || (${OPSYS} == "DragonFly") 156.if (${OPSYS} == "NetBSD") || (${OPSYS} == "DragonFly")
157# the 'spamd' RCD_SCRIPT behaves differently if we run NetBSD 1.6 or later 
158. if (${OPSYS} == "NetBSD") && !empty(OS_VERSION:M1.[0-5]*) 
159INTERPRETER_SUPPORT= NO 
160. else 
161INTERPRETER_SUPPORT= YES 157INTERPRETER_SUPPORT= YES
162. endif 
163.endif 158.endif
164 159
165# These variables are substituted in netbsd-rc-script.sh. 160# These variables are substituted in netbsd-rc-script.sh.
166FILES_SUBST+= INTERPRETER_SUPPORT=${INTERPRETER_SUPPORT} 161FILES_SUBST+= INTERPRETER_SUPPORT=${INTERPRETER_SUPPORT}
167FILES_SUBST+= OPSYS=${OPSYS} 162FILES_SUBST+= OPSYS=${OPSYS}
168 163
169INSTALLATION_DIRS+= ${SA_INSTALLDIRS} 164INSTALLATION_DIRS+= ${SA_INSTALLDIRS}
170 165
171# Configure the programe that "sa-update" uses for fetching files 166# Configure the programe that "sa-update" uses for fetching files
172.if defined(TOOLS_PLATFORM.curl) 167.if defined(TOOLS_PLATFORM.curl)
173SA_UPDATE_FETCH_PROG= curl 168SA_UPDATE_FETCH_PROG= curl
174SA_UPDATE_FETCH_CMD= ${TOOLS_PLATFORM.curl} 169SA_UPDATE_FETCH_CMD= ${TOOLS_PLATFORM.curl}
175.elif defined(TOOLS_PLATFORM.fetch) 170.elif defined(TOOLS_PLATFORM.fetch)
@@ -200,28 +195,28 @@ post-install: @@ -200,28 +195,28 @@ post-install:
200.endfor 195.endfor
201 196
202 set -e ; cd ${WRKSRC}/rules; \ 197 set -e ; cd ${WRKSRC}/rules; \
203 for f in ${PRE_FILES}; do \ 198 for f in ${PRE_FILES}; do \
204 ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR} && \ 199 ${INSTALL_DATA} "$$f" ${DESTDIR}${EGDIR} && \
205 ${ECHO} "${EG_SUBDIR}/$$f" >> ${DYNAMIC_PLIST}; \ 200 ${ECHO} "${EG_SUBDIR}/$$f" >> ${DYNAMIC_PLIST}; \
206 done 201 done
207 # examples are in the static PLIST 202 # examples are in the static PLIST
208 ${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${DESTDIR}${EGDIR} 203 ${INSTALL_DATA} ${WRKSRC}/procmailrc.example ${DESTDIR}${EGDIR}
209 ${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${DESTDIR}${EGDIR} 204 ${INSTALL_DATA} ${WRKSRC}/rules/local.cf ${DESTDIR}${EGDIR}
210 ${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${DESTDIR}${EGDIR} 205 ${INSTALL_DATA} ${FILESDIR}/netbsd_lists.cf ${DESTDIR}${EGDIR}
211 ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVE} \ 206 ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVE} \
212 ${DESTDIR}${RULESDIR} 207 ${DESTDIR}${RULESDIR}
213# ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVEASC} \ 208 ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVEASC} \
214# ${DESTDIR}${RULESDIR} 209 ${DESTDIR}${RULESDIR}
215# ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVESHA} \ 210# ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${RULESARCHIVESHA} \
216# ${DESTDIR}${RULESDIR} 211# ${DESTDIR}${RULESDIR}
217 212
218# make sure we install the patched version of init.pre but can run the 213# make sure we install the patched version of init.pre but can run the
219# tests with the original file 214# tests with the original file
220pre-patch: 215pre-patch:
221 ${CP} ${WRKSRC}/rules/init.pre ${WRKDIR}/init.pre.notpatched 216 ${CP} ${WRKSRC}/rules/init.pre ${WRKDIR}/init.pre.notpatched
222 217
223post-patch: 218post-patch:
224 ${CP} ${WRKSRC}/rules/init.pre ${WRKDIR}/init.pre.patched 219 ${CP} ${WRKSRC}/rules/init.pre ${WRKDIR}/init.pre.patched
225 220
226pre-test: 221pre-test:
227 ${CP} ${WRKDIR}/init.pre.notpatched ${WRKSRC}/rules/init.pre 222 ${CP} ${WRKDIR}/init.pre.notpatched ${WRKSRC}/rules/init.pre
cvs diff -r1.23 -r1.24 pkgsrc/mail/spamassassin/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/spamassassin/PLIST 2015/09/09 19:13:48 1.23
+++ pkgsrc/mail/spamassassin/PLIST 2022/08/16 14:21:48 1.24
@@ -1,9 +1,10 @@ @@ -1,9 +1,10 @@
1@comment $NetBSD: PLIST,v 1.23 2015/09/09 19:13:48 christos Exp $ 1@comment $NetBSD: PLIST,v 1.24 2022/08/16 14:21:48 wiz Exp $
2@comment Most of this PLIST is auto-generated; see Makefile. 2@comment Most of this PLIST is auto-generated; see Makefile.
3share/examples/spamassassin/local.cf 3share/examples/spamassassin/local.cf
4share/examples/spamassassin/netbsd_lists.cf 4share/examples/spamassassin/netbsd_lists.cf
5share/examples/spamassassin/procmailrc.example 5share/examples/spamassassin/procmailrc.example
6share/spamassassin/languages 6share/spamassassin/languages
7share/spamassassin/sa-update-pubkey.txt 7share/spamassassin/sa-update-pubkey.txt
8share/spamassassin/user_prefs.template 8share/spamassassin/user_prefs.template
9share/spamassassin/${RULESARCHIVE} 9share/spamassassin/${RULESARCHIVE}
 10share/spamassassin/${RULESARCHIVE}.asc
cvs diff -r1.79 -r1.80 pkgsrc/mail/spamassassin/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/spamassassin/distinfo 2021/10/26 10:54:30 1.79
+++ pkgsrc/mail/spamassassin/distinfo 2022/08/16 14:21:48 1.80
@@ -1,14 +1,17 @@ @@ -1,14 +1,17 @@
1$NetBSD: distinfo,v 1.79 2021/10/26 10:54:30 nia Exp $ 1$NetBSD: distinfo,v 1.80 2022/08/16 14:21:48 wiz Exp $
2 2
3BLAKE2s (Mail-SpamAssassin-3.4.6.tar.gz) = d330863c4775e9dfc3ffb8158e3b145a3e43ff9122e686a074be7c2d1a2cb65d 3BLAKE2s (Mail-SpamAssassin-3.4.6.tar.gz) = d330863c4775e9dfc3ffb8158e3b145a3e43ff9122e686a074be7c2d1a2cb65d
4SHA512 (Mail-SpamAssassin-3.4.6.tar.gz) = 7910852f04463a7363a2fc3b70a35adadf5714552e57c5b8ca57beaa534ee18d9f06526cdbcf8bcd5781e5ca778f98d2f84ef2efd1872fa550cfe1689440364a 4SHA512 (Mail-SpamAssassin-3.4.6.tar.gz) = 7910852f04463a7363a2fc3b70a35adadf5714552e57c5b8ca57beaa534ee18d9f06526cdbcf8bcd5781e5ca778f98d2f84ef2efd1872fa550cfe1689440364a
5Size (Mail-SpamAssassin-3.4.6.tar.gz) = 6572574 bytes 5Size (Mail-SpamAssassin-3.4.6.tar.gz) = 6572574 bytes
6BLAKE2s (Mail-SpamAssassin-rules-3.4.4.r1873061.tgz) = a45930ab88019b844fe7128da7742fa5c6bf68c4d6a02543f10af103575cf525 6BLAKE2s (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) = 5ac6070924cf3093fda442bf1cbc059ea3dd98df0d9eea7eaad45eea6f7a177e
7SHA512 (Mail-SpamAssassin-rules-3.4.4.r1873061.tgz) = cc2f6949db4662cdcaf5dcef922e69d18320a591deb7fb98c1fb729d91d37f5164052ab6cd2e294657334874fbfc0cccdefc750910e0453cb8da0b3f263b3ede 7SHA512 (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) = 29167c2ab50de26954181ad53395d4270b8b15b7d3bb13d6c62aa2f13ed3bb7a54adcda944bbd4c8d0cf4fe918a2eb0f542ef420af2bd96a121cb3d9b55dd572
8Size (Mail-SpamAssassin-rules-3.4.4.r1873061.tgz) = 315930 bytes 8Size (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz) = 369768 bytes
 9BLAKE2s (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz.asc) = e1c0171d935698f2f3241a45ae16e34d990727ba8c0d6195e658eb77e4959b04
 10SHA512 (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz.asc) = 97066dfe751aa067b14368ebd0388666522257945bd0fd37d921371682209be6bd658199ca817bb0dd345c4ddb1cebe02015ca9ca3a33f167d68b7d029a07b0c
 11Size (Mail-SpamAssassin-rules-3.4.6.r1888502.tgz.asc) = 833 bytes
9SHA1 (patch-Makefile.PL) = bcf48afe3adce57fbe4ff0de583ca23bf5177aab 12SHA1 (patch-Makefile.PL) = bcf48afe3adce57fbe4ff0de583ca23bf5177aab
10SHA1 (patch-README) = 5d2aaecc4791e4f76df1078c17036cc23a39a8d0 13SHA1 (patch-README) = 5d2aaecc4791e4f76df1078c17036cc23a39a8d0
11SHA1 (patch-ae) = e6e83c1de1002b8db647779d17740e67103b69d8 14SHA1 (patch-ae) = e6e83c1de1002b8db647779d17740e67103b69d8
12SHA1 (patch-sa-update) = 0cac6f2315db8f80cd313473e8d141b49edb791f 15SHA1 (patch-sa-update) = 0cac6f2315db8f80cd313473e8d141b49edb791f
13SHA1 (patch-spamc_libspamc.c) = 757b845df445414d4ba0c2fb039dbc6d9e68b85f 16SHA1 (patch-spamc_libspamc.c) = 757b845df445414d4ba0c2fb039dbc6d9e68b85f
14SHA1 (patch-spamd_netbsd-rc-script.sh) = 192fc1876ee30a4475c0efd9be6340e87d9fa2f4 17SHA1 (patch-spamd_netbsd-rc-script.sh) = 192fc1876ee30a4475c0efd9be6340e87d9fa2f4