svn commit: r434089 - in head/net/libnet: . files
Sunpoet Po-Chuan Hsieh
sunpoet at FreeBSD.org
Tue Feb 14 14:32:49 UTC 2017
Author: sunpoet
Date: Tue Feb 14 14:32:47 2017
New Revision: 434089
URL: https://svnweb.freebsd.org/changeset/ports/434089
Log:
Fix functionality on FreeBSD 11 and above
- Bump PORTREVISION for package change
PR: 216308 [1], 217093 [2]
Submitted by: <ganbold-freebsd at ateamsystems.com> [1], Eugene Grosbein <ports at grosbein.net> [2]
Added:
head/net/libnet/files/extra-patch-configure (contents, props changed)
Modified:
head/net/libnet/Makefile
head/net/libnet/files/patch-include-libnet.h.in
head/net/libnet/files/patch-src-libnet_cq.c
head/net/libnet/files/patch-src-libnet_if_addr.c
head/net/libnet/files/patch-src-libnet_link_bpf.c
Modified: head/net/libnet/Makefile
==============================================================================
--- head/net/libnet/Makefile Tue Feb 14 14:26:14 2017 (r434088)
+++ head/net/libnet/Makefile Tue Feb 14 14:32:47 2017 (r434089)
@@ -3,7 +3,7 @@
PORTNAME= libnet
PORTVERSION= 1.1.6
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= SF/libnet-dev
@@ -46,4 +46,10 @@ post-install-EXAMPLES-on:
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
${INSTALL_DATA} ${WRKSRC}/sample/*.c ${STAGEDIR}${EXAMPLESDIR}/
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100030
+EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-configure
+.endif
+
+.include <bsd.port.post.mk>
Added: head/net/libnet/files/extra-patch-configure
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/libnet/files/extra-patch-configure Tue Feb 14 14:32:47 2017 (r434089)
@@ -0,0 +1,17 @@
+--- configure.orig 2012-03-29 21:18:48 UTC
++++ configure
+@@ -12165,13 +12165,12 @@ done
+ $as_echo "#define LIBNET_BSDISH_OS 1" >>confdefs.h
+
+
+-$as_echo "#define LIBNET_BSD_BYTE_SWAP 1" >>confdefs.h
+
+
+ $as_echo "#define HAVE_SOCKADDR_SA_LEN 1" >>confdefs.h
+
+
+- LIBNET_CONFIG_DEFINES="-DLIBNET_BSDISH_OS -DLIBNET_BSD_BYTE_SWAP -DHAVE_SOCKADDR_SA_LEN"
++ LIBNET_CONFIG_DEFINES="-DLIBNET_BSDISH_OS -DHAVE_SOCKADDR_SA_LEN"
+ ;;
+
+ *netbsd*)
Modified: head/net/libnet/files/patch-include-libnet.h.in
==============================================================================
--- head/net/libnet/files/patch-include-libnet.h.in Tue Feb 14 14:26:14 2017 (r434088)
+++ head/net/libnet/files/patch-include-libnet.h.in Tue Feb 14 14:32:47 2017 (r434089)
@@ -1,6 +1,6 @@
---- include/libnet.h.in.orig 2012-03-06 01:45:46.000000000 +0100
+--- include/libnet.h.in.orig 2012-03-06 00:45:46 UTC
+++ include/libnet.h.in
-@@ -81,6 +81,9 @@
+@@ -81,6 +81,9 @@ extern "C" {
#if !defined(__WIN32__)
# include <sys/socket.h>
# include <net/if.h>
Modified: head/net/libnet/files/patch-src-libnet_cq.c
==============================================================================
--- head/net/libnet/files/patch-src-libnet_cq.c Tue Feb 14 14:26:14 2017 (r434088)
+++ head/net/libnet/files/patch-src-libnet_cq.c Tue Feb 14 14:32:47 2017 (r434089)
@@ -2,9 +2,9 @@
Obtained from: https://github.com/sam-github/libnet/commit/c9390bf8f3379c280ba8ceec67fbd8e908675d96
---- src/libnet_cq.c.orig 2012-03-20 00:59:50.000000000 +0800
-+++ src/libnet_cq.c 2015-01-18 03:09:08.170403000 +0800
-@@ -344,6 +344,8 @@
+--- src/libnet_cq.c.orig 2012-03-19 16:59:50 UTC
++++ src/libnet_cq.c
+@@ -344,6 +344,8 @@ libnet_cq_destroy()
libnet_destroy(tmp->context);
free(tmp);
}
Modified: head/net/libnet/files/patch-src-libnet_if_addr.c
==============================================================================
--- head/net/libnet/files/patch-src-libnet_if_addr.c Tue Feb 14 14:26:14 2017 (r434088)
+++ head/net/libnet/files/patch-src-libnet_if_addr.c Tue Feb 14 14:32:47 2017 (r434089)
@@ -4,9 +4,9 @@
Obtained from: https://github.com/sam-github/libnet/commit/18cbe497dd84afc471a5320e4ef3a7cde87c2c4e [1]
https://github.com/sam-github/libnet/commit/2e724b2f5cd614d7362f8dcbc57dc1fca6e437b3 [2]
---- src/libnet_if_addr.c.orig 2012-03-20 00:59:50.000000000 +0800
-+++ src/libnet_if_addr.c 2015-01-18 03:09:08.169400000 +0800
-@@ -330,6 +330,8 @@
+--- src/libnet_if_addr.c.orig 2012-03-19 16:59:50 UTC
++++ src/libnet_if_addr.c
+@@ -330,6 +330,8 @@ register char *errbuf)
++nipaddr;
}
@@ -15,7 +15,7 @@ Obtained from: https://github.com/sam-gi
*ipaddrp = ifaddrlist;
return (nipaddr);
}
-@@ -339,7 +341,6 @@
+@@ -339,7 +341,6 @@ int
libnet_select_device(libnet_t *l)
{
int c, i;
@@ -23,7 +23,7 @@ Obtained from: https://github.com/sam-gi
struct libnet_ifaddr_list *address_list, *al;
uint32_t addr;
-@@ -364,7 +365,7 @@
+@@ -364,7 +365,7 @@ libnet_select_device(libnet_t *l)
/*
* Number of interfaces.
*/
Modified: head/net/libnet/files/patch-src-libnet_link_bpf.c
==============================================================================
--- head/net/libnet/files/patch-src-libnet_link_bpf.c Tue Feb 14 14:26:14 2017 (r434088)
+++ head/net/libnet/files/patch-src-libnet_link_bpf.c Tue Feb 14 14:32:47 2017 (r434089)
@@ -2,9 +2,9 @@
Obtained from: https://github.com/sam-github/libnet/commit/408fa2266a4af402152cc0f1e9a40b56477b995a
---- src/libnet_link_bpf.c.orig 2012-03-20 00:59:50.000000000 +0800
-+++ src/libnet_link_bpf.c 2015-01-18 03:09:08.169400000 +0800
-@@ -316,7 +316,11 @@
+--- src/libnet_link_bpf.c.orig 2012-03-19 16:59:50 UTC
++++ src/libnet_link_bpf.c
+@@ -316,7 +316,11 @@ libnet_get_hwaddr(libnet_t *l)
if (ifm->ifm_type == RTM_IFINFO)
{
sdl = (struct sockaddr_dl *)(ifm + 1);
@@ -17,7 +17,7 @@ Obtained from: https://github.com/sam-gi
continue;
if (strncmp(&sdl->sdl_data[0], l->device, sdl->sdl_nlen) == 0)
{
-@@ -326,6 +330,12 @@
+@@ -326,6 +330,12 @@ libnet_get_hwaddr(libnet_t *l)
}
}
free(buf);
More information about the svn-ports-head
mailing list