From 3b00f2d2f95f5d6ff01e71259eb94fa714a92232 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 16 Feb 2024 17:36:56 +0000 Subject: gentoo auto-resync : 16:02:2024 - 17:36:56 --- net-dns/rbldnsd/Manifest | 4 + net-dns/rbldnsd/files/rbldnsd-0.998b-cstd.patch | 193 +++++++++++++++++++++ .../rbldnsd/files/rbldnsd-0.998b-mallinfo2.patch | 59 +++++++ .../rbldnsd/files/rbldnsd-0.998b-sys-poll.patch | 54 ++++++ net-dns/rbldnsd/rbldnsd-0.998b-r3.ebuild | 61 +++++++ 5 files changed, 371 insertions(+) create mode 100644 net-dns/rbldnsd/files/rbldnsd-0.998b-cstd.patch create mode 100644 net-dns/rbldnsd/files/rbldnsd-0.998b-mallinfo2.patch create mode 100644 net-dns/rbldnsd/files/rbldnsd-0.998b-sys-poll.patch create mode 100644 net-dns/rbldnsd/rbldnsd-0.998b-r3.ebuild (limited to 'net-dns/rbldnsd') diff --git a/net-dns/rbldnsd/Manifest b/net-dns/rbldnsd/Manifest index a0c052584908..c9880777198c 100644 --- a/net-dns/rbldnsd/Manifest +++ b/net-dns/rbldnsd/Manifest @@ -1,5 +1,9 @@ AUX confd-0.997a 1375 BLAKE2B 61980080ecad7a64ed547f19de7ca827057cca1ed4c4c724c5600faa8e1f5ae2845fef95a39a79ba297155ca7a0c33e1ed38eff86de65e19cc6c38fdd7b89944 SHA512 c26f561a0906704c8eb32d8748428b120489cb02d0c9b5ea814b7b4eb71e2ccdddc153d442ebcc46789e65c8c3aa3a305bbf56e6030f3b9994c6d7d247120669 AUX initd-0.997a 546 BLAKE2B 6f7a5220598bc37e7b3c59db65fd38f17ed68c407a9ff1c486c2052fba166fbcd854bca5dc6cedf59b497998d968077b39e790168dc7e93ee62fa29b4c5864fa SHA512 2d18c5126ee1cf79e45881cf358f9d9299387dc1b2c0ee2433f85f617694ba11fb2c80703c18002995dc3d1f3d9d561b9b473a9c705b5b0c8ff282385b2e3170 +AUX rbldnsd-0.998b-cstd.patch 5373 BLAKE2B 8788217ca4823337b7735ec87596fb6dc92eca1857559851757400119a12c6fb56f923a5e2fff1bd1dff42360f49c06dbcd355070a2f421c5abe67f23243857f SHA512 4cd739b7e10813aac34a606e2b9f4ab03f267b60faed89a8acee5bede4a68c4d561d7d788c57b0c076f6d07937c13775a4cea3aca85639999d79c67a5211e9ef +AUX rbldnsd-0.998b-mallinfo2.patch 1846 BLAKE2B 12ca80fec6d699921bf6bf04d03e5155da431e8b50ecea6cb61d96f6d2e89d4161e65ebc30675d03b3185a1232d93b609212daeb7d859eeba22c7378e1d8456b SHA512 3bb48f1804ddcc6850b5ed158f3d96c36ce2fd20f421c925b9a6ecf43842d64a9e6afb31eb26362a2a60379b07051441fe124f7e13aac1d95a6fb911c64062b9 +AUX rbldnsd-0.998b-sys-poll.patch 1416 BLAKE2B cbffd0c2094a46c1b53a0a12ad20c18f44c8aaecb27d23a19b082c86c70b3b234dffa3e0d3495ec7f681fa8b42fe56541f7dc8d60c519a80eff3f742265f932b SHA512 92109d047b70c0391352108d042c414b3d6678a964a8c15c1a892d404f8642076326db68588074ec81639c6af99a38e10ac0cb7c1681a76d827aa0918312c26e DIST rbldnsd-0.998b.tar.gz 154022 BLAKE2B f0bf03bef69853d45c3546c6fd3e58ffb95e76192ecb64f71f6799c6041749b1d117bed2bb21edbf1dec81d1684334b3af7d60b35d49089efb3a5e28752be6db SHA512 9b9c8694824a99b4ad120a22dbe4b05351867434e43ed0d8137990d3ece90ed67349965b6ed0450066d6663c1858545774c733b0d7afff304095de500ba30175 EBUILD rbldnsd-0.998b-r2.ebuild 1381 BLAKE2B 16628ac9446d7461667a3312d594fe5ff062c4c588279476c95bf85585714ddd2078dca42013cfe10a415c875c4aa7d26bd2e310ddcd546945eb5870d64088d0 SHA512 97eaa7053f834e7a9085399639c04a09fc93e4a9099237fc8640ae990188a48c50adb4ff405d218af130b042eb93c8b02e2e5c612b756ea29e8a076ac40f54dc +EBUILD rbldnsd-0.998b-r3.ebuild 1528 BLAKE2B b4db719ece942fa302f892a17166878ca1f76ad48b66fa23e9df6b4357e41b551bb38827c07d2e04976d956ede6dd9102ecaa937f747574048e6bcc692dcc9b7 SHA512 61c75b8946e21ac819367437d07af682b21f3337bbc0c10c370a0d9673a4d2edfd16f09618ce63631dbbc404a3c151160626578e862549d6ca79f7670e7391a9 MISC metadata.xml 1418 BLAKE2B 679c1b0228b34031facaa412144d2c31ca58b5f681ae51db198d7a0042c9c27f5688b5f0b5bb6fadf47d9fda5c87c4e924f27e7c8c6c83508af755ecce56cee4 SHA512 543b3c93fb1f56ac37d97a563eebece5593bcda75fc9a6d604d2ff33c16201c57470db99ee8da38ef69a34c0bb477306c3f296366b1b82538abe4e23dfabffa8 diff --git a/net-dns/rbldnsd/files/rbldnsd-0.998b-cstd.patch b/net-dns/rbldnsd/files/rbldnsd-0.998b-cstd.patch new file mode 100644 index 000000000000..e5e17e334b05 --- /dev/null +++ b/net-dns/rbldnsd/files/rbldnsd-0.998b-cstd.patch @@ -0,0 +1,193 @@ +From c1f9d0a5d112d2298ed4f3c696ea34c9b0c24ba6 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky +Date: Fri, 16 Feb 2024 07:43:54 -0500 +Subject: [PATCH 1/1] configure{,.lib},rbldnsd_util.c: future proof the + ./configure script + +https://github.com/spamhaus/rbldnsd/pull/28 +--- + configure | 38 ++++++++++++++++++++++---------------- + configure.lib | 2 +- + rbldnsd_util.c | 4 ++-- + 3 files changed, 25 insertions(+), 19 deletions(-) + +diff --git a/configure b/configure +index b0cb655..6470c9e 100755 +--- a/configure ++++ b/configure +@@ -90,7 +90,7 @@ else + if ac_yesno "sizes of standard integer types" \ + ac_compile_run < +-int main() { ++int main(int argc, char **argv) { + printf("#define SIZEOF_SHORT %d\n", sizeof(short)); + printf("#define SIZEOF_INT %d\n", sizeof(int)); + printf("#define SIZEOF_LONG %d\n", sizeof(long)); +@@ -105,7 +105,7 @@ EOF + if ac_yesno "for long long" \ + ac_compile_run < +-int main() { ++int main(int argc, char **argv) { + long long x; + printf("#define SIZEOF_LONG_LONG %d\n", sizeof(long long)); + return 0; +@@ -120,7 +120,7 @@ fi + + if ac_compile_run_v "whether C compiler defines __SIZEOF_POINTER__" < +-int main() { ++int main(int argc, char **argv) { + #ifdef __SIZEOF_POINTER__ + return 0; + #else +@@ -136,7 +136,7 @@ fi + + if ac_verbose "byte order" "big-endian" "little-endian" \ + ac_compile_run < + #include +-int foo() { socklen_t len; len = 0; return len; } ++int foo(void) { socklen_t len; len = 0; return len; } + EOF + then : + else +@@ -173,7 +173,13 @@ else + fi + + if ac_library_find_v 'connect()' "" "-lsocket -lnsl" < ++#include ++int main(int argc, char **argv) { ++ gethostbyname(""); ++ connect(0, (const struct sockaddr *)0, (socklen_t)0); ++ return 0; ++} + EOF + then : + else +@@ -189,7 +195,7 @@ if ac_link_v "for IPv6" < + #include + #include +-int main() { ++int main(int argc, char **argv) { + char h[200]; + char s[200]; + struct sockaddr_in6 sa; +@@ -211,7 +217,7 @@ if ac_link_v "for mallinfo()" < + #include + #include +-int main() { ++int main(int argc, char **argv) { + struct mallinfo mi = mallinfo(); + return 0; + } +@@ -224,7 +230,7 @@ fi + if ac_link_v "for poll()" < + #include +-int main() { ++int main(int argc, char **argv) { + struct pollfd pfd[2]; + return poll(pfd, 2, 10); + } +@@ -251,7 +257,7 @@ int test(char *fmt, ...) { + vsnprintf(buf, sizeof(buf), fmt, ap); + return 0; + } +-int main() { ++int main(int argc, char **argv) { + test("test%d", 40); + return 0; + } +@@ -265,7 +271,7 @@ if ac_link_v "for writev()/readv()" < + #include + #include +-int main() { ++int main(int argc, char **argv) { + struct iovec iov; + return writev(1, &iov, 1) && readv(1, &iov, 1); + } +@@ -278,7 +284,7 @@ fi + if ac_link_v "for setitimer()" < + #include +-int main() { ++int main(int argc, char **argv) { + struct itimerval itv; + itv.it_interval.tv_sec = itv.it_value.tv_sec = 10; + itv.it_interval.tv_usec = itv.it_value.tv_usec = 20; +@@ -296,7 +302,7 @@ elif ac_link_v "for zlib support" -lz < + #include + #include +-int main() { ++int main(int argc, char **argv) { + z_stream z; + int r; + r = inflateInit2(&z, 0); +@@ -319,7 +325,7 @@ elif [ n = "$enable_dso" ]; then + echo "#define NO_DSO 1 /* option disabled */" >>confdef.h + elif ac_link_v "for dlopen() in -dl with -rdynamic" -ldl -rdynamic < +-int main() { ++int main(int argc, char **argv) { + void *handle, *func; + handle = dlopen("testfile", RTLD_NOW); + func = dlsym(handle, "function"); +diff --git a/configure.lib b/configure.lib +index 39cf423..6b7245f 100644 +--- a/configure.lib ++++ b/configure.lib +@@ -178,7 +178,7 @@ EOF + if ac_yesno "whether the C compiler ($ccld) + can produce executables" \ + ac_compile_run < +Date: Fri, 16 Feb 2024 07:38:20 -0500 +Subject: [PATCH 2/2] configure,rbldnsd.c: replace mallinfo() with mallinfo2() + +The mallinfo() function from malloc.h is deprecated, and has been +replaced by mallinfo2(). Additionally, the "mallinfo" struct that it +returns has been replaced by a "mallinfo2" struct. The only difference +between the two is that the newer struct contains members of type +size_t rather than int, which proved to be too small (leading to +overflows). + +The call to ssprintf() that prints this information has been updated +to use the "z" length modifier, which is C99, but which is probably +safe by now. Other C99 features are already being used by rbldnsd. +--- + configure | 4 ++-- + rbldnsd.c | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 5686b0a..42fcf9a 100755 +--- a/configure ++++ b/configure +@@ -213,12 +213,12 @@ else + fi + fi # enable_ipv6? + +-if ac_link_v "for mallinfo()" < + #include + #include + int main(int argc, char **argv) { +- struct mallinfo mi = mallinfo(); ++ struct mallinfo2 mi = mallinfo2(); + return 0; + } + EOF +diff --git a/rbldnsd.c b/rbldnsd.c +index 8ea25a2..d0cb43e 100644 +--- a/rbldnsd.c ++++ b/rbldnsd.c +@@ -951,10 +951,10 @@ static int do_reload(int do_fork) { + #endif /* NO_TIMES */ + #ifndef NO_MEMINFO + { +- struct mallinfo mi = mallinfo(); ++ struct mallinfo2 mi = mallinfo2(); + # define kb(x) ((mi.x + 512)>>10) + ip += ssprintf(ibuf + ip, sizeof(ibuf) - ip, +- ", mem arena=%d free=%d mmap=%d Kb", ++ ", mem arena=%zd free=%zd mmap=%zd Kb", + kb(arena), kb(fordblks), kb(hblkhd)); + # undef kb + } +-- +2.43.0 + diff --git a/net-dns/rbldnsd/files/rbldnsd-0.998b-sys-poll.patch b/net-dns/rbldnsd/files/rbldnsd-0.998b-sys-poll.patch new file mode 100644 index 000000000000..ccf53d7e8072 --- /dev/null +++ b/net-dns/rbldnsd/files/rbldnsd-0.998b-sys-poll.patch @@ -0,0 +1,54 @@ +From 9a4eeaec16ebd7e5a493fe0a10c371b60ecf813c Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky +Date: Fri, 16 Feb 2024 07:36:24 -0500 +Subject: [PATCH 1/2] configure,rbldnsd.c: include instead of + + +As far back as 1997, the Single UNIX Specification (that later became +POSIX) has said that is the file that provides poll() and +friends: + + https://pubs.opengroup.org/onlinepubs/7908799/xsh/poll.h.html + +Most implementations also support the old , but musl, for +example, raises a warning about its usage: + + https://git.musl-libc.org/cgit/musl/tree/include/sys/poll.h + +This commit updates to in two places. + +Closes: https://github.com/spamhaus/rbldnsd/issues/25 +--- + configure | 2 +- + rbldnsd.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 6470c9e..5686b0a 100755 +--- a/configure ++++ b/configure +@@ -229,7 +229,7 @@ fi + + if ac_link_v "for poll()" < +-#include ++#include + int main(int argc, char **argv) { + struct pollfd pfd[2]; + return poll(pfd, 2, 10); +diff --git a/rbldnsd.c b/rbldnsd.c +index e791231..8ea25a2 100644 +--- a/rbldnsd.c ++++ b/rbldnsd.c +@@ -27,7 +27,7 @@ + # include + #endif + #ifndef NO_POLL +-# include ++# include + #endif + #ifndef NO_MEMINFO + # include +-- +2.43.0 + diff --git a/net-dns/rbldnsd/rbldnsd-0.998b-r3.ebuild b/net-dns/rbldnsd/rbldnsd-0.998b-r3.ebuild new file mode 100644 index 000000000000..cf702d80d5e1 --- /dev/null +++ b/net-dns/rbldnsd/rbldnsd-0.998b-r3.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit toolchain-funcs + +DESCRIPTION="DNS server designed to serve blacklist zones" +HOMEPAGE="https://rbldnsd.io/" +SRC_URI="https://github.com/spamhaus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~hppa ~sparc ~x86" +IUSE="ipv6 zlib" + +RDEPEND="zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND}" +BDEPEND=" + acct-group/rbldns + acct-user/rbldns +" + +# The test suite was dropped from the ebuild because it requires +# python-2.7, and it will crash if you try to run it now. +RESTRICT=test + +PATCHES=( + "${FILESDIR}/rbldnsd-0.998b-cstd.patch" + "${FILESDIR}/rbldnsd-0.998b-sys-poll.patch" + "${FILESDIR}/rbldnsd-0.998b-mallinfo2.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. We + # Have to set $CC here, too (and not just in the call to emake), + # because the ./configure script checks for it. + CC="$(tc-getCC)" ./configure \ + $(use_enable ipv6) \ + $(use_enable zlib) \ + || die "./configure failed" +} + +src_compile() { + emake \ + AR="$(tc-getAR)" \ + CC="$(tc-getCC)" \ + RANLIB="$(tc-getRANLIB)" +} + +src_install() { + einstalldocs + dosbin rbldnsd + doman rbldnsd.8 + newinitd "${FILESDIR}"/initd-0.997a rbldnsd + newconfd "${FILESDIR}"/confd-0.997a rbldnsd + diropts -g rbldns -o rbldns -m 0750 + keepdir /var/db/rbldnsd +} -- cgit v1.2.3