From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1LqBPT-0000fU-WE for garchives@archives.gentoo.org; Sat, 04 Apr 2009 19:20:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74371E083C; Sat, 4 Apr 2009 19:19:16 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2E68DE083C for ; Sat, 4 Apr 2009 19:19:16 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id C49AF65291 for ; Sat, 4 Apr 2009 19:19:15 +0000 (UTC) Received: from deathwing00 by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1LqBOd-0002VG-EI for gentoo-commits@lists.gentoo.org; Sat, 04 Apr 2009 19:19:15 +0000 From: "Ioannis Aslanidis (deathwing00)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, deathwing00@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in net-misc/dhcpv6/files: fix-gnusource-collisions.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: fix-gnusource-collisions.patch X-VCS-Directories: net-misc/dhcpv6/files X-VCS-Committer: deathwing00 X-VCS-Committer-Name: Ioannis Aslanidis Content-Type: text/plain; charset=utf8 Message-Id: Sender: Ioannis Aslanidis Date: Sat, 04 Apr 2009 19:19:15 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 64f02387-8569-4bc5-a2e9-ed1012d5cf3f X-Archives-Hash: bd6799eeb1bf68ebbbabdcc4928f9398 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/fi= les/fix-gnusource-collisions.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-misc/dhcpv6/fi= les/fix-gnusource-collisions.patch?rev=3D1.1&content-type=3Dtext/plain Index: fix-gnusource-collisions.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 #endif =20 +#ifdef HAVE_LINUX_IPV6_H +# include +#endif + #include #include #include --- 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 #endif =20 +#ifdef HAVE_LINUX_IPV6_H +# include +#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 +010= 0 +++ dhcpv6-1.0.22/src/Makefile.am 2008-12-02 08:48:15.518699531 +0100 @@ -25,21 +25,21 @@ =20 lib_LTLIBRARIES =3D libdhcp6client.la =20 -dhcp6s_CFLAGS =3D -fPIE -D_GNU_SOURCE +dhcp6s_CFLAGS =3D -fPIE=20 dhcp6s_LDFLAGS =3D $(BINLDFLAGS) dhcp6s_SOURCES =3D dhcp6s.c server6_conf.c server6_addr.c server6_parse.= y \ server6_token.l $(COMMONSRCS) =20 -dhcp6r_CFLAGS =3D -fPIE -D_GNU_SOURCE +dhcp6r_CFLAGS =3D -fPIE=20 dhcp6r_LDFLAGS =3D $(BINLDFLAGS) dhcp6r_SOURCES =3D dhcp6r.c relay6_database.c relay6_parser.c relay6_soc= ket.c =20 -dhcp6c_CFLAGS =3D -fPIE -D_GNU_SOURCE $(LIBNL_CFLAGS) +dhcp6c_CFLAGS =3D -fPIE $(LIBNL_CFLAGS) dhcp6c_LDFLAGS =3D $(BINLDFLAGS) $(LIBNL_LIBS) dhcp6c_SOURCES =3D dhcp6c.c cfg.c client6_addr.c client6_parse.y \ client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS= ) =20 -libdhcp6client_la_CFLAGS =3D -DLIBDHCP -D_GNU_SOURCE -fPIC $(LIBNL_CFLAG= S) +libdhcp6client_la_CFLAGS =3D -DLIBDHCP -fPIC $(LIBNL_CFLAGS) libdhcp6client_la_LDFLAGS =3D -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 +010= 0 +++ dhcpv6-1.0.22/src/Makefile.in 2008-12-02 08:47:47.308698921 +0100 @@ -278,20 +278,20 @@ =20 dhcp6clientinclude_HEADERS =3D client6_parse.h lib_LTLIBRARIES =3D libdhcp6client.la -dhcp6s_CFLAGS =3D -fPIE -D_GNU_SOURCE +dhcp6s_CFLAGS =3D -fPIE=20 dhcp6s_LDFLAGS =3D $(BINLDFLAGS) dhcp6s_SOURCES =3D dhcp6s.c server6_conf.c server6_addr.c server6_parse.= y \ server6_token.l $(COMMONSRCS) =20 -dhcp6r_CFLAGS =3D -fPIE -D_GNU_SOURCE +dhcp6r_CFLAGS =3D -fPIE dhcp6r_LDFLAGS =3D $(BINLDFLAGS) dhcp6r_SOURCES =3D dhcp6r.c relay6_database.c relay6_parser.c relay6_soc= ket.c -dhcp6c_CFLAGS =3D -fPIE -D_GNU_SOURCE $(LIBNL_CFLAGS) +dhcp6c_CFLAGS =3D -fPIE $(LIBNL_CFLAGS) dhcp6c_LDFLAGS =3D $(BINLDFLAGS) $(LIBNL_LIBS) dhcp6c_SOURCES =3D dhcp6c.c cfg.c client6_addr.c client6_parse.y \ client6_token.l dad_parse.c resolv_token.l $(COMMONSRCS= ) =20 -libdhcp6client_la_CFLAGS =3D -DLIBDHCP -D_GNU_SOURCE -fPIC $(LIBNL_CFLAG= S) +libdhcp6client_la_CFLAGS =3D -DLIBDHCP -fPIC $(LIBNL_CFLAGS) libdhcp6client_la_LDFLAGS =3D -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" =20 +#ifdef HAVE_LINUX_IPV6_H +# include +#endif + #ifndef IPV6_2292PKTINFO #define IPV6_2292PKTINFO IPV6_PKTINFO #endif