Attachment #162009 for bug #233326

Lines 74-79 Link Here

(-)src/dhcp6c.c.orig (+4 lines)
74	# include <netinet6/in6_var.h>	74	# include <netinet6/in6_var.h>
75	#endif	75	#endif
76		76
		77	#ifdef HAVE_LINUX_IPV6_H
		78	# include <linux/ipv6.h>
		79	#endif
		80
77	#include <linux/netlink.h>	81	#include <linux/netlink.h>
78	#include <netlink/socket.h>	82	#include <netlink/socket.h>
79	#include <netlink/route/rtnl.h>	83	#include <netlink/route/rtnl.h>

Lines 62-67 Link Here

(-)src/dhcp6s.c.orig (+4 lines)
62	# include <linux/sockios.h>	62	# include <linux/sockios.h>
63	#endif	63	#endif
64		64
		65	#ifdef HAVE_LINUX_IPV6_H
		66	# include <linux/ipv6.h>
		67	#endif
		68
65	#include "dhcp6.h"	69	#include "dhcp6.h"
66	#include "cfg.h"	70	#include "cfg.h"
67	#include "common.h"	71	#include "common.h"





dhcp6clientinclude_HEADERS = client6_parse.h
lib_LTLIBRARIES = libdhcp6client.la
dhcp6s_CFLAGS = -fPIE
dhcp6s_LDFLAGS = $(BINLDFLAGS)
dhcp6s_SOURCES = dhcp6s.c server6_conf.c server6_addr.c server6_parse.y \
                 server6_token.l $(COMMONSRCS)

dhcp6r_CFLAGS = -fPIE
dhcp6r_LDFLAGS = $(BINLDFLAGS)
dhcp6r_SOURCES = dhcp6r.c relay6_database.c relay6_parser.c relay6_socket.c
dhcp6c_CFLAGS = -fPIE $(LIBNL_CFLAGS)
dhcp6c_LDFLAGS = $(BINLDFLAGS) $(LIBNL_LIBS)
dhcp6c_SOURCES = dhcp6c.c cfg.c client6_addr.c client6_parse.y \
                 client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS)

libdhcp6client_la_CFLAGS = -DLIBDHCP -fPIC $(LIBNL_CFLAGS)
libdhcp6client_la_LDFLAGS = -version-info \
                                $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
                            -release $(LT_RELEASE) \

Lines 42-47 Link Here

(-)src/relay6_socket.c.orig (+4 lines)
42	#include "relay6_parser.h"	42	#include "relay6_parser.h"
43	#include "relay6_database.h"	43	#include "relay6_database.h"
44		44
		45	#ifdef HAVE_LINUX_IPV6_H
		46	# include <linux/ipv6.h>
		47	#endif
		48
45	#ifndef IPV6_2292PKTINFO	49	#ifndef IPV6_2292PKTINFO
46	#define IPV6_2292PKTINFO IPV6_PKTINFO	50	#define IPV6_2292PKTINFO IPV6_PKTINFO
47	#endif	51	#endif

Return to bug 233326

Lines 276-295 Link Here

(-)src/Makefile.orig (-4 / +4 lines)
276		276
277	dhcp6clientinclude_HEADERS = client6_parse.h	277	dhcp6clientinclude_HEADERS = client6_parse.h
278	lib_LTLIBRARIES = libdhcp6client.la	278	lib_LTLIBRARIES = libdhcp6client.la
279	dhcp6s_CFLAGS = -fPIE -D_GNU_SOURCE	279	dhcp6s_CFLAGS = -fPIE
280	dhcp6s_LDFLAGS = $(BINLDFLAGS)	280	dhcp6s_LDFLAGS = $(BINLDFLAGS)
281	dhcp6s_SOURCES = dhcp6s.c server6_conf.c server6_addr.c server6_parse.y \	281	dhcp6s_SOURCES = dhcp6s.c server6_conf.c server6_addr.c server6_parse.y \
282	server6_token.l $(COMMONSRCS)	282	server6_token.l $(COMMONSRCS)
283		283
284	dhcp6r_CFLAGS = -fPIE -D_GNU_SOURCE	284	dhcp6r_CFLAGS = -fPIE
285	dhcp6r_LDFLAGS = $(BINLDFLAGS)	285	dhcp6r_LDFLAGS = $(BINLDFLAGS)
286	dhcp6r_SOURCES = dhcp6r.c relay6_database.c relay6_parser.c relay6_socket.c	286	dhcp6r_SOURCES = dhcp6r.c relay6_database.c relay6_parser.c relay6_socket.c
287	dhcp6c_CFLAGS = -fPIE -D_GNU_SOURCE $(LIBNL_CFLAGS)	287	dhcp6c_CFLAGS = -fPIE $(LIBNL_CFLAGS)
288	dhcp6c_LDFLAGS = $(BINLDFLAGS) $(LIBNL_LIBS)	288	dhcp6c_LDFLAGS = $(BINLDFLAGS) $(LIBNL_LIBS)
289	dhcp6c_SOURCES = dhcp6c.c cfg.c client6_addr.c client6_parse.y \	289	dhcp6c_SOURCES = dhcp6c.c cfg.c client6_addr.c client6_parse.y \
290	client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS)	290	client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS)
291		291
292	libdhcp6client_la_CFLAGS = -DLIBDHCP -D_GNU_SOURCE -fPIC $(LIBNL_CFLAGS)	292	libdhcp6client_la_CFLAGS = -DLIBDHCP -fPIC $(LIBNL_CFLAGS)
293	libdhcp6client_la_LDFLAGS = -version-info \	293	libdhcp6client_la_LDFLAGS = -version-info \
294	$(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \	294	$(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
295	-release $(LT_RELEASE) \	295	-release $(LT_RELEASE) \