From: "Michael Orlitzky" <mjo@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/rbldnsd/files/
Date: Thu, 21 Nov 2019 12:55:42 +0000 (UTC) [thread overview]
Message-ID: <1574340488.5443c80b77c4cf1aea6ff6fd696973c709b3a4b8.mjo@gentoo> (raw)
commit: 5443c80b77c4cf1aea6ff6fd696973c709b3a4b8
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Nov 20 18:31:30 2019 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu Nov 21 12:48:08 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5443c80b
net-dns/rbldnsd: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
.../files/rbldnsd-0.998-fix-huge-zone-OOM.patch | 60 ----------------------
1 file changed, 60 deletions(-)
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 7a4d2da7187..00000000000
--- 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();
reply other threads:[~2019-11-21 12:55 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1574340488.5443c80b77c4cf1aea6ff6fd696973c709b3a4b8.mjo@gentoo \
--to=mjo@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox