gentoo resync : 15.12.2019

2 files changed, 0 insertions, 90 deletions

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();