[121309] trunk/dports/net/tcpreplay

[jmr at macports.org]

Revision: 121309
          https://trac.macports.org/changeset/121309
Author:   jmr at macports.org
Date:     2014-06-23 00:17:53 -0700 (Mon, 23 Jun 2014)
Log Message:
-----------
tcpreplay: fix build without disabling security checks (#41101)

Modified Paths:
--------------
    trunk/dports/net/tcpreplay/Portfile

Added Paths:
-----------
    trunk/dports/net/tcpreplay/files/strl.patch

Removed Paths:
-------------
    trunk/dports/net/tcpreplay/files/tcpreplay_maverick.patch

Modified: trunk/dports/net/tcpreplay/Portfile
===================================================================
--- trunk/dports/net/tcpreplay/Portfile	2014-06-23 06:23:45 UTC (rev 121308)
+++ trunk/dports/net/tcpreplay/Portfile	2014-06-23 07:17:53 UTC (rev 121309)
@@ -6,6 +6,7 @@
 categories          net security
 license             BSD ISC
 version             3.4.4
+revision            1
 platforms           darwin
 maintainers         wohner.eu:normen
 
@@ -30,8 +31,7 @@
 # libdnet is required for fragroute support
 depends_lib         port:libpcap port:tcpdump port:libdnet
 
+patchfiles          strl.patch
+
 configure.args      --with-libpcap=${prefix} \
                     --with-tcpdump=${prefix}/sbin/tcpdump
-
-configure.cflags-append	-D_FORTIFY_SOURCE=0
-

Added: trunk/dports/net/tcpreplay/files/strl.patch
===================================================================
--- trunk/dports/net/tcpreplay/files/strl.patch	                        (rev 0)
+++ trunk/dports/net/tcpreplay/files/strl.patch	2014-06-23 07:17:53 UTC (rev 121309)
@@ -0,0 +1,43 @@
+--- lib/strlcat.c.orig	2010-04-05 10:58:00.000000000 +1000
++++ lib/strlcat.c	2014-06-23 17:08:42.000000000 +1000
+@@ -23,6 +23,10 @@ static char *rcsid = "$OpenBSD: strlcat.
+ #include <sys/types.h>
+ #include <string.h>
+ 
++#ifdef strlcat
++#undef strlcat
++#endif
++
+ /*
+  * Appends src to string dst of size siz (unlike strncat, siz is the
+  * full size of dst, not space left).  At most siz-1 characters
+--- lib/strlcpy.c.orig	2010-04-05 10:58:00.000000000 +1000
++++ lib/strlcpy.c	2014-06-23 17:09:18.000000000 +1000
+@@ -23,6 +23,10 @@ static char *rcsid = "$OpenBSD: strlcpy.
+ #include <sys/types.h>
+ #include <string.h>
+ 
++#ifdef strlcpy
++#undef strlcpy
++#endif
++
+ /*
+  * Copy src to string dst of size siz.  At most siz-1 characters
+  * will be copied.  Always NUL terminates (unless siz == 0).
+--- lib/strlcpy.h.orig	2010-04-05 10:58:00.000000000 +1000
++++ lib/strlcpy.h	2014-06-23 17:15:16.000000000 +1000
+@@ -3,10 +3,14 @@
+ 
+ #include <sys/types.h>
+ 
++#ifndef strlcpy
+ size_t
+ strlcpy(char *dst, const char *src, size_t size);
++#endif
+ 
++#ifndef strlcat
+ size_t
+ strlcat(char *dst, const char *src, size_t size);
++#endif
+ 
+ #endif

Deleted: trunk/dports/net/tcpreplay/files/tcpreplay_maverick.patch
===================================================================
--- trunk/dports/net/tcpreplay/files/tcpreplay_maverick.patch	2014-06-23 06:23:45 UTC (rev 121308)
+++ trunk/dports/net/tcpreplay/files/tcpreplay_maverick.patch	2014-06-23 07:17:53 UTC (rev 121309)
@@ -1,11 +0,0 @@
---- /opt/local/var/macports/sources/rsync.macports.org/release/tarballs/ports/net/tcpreplay/Portfile	2013-07-15 18:03:08.000000000 +0200
-+++ Portfile	2013-11-01 11:56:37.000000000 +0100
-@@ -32,3 +32,8 @@
- 
- configure.args      --with-libpcap=${prefix} \
-                     --with-tcpdump=${prefix}/sbin/tcpdump
-+
-+if {${os.platform} == "darwin" && ${os.major} == 13} {
-+	configure.cflags-append	-D_FORTIFY_SOURCE=0
-+}
-+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140623/ad4a0a45/attachment.html>