gentoo resync : 12.07.2021

2 files changed, 110 insertions, 0 deletions

diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index c012bf0f53fb..4e67e3bf18ea 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -2,6 +2,8 @@ AUX hosts.allow.example 585 BLAKE2B 18a7786b0eb9d08b0536de6ef135189aa0527af34a9b
 AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae680b189158c9936428644e7b93981403ed017ef26806f3de184f66eace573cf385ae350f3b0fa1b3f250b2a0b4708908289c558 SHA512 d530f788c3b40f5ec2836ba7c6e73df529869ef465b93fe2b2d8460dfcb5e9031e78c8e6a99c71d6262a05b82f25e694fdd717686198a87dfcb2c9b9d5a52ef4
 AUX tcp-wrappers-7.6.28-no-external-malloc.patch 317 BLAKE2B 4436d7bf54e13b038e8139c2dfd0a4a061b6113898560436ae0e5fb6e5a74c3c4c163c27f99e9957ec89665186beed30e7a57810db886b8a86148f6b58f5f594 SHA512 bdefe3dd35e96d1e140d1dc363f1904526aaf0c44952b8ec5e206c8e53693437f07be2ad136a0e22c38e09c1dcd1c73c755165cc68b4588715f6997f9c6affb8
 DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec581f7132cfb4352f8807d2cea4715daf5c11aa08a92cf084ab1ff31222f5b265f032286ce2dcf49a238e9dc5616161c400fce4f08 SHA512 2c63201937737c19b4e5ca97dbc0ede9fc2d3b8fc344f8854a7d2afc0109ccb9ee52af94ba8a8498da910336a4f473825daa7a0cca26a0d93e1078e67abe16b0
+DIST tcp-wrappers_7.6.q-31.debian.tar.xz 36256 BLAKE2B 3ffd8b014c120f54b9231f375d3ec77a1894db8c48e56a57b52c5d796be42b78a1ddc35a45c816a05a1cbc603b88e3fe6131b4a562fb9d2169685031ecbf44d5 SHA512 de2bd7b081fca0f182def93795014332baf7b5edf339eaf81dff82772aea1dc866ccddccd5273e7dc49cf760953e164a66f1e5945cb54f2b8dab090c11712c33
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
 EBUILD tcp-wrappers-7.6.28-r1.ebuild 2509 BLAKE2B 79b2fbb4710eab85626c207d78f1d0cdd4b995ff3e32b267ac9be30b6fe29602cb6ab395f617c9a9bb67a598dc16a33da48765a7fd1e796a45f6cba991c8e1d3 SHA512 b1007fc41f6c357c0f2b1e2ef62396dd1e30ed09994ac77935fe95b580947affd0674494097a38b0174b1af99310b56f87dfd022ae748b57d2684c44f9e8b4ef
+EBUILD tcp-wrappers-7.6.31.ebuild 2630 BLAKE2B aed16260ff668acb5b1d0bc7ba5381edd6c77517e3a8cd3d1d1bae135e47b205099810ec70cfba41e831d4cfed90ce190749e94cc68fb37042bc355b6dbdb625 SHA512 f86846a8023352a5ba4a76c31ef7edcbc16b9160dee9c5c9da4f41b92173ee75fcbfc3bddd648b7251bd2847ce35a3d0f4e36dc044fa5d58313917ca39334b4c
 MISC metadata.xml 440 BLAKE2B 701c101283758170adf92309f323c549f8cdac83c8885cff01e0a9841474e88b00cd8ce7d3e5c0d19209cc2acd8c113d23129c54a116433cf495126960758bea SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild
new file mode 100644
index 000000000000..7ab6995f3d7f
--- /dev/null
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.31.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs multilib-minimal usr-ldscript
+
+MY_PV=$(ver_cut 1-2)
+DEB_PV=$(ver_cut 3)
+MY_P="${PN//-/_}_${MY_PV}"
+DESCRIPTION="TCP Wrappers"
+HOMEPAGE="http://ftp.porcupine.org/pub/security"
+SRC_URI="http://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
+	mirror://debian/pool/main/t/${PN}/${PN}_${MY_PV}.q-${DEB_PV}.debian.tar.xz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="tcp_wrappers_license"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="ipv6 netgroups static-libs"
+
+RDEPEND="netgroups? ( net-libs/libnsl:= )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-7.6-redhat-bug11881.patch"
+	"${FILESDIR}/${PN}-7.6.28-no-external-malloc.patch"
+)
+
+src_prepare() {
+	# Apply Debian patchset except for the series file which just lists
+	# the patches
+	eapply $(sed -e 's:^:../debian/patches/:' ../debian/patches/series || die)
+
+	default
+
+	multilib_copy_sources
+}
+
+temake() {
+	append-cppflags "-DHAVE_WEAKSYMS -DHAVE_STRERROR -DSYS_ERRLIST_DEFINED"
+
+	if use ipv6; then
+		append-cppflags "-DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len"
+	fi
+
+	local myemakeargs=(
+		REAL_DAEMON_DIR="${EPREFIX}/usr/sbin"
+		TLI= VSYSLOG= PARANOID= BUGS=
+		AUTH="-DALWAYS_RFC931"
+		AUX_OBJ="weak_symbols.o"
+		DOT="-DAPPEND_DOT"
+		HOSTNAME="-DALWAYS_HOSTNAME"
+		NETGROUP=$(usex netgroups -DNETGROUPS "")
+		STYLE="-DPROCESS_OPTIONS"
+		LIBS=$(usex netgroups -lnsl "")
+		LIB=$(usex static-libs libwrap.a "")
+		AR="$(tc-getAR)" ARFLAGS=rc
+		CC="$(tc-getCC)"
+		RANLIB="$(tc-getRANLIB)"
+		COPTS="${CFLAGS} ${CPPFLAGS}"
+		LDFLAGS="${LDFLAGS}"
+		"$@"
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+multilib_src_configure() {
+	tc-export AR RANLIB
+	temake config-check
+}
+
+multilib_src_compile() {
+	# https://bugs.gentoo.org/728348
+	unset STRINGS
+	temake all
+}
+
+multilib_src_install() {
+	into /usr
+	use static-libs && dolib.a libwrap.a
+	dolib.so shared/libwrap.so*
+
+	insinto /usr/include
+	doins tcpd.h
+
+	if multilib_is_native_abi; then
+		gen_usr_ldscript -a wrap
+		dosbin tcpd tcpdchk tcpdmatch safe_finger try-from
+	fi
+}
+
+multilib_src_install_all() {
+	doman *.[358]
+	dosym hosts_access.5 /usr/share/man/man5/hosts.allow.5
+	dosym hosts_access.5 /usr/share/man/man5/hosts.deny.5
+
+	insinto /etc
+	newins "${FILESDIR}"/hosts.allow.example hosts.allow
+
+	dodoc BLURB CHANGES DISCLAIMER README*
+}
+
+pkg_preinst() {
+	# don't clobber people with our default example config
+	[[ -e ${EROOT}/etc/hosts.allow ]] && cp -pP "${EROOT}"/etc/hosts.allow "${ED}"/etc/hosts.allow
+}