[rpms/maradns] rawhide: update to 3.5.0037

[rpms/maradns] rawhide: update to 3.5.0037

[Tomasz Torcz]

            A new commit has been pushed.

            Repo   : rpms/maradns
            Branch : rawhide
            Commit : ac2dbe443302b14cc22df1be11ff94afea4c62a8
            Author : Tomasz Torcz <tomek@pipebreaker.pl>
            Date   : 2026-06-17T15:20:09+02:00
            Stats  : +19/-114 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/maradns/c/ac2dbe443302b14cc22df1be11ff94afea4c62a8?branch=rawhide

            Log:
            update to 3.5.0037

Upstream provided new tarball, now it's generated by Github Actions.

---
diff --git a/.gitignore b/.gitignore
index 75c2423..9e4649d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 /maradns-3.5.0024.tar.xz
 /maradns-3.5.0030.tar.xz
 /maradns-3.5.0036.tar.xz
+/maradns-3.5.0037.tar.xz
+/MaraDNS-3.5.0037-fedora.tar.xz

diff --git a/maradns-0002-fix-prototypes-and-signal-handlers.patch b/maradns-0002-fix-prototypes-and-signal-handlers.patch
deleted file mode 100644
index b4d55eb..0000000
--- a/maradns-0002-fix-prototypes-and-signal-handlers.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-diff -uNr maradns-3.5.0036/deadwood-3.5.0036/src/DwSocket.h maradns-3.5.0036-patched/deadwood-3.5.0036/src/DwSocket.h
---- maradns-3.5.0036/deadwood-3.5.0036/src/DwSocket.h	2023-05-03 02:53:39.000000000 +0200
-+++ maradns-3.5.0036-patched/deadwood-3.5.0036/src/DwSocket.h	2025-02-18 10:32:10.384646061 +0100
-@@ -275,7 +275,7 @@
- SOCKET do_bind(ip_addr_T *ip,int type);
- 
- /* Get an upstream IP address (Not thread safe w/o locking) */
--ip_addr_T get_upstream_ip();
-+ip_addr_T get_upstream_ip(dw_str *query, int b);
- 
- /* Find a free remote pending connection */
- int_fast32_t find_free_remote();
-diff -uNr maradns-3.5.0036/deadwood-3.5.0036/src/DwSys.h maradns-3.5.0036-patched/deadwood-3.5.0036/src/DwSys.h
---- maradns-3.5.0036/deadwood-3.5.0036/src/DwSys.h	2023-05-03 02:53:39.000000000 +0200
-+++ maradns-3.5.0036-patched/deadwood-3.5.0036/src/DwSys.h	2025-02-18 10:34:07.603568612 +0100
-@@ -101,7 +101,7 @@
- 
- /* Read mararc parameters and set global variables based on those
-  * parameters */
--void process_mararc();
-+void process_mararc(char *name);
- 
- /* Initialize the cache */
- void init_cache();
-diff -uNr maradns-3.5.0036/libs/MaraHash.h maradns-3.5.0036-patched/libs/MaraHash.h
---- maradns-3.5.0036/libs/MaraHash.h	2023-05-03 02:53:39.000000000 +0200
-+++ maradns-3.5.0036-patched/libs/MaraHash.h	2025-02-18 10:36:45.926464005 +0100
-@@ -55,7 +55,7 @@
- 
- /* Function prototypes */
- /* mhash (assosciative array) objects */
--mhash *mhash_create();
-+mhash *mhash_create(int hash_bits);
- mhash_offset mhash_js(js_string *tohash, int hash_bits);
- mhash_offset mhash_inc(mhash_offset old, int hash_bits);
- int mhash_put(mhash *hash, js_string *key, void *value, int datatype);
-diff -uNr maradns-3.5.0036/server/MaraDNS.c maradns-3.5.0036-patched/server/MaraDNS.c
---- maradns-3.5.0036/server/MaraDNS.c	2023-05-03 02:53:39.000000000 +0200
-+++ maradns-3.5.0036-patched/server/MaraDNS.c	2025-02-18 10:50:30.611918558 +0100
-@@ -237,7 +237,7 @@
- int got_hup_signal = 0;
- 
- /* Signal handler for HUP signal */
--void handle_hup() {
-+void handle_hup(int signum) {
-     got_hup_signal = 1;
-     return;
-     }
-diff -uNr maradns-3.5.0036/server/udpsuccess.c maradns-3.5.0036-patched/server/udpsuccess.c
---- maradns-3.5.0036/server/udpsuccess.c	2023-05-03 02:53:39.000000000 +0200
-+++ maradns-3.5.0036-patched/server/udpsuccess.c	2025-02-18 10:38:12.618406728 +0100
-@@ -39,7 +39,7 @@
- extern rr *seenlist[256];
- extern int seenlist_where;
- extern ipv4pair long_packet[512];
--extern int calc_ra_value(); /* Make -Wall happy */
-+extern int calc_ra_value(int); /* Make -Wall happy */
- 
- /* If we successfully found a record, spit out that record on the
-    udp packet.
-diff -uNr maradns-3.5.0036/tcp/fetchzone.c maradns-3.5.0036-patched/tcp/fetchzone.c
---- maradns-3.5.0036/tcp/fetchzone.c	2023-05-03 02:53:39.000000000 +0200
-+++ maradns-3.5.0036-patched/tcp/fetchzone.c	2025-02-18 10:53:56.955781783 +0100
-@@ -50,7 +50,7 @@
-     exit(3);
-     }
- 
--void timeout() {
-+void timeout(int signum) {
-     harderror(L_TIMEOUT); /* "Connection timed out" */
-     }
- 
-diff -uNr maradns-3.5.0036/tcp/getzone.c maradns-3.5.0036-patched/tcp/getzone.c
---- maradns-3.5.0036/tcp/getzone.c	2023-05-03 02:53:39.000000000 +0200
-+++ maradns-3.5.0036-patched/tcp/getzone.c	2025-02-18 10:53:33.478797344 +0100
-@@ -47,7 +47,7 @@
-     exit(3);
-     }
- 
--void timeout() {
-+void timeout(int signum) {
-     harderror(L_TIMEOUT); /* "Connection timed out" */
-     }
- 
-diff -uNr maradns-3.5.0036/tcp/zoneserver.c maradns-3.5.0036-patched/tcp/zoneserver.c
---- maradns-3.5.0036/tcp/zoneserver.c	2023-05-03 02:53:39.000000000 +0200
-+++ maradns-3.5.0036-patched/tcp/zoneserver.c	2025-02-18 10:51:08.924893163 +0100
-@@ -84,13 +84,13 @@
- int no_cname_warnings = 1; /* So we can link to MaraBigHash.o */
- 
- /* Signal handler for handling the exit of a child */
--void handle_childs() {
-+void handle_childs(int signum) {
-     if(waitpid(0,NULL,WNOHANG) > 0)
-         num_children--;
- }
- 
- /* Signal handler for termination of the root process */
--void handle_term() {
-+void handle_term(int signum) {
-     killpg(getpgrp(), SIGTERM);
-     exit(0);
- }

diff --git a/maradns.spec b/maradns.spec
index 5b1ef87..ad433fb 100644
--- a/maradns.spec
+++ b/maradns.spec
@@ -1,12 +1,11 @@
 Name:		maradns
-Version:	3.5.0036
-Release:	9%{?dist}
+Version:	3.5.0037
+Release:	1%{?dist}
 Summary:	Authoritative and recursive DNS server made with security in mind
 
-Source0:	http://www.maradns.org/download/3.5/%{version}/%{name}-%{version}.tar.xz
+Source0:	http://www.maradns.org/download/3.5/%{version}/MaraDNS-%{version}-fedora.tar.xz
 # http://maradns.samiam.org/download/patches/3rd_party/Thomasz-Torcz-systemd-2013-10-14.patch
 Patch0:		%{name}-0001-add-systemd-unit-files.patch
-Patch1:		%{name}-0002-fix-prototypes-and-signal-handlers.patch
 # parts of MaraDNS – the files in coLunacyDNS/lunacy – are under MIT (Lua) license,
 # but we don't package them
 License:	BSD-2-Clause
@@ -27,12 +26,12 @@ essential internet service. MaraDNS has the following advantages:
 	* Open Source.
 
 %prep
-%setup -q
+%setup -q -n MaraDNS-%{version}
 %autopatch -p1
 
 # Create a sysusers.d config file
 cat >maradns.sysusers.conf <<EOF
-u maradns - 'MaraDns chroot user' /etc/maradns -
+u maradns - 'MaraDNS chroot user' /etc/maradns -
 EOF
 
 %build
@@ -42,7 +41,8 @@ EOF
 
 # recursive resolver is shipped in versioned directory
 # first compile Deadwood, otherwise we have no control over make flags
-pushd deadwood-%{version}/src
+#pushd deadwood-%{version}/src
+pushd deadwood-github/src
 make %{?_smp_mflags} FLAGS="%{optflags} -lrt"
 popd
 make %{?_smp_mflags} FLAGS="%{optflags} -DSELECT_PROBLEM -DAUTHONLY"
@@ -52,7 +52,8 @@ make %{?_smp_mflags} FLAGS="%{optflags} -DSELECT_PROBLEM -DAUTHONLY"
 # create /etc/maradns, /etc/mararc and /etc/dwood3rc first
 install -p -d -m 0755 %{buildroot}%{_sysconfdir}/maradns/logger/
 install -p -D -m 0644 doc/en/examples/example_mararc %{buildroot}%{_sysconfdir}/mararc
-install -p -D -m 0644 deadwood-%{version}/doc/dwood3rc %{buildroot}%{_sysconfdir}/dwood3rc
+#install -p -D -m 0644 deadwood-%{version}/doc/dwood3rc %{buildroot}%{_sysconfdir}/dwood3rc
+install -p -D -m 0644 deadwood-github/doc/dwood3rc %{buildroot}%{_sysconfdir}/dwood3rc
 
 # cache dir
 install -p -d -m 0755 %{buildroot}/var/cache/deadwood
@@ -60,7 +61,8 @@ install -p -d -m 0755 %{buildroot}/var/cache/deadwood
 # sbin files
 install -p -D -m 0755 server/maradns %{buildroot}%{_sbindir}/maradns
 install -p -D -m 0755 tcp/zoneserver %{buildroot}%{_sbindir}/zoneserver
-install -p -D -m 0755 deadwood-%{version}/src/Deadwood %{buildroot}%{_sbindir}/Deadwood
+#install -p -D -m 0755 deadwood-%{version}/src/Deadwood %{buildroot}%{_sbindir}/Deadwood
+install -p -D -m 0755 deadwood-github/src/Deadwood %{buildroot}%{_sbindir}/Deadwood
 
 # bin files
 install -p -D -m 0755 tcp/getzone %{buildroot}%{_bindir}/getzone
@@ -74,7 +76,8 @@ install -p -D -m 0644 -t %{buildroot}%{_mandir}/man1/ \
 	doc/en/man/getzone.1 \
 	doc/en/man/fetchzone.1
 install -p -D -m 0644 -t %{buildroot}%{_mandir}/man1/ \
-	deadwood-%{version}/doc/Deadwood.1
+	deadwood-github/doc/Deadwood.1
+#	deadwood-%{version}/doc/Deadwood.1
 install -p -D -m 0644 -t %{buildroot}%{_mandir}/man5/ \
 	doc/en/man/csv1.5 \
 	doc/en/man/csv2.5 \
@@ -146,6 +149,9 @@ fi
 
 
 %changelog
+* Mon Jun 15 2026 Tomasz Torcz <ttorcz@fedoraproject.org> - 3.5.0037-1
+- update to 3.5.0037, fixing DNS-over-TCP bug (rhbz#2488786)
+
 * Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.0036-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
 

diff --git a/sources b/sources
index ec29efa..5589d3d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (maradns-3.5.0036.tar.xz) = 0d8248ad858064aec162a1d4bbdcf48eca39e07403b243a318c6512e4fee57429c6aa216e434cb0cb6ae86182474ea9069dc8f69622e9eadb339cfa3a4dc554e
+SHA512 (MaraDNS-3.5.0037-fedora.tar.xz) = 0c099d651a656705f9336b5bf75ed41e87bd344b6a96a603d56d7acb6fdbf7cd0461d4b89a33b02dac8951ed72ba9d48c96df3f423327d099450c2f17e9e19cf