From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1606695-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 6F550158041
for <garchives@archives.gentoo.org>; Sun, 3 Mar 2024 05:52:13 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id B3BC2E29AC;
Sun, 3 Mar 2024 05:52:12 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 95E31E29B2
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Mar 2024 05:52:12 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id A6DAA343021
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Mar 2024 05:52:11 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 257C7E95
for <gentoo-commits@lists.gentoo.org>; Sun, 3 Mar 2024 05:52:10 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1709445071.0c153250617ed0d50f1ee4ac1e7aa53bad9e87af.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/maradns/files/, net-dns/maradns/
X-VCS-Repository: repo/gentoo
X-VCS-Files: net-dns/maradns/files/maradns-3.5.0022-flags.patch net-dns/maradns/files/maradns-3.5.0036-flags.patch net-dns/maradns/maradns-3.5.0036.ebuild
X-VCS-Directories: net-dns/maradns/ net-dns/maradns/files/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 0c153250617ed0d50f1ee4ac1e7aa53bad9e87af
X-VCS-Branch: master
Date: Sun, 3 Mar 2024 05:52:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: a5c0d858-a47c-43c1-9314-ef63cc2a43b2
X-Archives-Hash: f8f1028e266abef50725495e46ebdd39
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() {