radvd: upgraded package to upstream
Upgraded net-misc/radvd to version 2.17-r1 on amd64, arm
2.17 includes a fix from upstream radvd that helps when building with
new linux-headers:
commit 1a76e9047486f4dc12b7c8e22d6198b8af7f3d2b
Author: Pavel Zhukov <pzhukov@redhat.com>
Date: Tue Apr 4 09:43:26 2017 +0200
Do not use if_arp from glibc if one from linux is usable
In case if both net/if_arp.h and linux/if_arp.h can be used at the
same time (don't have incomplete types etc) the compilation is failed
with type redifiniation error. It worked so far because there were few
incomplete types in linux/if_arp.h dependencies.
Signed-off-by: Pavel Zhukov <pzhukov@redhat.com>
BUG=none
TEST=`network_Ipv6SimpleNegotiation` autotest
Change-Id: I12c12daa650afc95c86daa89347b194b36b12bbf
Reviewed-on: https://chromium-review.googlesource.com/1195911
Commit-Ready: Brian Norris <briannorris@chromium.org>
Tested-by: Brian Norris <briannorris@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
diff --git a/metadata/md5-cache/net-misc/radvd-2.14 b/metadata/md5-cache/net-misc/radvd-2.14
deleted file mode 100644
index 952c771..0000000
--- a/metadata/md5-cache/net-misc/radvd-2.14
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst setup
-DEPEND=dev-libs/libdaemon sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-libs/check ) virtual/pkgconfig sys-apps/baselayout
-DESCRIPTION=Linux IPv6 Router Advertisement Daemon
-EAPI=5
-HOMEPAGE=http://v6web.litech.org/radvd/
-IUSE=kernel_FreeBSD selinux test
-KEYWORDS=*
-LICENSE=BSD
-RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd ) sys-apps/baselayout
-SLOT=0
-SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.14.tar.gz
-_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 97f470f374f2e94ccab04a2fb21d811e readme.gentoo 2466b2f6a77a9600954c6b99ebca6e02 systemd 8f5286f89e265842f5b5189666eae88b toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 77ad494d1257e3badef496e390973d6b
-_md5_=1937b7086482b33ef9782f8e412bb04e
diff --git a/metadata/md5-cache/net-misc/radvd-2.17-r1 b/metadata/md5-cache/net-misc/radvd-2.17-r1
new file mode 100644
index 0000000..fe2eb00
--- /dev/null
+++ b/metadata/md5-cache/net-misc/radvd-2.17-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install setup
+DEPEND=dev-libs/libdaemon sys-devel/bison sys-devel/flex virtual/pkgconfig test? ( dev-libs/check ) virtual/pkgconfig sys-apps/baselayout
+DESCRIPTION=Linux IPv6 Router Advertisement Daemon
+EAPI=6
+HOMEPAGE=http://v6web.litech.org/radvd/
+IUSE=kernel_FreeBSD selinux test
+KEYWORDS=*
+LICENSE=BSD
+RDEPEND=dev-libs/libdaemon selinux? ( sec-policy/selinux-radvd ) sys-apps/baselayout
+SLOT=0
+SRC_URI=http://v6web.litech.org/radvd/dist/radvd-2.17.tar.gz
+_eclasses_=eutils 06133990e861be0fe60c2b428fd025d9 multilib 97f470f374f2e94ccab04a2fb21d811e readme.gentoo-r1 6f03e110529650f57fc7d1fb908b8986 systemd 8f5286f89e265842f5b5189666eae88b toolchain-funcs 1e35303c63cd707f6c3422b4493d5607 user 77ad494d1257e3badef496e390973d6b
+_md5_=0a1f0193ce870ace90f43a20140ab612
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index 8f1d589..11d5888 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -1 +1 @@
-DIST radvd-2.14.tar.gz 211461 SHA256 46d31c05daea11c3d1e3dc092997d3631b3bc72b20a4f279b05304b83dbd7aa8 SHA512 8fdfd776f998b82e9dcbb29a13e44b1ba060f2e4b03bae0167549fb58731f16e80e980f9636e0d7614270b8e6457779ac044b433c5c5d26d9fb72ea9e2d3cb02 WHIRLPOOL 6f2974c4e9d689052b36885c2b82425e346bdd7fd3a928a650f2c71debc7cd5e3c13504759fb5cec20641f4e6fdf35ce6a83fe3023f6efa00efff3da84b01954
+DIST radvd-2.17.tar.gz 214937 SHA256 53757e7f2164899e1145482f1ae91829600a6e2f6fec29cfb3b350a3bb45bd5d SHA512 117a42c2c007d730b956cf999ac281f50a1a9b57c9428fe0f860cb211ac234ec62f59fead244a80191aaa15ef4ce96fb7dba9bd1a3cb6c3b29f1b6897d7a6132 WHIRLPOOL fdd0a9fbe306a6f761e3260071c7557bb3c0b164fb139bce8d9403bc97f087069f96077eb5f2dc92594a0b1e91eca1062ac817610f66c1402cb660703ee3fa12
diff --git a/net-misc/radvd/files/radvd-1.9.1.init b/net-misc/radvd/files/radvd-1.9.1.init
index 099bd92..cea8807 100644
--- a/net-misc/radvd/files/radvd-1.9.1.init
+++ b/net-misc/radvd/files/radvd-1.9.1.init
@@ -1,7 +1,6 @@
#!/sbin/openrc-run
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CONFIGFILE=/etc/radvd.conf
PIDFILE=/var/run/radvd/radvd.pid
diff --git a/net-misc/radvd/files/radvd-2.15.init b/net-misc/radvd/files/radvd-2.15.init
index 1603d5d..2c96cca 100644
--- a/net-misc/radvd/files/radvd-2.15.init
+++ b/net-misc/radvd/files/radvd-2.15.init
@@ -1,7 +1,6 @@
#!/sbin/openrc-run
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
CONFIGFILE=/etc/radvd.conf
PIDFILE=/run/radvd/radvd.pid
diff --git a/net-misc/radvd/files/radvd.conf b/net-misc/radvd/files/radvd.conf
index d1a95b8..6ba8f65 100644
--- a/net-misc/radvd/files/radvd.conf
+++ b/net-misc/radvd/files/radvd.conf
@@ -1,6 +1,5 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
# Extra options to pass to radvd
OPTIONS=""
diff --git a/net-misc/radvd/radvd-2.14.ebuild b/net-misc/radvd/radvd-2.17-r1.ebuild
similarity index 75%
rename from net-misc/radvd/radvd-2.14.ebuild
rename to net-misc/radvd/radvd-2.17-r1.ebuild
index 10dd79e..c34caec 100644
--- a/net-misc/radvd/radvd-2.14.ebuild
+++ b/net-misc/radvd/radvd-2.17-r1.ebuild
@@ -1,10 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Id$
-EAPI=5
+EAPI=6
-inherit systemd user eutils readme.gentoo
+inherit systemd user eutils readme.gentoo-r1
DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
HOMEPAGE="http://v6web.litech.org/radvd/"
@@ -29,27 +28,25 @@
pkg_setup() {
enewgroup radvd
enewuser radvd -1 -1 /dev/null radvd
-
- # force ownership of radvd user and group (bug #19647)
- [[ -d ${ROOT}/var/run/radvd ]] && chown radvd:radvd "${ROOT}"/var/run/radvd
}
src_configure() {
- econf --with-pidfile=/var/run/radvd/radvd.pid \
+ econf --with-pidfile=/run/radvd/radvd.pid \
--disable-silent-rules \
+ --with-systemdsystemunitdir=no \
$(use_with test check)
}
src_install() {
default
- dohtml INTRO.html
+ insinto /usr/share/doc/${PF}/html
+ doins INTRO.html
- newinitd "${FILESDIR}"/${PN}-1.9.1.init ${PN}
+ newinitd "${FILESDIR}"/${PN}-2.15.init ${PN}
newconfd "${FILESDIR}"/${PN}.conf ${PN}
systemd_dounit "${FILESDIR}"/${PN}.service
- systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfilesd ${PN}.conf
if use kernel_FreeBSD ; then
sed -i -e \
