From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:33488) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifDLo-0006G0-31 for guix-patches@gnu.org; Wed, 11 Dec 2019 20:33:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifDLk-00083Z-DZ for guix-patches@gnu.org; Wed, 11 Dec 2019 20:33:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:52893) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ifDLi-000818-9p for guix-patches@gnu.org; Wed, 11 Dec 2019 20:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ifDLi-0008G3-6w for guix-patches@gnu.org; Wed, 11 Dec 2019 20:33:02 -0500 Subject: [bug#38572] [PATCH] gnu: Add jfsutils. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:52748) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ifDKq-0006C1-2Y for guix-patches@gnu.org; Wed, 11 Dec 2019 20:32:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ifDKk-0006bZ-QO for guix-patches@gnu.org; Wed, 11 Dec 2019 20:32:06 -0500 Received: from tobias.gr ([2001:470:7405::1]:50884) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ifDKj-0006VM-9Z for guix-patches@gnu.org; Wed, 11 Dec 2019 20:32:02 -0500 Received: by tobias.gr (OpenSMTPD) with ESMTP id 78a3c40b for ; Thu, 12 Dec 2019 01:31:58 +0000 (UTC) Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id f0fc77b8 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Thu, 12 Dec 2019 01:31:58 +0000 (UTC) Date: Thu, 12 Dec 2019 02:31:49 +0100 Message-Id: <20191212013149.5526-1-me@tobias.gr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" Reply-to: Tobias Geerinckx-Rice , Tobias Geerinckx-Rice via Guix-patches From: Tobias Geerinckx-Rice via Guix-patches via To: 38572@debbugs.gnu.org * gnu/packages/file-systems.scm (jfsutils): New public variable. --- gnu/local.mk | 2 ++ gnu/packages/file-systems.scm | 34 +++++++++++++++++++ .../patches/jfsutils-add-sysmacros.patch | 26 ++++++++++++++ .../patches/jfsutils-include-systypes.patch | 25 ++++++++++++++ 4 files changed, 87 insertions(+) create mode 100644 gnu/packages/patches/jfsutils-add-sysmacros.patch create mode 100644 gnu/packages/patches/jfsutils-include-systypes.patch diff --git a/gnu/local.mk b/gnu/local.mk index df0959fa7e..2be218f59e 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1011,6 +1011,8 @@ dist_patch_DATA = \ %D%/packages/patches/java-xerces-build_dont_unzip.patch \ %D%/packages/patches/java-xerces-xjavac_taskdef.patch \ %D%/packages/patches/jbig2dec-ignore-testtest.patch \ + %D%/packages/patches/jfsutils-add-sysmacros.patch \ + %D%/packages/patches/jfsutils-include-systypes.patch \ %D%/packages/patches/kdbusaddons-kinit-file-name.patch \ %D%/packages/patches/libnftnl-dont-check-NFTNL_FLOWTABLE_SIZE.patch \ %D%/packages/patches/libvirt-create-machine-cgroup.patch \ diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm index 7bd09bce0c..527e915e84 100644 --- a/gnu/packages/file-systems.scm +++ b/gnu/packages/file-systems.scm @@ -167,6 +167,40 @@ files. Since the HTTP protocol itself has no notion of directories, only a single file can be mounted.") (license license:gpl2+))) +(define-public jfsutils + (package + (name "jfsutils") + (version "1.1.15") + (source + (origin + (method url-fetch) + (uri (string-append "http://jfs.sourceforge.net/project/pub/jfsutils-" + version ".tar.gz")) + (sha256 + (base32 "0kbsy2sk1jv4m82rxyl25gwrlkzvl3hzdga9gshkxkhm83v1aji4")) + (patches (search-patches "jfsutils-add-sysmacros.patch" + "jfsutils-include-systypes.patch")))) + (build-system gnu-build-system) + (inputs + `(("util-linux" ,util-linux))) + (home-page "http://jfs.sourceforge.net/home.html") + (synopsis "Utilities for managing JFS file systems") + (description + "The JFSutils are a collection of utilities for managing the @acronym{JFS, +Journaled File System}, a 64-bit journaling file system created by IBM and later +ported to the kernel Linux. The following commands are available: +@enumerate +@item @command{fsck.jfs}: check and repair a JFS file system or replay its +transaction log. +@item @command{logdump}: dump the JFS journal log. +@item @command{logredo}: replay the JFS journal log. +@item @command{mkfs.jfs}: create a new JFS file system. +@item @command{xchklog}: save a JFS fsck log to a file. +@item @command{xchkdmp}: dump the contents of such a log file. +@item @command{xpeek}: a JFS file system editor with a shell-like interface. +@end enumerate\n") + (license license:gpl3+))) ; no explicit version given + (define-public disorderfs (package (name "disorderfs") diff --git a/gnu/packages/patches/jfsutils-add-sysmacros.patch b/gnu/packages/patches/jfsutils-add-sysmacros.patch new file mode 100644 index 0000000000..2349e37c06 --- /dev/null +++ b/gnu/packages/patches/jfsutils-add-sysmacros.patch @@ -0,0 +1,26 @@ +From: Tobias Geerinckx-Rice +Date: Thu, 12 Dec 2019 02:15:37 +0100 +Subject: gnu: jfsutils: Include sys/sysmacros.h. + +Copied verbatim[0] from the Debian package. + +[0]: https://sources.debian.org/patches/jfsutils/1.1.15-4/add_sysmacros.patch + +Description: Include sys/sysmacros.h + Mentioned header needed for major() definition. +Author: Laszlo Boszormenyi (GCS) +Last-Update: 2018-12-11 + +--- + +--- jfsutils-1.1.15.orig/libfs/devices.c ++++ jfsutils-1.1.15/libfs/devices.c +@@ -49,6 +49,8 @@ + #include + #endif + ++#include ++ + #include "jfs_types.h" + #include "jfs_filsys.h" + #include "devices.h" diff --git a/gnu/packages/patches/jfsutils-include-systypes.patch b/gnu/packages/patches/jfsutils-include-systypes.patch new file mode 100644 index 0000000000..ef1515d02c --- /dev/null +++ b/gnu/packages/patches/jfsutils-include-systypes.patch @@ -0,0 +1,25 @@ +From: Tobias Geerinckx-Rice +Date: Thu, 12 Dec 2019 02:15:37 +0100 +Subject: gnu: jfsutils: Include sys/types.h. + +Copied verbatim[0] from the Debian package. + +[0]: https://sources.debian.org/patches/jfsutils/1.1.15-4/missing-includes.diff + +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 + #include + #include ++#include + + #include "devices.h" + #include "diskmap.h" -- 2.23.0