diff options
Diffstat (limited to 'sys-apps/xinetd')
-rw-r--r-- | sys-apps/xinetd/Manifest | 9 | ||||
-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/xinetd-2.3.15-r2.ebuild | 2 | ||||
-rw-r--r-- | sys-apps/xinetd/xinetd-2.3.15-r3.ebuild | 2 | ||||
-rw-r--r-- | sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild | 64 | ||||
-rw-r--r-- | sys-apps/xinetd/xinetd-2.3.15.3.ebuild | 4 |
7 files changed, 181 insertions, 7 deletions
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest index 26b0a1cfa88e..a828ac246d92 100644 --- a/sys-apps/xinetd/Manifest +++ b/sys-apps/xinetd/Manifest @@ -3,12 +3,15 @@ AUX xinetd-2.3.14-config.patch 154 BLAKE2B d003faa46d6ecc20d57d087896acc3f39a125 AUX xinetd-2.3.14-install-contrib.patch 728 BLAKE2B 4624096a41c3ce819f8976b561e761a65b7308dbaa7863e6c287f99a1ac206497c5ef9dc0222a0d81ab565d280394a44573b3ba7734879b24644a53efe6e5f77 SHA512 15b8b1649b02e2d8834eb057bef7345497d230a4b10600e9b3e2a83511f9c7df115009ba1f38b1c4907417735454cafbbc41a96266fbb4370c584ecf1aa1638b AUX xinetd-2.3.15-config.patch 437 BLAKE2B 50cf65153ee242dd0bc7ec587ee7f50de6d7385e1f6ffa213b11e70f2f584d42ee544f7be297b38275290338afaf689cb0aed9d1435a14bb3e0f0b25b6a42ba9 SHA512 58a9880ca154441c5cfc3ed978a0224601d406a4422435a430b885985a0fbe7ef0d750f54047cb0d7fc5c6ab7bc35433776bb5c6c2c61525e2a04b49d509ad66 AUX xinetd-2.3.15-creds.patch 367 BLAKE2B d2ffeb2d83b1c604556e240177417d79e2d4ce499c4fdb0b431a414835a4e2eaa5b24e01ab4e698211bfd2e63d2872ebd9456af81faa2fb755342bfe2cdfa2fb SHA512 5d1d883620ed6c1ae0e391687a1a10769eb4c2436cf8bae60ddbbb7b8d1250272c2aa7068c308ee1f3540a41fcdf8ae890a7687ff0213553c59f6a91718f46c1 +AUX xinetd-2.3.15.3-no-rpc.patch 1290 BLAKE2B 8330913acccd865b4dff0c6a918936af8736854e90e5661633d5a91b551478e3ec87990f6ac6562c000328bd5ed57918359b1fdf214e297bee2376abdf1f589d SHA512 eb7e463a4f65cd5c7e271de46d9924ae6b96bc20ca7075e4c94caafb81ad03544eebe8a610313a1c402da10e010d3efd3fb2f52d0d117b9c406700831067c6aa +AUX xinetd-2.3.15.3-rpc-configure.patch 1709 BLAKE2B 7a7d90a8f10d8b8a5274a63d38e38bd6c93a7a7d1ccf5171cbfa612828a22ff4f04045d0d44e321caee2fa8e37ff209d6b1b1df715e38c43a16792a9f4374676 SHA512 52fea8f4d95882966e31761d67c3991eb4f9bd853761f0b6a9acea8a72774176f98265f8260467cff4779c69c2bec6764a6a48d7c6c620bf31bc71c50287f229 AUX xinetd.confd 90 BLAKE2B 4fd6cce15cffc6de5b59e83646cafbf52f61b203292ac4ecbbaed904d8387a4ac686f730e2f0ddf5ee90575bd0a7d73588a23b25ec4a6e9c73d48714f5770f5d SHA512 03bf05e544c0e52bc2bdeadf494dabd49ace985687b656baae869be99ef65a5f7129492c37e062bf6f196f70561d6239f2d3c4e8171fddc04729d3e266bfe2b2 AUX xinetd.rc6 721 BLAKE2B d273c33bdd9df218f8dfdc765c0e3a788baaee0fbb3fd20e63be0f1d4b587b19550107c1818015077ce9fa194fca7180748b39089c51101f10ceeb6066a323af SHA512 bfe591f83a03e26ccbe06c489fa8c2e7af0f05203e0239b7cbde521dbe22700ba63d4bc50465e01a3fc101a7c7cfa40d0a6a02e881e950143bef7ac4046a6604 AUX xinetd.service 192 BLAKE2B e13bdc35380da5805e9fbec1a1d05f7290bc154b1adea73b23468f909eea22c411be11cf3e2c68757e8120db73ccc8ca624c808c6563859a29c095b94c10bbf9 SHA512 c2b324c1116485996c414543f67c5dae89de3f82ac85634009da4dc04ea720a860626f6bb0ece0bb734616c6e4394e31ca00a71f697dc93e38b05fbad06dedc0 DIST xinetd-2.3.15.3.tar.xz 383204 BLAKE2B dada7e1efb8c70d9b47efbb33de54e643e195fc043a2fe8b1b61a1d9e597a5a10feda8d6692e665af1f1690870e619098a9a2367df3a73f7821a91777532f1fa SHA512 3a744d5ce66da46743eec28d5b95a44709b1828187078984e59d7220ac325abce1198927e9156f343a4e16a9dc63e8846f1dcb0facbf05ea44c73aecbe7e504f DIST xinetd-2.3.15.tar.gz 309774 BLAKE2B b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa -EBUILD xinetd-2.3.15-r2.ebuild 1489 BLAKE2B 0e692389c82eaa474c6068ef4b2f3d96713dc3c9c5174c2265632f3904d6021ba966c23d0a7f7eaa7ce50ae026bf954407764351c62298556311f705949cbbf9 SHA512 552f0cda59c778ba6a576df1cba0befa55ff909e1f9fdec092dc7ea666be8371e956f2d34fdc1364c997db9eed36dd9c38ebcc10db0d5dfe8fbd576ed8ea0d8d -EBUILD xinetd-2.3.15-r3.ebuild 1584 BLAKE2B b50232148f4aa38bd767715958ee7da6b0a4a8b35f17138f9422ad98546edb301aa87e1182b6feef7fb491fbd84c5072ec5ca4df213065f78b098820d47d921b SHA512 2ed014285abf51f3c745f94c0dda14233f0ca7e971c94fa4bcffc8ecf83265f9bc48388639e7caaebc2b24bbb07b87e4e672c30ea3bea209ef38258718a11c85 -EBUILD xinetd-2.3.15.3.ebuild 1086 BLAKE2B a015f743a33b424703f9bff3bd921b91d9814bb96c8477d7d9d1a55ecf2987df8b2fbf242ed6a7d10b03a1aaea7eeb69b706afaa7b039b82f94c792cc3d02963 SHA512 405118491c72572a880dd48b0ec8408827dabbc08f910eef5e79188e946afe3d77b9bb1f2281dbd82c1e877e9898bd13d2b671fa0366f7ef87d4bed51e6945a7 +EBUILD xinetd-2.3.15-r2.ebuild 1467 BLAKE2B c0413e497292f044b847c6b84867857eacad275dfdd2f008b5474c58f495a198e35c59a4dd03b91025637f4ceab1e5ad8c194ca8afc8feacebc6bdb4d0a56427 SHA512 b8a942166b119cf6cf8aa3038db1b19fd1e8d818a3adfb56305ac29dfc7088364401ec3e4f10f2669084ae4685b24419eaf3c694615367a8be7dda4febe7ce24 +EBUILD xinetd-2.3.15-r3.ebuild 1574 BLAKE2B 86753bd03b2b446abd848b56e9180ce5bca615bd5dd0faf55a3f92e7d5093908e968164356c4ea7b9d5f16cca4086cfecfc149de5a491164884ea0949d5a9839 SHA512 ca0e166253b5cb80c9180a2bee4610c7d6aaaf1d38b62c10b024d7dda91be57b71fa22c742188f1357b3af9feea82af60f818c42de377bc40746adf6ef09cacd +EBUILD xinetd-2.3.15.3-r2.ebuild 1381 BLAKE2B 6c16dedba41a1f9ce0d6ee3d51f88b2d03137a8d3bc9068ac2a0db2550efa9d68174b075981391839a1abe13073ec392ef7fb5e0e91eac048f7d7831891713ec SHA512 86e8fa9e66d95313d05b6c7b3def44e26452846b889f335013be14cf051ac82eb292505e48bc1bd017f961cd0df5300345b32374ea15153a54da02d007b43a62 +EBUILD xinetd-2.3.15.3.ebuild 1046 BLAKE2B 921c62db32a23a855dfe328213a5a339e09f1fb90842c68dd8197a61eb3d02d28007632e98d15c912a5e3b2883edd775962317777914f1a164a42d19e2bac869 SHA512 f26e677cb3c254aff51a0799bc1ae7329711077b522a83de43d44c1c8a698e81a308e925706a7417c031863cb6221b841cf7047260382677bd370fb8af7e1b32 MISC metadata.xml 401 BLAKE2B b00f11946b61c89e69864bc02fbbb0fb9d97e6e1b58c1f4604a806361a39b2eb5f4ef25c095a8ce42e2e2d1dc0160d6525d58e6ba24c6d63057e4b07291d2052 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb 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 new file mode 100644 index 000000000000..3bd995a0892d --- /dev/null +++ b/sys-apps/xinetd/files/xinetd-2.3.15.3-no-rpc.patch @@ -0,0 +1,50 @@ +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 new file mode 100644 index 000000000000..682dece1b2b6 --- /dev/null +++ b/sys-apps/xinetd/files/xinetd-2.3.15.3-rpc-configure.patch @@ -0,0 +1,57 @@ +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/xinetd-2.3.15-r2.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild index bd8c5d93a129..99bf38e9a727 100644 --- a/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild +++ b/sys-apps/xinetd/xinetd-2.3.15-r2.ebuild @@ -11,7 +11,7 @@ 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 ~x86-fbsd" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" IUSE="perl rpc tcpd" DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) diff --git a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild index 31d86d05cec9..357e0c91b5aa 100644 --- a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild +++ b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild @@ -11,7 +11,7 @@ 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 ~x86-fbsd" +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 ) diff --git a/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild new file mode 100644 index 000000000000..92bc834e7df9 --- /dev/null +++ b/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild @@ -0,0 +1,64 @@ +# 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 +" + +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 index bd39ceb3f7a3..f1156920796f 100644 --- a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild +++ b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild @@ -10,12 +10,12 @@ 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 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86" IUSE="perl selinux tcpd" DEPEND=" selinux? ( sys-libs/libselinux ) - kernel_linux? ( net-libs/libtirpc:= ) + net-libs/libtirpc:= tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 ) " RDEPEND=" |