Import Debian changes 1.45.5-ok1

e2fsprogs (1.45.5-ok1) yangtze; urgency=low

  * Build for openKylin.

debian/.gitignore

@@ -1 +0,0 @@
-!patches

debian/control

@@ -1,7 +1,8 @@
 Source: e2fsprogs
 Section: admin
 Priority: required
-Maintainer: Theodore Y. Ts'o <tytso@mit.edu>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Theodore Y. Ts'o <tytso@mit.edu>
 Build-Depends: gettext, texinfo, pkg-config, libfuse-dev [linux-any kfreebsd-any] <!pkg.e2fsprogs.no-fuse2fs>, libattr1-dev, debhelper (>= 12.0), dh-exec, libblkid-dev, uuid-dev, m4, udev [linux-any], systemd [linux-any], cron [linux-any]
 Standards-Version: 4.4.1
 Homepage: http://e2fsprogs.sourceforge.net
@@ -21,8 +22,8 @@ Description: ext2 / ext3 / ext4 file system driver for FUSE
 Package: logsave
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: e2fsprogs (<< 1.45.3-1)
+Replaces: e2fsprogs (<< 1.45.3-0)
-Breaks: e2fsprogs (<< 1.45.3-1)
+Breaks: e2fsprogs (<< 1.45.3-0)
 Architecture: any
 Multi-Arch: foreign
 Description: save the output of a command in a log file
@@ -51,7 +52,7 @@ Package: e2fsprogs-l10n
 Section: localization
 Priority: optional
 Depends: e2fsprogs (>= ${binary:Version}), e2fsprogs (<< ${binary:Version}+c~), ${misc:Depends}
-Replaces: e2fsprogs (<< 1.43.5-1)
+Replaces: e2fsprogs (<< 1.43.5-0)
 Architecture: all
 Multi-Arch: foreign
 Description: ext2/ext3/ext4 file system utilities - translations
@@ -75,8 +76,8 @@ Package: libcom-err2
 Section: libs
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libcomerr2 (<< 1.43.9-1~)
+Replaces: libcomerr2 (<< 1.43.9-0)
-Breaks: libcomerr2 (<< 1.43.9-1~)
+Breaks: libcomerr2 (<< 1.43.9-0)
 Provides: libcomerr2 (= ${binary:Version})
 Architecture: any
 Multi-Arch: same
@@ -91,7 +92,7 @@ Section: libdevel
 Priority: optional
 Depends: libc6-dev | libc-dev, libcom-err2 (= ${mainBinary}), ${misc:Depends}
 Suggests: doc-base
-Replaces: e2fslibs-dev (<< 1.33-2), libkrb5-dev (<< 1.3)
+Replaces: e2fslibs-dev (<< 1.33-0), libkrb5-dev (<< 1.3)
 Architecture: any
 Multi-Arch: same
 Description: common error description library - headers and static libraries
@@ -105,7 +106,7 @@ Package: libss2
 Section: libs
 Priority: optional
 Depends: libcom-err2, ${shlibs:Depends}, ${misc:Depends}
-Replaces: e2fsprogs (<< 1.34-1)
+Replaces: e2fsprogs (<< 1.34-0)
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -165,8 +166,8 @@ Package: libext2fs2
 Section: libs
 Priority: optional
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: e2fslibs (<< 1.43.9-1~)
+Replaces: e2fslibs (<< 1.43.9-0)
-Breaks: e2fslibs (<< 1.43.9-1~)
+Breaks: e2fslibs (<< 1.43.9-0)
 Provides: e2fslibs (= ${binary:Version})
 Architecture: any
 Multi-Arch: same
@@ -185,8 +186,8 @@ Package: libext2fs-dev
 Section: libdevel
 Priority: optional
 Depends: libc6-dev | libc-dev, comerr-dev, libext2fs2 (= ${binary:Version}), ${misc:Depends}
-Replaces: e2fslibs-dev (<< 1.43.9-1~)
+Replaces: e2fslibs-dev (<< 1.43.9-0)
-Breaks: e2fslibs-dev (<< 1.43.9-1~)
+Breaks: e2fslibs-dev (<< 1.43.9-0)
 Provides: e2fslibs-dev (= ${binary:Version})
 Suggests: doc-base
 Architecture: any

debian/patches/0001-libcom_err-deal-with-the-fact-that-the-Hurd-error-messages

@@ -0,0 +1,50 @@
+From 00179a29867b72c47e074d8e0babe6622d074dba Mon Sep 17 00:00:00 2001
+From: Theodore Ts'o <tytso@mit.edu>
+Date: Wed, 8 Jan 2020 10:59:37 -0500
+Subject: [PATCH] libcom_err: deal with the fact that the Hurd error messages
+ are not zero-based
+
+Signed-off-by: Theodore Ts'o <tytso@mit.edu>
+---
+ debian/changelog       |  9 +++++++++
+ lib/et/error_message.c | 13 +++++++++----
+ 2 files changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/lib/et/error_message.c b/lib/et/error_message.c
+index bd18be78..cd9f57f5 100644
+--- a/lib/et/error_message.c
++++ b/lib/et/error_message.c
+@@ -113,6 +113,11 @@ gettextf set_com_err_gettext(gettextf new_proc)
+     return x;
+ }
+ 
++#ifdef __GNU__
++#define SYS_ERR_BASE 0x40000000
++#else
++#define SYS_ERR_BASE 0
++#endif
+ 
+ const char * error_message (errcode_t code)
+ {
+@@ -124,14 +129,14 @@ const char * error_message (errcode_t code)
+ 
+     offset = (int) (code & ((1<<ERRCODE_RANGE)-1));
+     table_num = code - offset;
+-    if (!table_num) {
++    if (table_num == SYS_ERR_BASE) {
+ #ifdef HAS_SYS_ERRLIST
+-	if (offset < sys_nerr)
+-	    return(sys_errlist[offset]);
++	if (code < sys_nerr)
++	    return(sys_errlist[code]);
+ 	else
+ 	    goto oops;
+ #else
+-	cp = strerror(offset);
++	cp = strerror(code);
+ 	if (cp)
+ 	    return(cp);
+ 	else
+-- 
+2.24.1
+

debian/patches/default-to-4k.patch

@@ -0,0 +1,21 @@
+Description: Use 4k blocksize in all ext4 mke2fs.conf such that lvm migration
+  between non-4k PVs and 4k PVs works irrespective of the volume size.
+Author: Dimitri John Ledkov <xnox@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1817097
+
+
+--- e2fsprogs-1.45.1.orig/misc/mke2fs.conf.in
++++ e2fsprogs-1.45.1/misc/mke2fs.conf.in
+@@ -15,12 +15,10 @@
+ 		inode_size = 256
+ 	}
+ 	small = {
+-		blocksize = 1024
+ 		inode_size = 128
+ 		inode_ratio = 4096
+ 	}
+ 	floppy = {
+-		blocksize = 1024
+ 		inode_size = 128
+ 		inode_ratio = 8192
+ 	}

debian/patches/series

@@ -0,0 +1,2 @@
+0001-libcom_err-deal-with-the-fact-that-the-Hurd-error-messages
+default-to-4k.patch