CVS commit: pkgsrc/security/hitch

["Travis Paul" <tpaul%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tpaul
Date:           Tue Apr  4 21:51:07 UTC 2023

Modified Files:
        pkgsrc/security/hitch: Makefile distinfo
        pkgsrc/security/hitch/patches: patch-src_configuration.c
Added Files:
        pkgsrc/security/hitch/patches: patch-src_foreign_vsa.c
            patch-src_hitch.c

Log Message:
security/hitch: Update to 1.7.3

Add patches to fix build on Illumos.

Upstream release notes:
  - Fixes build for OpenSSL 3.0.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/security/hitch/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/security/hitch/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/security/hitch/patches/patch-src_configuration.c
cvs rdiff -u -r0 -r1.1 pkgsrc/security/hitch/patches/patch-src_foreign_vsa.c
cvs rdiff -u -r0 -r1.4 pkgsrc/security/hitch/patches/patch-src_hitch.c

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

Modified files:

Index: pkgsrc/security/hitch/Makefile
diff -u pkgsrc/security/hitch/Makefile:1.19 pkgsrc/security/hitch/Makefile:1.20
--- pkgsrc/security/hitch/Makefile:1.19 Fri Mar 11 21:36:01 2022
+++ pkgsrc/security/hitch/Makefile      Tue Apr  4 21:51:07 2023
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2022/03/11 21:36:01 tnn Exp $
+# $NetBSD: Makefile,v 1.20 2023/04/04 21:51:07 tpaul Exp $
 
-DISTNAME=      hitch-1.7.2
+DISTNAME=      hitch-1.7.3
 CATEGORIES=    security
 MASTER_SITES=  https://hitch-tls.org/source/
 

Index: pkgsrc/security/hitch/distinfo
diff -u pkgsrc/security/hitch/distinfo:1.15 pkgsrc/security/hitch/distinfo:1.16
--- pkgsrc/security/hitch/distinfo:1.15 Fri Mar 11 21:36:01 2022
+++ pkgsrc/security/hitch/distinfo      Tue Apr  4 21:51:07 2023
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.15 2022/03/11 21:36:01 tnn Exp $
+$NetBSD: distinfo,v 1.16 2023/04/04 21:51:07 tpaul Exp $
 
-BLAKE2s (hitch-1.7.2.tar.gz) = bdc049a4d21333eee6868b5fdce67513b5cbaae40b2a64d84536f2ed7da777ec
-SHA512 (hitch-1.7.2.tar.gz) = 7b35b5f4a3b6dab2599643c0bc90880a77ea518a627b31813f45a7ee8c52982ba4ac07228b640a0bcf90ea7d63421b62884a091fed6664732585585e5ec15bcf
-Size (hitch-1.7.2.tar.gz) = 324070 bytes
+BLAKE2s (hitch-1.7.3.tar.gz) = 98dbfc5843911b89ca3da9379ee0fa4e01f8e2643215b8877b09be884cb15d31
+SHA512 (hitch-1.7.3.tar.gz) = 88de82e639e7f9b7873bb7226fcbcbc4cd5779c75a5bd21fca8e1ca927a2a3ae9eb455d73d1f42d4dc45546118c718d1b58396836ed9c8acac281d487c9fe8fd
+Size (hitch-1.7.3.tar.gz) = 355577 bytes
 SHA1 (patch-hitch.conf.example) = 21840c6028994953d9b05632c55f2da81fd817b0
-SHA1 (patch-src_configuration.c) = 61689ab5946e2762af1f9c02e6a7b95bfee63368
+SHA1 (patch-src_configuration.c) = 2b039766dfb86fb7a6aff5fcaec9826734f3a10c
+SHA1 (patch-src_foreign_vsa.c) = d40dc2d0ab890e95d9a715bb12e9d32a20ee4c6f
+SHA1 (patch-src_hitch.c) = 9348cd4658617612700b2f1337fd46065637ccce

Index: pkgsrc/security/hitch/patches/patch-src_configuration.c
diff -u pkgsrc/security/hitch/patches/patch-src_configuration.c:1.3 pkgsrc/security/hitch/patches/patch-src_configuration.c:1.4
--- pkgsrc/security/hitch/patches/patch-src_configuration.c:1.3 Sun May 17 15:01:41 2020
+++ pkgsrc/security/hitch/patches/patch-src_configuration.c     Tue Apr  4 21:51:07 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_configuration.c,v 1.3 2020/05/17 15:01:41 nia Exp $
+$NetBSD: patch-src_configuration.c,v 1.4 2023/04/04 21:51:07 tpaul Exp $
 
-Sane default options.
+Use SUBST var for OSCP_DIR, Avoid d_type on Illumos.
 
---- src/configuration.c.orig   2019-11-26 13:33:39.000000000 +0000
+--- src/configuration.c.orig   2021-11-29 12:09:28.000000000 +0000
 +++ src/configuration.c
-@@ -209,7 +209,7 @@ config_new(void)
+@@ -215,7 +215,7 @@ config_new(void)
        r->CERT_FILES                   = NULL;
        r->LISTEN_ARGS                  = NULL;
        r->PEM_DIR                      = NULL;
@@ -13,7 +13,32 @@ Sane default options.
        AN(r->OCSP_DIR);
        r->OCSP_VFY                     = 0;
        r->OCSP_RESP_TMO                = 10.0;
-@@ -1340,7 +1340,7 @@ create_alpn_callback_data(hitch_config *
+@@ -1198,9 +1198,10 @@ config_scan_pem_dir(char *pemdir, hitch_
+                       if (fnmatch(cfg->PEM_DIR_GLOB, d[i]->d_name, 0))
+                               continue;
+               }
++#ifndef __sun
+               if (d[i]->d_type != DT_UNKNOWN && d[i]->d_type != DT_REG)
+                       continue;
+-
++#endif
+               fpath = malloc(plen);
+               AN(fpath);
+ 
+@@ -1211,8 +1212,11 @@ config_scan_pem_dir(char *pemdir, hitch_
+                       retval = 1;
+                       break;
+               }
+-
++#ifndef __sun
+               if (d[i]->d_type == DT_UNKNOWN) {
++#else
++              if (1) {
++#endif
+                       /* The underlying filesystem does not support d_type. */
+                       if (lstat(fpath, &st) < 0) {
+                               fprintf(stderr, "Warning: unable to stat '%s': %s. Skipping.\n",
+@@ -1455,7 +1459,7 @@ create_alpn_callback_data(hitch_config *
  
        // first remove spaces while copying to cfg->ALPN_PROTOS_LV
        for(j = 0; j < l; j++)

Added files:

Index: pkgsrc/security/hitch/patches/patch-src_foreign_vsa.c
diff -u /dev/null pkgsrc/security/hitch/patches/patch-src_foreign_vsa.c:1.1
--- /dev/null   Tue Apr  4 21:51:07 2023
+++ pkgsrc/security/hitch/patches/patch-src_foreign_vsa.c       Tue Apr  4 21:51:07 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_foreign_vsa.c,v 1.1 2023/04/04 21:51:07 tpaul Exp $
+
+Avoid "sun" conflict.
+
+--- src/foreign/vsa.c.orig     2021-11-29 12:09:28.000000000 +0000
++++ src/foreign/vsa.c
+@@ -43,6 +43,10 @@
+ #include "vsa.h"
+ #include "miniobj.h"
+ 
++#ifdef __sun
++#undef sun
++#endif
++
+ /*
+  * Struct sockaddr{|_in|_in6|_storage} is absolutely the worst data
+  * structure I have ever seen gold-plated in international standards.

Index: pkgsrc/security/hitch/patches/patch-src_hitch.c
diff -u /dev/null pkgsrc/security/hitch/patches/patch-src_hitch.c:1.4
--- /dev/null   Tue Apr  4 21:51:07 2023
+++ pkgsrc/security/hitch/patches/patch-src_hitch.c     Tue Apr  4 21:51:07 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_hitch.c,v 1.4 2023/04/04 21:51:07 tpaul Exp $
+
+Avoid "sun" conflict.
+
+--- src/hitch.c.orig   2021-11-29 12:09:28.000000000 +0000
++++ src/hitch.c
+@@ -124,6 +124,10 @@
+ #  define X509_NAME_ENTRY_get_data(entry) ((entry)->value)
+ #endif
+ 
++#ifdef __sun
++#undef sun
++#endif
++
+ /* logging.c */
+ extern FILE *logfile;
+ extern struct stat logf_st;