1 |
commit: 4fbf9f4effb630645e5d64809a24e376099f2c30 |
2 |
Author: ktrace@××××××.ru <ktrace <AT> yandex <DOT> ru> |
3 |
AuthorDate: Sun Jun 6 18:57:20 2021 +0000 |
4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jun 7 05:19:50 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fbf9f4e |
7 |
|
8 |
net-dns/maradns: version bump to 3.5.0020 and fixes |
9 |
|
10 |
- fix ipv6/noipv6 building Deadwood |
11 |
- still fixes compile flags |
12 |
- small change in doc's installing |
13 |
|
14 |
Package-Manager: Portage-3.0.18, Repoman-3.0.2 |
15 |
Signed-off-by: Victor Kustov <ktrace <AT> yandex.ru> |
16 |
Closes: https://github.com/gentoo/gentoo/pull/21060 |
17 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
18 |
|
19 |
net-dns/maradns/Manifest | 1 + |
20 |
.../files/maradns-3.5.0020-flags-ipv6.patch | 113 +++++++++++++++++++++ |
21 |
net-dns/maradns/maradns-3.5.0020.ebuild | 96 +++++++++++++++++ |
22 |
3 files changed, 210 insertions(+) |
23 |
|
24 |
diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest |
25 |
index 3dc055a4f47..0483ddcd84f 100644 |
26 |
--- a/net-dns/maradns/Manifest |
27 |
+++ b/net-dns/maradns/Manifest |
28 |
@@ -1 +1,2 @@ |
29 |
DIST maradns-3.5.0005.tar.xz 5351412 BLAKE2B c6b1c4fb93cb507045b3c09574d7ce30b0af92301e157216b4a5bbd2ed74ceb829ef4d11cd08048c7a685a09cdd4178cf3fc4e7b2465820d26d3a5c1b96f4a5e SHA512 2e7008ff6217929008292dde60d96eb2ec0499a170e1b5bda5fcfb27300d2ce6cecd8b3e2a2d4b09ff32b803f9f435230378e6b2e41e7b63c42653d8c931151d |
30 |
+DIST maradns-3.5.0020.tar.xz 7154452 BLAKE2B 4d193c06620332b90f4a004e787f9cbe61cd48adcee1dd667ecf0383c0fb81f5b7cae40ee953f077b2ccf060d7429863f741cf942c34c862d6c56092bc40600b SHA512 3478ccdc82d5be45826072f91c1b00c491f21f69bcce169cfeb3dfdd00e0012a9def884d711daa41ea18dce52e069dbb4c31e1e37ecda418565b5d8d6a0ea4d4 |
31 |
|
32 |
diff --git a/net-dns/maradns/files/maradns-3.5.0020-flags-ipv6.patch b/net-dns/maradns/files/maradns-3.5.0020-flags-ipv6.patch |
33 |
new file mode 100644 |
34 |
index 00000000000..4582dec4f56 |
35 |
--- /dev/null |
36 |
+++ b/net-dns/maradns/files/maradns-3.5.0020-flags-ipv6.patch |
37 |
@@ -0,0 +1,113 @@ |
38 |
+From 0a2159798edffdbc0fdba67b2ae4aeca118a2516 Mon Sep 17 00:00:00 2001 |
39 |
+From: Victor Kustov <ktrace@××××××.ru> |
40 |
+Date: Mon, 31 May 2021 22:47:55 +0300 |
41 |
+Subject: [PATCH] fix |
42 |
+ |
43 |
+--- |
44 |
+ build/Makefile.linux | 52 ++++++++++++++++++++++---------------------- |
45 |
+ configure | 4 ++-- |
46 |
+ 2 files changed, 28 insertions(+), 28 deletions(-) |
47 |
+ |
48 |
+diff --git a/build/Makefile.linux b/build/Makefile.linux |
49 |
+index 965c7fb..62c20b9 100644 |
50 |
+--- a/build/Makefile.linux |
51 |
++++ b/build/Makefile.linux |
52 |
+@@ -24,48 +24,48 @@ EXECS=server/maradns |
53 |
+ # end the Solaris section |
54 |
+ # Non-Solaris version of "M" |
55 |
+ V="VERSION=$(VERSION)" |
56 |
+-Q="DEFINES=-DSELECT_PROBLEM" |
57 |
++Q="$(LDFLAGS) DEFINES=-DSELECT_PROBLEM" |
58 |
+ |
59 |
+ # Debug |
60 |
+ |
61 |
+ FLAGS = -O2 -Wall -DSELECT_PROBLEM |
62 |
+-M="CC=$(CC) $(FLAGS)" |
63 |
+-D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS" |
64 |
++M="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)" |
65 |
++D="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DDEBUG -DTHREADS" |
66 |
+ #FLAGS = -g |
67 |
+ |
68 |
+ all: |
69 |
+- cd libs ; make $(M) ; cd ../dns ; make $(M) ; \ |
70 |
+- cd ../rng ; make $(M) ; cd ../parse ; make $(M) ; \ |
71 |
+- cd ../qual ; make $(M) ; cd ../server ; \ |
72 |
++ cd libs ; $(MAKE) $(M) ; cd ../dns ; $(MAKE) $(M) ; \ |
73 |
++ cd ../rng ; $(MAKE) $(M) ; cd ../parse ; $(MAKE) $(M) ; \ |
74 |
++ cd ../qual ; $(MAKE) $(M) ; cd ../server ; \ |
75 |
+ make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \ |
76 |
+- cd ../tools ; make $(M) ; \ |
77 |
+- cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \ |
78 |
+- cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST |
79 |
++ cd ../tools ; $(MAKE) $(M) ; \ |
80 |
++ cd ../deadwood-*/src/ ; $(MAKE) $(M) ; \ |
81 |
++ cd ../../tcp ; $(MAKE) $(M) $(V) ; cat ../00README.FIRST |
82 |
+ |
83 |
+ debug: |
84 |
+- cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \ |
85 |
+- cd ../dns ; make $(D) ; cd ../rng ; make $(D) ; \ |
86 |
+- cd ../parse ; make $(D) ; cd ../qual ; make $(D) ; \ |
87 |
++ cd libs ; $(MAKE) $(D) DEBUG="-DDEBUG -DTHREADS" ; \ |
88 |
++ cd ../dns ; $(MAKE) $(D) ; cd ../rng ; $(MAKE) $(D) ; \ |
89 |
++ cd ../parse ; $(MAKE) $(D) ; cd ../qual ; $(MAKE) $(D) ; \ |
90 |
+ cd ../server ; \ |
91 |
+ make $(D) $(Q) $(V) COMPILED=\"$(COMPILED_DEBUG)\" ; \ |
92 |
+- cd ../tools ; make $(D) ; \ |
93 |
+- cd ../tcp ; make $(D) $(V) ; cat ../00README.FIRST |
94 |
++ cd ../tools ; $(MAKE) $(D) ; \ |
95 |
++ cd ../tcp ; $(MAKE) $(D) $(V) ; cat ../00README.FIRST |
96 |
+ |
97 |
+ clean: |
98 |
+ rm -f $(OBJECTS) core $(EXECS) ; \ |
99 |
+- cp build/Makefile.w Makefile ; cd dns ; make clean ; \ |
100 |
+- cd ../libs ; make clean ; cd ../parse ; make clean ; \ |
101 |
+- cd ../qual ; make clean ; \ |
102 |
+- cd ../server ; make clean ; \ |
103 |
++ cp build/Makefile.w Makefile ; cd dns ; $(MAKE) clean ; \ |
104 |
++ cd ../libs ; $(MAKE) clean ; cd ../parse ; $(MAKE) clean ; \ |
105 |
++ cd ../qual ; $(MAKE) clean ; \ |
106 |
++ cd ../server ; $(MAKE) clean ; \ |
107 |
+ cp Makefile.recursive Makefile ; \ |
108 |
+- cd ../test ; make clean ; \ |
109 |
+- cd ../tools ; make clean ; \ |
110 |
+- cd misc ; make clean ; \ |
111 |
+- cd ../../utf8 ; make clean ; \ |
112 |
+- cd ../tcp ; make clean ; \ |
113 |
+- cd ../rng ; make clean ; \ |
114 |
+- cd ../sqa ; make clean ; \ |
115 |
+- cd ../deadwood-*/src ; make clean ; \ |
116 |
++ cd ../test ; $(MAKE) clean ; \ |
117 |
++ cd ../tools ; $(MAKE) clean ; \ |
118 |
++ cd misc ; $(MAKE) clean ; \ |
119 |
++ cd ../../utf8 ; $(MAKE) clean ; \ |
120 |
++ cd ../tcp ; $(MAKE) clean ; \ |
121 |
++ cd ../rng ; $(MAKE) clean ; \ |
122 |
++ cd ../sqa ; $(MAKE) clean ; \ |
123 |
++ cd ../deadwood-*/src ; $(MAKE) clean ; \ |
124 |
+ # ; cd .. ; find . -type d | grep .deps | xargs rm -fr ; find . -name '*.o' | xargs rm |
125 |
+ |
126 |
+ strip: |
127 |
+diff --git a/configure b/configure |
128 |
+index 9e98ac8..fedbd87 100755 |
129 |
+--- a/configure |
130 |
++++ b/configure |
131 |
+@@ -174,14 +174,14 @@ if [ -z "$IPV6" ] ; then |
132 |
+ cp tcp/Makefile.authonly tcp/Makefile |
133 |
+ cp dns/Makefile.authonly dns/Makefile |
134 |
+ cp tools/Makefile.authonly tools/Makefile |
135 |
++ DEADWOOD_DIR=$( echo deadwood-* ) |
136 |
++ cp $DEADWOOD_DIR/src/Makefile.noipv6 $DEADWOOD_DIR/src/Makefile |
137 |
+ else |
138 |
+ cp server/Makefile.ipv6 server/Makefile |
139 |
+ cp qual/Makefile.nothreads qual/Makefile |
140 |
+ cp tcp/Makefile.ipv6 tcp/Makefile |
141 |
+ cp dns/Makefile.authonly dns/Makefile |
142 |
+ cp tools/Makefile.ipv6 tools/Makefile |
143 |
+- DEADWOOD_DIR=$( echo deadwood-* ) |
144 |
+- cp $DEADWOOD_DIR/src/Makefile.ipv6 $DEADWOOD_DIR/src/Makefile |
145 |
+ fi |
146 |
+ |
147 |
+ echo |
148 |
+-- |
149 |
+2.26.3 |
150 |
+ |
151 |
|
152 |
diff --git a/net-dns/maradns/maradns-3.5.0020.ebuild b/net-dns/maradns/maradns-3.5.0020.ebuild |
153 |
new file mode 100644 |
154 |
index 00000000000..6bf474750b6 |
155 |
--- /dev/null |
156 |
+++ b/net-dns/maradns/maradns-3.5.0020.ebuild |
157 |
@@ -0,0 +1,96 @@ |
158 |
+# Copyright 1999-2021 Gentoo Authors |
159 |
+# Distributed under the terms of the GNU General Public License v2 |
160 |
+ |
161 |
+EAPI=7 |
162 |
+ |
163 |
+PYTHON_COMPAT=( python3_{7..10} ) |
164 |
+inherit python-any-r1 systemd toolchain-funcs |
165 |
+ |
166 |
+DESCRIPTION="A security-aware DNS server" |
167 |
+HOMEPAGE="https://maradns.samiam.org" |
168 |
+SRC_URI="https://maradns.samiam.org/download/${PV%.*}/${PV}/${P}.tar.xz" |
169 |
+ |
170 |
+# The GPL-2 covers the init script, bug 426018. |
171 |
+LICENSE="BSD-2 GPL-2" |
172 |
+SLOT="0" |
173 |
+KEYWORDS="~amd64 ~mips ~ppc ~x86" |
174 |
+IUSE="examples ipv6" |
175 |
+ |
176 |
+BDEPEND="${PYTHON_DEPS} |
177 |
+ dev-lang/perl" |
178 |
+DEPEND=" |
179 |
+ acct-group/maradns |
180 |
+ acct-user/duende |
181 |
+ acct-user/maradns" |
182 |
+RDEPEND="${DEPEND}" |
183 |
+ |
184 |
+PATCHES=( |
185 |
+ "${FILESDIR}"/${P}-flags-ipv6.patch |
186 |
+) |
187 |
+ |
188 |
+src_prepare() { |
189 |
+ default |
190 |
+ python_fix_shebang tools/bind2csv2.py |
191 |
+} |
192 |
+ |
193 |
+src_configure() { |
194 |
+ tc-export CC |
195 |
+ ./configure \ |
196 |
+ $(usex ipv6 --ipv6 "") || die "Failed to configure" |
197 |
+} |
198 |
+ |
199 |
+src_install() { |
200 |
+ # Install the MaraDNS and Deadwood binaries |
201 |
+ dosbin server/maradns |
202 |
+ dosbin tcp/zoneserver |
203 |
+ dosbin deadwood-${PV}/src/Deadwood |
204 |
+ dobin tcp/{getzone,fetchzone} |
205 |
+ dobin tools/{askmara,askmara-tcp,duende,bind2csv2.py,csv1tocsv2.pl} |
206 |
+ |
207 |
+ # MaraDNS docs, manpages, misc |
208 |
+ docompress -x /usr/share/doc/${PF}/maradns.gpg.key |
209 |
+ dodoc {CHANGELOG,COPYING,SUPPORT,maradns.gpg.key} |
210 |
+ dodoc doc/en/{QuickStart,faq.*,*.md,README} |
211 |
+ dodoc -r doc/en/{text,webpage,tutorial} |
212 |
+ docinto deadwood |
213 |
+ dodoc deadwood-${PV}/doc/{*.txt,*.html,CHANGELOG,Deadwood-HOWTO} |
214 |
+ dodoc -r deadwood-${PV}/doc/internals |
215 |
+ |
216 |
+ # Install examples (optional) |
217 |
+ if use examples ; then |
218 |
+ docinto examples |
219 |
+ dodoc doc/en/examples/example_* |
220 |
+ fi |
221 |
+ |
222 |
+ # Install manpages |
223 |
+ doman doc/en/man/*.[1-9] |
224 |
+ doman deadwood-${PV}/doc/{Deadwood,Duende}.1 |
225 |
+ |
226 |
+ # Example configurations. |
227 |
+ insinto /etc/maradns |
228 |
+ newins doc/en/examples/example_full_mararc mararc_full.dist |
229 |
+ newins doc/en/examples/example_csv2 example_csv2.dist |
230 |
+ newins deadwood-${PV}/doc/dwood3rc-all dwood3rc_all.dist |
231 |
+ keepdir /etc/maradns/logger |
232 |
+ |
233 |
+ # Init scripts. |
234 |
+ newinitd "${FILESDIR}"/maradns2 maradns |
235 |
+ newinitd "${FILESDIR}"/zoneserver2 zoneserver |
236 |
+ newinitd "${FILESDIR}"/deadwood deadwood |
237 |
+ |
238 |
+ # systemd unit |
239 |
+ # please keep paths in sync! |
240 |
+ sed -e "s^@bindir@^${EPREFIX}/usr/sbin^" \ |
241 |
+ -e "s^@sysconfdir@^${EPREFIX}/etc/maradns^" \ |
242 |
+ "${FILESDIR}"/maradns.service.in > "${T}"/maradns.service \ |
243 |
+ || die "failed to create the maradns.service file (sed)" |
244 |
+ |
245 |
+ systemd_dounit "${T}"/maradns.service |
246 |
+} |
247 |
+ |
248 |
+pkg_postinst() { |
249 |
+ elog "Examples of configuration files can be found in the" |
250 |
+ elog "/etc/maradns directory, feel free use it like:" |
251 |
+ elog " cp /etc/maradns/mararc{_full.dist,}" |
252 |
+ elog "and edit /etc/maradns/mararc as described in man mararc." |
253 |
+} |