[med-svn] [Git][med-team/caftools][master] 3 commits: fix FTBFS on recent glibc versions

[Sascha Steinbiss (@satta)]

Sascha Steinbiss pushed to branch master at Debian Med / caftools


Commits:
b01fab8d by Sascha Steinbiss at 2022-02-19T12:06:32+01:00
fix FTBFS on recent glibc versions

- - - - -
c7b22992 by Sascha Steinbiss at 2022-02-19T12:11:39+01:00
use debhelper-compat

- - - - -
a9ee7eae by Sascha Steinbiss at 2022-02-19T12:11:49+01:00
bump Standards-Version

- - - - -


5 changed files:

- debian/changelog
- − debian/compat
- debian/control
- + debian/patches/glibc_2.32.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+caftools (2.0.3-2) unstable; urgency=medium
+
+  * Team upload.
+  * Add patch to fix build on glibc >= 2.32. Thanks to Logan Rosen for the
+    patch. (Closes: #986487)
+
+ -- Sascha Steinbiss <satta at debian.org>  Sat, 19 Feb 2022 12:03:28 +0100
+
 caftools (2.0.3-1) unstable; urgency=medium
 
   * New upstream release.


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-11


=====================================
debian/control
=====================================
@@ -2,8 +2,8 @@ Source: caftools
 Section: non-free/science
 Priority: optional
 Maintainer: Steffen Moeller <moeller at debian.org>
-Build-Depends: debhelper (>= 11), autotools-dev
-Standards-Version: 4.5.0
+Build-Depends: debhelper-compat (= 13), autotools-dev
+Standards-Version: 4.5.1
 Homepage: https://www.sanger.ac.uk/science/tools/caf
 Vcs-Browser: https://salsa.debian.org/med-team/caftools
 Vcs-Git: https://salsa.debian.org/med-team/caftools.git


=====================================
debian/patches/glibc_2.32.patch
=====================================
@@ -0,0 +1,59 @@
+--- a/src/acedb/messubs.c
++++ b/src/acedb/messubs.c
+@@ -268,10 +268,6 @@
+   char *messbuf2 = &messbuf[BUFSIZE/2];
+   static int total = 50 ;
+   /* extern int errno ; */
+-#if !defined(MACINTOSH) && !defined(__linux__)
+-  extern char *sys_errlist[] ;
+-  extern int sys_nerr ;
+-#endif
+ 
+   messFlag = TRUE ;
+ 
+@@ -284,15 +280,16 @@
+       messdump ("internal system error : %s", messbuf2) ;
+     }
+ #if !defined(MACINTOSH)
+-  else if (errno < sys_nerr)
+-    { messout ("%s : %s", messbuf2, sys_errlist[errno]) ;
+-      messdump ("%s : %s", messbuf2, sys_errlist[errno]) ;
++  else
++    { messout ("%s : %s", messbuf2, strerror(errno)) ;
++      messdump ("%s : %s", messbuf2, strerror(errno)) ;
+     }
+-#endif
++#else
+   else
+     { messout ("%s : system error %d", messbuf2, errno) ;
+       messdump ("%s : system error %d", messbuf2, errno) ;
+     }
++#endif
+ 
+   invokeDebugger () ;
+   errno = 0 ;
+@@ -312,10 +309,6 @@
+   extern void crashOut (char* text) ;
+ #else
+   /* extern int errno ; */
+-#if !defined(__linux__)
+-  extern char *sys_errlist[] ;
+-  extern int sys_nerr ;
+-#endif
+ #endif
+ 
+   if (messcrashbuf)
+@@ -330,11 +323,8 @@
+   crashOut (crashText) ;
+ #else
+   messbeep();
+-  if (errno <= 0 || errno >= sys_nerr)
+-    fprintf (stderr,"!! FATAL ERROR %d: ", errno) ;
+-  else
+-    fprintf (stderr,"!! FATAL ERROR: system error %d %s \n",
+-	     errno, sys_errlist[errno]) ;
++  fprintf (stderr,"!! FATAL ERROR: system error %d %s \n",
++	   errno, strerror(errno)) ;
+   fprintf (stderr, "!! %s\n", crashText) ;
+ #if !defined(MESSCLEAN)
+   graphOut (messbuf) ;		/* to display on screen */


=====================================
debian/patches/series
=====================================
@@ -1,3 +1,4 @@
 messubs.patch
 autoconf.patch
 do_not_fail_building_man_pages.patch
+glibc_2.32.patch



View it on GitLab: https://salsa.debian.org/med-team/caftools/-/compare/d9f7651dd269ec8e2730585c69236f966dd23d1b...a9ee7eae0600387dbbd77e6735ab326c40b8359b

-- 
View it on GitLab: https://salsa.debian.org/med-team/caftools/-/compare/d9f7651dd269ec8e2730585c69236f966dd23d1b...a9ee7eae0600387dbbd77e6735ab326c40b8359b
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20220219/75a00778/attachment-0001.htm>