Version bump to latest version. Fixes bug#420741.

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 65 insertions, 14 deletions

diff --git a/net-dns/knot/ChangeLog b/net-dns/knot/ChangeLog
index c0262ab8b3d3..738ca568c116 100644
--- a/net-dns/knot/ChangeLog
+++ b/net-dns/knot/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-dns/knot
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/ChangeLog,v 1.6 2012/05/22 00:14:27 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/ChangeLog,v 1.7 2012/06/12 14:54:00 scarabeus Exp $
+
+*knot-1.0.5 (12 Jun 2012)
+
+  12 Jun 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/knot-braindead-lto.patch, +files/knot-move-pidfile-to-var.patch,
+  +knot-1.0.5.ebuild, -knot-1.0.0.ebuild:
+  Version bump to latest version. Fixes bug#420741.
 
   22 May 2012; Christian Ruppert <idl0r@gentoo.org> metadata.xml:
   Remove bind herd.. It's "empty" for years anyway, bug 417001.
diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 23156d511355..be15f0958ad9 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX knot-braindead-lto.patch 483 RMD160 1df982f09ce5c8d039eebd0b2137ec32b1eccf47 SHA1 69b5f91c54180239628d9389210825dd86065e8e SHA256 66c398a04df766a0450842f3eacfe34fa32686632ffb6edef9adfc520b6264b0
+AUX knot-move-pidfile-to-var.patch 764 RMD160 dc47fcd5d4e96d7844238a085454a8cb1d414d58 SHA1 b258ff0f217ec71fc322678816fac1821b600425 SHA256 0ee573b4fb4cf16265f1ee431587dbdf090424dabd4b0cce0b3fbcaecbae8d60
 AUX knot.init 673 RMD160 c002635fba41fad5aca818fcd182fbf8d3f1bb0c SHA1 928f6b83fc6a6ea19d75aa6a30c2f8c2d1cfc1f1 SHA256 730e530a56e233cb92df4edbd918df8da24c62370f472ee449a47a344e7f738d
-DIST knot-1.0.0.tar.gz 1050994 RMD160 ebbcd502f3aeef93e64cf69c220fb8b8e2d9b7ef SHA1 50aeea2d40a60cf7f4e03494d523607bca7c8678 SHA256 ab947ff09655f44bd4106da65764810ff760b646b83e9b0939ee994f943372a6
-EBUILD knot-1.0.0.ebuild 932 RMD160 887d461f1ae28a82354e6c7e06b7274d23e27978 SHA1 5fe8ceeeb41c71668091bbf482c0b85d7d85e3fb SHA256 e0447c11cb063b7d5801fc55ac700f4dc97b2e919cae2e8058795d3c976971f4
-MISC ChangeLog 1166 RMD160 a8b14d219950cd9df58ed14b404c3659da56b9a7 SHA1 20acb95f352204b4323d8034380f598b4342c47e SHA256 f05a31f195ba1e51e12a0b585026d786f37c43ba2c022e04ed29411a76ecbf8b
+DIST knot-1.0.5.tar.gz 1064340 RMD160 d22d0fd1a5abb9e1105885d4edb7e5265a362d69 SHA1 631343880acfc4b4aa5e0141469e5c8ef88cca96 SHA256 9476aa0444f4c8e9ec96bb284aa7b03a746a8ddfef5dbd287fcb6efedcfcc1dd
+EBUILD knot-1.0.5.ebuild 1044 RMD160 caac46b3b47cbbbc2a847fefa5cdca620a047976 SHA1 03a24578d4e1e6c363a8894ad92685badff78707 SHA256 3b453112f6c3056998d940f3b402e0c4b058d97453470a5f3d25b0fb03330df9
+MISC ChangeLog 1421 RMD160 f86f5b81de228e4254d7b09d8fb41beebdbd77d6 SHA1 ccaef0972557b9771fb384d394c930c65e271615 SHA256 1d95cb9c347034810c9d69b2f6bf30726dc1fd2d8138b040f76eea06cd05d36d
 MISC metadata.xml 214 RMD160 ea476e10a778f79d9273adbbc2403db67d025e10 SHA1 7f156558998e184ab8ea7417fd4739048f012a09 SHA256 0e019c1dee563e5b23815be471ae1b65fcaf721a91ec48037446d41ca787d3e5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCAAGBQJPutpoAAoJEMOx0zmdw4Z1aEUH+wbgJMrXOHJgzzMusx6nnnM1
-zXkGqdQNwrbw73b4r9ORimDtidc7lhIjW5TT36KaUXMuOT05TyhesuQ5YZ5iuqtw
-K/Bf6KyszhcMzxah9OCAh/OzV/eSNcIj4Wkd0AI03bcfmrtC2yWCxDG50ukQPTkj
-11r86OLHuByfK7oxErC48/Np47yInHxQxW6ychw0phaokzJji9f35KIsZQFrRr6i
-mD9mG90u45t9nhUXnY4+70oi/TzjRKnLQJBT6jWeyLOdqrxdUZ44gPoGbyBTbAYt
-T3i9JrN2HmA4JwMpIbaGapqN/qOdM6tLQjQuIuA7R7kUg4rKV80/RAY1thiawbw=
-=uCgE
+iQIcBAEBAgAGBQJP11gTAAoJEOSiRoyO7jvo+2EQALD8xg91zwEUq/CJDYNLXIN8
+Oqtthp2RrS0OZThgWRPpr6DlhWLe2pMMXFKwq1TN1u0O0YzTFwiJOXWoWiXcPC3S
+3lFvjD9z9l3guC3EpGFh4SmFWLqUFGyyRcznBC5brJ/qdg6pmb+lEK07J+6OB3GG
+l8aSRV+P6wxUQ4PY/BXGuomiFhs3zZnNE/4svn7HTacLCjFVrhQz0rMV7Wen7Sbx
+wZtpPD/Gr1wQ7VLf8U23INff19mcNwLluX0ZgwCeIBii/Wcav1QnUO3cl+tuFY+o
+ilBgEmyejJI8fIJaedVG62RVY5oxP2vMOl23y8nKTyr8mJwOdTWSEAlCv9NYoCOG
+dMVUrJf2H9dgg26fU8IU2YIapmdu4x0tjHaWX4osPVHYLA0mOaQ3C74mJ8h3f2hq
+VHwc3Irl4+jht2fO4tLyNA861szh2eMFDzUUfROm4r6W8+7MXs2tDFjKDF7hFYsU
+7dZr4EqlWBcOUQ3FCGmjtT7bP9DTFg8MTMTyEjEB/Kkx4A1IjJlUYCb1IDN1S+Kv
+UUuTdoSmzkpLB8AxL73IFqEs6vofYpi0Z3UMr8Zhsshq61svL7LhZxrV2zh5EgOS
+WWZ/5k+/aCi9oP3qTuTQdLHl7amjLdIM87522YLkvwlgnJjL37RsrmSkU5ge+0Bz
+6AEHhoq9ZQ+CS99rFIQ4
+=66xE
 -----END PGP SIGNATURE-----
diff --git a/net-dns/knot/files/knot-braindead-lto.patch b/net-dns/knot/files/knot-braindead-lto.patch
new file mode 100644
index 000000000000..0089279b80bf
--- /dev/null
+++ b/net-dns/knot/files/knot-braindead-lto.patch
@@ -0,0 +1,11 @@
+diff -urN knot-1.0.5.old/configure.ac knot-1.0.5/configure.ac
+--- knot-1.0.5.old/configure.ac	2012-06-12 15:50:47.954879966 +0200
++++ knot-1.0.5/configure.ac	2012-06-12 16:50:33.207942404 +0200
+@@ -123,7 +123,6 @@
+     ])
+ 
+ # Check for link time optimizations support and predictive commoning
+-AX_CHECK_COMPILER_FLAGS("-flto", [CFLAGS="$CFLAGS -flto"], [])
+ AX_CHECK_COMPILER_FLAGS("-fpredictive-commoning", [CFLAGS="$CFLAGS -fpredictive-commoning"], [])
+ 
+ # Checks for libraries.
diff --git a/net-dns/knot/files/knot-move-pidfile-to-var.patch b/net-dns/knot/files/knot-move-pidfile-to-var.patch
new file mode 100644
index 000000000000..0e5e11424bb0
--- /dev/null
+++ b/net-dns/knot/files/knot-move-pidfile-to-var.patch
@@ -0,0 +1,22 @@
+--- a/src/knot/common.h
++++ b/src/knot/common.h
+@@ -42,7 +42,7 @@ typedef unsigned int uint; /*!< \brief U
+ 
+ #define PROJECT_EXEC SBINDIR "/" "knotd" /*!< \brief  Project executable. */
+ #define ZONEPARSER_EXEC LIBEXECDIR "/" "knot-zcompile" /*!< \brief  Zoneparser executable. */
+-#define PID_FILE "knot.pid" /*!< \brief Server PID file name. */
++#define PID_FILE "/var/run/knotd.pid" /*!< \brief Server PID file name. */
+ 
+ /*
+  * Server.
+--- a/src/knot/conf/conf.c
++++ b/src/knot/conf/conf.c
+@@ -198,7 +198,7 @@ static int conf_process(conf_t *conf)
+ 
+ 	// Create PID file
+ 	if (conf->pidfile == NULL) {
+-		conf->pidfile = strcdup(conf->storage, "/" PID_FILE);
++		conf->pidfile = strdup(PID_FILE);
+ 		if (conf->pidfile == NULL) {
+ 			return KNOTD_ENOMEM;
+ 		}
diff --git a/net-dns/knot/knot-1.0.0.ebuild b/net-dns/knot/knot-1.0.5.ebuild
index 8e36a3ec8a03..95e3ed67b9c7 100644
--- a/net-dns/knot/knot-1.0.0.ebuild
+++ b/net-dns/knot/knot-1.0.5.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/knot-1.0.0.ebuild,v 1.2 2012/05/03 03:59:12 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/knot/knot-1.0.5.ebuild,v 1.1 2012/06/12 14:54:00 scarabeus Exp $
 
 EAPI=4
 
-inherit autotools
+inherit eutils autotools
 
 DESCRIPTION="High-performance authoritative-only DNS server"
 HOMEPAGE="http://www.knot-dns.cz/"
@@ -27,6 +27,9 @@ DEPEND="${RDEPEND}
 "
 
 src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-move-pidfile-to-var.patch \
+		"${FILESDIR}"/${PN}-braindead-lto.patch
 	sed -i \
 		-e 's:-Werror::g' \
 		configure.ac || die