From b2c59335bfbeb25c5644f32172e1e9b23c447710 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 22 Dec 2022 01:55:45 +0000 Subject: gentoo auto-resync : 22:12:2022 - 01:55:45 --- net-dns/maradns/Manifest | 6 -- net-dns/maradns/files/maradns-3.5.0005-flags.patch | 28 ----- .../files/maradns-3.5.0020-flags-ipv6.patch | 113 --------------------- net-dns/maradns/maradns-3.5.0005.ebuild | 93 ----------------- net-dns/maradns/maradns-3.5.0020.ebuild | 96 ----------------- 5 files changed, 336 deletions(-) delete mode 100644 net-dns/maradns/files/maradns-3.5.0005-flags.patch delete mode 100644 net-dns/maradns/files/maradns-3.5.0020-flags-ipv6.patch delete mode 100644 net-dns/maradns/maradns-3.5.0005.ebuild delete mode 100644 net-dns/maradns/maradns-3.5.0020.ebuild (limited to 'net-dns/maradns') diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest index 911ee6435103..d825479d2412 100644 --- a/net-dns/maradns/Manifest +++ b/net-dns/maradns/Manifest @@ -1,14 +1,8 @@ AUX deadwood 475 BLAKE2B 1f5f669b22011bf38e077d21278ebfbff72ba45782b863044d868f3a46256192fa1041db8ee6fe5ff5ac15285caacceb8222d2fb1dce1c617c41baea1da7fe15 SHA512 ea01c5cd9494a9dd5c8146f0de84c6bd4df3ba2221b52b87886892cbc13aad21f273ea1d056c3dd88ae5e15c1f6f820f9fe4b1dd4c9ae7082d7f7f78b3f8813e -AUX maradns-3.5.0005-flags.patch 793 BLAKE2B 65a6cf4e0b77e19431e9c243bbb9a790ffbe064a66bf20747779c5401ba6e47b4b6cf21a73843ca8e259f296e5d2fca70dcd801fd45b3d3e2b7e784e9557cf24 SHA512 940b18ebfbcd7b8b83e505dd9e597599febd0ffb9c1b8d1e6bdc5749031c53e514467a9d62fd7d6e02d99d4226e09c87cc8124e5fb19a5c735dac25f99d4bfb5 -AUX maradns-3.5.0020-flags-ipv6.patch 3899 BLAKE2B 9a4bcca0f453b85a6f8c2fa2ce1731a6c454be01a39818eeaec0d06fa5e95d8a3f4b8e52262fc9ee4b45c7fd24231fc501cf9ff4327c9aadfefd1346f9a285ea SHA512 2d50ce4e0678f7303a7b48e31b0b175b494ef0ebf4ad623ff934f33d631a245663970b98df08f2ff68cb6a86a660cc47f9e4d0b55cd5cccacb1c18c66a75ac9d AUX maradns-3.5.0022-flags.patch 2224 BLAKE2B f8c028021ed9f98cf0b4dcc3ea75b914266424376816ea2d2cc1fd6c626272126f053dd9517f306af2c0207fa87ebbf8191baef9d24db59c1e2944270493e0ab SHA512 2d19346ce9dcc2023456644987620ed7b401d7789421f88e6b7895cdfe2324617b1832bb958f1e63b9e4808c4166a8bee78ee747321d123b602a26c544b58a0f AUX maradns.service.in 159 BLAKE2B 2ecd43d92a6c804fd713c0e1e22a18049ab410ccb0b92ec9ffe7621605e1dfea65c880369d0530e59cf061f6fb402cd83175f38be27b43d82b65a7175434e648 SHA512 0de3b9141b8266cb6443b8a7fcb6243782059d2ea45b89421158ded607413eb491542c279f2a9b4455e9396e6ba20e46aed8f46eba3b04e5bd428f335c4b9582 AUX maradns2 481 BLAKE2B 486711875cc3ad29066cbe52d16fb29c6ba35473ec0ffe63fb8039e208e90009900faf8f93c9c43ae80fe0b618202b2aff5cd2302af253a4d38d7d6486c8bc05 SHA512 e893020a934c5927b772189c034469055cd0d8a8ab3e066fe063e30999be6a6679e7b95c2761dec1326cec37fe5261541fbb27e9be796681764c75252b10e90b AUX zoneserver2 483 BLAKE2B fcae510c7d5719df0b018976052fb0b6ccb3af1324b607ccfb93a3e5d822d1ee5460424f2b05e1f2b3f09f7d445242f58f55abbc5ba88adeb25861c3eae29e90 SHA512 dc5dd43b043417002fce4c3d6c2e5417bc68fae7a0ac4db03f7cb382d348ed6b2c7042c38ffc2db3a4c36abf734e9d34124042a4077090bd7947241aab955ab7 -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 -EBUILD maradns-3.5.0005.ebuild 2410 BLAKE2B a6703a7856b9344dfa5c17df257f8cdcf46013498c2acfb46a02bf2d2923692e9d9b9288b7ba3d15fe77a8fdd67ba444fc3283e3e43f01c97fff82a971fd928e SHA512 d09cddab2a6e4af7cdfbd48ce99b16a1759baf34c85376fd3ed16629c545abfa353eb95a074ce73f8af44ef8ed631daa128b3bc23bcb9b4ed39afec9bc0f86d6 -EBUILD maradns-3.5.0020.ebuild 2576 BLAKE2B ca97afffa1ec6db0af09d78e9e5574037a360b8d4b1914a939a48d0daec36ee86ddaeadb8cd4fb59721750f1749f38ba0faf6e61ac1d1047d7d74757745ad566 SHA512 73a2fd092e379ebde7c670c172aa369dfbd75d4ae401f064ee9dac802b38eca60dde7fdac6006f4ae38a8a48ad8cf5f7474d3796b749cf69ae95768e887d4d44 EBUILD maradns-3.5.0022.ebuild 2575 BLAKE2B be21518613aec11241b9e8747a74abea326272b50f225f78eed60603d7da69f152d3bf49f77e8b48fb9df89585beccf07f689d03094af69c31d56dbf77df1af0 SHA512 59f9b3e7bf5eeee30d61f185c14cae3446f6216a12af4ea10fbae3a644baf82f76e88e70bf15f846bc8d84eb6d40f3472f2f3416ac6cb2521a283d94d3a1e6fa MISC metadata.xml 262 BLAKE2B c06e19c824b3a1235a60dd441b0443e2bd2880c90d531b7775402b1f89a89347127b4ee72d7d114f93a2ded7bc0dde81c61cd16e5eb38923ea3d13565598e3df SHA512 a6cf0c235960afadbf8e447a7f7c07c0fa2f713334ad7019e237885df34c0027a62bf3bed1f9600e8d1a4be1366686f6ae65ac3b113f0328e3d628a6eabb7f71 diff --git a/net-dns/maradns/files/maradns-3.5.0005-flags.patch b/net-dns/maradns/files/maradns-3.5.0005-flags.patch deleted file mode 100644 index 66493632df0a..000000000000 --- a/net-dns/maradns/files/maradns-3.5.0005-flags.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/build/Makefile.linux -+++ b/build/Makefile.linux -@@ -24,13 +24,13 @@ 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: -@@ -39,7 +39,7 @@ all: - cd ../qual ; make $(M) ; cd ../server ; \ - make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \ - cd ../tools ; make $(M) ; \ -- cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \ -+ cd ../deadwood-*/src/ ; $(MAKE) $(M) ; \ - cd ../../tcp ; make $(M) $(V) ; cat ../00README.FIRST - - debug: 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 deleted file mode 100644 index 4582dec4f56a..000000000000 --- a/net-dns/maradns/files/maradns-3.5.0020-flags-ipv6.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 0a2159798edffdbc0fdba67b2ae4aeca118a2516 Mon Sep 17 00:00:00 2001 -From: Victor Kustov -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.0005.ebuild b/net-dns/maradns/maradns-3.5.0005.ebuild deleted file mode 100644 index 0b520db460fc..000000000000 --- a/net-dns/maradns/maradns-3.5.0005.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -inherit python-any-r1 systemd toolchain-funcs - -DESCRIPTION="A security-aware DNS server" -HOMEPAGE="http://www.maradns.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 - - # replace "make" by "$(MAKE)" to avoid GNU Make warning - sed -i 's/\ make\ /\ \$\(MAKE\)\ /g' build/Makefile.linux \ - || die "can't patch build/Makefile.linux" - - python_fix_shebang tools/bind2csv2.py -} - -src_configure() { - tc-export CC - ./configure \ - $(usex ipv6 --ipv6 "") || die "Failed to configure ${PN}" -} - -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 - dodoc doc/en/{QuickStart,README,*.txt,*.html} - dodoc -r doc/en/{text,webpage,tutorial} - dodoc maradns.gpg.key - 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 -} diff --git a/net-dns/maradns/maradns-3.5.0020.ebuild b/net-dns/maradns/maradns-3.5.0020.ebuild deleted file mode 100644 index baedba8f5473..000000000000 --- a/net-dns/maradns/maradns-3.5.0020.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2022 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." -} -- cgit v1.2.3