From owner-svn-ports-all@FreeBSD.ORG Mon Jan 20 23:47:15 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 9E2FAA30;
Mon, 20 Jan 2014 23:47:15 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id 701C618D3;
Mon, 20 Jan 2014 23:47:15 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0KNlFqK049098;
Mon, 20 Jan 2014 23:47:15 GMT (envelope-from marcus@svn.freebsd.org)
Received: (from marcus@localhost)
by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0KNlFIL049096;
Mon, 20 Jan 2014 23:47:15 GMT (envelope-from marcus@svn.freebsd.org)
Message-Id: <201401202347.s0KNlFIL049096@svn.freebsd.org>
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Mon, 20 Jan 2014 23:47:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r340498 - in head/net/netatalk3: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
<mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 Jan 2014 23:47:15 -0000
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); \