CVS commit: pkgsrc/security

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/security
From: "Christos Zoulas" <christos%netbsd.org@localhost>
Date: Mon, 16 Apr 2018 21:57:19 -0400

Module Name:    pkgsrc
Committed By:   christos
Date:           Tue Apr 17 01:57:19 UTC 2018

Modified Files:
        pkgsrc/security/cy2-anonymous: Makefile
        pkgsrc/security/cy2-crammd5: Makefile
        pkgsrc/security/cy2-digestmd5: Makefile
        pkgsrc/security/cy2-gssapi: Makefile
        pkgsrc/security/cy2-ldapdb: Makefile
        pkgsrc/security/cy2-login: Makefile
        pkgsrc/security/cy2-ntlm: Makefile
        pkgsrc/security/cy2-otp: Makefile
        pkgsrc/security/cy2-plain: Makefile
        pkgsrc/security/cy2-scram: Makefile
        pkgsrc/security/cy2-sql: Makefile
        pkgsrc/security/cyrus-sasl: Makefile Makefile.common PLIST distinfo
        pkgsrc/security/cyrus-sasl/patches: patch-configure patch-plugins_otp.c
            patch-saslauthd_Makefile.in
        pkgsrc/security/cyrus-saslauthd: Makefile PLIST
Removed Files:
        pkgsrc/security/cyrus-sasl/patches: patch-configure.in
            patch-include_sasl.h patch-libsasl2.pc.in
            patch-saslauthd_auth__rimap.c patch-saslauthd_md5global.h
            patch-saslauthd_saslcache.c

Log Message:
upgrade to 2.1.27-rc7 so that we can use it with openssl-1.1


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/cy2-anonymous/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/cy2-crammd5/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/security/cy2-digestmd5/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/security/cy2-gssapi/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/security/cy2-ldapdb/Makefile
cvs rdiff -u -r1.17 -r1.18 pkgsrc/security/cy2-login/Makefile
cvs rdiff -u -r1.28 -r1.29 pkgsrc/security/cy2-ntlm/Makefile
cvs rdiff -u -r1.21 -r1.22 pkgsrc/security/cy2-otp/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/security/cy2-plain/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/cy2-scram/Makefile
cvs rdiff -u -r1.37 -r1.38 pkgsrc/security/cy2-sql/Makefile
cvs rdiff -u -r1.73 -r1.74 pkgsrc/security/cyrus-sasl/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/security/cyrus-sasl/Makefile.common
cvs rdiff -u -r1.8 -r1.9 pkgsrc/security/cyrus-sasl/PLIST
cvs rdiff -u -r1.34 -r1.35 pkgsrc/security/cyrus-sasl/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/security/cyrus-sasl/patches/patch-configure \
    pkgsrc/security/cyrus-sasl/patches/patch-plugins_otp.c \
    pkgsrc/security/cyrus-sasl/patches/patch-saslauthd_Makefile.in
cvs rdiff -u -r1.1 -r0 pkgsrc/security/cyrus-sasl/patches/patch-configure.in \
    pkgsrc/security/cyrus-sasl/patches/patch-libsasl2.pc.in \
    pkgsrc/security/cyrus-sasl/patches/patch-saslauthd_md5global.h \
    pkgsrc/security/cyrus-sasl/patches/patch-saslauthd_saslcache.c
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/security/cyrus-sasl/patches/patch-include_sasl.h
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/security/cyrus-sasl/patches/patch-saslauthd_auth__rimap.c
cvs rdiff -u -r1.52 -r1.53 pkgsrc/security/cyrus-saslauthd/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/security/cyrus-saslauthd/PLIST

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

Modified files:

Index: pkgsrc/security/cy2-anonymous/Makefile
diff -u pkgsrc/security/cy2-anonymous/Makefile:1.10 pkgsrc/security/cy2-anonymous/Makefile:1.11
--- pkgsrc/security/cy2-anonymous/Makefile:1.10 Thu Apr 27 09:56:46 2017
+++ pkgsrc/security/cy2-anonymous/Makefile      Mon Apr 16 21:57:18 2018
@@ -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
 

Index: pkgsrc/security/cy2-crammd5/Makefile
diff -u pkgsrc/security/cy2-crammd5/Makefile:1.10 pkgsrc/security/cy2-crammd5/Makefile:1.11
--- pkgsrc/security/cy2-crammd5/Makefile:1.10   Thu Apr 27 09:56:46 2017
+++ pkgsrc/security/cy2-crammd5/Makefile        Mon Apr 16 21:57:18 2018
@@ -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
 

Index: pkgsrc/security/cy2-digestmd5/Makefile
diff -u pkgsrc/security/cy2-digestmd5/Makefile:1.20 pkgsrc/security/cy2-digestmd5/Makefile:1.21
--- pkgsrc/security/cy2-digestmd5/Makefile:1.20 Thu Apr 27 09:56:47 2017
+++ pkgsrc/security/cy2-digestmd5/Makefile      Mon Apr 16 21:57:18 2018
@@ -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
 

Index: pkgsrc/security/cy2-gssapi/Makefile
diff -u pkgsrc/security/cy2-gssapi/Makefile:1.26 pkgsrc/security/cy2-gssapi/Makefile:1.27
--- pkgsrc/security/cy2-gssapi/Makefile:1.26    Thu Apr 27 09:56:47 2017
+++ pkgsrc/security/cy2-gssapi/Makefile Mon Apr 16 21:57:18 2018
@@ -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
 

Index: pkgsrc/security/cy2-ldapdb/Makefile
diff -u pkgsrc/security/cy2-ldapdb/Makefile:1.12 pkgsrc/security/cy2-ldapdb/Makefile:1.13
--- pkgsrc/security/cy2-ldapdb/Makefile:1.12    Thu Apr 27 09:56:47 2017
+++ pkgsrc/security/cy2-ldapdb/Makefile Mon Apr 16 21:57:18 2018
@@ -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
 

Index: pkgsrc/security/cy2-login/Makefile
diff -u pkgsrc/security/cy2-login/Makefile:1.17 pkgsrc/security/cy2-login/Makefile:1.18
--- pkgsrc/security/cy2-login/Makefile:1.17     Thu Apr 27 09:56:47 2017
+++ pkgsrc/security/cy2-login/Makefile  Mon Apr 16 21:57:18 2018
@@ -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
 

Index: pkgsrc/security/cy2-ntlm/Makefile
diff -u pkgsrc/security/cy2-ntlm/Makefile:1.28 pkgsrc/security/cy2-ntlm/Makefile:1.29
--- pkgsrc/security/cy2-ntlm/Makefile:1.28      Thu Apr 27 09:56:47 2017
+++ pkgsrc/security/cy2-ntlm/Makefile   Mon Apr 16 21:57:18 2018
@@ -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
 

Index: pkgsrc/security/cy2-otp/Makefile
diff -u pkgsrc/security/cy2-otp/Makefile:1.21 pkgsrc/security/cy2-otp/Makefile:1.22
--- pkgsrc/security/cy2-otp/Makefile:1.21       Thu Apr 27 09:56:47 2017
+++ pkgsrc/security/cy2-otp/Makefile    Mon Apr 16 21:57:18 2018
@@ -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+=      --enable-otp
 CONFIGURE_ARGS+=       --with-openssl=${SSLBASE:Q}
 
 BUILD_DIRS=    plugins
-BUILD_TARGET=  libotp.la
+#BUILD_TARGET= libotp.la
 
 .include "../../security/openssl/buildlink3.mk"
 

Index: pkgsrc/security/cy2-plain/Makefile
diff -u pkgsrc/security/cy2-plain/Makefile:1.10 pkgsrc/security/cy2-plain/Makefile:1.11
--- pkgsrc/security/cy2-plain/Makefile:1.10     Thu Apr 27 09:56:47 2017
+++ pkgsrc/security/cy2-plain/Makefile  Mon Apr 16 21:57:18 2018
@@ -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
 

Index: pkgsrc/security/cy2-scram/Makefile
diff -u pkgsrc/security/cy2-scram/Makefile:1.8 pkgsrc/security/cy2-scram/Makefile:1.9
--- pkgsrc/security/cy2-scram/Makefile:1.8      Thu Apr 27 09:56:47 2017
+++ pkgsrc/security/cy2-scram/Makefile  Mon Apr 16 21:57:19 2018
@@ -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
 

Index: pkgsrc/security/cy2-sql/Makefile
diff -u pkgsrc/security/cy2-sql/Makefile:1.37 pkgsrc/security/cy2-sql/Makefile:1.38
--- pkgsrc/security/cy2-sql/Makefile:1.37       Sat Apr 14 03:34:39 2018
+++ pkgsrc/security/cy2-sql/Makefile    Mon Apr 16 21:57:19 2018
@@ -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
 

Index: pkgsrc/security/cyrus-sasl/Makefile
diff -u pkgsrc/security/cyrus-sasl/Makefile:1.73 pkgsrc/security/cyrus-sasl/Makefile:1.74
--- pkgsrc/security/cyrus-sasl/Makefile:1.73    Sun Jan 28 15:11:03 2018
+++ pkgsrc/security/cyrus-sasl/Makefile Mon Apr 16 21:57:17 2018
@@ -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 @@ MESSAGE_SUBST+=               PLUGINDIR=${PLUGINDIR:Q
 
 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
 

Index: pkgsrc/security/cyrus-sasl/Makefile.common
diff -u pkgsrc/security/cyrus-sasl/Makefile.common:1.26 pkgsrc/security/cyrus-sasl/Makefile.common:1.27
--- pkgsrc/security/cyrus-sasl/Makefile.common:1.26     Thu Apr 27 09:56:47 2017
+++ pkgsrc/security/cyrus-sasl/Makefile.common  Mon Apr 16 21:57:17 2018
@@ -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 @@ CONFIGURE_ARGS+=      --without-saslauthd
 
 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
 #

Index: pkgsrc/security/cyrus-sasl/PLIST
diff -u pkgsrc/security/cyrus-sasl/PLIST:1.8 pkgsrc/security/cyrus-sasl/PLIST:1.9
--- pkgsrc/security/cyrus-sasl/PLIST:1.8        Sat Dec 15 20:36:44 2012
+++ pkgsrc/security/cyrus-sasl/PLIST    Mon Apr 16 21:57:17 2018
@@ -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 @@ sbin/saslpasswd2
 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

Index: pkgsrc/security/cyrus-sasl/distinfo
diff -u pkgsrc/security/cyrus-sasl/distinfo:1.34 pkgsrc/security/cyrus-sasl/distinfo:1.35
--- pkgsrc/security/cyrus-sasl/distinfo:1.34    Sun Sep 11 02:11:15 2016
+++ pkgsrc/security/cyrus-sasl/distinfo Mon Apr 16 21:57:17 2018
@@ -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

Index: pkgsrc/security/cyrus-sasl/patches/patch-configure
diff -u pkgsrc/security/cyrus-sasl/patches/patch-configure:1.1 pkgsrc/security/cyrus-sasl/patches/patch-configure:1.2
--- pkgsrc/security/cyrus-sasl/patches/patch-configure:1.1      Sun Oct 20 13:56:02 2013
+++ pkgsrc/security/cyrus-sasl/patches/patch-configure  Mon Apr 16 21:57:18 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.1 2013/10/20 17:56:02 joerg Exp $
+$NetBSD: patch-configure,v 1.2 2018/04/17 01:57:18 christos Exp $
 
---- configure.orig     2013-10-20 15:45:41.000000000 +0000
-+++ configure
-@@ -4346,9 +4346,9 @@ if test "${andrew_cv_runpath_switch+set}
+--- configure.orig     2018-01-19 09:14:17.000000000 -0500
++++ configure  2018-04-16 20:43:13.559772861 -0400
+@@ -6219,9 +6219,9 @@
    $as_echo_n "(cached) " >&6
  else
  
@@ -11,39 +11,15 @@ $NetBSD: patch-configure,v 1.1 2013/10/2
      SAVE_LDFLAGS="${LDFLAGS}"
 -    LDFLAGS="-R /usr/lib"
 +    LDFLAGS="${COMPILER_RPATH_FLAG} /usr/lib"
-     cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+@@ -6234,7 +6234,7 @@
+ }
  _ACEOF
-@@ -4385,7 +4385,7 @@ $as_echo "$ac_try_echo") >&5
-        test "$cross_compiling" = yes ||
-        $as_test_x conftest$ac_exeext
-        }; then
+ if ac_fn_c_try_link "$LINENO"; then :
 -  andrew_cv_runpath_switch="-R"
 +  andrew_cv_runpath_switch="${COMPILER_RPATH_FLAG}"
  else
-   $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-@@ -14591,9 +14591,9 @@ case "$with_sqlite" in
- $as_echo "$as_me: WARNING: SQLite Library not found" >&2;}; true;;
-     *)
-      if test -d ${with_sqlite}/lib; then
--         LIB_SQLITE="-L${with_sqlite}/lib -R${with_sqlite}/lib"
-+         LIB_SQLITE="-L${with_sqlite}/lib ${COMPILER_RPATH_FLAG}${with_sqlite}/lib"
-      else
--         LIB_SQLITE="-L${with_sqlite} -R${with_sqlite}"
-+         LIB_SQLITE="-L${with_sqlite} ${COMPILER_RPATH_FLAG}${with_sqlite}"
-      fi
- 
-      LIB_SQLITE_DIR=$LIB_SQLITE
-@@ -14721,9 +14721,9 @@ case "$with_sqlite3" in
- $as_echo "$as_me: WARNING: SQLite3 Library not found" >&2;}; true;;
-     *)
-      if test -d ${with_sqlite3}/lib; then
--         LIB_SQLITE3="-L${with_sqlite3}/lib -R${with_sqlite3}/lib"
-+         LIB_SQLITE3="-L${with_sqlite3}/lib ${COMPILER_RPATH_FLAG}${with_sqlite3}/lib"
-      else
--         LIB_SQLITE3="-L${with_sqlite3} -R${with_sqlite3}"
-+         LIB_SQLITE3="-L${with_sqlite3} ${COMPILER_RPATH_FLAG}${with_sqlite3}"
-      fi
  
-      LIB_SQLITE3_DIR=$LIB_SQLITE3
+       LDFLAGS="-Wl,-rpath,/usr/lib"
Index: pkgsrc/security/cyrus-sasl/patches/patch-plugins_otp.c
diff -u pkgsrc/security/cyrus-sasl/patches/patch-plugins_otp.c:1.1 pkgsrc/security/cyrus-sasl/patches/patch-plugins_otp.c:1.2
--- pkgsrc/security/cyrus-sasl/patches/patch-plugins_otp.c:1.1  Tue Nov 10 03:46:06 2015
+++ pkgsrc/security/cyrus-sasl/patches/patch-plugins_otp.c      Mon Apr 16 21:57:18 2018
@@ -1,12 +1,11 @@
-$NetBSD: patch-plugins_otp.c,v 1.1 2015/11/10 08:46:06 manu Exp $
+$NetBSD: patch-plugins_otp.c,v 1.2 2018/04/17 01:57:18 christos Exp $
 
 Fix the OTP plugin on 32 bit machines and add SHA2 support
 Submitted upstream as https://bugzilla.cyrusimap.org/show_bug.cgi?id=3914
 
---- plugins/otp.c.orig 2012-10-12 16:05:48.000000000 +0200
-+++ plugins/otp.c      2015-11-07 15:19:43.000000000 +0100
-@@ -92,8 +92,12 @@
- static algorithm_option_t algorithm_options[] = {
+--- plugins/otp.c.orig 2016-12-10 10:54:27.000000000 -0500
++++ plugins/otp.c      2018-04-16 20:09:59.910785912 -0400
+@@ -91,6 +91,10 @@
      {"md4",   0,      "md4"},
      {"md5",   0,      "md5"},
      {"sha1",  4,      "sha1"},
@@ -17,9 +16,7 @@ Submitted upstream as https://bugzilla.c
      {NULL,    0,      NULL}
  };
  
- /* Convert the binary data into ASCII hex */
-@@ -675,9 +679,9 @@
-           SETERROR(utils, "OTP secret too short");
+@@ -706,7 +710,7 @@
            return SASL_FAIL;
        }
        
@@ -28,4 +25,3 @@ Submitted upstream as https://bugzilla.c
               alg, seq, seed, buf, timeout);
        
        hex2bin(buf, otp, OTP_HASH_SIZE);
-       
Index: pkgsrc/security/cyrus-sasl/patches/patch-saslauthd_Makefile.in
diff -u pkgsrc/security/cyrus-sasl/patches/patch-saslauthd_Makefile.in:1.1 pkgsrc/security/cyrus-sasl/patches/patch-saslauthd_Makefile.in:1.2
--- pkgsrc/security/cyrus-sasl/patches/patch-saslauthd_Makefile.in:1.1  Sat Sep 22 02:20:21 2012
+++ pkgsrc/security/cyrus-sasl/patches/patch-saslauthd_Makefile.in      Mon Apr 16 21:57:18 2018
@@ -1,11 +1,22 @@
-$NetBSD: patch-saslauthd_Makefile.in,v 1.1 2012/09/22 06:20:21 obache Exp $
+$NetBSD: patch-saslauthd_Makefile.in,v 1.2 2018/04/17 01:57:18 christos Exp $
 
 * install man source into $(mandir)/man8 instead of catman.
   https://bugzilla.cyrusimap.org/show_bug.cgi?id=3740
 
---- saslauthd/Makefile.in.orig 2011-09-07 13:13:56.000000000 +0000
-+++ saslauthd/Makefile.in
-@@ -720,9 +720,9 @@ dist-hook: saslauthd.8
+--- saslauthd/Makefile.in.orig 2018-01-19 09:14:18.000000000 -0500
++++ saslauthd/Makefile.in      2018-04-16 21:21:07.610121926 -0400
+@@ -89,8 +89,8 @@
+ build_triplet = @build@
+ host_triplet = @host@
+ target_triplet = @target@
+-sbin_PROGRAMS = saslauthd$(EXEEXT) testsaslauthd$(EXEEXT)
+-EXTRA_PROGRAMS = saslcache$(EXEEXT)
++sbin_PROGRAMS = saslauthd$(EXEEXT) testsaslauthd$(EXEEXT) saslcache$(EXEEXT)
++#EXTRA_PROGRAMS = saslcache$(EXEEXT)
+ subdir = saslauthd
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/ax_prog_cc_for_build.m4 \
+@@ -787,9 +787,9 @@
  saslauthd.8: saslauthd.mdoc
        nroff -mdoc $(srcdir)/saslauthd.mdoc > $(srcdir)/saslauthd.8
  
@@ -15,5 +26,5 @@ $NetBSD: patch-saslauthd_Makefile.in,v 1
 -      $(INSTALL_DATA) $(srcdir)/saslauthd.8 $(DESTDIR)$(mandir)/man8/saslauthd.8
 +      $(INSTALL_DATA) $(srcdir)/saslauthd.mdoc $(DESTDIR)$(mandir)/man8/saslauthd.8
  
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
+ uninstall-local:
+       -rm -rf $(DESTDIR)$(mandir)/man8/saslauthd.8

Index: pkgsrc/security/cyrus-saslauthd/Makefile
diff -u pkgsrc/security/cyrus-saslauthd/Makefile:1.52 pkgsrc/security/cyrus-saslauthd/Makefile:1.53
--- pkgsrc/security/cyrus-saslauthd/Makefile:1.52       Thu Apr 27 09:56:47 2017
+++ pkgsrc/security/cyrus-saslauthd/Makefile    Mon Apr 16 21:57:18 2018
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.52 2017/04/27 13:56:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.53 2018/04/17 01:57:18 christos Exp $
 
 PKGNAME=       ${DISTNAME:S/sasl/saslauthd/}
-PKGREVISION=   7
+#PKGREVISION=  7
 CONFLICTS+=    cyrus-sasl<2.1.15nb2
 
 .include "../../security/cyrus-sasl/Makefile.common"
@@ -10,7 +10,7 @@ COMMENT=              Cyrus SASL plaintext authentic
 
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR:Q}
 
-BUILD_TARGET=          all saslcache
+BUILD_TARGET=          all
 
 SASLSOCKETDIR?=                ${VARBASE}/run/saslauthd
 BUILD_DEFS+=           SASLSOCKETDIR

Index: pkgsrc/security/cyrus-saslauthd/PLIST
diff -u pkgsrc/security/cyrus-saslauthd/PLIST:1.13 pkgsrc/security/cyrus-saslauthd/PLIST:1.14
--- pkgsrc/security/cyrus-saslauthd/PLIST:1.13  Tue Mar 11 10:05:13 2014
+++ pkgsrc/security/cyrus-saslauthd/PLIST       Mon Apr 16 21:57:18 2018
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.13 2014/03/11 14:05:13 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.14 2018/04/17 01:57:18 christos Exp $
 bin/saslcache
 man/man8/saslauthd.8
+sbin/saslcache
 sbin/saslauthd
 sbin/testsaslauthd
 ${PLIST.ldap}share/doc/cyrus-saslauthd/LDAP_SASLAUTHD

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index