[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2024-06-26 Thread Sam James
commit: bb433a20825e04d96961877a4956c031ce31d16d
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 27 01:25:31 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 27 01:25:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb433a20

net-dns/djbdns: Stabilize 1.05-r40 x86, #932846

Signed-off-by: Sam James  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r40.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r40.ebuild 
b/net-dns/djbdns/djbdns-1.05-r40.ebuild
index abc8b053b001..493bdc0a478e 100644
--- a/net-dns/djbdns/djbdns-1.05-r40.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r40.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://cr.yp.to/djbdns/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ppc64 sparc x86"
 IUSE="ipv6 selinux"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2024-06-26 Thread Sam James
commit: 1b31b5c87a8c01b0ad54f2bd70bfd98a442954ad
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 27 01:25:34 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 27 01:25:34 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b31b5c8

net-dns/djbdns: Stabilize 1.05-r40 ppc, #932846

Signed-off-by: Sam James  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r40.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r40.ebuild 
b/net-dns/djbdns/djbdns-1.05-r40.ebuild
index a1a300ef5603..3ceac85f940c 100644
--- a/net-dns/djbdns/djbdns-1.05-r40.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r40.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://cr.yp.to/djbdns/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="ipv6 selinux"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2024-06-26 Thread Sam James
commit: 898197e0e2f85fb814e1f4e3251e529363f705f4
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun 27 01:25:33 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 27 01:25:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=898197e0

net-dns/djbdns: Stabilize 1.05-r40 amd64, #932846

Signed-off-by: Sam James  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r40.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r40.ebuild 
b/net-dns/djbdns/djbdns-1.05-r40.ebuild
index 493bdc0a478e..a1a300ef5603 100644
--- a/net-dns/djbdns/djbdns-1.05-r40.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r40.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://cr.yp.to/djbdns/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ppc64 sparc x86"
 IUSE="ipv6 selinux"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2024-06-26 Thread Sam James
commit: 0cb86dfeed7a47dc2acb05a1e2483212647b1a91
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 26 23:52:18 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 26 23:52:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cb86dfe

net-dns/djbdns: Stabilize 1.05-r40 sparc, #932846

Signed-off-by: Sam James  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r40.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r40.ebuild 
b/net-dns/djbdns/djbdns-1.05-r40.ebuild
index 45f387387ecc..abc8b053b001 100644
--- a/net-dns/djbdns/djbdns-1.05-r40.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r40.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://cr.yp.to/djbdns/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ppc64 sparc ~x86"
 IUSE="ipv6 selinux"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2024-06-26 Thread Sam James
commit: c27f5d51342234c1560f03c1638b163931569696
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun 26 23:52:16 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun 26 23:52:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c27f5d51

net-dns/djbdns: Stabilize 1.05-r40 ppc64, #932846

Signed-off-by: Sam James  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r40.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r40.ebuild 
b/net-dns/djbdns/djbdns-1.05-r40.ebuild
index f5a5afde9b70..45f387387ecc 100644
--- a/net-dns/djbdns/djbdns-1.05-r40.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r40.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://cr.yp.to/djbdns/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ppc64 ~sparc ~x86"
 IUSE="ipv6 selinux"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2024-05-27 Thread Viorel Munteanu
commit: 208c21eb43eac8c92ce6d9d47f3a2974b000ffdc
Author: Jaco Kroon  uls  co  za>
AuthorDate: Mon May 27 13:32:39 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Mon May 27 15:08:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=208c21eb

net-dns/djbdns: Add myself as maintainer.

Update all leading space in metadata.xml to tabs.

Signed-off-by: Jaco Kroon  uls.co.za>
Signed-off-by: Viorel Munteanu  gentoo.org>

 net-dns/djbdns/metadata.xml | 20 ++--
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/net-dns/djbdns/metadata.xml b/net-dns/djbdns/metadata.xml
index 6e76cd2b88bd..7fb0b75a8609 100644
--- a/net-dns/djbdns/metadata.xml
+++ b/net-dns/djbdns/metadata.xml
@@ -1,10 +1,18 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-
-
-  Apply Fefe's patch (https://www.fefe.de/dns/) for ipv6 support.
-
-  
+   
+   j...@uls.co.za
+   Jaco Kroon
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   
+   
+   Apply Fefe's patch (https://www.fefe.de/dns/) for ipv6 
support.
+   
+   
 



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/files/, net-dns/djbdns/

2024-05-27 Thread Viorel Munteanu
commit: b938f9f9a917d3bacb73ef914c371dfc5f2d8ebe
Author: Jaco Kroon  uls  co  za>
AuthorDate: Mon May 27 14:37:52 2024 +
Commit: Viorel Munteanu  gentoo  org>
CommitDate: Mon May 27 15:08:30 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b938f9f9

net-dns/djbdns: 1.05-r40

Work around local receive overflow bug.

Bug: https://bugs.gentoo.org/932846
Signed-off-by: Jaco Kroon  uls.co.za>
Closes: https://github.com/gentoo/gentoo/pull/36841
Signed-off-by: Viorel Munteanu  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r40.ebuild  | 143 +
 ...dp-overflow-response-buffer-truncate-nov6.patch |  13 ++
 ...-udp-overflow-response-buffer-truncate-v6.patch |  34 +
 3 files changed, 190 insertions(+)

diff --git a/net-dns/djbdns/djbdns-1.05-r40.ebuild 
b/net-dns/djbdns/djbdns-1.05-r40.ebuild
new file mode 100644
index ..f5a5afde9b70
--- /dev/null
+++ b/net-dns/djbdns/djbdns-1.05-r40.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Collection of DNS client/server software"
+HOMEPAGE="https://cr.yp.to/djbdns.html;
+IPV6_PATCH="test32"
+
+SRC_URI="https://cr.yp.to/djbdns/${P}.tar.gz
+   https://smarden.org/pape/djb/manpages/${P}-man.tar.gz
+   ipv6? ( https://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.xz )"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 selinux"
+
+RDEPEND="
+   acct-user/dnscache
+   acct-user/dnslog
+   acct-user/tinydns
+   sys-apps/ucspi-tcp
+   virtual/daemontools
+   selinux? ( sec-policy/selinux-djbdns )"
+
+src_unpack() {
+   # Unpack both djbdns and its man pages to separate directories.
+   default
+
+   # Now move the man pages under ${S} so that user patches can be
+   # applied to them as well in src_prepare().
+   mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
+}
+
+PATCHES=(
+   "${FILESDIR}/dnsroots.patch"
+   "${FILESDIR}/dnstracesort.patch"
+   "${FILESDIR}/string_length_255.patch"
+   "${FILESDIR}/srv_record_support.patch"
+   "${FILESDIR}/increase-cname-recustion-depth.patch"
+   "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
+   "${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch"
+   "${FILESDIR}/AR-and-RANLIB-support.patch"
+   "${FILESDIR}/tinydns-softlimit.patch"
+   "${FILESDIR}/${PN}-dnscache-configurable-truncate-manpages.patch"
+)
+
+src_prepare() {
+   if use ipv6; then
+   PATCHES=(${PATCHES[@]}
+   # The big ipv6 patch.
+   "${WORKDIR}/${P}-${IPV6_PATCH}.diff"
+   # Fix CVE2008-4392 (ipv6)
+   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test32.patch"
+   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6-test29.patch"
+   
"${FILESDIR}/${PN}-dnscache-configurable-truncate-size-v6.patch"
+   
"${FILESDIR}/${PN}-udp-overflow-response-buffer-truncate-v6.patch"
+   )
+   else
+   PATCHES=(${PATCHES[@]}
+   "${FILESDIR}/implicit-declarations-nov6.patch"
+   # Fix CVE2008-4392 (no ipv6)
+   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch"
+   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
+   # Later versions of the ipv6 patch include this
+   "${FILESDIR}/${PV}-errno-r1.patch"
+   
"${FILESDIR}/${PN}-dnscache-configurable-truncate-size-nov6.patch"
+   
"${FILESDIR}/${PN}-udp-overflow-response-buffer-truncate-nov6.patch"
+   )
+   fi
+
+   default
+
+   # Change "head -X" to the posix-compatible "head -nX" within the
+   # Makefile. We do this with sed instead of a patch because the ipv6
+   # patch uses some of the surrounding lines; we'd need two versions
+   # of the patch.
+   sed -i Makefile \
+   -e 's/head[[:space:]]\{1,\}\-\([0-9]\{1,\}\)/head -n\1/g' \
+   || die 'failed to sed head in the Makefile'
+}
+
+src_compile() {
+   # Bug 927539. This is beyond our ability to realistically fix due
+   # to patch conflicts.
+   append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
+   echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+   echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+   echo "/usr" > conf-home || die
+   emake AR=$(tc-getAR) RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+   insinto /etc
+   doins dnsroots.global
+
+   into /usr
+   dobin *-conf dnscache tinydns 

[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2024-04-05 Thread Michael Orlitzky
commit: 04d69ea586027be047ad97d30c421791e6eba124
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Apr  5 19:18:57 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Apr  5 19:18:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04d69ea5

net-dns/djbdns: drop myself as a maintainer

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-dns/djbdns/metadata.xml | 4 
 1 file changed, 4 deletions(-)

diff --git a/net-dns/djbdns/metadata.xml b/net-dns/djbdns/metadata.xml
index f19ea0598296..6e76cd2b88bd 100644
--- a/net-dns/djbdns/metadata.xml
+++ b/net-dns/djbdns/metadata.xml
@@ -1,10 +1,6 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-  
-m...@gentoo.org
-Michael Orlitzky
-  
   
 
 



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2024-03-23 Thread Michael Orlitzky
commit: c2477a76b1edeb7bec683b4f924b16ff53a6798f
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Mar 23 11:56:14 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Mar 23 12:01:19 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2477a76

net-dns/djbdns: hide -Wincompatible-pointer-types problems

This is the worst solution to this problem, but our djbdns package isn't
djbdns at all, it's twenty patches in a trenchcoat. Maintenance for
things like this typically comes in the form of yet more downstream
patches, but invasive patches are essentially blocked by the fact that
they introduce conflicts with the others. There is at least one big
patch, the ipv6 patch, that is maintained by someone else, so it's not
as simple as basing all new patches on top of the old ones.

For lack of a better solution, we append -Wno-error for this warning.

Closes: https://bugs.gentoo.org/927539
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r39.ebuild | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r39.ebuild 
b/net-dns/djbdns/djbdns-1.05-r39.ebuild
index 77ba586d70d9..9b70fbb959bb 100644
--- a/net-dns/djbdns/djbdns-1.05-r39.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r39.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-inherit readme.gentoo-r1 toolchain-funcs
+inherit flag-o-matic readme.gentoo-r1 toolchain-funcs
 
 DESCRIPTION="Collection of DNS client/server software"
 HOMEPAGE="https://cr.yp.to/djbdns.html;
@@ -81,6 +81,10 @@ src_prepare() {
 }
 
 src_compile() {
+   # Bug 927539. This is beyond our ability to realistically fix due
+   # to patch conflicts.
+   append-cflags $(test-flags-CC -Wno-error=incompatible-pointer-types)
+
echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
echo "/usr" > conf-home || die



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/, net-dns/djbdns/files/

2024-03-04 Thread Michael Orlitzky
commit: 755301799f2c0fcfcebdb614f6e991ec8fedef38
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Mar  4 15:37:19 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Mar  4 15:39:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75530179

net-dns/djbdns: fix build with -Werror=implicit-function-declaration

The ipv6 patch contains fixes for most of these, so this consists of:

  1. Adding includes to a bunch of files when USE=ipv6 is not set.
  2. Adding an include to our new configurable TRUNCATELEN patches.

Closes: https://bugs.gentoo.org/926050
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r39.ebuild  |  1 +
 ...-dnscache-configurable-truncate-size-nov6.patch | 47 ++---
 ...ns-dnscache-configurable-truncate-size-v6.patch |  8 +++
 .../djbdns/files/implicit-declarations-nov6.patch  | 79 ++
 4 files changed, 109 insertions(+), 26 deletions(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r39.ebuild 
b/net-dns/djbdns/djbdns-1.05-r39.ebuild
index 2801d37b2612..77ba586d70d9 100644
--- a/net-dns/djbdns/djbdns-1.05-r39.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r39.ebuild
@@ -59,6 +59,7 @@ src_prepare() {
)
else
PATCHES=(${PATCHES[@]}
+   "${FILESDIR}/implicit-declarations-nov6.patch"
# Fix CVE2008-4392 (no ipv6)

"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch"

"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"

diff --git 
a/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-nov6.patch 
b/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-nov6.patch
index 9f16531a5441..d855c212d198 100644
--- a/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-nov6.patch
+++ b/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-nov6.patch
@@ -1,22 +1,8 @@
-From: Jaco Kroon 
-Date: Tue, 24 Oct 2023 06:36:10 +0200
-Subject: [PATCH] dnscache: Enable larger truncation
-
-This variation conflicts with the IPv6 patch.
-
-This is a workaround for https://forum.mikrotik.com/viewtopic.php?t=200627
-where Mikrotik doesn't fall back if the UDP response is truncated.
-
-This is done by enabling larger (configurable) than 512 byte responses on UDP
-such that Mikrotik doesn't have a need to revert to TCP.  Since it's impossible
-to truly know the maximum size of a DNS response trivially this is made
-configurable and the upper limit is arbitrarily capped to 16KB.
-
-Signed-off-by: Jaco Kroon 
-diff -bru djbdns-1.05.o/dnscache.c djbdns-1.05/dnscache.c
 djbdns-1.05.o/dnscache.c   2024-02-23 08:05:00.037623680 +0200
-+++ djbdns-1.05/dnscache.c 2024-02-23 08:18:26.320580927 +0200
-@@ -52,6 +52,7 @@
+diff --git a/dnscache.c b/dnscache.c
+index 8c899a3..8b10571 100644
+--- a/dnscache.c
 b/dnscache.c
+@@ -51,6 +51,7 @@ static char myipincoming[4];
  static char buf[1024];
  uint64 numqueries = 0;
  
@@ -24,7 +10,7 @@ diff -bru djbdns-1.05.o/dnscache.c djbdns-1.05/dnscache.c
  
  static int udp53;
  
-@@ -77,7 +78,7 @@
+@@ -77,7 +78,7 @@ void u_respond(int j)
  {
if (!u[j].active) return;
response_id(u[j].id);
@@ -33,7 +19,7 @@ diff -bru djbdns-1.05.o/dnscache.c djbdns-1.05/dnscache.c
socket_send4(udp53,response,response_len,u[j].ip,u[j].port);
log_querydone([j].active,response_len);
u[j].active = 0; --uactive;
-@@ -430,6 +431,15 @@
+@@ -431,6 +432,15 @@ int main()
if (!cache_init(cachesize))
  strerr_die3x(111,FATAL,"not enough memory for cache of size ",x);
  
@@ -49,10 +35,19 @@ diff -bru djbdns-1.05.o/dnscache.c djbdns-1.05/dnscache.c
if (env_get("HIDETTL"))
  response_hidettl();
if (env_get("FORWARDONLY"))
-diff -Nbrau djbdns-1.05.o/server.c djbdns-1.05/server.c
 djbdns-1.05.o/server.c 2001-02-11 23:11:45.0 +0200
-+++ djbdns-1.05/server.c   2024-02-23 08:19:40.020855813 +0200
-@@ -83,6 +83,7 @@
+diff --git a/server.c b/server.c
+index e486fe1..63ad11c 100644
+--- a/server.c
 b/server.c
+@@ -2,6 +2,7 @@
+ #include "case.h"
+ #include "env.h"
+ #include "buffer.h"
++#include "scan.h"
+ #include "strerr.h"
+ #include "ip4.h"
+ #include "uint16.h"
+@@ -83,6 +84,7 @@ int main()
  {
char *x;
int udp53;
@@ -60,7 +55,7 @@ diff -Nbrau djbdns-1.05.o/server.c djbdns-1.05/server.c
  
x = env_get("IP");
if (!x)
-@@ -105,11 +106,19 @@
+@@ -105,11 +107,19 @@ int main()
  
buffer_putsflush(buffer_2,starting);
  

diff --git 
a/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-v6.patch 
b/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-v6.patch
index 291ebe4f5c44..cea01ebd30d1 100644
--- a/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-v6.patch
+++ b/net-dns/djbdns/files/djbdns-dnscache-configurable-truncate-size-v6.patch
@@ -53,6 +53,14 @@ Only in djbdns-1.05/: 

[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/files/, net-dns/djbdns/

2024-02-24 Thread Michael Orlitzky
commit: 9c51d1e85c83c2c1af71f61cc2f003374ca902c9
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Feb 24 12:07:59 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Feb 24 12:32:24 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c51d1e8

net-dns/djbdns: new revision with configurable UDP response limit

This new revision allows the user to set TRUNCATELEN in the environment
to a value between 512 (per the RFC) and 16384. This affects only the
dnscache daemon and is useful in some cases to work around
implementation bugs; for example,

  https://forum.mikrotik.com/viewtopic.php?t=200627

Thanks to Jaco Kroon for the patches.

Closes: https://bugs.gentoo.org/916209
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r39.ebuild  | 136 +
 ...s-dnscache-configurable-truncate-manpages.patch |  53 
 ...-dnscache-configurable-truncate-size-nov6.patch |  83 +
 ...ns-dnscache-configurable-truncate-size-v6.patch |  87 +
 4 files changed, 359 insertions(+)

diff --git a/net-dns/djbdns/djbdns-1.05-r39.ebuild 
b/net-dns/djbdns/djbdns-1.05-r39.ebuild
new file mode 100644
index ..2801d37b2612
--- /dev/null
+++ b/net-dns/djbdns/djbdns-1.05-r39.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Collection of DNS client/server software"
+HOMEPAGE="https://cr.yp.to/djbdns.html;
+IPV6_PATCH="test32"
+
+SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
+   http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
+   ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.xz )"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 selinux"
+
+RDEPEND="
+   acct-user/dnscache
+   acct-user/dnslog
+   acct-user/tinydns
+   sys-apps/ucspi-tcp
+   virtual/daemontools
+   selinux? ( sec-policy/selinux-djbdns )"
+
+src_unpack() {
+   # Unpack both djbdns and its man pages to separate directories.
+   default
+
+   # Now move the man pages under ${S} so that user patches can be
+   # applied to them as well in src_prepare().
+   mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
+}
+
+PATCHES=(
+   "${FILESDIR}/dnsroots.patch"
+   "${FILESDIR}/dnstracesort.patch"
+   "${FILESDIR}/string_length_255.patch"
+   "${FILESDIR}/srv_record_support.patch"
+   "${FILESDIR}/increase-cname-recustion-depth.patch"
+   "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
+   "${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch"
+   "${FILESDIR}/AR-and-RANLIB-support.patch"
+   "${FILESDIR}/tinydns-softlimit.patch"
+   "${FILESDIR}/${PN}-dnscache-configurable-truncate-manpages.patch"
+)
+
+src_prepare() {
+   if use ipv6; then
+   PATCHES=(${PATCHES[@]}
+   # The big ipv6 patch.
+   "${WORKDIR}/${P}-${IPV6_PATCH}.diff"
+   # Fix CVE2008-4392 (ipv6)
+   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test32.patch"
+   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6-test29.patch"
+   
"${FILESDIR}/${PN}-dnscache-configurable-truncate-size-v6.patch"
+   )
+   else
+   PATCHES=(${PATCHES[@]}
+   # Fix CVE2008-4392 (no ipv6)
+   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch"
+   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
+   # Later versions of the ipv6 patch include this
+   "${FILESDIR}/${PV}-errno-r1.patch"
+   
"${FILESDIR}/${PN}-dnscache-configurable-truncate-size-nov6.patch"
+   )
+   fi
+
+   default
+
+   # Change "head -X" to the posix-compatible "head -nX" within the
+   # Makefile. We do this with sed instead of a patch because the ipv6
+   # patch uses some of the surrounding lines; we'd need two versions
+   # of the patch.
+   sed -i Makefile \
+   -e 's/head[[:space:]]\{1,\}\-\([0-9]\{1,\}\)/head -n\1/g' \
+   || die 'failed to sed head in the Makefile'
+}
+
+src_compile() {
+   echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+   echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+   echo "/usr" > conf-home || die
+   emake AR=$(tc-getAR) RANLIB=$(tc-getRANLIB)
+}
+
+src_install() {
+   insinto /etc
+   doins dnsroots.global
+
+   into /usr
+   dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
+   *-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
+   

[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2024-02-24 Thread Michael Orlitzky
commit: 105ec16888c8116c64b11b28a31c5de01103c5f1
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Feb 24 12:35:54 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Feb 24 12:35:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=105ec168

net-dns/djbdns: define USE=ipv6 locally to hide a pkgcheck warning

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-dns/djbdns/metadata.xml | 14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/net-dns/djbdns/metadata.xml b/net-dns/djbdns/metadata.xml
index f5946e0f0cc5..f19ea0598296 100644
--- a/net-dns/djbdns/metadata.xml
+++ b/net-dns/djbdns/metadata.xml
@@ -1,8 +1,14 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-  m...@gentoo.org
-  Michael Orlitzky
-
+  
+m...@gentoo.org
+Michael Orlitzky
+  
+  
+
+
+  Apply Fefe's patch (https://www.fefe.de/dns/) for ipv6 support.
+
+  
 



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/files/

2023-06-15 Thread Michael Orlitzky
commit: 5464de51ff555cb1abc838a7610f44e3c90c9221
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Jun 13 16:47:29 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Jun 15 09:24:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5464de51

net-dns/djbdns: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/31425
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Michael Orlitzky  gentoo.org>

 ...erge-similar-outgoing-queries-ipv6-test28.patch | 351 -
 ...4392_0002-dnscache-cache-soa-records-ipv6.patch |  68 
 net-dns/djbdns/files/headtail-r1.patch |  67 
 .../djbdns/files/makefile-parallel-test25.patch|  91 --
 4 files changed, 577 deletions(-)

diff --git 
a/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test28.patch
 
b/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test28.patch
deleted file mode 100644
index d493b8985e05..
--- 
a/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test28.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 5ccd647..eee09dd 100644
 a/Makefile
-+++ b/Makefile
-@@ -346,11 +346,11 @@ stralloc.h iopause.h taia.h tai.h uint64.h taia.h
-   ./compile dns_txt.c
- 
- dnscache: \
--load dnscache.o droproot.o okclient.o log.o cache.o query.o \
-+load dnscache.o droproot.o okclient.o log.o cache.o query.o qmerge.o \
- response.o dd.o roots.o iopause.o prot.o dns.a env.a alloc.a buffer.a \
- libtai.a unix.a byte.a socket.lib
-   ./load dnscache droproot.o okclient.o log.o cache.o \
--  query.o response.o dd.o roots.o iopause.o prot.o dns.a \
-+  query.o qmerge.o response.o dd.o roots.o iopause.o prot.o dns.a \
-   env.a alloc.a buffer.a libtai.a unix.a byte.a  `cat \
-   socket.lib`
- 
-@@ -371,7 +371,7 @@ compile dnscache.c env.h exit.h scan.h strerr.h error.h 
ip4.h \
- uint16.h uint64.h socket.h uint16.h dns.h stralloc.h gen_alloc.h \
- iopause.h taia.h tai.h uint64.h taia.h taia.h byte.h roots.h fmt.h \
- iopause.h query.h dns.h uint32.h alloc.h response.h uint32.h cache.h \
--uint32.h uint64.h ndelay.h log.h uint64.h okclient.h droproot.h
-+uint32.h uint64.h ndelay.h log.h uint64.h okclient.h droproot.h maxclient.h
-   ./compile dnscache.c
- 
- dnsfilter: \
-@@ -749,11 +749,16 @@ qlog.o: \
- compile qlog.c buffer.h qlog.h uint16.h
-   ./compile qlog.c
- 
-+qmerge.o: \
-+compile qmerge.c qmerge.h dns.h stralloc.h gen_alloc.h iopause.h \
-+taia.h tai.h uint64.h log.h maxclient.h
-+  ./compile qmerge.c
-+
- query.o: \
- compile query.c error.h roots.h log.h uint64.h case.h cache.h \
- uint32.h uint64.h byte.h dns.h stralloc.h gen_alloc.h iopause.h \
- taia.h tai.h uint64.h taia.h uint64.h uint32.h uint16.h dd.h alloc.h \
--response.h uint32.h query.h dns.h uint32.h
-+response.h uint32.h query.h dns.h uint32.h qmerge.h
-   ./compile query.c
- 
- random-ip: \
-diff --git a/dnscache.c b/dnscache.c
-index abcba69..c84e4b8 100644
 a/dnscache.c
-+++ b/dnscache.c
-@@ -23,6 +23,7 @@
- #include "okclient.h"
- #include "droproot.h"
- #include "openreadclose.h"
-+#include "maxclient.h"
- 
- long interface;
- 
-@@ -59,7 +60,6 @@ uint64 numqueries = 0;
- 
- static int udp53;
- 
--#define MAXUDP 200
- static struct udpclient {
-   struct query q;
-   struct taia start;
-@@ -136,7 +136,6 @@ void u_new(void)
- 
- static int tcp53;
- 
--#define MAXTCP 20
- struct tcpclient {
-   struct query q;
-   struct taia start;
-diff --git a/log.c b/log.c
-index df465e2..1b0d98c 100644
 a/log.c
-+++ b/log.c
-@@ -149,6 +149,13 @@ void log_tx(const char *q,const char qtype[2],const char 
*control,const char ser
-   line();
- }
- 
-+void log_tx_piggyback(const char *q, const char qtype[2], const char *control)
-+{
-+  string("txpb ");
-+  logtype(qtype); space(); name(q); space(); name(control);
-+  line();
-+}
-+
- void log_cachedanswer(const char *q,const char type[2])
- {
-   string("cached "); logtype(type); space();
-diff --git a/log.h b/log.h
-index fe62fa3..d9a829b 100644
 a/log.h
-+++ b/log.h
-@@ -18,6 +18,7 @@ extern void log_cachednxdomain(const char *);
- extern void log_cachedns(const char *,const char *);
- 
- extern void log_tx(const char *,const char *,const char *,const char 
*,unsigned int);
-+extern void log_tx_piggyback(const char *,const char *,const char *);
- 
- extern void log_nxdomain(const char *,const char *,unsigned int);
- extern void log_nodata(const char *,const char *,const char *,unsigned int);
-diff --git a/maxclient.h b/maxclient.h
-new file mode 100644
-index 000..e52fcd1
 /dev/null
-+++ b/maxclient.h
-@@ -0,0 +1,7 @@
-+#ifndef MAXCLIENT_H
-+#define MAXCLIENT_H
-+
-+#define MAXUDP 200
-+#define MAXTCP 20
-+
-+#endif /* MAXCLIENT_H */
-diff --git a/qmerge.c b/qmerge.c
-new file mode 100644
-index 000..7c92299
 

[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2023-06-10 Thread Michael Orlitzky
commit: 7fb3d01b29956541ee7edf1e743cc340e0d4ae7a
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sat Jun 10 11:33:34 2023 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Jun 10 11:33:34 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fb3d01b

net-dns/djbdns: drop 1.05-r35

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-dns/djbdns/Manifest   |   1 -
 net-dns/djbdns/djbdns-1.05-r35.ebuild | 127 --
 2 files changed, 128 deletions(-)

diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 8ba71a5953bf..64f722e2e2fe 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,4 +1,3 @@
 DIST djbdns-1.05-man.tar.gz 17170 BLAKE2B 
2fef7e1be8a427b2c426c2af58bf4c22795e64d03e0f605ca333e38f187ff65b333e88a7cea0e8a9ec867b446b5ca34a5c97dd24ae18b28ee4c747f2fd1f1608
 SHA512 
98af7bd9033a2205fbbc0f23b7eab45b9756f6ceff5199a62952e19c89c9fe3c03495cb6f8621d388f883c40650309a1509095417df3f54af21a71350c4aa183
-DIST djbdns-1.05-test28.diff.xz 22072 BLAKE2B 
fff6c13220adfa056a0ac5942ff9385d83b75f8622adaebab65f557a2ca8d014fe3c255fe55ba9afca56b24880b7cd28597b26b5bcc3bbbd3ef9f581b67004fd
 SHA512 
7fbfeda10221a0a09897c2e744df5606c83113c394ce055d822b0d8733873d72567a88c37905d21c7d2395170fc12b9e9eb133a941aa809f1b9856872ab48230
 DIST djbdns-1.05-test32.diff.xz 31096 BLAKE2B 
0bd6948ba3930f7d6e657f91ff76b1101fa7bb8f3da6849344c2230622fce6c15354e632a9140fefafee5986b522fb85c77c70ac64821d280043d1cd3564be2a
 SHA512 
ed5ea46e3346841a8e8b6a77756c1dba53dab5636f73cf495bf1a182c393bef83d6035f6af26fb903baa75ee689db4abae222b6f85a7e245eb59f9c805163774
 DIST djbdns-1.05.tar.gz 85648 BLAKE2B 
51918fcc8944e64e72709636ee7d56975a138a2806e22c019fa836770de3a338bb8f682216b89c09d6b2861c2423e60e28dc60639f5a86aca2040e1788e4cf5c
 SHA512 
20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9

diff --git a/net-dns/djbdns/djbdns-1.05-r35.ebuild 
b/net-dns/djbdns/djbdns-1.05-r35.ebuild
deleted file mode 100644
index b9430c86fb90..
--- a/net-dns/djbdns/djbdns-1.05-r35.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Collection of DNS client/server software"
-HOMEPAGE="http://cr.yp.to/djbdns.html;
-IPV6_PATCH="test28"
-
-SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
-   http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
-   ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.xz )"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86"
-IUSE="ipv6 selinux"
-
-DEPEND=""
-RDEPEND="
-   acct-user/dnscache
-   acct-user/dnslog
-   acct-user/tinydns
-   sys-apps/ucspi-tcp
-   virtual/daemontools
-   selinux? ( sec-policy/selinux-djbdns )"
-
-src_unpack() {
-   # Unpack both djbdns and its man pages to separate directories.
-   default
-
-   # Now move the man pages under ${S} so that user patches can be
-   # applied to them as well in src_prepare().
-   mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
-}
-
-PATCHES=(
-   "${FILESDIR}/headtail-r1.patch"
-   "${FILESDIR}/dnsroots.patch"
-   "${FILESDIR}/dnstracesort.patch"
-   "${FILESDIR}/string_length_255.patch"
-   "${FILESDIR}/srv_record_support.patch"
-   "${FILESDIR}/increase-cname-recustion-depth.patch"
-   "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
-   "${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch"
-   "${FILESDIR}/AR-and-RANLIB-support.patch"
-)
-
-src_prepare() {
-   if use ipv6; then
-   PATCHES=(${PATCHES[@]}
-   # The big ipv6 patch.
-   "${WORKDIR}/${P}-${IPV6_PATCH}.diff"
-   # Fix CVE2008-4392 (ipv6)
-   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test28.patch"
-   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch"
-   "${FILESDIR}/makefile-parallel-test25.patch"
-   )
-   else
-   PATCHES=(${PATCHES[@]}
-   # Fix CVE2008-4392 (no ipv6)
-   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch"
-   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
-   # Later versions of the ipv6 patch include this
-   "${FILESDIR}/${PV}-errno-r1.patch"
-   )
-   fi
-
-   default
-}
-
-src_compile() {
-   echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
-   echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-   echo "/usr" > conf-home || die
-   emake AR=$(tc-getAR) 

[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2023-06-09 Thread Arthur Zamarin
commit: 6b77f7630ec547e8a04a31e60caf5914828c2c01
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  9 18:05:21 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  9 18:05:21 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b77f763

net-dns/djbdns: Stabilize 1.05-r38 ppc64, #908138

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r38.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r38.ebuild 
b/net-dns/djbdns/djbdns-1.05-r38.ebuild
index 0245cb5648f3..d5e32320b88d 100644
--- a/net-dns/djbdns/djbdns-1.05-r38.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r38.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ppc64 sparc ~x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2023-06-09 Thread Arthur Zamarin
commit: 7c3306fa825a8e6cb7c26df4117530769d206271
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Jun  9 18:04:37 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Jun  9 18:04:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c3306fa

net-dns/djbdns: Stabilize 1.05-r38 sparc, #908138

Signed-off-by: Arthur Zamarin  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r38.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r38.ebuild 
b/net-dns/djbdns/djbdns-1.05-r38.ebuild
index b9e8644c4128..0245cb5648f3 100644
--- a/net-dns/djbdns/djbdns-1.05-r38.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r38.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 sparc ~x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/files/, net-dns/djbdns/

2022-12-02 Thread Michael Orlitzky
commit: 0a4405074f435983fb6515a2cfed1dca2a67a783
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Dec  2 13:12:12 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Dec  2 22:43:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a440507

net-dns/djbdns: new revision increasing tinydns's softlimit.

The tinydns launch script imposes a "softlimit" on the amount of memory
it can use, and sometime recently (in djbdns terms, anyway), the old
default of 30 became insufficient. We raise it 450. This will
only help new installations; users with existing ones will need to
modify their local launch scripts because the script itself is not
controlled by the package manager.

Thanks to Vadim Efimov for pointing out that this problem is widespread
and in need of fixing.

Closes: https://bugs.gentoo.org/883159
Signed-off-by: Michael Orlitzky  gentoo.org>

 .../{djbdns-1.05-r37.ebuild => djbdns-1.05-r38.ebuild} |  1 +
 net-dns/djbdns/files/tinydns-softlimit.patch   | 18 ++
 2 files changed, 19 insertions(+)

diff --git a/net-dns/djbdns/djbdns-1.05-r37.ebuild 
b/net-dns/djbdns/djbdns-1.05-r38.ebuild
similarity index 98%
rename from net-dns/djbdns/djbdns-1.05-r37.ebuild
rename to net-dns/djbdns/djbdns-1.05-r38.ebuild
index 95606086af30..b9e8644c4128 100644
--- a/net-dns/djbdns/djbdns-1.05-r37.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r38.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
"${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
"${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch"
"${FILESDIR}/AR-and-RANLIB-support.patch"
+   "${FILESDIR}/tinydns-softlimit.patch"
 )
 
 src_prepare() {

diff --git a/net-dns/djbdns/files/tinydns-softlimit.patch 
b/net-dns/djbdns/files/tinydns-softlimit.patch
new file mode 100644
index ..89d80d933012
--- /dev/null
+++ b/net-dns/djbdns/files/tinydns-softlimit.patch
@@ -0,0 +1,18 @@
+Use a larger memory limit by default than was chosen at the beginning
+of time. This is evidently necessary on many machines, including my
+own, starting somewhere around December 2020.
+
+https://bugs.gentoo.org/883159
+
+diff -Naur a/tinydns-conf.c b/tinydns-conf.c
+--- a/tinydns-conf.c   2001-02-11 21:11:45.0 +
 b/tinydns-conf.c   2021-11-08 17:23:06.181385437 +
+@@ -46,7 +46,7 @@
+
+   start("run");
+   outs("#!/bin/sh\nexec 2>&1\nexec envuidgid "); outs(user);
+-  outs(" envdir ./env softlimit -d30 ");
++  outs(" envdir ./env softlimit -d450 ");
+   outs(auto_home); outs("/bin/tinydns\n");
+   finish();
+   perm(0755);



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/files/, net-dns/djbdns/

2022-11-17 Thread Michael Orlitzky
commit: b6b626201479d9889c4b28a10b24c9fd9d944bba
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu Nov 17 13:09:07 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu Nov 17 13:23:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6b62620

net-dns/djbdns: new revision with updated ipv6 patch.

The new ipv6 patch corrects a logic error, but now also includes a bunch
of other Makefile dependency fixes, obsoleting one of our own
patches. One of the CVE patches has once again been manually rebased,
and I dropped the "headtail" patch in favor of sed to avoid a new
conditional patch.

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-dns/djbdns/Manifest|  2 +-
 ...bdns-1.05-r36.ebuild => djbdns-1.05-r37.ebuild} | 14 
 ...rge-similar-outgoing-queries-ipv6-test32.patch} | 26 +++---
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 7892a331568a..8ba71a5953bf 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,4 +1,4 @@
 DIST djbdns-1.05-man.tar.gz 17170 BLAKE2B 
2fef7e1be8a427b2c426c2af58bf4c22795e64d03e0f605ca333e38f187ff65b333e88a7cea0e8a9ec867b446b5ca34a5c97dd24ae18b28ee4c747f2fd1f1608
 SHA512 
98af7bd9033a2205fbbc0f23b7eab45b9756f6ceff5199a62952e19c89c9fe3c03495cb6f8621d388f883c40650309a1509095417df3f54af21a71350c4aa183
 DIST djbdns-1.05-test28.diff.xz 22072 BLAKE2B 
fff6c13220adfa056a0ac5942ff9385d83b75f8622adaebab65f557a2ca8d014fe3c255fe55ba9afca56b24880b7cd28597b26b5bcc3bbbd3ef9f581b67004fd
 SHA512 
7fbfeda10221a0a09897c2e744df5606c83113c394ce055d822b0d8733873d72567a88c37905d21c7d2395170fc12b9e9eb133a941aa809f1b9856872ab48230
-DIST djbdns-1.05-test29.diff.xz 28884 BLAKE2B 
cff7dd55d68eb33a7f8725898469f39b7a1109c7a081e00b0465d599e0ea462e888f510b98a37a31190dfadb2006c6ba2f42311e235e1d9456f745dd756035a9
 SHA512 
f3fda79813f0067aadc399b1b8af9b33b179ee212fee188119ad2e3d8fced3b31dbd4d2a83922a138da523bb6d6784c3d98105053f9267e7e4f41cf77b76ce88
+DIST djbdns-1.05-test32.diff.xz 31096 BLAKE2B 
0bd6948ba3930f7d6e657f91ff76b1101fa7bb8f3da6849344c2230622fce6c15354e632a9140fefafee5986b522fb85c77c70ac64821d280043d1cd3564be2a
 SHA512 
ed5ea46e3346841a8e8b6a77756c1dba53dab5636f73cf495bf1a182c393bef83d6035f6af26fb903baa75ee689db4abae222b6f85a7e245eb59f9c805163774
 DIST djbdns-1.05.tar.gz 85648 BLAKE2B 
51918fcc8944e64e72709636ee7d56975a138a2806e22c019fa836770de3a338bb8f682216b89c09d6b2861c2423e60e28dc60639f5a86aca2040e1788e4cf5c
 SHA512 
20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9

diff --git a/net-dns/djbdns/djbdns-1.05-r36.ebuild 
b/net-dns/djbdns/djbdns-1.05-r37.ebuild
similarity index 89%
rename from net-dns/djbdns/djbdns-1.05-r36.ebuild
rename to net-dns/djbdns/djbdns-1.05-r37.ebuild
index 115ca72ded0b..95606086af30 100644
--- a/net-dns/djbdns/djbdns-1.05-r36.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r37.ebuild
@@ -6,7 +6,7 @@ inherit readme.gentoo-r1 toolchain-funcs
 
 DESCRIPTION="Collection of DNS client/server software"
 HOMEPAGE="https://cr.yp.to/djbdns.html;
-IPV6_PATCH="test29"
+IPV6_PATCH="test32"
 
 SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
@@ -36,7 +36,6 @@ src_unpack() {
 }
 
 PATCHES=(
-   "${FILESDIR}/headtail-r1.patch"
"${FILESDIR}/dnsroots.patch"
"${FILESDIR}/dnstracesort.patch"
"${FILESDIR}/string_length_255.patch"
@@ -53,9 +52,8 @@ src_prepare() {
# The big ipv6 patch.
"${WORKDIR}/${P}-${IPV6_PATCH}.diff"
# Fix CVE2008-4392 (ipv6)
-   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test29.patch"
+   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test32.patch"

"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6-test29.patch"
-   "${FILESDIR}/makefile-parallel-test25.patch"
)
else
PATCHES=(${PATCHES[@]}
@@ -68,6 +66,14 @@ src_prepare() {
fi
 
default
+
+   # Change "head -X" to the posix-compatible "head -nX" within the
+   # Makefile. We do this with sed instead of a patch because the ipv6
+   # patch uses some of the surrounding lines; we'd need two versions
+   # of the patch.
+   sed -i Makefile \
+   -e 's/head[[:space:]]\{1,\}\-\([0-9]\{1,\}\)/head -n\1/g' \
+   || die 'failed to sed head in the Makefile'
 }
 
 src_compile() {

diff --git 
a/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test29.patch
 
b/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test32.patch
similarity index 92%
rename from 

[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/, net-dns/djbdns/files/

2022-11-15 Thread Michael Orlitzky
commit: 0d1b97b7297ab5ecd5da0f9b6a7b1dfd0239a5bc
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Nov 15 20:27:18 2022 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Nov 15 23:24:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d1b97b7

net-dns/djbdns: new EAPI=8 revision with fixed parallel build.

The parallel build fix comes via an updated ipv6 patch, courtesy of
Felix von Leitner. (Thanks for the fast response!)

This also includes the ever-dangerous manual rebasing of two CVE patches
on top of the new ipv6 patch, made scarier by the fact that I don't
actually ipv6 myself. Fortunately those patches are not too crazy.

Closes: https://bugs.gentoo.org/881349
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-dns/djbdns/Manifest|   1 +
 net-dns/djbdns/djbdns-1.05-r36.ebuild  | 127 
 ...erge-similar-outgoing-queries-ipv6-test29.patch | 351 +
 ...02-dnscache-cache-soa-records-ipv6-test29.patch |  69 
 4 files changed, 548 insertions(+)

diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index af9a9ef1e60a..7892a331568a 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,3 +1,4 @@
 DIST djbdns-1.05-man.tar.gz 17170 BLAKE2B 
2fef7e1be8a427b2c426c2af58bf4c22795e64d03e0f605ca333e38f187ff65b333e88a7cea0e8a9ec867b446b5ca34a5c97dd24ae18b28ee4c747f2fd1f1608
 SHA512 
98af7bd9033a2205fbbc0f23b7eab45b9756f6ceff5199a62952e19c89c9fe3c03495cb6f8621d388f883c40650309a1509095417df3f54af21a71350c4aa183
 DIST djbdns-1.05-test28.diff.xz 22072 BLAKE2B 
fff6c13220adfa056a0ac5942ff9385d83b75f8622adaebab65f557a2ca8d014fe3c255fe55ba9afca56b24880b7cd28597b26b5bcc3bbbd3ef9f581b67004fd
 SHA512 
7fbfeda10221a0a09897c2e744df5606c83113c394ce055d822b0d8733873d72567a88c37905d21c7d2395170fc12b9e9eb133a941aa809f1b9856872ab48230
+DIST djbdns-1.05-test29.diff.xz 28884 BLAKE2B 
cff7dd55d68eb33a7f8725898469f39b7a1109c7a081e00b0465d599e0ea462e888f510b98a37a31190dfadb2006c6ba2f42311e235e1d9456f745dd756035a9
 SHA512 
f3fda79813f0067aadc399b1b8af9b33b179ee212fee188119ad2e3d8fced3b31dbd4d2a83922a138da523bb6d6784c3d98105053f9267e7e4f41cf77b76ce88
 DIST djbdns-1.05.tar.gz 85648 BLAKE2B 
51918fcc8944e64e72709636ee7d56975a138a2806e22c019fa836770de3a338bb8f682216b89c09d6b2861c2423e60e28dc60639f5a86aca2040e1788e4cf5c
 SHA512 
20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9

diff --git a/net-dns/djbdns/djbdns-1.05-r36.ebuild 
b/net-dns/djbdns/djbdns-1.05-r36.ebuild
new file mode 100644
index ..115ca72ded0b
--- /dev/null
+++ b/net-dns/djbdns/djbdns-1.05-r36.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Collection of DNS client/server software"
+HOMEPAGE="https://cr.yp.to/djbdns.html;
+IPV6_PATCH="test29"
+
+SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
+   http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
+   ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.xz )"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 selinux"
+
+DEPEND=""
+RDEPEND="
+   acct-user/dnscache
+   acct-user/dnslog
+   acct-user/tinydns
+   sys-apps/ucspi-tcp
+   virtual/daemontools
+   selinux? ( sec-policy/selinux-djbdns )"
+
+src_unpack() {
+   # Unpack both djbdns and its man pages to separate directories.
+   default
+
+   # Now move the man pages under ${S} so that user patches can be
+   # applied to them as well in src_prepare().
+   mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
+}
+
+PATCHES=(
+   "${FILESDIR}/headtail-r1.patch"
+   "${FILESDIR}/dnsroots.patch"
+   "${FILESDIR}/dnstracesort.patch"
+   "${FILESDIR}/string_length_255.patch"
+   "${FILESDIR}/srv_record_support.patch"
+   "${FILESDIR}/increase-cname-recustion-depth.patch"
+   "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
+   "${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch"
+   "${FILESDIR}/AR-and-RANLIB-support.patch"
+)
+
+src_prepare() {
+   if use ipv6; then
+   PATCHES=(${PATCHES[@]}
+   # The big ipv6 patch.
+   "${WORKDIR}/${P}-${IPV6_PATCH}.diff"
+   # Fix CVE2008-4392 (ipv6)
+   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test29.patch"
+   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6-test29.patch"
+   "${FILESDIR}/makefile-parallel-test25.patch"
+   )
+   else
+   PATCHES=(${PATCHES[@]}
+   # Fix CVE2008-4392 (no ipv6)
+   

[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2021-07-18 Thread Michael Orlitzky
commit: 9ea2743379dc38eca8c23b273ad01aeee388d1ab
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Jul 18 18:09:42 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Jul 18 18:09:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ea27433

net-dns/djbdns: stabilize on ppc thanks to ernsteiswuerfel.

Bug: https://bugs.gentoo.org/802321
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r35.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r35.ebuild 
b/net-dns/djbdns/djbdns-1.05-r35.ebuild
index 6b06f4f1eeb..b9430c86fb9 100644
--- a/net-dns/djbdns/djbdns-1.05-r35.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r35.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2021-07-18 Thread Michael Orlitzky
commit: e120d23f19ca45b2c0997061c3f850b855827b73
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Sun Jul 18 18:10:38 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sun Jul 18 18:10:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e120d23f

net-dns/djbdns: remove pre-GLEP81 djbdns-1.05-r33.ebuild.

Closes: https://bugs.gentoo.org/802321
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r33.ebuild | 132 --
 1 file changed, 132 deletions(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r33.ebuild 
b/net-dns/djbdns/djbdns-1.05-r33.ebuild
deleted file mode 100644
index ca8d5bbf314..000
--- a/net-dns/djbdns/djbdns-1.05-r33.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic readme.gentoo-r1 toolchain-funcs user
-
-DESCRIPTION="Collection of DNS client/server software"
-HOMEPAGE="http://cr.yp.to/djbdns.html;
-IPV6_PATCH="test28"
-
-SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
-   http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
-   ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.xz )"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="~alpha amd64 ~hppa ~mips ppc ppc64 sparc x86"
-IUSE="ipv6 selinux"
-
-DEPEND=""
-RDEPEND="sys-apps/ucspi-tcp
-   virtual/daemontools
-   selinux? ( sec-policy/selinux-djbdns )"
-
-src_unpack() {
-   # Unpack both djbdns and its man pages to separate directories.
-   default
-
-   # Now move the man pages under ${S} so that user patches can be
-   # applied to them as well in src_prepare().
-   mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
-}
-
-PATCHES=(
-   "${FILESDIR}/headtail-r1.patch"
-   "${FILESDIR}/dnsroots.patch"
-   "${FILESDIR}/dnstracesort.patch"
-   "${FILESDIR}/string_length_255.patch"
-   "${FILESDIR}/srv_record_support.patch"
-   "${FILESDIR}/increase-cname-recustion-depth.patch"
-   "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
-   "${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch"
-)
-
-src_prepare() {
-   if use ipv6; then
-   PATCHES=(${PATCHES[@]}
-   # The big ipv6 patch.
-   "${WORKDIR}/${P}-${IPV6_PATCH}.diff"
-   # Fix CVE2008-4392 (ipv6)
-   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test28.patch"
-   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch"
-   "${FILESDIR}/makefile-parallel-test25.patch"
-   )
-   else
-   PATCHES=(${PATCHES[@]}
-   # Fix CVE2008-4392 (no ipv6)
-   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch"
-   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
-   # Later versions of the ipv6 patch include this
-   "${FILESDIR}/${PV}-errno-r1.patch"
-   )
-   fi
-
-   default
-}
-
-src_compile() {
-   echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
-   echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-   echo "/usr" > conf-home || die
-   emake
-}
-
-src_install() {
-   insinto /etc
-   doins dnsroots.global
-
-   into /usr
-   dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
-   *-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
-   dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
-
-   if use ipv6; then
-   dobin dnsip6 dnsip6q
-   fi
-
-   dodoc CHANGES README
-
-   doman man/*.[158]
-
-   readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-   # The nofiles group is no longer provided by baselayout.
-   # Share it with qmail if possible.
-   enewgroup nofiles 200
-
-   enewuser dnscache -1 -1 -1 nofiles
-   enewuser dnslog -1 -1 -1 nofiles
-   enewuser tinydns -1 -1 -1 nofiles
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS='
-To configure djbdns, please follow the instructions at,
-
-   http://cr.yp.to/djbdns.html
-
-Of particular interest are,
-
-   axfrdns : http://cr.yp.to/djbdns/axfrdns-conf.html
-   dnscache: http://cr.yp.to/djbdns/run-cache-x-home.html
-   tinydns : http://cr.yp.to/djbdns/run-server.html
-
-Portage has created users for axfrdns, dnscache, and tinydns; the
-commands to configure these programs are,
-
-   1. axfrdns-conf tinydns dnslog /var/axfrdns /var/tinydns $ip
-   2. dnscache-conf dnscache dnslog /var/dnscache $ip
-   3. tinydns-conf tinydns dnslog /var/tinydns $ip
-
-(replace $ip with the ip address on which the server will run).
-
-If you wish to configure rbldns or 

[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2021-07-15 Thread Sam James
commit: e9e20e5fa7097c80fc88821f47575a072ceb5acf
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 15 21:42:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 15 21:42:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9e20e5f

net-dns/djbdns: Stabilize 1.05-r35 sparc, #802321

Signed-off-by: Sam James  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r35.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r35.ebuild 
b/net-dns/djbdns/djbdns-1.05-r35.ebuild
index 70bf8bdeb5f..6b06f4f1eeb 100644
--- a/net-dns/djbdns/djbdns-1.05-r35.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r35.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ppc64 sparc x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2021-07-15 Thread Sam James
commit: 4bf2eafa0df8cfbfe01c4292e71a32391b7864c6
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 15 21:41:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 15 21:41:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4bf2eafa

net-dns/djbdns: Stabilize 1.05-r35 ppc64, #802321

Signed-off-by: Sam James  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r35.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r35.ebuild 
b/net-dns/djbdns/djbdns-1.05-r35.ebuild
index 18be292051e..70bf8bdeb5f 100644
--- a/net-dns/djbdns/djbdns-1.05-r35.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r35.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ppc64 ~sparc x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2021-07-15 Thread Sam James
commit: 34f5a81a337212bf0d758453372687877d1bfed6
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 15 21:36:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 15 21:38:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34f5a81a

net-dns/djbdns: Stabilize 1.05-r35 amd64, #802321

Signed-off-by: Sam James  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r35.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r35.ebuild 
b/net-dns/djbdns/djbdns-1.05-r35.ebuild
index 5c97805d0b3..18be292051e 100644
--- a/net-dns/djbdns/djbdns-1.05-r35.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r35.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2021-07-15 Thread Sam James
commit: dd91fc011e004ca6a0e5ba7f715cfc32e3f600ad
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 15 21:32:55 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 15 21:32:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd91fc01

net-dns/djbdns: Stabilize 1.05-r35 x86, #802321

Signed-off-by: Sam James  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r35.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r35.ebuild 
b/net-dns/djbdns/djbdns-1.05-r35.ebuild
index 8cc9d5c60aa..5c97805d0b3 100644
--- a/net-dns/djbdns/djbdns-1.05-r35.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r35.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/files/, net-dns/djbdns/

2021-04-19 Thread Michael Orlitzky
commit: 5b6cc80b2ba5a2ee76cd203379dedb0a1dbe6aae
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Tue Apr 20 01:26:37 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Tue Apr 20 01:26:54 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b6cc80b

net-dns/djbdns: new revision with $AR and $RANLIB support.

Upstream lives on only in our thoughts and prayers, so I patched the
Makefile slightly to make this happen.

Closes: https://bugs.gentoo.org/784230
Closes: https://bugs.gentoo.org/784233
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Orlitzky  gentoo.org>

 ...bdns-1.05-r34.ebuild => djbdns-1.05-r35.ebuild} |  3 +-
 net-dns/djbdns/files/AR-and-RANLIB-support.patch   | 48 ++
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r34.ebuild 
b/net-dns/djbdns/djbdns-1.05-r35.ebuild
similarity index 97%
rename from net-dns/djbdns/djbdns-1.05-r34.ebuild
rename to net-dns/djbdns/djbdns-1.05-r35.ebuild
index f2f79e02fd0..8cc9d5c60aa 100644
--- a/net-dns/djbdns/djbdns-1.05-r34.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r35.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
"${FILESDIR}/increase-cname-recustion-depth.patch"
"${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
"${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch"
+   "${FILESDIR}/AR-and-RANLIB-support.patch"
 )
 
 src_prepare() {
@@ -73,7 +74,7 @@ src_compile() {
echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
echo "/usr" > conf-home || die
-   emake
+   emake AR=$(tc-getAR) RANLIB=$(tc-getRANLIB)
 }
 
 src_install() {

diff --git a/net-dns/djbdns/files/AR-and-RANLIB-support.patch 
b/net-dns/djbdns/files/AR-and-RANLIB-support.patch
new file mode 100644
index 000..792bc22a82c
--- /dev/null
+++ b/net-dns/djbdns/files/AR-and-RANLIB-support.patch
@@ -0,0 +1,48 @@
+From 5dde3af17a784615ab52130702458ca83d5b18bd Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky 
+Date: Mon, 19 Apr 2021 21:11:02 -0400
+Subject: [PATCH 1/1] Makefile: support AR and RANLIB variables.
+
+These variables should default to the generic "ar" and "ranlib"
+commands, but if the user specifies them we now respect them.
+
+Gentoo-bug: https://bugs.gentoo.org/784230
+Gentoo-bug: https://bugs.gentoo.org/784233
+---
+ Makefile | 6 --
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 1429643..5742195 100644
+--- a/Makefile
 b/Makefile
+@@ -1,6 +1,8 @@
+ # Don't edit Makefile! Use conf-* for configuration.
+ 
+ SHELL=/bin/sh
++AR ?= ar
++RANLIB ?= ranlib
+ 
+ default: it
+ 
+@@ -581,7 +583,7 @@ warn-auto.sh systype
+   ( cat warn-auto.sh; \
+   echo 'main="$$1"; shift'; \
+   echo 'rm -f "$$main"'; \
+-  echo 'ar cr "$$main" $${1+"$$@"}'; \
++  echo '$(AR) cr "$$main" $${1+"$$@"}'; \
+   case "`cat systype`" in \
+   sunos-5.*) ;; \
+   unix_sv*) ;; \
+@@ -590,7 +592,7 @@ warn-auto.sh systype
+   dgux-*) ;; \
+   hp-ux-*) ;; \
+   sco*) ;; \
+-  *) echo 'ranlib "$$main"' ;; \
++  *) echo '$(RANLIB) "$$main"' ;; \
+   esac \
+   ) > makelib
+   chmod 755 makelib
+-- 
+2.26.3
+



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2021-04-19 Thread Michael Orlitzky
commit: 833c0545e8afd0e54879133908b9e0a19ecd2db7
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Mon Apr 19 13:16:41 2021 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon Apr 19 18:43:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=833c0545

net-dns/djbdns: new EAPI7/GLEP81 revision.

Closes: https://bugs.gentoo.org/781374
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r34.ebuild | 126 ++
 1 file changed, 126 insertions(+)

diff --git a/net-dns/djbdns/djbdns-1.05-r34.ebuild 
b/net-dns/djbdns/djbdns-1.05-r34.ebuild
new file mode 100644
index 000..f2f79e02fd0
--- /dev/null
+++ b/net-dns/djbdns/djbdns-1.05-r34.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Collection of DNS client/server software"
+HOMEPAGE="http://cr.yp.to/djbdns.html;
+IPV6_PATCH="test28"
+
+SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
+   http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
+   ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.xz )"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 selinux"
+
+DEPEND=""
+RDEPEND="
+   acct-user/dnscache
+   acct-user/dnslog
+   acct-user/tinydns
+   sys-apps/ucspi-tcp
+   virtual/daemontools
+   selinux? ( sec-policy/selinux-djbdns )"
+
+src_unpack() {
+   # Unpack both djbdns and its man pages to separate directories.
+   default
+
+   # Now move the man pages under ${S} so that user patches can be
+   # applied to them as well in src_prepare().
+   mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
+}
+
+PATCHES=(
+   "${FILESDIR}/headtail-r1.patch"
+   "${FILESDIR}/dnsroots.patch"
+   "${FILESDIR}/dnstracesort.patch"
+   "${FILESDIR}/string_length_255.patch"
+   "${FILESDIR}/srv_record_support.patch"
+   "${FILESDIR}/increase-cname-recustion-depth.patch"
+   "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
+   "${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch"
+)
+
+src_prepare() {
+   if use ipv6; then
+   PATCHES=(${PATCHES[@]}
+   # The big ipv6 patch.
+   "${WORKDIR}/${P}-${IPV6_PATCH}.diff"
+   # Fix CVE2008-4392 (ipv6)
+   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test28.patch"
+   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch"
+   "${FILESDIR}/makefile-parallel-test25.patch"
+   )
+   else
+   PATCHES=(${PATCHES[@]}
+   # Fix CVE2008-4392 (no ipv6)
+   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch"
+   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
+   # Later versions of the ipv6 patch include this
+   "${FILESDIR}/${PV}-errno-r1.patch"
+   )
+   fi
+
+   default
+}
+
+src_compile() {
+   echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+   echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+   echo "/usr" > conf-home || die
+   emake
+}
+
+src_install() {
+   insinto /etc
+   doins dnsroots.global
+
+   into /usr
+   dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
+   *-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
+   dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
+
+   if use ipv6; then
+   dobin dnsip6 dnsip6q
+   fi
+
+   dodoc CHANGES README
+
+   doman man/*.[158]
+
+   readme.gentoo_create_doc
+}
+
+DISABLE_AUTOFORMATTING=1
+DOC_CONTENTS='
+To configure djbdns, please follow the instructions at,
+
+   http://cr.yp.to/djbdns.html
+
+Of particular interest are,
+
+   axfrdns : http://cr.yp.to/djbdns/axfrdns-conf.html
+   dnscache: http://cr.yp.to/djbdns/run-cache-x-home.html
+   tinydns : http://cr.yp.to/djbdns/run-server.html
+
+Portage has created users for axfrdns, dnscache, and tinydns; the
+commands to configure these programs are,
+
+   1. axfrdns-conf tinydns dnslog /var/axfrdns /var/tinydns $ip
+   2. dnscache-conf dnscache dnslog /var/dnscache $ip
+   3. tinydns-conf tinydns dnslog /var/tinydns $ip
+
+(replace $ip with the ip address on which the server will run).
+
+If you wish to configure rbldns or walldns, you will need to create
+those users yourself (although you should still use the "dnslog"
+user for the logs):
+
+   4. rbldns-conf $username dnslog /var/rbldns $ip $base
+   5. walldns-conf $username 

[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/files/

2019-05-06 Thread Michael Orlitzky
commit: 0c73587753c8841c0cdd02d73150fe18b4d266f5
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Sun May  5 12:27:55 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Mon May  6 15:28:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c735877

net-dns/djbdns: remove unused patch

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Michael Orlitzky  gentoo.org>

 ...e-similar-outgoing-queries-ipv6-test25-r1.patch | 351 -
 1 file changed, 351 deletions(-)

diff --git 
a/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25-r1.patch
 
b/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25-r1.patch
deleted file mode 100644
index 1d132d6d4f5..000
--- 
a/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25-r1.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 5ccd647..eee09dd 100644
 a/Makefile
-+++ b/Makefile
-@@ -346,11 +346,11 @@ stralloc.h iopause.h taia.h tai.h uint64.h taia.h
-   ./compile dns_txt.c
- 
- dnscache: \
--load dnscache.o droproot.o okclient.o log.o cache.o query.o \
-+load dnscache.o droproot.o okclient.o log.o cache.o query.o qmerge.o \
- response.o dd.o roots.o iopause.o prot.o dns.a env.a alloc.a buffer.a \
- libtai.a unix.a byte.a socket.lib
-   ./load dnscache droproot.o okclient.o log.o cache.o \
--  query.o response.o dd.o roots.o iopause.o prot.o dns.a \
-+  query.o qmerge.o response.o dd.o roots.o iopause.o prot.o dns.a \
-   env.a alloc.a buffer.a libtai.a unix.a byte.a  `cat \
-   socket.lib`
- 
-@@ -371,7 +371,7 @@ compile dnscache.c env.h exit.h scan.h strerr.h error.h 
ip4.h \
- uint16.h uint64.h socket.h uint16.h dns.h stralloc.h gen_alloc.h \
- iopause.h taia.h tai.h uint64.h taia.h taia.h byte.h roots.h fmt.h \
- iopause.h query.h dns.h uint32.h alloc.h response.h uint32.h cache.h \
--uint32.h uint64.h ndelay.h log.h uint64.h okclient.h droproot.h
-+uint32.h uint64.h ndelay.h log.h uint64.h okclient.h droproot.h maxclient.h
-   ./compile dnscache.c
- 
- dnsfilter: \
-@@ -749,11 +749,16 @@ qlog.o: \
- compile qlog.c buffer.h qlog.h uint16.h
-   ./compile qlog.c
- 
-+qmerge.o: \
-+compile qmerge.c qmerge.h dns.h stralloc.h gen_alloc.h iopause.h \
-+taia.h tai.h uint64.h log.h maxclient.h
-+  ./compile qmerge.c
-+
- query.o: \
- compile query.c error.h roots.h log.h uint64.h case.h cache.h \
- uint32.h uint64.h byte.h dns.h stralloc.h gen_alloc.h iopause.h \
- taia.h tai.h uint64.h taia.h uint64.h uint32.h uint16.h dd.h alloc.h \
--response.h uint32.h query.h dns.h uint32.h
-+response.h uint32.h query.h dns.h uint32.h qmerge.h
-   ./compile query.c
- 
- random-ip: \
-diff --git a/dnscache.c b/dnscache.c
-index abcba69..c84e4b8 100644
 a/dnscache.c
-+++ b/dnscache.c
-@@ -23,6 +23,7 @@
- #include "log.h"
- #include "okclient.h"
- #include "droproot.h"
-+#include "maxclient.h"
- 
- long interface;
- 
-@@ -59,7 +60,6 @@ uint64 numqueries = 0;
- 
- static int udp53;
- 
--#define MAXUDP 200
- static struct udpclient {
-   struct query q;
-   struct taia start;
-@@ -136,7 +136,6 @@ void u_new(void)
- 
- static int tcp53;
- 
--#define MAXTCP 20
- struct tcpclient {
-   struct query q;
-   struct taia start;
-diff --git a/log.c b/log.c
-index df465e2..1b0d98c 100644
 a/log.c
-+++ b/log.c
-@@ -149,6 +149,13 @@ void log_tx(const char *q,const char qtype[2],const char 
*control,const char ser
-   line();
- }
- 
-+void log_tx_piggyback(const char *q, const char qtype[2], const char *control)
-+{
-+  string("txpb ");
-+  logtype(qtype); space(); name(q); space(); name(control);
-+  line();
-+}
-+
- void log_cachedanswer(const char *q,const char type[2])
- {
-   string("cached "); logtype(type); space();
-diff --git a/log.h b/log.h
-index fe62fa3..d9a829b 100644
 a/log.h
-+++ b/log.h
-@@ -18,6 +18,7 @@ extern void log_cachednxdomain(const char *);
- extern void log_cachedns(const char *,const char *);
- 
- extern void log_tx(const char *,const char *,const char *,const char 
*,unsigned int);
-+extern void log_tx_piggyback(const char *,const char *,const char *);
- 
- extern void log_nxdomain(const char *,const char *,unsigned int);
- extern void log_nodata(const char *,const char *,const char *,unsigned int);
-diff --git a/maxclient.h b/maxclient.h
-new file mode 100644
-index 000..e52fcd1
 /dev/null
-+++ b/maxclient.h
-@@ -0,0 +1,7 @@
-+#ifndef MAXCLIENT_H
-+#define MAXCLIENT_H
-+
-+#define MAXUDP 200
-+#define MAXTCP 20
-+
-+#endif /* MAXCLIENT_H */
-diff --git a/qmerge.c b/qmerge.c
-new file mode 100644
-index 000..7c92299
 /dev/null
-+++ b/qmerge.c
-@@ -0,0 +1,115 @@
-+#include "qmerge.h"
-+#include "byte.h"
-+#include "log.h"
-+#include "maxclient.h"
-+
-+#define QMERGE_MAX (MAXUDP+MAXTCP)
-+struct qmerge inprogress[QMERGE_MAX];
-+
-+static
-+int qmerge_key_init(struct 

[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2019-05-02 Thread Michael Orlitzky
commit: 4cb363bd5164881fb01e0e376abdad61398a5a72
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Thu May  2 22:37:38 2019 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Thu May  2 22:37:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cb363bd

net-dns/djbdns: remove "unused" djbdns-1.05-r32.ebuild.

Signed-off-by: Michael Orlitzky  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

 net-dns/djbdns/Manifest   |   1 -
 net-dns/djbdns/djbdns-1.05-r32.ebuild | 154 --
 2 files changed, 155 deletions(-)

diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 813304725d1..af9a9ef1e60 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,4 +1,3 @@
 DIST djbdns-1.05-man.tar.gz 17170 BLAKE2B 
2fef7e1be8a427b2c426c2af58bf4c22795e64d03e0f605ca333e38f187ff65b333e88a7cea0e8a9ec867b446b5ca34a5c97dd24ae18b28ee4c747f2fd1f1608
 SHA512 
98af7bd9033a2205fbbc0f23b7eab45b9756f6ceff5199a62952e19c89c9fe3c03495cb6f8621d388f883c40650309a1509095417df3f54af21a71350c4aa183
-DIST djbdns-1.05-test27.diff.bz2 20695 BLAKE2B 
5eb2b5deeb81ec802bec4787b844f8b072e46a06ea28cf28a2702f8d545c3248256357669471f78b61f30c656b6f325bb8c0710dbdfa3ad2c2b00d5fb02bfc66
 SHA512 
e5acf26ff353ae20b6c2186140255bf0ae478a75a9946163d4474a003afbf8c2f47e61a12fc3ed4b9eff17ec8732e9d91bfbb10fb2762310b067180b6d471ba0
 DIST djbdns-1.05-test28.diff.xz 22072 BLAKE2B 
fff6c13220adfa056a0ac5942ff9385d83b75f8622adaebab65f557a2ca8d014fe3c255fe55ba9afca56b24880b7cd28597b26b5bcc3bbbd3ef9f581b67004fd
 SHA512 
7fbfeda10221a0a09897c2e744df5606c83113c394ce055d822b0d8733873d72567a88c37905d21c7d2395170fc12b9e9eb133a941aa809f1b9856872ab48230
 DIST djbdns-1.05.tar.gz 85648 BLAKE2B 
51918fcc8944e64e72709636ee7d56975a138a2806e22c019fa836770de3a338bb8f682216b89c09d6b2861c2423e60e28dc60639f5a86aca2040e1788e4cf5c
 SHA512 
20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9

diff --git a/net-dns/djbdns/djbdns-1.05-r32.ebuild 
b/net-dns/djbdns/djbdns-1.05-r32.ebuild
deleted file mode 100644
index acfed9c3992..000
--- a/net-dns/djbdns/djbdns-1.05-r32.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic readme.gentoo-r1 toolchain-funcs user
-
-DESCRIPTION="Collection of DNS client/server software"
-HOMEPAGE="http://cr.yp.to/djbdns.html;
-IPV6_PATCH="test27"
-
-SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
-   http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
-   ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 )"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="ipv6 selinux"
-
-DEPEND=""
-RDEPEND="sys-apps/ucspi-tcp
-   virtual/daemontools
-   selinux? ( sec-policy/selinux-djbdns )"
-
-src_unpack(){
-   # Unpack both djbdns and its man pages to separate directories.
-   default
-
-   # Now move the man pages under ${S} so that user patches can be
-   # applied to them as well in src_prepare().
-   mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
-}
-
-src_prepare() {
-   eapply \
-   "${FILESDIR}/headtail-r1.patch" \
-   "${FILESDIR}/dnsroots.patch" \
-   "${FILESDIR}/dnstracesort.patch" \
-   "${FILESDIR}/string_length_255.patch" \
-   "${FILESDIR}/srv_record_support.patch" \
-   "${FILESDIR}/increase-cname-recustion-depth.patch"
-
-   # Fix CVE2009-0858
-   eapply 
"${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
-
-   # Fix CVE2012-1191
-   eapply "${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch"
-
-   if use ipv6; then
-   elog 'At present dnstrace does NOT support IPv6. It will'\
-'be compiled without IPv6 support.'
-
-   # Create a separate copy of the source tree for dnstrace.
-   cp -pR "${S}" "${S}-noipv6" || die
-
-   # The big ipv6 patch.
-   eapply "${WORKDIR}/${P}-${IPV6_PATCH}.diff"
-
-   # Fix CVE2008-4392 (ipv6)
-   eapply \
-   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25-r1.patch"
 \
-   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch" \
-   "${FILESDIR}/makefile-parallel-test25.patch"
-
-   cd "${S}-noipv6" || die
-   fi
-
-   # Fix CVE2008-4392 (no ipv6)
-   eapply \
-   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch"
 \
-   "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
-
-   # Later versions of the ipv6 patch include this, but even if
-   # USE=ipv6, we're 

[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2019-05-02 Thread Mikle Kolyada
commit: f13dfb86d8dab3ff4b41f05b6fbefe8b395c9c33
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu May  2 21:19:56 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu May  2 21:19:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f13dfb86

net-dns/djbdns: alpha stable wrt bug #678156

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="alpha"

 net-dns/djbdns/djbdns-1.05-r33.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r33.ebuild 
b/net-dns/djbdns/djbdns-1.05-r33.ebuild
index 7f53b8fb3fc..ef0a8724cc1 100644
--- a/net-dns/djbdns/djbdns-1.05-r33.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r33.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2019-02-20 Thread Mikle Kolyada
commit: 78ef4d6e9f16d022a93547f9c8612076810282f1
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Wed Feb 20 13:03:48 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Wed Feb 20 13:03:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78ef4d6e

net-dns/djbdns: amd64 stable wrt bug #678156

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 net-dns/djbdns/djbdns-1.05-r33.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r33.ebuild 
b/net-dns/djbdns/djbdns-1.05-r33.ebuild
index 8702ea7b338..7f53b8fb3fc 100644
--- a/net-dns/djbdns/djbdns-1.05-r33.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r33.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 hppa ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2019-02-18 Thread Sergei Trofimovich
commit: 7ef9d1c4f1dc8709d481faf7f58fa370b55cc04c
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Feb 18 17:47:45 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Feb 18 19:48:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ef9d1c4

net-dns/djbdns: stable 1.05-r33 for hppa/sparc, bug #678156

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
RepoMan-Options: --include-arches="hppa sparc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r33.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r33.ebuild 
b/net-dns/djbdns/djbdns-1.05-r33.ebuild
index 9ddbdc94f4a..8702ea7b338 100644
--- a/net-dns/djbdns/djbdns-1.05-r33.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r33.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 hppa ~mips ppc ppc64 sparc x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2019-02-17 Thread Thomas Deutschmann
commit: 135593346d2a33c5454799dcab2ad341401939f2
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Sun Feb 17 22:15:24 2019 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sun Feb 17 22:15:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13559334

net-dns/djbdns: x86 stable (bug #678156)

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r33.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r33.ebuild 
b/net-dns/djbdns/djbdns-1.05-r33.ebuild
index ea6a186ddba..9ddbdc94f4a 100644
--- a/net-dns/djbdns/djbdns-1.05-r33.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r33.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2019-02-17 Thread Sergei Trofimovich
commit: 169233f8dc4f855766b0c909db05739df29c2740
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Feb 17 17:14:00 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Feb 17 17:14:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=169233f8

net-dns/djbdns: stable 1.05-r33 for ppc64, bug #678156

Package-Manager: Portage-2.3.60, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r33.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r33.ebuild 
b/net-dns/djbdns/djbdns-1.05-r33.ebuild
index 24e63f47663..ea6a186ddba 100644
--- a/net-dns/djbdns/djbdns-1.05-r33.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r33.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ppc64 ~sparc ~x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2019-02-17 Thread Sergei Trofimovich
commit: 6f0afcc1ae965d40f740232cdf35bc1fdc559dff
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sun Feb 17 17:03:57 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun Feb 17 17:08:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f0afcc1

net-dns/djbdns: stable 1.05-r33 for ppc, bug #678156

Package-Manager: Portage-2.3.60, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r33.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r33.ebuild 
b/net-dns/djbdns/djbdns-1.05-r33.ebuild
index ad80420e697..24e63f47663 100644
--- a/net-dns/djbdns/djbdns-1.05-r33.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ppc ~ppc64 ~sparc ~x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/, net-dns/djbdns/files/

2018-04-11 Thread Michael Orlitzky
commit: 2837acf969f908129dc20336ae6bb6d748f0054f
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Apr  1 20:04:39 2018 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Apr 11 13:18:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2837acf9

net-dns/djbdns: update IPv6 patch

Closes: https://bugs.gentoo.org/652156
Closes: https://github.com/gentoo/gentoo/pull/7768
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Signed-off-by: Michael Orlitzky  gentoo.org>

 net-dns/djbdns/Manifest|   1 +
 net-dns/djbdns/djbdns-1.05-r33.ebuild  | 132 
 ...erge-similar-outgoing-queries-ipv6-test28.patch | 351 +
 3 files changed, 484 insertions(+)

diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index c4ec7a7f792..813304725d1 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,3 +1,4 @@
 DIST djbdns-1.05-man.tar.gz 17170 BLAKE2B 
2fef7e1be8a427b2c426c2af58bf4c22795e64d03e0f605ca333e38f187ff65b333e88a7cea0e8a9ec867b446b5ca34a5c97dd24ae18b28ee4c747f2fd1f1608
 SHA512 
98af7bd9033a2205fbbc0f23b7eab45b9756f6ceff5199a62952e19c89c9fe3c03495cb6f8621d388f883c40650309a1509095417df3f54af21a71350c4aa183
 DIST djbdns-1.05-test27.diff.bz2 20695 BLAKE2B 
5eb2b5deeb81ec802bec4787b844f8b072e46a06ea28cf28a2702f8d545c3248256357669471f78b61f30c656b6f325bb8c0710dbdfa3ad2c2b00d5fb02bfc66
 SHA512 
e5acf26ff353ae20b6c2186140255bf0ae478a75a9946163d4474a003afbf8c2f47e61a12fc3ed4b9eff17ec8732e9d91bfbb10fb2762310b067180b6d471ba0
+DIST djbdns-1.05-test28.diff.xz 22072 BLAKE2B 
fff6c13220adfa056a0ac5942ff9385d83b75f8622adaebab65f557a2ca8d014fe3c255fe55ba9afca56b24880b7cd28597b26b5bcc3bbbd3ef9f581b67004fd
 SHA512 
7fbfeda10221a0a09897c2e744df5606c83113c394ce055d822b0d8733873d72567a88c37905d21c7d2395170fc12b9e9eb133a941aa809f1b9856872ab48230
 DIST djbdns-1.05.tar.gz 85648 BLAKE2B 
51918fcc8944e64e72709636ee7d56975a138a2806e22c019fa836770de3a338bb8f682216b89c09d6b2861c2423e60e28dc60639f5a86aca2040e1788e4cf5c
 SHA512 
20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9

diff --git a/net-dns/djbdns/djbdns-1.05-r33.ebuild 
b/net-dns/djbdns/djbdns-1.05-r33.ebuild
new file mode 100644
index 000..ad80420e697
--- /dev/null
+++ b/net-dns/djbdns/djbdns-1.05-r33.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic readme.gentoo-r1 toolchain-funcs user
+
+DESCRIPTION="Collection of DNS client/server software"
+HOMEPAGE="http://cr.yp.to/djbdns.html;
+IPV6_PATCH="test28"
+
+SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
+   http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
+   ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.xz )"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 selinux"
+
+DEPEND=""
+RDEPEND="sys-apps/ucspi-tcp
+   virtual/daemontools
+   selinux? ( sec-policy/selinux-djbdns )"
+
+src_unpack(){
+   # Unpack both djbdns and its man pages to separate directories.
+   default
+
+   # Now move the man pages under ${S} so that user patches can be
+   # applied to them as well in src_prepare().
+   mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
+}
+
+PATCHES=(
+   "${FILESDIR}/headtail-r1.patch"
+   "${FILESDIR}/dnsroots.patch"
+   "${FILESDIR}/dnstracesort.patch"
+   "${FILESDIR}/string_length_255.patch"
+   "${FILESDIR}/srv_record_support.patch"
+   "${FILESDIR}/increase-cname-recustion-depth.patch"
+   "${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
+   "${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch"
+)
+
+src_prepare() {
+   if use ipv6; then
+   PATCHES=(${PATCHES[@]}
+   # The big ipv6 patch.
+   "${WORKDIR}/${P}-${IPV6_PATCH}.diff"
+   # Fix CVE2008-4392 (ipv6)
+   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test28.patch"
+   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch"
+   "${FILESDIR}/makefile-parallel-test25.patch"
+   )
+   else
+   PATCHES=(${PATCHES[@]}
+   # Fix CVE2008-4392 (no ipv6)
+   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch"
+   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
+   # Later versions of the ipv6 patch include this
+   "${FILESDIR}/${PV}-errno-r1.patch"
+   )
+   fi
+
+   default
+}
+
+src_compile() {
+   echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+   echo "$(tc-getCC) ${LDFLAGS}" > 

[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/files/

2017-09-06 Thread Michael Orlitzky
commit: f31b127325760ab8ecc84b489bf6eb6261d0358e
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Sep  6 16:37:23 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Sep  6 17:26:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31b1273

net-dns/djbdns: remove unused patches

Signed-off-by: Michael Orlitzky  gentoo.org>

 net-dns/djbdns/files/1.05-errno.patch  |  11 -
 ...erge-similar-outgoing-queries-ipv6-test25.patch | 351 -
 ...1-dnscache-merge-similar-outgoing-queries.patch | 349 
 net-dns/djbdns/files/headtail.patch|  67 
 4 files changed, 778 deletions(-)

diff --git a/net-dns/djbdns/files/1.05-errno.patch 
b/net-dns/djbdns/files/1.05-errno.patch
deleted file mode 100644
index b4650b1a9cf..000
--- a/net-dns/djbdns/files/1.05-errno.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 error.h2001-02-11 15:11:45.0 -0600
-+++ error.h2003-02-26 02:10:21.0 -0600
-@@ -1,7 +1,7 @@
- #ifndef ERROR_H
- #define ERROR_H
- 
--extern int errno;
-+#include 
- 
- extern int error_intr;
- extern int error_nomem;

diff --git 
a/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25.patch
 
b/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25.patch
deleted file mode 100644
index e33e0ccd601..000
--- 
a/net-dns/djbdns/files/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25.patch
+++ /dev/null
@@ -1,351 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 5ccd647..eee09dd 100644
 a/Makefile
-+++ b/Makefile
-@@ -346,11 +346,11 @@ stralloc.h iopause.h taia.h tai.h uint64.h taia.h
-   ./compile dns_txt.c
- 
- dnscache: \
--load dnscache.o droproot.o okclient.o log.o cache.o query.o \
-+load dnscache.o droproot.o okclient.o log.o cache.o query.o qmerge.o \
- response.o dd.o roots.o iopause.o prot.o dns.a env.a alloc.a buffer.a \
- libtai.a unix.a byte.a socket.lib
-   ./load dnscache droproot.o okclient.o log.o cache.o \
--  query.o response.o dd.o roots.o iopause.o prot.o dns.a \
-+  query.o qmerge.o response.o dd.o roots.o iopause.o prot.o dns.a \
-   env.a alloc.a buffer.a libtai.a unix.a byte.a  `cat \
-   socket.lib`
- 
-@@ -371,7 +371,7 @@ compile dnscache.c env.h exit.h scan.h strerr.h error.h 
ip4.h \
- uint16.h uint64.h socket.h uint16.h dns.h stralloc.h gen_alloc.h \
- iopause.h taia.h tai.h uint64.h taia.h taia.h byte.h roots.h fmt.h \
- iopause.h query.h dns.h uint32.h alloc.h response.h uint32.h cache.h \
--uint32.h uint64.h ndelay.h log.h uint64.h okclient.h droproot.h
-+uint32.h uint64.h ndelay.h log.h uint64.h okclient.h droproot.h maxclient.h
-   ./compile dnscache.c
- 
- dnsfilter: \
-@@ -749,11 +749,16 @@ qlog.o: \
- compile qlog.c buffer.h qlog.h uint16.h
-   ./compile qlog.c
- 
-+qmerge.o: \
-+compile qmerge.c qmerge.h dns.h stralloc.h gen_alloc.h iopause.h \
-+taia.h tai.h uint64.h log.h maxclient.h
-+  ./compile qmerge.c
-+
- query.o: \
- compile query.c error.h roots.h log.h uint64.h case.h cache.h \
- uint32.h uint64.h byte.h dns.h stralloc.h gen_alloc.h iopause.h \
- taia.h tai.h uint64.h taia.h uint64.h uint32.h uint16.h dd.h alloc.h \
--response.h uint32.h query.h dns.h uint32.h
-+response.h uint32.h query.h dns.h uint32.h qmerge.h
-   ./compile query.c
- 
- random-ip: \
-diff --git a/dnscache.c b/dnscache.c
-index abcba69..c84e4b8 100644
 a/dnscache.c
-+++ b/dnscache.c
-@@ -23,6 +23,7 @@
- #include "log.h"
- #include "okclient.h"
- #include "droproot.h"
-+#include "maxclient.h"
- 
- long interface;
- 
-@@ -59,7 +60,6 @@ uint64 numqueries = 0;
- 
- static int udp53;
- 
--#define MAXUDP 200
- static struct udpclient {
-   struct query q;
-   struct taia start;
-@@ -136,7 +136,6 @@ void u_new(void)
- 
- static int tcp53;
- 
--#define MAXTCP 20
- struct tcpclient {
-   struct query q;
-   struct taia start;
-diff --git a/log.c b/log.c
-index df465e2..1b0d98c 100644
 a/log.c
-+++ b/log.c
-@@ -149,6 +149,13 @@ void log_tx(const char *q,const char qtype[2],const char 
*control,const char ser
-   line();
- }
- 
-+void log_tx_piggyback(const char *q, const char qtype[2], const char *control)
-+{
-+  string("txpb ");
-+  logtype(qtype); space(); name(q); space(); name(control);
-+  line();
-+}
-+
- void log_cachedanswer(const char *q,const char type[2])
- {
-   string("cached "); logtype(type); space();
-diff --git a/log.h b/log.h
-index fe62fa3..d9a829b 100644
 a/log.h
-+++ b/log.h
-@@ -18,6 +18,7 @@ extern void log_cachednxdomain(const char *);
- extern void log_cachedns(const char *,const char *);
- 
- extern void log_tx(const char *,const char *,const char *,const char 
*,unsigned int);
-+extern void log_tx_piggyback(const char *,const char *,const char *);
- 
- extern void log_nxdomain(const char *,const char *,unsigned int);
- extern void log_nodata(const char *,const char *,const char 

[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2017-01-18 Thread Michael Orlitzky
commit: e24450ef08df82ca43af2c8e2dca59b1f9b6
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Jan 18 13:28:33 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Jan 18 13:28:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e24450ef

net-dns/djbdns: remove old versions vulnerable to CVE-2012-1191.

Gentoo-Bug: 404959

Package-Manager: portage-2.3.0

 net-dns/djbdns/djbdns-1.05-r30.ebuild | 151 --
 1 file changed, 151 deletions(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r30.ebuild 
b/net-dns/djbdns/djbdns-1.05-r30.ebuild
deleted file mode 100644
index 3afbb66..
--- a/net-dns/djbdns/djbdns-1.05-r30.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic readme.gentoo toolchain-funcs user
-
-DESCRIPTION="Collection of DNS client/server software"
-HOMEPAGE="http://cr.yp.to/djbdns.html;
-IPV6_PATCH="test27"
-
-SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
-   http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
-   ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 )"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="ipv6 selinux"
-
-DEPEND=""
-RDEPEND="sys-apps/ucspi-tcp
-   virtual/daemontools
-   selinux? ( sec-policy/selinux-djbdns )"
-
-src_unpack(){
-   # Unpack both djbdns and its man pages to separate directories.
-   default
-
-   # Now move the man pages under ${S} so that user patches can be
-   # applied to them as well in src_prepare().
-   mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
-}
-
-src_prepare() {
-   epatch \
-   "${FILESDIR}/headtail.patch" \
-   "${FILESDIR}/dnsroots.patch" \
-   "${FILESDIR}/dnstracesort.patch" \
-   "${FILESDIR}/string_length_255.patch" \
-   "${FILESDIR}/srv_record_support.patch"
-
-   # Fix CVE2009-0858
-   epatch 
"${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
-
-   if use ipv6; then
-   elog 'At present dnstrace does NOT support IPv6. It will'\
-'be compiled without IPv6 support.'
-
-   # Create a separate copy of the source tree for dnstrace.
-   cp -pR "${S}" "${S}-noipv6" || die
-
-   # The big ipv6 patch.
-   epatch "${WORKDIR}/${P}-${IPV6_PATCH}.diff"
-
-   # Fix CVE2008-4392 (ipv6)
-   epatch \
-   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25.patch"
 \
-   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch" \
-   "${FILESDIR}/makefile-parallel-test25.patch"
-
-   cd "${S}-noipv6" || die
-   fi
-
-   # Fix CVE2008-4392 (no ipv6)
-   epatch \
-   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries.patch" \
-   "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
-
-   # Later versions of the ipv6 patch include this, but even if
-   # USE=ipv6, we're in the ${S}-noipv6 directory at this point.
-   epatch "${FILESDIR}/${PV}-errno.patch"
-
-   epatch_user
-}
-
-src_compile() {
-   echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
-   echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
-   echo "/usr" > conf-home || die
-   emake
-
-   # If djbdns is compiled with IPv6 support, it breaks dnstrace.
-   # Therefore we must compile dnstrace separately without IPv6
-   # support.
-   if use ipv6; then
-   elog 'Compiling dnstrace without ipv6 support'
-   cp conf-cc conf-ld conf-home "${S}-noipv6/" || die
-   cd "${S}-noipv6" || die
-   emake dnstrace
-   fi
-}
-
-src_install() {
-   insinto /etc
-   doins dnsroots.global
-
-   into /usr
-   dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
-   *-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
-   dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
-
-   if use ipv6; then
-   dobin dnsip6 dnsip6q "${S}-noipv6/dnstrace"
-   fi
-
-   dodoc CHANGES README
-
-   doman man/*.[158]
-
-   readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-   # The nofiles group is no longer provided by baselayout.
-   # Share it with qmail if possible.
-   enewgroup nofiles 200
-
-   enewuser dnscache -1 -1 -1 nofiles
-   enewuser dnslog -1 -1 -1 nofiles
-   enewuser tinydns -1 -1 -1 nofiles
-}
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS='
-To configure djbdns, please follow the instructions at,
-
-   http://cr.yp.to/djbdns.html
-
-Of particular interest are,
-
-   axfrdns : 

[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2017-01-15 Thread Agostino Sarubbo
commit: 7b3407c0c04c1c13f38e97797be58a96d8bb088f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sun Jan 15 15:46:44 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sun Jan 15 15:49:59 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b3407c0

net-dns/djbdns: ppc stable wrt bug #404959

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r32.ebuild 
b/net-dns/djbdns/djbdns-1.05-r32.ebuild
index 1cbf699..01f1572 100644
--- a/net-dns/djbdns/djbdns-1.05-r32.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r32.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="alpha amd64 hppa ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 hppa ~mips ppc ~ppc64 sparc x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2017-01-11 Thread Agostino Sarubbo
commit: 74aee74320a41bd39e4007e0ff5d00e922a38032
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jan 11 10:34:41 2017 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jan 11 10:34:41 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74aee743

net-dns/djbdns: sparc stable wrt bug #404959

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r32.ebuild 
b/net-dns/djbdns/djbdns-1.05-r32.ebuild
index dcbc3b3..1cbf699 100644
--- a/net-dns/djbdns/djbdns-1.05-r32.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r32.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="alpha amd64 hppa ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ~mips ~ppc ~ppc64 sparc x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2017-01-10 Thread Jeroen Roovers
commit: f3151f3dbd68385f2ea0c69493e9f8adc4e951ba
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Tue Jan 10 09:54:46 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Tue Jan 10 09:54:46 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3151f3d

net-dns/djbdns: Stable for HPPA (bug #404959).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 net-dns/djbdns/djbdns-1.05-r32.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r32.ebuild 
b/net-dns/djbdns/djbdns-1.05-r32.ebuild
index 2c459f4..dcbc3b3 100644
--- a/net-dns/djbdns/djbdns-1.05-r32.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r32.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -15,7 +15,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="alpha amd64 hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2017-01-04 Thread Michael Orlitzky
commit: 90c5f36896f7e820d8f08b0f32fdc5bed76f5a24
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Wed Jan  4 16:04:28 2017 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Wed Jan  4 16:04:50 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90c5f368

net-dns/djbdns: remove two unused revisions.

Package-Manager: portage-2.3.0

 net-dns/djbdns/Manifest   |   1 -
 net-dns/djbdns/djbdns-1.05-r29.ebuild | 146 
 net-dns/djbdns/djbdns-1.05-r31.ebuild | 152 --
 3 files changed, 299 deletions(-)

diff --git a/net-dns/djbdns/Manifest b/net-dns/djbdns/Manifest
index 91dd57c..3b69a67 100644
--- a/net-dns/djbdns/Manifest
+++ b/net-dns/djbdns/Manifest
@@ -1,4 +1,3 @@
 DIST djbdns-1.05-man.tar.gz 17170 SHA256 
ba1c58f14bc928908d8618230f400d73cfe2200ed800a272b63048e3e50be569 SHA512 
98af7bd9033a2205fbbc0f23b7eab45b9756f6ceff5199a62952e19c89c9fe3c03495cb6f8621d388f883c40650309a1509095417df3f54af21a71350c4aa183
 WHIRLPOOL 
b611e37e7422a4ae405fa15a4b9ff7eb8d0007d81310d044bc1982fe70dada1e4646cf22832e8e5320bae8d2e328eb87d59eb51c3d390f1089f30548053b839b
-DIST djbdns-1.05-test25.diff.bz2 20376 SHA256 
28c88de08822894cf252e54ed3be9abfdf4f492644ff74a7c479340bdce051ea SHA512 
41cca597dba971010b9844071e0349d3a4b25cc4b144e12721b0bc8250589fb374e40ece8908f1081762597048179b1177e88b9a5f97be0b47b63e3183e654bb
 WHIRLPOOL 
d531001511ead02f51558909b13e14734f013213e0f13ec7589876878928bd4057f917e004e8d37955c2965aeba5d92a9fc481f2f9ac48c08edaeb9bb9b821d9
 DIST djbdns-1.05-test27.diff.bz2 20695 SHA256 
0de3816016d5a9159d0fe1beaea809e2229820256af114cbf911f04f202a SHA512 
e5acf26ff353ae20b6c2186140255bf0ae478a75a9946163d4474a003afbf8c2f47e61a12fc3ed4b9eff17ec8732e9d91bfbb10fb2762310b067180b6d471ba0
 WHIRLPOOL 
5c89691836a349553531816a8b4c5b6edc18c2c0a1cf8309b67344ad04c9575fbc5f9d79dcf156aeb692ccd7a6fbd2ce2838fb2fd7b85bd6cd0693a9f657e66e
 DIST djbdns-1.05.tar.gz 85648 SHA256 
3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48 SHA512 
20f066402801d7bec183cb710a5bc51e41f1410024741e5803e26f68f2c13567e48eba793f233dfab903459c3335bc169e24b99d66a4c64e617e1f0779732fa9
 WHIRLPOOL 
0fb67d19fcbf1cf21debcedfd3456d9cb9160079631ae1995e94aa9db3969ae02927f215ee8a5f03b34a6523cb9e3abebabf23e08e95eb1efdb626eb8b10312f

diff --git a/net-dns/djbdns/djbdns-1.05-r29.ebuild 
b/net-dns/djbdns/djbdns-1.05-r29.ebuild
deleted file mode 100644
index 14e4a29..
--- a/net-dns/djbdns/djbdns-1.05-r29.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils flag-o-matic readme.gentoo toolchain-funcs user
-
-DESCRIPTION="Collection of DNS client/server software"
-HOMEPAGE="http://cr.yp.to/djbdns.html;
-IPV6_PATCH="test25"
-
-SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
-   http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
-   ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 )"
-
-SLOT="0"
-LICENSE="public-domain"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86"
-IUSE="ipv6 selinux"
-
-DEPEND="!app-doc/djbdns-man"
-RDEPEND="${DEPEND}
-   sys-apps/ucspi-tcp
-   virtual/daemontools
-   selinux? ( sec-policy/selinux-djbdns )"
-
-src_prepare() {
-   epatch \
-   "${FILESDIR}/headtail.patch" \
-   "${FILESDIR}/dnsroots.patch" \
-   "${FILESDIR}/dnstracesort.patch" \
-   "${FILESDIR}/string_length_255.patch"
-
-   # Fix CVE2009-0858
-   epatch 
"${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
-
-   if use ipv6; then
-   elog 'At present dnstrace does NOT support IPv6. It will'\
-'be compiled without IPv6 support.'
-
-   # Create a separate copy of the source tree for dnstrace.
-   cp -pR "${S}" "${S}-noipv6" || die
-
-   # The big ipv6 patch.
-   epatch "${WORKDIR}/${P}-${IPV6_PATCH}.diff"
-
-   # Fix CVE2008-4392 (ipv6)
-   epatch \
-   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-${IPV6_PATCH}.patch"
 \
-   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch" \
-   "${FILESDIR}/makefile-parallel-${IPV6_PATCH}.patch"
-
-   cd "${S}-noipv6" || die
-   fi
-
-   # Fix CVE2008-4392 (no ipv6)
-   epatch \
-   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries.patch" \
-   "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
-
-   # Later versions of the ipv6 patch include this, but even if
-   # USE=ipv6, we're in the ${S}-noipv6 directory at this point.
-   epatch "${FILESDIR}/${PV}-errno.patch"
-
-   epatch_user
-}
-
-src_compile() {
-   echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
-   

[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2016-12-06 Thread Agostino Sarubbo
commit: 0e5dc80257fa93056a3f08676520523a0afe68ff
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Dec  6 11:53:05 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Dec  6 11:53:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e5dc802

net-dns/djbdns: x86 stable wrt bug #404959

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r32.ebuild 
b/net-dns/djbdns/djbdns-1.05-r32.ebuild
index ab2c0f1..2c459f4 100644
--- a/net-dns/djbdns/djbdns-1.05-r32.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r32.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2016-12-06 Thread Agostino Sarubbo
commit: 0de1de10798d8f703195f4b4828b294b5f06e0a8
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Dec  6 11:50:14 2016 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Dec  6 11:50:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de1de10

net-dns/djbdns: amd64 stable wrt bug #404959

Package-Manager: portage-2.3.0
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-dns/djbdns/djbdns-1.05-r32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r32.ebuild 
b/net-dns/djbdns/djbdns-1.05-r32.ebuild
index f337439..ab2c0f1 100644
--- a/net-dns/djbdns/djbdns-1.05-r32.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r32.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2016-12-05 Thread Tobias Klausmann
commit: 551e0c8105de5537c91c19d6827d8263055a8f6f
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Mon Dec  5 15:48:35 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Mon Dec  5 15:48:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=551e0c81

net-dns/djbdns-1.05-r32: stable on alpha

Gentoo-Bug: 404959

 net-dns/djbdns/djbdns-1.05-r32.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r32.ebuild 
b/net-dns/djbdns/djbdns-1.05-r32.ebuild
index 8dcc0f3..f337439 100644
--- a/net-dns/djbdns/djbdns-1.05-r32.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r32.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/files/, net-dns/djbdns/

2016-12-03 Thread Thomas Deutschmann
commit: f19fd949c1e9d06252fdb59c0f1fb0142cb7d9c8
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Fri Dec  2 18:53:41 2016 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Sat Dec  3 20:56:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f19fd949

net-dns/djbdns: Sec rev bump to v1.05-r32 (bug #404959)

CVE-2012-1191

Closes: https://github.com/gentoo/gentoo/pull/2988

Package-Manager: portage-2.3.2

 net-dns/djbdns/djbdns-1.05-r32.ebuild  | 155 +
 .../CVE2012-1191_0001-ghost-domain-attack.patch|  22 +++
 2 files changed, 177 insertions(+)

diff --git a/net-dns/djbdns/djbdns-1.05-r32.ebuild 
b/net-dns/djbdns/djbdns-1.05-r32.ebuild
new file mode 100644
index ..8dcc0f3
--- /dev/null
+++ b/net-dns/djbdns/djbdns-1.05-r32.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit flag-o-matic readme.gentoo-r1 toolchain-funcs user
+
+DESCRIPTION="Collection of DNS client/server software"
+HOMEPAGE="http://cr.yp.to/djbdns.html;
+IPV6_PATCH="test27"
+
+SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
+   http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
+   ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 )"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 selinux"
+
+DEPEND=""
+RDEPEND="sys-apps/ucspi-tcp
+   virtual/daemontools
+   selinux? ( sec-policy/selinux-djbdns )"
+
+src_unpack(){
+   # Unpack both djbdns and its man pages to separate directories.
+   default
+
+   # Now move the man pages under ${S} so that user patches can be
+   # applied to them as well in src_prepare().
+   mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
+}
+
+src_prepare() {
+   eapply \
+   "${FILESDIR}/headtail-r1.patch" \
+   "${FILESDIR}/dnsroots.patch" \
+   "${FILESDIR}/dnstracesort.patch" \
+   "${FILESDIR}/string_length_255.patch" \
+   "${FILESDIR}/srv_record_support.patch" \
+   "${FILESDIR}/increase-cname-recustion-depth.patch"
+
+   # Fix CVE2009-0858
+   eapply 
"${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
+
+   # Fix CVE2012-1191
+   eapply "${FILESDIR}/CVE2012-1191_0001-ghost-domain-attack.patch"
+
+   if use ipv6; then
+   elog 'At present dnstrace does NOT support IPv6. It will'\
+'be compiled without IPv6 support.'
+
+   # Create a separate copy of the source tree for dnstrace.
+   cp -pR "${S}" "${S}-noipv6" || die
+
+   # The big ipv6 patch.
+   eapply "${WORKDIR}/${P}-${IPV6_PATCH}.diff"
+
+   # Fix CVE2008-4392 (ipv6)
+   eapply \
+   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25-r1.patch"
 \
+   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch" \
+   "${FILESDIR}/makefile-parallel-test25.patch"
+
+   cd "${S}-noipv6" || die
+   fi
+
+   # Fix CVE2008-4392 (no ipv6)
+   eapply \
+   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch"
 \
+   "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
+
+   # Later versions of the ipv6 patch include this, but even if
+   # USE=ipv6, we're in the ${S}-noipv6 directory at this point.
+   eapply "${FILESDIR}/${PV}-errno-r1.patch"
+
+   eapply_user
+}
+
+src_compile() {
+   echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+   echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+   echo "/usr" > conf-home || die
+   emake
+
+   # If djbdns is compiled with IPv6 support, it breaks dnstrace.
+   # Therefore we must compile dnstrace separately without IPv6
+   # support.
+   if use ipv6; then
+   elog 'Compiling dnstrace without ipv6 support'
+   cp conf-cc conf-ld conf-home "${S}-noipv6/" || die
+   cd "${S}-noipv6" || die
+   emake dnstrace
+   fi
+}
+
+src_install() {
+   insinto /etc
+   doins dnsroots.global
+
+   into /usr
+   dobin *-conf dnscache tinydns walldns rbldns pickdns axfrdns \
+   *-get *-data *-edit dnsip dnsipq dnsname dnstxt dnsmx \
+   dnsfilter random-ip dnsqr dnsq dnstrace dnstracesort
+
+   if use ipv6; then
+   dobin dnsip6 dnsip6q "${S}-noipv6/dnstrace"
+   fi
+
+   dodoc CHANGES README
+
+   doman man/*.[158]
+
+   readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+   # The nofiles group is no longer provided by baselayout.
+   # Share it with qmail if possible.
+   enewgroup nofiles 200
+
+   enewuser dnscache -1 -1 -1 

[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/

2016-11-24 Thread Tobias Klausmann
commit: 5d9834f19d89456ff99905c995e6a8ed29ed1b90
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Thu Nov 24 09:50:20 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Thu Nov 24 09:50:20 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d9834f1

net-dns/djbdns-1.05-r31: stable on alpha

Gentoo-Bug: 600634

 net-dns/djbdns/djbdns-1.05-r31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-dns/djbdns/djbdns-1.05-r31.ebuild 
b/net-dns/djbdns/djbdns-1.05-r31.ebuild
index 28341aa..83d3925 100644
--- a/net-dns/djbdns/djbdns-1.05-r31.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r31.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
 
 SLOT="0"
 LICENSE="public-domain"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ipv6 selinux"
 
 DEPEND=""



[gentoo-commits] repo/gentoo:master commit in: net-dns/djbdns/, net-dns/djbdns/files/

2016-08-05 Thread Michael Orlitzky
commit: e36913e087879c62aaa678f2ba35927a17af9b1c
Author: Michael Orlitzky  gentoo  org>
AuthorDate: Fri Aug  5 13:41:35 2016 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Fri Aug  5 13:41:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e36913e0

net-dns/djbdns: new revision with increased dnscache recursion depth.

There is a hard limit on the number of recursive queries that dnscache
will perform. This new revision adds a patch, increasing a loop
iteration limit from 100 to 200, and thus increasing the recursion
depth. The patch was based on a similar fix for OpenWrt, suggested by
John Stile.

With the new revision, the ebuild was updated to EAPI=6. The eutils
eclass was dropped as "epatch" was replaced with "eapply"; some
patches needed new revisions to work with -p1, as eapply does. Two
other patches needed revisions to avoid fuzz from the new fix.

Gentoo-Bug: 590548
Reported-By: John Stile

Package-Manager: portage-2.2.28

 net-dns/djbdns/djbdns-1.05-r31.ebuild  | 152 +
 net-dns/djbdns/files/1.05-errno-r1.patch   |  11 +
 ...e-similar-outgoing-queries-ipv6-test25-r1.patch | 351 +
 ...nscache-merge-similar-outgoing-queries-r1.patch | 349 
 net-dns/djbdns/files/headtail-r1.patch |  67 
 .../files/increase-cname-recustion-depth.patch |  43 +++
 6 files changed, 973 insertions(+)

diff --git a/net-dns/djbdns/djbdns-1.05-r31.ebuild 
b/net-dns/djbdns/djbdns-1.05-r31.ebuild
new file mode 100644
index 000..28341aa
--- /dev/null
+++ b/net-dns/djbdns/djbdns-1.05-r31.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit flag-o-matic readme.gentoo-r1 toolchain-funcs user
+
+DESCRIPTION="Collection of DNS client/server software"
+HOMEPAGE="http://cr.yp.to/djbdns.html;
+IPV6_PATCH="test27"
+
+SRC_URI="http://cr.yp.to/djbdns/${P}.tar.gz
+   http://smarden.org/pape/djb/manpages/${P}-man.tar.gz
+   ipv6? ( http://www.fefe.de/dns/${P}-${IPV6_PATCH}.diff.bz2 )"
+
+SLOT="0"
+LICENSE="public-domain"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ipv6 selinux"
+
+DEPEND=""
+RDEPEND="sys-apps/ucspi-tcp
+   virtual/daemontools
+   selinux? ( sec-policy/selinux-djbdns )"
+
+src_unpack(){
+   # Unpack both djbdns and its man pages to separate directories.
+   default
+
+   # Now move the man pages under ${S} so that user patches can be
+   # applied to them as well in src_prepare().
+   mv "${PN}-man" "${P}/man" || die "failed to transplant man pages"
+}
+
+src_prepare() {
+   eapply \
+   "${FILESDIR}/headtail-r1.patch" \
+   "${FILESDIR}/dnsroots.patch" \
+   "${FILESDIR}/dnstracesort.patch" \
+   "${FILESDIR}/string_length_255.patch" \
+   "${FILESDIR}/srv_record_support.patch" \
+   "${FILESDIR}/increase-cname-recustion-depth.patch"
+
+   # Fix CVE2009-0858
+   eapply 
"${FILESDIR}/CVE2009-0858_0001-check-response-domain-name-length.patch"
+
+   if use ipv6; then
+   elog 'At present dnstrace does NOT support IPv6. It will'\
+'be compiled without IPv6 support.'
+
+   # Create a separate copy of the source tree for dnstrace.
+   cp -pR "${S}" "${S}-noipv6" || die
+
+   # The big ipv6 patch.
+   eapply "${WORKDIR}/${P}-${IPV6_PATCH}.diff"
+
+   # Fix CVE2008-4392 (ipv6)
+   eapply \
+   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-ipv6-test25-r1.patch"
 \
+   
"${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records-ipv6.patch" \
+   "${FILESDIR}/makefile-parallel-test25.patch"
+
+   cd "${S}-noipv6" || die
+   fi
+
+   # Fix CVE2008-4392 (no ipv6)
+   eapply \
+   
"${FILESDIR}/CVE2008-4392_0001-dnscache-merge-similar-outgoing-queries-r1.patch"
 \
+   "${FILESDIR}/CVE2008-4392_0002-dnscache-cache-soa-records.patch"
+
+   # Later versions of the ipv6 patch include this, but even if
+   # USE=ipv6, we're in the ${S}-noipv6 directory at this point.
+   eapply "${FILESDIR}/${PV}-errno-r1.patch"
+
+   eapply_user
+}
+
+src_compile() {
+   echo "$(tc-getCC) ${CFLAGS}" > conf-cc || die
+   echo "$(tc-getCC) ${LDFLAGS}" > conf-ld || die
+   echo "/usr" > conf-home || die
+   emake
+
+   # If djbdns is compiled with IPv6 support, it breaks dnstrace.
+   # Therefore we must compile dnstrace separately without IPv6
+   # support.
+   if use ipv6; then
+   elog 'Compiling dnstrace without ipv6 support'
+   cp conf-cc conf-ld conf-home "${S}-noipv6/" || die
+   cd "${S}-noipv6" || die
+   emake dnstrace
+