Date: Monday, May 25, 2015 @ 17:48:34 Author: eworm Revision: 134069 archrelease: copy trunk to community-i686, community-x86_64
Added: oath-toolkit/repos/community-i686/0001-fix-make-check-on-32-bit-systems.patch (from rev 134068, oath-toolkit/trunk/0001-fix-make-check-on-32-bit-systems.patch) oath-toolkit/repos/community-i686/PKGBUILD (from rev 134068, oath-toolkit/trunk/PKGBUILD) oath-toolkit/repos/community-x86_64/0001-fix-make-check-on-32-bit-systems.patch (from rev 134068, oath-toolkit/trunk/0001-fix-make-check-on-32-bit-systems.patch) oath-toolkit/repos/community-x86_64/PKGBUILD (from rev 134068, oath-toolkit/trunk/PKGBUILD) Deleted: oath-toolkit/repos/community-i686/PKGBUILD oath-toolkit/repos/community-x86_64/PKGBUILD --------------------------------------------------------------+ /PKGBUILD | 90 ++++++++++ community-i686/0001-fix-make-check-on-32-bit-systems.patch | 43 ++++ community-i686/PKGBUILD | 37 ---- community-x86_64/0001-fix-make-check-on-32-bit-systems.patch | 43 ++++ community-x86_64/PKGBUILD | 37 ---- 5 files changed, 176 insertions(+), 74 deletions(-) Copied: oath-toolkit/repos/community-i686/0001-fix-make-check-on-32-bit-systems.patch (from rev 134068, oath-toolkit/trunk/0001-fix-make-check-on-32-bit-systems.patch) =================================================================== --- community-i686/0001-fix-make-check-on-32-bit-systems.patch (rev 0) +++ community-i686/0001-fix-make-check-on-32-bit-systems.patch 2015-05-25 15:48:34 UTC (rev 134069) @@ -0,0 +1,43 @@ +From 547065646f96d8e7a3b88ebc03b0fd35294e9d11 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <m...@eworm.de> +Date: Mon, 25 May 2015 17:34:19 +0200 +Subject: [PATCH 1/1] fix make check on 32 bit systems + +Some tests break with time_t limited to 32 bit. The test code has +exception, but bad values. Update the values to what we expect and make +tests pass. + +Signed-off-by: Christian Hesse <m...@eworm.de> +--- + liboath/tests/tst_totp_algo.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/liboath/tests/tst_totp_algo.c b/liboath/tests/tst_totp_algo.c +index 019efb9..f56be1f 100644 +--- a/liboath/tests/tst_totp_algo.c ++++ b/liboath/tests/tst_totp_algo.c +@@ -131,8 +131,8 @@ main (void) + if (strcmp (otp, tv[i].sha256otp) != 0) + { + printf ("otp[%ld] got %s expected2 %s\n", i, otp, tv[i].sha256otp); +- if (strcmp (otp, "82762030") == 0 +- && strcmp (tv[i].sha256otp, "65353130") == 0) ++ if (strcmp (otp, "11281421") == 0 ++ && strcmp (tv[i].sha256otp, "77737706") == 0) + printf ("Mismatch due to 32-bit time_t...\n"); + else + return 1; +@@ -153,8 +153,8 @@ main (void) + if (strcmp (otp, tv[i].sha512otp) != 0) + { + printf ("otp[%ld] got %s expected2 %s\n", i, otp, tv[i].sha512otp); +- if (strcmp (otp, "82762030") == 0 +- && strcmp (tv[i].sha512otp, "65353130") == 0) ++ if (strcmp (otp, "29833534") == 0 ++ && strcmp (tv[i].sha512otp, "47863826") == 0) + printf ("Mismatch due to 32-bit time_t...\n"); + else + return 1; +-- +2.4.1 + Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2015-05-25 15:45:39 UTC (rev 134068) +++ community-i686/PKGBUILD 2015-05-25 15:48:34 UTC (rev 134069) @@ -1,37 +0,0 @@ -# $Id$ -# Maintainer: Sébastien Luttringer -# Contributor: Christian Hesse <m...@eworm.de> -# Contributor: L42y <423...@gmail.com> - -pkgname=oath-toolkit -pkgver=2.4.1 -pkgrel=1 -pkgdesc='OATH one-time password toolkit' -arch=('i686' 'x86_64') -url='http://www.nongnu.org/oath-toolkit/' -license=('GPL3') -depends=('glibc' 'pam' 'xmlsec') -source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('951bafd1d86e6013903c10be3b6623bb' - 'SKIP') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr - make -} - -check() { - cd $pkgname-$pkgver - make check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - # Install basic docs too - install -D -m 644 pam_oath/README "$pkgdir/usr/share/doc/$pkgname/PAM_README" - install -D -m 644 README "$pkgdir/usr/share/doc/$pkgname/README" -} - -# vim:set ts=2 sw=2 et: Copied: oath-toolkit/repos/community-i686/PKGBUILD (from rev 134068, oath-toolkit/trunk/PKGBUILD) =================================================================== --- community-i686/PKGBUILD (rev 0) +++ community-i686/PKGBUILD 2015-05-25 15:48:34 UTC (rev 134069) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Sébastien Luttringer +# Maintainer: Christian Hesse <m...@eworm.de> +# Contributor: L42y <423...@gmail.com> + +pkgname=oath-toolkit +pkgver=2.6.0 +pkgrel=1 +pkgdesc='OATH one-time password toolkit' +arch=('i686' 'x86_64') +url='http://www.nongnu.org/oath-toolkit/' +license=('GPL3') +depends=('glibc' 'pam' 'xmlsec') +validpgpkeys=('9AA9BDB11BB1B99A21285A330664A76954265E8C') # Simon Josefsson +source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} + '0001-fix-make-check-on-32-bit-systems.patch') +md5sums=('f19f1c47eb7d1c609b3e244876b9ce63' + 'SKIP' + 'd3c1a32357fb27f67a82bffd08331062') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 < "${srcdir}/0001-fix-make-check-on-32-bit-systems.patch" +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + # Install basic docs too + install -D -m 644 pam_oath/README "$pkgdir/usr/share/doc/$pkgname/PAM_README" + install -D -m 644 README "$pkgdir/usr/share/doc/$pkgname/README" +} + +# vim:set ts=2 sw=2 et: Copied: oath-toolkit/repos/community-x86_64/0001-fix-make-check-on-32-bit-systems.patch (from rev 134068, oath-toolkit/trunk/0001-fix-make-check-on-32-bit-systems.patch) =================================================================== --- community-x86_64/0001-fix-make-check-on-32-bit-systems.patch (rev 0) +++ community-x86_64/0001-fix-make-check-on-32-bit-systems.patch 2015-05-25 15:48:34 UTC (rev 134069) @@ -0,0 +1,43 @@ +From 547065646f96d8e7a3b88ebc03b0fd35294e9d11 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <m...@eworm.de> +Date: Mon, 25 May 2015 17:34:19 +0200 +Subject: [PATCH 1/1] fix make check on 32 bit systems + +Some tests break with time_t limited to 32 bit. The test code has +exception, but bad values. Update the values to what we expect and make +tests pass. + +Signed-off-by: Christian Hesse <m...@eworm.de> +--- + liboath/tests/tst_totp_algo.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/liboath/tests/tst_totp_algo.c b/liboath/tests/tst_totp_algo.c +index 019efb9..f56be1f 100644 +--- a/liboath/tests/tst_totp_algo.c ++++ b/liboath/tests/tst_totp_algo.c +@@ -131,8 +131,8 @@ main (void) + if (strcmp (otp, tv[i].sha256otp) != 0) + { + printf ("otp[%ld] got %s expected2 %s\n", i, otp, tv[i].sha256otp); +- if (strcmp (otp, "82762030") == 0 +- && strcmp (tv[i].sha256otp, "65353130") == 0) ++ if (strcmp (otp, "11281421") == 0 ++ && strcmp (tv[i].sha256otp, "77737706") == 0) + printf ("Mismatch due to 32-bit time_t...\n"); + else + return 1; +@@ -153,8 +153,8 @@ main (void) + if (strcmp (otp, tv[i].sha512otp) != 0) + { + printf ("otp[%ld] got %s expected2 %s\n", i, otp, tv[i].sha512otp); +- if (strcmp (otp, "82762030") == 0 +- && strcmp (tv[i].sha512otp, "65353130") == 0) ++ if (strcmp (otp, "29833534") == 0 ++ && strcmp (tv[i].sha512otp, "47863826") == 0) + printf ("Mismatch due to 32-bit time_t...\n"); + else + return 1; +-- +2.4.1 + Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2015-05-25 15:45:39 UTC (rev 134068) +++ community-x86_64/PKGBUILD 2015-05-25 15:48:34 UTC (rev 134069) @@ -1,37 +0,0 @@ -# $Id$ -# Maintainer: Sébastien Luttringer -# Contributor: Christian Hesse <m...@eworm.de> -# Contributor: L42y <423...@gmail.com> - -pkgname=oath-toolkit -pkgver=2.4.1 -pkgrel=1 -pkgdesc='OATH one-time password toolkit' -arch=('i686' 'x86_64') -url='http://www.nongnu.org/oath-toolkit/' -license=('GPL3') -depends=('glibc' 'pam' 'xmlsec') -source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}) -md5sums=('951bafd1d86e6013903c10be3b6623bb' - 'SKIP') - -build() { - cd $pkgname-$pkgver - ./configure --prefix=/usr - make -} - -check() { - cd $pkgname-$pkgver - make check -} - -package() { - cd $pkgname-$pkgver - make DESTDIR="$pkgdir" install - # Install basic docs too - install -D -m 644 pam_oath/README "$pkgdir/usr/share/doc/$pkgname/PAM_README" - install -D -m 644 README "$pkgdir/usr/share/doc/$pkgname/README" -} - -# vim:set ts=2 sw=2 et: Copied: oath-toolkit/repos/community-x86_64/PKGBUILD (from rev 134068, oath-toolkit/trunk/PKGBUILD) =================================================================== --- community-x86_64/PKGBUILD (rev 0) +++ community-x86_64/PKGBUILD 2015-05-25 15:48:34 UTC (rev 134069) @@ -0,0 +1,45 @@ +# $Id$ +# Maintainer: Sébastien Luttringer +# Maintainer: Christian Hesse <m...@eworm.de> +# Contributor: L42y <423...@gmail.com> + +pkgname=oath-toolkit +pkgver=2.6.0 +pkgrel=1 +pkgdesc='OATH one-time password toolkit' +arch=('i686' 'x86_64') +url='http://www.nongnu.org/oath-toolkit/' +license=('GPL3') +depends=('glibc' 'pam' 'xmlsec') +validpgpkeys=('9AA9BDB11BB1B99A21285A330664A76954265E8C') # Simon Josefsson +source=("http://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig} + '0001-fix-make-check-on-32-bit-systems.patch') +md5sums=('f19f1c47eb7d1c609b3e244876b9ce63' + 'SKIP' + 'd3c1a32357fb27f67a82bffd08331062') + +prepare() { + cd $pkgname-$pkgver + patch -Np1 < "${srcdir}/0001-fix-make-check-on-32-bit-systems.patch" +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr + make +} + +check() { + cd $pkgname-$pkgver + make check +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install + # Install basic docs too + install -D -m 644 pam_oath/README "$pkgdir/usr/share/doc/$pkgname/PAM_README" + install -D -m 644 README "$pkgdir/usr/share/doc/$pkgname/README" +} + +# vim:set ts=2 sw=2 et: