app-forensics/ovaldi: Add optional LDAP support to ovaldi

svn path=/sunrise/; revision=11602

diff --git a/app-forensics/ovaldi/ChangeLog b/app-forensics/ovaldi/ChangeLog
index 0a93d74e7c9a0fa474dcff7b4fd51f997ee17df9..721f0e4466d806f6f6f765dd4266f345597111ca 100644 (file)
--- a/app-forensics/ovaldi/ChangeLog
+++ b/app-forensics/ovaldi/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Dec 2010; LABBE Corentin (montjoie) corentin.labbe@geomatys.fr
+  ovaldi-5.8.2.ebuild, +files/ovaldi-5.8.2-disable-ldap-probes.patch:
+  Add optional LDAP support to ovaldi
+
   08 Dec 2010; LABBE Corentin (montjoie) <corentin.labbe@geomatys.fr>
   +ovaldi-5.8.2.ebuild, +files/ovaldi-5.8.2-strnicmp.patch,
   +files/ovaldi-5.8.2-xerces3.patch, +files/rpmdb.patch,

diff --git a/app-forensics/ovaldi/Manifest b/app-forensics/ovaldi/Manifest
index 454df4f76a17d88aab5114749c266e7549a4593a..397a50b49abc9338d76ca05c7659f7fad5f02e57 100644 (file)
--- a/app-forensics/ovaldi/Manifest
+++ b/app-forensics/ovaldi/Manifest
@@ -1,8 +1,9 @@
+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.ebuild 1538 RMD160 c221e4c2aa5598b58d9ca4b38486cc2c7fcd3c1b SHA1 6543ba60c197826d97b585c11916beae18bb1b61 SHA256 fa4714daeeecf13aa01162a5dfa128786186888a41c4d5ed07b10b44b77ef57d
-MISC ChangeLog 433 RMD160 4e0c13e08480b9ad748be7fce38ff4164d028f7a SHA1 f05a6b5f9ac2fb29877b1ff91287b6251b14854b SHA256 a66e5e98397f39aa2e0abaf21964f076b717cfdc590a7d2e4ae1a95652f209b6
+EBUILD ovaldi-5.8.2.ebuild 1758 RMD160 755e88dce99442248d5f4cdbd9a417a0838942b8 SHA1 b9bbc3c99e20c68c068bebb4b55b81567c1e5465 SHA256 66ec3ab9d2aa17f775640e54799fd1a57faa0e7328eb6dd0c6bc29f6ed00b954
+MISC ChangeLog 610 RMD160 84147899e81440a6d824bfe78bfba0b29d83e392 SHA1 4870567fbcfc12c71b7246d96bd99b37f05aecd8 SHA256 5605d8f9bfa06e206bf8a81b6b31a4ae8e871f3162183705199c139ce772b82b
 MISC metadata.xml 288 RMD160 c522c377e361253fbc7aefc82764bfde929e6d65 SHA1 15e559615de1ea0171ce5bd28dc29f6420d72287 SHA256 6ad915aa8571ce7d72c55c598c14784fa0f503a330842ac686a508264ff0cd4c

diff --git a/app-forensics/ovaldi/files/ovaldi-5.8.2-disable-ldap-probes.patch b/app-forensics/ovaldi/files/ovaldi-5.8.2-disable-ldap-probes.patch
new file mode 100644 (file)
index 0000000..1f59b02
--- /dev/null
+++ b/app-forensics/ovaldi/files/ovaldi-5.8.2-disable-ldap-probes.patch
@@ -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();\r
+       } else if(objectName.compare("textfilecontent54_object") == 0) {\r
+               probe = TextFileContent54Probe::Instance();\r
+-      } else if(objectName.compare("ldap_object") == 0) {\r
+-              probe = LDAPProbe::Instance();\r
+ \r
+ // here are the objects defined in the unix schema\r
+       } else if(objectName.compare("file_object") == 0) {\r
+--- 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"\r
+ #include "XinetdProbe.h"\r
+ #include "InetdProbe.h"\r
+-#include "LDAPProbe.h"\r
+ \r
+ \r
+ \r
+--- 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\r
+ \r
+ # What libraries do we need?\r
+-LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt -lldap\r
++LIBS = -lxerces-c -lxalan-c -lpcre -lpopt -lgcrypt\r
+ \r
+ # Determine what package management system is being used \r
+ PACKAGE_RPM  = $(shell /usr/bin/env rpm  --version 2>/dev/null)\r

diff --git a/app-forensics/ovaldi/ovaldi-5.8.2.ebuild b/app-forensics/ovaldi/ovaldi-5.8.2.ebuild
index 420d0a8ab6e41882d7a336da0763ce0793ee05b1..7b4a8c4398c393c396501ed9b8a76ce1e7af2552 100644 (file)
--- a/app-forensics/ovaldi/ovaldi-5.8.2.ebuild
+++ b/app-forensics/ovaldi/ovaldi-5.8.2.ebuild
@@ -13,12 +13,14 @@ 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/xerces-c
+       ldap? ( net-nds/openldap )"
 RDEPEND="${DEPEND}"
 
 S="${WORKDIR}/${P}-src"
@@ -26,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
@@ -34,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 () {