[arch-commits] Commit in oath-toolkit/trunk (PKGBUILD fseeko.patch)

[Christian Hesse]

    Date: Saturday, November 7, 2020 @ 19:43:51
  Author: eworm
Revision: 745953

upgpkg: oath-toolkit 2.6.3-1: new upstream release

Modified:
  oath-toolkit/trunk/PKGBUILD
Deleted:
  oath-toolkit/trunk/fseeko.patch

--------------+
 PKGBUILD     |   20 +++++++-------------
 fseeko.patch |   22 ----------------------
 2 files changed, 7 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-07 19:10:27 UTC (rev 745952)
+++ PKGBUILD	2020-11-07 19:43:51 UTC (rev 745953)
@@ -3,28 +3,22 @@
 # Contributor: L42y <423300 at gmail.com>
 
 pkgname=oath-toolkit
-pkgver=2.6.2
-pkgrel=8
+pkgver=2.6.3
+pkgrel=1
 pkgdesc='OATH one-time password toolkit'
 arch=('x86_64')
 url='https://www.nongnu.org/oath-toolkit/'
 license=('GPL3')
 depends=('glibc' 'pam' 'xmlsec')
-validpgpkeys=('9AA9BDB11BB1B99A21285A330664A76954265E8C') # Simon Josefsson
-source=("https://download.savannah.gnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig}
-        'oath-toolkit-update-gnulib.patch::https://gitlab.com/oath-toolkit/oath-toolkit/commit/2fffce2a471f74a585939c84cce16ef3015e5d3d.diff'
-        'fseeko.patch')
-sha256sums=('b03446fa4b549af5ebe4d35d7aba51163442d255660558cd861ebce536824aa0'
-            'SKIP'
-            '4093d69a22af60fac339fcee22ff29c3b8418b76bc1286e5226505af884e0c21'
-            'b93dc7bafe32a3477127e55b1c470063660b1f5c3f25622ea581b41502783020')
+provides=('liboath.so' 'libpskc.so')
+validpgpkeys=('B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE') # Simon Josefsson <simon at josefsson.org>
+source=("https://download.savannah.nongnu.org/releases/$pkgname/$pkgname-$pkgver.tar.gz"{,.sig})
+sha256sums=('a1f7fd5fc5df214eebe263233bae750596b8aeee4c8a424ed3623269115551b2'
+            'SKIP')
 
 prepare() {
   cd $pkgname-$pkgver
 
-  patch -Np1 < "${srcdir}"/oath-toolkit-update-gnulib.patch
-  patch -Np1 < "${srcdir}"/fseeko.patch
-  
   autoreconf -fi
 }
 

Deleted: fseeko.patch
===================================================================
--- fseeko.patch	2020-11-07 19:10:27 UTC (rev 745952)
+++ fseeko.patch	2020-11-07 19:43:51 UTC (rev 745953)
@@ -1,22 +0,0 @@
-diff --git a/liboath/gl/fseeko.c b/liboath/gl/fseeko.c
-index 67bb9ec..6adb80e 100644
---- a/liboath/gl/fseeko.c
-+++ b/liboath/gl/fseeko.c
-@@ -47,7 +47,7 @@ fseeko (FILE *fp, off_t offset, int whence)
- #endif
- 
-   /* These tests are based on fpurge.c.  */
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-   if (fp->_IO_read_end == fp->_IO_read_ptr
-       && fp->_IO_write_ptr == fp->_IO_write_base
-       && fp->_IO_save_base == NULL)
-@@ -123,7 +123,7 @@ fseeko (FILE *fp, off_t offset, int whence)
-           return -1;
-         }
- 
--#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-+#if defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-       fp->_flags &= ~_IO_EOF_SEEN;
-       fp->_offset = pos;
- #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__