diff options
| -rw-r--r-- | dev-util/mfoc/Manifest | 7 | ||||
| -rw-r--r-- | dev-util/mfoc/files/mfoc-fix-segfault.patch | 49 | ||||
| -rw-r--r-- | dev-util/mfoc/mfoc-0.10.7.ebuild (renamed from dev-util/mfoc/mfoc-0.10.2.ebuild) | 8 | ||||
| -rw-r--r-- | dev-util/mfoc/mfoc-9999.ebuild | 29 | ||||
| -rw-r--r-- | metadata/cache/dev-util/mfoc-0.10.7 (renamed from metadata/cache/dev-util/mfoc-0.10.2) | 8 | ||||
| -rw-r--r-- | metadata/cache/dev-util/mfoc-9999 | 22 |
6 files changed, 39 insertions, 84 deletions
diff --git a/dev-util/mfoc/Manifest b/dev-util/mfoc/Manifest index 9f96e48..d1d7c28 100644 --- a/dev-util/mfoc/Manifest +++ b/dev-util/mfoc/Manifest @@ -1,4 +1,3 @@ -AUX mfoc-fix-segfault.patch 1104 RMD160 2494955653bbabd3b4c152f19b17fa4421b71096 SHA1 62497ae871d3e0871615afa4027b7ac6748564bc SHA256 2ddccf4187463bbee1c416cb4902c70fccdd25dc1452a507b6d9574f1ae74ff3 -DIST mfoc-0.10.2.tar.gz 112864 RMD160 a74ccdc22f4ead364872bac0beee0564c53f2be2 SHA1 cce1662300eeab303d375f746dd52e515e2f0e99 SHA256 fc38b990bf37b6416949d0a7c6481bdd8a67698cbb4dcae00c0576fd10845cb0 -EBUILD mfoc-0.10.2.ebuild 591 RMD160 ba78dc93a7641e2c8b9e8d0f78b7fa32a17d5389 SHA1 a9440ea46f317ccf620eba2f601598eb5429a6ad SHA256 0e4fe4fcf98476584e4769565592e934242d68a126158552ee915744fc998681 -EBUILD mfoc-9999.ebuild 735 RMD160 49fb61faf9437ad6315ba10240a1e98382ad5b74 SHA1 9247a44718a04eb36d4589165bc60d7e681589ab SHA256 bd5dcc27a823af8d0a18d8b5f614b8ed9f4c16a3eb870359ed5af24d9529d0c0 +AUX mfoc-fix-segfault.patch 1076 SHA256 f128a4e65c6d2d82b0a770df56b29bd90a00720ec2090cc758b2f484cea8772e SHA512 4f2a589944289b3dcd5601033f6a69c4ca0d2dea992dad860650e2c38eb5e12c916f454d6b77c699d42017acfa60cb570fdbbe19e6000e79dcbae7e68910815d WHIRLPOOL 37d71ea0dbf50bdbee28bff230985f46cd9240ed524fa1fa73c7f3d79e2a2ebdc0d109ce63dbebc007413ddd45d9b7dd594de06a6e3346018c1b26eef1dd2c9e +DIST mfoc-0.10.7.tar.bz2 99596 SHA256 93d8ac4cb0aa6ed94855ca9732a2ffd898a9095c087f12f9402205443c2eb98c SHA512 fc2f5619374c575bf71083d7774fec2855255cd24de325fc33290c3375126173c83a198162cfdcec444d8a6fc393eae3d5bc61fb341bac79ec96ffa2b380506e WHIRLPOOL 0cbc7af16ce948169c4d562fae3251ade4110b4c0693994aa82c14d2e5e6851e4d9fa0d492d5eff1cff15d64f8887ed59ca523e22f82437b2e7bd0fa20a2958d +EBUILD mfoc-0.10.7.ebuild 650 SHA256 14a0f717a163832451fc56685143252d48b7861c4d3b75cf2940144d5d6be89a SHA512 aca1567adc925b4dee696084b6e775ff1e0e0438dc33bf7c29933719a62bdae42a71908ca66f575402cdab3e069dba6922e1b143ecf7038faf48c8254602ae0e WHIRLPOOL a7fb1b1815aca40247547e81cf78d10dbc58ddf926ac9f880c5a5d76349b1615168a2b48823e0b7df32fa3dff6a2d2ad291872eee74d82e97590fe3630bb6260 diff --git a/dev-util/mfoc/files/mfoc-fix-segfault.patch b/dev-util/mfoc/files/mfoc-fix-segfault.patch index ad09e3b..9b66fd2 100644 --- a/dev-util/mfoc/files/mfoc-fix-segfault.patch +++ b/dev-util/mfoc/files/mfoc-fix-segfault.patch @@ -1,29 +1,32 @@ -Index: src/mifare.c -=================================================================== ---- src/mifare.c (revision 1071) -+++ src/mifare.c (working copy) -@@ -104,7 +104,8 @@ +--- src/mifare.c.orig 2013-12-06 15:29:07.000000000 +0100 ++++ src/mifare.c 2014-10-03 11:00:06.575404505 +0200 +@@ -124,7 +124,8 @@ + return res; } // Fire the mifare command - int res; - if ((res = nfc_initiator_transceive_bytes(pnd, abtCmd, 2 + szParamLen, abtRx, sizeof(abtRx), -1)) < 0) { + size_t abtRxSize = sizeof(abtRx); + if ((res = nfc_initiator_transceive_bytes(pnd, abtCmd, 2 + szParamLen, abtRx, &abtRxSize, -1)) < 0) { - if (res == NFC_ERFTRANS) { - // "Invalid received frame", usual means we are - // authenticated on a sector but the requested MIFARE cmd (read, write) -Index: src/mfoc.c -=================================================================== ---- src/mfoc.c (revision 1071) -+++ src/mfoc.c (working copy) -@@ -690,7 +690,8 @@ - exit (EXIT_FAILURE); - } + return res; + } + +--- src/mfoc.c.orig 2013-12-06 15:29:07.000000000 +0100 ++++ src/mfoc.c 2014-10-03 10:59:23.001537603 +0200 +@@ -706,6 +706,7 @@ + + uint8_t Rx[MAX_FRAME_LEN]; // Tag response + uint8_t RxPar[MAX_FRAME_LEN]; // Tag response ++ size_t RxLen; + + uint32_t Nt, NtLast, NtProbe, NtEnc, Ks1; -- if (nfc_initiator_transceive_bytes(r.pdi, Auth, 4, Rx, sizeof(Rx), 0) < 0) { -+ RxLen = sizeof(Rx); -+ if (nfc_initiator_transceive_bytes(r.pdi, Auth, 4, Rx, &RxLen, 0) < 0) { - fprintf(stdout, "Error while requesting plain tag-nonce\n"); - exit(EXIT_FAILURE); - } - +@@ -731,7 +732,8 @@ + exit(EXIT_FAILURE); + } + +- if (nfc_initiator_transceive_bytes(r.pdi, Auth, 4, Rx, sizeof(Rx), 0) < 0) { ++ RxLen = sizeof(Rx); ++ if (nfc_initiator_transceive_bytes(r.pdi, Auth, 4, Rx, &RxLen, 0) < 0) { + fprintf(stdout, "Error while requesting plain tag-nonce\n"); + exit(EXIT_FAILURE); + } diff --git a/dev-util/mfoc/mfoc-0.10.2.ebuild b/dev-util/mfoc/mfoc-0.10.7.ebuild index e38eb68..bb8f291 100644 --- a/dev-util/mfoc/mfoc-0.10.2.ebuild +++ b/dev-util/mfoc/mfoc-0.10.7.ebuild @@ -7,8 +7,8 @@ EAPI="2" inherit eutils DESCRIPTION="Mifare Classic Offline Cracker is a tool that can recover keys from Mifare Classic cards" -HOMEPAGE="http://code.google.com/p/nfc-tools/" -SRC_URI="http://nfc-tools.googlecode.com/files/${P}.tar.gz" +HOMEPAGE="http://code.google.com/p/mfoc/" +SRC_URI="http://mfoc.googlecode.com/files/${P}.tar.bz2" LICENSE="LGPL-3" SLOT="0" @@ -17,6 +17,10 @@ KEYWORDS="~x86 ~amd64" CDEPEND=">=dev-libs/libnfc-1.4.0" RDEPEND="${CDEPEND}" +src_prepare() { + epatch "${FILESDIR}/mfoc-fix-segfault.patch" +} + src_install() { emake DESTDIR="${D}" install || die "Install failed" dodoc README ChangeLog AUTHORS NEWS TODO || die diff --git a/dev-util/mfoc/mfoc-9999.ebuild b/dev-util/mfoc/mfoc-9999.ebuild deleted file mode 100644 index ec1861f..0000000 --- a/dev-util/mfoc/mfoc-9999.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit eutils subversion autotools - -DESCRIPTION="Mifare Classic Offline Cracker is a tool that can recover keys from Mifare Classic cards" -HOMEPAGE="http://code.google.com/p/nfc-tools/" -ESVN_REPO_URI="http://nfc-tools.googlecode.com/svn/trunk/mfoc/" -ESVN_PROJECT="mfoc" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~x86 ~amd64" - -CDEPEND=">=dev-libs/libnfc-1.5.1" -RDEPEND="${CDEPEND}" - -src_prepare() { - epatch "${FILESDIR}/mfoc-fix-segfault.patch" - eautoreconf || die "autoreconf failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "Install failed" - dodoc README ChangeLog AUTHORS NEWS TODO || die -} diff --git a/metadata/cache/dev-util/mfoc-0.10.2 b/metadata/cache/dev-util/mfoc-0.10.7 index 16e4fa4..8fd3c60 100644 --- a/metadata/cache/dev-util/mfoc-0.10.2 +++ b/metadata/cache/dev-util/mfoc-0.10.7 @@ -1,20 +1,20 @@ >=dev-libs/libnfc-1.4.0 0 -http://nfc-tools.googlecode.com/files/mfoc-0.10.2.tar.gz +http://mfoc.googlecode.com/files/mfoc-0.10.7.tar.bz2 -http://code.google.com/p/nfc-tools/ +http://code.google.com/p/mfoc/ LGPL-3 Mifare Classic Offline Cracker is a tool that can recover keys from Mifare Classic cards ~x86 ~amd64 -eutils multilib toolchain-funcs user +eutils multilib toolchain-funcs 2 -install +install prepare diff --git a/metadata/cache/dev-util/mfoc-9999 b/metadata/cache/dev-util/mfoc-9999 deleted file mode 100644 index dd2304d..0000000 --- a/metadata/cache/dev-util/mfoc-9999 +++ /dev/null @@ -1,22 +0,0 @@ -|| ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync || ( >=sys-devel/automake-1.11.1:1.11 >=sys-devel/automake-1.12:1.12 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ->=dev-libs/libnfc-1.5.1 -0 - - -http://code.google.com/p/nfc-tools/ -LGPL-3 -Mifare Classic Offline Cracker is a tool that can recover keys from Mifare Classic cards -~x86 ~amd64 -autotools eutils libtool multilib multiprocessing subversion toolchain-funcs user - - - - -2 - -install preinst prepare unpack - - - - - |