user debian-rele...@lists.debian.org
usertag 915175 + bsp-2019-02-de-berlin
thank you
Dear maintainers,
Greetings from the BSP at the DCSO office in Berlin.
> libtool: compile: gcc -DHAVE_CONFIG_H -I. -I.. -Wdate-time
> -D_FORTIFY_SOURCE=2 -fvisibility=hidden -g -O2
> -ffile-prefix-map=/build/1st/oath-toolkit-2.6.1=. -fstack-protector-strong
> -Wformat -Werror=format-security -c fseeko.c -fPIC -DPIC -o .libs/fseeko.o
> fseeko.c: In function 'rpl_fseeko':
> fseeko.c:110:4: error: #error "Please port gnulib fseeko.c to your platform!
> Look at the code in fseeko.c, then report this to bug-gnulib."
>#error "Please port gnulib fseeko.c to your platform! Look at the code in
> fseeko.c, then report this to bug-gnulib."
> ^
> make[7]: *** [Makefile:1402: fseeko.lo] Error 1
I have fixed this bug and NMU'd oath-toolkit_2.6.1-1.3 to DELAYED/5.
Please feel free to reschedule or cancel my upload as you see fit. I
have attached the diff.
Cheers
Sascha
diff -Nru oath-toolkit-2.6.1/debian/changelog oath-toolkit-2.6.1/debian/changelog
--- oath-toolkit-2.6.1/debian/changelog 2018-06-22 19:48:53.0 +0200
+++ oath-toolkit-2.6.1/debian/changelog 2019-02-09 16:39:41.0 +0100
@@ -1,3 +1,11 @@
+oath-toolkit (2.6.1-1.3) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Use _IO_EOF_SEEN as GNU libc indicator.
+Closes: #915175
+
+ -- Sascha Steinbiss Sat, 09 Feb 2019 16:39:41 +0100
+
oath-toolkit (2.6.1-1.2) unstable; urgency=medium
* Non-maintainer upload.
diff -Nru oath-toolkit-2.6.1/debian/patches/new-glibc-check.patch oath-toolkit-2.6.1/debian/patches/new-glibc-check.patch
--- oath-toolkit-2.6.1/debian/patches/new-glibc-check.patch 1970-01-01 01:00:00.0 +0100
+++ oath-toolkit-2.6.1/debian/patches/new-glibc-check.patch 2019-02-09 16:39:41.0 +0100
@@ -0,0 +1,25 @@
+Description: Check _IO_EOF_SEEN instead of _IO_ftrylockfile
+ Needed to get fseeko.c to build with glibc 2.28.
+ Inspired by https://git.savannah.gnu.org/cgit/gnulib.git/commit/?id=4af4a4a71827c0bc5e0ec67af23edef4f15cee8e.
+Author: Sascha Steinbiss
+Last-Update: 2019-02-09
+--- a/liboath/gl/fseeko.c
b/liboath/gl/fseeko.c
+@@ -47,7 +47,7 @@
+ #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 @@
+ 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__
diff -Nru oath-toolkit-2.6.1/debian/patches/series oath-toolkit-2.6.1/debian/patches/series
--- oath-toolkit-2.6.1/debian/patches/series 2018-04-15 20:19:41.0 +0200
+++ oath-toolkit-2.6.1/debian/patches/series 2019-02-09 16:39:41.0 +0100
@@ -1 +1,2 @@
gtkdocize.patch
+new-glibc-check.patch
