Cleanup. Removed patches for bugs that have been fixed.

Package-Manager: portage-2.1.5_rc2

9 files changed, 19 insertions, 137 deletions

diff --git a/net-dns/pdns-recursor/ChangeLog b/net-dns/pdns-recursor/ChangeLog
index e761e3c27ae3..090b90b00d7a 100644
--- a/net-dns/pdns-recursor/ChangeLog
+++ b/net-dns/pdns-recursor/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-dns/pdns-recursor
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/ChangeLog,v 1.17 2008/03/31 19:50:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/ChangeLog,v 1.18 2008/04/06 23:34:25 swegener Exp $
+
+  06 Apr 2008; Sven Wegener <swegener@gentoo.org>
+  -files/pdns-recursor-3.1.4-chdir.patch,
+  -files/pdns-recursor-3.1.4-gcc42.patch,
+  -files/pdns-recursor-3.1.4-statedir.patch,
+  -files/pdns-recursor-3.1.5-chdir.patch,
+  -files/pdns-recursor-3.1.5-statedir.patch, -pdns-recursor-3.1.4.ebuild,
+  pdns-recursor-3.1.5.ebuild:
+  Cleanup. Removed patches for bugs that have been fixed.
 
   31 Mar 2008; Markus Meier <maekke@gentoo.org> pdns-recursor-3.1.5.ebuild:
   amd64/x86 stable, security bug #215567
diff --git a/net-dns/pdns-recursor/Manifest b/net-dns/pdns-recursor/Manifest
index 2dd23c14cb8f..7e72b868a6f3 100644
--- a/net-dns/pdns-recursor/Manifest
+++ b/net-dns/pdns-recursor/Manifest
@@ -1,23 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX pdns-recursor-3.1.4-chdir.patch 386 RMD160 0bb7ad1428eece74f718da78bac9a343fe7da5b9 SHA1 3f52fdc6778ad7b7ae74e36de46051f648c3aa28 SHA256 30e91c9b382a37b6ccf04145d96ccf0b766ba65a181ab8bb37ec60a3bbb2b090
-AUX pdns-recursor-3.1.4-gcc42.patch 545 RMD160 3ee1fcc65e7f97eb83a6d003c89706ba2196d78c SHA1 84a47380c2c3007400b696aa2a09f97ef2f9a371 SHA256 a9322b3894298f89f5bd2bddc037a23378b7f9cfc4883ad0720bf041d0b83f93
-AUX pdns-recursor-3.1.4-statedir.patch 246 RMD160 28ecc384019adc40616509eaad75babd6c29f2a5 SHA1 56903bc11a4c190a21b8112afe82242c983475e5 SHA256 c48eb99993127a111d904f6874f205014fb685be05d47cb58555bc56162ae187
-AUX pdns-recursor-3.1.5-chdir.patch 386 RMD160 0bb7ad1428eece74f718da78bac9a343fe7da5b9 SHA1 3f52fdc6778ad7b7ae74e36de46051f648c3aa28 SHA256 30e91c9b382a37b6ccf04145d96ccf0b766ba65a181ab8bb37ec60a3bbb2b090
-AUX pdns-recursor-3.1.5-statedir.patch 246 RMD160 75f1cbe5953d7a92a8023e382763c156fd2052f0 SHA1 926c30372bd9a6a12975be1eeb0dc3453cd81a5e SHA256 a2f805e7e849964b79bbc74a134f2626de0fddc8dc6822862dd98011966b248b
 AUX precursor 580 RMD160 71be0984e72763e09173b81f7a76bb5df56667a6 SHA1 ea316b070e8eb123f02e24cd60c568b4dd5aefc6 SHA256 f17d76262bea558604fa01e9d661bbb54af387bd976b54a8a59f7ad4a5a56014
 AUX recursor.conf 452 RMD160 6708700e955dd29041e360d5f0a68c9d3293d665 SHA1 455cbbd4335dbd032b2274498044ba680693d306 SHA256 b36b3310a26785d5e8a38c03bce9afcf8a08e321a81ee385e9557dcaa3957255
-DIST pdns-recursor-3.1.4.tar.bz2 139191 RMD160 0c71b6817a274d85424164bfb88c482edff144b4 SHA1 d1fa344ec5f2feb12397361f92b011a0cb726d48 SHA256 9975ec73e311bda4c22f302f18f4ed4fe701d63bce3155f300ccc561d5b0cc39
 DIST pdns-recursor-3.1.5.tar.bz2 171466 RMD160 c09b4e594b410085e23d9319d14b41f611b0fddf SHA1 5f341955e7027f28383704012dd410eef4698fd7 SHA256 8fde0df7033ee66e720b422038c827d7443ea8eb0e1077da19b34402d9b8d10e
-EBUILD pdns-recursor-3.1.4.ebuild 1264 RMD160 1bd557d86f691988b160d6008a2d6eb189c351ca SHA1 14fa07ceae5bc7365fd6fe920b950ab140eb8521 SHA256 4eba888e598ab95915298e9af8e614f3b7f39e80e2acdb2ee39c3152d39df54b
-EBUILD pdns-recursor-3.1.5.ebuild 1223 RMD160 dfbf5136c9ea94134294e0d3290971553600400c SHA1 05283cfd3e5da2bfe8f3bc7714467e92799e3c11 SHA256 8679c3570d3d7ed7f0498ab60b4bd90dad75293c4b68e003d7395a37932a6a79
-MISC ChangeLog 2935 RMD160 bddad84ba5cda278f3b3ce8cb30cb63df1e16227 SHA1 43ef7538f8c305f65a5252920d1826eb5b882f66 SHA256 571b09636fda06de628f5a2e191aecac276b9139ccf7c1437c97c49323428b04
+EBUILD pdns-recursor-3.1.5.ebuild 1191 RMD160 897496eb89c5210be3769dba4ee8a0a44b091ca2 SHA1 03722d29b82b50450936ac922f4b2cc2bffe92a5 SHA256 7db98d40bd3c6a87028dde1d9289b00527ba4936d0cb2dcf727f6fb4966a9c0f
+MISC ChangeLog 3321 RMD160 20d242238c014fdc52ca692fee0b1069e2e6efb4 SHA1 079dddb103720b93b99217b8df44a5ae75826f5e SHA256 9252b7169f13d70ea44c43658910bf217f9a0d26c9a5457dae93bcbe85ba3902
 MISC metadata.xml 837 RMD160 2622852a4345606d2ffe85a68f50f332a1dbd696 SHA1 4b574c68576b1c058956085df7a07e250361455c SHA256 742f9fd882ba627c0a7b26dff7fe7b439b8ccf728a1394725bbd85f2a28a7d4b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iEYEARECAAYFAkfxQNAACgkQkKaRLQcq0GKKvgCgtUedl6KziDC25iDqeSIf6lvb
-198An2SVXn++owXeBIUTCldRk79xOKGB
-=tClh
+iD8DBQFH+V4GI1lqEGTUzyQRAnfSAKDQsA+gaOzL8wUSQhV4Xjy/pWTTSACcDr0t
+pygv5wUFOuLT8P2/uuOxwjs=
+=XDZv
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-chdir.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-chdir.patch
deleted file mode 100644
index d30ca4286c02..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-chdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- pdns-recursor/pdns_recursor.cc
-+++ pdns-recursor/pdns_recursor.cc
-@@ -1565,6 +1565,10 @@
-     }
-   }
-   
-+  // this is needed to really get into the chroot. and even without chroot
-+  // enabled it's nice to not block the directory we're currently in.
-+  chdir("/");
-+  
-   Utility::dropPrivs(newuid, newgid);
-   g_fdm->addReadFD(s_rcc.d_fd, handleRCC); // control channel
- #endif 
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-gcc42.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-gcc42.patch
deleted file mode 100644
index f20d25baa19a..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-gcc42.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- pdns/recursor_cache.cc
-+++ pdns/recursor_cache.cc
-@@ -11,7 +11,10 @@
- #include "config.h"
- 
- #ifdef GCC_SKIP_LOCKING
--#include <bits/atomicity.h>
-+#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2))
-+# include <ext/atomicity.h>
-+#else
-+# include <bits/atomicity.h>
- // This code is ugly but does speedup the recursor tremendously on multi-processor systems, and even has a large effect (20, 30%) on uniprocessor 
- namespace __gnu_cxx
- {
-@@ -32,6 +35,7 @@
-   }
- }
- #endif
-+#endif
- 
- string simpleCompress(const string& label)
- {
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-statedir.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-statedir.patch
deleted file mode 100644
index e0096c873a8c..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.4-statedir.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- pdns-recursor/config.h
-+++ pdns-recursor/config.h
-@@ -1,5 +1,5 @@
- #define SYSCONFDIR "/etc/powerdns/" 
--#define LOCALSTATEDIR "/var/run/" 
-+#define LOCALSTATEDIR "/var/lib/powerdns" 
- #define VERSION "3.1.4"
- #define RECURSOR
- #ifndef WIN32
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.5-chdir.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.5-chdir.patch
deleted file mode 100644
index d30ca4286c02..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.5-chdir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- pdns-recursor/pdns_recursor.cc
-+++ pdns-recursor/pdns_recursor.cc
-@@ -1565,6 +1565,10 @@
-     }
-   }
-   
-+  // this is needed to really get into the chroot. and even without chroot
-+  // enabled it's nice to not block the directory we're currently in.
-+  chdir("/");
-+  
-   Utility::dropPrivs(newuid, newgid);
-   g_fdm->addReadFD(s_rcc.d_fd, handleRCC); // control channel
- #endif 
diff --git a/net-dns/pdns-recursor/files/pdns-recursor-3.1.5-statedir.patch b/net-dns/pdns-recursor/files/pdns-recursor-3.1.5-statedir.patch
deleted file mode 100644
index 2bd1690084a3..000000000000
--- a/net-dns/pdns-recursor/files/pdns-recursor-3.1.5-statedir.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- pdns-recursor/config.h
-+++ pdns-recursor/config.h
-@@ -1,5 +1,5 @@
- #define SYSCONFDIR "/etc/powerdns/" 
--#define LOCALSTATEDIR "/var/run/" 
-+#define LOCALSTATEDIR "/var/lib/powerdns" 
- #define VERSION "3.1.5"
- #define RECURSOR
- #ifndef WIN32
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild
deleted file mode 100644
index a780a638bfc4..000000000000
--- a/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/pdns-recursor-3.1.4.ebuild,v 1.6 2007/09/22 19:34:04 swegener Exp $
-
-inherit toolchain-funcs flag-o-matic eutils
-
-DESCRIPTION="The PowerDNS Recursor"
-HOMEPAGE="http://www.powerdns.com/"
-SRC_URI="http://downloads.powerdns.com/releases/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">=dev-libs/boost-1.33.1"
-RDEPEND="${DEPEND}
-	!<net-dns/pdns-2.9.20-r1"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-statedir.patch
-	epatch "${FILESDIR}"/${P}-chdir.patch
-	epatch "${FILESDIR}"/${P}-gcc42.patch
-}
-
-src_compile() {
-	filter-flags -ftree-vectorize
-
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dosbin pdns_recursor rec_control || die "dosbin failed"
-	doman pdns_recursor.1 rec_control.1 || die "doman failed"
-
-	insinto /etc/powerdns
-	doins "${FILESDIR}"/recursor.conf || die "doins failed"
-
-	doinitd "${FILESDIR}"/precursor || die "doinitd failed"
-
-	# Pretty ugly, uh?
-	dodir /var/lib/powerdns/var/lib
-	dosym ../.. /var/lib/powerdns/var/lib/powerdns
-}
diff --git a/net-dns/pdns-recursor/pdns-recursor-3.1.5.ebuild b/net-dns/pdns-recursor/pdns-recursor-3.1.5.ebuild
index a6a0be9b9315..0f04bc78cded 100644
--- a/net-dns/pdns-recursor/pdns-recursor-3.1.5.ebuild
+++ b/net-dns/pdns-recursor/pdns-recursor-3.1.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/pdns-recursor-3.1.5.ebuild,v 1.2 2008/03/31 19:50:33 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns-recursor/pdns-recursor-3.1.5.ebuild,v 1.3 2008/04/06 23:34:25 swegener Exp $
 
-inherit toolchain-funcs flag-o-matic eutils
+inherit toolchain-funcs flag-o-matic
 
 DESCRIPTION="The PowerDNS Recursor"
 HOMEPAGE="http://www.powerdns.com/"
@@ -19,10 +19,8 @@ RDEPEND="${DEPEND}
 
 src_unpack() {
 	unpack ${A}
-	cd "${S}"
 
-	epatch "${FILESDIR}"/${P}-statedir.patch
-	epatch "${FILESDIR}"/${P}-chdir.patch
+	sed -i -e s:/var/run/:/var/lib/powerdns: "${S}"/config.h || die
 }
 
 src_compile() {