CVS commit: pkgsrc

["Niclas Rosenvik" <nros%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nros
Date:           Thu Dec  5 10:57:55 UTC 2019

Modified Files:
        pkgsrc/mail/cyrus-imapd23: Makefile
        pkgsrc/mail/cyrus-imapd24: Makefile
        pkgsrc/security/cyrus-sasl: Makefile.common

Log Message:
Drop ftp.cyrusimap.org from MASTER_SITES

ftp.cyrusimap.org has been down for months. Asked about this on the
cyrus-info mailinglist months ago with no responses. So lets drop it from
MASTER_SITES.
The directory old on the ftp is also available in the http download so I
added that to MASTER_SITES as well.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/mail/cyrus-imapd23/Makefile
cvs rdiff -u -r1.62 -r1.63 pkgsrc/mail/cyrus-imapd24/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/security/cyrus-sasl/Makefile.common

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/cyrus-imapd23/Makefile
diff -u pkgsrc/mail/cyrus-imapd23/Makefile:1.55 pkgsrc/mail/cyrus-imapd23/Makefile:1.56
--- pkgsrc/mail/cyrus-imapd23/Makefile:1.55     Sun Aug 11 13:21:26 2019
+++ pkgsrc/mail/cyrus-imapd23/Makefile  Thu Dec  5 10:57:54 2019
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.55 2019/08/11 13:21:26 wiz Exp $
+# $NetBSD: Makefile,v 1.56 2019/12/05 10:57:54 nros Exp $
 
 DISTNAME=      cyrus-imapd-2.3.18
 PKGREVISION=   31
 CATEGORIES=    mail
 MASTER_SITES=  http://cyrusimap.org/releases/
-MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-imapd/
-MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/
+MASTER_SITES+= https://www.cyrusimap.org/releases/old/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.cyrusimap.org/

Index: pkgsrc/mail/cyrus-imapd24/Makefile
diff -u pkgsrc/mail/cyrus-imapd24/Makefile:1.62 pkgsrc/mail/cyrus-imapd24/Makefile:1.63
--- pkgsrc/mail/cyrus-imapd24/Makefile:1.62     Sat Nov  2 16:25:19 2019
+++ pkgsrc/mail/cyrus-imapd24/Makefile  Thu Dec  5 10:57:54 2019
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.62 2019/11/02 16:25:19 rillig Exp $
+# $NetBSD: Makefile,v 1.63 2019/12/05 10:57:54 nros Exp $
 
 DISTNAME=      cyrus-imapd-2.4.20
 PKGREVISION=   7
 CATEGORIES=    mail
 MASTER_SITES=  http://cyrusimap.org/releases/
-MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-imapd/
-MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-imapd/OLD-VERSIONS/
+MASTER_SITES+= https://www.cyrusimap.org/releases/old/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://www.cyrusimap.org/

Index: pkgsrc/security/cyrus-sasl/Makefile.common
diff -u pkgsrc/security/cyrus-sasl/Makefile.common:1.30 pkgsrc/security/cyrus-sasl/Makefile.common:1.31
--- pkgsrc/security/cyrus-sasl/Makefile.common:1.30     Mon Nov  4 21:12:52 2019
+++ pkgsrc/security/cyrus-sasl/Makefile.common  Thu Dec  5 10:57:54 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2019/11/04 21:12:52 rillig Exp $
+# $NetBSD: Makefile.common,v 1.31 2019/12/05 10:57:54 nros Exp $
 #
 # used by security/cyrus-sasl/Makefile
 # used by security/cy2-anonymous/Makefile
@@ -21,7 +21,7 @@ DISTNAME=             cyrus-sasl-2.1.27
 DISTFILES=             ${DISTNAME}-rc7${EXTRACT_SUFX}
 CATEGORIES=            security
 MASTER_SITES=          https://www.cyrusimap.org/releases/
-MASTER_SITES+=         ftp://ftp.cyrusimap.org/cyrus-sasl/
+MASTER_SITES+=         https://www.cyrusimap.org/releases/old/
 #MASTER_SITES+=                ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/
 #PATCHFILES+=          cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2
 #SITES.cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2= \