* [gentoo-commits] gentoo-x86 commit in net-misc/dhcpv6/files: fix-gnusource-collisions.patch
@ 2009-04-04 19:19 Ioannis Aslanidis (deathwing00)
0 siblings, 0 replies; only message in thread
From: Ioannis Aslanidis (deathwing00) @ 2009-04-04 19:19 UTC (permalink / raw
To: gentoo-commits
deathwing00 09/04/04 19:19:15
Added: fix-gnusource-collisions.patch
Log:
Fixes bug 233326. Fixes RDEPEND issue. Package taken over.
(Portage version: 2.2_rc28/cvs/Linux x86_64)
Revision Changes Path
1.1 net-misc/dhcpv6/files/fix-gnusource-collisions.patch
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcpv6/files/fix-gnusource-collisions.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcpv6/files/fix-gnusource-collisions.patch?rev=1.1&content-type=text/plain
Index: fix-gnusource-collisions.patch
===================================================================
--- dhcpv6-1.0.22.orig/src/dhcp6c.c 2008-12-02 08:40:48.148706045 +0100
+++ dhcpv6-1.0.22/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.0.22.orig/src/dhcp6s.c 2008-12-02 08:40:48.158710880 +0100
+++ dhcpv6-1.0.22/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.0.22.orig/src/Makefile.am 2008-12-02 08:40:48.158710880 +0100
+++ dhcpv6-1.0.22/src/Makefile.am 2008-12-02 08:48:15.518699531 +0100
@@ -25,21 +25,21 @@
lib_LTLIBRARIES = libdhcp6client.la
-dhcp6s_CFLAGS = -fPIE -D_GNU_SOURCE
+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 -D_GNU_SOURCE
+dhcp6r_CFLAGS = -fPIE
dhcp6r_LDFLAGS = $(BINLDFLAGS)
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 = $(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 -D_GNU_SOURCE -fPIC $(LIBNL_CFLAGS)
+libdhcp6client_la_CFLAGS = -DLIBDHCP -fPIC $(LIBNL_CFLAGS)
libdhcp6client_la_LDFLAGS = -version-info \
$(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-release $(LT_RELEASE) \
--- dhcpv6-1.0.22.orig/src/Makefile.in 2008-12-02 08:40:48.148706045 +0100
+++ dhcpv6-1.0.22/src/Makefile.in 2008-12-02 08:47:47.308698921 +0100
@@ -278,20 +278,20 @@
dhcp6clientinclude_HEADERS = client6_parse.h
lib_LTLIBRARIES = libdhcp6client.la
-dhcp6s_CFLAGS = -fPIE -D_GNU_SOURCE
+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 -D_GNU_SOURCE
+dhcp6r_CFLAGS = -fPIE
dhcp6r_LDFLAGS = $(BINLDFLAGS)
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 = $(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 -D_GNU_SOURCE -fPIC $(LIBNL_CFLAGS)
+libdhcp6client_la_CFLAGS = -DLIBDHCP -fPIC $(LIBNL_CFLAGS)
libdhcp6client_la_LDFLAGS = -version-info \
$(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-release $(LT_RELEASE) \
--- dhcpv6-1.0.22.orig/src/relay6_socket.c 2008-12-02 08:40:48.158710880 +0100
+++ dhcpv6-1.0.22/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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-04-04 19:20 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-04 19:19 [gentoo-commits] gentoo-x86 commit in net-misc/dhcpv6/files: fix-gnusource-collisions.patch Ioannis Aslanidis (deathwing00)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox