* update jfsutils to 1.1.15-9
This commit is contained in:
parent
ec582eb2d3
commit
32182c0177
@ -1,42 +1,46 @@
|
||||
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
|
||||
# POWER Maintainer: Alexander Baldeck <alex.bldck@gmail.com>
|
||||
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
|
||||
# Maintainer: Gaetan Bisson <bisson@archlinux.org>
|
||||
|
||||
pkgname=jfsutils
|
||||
pkgver=1.1.15
|
||||
pkgrel=8
|
||||
pkgrel=9
|
||||
pkgdesc='JFS filesystem utilities'
|
||||
url='http://jfs.sourceforge.net'
|
||||
arch=(x86_64 powerpc64le powerpc)
|
||||
license=('GPL')
|
||||
arch=(x86_64 powerpc64le powerpc64 powerpc riscv64)
|
||||
license=('GPL-3.0-or-later')
|
||||
depends=('util-linux')
|
||||
source=("http://jfs.sourceforge.net/project/pub/${pkgname}-${pkgver}.tar.gz"
|
||||
'inttypes.patch'
|
||||
'sysmacros.patch')
|
||||
'jfsutils-1.1.15-missing-includes.patch'
|
||||
'jfsutils-1.1.15-sysmacros.patch'
|
||||
'jfsutils-1.1.15-gcc10.patch'
|
||||
'jfsutils-1.1.15-format-security-errors.patch')
|
||||
sha256sums=('244a15f64015ce3ea17e49bdf6e1a0fb4f9af92b82fa9e05aa64cb30b5f07a4d'
|
||||
'15ea88350c240b23fe322d4adafbb79c8473b9850495d61efafc7bf68be391b3'
|
||||
'fd1a4e794a3bf2ebdb4b81f582e147655d70aadd59689aacea0ccc32c6381a28')
|
||||
'467f43ad5be91f57c01b3171b71d3c079f45d150290b02b06ebd32c6b22f5e2c'
|
||||
'fd1a4e794a3bf2ebdb4b81f582e147655d70aadd59689aacea0ccc32c6381a28'
|
||||
'491c8e4b4d95cc296e4b87b730e252ce37dafbabaae48aa653ae002df26266f2'
|
||||
'40e3ee196b139fec46b2df6047c2f052e7630d9c9e6669d4f70ca478165bc054')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
patch -p1 -i ../inttypes.patch
|
||||
patch -p1 -i ../sysmacros.patch
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
patch -p1 -i ../jfsutils-1.1.15-missing-includes.patch
|
||||
patch -p1 -i ../jfsutils-1.1.15-sysmacros.patch
|
||||
patch -p1 -i ../jfsutils-1.1.15-gcc10.patch
|
||||
patch -p1 -i ../jfsutils-1.1.15-format-security-errors.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
CFLAGS+=' -fcommon' \
|
||||
./configure --prefix=/usr --sbindir=/usr/bin
|
||||
make
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
./configure --prefix=/usr --sbindir=/usr/bin
|
||||
make
|
||||
}
|
||||
|
||||
check() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make check
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make check
|
||||
}
|
||||
|
||||
package() {
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
cd "${srcdir}/${pkgname}-${pkgver}"
|
||||
make DESTDIR="${pkgdir}" install
|
||||
}
|
||||
|
||||
37
jfsutils/jfsutils-1.1.15-format-security-errors.patch
Normal file
37
jfsutils/jfsutils-1.1.15-format-security-errors.patch
Normal file
@ -0,0 +1,37 @@
|
||||
--- a/fscklog/display.c
|
||||
+++ b/fscklog/display.c
|
||||
@@ -182,7 +182,7 @@ void dump_service_log()
|
||||
} else {
|
||||
/* the record looks ok */
|
||||
msg_txt = &log_entry[log_entry_pos];
|
||||
- printf(msg_txt);
|
||||
+ printf("%s", msg_txt);
|
||||
/*
|
||||
* set up for the next record
|
||||
*/
|
||||
--- a/fscklog/fscklog.c
|
||||
+++ b/fscklog/fscklog.c
|
||||
@@ -252,8 +252,8 @@ int v_send_msg(int msg_num, const char *file_name, int line_number, ...) {
|
||||
|
||||
sprintf(debug_detail, " [%s:%d]\n", basename(file_name), line_number);
|
||||
|
||||
- printf(msg_string);
|
||||
- printf(debug_detail);
|
||||
+ printf("%s", msg_string);
|
||||
+ printf("%s", debug_detail);
|
||||
|
||||
return 0;
|
||||
}
|
||||
--- a/logdump/helpers.c
|
||||
+++ b/logdump/helpers.c
|
||||
@@ -95,8 +95,8 @@ int v_fsck_send_msg(int msg_num, const char *file_name, int line_number, ...) {
|
||||
|
||||
sprintf(debug_detail, " [%s:%d]\n", file_name, line_number);
|
||||
|
||||
- printf(msg_string);
|
||||
- printf(debug_detail);
|
||||
+ printf("%s", msg_string);
|
||||
+ printf("%s", debug_detail);
|
||||
|
||||
return 0;
|
||||
}
|
||||
74
jfsutils/jfsutils-1.1.15-gcc10.patch
Normal file
74
jfsutils/jfsutils-1.1.15-gcc10.patch
Normal file
@ -0,0 +1,74 @@
|
||||
Submitted By: Pierre Labastie <pierre dot labastie at neuf dot fr>
|
||||
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;
|
||||
|
||||
/*
|
||||
17
jfsutils/jfsutils-1.1.15-missing-includes.patch
Normal file
17
jfsutils/jfsutils-1.1.15-missing-includes.patch
Normal file
@ -0,0 +1,17 @@
|
||||
Description: Add missing include to fix FTBFS with eglibc 2.17
|
||||
Origin: vendor, http://patches.ubuntu.com/j/jfsutils/jfsutils_1.1.15-2ubuntu1.patch
|
||||
Bug-Debian: http://bugs.debian.org/701433
|
||||
Last-Update: 2013-07-05
|
||||
|
||||
Index: b/fscklog/extract.c
|
||||
===================================================================
|
||||
--- a/fscklog/extract.c 2006-06-05 19:31:40.000000000 +0000
|
||||
+++ b/fscklog/extract.c 2013-04-02 07:13:08.737654963 +0000
|
||||
@@ -28,6 +28,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
+#include <sys/types.h>
|
||||
|
||||
#include "devices.h"
|
||||
#include "diskmap.h"
|
||||
15
jfsutils/jfsutils-1.1.15-sysmacros.patch
Normal file
15
jfsutils/jfsutils-1.1.15-sysmacros.patch
Normal file
@ -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>
|
||||
Loading…
x
Reference in New Issue
Block a user