Revision bump. Fix cf-key --output-file/-f option, upstream bug: https://cfengine.com/bugtracker/view.php?id=390

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

4 files changed, 55 insertions, 8 deletions

diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog
index 364a9c21bad2..e127d3f8605e 100644
--- a/net-misc/cfengine/ChangeLog
+++ b/net-misc/cfengine/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/cfengine
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.115 2010/11/17 10:54:40 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.116 2010/11/19 20:20:34 idl0r Exp $
+
+*cfengine-3.1.0-r1 (19 Nov 2010)
+
+  19 Nov 2010; Christian Ruppert <idl0r@gentoo.org> -cfengine-3.1.0.ebuild,
+  +cfengine-3.1.0-r1.ebuild, +files/cfengine-3.1.0-cf-key.patch:
+  Revision bump. Fix cf-key --output-file/-f option, upstream bug:
+  https://cfengine.com/bugtracker/view.php?id=390
 
   17 Nov 2010; Markus Meier <maekke@gentoo.org> cfengine-2.2.10-r3.ebuild:
   x86 stable, bug #344841
diff --git a/net-misc/cfengine/Manifest b/net-misc/cfengine/Manifest
index b118b4a3727a..b432101c11d3 100644
--- a/net-misc/cfengine/Manifest
+++ b/net-misc/cfengine/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 511666-segfault.patch 731 RMD160 5a1965029fcc27f95ef89aaf74ea7b5e93ff30eb SHA1 1c93030161d91bab21e46df355bbb7da77772f27 SHA256 cb38c886bf92c1ae48000a65a93a2cf610a9b9d991c44fb1b7df00c3bd9af54d
 AUX admit-noclass-520696.patch 400 RMD160 35073a17f2618c189bc3dd9b1a4264b117d6abdb SHA1 39e8a42c9ecca02d51d340fd6dabe91626c494c8 SHA256 d882a327a3788640f96ef7fa5a38953365f358722883ce105c8be973fbb6c5d2
@@ -10,6 +10,7 @@ AUX cfengine-2.2.10-snprintf_buffer_overflow.patch 456 RMD160 58c7369342d9042dd6
 AUX cfengine-3.0.5_p1-Makefile.am.patch 1010 RMD160 63be934e2e0529f320034882cfa7a477bf818d6b SHA1 5370668dc725135cf27252c4928c54e6560ca0e7 SHA256 17558b112bdd3991f4ca18a135e8c96cd10f5477dab5eed208d8f33222ca4dac
 AUX cfengine-3.0.5_p1-configure.ac.patch 13597 RMD160 645163b58d05124f03dc8aa4525954f7412ce038 SHA1 a716dc0af3f835a5327e0e9096ef53d7c0e6120b SHA256 82ff6baf5e8c0215ddda4824d233cd9ab7a144e6bc8c409112980c03cc804835
 AUX cfengine-3.0.5_p1-regex.c.patch 330 RMD160 d5cf6c473f11432b6d215666a0257f1ed980ff44 SHA1 cb4c994df51d91a45ca1d73fef6f9f8951d61a8a SHA256 bc50e35480ab2fb0837f5a68d3ce5d33e06f098ee7c219f4b5c7fe63326ecf4d
+AUX cfengine-3.1.0-cf-key.patch 1440 RMD160 e755aa329f75965f4f95f651627bb66b2bcee216 SHA1 b8a3380f38f893ab5d2cdf9ad7a8446361498335 SHA256 2b53155e33854f9009eac44d33bbf18235c2b3b9c391785cd7d3d14e63c9eae2
 AUX cfengine-3.1.0-configure.ac.patch 13859 RMD160 6c70d29f329d9f3afb14ff7fd64fb9dc45067863 SHA1 06d87c3b6c5903dc2b1a9645b0bb188b67a0d286 SHA256 8e5c076880b185489df8ba69fe5273296d7000fd08a3e62824aa32dad7a2ca04
 AUX cfenvd.rc6 254 RMD160 cbbb932dfee81318437f27b0e644b3201d6e4664 SHA1 d27f693a0744cbbd8f06ec85779935fc1a3181f2 SHA256 de0877e26bbb5cd8eb5da1827308b8fa00c9ce487e61263306c4b57e3ba9e150
 AUX cfexecd.rc6 259 RMD160 05810d7582d962903033ed85b409818dd19089ef SHA1 f95df7747bded2a2d9c5bdcfb1bebc3e3c9ef463 SHA256 98735d665038e372be29ac8b173861491dde1d71fad7d0cefddab0fbf99a157c
@@ -21,13 +22,17 @@ DIST cfengine-3.1.0.tar.gz 2267458 RMD160 b92f76b3ac6c0e92d95c167a8dab1e74e31d21
 EBUILD cfengine-2.2.10-r3.ebuild 3112 RMD160 de8e48260aafe164ebb8e90417149509e2e3bf71 SHA1 9fb12f820de7758478b4faaa66a72e61dd3bdd28 SHA256 7803dcaf53ba4b0b2a5363d59b7abc7d4d90a0962a3ddb78708c7a1ded4971b5
 EBUILD cfengine-2.2.10.ebuild 2720 RMD160 f79ad7c72b4ceac12a0323434b3797c4dbc1f3cb SHA1 cddf8f46bd13c6d1c83bddbcdff56673151f6104 SHA256 6b20bf4737274d6bfbe519dd717a4b19f689296accb431e7b0dae6b16e41a34d
 EBUILD cfengine-3.0.5_p1-r3.ebuild 4306 RMD160 b6ea2704be1f7d0101d6faea87f12091f61655ca SHA1 9c03dfa4830326ad45778b6b7ce86b49a6b1f0ae SHA256 bfe457e2146b25aea305c8d48fa886db31a4fe52e299b8cc62923d7689889a8e
-EBUILD cfengine-3.1.0.ebuild 4269 RMD160 1b4a6354a333522cca0fefc12492949c7ad08226 SHA1 f31e005c947f23abc90cf0522a02c4797b585ff6 SHA256 f834429120a4a37bb397609de6369ea7a6f10e964cb5f012a10c459d4780cccb
-MISC ChangeLog 19777 RMD160 e2010e511e2ab373b69dc724ec0df2dc24e5e08a SHA1 735665433f73d2277bceebdb1aaabc214bfdeb42 SHA256 585100c2e03290cc6a4a692a86d51bfac4af1c7c3ac7226ce13dfaf754c5e60a
+EBUILD cfengine-3.1.0-r1.ebuild 4414 RMD160 c5f5021a142a88c44c2d57fc75d482b4bdb0f92c SHA1 0f2c3da75d1149de14f5f4d44ca71ba5dcb1bf1e SHA256 f3dceb62967c29263e8ca750bbfe17f9eb8194ea08c33ca68b3d0b6887e41c48
+MISC ChangeLog 20069 RMD160 8ff31d4988ddba38c2146b3fd208f800df1066b5 SHA1 5e650bb1e7cb44faf910673072de5e0496cca7de SHA256 d364892163fae0ca29f8eb4f2051682aabfb009e614ec357a136a7559b6faa5d
 MISC metadata.xml 2646 RMD160 2c51382fec40e084a1ef7372505399d079fcedfb SHA1 51acdf2de92d83b818d56a326511a03a5d8a1689 SHA256 f78868dec97c0018b6b59a05e85153a76e44526b65aa77820d8ce9c2cdcf857e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzjtDIACgkQkKaRLQcq0GL6EQCgldP+kH58EEPiNq/73EDZ70uw
-9CQAoJH0u48GVnHMeAaDajP45RXItH7r
-=GA+0
+iQEcBAEBCAAGBQJM5twXAAoJEMOx0zmdw4Z1LNEIAIbksbyqctlqTTH9F+WW6e8Z
+NuupuqrFf8S5zj5yrtsfx/i3w+pQ7WLl7rdoO6hXGY0X0Kf03xC+eKrM7YLocF5l
+gEp87AJc6ntkMi/NFKgz2urUzBmfiYRl5rrhQ/+OwM92kHdmr16nj0XDNl0ndk4V
+MSdsElVuZhf3AgNAJSVcEu6iNkGVPEQV7zdE01pOyo+Mjkkhir1B8sUZkP6ii3hN
+AZjOBaL1XMqvY1aGxPNhOF3CTQXKRlKfqS8rAiv0n2Cp6VK2jbv/Sa4WnjUsOSxQ
+wbnR+YWpMX4atvQjRirIQUEGzUDdJaf2fgGTxrOETnR6cg2XyDKHDZcmeB2S8kg=
+=8tXm
 -----END PGP SIGNATURE-----
diff --git a/net-misc/cfengine/cfengine-3.1.0.ebuild b/net-misc/cfengine/cfengine-3.1.0-r1.ebuild
index 55c5c8b5a797..58216232e030 100644
--- a/net-misc/cfengine/cfengine-3.1.0.ebuild
+++ b/net-misc/cfengine/cfengine-3.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.0.ebuild,v 1.2 2010/11/09 20:02:35 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.1.0-r1.ebuild,v 1.1 2010/11/19 20:20:34 idl0r Exp $
 
 EAPI="3"
 
@@ -40,8 +40,11 @@ PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )"
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	# https://cfengine.com/bugtracker/view.php?id=243
 	epatch "${FILESDIR}/${P}-configure.ac.patch"
 	epatch "${FILESDIR}/${PN}-3.0.5_p1-Makefile.am.patch"
+	# https://cfengine.com/bugtracker/view.php?id=390
+	epatch "${FILESDIR}/${P}-cf-key.patch"
 	eautoreconf
 }
 
diff --git a/net-misc/cfengine/files/cfengine-3.1.0-cf-key.patch b/net-misc/cfengine/files/cfengine-3.1.0-cf-key.patch
new file mode 100644
index 000000000000..5211cc95e58b
--- /dev/null
+++ b/net-misc/cfengine/files/cfengine-3.1.0-cf-key.patch
@@ -0,0 +1,32 @@
+From fa27358c48772ddea52f10fc85d14dbad0ec20a8 Mon Sep 17 00:00:00 2001
+From: Christian Ruppert <idl0r@gentoo.org>
+Date: Fri, 19 Nov 2010 20:53:37 +0100
+Subject: [PATCH 2/2] Fix cf-key --output-file/-f option
+
+CFPRIVKEYFILE and CFPUBKEYFILE has been overriden by CheckWorkingDirectories().
+We now check if both variables are empty (which is the default, without
+		--output-file/-f).
+---
+ src/generic_agent.c |    6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/generic_agent.c b/src/generic_agent.c
+index 8287bbc..483b20f 100644
+--- a/src/generic_agent.c
++++ b/src/generic_agent.c
+@@ -1106,8 +1106,10 @@ if (cfstat(CFWORKDIR,&statbuf) != -1)
+ snprintf(vbuff,CF_BUFSIZE,"%s%cstate%c.",CFWORKDIR,FILE_SEPARATOR,FILE_SEPARATOR);
+ MakeParentDirectory(vbuff,false);
+
+-snprintf(CFPRIVKEYFILE,CF_BUFSIZE,"%s%cppkeys%clocalhost.priv",CFWORKDIR,FILE_SEPARATOR,FILE_SEPARATOR);
+-snprintf(CFPUBKEYFILE,CF_BUFSIZE,"%s%cppkeys%clocalhost.pub",CFWORKDIR,FILE_SEPARATOR,FILE_SEPARATOR);
++if(strlen(CFPRIVKEYFILE) == 0 && strlen(CFPUBKEYFILE) == 0) {
++	snprintf(CFPRIVKEYFILE,CF_BUFSIZE,"%s%cppkeys%clocalhost.priv",CFWORKDIR,FILE_SEPARATOR,FILE_SEPARATOR);
++	snprintf(CFPUBKEYFILE,CF_BUFSIZE,"%s%cppkeys%clocalhost.pub",CFWORKDIR,FILE_SEPARATOR,FILE_SEPARATOR);
++}
+
+ CfOut(cf_verbose,"","Checking integrity of the state database\n");
+ snprintf(vbuff,CF_BUFSIZE,"%s%cstate",CFWORKDIR,FILE_SEPARATOR,FILE_SEPARATOR);
+--
+1.7.2.2
+