blob: b6524fd4aa046a0d3ba202562556cc2050407f18 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
|
--- dhcpv6-1.2.0.orig/src/dhcp6c.c 2008-12-02 08:40:48.148706045 +0100
+++ dhcpv6-1.2.0/src/dhcp6c.c 2008-12-02 08:43:49.708699325 +0100
@@ -74,6 +74,10 @@
# include <netinet6/in6_var.h>
#endif
+#ifdef HAVE_LINUX_IPV6_H
+# include <linux/ipv6.h>
+#endif
+
#include <linux/netlink.h>
#include <netlink/socket.h>
#include <netlink/route/rtnl.h>
--- dhcpv6-1.2.0.orig/src/dhcp6s.c 2008-12-02 08:40:48.158710880 +0100
+++ dhcpv6-1.2.0/src/dhcp6s.c 2008-12-02 08:45:42.458702955 +0100
@@ -62,6 +62,10 @@
# include <linux/sockios.h>
#endif
+#ifdef HAVE_LINUX_IPV6_H
+# include <linux/ipv6.h>
+#endif
+
#include "dhcp6.h"
#include "cfg.h"
#include "common.h"
--- dhcpv6-1.2.0.orig/src/relay6_socket.c 2008-12-02 08:40:48.158710880 +0100
+++ dhcpv6-1.2.0/src/relay6_socket.c 2008-12-02 08:47:00.648708216 +0100
@@ -42,6 +42,10 @@
#include "relay6_parser.h"
#include "relay6_database.h"
+#ifdef HAVE_LINUX_IPV6_H
+# include <linux/ipv6.h>
+#endif
+
#ifndef IPV6_2292PKTINFO
#define IPV6_2292PKTINFO IPV6_PKTINFO
#endif
diff -Nutr dhcpv6-1.2.0.orig/src/Makefile.am dhcpv6-1.2.0/src/Makefile.am
--- dhcpv6-1.2.0.orig/src/Makefile.am 2009-04-03 00:53:39.000000000 +0200
+++ dhcpv6-1.2.0/src/Makefile.am 2009-09-11 03:10:37.869487886 +0200
@@ -17,16 +17,16 @@
sbin_PROGRAMS = dhcp6s dhcp6r dhcp6c
-dhcp6s_CFLAGS = -fPIE -D_GNU_SOURCE
+dhcp6s_CFLAGS = -fPIE
dhcp6s_LDFLAGS = $(LDFLAGS)
dhcp6s_SOURCES = dhcp6s.c server6_conf.c server6_addr.c server6_parse.y \
server6_token.l $(COMMONSRCS)
-dhcp6r_CFLAGS = -fPIE -D_GNU_SOURCE
+dhcp6r_CFLAGS = -fPIE
dhcp6r_LDFLAGS = $(LDFLAGS)
dhcp6r_SOURCES = dhcp6r.c relay6_database.c relay6_parser.c relay6_socket.c
-dhcp6c_CFLAGS = -fPIE -D_GNU_SOURCE $(LIBNL_CFLAGS)
+dhcp6c_CFLAGS = -fPIE $(LIBNL_CFLAGS)
dhcp6c_LDFLAGS = $(LDFLAGS) $(LIBNL_LIBS)
dhcp6c_SOURCES = dhcp6c.c confdata.c client6_addr.c client6_parse.y \
client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS)
diff -Nutr dhcpv6-1.2.0.orig/src/Makefile.in dhcpv6-1.2.0/src/Makefile.in
--- dhcpv6-1.2.0.orig/src/Makefile.in 2009-04-03 04:45:17.000000000 +0200
+++ dhcpv6-1.2.0/src/Makefile.in 2009-09-11 03:11:30.522393156 +0200
@@ -238,15 +238,15 @@
client6_parse.h server6_token.c client6_token.c \
resolv_token.c lease_token.c
-dhcp6s_CFLAGS = -fPIE -D_GNU_SOURCE
+dhcp6s_CFLAGS = -fPIE
dhcp6s_LDFLAGS = $(LDFLAGS)
dhcp6s_SOURCES = dhcp6s.c server6_conf.c server6_addr.c server6_parse.y \
server6_token.l $(COMMONSRCS)
-dhcp6r_CFLAGS = -fPIE -D_GNU_SOURCE
+dhcp6r_CFLAGS = -fPIE
dhcp6r_LDFLAGS = $(LDFLAGS)
dhcp6r_SOURCES = dhcp6r.c relay6_database.c relay6_parser.c relay6_socket.c
-dhcp6c_CFLAGS = -fPIE -D_GNU_SOURCE $(LIBNL_CFLAGS)
+dhcp6c_CFLAGS = -fPIE $(LIBNL_CFLAGS)
dhcp6c_LDFLAGS = $(LDFLAGS) $(LIBNL_LIBS)
dhcp6c_SOURCES = dhcp6c.c confdata.c client6_addr.c client6_parse.y \
client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS)
|
GitWeb