CVS commit: pkgsrc/comms/libopensync

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jun 16 12:35:00 UTC 2026

Modified Files:
        pkgsrc/comms/libopensync: distinfo
        pkgsrc/comms/libopensync/patches: patch-aa
Added Files:
        pkgsrc/comms/libopensync/patches:
            patch-formats_vformats-xml_xml-support.h

Log Message:
libopensync: Various build fixes.

Improve the handling of non-POSIX iconv, detect a GNU libiconv,
and fix an implicit function declaration. This is important for
NetBSD with newer GCC.

Verified to build on FreeBSD, macOS, Linux, NetBSD, OpenBSD.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/comms/libopensync/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/comms/libopensync/patches/patch-aa
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/comms/libopensync/patches/patch-formats_vformats-xml_xml-support.h

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

Modified files:

Index: pkgsrc/comms/libopensync/distinfo
diff -u pkgsrc/comms/libopensync/distinfo:1.11 pkgsrc/comms/libopensync/distinfo:1.12
--- pkgsrc/comms/libopensync/distinfo:1.11      Tue Oct 26 10:06:00 2021
+++ pkgsrc/comms/libopensync/distinfo   Tue Jun 16 12:35:00 2026
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:06:00 nia Exp $
+$NetBSD: distinfo,v 1.12 2026/06/16 12:35:00 nia Exp $
 
 BLAKE2s (libopensync-0.22.tar.bz2) = ed12a9c526a2b66c5da0f0d56fa65c455bfb6aff9e5638fc9b3e87ebbdb6d92e
 SHA512 (libopensync-0.22.tar.bz2) = 90b6c7af9890d51bddfa5ce9ff5403f642d1deb7dc839e517366f9fd0afa5cd582b9a0e6e37d4a110f2aba7421da6705da0a761ad3ea40e9def3d3580f1b6aa2
 Size (libopensync-0.22.tar.bz2) = 489978 bytes
-SHA1 (patch-aa) = 4bcf03611850719042bafd794fc413cef159a702
+SHA1 (patch-aa) = e439f081c02977e350d96c40a26c4a2e19fba813
 SHA1 (patch-ab) = 057f995d58c98eba96e22671d9c8ee0ec8270b3e
 SHA1 (patch-ac) = f6a8c12e9344a7f68439b06f8797bfa30106d0e3
 SHA1 (patch-ad) = d2a199b04788512378dbd5024b34d367da6add5d
 SHA1 (patch-ae) = 39b5cf27a5b1722f5d8550b97deb1a8763a4ace1
 SHA1 (patch-af) = 07666352a1cd68ae00b10fc5eefeb8001673abe7
+SHA1 (patch-formats_vformats-xml_xml-support.h) = dec852062b43d99f3740122ff992ed67e52bd39d
 SHA1 (patch-opensync_opensync__group.c) = da6cb5ae9a2c8067126f9cec3d27bf4d8c0b56df
 SHA1 (patch-opensync_opensync_time.c) = cb6cf27e1ba3fcd6a0cb139759d4da7306817e10

Index: pkgsrc/comms/libopensync/patches/patch-aa
diff -u pkgsrc/comms/libopensync/patches/patch-aa:1.3 pkgsrc/comms/libopensync/patches/patch-aa:1.4
--- pkgsrc/comms/libopensync/patches/patch-aa:1.3       Thu Jul 21 15:35:55 2011
+++ pkgsrc/comms/libopensync/patches/patch-aa   Tue Jun 16 12:35:00 2026
@@ -1,26 +1,44 @@
-$NetBSD: patch-aa,v 1.3 2011/07/21 15:35:55 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2026/06/16 12:35:00 nia Exp $
 
---- formats/vformats-xml/vformat.c.orig        2007-03-27 20:49:27.000000000 +0900
+--- formats/vformats-xml/vformat.c.orig        2007-03-27 11:49:27.000000000 +0000
 +++ formats/vformats-xml/vformat.c
-@@ -236,7 +236,7 @@ static void _read_attribute_value_add (V
+@@ -26,6 +26,17 @@
+ #include "config.h"
+ #endif
+ 
++#if defined(__NetBSD__)
++#include <sys/param.h>
++#if __NetBSD_Prereq__(9,99,17)
++#define NETBSD_POSIX_ICONV 1
++#endif
++#endif
++
++#if (!defined(SOLARIS) && !defined(__NetBSD__)) || defined(NETBSD_POSIX_ICONV) || defined(_LIBICONV_VERSION)
++#define HAS_POSIX_ICONV
++#endif
++
+ #include <string.h>
+ #include <stdio.h>
+ #include <ctype.h>
+@@ -236,7 +247,7 @@ static void _read_attribute_value_add (VFormatAttribut
        if (charset) {
  
                cd = iconv_open("UTF-8", charset->str);
 -#ifdef SOLARIS
-+#if defined(SOLARIS) || defined(__NetBSD__) || defined(__APPLE__)
++#ifndef HAS_POSIX_ICONV
                  if (iconv(cd, (const char**)&inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) {
  #else
                  if (iconv(cd, &inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) {
-@@ -264,7 +264,7 @@ static void _read_attribute_value_add (V
+@@ -264,7 +275,7 @@ static void _read_attribute_value_add (VFormatAttribut
  
                        /* because inbuf is not UTF-8, we think it is ISO-8859-1 */
                          cd = iconv_open("UTF-8", "ISO-8859-1");
 -#ifdef SOLARIS
-+#if defined(SOLARIS) || defined(__NetBSD__) || defined(__APPLE__)
++#ifndef HAS_POSIX_ICONV
                          if (iconv(cd, (const char**)&inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) {
  #else
                          if (iconv(cd, &inbuf, &inbytesleft, &p, &outbytesleft) != (size_t)(-1)) {
-@@ -302,8 +302,8 @@ static void _read_attribute_value (VForm
+@@ -302,8 +313,8 @@ static void _read_attribute_value (VFormatAttribute *a
                        if ((a = *(++lp)) == '\0') break;
                        if ((b = *(++lp)) == '\0') break;
                        
@@ -31,7 +49,7 @@ $NetBSD: patch-aa,v 1.3 2011/07/21 15:35
                                        /* e.g. ...N=C3=BCrnberg\r\n
                                         *          ^^^
                                         */
-@@ -317,7 +317,7 @@ static void _read_attribute_value (VForm
+@@ -317,7 +328,7 @@ static void _read_attribute_value (VFormatAttribute *a
                                         * ^
                                         */
                                        char *tmplp = lp;
@@ -40,7 +58,7 @@ $NetBSD: patch-aa,v 1.3 2011/07/21 15:35
                                                x1 = a;
                                                x2 = *tmplp;
                                                lp = tmplp;     
-@@ -336,7 +336,7 @@ static void _read_attribute_value (VForm
+@@ -336,7 +347,7 @@ static void _read_attribute_value (VFormatAttribute *a
                                c = *(++tmplp);
                                d = *(++tmplp);
                                e = *(++tmplp);
@@ -49,7 +67,7 @@ $NetBSD: patch-aa,v 1.3 2011/07/21 15:35
                                        x1 = d;
                                        x2 = e;
                                        lp = tmplp;
-@@ -357,8 +357,8 @@ static void _read_attribute_value (VForm
+@@ -357,8 +368,8 @@ static void _read_attribute_value (VFormatAttribute *a
                        if (x1 && x2) {
                                char c;
  
@@ -60,7 +78,7 @@ $NetBSD: patch-aa,v 1.3 2011/07/21 15:35
  
                                c = (((a>='a'?a-'a'+10:a-'0')&0x0f) << 4)
                                        | ((b>='a'?b-'a'+10:b-'0')&0x0f);
-@@ -1751,11 +1751,11 @@ static const char *base64_alphabet = "AB
+@@ -1751,11 +1762,11 @@ static const char *base64_alphabet = "ABCDEFGHIJKLMNOP
  
  //static unsigned char _evc_base64_rank[256];
  
@@ -74,7 +92,7 @@ $NetBSD: patch-aa,v 1.3 2011/07/21 15:35
        for (i=0;i<64;i++) {
                rank[(unsigned int)base64_alphabet[i]] = i;
        }
-@@ -1880,7 +1880,7 @@ static size_t base64_encode_step(unsigne
+@@ -1880,7 +1891,7 @@ static size_t base64_decode_step(unsigned char *in, si
  static size_t base64_decode_step(unsigned char *in, size_t len, unsigned char *out, int *state, unsigned int *save)
  {
        unsigned char base64_rank[256];

Added files:

Index: pkgsrc/comms/libopensync/patches/patch-formats_vformats-xml_xml-support.h
diff -u /dev/null pkgsrc/comms/libopensync/patches/patch-formats_vformats-xml_xml-support.h:1.1
--- /dev/null   Tue Jun 16 12:35:00 2026
+++ pkgsrc/comms/libopensync/patches/patch-formats_vformats-xml_xml-support.h   Tue Jun 16 12:35:00 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-formats_vformats-xml_xml-support.h,v 1.1 2026/06/16 12:35:00 nia Exp $
+
+Fix implicit declaration of malloc(3) in xmldoc.c, among others.
+
+--- formats/vformats-xml/xml-support.h.orig    2026-06-16 12:23:15.638724338 +0000
++++ formats/vformats-xml/xml-support.h
+@@ -9,6 +9,7 @@
+ #include <opensync/opensync_xml.h>
+ #include <string.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ 
+ #ifdef __cplusplus
+ extern "C"