svn commit: r340506 - in branches/2014Q1/net/netatalk3: . files

[Joe Marcus Clarke]

Author: marcus
Date: Tue Jan 21 00:06:56 2014
New Revision: 340506
URL: http://svnweb.freebsd.org/changeset/ports/340506
QAT: https://qat.redports.org/buildarchive/r340506/

Log:
  MFH: (r340498)
  
  Revert a bad upstream patch pertaining to varargs that continued to plague
  Time Machine users.
  
  Submitted by: dim
  
  Approved by:	portmgr (miwi)

Modified:
  branches/2014Q1/net/netatalk3/Makefile
  branches/2014Q1/net/netatalk3/files/patch-etc_afpd_afp_mdns.c
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/net/netatalk3/Makefile
==============================================================================
--- branches/2014Q1/net/netatalk3/Makefile	Tue Jan 21 00:06:26 2014	(r340505)
+++ branches/2014Q1/net/netatalk3/Makefile	Tue Jan 21 00:06:56 2014	(r340506)
@@ -3,7 +3,7 @@
 
 PORTNAME=	netatalk
 PORTVERSION=	3.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	net
 MASTER_SITES=	SF

Modified: branches/2014Q1/net/netatalk3/files/patch-etc_afpd_afp_mdns.c
==============================================================================
--- branches/2014Q1/net/netatalk3/files/patch-etc_afpd_afp_mdns.c	Tue Jan 21 00:06:26 2014	(r340505)
+++ branches/2014Q1/net/netatalk3/files/patch-etc_afpd_afp_mdns.c	Tue Jan 21 00:06:56 2014	(r340506)
@@ -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);                           \