diff -Nru jfsutils-1.1.15/debian/changelog jfsutils-1.1.15/debian/changelog --- jfsutils-1.1.15/debian/changelog 2018-12-11 14:40:40.000000000 +0000 +++ jfsutils-1.1.15/debian/changelog 2020-06-23 20:31:15.000000000 +0000 @@ -1,3 +1,12 @@ +jfsutils (1.1.15-5) unstable; urgency=medium + + * Update Standards-Version to 4.5.0 . + + [ Pierre Labastie ] + * Add patch to fix FTBFS with GCC 10 (closes: #957390). + + -- Laszlo Boszormenyi (GCS) Tue, 23 Jun 2020 22:31:15 +0200 + jfsutils (1.1.15-4) unstable; urgency=medium * Include sys/sysmacros.h for recent glibc (closes: #916211). diff -Nru jfsutils-1.1.15/debian/control jfsutils-1.1.15/debian/control --- jfsutils-1.1.15/debian/control 2018-12-11 14:40:40.000000000 +0000 +++ jfsutils-1.1.15/debian/control 2020-06-23 20:31:15.000000000 +0000 @@ -2,8 +2,8 @@ Section: admin Priority: optional Maintainer: Laszlo Boszormenyi (GCS) -Build-Depends: cdbs, debhelper (>= 11), uuid-dev -Standards-Version: 4.2.1 +Build-Depends: cdbs, debhelper (>= 10), uuid-dev +Standards-Version: 4.5.0 Homepage: https://jfs.sourceforge.net/ Package: jfsutils diff -Nru jfsutils-1.1.15/debian/patches/gcc10_fix-1.patch jfsutils-1.1.15/debian/patches/gcc10_fix-1.patch --- jfsutils-1.1.15/debian/patches/gcc10_fix-1.patch 1970-01-01 00:00:00.000000000 +0000 +++ jfsutils-1.1.15/debian/patches/gcc10_fix-1.patch 2020-06-23 09:48:06.000000000 +0000 @@ -0,0 +1,74 @@ +Submitted By: Pierre Labastie +Date: 2020-05-21 +Initial Package Version: 1.1.15 +Upstream Status: Unknown (no development since 2011) +Origin: self, adapted from opensuse +Description: Fixes building with GCC 10 + +--- jfsutils-1.1.15.old/fscklog/display.c 2005-11-22 21:43:54.000000000 +0100 ++++ jfsutils-1.1.15.new/fscklog/display.c 2020-05-21 18:15:13.410617620 +0200 +@@ -54,7 +54,7 @@ + * output: fsck extracted service log I/O buffer + * + */ +-char xchklog_buffer[XCHKLOG_BUFSIZE]; ++static char xchklog_buffer[XCHKLOG_BUFSIZE]; + + /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + * +diff -ur --exclude '*.o' --exclude '*.a' jfsutils-1.1.15.old/libfs/logredo.c jfsutils-1.1.15.new/libfs/logredo.c +--- jfsutils-1.1.15.old/libfs/logredo.c 2005-11-22 21:43:55.000000000 +0100 ++++ jfsutils-1.1.15.new/libfs/logredo.c 2020-05-21 18:19:44.927703271 +0200 +@@ -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 -Nru jfsutils-1.1.15/debian/patches/series jfsutils-1.1.15/debian/patches/series --- jfsutils-1.1.15/debian/patches/series 2018-12-11 14:40:40.000000000 +0000 +++ jfsutils-1.1.15/debian/patches/series 2020-06-23 20:31:15.000000000 +0000 @@ -3,3 +3,4 @@ sparc-memory-alignment-fix.patch fix-mkfs-man-comment.patch add_sysmacros.patch +gcc10_fix-1.patch