Fixed checkpath args. The patch was submitted by Eric Martin, wrt bug #406053.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 28 insertions, 14 deletions

diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index e42128c46a9a..1c159a002d62 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.100 2012/02/29 14:34:13 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.101 2012/03/03 00:08:33 matsuu Exp $
+
+  03 Mar 2012; MATSUU Takuto <matsuu@gentoo.org> files/puppetmaster-2.7.6.init:
+  Fixed checkpath args. The patch was submitted by Eric Martin, wrt bug
+  #406053.
+
+  03 Mar 2012; MATSUU Takuto <matsuu@gentoo.org> files/puppetmaster-2.7.6.init:
+  Fixed checkpath args. The patch was submitted by Eric Martin, wrt bug
+  #406053.
 
   29 Feb 2012; Agostino Sarubbo <ago@gentoo.org> puppet-2.7.11.ebuild:
   Stable for AMD64, wrt security bug #403963
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index 0920af12a0de..e670982793a4 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -1,10 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX 50puppet-mode-gentoo.el 217 RMD160 6ab7ace77c4e2da030c894f6b7f1a520e4950311 SHA1 7f6e97e1db4079bc45021360b0ada69c0482c008 SHA256 e70f8d26e2523d2d118a4944d11540807b48f59d75d878e6fa6aac606ece9a91
 AUX puppet.init 916 RMD160 6fc57ee6e0daab1fdc23660deac947174f2e9da9 SHA1 00042571d62182afd22924447966600e961d9135 SHA256 edad76953e36dab793010955cb4775242271c3e4a22a193ecf1ade4f0716d2bf
 AUX puppetmaster-2.7.6.confd 640 RMD160 6117e911ecc9be8c5eaa5df7562b6c9c56bc28aa SHA1 acfb9bfcee57cf356563f543339e5196aec6c500 SHA256 2245ae58a702618504257b690fd9b82b3562e7eaaa0d4ef2a96f918996249e8b
-AUX puppetmaster-2.7.6.init 861 RMD160 128e7eaa892cfb52da37278c263943186782de91 SHA1 fa6facc1f28055dda3b17294d02afea5fe51ce5e SHA256 16f6429c15d282b3628fa7be926a6edf93358dbdcfe6a45b6594c4301b7e36be
+AUX puppetmaster-2.7.6.init 867 RMD160 3dcf630b8f758a5a6075bd412c7174d182609235 SHA1 85b8e2aadc95658701a89e7aa8b44eef4b272fd0 SHA256 3fc62b4850ccd38517d9617671bef2a5d804147383744638de67c6f2289de28c
 AUX puppetmaster.confd 279 RMD160 64824fc2c88d9069b25d0548fac5981f1ff4fa6b SHA1 d521616310e7a27986c27138bd4d4382238d609a SHA256 6db68d9e093d3d231c8ad35968e8d276f68cdd7aec8577b3f7ac2998d1f91692
 AUX puppetmaster.init 984 RMD160 0f64b00f6b67fd4a7df0ed765fae096d7708abe0 SHA1 73c53119ac29591f1119637eb8818225bc32b95f SHA256 62f0abb0a386620be83586adaf34c1baff4719618d08495a7cbadaa21cc2d101
 DIST puppet-2.6.12.gem 1530880 RMD160 283875f708d07e1b8acbf8cbe8fb6e1f1a67b5bf SHA1 75e6978b13a88b3498e3f79f467a19802ec83672 SHA256 d4dbfb48c42e73fd22d1f3605d6794756f7cd0873e57b3ffde00d81e5ccfa732
@@ -13,16 +13,22 @@ DIST puppet-2.7.9.gem 1802240 RMD160 69fac8fbc4a59a11c93e7bcb555f6cede2b81b75 SH
 EBUILD puppet-2.6.12.ebuild 4811 RMD160 535ceff9dfcc36f6ab2fdf8e18a7a5ee434748ce SHA1 64f16fc5ab0129ba871b77b8a78b224bd71e72eb SHA256 0ab06f8b307100f3682b7edc737c6bb89f4f46fdc657dc1f21a248087132756b
 EBUILD puppet-2.7.11.ebuild 4601 RMD160 b7fdda0e5b4775acf3754420c6c9b0f1958361d5 SHA1 7cc980e2f534b1d4d5c0b999c5f9fc493dc279c5 SHA256 3d23e4b6c41289ac857ed39d56c9499700a3ebdef5f5c2ed935fa081814a0170
 EBUILD puppet-2.7.9.ebuild 4606 RMD160 a09a1b73bfd47c2379015cbe0121c343dda3eece SHA1 7f11203f9605df4352b1d7879ea14057cebc4bbb SHA256 c48813dd7bd1acc3ff9479cbfd9fdf4c42fe884a041187e5db539ee051d68a8d
-MISC ChangeLog 17008 RMD160 e02a66f8acdcbaf2d964df127120c26725152759 SHA1 9aebb57eae815f182af19c4c552aa21062152a4d SHA256 1517c70162a9667e82466a728aaf40d842c86b35d3df4e17ade713c3db38f94d
+MISC ChangeLog 17339 RMD160 e53fb9bfb1137ff1849db1495beebf67d90e871e SHA1 4052ca65e9bc505b077b5884beddc988c1119ac7 SHA256 9899fe5defd8acaf5528b6a143b58a6e2cedc7ba67eb1bdaf9ae2b20dee0589a
 MISC metadata.xml 1129 RMD160 64eb4cc09f22194da11da3c4e01441d846d1e9eb SHA1 bd76204117d9000ea1b3704054dbac3945a09026 SHA256 4e7dfa915273eb359790f38782099255c8e788794539b83205ed866b400d09cf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPTjdrAAoJEOTDgjZ80txdEAYH/3QQnwgxCp4pblNB6TjCnSsy
-j7k1XF0pttYFhVImqPSq61GaHCbLOjK7VP+GSnuBp0/wrVFZu/rbIbI76Owx1J/d
-Zy7LUYYyttN3vw23fH9F68pJXh97DEo3g5xkcSxBvxWBFvqGXgtNOslu3tRQAD7q
-TA2qCJEvD9AM629x7nHBK02C05uWQwpKzWvK4JSP5dczhggZvXBT0gCV34ZEkPm1
-XTdUNQBVXlO/MeM7vvkQxjwtDlILhPbwAvgIEIHhNW9jyXoYpsblxx/q2CsyKxFS
-YKK+NrGqNHLBg1p/Gs8xXMyDezQ2fQZcIJVxvwl3yVe9cklTwsOWWMBf57oW2oQ=
-=80L9
+iQIcBAEBAgAGBQJPUWEKAAoJECaGw+YFKA1pLHsP/i5qA3gvPhJQashNbpcf9bPV
+aqcOVsRZOp/99xNf6y1EIih4pVnnTJXwuUBXhVkuFzahRkY7JWgBMKO0V3Ypevfc
+EvKnJx8bSvQ1goJ8Fyu5bSlH7Qfq4qFEeaXHwPjRZUN1MoroPjB2jEsumW96vTLx
+xO+Q4xM6QBl5Z0dcWDPGFcDJq9FrlGBAtAA9N14UU01LMBPw2zT+k5rKn3mmOgIQ
+oFY4QIysR1yH+YXbAhgqhB+DzWjzyd/Gp6fCZiKza44Vi7M6elu8kG4N2z8Uw4Av
+492MyMh/+DU3nLSxEcE5VwxfzPa9t+IFAmTAVZED5LFOCf9l2LKO/3sN7mDFGVnK
+QL/7U3TD35txOfbiQqmpdDMezffYTbuDXK3LxHxdDJfWi8zYx7jclN1ruClvbLFu
+ZlTZHWN+umXxqWXgIaGfUQD7bxCOy5rs6dvXaINVO5H903oXE0xyb8zFsYhG8a67
+kv3D6QfJlmt/55NBXqsDKQuv4N5YbqajJgZ0z1VYL8NmqNRuTloXAssuESi62hVM
+uIr0rIIEeLB4A567fXuwR3iCedKu+H9fEJpV7F6iqDoVJ81TVAyph0aUgT5UwUtp
+HJv0y/vV51xoPi2kdGbFajJNUrZ/W9UoT2irTfgxGA88q9gdAg1nQW9IIH/9UFq8
+nrhJmdlPKMxqpaGmdh1t
+=oalM
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/files/puppetmaster-2.7.6.init b/app-admin/puppet/files/puppetmaster-2.7.6.init
index 05ed1eb30878..0fb0669ef224 100644
--- a/app-admin/puppet/files/puppetmaster-2.7.6.init
+++ b/app-admin/puppet/files/puppetmaster-2.7.6.init
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 if [ "${SVCNAME}" = "puppetmaster" ] ; then
@@ -24,7 +24,7 @@ depend() {
 }
 
 start_pre() {
-	checkpath --dir --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
+	checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
 }
 
 reload() {