[Debian-ha-commits] [ocfs2-tools] 04/04: debian/patches: fix glibc 2.26 FTBFS (Closes: #887631)

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch master
in repository ocfs2-tools.

commit b2f760fd4e5424cf72737a64eeaa1d829a7dcc27
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Thu Jan 18 16:48:27 2018 +0100

    debian/patches: fix glibc 2.26 FTBFS (Closes: #887631)
---
 debian/patches/glibc-2.26.patch | 70 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series           |  1 +
 2 files changed, 71 insertions(+)

diff --git a/debian/patches/glibc-2.26.patch b/debian/patches/glibc-2.26.patch
new file mode 100644
index 0000000..9a468c3
--- /dev/null
+++ b/debian/patches/glibc-2.26.patch
@@ -0,0 +1,70 @@
+Author: Gang He <ghe at suse.com>
+Origin: https://github.com/markfasheh/ocfs2-tools/commit/0ffd58b223e24779420130522ea8ee359505f493
+Subject: fsck.ocfs2: fix compile error when glibc upgrade
+    When glibc upgrade to glibc-2.26.90-14, there was a compile error in fsck.ocfs2,
+    the compile error messages like,
+    
+    In file included from /usr/include/string.h:431:0,
+                     from ../include/ocfs2/ocfs2.h:41,
+                     from pass4.c:32:
+    include/strings.h:37:1: error: unknown type name ‘errcode_t’; did you mean ‘mode_t’?
+     errcode_t o2fsck_strings_insert(o2fsck_strings *strings, char *string,
+     ^~~~~~~~~
+     mode_t
+
+diff --git a/fsck.ocfs2/Makefile b/fsck.ocfs2/Makefile
+index 051ed742..baf1994d 100644
+--- a/fsck.ocfs2/Makefile
++++ b/fsck.ocfs2/Makefile
+@@ -64,7 +64,7 @@ HFILES = 	include/fsck.h		\
+ 		include/problem.h	\
+ 		include/refcount.h	\
+ 		include/slot_recovery.h	\
+-		include/strings.h	\
++		include/o2fsck_strings.h	\
+ 		include/util.h
+ 
+ 
+diff --git a/fsck.ocfs2/include/strings.h b/fsck.ocfs2/include/o2fsck_strings.h
+similarity index 100%
+rename from fsck.ocfs2/include/strings.h
+rename to fsck.ocfs2/include/o2fsck_strings.h
+diff --git a/fsck.ocfs2/pass2.c b/fsck.ocfs2/pass2.c
+index 181febb9..a48a50b5 100644
+--- a/fsck.ocfs2/pass2.c
++++ b/fsck.ocfs2/pass2.c
+@@ -43,7 +43,7 @@
+ #include "fsck.h"
+ #include "pass2.h"
+ #include "problem.h"
+-#include "strings.h"
++#include "o2fsck_strings.h"
+ #include "util.h"
+ 
+ static const char *whoami = "pass2";
+diff --git a/fsck.ocfs2/pass5.c b/fsck.ocfs2/pass5.c
+index 5c2d899f..bfad1b72 100644
+--- a/fsck.ocfs2/pass5.c
++++ b/fsck.ocfs2/pass5.c
+@@ -40,7 +40,7 @@
+ #include "fsck.h"
+ #include "pass5.h"
+ #include "problem.h"
+-#include "strings.h"
++#include "o2fsck_strings.h"
+ #include "util.h"
+ 
+ static const char *whoami = "pass5";
+diff --git a/fsck.ocfs2/strings.c b/fsck.ocfs2/strings.c
+index 4ad37822..8a7a8d9d 100644
+--- a/fsck.ocfs2/strings.c
++++ b/fsck.ocfs2/strings.c
+@@ -31,7 +31,7 @@
+ #include "ocfs2/ocfs2.h"
+ 
+ #include "fsck.h"
+-#include "strings.h"
++#include "o2fsck_strings.h"
+ #include "util.h"
+ 
+ struct string_entry {
diff --git a/debian/patches/series b/debian/patches/series
index 0638241..b7b8080 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ parallel-build.patch
 gcc-warnings.patch
 register_printf_specifier.patch
 fortify-source.patch
+glibc-2.26.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/ocfs2-tools.git