sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (b029e10c777ce3fdb1d3bda8a6fba7b786824e9a)

From: Pavel Vinogradov <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (b029e10c777ce3fdb1d3bda8a6fba7b786824e9a)
Date: Sun, 25 Mar 2018 19:32:53 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

disk/btrfs-progs/HISTORY
| 5 +++
disk/btrfs-progs/PRE_BUILD
| 4 +-

disk/btrfs-progs/patches/btrfs-progs-convert-ext2-Remove-check-for-ext2_ext_attr_entry--e_value_block.patch
| 14 ++++++++++
disk/e2fsprogs/DETAILS
| 2 -
disk/e2fsprogs/HISTORY
| 3 ++
5 files changed, 25 insertions(+), 3 deletions(-)

New commits:
commit b029e10c777ce3fdb1d3bda8a6fba7b786824e9a
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

disk/e2fsprogs: version 1.44.1

commit 98ff37f177f2d67da4256366ad38e19ed721b9cc
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

disk/btrfs-progs: added a fix for e2fsprogs 1.44.x, redundancy--

diff --git a/disk/btrfs-progs/HISTORY b/disk/btrfs-progs/HISTORY
index d10c2a9..a109bea 100644
--- a/disk/btrfs-progs/HISTORY
+++ b/disk/btrfs-progs/HISTORY
@@ -1,3 +1,8 @@
+2018-03-25 Pavel Vinogradov <public AT sourcemage.org>
+ * PRE_BUILD,
+
patches/btrfs-progs-convert-ext2-Remove-check-for-ext2_ext_attr_entry--e_value_block.patch:
+ added a fix for e2fsprogs 1.44.x, removed redundant verify_file
+
2018-03-05 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: Updated to 4.15.1

diff --git a/disk/btrfs-progs/PRE_BUILD b/disk/btrfs-progs/PRE_BUILD
index c059714..5fbc877 100755
--- a/disk/btrfs-progs/PRE_BUILD
+++ b/disk/btrfs-progs/PRE_BUILD
@@ -9,7 +9,6 @@ if [[ "${BTRFS_PROGS_BRANCH}" != scm ]]; then
# Fake new SOURCE for unpack_file and verify_file
cd "${BUILD_DIRECTORY}" &&
SOURCE=${SOURCE/.xz} &&
- verify_file '' &&
unpack_file '' &&

# Clean up
@@ -21,4 +20,5 @@ else
default_pre_build &&
cd "${SOURCE_DIRECTORY}" &&
./autogen.sh
-fi
+fi &&
+apply_patch_dir patches
diff --git
a/disk/btrfs-progs/patches/btrfs-progs-convert-ext2-Remove-check-for-ext2_ext_attr_entry--e_value_block.patch

b/disk/btrfs-progs/patches/btrfs-progs-convert-ext2-Remove-check-for-ext2_ext_attr_entry--e_value_block.patch
new file mode 100644
index 0000000..f0568b6
--- /dev/null
+++
b/disk/btrfs-progs/patches/btrfs-progs-convert-ext2-Remove-check-for-ext2_ext_attr_entry--e_value_block.patch
@@ -0,0 +1,14 @@
+diff --git a/convert/source-ext2.c b/convert/source-ext2.c
+index b1492c78693d..070126ec38ec 100644
+--- a/convert/source-ext2.c
++++ b/convert/source-ext2.c
+@@ -422,8 +422,7 @@ static int ext2_xattr_check_entry(struct
ext2_ext_attr_entry *entry,
+ {
+ size_t value_size = entry->e_value_size;
+
+- if (entry->e_value_block != 0 || value_size > size ||
+- entry->e_value_offs + value_size > size)
++ if (value_size > size || entry->e_value_offs + value_size > size)
+ return -EIO;
+ return 0;
+ }
diff --git a/disk/e2fsprogs/DETAILS b/disk/e2fsprogs/DETAILS
index f750f5b..dd8d526 100755
--- a/disk/e2fsprogs/DETAILS
+++ b/disk/e2fsprogs/DETAILS
@@ -1,5 +1,5 @@
SPELL=e2fsprogs
- VERSION=1.43.9
+ VERSION=1.44.1
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SOURCE.asc
diff --git a/disk/e2fsprogs/HISTORY b/disk/e2fsprogs/HISTORY
index 7d163a2..be86f43 100644
--- a/disk/e2fsprogs/HISTORY
+++ b/disk/e2fsprogs/HISTORY
@@ -1,3 +1,6 @@
+2018-03-25 Pavel Vinogradov <public AT sourcemage.org>
+ * DETAILS: version 1.44.1
+
2018-02-09 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 1.43.9

[SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (b029e10c777ce3fdb1d3bda8a6fba7b786824e9a), Pavel Vinogradov, 03/25/2018