Version bump.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 138 insertions, 1 deletions

diff --git a/net-misc/dhcpv6/ChangeLog b/net-misc/dhcpv6/ChangeLog
index 141c798f8b36..856762321e46 100644
--- a/net-misc/dhcpv6/ChangeLog
+++ b/net-misc/dhcpv6/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/dhcpv6
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/ChangeLog,v 1.23 2009/04/04 19:19:15 deathwing00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/ChangeLog,v 1.24 2009/09/11 01:20:07 deathwing00 Exp $
+
+*dhcpv6-1.2.0 (11 Sep 2009)
+
+  11 Sep 2009; Ioannis Aslanidis <deathwing00@gentoo.org>
+  +dhcpv6-1.2.0.ebuild, +files/fix-gnusource-collisions-1.2.0.patch:
+  Version bump. Created brand new patch to remove GNU_SOURCEi-caused
+  collisions.
 
 *dhcpv6-1.0.22-r1 (04 Apr 2009)
 
diff --git a/net-misc/dhcpv6/dhcpv6-1.2.0.ebuild b/net-misc/dhcpv6/dhcpv6-1.2.0.ebuild
new file mode 100644
index 000000000000..9ba2c3ba1848
--- /dev/null
+++ b/net-misc/dhcpv6/dhcpv6-1.2.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/dhcpv6/dhcpv6-1.2.0.ebuild,v 1.1 2009/09/11 01:20:07 deathwing00 Exp $
+
+inherit flag-o-matic
+
+DESCRIPTION="Server and client for DHCPv6"
+HOMEPAGE="https://fedorahosted.org/dhcpv6/"
+SRC_URI="https://fedorahosted.org/releases/d/h/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="static"
+
+DEPEND=">=dev-libs/libnl-1.1"
+RDEPEND="${DEPEND}"
+
+src_compile() {
+	use static && append-ldflags -static
+	econf || die
+	epatch "${FILESDIR}/fix-gnusource-collisions-${PV}.patch"
+	emake || die
+}
+
+mkd() {
+	local x=$1 X=$2 i=$3
+	sed \
+		-e "s:6x:6${x}:g" \
+		-e "s:6X:6${X}:g" \
+		"${FILESDIR}"/dhcp6x.${i}d.in > dhcp6${x}.${i}d
+	new${i}d dhcp6${x}.${i}d dhcp6${x}
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc AUTHORS ChangeLog README TODO RFC*
+	dodir /var/lib/dhcpv6
+
+	rm -rf "${D}"/etc/{rc.d,sysconfig}
+	mkd s S init
+	mkd s S conf
+	mkd r R init
+	mkd r R conf
+}
diff --git a/net-misc/dhcpv6/files/fix-gnusource-collisions-1.2.0.patch b/net-misc/dhcpv6/files/fix-gnusource-collisions-1.2.0.patch
new file mode 100644
index 000000000000..b6524fd4aa04
--- /dev/null
+++ b/net-misc/dhcpv6/files/fix-gnusource-collisions-1.2.0.patch
@@ -0,0 +1,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)
+