summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2008-09-17 19:51:31 +0000
committerUlrich Müller <ulm@gentoo.org>2008-09-17 19:51:31 +0000
commit93b60c1f54d7b4789e7a5b043b2f3b0b1a0c03bf (patch)
treeba0e6fd3da9bd9ff9701ff09aaa1a5ab2e62f535 /sys-auth
parentversion bump (diff)
downloadhistorical-93b60c1f54d7b4789e7a5b043b2f3b0b1a0c03bf.tar.gz
historical-93b60c1f54d7b4789e7a5b043b2f3b0b1a0c03bf.tar.bz2
historical-93b60c1f54d7b4789e7a5b043b2f3b0b1a0c03bf.zip
Fix SHA1 byte-order issue for conformance with RFC 2289.
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 i686
Diffstat (limited to 'sys-auth')
-rw-r--r--sys-auth/otpcalc/ChangeLog9
-rw-r--r--sys-auth/otpcalc/Manifest11
-rw-r--r--sys-auth/otpcalc/files/otpcalc-0.97-sha1-byteorder.patch22
-rw-r--r--sys-auth/otpcalc/otpcalc-0.97-r4.ebuild (renamed from sys-auth/otpcalc/otpcalc-0.97-r3.ebuild)7
4 files changed, 42 insertions, 7 deletions
diff --git a/sys-auth/otpcalc/ChangeLog b/sys-auth/otpcalc/ChangeLog
index 8f0fe6930145..7e58c12fb574 100644
--- a/sys-auth/otpcalc/ChangeLog
+++ b/sys-auth/otpcalc/ChangeLog
@@ -1,6 +1,13 @@
# 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.3 2008/08/20 23:09:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/otpcalc/ChangeLog,v 1.4 2008/09/17 19:51:31 ulm Exp $
+
+*otpcalc-0.97-r4 (17 Sep 2008)
+
+ 17 Sep 2008; Ulrich Mueller <ulm@gentoo.org>
+ +files/otpcalc-0.97-sha1-byteorder.patch, -otpcalc-0.97-r3.ebuild,
+ +otpcalc-0.97-r4.ebuild:
+ Fix SHA1 byte-order issue for conformance with RFC 2289.
*otpcalc-0.97-r3 (20 Aug 2008)
diff --git a/sys-auth/otpcalc/Manifest b/sys-auth/otpcalc/Manifest
index 33a16806ca7b..4832f87a232a 100644
--- a/sys-auth/otpcalc/Manifest
+++ b/sys-auth/otpcalc/Manifest
@@ -3,18 +3,19 @@ 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-sha1-byteorder.patch 647 RMD160 90146e9c4673bf5816568216ffb998c1dea0fe73 SHA1 dde80f63c40d502fc0859a93a9692d53e812fb55 SHA256 7104620af7ea41e46aca79c60aac90188dd98ad25257f31df1cddd93364b29f7
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
-EBUILD otpcalc-0.97-r3.ebuild 1428 RMD160 a749fe6d8c901059dbec7904628cda0e447ea2ab SHA1 f5e376c5531ec1e92024c164cb044d72802319b5 SHA256 7fbb924c7a3e1db9c208e52f5e5e8ef3a0faeca244413e279f0a0301fc0de69f
-MISC ChangeLog 4150 RMD160 b6a35074eca212202a4c2f063b415d1340adf0a3 SHA1 b3864419f424e2f751a97f4aa19e42c07bf1f236 SHA256 db2e3fc357fda830f4d6da9b5567f9dd2c03f68cde6de1356200e41d58417185
+EBUILD otpcalc-0.97-r4.ebuild 1565 RMD160 c6718d8cf51a43b38d3a03c567523e3eb5c94e3d SHA1 f7591f1d3dfb601426292944ff699b384d61c376 SHA256 1f138fb3f7b41cef3f618b51b3cf9104c1b9190b90d0d8130f1ed10b2fbf4e97
+MISC ChangeLog 4385 RMD160 6d87a61bcaa5413da154be18edaee2366ec793a7 SHA1 50de539bda334420b56c4323076cd21381c9f7ad SHA256 7c8fbbfdec29b6b483e69db47eee084a3c12ca50b90ec43d1067f8eefb8f2257
MISC metadata.xml 392 RMD160 500534c054b9f912fb7b5742b23a9f65c97d69de SHA1 2b568d2d16c861ae39a99271da305945b79344bc SHA256 3a48ceb0870d309c72fcb1064dec7333e3dacd3abe2596c82dce780a5643fdcb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
-iEYEARECAAYFAkispDAACgkQOeoy/oIi7ux3cQCfXI3PiZx5FT7X7ztDUVUoQKVT
-fxcAniQeoA49tl5ZudeXrc4LCiVL+cUE
-=xCEM
+iEYEARECAAYFAkjRX8cACgkQOeoy/oIi7uy6fACglzNHBCnGrY8hrSW1NiuySXHP
+BxkAnjZIlyicF6BwFAJdEe0LqLmrKPQa
+=dc6k
-----END PGP SIGNATURE-----
diff --git a/sys-auth/otpcalc/files/otpcalc-0.97-sha1-byteorder.patch b/sys-auth/otpcalc/files/otpcalc-0.97-sha1-byteorder.patch
new file mode 100644
index 000000000000..eb9fe8cf823a
--- /dev/null
+++ b/sys-auth/otpcalc/files/otpcalc-0.97-sha1-byteorder.patch
@@ -0,0 +1,22 @@
+--- otpCalc-0.97-orig/crypto.c 2001-06-26 10:22:52.000000000 +0200
++++ otpCalc-0.97/crypto.c 2008-09-17 20:55:10.000000000 +0200
+@@ -199,6 +199,8 @@
+ for (i = 0; i < 4; i++)
+ digest[i] ^= digest[i+16];
+
+- memcpy(message, digest, 8);
++ /* Fix byte order */
++ for (i = 0; i < 8; i++)
++ message[i] = digest[(i&4)+3-(i&3)];
+
+ }
+--- otpCalc-0.97-orig/BUGS 2001-05-07 08:23:38.000000000 +0200
++++ otpCalc-0.97/BUGS 2008-09-17 21:02:36.000000000 +0200
+@@ -16,3 +16,7 @@
+
+ Thanks,
+ Anthony
++
++Note: Above-mentioned SHA1 issue is fixed in the Gentoo version.
++The output now agrees with RFC 2289 and with S/Key.
++ - Ulrich Mueller <ulm@gentoo.org>
diff --git a/sys-auth/otpcalc/otpcalc-0.97-r3.ebuild b/sys-auth/otpcalc/otpcalc-0.97-r4.ebuild
index e44c52bfd34b..f5cb202f7ccd 100644
--- a/sys-auth/otpcalc/otpcalc-0.97-r3.ebuild
+++ b/sys-auth/otpcalc/otpcalc-0.97-r4.ebuild
@@ -1,6 +1,6 @@
# 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/otpcalc/otpcalc-0.97-r4.ebuild,v 1.1 2008/09/17 19:51:31 ulm Exp $
inherit eutils
@@ -27,11 +27,16 @@ src_unpack() {
epatch "${FILESDIR}/${PN}-man-table-format.diff"
epatch "${FILESDIR}/${P}-badindex.diff"
epatch "${FILESDIR}/${PN}-crypto-proto.diff"
+
+ # make it work with GTK+ 2
epatch "${FILESDIR}/${P}-gtk2-gentoo.patch"
# change default s/key hash to MD5 (same as sys-auth/skey)
epatch "${FILESDIR}/${P}-skey-md5.patch"
+ # fix SHA1 byte-order issue for conformance with RFC 2289
+ epatch "${FILESDIR}/${P}-sha1-byteorder.patch"
+
# print correct version in manpage
sed -i -e "s/VERSION/${PV}/g" otpCalc.man