Add patch to fix memory corruption.

Package-Manager: portage-2.1.2.5

diff --git a/net-nds/ldapvi/ChangeLog b/net-nds/ldapvi/ChangeLog
index 3978ac5cfd32b12d3464e8edc64a490ff9239eb0..7240836f77db9d5e4621fdef06049e235df53e1b 100644 (file)
--- a/net-nds/ldapvi/ChangeLog
+++ b/net-nds/ldapvi/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-nds/ldapvi
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ChangeLog,v 1.11 2007/01/09 18:52:32 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ChangeLog,v 1.12 2007/05/02 23:07:03 hansmi Exp $
+
+*ldapvi-1.6-r1 (03 May 2007)
+
+  02 May 2007; Michael Hanselmann <hansmi@gentoo.org>
+  +files/1.6-mem-corruption.diff, +ldapvi-1.6-r1.ebuild:
+  Add post-1.6 patch from GIT to fix memory corruption bug (mentioned as
+  "potential FAQ" on ldapvi's website).
 
   09 Jan 2007; Michael Hanselmann <hansmi@gentoo.org> ldapvi-1.6.ebuild:
   Stable on ppc, x86.

diff --git a/net-nds/ldapvi/Manifest b/net-nds/ldapvi/Manifest
index b3a53751bf8164649ddb9149fa7b4fb0aa1b22ad..8da1351dd8f85d085f53cc25918358bf56dab67f 100644 (file)
--- a/net-nds/ldapvi/Manifest
+++ b/net-nds/ldapvi/Manifest
@@ -1,17 +1,25 @@
+AUX 1.6-mem-corruption.diff 326 RMD160 671db89e7ed76a5564a6a33f4b6f7625132588f3 SHA1 52c56a4f1a8ff52079dadbe5020ca304a27dc234 SHA256 93f6b384dd07ec0cd7023608f801c5afbd48f2ab1fa541fc24ae9ca9d5215b77
+MD5 b19fe4524cd48ad2060e7a7d0460a822 files/1.6-mem-corruption.diff 326
+RMD160 671db89e7ed76a5564a6a33f4b6f7625132588f3 files/1.6-mem-corruption.diff 326
+SHA256 93f6b384dd07ec0cd7023608f801c5afbd48f2ab1fa541fc24ae9ca9d5215b77 files/1.6-mem-corruption.diff 326
 DIST ldapvi-1.5.tar.gz 75707 RMD160 16796740fbb4d4840107239e026fd40870f03c7b SHA1 a3a7857dea6cef4a0bb04f7fbb5228d445cf970b SHA256 2515249e3e9e36dd78e319b08b8e812c0f186a691a598489119faa8b828b6330
 DIST ldapvi-1.6.tar.gz 113138 RMD160 e730b09b927ae2d1cbc7f2000eae2b2fb6e766a0 SHA1 d1f98016ae252de04861574486f49969cbd0154b SHA256 1c4b8de461ede56c674398640b4a380beb7e2180e386eef180e3db2495672876
 EBUILD ldapvi-1.5.ebuild 611 RMD160 cd16cd2cb2630262a2bfc99147307fed1da1da1f SHA1 35c63d721f2057a924027002b18f9d043aa34e3e SHA256 6aa235e549044dba2172db8fb9e1febb8ee976cc8915dc91c60324855d426306
 MD5 92ebcf1a3ffb222eb3a83ea75929ce32 ldapvi-1.5.ebuild 611
 RMD160 cd16cd2cb2630262a2bfc99147307fed1da1da1f ldapvi-1.5.ebuild 611
 SHA256 6aa235e549044dba2172db8fb9e1febb8ee976cc8915dc91c60324855d426306 ldapvi-1.5.ebuild 611
+EBUILD ldapvi-1.6-r1.ebuild 823 RMD160 3f3ddf458d3d3359c00ee33d48c423bbc558e8d4 SHA1 c67a70943fa1732daf92f59c1c79b474ebbeda36 SHA256 931c13ed3bb32a53c5da44377d114322935da554aa6af704d90e8baabdb21580
+MD5 fd5a44ad71be36e7a305c4f43b29dd92 ldapvi-1.6-r1.ebuild 823
+RMD160 3f3ddf458d3d3359c00ee33d48c423bbc558e8d4 ldapvi-1.6-r1.ebuild 823
+SHA256 931c13ed3bb32a53c5da44377d114322935da554aa6af704d90e8baabdb21580 ldapvi-1.6-r1.ebuild 823
 EBUILD ldapvi-1.6.ebuild 702 RMD160 5ee200f9fceb546978d5c4256487fbd898cafac5 SHA1 40bd0ed24ff3be120223acd6b09767055c3b41c4 SHA256 d70158690be79ca19d1c85581a0f377ea13bcec11ec925e1bb9e1d6ef0eaf580
 MD5 620bdeae6307ec5566fed4fb326fdf9d ldapvi-1.6.ebuild 702
 RMD160 5ee200f9fceb546978d5c4256487fbd898cafac5 ldapvi-1.6.ebuild 702
 SHA256 d70158690be79ca19d1c85581a0f377ea13bcec11ec925e1bb9e1d6ef0eaf580 ldapvi-1.6.ebuild 702
-MISC ChangeLog 1642 RMD160 c6c3cf05f9ccf66dbb72855b09c368d817a46bea SHA1 7def4233b157b321efbeec86460fb257e2e939bd SHA256 32cb2b34d29af97a01ad35252c3517c37f3cb8ce3c057bc487388d549e9de8dc
-MD5 fcb9f088570ae820b121dbb0ac38e76f ChangeLog 1642
-RMD160 c6c3cf05f9ccf66dbb72855b09c368d817a46bea ChangeLog 1642
-SHA256 32cb2b34d29af97a01ad35252c3517c37f3cb8ce3c057bc487388d549e9de8dc ChangeLog 1642
+MISC ChangeLog 1897 RMD160 a4833922bd03ba1110e6ed8807c5318668e52ec3 SHA1 35f1b779724efe509d2bd80b0bd3112d800d19f8 SHA256 71f5f317f4eb82d62aa675ecc36b7c9e9a5b436f04082803e8bd113b290686c9
+MD5 a0e4702feb11222f0ad96e4e842ee4c0 ChangeLog 1897
+RMD160 a4833922bd03ba1110e6ed8807c5318668e52ec3 ChangeLog 1897
+SHA256 71f5f317f4eb82d62aa675ecc36b7c9e9a5b436f04082803e8bd113b290686c9 ChangeLog 1897
 MISC metadata.xml 384 RMD160 1271d29eeb84dcad197cd9cb13e36112dbe693f3 SHA1 74cd201d24b0c504fdc52914d7610095cfbda38e SHA256 bf6070b5190a8aa0894172ebf5e3517b995c8eaf9d307b1eeb4db310f3aaa3dd
 MD5 ded28f3618875f1ee411e3e426e401c0 metadata.xml 384
 RMD160 1271d29eeb84dcad197cd9cb13e36112dbe693f3 metadata.xml 384
@@ -22,3 +30,6 @@ SHA256 be39c29f64e9c9abe29601f5708f571aa73a5d9c03585021aab0a0deb3308989 files/di
 MD5 51149fff6e0f5521385b134e5a52d02e files/digest-ldapvi-1.6 232
 RMD160 3600b4a8c91898b6fd10ca960f9a41aee28d66a6 files/digest-ldapvi-1.6 232
 SHA256 cc610173115920af8423c0fdb1d1be43134b46ecbe1654940bb43c13844471ba files/digest-ldapvi-1.6 232
+MD5 51149fff6e0f5521385b134e5a52d02e files/digest-ldapvi-1.6-r1 232
+RMD160 3600b4a8c91898b6fd10ca960f9a41aee28d66a6 files/digest-ldapvi-1.6-r1 232
+SHA256 cc610173115920af8423c0fdb1d1be43134b46ecbe1654940bb43c13844471ba files/digest-ldapvi-1.6-r1 232

diff --git a/net-nds/ldapvi/files/1.6-mem-corruption.diff b/net-nds/ldapvi/files/1.6-mem-corruption.diff
new file mode 100644 (file)
index 0000000..12c3baa
--- /dev/null
+++ b/net-nds/ldapvi/files/1.6-mem-corruption.diff
@@ -0,0 +1,11 @@
+--- ldapvi-1.6/misc.c  2006-11-04 13:53:40.000000000 +0100
++++ ldapvi/ldapvi/misc.c       2007-05-03 00:48:21.000000000 +0200
+@@ -277,7 +277,7 @@
+       }
+ 
+       n = strlen(home);
+-      result = xalloc(n + 1 + strlen(name));
++      result = xalloc(n + 1 + strlen(name) + 1);
+       strcpy(result, home);
+       result[n] = '/';
+       strcpy(result + n + 1, name);

diff --git a/net-nds/ldapvi/files/digest-ldapvi-1.6-r1 b/net-nds/ldapvi/files/digest-ldapvi-1.6-r1
new file mode 100644 (file)
index 0000000..3f8f75d
--- /dev/null
+++ b/net-nds/ldapvi/files/digest-ldapvi-1.6-r1
@@ -0,0 +1,3 @@
+MD5 09d5443bbc349548bbe016da1f734e9e ldapvi-1.6.tar.gz 113138
+RMD160 e730b09b927ae2d1cbc7f2000eae2b2fb6e766a0 ldapvi-1.6.tar.gz 113138
+SHA256 1c4b8de461ede56c674398640b4a380beb7e2180e386eef180e3db2495672876 ldapvi-1.6.tar.gz 113138

diff --git a/net-nds/ldapvi/ldapvi-1.6-r1.ebuild b/net-nds/ldapvi/ldapvi-1.6-r1.ebuild
new file mode 100644 (file)
index 0000000..8cf510e
--- /dev/null
+++ b/net-nds/ldapvi/ldapvi-1.6-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-nds/ldapvi/ldapvi-1.6-r1.ebuild,v 1.1 2007/05/02 23:07:03 hansmi Exp $
+
+inherit eutils
+
+DESCRIPTION="Manage LDAP entries with a text editor"
+HOMEPAGE="http://www.lichteblau.com/ldapvi/"
+SRC_URI="http://www.lichteblau.com/download/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="ssl"
+
+DEPEND="
+       sys-libs/ncurses
+       >=net-nds/openldap-2.2
+       dev-libs/popt
+       >=dev-libs/glib-2
+       sys-libs/readline
+       ssl? ( dev-libs/openssl )
+"
+
+src_unpack() {
+       unpack "${A}" || die
+       cd "${S}"
+
+       epatch "${FILESDIR}/${PV}-mem-corruption.diff"
+}
+
+src_compile() {
+       econf $(use_with ssl libcrypto openssl) || die
+       emake || die
+}
+
+src_install() {
+       dobin ldapvi
+       doman ldapvi.1
+}