From 2d5051c014c330b40eda98080c4879f602d529ee Mon Sep 17 00:00:00 2001 From: Christian Ruppert Date: Fri, 15 Oct 2010 20:52:30 +0000 Subject: Remove cfengine-3.0.4. Revision bump from cfengine-2.2.10-r2 to -r3, fixes bug 339808. Remove ~arm, ~sparc, ~ppc keywords due to libvirt useflag. (Portage version: 2.2_rc96/cvs/Linux x86_64) --- net-misc/cfengine/ChangeLog | 11 ++- net-misc/cfengine/cfengine-2.2.10-r2.ebuild | 105 -------------------- net-misc/cfengine/cfengine-2.2.10-r3.ebuild | 107 ++++++++++++++++++++ net-misc/cfengine/cfengine-3.0.4.ebuild | 109 --------------------- net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild | 4 +- .../cfengine-2.2.10-snprintf_buffer_overflow.patch | 11 +++ 6 files changed, 130 insertions(+), 217 deletions(-) delete mode 100644 net-misc/cfengine/cfengine-2.2.10-r2.ebuild create mode 100644 net-misc/cfengine/cfengine-2.2.10-r3.ebuild delete mode 100644 net-misc/cfengine/cfengine-3.0.4.ebuild create mode 100644 net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch (limited to 'net-misc') diff --git a/net-misc/cfengine/ChangeLog b/net-misc/cfengine/ChangeLog index f3f8032538c7..023721c7eddf 100644 --- a/net-misc/cfengine/ChangeLog +++ b/net-misc/cfengine/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for net-misc/cfengine # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.106 2010/09/16 12:15:42 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/ChangeLog,v 1.107 2010/10/15 20:52:29 idl0r Exp $ + +*cfengine-2.2.10-r3 (15 Oct 2010) + + 15 Oct 2010; Christian Ruppert -cfengine-2.2.10-r2.ebuild, + +cfengine-2.2.10-r3.ebuild, + +files/cfengine-2.2.10-snprintf_buffer_overflow.patch, + -cfengine-3.0.4.ebuild, cfengine-3.0.5_p1-r1.ebuild: + Remove cfengine-3.0.4. Revision bump from cfengine-2.2.10-r2 to -r3, fixes + bug 339808. Remove ~arm, ~sparc, ~ppc keywords due to libvirt useflag. *cfengine-3.0.5_p1-r1 (16 Sep 2010) diff --git a/net-misc/cfengine/cfengine-2.2.10-r2.ebuild b/net-misc/cfengine/cfengine-2.2.10-r2.ebuild deleted file mode 100644 index b0c8fb023ed4..000000000000 --- a/net-misc/cfengine/cfengine-2.2.10-r2.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.10-r2.ebuild,v 1.2 2010/05/10 19:18:54 idl0r Exp $ - -EAPI="2" - -inherit eutils - -DESCRIPTION="An automated suite of programs for configuring and maintaining -Unix-like computers" -HOMEPAGE="http://www.cfengine.org/" -SRC_URI="http://www.cfengine.org/tarballs/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86" -IUSE="vim-syntax" - -DEPEND=">=sys-libs/db-4 - >=dev-libs/openssl-0.9.7 - app-portage/portage-utils" -RDEPEND="${DEPEND}" -PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" - -src_prepare() { - # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696 - # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666 - epatch "${FILESDIR}/admit-noclass-520696.patch" \ - "${FILESDIR}/511666-segfault.patch" -} - -src_configure() { - # Enforce /var/cfengine for historical compatibility - econf \ - --with-workdir=/var/cfengine \ - --with-berkeleydb=/usr - - # Fix Makefile to skip doc,inputs, & contrib install to wrong locations - sed -i -e 's/\(DIST_SUBDIRS.*\) contrib inputs doc/\1/' Makefile - sed -i -e 's/\(SUBDIRS.*\) contrib inputs/\1/' Makefile - sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile - - # Fix man pages - sed -i -e 's/\/usr\/local/\/usr/' doc/*.8 -} - -src_install() { - newinitd "${FILESDIR}"/cfservd.rc6 cfservd || die - newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd || die - newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd || die - - make DESTDIR="${D}" install || die - - # Remove static library and libtool file as they are not needed - rm "${D}"/usr/$(get_libdir)/*.la - rm "${D}"/usr/$(get_libdir)/*.a - - dodoc AUTHORS ChangeLog README TODO INSTALL - - # Manually install doc and inputs - doman doc/*.8 - docinto examples - doinfo doc/*.info* - dodoc inputs/*.example - - # Create cfengine working directory - mkdir -p "${D}"/var/cfengine - fperms 700 /var/cfengine - keepdir /var/cfengine/bin - keepdir /var/cfengine/inputs - dodir /var/cfengine/modules -} - -pkg_postinst() { - # Copy cfagent into the cfengine tree otherwise cfexecd won't - # find it. Most hosts cache their copy of the cfengine - # binaries here. This is the default search location for the - # binaries. - - cp -f /usr/sbin/cf{agent,servd,execd} "${ROOT}"/var/cfengine/bin/ - - einfo - einfo "NOTE: The cfportage module has been deprecated in favor of the" - einfo " upstream 'packages' action." - einfo - einfo "Init scripts for cfservd, cfenvd, and cfexecd are now provided." - einfo - einfo "To run cfengine out of cron every half hour modify your crontab:" - einfo "0,30 * * * * /usr/sbin/cfexecd -F" - einfo - - elog "You MUST generate the keys for cfengine by running:" - elog "emerge --config ${CATEGORY}/${PN}" -} - -pkg_config() { - if [ "${ROOT}" == "/" ]; then - if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then - einfo "Generating keys for localhost." - /usr/sbin/cfkey - fi - else - die "cfengine cfkey does not support any value of ROOT other than /." - fi -} diff --git a/net-misc/cfengine/cfengine-2.2.10-r3.ebuild b/net-misc/cfengine/cfengine-2.2.10-r3.ebuild new file mode 100644 index 000000000000..d2bd383ca083 --- /dev/null +++ b/net-misc/cfengine/cfengine-2.2.10-r3.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-2.2.10-r3.ebuild,v 1.1 2010/10/15 20:52:29 idl0r Exp $ + +EAPI="2" + +inherit eutils + +DESCRIPTION="An automated suite of programs for configuring and maintaining +Unix-like computers" +HOMEPAGE="http://www.cfengine.org/" +SRC_URI="http://www.cfengine.org/tarballs/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86" +IUSE="vim-syntax" + +DEPEND=">=sys-libs/db-4 + >=dev-libs/openssl-0.9.7 + app-portage/portage-utils" +RDEPEND="${DEPEND}" +PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" + +src_prepare() { + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=520696 + # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=511666 + # http://bugs.gentoo.org/339808 + epatch "${FILESDIR}/admit-noclass-520696.patch" \ + "${FILESDIR}/511666-segfault.patch" \ + "${FILESDIR}/${P}-snprintf_buffer_overflow.patch" +} + +src_configure() { + # Enforce /var/cfengine for historical compatibility + econf \ + --with-workdir=/var/cfengine \ + --with-berkeleydb=/usr + + # Fix Makefile to skip doc,inputs, & contrib install to wrong locations + sed -i -e 's/\(DIST_SUBDIRS.*\) contrib inputs doc/\1/' Makefile + sed -i -e 's/\(SUBDIRS.*\) contrib inputs/\1/' Makefile + sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile + + # Fix man pages + sed -i -e 's/\/usr\/local/\/usr/' doc/*.8 +} + +src_install() { + newinitd "${FILESDIR}"/cfservd.rc6 cfservd || die + newinitd "${FILESDIR}"/cfenvd.rc6 cfenvd || die + newinitd "${FILESDIR}"/cfexecd.rc6 cfexecd || die + + make DESTDIR="${D}" install || die + + # Remove static library and libtool file as they are not needed + rm "${D}"/usr/$(get_libdir)/*.la + rm "${D}"/usr/$(get_libdir)/*.a + + dodoc AUTHORS ChangeLog README TODO INSTALL + + # Manually install doc and inputs + doman doc/*.8 + docinto examples + doinfo doc/*.info* + dodoc inputs/*.example + + # Create cfengine working directory + mkdir -p "${D}"/var/cfengine + fperms 700 /var/cfengine + keepdir /var/cfengine/bin + keepdir /var/cfengine/inputs + dodir /var/cfengine/modules +} + +pkg_postinst() { + # Copy cfagent into the cfengine tree otherwise cfexecd won't + # find it. Most hosts cache their copy of the cfengine + # binaries here. This is the default search location for the + # binaries. + + cp -f /usr/sbin/cf{agent,servd,execd} "${ROOT}"/var/cfengine/bin/ + + einfo + einfo "NOTE: The cfportage module has been deprecated in favor of the" + einfo " upstream 'packages' action." + einfo + einfo "Init scripts for cfservd, cfenvd, and cfexecd are now provided." + einfo + einfo "To run cfengine out of cron every half hour modify your crontab:" + einfo "0,30 * * * * /usr/sbin/cfexecd -F" + einfo + + elog "You MUST generate the keys for cfengine by running:" + elog "emerge --config ${CATEGORY}/${PN}" +} + +pkg_config() { + if [ "${ROOT}" == "/" ]; then + if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then + einfo "Generating keys for localhost." + /usr/sbin/cfkey + fi + else + die "cfengine cfkey does not support any value of ROOT other than /." + fi +} diff --git a/net-misc/cfengine/cfengine-3.0.4.ebuild b/net-misc/cfengine/cfengine-3.0.4.ebuild deleted file mode 100644 index 792f36a9e7ef..000000000000 --- a/net-misc/cfengine/cfengine-3.0.4.ebuild +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.0.4.ebuild,v 1.4 2010/08/29 10:57:19 idl0r Exp $ - -EAPI="2" - -inherit eutils - -MY_PV="${PV//_beta/b}" -MY_P="${PN}-${MY_PV}" - -DESCRIPTION="An automated suite of programs for configuring and maintaining -Unix-like computers" -HOMEPAGE="http://www.cfengine.org/" -SRC_URI="http://www.cfengine.org/tarballs/${MY_P}.tar.gz" - -LICENSE="GPL-3" -SLOT="3" -KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86" -IUSE="mysql postgres selinux vim-syntax" - -DEPEND=">=sys-libs/db-4 - >=dev-libs/openssl-0.9.7 - dev-libs/libpcre - mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql-base ) - app-portage/portage-utils" -RDEPEND="${DEPEND}" -PDEPEND="vim-syntax? ( app-vim/cfengine-syntax )" -S="${WORKDIR}/${MY_P}" - -src_configure() { - local myconf - - if use mysql || use postgres ; then - myconf="--with-sql" - else - myconf="--without-sql" - fi - # selinux incorrectly enables if it sets --disable-selinux - if use selinux ; then - myconf="${myconf} $(use_enable selinux)" - fi - - # Enforce /var/cfengine for historical compatibility - econf \ - "${myconf}" \ - --with-workdir=/var/cfengine \ - --docdir=/usr/share/doc/"${P}" \ - --with-berkeleydb=/usr || die - - # Fix Makefile to skip inputs - sed -i -e 's/\(SUBDIRS.*\) inputs/\1/' Makefile - sed -i -e 's/\(install-data-am.*\) install-docDATA/\1/' Makefile - # Fix Makefiles to install tests in correct directory - for i in file_masters file_operands units ; do - sed -i -e "s/\(docdir.*\) =.*/\1 = \/usr\/share\/doc\/${P}\/tests\/${i}/" \ - tests/${i}/Makefile - done -} - -src_install() { - newinitd "${FILESDIR}"/cf-serverd.rc6 cf-servd - newinitd "${FILESDIR}"/cf-monitord.rc6 cf-monitord - newinitd "${FILESDIR}"/cf-execd.rc6 cf-execd - - make DESTDIR="${D}" install || die - dodoc AUTHORS ChangeLog README TODO INSTALL - - # Manually install inputs - docinto examples - dodoc inputs/*.cf - - # Create cfengine working directory - mkdir -p "${D}"/var/cfengine - fperms 700 /var/cfengine - keepdir /var/cfengine/bin - keepdir /var/cfengine/inputs -} - -pkg_postinst() { - # Copy cfagent into the cfengine tree otherwise cfexecd won't - # find it. Most hosts cache their copy of the cfengine - # binaries here. This is the default search location for the - # binaries. - - cp -f /usr/sbin/cf-{agent,serverd,execd} "${ROOT}"/var/cfengine/bin/ - - einfo - einfo "Init scripts for cf-serverd, cf-monitord, and cf-execd are provided." - einfo - einfo "To run cfengine out of cron every half hour modify your crontab:" - einfo "0,30 * * * * /usr/sbin/cf-execd -F" - einfo - - elog "You MUST generate the keys for cfengine by running:" - elog "emerge --config ${CATEGORY}/${PN}" -} - -pkg_config() { - if [ "${ROOT}" == "/" ]; then - if [ ! -f "/var/cfengine/ppkeys/localhost.priv" ]; then - einfo "Generating keys for localhost." - /usr/sbin/cf-key - fi - else - die "cfengine cfkey does not support any value of ROOT other than /." - fi -} diff --git a/net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild b/net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild index 66294a83e634..a06d28367bf0 100644 --- a/net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild +++ b/net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild,v 1.1 2010/09/16 12:15:42 idl0r Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/cfengine/cfengine-3.0.5_p1-r1.ebuild,v 1.2 2010/10/15 20:52:29 idl0r Exp $ EAPI="3" @@ -17,7 +17,7 @@ SRC_URI="http://www.cfengine.org/tarballs/${MY_P}.tar.gz" LICENSE="GPL-3" SLOT="3" -KEYWORDS="~amd64 ~arm ~ppc ~s390 ~sparc ~x86" +KEYWORDS="~amd64 ~s390 ~x86" IUSE="examples gd graphviz html ldap libvirt mysql pcre postgres qdbm selinux tests tokyocabinet vim-syntax" diff --git a/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch b/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch new file mode 100644 index 000000000000..dee9b797f6ac --- /dev/null +++ b/net-misc/cfengine/files/cfengine-2.2.10-snprintf_buffer_overflow.patch @@ -0,0 +1,11 @@ +--- src/instrument.c.old 2010-10-15 22:20:58.014091858 +0200 ++++ src/instrument.c 2010-10-15 22:21:34.132271440 +0200 +@@ -542,7 +542,7 @@ while (dbcp->c_get(dbcp, &key, &value, D + + tthen = (time_t)then; + +- snprintf(datebuf,CF_BUFSIZE-1,"%s",ctime(&tthen)); ++ snprintf(datebuf,CF_MAXVARSIZE-1,"%s",ctime(&tthen)); + datebuf[strlen(datebuf)-9] = '\0'; /* Chop off second and year */ + + snprintf(addr,15,"%s",hostname+1); -- cgit v1.2.3-65-gdbad