From 22c2139254a4a7ce94b8b293c49729689675b0e8 Mon Sep 17 00:00:00 2001 From: Benjamin Kaduk Date: Thu, 14 Dec 2017 21:03:57 -0600 Subject: [PATCH] Pull in patch that properly includes stdint.h This should allow Ubuntu to return to syncing instead of having their own additional patches. Change-Id: I9e97fbb237d059433ba6193b67c22774602b3a77 --- debian/changelog | 2 + ...g-include-of-stdint.h-to-volinodes.h.patch | 37 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 40 insertions(+) create mode 100644 debian/patches/0007-vol-add-missing-include-of-stdint.h-to-volinodes.h.patch diff --git a/debian/changelog b/debian/changelog index 2b3989110..4b41d6780 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ openafs (1.6.22-3) UNRELEASED; urgency=medium * Pull in upstream patch to avoid OOPS on linux 4.14 kernels. (Closes: #884420) + * Pull in pending upstream patch to include stdint.h where needed. + This should allow Ubuntu to return to syncing openafs from Debian. -- Benjamin Kaduk Thu, 14 Dec 2017 20:57:22 -0600 diff --git a/debian/patches/0007-vol-add-missing-include-of-stdint.h-to-volinodes.h.patch b/debian/patches/0007-vol-add-missing-include-of-stdint.h-to-volinodes.h.patch new file mode 100644 index 000000000..727023e15 --- /dev/null +++ b/debian/patches/0007-vol-add-missing-include-of-stdint.h-to-volinodes.h.patch @@ -0,0 +1,37 @@ +From: =?utf-8?q?Michael_La=C3=9F?= +Date: Tue, 12 Sep 2017 19:33:15 +0200 +Subject: vol: add missing include of stdint.h to volinodes.h + +volinodes.h requires stdint.h for use of uintptr_t: + +In file included from vutil.c:55:0: +volinodes.h: In function 'init_inode_info': +volinodes.h:109:45: error: 'uintptr_t' undeclared (first use in this function); did you mean 'intptr_t'? + stuff[i].inode = (Inode*)((char*)header + (uintptr_t)stuff[i].inode); + ^~~~~~~~~ + intptr_t + +Similar changes have been applied earlier in 1e53da3. + +This change does not apply to master since e2b4fde added an include of roken.h +to all affected source files which in turn includes stdint.h. + +Change-Id: Iddd174e844583e06f66d910052e11feff928ba40 +--- + src/vol/volinodes.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/vol/volinodes.h b/src/vol/volinodes.h +index 181b441..2dec0ce 100644 +--- a/src/vol/volinodes.h ++++ b/src/vol/volinodes.h +@@ -18,6 +18,9 @@ + #define __volinodes_h_ + + #include ++#ifdef HAVE_STDINT_H ++# include ++#endif + + /* Used by vutil.c and salvager.c */ + diff --git a/debian/patches/series b/debian/patches/series index ea9a5b735..9c41230d1 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -4,3 +4,4 @@ AFS_component_version_number.c-Respect-SOURCE_DATE_E.patch 0004-Linux-Use-kernel_read-kernel_write-when-__vfs-varian.patch 0005-afs-fix-kernel_write-kernel_read-arguments.patch 0006-Fix-macro-used-to-check-kernel_read-argument-order.patch +0007-vol-add-missing-include-of-stdint.h-to-volinodes.h.patch -- 2.39.5