CVS commit: pkgsrc/net/ucspi-ssl

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Sep 29 00:42:50 UTC 2024

Modified Files:
        pkgsrc/net/ucspi-ssl: distinfo
Added Files:
        pkgsrc/net/ucspi-ssl/patches: patch-src_ssl__env.c

Log Message:
ucspi-ssl: Fix newly introduced non-C99.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/net/ucspi-ssl/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/net/ucspi-ssl/patches/patch-src_ssl__env.c

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/distinfo
diff -u pkgsrc/net/ucspi-ssl/distinfo:1.35 pkgsrc/net/ucspi-ssl/distinfo:1.36
--- pkgsrc/net/ucspi-ssl/distinfo:1.35  Tue Sep 24 13:42:31 2024
+++ pkgsrc/net/ucspi-ssl/distinfo       Sun Sep 29 00:42:50 2024
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.35 2024/09/24 13:42:31 schmonz Exp $
+$NetBSD: distinfo,v 1.36 2024/09/29 00:42:50 schmonz Exp $
 
 BLAKE2s (ucspi-ssl-0.13.03.tgz) = 61a7995df0412e0f046730ac29cfedf17eaaddccb0ef3e04888a66022a110f81
 SHA512 (ucspi-ssl-0.13.03.tgz) = 3459da99d8bfe7d46f5432fe6756a23c378a06727f8d3a3abd11da633b614d27c0a9ba6f0cd5942f0812d27007d4b6b91dff11dc30203a370a073353d63adafb
 Size (ucspi-ssl-0.13.03.tgz) = 80392 bytes
 SHA1 (patch-src_print-dl.sh) = 456ae878c5116bbdfab1e9b4c049f6e4e80bc2b1
 SHA1 (patch-src_print-ld.sh) = f05f316eb6b95a3a9cb5726c9e7bb2d27dfc1b7b
+SHA1 (patch-src_ssl__env.c) = 003f1496a315cdd29d2fe8d85f70876df313f78a
 SHA1 (patch-src_ucspissl.h) = 4f9724be72a9fa9310bd5969f84767ff1b88260c

Added files:

Index: pkgsrc/net/ucspi-ssl/patches/patch-src_ssl__env.c
diff -u /dev/null pkgsrc/net/ucspi-ssl/patches/patch-src_ssl__env.c:1.1
--- /dev/null   Sun Sep 29 00:42:50 2024
+++ pkgsrc/net/ucspi-ssl/patches/patch-src_ssl__env.c   Sun Sep 29 00:42:50 2024
@@ -0,0 +1,42 @@
+$NetBSD: patch-src_ssl__env.c,v 1.1 2024/09/29 00:42:50 schmonz Exp $
+
+Fix newly introduced non-C99.
+
+--- src/ssl_env.c.orig 2024-09-09 15:44:27.000000000 +0000
++++ src/ssl_env.c
+@@ -167,7 +167,7 @@ static int ssl_client_vars(X509 *cert,ST
+   BIGNUM *bn;
+   BIO *bio;
+   char *x = 0;
+-  int n;
++  int n, i;
+   char *yname;
+ 
+   if (!cert) return 1;
+@@ -243,7 +243,7 @@ static int ssl_client_vars(X509 *cert,ST
+   GENERAL_NAMES *extensions = X509_get_ext_d2i(cert,NID_subject_alt_name,0,0);
+   int num = sk_GENERAL_NAME_num(extensions);  /* num = 0, if no SAN extensions */
+ 
+-  for (int i = 0, n = 0; i < num; ++i) {
++  for (i = 0, n = 0; i < num; ++i) {
+     const GENERAL_NAME *ext = sk_GENERAL_NAME_value(extensions,i);
+     if (ext->type == GEN_DNS) {
+       if (OBJ_sn2nid((const char*)ext->d.ia5) != V_ASN1_IA5STRING) continue;
+@@ -338,7 +338,7 @@ static int ssl_server_vars(X509 *cert,ST
+   BIGNUM *bn;
+   BIO *bio;
+   char *x = 0;
+-  int n;
++  int n, i;
+   char *yname;
+ 
+   if (!cert) return 1;
+@@ -411,7 +411,7 @@ static int ssl_server_vars(X509 *cert,ST
+   GENERAL_NAMES *extensions = X509_get_ext_d2i(cert,NID_subject_alt_name,0,0);
+   int num = sk_GENERAL_NAME_num(extensions);  /* num = 0, if no SAN extensions */
+ 
+-  for (int i = 0, n = 0; i < num; ++i) {
++  for (i = 0, n = 0; i < num; ++i) {
+     const GENERAL_NAME *ext = sk_GENERAL_NAME_value(extensions,i);
+     if (ext->type == GEN_DNS) {
+       if (OBJ_sn2nid((const char*)ext->d.ia5) != V_ASN1_IA5STRING) continue;