Date: Sun, 6 Nov 2016 19:05:13 +0300 From: Andrej Zverev <andrej.zverev@gmail.com> To: Adam Weinberger <adamw@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r425497 - in head/mail/spamassassin: . files Message-ID: <CAD5bB%2BhP74Nrn0BCpaR71iddia6AC1-VGmYXKrcW1PqZJW19GA@mail.gmail.com> In-Reply-To: <201611061538.uA6FctD0018533@repo.freebsd.org> References: <201611061538.uA6FctD0018533@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Well. LOL. Thank you for take care. 6 =D0=BD=D0=BE=D1=8F=D0=B1. 2016 =D0=B3. 18:39 =D0=BF=D0=BE=D0=BB=D1=8C=D0= =B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C "Adam Weinberger" <adamw@free= bsd.org> =D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0=B0=D0=BB: > Author: adamw > Date: Sun Nov 6 15:38:55 2016 > New Revision: 425497 > URL: https://svnweb.freebsd.org/changeset/ports/425497 > > Log: > For quite a while now, the only update server for SpamAssassin hasn't > had a valid DNS entry. People have asked about it on the mailing list > as far back as August, but literally nobody has replied to any of those > posts, and no commits or wiki updates have been made regarding this, > making it reasonably appear that nobody on the SpamAssassin team has > noticed or cares that SpamAssassin no longer updates. > > For now, just add a patch that turns sa-update(1) into a no-op. > > While here, add a couple simple Makefile tweaks and bump PORTREVISION. > > Added: > head/mail/spamassassin/files/patch-sa-update.raw (contents, props > changed) > Modified: > head/mail/spamassassin/Makefile > head/mail/spamassassin/pkg-plist > > Modified: head/mail/spamassassin/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/mail/spamassassin/Makefile Sun Nov 6 15:31:40 2016 > (r425496) > +++ head/mail/spamassassin/Makefile Sun Nov 6 15:38:55 2016 > (r425497) > @@ -3,7 +3,7 @@ > > PORTNAME=3D spamassassin > PORTVERSION=3D 3.4.1 > -PORTREVISION?=3D 7 # also bump japanese/spamassassin > +PORTREVISION?=3D 8 # also bump japanese/spamassassin > CATEGORIES?=3D mail perl5 > MASTER_SITES=3D APACHE/spamassassin/source CPAN/Mail > DISTNAME=3D Mail-SpamAssassin-${PORTVERSION} > @@ -29,7 +29,7 @@ CONFLICTS?=3D ja-spamassassin-[0-9]* > > CPE_VENDOR=3D apache > > -USES=3D perl5 cpe > +USES=3D cpe perl5 > USE_PERL5=3D configure > USE_LDCONFIG=3D yes > > @@ -78,6 +78,8 @@ SUB_LIST+=3D SPAMD_OWN=3D"${USERS}:${GROUPS} > PLIST_SUB+=3D USER=3D${USERS} GROUP=3D${GROUPS} > OPTIONS_SUB=3D yes > > +AS_ROOT_SUB_LIST=3D RUN_AS_USER=3D"-u ${USERS} -H /var/spool/spamd" > +AS_ROOT_SUB_LIST_OFF=3D RUN_AS_USER=3D > DCC_RUN_DEPENDS=3D dcc-dccd>=3D1.3.111:mail/dcc-dccd > DKIM_RUN_DEPENDS=3D p5-IO-Socket-SSL>=3D0:security/p5-IO-Socket-SSL= \ > p5-Mail-DKIM>=3D0.37:mail/p5-Mail-DKIM \ > @@ -91,7 +93,7 @@ RAZOR_RUN_DEPENDS=3D razor-agents>=3D2.84:ma > RELAY_COUNTRY_RUN_DEPENDS=3D p5-Geo-IP>=3D0:net/p5-Geo-IP > SPF_QUERY_RUN_DEPENDS=3D p5-Mail-SPF>=3D0:mail/p5-Mail-SPF > > -SSL_USE=3D OPENSSL=3Dyes > +SSL_USES=3D ssl > SSL_RUN_DEPENDS=3D p5-IO-Socket-SSL>=3D0:security/p5-IO-Socket-SSL > SSL_CONFIGURE_ON=3D ENABLE_SSL=3Dyes > SSL_CONFIGURE_OFF=3D ENABLE_SSL=3Dno > @@ -128,12 +130,6 @@ SUB_LIST+=3D SQL_FLAG=3D"-Q" > SUB_LIST+=3D SQL_FLAG=3D"" > .endif > > -.if empty(PORT_OPTIONS:MAS_ROOT) > -SUB_LIST+=3D RUN_AS_USER=3D"-u ${USERS} -H /var/spool/spamd" > -.else > -SUB_LIST+=3D RUN_AS_USER=3D"" > -.endif > - > .if ${PORT_OPTIONS:MUPDATE_AND_COMPILE} && empty(PACKAGE_BUILDING) && > empty(BATCH) > PLIST_SUB+=3D UPDATE_ON_INSTALL=3D"yes" > .else > @@ -162,8 +158,6 @@ post-patch:: > . endif > .endfor > > - ${FIND} ${WRKSRC} -name '*.orig' -or -name '*.bak' -delete > - > pre-su-install: > @${MKDIR} ${STAGEDIR}${DATADIR} > ${INSTALL_LIB} ${WRKSRC}/spamc/libspamc.so > ${STAGEDIR}${PREFIX}/lib/libspamc.so.0 > > Added: head/mail/spamassassin/files/patch-sa-update.raw > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/mail/spamassassin/files/patch-sa-update.raw Sun Nov 6 > 15:38:55 2016 (r425497) > @@ -0,0 +1,12 @@ > +--- sa-update.raw.orig 2016-11-06 15:26:19 UTC > ++++ sa-update.raw > +@@ -162,7 +162,8 @@ my %valid_GPG =3D ( > + > + # Default list of channels to update against > + # > +-my @channels =3D ( 'updates.spamassassin.org' ); > ++#my @channels =3D ( 'updates.spamassassin.org' ); > ++my @channels =3D (); > + > + my $IGNORE_MIRBY_OLDER_THAN =3D (24 * 60 * 60 * 7); # 1 week > + > > Modified: head/mail/spamassassin/pkg-plist > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- head/mail/spamassassin/pkg-plist Sun Nov 6 15:31:40 2016 > (r425496) > +++ head/mail/spamassassin/pkg-plist Sun Nov 6 15:38:55 2016 > (r425497) > @@ -1,4 +1,4 @@ > -@unexec if service sa-spamd status | grep -q "spamd is running"; then > service sa-spamd stop; fi > +@preunexec if service sa-spamd status | grep -q "spamd is running"; then > service sa-spamd stop; fi > bin/sa-awl > bin/sa-check_spamd > bin/sa-compile > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAD5bB%2BhP74Nrn0BCpaR71iddia6AC1-VGmYXKrcW1PqZJW19GA>