Change default S/Key hash to MD5 in order to agree with sys-auth/skey.

(Portage version: 2.2_rc8/cvs/Linux 2.6.25-gentoo-r6 i686)

3 files changed, 86 insertions, 1 deletions

diff --git a/sys-auth/otpcalc/ChangeLog b/sys-auth/otpcalc/ChangeLog
index 27212e5625ce..c70c7e7eeb53 100644
--- a/sys-auth/otpcalc/ChangeLog
+++ b/sys-auth/otpcalc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-auth/otpcalc
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/otpcalc/ChangeLog,v 1.1 2008/05/11 12:37:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/otpcalc/ChangeLog,v 1.2 2008/08/20 22:50:59 ulm Exp $
+
+*otpcalc-0.97-r3 (20 Aug 2008)
+
+  20 Aug 2008; Ulrich Mueller <ulm@gentoo.org>
+  +files/otpcalc-0.97-skey-md5.patch, +otpcalc-0.97-r3.ebuild:
+  Change default S/Key hash to MD5 in order to agree with sys-auth/skey.
 
   11 May 2008; Ulrich Mueller <ulm@gentoo.org>
   +files/otpcalc-0.97-badindex.diff, +files/otpcalc-0.97-gtk2-gentoo.patch,
diff --git a/sys-auth/otpcalc/files/otpcalc-0.97-skey-md5.patch b/sys-auth/otpcalc/files/otpcalc-0.97-skey-md5.patch
new file mode 100644
index 000000000000..b6013e572254
--- /dev/null
+++ b/sys-auth/otpcalc/files/otpcalc-0.97-skey-md5.patch
@@ -0,0 +1,22 @@
+--- otpCalc-0.97-orig/callbacks.c	2008-08-21 00:23:04.000000000 +0200
++++ otpCalc-0.97/callbacks.c	2008-08-21 00:27:47.000000000 +0200
+@@ -90,7 +90,7 @@
+ 	unsigned char results[9];
+ 
+ 
+-	hashes[SKEY] = md4lite;
++	hashes[SKEY] = md5lite;
+ 	hashes[MD4] = md4lite;
+ 	hashes[MD5] = md5lite;
+ 	hashes[RMD160] = rmd160lite;
+--- otpCalc-0.97-orig/otpCalc.man	2008-08-21 00:23:04.000000000 +0200
++++ otpCalc-0.97/otpCalc.man	2008-08-21 00:26:49.000000000 +0200
+@@ -30,7 +30,7 @@
+ cb l
+ cb l
+ cb l.
+-s/key#MD4
++s/key#MD5
+ otp-md4#MD4
+ otp-md5#MD5
+ otp-rmd160#RIPEMD-160
diff --git a/sys-auth/otpcalc/otpcalc-0.97-r3.ebuild b/sys-auth/otpcalc/otpcalc-0.97-r3.ebuild
new file mode 100644
index 000000000000..e44c52bfd34b
--- /dev/null
+++ b/sys-auth/otpcalc/otpcalc-0.97-r3.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/otpcalc/otpcalc-0.97-r3.ebuild,v 1.1 2008/08/20 22:51:00 ulm 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 ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="=x11-libs/gtk+-2*
+	dev-libs/openssl"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/otpCalc-${PV}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${PN}-man-table-format.diff"
+	epatch "${FILESDIR}/${P}-badindex.diff"
+	epatch "${FILESDIR}/${PN}-crypto-proto.diff"
+	epatch "${FILESDIR}/${P}-gtk2-gentoo.patch"
+
+	# change default s/key hash to MD5 (same as sys-auth/skey)
+	epatch "${FILESDIR}/${P}-skey-md5.patch"
+
+	# print correct version in manpage
+	sed -i -e "s/VERSION/${PV}/g" otpCalc.man
+
+	# override hardcoded CFLAGS
+	sed -i -e "s#-s -O3#${CFLAGS}#g" Makefile.in
+}
+
+src_install() {
+	dobin otpCalc || die
+	newman otpCalc.man otpCalc.1 || die
+	dodoc BUGS ChangeLog TODO || die
+
+	cat <<-EOF >"${T}"/${PN}.desktop
+	[Desktop Entry]
+	Type=Application
+	Version=1.0
+	Name=otpCalc
+	Comment=One Time Password and S/Key calculator
+	Exec=otpCalc
+	Categories=Utility;GTK;Security;
+	EOF
+	domenu "${T}"/${PN}.desktop || die
+}