diff options
author | Sam James <sam@gentoo.org> | 2021-05-13 15:51:53 +0200 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2021-05-13 15:51:53 +0200 |
commit | 744e549e7dc45b5e27b7eb2da5bcdf7d08a7a930 (patch) | |
tree | 8b0b695ff7fc1461d89624c44f098a755e4efea2 /sys-apps | |
parent | sys-apps/cracklib-words: update EAPI 5 -> 7 (diff) | |
download | gentoo-744e549e7dc45b5e27b7eb2da5bcdf7d08a7a930.tar.gz gentoo-744e549e7dc45b5e27b7eb2da5bcdf7d08a7a930.tar.bz2 gentoo-744e549e7dc45b5e27b7eb2da5bcdf7d08a7a930.zip |
sys-apps/xinetd: drop 2.3.15-r3 (EAPI 5)
Closes: https://bugs.gentoo.org/653826
Signed-off-by: Sam James <sam@gentoo.org>
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/xinetd/Manifest | 1 | ||||
-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/xinetd-2.3.15-r3.ebuild | 56 |
6 files changed, 0 insertions, 147 deletions
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest index 12b8ad8295b9..1e3b440acf09 100644 --- a/sys-apps/xinetd/Manifest +++ b/sys-apps/xinetd/Manifest @@ -1,3 +1,2 @@ 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/xinetd-2.3.15-r3.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild deleted file mode 100644 index 4dad4fcdcb20..000000000000 --- a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" - -inherit epatch 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 sparc x86" -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 -} |