!1 package init

Merge pull request !1 from gu-gu-gu/gu
This commit is contained in:
openeuler-ci-bot 2020-02-20 15:30:58 +08:00 committed by Gitee
commit 40facddde1
5 changed files with 112 additions and 0 deletions

View File

@ -0,0 +1,13 @@
https://sourceforge.net/p/jfs/bugs/286/
https://bugs.gentoo.org/448844
--- a/libfs/devices.h
+++ b/libfs/devices.h
@@ -42,6 +42,7 @@
struct stat;
+#include <stdint.h>
int ujfs_get_dev_size(FILE *, int64_t * size);
int ujfs_rw_diskblocks(FILE *, int64_t, int32_t, void *, int32_t);
int ujfs_flush_dev(FILE *);

BIN
jfsutils-1.1.15.tar.gz Normal file

Binary file not shown.

View File

@ -0,0 +1,40 @@
diff -Nur jfsutils-1.1.15_old/fscklog/display.c jfsutils-1.1.15/fscklog/display.c
--- jfsutils-1.1.15_old/fscklog/display.c 2020-01-19 10:38:11.873031611 +0800
+++ jfsutils-1.1.15/fscklog/display.c 2020-01-19 11:00:42.226950905 +0800
@@ -182,7 +182,7 @@
} 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
*/
diff -Nur jfsutils-1.1.15_old/fscklog/fscklog.c jfsutils-1.1.15/fscklog/fscklog.c
--- jfsutils-1.1.15_old/fscklog/fscklog.c 2020-01-19 10:38:11.873031611 +0800
+++ jfsutils-1.1.15/fscklog/fscklog.c 2020-01-19 11:01:15.377539460 +0800
@@ -252,8 +252,8 @@
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;
}
diff -Nur jfsutils-1.1.15_old/logdump/helpers.c jfsutils-1.1.15/logdump/helpers.c
--- jfsutils-1.1.15_old/logdump/helpers.c 2020-01-19 10:38:11.873031611 +0800
+++ jfsutils-1.1.15/logdump/helpers.c 2020-01-19 11:01:52.548199382 +0800
@@ -95,8 +95,8 @@
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;
}

44
jfsutils.spec Normal file
View File

@ -0,0 +1,44 @@
Name: jfsutils
Version: 1.1.15
Release: 14
Summary: Administration and debugging tools for the JFS filesystem
License: GPLv3
URL: http://jfs.sourceforge.net/
Source0: http://jfs.sourceforge.net/project/pub/jfsutils-1.1.15.tar.gz
Patch0001: jfsutils-1.1.15-linux-headers.patch
Patch0002: jfsutils_sysmacros.patch
Patch9000: jfsutils-reslove-build-error.patch
Buildrequires: libuuid-devel git gdb
%description
JFS(IBM's Journaled File System) is used in IBM enterprise servers,
is designed for high-throughput server environments, key to running
intranet and other high-performance e-business file servers.
The jfsutils package is an dministration and debugging tools for the JFS
filesystem, which mainly contains a number of utilities for creating,
checking, modifying, and correcting any inconsistencies in JFS filesystems.
%prep
%autosetup -n %{name}-%{version} -p1 -Sgit
%build
%configure
%make_build
%install
rm -rf $RPM_BUILD_ROOT
%make_install
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%{_sbindir}/*
%{_mandir}/man8/*
%doc AUTHORS NEWS ChangeLog
%license COPYING
%changelog
* Fri Feb 14 2020 gulining<gulining1@openeuler.org> - 1.1.15-14
- Package init

15
jfsutils_sysmacros.patch Normal file
View 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>