diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-24 14:11:38 +0000 |
commit | de49812990871e1705b64051c35161d5e6400269 (patch) | |
tree | 5e1e8fcb0ff4579dbd22a1bfee28a6b97dc8aaeb /net-misc/radvd | |
parent | 536c3711867ec947c1738f2c4b96f22e4863322d (diff) |
gentoo resync : 24.12.2018
Diffstat (limited to 'net-misc/radvd')
-rw-r--r-- | net-misc/radvd/Manifest | 7 | ||||
-rw-r--r-- | net-misc/radvd/files/radvd-2.14-headers.patch | 26 | ||||
-rw-r--r-- | net-misc/radvd/files/radvd-2.17-nd_opt_6co.patch | 48 | ||||
-rw-r--r-- | net-misc/radvd/metadata.xml | 4 | ||||
-rw-r--r-- | net-misc/radvd/radvd-2.14.ebuild | 6 | ||||
-rw-r--r-- | net-misc/radvd/radvd-2.17-r2.ebuild | 70 |
6 files changed, 154 insertions, 7 deletions
diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest index fd01deee27f7..48b5060dde09 100644 --- a/net-misc/radvd/Manifest +++ b/net-misc/radvd/Manifest @@ -1,10 +1,13 @@ AUX radvd-1.9.1.init 1541 BLAKE2B fadbd829fdfe7e480e6142f07853e45ce1f11ed6ecaf2ea82a898dd6258a5d85c74c8b686130c6e48f7d78c1bd337e645ce5c0a95d85fbc96617ad9baf15fd56 SHA512 1c2bef4f39c14b4244f10b5ad5a5bebeba62bf3f60da78511151713d0f29a03a2736055f84bbcd18f0b3a5dd3fb02accb81ed078105b84ca34d0dca931348d65 +AUX radvd-2.14-headers.patch 724 BLAKE2B 88dd2ebaa50e627755650d0054c4240e5ab46059f5197cbdf3e031d377dde0d2e6ea61680b6544dcc60d9cc8135253210e920e2643caba9503869e064c8ea8a9 SHA512 758a25830eed2b10c5aab18b5a670a482ed312e54c105b449f904c88737afe437c015926841b3f78bc4095e824b9e6fb4e2cfc8eb7426a7cf14481f3f58af049 AUX radvd-2.15.init 1537 BLAKE2B 6ca0db1eeeee77c345e4a5d9ee75d4e4fac188e3e19b153cff748c2b3a6c95960e8c360168b32a0f2b860bf40c21de86bcff1cfb69b2f70e7ce005e46f5d532f SHA512 cd3a6527d7b323266748cf674090419e89dc153daf883601604d040fceb55850d551e44371ba383a2bb98adaf361311969d1eea94a9f3ec1bf8c11aad54aac8e +AUX radvd-2.17-nd_opt_6co.patch 2240 BLAKE2B 45c096fc406d31d9a9edca64c6e24005ac0b73b13acdf7a73fefe39f6212e574d3eca342d90211df65255763fe40771d4836b3f5b060e4e3875a865e571c2e49 SHA512 0732d403e416fc4b3ed3f322c90b3d5c98adaf7b4fe0af05fa5ffaf3845f5047b0997f03065889c6272e57d3a09088a6beb99692cb9e4efc660638f586c4dbf3 AUX radvd.conf 337 BLAKE2B 67d50a761449b35389580ac956758f5c8c9373a14294a9e98e8238cce4ef2847694712e12296197ff196d58a9e5123aa6e27044a2137c36c34c6e2342ee7db63 SHA512 303a79c6e60293571f5cc868ba36f48a98658be8b6a9596c007461cbef2775d7deb67950fdacb3f37765cffdda164bc386e23bbb512cbabebd5173245841e401 AUX radvd.service 603 BLAKE2B fb573b528050d772926f3cb3cf82984b946345f636b661583f3aa5ef720a664cc13b20b8435ad2bcdd5bbdbad6451530384cd869f6d33d4e6f2ccf014ff9871b SHA512 3371d18e71ddb7672e929152d9f93201b49c1ce08c77d59cbcac7654362690a9ab97db08519f5fbe210738595aa52f30f5972cacca988b9274e2218c21bc7dd2 AUX radvd.tmpfilesd 30 BLAKE2B a1c207296debe31a4fb25c7ec52202b679e41fb9b73658d278e5e2599cc12b2b1b48ce53043ef89210cc18ef445c8c952e498bed43cc474b698581777843017f SHA512 d126bc90083e0f8aefda8cbd3cd01ecc9beb0eb05713c2d9fb5315bc10337d927b3c9e52c390e35799d1421078b365793772a712c33028be35280cd083cf65c3 DIST radvd-2.14.tar.gz 211461 BLAKE2B 0acdd23d1606d7dc5df3a8c8e2d3be7f6178bde866b9463b2a645a78b4ed710e8c60bcd32eff9456b80a993c3544a71721199298fccb184b357bc2ac51651f55 SHA512 8fdfd776f998b82e9dcbb29a13e44b1ba060f2e4b03bae0167549fb58731f16e80e980f9636e0d7614270b8e6457779ac044b433c5c5d26d9fb72ea9e2d3cb02 DIST radvd-2.17.tar.gz 214937 BLAKE2B 1eec22e09607c0396f9539aef203b76d5beca18d1fdf5aa0ff202dcb2ff0e36ed8af74fc7900eb7b16012bfb0672f9660f17c88c222ac0269947d3cf4a270db3 SHA512 117a42c2c007d730b956cf999ac281f50a1a9b57c9428fe0f860cb211ac234ec62f59fead244a80191aaa15ef4ce96fb7dba9bd1a3cb6c3b29f1b6897d7a6132 -EBUILD radvd-2.14.ebuild 1706 BLAKE2B d9945809543964b856b8d30cbafdad388bf48fe37cc02dbb28b3ba245ab0a581b8d5389582e416f944626218b52c6110c09488fb66259335de0edc276fcf9e25 SHA512 8d0035cb5309556841e87769b6839ded82e0fa17b7664eb7a732c8cc31561ceb0482d2ffe687ff80fc65110e9e6ec6753152c99b9ab6a7722324734137b989b8 +EBUILD radvd-2.14.ebuild 1763 BLAKE2B ffe1ecff2d2fa70d7bfb9e8dd20fc7e15a017d8ce363ed3fe36780ee803676aa6ab3d650ba8d48bd8f5fd1f2207a86486916edb831d16c723511bc9d907d71ba SHA512 7f7e28f4d4b84e088fb60a50c26ce2a42eb3ddbcfce094f035d779a01aa235b27e24ed590646ab186f2faec854e6d13f5b2c32e0e580d76dfc6d08ba5e4f9550 EBUILD radvd-2.17-r1.ebuild 1575 BLAKE2B 327a7eb2dc9a567145a14f556e4e4bb7d35e0184b83d7336d963f3754c96cfc4d1bd8db85b074c6ccf547cf4331b2260ace20a05ee085eea895fd5088cd16e2d SHA512 d4df95d439844c4be3dd7df39609c762acb27a8f3b6db1dba081c1961e03289cf0fdb795bf1d10f20053bac9e587995944a70efa5c9d6e53ab0e7cc88c1d86b8 -MISC metadata.xml 358 BLAKE2B 70f1eae6d5cf08ab6f32571544ff2a4ae7169bd493a435cf03faf038f7aa1fbe5f14dad4a19e468b2ab6577a18340489f547420bb4551288612b7fe23ea468ca SHA512 3d5a0cff9bc15adc735715969e1d5e5dbb88d1b938f12291b5e1f2b63e5eead0e598b6abb71a740867551f28a50567c4006a77fde240603aded2d956ad784485 +EBUILD radvd-2.17-r2.ebuild 1628 BLAKE2B caaaedd5d8d132165e080f1ad9888c629a2cc44f7a75a0213cbd1ffa32fd50725ded8366eeb5ecf08ce2d3d5a8873730dca7f7aff7931e3aa2ea67dbaab4ef9c SHA512 7b1ca29b1537e18c66dcd7e6bf764df08e350b9006e589de9e5388684d12ff7532e1d4b86c36d1981da8760b766916ae33a010a1052c52d51010a4e3dd3a6206 +MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31 diff --git a/net-misc/radvd/files/radvd-2.14-headers.patch b/net-misc/radvd/files/radvd-2.14-headers.patch new file mode 100644 index 000000000000..36f6c3b7de4e --- /dev/null +++ b/net-misc/radvd/files/radvd-2.14-headers.patch @@ -0,0 +1,26 @@ +Fix build failure: + recv.c:17: /usr/include/linux/if_arp.h:114:8: error: redefinition of 'struct +on modern linux-headers. + +Patch by Murilo Morais +Bug: https://bugs.gentoo.org/625236 +--- a/includes.h 2015-11-19 10:58:52.000000000 -0300 ++++ b/includes.h 2017-07-15 09:32:17.024877205 -0300 +@@ -86,7 +86,7 @@ + #include <net/if_types.h> + #endif + +-#if defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER) ++#if (defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER)) || HAVE_LINUX_IF_ARP_H + #include <net/if_arp.h> + #endif /* defined(HAVE_NET_IF_ARP_H) && !defined(ARPHRD_ETHER) */ + +@@ -101,8 +101,3 @@ + #ifdef HAVE_IFADDRS_H + #include <ifaddrs.h> + #endif +- +-#ifdef HAVE_LINUX_IF_ARP_H +-#include <linux/if_arp.h> +-#endif +- diff --git a/net-misc/radvd/files/radvd-2.17-nd_opt_6co.patch b/net-misc/radvd/files/radvd-2.17-nd_opt_6co.patch new file mode 100644 index 000000000000..09fb29f9e318 --- /dev/null +++ b/net-misc/radvd/files/radvd-2.17-nd_opt_6co.patch @@ -0,0 +1,48 @@ +nd_opt_6co: fix serialization + +Bug: https://github.com/reubenhwk/radvd/issues/77 +Bug: https://bugs.gentoo.org/637958 +--- a/radvd.h ++++ b/radvd.h +@@ -261,5 +261,3 @@ struct nd_opt_6co { + uint8_t nd_opt_6co_context_len; +- uint8_t nd_opt_6co_res : 3; +- uint8_t nd_opt_6co_c : 1; +- uint8_t nd_opt_6co_cid : 4; ++ uint8_t nd_opt_6co_res_c_cid; /* [ res=3-bits | c=1-bit | cid=4-bits ] */ + uint16_t nd_opt_6co_reserved; +--- a/send.c ++++ b/send.c +@@ -621,5 +621,5 @@ static void add_ra_option_lowpanco(struct safe_buffer *sb, struct AdvLowpanCo co + co.nd_opt_6co_context_len = lowpanco->ContextLength; +- co.nd_opt_6co_c = lowpanco->ContextCompressionFlag; +- co.nd_opt_6co_cid = lowpanco->AdvContextID; +- co.nd_opt_6co_valid_lifetime = lowpanco->AdvLifeTime; ++ co.nd_opt_6co_res_c_cid = ((lowpanco->ContextCompressionFlag ? 1 : 0) << 4) ++ | (lowpanco->AdvContextID & 0x0F); ++ co.nd_opt_6co_valid_lifetime = htons(lowpanco->AdvLifeTime); + co.nd_opt_6co_con_prefix = lowpanco->AdvContextPrefix; +@@ -637,5 +637,5 @@ static void add_ra_option_abro(struct safe_buffer *sb, struct AdvAbro const *abr + abro.nd_opt_abro_len = 3; +- abro.nd_opt_abro_ver_low = abroo->Version[1]; +- abro.nd_opt_abro_ver_high = abroo->Version[0]; +- abro.nd_opt_abro_valid_lifetime = abroo->ValidLifeTime; ++ abro.nd_opt_abro_ver_low = htons(abroo->Version[1]); ++ abro.nd_opt_abro_ver_high = htons(abroo->Version[0]); ++ abro.nd_opt_abro_valid_lifetime = htons(abroo->ValidLifeTime); + abro.nd_opt_abro_6lbr_address = abroo->LBRaddress; +--- a/test/send.c ++++ b/test/send.c +@@ -311,6 +311,5 @@ START_TEST(test_add_ra_option_lowpanco) + unsigned char expected[] = { +- 0x22, 0x03, 0x32, 0x48, 0x00, 0x00, 0xe8, 0x03, 0x00, 0x00, 0x00, 0x00, ++ 0x22, 0x03, 0x32, 0x14, 0x00, 0x00, 0x03, 0xe8, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + }; +- + ck_assert_int_eq(sb.used, sizeof(expected)); +@@ -336,3 +335,3 @@ START_TEST(test_add_ra_option_abro) + unsigned char expected[] = { +- 0x23, 0x03, 0x0a, 0x00, 0x02, 0x00, 0x02, 0x00, 0xfe, 0x80, 0x00, 0x00, ++ 0x23, 0x03, 0x00, 0x0a, 0x00, 0x02, 0x00, 0x02, 0xfe, 0x80, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xa2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, diff --git a/net-misc/radvd/metadata.xml b/net-misc/radvd/metadata.xml index 8307f5e2d4f5..3ffdeb4af3b5 100644 --- a/net-misc/radvd/metadata.xml +++ b/net-misc/radvd/metadata.xml @@ -2,10 +2,6 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> - <email>xmw@gentoo.org</email> - <name>Michael Weber</name> - </maintainer> - <maintainer type="person"> <email>prometheanfire@gentoo.org</email> <name>Matthew Thode</name> </maintainer> diff --git a/net-misc/radvd/radvd-2.14.ebuild b/net-misc/radvd/radvd-2.14.ebuild index 866364355569..2dfcb3af875c 100644 --- a/net-misc/radvd/radvd-2.14.ebuild +++ b/net-misc/radvd/radvd-2.14.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -33,6 +33,10 @@ pkg_setup() { [[ -d ${ROOT}/var/run/radvd ]] && chown radvd:radvd "${ROOT}"/var/run/radvd } +src_prepare() { + epatch "${FILESDIR}"/${P}-headers.patch +} + src_configure() { econf --with-pidfile=/var/run/radvd/radvd.pid \ --disable-silent-rules \ diff --git a/net-misc/radvd/radvd-2.17-r2.ebuild b/net-misc/radvd/radvd-2.17-r2.ebuild new file mode 100644 index 000000000000..aeaf39fdd2b1 --- /dev/null +++ b/net-misc/radvd/radvd-2.17-r2.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit systemd user eutils readme.gentoo-r1 + +DESCRIPTION="Linux IPv6 Router Advertisement Daemon" +HOMEPAGE="http://v6web.litech.org/radvd/" +SRC_URI="http://v6web.litech.org/radvd/dist/${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd" +IUSE="kernel_FreeBSD selinux test" + +CDEPEND="dev-libs/libdaemon" +DEPEND="${CDEPEND} + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + test? ( dev-libs/check )" +RDEPEND="${CDEPEND} + selinux? ( sec-policy/selinux-radvd ) +" +DOCS=( CHANGES README TODO radvd.conf.example ) + +PATCHES=( + "${FILESDIR}"/${P}-nd_opt_6co.patch +) + +pkg_setup() { + enewgroup radvd + enewuser radvd -1 -1 /dev/null radvd +} + +src_configure() { + econf --with-pidfile=/run/radvd/radvd.pid \ + --disable-silent-rules \ + --with-systemdsystemunitdir=no \ + $(use_with test check) +} + +src_install() { + default + + insinto /usr/share/doc/${PF}/html + doins INTRO.html + + newinitd "${FILESDIR}"/${PN}-2.15.init ${PN} + newconfd "${FILESDIR}"/${PN}.conf ${PN} + + systemd_dounit "${FILESDIR}"/${PN}.service + + if use kernel_FreeBSD ; then + sed -i -e \ + 's/^SYSCTL_FORWARD=.*$/SYSCTL_FORWARD=net.inet6.ip6.forwarding/g' \ + "${D}"/etc/init.d/${PN} || die + fi + + readme.gentoo_create_doc +} + +DISABLE_AUTOFORMATTING=1 +DOC_CONTENTS="Please create a configuration file ${ROOT}etc/radvd.conf. +See ${ROOT}usr/share/doc/${PF} for an example. + +grsecurity users should allow a specific group to read /proc +and add the radvd user to that group, otherwise radvd may +segfault on startup." |