Attachment #174048 for bug #233326

Lines 74-79 Link Here

(-)dhcpv6-1.0.22.orig/src/dhcp6c.c (+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

(-)dhcpv6-1.0.22.orig/src/dhcp6s.c (+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"





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) \





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

(-)dhcpv6-1.0.22.orig/src/relay6_socket.c (+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 25-45 Link Here

(-)dhcpv6-1.0.22.orig/src/Makefile.am (-4 / +4 lines)
25		25
26	lib_LTLIBRARIES = libdhcp6client.la	26	lib_LTLIBRARIES = libdhcp6client.la
27		27
28	dhcp6s_CFLAGS = -fPIE -D_GNU_SOURCE	28	dhcp6s_CFLAGS = -fPIE
29	dhcp6s_LDFLAGS = $(BINLDFLAGS)	29	dhcp6s_LDFLAGS = $(BINLDFLAGS)
30	dhcp6s_SOURCES = dhcp6s.c server6_conf.c server6_addr.c server6_parse.y \	30	dhcp6s_SOURCES = dhcp6s.c server6_conf.c server6_addr.c server6_parse.y \
31	server6_token.l $(COMMONSRCS)	31	server6_token.l $(COMMONSRCS)
32		32
33	dhcp6r_CFLAGS = -fPIE -D_GNU_SOURCE	33	dhcp6r_CFLAGS = -fPIE
34	dhcp6r_LDFLAGS = $(BINLDFLAGS)	34	dhcp6r_LDFLAGS = $(BINLDFLAGS)
35	dhcp6r_SOURCES = dhcp6r.c relay6_database.c relay6_parser.c relay6_socket.c	35	dhcp6r_SOURCES = dhcp6r.c relay6_database.c relay6_parser.c relay6_socket.c
36		36
37	dhcp6c_CFLAGS = -fPIE -D_GNU_SOURCE $(LIBNL_CFLAGS)	37	dhcp6c_CFLAGS = -fPIE $(LIBNL_CFLAGS)
38	dhcp6c_LDFLAGS = $(BINLDFLAGS) $(LIBNL_LIBS)	38	dhcp6c_LDFLAGS = $(BINLDFLAGS) $(LIBNL_LIBS)
39	dhcp6c_SOURCES = dhcp6c.c cfg.c client6_addr.c client6_parse.y \	39	dhcp6c_SOURCES = dhcp6c.c cfg.c client6_addr.c client6_parse.y \
40	client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS)	40	client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS)
41		41
42	libdhcp6client_la_CFLAGS = -DLIBDHCP -D_GNU_SOURCE -fPIC $(LIBNL_CFLAGS)	42	libdhcp6client_la_CFLAGS = -DLIBDHCP -fPIC $(LIBNL_CFLAGS)
43	libdhcp6client_la_LDFLAGS = -version-info \	43	libdhcp6client_la_LDFLAGS = -version-info \
44	$(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \	44	$(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
45	-release $(LT_RELEASE) \	45	-release $(LT_RELEASE) \

Lines 278-297 Link Here

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