[packages/jfsutils] build fixes from gentoo

[atler]

commit 95228131a63ed4484ef1248184ff3095945eb193
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Jun 25 23:11:19 2023 +0200

    build fixes from gentoo

 jfsutils-gcc10.patch     | 71 ++++++++++++++++++++++++++++++++++++++++++++++++
 jfsutils-sysmacros.patch | 15 ++++++++++
 jfsutils.spec            |  4 +++
 3 files changed, 90 insertions(+)
---
diff --git a/jfsutils.spec b/jfsutils.spec
index c863901..38e6609 100644
--- a/jfsutils.spec
+++ b/jfsutils.spec
@@ -14,6 +14,8 @@ Source0:	http://jfs.sourceforge.net/project/pub/%{name}-%{version}.tar.gz
 Patch0:		%{name}-am.patch
 Patch1:		%{name}-format-security.patch
 Patch2:		%{name}-includes.patch
+Patch3:		%{name}-sysmacros.patch
+Patch4:		%{name}-gcc10.patch
 URL:		http://jfs.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -34,6 +36,8 @@ Programy do zarządzania systemem plików JFS.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
 %{!?with_fsck:cp Makefile.am Makefile.am.tmp}
 %{!?with_fsck:sed -e 's/ fsck / /' Makefile.am.tmp > Makefile.am}
 
diff --git a/jfsutils-gcc10.patch b/jfsutils-gcc10.patch
new file mode 100644
index 0000000..72160e8
--- /dev/null
+++ b/jfsutils-gcc10.patch
@@ -0,0 +1,71 @@
+Fix building with GCC 10
+
+Origin: https://sources.debian.org/patches/jfsutils/1.1.15-5/gcc10_fix-1.patch/
+
+--- jfsutils-1.1.15.old/fscklog/display.c
++++ jfsutils-1.1.15.new/fscklog/display.c
+@@ -54,7 +54,7 @@
+  * output: fsck extracted service log I/O buffer
+  *
+  */
+-char xchklog_buffer[XCHKLOG_BUFSIZE];
++static char xchklog_buffer[XCHKLOG_BUFSIZE];
+ 
+ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+  *
+--- jfsutils-1.1.15.old/libfs/logredo.c
++++ jfsutils-1.1.15.new/libfs/logredo.c
+@@ -87,9 +87,9 @@
+  *    S T U F F    F O R    T H E    L O G
+  *
+  */
+-struct logsuper logsup;		/* log super block */
+-int32_t numdoblk;		/* number of do blocks used     */
+-int32_t numnodofile;		/* number of nodo file blocks used  */
++static struct logsuper logsup;		/* log super block */
++static int32_t numdoblk;		/* number of do blocks used     */
++static int32_t numnodofile;		/* number of nodo file blocks used  */
+ int32_t numExtDtPg = 0;		/* number of extended dtpage blocks used  */
+ 
+ /*
+@@ -129,7 +129,7 @@
+  */
+ 
+ /* buffer header table */
+-struct bufhdr {
++static struct bufhdr {
+ 	int16_t next;		/* 2: next on free/lru list */
+ 	int16_t prev;		/* 2: previous on free/lru list */
+ 	int16_t hnext;		/* 2: next on hash chain */
+@@ -142,7 +142,7 @@
+ } bufhdr[NBUFPOOL];		/* (24) */
+ 
+ /* buffer table */
+-struct bufpool {
++static struct bufpool {
+ 	char bytes[PSIZE];
+ } buffer[NBUFPOOL - 1];
+ 
+@@ -151,15 +151,16 @@
+  *
+  * log has its own 4 page buffer pool.
+  */
+-uint8_t afterdata[LOGPSIZE * 2];	/* buffer to read in redopage data */
++static uint8_t afterdata[LOGPSIZE * 2];	/* buffer to read in redopage data */
+ 
+ /*
+  * Miscellaneous
+  */
+-caddr_t prog;			/* Program name */
+-int32_t mntcnt, bufsize;
+-char *mntinfo;
+-int32_t retcode;		/* return code from logredo    */
++static caddr_t prog;			/* Program name */
++extern int32_t mntcnt;
++static int32_t bufsize;
++static char *mntinfo;
++static int32_t retcode;		/* return code from logredo    */
+ int end_of_transaction = 0;
+ 
+ /*
+ 
diff --git a/jfsutils-sysmacros.patch b/jfsutils-sysmacros.patch
new file mode 100644
index 0000000..82f9d63
--- /dev/null
+++ b/jfsutils-sysmacros.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/580056
+
+--- a/libfs/devices.c
++++ b/libfs/devices.c
+@@ -30,6 +30,10 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
++#if HAVE_SYS_SYSMACROS_H
++#include <sys/sysmacros.h>
++#endif
++
+ #ifdef HAVE_SYS_MOUNT_H
+ #ifdef HAVE_SYS_PARAM_H
+ #include <sys/param.h>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/jfsutils.git/commitdiff/95228131a63ed4484ef1248184ff3095945eb193