[gentoo-commits] repo/gentoo:master commit in: sys-apps/xinetd/, sys-apps/xinetd/files/

[David Seifert]

commit:     72ad30d536ae2adbc6f0fe246423b9b14e3d57c0
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 22:53:59 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri May 14 22:53:59 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72ad30d5

sys-apps/xinetd: drop 2.3.15.3, 2.3.15.3-r2

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-apps/xinetd/Manifest                           |  1 -
 sys-apps/xinetd/files/xinetd-2.3.15.3-no-rpc.patch | 50 -----------------
 .../files/xinetd-2.3.15.3-rpc-configure.patch      | 57 -------------------
 sys-apps/xinetd/files/xinetd.service               | 10 ----
 sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild          | 64 ----------------------
 sys-apps/xinetd/xinetd-2.3.15.3.ebuild             | 48 ----------------
 6 files changed, 230 deletions(-)

diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index 1e3b440acf0..9299a6953ad 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -1,2 +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

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 3bd995a0892..00000000000
--- 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@g.o>
-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 682dece1b2b..00000000000
--- 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@g.o>
-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.service b/sys-apps/xinetd/files/xinetd.service
deleted file mode 100644
index c6f6271fd97..00000000000
--- 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/xinetd-2.3.15.3-r2.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild
deleted file mode 100644
index d5c268f31bb..00000000000
--- a/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 ~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
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-no-rpc.patch #651838
-	"${FILESDIR}"/${P}-rpc-configure.patch #651838
-)
-
-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
-}

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 7a903b612a3..00000000000
--- a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# 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="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 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
-}