summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Thode <prometheanfire@gentoo.org>2013-09-16 05:46:47 +0000
committerMatthew Thode <prometheanfire@gentoo.org>2013-09-16 05:46:47 +0000
commit9622649926c00dcbd76a2a1bdcc8fe82354d6996 (patch)
tree1ec471ffa5c197fb171ec1c60363f6c1396d603e /app-admin
parentBring hang-fix in 2.3 to stable users (diff)
downloadgentoo-2-9622649926c00dcbd76a2a1bdcc8fe82354d6996.tar.gz
gentoo-2-9622649926c00dcbd76a2a1bdcc8fe82354d6996.tar.bz2
gentoo-2-9622649926c00dcbd76a2a1bdcc8fe82354d6996.zip
verbump of puppet to 3.3.0
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
Diffstat (limited to 'app-admin')
-rw-r--r--app-admin/puppet/ChangeLog8
-rw-r--r--app-admin/puppet/puppet-3.3.0.ebuild (renamed from app-admin/puppet/puppet-3.1.1-r3.ebuild)12
2 files changed, 12 insertions, 8 deletions
diff --git a/app-admin/puppet/ChangeLog b/app-admin/puppet/ChangeLog
index b156d813fcc0..ade5a1be9bb0 100644
--- a/app-admin/puppet/ChangeLog
+++ b/app-admin/puppet/ChangeLog
@@ -1,6 +1,12 @@
# 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.170 2013/08/27 20:58:07 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/ChangeLog,v 1.171 2013/09/16 05:46:47 prometheanfire Exp $
+
+*puppet-3.3.0 (16 Sep 2013)
+
+ 16 Sep 2013; Matthew Thode <prometheanfire@gentoo.org> +puppet-3.3.0.ebuild,
+ -puppet-3.1.1-r3.ebuild:
+ verbump of puppet to 3.3.0
27 Aug 2013; Chris Reffett <creffett@gentoo.org> -puppet-2.7.22.ebuild:
Drop insecure version wrt cleanup for security bug 481186. ACK by
diff --git a/app-admin/puppet/puppet-3.1.1-r3.ebuild b/app-admin/puppet/puppet-3.3.0.ebuild
index 020a457d499f..9ea7a33020e5 100644
--- a/app-admin/puppet/puppet-3.1.1-r3.ebuild
+++ b/app-admin/puppet/puppet-3.3.0.ebuild
@@ -1,8 +1,8 @@
# 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.1.1-r3.ebuild,v 1.2 2013/08/15 15:43:32 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/puppet/puppet-3.3.0.ebuild,v 1.1 2013/09/16 05:46:47 prometheanfire Exp $
-EAPI="4"
+EAPI="5"
USE_RUBY="ruby18 ruby19"
@@ -10,12 +10,11 @@ inherit elisp-common xemacs-elisp-common eutils user ruby-ng versionator
DESCRIPTION="A system automation and configuration management software"
HOMEPAGE="http://puppetlabs.com/"
-SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz
- https://dev.gentoo.org/~prometheanfire/dist/patches/CVEs/puppet-3.1.1-CVE-2013-3567.patch"
+SRC_URI="http://www.puppetlabs.com/downloads/puppet/${P}.tar.gz"
LICENSE="Apache-2.0 GPL-2"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
IUSE="augeas diff doc emacs ldap minimal rrdtool selinux shadow sqlite3 vim-syntax xemacs"
ruby_add_rdepend "
@@ -45,8 +44,7 @@ RDEPEND="${RDEPEND}
SITEFILE="50${PN}-mode-gentoo.el"
-RUBY_PATCHES=( "${DISTDIR}/puppet-3.1.1-CVE-2013-3567.patch"
- "${FILESDIR}/puppet-openrc-status-fix.patch" )
+#RUBY_PATCHES=( "${FILESDIR}/puppet-openrc-status-fix.patch" )
pkg_setup() {
enewgroup puppet