* [gentoo-commits] repo/gentoo:master commit in: net-dns/maradns/, net-dns/maradns/files/
@ 2016-04-28 23:44 Austin English
0 siblings, 0 replies; 4+ messages in thread
From: Austin English @ 2016-04-28 23:44 UTC (permalink / raw
To: gentoo-commits
commit: 70d311026cfc6e9fb80c19ffc063c712ed091f29
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 28 22:42:00 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Thu Apr 28 22:42:00 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70d31102
net-dns/maradns: use #!/sbin/openrc-run instead of #!/sbin/runscript
Gentoo-Bug: https://bugs.gentoo.org/573846
Package-Manager: portage-2.2.26
net-dns/maradns/files/deadwood | 4 +-
net-dns/maradns/files/maradns2 | 4 +-
net-dns/maradns/files/zoneserver2 | 4 +-
net-dns/maradns/maradns-2.0.09-r1.ebuild | 98 ++++++++++++++++++++++++++++++++
4 files changed, 104 insertions(+), 6 deletions(-)
diff --git a/net-dns/maradns/files/deadwood b/net-dns/maradns/files/deadwood
index d9e8175..69fe0a4 100644
--- a/net-dns/maradns/files/deadwood
+++ b/net-dns/maradns/files/deadwood
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/net-dns/maradns/files/maradns2 b/net-dns/maradns/files/maradns2
index cc6915f..a6fb9e4 100644
--- a/net-dns/maradns/files/maradns2
+++ b/net-dns/maradns/files/maradns2
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/net-dns/maradns/files/zoneserver2 b/net-dns/maradns/files/zoneserver2
index 6c6486d..b2abe26 100644
--- a/net-dns/maradns/files/zoneserver2
+++ b/net-dns/maradns/files/zoneserver2
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/net-dns/maradns/maradns-2.0.09-r1.ebuild b/net-dns/maradns/maradns-2.0.09-r1.ebuild
new file mode 100644
index 0000000..42c2d00
--- /dev/null
+++ b/net-dns/maradns/maradns-2.0.09-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils systemd toolchain-funcs user
+
+DEADWOOD_VER="3.2.05"
+
+DESCRIPTION="A security-aware DNS server"
+HOMEPAGE="http://www.maradns.org/"
+SRC_URI="http://www.maradns.org/download/${PV%.*}/${PV}/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="amd64 ~mips ppc x86"
+IUSE="authonly ipv6"
+
+DEPEND=""
+RDEPEND=""
+
+pkg_setup() {
+ ebegin "Creating group and users"
+ enewgroup maradns 99
+ enewuser duende 66 -1 -1 maradns
+ enewuser maradns 99 -1 -1 maradns
+ eend ${?}
+}
+
+src_prepare() {
+ # Apply some minor patches from Debian. Last one - from Gentoo
+ epatch "${FILESDIR}/${PN}-2.0.06-askmara-tcp.patch" \
+ "${FILESDIR}/${PN}-2.0.06-duende-man.patch" \
+ "${FILESDIR}/${P}-build.patch"
+ epatch_user
+}
+
+src_configure() {
+ # Use duende-ng.c.
+ cp "${S}/tools/duende-ng.c" "${S}/tools/duende.c" || die
+
+ tc-export CC
+ ./configure $(use ipv6 && echo "--ipv6") || die "Failed to configure ${PN}"
+}
+
+src_install() {
+ # Install the MaraDNS binaries.
+ dosbin server/maradns
+ dosbin tcp/zoneserver
+ dobin tcp/getzone tcp/fetchzone
+ dobin tools/askmara tools/askmara-tcp tools/duende
+ dobin tools/bind2csv2.py tools/csv1tocsv2.pl
+
+ # MaraDNS docs, manpages, misc.
+ dodoc doc/en/{QuickStart,README,*.txt}
+ dodoc doc/en/text/*.txt
+ doman doc/en/man/*.[1-9]
+ dodoc maradns.gpg.key
+ dohtml doc/en/*.html
+ dohtml -r doc/en/webpage
+ dohtml -r doc/en/tutorial
+ docinto examples
+ dodoc doc/en/examples/example_*
+
+ # Deadwood binary, docs, manpages, etc.
+ if ! use authonly; then
+ dosbin deadwood-${DEADWOOD_VER}/src/Deadwood
+ doman deadwood-${DEADWOOD_VER}/doc/{Deadwood,Duende}.1
+ docinto deadwood
+ dodoc deadwood-${DEADWOOD_VER}/doc/{Deadwood,Duende,FAQ}.txt
+ dohtml deadwood-${DEADWOOD_VER}/doc/{Deadwood,FAQ}.html
+ docinto deadwood/internals
+ dodoc deadwood-${DEADWOOD_VER}/doc/internals/*
+ insinto /etc/maradns
+ newins deadwood-${DEADWOOD_VER}/doc/dwood3rc-all dwood3rc_all.dist
+ fi
+
+ # Example configurations.
+ insinto /etc/maradns
+ newins doc/en/examples/example_full_mararc mararc_full.dist
+ newins doc/en/examples/example_csv2 example_csv2.dist
+ keepdir /etc/maradns/logger
+
+ # Init scripts.
+ newinitd "${FILESDIR}"/maradns2 maradns
+ newinitd "${FILESDIR}"/zoneserver2 zoneserver
+ if ! use authonly; then
+ newinitd "${FILESDIR}"/deadwood deadwood
+ fi
+
+ # systemd unit
+ # please keep paths in sync!
+ sed -e "s^@bindir@^${EPREFIX}/usr/sbin^" \
+ -e "s^@sysconfdir@^${EPREFIX}/etc/maradns^" \
+ "${FILESDIR}"/maradns.service.in > "${T}"/maradns.service
+ systemd_dounit "${T}"/maradns.service
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-dns/maradns/, net-dns/maradns/files/
@ 2021-06-07 5:34 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2021-06-07 5:34 UTC (permalink / raw
To: gentoo-commits
commit: 4fbf9f4effb630645e5d64809a24e376099f2c30
Author: ktrace@yandex.ru <ktrace <AT> yandex <DOT> ru>
AuthorDate: Sun Jun 6 18:57:20 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jun 7 05:19:50 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fbf9f4e
net-dns/maradns: version bump to 3.5.0020 and fixes
- fix ipv6/noipv6 building Deadwood
- still fixes compile flags
- small change in doc's installing
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Victor Kustov <ktrace <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/21060
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-dns/maradns/Manifest | 1 +
.../files/maradns-3.5.0020-flags-ipv6.patch | 113 +++++++++++++++++++++
net-dns/maradns/maradns-3.5.0020.ebuild | 96 +++++++++++++++++
3 files changed, 210 insertions(+)
diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest
index 3dc055a4f47..0483ddcd84f 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -1 +1,2 @@
DIST maradns-3.5.0005.tar.xz 5351412 BLAKE2B c6b1c4fb93cb507045b3c09574d7ce30b0af92301e157216b4a5bbd2ed74ceb829ef4d11cd08048c7a685a09cdd4178cf3fc4e7b2465820d26d3a5c1b96f4a5e SHA512 2e7008ff6217929008292dde60d96eb2ec0499a170e1b5bda5fcfb27300d2ce6cecd8b3e2a2d4b09ff32b803f9f435230378e6b2e41e7b63c42653d8c931151d
+DIST maradns-3.5.0020.tar.xz 7154452 BLAKE2B 4d193c06620332b90f4a004e787f9cbe61cd48adcee1dd667ecf0383c0fb81f5b7cae40ee953f077b2ccf060d7429863f741cf942c34c862d6c56092bc40600b SHA512 3478ccdc82d5be45826072f91c1b00c491f21f69bcce169cfeb3dfdd00e0012a9def884d711daa41ea18dce52e069dbb4c31e1e37ecda418565b5d8d6a0ea4d4
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
new file mode 100644
index 00000000000..4582dec4f56
--- /dev/null
+++ b/net-dns/maradns/files/maradns-3.5.0020-flags-ipv6.patch
@@ -0,0 +1,113 @@
+From 0a2159798edffdbc0fdba67b2ae4aeca118a2516 Mon Sep 17 00:00:00 2001
+From: Victor Kustov <ktrace@yandex.ru>
+Date: Mon, 31 May 2021 22:47:55 +0300
+Subject: [PATCH] fix
+
+---
+ build/Makefile.linux | 52 ++++++++++++++++++++++----------------------
+ configure | 4 ++--
+ 2 files changed, 28 insertions(+), 28 deletions(-)
+
+diff --git a/build/Makefile.linux b/build/Makefile.linux
+index 965c7fb..62c20b9 100644
+--- a/build/Makefile.linux
++++ b/build/Makefile.linux
+@@ -24,48 +24,48 @@ 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
+-M="CC=$(CC) $(FLAGS)"
+-D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS"
++M="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)"
++D="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DDEBUG -DTHREADS"
+ #FLAGS = -g
+
+ all:
+- cd libs ; make $(M) ; cd ../dns ; make $(M) ; \
+- cd ../rng ; make $(M) ; cd ../parse ; make $(M) ; \
+- cd ../qual ; make $(M) ; cd ../server ; \
++ cd libs ; $(MAKE) $(M) ; cd ../dns ; $(MAKE) $(M) ; \
++ cd ../rng ; $(MAKE) $(M) ; cd ../parse ; $(MAKE) $(M) ; \
++ cd ../qual ; $(MAKE) $(M) ; cd ../server ; \
+ make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
+- cd ../tools ; make $(M) ; \
+- cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \
+- cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST
++ cd ../tools ; $(MAKE) $(M) ; \
++ cd ../deadwood-*/src/ ; $(MAKE) $(M) ; \
++ cd ../../tcp ; $(MAKE) $(M) $(V) ; cat ../00README.FIRST
+
+ debug:
+- cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \
+- cd ../dns ; make $(D) ; cd ../rng ; make $(D) ; \
+- cd ../parse ; make $(D) ; cd ../qual ; make $(D) ; \
++ cd libs ; $(MAKE) $(D) DEBUG="-DDEBUG -DTHREADS" ; \
++ cd ../dns ; $(MAKE) $(D) ; cd ../rng ; $(MAKE) $(D) ; \
++ cd ../parse ; $(MAKE) $(D) ; cd ../qual ; $(MAKE) $(D) ; \
+ cd ../server ; \
+ make $(D) $(Q) $(V) COMPILED=\"$(COMPILED_DEBUG)\" ; \
+- cd ../tools ; make $(D) ; \
+- cd ../tcp ; make $(D) $(V) ; cat ../00README.FIRST
++ cd ../tools ; $(MAKE) $(D) ; \
++ cd ../tcp ; $(MAKE) $(D) $(V) ; cat ../00README.FIRST
+
+ clean:
+ rm -f $(OBJECTS) core $(EXECS) ; \
+- cp build/Makefile.w Makefile ; cd dns ; make clean ; \
+- cd ../libs ; make clean ; cd ../parse ; make clean ; \
+- cd ../qual ; make clean ; \
+- cd ../server ; make clean ; \
++ cp build/Makefile.w Makefile ; cd dns ; $(MAKE) clean ; \
++ cd ../libs ; $(MAKE) clean ; cd ../parse ; $(MAKE) clean ; \
++ cd ../qual ; $(MAKE) clean ; \
++ cd ../server ; $(MAKE) clean ; \
+ cp Makefile.recursive Makefile ; \
+- cd ../test ; make clean ; \
+- cd ../tools ; make clean ; \
+- cd misc ; make clean ; \
+- cd ../../utf8 ; make clean ; \
+- cd ../tcp ; make clean ; \
+- cd ../rng ; make clean ; \
+- cd ../sqa ; make clean ; \
+- cd ../deadwood-*/src ; make clean ; \
++ cd ../test ; $(MAKE) clean ; \
++ cd ../tools ; $(MAKE) clean ; \
++ cd misc ; $(MAKE) clean ; \
++ cd ../../utf8 ; $(MAKE) clean ; \
++ cd ../tcp ; $(MAKE) clean ; \
++ cd ../rng ; $(MAKE) clean ; \
++ cd ../sqa ; $(MAKE) clean ; \
++ cd ../deadwood-*/src ; $(MAKE) clean ; \
+ # ; cd .. ; find . -type d | grep .deps | xargs rm -fr ; find . -name '*.o' | xargs rm
+
+ strip:
+diff --git a/configure b/configure
+index 9e98ac8..fedbd87 100755
+--- a/configure
++++ b/configure
+@@ -174,14 +174,14 @@ if [ -z "$IPV6" ] ; then
+ cp tcp/Makefile.authonly tcp/Makefile
+ cp dns/Makefile.authonly dns/Makefile
+ cp tools/Makefile.authonly tools/Makefile
++ DEADWOOD_DIR=$( echo deadwood-* )
++ cp $DEADWOOD_DIR/src/Makefile.noipv6 $DEADWOOD_DIR/src/Makefile
+ else
+ cp server/Makefile.ipv6 server/Makefile
+ cp qual/Makefile.nothreads qual/Makefile
+ cp tcp/Makefile.ipv6 tcp/Makefile
+ cp dns/Makefile.authonly dns/Makefile
+ cp tools/Makefile.ipv6 tools/Makefile
+- DEADWOOD_DIR=$( echo deadwood-* )
+- cp $DEADWOOD_DIR/src/Makefile.ipv6 $DEADWOOD_DIR/src/Makefile
+ fi
+
+ echo
+--
+2.26.3
+
diff --git a/net-dns/maradns/maradns-3.5.0020.ebuild b/net-dns/maradns/maradns-3.5.0020.ebuild
new file mode 100644
index 00000000000..6bf474750b6
--- /dev/null
+++ b/net-dns/maradns/maradns-3.5.0020.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..10} )
+inherit python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="A security-aware DNS server"
+HOMEPAGE="https://maradns.samiam.org"
+SRC_URI="https://maradns.samiam.org/download/${PV%.*}/${PV}/${P}.tar.xz"
+
+# The GPL-2 covers the init script, bug 426018.
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+IUSE="examples ipv6"
+
+BDEPEND="${PYTHON_DEPS}
+ dev-lang/perl"
+DEPEND="
+ acct-group/maradns
+ acct-user/duende
+ acct-user/maradns"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-flags-ipv6.patch
+)
+
+src_prepare() {
+ default
+ python_fix_shebang tools/bind2csv2.py
+}
+
+src_configure() {
+ tc-export CC
+ ./configure \
+ $(usex ipv6 --ipv6 "") || die "Failed to configure"
+}
+
+src_install() {
+ # Install the MaraDNS and Deadwood binaries
+ dosbin server/maradns
+ dosbin tcp/zoneserver
+ dosbin deadwood-${PV}/src/Deadwood
+ dobin tcp/{getzone,fetchzone}
+ dobin tools/{askmara,askmara-tcp,duende,bind2csv2.py,csv1tocsv2.pl}
+
+ # MaraDNS docs, manpages, misc
+ docompress -x /usr/share/doc/${PF}/maradns.gpg.key
+ dodoc {CHANGELOG,COPYING,SUPPORT,maradns.gpg.key}
+ dodoc doc/en/{QuickStart,faq.*,*.md,README}
+ dodoc -r doc/en/{text,webpage,tutorial}
+ docinto deadwood
+ dodoc deadwood-${PV}/doc/{*.txt,*.html,CHANGELOG,Deadwood-HOWTO}
+ dodoc -r deadwood-${PV}/doc/internals
+
+ # Install examples (optional)
+ if use examples ; then
+ docinto examples
+ dodoc doc/en/examples/example_*
+ fi
+
+ # Install manpages
+ doman doc/en/man/*.[1-9]
+ doman deadwood-${PV}/doc/{Deadwood,Duende}.1
+
+ # Example configurations.
+ insinto /etc/maradns
+ newins doc/en/examples/example_full_mararc mararc_full.dist
+ newins doc/en/examples/example_csv2 example_csv2.dist
+ newins deadwood-${PV}/doc/dwood3rc-all dwood3rc_all.dist
+ keepdir /etc/maradns/logger
+
+ # Init scripts.
+ newinitd "${FILESDIR}"/maradns2 maradns
+ newinitd "${FILESDIR}"/zoneserver2 zoneserver
+ newinitd "${FILESDIR}"/deadwood deadwood
+
+ # systemd unit
+ # please keep paths in sync!
+ sed -e "s^@bindir@^${EPREFIX}/usr/sbin^" \
+ -e "s^@sysconfdir@^${EPREFIX}/etc/maradns^" \
+ "${FILESDIR}"/maradns.service.in > "${T}"/maradns.service \
+ || die "failed to create the maradns.service file (sed)"
+
+ systemd_dounit "${T}"/maradns.service
+}
+
+pkg_postinst() {
+ elog "Examples of configuration files can be found in the"
+ elog "/etc/maradns directory, feel free use it like:"
+ elog " cp /etc/maradns/mararc{_full.dist,}"
+ elog "and edit /etc/maradns/mararc as described in man mararc."
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-dns/maradns/, net-dns/maradns/files/
@ 2022-08-17 16:18 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2022-08-17 16:18 UTC (permalink / raw
To: gentoo-commits
commit: 5b43506ed9b31d9388b82b16375fa381f21aabde
Author: Victor Kustov <ktrace <AT> yandex <DOT> ru>
AuthorDate: Wed Jul 27 18:37:32 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 16:17:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b43506e
net-dns/maradns: bump version to 3.5.0022
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Victor Kustov <ktrace <AT> yandex.ru>
Closes: https://github.com/gentoo/gentoo/pull/26626
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-dns/maradns/Manifest | 1 +
net-dns/maradns/files/maradns-3.5.0022-flags.patch | 65 +++++++++++++++
net-dns/maradns/maradns-3.5.0022.ebuild | 96 ++++++++++++++++++++++
3 files changed, 162 insertions(+)
diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest
index 0483ddcd84fc..5cfeb8c3d3e1 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -1,2 +1,3 @@
DIST maradns-3.5.0005.tar.xz 5351412 BLAKE2B c6b1c4fb93cb507045b3c09574d7ce30b0af92301e157216b4a5bbd2ed74ceb829ef4d11cd08048c7a685a09cdd4178cf3fc4e7b2465820d26d3a5c1b96f4a5e SHA512 2e7008ff6217929008292dde60d96eb2ec0499a170e1b5bda5fcfb27300d2ce6cecd8b3e2a2d4b09ff32b803f9f435230378e6b2e41e7b63c42653d8c931151d
DIST maradns-3.5.0020.tar.xz 7154452 BLAKE2B 4d193c06620332b90f4a004e787f9cbe61cd48adcee1dd667ecf0383c0fb81f5b7cae40ee953f077b2ccf060d7429863f741cf942c34c862d6c56092bc40600b SHA512 3478ccdc82d5be45826072f91c1b00c491f21f69bcce169cfeb3dfdd00e0012a9def884d711daa41ea18dce52e069dbb4c31e1e37ecda418565b5d8d6a0ea4d4
+DIST maradns-3.5.0022.tar.xz 7375408 BLAKE2B d79fd800099f41e6395537b8a9d945820cd295c9a3be8bec0850b8c85df65a607b07c3a0949a6ed058d1155514836d5a72a3ab0512a4369a979b021c80159908 SHA512 0c4df5aac0a979a74f811c9ccd30e2708f6b21816d9d70b88bf31ac4a65175b46c3a53adf439e098c57aa9b79250c26a38c8cdf26e0ee52637092a184d852076
diff --git a/net-dns/maradns/files/maradns-3.5.0022-flags.patch b/net-dns/maradns/files/maradns-3.5.0022-flags.patch
new file mode 100644
index 000000000000..9f6b81addfca
--- /dev/null
+++ b/net-dns/maradns/files/maradns-3.5.0022-flags.patch
@@ -0,0 +1,65 @@
+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 965c7fb..572dccc 100644
+--- a/build/Makefile.linux
++++ b/build/Makefile.linux
+@@ -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
+-M="CC=$(CC) $(FLAGS)"
+-D="CC=$(CC) $(FLAGS) -DDEBUG -DTHREADS"
++M="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)"
++D="CC=$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -DDEBUG -DTHREADS"
+ #FLAGS = -g
+
+ all:
+- cd libs ; make $(M) ; cd ../dns ; make $(M) ; \
+- cd ../rng ; make $(M) ; cd ../parse ; make $(M) ; \
+- cd ../qual ; make $(M) ; cd ../server ; \
+- make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
+- cd ../tools ; make $(M) ; \
+- cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \
+- 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 ; \
++ $(MAKE) $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
++ cd ../tools ; $(MAKE) $(M) ; \
++ cd ../deadwood-*/src/ ; $(MAKE) FLAGS=-O2 ; \
++ cd ../../tcp ; $(MAKE) $(M) $(V) ; cat ../00README.FIRST
+
+ debug:
+- cd libs ; make $(D) DEBUG="-DDEBUG -DTHREADS" ; \
+- cd ../dns ; make $(D) ; cd ../rng ; make $(D) ; \
+- cd ../parse ; make $(D) ; cd ../qual ; make $(D) ; \
++ cd libs ; $(MAKE) $(D) DEBUG="-DDEBUG -DTHREADS" ; \
++ cd ../dns ; $(MAKE) $(D) ; cd ../rng ; $(MAKE) $(D) ; \
++ cd ../parse ; $(MAKE) $(D) ; cd ../qual ; $(MAKE) $(D) ; \
+ cd ../server ; \
+- make $(D) $(Q) $(V) COMPILED=\"$(COMPILED_DEBUG)\" ; \
+- cd ../tools ; make $(D) ; \
+- cd ../tcp ; make $(D) $(V) ; cat ../00README.FIRST
++ $(MAKE) $(D) $(Q) $(V) COMPILED=\"$(COMPILED_DEBUG)\" ; \
++ cd ../tools ; $(MAKE) $(D) ; \
++ cd ../tcp ; $(MAKE) $(D) $(V) ; cat ../00README.FIRST
+
+ clean:
+ rm -f $(OBJECTS) core $(EXECS) ; \
+--
+2.35.1
+
diff --git a/net-dns/maradns/maradns-3.5.0022.ebuild b/net-dns/maradns/maradns-3.5.0022.ebuild
new file mode 100644
index 000000000000..d956f23b3b13
--- /dev/null
+++ b/net-dns/maradns/maradns-3.5.0022.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="A security-aware DNS server"
+HOMEPAGE="https://maradns.samiam.org"
+SRC_URI="https://maradns.samiam.org/download/${PV%.*}/${PV}/${P}.tar.xz"
+
+# The GPL-2 covers the init script, bug 426018.
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+IUSE="examples ipv6"
+
+BDEPEND="${PYTHON_DEPS}
+ dev-lang/perl"
+DEPEND="
+ acct-group/maradns
+ acct-user/duende
+ acct-user/maradns"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-flags.patch
+)
+
+src_prepare() {
+ default
+ python_fix_shebang tools/bind2csv2.py
+}
+
+src_configure() {
+ tc-export CC
+ ./configure \
+ $(usex ipv6 --ipv6 "") || die "Failed to configure"
+}
+
+src_install() {
+ # Install the MaraDNS and Deadwood binaries
+ dosbin server/maradns
+ dosbin tcp/zoneserver
+ dosbin deadwood-${PV}/src/Deadwood
+ dobin tcp/{getzone,fetchzone}
+ dobin tools/{askmara,askmara-tcp,duende,bind2csv2.py,csv1tocsv2.pl}
+
+ # MaraDNS docs, manpages, misc
+ docompress -x /usr/share/doc/${PF}/maradns.gpg.key
+ dodoc {CHANGELOG.TXT,COPYING,SUPPORT,maradns.gpg.key}
+ dodoc doc/en/{QuickStart,faq.*,*.md,README}
+ dodoc -r doc/en/{text,webpage,tutorial}
+ docinto deadwood
+ dodoc deadwood-${PV}/doc/{*.txt,*.html,CHANGELOG,Deadwood-HOWTO}
+ dodoc -r deadwood-${PV}/doc/internals
+
+ # Install examples (optional)
+ if use examples ; then
+ docinto examples
+ dodoc doc/en/examples/example_*
+ fi
+
+ # Install manpages
+ doman doc/en/man/*.[1-9]
+ doman deadwood-${PV}/doc/{Deadwood,Duende}.1
+
+ # Example configurations.
+ insinto /etc/maradns
+ newins doc/en/examples/example_full_mararc mararc_full.dist
+ newins doc/en/examples/example_csv2 example_csv2.dist
+ newins deadwood-${PV}/doc/dwood3rc-all dwood3rc_all.dist
+ keepdir /etc/maradns/logger
+
+ # Init scripts.
+ newinitd "${FILESDIR}"/maradns2 maradns
+ newinitd "${FILESDIR}"/zoneserver2 zoneserver
+ newinitd "${FILESDIR}"/deadwood deadwood
+
+ # systemd unit
+ # please keep paths in sync!
+ sed -e "s^@bindir@^${EPREFIX}/usr/sbin^" \
+ -e "s^@sysconfdir@^${EPREFIX}/etc/maradns^" \
+ "${FILESDIR}"/maradns.service.in > "${T}"/maradns.service \
+ || die "failed to create the maradns.service file (sed)"
+
+ systemd_dounit "${T}"/maradns.service
+}
+
+pkg_postinst() {
+ elog "Examples of configuration files can be found in the"
+ elog "/etc/maradns directory, feel free use it like:"
+ elog " cp /etc/maradns/mararc{_full.dist,}"
+ elog "and edit /etc/maradns/mararc as described in man mararc."
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: net-dns/maradns/, net-dns/maradns/files/
@ 2024-02-09 13:47 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2024-02-09 13:47 UTC (permalink / raw
To: gentoo-commits
commit: 73937e86b92dcf813bf021a83451e2ae4dbc423c
Author: Christopher Fore <csfore <AT> posteo <DOT> net>
AuthorDate: Sat Jan 20 16:34:59 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Feb 9 13:47:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73937e86
net-dns/maradns: add 3.5.0036, security bump
Rebased patch, removed fix_shebang due to the tool no longer being
present.
Bug: https://bugs.gentoo.org/906113
Signed-off-by: Christopher Fore <csfore <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/34684
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-dns/maradns/Manifest | 1 +
net-dns/maradns/files/maradns-3.5.0022-flags.patch | 23 ++----
net-dns/maradns/maradns-3.5.0036.ebuild | 89 ++++++++++++++++++++++
3 files changed, 97 insertions(+), 16 deletions(-)
diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest
index c1df5641ee34..4c2bb6642f78 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -1 +1,2 @@
DIST maradns-3.5.0022.tar.xz 7375408 BLAKE2B d79fd800099f41e6395537b8a9d945820cd295c9a3be8bec0850b8c85df65a607b07c3a0949a6ed058d1155514836d5a72a3ab0512a4369a979b021c80159908 SHA512 0c4df5aac0a979a74f811c9ccd30e2708f6b21816d9d70b88bf31ac4a65175b46c3a53adf439e098c57aa9b79250c26a38c8cdf26e0ee52637092a184d852076
+DIST maradns-3.5.0036.tar.xz 9192932 BLAKE2B 43d2f84b937a176b794aff68fc4fe73b5aada96df27ebf16dde04be1b7883ff5a95a07b5ce37dc65b305979e1b4379d5b540e59f917bbf1518d4f909bab717a1 SHA512 0d8248ad858064aec162a1d4bbdcf48eca39e07403b243a318c6512e4fee57429c6aa216e434cb0cb6ae86182474ea9069dc8f69622e9eadb339cfa3a4dc554e
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 9f01795fd2bb..923417538778 100644
--- a/net-dns/maradns/files/maradns-3.5.0022-flags.patch
+++ b/net-dns/maradns/files/maradns-3.5.0022-flags.patch
@@ -1,23 +1,15 @@
+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 965c7fb..572dccc 100644
+index 9d8117e..22a7518 100644
--- a/build/Makefile.linux
+++ b/build/Makefile.linux
-@@ -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"
-
+@@ -29,29 +29,27 @@ Q="DEFINES=-DSELECT_PROBLEM"
# Debug
FLAGS = -O2 -Wall -DSELECT_PROBLEM
@@ -34,7 +26,9 @@ index 965c7fb..572dccc 100644
- make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
- cd ../tools ; make $(M) ; \
- cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \
-- cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST
+- cd ../tools/blockhash ; make CFLAGS=-O2 ; \
+- cd ../../../coLunacyDNS/ ; make ; \
+- 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 ; \
@@ -60,6 +54,3 @@ index 965c7fb..572dccc 100644
clean:
rm -f $(OBJECTS) core $(EXECS) ; \
---
-2.35.1
-
diff --git a/net-dns/maradns/maradns-3.5.0036.ebuild b/net-dns/maradns/maradns-3.5.0036.ebuild
new file mode 100644
index 000000000000..e97fe9dd8692
--- /dev/null
+++ b/net-dns/maradns/maradns-3.5.0036.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+inherit python-any-r1 systemd toolchain-funcs
+
+DESCRIPTION="A security-aware DNS server"
+HOMEPAGE="https://maradns.samiam.org"
+SRC_URI="https://maradns.samiam.org/download/${PV%.*}/${PV}/${P}.tar.xz"
+
+# The GPL-2 covers the init script, bug 426018.
+LICENSE="BSD-2 GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~ppc ~x86"
+IUSE="examples"
+
+BDEPEND="${PYTHON_DEPS}
+ dev-lang/perl"
+DEPEND="
+ acct-group/maradns
+ acct-user/duende
+ acct-user/maradns"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.5.0022-flags.patch
+)
+
+src_configure() {
+ tc-export CC
+ ./configure --ipv6 || die "Failed to configure"
+}
+
+src_install() {
+ # Install the MaraDNS and Deadwood binaries
+ dosbin server/maradns
+ dosbin tcp/zoneserver
+ dosbin deadwood-${PV}/src/Deadwood
+ dobin tcp/{getzone,fetchzone}
+ dobin tools/{askmara,askmara-tcp,duende}
+
+ # MaraDNS docs, manpages, misc
+ docompress -x /usr/share/doc/${PF}/maradns.gpg.key
+ dodoc {CHANGELOG.TXT,COPYING,maradns.gpg.key}
+ dodoc doc/en/{QuickStart,faq.*,*.md,README}
+ dodoc -r doc/en/{text,tutorial}
+ docinto deadwood
+ dodoc deadwood-${PV}/doc/{*.txt,*.html,CHANGELOG,Deadwood-HOWTO}
+ dodoc -r deadwood-${PV}/doc/internals
+
+ # Install examples (optional)
+ if use examples ; then
+ docinto examples
+ dodoc doc/en/examples/example_*
+ fi
+
+ # Install manpages
+ doman doc/en/man/*.[1-9]
+
+ # Example configurations.
+ insinto /etc/maradns
+ newins doc/en/examples/example_full_mararc mararc_full.dist
+ newins doc/en/examples/example_csv2 example_csv2.dist
+ newins deadwood-${PV}/doc/dwood3rc-all dwood3rc_all.dist
+ keepdir /etc/maradns/logger
+
+ # Init scripts.
+ newinitd "${FILESDIR}"/maradns2 maradns
+ newinitd "${FILESDIR}"/zoneserver2 zoneserver
+ newinitd "${FILESDIR}"/deadwood deadwood
+
+ # systemd unit
+ # please keep paths in sync!
+ sed -e "s^@bindir@^${EPREFIX}/usr/sbin^" \
+ -e "s^@sysconfdir@^${EPREFIX}/etc/maradns^" \
+ "${FILESDIR}"/maradns.service.in > "${T}"/maradns.service \
+ || die "failed to create the maradns.service file (sed)"
+
+ systemd_dounit "${T}"/maradns.service
+}
+
+pkg_postinst() {
+ elog "Examples of configuration files can be found in the"
+ elog "/etc/maradns directory, feel free use it like:"
+ elog " cp /etc/maradns/mararc{_full.dist,}"
+ elog "and edit /etc/maradns/mararc as described in man mararc."
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-02-09 13:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-04-28 23:44 [gentoo-commits] repo/gentoo:master commit in: net-dns/maradns/, net-dns/maradns/files/ Austin English
-- strict thread matches above, loose matches on Subject: below --
2021-06-07 5:34 Joonas Niilola
2022-08-17 16:18 Joonas Niilola
2024-02-09 13:47 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox