pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/www/libwww



Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Jun 14 12:57:43 UTC 2026

Modified Files:
        pkgsrc/www/libwww: Makefile distinfo
Added Files:
        pkgsrc/www/libwww/patches: patch-Library_src_HTFTP.c
            patch-Library_src_HTRDF.c patch-Library_src_HTTCP.c
            patch-Library_src_HTTPGen.c

Log Message:
libwww: Fails with C23 default language.

While here, fix various warnings.


To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 pkgsrc/www/libwww/Makefile
cvs rdiff -u -r1.33 -r1.34 pkgsrc/www/libwww/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/www/libwww/patches/patch-Library_src_HTFTP.c \
    pkgsrc/www/libwww/patches/patch-Library_src_HTRDF.c \
    pkgsrc/www/libwww/patches/patch-Library_src_HTTCP.c \
    pkgsrc/www/libwww/patches/patch-Library_src_HTTPGen.c

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/Makefile
diff -u pkgsrc/www/libwww/Makefile:1.103 pkgsrc/www/libwww/Makefile:1.104
--- pkgsrc/www/libwww/Makefile:1.103    Sat Dec 30 01:43:36 2023
+++ pkgsrc/www/libwww/Makefile  Sun Jun 14 12:57:42 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2023/12/30 01:43:36 zafer Exp $
+# $NetBSD: Makefile,v 1.104 2026/06/14 12:57:42 nia Exp $
 
 DISTNAME=      w3c-libwww-5.4.2
 PKGNAME=       ${DISTNAME:S/^w3c-//}
@@ -14,6 +14,7 @@ LICENSE=      w3c
 
 USE_LIBTOOL=           yes
 USE_TOOLS+=            gmake gzcat perl
+FORCE_C_STD=           gnu89
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-expat=${BUILDLINK_PREFIX.expat}
 CONFIGURE_ARGS+=       --with-ssl #=${SSLBASE:Q}

Index: pkgsrc/www/libwww/distinfo
diff -u pkgsrc/www/libwww/distinfo:1.33 pkgsrc/www/libwww/distinfo:1.34
--- pkgsrc/www/libwww/distinfo:1.33     Sat Oct  4 13:37:08 2025
+++ pkgsrc/www/libwww/distinfo  Sun Jun 14 12:57:42 2026
@@ -1,11 +1,15 @@
-$NetBSD: distinfo,v 1.33 2025/10/04 13:37:08 tnn Exp $
+$NetBSD: distinfo,v 1.34 2026/06/14 12:57:42 nia Exp $
 
 BLAKE2s (w3c-libwww-5.4.2.tgz) = f3885a50927cefff19d9931000c10fadeed77495eb7d18f92e9bb2e4d83c6750
 SHA512 (w3c-libwww-5.4.2.tgz) = d0dbe2be106c4987a5131c22c300bd3fcb1dce1881d0009269dd4e3c8068da1c07e2b1ca4bfd181640f8b467d4a378a9036f9b385d3a28badbe22b2ed74e0e74
 Size (w3c-libwww-5.4.2.tgz) = 2630357 bytes
 SHA1 (patch-Library_Makefile.in) = f0ea0413c13501cfa7d038ebfe602d6bdbf02de4
+SHA1 (patch-Library_src_HTFTP.c) = 32e71cc93e3fa59193616d2fe3904c538a237b89
 SHA1 (patch-Library_src_HTMIMImp.c) = 2f14df9867758c69f9e6110b16f75d017e032a8e
+SHA1 (patch-Library_src_HTRDF.c) = 8c51036160255024219ef922137166073f032d3f
 SHA1 (patch-Library_src_HTStyle.c) = 2c42a00ce5ed0ff0f34e779582684805e47edce2
+SHA1 (patch-Library_src_HTTCP.c) = 70a87960adeab6fb7e106ee8ae2de4e10411beb6
+SHA1 (patch-Library_src_HTTPGen.c) = 04c00086464ba727ce889b2a27cafcc3c98ff2c6
 SHA1 (patch-Library_src_Makefile.am) = 14bf3beef9e2e57e2574ccb806132b13d2b60af7
 SHA1 (patch-Library_src_Makefile.in) = cd685a468b93066c0da9e1171051da93cfd28bb4
 SHA1 (patch-Library_src_SSL_HTSSL.c) = 70a3b8876f7e11029375deebf9fa9f0667515e99

Added files:

Index: pkgsrc/www/libwww/patches/patch-Library_src_HTFTP.c
diff -u /dev/null pkgsrc/www/libwww/patches/patch-Library_src_HTFTP.c:1.1
--- /dev/null   Sun Jun 14 12:57:43 2026
+++ pkgsrc/www/libwww/patches/patch-Library_src_HTFTP.c Sun Jun 14 12:57:43 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-Library_src_HTFTP.c,v 1.1 2026/06/14 12:57:43 nia Exp $
+
+Use correct types. sizeof returns size_t and the next function takes
+size_t as its argument. Fixes a warning.
+
+--- Library/src/HTFTP.c.orig   2026-06-14 12:53:17.373693538 +0000
++++ Library/src/HTFTP.c
+@@ -498,7 +498,7 @@ PRIVATE BOOL AcceptDataSocket (HTNet *cnet, HTNet *dne
+     */
+     {
+       SockA local_port, local_host;
+-      int addr_size = sizeof(local_port);
++      size_t addr_size = sizeof(local_port);
+       memset((void *) &local_host, '\0', addr_size);
+       memset((void *) &local_port, '\0', addr_size);
+       if (getsockname(HTNet_socket(cnet),
Index: pkgsrc/www/libwww/patches/patch-Library_src_HTRDF.c
diff -u /dev/null pkgsrc/www/libwww/patches/patch-Library_src_HTRDF.c:1.1
--- /dev/null   Sun Jun 14 12:57:43 2026
+++ pkgsrc/www/libwww/patches/patch-Library_src_HTRDF.c Sun Jun 14 12:57:43 2026
@@ -0,0 +1,25 @@
+$NetBSD: patch-Library_src_HTRDF.c,v 1.1 2026/06/14 12:57:43 nia Exp $
+
+Use correct format argument. XML_GetCurrentLineNumber
+returns a long int.
+
+--- Library/src/HTRDF.c.orig   2026-06-14 12:54:01.392916670 +0000
++++ Library/src/HTRDF.c
+@@ -2701,7 +2701,7 @@ PUBLIC BOOL HTRDF_parseFile (const char *file_name, 
+         else
+             buff_len = strlen (buff);
+         if (! XML_Parse(xmlparser, buff, buff_len, done)) {
+-            fprintf (stderr, "Parse error at line %d:\n%s\n",
++            fprintf (stderr, "Parse error at line %ld:\n%s\n",
+                      XML_GetCurrentLineNumber(xmlparser),
+                      XML_ErrorString(XML_GetErrorCode(xmlparser)));
+             HT_FREE(uri);
+@@ -2779,7 +2779,7 @@ PUBLIC BOOL HTRDF_parseBuffer (const char *buffer, con
+         return NO;
+ 
+     if (! XML_Parse(xmlparser, buffer, buffer_len, 1)) {
+-        fprintf(stderr, "Parse error at line %d:\n%s\n",
++        fprintf(stderr, "Parse error at line %ld:\n%s\n",
+                 XML_GetCurrentLineNumber(xmlparser),
+                 XML_ErrorString(XML_GetErrorCode(xmlparser)));
+         HT_FREE(uri);
Index: pkgsrc/www/libwww/patches/patch-Library_src_HTTCP.c
diff -u /dev/null pkgsrc/www/libwww/patches/patch-Library_src_HTTCP.c:1.1
--- /dev/null   Sun Jun 14 12:57:43 2026
+++ pkgsrc/www/libwww/patches/patch-Library_src_HTTCP.c Sun Jun 14 12:57:43 2026
@@ -0,0 +1,16 @@
+$NetBSD: patch-Library_src_HTTCP.c,v 1.1 2026/06/14 12:57:43 nia Exp $
+
+Use correct types. sizeof returns size_t and the next function takes
+size_t as its argument. Fixes a warning.
+
+--- Library/src/HTTCP.c.orig   2026-06-14 12:52:26.297871273 +0000
++++ Library/src/HTTCP.c
+@@ -471,7 +471,7 @@ PUBLIC int HTDoAccept (HTNet * listening, HTNet * acce
+ {
+     HTHost * host = HTNet_host(listening);
+     HTRequest * request = HTNet_request(accepting);
+-    int size = sizeof(host->sock_addr);
++    size_t size = sizeof(host->sock_addr);
+     int status;
+     if (!request || HTNet_socket(listening)==INVSOC) {
+       HTTRACE(PROT_TRACE, "HTDoAccept.. Invalid socket\n");
Index: pkgsrc/www/libwww/patches/patch-Library_src_HTTPGen.c
diff -u /dev/null pkgsrc/www/libwww/patches/patch-Library_src_HTTPGen.c:1.1
--- /dev/null   Sun Jun 14 12:57:43 2026
+++ pkgsrc/www/libwww/patches/patch-Library_src_HTTPGen.c       Sun Jun 14 12:57:43 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-Library_src_HTTPGen.c,v 1.1 2026/06/14 12:57:43 nia Exp $
+
+Fix ctype usage.
+
+--- Library/src/HTTPGen.c.orig 2026-06-14 12:53:36.556710502 +0000
++++ Library/src/HTTPGen.c
+@@ -140,7 +140,7 @@ PRIVATE int HTTPGenMake (HTStream * me, HTRequest * re
+               if (name && *name) {
+                   char * ptr = name;
+                   while (*ptr) {
+-                      if (isspace(*ptr)) *ptr='_';
++                      if (isspace((unsigned char)*ptr)) *ptr='_';
+                       ptr++;
+                   }
+                   PUTS(name);
+@@ -148,7 +148,7 @@ PRIVATE int HTTPGenMake (HTStream * me, HTRequest * re
+                   if (value) {
+                       ptr = value;
+                       while (*ptr) {
+-                          if (isspace(*ptr)) *ptr=' ';
++                          if (isspace((unsigned char)*ptr)) *ptr=' ';
+                           ptr++;
+                       }
+                       PUTS(value);



Home | Main Index | Thread Index | Old Index