public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-misc/radvd/, net-misc/radvd/files/
@ 2018-11-25 11:14 Sergei Trofimovich
  0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2018-11-25 11:14 UTC (permalink / raw
  To: gentoo-commits

commit:     6b771c256f85e302da9fb833d9f162971d752c91
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 11:13:28 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Nov 25 11:14:13 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b771c25

net-misc/radvd: backport nd_opt_6co serialization, bug #637958

Reported-by: Rolf Eike Beer
Bug: https://github.com/reubenhwk/radvd/issues/77
Closes: https://bugs.gentoo.org/637958
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-misc/radvd/files/radvd-2.17-nd_opt_6co.patch | 48 ++++++++++++++++
 net-misc/radvd/radvd-2.17-r2.ebuild              | 70 ++++++++++++++++++++++++
 2 files changed, 118 insertions(+)

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 00000000000..09fb29f9e31
--- /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/radvd-2.17-r2.ebuild b/net-misc/radvd/radvd-2.17-r2.ebuild
new file mode 100644
index 00000000000..aeaf39fdd2b
--- /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."


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/radvd/, net-misc/radvd/files/
@ 2018-11-25 11:21 Sergei Trofimovich
  0 siblings, 0 replies; 5+ messages in thread
From: Sergei Trofimovich @ 2018-11-25 11:21 UTC (permalink / raw
  To: gentoo-commits

commit:     8fad7a82a85f3f6622425bc425c9818e8a76850c
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 25 11:21:05 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Nov 25 11:21:05 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fad7a82

net-misc/radvd: fix build aganst linux-headers, bug #625236

Patch by Murilo Morais
Closes: https://bugs.gentoo.org/625236
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-misc/radvd/files/radvd-2.14-headers.patch | 26 ++++++++++++++++++++++++++
 net-misc/radvd/radvd-2.14.ebuild              |  6 +++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

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 00000000000..36f6c3b7de4
--- /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/radvd-2.14.ebuild b/net-misc/radvd/radvd-2.14.ebuild
index 86636435556..2dfcb3af875 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 \


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/radvd/, net-misc/radvd/files/
@ 2021-05-15 18:26 Andreas Sturmlechner
  0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2021-05-15 18:26 UTC (permalink / raw
  To: gentoo-commits

commit:     e0781b9663a80448f0aa5fefe5c14d6f0ad195e6
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May  3 21:17:15 2021 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 15 18:25:36 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0781b96

net-misc/radvd: Drop 2.17 and 2.18, EAPI6--

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-misc/radvd/Manifest                          |  2 -
 net-misc/radvd/files/radvd-2.17-nd_opt_6co.patch | 48 ----------------
 net-misc/radvd/radvd-2.17-r1.ebuild              | 66 ---------------------
 net-misc/radvd/radvd-2.17-r2.ebuild              | 70 -----------------------
 net-misc/radvd/radvd-2.18-r1.ebuild              | 73 ------------------------
 net-misc/radvd/radvd-2.18.ebuild                 | 69 ----------------------
 6 files changed, 328 deletions(-)

diff --git a/net-misc/radvd/Manifest b/net-misc/radvd/Manifest
index 20f1a9e7a00..acedd8af8fa 100644
--- a/net-misc/radvd/Manifest
+++ b/net-misc/radvd/Manifest
@@ -1,3 +1 @@
-DIST radvd-2.17.tar.gz 214937 BLAKE2B 1eec22e09607c0396f9539aef203b76d5beca18d1fdf5aa0ff202dcb2ff0e36ed8af74fc7900eb7b16012bfb0672f9660f17c88c222ac0269947d3cf4a270db3 SHA512 117a42c2c007d730b956cf999ac281f50a1a9b57c9428fe0f860cb211ac234ec62f59fead244a80191aaa15ef4ce96fb7dba9bd1a3cb6c3b29f1b6897d7a6132
-DIST radvd-2.18.tar.gz 224183 BLAKE2B 4bacf9e17b78286a032ca5e6b6424aa8742d2e42b3a00a67e5d8beeda139a70a574e69c0d8fde2c2754b6e9c9e92a97dfb6a2a67b4b3ce91740aa8edee994c5e SHA512 b66068ec40d4f228f679946039d7c696bf611eb55b88cb37bbea5e748cf7cdda796dc0b12e0f1e54b26a6af21750c8714ea18a152ef932741c0f0a6a7a9de59a
 DIST radvd-2.19.tar.gz 222794 BLAKE2B 1c877d5a9eda6bda41b5c20ac9c1e28a26defc192fe14fc2d65888280bc96fc1ff6f4212ccaeac5f7e899087b2805772ed4c0cbbda163b2a87c79a2c178eda2b SHA512 caa621fd77e34ff6858d60a41b0ee02aff967ac14f2b84c402359744f4bece5c1563419860431c328adc0385e9893ed1f2421d652247a3aa0dfc0aaad1e01233

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
deleted file mode 100644
index 09fb29f9e31..00000000000
--- a/net-misc/radvd/files/radvd-2.17-nd_opt_6co.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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/radvd-2.17-r1.ebuild b/net-misc/radvd/radvd-2.17-r1.ebuild
deleted file mode 100644
index 7bed2c874d9..00000000000
--- a/net-misc/radvd/radvd-2.17-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user 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"
-IUSE="kernel_FreeBSD selinux test"
-RESTRICT="!test? ( 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 )
-
-pkg_setup() {
-	enewgroup radvd
-	enewuser radvd -1 -1 /dev/null radvd
-}
-
-src_configure() {
-	econf --with-pidfile=/run/radvd/radvd.pid \
-		--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."

diff --git a/net-misc/radvd/radvd-2.17-r2.ebuild b/net-misc/radvd/radvd-2.17-r2.ebuild
deleted file mode 100644
index f323029a594..00000000000
--- a/net-misc/radvd/radvd-2.17-r2.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user 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"
-IUSE="kernel_FreeBSD selinux test"
-RESTRICT="!test? ( 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 \
-		--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."

diff --git a/net-misc/radvd/radvd-2.18-r1.ebuild b/net-misc/radvd/radvd-2.18-r1.ebuild
deleted file mode 100644
index e64526ed134..00000000000
--- a/net-misc/radvd/radvd-2.18-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user readme.gentoo-r1 toolchain-funcs
-
-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 ~ppc64 ~sparc ~x86"
-IUSE="kernel_FreeBSD selinux test"
-RESTRICT="!test? ( 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=(
-)
-
-pkg_setup() {
-	enewgroup radvd
-	enewuser radvd -1 -1 /dev/null radvd
-}
-
-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
-
-	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."

diff --git a/net-misc/radvd/radvd-2.18.ebuild b/net-misc/radvd/radvd-2.18.ebuild
deleted file mode 100644
index a39b4d0db4e..00000000000
--- a/net-misc/radvd/radvd-2.18.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user 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 ~ppc64 sparc x86"
-IUSE="kernel_FreeBSD selinux test"
-RESTRICT="!test? ( 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=(
-)
-
-pkg_setup() {
-	enewgroup radvd
-	enewuser radvd -1 -1 /dev/null radvd
-}
-
-src_configure() {
-	econf --with-pidfile=/run/radvd/radvd.pid \
-		--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."


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/radvd/, net-misc/radvd/files/
@ 2022-09-13 14:32 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2022-09-13 14:32 UTC (permalink / raw
  To: gentoo-commits

commit:     d9be9452dc264ba3a32ed16ae97707167df383d4
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 13 14:32:09 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Sep 13 14:32:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9be9452

net-misc/radvd: update EAPI 7 -> 8; fix runtime w/ musl (and build w/ Clang 15)

Bug: https://github.com/radvd-project/radvd/issues/158
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-misc/radvd/files/radvd-2.19-musl-include.patch | 28 +++++++++
 net-misc/radvd/radvd-2.19-r3.ebuild                | 69 ++++++++++++++++++++++
 2 files changed, 97 insertions(+)

diff --git a/net-misc/radvd/files/radvd-2.19-musl-include.patch b/net-misc/radvd/files/radvd-2.19-musl-include.patch
new file mode 100644
index 000000000000..cba7666f8129
--- /dev/null
+++ b/net-misc/radvd/files/radvd-2.19-musl-include.patch
@@ -0,0 +1,28 @@
+https://github.com/radvd-project/radvd/commit/06689f8c06f44c7e87f7ff1d814428f88375b53f
+https://github.com/radvd-project/radvd/pull/161
+https://github.com/radvd-project/radvd/issues/158
+
+From: Jonathan Davies <jpds@protonmail.com>
+Date: Thu, 25 Nov 2021 15:29:18 +0000
+Subject: [PATCH] Reverts the include.h change in
+ 46883f8a1a02fe42040dd8e48aec0ed871545d4d
+
+Closes: #158
+
+Signed-off-by: Jonathan Davies <jpds@protonmail.com>
+--- a/includes.h
++++ b/includes.h
+@@ -76,12 +76,7 @@
+ #include <sys/sysctl.h>
+ #endif
+ 
+-#if !defined(__GLIBC__) && defined(linux)
+-#include <linux/if.h>
+-#define IF_NAMESIZE IFNAMSIZ
+-#else
+ #include <net/if.h>
+-#endif
+ 
+ #ifdef HAVE_NET_IF_DL_H
+ #include <net/if_dl.h>
+

diff --git a/net-misc/radvd/radvd-2.19-r3.ebuild b/net-misc/radvd/radvd-2.19-r3.ebuild
new file mode 100644
index 000000000000..e5bb868d1b38
--- /dev/null
+++ b/net-misc/radvd/radvd-2.19-r3.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit readme.gentoo-r1 systemd toolchain-funcs
+
+DESCRIPTION="Linux IPv6 Router Advertisement Daemon"
+HOMEPAGE="https://v6web.litech.org/radvd/"
+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 )
+
+PATCHES=(
+	"${FILESDIR}"/${P}-musl-include.patch
+)
+
+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."


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/radvd/, net-misc/radvd/files/
@ 2023-12-06 16:01 Sam James
  0 siblings, 0 replies; 5+ messages in thread
From: Sam James @ 2023-12-06 16:01 UTC (permalink / raw
  To: gentoo-commits

commit:     71e0258b5309c64c42807d099af04f0c578f8cfb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  6 11:46:25 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec  6 16:00:57 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71e0258b

net-misc/radvd: fix modern c issue in configure

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../radvd/files/radvd-2.19-configure-c99.patch     | 46 +++++++++++++
 net-misc/radvd/radvd-2.19-r6.ebuild                | 76 ++++++++++++++++++++++
 2 files changed, 122 insertions(+)

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-r6.ebuild b/net-misc/radvd/radvd-2.19-r6.ebuild
new file mode 100644
index 000000000000..1d81dd69fda5
--- /dev/null
+++ b/net-misc/radvd/radvd-2.19-r6.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools 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="
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig"
+DEPEND="test? ( dev-libs/check )"
+RDEPEND="
+	acct-group/radvd
+	acct-user/radvd
+	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)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
+src_install() {
+	HTML_DOCS=( INTRO.html )
+	default
+	dodoc radvd.conf.example
+
+	newinitd "${FILESDIR}"/${PN}-2.15.init ${PN}
+	newconfd "${FILESDIR}"/${PN}.conf ${PN}
+
+	systemd_dounit "${FILESDIR}"/${PN}.service
+
+	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
+}


^ permalink raw reply related	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-12-06 16:01 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-13 14:32 [gentoo-commits] repo/gentoo:master commit in: net-misc/radvd/, net-misc/radvd/files/ Sam James
  -- strict thread matches above, loose matches on Subject: below --
2023-12-06 16:01 Sam James
2021-05-15 18:26 Andreas Sturmlechner
2018-11-25 11:21 Sergei Trofimovich
2018-11-25 11:14 Sergei Trofimovich

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox