Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-forensics/ovaldi/files/, app-forensics/ovaldi/
Date: Wed, 02 Aug 2017 21:17:54
Message-Id: 1501708670.0482e94f210513d83b9b37484de2f4eb67e0e222.monsieurp@gentoo
1 commit: 0482e94f210513d83b9b37484de2f4eb67e0e222
2 Author: Labbe Corentin <clabbe.montjoie <AT> gmail <DOT> com>
3 AuthorDate: Wed Aug 2 18:50:42 2017 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 2 21:17:50 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0482e94f
7
8 app-forensics/ovaldi: remove rpm USE flag.
9
10 This commit removes the rpm USE flag.
11
12 Gentoo-Bug: https://bugs.gentoo.org/625816
13
14 Package-Manager: Portage-2.3.6, Repoman-2.3.1
15 Closes: https://github.com/gentoo/gentoo/pull/5280
16
17 app-forensics/ovaldi/files/rpmdb.patch | 58 ------------------------
18 app-forensics/ovaldi/files/use_local_rpmdb.patch | 11 -----
19 app-forensics/ovaldi/metadata.xml | 3 --
20 app-forensics/ovaldi/ovaldi-5.10.1.4.ebuild | 20 +++-----
21 4 files changed, 6 insertions(+), 86 deletions(-)
22
23 diff --git a/app-forensics/ovaldi/files/rpmdb.patch b/app-forensics/ovaldi/files/rpmdb.patch
24 deleted file mode 100644
25 index 0d6e62608b5..00000000000
26 --- a/app-forensics/ovaldi/files/rpmdb.patch
27 +++ /dev/null
28 @@ -1,58 +0,0 @@
29 ---- src/probes/linux/rpmdb.h.old 2010-10-22 15:16:49.000000000 +0200
30 -+++ src/probes/linux/rpmdb.h 2010-10-22 15:22:09.000000000 +0200
31 -@@ -8,8 +8,8 @@
32 - */
33 -
34 - #include <assert.h>
35 --#include "rpmlib.h"
36 --#include "rpmsw.h"
37 -+/*#include <rpmlib.h>
38 -+#include <rpmsw.h>*/
39 - #include "db.h"
40 -
41 - /*@-exportlocal@*/
42 -@@ -508,7 +508,7 @@
43 - * @param opx per-rpmdb accumulator index (aka rpmtsOpX)
44 - * @return per-rpmdb accumulator pointer
45 - */
46 --void * dbiStatsAccumulator(dbiIndex dbi, int opx)
47 -+rpmop_s * dbiStatsAccumulator(dbiIndex dbi, int opx)
48 - /*@*/;
49 -
50 - #if !defined(SWIG)
51 -@@ -576,7 +576,7 @@
52 - /*@globals fileSystem, internalState @*/
53 - /*@modifies dbi, *dbcursor, fileSystem, internalState @*/
54 - {
55 -- void * sw = dbiStatsAccumulator(dbi, 16); /* RPMTS_OP_DBDEL */
56 -+ rpmop_s *sw = dbiStatsAccumulator(dbi, 16); /* RPMTS_OP_DBDEL */
57 - int rc;
58 - assert(key->data != NULL && key->size > 0);
59 - (void) rpmswEnter(sw, 0);
60 -@@ -600,7 +600,7 @@
61 - /*@globals fileSystem, internalState @*/
62 - /*@modifies dbi, *dbcursor, *key, *data, fileSystem, internalState @*/
63 - {
64 -- void * sw = dbiStatsAccumulator(dbi, 14); /* RPMTS_OP_DBGET */
65 -+ rpmop_s * sw = dbiStatsAccumulator(dbi, 14); /* RPMTS_OP_DBGET */
66 - int rc;
67 - assert((flags == DB_NEXT) || (key->data != NULL && key->size > 0));
68 - (void) rpmswEnter(sw, 0);
69 -@@ -625,7 +625,7 @@
70 - /*@globals fileSystem, internalState @*/
71 - /*@modifies dbi, *dbcursor, *key, *pkey, *data, fileSystem, internalState @*/
72 - {
73 -- void * sw = dbiStatsAccumulator(dbi, 14); /* RPMTS_OP_DBGET */
74 -+ rpmop_s * sw = dbiStatsAccumulator(dbi, 14); /* RPMTS_OP_DBGET */
75 - int rc;
76 - assert((flags == DB_NEXT) || (key->data != NULL && key->size > 0));
77 - (void) rpmswEnter(sw, 0);
78 -@@ -649,7 +649,7 @@
79 - /*@globals fileSystem, internalState @*/
80 - /*@modifies dbi, *dbcursor, *key, fileSystem, internalState @*/
81 - {
82 -- void * sw = dbiStatsAccumulator(dbi, 15); /* RPMTS_OP_DBPUT */
83 -+ rpmop_s * sw = dbiStatsAccumulator(dbi, 15); /* RPMTS_OP_DBPUT */
84 - int rc;
85 - assert(key->data != NULL && key->size > 0 && data->data != NULL && data->size > 0);
86 - (void) rpmswEnter(sw, 0);
87
88 diff --git a/app-forensics/ovaldi/files/use_local_rpmdb.patch b/app-forensics/ovaldi/files/use_local_rpmdb.patch
89 deleted file mode 100644
90 index 036d35edf94..00000000000
91 --- a/app-forensics/ovaldi/files/use_local_rpmdb.patch
92 +++ /dev/null
93 @@ -1,11 +0,0 @@
94 ---- src/probes/linux/RPMInfoProbe.h.old 2010-10-22 15:12:50.000000000 +0200
95 -+++ src/probes/linux/RPMInfoProbe.h 2010-10-22 15:13:02.000000000 +0200
96 -@@ -36,7 +36,7 @@
97 - #include <rpm/rpmlib.h>
98 - #include <rpm/rpmio.h>
99 - #include <rpm/rpmts.h>
100 --#include <rpm/rpmdb.h>
101 -+#include "rpmdb.h"
102 - #include <rpm/header.h>
103 - #include <rpm/rpmcli.h> // added for rpm query function
104 - #include <rpm/rpmds.h> // added for rpm query function
105
106 diff --git a/app-forensics/ovaldi/metadata.xml b/app-forensics/ovaldi/metadata.xml
107 index aa8bd2bbca0..eefcf17b60e 100644
108 --- a/app-forensics/ovaldi/metadata.xml
109 +++ b/app-forensics/ovaldi/metadata.xml
110 @@ -10,9 +10,6 @@
111 <email>proxy-maint@g.o</email>
112 <name>Proxy Maintainers</name>
113 </maintainer>
114 - <use>
115 - <flag name="rpm">Enable the RPM probes</flag>
116 - </use>
117 <upstream>
118 <remote-id type="sourceforge">ovaldi</remote-id>
119 </upstream>
120
121 diff --git a/app-forensics/ovaldi/ovaldi-5.10.1.4.ebuild b/app-forensics/ovaldi/ovaldi-5.10.1.4.ebuild
122 index 364a0a9e774..c23af38bfe5 100644
123 --- a/app-forensics/ovaldi/ovaldi-5.10.1.4.ebuild
124 +++ b/app-forensics/ovaldi/ovaldi-5.10.1.4.ebuild
125 @@ -1,4 +1,4 @@
126 -# Copyright 1999-2014 Gentoo Foundation
127 +# Copyright 1999-2017 Gentoo Foundation
128 # Distributed under the terms of the GNU General Public License v2
129
130 EAPI=5
131 @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
132 LICENSE="BSD"
133 SLOT="0"
134 KEYWORDS="~amd64 ~x86"
135 -IUSE="acl ldap rpm selinux"
136 +IUSE="acl ldap selinux"
137
138 CDEPEND="dev-libs/libgcrypt:0
139 dev-libs/libpcre
140 @@ -21,8 +21,7 @@ CDEPEND="dev-libs/libgcrypt:0
141 sys-apps/util-linux
142 sys-libs/libcap
143 acl? ( sys-apps/acl )
144 - ldap? ( net-nds/openldap )
145 - rpm? ( app-arch/rpm )"
146 + ldap? ( net-nds/openldap )"
147 DEPEND="${CDEPEND}
148 sys-apps/sed"
149 RDEPEND="${CDEPEND}
150 @@ -54,16 +53,9 @@ src_prepare() {
151 sed -i 's, -lacl , ,' project/linux/Makefile || die
152 fi
153
154 - # rpm probes support is build dependant only on the presence of the rpm binary
155 - if use rpm ; then
156 - #Same problems as bug 274679, so i do a local copy of the header and patch it
157 - cp /usr/include/rpm/rpmdb.h src/probes/linux/ || die
158 - epatch "${FILESDIR}"/use_local_rpmdb.patch
159 - epatch "${FILESDIR}"/rpmdb.patch
160 - else
161 - einfo "Disabling rpm probes"
162 - sed -i 's/^PACKAGE_RPM/#PACKAGE_RPM/' project/linux/Makefile || die
163 - fi
164 + einfo "Disabling rpm probes"
165 + sed -i 's/^PACKAGE_RPM/#PACKAGE_RPM/' project/linux/Makefile || die
166 +
167 # same thing for dpkg, but package dpkg is not sufficient, needs app-arch/apt-pkg that is not on tree
168 einfo "Disabling dpkg probes"
169 sed -i 's/^PACKAGE_DPKG/#PACKAGE_DPKG/' project/linux/Makefile || die