Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-05-05 19:11:57 +02:00
Code Issues Projects Releases Wiki Activity

ovaldi: Add optional LDAP support

Browse source
This commit is contained in:
Anton Bolshakov 2010-12-13 08:41:25 +00:00
parent a311a4326f
commit a28d3f8db0
3 changed files with 47 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app-misc/ovaldi/Manifest
View file

@ -1,6 +1,7 @@
AUX ovaldi-5.8.2-disable-ldap-probes.patch 1237 RMD160 5c75a4eb790712f2a5e219035c3bd66b6437b7b4 SHA1 fe627c386fd1e9f299b7caa06b73fe3ac943cae6 SHA256 ca8846757488a75d434a4cc909a96de44cf4b8f6d8f7950c2938630668bbde6a
AUX ovaldi-5.8.2-strnicmp.patch 292 RMD160 30058fc991df58e38be9b19855512602879d0136 SHA1 09f4ef19ba2dc009a45ff3b89e93dae6e9fd0cb6 SHA256 aa4a1f23df2fd4b8ed0456a23948cc597d0573eb1e9881f8a8f229b8778f6a54
AUX ovaldi-5.8.2-xerces3.patch 12336 RMD160 501377cc5cbe1256a72bf2cd0be8a67943aca50e SHA1 024a2860faf0783c728d468fbe77dd6dc0da5a2f SHA256 70754174e4d390663b79b0dc070eba536d2868ce5b68aae1632e805a52b0e0f0
AUX rpmdb.patch 2131 RMD160 eab0ea48e95ae7d278b80b555a73ca456ac07703 SHA1 ae06d023162d19019f27fdbbc9476fcf57d10cad SHA256 d40775d272b8aed6062b983640cf4c0a330a9d318012b922099eeb04d4c1d131
AUX use_local_rpmdb.patch 429 RMD160 4a8f35be13522873bcfc5e03842964e84fc557b0 SHA1 70fe83d0f9f1c8716a2a8afec70da94c9183b2be SHA256 e7956ab2c1de68b0c5284641a36136643aa5a6e12cfd8b6042f0484c1cba63cd
DIST ovaldi-5.8.2-src.tar.bz2 7763462 RMD160 04ce0dbce70e2a417f1ebcd612142ade49f42b81 SHA1 d5f2f82c818a5fee28822e4a3608d775df05f031 SHA256 a24d4f2ab88032887ee6a8617994836e9bd7f86565b29811891d4de6a3e9b8e2
EBUILD ovaldi-5.8.2-r1.ebuild 1583 RMD160 447ddcd0a9bd4ce44d31a3e61c264f422df96338 SHA1 a84288f21ad16704a808ea077010eac916201c31 SHA256 69f956de1d6503badce3e30a408a09ae74d2537632af4b8a3ebaecb36c2abb42
EBUILD ovaldi-5.8.2-r2.ebuild 1758 RMD160 755e88dce99442248d5f4cdbd9a417a0838942b8 SHA1 b9bbc3c99e20c68c068bebb4b55b81567c1e5465 SHA256 66ec3ab9d2aa17f775640e54799fd1a57faa0e7328eb6dd0c6bc29f6ed00b954

32
app-misc/ovaldi/files/ovaldi-5.8.2-disable-ldap-probes.patch Normal file
View file

@ -0,0 +1,32 @@
--- src/linux/ProbeFactory.cpp 2010-12-10 13:37:00.019140703 +0100
+++ src/linux/ProbeFactory.cpp 2010-08-27 21:23:41.000000000 +0200
@@ -61,8 +61,6 @@
probe = XmlFileContentProbe::Instance();
} else if(objectName.compare("textfilecontent54_object") == 0) {
probe = TextFileContent54Probe::Instance();
- } else if(objectName.compare("ldap_object") == 0) {
- probe = LDAPProbe::Instance();
// here are the objects defined in the unix schema
} else if(objectName.compare("file_object") == 0) {
--- src/linux/ProbeFactory.h 2010-12-10 13:36:50.315386197 +0100
+++ src/linux/ProbeFactory.h 2010-08-27 21:23:41.000000000 +0200
@@ -68,7 +68,6 @@
#include "RunLevelProbe.h"
#include "XinetdProbe.h"
#include "InetdProbe.h"
-#include "LDAPProbe.h"
--- project/linux/Makefile 2010-12-10 13:49:06.655143160 +0100
+++ project/linux/Makefile 2010-12-10 13:47:37.247382096 +0100
@@ -49,7 +49,7 @@
LIBDIR = -L/usr/local/lib -L/usr/lib
# What libraries do we need?
-LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt -lldap
+LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt
# Determine what package management system is being used
PACKAGE_RPM = $(shell /usr/bin/env rpm --version 2>/dev/null)

21
app-misc/ovaldi/ovaldi-5.8.2-r1.ebuild → app-misc/ovaldi/ovaldi-5.8.2-r2.ebuild
View file

@ -6,21 +6,21 @@ EAPI=3
inherit eutils
DESCRIPTION="Free OVAL definition's interpreter"
DESCRIPTION="Free implementation of OVAL"
HOMEPAGE="http://oval.mitre.org/language/interpreter.html"
SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="rpm"
IUSE="ldap rpm"
DEPEND="rpm? ( app-arch/rpm )
dev-libs/libgcrypt
dev-libs/libpcre
dev-libs/xalan-c
dev-libs/xerces-c
dev-libs/libgcrypt
net-nds/openldap"
ldap? ( net-nds/openldap )"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${P}-src"
@ -28,6 +28,11 @@ S="${WORKDIR}/${P}-src"
src_prepare() {
epatch "${FILESDIR}"/${P}-xerces3.patch
epatch "${FILESDIR}"/${P}-strnicmp.patch
if ! use ldap ; then
einfo "Disabling LDAP probes"
epatch "${FILESDIR}"/${P}-disable-ldap-probes.patch
rm src/probes/independent/LDAPProbe.{cpp,h} || die
fi
# rpm probes support is build dependant only on the presence of the rpm binary
if use rpm ; then
@ -36,12 +41,12 @@ src_prepare() {
epatch "${FILESDIR}"/use_local_rpmdb.patch
epatch "${FILESDIR}"/rpmdb.patch
else
einfo "Disable rpm probes"
sed -i 's/^PACKAGE_RPM/#PACKAGE_RPM/g' project/linux/Makefile || die
einfo "Disabling rpm probes"
sed -i 's/^PACKAGE_RPM/#PACKAGE_RPM/' project/linux/Makefile || die
fi
# same thing for dpkg, but package dpkg is not sufficient, needs app-arch/apt-pkg that is not on tree
einfo "Disable dpkg probes"
sed -i 's/^PACKAGE_DPKG/#PACKAGE_DPKG/g' project/linux/Makefile || die
einfo "Disabling dpkg probes"
sed -i 's/^PACKAGE_DPKG/#PACKAGE_DPKG/' project/linux/Makefile || die
}
src_compile () {