gentoo auto-resync : 06:12:2023 - 17:00:43

4 files changed, 77 insertions, 86 deletions

diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index 836a3d30a694..4decdf319a52 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -1,10 +1,10 @@
 AUX radvd-2.15.init 1537 BLAKE2B 6ca0db1eeeee77c345e4a5d9ee75d4e4fac188e3e19b153cff748c2b3a6c95960e8c360168b32a0f2b860bf40c21de86bcff1cfb69b2f70e7ce005e46f5d532f SHA512 cd3a6527d7b323266748cf674090419e89dc153daf883601604d040fceb55850d551e44371ba383a2bb98adaf361311969d1eea94a9f3ec1bf8c11aad54aac8e
 AUX radvd-2.19-clang16.patch 1928 BLAKE2B 474ecc1ead26d8f48d3fbf3717f344e6dbb2dfbaa0bd4327d9ee2cf0141aacdaf286ed1eba8092bb94e47224bbf3204f208367fa86fcf4fdaa2361cbfa296e1d SHA512 160fda7ce408cf86312f29e525bae899df6059a01e52fb731ea14c499ab286f93a30b56d7beaea6c94a081766eddc6331df4db9890d1a7ae5ea1eff6ce8bade0
+AUX radvd-2.19-configure-c99.patch 2060 BLAKE2B ae4e10a6960854cbd1cefd2898e213596181b28b55613cf75667fc795da2ec4f4d861b0cf4ee35992ce9e201bde7a4f8bc6185c40cdc5cc221128a4bfa0c9242 SHA512 17505b1986660258dbce340c49ad114c843ce9bc86602dd29893002ab48fca3086d4009e5c3a360b4a23cddb73235c57bbaf7ac2f21e7189fe0028acd0f1da10
 AUX radvd-2.19-musl-include.patch 699 BLAKE2B 48ed5443cdad829b22f044ed5783d495ea111d4d573b6a961cf0a2fc44f7bf5a6db7c43e98a4e7f287a54d42114e5ddee9ffbc80f5209a12401a380ed3c196b0 SHA512 2451de4b6ed7979c2c64b30006c5c146612788a990f656c7ed6def6307c7682cb98708c6b780db8778ebe4ae460545bc71c00918d9fcd4bab764a10c1d5bbaf5
 AUX radvd.conf 337 BLAKE2B 67d50a761449b35389580ac956758f5c8c9373a14294a9e98e8238cce4ef2847694712e12296197ff196d58a9e5123aa6e27044a2137c36c34c6e2342ee7db63 SHA512 303a79c6e60293571f5cc868ba36f48a98658be8b6a9596c007461cbef2775d7deb67950fdacb3f37765cffdda164bc386e23bbb512cbabebd5173245841e401
 AUX radvd.service 603 BLAKE2B fb573b528050d772926f3cb3cf82984b946345f636b661583f3aa5ef720a664cc13b20b8435ad2bcdd5bbdbad6451530384cd869f6d33d4e6f2ccf014ff9871b SHA512 3371d18e71ddb7672e929152d9f93201b49c1ce08c77d59cbcac7654362690a9ab97db08519f5fbe210738595aa52f30f5972cacca988b9274e2218c21bc7dd2
 DIST radvd-2.19.tar.xz 168264 BLAKE2B e28705837263d2d377721e4eaee56b2f86d636d77cf052f08a7c74d5d7f3871f6821a2681ba4997f283b4debe9b3df28a88b01f6fc16b87ee7c3f8b6bbf431b4 SHA512 a1eb40af90fc83ebab2517c16a0f7e85c11338ab276bec400b7c33177748d1e36bc5abd7e373b6742f12f7c690dd7ae6b951bc832c7de9bbb56f7e9bc844ed22
-EBUILD radvd-2.19-r2.ebuild 1409 BLAKE2B 5708b29bca2ec1e293c09776641df4a71cdf59191129f9cdcb2abd8d02815c6545421d9d2b4a6fbb36122c59f004fe714ce63eb9ccfa77e31e756f3fbafdeef6 SHA512 38af89e84cbc8b593c142c21f1a231a7b04bae9cff539abedb9cd6d4543bc408965491f88c82a83a6fedfb003f41ed4575b6160bdef37d47cfc95d96c321b6ed
-EBUILD radvd-2.19-r4.ebuild 1408 BLAKE2B a26988d4a99d0db5ab4e6bf5305eb5fdd5601a3d4cb9f4c73a4b1ccc6b4a400c096ab680335cfd2a3e4f6abcf40d65479774f648a59d6dc5d4ebd03a4cf5c418 SHA512 b432208968f323a8f9d6af8599b6abe7c27487ecaf3deaed7fdc91d8e61b3cee374da697f0197110c5b7c9d9d9b50807c074424ebc1cb63d260a813f4bf48911
 EBUILD radvd-2.19-r5.ebuild 1635 BLAKE2B ebe97e2af4e9aa2da2933b08cb0dde984e8cef54bfe7166e24bebc522e2845eb5b7ecb4c76003649c52fd5a775dd0a85045194e600ff684e09a76d358965872f SHA512 a3c83993732669bf3204389e7e110b0947595bbae925b1ccc1749ab9869fcf231fdcb906f59f2490beeed3026a59b5e85069907e5a8bcb01d2b3b6853afa14fe
+EBUILD radvd-2.19-r6.ebuild 1681 BLAKE2B 81212210813f0073638fa8a6731cc81a1ff4768fb0688d04beb746d3814f0c50cf582fc57fca3870454996f8b9338336f81e0a31330fbbdfb0b6237aa226e072 SHA512 52379762815ad0b0c11cb58d5cf4d844422114511bc18b9d6ed305c36da8a53165bf85ae66186034209c4f2586c8d94e7893098c171c333b656cab59ddfca5d4
 MISC metadata.xml 417 BLAKE2B 7f94abef147b6a917da0c6d0070855bc54c121e0a6fbb54161e7e7de2ce0bf709de51fd3a5e834b52b2b19fbd544330266852788a810ee7f60a039a5c7c6fe14 SHA512 1402bb46da7074aa12c0154417b4d1aa3c887a3817281b59f8dcd3aa98708b30b2fa522c23d920afb4ff824753e7be2555ceb085ee72b967ff60249959c10476
diff --git a/net-misc/radvd/files/radvd-2.19-configure-c99.patch b/net-misc/radvd/files/radvd-2.19-configure-c99.patch
new file mode 100644
index 000000000000..38a6d070657f
--- /dev/null
+++ b/net-misc/radvd/files/radvd-2.19-configure-c99.patch
@@ -0,0 +1,46 @@
+https://github.com/radvd-project/radvd/commit/5acb1c64766dfaf37c9745632f99feecf11d1403
+
+From 5acb1c64766dfaf37c9745632f99feecf11d1403 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Fri, 3 Feb 2023 02:33:13 +0000
+Subject: [PATCH] configure.ac: Fix -Wint-conversion warnings
+
+These become fatal with Clang 15 and may lead to incorrect configure
+test results.
+
+```
+-ignoreme: warning: incompatible pointer to integer conversion initializing 'int' with an expression of type 'uint16_t[8]' (aka 'unsigned short[8]') [-Wint-conversion]
++ignoreme: error: incompatible pointer to integer conversion initializing 'int' with an expression of type 'uint16_t[8]' (aka 'unsigned short[8]') [-Wint-conversion]
+ int u =  in6_u.s6_addr16;
+     ^    ~~~~~~~~~~~~~~~
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -178,15 +178,19 @@ AC_HEADER_TIME
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_MSG_CHECKING(whether struct sockaddr_in6 has sin6_scope_id)
+-AC_TRY_COMPILE([#include <sys/types.h>
+-#include <netinet/in.h>], [static struct sockaddr_in6 ac_sin6; int ac_size = 
+-sizeof (ac_sin6.sin6_scope_id);], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_SIN6_SCOPE_ID],
++AC_TRY_COMPILE([#include <stdint.h>
++#include <sys/types.h>
++#include <netinet/in.h>], [
++static struct sockaddr_in6 ac_sin6;
++uint32_t ac_size = sizeof (ac_sin6.sin6_scope_id);
++], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_SIN6_SCOPE_ID],
+ 1, [whether struct sockaddr_in6 has sin6_scope_id])],
+ AC_MSG_RESULT(no))
+ 
+ AC_MSG_CHECKING(whether struct in6_addr has u6_addrXX and defines s6_addrXX)
+-AC_TRY_COMPILE([#include <netinet/in.h>], [static struct in6_addr in6_u; 
+-int u =  in6_u.s6_addr16;], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_IN6_ADDR_S6_ADDR],
++AC_TRY_COMPILE([#include <stdint.h>
++#include <netinet/in.h>], [static struct in6_addr in6_u;
++uint16_t u =  in6_u.s6_addr16[0];], [AC_MSG_RESULT(yes); AC_DEFINE([HAVE_IN6_ADDR_S6_ADDR],
+ 1, [whether struct in6_addr has u6_addrXX and defines s6_addrXX])],
+ AC_MSG_RESULT(no))
+ 
+
diff --git a/net-misc/radvd/radvd-2.19-r2.ebuild b/net-misc/radvd/radvd-2.19-r2.ebuild
deleted file mode 100644
index ac71ff204c83..000000000000
--- a/net-misc/radvd/radvd-2.19-r2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 systemd toolchain-funcs
-
-DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
-HOMEPAGE="https://radvd.litech.org/"
-SRC_URI="https://v6web.litech.org/radvd/dist/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 ~riscv sparc x86"
-IUSE="selinux test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-CDEPEND="dev-libs/libdaemon"
-DEPEND="
-	${CDEPEND}
-	sys-devel/bison
-	sys-devel/flex
-	test? ( dev-libs/check )
-"
-RDEPEND="
-	${CDEPEND}
-	acct-group/radvd
-	acct-user/radvd
-	selinux? ( sec-policy/selinux-radvd )
-"
-
-DOCS=( CHANGES README TODO radvd.conf.example )
-
-src_configure() {
-	econf --with-pidfile=/run/radvd/radvd.pid \
-		--with-systemdsystemunitdir=no \
-		$(use_with test check)
-}
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-src_install() {
-	default
-
-	docinto html
-	dodoc INTRO.html
-
-	newinitd "${FILESDIR}"/${PN}-2.15.init ${PN}
-	newconfd "${FILESDIR}"/${PN}.conf ${PN}
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-
-	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."
diff --git a/net-misc/radvd/radvd-2.19-r4.ebuild b/net-misc/radvd/radvd-2.19-r6.ebuild
index 24730014369e..1d81dd69fda5 100644
--- a/net-misc/radvd/radvd-2.19-r4.ebuild
+++ b/net-misc/radvd/radvd-2.19-r6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit readme.gentoo-r1 systemd toolchain-funcs
+inherit autotools readme.gentoo-r1 systemd toolchain-funcs
 
 DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
 HOMEPAGE="https://radvd.litech.org/"
@@ -11,29 +11,37 @@ SRC_URI="https://v6web.litech.org/radvd/dist/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ~ppc64 ~riscv sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="selinux test"
 RESTRICT="!test? ( test )"
 
-BDEPEND="virtual/pkgconfig"
-DEPEND="
+BDEPEND="
 	sys-devel/bison
 	sys-devel/flex
-	test? ( dev-libs/check )
-"
+	virtual/pkgconfig"
+DEPEND="test? ( dev-libs/check )"
 RDEPEND="
 	acct-group/radvd
 	acct-user/radvd
-	selinux? ( sec-policy/selinux-radvd )
-"
-
-DOCS=( CHANGES README TODO radvd.conf.example )
+	selinux? ( sec-policy/selinux-radvd )"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-musl-include.patch
+	"${FILESDIR}"/${P}-clang16.patch
+	"${FILESDIR}"/${P}-configure-c99.patch
 )
 
+src_prepare() {
+	default
+
+	# Drop once clang16 patch is in a release
+	eautoreconf
+}
+
 src_configure() {
+	# Needs reentrant functions (yyset_in), bug #884375
+	export LEX=flex
+
 	econf --with-pidfile=/run/radvd/radvd.pid \
 		--with-systemdsystemunitdir=no \
 		$(use_with test check)
@@ -44,23 +52,25 @@ src_compile() {
 }
 
 src_install() {
+	HTML_DOCS=( INTRO.html )
 	default
-
-	docinto html
-	dodoc INTRO.html
+	dodoc radvd.conf.example
 
 	newinitd "${FILESDIR}"/${PN}-2.15.init ${PN}
 	newconfd "${FILESDIR}"/${PN}.conf ${PN}
 
 	systemd_dounit "${FILESDIR}"/${PN}.service
 
-	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.
+	DISABLE_AUTOFORMATTING=1
+	local DOC_CONTENTS="Please create a configuration file ${EPREFIX}/etc/radvd.conf.
+See ${EPREFIX}/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."
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}