Date: Mon, 20 Jan 2014 23:47:15 +0000 (UTC) From: Joe Marcus Clarke <marcus@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340498 - in head/net/netatalk3: . files Message-ID: <201401202347.s0KNlFIL049096@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcus Date: Mon Jan 20 23:47:14 2014 New Revision: 340498 URL: http://svnweb.freebsd.org/changeset/ports/340498 QAT: https://qat.redports.org/buildarchive/r340498/ Log: Revert a bad upstream patch pertaining to varargs that continued to plague Time Machine users. Submitted by: dim Modified: head/net/netatalk3/Makefile head/net/netatalk3/files/patch-etc_afpd_afp_mdns.c Modified: head/net/netatalk3/Makefile ============================================================================== --- head/net/netatalk3/Makefile Mon Jan 20 23:45:13 2014 (r340497) +++ head/net/netatalk3/Makefile Mon Jan 20 23:47:14 2014 (r340498) @@ -3,7 +3,7 @@ PORTNAME= netatalk PORTVERSION= 3.1.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF Modified: head/net/netatalk3/files/patch-etc_afpd_afp_mdns.c ============================================================================== --- head/net/netatalk3/files/patch-etc_afpd_afp_mdns.c Mon Jan 20 23:45:13 2014 (r340497) +++ head/net/netatalk3/files/patch-etc_afpd_afp_mdns.c Mon Jan 20 23:47:14 2014 (r340498) @@ -1,20 +1,23 @@ --- etc/afpd/afp_mdns.c.orig 2013-10-28 06:43:13.000000000 -0700 +++ etc/afpd/afp_mdns.c 2014-01-17 22:10:59.000000000 -0800 @@ -37,17 +37,15 @@ + /* * Its easier to use asprintf to set the TXT record values */ - #define TXTRecordPrintf(rec, key, args, ...) { \ +-#define TXTRecordPrintf(rec, key, args, ...) { \ - char *str; \ - asprintf(&str, args); \ ++#define TXTRecordPrintf(rec, key, args...) { \ + char str[1024]; \ + sprintf(str, args); \ TXTRecordSetValue(rec, key, strlen(str), str); \ - free(str); \ } - #define TXTRecordKeyPrintf(rec, k, var, args, ...) { \ +-#define TXTRecordKeyPrintf(rec, k, var, args, ...) { \ - char *key, *str; \ - asprintf(&key, k, var); \ - asprintf(&str, args); \ ++#define TXTRecordKeyPrintf(rec, k, var, args...) { \ + char key[1024], str[1024]; \ + sprintf(key, k, var); \ + sprintf(str, args); \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401202347.s0KNlFIL049096>