aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Everitt <gentoo@veremit.xyz>2020-04-23 08:16:13 +0100
committerAnthony G. Basile <blueness@gentoo.org>2020-04-23 10:56:07 -0400
commit26cd6a6e2be7f7291b496f0c06f6ec71a108dc34 (patch)
tree12a6d885f6aafba234108655ddffe7dde0ccbb96 /sys-apps
parentpciutils: Fixed in upstream commit f15db37, release v3.6.1 (diff)
downloadmusl-26cd6a6e2be7f7291b496f0c06f6ec71a108dc34.tar.gz
musl-26cd6a6e2be7f7291b496f0c06f6ec71a108dc34.tar.bz2
musl-26cd6a6e2be7f7291b496f0c06f6ec71a108dc34.zip
xinetd: Many fixes now incorporated into new upstream. ::gentoo builds fine.
Gentoo has switched from raw xinetd upstream to openSUSE's fork, with a lot of fixes applied, including various contributions from vapier over the last three or so years. In-tree version builds fine: >>> Completed installing sys-apps/xinetd-2.3.15.3 into /var/tmp/portage/sys-apps/xinetd-2.3.15.3/image/ >>> sys-apps/xinetd-2.3.15.3 merged. Signed-off-by: Michael Everitt <gentoo@veremit.xyz> Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/xinetd/Manifest1
-rw-r--r--sys-apps/xinetd/files/xinetd-2.3.14-DESTDIR.patch27
-rw-r--r--sys-apps/xinetd/files/xinetd-2.3.14-config.patch9
-rw-r--r--sys-apps/xinetd/files/xinetd-2.3.14-install-contrib.patch24
-rw-r--r--sys-apps/xinetd/files/xinetd-2.3.15-no-rpc-netdb_h.patch21
-rw-r--r--sys-apps/xinetd/files/xinetd-2.3.15-remove-XINETD_CHECK_TYPE.patch49
-rw-r--r--sys-apps/xinetd/files/xinetd.confd3
-rw-r--r--sys-apps/xinetd/files/xinetd.rc633
-rw-r--r--sys-apps/xinetd/files/xinetd.service10
-rw-r--r--sys-apps/xinetd/metadata.xml14
-rw-r--r--sys-apps/xinetd/xinetd-2.3.15-r99.ebuild56
11 files changed, 0 insertions, 247 deletions
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
deleted file mode 100644
index 1bba7b7..0000000
--- a/sys-apps/xinetd/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST xinetd-2.3.15.tar.gz 309774 SHA256 bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa WHIRLPOOL 5bcf69b2cfac3b3713648da666e4c98d62caea4c506be9dc5cc84f1acdc643812460a158b092705274d7452d394d3f2c03b5635f135f5d900bb6a5406f0350c2
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 2ebdf4c..0000000
--- 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-config.patch b/sys-apps/xinetd/files/xinetd-2.3.14-config.patch
deleted file mode 100644
index c368dea..0000000
--- a/sys-apps/xinetd/files/xinetd-2.3.14-config.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- contrib/xinetd.conf
-+++ contrib/xinetd.conf
-@@ -22,5 +22,5 @@
- #
- # no_access =
--# only_from =
-+ only_from = localhost
- # max_load = 0
- cps = 50 10
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 c1717e4..0000000
--- 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-no-rpc-netdb_h.patch b/sys-apps/xinetd/files/xinetd-2.3.15-no-rpc-netdb_h.patch
deleted file mode 100644
index c52c599..0000000
--- a/sys-apps/xinetd/files/xinetd-2.3.15-no-rpc-netdb_h.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur xinetd-2.3.15.orig/xinetd/confparse.c xinetd-2.3.15/xinetd/confparse.c
---- xinetd-2.3.15.orig/xinetd/confparse.c 2007-09-20 10:58:27.000000000 -0400
-+++ xinetd-2.3.15/xinetd/confparse.c 2015-07-15 17:44:58.782269320 -0400
-@@ -632,7 +632,7 @@
- */
- continue;
- }
--#if defined(HAVE_RPC_RPCENT_H) || defined(HAVE_NETDB_H)
-+#ifdef HAVE_RPC_RPCENT_H
- if ( SC_IS_RPC( scp ) && SC_IS_RPC ( tmp_scp ) )
- {
- const struct rpc_data *rdp1 = SC_RPCDATA( scp ) ;
-@@ -746,7 +746,7 @@
- }
-
- /* #ifndef NO_RPC */
--#if defined(HAVE_RPC_RPCENT_H) || defined(HAVE_NETDB_H)
-+#ifdef HAVE_RPC_RPCENT_H
- if ( SC_IS_RPC( scp ) && !SC_IS_UNLISTED( scp ) )
- {
- struct rpcent *rep = (struct rpcent *)getrpcbyname( SC_NAME(scp) ) ;
diff --git a/sys-apps/xinetd/files/xinetd-2.3.15-remove-XINETD_CHECK_TYPE.patch b/sys-apps/xinetd/files/xinetd-2.3.15-remove-XINETD_CHECK_TYPE.patch
deleted file mode 100644
index b3d3f3c..0000000
--- a/sys-apps/xinetd/files/xinetd-2.3.15-remove-XINETD_CHECK_TYPE.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Naur xinetd-2.3.15.orig/aclocal.m4 xinetd-2.3.15/aclocal.m4
---- xinetd-2.3.15.orig/aclocal.m4 2003-02-19 12:29:27.000000000 -0500
-+++ xinetd-2.3.15/aclocal.m4 1969-12-31 19:00:00.000000000 -0500
-@@ -1,27 +0,0 @@
--dnl Check for variable types.
--dnl
--AC_DEFUN(XINETD_CHECK_TYPE,
--[AC_REQUIRE([AC_HEADER_STDC])dnl
--AC_MSG_CHECKING(for $1)
--AC_CACHE_VAL(xinetd_cv_type_$1,
--[AC_EGREP_CPP($1, [#include <sys/types.h>
--#if STDC_HEADERS
--#include <stdlib.h>
--#endif
--#if HAVE_NETDB_H
--#include <netdb.h>
--#endif
--#if HAVE_RLIM_T
--#include <sys/resource.h>
--#endif
--#if HAVE_STDINT_H
--#include <stdint.h>
--#endif
--#if HAVE_UNISTD_H
--#include <unistd.h>
--#endif], xinetd_cv_type_$1=yes, xinetd_cv_type_$1=no)])dnl
--AC_MSG_RESULT($xinetd_cv_type_$1)
--if test $xinetd_cv_type_$1 = no; then
-- AC_DEFINE($1, $2)
--fi
--])
-diff -Naur xinetd-2.3.15.orig/configure.in xinetd-2.3.15/configure.in
---- xinetd-2.3.15.orig/configure.in 2007-09-20 10:58:27.000000000 -0400
-+++ xinetd-2.3.15/configure.in 2015-07-15 17:42:15.415277150 -0400
-@@ -65,14 +65,6 @@
- ])
- ])
-
--XINETD_CHECK_TYPE(uint16_t, unsigned short)
--XINETD_CHECK_TYPE(uint32_t, unsigned int)
--XINETD_CHECK_TYPE(uint64_t, unsigned long long)
--XINETD_CHECK_TYPE(uid_t, unsigned int)
--XINETD_CHECK_TYPE(gid_t, unsigned int)
--XINETD_CHECK_TYPE(socklen_t, unsigned int)
--XINETD_CHECK_TYPE(rlim_t, long long)
--
- AC_CACHE_CHECK([for struct addrinfo], ac_cv_have_struct_addrinfo, [
- AC_TRY_COMPILE(
- [
diff --git a/sys-apps/xinetd/files/xinetd.confd b/sys-apps/xinetd/files/xinetd.confd
deleted file mode 100644
index ae211f3..0000000
--- a/sys-apps/xinetd/files/xinetd.confd
+++ /dev/null
@@ -1,3 +0,0 @@
-# /etc/conf.d/xinetd: config file for /etc/init.d/xinetd
-
-XINETD_OPTS="-stayalive -reuse"
diff --git a/sys-apps/xinetd/files/xinetd.rc6 b/sys-apps/xinetd/files/xinetd.rc6
deleted file mode 100644
index 57cee36..0000000
--- a/sys-apps/xinetd/files/xinetd.rc6
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_started_commands="reload dump check"
-
-depend() {
- use net
-}
-
-start() {
- ebegin "Starting xinetd"
- start-stop-daemon --start --exec /usr/sbin/xinetd -- \
- -pidfile /var/run/xinetd.pid ${XINETD_OPTS}
- eend $?
-}
-
-stop() {
- ebegin "Stopping xinetd"
- start-stop-daemon --stop --quiet --pidfile /var/run/xinetd.pid
- eend $?
-}
-
-do_sig() {
- local sig=$1 ; shift
- ebegin "$*"
- start-stop-daemon --signal ${sig} --pidfile /var/run/xinetd.pid
- eend $?
-}
-reload() { do_sig HUP "Reloading configuration" ; }
-dump() { do_sig USR1 "Dumping configuration" ; }
-check() { do_sig IOT "Performing Consistency Check" ; }
diff --git a/sys-apps/xinetd/files/xinetd.service b/sys-apps/xinetd/files/xinetd.service
deleted file mode 100644
index c6f6271..0000000
--- 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
deleted file mode 100644
index e143258..0000000
--- a/sys-apps/xinetd/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
- </maintainer>
- <use>
- <flag name="rpc">support RPC services</flag>
- </use>
- <upstream>
- <remote-id type="github">xinetd-org/xinetd</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r99.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r99.ebuild
deleted file mode 100644
index 86e6ee7..0000000
--- a/sys-apps/xinetd/xinetd-2.3.15-r99.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit autotools eutils flag-o-matic systemd toolchain-funcs
-
-DESCRIPTION="powerful replacement for inetd"
-HOMEPAGE="http://www.xinetd.org/"
-SRC_URI="http://www.xinetd.org/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc 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.14-config.patch
- epatch "${FILESDIR}"/${PN}-2.3.15-no-rpc-netdb_h.patch
- epatch "${FILESDIR}"/${PN}-2.3.15-remove-XINETD_CHECK_TYPE.patch
- eautoconf
- find -name Makefile.in -exec sed -i 's:\<ar\>:$(AR):' {} +
-}
-
-src_configure() {
- if ! use rpc ; then
- append-cppflags -DNO_RPC
- export ac_cv_header_{rpc_{rpc,rpcent,pmap_clnt},netdb}_h=no
- fi
- tc-export AR PKG_CONFIG
- 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
-}