* [gentoo-commits] gentoo-x86 commit in app-forensics/openscap: metadata.xml ChangeLog openscap-1.0.1.ebuild openscap-9999.ebuild openscap-0.9.4.1.ebuild
@ 2013-12-23 19:59 Sven Vermeulen (swift)
0 siblings, 0 replies; only message in thread
From: Sven Vermeulen (swift) @ 2013-12-23 19:59 UTC (permalink / raw
To: gentoo-commits
swift 13/12/23 19:59:12
Modified: metadata.xml ChangeLog openscap-9999.ebuild
Added: openscap-1.0.1.ebuild
Removed: openscap-0.9.4.1.ebuild
Log:
Add 1.0.1, drop 0.9.4.1, update 9999; proxy-committed for Corentin Labbe
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0x2EDD52403B68AF47)
Revision Changes Path
1.10 app-forensics/openscap/metadata.xml
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/metadata.xml?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/metadata.xml?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/metadata.xml?r1=1.9&r2=1.10
Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-forensics/openscap/metadata.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- metadata.xml 19 Sep 2013 15:31:32 -0000 1.9
+++ metadata.xml 23 Dec 2013 19:59:12 -0000 1.10
@@ -8,6 +8,7 @@
<description>Maintainer</description>
</maintainer>
<use>
+<flag name="gconf">Build the gconf independant probes</flag>
<flag name="nss">Prefer NSS over libgcrypt as the crypto engine</flag>
<flag name="rpm">Compiles the RPM probes</flag>
<flag name="sce">Enables Script Check Engine (SCE) support</flag>
1.26 app-forensics/openscap/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/ChangeLog?r1=1.25&r2=1.26
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog 26 Sep 2013 08:19:06 -0000 1.25
+++ ChangeLog 23 Dec 2013 19:59:12 -0000 1.26
@@ -1,6 +1,20 @@
# ChangeLog for app-forensics/openscap
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.25 2013/09/26 08:19:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/ChangeLog,v 1.26 2013/12/23 19:59:12 swift Exp $
+
+ 23 Dec 2013; Sven Vermeulen <swift@gentoo.org> -openscap-0.9.4.1.ebuild,
+ +openscap-1.0.1.ebuild, openscap-9999.ebuild, metadata.xml:
+ Add fixes of 1.0.1 in live ebuild
+
+ 23 Dec 2013; Sven Vermeulen <swift@gentoo.org> -openscap-0.9.4.1.ebuild,
+ +openscap-1.0.1.ebuild, metadata.xml:
+ Remove old ebuilds
+
+*openscap-1.0.1 (23 Dec 2013)
+
+ 23 Dec 2013; Sven Vermeulen <swift@gentoo.org> +openscap-1.0.1.ebuild,
+ metadata.xml:
+ Bump openscap to 1.0.1
*openscap-9999 (26 Sep 2013)
1.2 app-forensics/openscap/openscap-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/openscap-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/openscap-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/openscap-9999.ebuild?r1=1.1&r2=1.2
Index: openscap-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openscap-9999.ebuild 26 Sep 2013 08:19:06 -0000 1.1
+++ openscap-9999.ebuild 23 Dec 2013 19:59:12 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-9999.ebuild,v 1.1 2013/09/26 08:19:06 swift Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-9999.ebuild,v 1.2 2013/12/23 19:59:12 swift Exp $
EAPI=5
@@ -25,14 +25,19 @@
LICENSE="LGPL-2.1"
SLOT="0"
-IUSE="bash-completion debug doc ldap nss perl python rpm selinux sce sql test"
-RESTRICT="test"
+IUSE="acl bash-completion caps debug doc gconf ldap nss pcre perl python rpm selinux sce sql test xattr"
+#RESTRICT="test"
RDEPEND="!nss? ( dev-libs/libgcrypt )
nss? ( dev-libs/nss )
+ acl? ( virtual/acl )
+ caps? ( sys-libs/libcap )
+ gconf? ( gnome-base/gconf )
ldap? ( net-nds/openldap )
+ pcre? ( dev-libs/libpcre )
rpm? ( >=app-arch/rpm-4.9 )
sql? ( dev-db/opendbx )
+ xattr? ( sys-apps/attr )
dev-libs/libpcre
dev-libs/libxml2
dev-libs/libxslt
@@ -135,9 +140,9 @@
src_compile() {
emake
- if [[ "${PV}" == "9999" ]] && use doc ; then
+ if use doc ; then
einfo "Building HTML documentation using Doxygen (which will take a while)"
- cd docs && doxygen Doxyfile
+ cd docs && doxygen Doxyfile || die
fi
}
1.1 app-forensics/openscap/openscap-1.0.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/openscap-1.0.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-forensics/openscap/openscap-1.0.1.ebuild?rev=1.1&content-type=text/plain
Index: openscap-1.0.1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-forensics/openscap/openscap-1.0.1.ebuild,v 1.1 2013/12/23 19:59:12 swift Exp $
EAPI=5
PYTHON_DEPEND="2"
PYTHON_COMPAT=( python{2_5,2_6,2_7} )
inherit bash-completion-r1 eutils multilib python-r1
DESCRIPTION="Framework which enables integration with the Security Content Automation Protocol (SCAP)"
HOMEPAGE="http://www.open-scap.org/"
SRC_URI="https://fedorahosted.org/releases/o/p/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="acl bash-completion caps debug doc gconf ldap nss pcre perl python rpm selinux sce sql test xattr"
#RESTRICT="test"
RDEPEND="!nss? ( dev-libs/libgcrypt )
nss? ( dev-libs/nss )
acl? ( virtual/acl )
caps? ( sys-libs/libcap )
gconf? ( gnome-base/gconf )
ldap? ( net-nds/openldap )
pcre? ( dev-libs/libpcre )
rpm? ( >=app-arch/rpm-4.9 )
sql? ( dev-db/opendbx )
xattr? ( sys-apps/attr )
dev-libs/libpcre
dev-libs/libxml2
dev-libs/libxslt
net-misc/curl"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
perl? ( dev-lang/swig )
python? ( dev-lang/swig )
test? (
app-arch/unzip
dev-perl/XML-XPath
net-misc/ipcalc
sys-apps/grep )"
src_prepare() {
# uncoment for debugging test
# sed -i 's,set -e,&;set -x,' tests/API/XCCDF/unittests/test_remediate_simple.sh || die
sed -i 's,^ bash, LC_ALL=C bash,' tests/probes/process/test_probes_process.sh || die
sed -i 's/uname -p/uname -m/' tests/probes/uname/test_probes_uname.xml.sh || die
#probe runlevel for non-centos/redhat/fedora is not implemented
sed -i 's,.*runlevel_test.*,echo "runlevel test bypassed",' tests/mitre/test_mitre.sh || die
sed -i 's,probecheck "runlevel,probecheck "runlevellllll,' tests/probes/runlevel/test_probes_runlevel.sh || die
#According to comment of theses tests, we must modify it. For the moment disable it
sed -i 's,.*linux-def_inetlisteningservers_test,#&,' tests/mitre/test_mitre.sh || die
sed -i 's,.*ind-def_environmentvariable_test,#&,' tests/mitre/test_mitre.sh || die
# theses tests are hardcoded for checking hald process...,
# but no good solution for the moment, disabling them with a fake echo
# because encased in a if then
# sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process_test.xml || die
# sed -i 's,ha.d,/sbin/udevd --daemon,g' tests/mitre/unix-def_process58_test.xml || die
sed -i 's,.*process_test.*,echo "process test bypassed",' tests/mitre/test_mitre.sh || die
sed -i 's,.*process58_test.*,echo "process58 test bypassed",' tests/mitre/test_mitre.sh || die
#This test fail
sed -i 's,.*generate report: xccdf,#&,' tests/API/XCCDF/unittests/all.sh || die
if ! use rpm ; then
sed -i 's,probe_rpminfo_req_deps_ok=yes,probe_rpminfo_req_deps_ok=no,' configure || die
sed -i 's,probe_rpminfo_opt_deps_ok=yes,probe_rpminfo_opt_deps_ok=no,' configure || die
sed -i 's,probe_rpmverify_req_deps_ok=yes,probe_rpmverify_req_deps_ok=no,' configure || die
sed -i 's,probe_rpmverify_opt_deps_ok=yes,probe_rpmverify_opt_deps_ok=no,' configure || die
sed -i 's,^probe_rpm.*_deps_missing=,&disabled_by_USE_flag,' configure || die
sed -i 's,.*rpm.*,#&,' tests/mitre/test_mitre.sh || die
fi
if ! use selinux ; then
einfo "Disabling SELinux probes"
sed -i 's,.*selinux.*, echo "SELinux test bypassed",' tests/mitre/test_mitre.sh || die
#process58 need selinux
sed -i 's,.*process58,#&,' tests/mitre/test_mitre.sh || die
fi
if ! use ldap; then
einfo "Disabling LDAP probes"
sed -i 's,ldap.h,ldapp.h,g' configure || die
fi
epatch_user
}
src_configure() {
local myconf
if use debug ; then
myconf+=" --enable-debug"
fi
if use python ; then
myconf+=" --enable-python"
else
myconf+=" --enable-python=no"
fi
if use perl ; then
myconf+=" --enable-perl"
fi
if use nss ; then
myconf+=" --with-crypto=nss3"
else
myconf+=" --with-crypto=gcrypt"
fi
if use sce ; then
myconf+=" --enable-sce"
else
myconf+=" --enable-sce=no"
fi
econf ${myconf}
}
src_compile() {
emake
if use doc ; then
cd docs && doxygen Doxyfile || die
fi
}
src_install() {
emake install DESTDIR="${D}" || die
find "${D}" -name '*.la' -delete || die
if use doc ; then
dohtml -r docs/html/* || die
dodoc docs/examples/* || die
fi
if use bash-completion ; then
dobashcomp "${D}"/etc/bash_completion.d/oscap
fi
rm -rf "${D}"/etc/bash_completion.d || die
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-12-23 19:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-23 19:59 [gentoo-commits] gentoo-x86 commit in app-forensics/openscap: metadata.xml ChangeLog openscap-1.0.1.ebuild openscap-9999.ebuild openscap-0.9.4.1.ebuild Sven Vermeulen (swift)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox