From: Labbe Corentin Date: Wed, 2 Aug 2017 18:50:42 +0000 (+0200) Subject: app-forensics/ovaldi: remove rpm USE flag. X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=0482e94f210513d83b9b37484de2f4eb67e0e222;p=gentoo.git app-forensics/ovaldi: remove rpm USE flag. This commit removes the rpm USE flag. Gentoo-Bug: https://bugs.gentoo.org/625816 Package-Manager: Portage-2.3.6, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/5280 --- diff --git a/app-forensics/ovaldi/files/rpmdb.patch b/app-forensics/ovaldi/files/rpmdb.patch deleted file mode 100644 index 0d6e62608b52..000000000000 --- a/app-forensics/ovaldi/files/rpmdb.patch +++ /dev/null @@ -1,58 +0,0 @@ ---- src/probes/linux/rpmdb.h.old 2010-10-22 15:16:49.000000000 +0200 -+++ src/probes/linux/rpmdb.h 2010-10-22 15:22:09.000000000 +0200 -@@ -8,8 +8,8 @@ - */ - - #include --#include "rpmlib.h" --#include "rpmsw.h" -+/*#include -+#include */ - #include "db.h" - - /*@-exportlocal@*/ -@@ -508,7 +508,7 @@ - * @param opx per-rpmdb accumulator index (aka rpmtsOpX) - * @return per-rpmdb accumulator pointer - */ --void * dbiStatsAccumulator(dbiIndex dbi, int opx) -+rpmop_s * dbiStatsAccumulator(dbiIndex dbi, int opx) - /*@*/; - - #if !defined(SWIG) -@@ -576,7 +576,7 @@ - /*@globals fileSystem, internalState @*/ - /*@modifies dbi, *dbcursor, fileSystem, internalState @*/ - { -- void * sw = dbiStatsAccumulator(dbi, 16); /* RPMTS_OP_DBDEL */ -+ rpmop_s *sw = dbiStatsAccumulator(dbi, 16); /* RPMTS_OP_DBDEL */ - int rc; - assert(key->data != NULL && key->size > 0); - (void) rpmswEnter(sw, 0); -@@ -600,7 +600,7 @@ - /*@globals fileSystem, internalState @*/ - /*@modifies dbi, *dbcursor, *key, *data, fileSystem, internalState @*/ - { -- void * sw = dbiStatsAccumulator(dbi, 14); /* RPMTS_OP_DBGET */ -+ rpmop_s * sw = dbiStatsAccumulator(dbi, 14); /* RPMTS_OP_DBGET */ - int rc; - assert((flags == DB_NEXT) || (key->data != NULL && key->size > 0)); - (void) rpmswEnter(sw, 0); -@@ -625,7 +625,7 @@ - /*@globals fileSystem, internalState @*/ - /*@modifies dbi, *dbcursor, *key, *pkey, *data, fileSystem, internalState @*/ - { -- void * sw = dbiStatsAccumulator(dbi, 14); /* RPMTS_OP_DBGET */ -+ rpmop_s * sw = dbiStatsAccumulator(dbi, 14); /* RPMTS_OP_DBGET */ - int rc; - assert((flags == DB_NEXT) || (key->data != NULL && key->size > 0)); - (void) rpmswEnter(sw, 0); -@@ -649,7 +649,7 @@ - /*@globals fileSystem, internalState @*/ - /*@modifies dbi, *dbcursor, *key, fileSystem, internalState @*/ - { -- void * sw = dbiStatsAccumulator(dbi, 15); /* RPMTS_OP_DBPUT */ -+ rpmop_s * sw = dbiStatsAccumulator(dbi, 15); /* RPMTS_OP_DBPUT */ - int rc; - assert(key->data != NULL && key->size > 0 && data->data != NULL && data->size > 0); - (void) rpmswEnter(sw, 0); diff --git a/app-forensics/ovaldi/files/use_local_rpmdb.patch b/app-forensics/ovaldi/files/use_local_rpmdb.patch deleted file mode 100644 index 036d35edf947..000000000000 --- a/app-forensics/ovaldi/files/use_local_rpmdb.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/probes/linux/RPMInfoProbe.h.old 2010-10-22 15:12:50.000000000 +0200 -+++ src/probes/linux/RPMInfoProbe.h 2010-10-22 15:13:02.000000000 +0200 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include "rpmdb.h" - #include - #include // added for rpm query function - #include // added for rpm query function diff --git a/app-forensics/ovaldi/metadata.xml b/app-forensics/ovaldi/metadata.xml index aa8bd2bbca04..eefcf17b60e9 100644 --- a/app-forensics/ovaldi/metadata.xml +++ b/app-forensics/ovaldi/metadata.xml @@ -10,9 +10,6 @@ proxy-maint@gentoo.org Proxy Maintainers - - Enable the RPM probes - ovaldi diff --git a/app-forensics/ovaldi/ovaldi-5.10.1.4.ebuild b/app-forensics/ovaldi/ovaldi-5.10.1.4.ebuild index 364a0a9e7740..c23af38bfe53 100644 --- a/app-forensics/ovaldi/ovaldi-5.10.1.4.ebuild +++ b/app-forensics/ovaldi/ovaldi-5.10.1.4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2" LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="acl ldap rpm selinux" +IUSE="acl ldap selinux" CDEPEND="dev-libs/libgcrypt:0 dev-libs/libpcre @@ -21,8 +21,7 @@ CDEPEND="dev-libs/libgcrypt:0 sys-apps/util-linux sys-libs/libcap acl? ( sys-apps/acl ) - ldap? ( net-nds/openldap ) - rpm? ( app-arch/rpm )" + ldap? ( net-nds/openldap )" DEPEND="${CDEPEND} sys-apps/sed" RDEPEND="${CDEPEND} @@ -54,16 +53,9 @@ src_prepare() { sed -i 's, -lacl , ,' project/linux/Makefile || die fi - # rpm probes support is build dependant only on the presence of the rpm binary - if use rpm ; then - #Same problems as bug 274679, so i do a local copy of the header and patch it - cp /usr/include/rpm/rpmdb.h src/probes/linux/ || die - epatch "${FILESDIR}"/use_local_rpmdb.patch - epatch "${FILESDIR}"/rpmdb.patch - else - einfo "Disabling rpm probes" - sed -i 's/^PACKAGE_RPM/#PACKAGE_RPM/' project/linux/Makefile || die - fi + einfo "Disabling rpm probes" + sed -i 's/^PACKAGE_RPM/#PACKAGE_RPM/' project/linux/Makefile || die + # same thing for dpkg, but package dpkg is not sufficient, needs app-arch/apt-pkg that is not on tree einfo "Disabling dpkg probes" sed -i 's/^PACKAGE_DPKG/#PACKAGE_DPKG/' project/linux/Makefile || die