CVS commit: pkgsrc/net/netatalk3

["Christos Zoulas" <christos%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   christos
Date:           Tue Nov 27 02:19:04 UTC 2018

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

Log Message:
fix SSP build.


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/net/netatalk3/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/netatalk3/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/net/netatalk3/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/netatalk3/Makefile
diff -u pkgsrc/net/netatalk3/Makefile:1.15 pkgsrc/net/netatalk3/Makefile:1.16
--- pkgsrc/net/netatalk3/Makefile:1.15  Wed Nov 14 17:22:13 2018
+++ pkgsrc/net/netatalk3/Makefile       Mon Nov 26 21:19:03 2018
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2018/11/14 22:22:13 kleink Exp $
+# $NetBSD: Makefile,v 1.16 2018/11/27 02:19:03 christos Exp $
 
 DISTNAME=      netatalk-3.1.11
 PKGNAME=        ${DISTNAME:C/-/3-/}
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=  .tar.bz2

Index: pkgsrc/net/netatalk3/distinfo
diff -u pkgsrc/net/netatalk3/distinfo:1.4 pkgsrc/net/netatalk3/distinfo:1.5
--- pkgsrc/net/netatalk3/distinfo:1.4   Fri Jun  2 08:19:07 2017
+++ pkgsrc/net/netatalk3/distinfo       Mon Nov 26 21:19:03 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2017/06/02 12:19:07 szptvlfn Exp $
+$NetBSD: distinfo,v 1.5 2018/11/27 02:19:03 christos Exp $
 
 SHA1 (netatalk-3.1.11.tar.bz2) = 5aa7900e6f7de3c7ee812aa1130c1245d1974586
 RMD160 (netatalk-3.1.11.tar.bz2) = d0b671662afb642dc6bdfb44688fd459da5e7415
@@ -14,5 +14,6 @@ SHA1 (patch-etc_afpd_quota.c) = bd93ed95
 SHA1 (patch-etc_cnid__dbd_cnid__metad.c) = 6c28332ca3e11d11f3b5bb13fa01783dbb94c30f
 SHA1 (patch-etc_netatalk_netatalk.c) = 2bdbfc035e4bea9859cf970cd6b9a6503244185e
 SHA1 (patch-include_atalk_util.h) = a7a0763c5866288ad89a8b6b90c71767ee4d9d64
+SHA1 (patch-libatalk_bstring_bstrlib.c) = eaee8075f102c1150f74e9dce4d83697c3eac3fc
 SHA1 (patch-libatalk_util_getiface.c) = 1a46bd695c96e0666b6f45493eb44501c0f4e0b5
 SHA1 (patch-macros_quota-check.m4) = a6502693ae8c7218b7c4426b134e0aa590412e1f

Added files:

Index: pkgsrc/net/netatalk3/patches/patch-libatalk_bstring_bstrlib.c
diff -u /dev/null pkgsrc/net/netatalk3/patches/patch-libatalk_bstring_bstrlib.c:1.1
--- /dev/null   Mon Nov 26 21:19:04 2018
+++ pkgsrc/net/netatalk3/patches/patch-libatalk_bstring_bstrlib.c       Mon Nov 26 21:19:03 2018
@@ -0,0 +1,21 @@
+$NetBSD: patch-libatalk_bstring_bstrlib.c,v 1.1 2018/11/27 02:19:03 christos Exp $
+
+Fix for SSP build.
+
+--- libatalk/bstring/bstrlib.c.orig    2014-01-10 05:19:29.000000000 -0500
++++ libatalk/bstring/bstrlib.c 2018-11-26 20:23:28.658129721 -0500
+@@ -2737,11 +2737,14 @@
+ #define START_VSNBUFF (256)
+ #else
+ 
++#ifndef __NetBSD__
++/* Don't redeclare snprintf, it confuses SSP */
+ #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
++#endif
+ 
+ #define exvsnprintf(r,b,n,f,a) {r = vsnprintf (b,n,f,a);}
+ #endif