From 91ef0986786484df054625fb9d57e4a3577d2e16 Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Thu, 24 Mar 2011 01:33:49 +0000 Subject: Version bump. Remove old ebuilds. Security bug #359769 Package-Manager: portage-2.1.9.42/cvs/Linux x86_64 --- app-forensics/openscap/ChangeLog | 9 ++- app-forensics/openscap/Manifest | 35 ++++++----- .../openscap/files/openscap-0.7.1-sql-fix.patch | 26 ++++++++ app-forensics/openscap/openscap-0.6.4.ebuild | 65 -------------------- app-forensics/openscap/openscap-0.6.7.ebuild | 66 -------------------- app-forensics/openscap/openscap-0.7.1.ebuild | 70 ++++++++++++++++++++++ 6 files changed, 121 insertions(+), 150 deletions(-) create mode 100644 app-forensics/openscap/files/openscap-0.7.1-sql-fix.patch delete mode 100644 app-forensics/openscap/openscap-0.6.4.ebuild delete mode 100644 app-forensics/openscap/openscap-0.6.7.ebuild create mode 100644 app-forensics/openscap/openscap-0.7.1.ebuild (limited to 'app-forensics') diff --git a/app-forensics/openscap/ChangeLog b/app-forensics/openscap/ChangeLog index 9aa2209e6b12..519e50ef7d60 100644 --- a/app-forensics/openscap/ChangeLog +++ b/app-forensics/openscap/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-forensics/openscap # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.2 2011/01/30 22:35:51 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.3 2011/03/24 01:33:49 hwoarang Exp $ + +*openscap-0.7.1 (24 Mar 2011) + + 24 Mar 2011; Markos Chandras -openscap-0.6.4.ebuild, + -openscap-0.6.7.ebuild, +openscap-0.7.1.ebuild, + +files/openscap-0.7.1-sql-fix.patch: + Version bump. Remove old ebuilds. Security bug #359769 *openscap-0.6.7 (30 Jan 2011) diff --git a/app-forensics/openscap/Manifest b/app-forensics/openscap/Manifest index 48295e0cf571..9e225721cac2 100644 --- a/app-forensics/openscap/Manifest +++ b/app-forensics/openscap/Manifest @@ -1,26 +1,25 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 -DIST openscap-0.6.4.tar.gz 3730398 RMD160 6270706fa1b778d1654903887dc84e845b0f8390 SHA1 1b9c7778a66d1dcbbae1e14c6e39512a652bab50 SHA256 017e4bc4b19cd3e0ca1fe409fbd112062a5c83df08da20725b25002b83dedc46 -DIST openscap-0.6.7.tar.gz 3884758 RMD160 bc0296befa240a9ea813bf0f00bff39ad4e61b1f SHA1 c6bd9c1bd4357808d0832e507483fcec0e047262 SHA256 40a28eedf1ab269bf7e6c8a46f54f0f2cce602cf6b535c08516cb5dcb373368f -EBUILD openscap-0.6.4.ebuild 1552 RMD160 8ba44b5b0a46472b154669583ff8f162a341fdc9 SHA1 788765b8bba9ed19d5f249053529087df33fb568 SHA256 bf0af860b43d63ae48beda326f745900b9aca1a9203c89b971713d63e50d3e37 -EBUILD openscap-0.6.7.ebuild 1581 RMD160 6f9c4b8d5c4f6f75fde3551aabc252ab68796fe6 SHA1 20ad934317dbb22ecfb593d45764db4a1ee3ca9f SHA256 1945dc654c8fd929aea096ced7cf5c0623375a69779a494f59d497bcf2fad380 -MISC ChangeLog 562 RMD160 c13b33998a5018e8886e1e371a831ac83c23d1bd SHA1 2dd0414d384cfd8c154cdedb026dfdb83d955402 SHA256 899eb071c07004846b5fb860b8022890db921cd07da62fac1ca4600fc3d437a7 +AUX openscap-0.7.1-sql-fix.patch 1122 RMD160 0a98b86f864b3990c97769141a12f78557046883 SHA1 0058400cf127afd688d065c43b5ff22d6cf0f1c6 SHA256 3918480e8c038490101336bbf46d0db91323d5284e168a4f1e270866c263e3a2 +DIST openscap-0.7.1.tar.gz 3897536 RMD160 459f436244c3128148ccdcbe71faee215df5ae0c SHA1 5a39cc2d42fc783da2f0564cf7648f2e4b221346 SHA256 a43013fdcb2c83ba0ae52534db9f405649aac06a92e2c6ecf7fb39d5b78e7a78 +EBUILD openscap-0.7.1.ebuild 1648 RMD160 09888969e9e8b7422447d698e27320b9d4a7cc19 SHA1 5a1008e2b78aa06a608463ac5929c0abdf191af6 SHA256 2528e7c69105b2c52ed0f8cf3498d67fa72ac221a55b96ce533be32aee38614f +MISC ChangeLog 817 RMD160 06d1f1151c0464a4bb9a1324829872c5ac21ec94 SHA1 7ba269e70feafc1c361f727380139e79f52fd178 SHA256 687da92b033e1ce920a0889303dd8e1ba3c28d2ea923d382e868e559a0ebc9ed MISC metadata.xml 666 RMD160 4592a9f2a8c56fd908a4adf7cd0cb403a582d037 SHA1 824f39daed58ac2ae3ca9fa379bbb85f357614f6 SHA256 9495099e414de1b19df3b68239b8ba67e44bec68a78b2c3d428e44bb3690b02f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iQIcBAEBCgAGBQJNReeDAAoJEPqDWhW0r/LCm0AP/j4kLwKrV/y3qpKvT44hUhFT -o9GbR1FjnNYG94eZzLbr6s4qoimYwAhcwnYt4k5+j2/j7KkdnaO3y494TTgEBU63 -IptAQXtkD7r3OCtglpCpCVjMH3ox7MNmD7KaW7qZPpvxN1W+gmFSKG1uxKxqSTBI -Pr3MwUW/7wWwlTYgp3VjTKaveSWEQuD8MnjC630429fNmyqDEp8u+npRTjhoxwxe -T2TRb8SQytNXKilbOT0oQX0J9RjYKp+yEjvh8lPGR0noBMFUUnxqILMFvZv8cK30 -yI4zTOLJzuw0DeA3ypyEvPUD6PG7OzRWbsqyLtHWt4YZRQmvkPWU5mqwaeB+hs1g -I5nDjrf+SDVfTNriN+DrMU69uq5aOvG2waKNiewDQUL8Zrz+nKjjN0WSaX1JdfJW -hs6LvTG4UY2gPS7hUAFtdEPT6PHC+hupxmGzowwgpI+1QtwVHnLzVG63usnPwYEb -wzkWom01CMMGz74rHqZWPgZckGnN3b32k9FzOD22NYug2NEGgtGITwEA/+MqhjsT -ddD8Au3FvsA9qon9FyMjg2qzVJC+HyyJk7S6IQlRBsugU1E2kppBUiNTnE1CNUQ2 -DWN8kSZA3bcr+Bi+/RoIoYoItPIxmz2BmhcRJWncz3O/btJv3HnI8/Xz5BL7iKUo -eCyodxdBZjEsveLg16uu -=AIzi +iQIcBAEBCgAGBQJNip+KAAoJEPqDWhW0r/LCu+cP/jb/y5j60IINvxUCQ/z0yHps +ohBz4Da3H0LWu2xmHkeUE3qt3wdFwiDh+Fl5hR52m6bIA0JjpsSIaBVAtrN+aWPK +xOhtEva7EwX7LeXtP/7/+Q6xtKblklcGbE7PMWckNEQ8m475SR/6V74P+oLcpzef +K5y/Xh9JxLAtW3nTn8oFW1E25AbMmwmEyUG+V81E28gRVXCZBuV64L8MGk40iyKS +FfLvXrGdrxk+I+kQ8ZY15kO0vt+7s4pkesG/UEfy6Weg13UukMRFPtPbdkL7G0JZ +q/lY+g0B1VvC6DNZG8Ca0V6LDh8pKYvXeisCY6sx6oON7bL/uDaEj0YIrnMh6+JU +28DWHUNWV1nfcrvSitOGunYF3/qHrWuondCQVPuWgr1iBPRSGCKlfEXlQu9Xiaep +G+B1JeBYJjLjuq+4EnL/uuE4/qzU/GNaQt1/EUKw3koj0g0Z6Mbj3KD4Jo5/l2/6 +lGBl7eQklpqgqhBIMo7Y23+hza4NoTFhb/9qqWT/iPr2Xa7hqopyxEOr/k1EMH1l +4QKxOcXiTURFoaywBCg0hNmK/DJqq9g+faE7QiakEFEbX9G06N3rnSM0eSmENOMf +5VlssVfX2bupaS+/Gq+/cu/yhbkkBdyZBseBwW3+cNNmL7nrodJGaAH8/IPZothj +jmbMfeAAbzPzxDFqRMqt +=5uhc -----END PGP SIGNATURE----- diff --git a/app-forensics/openscap/files/openscap-0.7.1-sql-fix.patch b/app-forensics/openscap/files/openscap-0.7.1-sql-fix.patch new file mode 100644 index 000000000000..abd247035b0c --- /dev/null +++ b/app-forensics/openscap/files/openscap-0.7.1-sql-fix.patch @@ -0,0 +1,26 @@ +X-Git-Url: http://git.fedorahosted.org/git/?p=openscap.git;a=blobdiff_plain;f=src%2FOVAL%2Fprobes%2Findependent%2Fsql.c;h=ad7988c60ec344fa721e28b8aca59b9690cabbac;hp=0eb18a9a7cd0c03d3923c2b724eea23791e4ff25;hb=9eeceaecde0718cf28ffc8a672923f4f16b63c6a;hpb=dfad8e4db009182a3a2c3c2ba79563feefb09ada + +diff --git a/src/OVAL/probes/independent/sql.c b/src/OVAL/probes/independent/sql.c +index 0eb18a9..ad7988c 100644 +--- a/src/OVAL/probes/independent/sql.c ++++ b/src/OVAL/probes/independent/sql.c +@@ -242,8 +242,8 @@ __fail: + return (-1); + } + +-static SEXP_t *dbSQL_eval(const char *engine, const char *version, +- const char *conn, const char *sql, SEXP_t *probe_out) ++static int dbSQL_eval(const char *engine, const char *version, ++ const char *conn, const char *sql, SEXP_t *probe_out) + { + int err = -1; + dbURIInfo_t uriInfo = { .host = NULL, +@@ -350,7 +350,7 @@ __exit: + return (err); + } + +-int probe_main(SEXP_t *probe_in, SEXP_t *probe_out, void *arg) ++int probe_main(SEXP_t *probe_in, SEXP_t *probe_out, void *arg, SEXP_t *filters) + { + char *engine, *version, *conn, *sqlexp; + int err; diff --git a/app-forensics/openscap/openscap-0.6.4.ebuild b/app-forensics/openscap/openscap-0.6.4.ebuild deleted file mode 100644 index b32f7cd8c5ee..000000000000 --- a/app-forensics/openscap/openscap-0.6.4.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.6.4.ebuild,v 1.1 2010/11/05 23:49:24 hwoarang Exp $ - -EAPI=3 - -PYTHON_DEPEND="2" - -inherit multilib python bash-completion - -DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)" -HOMEPAGE="http://www.open-scap.org/" -SRC_URI="http://www.open-scap.org/download/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="bash-completion doc nss perl python" - -RDEPEND="!nss? ( dev-libs/libgcrypt ) - nss? ( dev-libs/nss ) - dev-libs/libpcre - dev-libs/libxml2 - net-misc/curl" -DEPEND="${RDEPEND} - perl? ( dev-lang/swig ) - python? ( dev-lang/swig )" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_configure() { - local myconf - if use python || use perl ; then - myconf+=" --enable-bindings" - else - myconf+=" --disable-bindings" - fi - if use nss ; then - myconf+=" --with-crypto=nss3" - else - myconf+=" --with-crypto=gcrypt" - fi - econf ${myconf} -} - -src_install() { - emake install DESTDIR="${D}" || die - #--enable-bindings enable all bindings, clean unwanted bindings - if use python && ! use perl ; then - rm -rf "${D}"/usr/$(get_libdir)/perl5 || die - fi - if ! use python && use perl ; then - rm -rf "${D}"/$(python_get_sitedir) || die - fi - if use doc ; then - dohtml -r docs/html/* || die - dodoc docs/examples/* || die - fi - if ! use bash-completion ; then - rm -rf "${D}"/etc/bash_completion.d || die - fi -} diff --git a/app-forensics/openscap/openscap-0.6.7.ebuild b/app-forensics/openscap/openscap-0.6.7.ebuild deleted file mode 100644 index 3b9ad3dbc16a..000000000000 --- a/app-forensics/openscap/openscap-0.6.7.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.6.7.ebuild,v 1.1 2011/01/30 22:35:51 hwoarang Exp $ - -EAPI=3 - -PYTHON_DEPEND="2" - -inherit multilib python bash-completion - -DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)" -HOMEPAGE="http://www.open-scap.org/" -SRC_URI="http://www.open-scap.org/download/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="bash-completion doc nss perl python sql" - -RDEPEND="!nss? ( dev-libs/libgcrypt ) - nss? ( dev-libs/nss ) - sql? ( dev-db/opendbx ) - dev-libs/libpcre - dev-libs/libxml2 - net-misc/curl" -DEPEND="${RDEPEND} - perl? ( dev-lang/swig ) - python? ( dev-lang/swig )" - -pkg_setup() { - python_set_active_version 2 - python_pkg_setup -} - -src_configure() { - local myconf - if use python || use perl ; then - myconf+=" --enable-bindings" - else - myconf+=" --disable-bindings" - fi - if use nss ; then - myconf+=" --with-crypto=nss3" - else - myconf+=" --with-crypto=gcrypt" - fi - econf ${myconf} -} - -src_install() { - emake install DESTDIR="${D}" || die - #--enable-bindings enable all bindings, clean unwanted bindings - if use python && ! use perl ; then - rm -rf "${D}"/usr/$(get_libdir)/perl5 || die - fi - if ! use python && use perl ; then - rm -rf "${D}"/$(python_get_sitedir) || die - fi - if use doc ; then - dohtml -r docs/html/* || die - dodoc docs/examples/* || die - fi - if ! use bash-completion ; then - rm -rf "${D}"/etc/bash_completion.d || die - fi -} diff --git a/app-forensics/openscap/openscap-0.7.1.ebuild b/app-forensics/openscap/openscap-0.7.1.ebuild new file mode 100644 index 000000000000..0ce238b2150e --- /dev/null +++ b/app-forensics/openscap/openscap-0.7.1.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-0.7.1.ebuild,v 1.1 2011/03/24 01:33:49 hwoarang Exp $ + +EAPI=3 + +PYTHON_DEPEND="2" + +inherit eutils multilib python bash-completion + +DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)" +HOMEPAGE="http://www.open-scap.org/" +SRC_URI="http://www.open-scap.org/download/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="bash-completion doc nss perl python sql" + +RDEPEND="!nss? ( dev-libs/libgcrypt ) + nss? ( dev-libs/nss ) + sql? ( dev-db/opendbx ) + dev-libs/libpcre + dev-libs/libxml2 + net-misc/curl" +DEPEND="${RDEPEND} + perl? ( dev-lang/swig ) + python? ( dev-lang/swig )" + +pkg_setup() { + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + epatch "${FILESDIR}"/${P}-sql-fix.patch +} + +src_configure() { + local myconf + if use python || use perl ; then + myconf+=" --enable-bindings" + else + myconf+=" --disable-bindings" + fi + if use nss ; then + myconf+=" --with-crypto=nss3" + else + myconf+=" --with-crypto=gcrypt" + fi + econf ${myconf} +} + +src_install() { + emake install DESTDIR="${D}" || die + #--enable-bindings enable all bindings, clean unwanted bindings + if use python && ! use perl ; then + rm -rf "${D}"/usr/$(get_libdir)/perl5 || die + fi + if ! use python && use perl ; then + rm -rf "${D}"/$(python_get_sitedir) || die + fi + if use doc ; then + dohtml -r docs/html/* || die + dodoc docs/examples/* || die + fi + if ! use bash-completion ; then + rm -rf "${D}"/etc/bash_completion.d || die + fi +} -- cgit v1.2.3-65-gdbad