| 1 |
deathwing00 09/09/11 01:20:07 |
| 2 |
|
| 3 |
Added: fix-gnusource-collisions-1.2.0.patch |
| 4 |
Log: |
| 5 |
Version bump. |
| 6 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 net-misc/dhcpv6/files/fix-gnusource-collisions-1.2.0.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcpv6/files/fix-gnusource-collisions-1.2.0.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcpv6/files/fix-gnusource-collisions-1.2.0.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: fix-gnusource-collisions-1.2.0.patch |
| 15 |
=================================================================== |
| 16 |
--- dhcpv6-1.2.0.orig/src/dhcp6c.c 2008-12-02 08:40:48.148706045 +0100 |
| 17 |
+++ dhcpv6-1.2.0/src/dhcp6c.c 2008-12-02 08:43:49.708699325 +0100 |
| 18 |
@@ -74,6 +74,10 @@ |
| 19 |
# include <netinet6/in6_var.h> |
| 20 |
#endif |
| 21 |
|
| 22 |
+#ifdef HAVE_LINUX_IPV6_H |
| 23 |
+# include <linux/ipv6.h> |
| 24 |
+#endif |
| 25 |
+ |
| 26 |
#include <linux/netlink.h> |
| 27 |
#include <netlink/socket.h> |
| 28 |
#include <netlink/route/rtnl.h> |
| 29 |
--- dhcpv6-1.2.0.orig/src/dhcp6s.c 2008-12-02 08:40:48.158710880 +0100 |
| 30 |
+++ dhcpv6-1.2.0/src/dhcp6s.c 2008-12-02 08:45:42.458702955 +0100 |
| 31 |
@@ -62,6 +62,10 @@ |
| 32 |
# include <linux/sockios.h> |
| 33 |
#endif |
| 34 |
|
| 35 |
+#ifdef HAVE_LINUX_IPV6_H |
| 36 |
+# include <linux/ipv6.h> |
| 37 |
+#endif |
| 38 |
+ |
| 39 |
#include "dhcp6.h" |
| 40 |
#include "cfg.h" |
| 41 |
#include "common.h" |
| 42 |
--- dhcpv6-1.2.0.orig/src/relay6_socket.c 2008-12-02 08:40:48.158710880 +0100 |
| 43 |
+++ dhcpv6-1.2.0/src/relay6_socket.c 2008-12-02 08:47:00.648708216 +0100 |
| 44 |
@@ -42,6 +42,10 @@ |
| 45 |
#include "relay6_parser.h" |
| 46 |
#include "relay6_database.h" |
| 47 |
|
| 48 |
+#ifdef HAVE_LINUX_IPV6_H |
| 49 |
+# include <linux/ipv6.h> |
| 50 |
+#endif |
| 51 |
+ |
| 52 |
#ifndef IPV6_2292PKTINFO |
| 53 |
#define IPV6_2292PKTINFO IPV6_PKTINFO |
| 54 |
#endif |
| 55 |
diff -Nutr dhcpv6-1.2.0.orig/src/Makefile.am dhcpv6-1.2.0/src/Makefile.am |
| 56 |
--- dhcpv6-1.2.0.orig/src/Makefile.am 2009-04-03 00:53:39.000000000 +0200 |
| 57 |
+++ dhcpv6-1.2.0/src/Makefile.am 2009-09-11 03:10:37.869487886 +0200 |
| 58 |
@@ -17,16 +17,16 @@ |
| 59 |
|
| 60 |
sbin_PROGRAMS = dhcp6s dhcp6r dhcp6c |
| 61 |
|
| 62 |
-dhcp6s_CFLAGS = -fPIE -D_GNU_SOURCE |
| 63 |
+dhcp6s_CFLAGS = -fPIE |
| 64 |
dhcp6s_LDFLAGS = $(LDFLAGS) |
| 65 |
dhcp6s_SOURCES = dhcp6s.c server6_conf.c server6_addr.c server6_parse.y \ |
| 66 |
server6_token.l $(COMMONSRCS) |
| 67 |
|
| 68 |
-dhcp6r_CFLAGS = -fPIE -D_GNU_SOURCE |
| 69 |
+dhcp6r_CFLAGS = -fPIE |
| 70 |
dhcp6r_LDFLAGS = $(LDFLAGS) |
| 71 |
dhcp6r_SOURCES = dhcp6r.c relay6_database.c relay6_parser.c relay6_socket.c |
| 72 |
|
| 73 |
-dhcp6c_CFLAGS = -fPIE -D_GNU_SOURCE $(LIBNL_CFLAGS) |
| 74 |
+dhcp6c_CFLAGS = -fPIE $(LIBNL_CFLAGS) |
| 75 |
dhcp6c_LDFLAGS = $(LDFLAGS) $(LIBNL_LIBS) |
| 76 |
dhcp6c_SOURCES = dhcp6c.c confdata.c client6_addr.c client6_parse.y \ |
| 77 |
client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS) |
| 78 |
diff -Nutr dhcpv6-1.2.0.orig/src/Makefile.in dhcpv6-1.2.0/src/Makefile.in |
| 79 |
--- dhcpv6-1.2.0.orig/src/Makefile.in 2009-04-03 04:45:17.000000000 +0200 |
| 80 |
+++ dhcpv6-1.2.0/src/Makefile.in 2009-09-11 03:11:30.522393156 +0200 |
| 81 |
@@ -238,15 +238,15 @@ |
| 82 |
client6_parse.h server6_token.c client6_token.c \ |
| 83 |
resolv_token.c lease_token.c |
| 84 |
|
| 85 |
-dhcp6s_CFLAGS = -fPIE -D_GNU_SOURCE |
| 86 |
+dhcp6s_CFLAGS = -fPIE |
| 87 |
dhcp6s_LDFLAGS = $(LDFLAGS) |
| 88 |
dhcp6s_SOURCES = dhcp6s.c server6_conf.c server6_addr.c server6_parse.y \ |
| 89 |
server6_token.l $(COMMONSRCS) |
| 90 |
|
| 91 |
-dhcp6r_CFLAGS = -fPIE -D_GNU_SOURCE |
| 92 |
+dhcp6r_CFLAGS = -fPIE |
| 93 |
dhcp6r_LDFLAGS = $(LDFLAGS) |
| 94 |
dhcp6r_SOURCES = dhcp6r.c relay6_database.c relay6_parser.c relay6_socket.c |
| 95 |
-dhcp6c_CFLAGS = -fPIE -D_GNU_SOURCE $(LIBNL_CFLAGS) |
| 96 |
+dhcp6c_CFLAGS = -fPIE $(LIBNL_CFLAGS) |
| 97 |
dhcp6c_LDFLAGS = $(LDFLAGS) $(LIBNL_LIBS) |
| 98 |
dhcp6c_SOURCES = dhcp6c.c confdata.c client6_addr.c client6_parse.y \ |
| 99 |
client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS) |
Archives