CVS commit: pkgsrc/net/netatalk30

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

Module Name:    pkgsrc
Committed By:   hauke
Date:           Fri Jul 14 13:08:31 UTC 2017

Modified Files:
        pkgsrc/net/netatalk30: Makefile distinfo
Added Files:
        pkgsrc/net/netatalk30/patches: patch-libatalk_bstring_bstrlib.c

Log Message:
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. (Same patch as for netatalk22, btw.)


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/net/netatalk30/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/netatalk30/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/netatalk30/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/netatalk30/Makefile
diff -u pkgsrc/net/netatalk30/Makefile:1.12 pkgsrc/net/netatalk30/Makefile:1.13
--- pkgsrc/net/netatalk30/Makefile:1.12 Fri May 19 13:29:03 2017
+++ pkgsrc/net/netatalk30/Makefile      Fri Jul 14 13:08:31 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2017/05/19 13:29:03 prlw1 Exp $
+# $NetBSD: Makefile,v 1.13 2017/07/14 13:08:31 hauke Exp $
 
 DISTNAME=      netatalk-3.0.8
 PKGNAME=        ${DISTNAME:C/-/30-/}
-PKGREVISION=   8
+PKGREVISION=   9
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=  .tar.bz2
@@ -21,8 +21,8 @@ PKG_CONFIG=           yes
 PKG_SYSCONFSUBDIR=     netatalk
 
 EGDIR=                 ${PREFIX}/share/examples/netatalk
-CONF_FILES=            ${EGDIR}/afp.conf               ${PKG_SYSCONFDIR}/afp.conf
-CONF_FILES+=           ${EGDIR}/extmap.conf            ${PKG_SYSCONFDIR}/extmap.conf
+CONF_FILES=            ${EGDIR}/afp.conf       ${PKG_SYSCONFDIR}/afp.conf
+CONF_FILES+=           ${EGDIR}/extmap.conf    ${PKG_SYSCONFDIR}/extmap.conf
 
 RCD_SCRIPTS=           netatalk
 RCD_SCRIPT_SRC.netatalk= ${WRKSRC}/distrib/initscripts/rc.netbsd

Index: pkgsrc/net/netatalk30/distinfo
diff -u pkgsrc/net/netatalk30/distinfo:1.4 pkgsrc/net/netatalk30/distinfo:1.5
--- pkgsrc/net/netatalk30/distinfo:1.4  Wed Nov  4 00:35:15 2015
+++ pkgsrc/net/netatalk30/distinfo      Fri Jul 14 13:08:31 2017
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2015/11/04 00:35:15 agc Exp $
+$NetBSD: distinfo,v 1.5 2017/07/14 13:08:31 hauke Exp $
 
 SHA1 (netatalk-3.0.8.tar.bz2) = 4956d0991ae09e6c5336980b0c9d92afe8153f5f
 RMD160 (netatalk-3.0.8.tar.bz2) = 61b8b5a43985b8a5441867cb96b9de5aeba324fb
@@ -16,5 +16,6 @@ SHA1 (patch-etc_cnid__dbd_cnid__metad.c)
 SHA1 (patch-etc_uams_uams__randnum.c) = 51e8b4a0c77f732423be9406c9f47d004403080a
 SHA1 (patch-include_atalk_util.h) = 5fe41720bf82980f6d5965f76d34e1703e541047
 SHA1 (patch-libatalk_adouble_ad_flush.c) = d4df84d2786bf392a5113b4867d955098c0c1da9
+SHA1 (patch-libatalk_bstring_bstrlib.c) = f43818328237b908166f956de464f532d578d2c4
 SHA1 (patch-libatalk_util_getiface.c) = fe4aba6080f6308866bedb3d96ccc2b034836d3e
 SHA1 (patch-macros_quota-check.m4) = aa8a053b83bc4579ca0a8f66f43226ead8e79696

Added files:

Index: pkgsrc/net/netatalk30/patches/patch-libatalk_bstring_bstrlib.c
diff -u /dev/null pkgsrc/net/netatalk30/patches/patch-libatalk_bstring_bstrlib.c:1.1
--- /dev/null   Fri Jul 14 13:08:31 2017
+++ pkgsrc/net/netatalk30/patches/patch-libatalk_bstring_bstrlib.c      Fri Jul 14 13:08:31 2017
@@ -0,0 +1,22 @@
+$NetBSD: patch-libatalk_bstring_bstrlib.c,v 1.1 2017/07/14 13:08:31 hauke Exp $
+
+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.
+
+--- libatalk/bstring/bstrlib.c.orig    2013-03-05 06:24:48.000000000 +0000
++++ libatalk/bstring/bstrlib.c
+@@ -2736,13 +2736,6 @@ struct genBstrList g;
+ #define exvsnprintf(r,b,n,f,a) {vsprintf (b,f,a); r = -1;}
+ #define START_VSNBUFF (256)
+ #else
+-
+-#ifdef __GNUC__
+-/* 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