From 6677b8d6b7332d398f8bf41debe82afebac949fa Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Thu, 14 Feb 2013 15:25:19 -0700 Subject: [PATCH] patch from Wookey for FTBFS with eglibc-2.16 per #693352 --- debian/.gitignore | 8 ------ debian/changelog | 7 +++++ .../patches/eglibc-2.16-ftbfs-gnulib-nogets | 28 +++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 36 insertions(+), 8 deletions(-) delete mode 100644 debian/.gitignore create mode 100644 debian/patches/eglibc-2.16-ftbfs-gnulib-nogets diff --git a/debian/.gitignore b/debian/.gitignore deleted file mode 100644 index 5956d7f2..00000000 --- a/debian/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -files -tar.1 -tar.debhelper.log -tar.postinst.debhelper -tar.postrm.debhelper -tar.substvars -tar - diff --git a/debian/changelog b/debian/changelog index b959464e..85b1fd6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +tar (1.26+dfsg-5) UNRELEASED; urgency=low + + [ Wookey ] + * Fix included gnulib so we don't get FTBFS with eglibc-2.16, closes: #693352 + + -- Bdale Garbee Thu, 14 Feb 2013 15:23:33 -0700 + tar (1.26+dfsg-0.1) unstable; urgency=low * non-maintainer upload diff --git a/debian/patches/eglibc-2.16-ftbfs-gnulib-nogets b/debian/patches/eglibc-2.16-ftbfs-gnulib-nogets new file mode 100644 index 00000000..42161c4d --- /dev/null +++ b/debian/patches/eglibc-2.16-ftbfs-gnulib-nogets @@ -0,0 +1,28 @@ +Description: Allow package to build with glibc-2.16 + 'gets' has been removed from glibc-2.16 but gnulib still refers to it + causing build failures. + The simple fix for now is just to put a check around the reference in + lib/stdio.in.h + A new release made with a new gnulib is a better fix. + . + tar (1.26-5) unstable; urgency=low + . + * Fix gnu/stdio.in.h to build with glibc-2.16 (gets removed) +Author: Wookey +Last-Update: 2012-11-5 +Bug : http://lists.gnu.org/archive/html/bug-gnulib/2012-03/msg00186.html +Bug-Debian: http://bugs.debian.org/687986 +Forwarded: not-needed + +--- tar-1.26.orig/gnu/stdio.in.h ++++ tar-1.26/gnu/stdio.in.h +@@ -164,7 +164,9 @@ _GL_WARN_ON_USE (fflush, "fflush is not + so any use of gets warrants an unconditional warning. Assume it is + always declared, since it is required by C89. */ + #undef gets ++#ifdef HAVE_RAW_DECL_GETS + _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead"); ++#endif + + #if @GNULIB_FOPEN@ + # if @REPLACE_FOPEN@ diff --git a/debian/patches/series b/debian/patches/series index aa99656d..15f75237 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ doc-hack.diff longlink-hack.diff listed03-linux-only +eglibc-2.16-ftbfs-gnulib-nogets -- 2.30.2