Fix building with OpenSSL >= 1.0.0 wrt #326545.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/net-analyzer/libnasl/ChangeLog b/net-analyzer/libnasl/ChangeLog
index d0db0cbfedef0264c3bff25a8c26a30b60800b3f..f829fb600bdc52eb8598432f922f91d3cee48da8 100644 (file)
--- a/net-analyzer/libnasl/ChangeLog
+++ b/net-analyzer/libnasl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/libnasl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/libnasl/ChangeLog,v 1.85 2010/01/01 17:38:22 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/libnasl/ChangeLog,v 1.86 2010/07/11 03:43:28 ssuominen Exp $
+
+  11 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> libnasl-2.2.9.ebuild,
+  +files/libnasl-2.2.9-openssl-1.patch:
+  Fix building with OpenSSL >= 1.0.0 wrt #326545.
 
   01 Jan 2010; Christian Faulhammer <fauli@gentoo.org> libnasl-2.3.1.ebuild:
   Transfer Prefix keywords

diff --git a/net-analyzer/libnasl/Manifest b/net-analyzer/libnasl/Manifest
index b3b4ee3b7aff5f4d6e629afc5033d91fa34de156..a44ddeb482e306a8dc44f1462d24eb301c61e4f4 100644 (file)
--- a/net-analyzer/libnasl/Manifest
+++ b/net-analyzer/libnasl/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX libnasl-2.2.9-openssl-1.patch 840 RMD160 1dc2366ce997eee69131982acdd94a351591a806 SHA1 dd540b8a6318022bd94eb333e70425b89bb48985 SHA256 a8d6b18d3e4b75f5265a6e9054058489c2e4c0400e00e2a64c226db8fdbe93f7
 DIST libnasl-2.2.6.tar.gz 364643 RMD160 0c179b3a7d87fe61c8729c4e854b83ab2839031f SHA1 323475d7c11b045abd93f8adad3e7ca7ca05ed0a SHA256 f3c95f9fd72c914ad35ed0411060d41f2228d19ecddac972a6afe12a75e181ea
 DIST libnasl-2.2.9.tar.gz 366960 RMD160 c7f1d5ebd080ed60cb79838601ada8617ec4b9ec SHA1 b3d9015a54317f6dd66e4148c51e1783534f3b61 SHA256 2d9cebfe69e40963d790295993e096697a0bed37774b66ee8b14e48c2231fa93
 DIST libnasl-2.3.1.tar.gz 363907 RMD160 f9c74e15ad2aedabb710ee9e518ba35a075b9471 SHA1 dadffacefa0068839663b701f7d86f3f4de42645 SHA256 10d749e961e83211bc0462ba462945f0e623d31c97199257b0d4ec9e0000fddd
 EBUILD libnasl-2.2.6.ebuild 809 RMD160 c00470b989e0f2f4dc68964a547751c08a7b1cfd SHA1 b3876594b6fd3913349845fb9a9b0cfe864e85cc SHA256 7a5548ad5fa03da1ad115bf69b1ff3c11d2e7f52e7827c72a2d43d32accc3f74
-EBUILD libnasl-2.2.9.ebuild 824 RMD160 8a40874206164f632315954a1a7c86149cde204d SHA1 9d92b59d3b53b028442ad6d1870fe8968f08b259 SHA256 7135d875540291018000189803bbc4c1c6839c5ecece6334a0286fd306793124
+EBUILD libnasl-2.2.9.ebuild 852 RMD160 5e787b83a41b12b5da2150adb3baa190cf7a2b1b SHA1 42b75e6d756b6f1e027fc46fb170793ae8b50ec3 SHA256 75505a3f43e592f5c7a0344ab6c2dc64da30d6591d42e9a4f829834f367ddeb0
 EBUILD libnasl-2.3.1.ebuild 859 RMD160 823bca27226fa0f27249f7893f73e8ae3da165f6 SHA1 8abf23458578a3069754b308edaafa9fcaa259c0 SHA256 60bb5cb728e379c00361c2d88d7cae1a140ef867312fbc6b38e6dbd4dc6cf82d
-MISC ChangeLog 11291 RMD160 b5c2bd1ba9adf8c101c5335364093d14d9173217 SHA1 4206693d3e0d8e87abeae799e73cc323e71742d1 SHA256 62d6a400c63afbf004dfce019e5d0422ad7e1dcacd36875772d86bbd58c96bf7
+MISC ChangeLog 11462 RMD160 bba3d122deb6a664a0eee1cf993d8f9303461b53 SHA1 df0a464f1d6717c3183c11f8aae4fe0cb3945dad SHA256 d2bb289b47af49fcc7b30164ef1e0512814309572783939b37d105329932d65f
 MISC metadata.xml 240 RMD160 7bdcc5cfea4c1a1748de7666ba9e63ce744c0116 SHA1 17ad69d1731a7764f5ba2b382d5c0075ec54cc68 SHA256 0139c026bc2e3da56a4d05c483239ad8fc90fb5381ff8f6337eab72518c6e9b1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks+MxQACgkQNQqtfCuFneOUhgCeMDjSJPMrIfDha8vSH47zgoim
-Xv0AnA/eS7/LpjqB7TDjB7op5YRxfB04
-=CgcC
------END PGP SIGNATURE-----

diff --git a/net-analyzer/libnasl/files/libnasl-2.2.9-openssl-1.patch b/net-analyzer/libnasl/files/libnasl-2.2.9-openssl-1.patch
new file mode 100644 (file)
index 0000000..7d62025
--- /dev/null
+++ b/net-analyzer/libnasl/files/libnasl-2.2.9-openssl-1.patch
@@ -0,0 +1,45 @@
+http://bugs.gentoo.org/326545
+
+--- nasl/nasl_crypto.c
++++ nasl/nasl_crypto.c
+@@ -22,7 +22,9 @@
+   */
+ #include <includes.h>
+ #ifdef HAVE_SSL
++#ifdef HAVE_OPENSSL_MD2_H
+ #include <openssl/md2.h>
++#endif
+ #include <openssl/md4.h>
+ #include <openssl/md5.h>
+ #include <openssl/ripemd.h>
+@@ -45,6 +47,7 @@
+ 
+ 
+ /*-------------------[  Std. HASH ]-------------------------------------*/
++#ifdef HAVE_OPENSSL_MD2_H
+ tree_cell * nasl_md2(lex_ctxt * lexic)
+ {
+  char * data = get_str_var_by_num(lexic, 0);
+@@ -63,6 +66,7 @@
+  retc->size = MD2_DIGEST_LENGTH;
+  return retc;
+ }
++#endif
+ 
+ tree_cell * nasl_md4(lex_ctxt * lexic)
+ {
+@@ -192,12 +196,12 @@
+  return retc;
+ }
+ 
+-
++#ifdef HAVE_OPENSSL_MD2_H
+ tree_cell * nasl_hmac_md2(lex_ctxt * lexic)
+ {
+  return nasl_hmac(lexic, EVP_md2());
+ }
+-
++#endif
+ 
+ tree_cell * nasl_hmac_md5(lex_ctxt * lexic)
+ {

diff --git a/net-analyzer/libnasl/libnasl-2.2.9.ebuild b/net-analyzer/libnasl/libnasl-2.2.9.ebuild
index a0797181885e11dd3907fc4bff8c950ceb15ff8d..e5e1ec1edf978b238dfed285ed711a16b188d613 100644 (file)
--- a/net-analyzer/libnasl/libnasl-2.2.9.ebuild
+++ b/net-analyzer/libnasl/libnasl-2.2.9.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/libnasl/libnasl-2.2.9.ebuild,v 1.2 2007/04/11 13:50:23 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/libnasl/libnasl-2.2.9.ebuild,v 1.3 2010/07/11 03:43:28 ssuominen Exp $
 
-inherit toolchain-funcs
+EAPI=2
+inherit eutils toolchain-funcs
 
 DESCRIPTION="A remote security scanner for Linux (libnasl)"
 HOMEPAGE="http://www.nessus.org/"
@@ -15,16 +16,23 @@ IUSE=""
 
 DEPEND="=net-analyzer/nessus-libraries-${PV}"
 
-S="${WORKDIR}/${PN}"
+S=${WORKDIR}/${PN}
+
+src_prepare() {
+       epatch "${FILESDIR}"/${P}-openssl-1.patch
+}
+
+src_configure() {
+       tc-export CC
+       econf
+}
 
 src_compile() {
-       export CC="$(tc-getCC)"
-       econf || die "configuration failed"
        # emake fails for >= -j2. bug #16471.
-       emake -C nasl cflags
-       emake || die "make failed"
+       emake -C nasl cflags || die
+       emake || die
 }
 
 src_install() {
-       make DESTDIR="${D}" install || die "Install failed libnasl"
+       emake DESTDIR="${D}" install || die
 }