gentoo resync : 15.12.2019

5 files changed, 3 insertions, 162 deletions

diff --git a/net-dns/rbldnsd/Manifest b/net-dns/rbldnsd/Manifest
index a5d9c957ec21..cfd3235e7d97 100644
--- a/net-dns/rbldnsd/Manifest
+++ b/net-dns/rbldnsd/Manifest
@@ -1,10 +1,6 @@
 AUX confd-0.997a 1375 BLAKE2B 61980080ecad7a64ed547f19de7ca827057cca1ed4c4c724c5600faa8e1f5ae2845fef95a39a79ba297155ca7a0c33e1ed38eff86de65e19cc6c38fdd7b89944 SHA512 c26f561a0906704c8eb32d8748428b120489cb02d0c9b5ea814b7b4eb71e2ccdddc153d442ebcc46789e65c8c3aa3a305bbf56e6030f3b9994c6d7d247120669
 AUX initd-0.997a 546 BLAKE2B 6f7a5220598bc37e7b3c59db65fd38f17ed68c407a9ff1c486c2052fba166fbcd854bca5dc6cedf59b497998d968077b39e790168dc7e93ee62fa29b4c5864fa SHA512 2d18c5126ee1cf79e45881cf358f9d9299387dc1b2c0ee2433f85f617694ba11fb2c80703c18002995dc3d1f3d9d561b9b473a9c705b5b0c8ff282385b2e3170
-AUX rbldnsd-0.997a-format-security-compile-fix.patch 914 BLAKE2B dadce821f6d1d06b3c6bd5d5ffb42227af203d47b771d45e6231cc0c9d161d9ff700bf8e442e4bd6ca25e1c79e66a9f2dd2ca3e2a8c21a4e3ef96382e1237b63 SHA512 fe61d08ca56759cbce9e078576b3efd4e0bfa35108ca3921d9aa02d78d8e5fc8bae4ea4c38cc9695379ea28f058facf70978c8aa5ecc7d53742222a28dcbc166
 AUX rbldnsd-0.997a-robust-ipv6-test-support.patch 10867 BLAKE2B b2470f4a364c490b01cc8c2349d18d54ce6bc44f0113883bab763742cd798a0edec8add591a716ea99ac2d121bb1070bda1109d40018a91c162aaede3a2bc31d SHA512 a502df0c102a92dbccba482741ef628cde409f6d87d8467b66a0e4f595f8b28b9e99db0832ca27e3dbf317018b33f666b8bb8962988177cfaf1e0d28b6bf21d6
-AUX rbldnsd-0.998-fix-huge-zone-OOM.patch 1659 BLAKE2B 310b0b0851a09b5161919ce5a7fd97bb57c6ecbc1d87780af04c31214c72d25ca5d9dae481a46d1e5ccec4c5ba7b04b2b216a8ed104eb2af47b95771e32fa1b8 SHA512 2342d29322e6a5b726319a60c54a7f8d19b020e3dfc8a9d236ac7b6a55d9755b9afe1505c2f835604016fb899630074090baa737b2d3a24f7b4d4e4d911b0443
-DIST rbldnsd-0.998.tar.gz 145363 BLAKE2B e698f5b99ed1deae1aedda1952c19eb6189cbdcc71ecfa043faada966d30eee93e158dfeb059603dc493a665a7c56c84ff6ee636fc9eec7de38eb0bc73ed26db SHA512 7b6fb106f8188b2ce6e05b622cf90a393a4642f00faa5bddc184ce02dbd2beee9d8de22cb09ae53a25c475f28f99d13fbf6252f0d4c1d72bf47ba23f769e7074
 DIST rbldnsd-0.998b.tar.gz 154022 BLAKE2B f0bf03bef69853d45c3546c6fd3e58ffb95e76192ecb64f71f6799c6041749b1d117bed2bb21edbf1dec81d1684334b3af7d60b35d49089efb3a5e28752be6db SHA512 9b9c8694824a99b4ad120a22dbe4b05351867434e43ed0d8137990d3ece90ed67349965b6ed0450066d6663c1858545774c733b0d7afff304095de500ba30175
-EBUILD rbldnsd-0.998.ebuild 1540 BLAKE2B 46abc7491803de1c9a3508d0213e97fc565bc4f8bbdc851fb1fe45a5cc79fbeb526a2cd83b1658935c9a30923bf1c94a5cda350d1689b7f6eb82efa5f9adabaf SHA512 236ddc68f8a48f092ac1d485f7d9e3bc6c8d24f19dbb437a9d06ca82bc63a603233894592b8f38a415b6225ca992d6e073df63f3e6f5801faddc820db00722ef
-EBUILD rbldnsd-0.998b.ebuild 1448 BLAKE2B 8dcf4a48068a747638ed3c222bb4a1178fbf920625f2f2379277aac48ca1dc72803a5255b9e1870fe49dc1cac796f9f3755c2036a7ea1fd7fb34951107696a7e SHA512 7b90211bdf848e1cb021c83eb6bdb737a07f0579dd2ee96689525d03b41af648d4125b7f92ed81d1da84514174804396e63730ab26d3ebd7fee282d139aab6cd
+EBUILD rbldnsd-0.998b.ebuild 1471 BLAKE2B 2cfb519389960159469c39726e2f6ca8fd4b0504803b7944c729785b9db21f598120a55b1006ea38fe81d50c2d35a9743324612f53b8254ee2a2b26c063805bc SHA512 1d13f5a5fff869e5a37d7a8f5cefbe7fff6f004bddddb7200de14099cfadce67498e0176b4cdb4cd3738cb0a9bbc34ed3b3273c2794ff77fdaa362775eb91177
 MISC metadata.xml 1219 BLAKE2B 78d1de3d2e056e8d1441e929686a9cf1d073348f2b58ef263ffee7c6e9c03ad59b387c6112fdcb845915b1d5f41eaf6825f21510e7d085852ab49567412eb867 SHA512 23bddced94702b936cadbaf9a6a51cfd8506715a766cbef9dbb0fb69bf02443e0c8636b6237f98fd3922d0c43fb17c7c2850074e6bdefc2c9af3731a01971f8f
diff --git a/net-dns/rbldnsd/files/rbldnsd-0.997a-format-security-compile-fix.patch b/net-dns/rbldnsd/files/rbldnsd-0.997a-format-security-compile-fix.patch
deleted file mode 100644
index 03da010336e3..000000000000
--- a/net-dns/rbldnsd/files/rbldnsd-0.997a-format-security-compile-fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 5d3455065f84fe1ef4673552a27d2e6e8f02c97a Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Mon, 22 Sep 2014 10:09:27 -0400
-Subject: [PATCH 1/1] Fix compilation with -Werror=format-security.
-
-The dslog() function takes an optional format string, analogous to
-e.g. printf(), and a list of arguments to be substituted into the
-format string. A call to dslog() in do_reload() omitted the format
-string causing GCC to throw a format-security warning. To silence the
-warning, a trivial format string of "%s" was provided.
----
- rbldnsd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rbldnsd.c b/rbldnsd.c
-index abf1d01..e791231 100644
---- a/rbldnsd.c
-+++ b/rbldnsd.c
-@@ -959,7 +959,7 @@ static int do_reload(int do_fork) {
- # undef kb
-   }
- #endif /* NO_MEMINFO */
--  dslog(LOG_INFO, 0, ibuf);
-+  dslog(LOG_INFO, 0, "%s", ibuf);
- 
-   check_expires();
- 
--- 
-1.8.5.5
-
diff --git a/net-dns/rbldnsd/files/rbldnsd-0.998-fix-huge-zone-OOM.patch b/net-dns/rbldnsd/files/rbldnsd-0.998-fix-huge-zone-OOM.patch
deleted file mode 100644
index 7a4d2da7187f..000000000000
--- a/net-dns/rbldnsd/files/rbldnsd-0.998-fix-huge-zone-OOM.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-This upstream patch has been merged but not released. I (mjo) dropped
-a change to the NEWS file to prevent a pointless conflict.
-
-From a1295eefc78b6e8a3c220e164dbfad6dbecc6f6e Mon Sep 17 00:00:00 2001
-From: Antonio Mammita <am@spamteq.com>
-Date: Wed, 21 Dec 2016 16:54:06 +0100
-Subject: [PATCH] Fix for out of memory errors on huge zones. Thanks to Andrew
- Clayton
-
----
- rbldnsd.h      | 6 +++---
- rbldnsd_util.c | 6 +++---
- 3 files changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/rbldnsd.h b/rbldnsd.h
-index 6acd8a0..f195a30 100644
---- a/rbldnsd.h
-+++ b/rbldnsd.h
-@@ -367,9 +367,9 @@ extern struct dataset *g_dsacl;	/* global acl */
- extern const char *show_version; /* version.bind CH TXT */
- 
- void oom(void);
--char *emalloc(unsigned size);
--char *ezalloc(unsigned size); /* zero-fill */
--char *erealloc(void *ptr, unsigned size);
-+char *emalloc(size_t size);
-+char *ezalloc(size_t size); /* zero-fill */
-+char *erealloc(void *ptr, size_t size);
- char *estrdup(const char *str);
- char *ememdup(const void *buf, unsigned size);
- 
-diff --git a/rbldnsd_util.c b/rbldnsd_util.c
-index d17b51b..c6d628d 100644
---- a/rbldnsd_util.c
-+++ b/rbldnsd_util.c
-@@ -460,21 +460,21 @@ dump_a_txt(const char *name, const char *rr,
- 
- #endif
- 
--char *emalloc(unsigned size) {
-+char *emalloc(size_t size) {
-   void *ptr = malloc(size);
-   if (!ptr)
-     oom();
-   return ptr;
- }
- 
--char *ezalloc(unsigned size) {
-+char *ezalloc(size_t size) {
-   void *ptr = calloc(1, size);
-   if (!ptr)
-     oom();
-   return ptr;
- }
- 
--char *erealloc(void *ptr, unsigned size) {
-+char *erealloc(void *ptr, size_t size) {
-   void *nptr = realloc(ptr, size);
-   if (!nptr)
-     oom();
diff --git a/net-dns/rbldnsd/rbldnsd-0.998.ebuild b/net-dns/rbldnsd/rbldnsd-0.998.ebuild
deleted file mode 100644
index e6463eb22efa..000000000000
--- a/net-dns/rbldnsd/rbldnsd-0.998.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils toolchain-funcs user python-any-r1
-
-DESCRIPTION="DNS server designed to serve blacklist zones"
-HOMEPAGE="http://www.corpit.ru/mjt/rbldnsd.html"
-SRC_URI="http://www.corpit.ru/mjt/rbldnsd/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ~sparc x86"
-IUSE="ipv6 test zlib"
-
-RDEPEND="zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pydns:2[${PYTHON_USEDEP}]')
-	)"
-
-src_prepare() {
-	epatch "${FILESDIR}/rbldnsd-0.997a-robust-ipv6-test-support.patch"
-	epatch "${FILESDIR}/rbldnsd-0.997a-format-security-compile-fix.patch"
-}
-
-src_configure() {
-	# The ./configure file is handwritten and doesn't support a `make
-	# install` target, so there are no --prefix options. The econf
-	# function appends those automatically, so we can't use it.
-	./configure \
-		$(use_enable ipv6) \
-		$(use_enable zlib) \
-		|| die "./configure failed"
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)"
-}
-
-src_test() {
-	emake check \
-		CC="$(tc-getCC)" \
-		PYTHON="${PYTHON}"
-}
-
-src_install() {
-	dosbin rbldnsd
-	doman rbldnsd.8
-	keepdir /var/db/rbldnsd
-	dodoc CHANGES* TODO NEWS README*
-	newinitd "${FILESDIR}"/initd-0.997a rbldnsd
-	newconfd "${FILESDIR}"/confd-0.997a rbldnsd
-}
-
-pkg_postinst() {
-	enewgroup rbldns
-	enewuser rbldns -1 -1 /var/db/rbldnsd rbldns
-	chown rbldns:rbldns /var/db/rbldnsd
-}
diff --git a/net-dns/rbldnsd/rbldnsd-0.998b.ebuild b/net-dns/rbldnsd/rbldnsd-0.998b.ebuild
index c570f9b9fbcd..19ee0603f04b 100644
--- a/net-dns/rbldnsd/rbldnsd-0.998b.ebuild
+++ b/net-dns/rbldnsd/rbldnsd-0.998b.ebuild
@@ -12,8 +12,9 @@ SRC_URI="https://github.com/spamhaus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~sparc ~x86"
+KEYWORDS="amd64 hppa sparc x86"
 IUSE="ipv6 test zlib"
+RESTRICT="!test? ( test )"
 
 RDEPEND="zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}"