9 files changed, 304 insertions, 28 deletions
diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index f5b70136623c..5c3116d4d6a9 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-admin/puppet
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.137 2013/02/03 13:01:38 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.138 2013/02/08 16:49:13 prometheanfire Exp $
+
+*puppet-3.0.1-r1 (08 Feb 2013)
+*puppet-2.7.19-r1 (08 Feb 2013)
+
+  08 Feb 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +files/puppetmaster-2.7.6.init-CVE-2012-6120, +puppet-2.7.18-r1.ebuild,
+  -puppet-2.7.19.ebuild, +puppet-2.7.19-r1.ebuild, -puppet-3.0.1.ebuild,
+  +puppet-3.0.1-r1.ebuild, +files/puppet.init-CVE-2012-6120,
+  files/puppet.init-r1, files/puppetmaster.init:
+  updating initscripts with checkpath for bug 456002 CVE-2012-6120
 
   03 Feb 2013; Matthew Thode <prometheanfire@gentoo.org> metadata.xml,
   puppet-3.0.1.ebuild:
diff --git a/app-admin/puppet/Manifest b/app-admin/puppet/Manifest
index b1f848ab4650..78db2a7e0c41 100644
--- a/app-admin/puppet/Manifest
+++ b/app-admin/puppet/Manifest
@@ -4,33 +4,36 @@ Hash: SHA256
 AUX 50puppet-mode-gentoo.el 217 SHA256 e70f8d26e2523d2d118a4944d11540807b48f59d75d878e6fa6aac606ece9a91 SHA512 3fbe7045df9ac9d30520020d4df454a03f02989bbcaa4bae0c632f86f6e6d3fd2eeb3bed84d864077c2b85b65586406525fa621a262ec363f53d714a093f6d1a WHIRLPOOL 60d02a9b70d418cb453d08c17fbeb1133a6ddd924ba18565e30f7c655f5abeebf71af6f17797d3045483ae8775c905efdc11396f4f9829ab2c6b95fbafc2584f
 AUX puppet-2.7.18-eix_fix.patch 1370 SHA256 9414e985fe18c673256dbe5e654018de3d4f8c3c33765e873e1873da7d06a4d1 SHA512 7a5aa71c6ce987c95224c79be55a4b14b4c37aef3960e1aa34e96397564042192f30f8c9f935949768e33a7191ab3ae6335830c68e9bfb2d02c654dbfdbe1fd4 WHIRLPOOL e318b8f60d787bb7947598b91168b96c6d4886602f5f6b90db7336feac00fee61f0c8b3c4c60d0de25f7bc029172a8b10ab6ce1d2115df7755db4344ccd57a3a
 AUX puppet.init 916 SHA256 edad76953e36dab793010955cb4775242271c3e4a22a193ecf1ade4f0716d2bf SHA512 1528e2c9f8d145663f9dab37a5928049ae1063570048f372ceeec3892b3b9e30aa84849056d7799a4a6d292c8227f8132142e115d6019f64050f4989e6584df8 WHIRLPOOL 6295f9eceda2ad94c5e5c9beee5a7549b043c646e8884c01375ec089805a40b037a533a8ce4c04c8f9ccbab0688ac75adceda14e528854ebfcf2d3462e26757c
-AUX puppet.init-r1 506 SHA256 9a1ae80b36981a5b61f98bc201ae3afb3499bb21b95239ccad5d0e89809a57a3 SHA512 4aa0efc012dbd149782361715c90acc652fe3b3352fab3a9913e7115b08d4c5d2515c0cd141c209c357946b5fb75da5e4de12af8a2221a5eba6e07f4f3af7985 WHIRLPOOL 30dc7fff3266498cfc2fa71362e31f0a81f4530029f77ec5d9f57d334f0e7d1c4610d78efc7dec7d02a1ecf36ec69460bdb919b9c30b4f349a812bfe1900fe1d
+AUX puppet.init-CVE-2012-6120 1027 SHA256 d2d9175d9c78490b2227a011227741fde27aeb3a9a099e2003b751b254ba3c95 SHA512 06d8b2fbf62d70d7722a36c28e1200e9f1e8d927e159a747c163cf617023ba772c4bf90b5e96577fdd66e227ed478c53c30d16e906e2b0b3251dd0ad01b4a3a4 WHIRLPOOL 77bc90a44f1151cb3ed346b905da13d9a02884bc821c27555c9e8f6b62ad669f023b3794898d271c01c72cfef25229a55ba91486aab219996806baf87590fa87
+AUX puppet.init-r1 616 SHA256 7be80efaf9ad9c681257a62d594da93f9de0149ab090b97c8bf002267a246bb7 SHA512 4890e06d26df8407e6f2507a3245e1712ed9f5d02558cb542b45a4ec539736e22e31ea5205558289e34caf96e4b2eb649f0380857c5dc72b918fb69114133c62 WHIRLPOOL 49827a6a46fcadadd38a7fda01e10884eb2f0c2691245746f09f1791a08948c887985fbe2a8de556857ade76f73e8f502365e0adef4bcbe5120e1ea0465f043c
 AUX puppetmaster-2.7.6.confd 640 SHA256 2245ae58a702618504257b690fd9b82b3562e7eaaa0d4ef2a96f918996249e8b SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d WHIRLPOOL d0d14ac957978d59ee6b57b53d8d2e4f00a78ac2fc9d5c279457e326fcd08c30c3ad0f884f05580a4e80a00ba02af7496469eed96a91245b2bf3141494c56058
 AUX puppetmaster-2.7.6.init 867 SHA256 3fc62b4850ccd38517d9617671bef2a5d804147383744638de67c6f2289de28c SHA512 0b40c12458fcd15458c243f34d95d2c5d58b43d5f3ee4f215f44a47f73fcd60604cb7c9ca3e71f884ca4b6a23755b7d76a143641192d5959ca0eef9a8e59d4f4 WHIRLPOOL 3f4bdb3a10cbec6933ff88db0bfa3f01a5694faf4de7952f3b39372df00b5c8f96bd534bf53e07f42c791750909711c304541eb26df2691bda701259d6cc8e48
+AUX puppetmaster-2.7.6.init-CVE-2012-6120 1066 SHA256 4f71739cef2abcc9bb861b744af6c88898032b8a44b145aa2ca1bb7121502c57 SHA512 05268387980aad5a0299aeca114c7285377ca1f1a91af9008366d37d21c64830c5db1b8a19f176eeb8239d616c0499996c6d0082e29de81d3945d3009fb30a90 WHIRLPOOL 8c753fc6a8bba8ec7dad5e02021d8e97e24044c3a90bb0d51682ffd9bfa5c3de6e31fae3154573f4fc2c8f72b622148f51b5f846612868b39257a0becfdc1a44
 AUX puppetmaster.confd 640 SHA256 2245ae58a702618504257b690fd9b82b3562e7eaaa0d4ef2a96f918996249e8b SHA512 deb4004dd8448c503099a0cdfcbbfa8e2efed5dc088539bbce5c9db4337f2910b625598402b72db42d68a0a9b6d3570c18fb314f3c9406fa67f946c38c9bf44d WHIRLPOOL d0d14ac957978d59ee6b57b53d8d2e4f00a78ac2fc9d5c279457e326fcd08c30c3ad0f884f05580a4e80a00ba02af7496469eed96a91245b2bf3141494c56058
-AUX puppetmaster.init 900 SHA256 603fcd104aeed9b2f3d8e6915f3117c955dcf7f6d242a1a93e0250ab3e4be938 SHA512 d3c2125d1ff183bf0164f785790047f8e535dd6d5c03da459c5df9994624d82a327c6c453e5a793a07d232129c77153c2c5ab80d9f9e364bddbef79f2d326f4f WHIRLPOOL 260050dddb654859a9d9b2b70f800fb7de71c5ef2afd6d78b5a870199b97eca8b01761d2b1d5ad73217b2acd5c448e0e66e9de6faa835465add82749d3724047
+AUX puppetmaster.init 1099 SHA256 5dd4ebaa436718838a3c60adbc19cbb27723f5e0d4fb5f7ada0e4c9cbf361c42 SHA512 3037625bc5ee7f57f40a15942fbb35807432122efeaeea3baadeb9634e2a73effb24eda1475d34cacc0749f560bea3ddc139ece53c91898214e3f542e77486f9 WHIRLPOOL 08be166f2a2163d76616c2ea5fe5b61920e5e8ad0508245a78a3307850179e51bd244c0e91be472dc350bd57c7e45a3f83fa600af30c77a86b2268ebdd29afb5
 DIST puppet-2.7.18.gem 1920000 SHA256 147cd18ec39d2768bbc40f2735a84f770d9dde1b5679ba21f37edd6f7db19089 SHA512 e51c09baf2eee908f3b4ad1d90c252eb0eca3a1eb550522d0b612db919de305b724a13fdcc7abac51da31291b4a703b2478d2fc9ebfc5aa995ad677aabc42c83 WHIRLPOOL 9f2f4d30acfddd78f0d57ab0a58f400d6c1218e6f5e6541a5f224b9243f5ef5c2dee64bde5a69dff16df42242fa3f44ee226b4aa411a249fc8acafdd1ae17bf3
 DIST puppet-2.7.19.gem 1936384 SHA256 aaa225d83a8fe545a6bcd1b1b6c10373f9cec7c41e38caf56bd0d956892cf2f3 SHA512 3d003c22663226996aa6422d18af446768bd81b67e76e8d1aedf18430bb85df73c3695de9d49340e51f948f661f4c6e24bc83d9d428c9f10634219e01fd641b6 WHIRLPOOL 0ffd63338cc55c13f6bb49bf1487f3b890be04a5ce83939848bace35dd51ff4b01b93ddde146197888455cc65cf8fb4228056c749c7802cd471d9b43dcca5c8c
 DIST puppet-3.0.1.tar.gz 1505102 SHA256 5e4d0cfdd6989faf4f6c5c76c0d3bcfa0364e380549be1a2f7c3abd22b0b562b SHA512 a55e7f30d867d72031d8d8ce5f55e1c7447f08227009164579e72974f4af158350ad568b5dee91e15cfd64c74d7df062bc2249244368bba96216ec8310f9d342 WHIRLPOOL a83716081ccabb590bb1cc86f0e666ae608914450abe722613fc9f4c2c94e9f25c657cf113f8145c73cceb4a1f5b79b851d3f084fd70dd19b245b2a3d3cf9688
+EBUILD puppet-2.7.18-r1.ebuild 4755 SHA256 a7ddaab1b997d2f71d8fb9285ba2b44ef8544440e5374d0419b43c67823bc73d SHA512 59ab02f592eec26d486020c56829adfff928a80561066967d48e479609a42ed58a598bbe60636e37aa92be3fbf92f465e6ba3c1a94a7e8fbd432d9fae273ccb7 WHIRLPOOL 985f64ef5fd2ff389133d360e61650a23ddc99c54423cdf05bcbd536a610ff23ee5d77d1d28518ead7803923c2537f2ec09915933bf4a9497b6654d436bdba55
 EBUILD puppet-2.7.18.ebuild 4712 SHA256 4172930670e5e1e40e2985824dd99247bf4c6befdc61e0865b3b4cef1317ceac SHA512 6b546e75814a9c8aef2944f89f802ca220c01db3dd970927ae4a12a13ac29e598e4bdb4930fbcf1b66022154959de25423ee2b4779931ae9f245300cc829ceb8 WHIRLPOOL df6770a6dbcd85add1b929ba369aee2ab8181adf2ac818d593c39dc36fcd899de717cf7517da0e09554efd0a5fbb14a0d69a1b587dc4d98bcc5b5d8366a7cf58
-EBUILD puppet-2.7.19.ebuild 4786 SHA256 82e95311da20cdc6574abcd1ba32940298d9b4f6b19cfb05782b49f44f69da08 SHA512 fe1d08ac519ae203add0ad2cb1494b04abd1e1d840f8387403d71161484ef03095783e16a30086fe61062341733e082dbfd3956fe66ab91210068d5cd5651e18 WHIRLPOOL ccf5d07362645b6481703a2587f29579d37ef6d80e602396b21788937cf57a09d4680e049658e96e964c463d15390a966b3e321057a12127001a6efbb729ded5
-EBUILD puppet-3.0.1.ebuild 4278 SHA256 f43dc1d6a2a0e2f3125f2282085620d6e940b0c82c6ec2111d38af0a8cb88983 SHA512 694f6f236fc1279fde1dfe799ce2ccdc844cae036c344c49a9997ef7438b2bb7b3cf9feb8b4513a244590bc09ecac2a83df8624822cf9e1bd73a4f009fd7124c WHIRLPOOL 67415e9f61d576f9077223fc70c10f86f4d0e1e39575cd56a3767cf766a0f2551accefb6f3c6b79169fa443626476c49b59cdc4af40fa2b9f3681ac47c2502cd
-MISC ChangeLog 22525 SHA256 49a8cc29f5594c50326c984cc4e7eb3f68f366af066ddc3ca078a481541139db SHA512 9d870cebcd8aa9060ef2b5c645bad4af26bda85957495344791227f773378ee0649133811c6e8ad699f5df5d07d06513f0f90237a43192b701b75b8059e597b2 WHIRLPOOL 7debf868509a505163fa411a14b4d8a3423d862f0144d05aace243f259fe43a7aaf8b1946a8cdf14c22b029c7a6082dacb406f85f4158f838917870f76505640
+EBUILD puppet-2.7.19-r1.ebuild 4826 SHA256 859a2e9570191340c2b5d7d459beca014ccb6e5c3c937640de65b407ca234be5 SHA512 e5f6252ea74795fa1d04272da63d85666fee0543ed27d027209b8eabb5360aeba1be2a36be4f4be62a29511498df748095008d68b5a2f87de073e7d45414091f WHIRLPOOL 7ac08ecdac144581860110e9f440974b9ff13a47cc6c01c82536c95268c593a5ccdd31e5f52f8004ee4538bdf0187e49630a97813c9c511ba2fa8ac3f2f42c96
+EBUILD puppet-3.0.1-r1.ebuild 4308 SHA256 121f1ae410a185fc067d597e2d2fa5b2d4fc0d6810fe6720147685788f7b7532 SHA512 3e2255ba3c247662d0c9e003c4627ce778b90fd2ff718343c7198131bae00667daa92e11ec696bfd516a619b14b6ec575711174df464feaec6d9024ef69e727b WHIRLPOOL ba4346d041b00075b865b4a8f250c12f8584a1cb2c87dceacf31c6e2841a102954e13f027ff284a91cb81e140095fa107d35254a1c08f30eb2d95c98837d4851
+MISC ChangeLog 22971 SHA256 342a8fa777c64e8866bfdaabe53a51551a529c907ed8a1c415eea7bbd9a296f0 SHA512 b58c78f079f12c76f8d5c65d4ae465ce573a2370f6149db7f6304f3d35b3b632ae95c0f69b6bcffcf2a236126ec73ac2c6609135823395e77dfdabc53288c969 WHIRLPOOL 16121dd2cc8b6ff368d39363fcc7520c4914f7566bc0dc3d32c0aeaf04671864604d14c393d1053fa6a8522bfcdf5970a297abd714637ac9b850b4862e7d17a7
 MISC metadata.xml 1178 SHA256 a2bacb8f1f7fe8ea72ecea2729a55402fdff8e88082295b8f27a96077328f83b SHA512 90c5f30845403e8eb5e2218617892d5cfd149deacea62c1ba8533a8773ff79d2e7f4d4b9ffea666237494e0f51fd02cba290d000902aa9811c39be4d8c564952 WHIRLPOOL c7067fd67fc94cdf4fb044428b9142019ef3ef9cb591b5354bc3da6604d54ad68eeb1388f19df40293e1a521f311dd5e447305a03a9a769afb1c96949f8cbe92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRDlzpAAoJECRx6z5ArFrDZZsQAJTt/a+O4+Dts8dmxW8tBpWq
-Rm3l8De4XasvNyTPzfUGJvXBafRglbNx9Me54HS/1ZEUh9QU3CocIf0Cjqvuf3op
-nF0a9MBpxroedJymhUTK/wieO3O36FfZAilSvOBE/1CjwC1rB68pR5R51OXStGsq
-dN1v1zfjVP9uYbKW0nL1YwtJ9THESGfZbEH3HhibHQwjfU6w6Uo+M10HQ7n43jMT
-xr9XE/kEAvL/Y1dw3NbLJ3PKCTFGcnqmkrkgxrh/eXZPXWE+po9JRarH76eID3ii
-WTzu+fDzJWCTfGdVFcW9fz2DF7FPHyq7WHDNciFiqQC21f9b39lSq/18y3Fac89z
-/P8GxOChUmGRm6fG4f6gnuC+Gv4RJeNIg/21nOLeDUfer/68GVFU+Ef5unlO5jcD
-OFgpFenfyqOiBgBhZveXXL+7ErYK3t+ettuG3KSwzDGKaVgoftJj6Mqjsc/qxq5l
-1am/SfSIscS5rLs7OSq/kadCl5w/A5Z+QmcTFnmQ9K+/4tn55kyafapL3oFc9Ro6
-uDJqX8xhh6egtTa0+RwCaRq3HkxD966AnkHFk9D2Vn/ZrKVzrVMoctKTKdGhHI7R
-4KD3VEsZEVZ0hNEsch0DG2OCmSaAPKZHE751hCnOQIvlEPEcuLzBw19uqMy2RtuC
-rZ5q2ggWVBjKzgoYZMdP
-=3fLr
+iQIcBAEBCAAGBQJRFSiHAAoJECRx6z5ArFrDkyYQALZBaF4trth6qmF3UDpUmPy9
++Rt61uZWzblitHm1qYnpGoo9GuACnx3O9GOBYPjgPNILliPPum8JzyaHOdXg+OR8
+5iagttURAOF5xgaoiW2W9DNReYRdyUjrxWxchUCEtawACAYrAJKgKm/IeOexlfRB
+3qIW4xJFcuv/b+vjJekyfSrAEnYr9S4ogywMEeBiieP8fZYubxHRu8rpj9/vrWNe
+BIIMMCDD4gQXMS9XU7XiQjvHhQJ7vd8g8wgs8Q+G02xdyv1BBbTBMQhlsOyI30dH
+oPKdYkwJK/IWqJllC4hCC6hFfny1Zxr1VbFfwB8gjhv5ctmJ6mR9NPjIiVFQz6Su
+QKXUcL7FxP0KV+eCPKiv5iZ+T/BPXqZFIIYoKuhB1WrAFme0kikYYI8aUEOp+dfP
+h6+LrN8fskw7AjVKjFtUrQvPszFGBJrJJjlkYXtCWofuhZ0bsM67mbB4qhkjq3Fn
+gLxs7ZTpOUfSDOQ+qOR6qkpvdbnAYu7Bl5+jlHWyLk48DTQbbdZ53WoOgeX+lXti
+Bcbo4VVowqPSrwn6ufwJBLqIF5aHqyILPAzuqj2nsB3+V+O2d9B/vfCcl2rteqYx
+XpMHVy7Hh8oIlBxzeWEk+aTV5f0rB1zpHRKGJML199cKOzD//v/zskskM5Ru08Cv
+hqWk6nKolQq61pZDBGjd
+=5rCS
 -----END PGP SIGNATURE-----
diff --git a/app-admin/puppet/files/puppet.init-CVE-2012-6120 b/app-admin/puppet/files/puppet.init-CVE-2012-6120
new file mode 100644
index 000000000000..ffa4b568c2f9
--- /dev/null
+++ b/app-admin/puppet/files/puppet.init-CVE-2012-6120
@@ -0,0 +1,43 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+PUPPET_LOG_DIR="/var/log/puppet"
+
+depend() {
+	need localmount net
+	use dns logger puppetmaster netmount nfsmount
+}
+
+checkconfig() {
+	if [ ! -d "${PUPPET_PID_DIR}" ] ; then
+		eerror "Please make sure PUPPET_PID_DIR is defined and points to a existing directory"
+		return 1
+	fi
+    checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+
+	return 0
+}
+
+start() {
+	checkconfig || return $?
+
+	local options=""
+	[ -n "${PUPPET_EXTRA_OPTS}" ] && options="${options} ${PUPPET_EXTRA_OPTS}"
+
+	ebegin "Starting puppet"
+	start-stop-daemon --start --quiet \
+		--pidfile "${PUPPET_PID_DIR}/agent.pid" \
+		--exec /usr/bin/puppetd -- ${options}
+	eend $? "Failed to start puppet"
+}
+
+stop() {
+	ebegin "Stopping puppet"
+	start-stop-daemon --stop --quiet \
+		--pidfile "${PUPPET_PID_DIR}/agent.pid"
+	local ret=$?
+	eend ${ret} "Failed to stop puppet"
+	rm -f "${PUPPET_PID_DIR}/agent.pid"
+	return ${ret}
+}
diff --git a/app-admin/puppet/files/puppet.init-r1 b/app-admin/puppet/files/puppet.init-r1
index cceb3eaeb6b0..72e8efe5fe07 100644
--- a/app-admin/puppet/files/puppet.init-r1
+++ b/app-admin/puppet/files/puppet.init-r1
@@ -1,10 +1,11 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 PUPPET_PID_DIR="${PUPPET_PID_DIR:-/var/run/puppet}"
 
 pidfile="${PUPPET_PID_DIR}/puppet.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
 
 extra_started_commands="reload"
 
@@ -19,4 +20,5 @@ depend() {
 
 start_pre() {
 	checkpath --directory --owner puppet:puppet "${PUPPET_PID_DIR}"
+    checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
 }
diff --git a/app-admin/puppet/files/puppetmaster-2.7.6.init-CVE-2012-6120 b/app-admin/puppet/files/puppetmaster-2.7.6.init-CVE-2012-6120
new file mode 100644
index 000000000000..046b2aa976a0
--- /dev/null
+++ b/app-admin/puppet/files/puppetmaster-2.7.6.init-CVE-2012-6120
@@ -0,0 +1,37 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+if [ "${SVCNAME}" = "puppetmaster" ] ; then
+	PUPPETMASTER_PID="master"
+else
+	PUPPETMASTER_PID="${SVCNAME#*.}"
+fi
+pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
+
+command_args="--pidfile ${pidfile}"
+if [ -n "${PUPPETMASTER_PORT}" ] ; then
+	command_args="${command_args} --masterport ${PUPPETMASTER_PORT}"
+fi
+command_args="${command_args} ${PUPPETMASTER_EXTRA_OPTS}"
+
+command="/usr/bin/puppetmasterd"
+extra_started_commands="reload"
+
+depend() {
+	need localmount net
+	use dns logger slapd netmount nfsmount
+}
+
+start_pre() {
+	checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
+    checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+    checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log"
+}
+
+reload() {
+	ebegin "Reloading ${SVCNAME}"
+	start-stop-daemon --signal HUP --pidfile "${pidfile}"
+	eend $? "Failed to stop ${SVCNAME}"
+}
diff --git a/app-admin/puppet/files/puppetmaster.init b/app-admin/puppet/files/puppetmaster.init
index a38322b2dab4..fe5838482346 100755
--- a/app-admin/puppet/files/puppetmaster.init
+++ b/app-admin/puppet/files/puppetmaster.init
@@ -1,5 +1,5 @@
 #!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 if [ "${SVCNAME}" = "puppetmaster" ] ; then
@@ -9,6 +9,7 @@ else
 fi
 PUPPETMASTER_PID_DIR="${PUPPETMASTER_PID_DIR:-/var/run/puppet}"
 pidfile="${PUPPETMASTER_PID_DIR}/${PUPPETMASTER_PID}.pid"
+PUPPET_LOG_DIR="/var/log/puppet"
 
 command_args="master --pidfile ${pidfile} ${PUPPETMASTER_EXTRA_OPTS}"
 if [ -n "${PUPPETMASTER_PORT}" ] ; then
@@ -25,6 +26,8 @@ depend() {
 
 start_pre() {
 	checkpath --directory --owner puppet:puppet "${PUPPETMASTER_PID_DIR}"
+    checkpath --directory --owner puppet:puppet --mode 750 ${PUPPET_LOG_DIR}
+    checkpath --file --owner puppet:puppet --mode 640 "${PUPPET_LOG_DIR}/masterhttp.log"
 }
 
 reload() {
diff --git a/app-admin/puppet/puppet-2.7.18-r1.ebuild b/app-admin/puppet/puppet-2.7.18-r1.ebuild
new file mode 100644
index 000000000000..c26b474901c8
--- /dev/null
+++ b/app-admin/puppet/puppet-2.7.18-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.18-r1.ebuild,v 1.4 2013/02/08 16:49:13 prometheanfire Exp $
+
+EAPI="4"
+# ruby19: dev-ruby/ruby-ldap has no ruby19
+#USE_RUBY="ruby18 ruby19 ree18"
+USE_RUBY="ruby18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_TASK_TEST="test"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG* README*"
+
+inherit elisp-common xemacs-elisp-common eutils ruby-fakegem user
+
+DESCRIPTION="A system automation and configuration management software"
+HOMEPAGE="http://puppetlabs.com/"
+
+LICENSE="Apache-2.0 GPL-2"
+SLOT="0"
+IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
+
+ruby_add_rdepend "
+	>=dev-ruby/facter-1.5.6
+	augeas? ( dev-ruby/ruby-augeas )
+	diff? ( dev-ruby/diff-lcs )
+	doc? ( dev-ruby/rdoc )
+	ldap? ( dev-ruby/ruby-ldap )
+	shadow? ( dev-ruby/ruby-shadow )
+	sqlite3? ( dev-ruby/sqlite3 )
+	virtual/ruby-ssl"
+#	couchdb? ( dev-ruby/couchrest )
+#	mongrel? ( www-servers/mongrel )
+#	rack? ( >=dev-ruby/rack-1 )
+#	rails? (
+#		dev-ruby/rails
+#		>=dev-ruby/activerecord-2.1
+#	)
+#	stomp? ( dev-ruby/stomp )
+
+DEPEND="${DEPEND}
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )
+	selinux? ( sec-policy/selinux-puppet )"
+RDEPEND="${RDEPEND}
+	emacs? ( virtual/emacs )
+	xemacs? ( app-editors/xemacs )
+	rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	>=app-portage/eix-0.18.0"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/lib/puppet puppet
+}
+
+all_ruby_compile() {
+	all_fakegem_compile
+
+	if use emacs ; then
+		elisp-compile ext/emacs/puppet-mode.el
+	fi
+
+	if use xemacs ; then
+		# Create a separate version for xemacs to be able to install
+		# emacs and xemacs in parallel.
+		mkdir ext/xemacs
+		cp ext/emacs/* ext/xemacs/
+		xemacs-elisp-compile ext/xemacs/puppet-mode.el
+	fi
+}
+
+each_fakegem_install() {
+	${RUBY} install.rb --destdir="${D}" install
+}
+
+all_ruby_install() {
+	all_fakegem_install
+
+	newinitd "${FILESDIR}"/puppet.init-CVE-2012-6120 puppet
+	doconfd conf/gentoo/conf.d/puppet
+
+	# Initial configuration files
+	insinto /etc/puppet
+	# Bug #338439
+	#doins conf/gentoo/puppet/*
+	doins conf/redhat/puppet.conf
+
+	# Location of log and data files
+	keepdir /var/{run,log}/puppet
+	fowners -R puppet:puppet /var/{run,log}/puppet
+
+	if use minimal ; then
+		rm "${ED}/usr/bin/puppetmasterd"
+		rm "${ED}/etc/puppet/auth.conf"
+	else
+		newinitd "${FILESDIR}"/puppetmaster-2.7.6.init-CVE-2012-6120 puppetmaster
+		newconfd "${FILESDIR}"/puppetmaster-2.7.6.confd puppetmaster
+
+		insinto /etc/puppet
+		doins conf/redhat/fileserver.conf
+
+		keepdir /etc/puppet/manifests
+		keepdir /etc/puppet/modules
+
+		keepdir /var/lib/puppet/ssl
+		keepdir /var/lib/puppet/facts
+		keepdir /var/lib/puppet/files
+		fowners -R puppet:puppet /var/{run,log,lib}/puppet
+	fi
+
+	if use emacs ; then
+		elisp-install ${PN} ext/emacs/puppet-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use xemacs ; then
+		xemacs-elisp-install ${PN} ext/xemacs/puppet-mode.el*
+		xemacs-elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins ext/vim/ftdetect/puppet.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins ext/vim/syntax/puppet.vim
+	fi
+
+	# ext and examples files
+	for f in $(find ext examples -type f) ; do
+		docinto "$(dirname ${f})"; dodoc "${f}"
+	done
+	docinto conf; dodoc conf/namespaceauth.conf
+}
+
+pkg_postinst() {
+	elog
+	elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
+	elog "cause puppet to hang while installing packages."
+	elog
+	elog "Puppet uses eix to get information about currently installed packages,"
+	elog "so please keep the eix metadata cache updated so puppet is able to properly"
+	elog "handle package installations."
+	elog
+	elog "Currently puppet only supports adding and removing services to the default"
+	elog "runlevel, if you want to add/remove a service from another runlevel you may"
+	elog "do so using symlinking."
+	elog
+
+	if [ \
+		-f "${EPREFIX}/etc/puppet/puppetd.conf" -o \
+		-f "${EPREFIX}/etc/puppet/puppetmaster.conf" -o \
+		-f "${EPREFIX}/etc/puppet/puppetca.conf" \
+	] ; then
+		elog
+		elog "Please remove deprecated config files."
+		elog "	/etc/puppet/puppetca.conf"
+		elog "	/etc/puppet/puppetd.conf"
+		elog "	/etc/puppet/puppetmasterd.conf"
+		elog
+	fi
+
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+	use xemacs && xemacs-elisp-site-regen
+}
diff --git a/app-admin/puppet/puppet-2.7.19.ebuild b/app-admin/puppet/puppet-2.7.19-r1.ebuild
index 4a6f9f78a485..475b0ec113a9 100644
--- a/app-admin/puppet/puppet-2.7.19.ebuild
+++ b/app-admin/puppet/puppet-2.7.19-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.19.ebuild,v 1.3 2012/11/06 22:00:44 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-2.7.19-r1.ebuild,v 1.1 2013/02/08 16:49:13 prometheanfire Exp $
 
 EAPI="4"
 USE_RUBY="ruby18 ruby19"
@@ -87,7 +87,7 @@ each_fakegem_install() {
 all_ruby_install() {
 	all_fakegem_install
 
-	newinitd "${FILESDIR}"/puppet.init-r1 puppet
+	newinitd "${FILESDIR}"/puppet.init-r1-CVE-2012-6120 puppet
 	doconfd conf/gentoo/conf.d/puppet
 
 	# Initial configuration files
@@ -104,7 +104,7 @@ all_ruby_install() {
 		rm "${ED}/usr/bin/puppetmasterd"
 		rm "${ED}/etc/puppet/auth.conf"
 	else
-		newinitd "${FILESDIR}"/puppetmaster.init puppetmaster
+		newinitd "${FILESDIR}"/puppetmaster.init-CVE-2012-6120 puppetmaster
 		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
 
 		insinto /etc/puppet
diff --git a/app-admin/puppet/puppet-3.0.1.ebuild b/app-admin/puppet/puppet-3.0.1-r1.ebuild
index b971800f2a37..b452fbc0432e 100644
--- a/app-admin/puppet/puppet-3.0.1.ebuild
+++ b/app-admin/puppet/puppet-3.0.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.0.1.ebuild,v 1.11 2013/02/03 13:01:38 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.0.1-r1.ebuild,v 1.1 2013/02/08 16:49:13 prometheanfire Exp $
 
 EAPI="4"
 
@@ -68,7 +68,7 @@ each_ruby_install() {
 }
 
 all_ruby_install() {
-	newinitd "${FILESDIR}"/puppet.init-r1 puppet
+	newinitd "${FILESDIR}"/puppet.init-r1-CVE-2012-6120 puppet
 
 	# Initial configuration files
 	insinto /etc/puppet
@@ -80,7 +80,7 @@ all_ruby_install() {
 	if use minimal ; then
 		rm "${ED}/etc/puppet/auth.conf"
 	else
-		newinitd "${FILESDIR}"/puppetmaster.init puppetmaster
+		newinitd "${FILESDIR}"/puppetmaster.init-CVE-2012-6120 puppetmaster
 		newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
 
 		insinto /etc/puppet