Minor patch to fix the call syntax of "sort", bug 131355.

(Portage version: 2.1_pre9-r4)

6 files changed, 84 insertions, 9 deletions

diff --git a/net-dns/djbdns/ChangeLog b/net-dns/djbdns/ChangeLog
index 946205847701..74df8c359e9d 100644
--- a/net-dns/djbdns/ChangeLog
+++ b/net-dns/djbdns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/djbdns
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.73 2006/03/30 19:29:19 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/ChangeLog,v 1.74 2006/04/26 20:03:24 hansmi Exp $
+
+  26 Apr 2006; Michael Hanselmann <hansmi@gentoo.org>
+  +files/dnstracesort.patch, djbdns-1.05-r17.ebuild:
+  Minor patch to fix the call syntax of "sort", bug 131355.
 
   30 Mar 2006; Michael Hanselmann <hansmi@gentoo.org>
   -djbdns-1.05-r15.ebuild:
diff --git a/net-dns/djbdns/djbdns-1.05-r17.ebuild b/net-dns/djbdns/djbdns-1.05-r17.ebuild
index 0dee57572503..18aba5362ae9 100644
--- a/net-dns/djbdns/djbdns-1.05-r17.ebuild
+++ b/net-dns/djbdns/djbdns-1.05-r17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r17.ebuild,v 1.4 2006/03/25 21:27:37 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/djbdns/djbdns-1.05-r17.ebuild,v 1.5 2006/04/26 20:03:24 hansmi Exp $
 
 IUSE="aliaschain cnamefix doc fwdzone ipv6 \
 	multipleip roundrobin semanticfix static selinux \
@@ -87,8 +87,10 @@ src_unpack() {
 	use multidata && \
 		epatch ${DISTDIR}/djbdns-1.05-multi_tinydns_data.patch
 
-	epatch ${FILESDIR}/headtail.patch
-	epatch ${FILESDIR}/dnsroots.patch
+	epatch \
+		${FILESDIR}/headtail.patch \
+		${FILESDIR}/dnsroots.patch \
+		${FILESDIR}/dnstracesort.patch
 
 	if use ipv6; then
 		einfo "At present dnstrace does NOT support IPv6. It will " \
diff --git a/net-dns/djbdns/files/digest-djbdns-1.05-r14 b/net-dns/djbdns/files/digest-djbdns-1.05-r14
index 6bfd661faa78..766d54b7c98d 100644
--- a/net-dns/djbdns/files/digest-djbdns-1.05-r14
+++ b/net-dns/djbdns/files/digest-djbdns-1.05-r14
@@ -1,9 +1,27 @@
-MD5 3147c5cd56832aa3b41955c7a51cbeb2 djbdns-1.05.tar.gz 85648
 MD5 ac799440bacc9d283e1c228f84cf99d4 djbdns-1.04-fwdzone.patch 6479
-MD5 4c8558be4c763b039de9211368c01b06 round-robin.patch 3239
-MD5 9ff9c640a746331bcb0901d21a0c0e4f dnscache-multiple-ip.patch 7601
+RMD160 99dc685d2f8ec7d7fccafc003cd406e6ec59419d djbdns-1.04-fwdzone.patch 6479
+SHA256 6a77f613e2df6fe51d99bce8a5c092ddedf6eb4205b5e8222a998951448562c9 djbdns-1.04-fwdzone.patch 6479
 MD5 d5c05ae75add84094d45a78a67ab925d djbdns-1.05-multiip.diff 5522
+RMD160 2c60f2fbed9410106ead6b007897c34690a5072f djbdns-1.05-multiip.diff 5522
+SHA256 115a66dcfd8d5e7daa095eb2643f33628d495d3da798ffd0ab1a96f001c3f294 djbdns-1.05-multiip.diff 5522
+MD5 672a27b988dce6e705c4bfce22b3f481 djbdns-1.05-test21.diff.bz2 18318
+RMD160 07ac9d27d488f5feb4c8a72903517a435daf3c8a djbdns-1.05-test21.diff.bz2 18318
+SHA256 0ac7e3d54db306ed924c4fd2462de6e147daa0d603d3e3bc51c6262cdcdce023 djbdns-1.05-test21.diff.bz2 18318
+MD5 3147c5cd56832aa3b41955c7a51cbeb2 djbdns-1.05.tar.gz 85648
+RMD160 a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed djbdns-1.05.tar.gz 85648
+SHA256 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48 djbdns-1.05.tar.gz 85648
+MD5 847766cb1b2fd57eb0cd97ac44b763c7 dnscache-cname-handling.patch 7569
+RMD160 481243ff63c79488cc971128d7cf1d40c9b8ebc8 dnscache-cname-handling.patch 7569
+SHA256 41899b9991e457681adb1ef03675ad8a56e8c8d5d755bb8995e6448f793f2b43 dnscache-cname-handling.patch 7569
+MD5 9ff9c640a746331bcb0901d21a0c0e4f dnscache-multiple-ip.patch 7601
+RMD160 5061d1c545f66efe9cf2158e6edda613dce79f8e dnscache-multiple-ip.patch 7601
+SHA256 793847ed60043407e5dd60e2db0a078d9b444b8a6ac24bb0cf4a56177dcc78a3 dnscache-multiple-ip.patch 7601
+MD5 4c8558be4c763b039de9211368c01b06 round-robin.patch 3239
+RMD160 e3a4e5b9965cf10adf91e2be931372f19ecc0bd6 round-robin.patch 3239
+SHA256 fbc1473e54df406105aa8f2a47e794abed6d2810402415a8b9ca0f7dde278f5f round-robin.patch 3239
 MD5 ef1b5cfe7a6f90e4ed8b342e4f4f1ded tinydns-alias-chain-truncation.patch 1994
+RMD160 dc3f6da0ed12f7eed39e776a61b2ea8ee6b78556 tinydns-alias-chain-truncation.patch 1994
+SHA256 d05af61040451fda1cb2110166c8fdf6244452fe6a2ff38c648a9d695d40f3cb tinydns-alias-chain-truncation.patch 1994
 MD5 219cb6b75878d7a7b9500a6e3ded154f tinydns-data-semantic-error.patch 5096
-MD5 847766cb1b2fd57eb0cd97ac44b763c7 dnscache-cname-handling.patch 7569
-MD5 672a27b988dce6e705c4bfce22b3f481 djbdns-1.05-test21.diff.bz2 18318
+RMD160 a57c1a3262f5b71ca7b0fdfdb644cbb9a92abb8a tinydns-data-semantic-error.patch 5096
+SHA256 7df84f315df230c8951ce0b577c90a8f5d2cd98cc7e6ef820b4e48ff30c12d40 tinydns-data-semantic-error.patch 5096
diff --git a/net-dns/djbdns/files/digest-djbdns-1.05-r16 b/net-dns/djbdns/files/digest-djbdns-1.05-r16
index 9c706025b390..c8e36b51aeff 100644
--- a/net-dns/djbdns/files/digest-djbdns-1.05-r16
+++ b/net-dns/djbdns/files/digest-djbdns-1.05-r16
@@ -1,9 +1,27 @@
 MD5 ac799440bacc9d283e1c228f84cf99d4 djbdns-1.04-fwdzone.patch 6479
+RMD160 99dc685d2f8ec7d7fccafc003cd406e6ec59419d djbdns-1.04-fwdzone.patch 6479
+SHA256 6a77f613e2df6fe51d99bce8a5c092ddedf6eb4205b5e8222a998951448562c9 djbdns-1.04-fwdzone.patch 6479
 MD5 d5c05ae75add84094d45a78a67ab925d djbdns-1.05-multiip.diff 5522
+RMD160 2c60f2fbed9410106ead6b007897c34690a5072f djbdns-1.05-multiip.diff 5522
+SHA256 115a66dcfd8d5e7daa095eb2643f33628d495d3da798ffd0ab1a96f001c3f294 djbdns-1.05-multiip.diff 5522
 MD5 dc35e88e20ffe2670cef5bb4d8a2c183 djbdns-1.05-test23.diff.bz2 18480
+RMD160 33037f2a41abb49c305f3efec4402c6965c8b8b8 djbdns-1.05-test23.diff.bz2 18480
+SHA256 e702f47b4a4c77fe5cec474a8219a072cfaaee07282650b7e0dd322ed82e8f33 djbdns-1.05-test23.diff.bz2 18480
 MD5 3147c5cd56832aa3b41955c7a51cbeb2 djbdns-1.05.tar.gz 85648
+RMD160 a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed djbdns-1.05.tar.gz 85648
+SHA256 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48 djbdns-1.05.tar.gz 85648
 MD5 847766cb1b2fd57eb0cd97ac44b763c7 dnscache-cname-handling.patch 7569
+RMD160 481243ff63c79488cc971128d7cf1d40c9b8ebc8 dnscache-cname-handling.patch 7569
+SHA256 41899b9991e457681adb1ef03675ad8a56e8c8d5d755bb8995e6448f793f2b43 dnscache-cname-handling.patch 7569
 MD5 9ff9c640a746331bcb0901d21a0c0e4f dnscache-multiple-ip.patch 7601
+RMD160 5061d1c545f66efe9cf2158e6edda613dce79f8e dnscache-multiple-ip.patch 7601
+SHA256 793847ed60043407e5dd60e2db0a078d9b444b8a6ac24bb0cf4a56177dcc78a3 dnscache-multiple-ip.patch 7601
 MD5 4c8558be4c763b039de9211368c01b06 round-robin.patch 3239
+RMD160 e3a4e5b9965cf10adf91e2be931372f19ecc0bd6 round-robin.patch 3239
+SHA256 fbc1473e54df406105aa8f2a47e794abed6d2810402415a8b9ca0f7dde278f5f round-robin.patch 3239
 MD5 ef1b5cfe7a6f90e4ed8b342e4f4f1ded tinydns-alias-chain-truncation.patch 1994
+RMD160 dc3f6da0ed12f7eed39e776a61b2ea8ee6b78556 tinydns-alias-chain-truncation.patch 1994
+SHA256 d05af61040451fda1cb2110166c8fdf6244452fe6a2ff38c648a9d695d40f3cb tinydns-alias-chain-truncation.patch 1994
 MD5 219cb6b75878d7a7b9500a6e3ded154f tinydns-data-semantic-error.patch 5096
+RMD160 a57c1a3262f5b71ca7b0fdfdb644cbb9a92abb8a tinydns-data-semantic-error.patch 5096
+SHA256 7df84f315df230c8951ce0b577c90a8f5d2cd98cc7e6ef820b4e48ff30c12d40 tinydns-data-semantic-error.patch 5096
diff --git a/net-dns/djbdns/files/digest-djbdns-1.05-r17 b/net-dns/djbdns/files/digest-djbdns-1.05-r17
index 624b8caee302..f740d9c98f78 100644
--- a/net-dns/djbdns/files/digest-djbdns-1.05-r17
+++ b/net-dns/djbdns/files/digest-djbdns-1.05-r17
@@ -1,11 +1,33 @@
 MD5 bbe7245413c83a31f08a678588ae5a09 djbdns-1.0.5-datadir.patch 2918
+RMD160 95ca3f4dc00d2a3f86948b1582d2cd0c92f35a5d djbdns-1.0.5-datadir.patch 2918
+SHA256 b6913a52720a60d87956bb5f798ef42cffa754e3e6b9c7e0fb9e0f00dd3ce18f djbdns-1.0.5-datadir.patch 2918
 MD5 ac799440bacc9d283e1c228f84cf99d4 djbdns-1.04-fwdzone.patch 6479
+RMD160 99dc685d2f8ec7d7fccafc003cd406e6ec59419d djbdns-1.04-fwdzone.patch 6479
+SHA256 6a77f613e2df6fe51d99bce8a5c092ddedf6eb4205b5e8222a998951448562c9 djbdns-1.04-fwdzone.patch 6479
 MD5 3b59e08b6e9d2c5538762ee60c286867 djbdns-1.05-multi_tinydns_data.patch 1616
+RMD160 805af99dab036084489c066747f2b42de2e747ce djbdns-1.05-multi_tinydns_data.patch 1616
+SHA256 6137e58853e3686576095c26498db3a23b03c59edf9791a97d1aaea0844d0093 djbdns-1.05-multi_tinydns_data.patch 1616
 MD5 d5c05ae75add84094d45a78a67ab925d djbdns-1.05-multiip.diff 5522
+RMD160 2c60f2fbed9410106ead6b007897c34690a5072f djbdns-1.05-multiip.diff 5522
+SHA256 115a66dcfd8d5e7daa095eb2643f33628d495d3da798ffd0ab1a96f001c3f294 djbdns-1.05-multiip.diff 5522
 MD5 dc35e88e20ffe2670cef5bb4d8a2c183 djbdns-1.05-test23.diff.bz2 18480
+RMD160 33037f2a41abb49c305f3efec4402c6965c8b8b8 djbdns-1.05-test23.diff.bz2 18480
+SHA256 e702f47b4a4c77fe5cec474a8219a072cfaaee07282650b7e0dd322ed82e8f33 djbdns-1.05-test23.diff.bz2 18480
 MD5 3147c5cd56832aa3b41955c7a51cbeb2 djbdns-1.05.tar.gz 85648
+RMD160 a832cbfd93e4ccec6a565492a4ee0b3c1b4b68ed djbdns-1.05.tar.gz 85648
+SHA256 3ccd826a02f3cde39be088e1fc6aed9fd57756b8f970de5dc99fcd2d92536b48 djbdns-1.05.tar.gz 85648
 MD5 847766cb1b2fd57eb0cd97ac44b763c7 dnscache-cname-handling.patch 7569
+RMD160 481243ff63c79488cc971128d7cf1d40c9b8ebc8 dnscache-cname-handling.patch 7569
+SHA256 41899b9991e457681adb1ef03675ad8a56e8c8d5d755bb8995e6448f793f2b43 dnscache-cname-handling.patch 7569
 MD5 9ff9c640a746331bcb0901d21a0c0e4f dnscache-multiple-ip.patch 7601
+RMD160 5061d1c545f66efe9cf2158e6edda613dce79f8e dnscache-multiple-ip.patch 7601
+SHA256 793847ed60043407e5dd60e2db0a078d9b444b8a6ac24bb0cf4a56177dcc78a3 dnscache-multiple-ip.patch 7601
 MD5 4c8558be4c763b039de9211368c01b06 round-robin.patch 3239
+RMD160 e3a4e5b9965cf10adf91e2be931372f19ecc0bd6 round-robin.patch 3239
+SHA256 fbc1473e54df406105aa8f2a47e794abed6d2810402415a8b9ca0f7dde278f5f round-robin.patch 3239
 MD5 ef1b5cfe7a6f90e4ed8b342e4f4f1ded tinydns-alias-chain-truncation.patch 1994
+RMD160 dc3f6da0ed12f7eed39e776a61b2ea8ee6b78556 tinydns-alias-chain-truncation.patch 1994
+SHA256 d05af61040451fda1cb2110166c8fdf6244452fe6a2ff38c648a9d695d40f3cb tinydns-alias-chain-truncation.patch 1994
 MD5 219cb6b75878d7a7b9500a6e3ded154f tinydns-data-semantic-error.patch 5096
+RMD160 a57c1a3262f5b71ca7b0fdfdb644cbb9a92abb8a tinydns-data-semantic-error.patch 5096
+SHA256 7df84f315df230c8951ce0b577c90a8f5d2cd98cc7e6ef820b4e48ff30c12d40 tinydns-data-semantic-error.patch 5096
diff --git a/net-dns/djbdns/files/dnstracesort.patch b/net-dns/djbdns/files/dnstracesort.patch
new file mode 100644
index 000000000000..3bf56f5a1ce6
--- /dev/null
+++ b/net-dns/djbdns/files/dnstracesort.patch
@@ -0,0 +1,11 @@
+--- djbdns-1.05/dnstracesort.sh.orig	2006-04-26 21:52:54.000000000 +0200
++++ djbdns-1.05/dnstracesort.sh	2006-04-26 21:53:02.000000000 +0200
+@@ -12,7 +12,7 @@
+     }
+     print
+   }
+-' | sort -t: +0 -2 +4 +3 -4 +2 -3 | uniq | awk -F: '
++' | sort -t: -k 1,3 -k 5 -k 4,5 -k 3,4 | uniq | awk -F: '
+   {
+     type = $1
+     q = $2