summaryrefslogtreecommitdiff
path: root/net-dns/maradns
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2024-03-03 11:42:33 +0000
committerV3n3RiX <venerix@koprulu.sector>2024-03-03 11:42:33 +0000
commit194313a653d5ba077627c85051de73377b95672a (patch)
treea8e4035e62460399fba9a328b2343275148a426e /net-dns/maradns
parentf1801aa7be2329c07c4c2bd7522e03522b34c437 (diff)
gentoo auto-resync : 03:03:2024 - 11:42:33
Diffstat (limited to 'net-dns/maradns')
-rw-r--r--net-dns/maradns/Manifest7
-rw-r--r--net-dns/maradns/files/maradns-3.5.0022-flags.patch23
-rw-r--r--net-dns/maradns/files/maradns-3.5.0036-flags.patch56
-rw-r--r--net-dns/maradns/maradns-3.5.0022.ebuild12
-rw-r--r--net-dns/maradns/maradns-3.5.0036.ebuild14
5 files changed, 94 insertions, 18 deletions
diff --git a/net-dns/maradns/Manifest b/net-dns/maradns/Manifest
index b3717c57b803..e3f6c7cd388b 100644
--- a/net-dns/maradns/Manifest
+++ b/net-dns/maradns/Manifest
@@ -1,10 +1,11 @@
AUX deadwood 475 BLAKE2B 1f5f669b22011bf38e077d21278ebfbff72ba45782b863044d868f3a46256192fa1041db8ee6fe5ff5ac15285caacceb8222d2fb1dce1c617c41baea1da7fe15 SHA512 ea01c5cd9494a9dd5c8146f0de84c6bd4df3ba2221b52b87886892cbc13aad21f273ea1d056c3dd88ae5e15c1f6f820f9fe4b1dd4c9ae7082d7f7f78b3f8813e
-AUX maradns-3.5.0022-flags.patch 2072 BLAKE2B b5cfeee76edb2045d8bd346fc6f8403632298e001dcd62036375a8f47e0a0c3aaeef870a47b0a60b4f26b5b86f5baf56e80fb87bc7dd8fe42a233480b92c1774 SHA512 bf762a7cb7a2f0bdc7d9c32a2a9fb7ea78309e0d4ad6f74b77a83720230e6fdfe60c94d64f440f136281dd0dcccd12fa4775a5ceabddaa1cb0057fcfe313ad36
+AUX maradns-3.5.0022-flags.patch 2224 BLAKE2B f8c028021ed9f98cf0b4dcc3ea75b914266424376816ea2d2cc1fd6c626272126f053dd9517f306af2c0207fa87ebbf8191baef9d24db59c1e2944270493e0ab SHA512 2d19346ce9dcc2023456644987620ed7b401d7789421f88e6b7895cdfe2324617b1832bb958f1e63b9e4808c4166a8bee78ee747321d123b602a26c544b58a0f
+AUX maradns-3.5.0036-flags.patch 2072 BLAKE2B b5cfeee76edb2045d8bd346fc6f8403632298e001dcd62036375a8f47e0a0c3aaeef870a47b0a60b4f26b5b86f5baf56e80fb87bc7dd8fe42a233480b92c1774 SHA512 bf762a7cb7a2f0bdc7d9c32a2a9fb7ea78309e0d4ad6f74b77a83720230e6fdfe60c94d64f440f136281dd0dcccd12fa4775a5ceabddaa1cb0057fcfe313ad36
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.0022.tar.xz 7375408 BLAKE2B d79fd800099f41e6395537b8a9d945820cd295c9a3be8bec0850b8c85df65a607b07c3a0949a6ed058d1155514836d5a72a3ab0512a4369a979b021c80159908 SHA512 0c4df5aac0a979a74f811c9ccd30e2708f6b21816d9d70b88bf31ac4a65175b46c3a53adf439e098c57aa9b79250c26a38c8cdf26e0ee52637092a184d852076
DIST maradns-3.5.0036.tar.xz 9192932 BLAKE2B 43d2f84b937a176b794aff68fc4fe73b5aada96df27ebf16dde04be1b7883ff5a95a07b5ce37dc65b305979e1b4379d5b540e59f917bbf1518d4f909bab717a1 SHA512 0d8248ad858064aec162a1d4bbdcf48eca39e07403b243a318c6512e4fee57429c6aa216e434cb0cb6ae86182474ea9069dc8f69622e9eadb339cfa3a4dc554e
-EBUILD maradns-3.5.0022.ebuild 2551 BLAKE2B 60fceb37d799b82c0b2ddbaff8816cd9ad860da9e2216e66a253ddefb3dc0494d11d3e4792e430ef6c1ed46002116e5bd0dedc02204f06bed7a5f3ccc1e1a11c SHA512 5896c58dd8f4606a19a2439ec4abc3b53f413a436224a45f553636d52b8387d52bb69fdb60ef5f7c4b8ac26301584b4cf7b81ba8015e683eecb475fda16a8d99
-EBUILD maradns-3.5.0036.ebuild 2407 BLAKE2B ade3ffb774c7c03e354bc4169bf73dd6c836f0abba0f284234270349d7230130b780a23d5e68e410cd774cbb8189ab7f8811ce39a95f274faacfae98b8bd9ae8 SHA512 1ec28e26290b7b506fe936aada4e6d1454217ec7d755cc1126355c0610896a7afe933507714f95dd9f129b9b11feee3c78d4b4d9976a0de8492a7a6688528c5c
+EBUILD maradns-3.5.0022.ebuild 2674 BLAKE2B ea27c89935236f60a66d814b790195e5c7bcdfb8fe1bdda655cb833513b3d110e852335171d5e3226722f48db575dc5d4b6885061fd4b509a5caf503ca0e4528 SHA512 ad40901959a7e86272dd6c606c5f4b8ef6c8e7e5c81e510ef89317a1fd29b33c4145c10b3d5b7f86da0955dce491b6a054b539d30f0c6a569640255f162f2085
+EBUILD maradns-3.5.0036.ebuild 2602 BLAKE2B 89dd5e39c790e86b778373959481817b389d78934903e4f56b683ac8706de57369c58bd34c121df20d962ad2c23accfee33c995a18feba0c2c90d368137fd6e6 SHA512 8d80d7e08770579f76cecb408f4f2befa6166712fa351890fa4e69cc23a96463ac91c340f8c58be001e119a626b3ed25bca5cb94416c8884cbce881f8a8d689e
MISC metadata.xml 262 BLAKE2B c06e19c824b3a1235a60dd441b0443e2bd2880c90d531b7775402b1f89a89347127b4ee72d7d114f93a2ded7bc0dde81c61cd16e5eb38923ea3d13565598e3df SHA512 a6cf0c235960afadbf8e447a7f7c07c0fa2f713334ad7019e237885df34c0027a62bf3bed1f9600e8d1a4be1366686f6ae65ac3b113f0328e3d628a6eabb7f71
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 923417538778..9f01795fd2bb 100644
--- a/net-dns/maradns/files/maradns-3.5.0022-flags.patch
+++ b/net-dns/maradns/files/maradns-3.5.0022-flags.patch
@@ -1,15 +1,23 @@
-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 9d8117e..22a7518 100644
+index 965c7fb..572dccc 100644
--- a/build/Makefile.linux
+++ b/build/Makefile.linux
-@@ -29,29 +29,27 @@ Q="DEFINES=-DSELECT_PROBLEM"
+@@ -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
@@ -26,9 +34,7 @@ index 9d8117e..22a7518 100644
- make $(M) $(V) COMPILED=\"$(COMPILED)\" ; \
- cd ../tools ; make $(M) ; \
- cd ../deadwood-*/src/ ; make FLAGS=-O2 ; \
-- cd ../tools/blockhash ; make CFLAGS=-O2 ; \
-- cd ../../../coLunacyDNS/ ; make ; \
-- cd ../tcp ; make $(M) $(V) ; cat ../00README.FIRST
+- 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 ; \
@@ -54,3 +60,6 @@ index 9d8117e..22a7518 100644
clean:
rm -f $(OBJECTS) core $(EXECS) ; \
+--
+2.35.1
+
diff --git a/net-dns/maradns/files/maradns-3.5.0036-flags.patch b/net-dns/maradns/files/maradns-3.5.0036-flags.patch
new file mode 100644
index 000000000000..923417538778
--- /dev/null
+++ b/net-dns/maradns/files/maradns-3.5.0036-flags.patch
@@ -0,0 +1,56 @@
+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
+
+diff --git a/build/Makefile.linux b/build/Makefile.linux
+index 9d8117e..22a7518 100644
+--- a/build/Makefile.linux
++++ b/build/Makefile.linux
+@@ -29,29 +29,27 @@ Q="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 ../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 ; \
++ $(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) ; \
diff --git a/net-dns/maradns/maradns-3.5.0022.ebuild b/net-dns/maradns/maradns-3.5.0022.ebuild
index 85670bec1b68..4492b31c472c 100644
--- a/net-dns/maradns/maradns-3.5.0022.ebuild
+++ b/net-dns/maradns/maradns-3.5.0022.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2023 Gentoo Authors
+# 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
+inherit flag-o-matic python-any-r1 systemd toolchain-funcs
DESCRIPTION="A security-aware DNS server"
HOMEPAGE="https://maradns.samiam.org"
@@ -18,11 +18,10 @@ IUSE="examples"
BDEPEND="${PYTHON_DEPS}
dev-lang/perl"
-DEPEND="
+RDEPEND="
acct-group/maradns
acct-user/duende
acct-user/maradns"
-RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${P}-flags.patch
@@ -34,6 +33,11 @@ src_prepare() {
}
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"
}
diff --git a/net-dns/maradns/maradns-3.5.0036.ebuild b/net-dns/maradns/maradns-3.5.0036.ebuild
index 0eea6659b14e..de0218026790 100644
--- a/net-dns/maradns/maradns-3.5.0036.ebuild
+++ b/net-dns/maradns/maradns-3.5.0036.ebuild
@@ -4,7 +4,7 @@
EAPI=8
PYTHON_COMPAT=( python3_{10..12} )
-inherit python-any-r1 systemd toolchain-funcs
+inherit flag-o-matic python-any-r1 systemd toolchain-funcs
DESCRIPTION="A security-aware DNS server"
HOMEPAGE="https://maradns.samiam.org"
@@ -18,17 +18,23 @@ IUSE="examples"
BDEPEND="${PYTHON_DEPS}
dev-lang/perl"
-DEPEND="
+RDEPEND="
acct-group/maradns
acct-user/duende
acct-user/maradns"
-RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}"/${PN}-3.5.0022-flags.patch
+ "${FILESDIR}"/${PN}-3.5.0036-flags.patch
)
src_configure() {
+ # -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/861293
+ # https://github.com/samboy/MaraDNS/discussions/124
+ #
+ # should be fixed in git master; try removing this on the next bump
+ filter-lto
+
tc-export CC
./configure --ipv6 || die "Failed to configure"
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-22 15:55:54 +0000