diff options
Diffstat (limited to 'sys-apps/xinetd')
-rw-r--r-- | sys-apps/xinetd/Manifest | 2 | ||||
-rw-r--r-- | sys-apps/xinetd/files/xinetd-2.3.14-DESTDIR.patch | 27 | ||||
-rw-r--r-- | sys-apps/xinetd/files/xinetd-2.3.14-install-contrib.patch | 24 | ||||
-rw-r--r-- | sys-apps/xinetd/files/xinetd-2.3.15-config.patch | 22 | ||||
-rw-r--r-- | sys-apps/xinetd/files/xinetd-2.3.15-creds.patch | 17 | ||||
-rw-r--r-- | sys-apps/xinetd/files/xinetd-2.3.15.3-no-rpc.patch | 50 | ||||
-rw-r--r-- | sys-apps/xinetd/files/xinetd-2.3.15.3-rpc-configure.patch | 57 | ||||
-rw-r--r-- | sys-apps/xinetd/files/xinetd-2.3.15.4-0001-configure.ac-use-AC_USE_SYSTEM_EXTENSIONS.patch | 43 | ||||
-rw-r--r-- | sys-apps/xinetd/files/xinetd-2.3.15.4-0002-redirect-drop-deprecated-sys-signal.h-include.patch | 24 | ||||
-rw-r--r-- | sys-apps/xinetd/files/xinetd.service | 10 | ||||
-rw-r--r-- | sys-apps/xinetd/metadata.xml | 2 | ||||
-rw-r--r-- | sys-apps/xinetd/xinetd-2.3.15-r3.ebuild | 56 | ||||
-rw-r--r-- | sys-apps/xinetd/xinetd-2.3.15.3.ebuild | 48 | ||||
-rw-r--r-- | sys-apps/xinetd/xinetd-2.3.15.4-r1.ebuild (renamed from sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild) | 22 | ||||
-rw-r--r-- | sys-apps/xinetd/xinetd-2.3.15.4.ebuild | 59 |
15 files changed, 78 insertions, 385 deletions
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest index 12b8ad8295b9..9299a6953ad1 100644 --- a/sys-apps/xinetd/Manifest +++ b/sys-apps/xinetd/Manifest @@ -1,3 +1 @@ -DIST xinetd-2.3.15.3.tar.xz 383204 BLAKE2B dada7e1efb8c70d9b47efbb33de54e643e195fc043a2fe8b1b61a1d9e597a5a10feda8d6692e665af1f1690870e619098a9a2367df3a73f7821a91777532f1fa SHA512 3a744d5ce66da46743eec28d5b95a44709b1828187078984e59d7220ac325abce1198927e9156f343a4e16a9dc63e8846f1dcb0facbf05ea44c73aecbe7e504f DIST xinetd-2.3.15.4.tar.xz 384504 BLAKE2B e6981d7143c5e39d45a6274d003467f372b1e97637112c66a3fd3a1cb47fe948228d72c914cca5b2db1d65a626b83ff36f10768d343579aa48353d20e2541f4d SHA512 1d9bbf5f60b299746adf3e57a669bf1a554b50066563b65cdb7584f00dcab2d3d331df705eefb56b51c52a16b5ed6b109cd832c27df87c7f262bb304e17ddc0e -DIST xinetd-2.3.15.tar.gz 309774 BLAKE2B b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa diff --git a/sys-apps/xinetd/files/xinetd-2.3.14-DESTDIR.patch b/sys-apps/xinetd/files/xinetd-2.3.14-DESTDIR.patch deleted file mode 100644 index 2ebdf4c4f1b0..000000000000 --- a/sys-apps/xinetd/files/xinetd-2.3.14-DESTDIR.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- Makefile.in.orig 2005-10-29 22:08:54.000000000 -0400 -+++ Makefile.in 2005-10-29 22:09:32.000000000 -0400 -@@ -75,15 +75,15 @@ - - install: build - for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \ -- test -d $$i || mkdir -p $$i ; done -- $(INSTALL_CMD) -m 755 xinetd/xinetd $(DAEMONDIR) -- $(INSTALL_CMD) -m 755 xinetd/itox $(DAEMONDIR) -- $(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DAEMONDIR) -- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(MANDIR)/man5/xinetd.conf.5 -- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(MANDIR)/man8/xinetd.log.8 -- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(MANDIR)/man8/xinetd.8 -- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(MANDIR)/man8/itox.8 -- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(MANDIR)/man8/xconv.pl.8 -+ test -d $(DESTDIR)$$i || mkdir -p $(DESTDIR)$$i ; done -+ $(INSTALL_CMD) -m 755 xinetd/xinetd $(DESTDIR)$(DAEMONDIR) -+ $(INSTALL_CMD) -m 755 xinetd/itox $(DESTDIR)$(DAEMONDIR) -+ $(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DESTDIR)$(DAEMONDIR) -+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(DESTDIR)$(MANDIR)/man5/xinetd.conf.5 -+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(DESTDIR)$(MANDIR)/man8/xinetd.log.8 -+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(DESTDIR)$(MANDIR)/man8/xinetd.8 -+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(DESTDIR)$(MANDIR)/man8/itox.8 -+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(DESTDIR)$(MANDIR)/man8/xconv.pl.8 - @echo "You must put your xinetd.conf in /etc/xinetd.conf" - @echo "There is a sample config file in xinetd/sample.conf and you can" - @echo "use xconv.pl to convert your old inetd.conf file to an xinetd format" diff --git a/sys-apps/xinetd/files/xinetd-2.3.14-install-contrib.patch b/sys-apps/xinetd/files/xinetd-2.3.14-install-contrib.patch deleted file mode 100644 index c1717e43902f..000000000000 --- a/sys-apps/xinetd/files/xinetd-2.3.14-install-contrib.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- xinetd-2.3.14/Makefile.in -+++ xinetd-2.3.14/Makefile.in -@@ -9,6 +9,7 @@ - DESTDIR = - prefix = @prefix@ - exec_prefix = @exec_prefix@ -+ETCDIR = @sysconfdir@ - DAEMONDIR = @sbindir@ - MANDIR = @mandir@ - topdir = @top_srcdir@ -@@ -97,7 +98,12 @@ - rm -f $(MANDIR)/man8/xinetd.log.8 - rm -f $(MANDIR)/man8/xinetd.8 - rm -f $(MANDIR)/man8/itox.8 -- -+ -+install-contrib: -+ test -d $(DESTDIR)$(ETCDIR)/xinetd.d || mkdir -p $(DESTDIR)$(ETCDIR)/xinetd.d -+ $(INSTALL_CMD) -m 644 contrib/xinetd.conf $(DESTDIR)$(ETCDIR) -+ $(INSTALL_CMD) -m 644 contrib/xinetd.d/* $(DESTDIR)$(ETCDIR)/xinetd.d -+ - distclean: clean - rm -f config.cache config.log Makefile config.status xinetd/itox - rm -f config.h @srcdir@/libs/include/* @srcdir@/libs/man/* diff --git a/sys-apps/xinetd/files/xinetd-2.3.15-config.patch b/sys-apps/xinetd/files/xinetd-2.3.15-config.patch deleted file mode 100644 index b362a97dbe82..000000000000 --- a/sys-apps/xinetd/files/xinetd-2.3.15-config.patch +++ /dev/null @@ -1,22 +0,0 @@ -set up some secure defaults: - - services can only be accessed from localhost - - sanitize the runtime environment (so root's shell vars don't bleed through) - ---- contrib/xinetd.conf -+++ contrib/xinetd.conf -@@ -22,5 +22,5 @@ - # - # no_access = --# only_from = -+ only_from = localhost - # max_load = 0 - cps = 50 10 -@@ -35,7 +35,7 @@ defaults - - # setup environmental attributes - # --# passenv = -+ passenv = - groups = yes - umask = 002 - diff --git a/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch b/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch deleted file mode 100644 index 39df3caf1156..000000000000 --- a/sys-apps/xinetd/files/xinetd-2.3.15-creds.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://bugs.gentoo.org/488158 - -taken from Fedora - -Patch by Thomas Swan <thomas.swan@gmail.com> - ---- a/xinetd/builtins.c -+++ b/xinetd/builtins.c -@@ -695,7 +695,7 @@ static void tcpmux_handler( const struct server *serp ) - if( SC_IS_INTERNAL( scp ) ) { - SC_INTERNAL(scp, nserp); - } else { -- exec_server(nserp); -+ child_process(nserp); - } - } - diff --git a/sys-apps/xinetd/files/xinetd-2.3.15.3-no-rpc.patch b/sys-apps/xinetd/files/xinetd-2.3.15.3-no-rpc.patch deleted file mode 100644 index 3bd995a0892d..000000000000 --- a/sys-apps/xinetd/files/xinetd-2.3.15.3-no-rpc.patch +++ /dev/null @@ -1,50 +0,0 @@ -https://github.com/openSUSE/xinetd/pull/8 - -From 4278495b1858b5b1ce94d72bd619eb79aab8ca04 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 18 Jun 2018 18:49:38 -0400 -Subject: [PATCH] fix no-rpc builds - -The code base already has support for -DNO_RPC, so fix the breakage -introduced by commit 56520dcc88c35113877c8f4f52bd98ad95b44653. ---- - src/confparse.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/confparse.c b/src/confparse.c -index 5b149dd03808..7965cc405f24 100644 ---- a/src/confparse.c -+++ b/src/confparse.c -@@ -13,10 +13,12 @@ - #include <stdlib.h> - #include <fcntl.h> - #include <unistd.h> -+#ifndef NO_RPC - #include <rpc/rpc.h> - #ifdef HAVE_RPCENT_H - #include <rpc/rpcent.h> - #endif -+#endif - #include <netdb.h> - - #include "str.h" -@@ -730,7 +732,7 @@ static status_e check_entry( struct service_config *scp, - } - } - --/* #ifndef NO_RPC */ -+#ifndef NO_RPC - if ( SC_IS_RPC( scp ) && !SC_IS_UNLISTED( scp ) ) - { - struct rpcent *rep = (struct rpcent *)getrpcbyname( SC_NAME(scp) ) ; -@@ -743,6 +745,7 @@ static status_e check_entry( struct service_config *scp, - SC_RPCDATA( scp )->rd_program_number = rep->r_number ; - } - else -+#endif - { - if ( !SC_IS_UNLISTED( scp ) ) - { --- -2.16.1 - diff --git a/sys-apps/xinetd/files/xinetd-2.3.15.3-rpc-configure.patch b/sys-apps/xinetd/files/xinetd-2.3.15.3-rpc-configure.patch deleted file mode 100644 index 682dece1b2b6..000000000000 --- a/sys-apps/xinetd/files/xinetd-2.3.15.3-rpc-configure.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 928d69309592704892d124b1f8de9111164c3793 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <vapier@gentoo.org> -Date: Mon, 18 Jun 2018 22:11:21 -0400 -Subject: [PATCH] configure: add a --without-rpc flag - -The build already supports NO_RPC to disable all RPC logic. Turn it -into a proper configure flag so people don't have to hack it up. ---- - configure.ac | 25 ++++++++++++++++++++----- - 1 file changed, 20 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8d0b562ddaac..75ae7fb472dc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -37,11 +37,6 @@ AC_CHECK_LIB([m], [log10], [ - AC_MSG_ERROR([Unable to find working libm.so]) - ]) - AC_SUBST([LIBM_LIBS]) --PKG_CHECK_MODULES([TIRPC],[libtirpc], [ -- AC_DEFINE([HAVE_RPCENT_H], [1], [Have <rpc/rpcent.h>.]) --], [ -- AC_MSG_WARN([Libtirpc not found, will not use <rpc/rpcent.h>]) --]) - - # ====================================== - # Check for various headers and settings -@@ -112,6 +107,26 @@ AS_IF([test x"$with_labeled_networking" != "xno"], [ - ]) - ]) - -+AC_ARG_WITH([rpc], -+ [AS_HELP_STRING([--without-rpc], [Do not include RPC support])], -+ [with_rpc="$withval"], -+ [with_rpc="auto"] -+) -+AS_IF([test x"$with_rpc" != "xno"], [ -+ PKG_CHECK_MODULES([TIRPC],[libtirpc], [ -+ AC_DEFINE([HAVE_RPCENT_H], [1], [Have <rpc/rpcent.h>.]) -+ ], [ -+ AS_IF([test x"$with_rpc" = "xyes"], [ -+ AC_MSG_ERROR([RPC support requested but not found]) -+ ]) -+ with_rpc="no" -+ AC_MSG_WARN([Libtirpc not found, will not use <rpc/rpcent.h>]) -+ ]) -+]) -+AS_IF([test x"$with_rpc" = "xno"], [ -+ AC_DEFINE([NO_RPC], [1], [Omit RPC support.]) -+]) -+ - # ========= - # Hardening - # ========= --- -2.16.1 - 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/files/xinetd.service b/sys-apps/xinetd/files/xinetd.service deleted file mode 100644 index c6f6271fd97b..000000000000 --- a/sys-apps/xinetd/files/xinetd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=A secure replacement for inetd -After=network.target - -[Service] -ExecStart=/usr/sbin/xinetd -dontfork -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/sys-apps/xinetd/metadata.xml b/sys-apps/xinetd/metadata.xml index e143258c6fa6..c841fc5c16b7 100644 --- a/sys-apps/xinetd/metadata.xml +++ b/sys-apps/xinetd/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>base-system@gentoo.org</email> diff --git a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild deleted file mode 100644 index 357e0c91b5aa..000000000000 --- a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit eutils flag-o-matic systemd toolchain-funcs - -DESCRIPTION="powerful replacement for inetd" -HOMEPAGE="http://www.xinetd.org/ https://github.com/xinetd-org/xinetd" -SRC_URI="http://www.xinetd.org/${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd" -IUSE="perl rpc tcpd" - -DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) - rpc? ( net-libs/libtirpc:= )" -RDEPEND="${DEPEND} - perl? ( dev-lang/perl )" -DEPEND="${DEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.3.14-DESTDIR.patch - epatch "${FILESDIR}"/${PN}-2.3.14-install-contrib.patch - epatch "${FILESDIR}"/${PN}-2.3.15-config.patch - epatch "${FILESDIR}"/${PN}-2.3.15-creds.patch #488158 - find -name Makefile.in -exec sed -i 's:\<ar\>:$(AR):' {} + -} - -src_configure() { - tc-export AR PKG_CONFIG - if use rpc ; then - append-cflags $(${PKG_CONFIG} --cflags libtirpc) - else - append-cppflags -DNO_RPC - export ac_cv_header_{rpc_{rpc,rpcent,pmap_clnt},netdb}_h=no - fi - LIBS=$(${PKG_CONFIG} --libs libtirpc) \ - econf \ - $(use_with tcpd libwrap) \ - --with-loadavg -} - -src_install() { - emake DESTDIR="${ED}" install install-contrib - use perl || rm -f "${ED}"/usr/sbin/xconv.pl - - newinitd "${FILESDIR}"/xinetd.rc6 xinetd - newconfd "${FILESDIR}"/xinetd.confd xinetd - systemd_dounit "${FILESDIR}/${PN}.service" - - newdoc contrib/xinetd.conf xinetd.conf.dist.sample - dodoc AUDIT INSTALL README TODO CHANGELOG -} diff --git a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild deleted file mode 100644 index ccc6459905d9..000000000000 --- a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit flag-o-matic systemd toolchain-funcs - -DESCRIPTION="powerful replacement for inetd" -HOMEPAGE="https://github.com/openSUSE/xinetd" -SRC_URI="${HOMEPAGE}/releases/download/${PV}/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -IUSE="perl selinux tcpd" - -DEPEND=" - selinux? ( sys-libs/libselinux ) - net-libs/libtirpc:= - tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) -" -RDEPEND=" - ${DEPEND} - perl? ( dev-lang/perl ) -" -DEPEND=" - ${DEPEND} - virtual/pkgconfig -" - -src_configure() { - econf \ - $(use_with tcpd libwrap) \ - $(use_with selinux labeled-networking) \ - --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 "${FILESDIR}/${PN}.service" - - newdoc contrib/xinetd.conf xinetd.conf.dist.sample - dodoc README.md CHANGELOG -} diff --git a/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild b/sys-apps/xinetd/xinetd-2.3.15.4-r1.ebuild index 92bc834e7df9..7eefb431eac1 100644 --- a/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild +++ b/sys-apps/xinetd/xinetd-2.3.15.4-r1.ebuild @@ -1,17 +1,17 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=8 -inherit flag-o-matic systemd toolchain-funcs autotools +inherit autotools systemd -DESCRIPTION="powerful replacement for inetd" +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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" IUSE="perl rpc selinux tcpd" DEPEND=" @@ -23,23 +23,21 @@ RDEPEND=" ${DEPEND} perl? ( dev-lang/perl ) " -DEPEND=" - ${DEPEND} - virtual/pkgconfig -" +BDEPEND="virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${P}-no-rpc.patch #651838 - "${FILESDIR}"/${P}-rpc-configure.patch #651838 + "${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 - eautoreconf sed -i \ -e 's:/usr/bin/kill:/bin/kill:' \ "contrib/${PN}.service" || die + + eautoreconf } src_configure() { diff --git a/sys-apps/xinetd/xinetd-2.3.15.4.ebuild b/sys-apps/xinetd/xinetd-2.3.15.4.ebuild deleted file mode 100644 index 73781412652a..000000000000 --- a/sys-apps/xinetd/xinetd-2.3.15.4.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit flag-o-matic systemd toolchain-funcs autotools - -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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~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 ) -" -DEPEND=" - ${DEPEND} - virtual/pkgconfig -" - -src_prepare() { - default - eautoreconf - - sed -i \ - -e 's:/usr/bin/kill:/bin/kill:' \ - "contrib/${PN}.service" || die -} - -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 -} |