CVS commit: pkgsrc/net/netatalk4

["Hauke Fath" <hauke%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   hauke
Date:           Thu Nov 21 22:02:11 UTC 2024

Modified Files:
        pkgsrc/net/netatalk4: distinfo
        pkgsrc/net/netatalk4/patches: patch-libatalk_bstring_bstrlib.c

Log Message:
Completely remove custom function prototype, like we used to, see
<http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/net/netatalk30/patches/Attic/patch-libatalk_bstring_bstrlib.c?rev=1.1;content-type=text%2Fplain;hideattic=0;only_with_tag=MAIN>


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/netatalk4/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/netatalk4/patches/patch-libatalk_bstring_bstrlib.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/netatalk4/distinfo
diff -u pkgsrc/net/netatalk4/distinfo:1.1 pkgsrc/net/netatalk4/distinfo:1.2
--- pkgsrc/net/netatalk4/distinfo:1.1   Thu Nov 21 15:26:08 2024
+++ pkgsrc/net/netatalk4/distinfo       Thu Nov 21 22:02:11 2024
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1 2024/11/21 15:26:08 hauke Exp $
+$NetBSD: distinfo,v 1.2 2024/11/21 22:02:11 hauke Exp $
 
 BLAKE2s (netatalk-4-0-6.tar.gz) = 00beb8d601af7dba7f9e0c30f00c3f90fd3e786346b60997a7708674214a2df9
 SHA512 (netatalk-4-0-6.tar.gz) = d0a99bc8200d767dba8254cf21b9880267da4a18524dbbffec2049dca747f0fe3d7023d26098c5bdc1fca160d06cc019f23e9f34be9ca9f823b3071a6cc729c8
 Size (netatalk-4-0-6.tar.gz) = 1326496 bytes
-SHA1 (patch-libatalk_bstring_bstrlib.c) = bb0efb8b474f9ed05118a3aa65aa64e01eb5d486
+SHA1 (patch-libatalk_bstring_bstrlib.c) = 8f38b0c0abea02074172b11f066f0628eb54c55c
 SHA1 (patch-meson.build) = 1a62c6009058e2e38fe9017afe30a8732c86d40d

Index: pkgsrc/net/netatalk4/patches/patch-libatalk_bstring_bstrlib.c
diff -u pkgsrc/net/netatalk4/patches/patch-libatalk_bstring_bstrlib.c:1.1 pkgsrc/net/netatalk4/patches/patch-libatalk_bstring_bstrlib.c:1.2
--- pkgsrc/net/netatalk4/patches/patch-libatalk_bstring_bstrlib.c:1.1   Thu Nov 21 15:26:08 2024
+++ pkgsrc/net/netatalk4/patches/patch-libatalk_bstring_bstrlib.c       Thu Nov 21 22:02:11 2024
@@ -1,18 +1,23 @@
-$NetBSD: patch-libatalk_bstring_bstrlib.c,v 1.1 2024/11/21 15:26:08 hauke Exp $
+$NetBSD: patch-libatalk_bstring_bstrlib.c,v 1.2 2024/11/21 22:02:11 hauke Exp $
 
-See https://github.com/mvp/uhubctl/issues/586
+When a compiler complains about a missing prototype for a libc
+function, just inserting one for what you think the interface might be
+is probably not a good idea.
 
-Maybe the re-definition should just be removed, given the vague
-reasoning
+See also <https://github.com/mvp/uhubctl/issues/586>
 
---- libatalk/bstring/bstrlib.c.orig    2024-11-08 16:22:48.888569855 +0000
+--- libatalk/bstring/bstrlib.c.orig    2024-11-15 06:52:12.000000000 +0000
 +++ libatalk/bstring/bstrlib.c
-@@ -2913,7 +2913,7 @@ struct genBstrList g;
+@@ -2913,12 +2913,6 @@ struct genBstrList g;
  #define START_VSNBUFF (256)
  #else
  
 -#if defined(__GNUC__) && !defined(__APPLE__)
-+#if defined(__GNUC__) && !defined(__APPLE__) && !defined(__NetBSD__)
- /* Something is making gcc complain about this prototype not being here, so
-    I've just gone ahead and put it in. */
- extern int vsnprintf (char *buf, size_t count, const char *format, va_list arg);
+-/* Something is making gcc complain about this prototype not being here, so
+-   I've just gone ahead and put it in. */
+-extern int vsnprintf (char *buf, size_t count, const char *format, va_list arg);
+-#endif
+-
+ #define exvsnprintf(r,b,n,f,a) {r = vsnprintf (b,n,f,a);}
+ #endif
+ #endif