Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/maradns/files/, net-dns/maradns/
Date: Tue, 04 May 2021 22:18:02
Message-Id: 1620166630.6f91d81f5e55ca9b74942e1808173c111c69dbf9.sam@gentoo
1 commit: 6f91d81f5e55ca9b74942e1808173c111c69dbf9
2 Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
3 AuthorDate: Thu Apr 29 23:41:46 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Tue May 4 22:17:10 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f91d81f
7
8 net-dns/maradns: Respect CFLAGS/LDFLAGS
9
10 Closes: https://bugs.gentoo.org/724942
11 Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
12 Signed-off-by: Sam James <sam <AT> gentoo.org>
13
14 net-dns/maradns/files/maradns-3.5.0005-flags.patch | 28 ++++++++++++++++++++++
15 net-dns/maradns/maradns-3.5.0005.ebuild | 21 +++++++++-------
16 2 files changed, 41 insertions(+), 8 deletions(-)
17
18 diff --git a/net-dns/maradns/files/maradns-3.5.0005-flags.patch b/net-dns/maradns/files/maradns-3.5.0005-flags.patch
19 new file mode 100644
20 index 00000000000..66493632df0
21 --- /dev/null
22 +++ b/net-dns/maradns/files/maradns-3.5.0005-flags.patch
23 @@ -0,0 +1,28 @@
24 +--- a/build/Makefile.linux
25 ++++ b/build/Makefile.linux
26 +@@ -24,13 +24,13 @@ EXECS=server/maradns
27 + # end the Solaris section
28 + # Non-Solaris version of "M"
29 + V="VERSION=$(VERSION)"
30 +-Q="DEFINES=-DSELECT_PROBLEM"
31 ++Q="$(LDFLAGS) DEFINES=-DSELECT_PROBLEM"
32 +
33 + # Debug
34 +
35 + FLAGS = -O2 -Wall -DSELECT_PROBLEM
36 +-M="CC=$(CC) $(FLAGS)"
37 +-D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS"
38 ++M="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)"
39 ++D="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DDEBUG -DTHREADS"
40 + #FLAGS = -g
41 +
42 + all:
43 +@@ -39,7 +39,7 @@ all:
44 + cd ../qual ; make $(M) ; cd ../server ; \
45 + make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
46 + cd ../tools ; make $(M) ; \
47 +- cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \
48 ++ cd ../deadwood-*/src/ ; $(MAKE) $(M) ; \
49 + cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST
50 +
51 + debug:
52
53 diff --git a/net-dns/maradns/maradns-3.5.0005.ebuild b/net-dns/maradns/maradns-3.5.0005.ebuild
54 index dc945dfceb0..13c34daf206 100644
55 --- a/net-dns/maradns/maradns-3.5.0005.ebuild
56 +++ b/net-dns/maradns/maradns-3.5.0005.ebuild
57 @@ -1,11 +1,10 @@
58 -# Copyright 1999-2020 Gentoo Authors
59 +# Copyright 1999-2021 Gentoo Authors
60 # Distributed under the terms of the GNU General Public License v2
61
62 EAPI=7
63
64 PYTHON_COMPAT=( python3_{7,8} )
65 -
66 -inherit systemd toolchain-funcs python-any-r1
67 +inherit python-any-r1 systemd toolchain-funcs
68
69 DESCRIPTION="A security-aware DNS server"
70 HOMEPAGE="http://www.maradns.org/"
71 @@ -17,12 +16,17 @@ SLOT="0"
72 KEYWORDS="amd64 ~mips ~ppc x86"
73 IUSE="examples ipv6"
74
75 -DEPEND="${PYTHON_DEPS}"
76 -RDEPEND="${DEPEND}
77 - acct-user/maradns
78 +BDEPEND="${PYTHON_DEPS}
79 + dev-lang/perl"
80 +DEPEND="
81 acct-group/maradns
82 acct-user/duende
83 - dev-lang/perl"
84 + acct-user/maradns"
85 +RDEPEND="${DEPEND}"
86 +
87 +PATCHES=(
88 + "${FILESDIR}"/${P}-flags.patch
89 +)
90
91 src_prepare() {
92 default
93 @@ -36,7 +40,8 @@ src_prepare() {
94
95 src_configure() {
96 tc-export CC
97 - ./configure $(use ipv6 && echo "--ipv6") || die "Failed to configure ${PN}"
98 + ./configure \
99 + $(usex ipv6 --ipv6 "") || die "Failed to configure ${PN}"
100 }
101
102 src_install() {