From 992d469e00d3c70b66c1d960e5c9587ec55baceb Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Thu, 5 Nov 2009 23:42:31 +0000 Subject: Version bump to 1.0.0 git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5553 ce84e21b-d406-0410-9b95-82705330c041 --- debian/changelog | 6 +++++ gentoo/bcfg2-1.0.0.ebuild | 54 +++++++++++++++++++++++++++++++++++++++++++ gentoo/bcfg2-1.0.0_rc4.ebuild | 54 ------------------------------------------- misc/bcfg2.spec | 6 ++--- redhat/VERSION | 2 +- setup.py | 2 +- src/lib/Server/Admin/Init.py | 1 - 7 files changed, 65 insertions(+), 60 deletions(-) create mode 100644 gentoo/bcfg2-1.0.0.ebuild delete mode 100644 gentoo/bcfg2-1.0.0_rc4.ebuild diff --git a/debian/changelog b/debian/changelog index 2191f4463..a83bc0c3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +bcfg2 (1.0.0-1) unstable; urgency=low + + * final release + + -- Narayan Desai Thu, 05 Nov 2009 17:40:46 -0600 + bcfg2 (1.0.0~rc4-1) unstable; urgency=low * last release candidate diff --git a/gentoo/bcfg2-1.0.0.ebuild b/gentoo/bcfg2-1.0.0.ebuild new file mode 100644 index 000000000..c482a5d70 --- /dev/null +++ b/gentoo/bcfg2-1.0.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +inherit distutils + +DESCRIPTION="Bcfg2 is a configuration management tool." +HOMEPAGE="http://trac.mcs.anl.gov/projects/bcfg2" + +# handle the "pre" case +MY_P="${P/_/}" +SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="BSD" +SLOT="1" +KEYWORDS="~amd64 ~x86" +IUSE="server" + +DEPEND=">=dev-lang/python-2.5" + +RDEPEND="app-portage/gentoolkit + >=dev-lang/python-2.6 + server? ( + dev-python/lxml + app-admin/gam-server )" + +src_install() { + distutils_src_install --record=PY_SERVER_LIBS --install-scripts /usr/sbin + + # Remove files only necessary for a server installation + if ! use server; then + rm -rf "${D}"/usr/sbin/bcfg2-* + rm -rf "${D}"/usr/share/bcfg2 + rm -rf "${D}"/usr/share/man/man8 + fi + + # Install a server init.d script + if use server; then + newinitd "${FILESDIR}"/bcfg2-server.rc bcfg2-server + fi + + insinto /etc + doins "${S}"/examples/bcfg2.conf +} + +pkg_postinst () { + use server && einfo "If this is a new installation, you probably need to run: " + use server && einfo " bcfg2-admin init" +} + +pkg_postrm () { + python_mod_cleanup +} diff --git a/gentoo/bcfg2-1.0.0_rc4.ebuild b/gentoo/bcfg2-1.0.0_rc4.ebuild deleted file mode 100644 index c482a5d70..000000000 --- a/gentoo/bcfg2-1.0.0_rc4.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -inherit distutils - -DESCRIPTION="Bcfg2 is a configuration management tool." -HOMEPAGE="http://trac.mcs.anl.gov/projects/bcfg2" - -# handle the "pre" case -MY_P="${P/_/}" -SRC_URI="ftp://ftp.mcs.anl.gov/pub/bcfg/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="BSD" -SLOT="1" -KEYWORDS="~amd64 ~x86" -IUSE="server" - -DEPEND=">=dev-lang/python-2.5" - -RDEPEND="app-portage/gentoolkit - >=dev-lang/python-2.6 - server? ( - dev-python/lxml - app-admin/gam-server )" - -src_install() { - distutils_src_install --record=PY_SERVER_LIBS --install-scripts /usr/sbin - - # Remove files only necessary for a server installation - if ! use server; then - rm -rf "${D}"/usr/sbin/bcfg2-* - rm -rf "${D}"/usr/share/bcfg2 - rm -rf "${D}"/usr/share/man/man8 - fi - - # Install a server init.d script - if use server; then - newinitd "${FILESDIR}"/bcfg2-server.rc bcfg2-server - fi - - insinto /etc - doins "${S}"/examples/bcfg2.conf -} - -pkg_postinst () { - use server && einfo "If this is a new installation, you probably need to run: " - use server && einfo " bcfg2-admin init" -} - -pkg_postrm () { - python_mod_cleanup -} diff --git a/misc/bcfg2.spec b/misc/bcfg2.spec index 6de395e1e..d183d69a0 100644 --- a/misc/bcfg2.spec +++ b/misc/bcfg2.spec @@ -13,14 +13,14 @@ %define lxmldep %(rpm -q %{alt_lxml} 2>&1 > /dev/null && echo %{alt_lxml} || echo %{dfl_lxml}) Name: bcfg2 -Version: 1.0.0rc4 +Version: 1.0.0 Release: %{release} Summary: Configuration management system Group: Applications/System License: BSD URL: http://trac.mcs.anl.gov/projects/bcfg2 -Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-1.0.0rc4.tar.gz +Source0: ftp://ftp.mcs.anl.gov/pub/bcfg/bcfg2-1.0.0.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -91,7 +91,7 @@ Bcfg2 can enable the construction of complex change management and deployment strategies. %prep -%setup -q -n bcfg2-1.0.0rc4 +%setup -q -n bcfg2-1.0.0 %build %{__python}%{pythonversion} setup.py build diff --git a/redhat/VERSION b/redhat/VERSION index 800a035c5..3eefcb9dd 100644 --- a/redhat/VERSION +++ b/redhat/VERSION @@ -1 +1 @@ -1.0.0rc4 +1.0.0 diff --git a/setup.py b/setup.py index 330722230..04a70c8ed 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ from distutils.core import setup from glob import glob setup(name="Bcfg2", - version="1.0.0rc4", + version="1.0.0", description="Bcfg2 Server", author="Narayan Desai", author_email="desai@mcs.anl.gov", diff --git a/src/lib/Server/Admin/Init.py b/src/lib/Server/Admin/Init.py index 7f5e42939..1488301f8 100644 --- a/src/lib/Server/Admin/Init.py +++ b/src/lib/Server/Admin/Init.py @@ -101,7 +101,6 @@ def create_key(hostname, keypath, certpath): ccstr = "openssl req -batch -new -subj '/C=US/ST=Illinois/L=Argonne/CN=%s' -key %s | openssl x509 -req -days 1000 -signkey %s -out %s" % (hostname, keypath, keypath, certpath) subprocess.call((ccstr), shell=True) os.chmod(keypath, 0600) - os.chmod(certpath, 0600) def create_conf(confpath, confdata): # don't overwrite existing bcfg2.conf file -- cgit v1.2.3-1-g7c22