From 3558ea425d48ddbd10edbcfa5097347eb5961cc4 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Mon, 20 Jan 2014 23:47:14 +0000 Subject: Revert a bad upstream patch pertaining to varargs that continued to plague Time Machine users. Submitted by: dim --- net/netatalk3/Makefile | 2 +- net/netatalk3/files/patch-etc_afpd_afp_mdns.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'net') diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile index cd216f23a7dc..1c14fa217488 100644 --- a/net/netatalk3/Makefile +++ b/net/netatalk3/Makefile @@ -3,7 +3,7 @@ PORTNAME= netatalk PORTVERSION= 3.1.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= net MASTER_SITES= SF diff --git a/net/netatalk3/files/patch-etc_afpd_afp_mdns.c b/net/netatalk3/files/patch-etc_afpd_afp_mdns.c index a457378498f0..cf0a9a9c787f 100644 --- a/net/netatalk3/files/patch-etc_afpd_afp_mdns.c +++ b/net/netatalk3/files/patch-etc_afpd_afp_mdns.c @@ -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); \ -- cgit v1.2.3