fix #123976, not enough elements allocated for array of func ptrs.

Package-Manager: portage-2.0.51.22-r3

5 files changed, 59 insertions, 2 deletions

diff --git a/app-admin/otpcalc/ChangeLog b/app-admin/otpcalc/ChangeLog
index c7519ed34395..6c897899be51 100644
--- a/app-admin/otpcalc/ChangeLog
+++ b/app-admin/otpcalc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-admin/otpcalc
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/otpcalc/ChangeLog,v 1.14 2006/02/24 17:54:15 taviso Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/otpcalc/ChangeLog,v 1.15 2006/02/24 22:45:42 taviso Exp $
+
+*otpcalc-0.97-r1 (24 Feb 2006)
+
+  24 Feb 2006; Tavis Ormandy <taviso@gentoo.org>
+  +files/otpcalc-0.97-badindex.diff, +otpcalc-0.97-r1.ebuild:
+  fix #123976, not enough elements allocated for array of func ptrs.
 
   24 Feb 2006; Tavis Ormandy <taviso@gentoo.org> otpcalc-0.97.ebuild:
   #123950 kill virtual/x11 dep
diff --git a/app-admin/otpcalc/Manifest b/app-admin/otpcalc/Manifest
index 6a7d50322d9f..272db4fc8f58 100644
--- a/app-admin/otpcalc/Manifest
+++ b/app-admin/otpcalc/Manifest
@@ -1,7 +1,10 @@
 MD5 ded776c9915279e88af019594ffda994 otpcalc-0.97.ebuild 795
+MD5 5937d67d0cf2d0526f60d8f53781c6c3 otpcalc-0.97-r1.ebuild 909
 MD5 2da57917cc18ce178900650519046289 otpcalc-0.96.ebuild 729
-MD5 d3ec7526d8d92e99b2eb585b35382d1c ChangeLog 1392
+MD5 d0ba220b1a333e9622154bbf864a1f9c ChangeLog 1605
 MD5 78714bd1cdeb6709df0a6dcc4c5347ce metadata.xml 410
+MD5 fb4ade24812b14dd5fc4c2d89dc6a9a5 files/digest-otpcalc-0.97-r1 64
 MD5 1ce297d1a90353ea4e3ee49a9d21be6d files/digest-otpcalc-0.96 64
 MD5 fb4ade24812b14dd5fc4c2d89dc6a9a5 files/digest-otpcalc-0.97 64
 MD5 79ac858c43e67fdc670c1092b51a03ad files/otpcalc-man-table-format.diff 507
+MD5 9f150d63ce347efb91f683233ff9b53d files/otpcalc-0.97-badindex.diff 300
diff --git a/app-admin/otpcalc/files/digest-otpcalc-0.97-r1 b/app-admin/otpcalc/files/digest-otpcalc-0.97-r1
new file mode 100644
index 000000000000..334e98f1b5cf
--- /dev/null
+++ b/app-admin/otpcalc/files/digest-otpcalc-0.97-r1
@@ -0,0 +1 @@
+MD5 73c9a9e95462afda725fdf17a301f0b0 otpCalc-0.97.tar.gz 123704
diff --git a/app-admin/otpcalc/files/otpcalc-0.97-badindex.diff b/app-admin/otpcalc/files/otpcalc-0.97-badindex.diff
new file mode 100644
index 000000000000..db1db17ba767
--- /dev/null
+++ b/app-admin/otpcalc/files/otpcalc-0.97-badindex.diff
@@ -0,0 +1,11 @@
+--- otpCalc-0.97.orig/callbacks.c	2004-11-24 05:57:45.000000000 +0000
++++ otpCalc-0.97/callbacks.c	2006-02-24 22:36:56.602831704 +0000
+@@ -81,7 +81,7 @@
+ void calculate(void)
+ {
+ 
+-	void (*hashes[4])();
++	void (*hashes[5])();
+ 
+ 	gchar *challenge, *passwd, *message, *response;
+ 	struct tokens *set;
diff --git a/app-admin/otpcalc/otpcalc-0.97-r1.ebuild b/app-admin/otpcalc/otpcalc-0.97-r1.ebuild
new file mode 100644
index 000000000000..e8f36528610e
--- /dev/null
+++ b/app-admin/otpcalc/otpcalc-0.97-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-admin/otpcalc/otpcalc-0.97-r1.ebuild,v 1.1 2006/02/24 22:45:42 taviso Exp $
+
+inherit eutils
+
+DESCRIPTION="A One Time Password and S/Key calculator for X"
+HOMEPAGE="http://killa.net/infosec/otpCalc/"
+SRC_URI="http://killa.net/infosec/otpCalc/otpCalc-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="=x11-libs/gtk+-1.2* virtual/libc"
+
+S=${WORKDIR}/${P/c/C}
+
+src_unpack() {
+	unpack ${A}; cd ${S}
+
+	epatch ${FILESDIR}/otpcalc-man-table-format.diff
+	epatch ${FILESDIR}/otpcalc-0.97-badindex.diff
+
+	# print correct version in manpage
+	sed -i -e "s/VERSION/${PV}/g" ${S}/otpCalc.man
+
+	# override hardcoded CFLAGS
+	sed -i "s#-s -O3#${CFLAGS}#g" ${S}/Makefile.in
+}
+
+src_install() {
+	newman otpCalc.man otpCalc.1
+	dobin otpCalc
+}