[gentoo-commits] repo/gentoo:master commit in: net-dns/maradns/files/, net-dns/maradns/

["Sam James" <sam@gentoo.org>]

commit:     0c153250617ed0d50f1ee4ac1e7aa53bad9e87af
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Sun Mar  3 04:43:21 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 05:51:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c153250

net-dns/maradns: fix totally broken patch

In commit 73937e86b92dcf813bf021a83451e2ae4dbc423c, a version bump was
applied, and a patch file in FILESDIR which was applied to the old
version was "rebased" against the new release and applied in-place for
both the old and new versions.

Result: stable ebuild does not compile because patch doesn't match.

Fixes: 73937e86b92dcf813bf021a83451e2ae4dbc423c
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-dns/maradns/files/maradns-3.5.0022-flags.patch | 23 +++++++++++++++-------
 ...22-flags.patch => maradns-3.5.0036-flags.patch} |  0
 net-dns/maradns/maradns-3.5.0036.ebuild            |  2 +-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/net-dns/maradns/files/maradns-3.5.0022-flags.patch b/net-dns/maradns/files/maradns-3.5.0022-flags.patch
index 923417538778..9f01795fd2bb 100644
--- a/net-dns/maradns/files/maradns-3.5.0022-flags.patch
+++ b/net-dns/maradns/files/maradns-3.5.0022-flags.patch
@@ -1,15 +1,23 @@
-Rebased on 2024-01-20, version 3.5.0036
-
 From 15470045421448a7a6813e2a4a96e18bba3b0aa4 Mon Sep 17 00:00:00 2001
 From: Victor Kustov <ktrace@yandex.ru>
 Date: Wed, 27 Jul 2022 21:28:31 +0300
 Subject: [PATCH] 2nd
 
+---
+ build/Makefile.linux | 32 ++++++++++++++++----------------
+ 1 file changed, 16 insertions(+), 16 deletions(-)
+
 diff --git a/build/Makefile.linux b/build/Makefile.linux
-index 9d8117e..22a7518 100644
+index 965c7fb..572dccc 100644
 --- a/build/Makefile.linux
 +++ b/build/Makefile.linux
-@@ -29,29 +29,27 @@ Q="DEFINES=-DSELECT_PROBLEM"
+@@ -24,32 +24,32 @@ EXECS=server/maradns
+ # end the Solaris section
+ # Non-Solaris version of "M"
+ V="VERSION=$(VERSION)"
+-Q="DEFINES=-DSELECT_PROBLEM"
++Q="$(LDFLAGS) DEFINES=-DSELECT_PROBLEM"
+ 
  # Debug
  
  FLAGS = -O2 -Wall -DSELECT_PROBLEM
@@ -26,9 +34,7 @@ index 9d8117e..22a7518 100644
 -	make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
 -	cd ../tools ; make $(M) ; \
 -	cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \
--	cd ../tools/blockhash ; make CFLAGS=-O2 ; \
--	cd ../../../coLunacyDNS/ ; make ; \
--	cd ../tcp ; make $(M) $(V) ; cat ../00README.FIRST
+-	cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST
 +	cd libs ; $(MAKE) $(M) ; cd ../dns ; $(MAKE) $(M) ; \
 +	cd ../rng ; $(MAKE) $(M) ; cd ../parse ; $(MAKE) $(M) ; \
 +	cd ../qual ; $(MAKE) $(M) ; cd ../server ; \
@@ -54,3 +60,6 @@ index 9d8117e..22a7518 100644
  
  clean:
  	rm -f $(OBJECTS) core $(EXECS) ; \
+-- 
+2.35.1
+

diff --git a/net-dns/maradns/files/maradns-3.5.0022-flags.patch b/net-dns/maradns/files/maradns-3.5.0036-flags.patch
similarity index 100%
copy from net-dns/maradns/files/maradns-3.5.0022-flags.patch
copy to net-dns/maradns/files/maradns-3.5.0036-flags.patch

diff --git a/net-dns/maradns/maradns-3.5.0036.ebuild b/net-dns/maradns/maradns-3.5.0036.ebuild
index 0eea6659b14e..fc926f30ad71 100644
--- a/net-dns/maradns/maradns-3.5.0036.ebuild
+++ b/net-dns/maradns/maradns-3.5.0036.ebuild
@@ -25,7 +25,7 @@ DEPEND="
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.5.0022-flags.patch
+	"${FILESDIR}"/${PN}-3.5.0036-flags.patch
 )
 
 src_configure() {