pkgsrc: upgrade to 2.1.27-rc7 so that we can use it with openssl...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: pkgsrc: upgrade to 2.1.27-rc7 so that we can use it with openssl...
From: christos <christos%pkgsrc.org@localhost>
Date: Tue, 17 Apr 2018 03:00:26 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/7c87b4efcb95
branches:  trunk
changeset: 306423:7c87b4efcb95
user:      christos <christos%pkgsrc.org@localhost>
date:      Tue Apr 17 01:57:17 2018 +0000
description:
upgrade to 2.1.27-rc7 so that we can use it with openssl-1.1

diffstat:

 security/cy2-anonymous/Makefile                           |   4 +-
 security/cy2-crammd5/Makefile                             |   4 +-
 security/cy2-digestmd5/Makefile                           |   4 +-
 security/cy2-gssapi/Makefile                              |   4 +-
 security/cy2-ldapdb/Makefile                              |   4 +-
 security/cy2-login/Makefile                               |   4 +-
 security/cy2-ntlm/Makefile                                |   4 +-
 security/cy2-otp/Makefile                                 |   6 +-
 security/cy2-plain/Makefile                               |   4 +-
 security/cy2-scram/Makefile                               |   4 +-
 security/cy2-sql/Makefile                                 |   4 +-
 security/cyrus-sasl/Makefile                              |   6 +-
 security/cyrus-sasl/Makefile.common                       |  18 +++--
 security/cyrus-sasl/PLIST                                 |  27 +--------
 security/cyrus-sasl/distinfo                              |  22 ++----
 security/cyrus-sasl/patches/patch-configure               |  46 +++-----------
 security/cyrus-sasl/patches/patch-configure.in            |  28 ---------
 security/cyrus-sasl/patches/patch-include_sasl.h          |  16 -----
 security/cyrus-sasl/patches/patch-libsasl2.pc.in          |  10 ---
 security/cyrus-sasl/patches/patch-plugins_otp.c           |  14 +--
 security/cyrus-sasl/patches/patch-saslauthd_Makefile.in   |  23 +++++-
 security/cyrus-sasl/patches/patch-saslauthd_auth__rimap.c |  24 -------
 security/cyrus-sasl/patches/patch-saslauthd_md5global.h   |  40 -------------
 security/cyrus-sasl/patches/patch-saslauthd_saslcache.c   |  15 ----
 security/cyrus-saslauthd/Makefile                         |   6 +-
 security/cyrus-saslauthd/PLIST                            |   3 +-
 26 files changed, 85 insertions(+), 259 deletions(-)

diffs (truncated from 624 to 300 lines):

diff -r f372ef168a7f -r 7c87b4efcb95 security/cy2-anonymous/Makefile
--- a/security/cy2-anonymous/Makefile   Mon Apr 16 21:33:08 2018 +0000
+++ b/security/cy2-anonymous/Makefile   Tue Apr 17 01:57:17 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2017/04/27 13:56:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2018/04/17 01:57:18 christos Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-anonymous/}
-PKGREVISION=   1
+#PKGREVISION=  1
 COMMENT=       Cyrus SASL ANONYMOUS authentication plugin
 SASL_PLUGIN=   yes
 
diff -r f372ef168a7f -r 7c87b4efcb95 security/cy2-crammd5/Makefile
--- a/security/cy2-crammd5/Makefile     Mon Apr 16 21:33:08 2018 +0000
+++ b/security/cy2-crammd5/Makefile     Tue Apr 17 01:57:17 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2017/04/27 13:56:46 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2018/04/17 01:57:18 christos Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-crammd5/}
-PKGREVISION=   1
+#PKGREVISION=  1
 COMMENT=       Cyrus SASL CRAM-MD5 authentication plugin
 SASL_PLUGIN=   yes
 
diff -r f372ef168a7f -r 7c87b4efcb95 security/cy2-digestmd5/Makefile
--- a/security/cy2-digestmd5/Makefile   Mon Apr 16 21:33:08 2018 +0000
+++ b/security/cy2-digestmd5/Makefile   Tue Apr 17 01:57:17 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2017/04/27 13:56:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.21 2018/04/17 01:57:18 christos Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-digestmd5/}
-PKGREVISION=   4
+#PKGREVISION=  4
 COMMENT=       Cyrus SASL DIGEST-MD5 authentication plugin
 SASL_PLUGIN=   yes
 
diff -r f372ef168a7f -r 7c87b4efcb95 security/cy2-gssapi/Makefile
--- a/security/cy2-gssapi/Makefile      Mon Apr 16 21:33:08 2018 +0000
+++ b/security/cy2-gssapi/Makefile      Tue Apr 17 01:57:17 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2017/04/27 13:56:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.27 2018/04/17 01:57:18 christos Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-gssapi/}
-PKGREVISION=   4
+#PKGREVISION=  4
 COMMENT=       Cyrus SASL GSSAPI authentication plugin
 SASL_PLUGIN=   yes
 
diff -r f372ef168a7f -r 7c87b4efcb95 security/cy2-ldapdb/Makefile
--- a/security/cy2-ldapdb/Makefile      Mon Apr 16 21:33:08 2018 +0000
+++ b/security/cy2-ldapdb/Makefile      Tue Apr 17 01:57:17 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2017/04/27 13:56:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.13 2018/04/17 01:57:18 christos Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-ldapdb/}
-PKGREVISION=   4
+#PKGREVISION=  4
 COMMENT=       Cyrus SASL LDAPDB authentication plugin
 SASL_PLUGIN=   yes
 
diff -r f372ef168a7f -r 7c87b4efcb95 security/cy2-login/Makefile
--- a/security/cy2-login/Makefile       Mon Apr 16 21:33:08 2018 +0000
+++ b/security/cy2-login/Makefile       Tue Apr 17 01:57:17 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2017/04/27 13:56:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.18 2018/04/17 01:57:18 christos Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-login/}
-PKGREVISION=   1
+#PKGREVISION=  1
 COMMENT=       Cyrus SASL LOGIN authentication plugin
 SASL_PLUGIN=   yes
 
diff -r f372ef168a7f -r 7c87b4efcb95 security/cy2-ntlm/Makefile
--- a/security/cy2-ntlm/Makefile        Mon Apr 16 21:33:08 2018 +0000
+++ b/security/cy2-ntlm/Makefile        Tue Apr 17 01:57:17 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2017/04/27 13:56:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.29 2018/04/17 01:57:18 christos Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-ntlm/}
-PKGREVISION=   4
+#PKGREVISION=  4
 COMMENT=       Cyrus SASL NTLM authentication plugin
 SASL_PLUGIN=   yes
 
diff -r f372ef168a7f -r 7c87b4efcb95 security/cy2-otp/Makefile
--- a/security/cy2-otp/Makefile Mon Apr 16 21:33:08 2018 +0000
+++ b/security/cy2-otp/Makefile Tue Apr 17 01:57:17 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2017/04/27 13:56:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.22 2018/04/17 01:57:18 christos Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-otp/}
-PKGREVISION=   5
+#PKGREVISION=  5
 COMMENT=       Cyrus SASL OTP authentication plugin
 SASL_PLUGIN=   yes
 
@@ -13,7 +13,7 @@
 CONFIGURE_ARGS+=       --with-openssl=${SSLBASE:Q}
 
 BUILD_DIRS=    plugins
-BUILD_TARGET=  libotp.la
+#BUILD_TARGET= libotp.la
 
 .include "../../security/openssl/buildlink3.mk"
 
diff -r f372ef168a7f -r 7c87b4efcb95 security/cy2-plain/Makefile
--- a/security/cy2-plain/Makefile       Mon Apr 16 21:33:08 2018 +0000
+++ b/security/cy2-plain/Makefile       Tue Apr 17 01:57:17 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2017/04/27 13:56:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.11 2018/04/17 01:57:18 christos Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-plain/}
-PKGREVISION=   1
+#PKGREVISION=  1
 COMMENT=       Cyrus SASL PLAIN authentication plugin
 SASL_PLUGIN=   yes
 
diff -r f372ef168a7f -r 7c87b4efcb95 security/cy2-scram/Makefile
--- a/security/cy2-scram/Makefile       Mon Apr 16 21:33:08 2018 +0000
+++ b/security/cy2-scram/Makefile       Tue Apr 17 01:57:17 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2017/04/27 13:56:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.9 2018/04/17 01:57:19 christos Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-scram/}
-PKGREVISION=   4
+#PKGREVISION=  4
 COMMENT=       Cyrus SASL SCRAM authentication plugin
 SASL_PLUGIN=   yes
 
diff -r f372ef168a7f -r 7c87b4efcb95 security/cy2-sql/Makefile
--- a/security/cy2-sql/Makefile Mon Apr 16 21:33:08 2018 +0000
+++ b/security/cy2-sql/Makefile Tue Apr 17 01:57:17 2018 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.37 2018/04/14 07:34:39 adam Exp $
+# $NetBSD: Makefile,v 1.38 2018/04/17 01:57:19 christos Exp $
 
 PKGNAME=       ${DISTNAME:S/cyrus-sasl/cy2-sql/}
-PKGREVISION=   15
+#PKGREVISION=  15
 COMMENT=       Cyrus SASL SQL authentication plugin
 SASL_PLUGIN=   yes
 
diff -r f372ef168a7f -r 7c87b4efcb95 security/cyrus-sasl/Makefile
--- a/security/cyrus-sasl/Makefile      Mon Apr 16 21:33:08 2018 +0000
+++ b/security/cyrus-sasl/Makefile      Tue Apr 17 01:57:17 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.73 2018/01/28 20:11:03 wiz Exp $
+# $NetBSD: Makefile,v 1.74 2018/04/17 01:57:17 christos Exp $
 
-PKGREVISION=   7
+#PKGREVISION=  7
 COMMENT=       Simple Authentication and Security Layer
 
 .include "Makefile.common"
@@ -65,7 +65,7 @@
 
 post-install:
        ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
-       cd ${WRKSRC}/doc; for file in *.fig *.html *.txt; do            \
+       cd ${WRKSRC}/doc/legacy; for file in *.fig *.html *.txt; do             \
                ${INSTALL_DATA} $${file} ${DESTDIR}${DOCDIR};           \
        done
 
diff -r f372ef168a7f -r 7c87b4efcb95 security/cyrus-sasl/Makefile.common
--- a/security/cyrus-sasl/Makefile.common       Mon Apr 16 21:33:08 2018 +0000
+++ b/security/cyrus-sasl/Makefile.common       Tue Apr 17 01:57:17 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2017/04/27 13:56:47 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.27 2018/04/17 01:57:17 christos Exp $
 #
 # used by security/cyrus-sasl/Makefile
 # used by security/cy2-anonymous/Makefile
@@ -17,14 +17,15 @@
 # This Makefile fragment should be included _below_ any SASL_PLUGIN
 # definition and _above_ any CONFIGURE_ARGS definitions.
 
-DISTNAME=      cyrus-sasl-2.1.26
+DISTNAME=      cyrus-sasl-2.1.27
+DISTFILES=     ${DISTNAME}-rc7${EXTRACT_SUFX}
 CATEGORIES=    security
 MASTER_SITES=  ftp://ftp.cyrusimap.org/cyrus-sasl/
-MASTER_SITES+= ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/
-PATCHFILES+=   cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2
-SITES.cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2= \
-               -https://cgit.cyrus.foundation/cyrus-sasl/patch/?id=dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d
-PATCH_DIST_STRIP=      -p1
+#MASTER_SITES+=        ftp://ftp.cyrusimap.org/cyrus-sasl/OLD-VERSIONS/
+#PATCHFILES+=  cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2
+#SITES.cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2= \
+#              -https://cgit.cyrus.foundation/cyrus-sasl/patch/?id=dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d
+#PATCH_DIST_STRIP=     -p1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://www.cyrussasl.org/
@@ -87,6 +88,9 @@
 
 PKGCONFIG_OVERRIDE+=   libsasl2.pc.in
 
+pre-build:
+        cd ${WRKSRC}/common && ${BUILD_MAKE_CMD} all
+
 # Left here as reference for patch makers...
 # clean up a bit to help package maintainer produce patch files
 #
diff -r f372ef168a7f -r 7c87b4efcb95 security/cyrus-sasl/PLIST
--- a/security/cyrus-sasl/PLIST Mon Apr 16 21:33:08 2018 +0000
+++ b/security/cyrus-sasl/PLIST Tue Apr 17 01:57:17 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2012/12/16 01:36:44 obache Exp $
+@comment $NetBSD: PLIST,v 1.9 2018/04/17 01:57:17 christos Exp $
 include/sasl/hmac-md5.h
 include/sasl/md5.h
 include/sasl/md5global.h
@@ -61,39 +61,16 @@
 share/doc/cyrus-sasl/advanced.html
 share/doc/cyrus-sasl/appconvert.html
 share/doc/cyrus-sasl/components.html
-share/doc/cyrus-sasl/draft-burdis-cat-srp-sasl-xx.txt
-share/doc/cyrus-sasl/draft-ietf-sasl-anon-xx.txt
-share/doc/cyrus-sasl/draft-ietf-sasl-crammd5-xx.txt
-share/doc/cyrus-sasl/draft-ietf-sasl-gssapi-xx.txt
-share/doc/cyrus-sasl/draft-ietf-sasl-plain-xx.txt
-share/doc/cyrus-sasl/draft-ietf-sasl-rfc2222bis-xx.txt
-share/doc/cyrus-sasl/draft-ietf-sasl-rfc2831bis-xx.txt
-share/doc/cyrus-sasl/draft-ietf-sasl-saslprep-xx.txt
-share/doc/cyrus-sasl/draft-murchison-sasl-login-xx.txt
-share/doc/cyrus-sasl/draft-newman-sasl-c-api-xx.txt
-share/doc/cyrus-sasl/draft-newman-sasl-passdss-xx.txt
 share/doc/cyrus-sasl/gssapi.html
 share/doc/cyrus-sasl/index.html
 share/doc/cyrus-sasl/install.html
 share/doc/cyrus-sasl/macosx.html
 share/doc/cyrus-sasl/mechanisms.html
 share/doc/cyrus-sasl/options.html
+share/doc/cyrus-sasl/os390.html
 share/doc/cyrus-sasl/plugprog.html
 share/doc/cyrus-sasl/programming.html
 share/doc/cyrus-sasl/readme.html
-share/doc/cyrus-sasl/rfc1321.txt
-share/doc/cyrus-sasl/rfc1939.txt
-share/doc/cyrus-sasl/rfc2104.txt
-share/doc/cyrus-sasl/rfc2195.txt
-share/doc/cyrus-sasl/rfc2222.txt
-share/doc/cyrus-sasl/rfc2243.txt
-share/doc/cyrus-sasl/rfc2245.txt
-share/doc/cyrus-sasl/rfc2289.txt
-share/doc/cyrus-sasl/rfc2444.txt
-share/doc/cyrus-sasl/rfc2595.txt
-share/doc/cyrus-sasl/rfc2831.txt
-share/doc/cyrus-sasl/rfc2945.txt
-share/doc/cyrus-sasl/rfc3174.txt
 share/doc/cyrus-sasl/server-plugin-flow.fig
 share/doc/cyrus-sasl/sysadmin.html
 share/doc/cyrus-sasl/testing.txt
diff -r f372ef168a7f -r 7c87b4efcb95 security/cyrus-sasl/distinfo
--- a/security/cyrus-sasl/distinfo      Mon Apr 16 21:33:08 2018 +0000
+++ b/security/cyrus-sasl/distinfo      Tue Apr 17 01:57:17 2018 +0000
@@ -1,20 +1,14 @@
-$NetBSD: distinfo,v 1.34 2016/09/11 06:11:15 richard Exp $
+$NetBSD: distinfo,v 1.35 2018/04/17 01:57:17 christos Exp $
 
-SHA1 (cyrus-sasl-2.1.26.tar.gz) = d6669fb91434192529bd13ee95737a8a5040241c
-RMD160 (cyrus-sasl-2.1.26.tar.gz) = 861a06d663cf3da37a198d0f971d99b249b5f4b8
-SHA512 (cyrus-sasl-2.1.26.tar.gz) = 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0
-Size (cyrus-sasl-2.1.26.tar.gz) = 5220231 bytes
+SHA1 (cyrus-sasl-2.1.27-rc7.tar.gz) = d4b72782975be980cc46ac9ccf176b8307bfcf67
+RMD160 (cyrus-sasl-2.1.27-rc7.tar.gz) = 6679c7b887f73da50a314dba97f676848d067684
+SHA512 (cyrus-sasl-2.1.27-rc7.tar.gz) = 498b0f83e99f77dcf56bd2b735e71b554571703305ef9ef64038f04ef235b39d49e7b2363fc8b9952dbe2f4921542c31811e93618d7ceb468d73b4f6dafa89aa
+Size (cyrus-sasl-2.1.27-rc7.tar.gz) = 4146356 bytes
 SHA1 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = 7fef4cda079e451517b950e99dfd49f255b9d113
 RMD160 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = c42b1b5c0b6c7322001fd506c44320a7f6eeee80
 SHA512 (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = 
08964bc3ad713e137b8f05f9bac345d79676d14784bc37525f195e8e2a3e6740428237b64f7eeeacc0c71ed6cf1664c6e9c2267ac6df327761d92174a1853744
 Size (cyrus-sasl-dedad73e5e7a75d01a5f3d5a6702ab8ccd2ff40d.patch.v2) = 3836 bytes
-SHA1 (patch-configure) = 473e4bb41d6e5c6ac136288b673880bd123853cf
-SHA1 (patch-configure.in) = c1bc731ea44e13943dc3952c46a0e588364c1dc7
-SHA1 (patch-include_sasl.h) = 315e9e8236108b49955dbf304a56b17cd028a8d6
-SHA1 (patch-libsasl2.pc.in) = ef5679feef7afb12429071020892d88ecd7c43e6
-SHA1 (patch-plugins_otp.c) = 482dfaa16efd9577274ed43d90aaec1bcf451337
-SHA1 (patch-saslauthd_Makefile.in) = b7962486aef16ec1e5b27a05a3405d79540f8e20
-SHA1 (patch-saslauthd_auth__rimap.c) = cc3e04ae0cf049eeb507df3226a2098528afaaab
+SHA1 (patch-configure) = 1afa4777f2cc2a24bb526fab9fb6d9265677fb9f
+SHA1 (patch-plugins_otp.c) = 1dd8763d5b14c2f2462349ce5f73353ae70313fa
+SHA1 (patch-saslauthd_Makefile.in) = 397bc893975ff4d8b0067dae571381f06486493d
 SHA1 (patch-saslauthd_ipc__doors.c) = 2470ed0f04a19f487811dec405f68ce91d4a4cd0
-SHA1 (patch-saslauthd_md5global.h) = fc200c6aee12bf58877c7a755c121441ebaa1bde
-SHA1 (patch-saslauthd_saslcache.c) = 725db77c5d56f58331255957a65d385267ddcaed
diff -r f372ef168a7f -r 7c87b4efcb95 security/cyrus-sasl/patches/patch-configure
--- a/security/cyrus-sasl/patches/patch-configure       Mon Apr 16 21:33:08 2018 +0000
+++ b/security/cyrus-sasl/patches/patch-configure       Tue Apr 17 01:57:17 2018 +0000
@@ -1,8 +1,8 @@
Prev by Date: pkgsrc: note cyrus-sasl change (do I need to mention all the cy2...
Next by Date: pkgsrc: pkg_install: Update to 20180417.
Previous by Thread: pkgsrc: note cyrus-sasl change (do I need to mention all the cy2...
Next by Thread: pkgsrc: pkg_install: Update to 20180417.
Indexes:
Home | Main Index | Thread Index | Old Index