gentoo auto-resync : 14:09:2022 - 11:10:10

4 files changed, 132 insertions, 0 deletions

diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index af84edcda779..490d6dc4c146 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -1,5 +1,8 @@
+AUX xinetd-2.3.15.4-0001-configure.ac-use-AC_USE_SYSTEM_EXTENSIONS.patch 1558 BLAKE2B 38f2f5d3cfdd7b63d198c00678ceb31458bea50637d50a09ed7af8aa252d32e891500d12118c7e91959a486c16dbd25c5298250b7bd7e48633f02128fbe541b9 SHA512 70f62467cdd8250be504dc3a82c7305e75ebf0e6ff9b99507ddb5c6dc6274c5802cc339d154306e91db0638e14cfe03b0d9918463a361d555418feaec927ddb5
+AUX xinetd-2.3.15.4-0002-redirect-drop-deprecated-sys-signal.h-include.patch 690 BLAKE2B 4601043b3bc77e327c0db06727ca25212c26e4025a2ca6d38a4e43acced68b15e3df4b20eeca8dbe0e51b43f569d0f58d4f3975b8f67db4e2c7d7b7dbc159860 SHA512 d07c8cfeeac5ec18727c049f8494c0e9056a449f0b171d8f8ca0c0de791f7693db7e824d790c5f1dfb39501c2c5e70f144dc3e66299e1e68f1cfd59d1f27d6a5
 AUX xinetd.confd 90 BLAKE2B 4fd6cce15cffc6de5b59e83646cafbf52f61b203292ac4ecbbaed904d8387a4ac686f730e2f0ddf5ee90575bd0a7d73588a23b25ec4a6e9c73d48714f5770f5d SHA512 03bf05e544c0e52bc2bdeadf494dabd49ace985687b656baae869be99ef65a5f7129492c37e062bf6f196f70561d6239f2d3c4e8171fddc04729d3e266bfe2b2
 AUX xinetd.rc6 721 BLAKE2B d273c33bdd9df218f8dfdc765c0e3a788baaee0fbb3fd20e63be0f1d4b587b19550107c1818015077ce9fa194fca7180748b39089c51101f10ceeb6066a323af SHA512 bfe591f83a03e26ccbe06c489fa8c2e7af0f05203e0239b7cbde521dbe22700ba63d4bc50465e01a3fc101a7c7cfa40d0a6a02e881e950143bef7ac4046a6604
 DIST xinetd-2.3.15.4.tar.xz 384504 BLAKE2B e6981d7143c5e39d45a6274d003467f372b1e97637112c66a3fd3a1cb47fe948228d72c914cca5b2db1d65a626b83ff36f10768d343579aa48353d20e2541f4d SHA512 1d9bbf5f60b299746adf3e57a669bf1a554b50066563b65cdb7584f00dcab2d3d331df705eefb56b51c52a16b5ed6b109cd832c27df87c7f262bb304e17ddc0e
+EBUILD xinetd-2.3.15.4-r1.ebuild 1426 BLAKE2B fca58f38696ad216fdcdc570fd7fa9f420abbeb7c7cfe4978d9cfc610a7378e2d9c039a0ac9d4e72319475a75a85389fccc3b7312ee457038e40241bdc5dc7e0 SHA512 5ba11540a647977296bc5ce7deecd422da4f6d1daf35a5f0f62702820de5a4a6b9d3e4efd08d8984fa4497366f7fe978b024c082de2e5831fb1d1a1aed333fac
 EBUILD xinetd-2.3.15.4.ebuild 1278 BLAKE2B be9347ce993ae3b9e703cb7a09acdc3a05fee3ceeeffe321f0515afd716dfaecf6a93282c621312be6f1ce4ec0979d3b02b9e0ae979f07038c3e8512f3ebffbe SHA512 1f9a6bd1607ed5a83d8290fb0d66c510c5f5c9617eefb1e26e160c3f0e310fd75d24c4dd8f515bf4b3eff49a20e1a21860d1535353daed5f99d990cdec376954
 MISC metadata.xml 402 BLAKE2B 2a178e254b868a3f45c83204a1d5ab44c09364b8934274121ddaf64fea015045c64a4e4350a2eaa4efda47d8051f0fbfd652bcaee776ccf5bfe36b4f0cde9efd SHA512 0b776965e5830ca2b0301fb4436a4d7bebff58ad6fa50a1678ef107fc7c7cbf4269e121156b3a7873de51d16434d4162d8b63d799d260ed0dc94b9cdddcb0f27
diff --git a/sys-apps/xinetd/files/xinetd-2.3.15.4-0001-configure.ac-use-AC_USE_SYSTEM_EXTENSIONS.patch b/sys-apps/xinetd/files/xinetd-2.3.15.4-0001-configure.ac-use-AC_USE_SYSTEM_EXTENSIONS.patch
new file mode 100644
index 000000000000..d2be93f08607
--- /dev/null
+++ b/sys-apps/xinetd/files/xinetd-2.3.15.4-0001-configure.ac-use-AC_USE_SYSTEM_EXTENSIONS.patch
@@ -0,0 +1,43 @@
+https://github.com/openSUSE/xinetd/pull/42
+
+From 0539bd4450020c83c6b72eec1004e3ce3f64554b Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 10 Sep 2022 13:59:20 +0100
+Subject: [PATCH 1/2] configure.ac: use AC_USE_SYSTEM_EXTENSIONS
+
+We use fcvt and gcvt, both of which are extensions
+guarded by GNU_SOURCE. Use AC_USE_SYSTEM_EXTENSIONS
+to ensure they're always available.
+
+Fixes a build failure on musl with Clang 15:
+```
+src/sio/sprint.c:176:15: error: call to undeclared function 'fcvt'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+                p = (char *)fcvt( num, precision, &decimal_point, is_negative ) ;
+src/sio/sprint.c:178:15: error: call to undeclared function 'ecvt'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+                p = (char *)ecvt( num, precision+1, &decimal_point, is_negative ) ;
+```
+
+And drop a single #define _GNU_SOURCE from signals.c, as it's
+preferable to have it consistently defined across the codebase
+where possible. We have autotools, so let's use it.
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,6 +38,8 @@ AC_CHECK_LIB([m], [log10], [
+ ])
+ AC_SUBST([LIBM_LIBS])
+ 
++AC_USE_SYSTEM_EXTENSIONS
++
+ # ======================================
+ # Check for various headers and settings
+ # ======================================
+--- a/src/signals.c
++++ b/src/signals.c
+@@ -7,7 +7,6 @@
+ 
+ 
+ #include "config.h"
+-#define _GNU_SOURCE
+ #include <sys/types.h>
+ #include <sys/time.h>
+ #include <signal.h>
diff --git a/sys-apps/xinetd/files/xinetd-2.3.15.4-0002-redirect-drop-deprecated-sys-signal.h-include.patch b/sys-apps/xinetd/files/xinetd-2.3.15.4-0002-redirect-drop-deprecated-sys-signal.h-include.patch
new file mode 100644
index 000000000000..f53a11eba650
--- /dev/null
+++ b/sys-apps/xinetd/files/xinetd-2.3.15.4-0002-redirect-drop-deprecated-sys-signal.h-include.patch
@@ -0,0 +1,24 @@
+https://github.com/openSUSE/xinetd/pull/42
+
+From 953a37c570a42743358cfc64e00e990813db1e09 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 10 Sep 2022 14:01:00 +0100
+Subject: [PATCH 2/2] redirect: drop deprecated <sys/signal.h> include
+
+Fix warning when building on musl:
+```
+In file included from src/redirect.c:23:
+/usr/include/sys/signal.h:1:2: warning: redirecting incorrect #include <sys/signal.h> to <signal.h> [-W#warnings]
+```
+
+We already include <signal.h>.
+--- a/src/redirect.c
++++ b/src/redirect.c
+@@ -20,7 +20,6 @@
+ #include <unistd.h>
+ #include <netinet/tcp.h>
+ #include <arpa/inet.h>
+-#include <sys/signal.h>
+ 
+ #include "redirect.h"
+ #include "service.h"
diff --git a/sys-apps/xinetd/xinetd-2.3.15.4-r1.ebuild b/sys-apps/xinetd/xinetd-2.3.15.4-r1.ebuild
new file mode 100644
index 000000000000..1f81038eb7bc
--- /dev/null
+++ b/sys-apps/xinetd/xinetd-2.3.15.4-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools systemd
+
+DESCRIPTION="Powerful replacement for inetd"
+HOMEPAGE="https://github.com/xinetd-org/xinetd https://github.com/openSUSE/xinetd"
+SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="perl rpc selinux tcpd"
+
+DEPEND="
+	rpc? ( net-libs/libtirpc:= )
+	selinux? ( sys-libs/libselinux )
+	tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
+"
+RDEPEND="
+	${DEPEND}
+	perl? ( dev-lang/perl )
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.15.4-0001-configure.ac-use-AC_USE_SYSTEM_EXTENSIONS.patch
+	"${FILESDIR}"/${PN}-2.3.15.4-0002-redirect-drop-deprecated-sys-signal.h-include.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e 's:/usr/bin/kill:/bin/kill:' \
+		"contrib/${PN}.service" || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with tcpd libwrap) \
+		$(use_with selinux labeled-networking) \
+		$(use_with rpc) \
+		--with-loadavg
+}
+
+src_install() {
+	default
+
+	use perl || rm -f "${ED}"/usr/sbin/xconv.pl
+
+	newinitd "${FILESDIR}"/xinetd.rc6 xinetd
+	newconfd "${FILESDIR}"/xinetd.confd xinetd
+	systemd_dounit "contrib/${PN}.service"
+
+	newdoc contrib/xinetd.conf xinetd.conf.dist.sample
+	dodoc README.md CHANGELOG
+}