Package: jfsutils
Version: 1.1.15-2.1
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for jfsutils (versioned as 1.1.15-2.2) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Regards.
reverted:
--- jfsutils-1.1.15/libfs/log_work.c
+++ jfsutils-1.1.15.orig/libfs/log_work.c
@@ -2406,7 +2406,6 @@
int32_t xlen, xlength;
int16_t nword;
int8_t upd_possible = 0;
- struct dinode dip_local; /* Local copy of dinode data for alignment purposes */
if (ld->length <= 0)
return (0);
@@ -2709,8 +2708,7 @@
*/
if (ino_rem == 0) { /* inode base segment */
+ dip = (struct dinode *) data;
- memcpy(&dip_local, data, size_dinode);
- dip = &dip_local;
if (ln == 1) {
/* ibase only */
if (db->db_ibase & mask_8)
diff -u jfsutils-1.1.15/debian/changelog jfsutils-1.1.15/debian/changelog
--- jfsutils-1.1.15/debian/changelog
+++ jfsutils-1.1.15/debian/changelog
@@ -1,3 +1,17 @@
+jfsutils (1.1.15-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Raise compat level for the cdbs invoked debhelper to 9 (Closes: #817508)
+ * Format utility list in description as properly list (Closes: #609793)
+ * Move 1.1.12-2.1 changes into its own patch file
+ debian/patches/sparc-memory-alignment-fix.patch
+ * Add ${misc:Depends} debhelper variables to Depends lines
+ * Add patch fix-mkfs-man-comment.patch to correct ./" unknown commands to
+ .\" comments as they are intended
+ * Bump Standards-Version to 3.9.8, no changes required
+
+ -- Andreas Bombe <[email protected]> Sun, 25 Sep 2016 13:37:53 +0200
+
jfsutils (1.1.15-2.1) unstable; urgency=low
* Non-maintainer upload.
diff -u jfsutils-1.1.15/debian/compat jfsutils-1.1.15/debian/compat
--- jfsutils-1.1.15/debian/compat
+++ jfsutils-1.1.15/debian/compat
@@ -1 +1 @@
-4
+9
diff -u jfsutils-1.1.15/debian/control jfsutils-1.1.15/debian/control
--- jfsutils-1.1.15/debian/control
+++ jfsutils-1.1.15/debian/control
@@ -2,13 +2,13 @@
Section: admin
Priority: optional
Maintainer: Stefan Hornburg (Racke) <[email protected]>
-Build-Depends: cdbs, debhelper (>= 4.1.0), uuid-dev, quilt
-Standards-Version: 3.8.0
+Build-Depends: cdbs, debhelper (>= 9), uuid-dev, quilt
+Standards-Version: 3.9.8
Homepage: http://jfs.sourceforge.net/
Package: jfsutils
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: utilities for managing the JFS filesystem
Utilities for managing IBM's Journaled File System (JFS) under Linux.
.
@@ -18,20 +18,21 @@
e-business file servers.
.
The following utilities are available:
- fsck.jfs - initiate replay of the JFS transaction log, and check and repair a
- JFS formatted device.
- logdump - dump a JFS formatted device's journal log.
- logredo - "replay" a JFS formatted device's journal log.
- mkfs.jfs - create a JFS formatted partition.
- xchkdmp - dump the contents of a JFS fsck log file created with xchklog.
- xchklog - extract a log from the JFS fsck workspace into a file.
- xpeek - shell-type JFS file system editor.
+ * fsck.jfs - initiate replay of the JFS transaction log, and check and
+ repair a JFS formatted device.
+ * logdump - dump a JFS formatted device's journal log.
+ * logredo - "replay" a JFS formatted device's journal log.
+ * mkfs.jfs - create a JFS formatted partition.
+ * xchkdmp - dump the contents of a JFS fsck log file created with
+ xchklog.
+ * xchklog - extract a log from the JFS fsck workspace into a file.
+ * xpeek - shell-type JFS file system editor.
Package: jfsutils-udeb
XC-Package-Type: udeb
Architecture: any
Section: debian-installer
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
Description: A stripped-down version of jfsutils, for debian-installer
This package is a jfsutils package built for reduced size, so that it
can help to save space in debian-installer.
diff -u jfsutils-1.1.15/debian/patches/series jfsutils-1.1.15/debian/patches/series
--- jfsutils-1.1.15/debian/patches/series
+++ jfsutils-1.1.15/debian/patches/series
@@ -2,0 +3,2 @@
+sparc-memory-alignment-fix.patch
+fix-mkfs-man-comment.patch
only in patch2:
unchanged:
--- jfsutils-1.1.15.orig/debian/patches/fix-mkfs-man-comment.patch
+++ jfsutils-1.1.15/debian/patches/fix-mkfs-man-comment.patch
@@ -0,0 +1,78 @@
+--- a/mkfs/jfs_mkfs.8
++++ b/mkfs/jfs_mkfs.8
+@@ -38,43 +38,43 @@
+
+ .SH OPTIONS
+
+-./"*********************************************
+-./"* block size has not been implemented yet *
+-./"*********************************************
+-./".TP
+-./".BI \-b " block_size"
+-./"Set the block size for a new JFS partition
+-./".RS
+-./"
+-./"Options for
+-./".I block_size
+-./"are:
+-./".BR 512 ","
+-./".BR 1024 ","
+-./".BR 2048 ", or"
+-./".BR 4096 "."
+-./"
+-./"Using small blocks (rather than large blocks) is more space efficient because it
+-./"reduces the amount of internal fragmentation within files and directories.
+-./"However, using large blocks (rather than small blocks) is more performance efficient
+-./"because block allocation activities may occur less often .
+-./"
+-./"If the
+-./".B \-b
+-./"option is not used, the default block size is
+-./".BR 4096 "."
+-./".RE
++.\"*********************************************
++.\"* block size has not been implemented yet *
++.\"*********************************************
++.\".TP
++.\".BI \-b " block_size"
++.\"Set the block size for a new JFS partition
++.\".RS
++.\"
++.\"Options for
++.\".I block_size
++.\"are:
++.\".BR 512 ","
++.\".BR 1024 ","
++.\".BR 2048 ", or"
++.\".BR 4096 "."
++.\"
++.\"Using small blocks (rather than large blocks) is more space efficient because it
++.\"reduces the amount of internal fragmentation within files and directories.
++.\"However, using large blocks (rather than small blocks) is more performance efficient
++.\"because block allocation activities may occur less often .
++.\"
++.\"If the
++.\".B \-b
++.\"option is not used, the default block size is
++.\".BR 4096 "."
++.\".RE
+
+ .TP
+ .BI \-c
+ Check the device for bad blocks before building the file system.
+
+-./"**********************************
+-./"* use -q (quiet) instead of -f *
+-./"**********************************
+-./".TP
+-./".BI \-f
+-./"Force - do not ask for confirmation before creating the file system.
++.\"**********************************
++.\"* use -q (quiet) instead of -f *
++.\"**********************************
++.\".TP
++.\".BI \-f
++.\"Force - do not ask for confirmation before creating the file system.
+
+ .TP
+ .BI -j " journal_device"
only in patch2:
unchanged:
--- jfsutils-1.1.15.orig/debian/patches/sparc-memory-alignment-fix.patch
+++ jfsutils-1.1.15/debian/patches/sparc-memory-alignment-fix.patch
@@ -0,0 +1,20 @@
+--- jfsutils-1.1.15.orig/libfs/log_work.c
++++ jfsutils-1.1.15/libfs/log_work.c
+@@ -2406,6 +2406,7 @@
+ int32_t xlen, xlength;
+ int16_t nword;
+ int8_t upd_possible = 0;
++ struct dinode dip_local; /* Local copy of dinode data for alignment purposes */
+
+ if (ld->length <= 0)
+ return (0);
+@@ -2708,7 +2709,8 @@
+ */
+
+ if (ino_rem == 0) { /* inode base segment */
+- dip = (struct dinode *) data;
++ memcpy(&dip_local, data, size_dinode);
++ dip = &dip_local;
+ if (ln == 1) {
+ /* ibase only */
+ if (db->db_ibase & mask_8)
