commit: 7e2c9c614fcadd30aa336d7a413fd7119f72c097 Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org> AuthorDate: Thu Jan 2 12:01:39 2025 +0000 Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org> CommitDate: Thu Jan 2 12:14:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e2c9c61
net-dns/maradns: drop 3.5.0022 Bug: https://bugs.gentoo.org/906113 Signed-off-by: Petr Vaněk <arkamar <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 | 99 ---------------------- 3 files changed, 165 deletions(-) diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest index 4c2bb6642f78..205a44bd8456 100644 --- a/net-dns/maradns/Manifest +++ b/net-dns/maradns/Manifest @@ -1,2 +1 @@ -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 deleted file mode 100644 index 9f01795fd2bb..000000000000 --- a/net-dns/maradns/files/maradns-3.5.0022-flags.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 15470045421448a7a6813e2a4a96e18bba3b0aa4 Mon Sep 17 00:00:00 2001 -From: Victor Kustov <[email protected]> -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) $(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) ; \ -+ 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 deleted file mode 100644 index 4492b31c472c..000000000000 --- a/net-dns/maradns/maradns-3.5.0022.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..11} ) -inherit flag-o-matic 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" -RDEPEND=" - acct-group/maradns - acct-user/duende - acct-user/maradns" - -PATCHES=( - "${FILESDIR}"/${P}-flags.patch -) - -src_prepare() { - default - python_fix_shebang tools/bind2csv2.py -} - -src_configure() { - # -Werror=lto-type-mismatch - # https://bugs.gentoo.org/861293 - # https://github.com/samboy/MaraDNS/discussions/124 - filter-lto - - 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,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." -}
