From 908778078736bd36f7a60a2d576d415cb8e000fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 May 2021 07:31:18 +0100 Subject: gentoo resync : 22.05.2021 --- sys-apps/xinetd/files/xinetd-2.3.14-DESTDIR.patch | 27 ---------- .../files/xinetd-2.3.14-install-contrib.patch | 24 --------- sys-apps/xinetd/files/xinetd-2.3.15-config.patch | 22 --------- sys-apps/xinetd/files/xinetd-2.3.15-creds.patch | 17 ------- 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 ---- 7 files changed, 207 deletions(-) delete mode 100644 sys-apps/xinetd/files/xinetd-2.3.14-DESTDIR.patch delete mode 100644 sys-apps/xinetd/files/xinetd-2.3.14-install-contrib.patch delete mode 100644 sys-apps/xinetd/files/xinetd-2.3.15-config.patch delete mode 100644 sys-apps/xinetd/files/xinetd-2.3.15-creds.patch delete mode 100644 sys-apps/xinetd/files/xinetd-2.3.15.3-no-rpc.patch delete mode 100644 sys-apps/xinetd/files/xinetd-2.3.15.3-rpc-configure.patch delete mode 100644 sys-apps/xinetd/files/xinetd.service (limited to 'sys-apps/xinetd/files') 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 - ---- 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 -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 - #include - #include -+#ifndef NO_RPC - #include - #ifdef HAVE_RPCENT_H - #include - #endif -+#endif - #include - - #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 -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 .]) --], [ -- AC_MSG_WARN([Libtirpc not found, will not use ]) --]) - - # ====================================== - # 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 .]) -+ ], [ -+ 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 ]) -+ ]) -+]) -+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 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 -- cgit v1.2.3