[gentoo-commits] gentoo-x86 commit in app-admin/bcfg2: bcfg2-1.2.2-r1.ebuild ChangeLog

[Michael Weber (xmw)]

xmw         12/06/29 06:28:41

  Modified:             ChangeLog
  Added:                bcfg2-1.2.2-r1.ebuild
  Log:
  Revbump to fix trigger plugin security problem (bug 424025)
  
  (Portage version: 2.1.11.3/cvs/Linux x86_64)

Revision  Changes    Path
1.26                 app-admin/bcfg2/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/bcfg2/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/bcfg2/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/bcfg2/ChangeLog?r1=1.25&r2=1.26

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-admin/bcfg2/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog	29 Jun 2012 06:16:32 -0000	1.25
+++ ChangeLog	29 Jun 2012 06:28:41 -0000	1.26
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/bcfg2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/ChangeLog,v 1.25 2012/06/29 06:16:32 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/ChangeLog,v 1.26 2012/06/29 06:28:41 xmw Exp $
+
+*bcfg2-1.2.2-r1 (29 Jun 2012)
+
+  29 Jun 2012; Michael Weber <xmw@g.o> +bcfg2-1.2.2-r1.ebuild,
+  +files/bcfg2-1.2.2-CVE-2012-3366-Trigger-plugin.patch:
+  Revbump to fix trigger plugin security problem (bug 424025)
 
   29 Jun 2012; Michael Weber <xmw@g.o> bcfg2-1.2.2.ebuild, metadata.xml:
   Add IUSE cheetah (bug 423231 by Alexandr Tiurin)



1.1                  app-admin/bcfg2/bcfg2-1.2.2-r1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/bcfg2/bcfg2-1.2.2-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/bcfg2/bcfg2-1.2.2-r1.ebuild?rev=1.1&content-type=text/plain

Index: bcfg2-1.2.2-r1.ebuild
===================================================================
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/bcfg2/bcfg2-1.2.2-r1.ebuild,v 1.1 2012/06/29 06:28:40 xmw Exp $

EAPI="4"

PYTHON_DEPEND="2:2.6"
SUPPORT_PYTHON_ABIS="1"
# ssl module required.
RESTRICT_PYTHON_ABIS="2.4 2.5 3.*"

inherit distutils eutils

DESCRIPTION="configuration management tool"
HOMEPAGE="http://bcfg2.org"
SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${P}.tar.gz"

LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
IUSE="doc cheetah genshi server"

DEPEND="dev-python/setuptools
	doc? ( dev-python/sphinx )"
RDEPEND="app-portage/gentoolkit
	cheetah? ( dev-python/cheetah )
	genshi? ( dev-python/genshi )
	server? (
		virtual/fam
		dev-python/lxml
		dev-libs/libgamin[python] )"

PYTHON_MODNAME="Bcfg2"

distutils_src_install_post_hook() {
	if ! use server; then
		rm -f "$(distutils_get_intermediate_installation_image)${EPREFIX}/usr/sbin/bcfg2-"*
	fi
}

src_prepare() {
	epatch "${FILESDIR}"/${P}-CVE-2012-3366-Trigger-plugin.patch
	distutils_src_prepare
}

src_compile() {
	distutils_src_compile

	if use doc; then
		einfo "Building Bcfg2 documentation"
		PYTHONPATH="build-$(PYTHON -f --ABI)" \
			sphinx-build doc doc_output || die
	fi
}

src_install() {
	distutils_src_install --record=PY_SERVER_LIBS --install-scripts "${EPREFIX}/usr/sbin"

	if ! use server; then
		rm -rf "${ED}usr/share/bcfg2" || die
		rm -rf "${ED}usr/share/man/man8" || die
	else
		newinitd "${FILESDIR}/${PN}-server-1.2.0.rc" bcfg2-server
	fi

	insinto /etc
	doins examples/bcfg2.conf

	if use doc; then
		pushd doc_output > /dev/null
		insinto /usr/share/doc/${PF}/html
		doins -r [a-z]* _images _static || die "Failed to install documentation"
		popd > /dev/null
	fi
}

pkg_postinst () {
	distutils_pkg_postinst

	if use server; then
		einfo "If this is a new installation, you probably need to run:"
		einfo "    bcfg2-admin init"
	fi
}