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

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r6 i686

4 files changed, 92 insertions, 5 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/Manifest b/sys-auth/otpcalc/Manifest
index 0c6ea73a5f30..29bd3cc2c3f0 100644
--- a/sys-auth/otpcalc/Manifest
+++ b/sys-auth/otpcalc/Manifest
@@ -3,16 +3,18 @@ Hash: SHA1
 
 AUX otpcalc-0.97-badindex.diff 300 RMD160 7a4eb69a009df9d3666ce135a3fc9061284c6db6 SHA1 6ee616f85d942fcc1fb53633a9fb67ad55e64653 SHA256 e61ee91721e6accb7b54697619422f38bb961136462ef1a2342ba7ad11623703
 AUX otpcalc-0.97-gtk2-gentoo.patch 2010 RMD160 859253c77a9f68e3f0fc048b579a0e4d6a5e6f1c SHA1 8e53b5bc316cdab11c3f2f99d3e8911b5b7d0b60 SHA256 edfabb39df8e1b82b084485cb5a9231956f0b22255f065624bb25fd73f4b7b82
+AUX otpcalc-0.97-skey-md5.patch 561 RMD160 c41fb24165fd4d8ebdd8179ad78982be3d347ceb SHA1 d6012fca59ea4c28bd24166ae96f37827e0764b9 SHA256 454fbed7108b5585872eb3b9145f02a92401d875c099a5714c5241ad4d210d47
 AUX otpcalc-crypto-proto.diff 528 RMD160 94792659215b7948befdf0032c1cfa03ca60dd92 SHA1 6e1f518c345d10fdb31b1f8c677c28f63e4b89ef SHA256 906d0b413d531fe2782c2ab4724a44ca856072895e2538a4e78d59929136a00d
 AUX otpcalc-man-table-format.diff 507 RMD160 2eaf50bdd0f50f70ff1ddac7d56bcfaadc8be9d1 SHA1 4afa7d24ba6aa57c72765e2d09ebcf1fd1b9d567 SHA256 cec72cec708bf6edf75c6236d8811544a9258c2b2710c520ee2c6acb65a599dd
 DIST otpCalc-0.97.tar.gz 123704 RMD160 0b7908f90fede73e23f25cb0ebd0f9e87393a2a2 SHA1 0ca443baf05ed491e49419345ec815256a822b8c SHA256 e2c19fa6178ed42f0576650db6f94942cac366feadf82c2a679b35197c65f745
 EBUILD otpcalc-0.97-r2.ebuild 1320 RMD160 133de17ad65c412e8fef30230d47d47e35c493ef SHA1 10226fd77acd3f78da7662849d867490581addeb SHA256 19ceba6afc6cf43f886225ade69bc4e66f659284a8e479e8bfbcd83b013d352b
-MISC ChangeLog 3874 RMD160 3359531a0c84dd6e9e02680cd38fa1b047498230 SHA1 f154f0c20dca66941915643c3a01143baece7515 SHA256 789c3fb7950b8c2f1cbff1ec1dcd8d3a775d2d184989ecae190749ff9dc5dc5b
+EBUILD otpcalc-0.97-r3.ebuild 1428 RMD160 a749fe6d8c901059dbec7904628cda0e447ea2ab SHA1 f5e376c5531ec1e92024c164cb044d72802319b5 SHA256 7fbb924c7a3e1db9c208e52f5e5e8ef3a0faeca244413e279f0a0301fc0de69f
+MISC ChangeLog 4090 RMD160 b962518d4913506fa252dc2ad8fd48aeb42ca666 SHA1 92e169114b2c3b67e0edd3cd9504318389057df2 SHA256 94938d80d43bb9e215a18b576a60fa16837eba09edf6256e92a098caa4dd03de
 MISC metadata.xml 392 RMD160 500534c054b9f912fb7b5742b23a9f65c97d69de SHA1 2b568d2d16c861ae39a99271da305945b79344bc SHA256 3a48ceb0870d309c72fcb1064dec7333e3dacd3abe2596c82dce780a5643fdcb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAkgm6LYACgkQOeoy/oIi7uyjGQCfXh50+7GrIDCh/tGnRi5o3vdu
-z9kAoOW4flgaB9JyUVPLF3o5kkdiReef
-=UYUl
+iEYEARECAAYFAkisn+UACgkQOeoy/oIi7uxnJQCfcVfhAuhquoDoNvKyZAS7DOtb
+CecAoIywYY5VXCoJKfUKy2tR2d3qYT4T
+=Z5CG
 -----END PGP SIGNATURE-----
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
+}