public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Tomasz Torcz <tomek@pipebreaker.pl>
To: git-commits@fedoraproject.org
Subject: [rpms/maradns] f44: update to 3.5.0037
Date: Mon, 22 Jun 2026 12:42:35 GMT [thread overview]
Message-ID: <178213215529.1.15026205740005421009.rpms-maradns-a7f2e8be70ae@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/maradns
Branch : f44
Commit : a7f2e8be70aed98ded27aae4b7cc1b582f44072e
Author : Tomasz Torcz <tomek@pipebreaker.pl>
Date : 2026-06-22T14:42:08+02:00
Stats : +16/-112 in 4 file(s)
URL : https://src.fedoraproject.org/rpms/maradns/c/a7f2e8be70aed98ded27aae4b7cc1b582f44072e?branch=f44
Log:
update to 3.5.0037
---
diff --git a/.gitignore b/.gitignore
index 75c2423..ca6aad1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/maradns-3.5.0024.tar.xz
/maradns-3.5.0030.tar.xz
/maradns-3.5.0036.tar.xz
+/maradns-3.5.0037.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..61f67fb 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
# 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,7 +26,7 @@ essential internet service. MaraDNS has the following advantages:
* Open Source.
%prep
-%setup -q
+%setup -q -n MaraDNS
%autopatch -p1
# Create a sysusers.d config file
@@ -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 22 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..a1bc907 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (maradns-3.5.0036.tar.xz) = 0d8248ad858064aec162a1d4bbdcf48eca39e07403b243a318c6512e4fee57429c6aa216e434cb0cb6ae86182474ea9069dc8f69622e9eadb339cfa3a4dc554e
+SHA512 (maradns-3.5.0037.tar.xz) = 4d4dcb8f67858841d7dca5f845a3fa72ad35ceb92f34e519fe4c095631588c4bcb9cf309bdd9b3df69b7b4dd06ef1370a900cfd55acc7e30d8cff75c85e88815
reply other threads:[~2026-06-22 12:42 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=178213215529.1.15026205740005421009.rpms-maradns-a7f2e8be70ae@fedoraproject.org \
--to=tomek@pipebreaker.pl \
--cc=git-commits@fedoraproject.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