CVS commit: pkgsrc/net/ucspi-ssl

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Tue Sep 22 09:59:05 UTC 2020

Modified Files:
        pkgsrc/net/ucspi-ssl: Makefile distinfo options.mk

Log Message:
Update to 0.11.6a (as 0.999.11.6a). From the changelog:

- GCC 10 compliance enforced.

pkgsrc changes:

- Catch up DEFAULT_MEDIUM_CIPHERS to NetBSD-current's.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 pkgsrc/net/ucspi-ssl/Makefile
cvs rdiff -u -r1.23 -r1.24 pkgsrc/net/ucspi-ssl/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/net/ucspi-ssl/options.mk

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

Modified files:

Index: pkgsrc/net/ucspi-ssl/Makefile
diff -u pkgsrc/net/ucspi-ssl/Makefile:1.49 pkgsrc/net/ucspi-ssl/Makefile:1.50
--- pkgsrc/net/ucspi-ssl/Makefile:1.49  Mon Aug 31 18:10:54 2020
+++ pkgsrc/net/ucspi-ssl/Makefile       Tue Sep 22 09:59:05 2020
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.49 2020/08/31 18:10:54 wiz Exp $
+# $NetBSD: Makefile,v 1.50 2020/09/22 09:59:05 schmonz Exp $
 #
 
-DISTNAME=              ucspi-ssl-0.11.6
+DISTNAME=              ucspi-ssl-0.11.6a
 PKGNAME=               ${DISTNAME:S/-0./-0.999./}
-PKGREVISION=           1
 CATEGORIES=            net
 MASTER_SITES=          https://www.fehcom.de/ipnet/ucspi-ssl/
 EXTRACT_SUFX=          .tgz
@@ -39,10 +38,11 @@ DJB_CONFIG_CMDS=                                                    \
        ${ECHO} > conf-ssl;                                             \
        ${ECHO} ${SSLDIR}/certs > conf-cadir;                           \
        ${ECHO} ${PKG_SYSCONFDIR}/dh1024.pem > conf-dhfile;             \
-       ${ECHO} ${DEFAULT_MEDIUM_CIPHERS} > conf-ciphers;
+       ${ECHO} ${DEFAULT_MEDIUM_CIPHERS} > conf-ciphers;               \
+       ${ECHO} it-base > src/it=d;
 
 # from `postconf -d | grep tls_medium_cipherlist`
-DEFAULT_MEDIUM_CIPHERS=        aNULL:-aNULL:ALL:!EXPORT:!LOW:+RC4:@STRENGTH
+DEFAULT_MEDIUM_CIPHERS=        aNULL:-aNULL:HIGH:MEDIUM:+RC4:@STRENGTH
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man2 share/doc/${PKGBASE} ${EGDIR}
 

Index: pkgsrc/net/ucspi-ssl/distinfo
diff -u pkgsrc/net/ucspi-ssl/distinfo:1.23 pkgsrc/net/ucspi-ssl/distinfo:1.24
--- pkgsrc/net/ucspi-ssl/distinfo:1.23  Fri Aug 28 20:01:38 2020
+++ pkgsrc/net/ucspi-ssl/distinfo       Tue Sep 22 09:59:05 2020
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.23 2020/08/28 20:01:38 schmonz Exp $
+$NetBSD: distinfo,v 1.24 2020/09/22 09:59:05 schmonz Exp $
 
-SHA1 (ucspi-ssl-0.11.6.tgz) = 9f871c17015d71b4bb94ae46326f9475b2e9cf45
-RMD160 (ucspi-ssl-0.11.6.tgz) = 057f6b1be38d1ac310d9d1b7c56b5b4e7eed7f3d
-SHA512 (ucspi-ssl-0.11.6.tgz) = d8259422c9411ee0be08f3600798629c84db643f36224e710625c5b6a0dc55f04473054ffa5928685e4a26a8d5e51aa1cdeb42b1a96030606bbaeab7d5a94581
-Size (ucspi-ssl-0.11.6.tgz) = 81920 bytes
+SHA1 (ucspi-ssl-0.11.6a.tgz) = 26397de8547328d8227ff6757564b0a33b892a1f
+RMD160 (ucspi-ssl-0.11.6a.tgz) = 9570c270ef9627029126fe9efaac86dc8a2bd666
+SHA512 (ucspi-ssl-0.11.6a.tgz) = 0b2d360ae08088eb32197f33cef46ab0e99e11330338338b5168c8c24a4fe1d8276688d86d1a98bf6500a9e9afd18b1f2d1edb0590a1c02a7d053bbb53a8f119
+Size (ucspi-ssl-0.11.6a.tgz) = 81920 bytes
 SHA1 (patch-src_print-dl.sh) = 456ae878c5116bbdfab1e9b4c049f6e4e80bc2b1
 SHA1 (patch-src_print-ld.sh) = f05f316eb6b95a3a9cb5726c9e7bb2d27dfc1b7b
 SHA1 (patch-src_ucspissl.h) = 4f9724be72a9fa9310bd5969f84767ff1b88260c

Index: pkgsrc/net/ucspi-ssl/options.mk
diff -u pkgsrc/net/ucspi-ssl/options.mk:1.9 pkgsrc/net/ucspi-ssl/options.mk:1.10
--- pkgsrc/net/ucspi-ssl/options.mk:1.9 Mon Aug 19 22:09:06 2019
+++ pkgsrc/net/ucspi-ssl/options.mk     Tue Sep 22 09:59:05 2020
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2019/08/19 22:09:06 schmonz Exp $
+# $NetBSD: options.mk,v 1.10 2020/09/22 09:59:05 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ucspi-ssl
 PKG_SUPPORTED_OPTIONS+=        inet6 perl
@@ -15,12 +15,12 @@ PLIST_VARS+=                perl
 .if !empty(PKG_OPTIONS:Mperl)
 .include "../../lang/perl5/buildlink3.mk"
 USE_TOOLS+=            perl:run
-DJB_CONFIG_CMDS+=      ${ECHO} ${PERL5} > conf-perl;
+DJB_CONFIG_CMDS+=      ${ECHO} ${PERL5} > conf-perl; \
+                       ${ECHO} it-sslperl >> src/it=d
 PLIST.perl=            yes
 do-install-sslperl:
        ${INSTALL_PROGRAM} ${WRKSRC}/command/sslperl ${DESTDIR}${PREFIX}/bin
 .else
-DJB_BUILD_ARGS+=       - sslperl
 do-install-sslperl:
        ${DO_NADA}
 .endif