CVS commit: pkgsrc/www/libwww

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat Oct  4 13:37:08 UTC 2025

Modified Files:
        pkgsrc/www/libwww: distinfo
        pkgsrc/www/libwww/patches: patch-Library_src_SSL_HTSSL.c
            patch-configure

Log Message:
libwww: sprinkle some const to appease GCC 14


To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 pkgsrc/www/libwww/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/www/libwww/patches/patch-Library_src_SSL_HTSSL.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/libwww/patches/patch-configure

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

Modified files:

Index: pkgsrc/www/libwww/distinfo
diff -u pkgsrc/www/libwww/distinfo:1.32 pkgsrc/www/libwww/distinfo:1.33
--- pkgsrc/www/libwww/distinfo:1.32     Tue Oct 26 11:29:37 2021
+++ pkgsrc/www/libwww/distinfo  Sat Oct  4 13:37:08 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2021/10/26 11:29:37 nia Exp $
+$NetBSD: distinfo,v 1.33 2025/10/04 13:37:08 tnn Exp $
 
 BLAKE2s (w3c-libwww-5.4.2.tgz) = f3885a50927cefff19d9931000c10fadeed77495eb7d18f92e9bb2e4d83c6750
 SHA512 (w3c-libwww-5.4.2.tgz) = d0dbe2be106c4987a5131c22c300bd3fcb1dce1881d0009269dd4e3c8068da1c07e2b1ca4bfd181640f8b467d4a378a9036f9b385d3a28badbe22b2ed74e0e74
@@ -8,7 +8,7 @@ SHA1 (patch-Library_src_HTMIMImp.c) = 2f
 SHA1 (patch-Library_src_HTStyle.c) = 2c42a00ce5ed0ff0f34e779582684805e47edce2
 SHA1 (patch-Library_src_Makefile.am) = 14bf3beef9e2e57e2574ccb806132b13d2b60af7
 SHA1 (patch-Library_src_Makefile.in) = cd685a468b93066c0da9e1171051da93cfd28bb4
-SHA1 (patch-Library_src_SSL_HTSSL.c) = ddb87040f0669e1c3ab9f098a957193b436f588a
+SHA1 (patch-Library_src_SSL_HTSSL.c) = 70a3b8876f7e11029375deebf9fa9f0667515e99
 SHA1 (patch-Library_src_wwwsys.h) = 25f39cf5afb6e4a2879a0f38129d8a450a863e72
-SHA1 (patch-configure) = 70a7d08b59361bb64069bb27cabfbc6dc2c47ec4
+SHA1 (patch-configure) = b38395e105f35ea07070e26cce37b1984eb6284b
 SHA1 (patch-libwww-config.in) = 438821b7979712cf87781c38c930ab8e24ea1aad

Index: pkgsrc/www/libwww/patches/patch-Library_src_SSL_HTSSL.c
diff -u pkgsrc/www/libwww/patches/patch-Library_src_SSL_HTSSL.c:1.2 pkgsrc/www/libwww/patches/patch-Library_src_SSL_HTSSL.c:1.3
--- pkgsrc/www/libwww/patches/patch-Library_src_SSL_HTSSL.c:1.2 Thu Jun 28 15:45:46 2018
+++ pkgsrc/www/libwww/patches/patch-Library_src_SSL_HTSSL.c     Sat Oct  4 13:37:08 2025
@@ -1,20 +1,24 @@
-$NetBSD: patch-Library_src_SSL_HTSSL.c,v 1.2 2018/06/28 15:45:46 jperkin Exp $
+$NetBSD: patch-Library_src_SSL_HTSSL.c,v 1.3 2025/10/04 13:37:08 tnn Exp $
 
 Fix for OpenSSL 1.1.x.
 
 --- Library/src/SSL/HTSSL.c.orig       2017-06-24 05:51:38.000000000 +0000
 +++ Library/src/SSL/HTSSL.c
-@@ -98,6 +98,7 @@ PRIVATE void apps_ssl_info_callback (SSL
- PRIVATE int verify_callback (int ok, X509_STORE_CTX * ctx)
+@@ -5,3 +5,3 @@
+ **    
+-**    Copyright � 1995-1998 World Wide Web Consortium, (Massachusetts
++**    Copyright © 1995-1998 World Wide Web Consortium, (Massachusetts
+ **    Institute of Technology, Institut National de Recherche en
+@@ -67,3 +67,3 @@ PRIVATE char *key_file = NULL;
+ */
+-PRIVATE void apps_ssl_info_callback (SSL * s, int where, int ret)
++PRIVATE void apps_ssl_info_callback (const SSL * s, int where, int ret)
  {
+@@ -100,2 +100,3 @@ PRIVATE int verify_callback (int ok, X50
      char buf[256];
 +    int ctx_error;
      X509 * err_cert = X509_STORE_CTX_get_current_cert(ctx);
-     int err = X509_STORE_CTX_get_error(ctx);
-     int depth = X509_STORE_CTX_get_error_depth(ctx);
-@@ -115,24 +116,28 @@ PRIVATE int verify_callback (int ok, X50
-           verify_error=X509_V_ERR_CERT_CHAIN_TOO_LONG;
-       }
+@@ -117,6 +118,10 @@ PRIVATE int verify_callback (int ok, X50
      }
 -    switch (ctx->error) {
 +    switch (ctx_error = X509_STORE_CTX_get_error(ctx)) {
@@ -26,27 +30,22 @@ Fix for OpenSSL 1.1.x.
        X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256);
 +#endif
        HTTRACE(PROT_TRACE, "issuer= %s\n" _ buf);
-       break;
- 
-     case X509_V_ERR_CERT_NOT_YET_VALID:
-     case X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD:
+@@ -127,3 +132,3 @@ PRIVATE int verify_callback (int ok, X50
        HTTRACE(PROT_TRACE, "notBefore=");
 -//    ASN1_TIME_print(bio_err,X509_get_notBefore(ctx->current_cert));
 +//    ASN1_TIME_print(bio_err,X509_get_notBefore(X509_STORE_CTX_get0_cert(ctx)));
        HTTRACE(PROT_TRACE, "\n");
-       break;
- 
-     case X509_V_ERR_CERT_HAS_EXPIRED:
-     case X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD:
+@@ -134,3 +139,3 @@ PRIVATE int verify_callback (int ok, X50
        HTTRACE(PROT_TRACE, "notAfter=");
 -//    ASN1_TIME_print(bio_err,X509_get_notAfter(ctx->current_cert));
 +//    ASN1_TIME_print(bio_err,X509_get_notAfter(X509_STORE_CTX_get0_cert(ctx)));
        HTTRACE(PROT_TRACE, "\n");
-       break;
-     }
-@@ -214,12 +219,6 @@ PUBLIC BOOL HTSSL_init (void)
- 
-       /* select the protocol method */
+@@ -209,3 +214,3 @@ PUBLIC BOOL HTSSL_init (void)
+     if (!app_ctx) {
+-      SSL_METHOD * meth = NULL;
++      const SSL_METHOD * meth = NULL;
+         SSLeay_add_ssl_algorithms();
+@@ -216,8 +221,2 @@ PUBLIC BOOL HTSSL_init (void)
        switch (ssl_prot_method) {
 -      case HTSSL_V2:
 -        meth = SSLv2_client_method();
@@ -55,5 +54,3 @@ Fix for OpenSSL 1.1.x.
 -        meth = SSLv3_client_method();
 -        break;
        case HTSSL_V23:
-         meth = SSLv23_client_method();
-         break;

Index: pkgsrc/www/libwww/patches/patch-configure
diff -u pkgsrc/www/libwww/patches/patch-configure:1.1 pkgsrc/www/libwww/patches/patch-configure:1.2
--- pkgsrc/www/libwww/patches/patch-configure:1.1       Sun Jun 24 16:54:59 2018
+++ pkgsrc/www/libwww/patches/patch-configure   Sat Oct  4 13:37:08 2025
@@ -1,6 +1,6 @@
-$NetBSD: patch-configure,v 1.1 2018/06/24 16:54:59 adam Exp $
+$NetBSD: patch-configure,v 1.2 2025/10/04 13:37:08 tnn Exp $
 
-Explicit declaration of SSL_library_init().
+Explicit declaration of SSL_library_init() & zlibVersion()
 Portability fix.
 
 --- configure.orig     2017-06-24 06:11:34.000000000 +0000
@@ -14,7 +14,15 @@ Portability fix.
  
  $as_echo "#define unlink remove" >>confdefs.h
  
-@@ -16420,6 +16420,7 @@ $as_echo "no" >&6; }
+@@ -15538,6 +15538,7 @@ $as_echo "#define HT_ZLIB 1" >>confdefs.
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
++#include <zlib.h>
+ int
+ main ()
+ {
+@@ -16420,6 +16421,7 @@ $as_echo "no" >&6; }
      LIBS="$LIBS $withval"
      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */