Hello community,
here is the log from the commit of package btrfsprogs for openSUSE:Factory
checked in at 2017-11-04 10:24:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/btrfsprogs (Old)
and /work/SRC/openSUSE:Factory/.btrfsprogs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "btrfsprogs"
Sat Nov 4 10:24:38 2017 rev:87 rq:538177 version:4.13.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/btrfsprogs/btrfsprogs.changes 2017-10-13
14:04:13.371532793 +0200
+++ /work/SRC/openSUSE:Factory/.btrfsprogs.new/btrfsprogs.changes
2017-11-04 10:25:00.068247809 +0100
@@ -1,0 +2,9 @@
+Wed Nov 1 00:00:00 CET 2017 - dste...@suse.cz
+
+- update to version 4.13.3:
+ * check: fix --force, wrong check for a mounted block device
+ * build: fix --with-convert parsing
+ * subvol list: don't list TOPLEVEL
+ * other: update tests
+
+-------------------------------------------------------------------
Old:
----
btrfs-progs-v4.13.2.tar.gz
New:
----
btrfs-progs-v4.13.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ btrfsprogs.spec ++++++
--- /var/tmp/diff_new_pack.OljEax/_old 2017-11-04 10:25:00.708224521 +0100
+++ /var/tmp/diff_new_pack.OljEax/_new 2017-11-04 10:25:00.708224521 +0100
@@ -28,7 +28,7 @@
%endif
Name: btrfsprogs
-Version: 4.13.2
+Version: 4.13.3
Release: 0
Summary: Utilities for the Btrfs filesystem
License: GPL-2.0
++++++ btrfs-progs-v4.13.2.tar.gz -> btrfs-progs-v4.13.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btrfs-progs-v4.13.2/CHANGES
new/btrfs-progs-v4.13.3/CHANGES
--- old/btrfs-progs-v4.13.2/CHANGES 2017-10-06 14:37:57.000000000 +0200
+++ new/btrfs-progs-v4.13.3/CHANGES 2017-10-16 18:47:48.000000000 +0200
@@ -1,3 +1,9 @@
+btrfs-progs-4.13.3 (2017-10-16)
+ * check: fix --force, wrong check for a mounted block device
+ * build: fix --with-convert parsing
+ * subvol list: don't list TOPLEVEL
+ * other: update tests
+
btrfs-progs-4.13.2 (2017-10-06)
* subvol list:
* don't list toplevel subvolume among deleted (broken since 4.8.3)
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-balance.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-balance.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-check.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-check.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-convert.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-convert.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-device.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-device.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-filesystem.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-filesystem.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-find-root.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-find-root.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-image.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-image.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-inspect-internal.8.gz
and new/btrfs-progs-v4.13.3/Documentation/btrfs-inspect-internal.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-map-logical.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-map-logical.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-property.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-property.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-qgroup.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-qgroup.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-quota.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-quota.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-receive.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-receive.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-replace.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-replace.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-rescue.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-rescue.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-restore.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-restore.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-scrub.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-scrub.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-select-super.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-select-super.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-send.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-send.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs-subvolume.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs-subvolume.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs.5.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs.5.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfs.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfs.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/btrfstune.8.gz and
new/btrfs-progs-v4.13.3/Documentation/btrfstune.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/fsck.btrfs.8.gz and
new/btrfs-progs-v4.13.3/Documentation/fsck.btrfs.8.gz differ
Binary files old/btrfs-progs-v4.13.2/Documentation/mkfs.btrfs.8.gz and
new/btrfs-progs-v4.13.3/Documentation/mkfs.btrfs.8.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btrfs-progs-v4.13.2/Makefile
new/btrfs-progs-v4.13.3/Makefile
--- old/btrfs-progs-v4.13.2/Makefile 2017-10-06 14:37:57.000000000 +0200
+++ new/btrfs-progs-v4.13.3/Makefile 2017-10-16 18:47:48.000000000 +0200
@@ -59,7 +59,8 @@
DEBUG_LDFLAGS_INTERNAL =
DEBUG_LDFLAGS :=
-TOPDIR := $(shell pwd)
+ABSTOPDIR = $(shell pwd)
+TOPDIR := .
# Common build flags
CSTD = -std=gnu90
@@ -487,7 +488,7 @@
@echo " [TEST PREP] $@"$(eval TMPD=$(shell mktemp -d))
$(Q)mkdir -p $(TMPD)/include/btrfs && \
cp $(libbtrfs_headers) $(TMPD)/include/btrfs && \
- cd $(TMPD) && $(CC) -I$(TMPD)/include -o $@ $(addprefix $(TOPDIR)/,$^)
-Wl,-rpath=$(TOPDIR) -lbtrfs
+ cd $(TMPD) && $(CC) -I$(TMPD)/include -o $@ $(addprefix
$(ABSTOPDIR)/,$^) -Wl,-rpath=$(ABSTOPDIR) -lbtrfs
@echo " [TEST RUN] $@"
$(Q)cd $(TMPD) && ./$@
@echo " [TEST CLEAN] $@"
@@ -497,7 +498,7 @@
@echo " [TEST PREP] $@"$(eval TMPD=$(shell mktemp -d))
$(Q)mkdir -p $(TMPD)/include/btrfs && \
cp $(libbtrfs_headers) $(TMPD)/include/btrfs && \
- cd $(TMPD) && $(CC) -I$(TMPD)/include -o $@ $(addprefix $(TOPDIR)/,$^)
$(STATIC_LDFLAGS) $(STATIC_LIBS)
+ cd $(TMPD) && $(CC) -I$(TMPD)/include -o $@ $(addprefix
$(ABSTOPDIR)/,$^) $(STATIC_LDFLAGS) $(STATIC_LIBS)
@echo " [TEST RUN] $@"
$(Q)cd $(TMPD) && ./$@
@echo " [TEST CLEAN] $@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btrfs-progs-v4.13.2/btrfs-list.c
new/btrfs-progs-v4.13.3/btrfs-list.c
--- old/btrfs-progs-v4.13.2/btrfs-list.c 2017-10-06 14:37:57.000000000
+0200
+++ new/btrfs-progs-v4.13.3/btrfs-list.c 2017-10-16 18:47:48.000000000
+0200
@@ -1273,7 +1273,7 @@
ret = resolve_root(all_subvols, entry, top_id);
if (ret == -ENOENT) {
- if (top_id != BTRFS_FS_TREE_OBJECTID) {
+ if (entry->root_id != BTRFS_FS_TREE_OBJECTID) {
entry->full_path = strdup("DELETED");
entry->deleted = 1;
} else {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btrfs-progs-v4.13.2/cmds-check.c
new/btrfs-progs-v4.13.3/cmds-check.c
--- old/btrfs-progs-v4.13.2/cmds-check.c 2017-10-06 14:37:57.000000000
+0200
+++ new/btrfs-progs-v4.13.3/cmds-check.c 2017-10-16 18:47:48.000000000
+0200
@@ -13112,6 +13112,8 @@
warning(
"filesystem mounted, continuing because of --force");
}
+ /* A block device is mounted in exclusive mode by kernel */
+ ctree_flags &= ~OPEN_CTREE_EXCLUSIVE;
}
/* only allow partial opening under repair mode */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btrfs-progs-v4.13.2/configure
new/btrfs-progs-v4.13.3/configure
--- old/btrfs-progs-v4.13.2/configure 2017-10-06 14:39:08.000000000 +0200
+++ new/btrfs-progs-v4.13.3/configure 2017-10-16 18:48:13.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for btrfs-progs v4.13.2.
+# Generated by GNU Autoconf 2.69 for btrfs-progs v4.13.3.
#
# Report bugs to <linux-bt...@vger.kernel.org>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='btrfs-progs'
PACKAGE_TARNAME='btrfs-progs'
-PACKAGE_VERSION='v4.13.2'
-PACKAGE_STRING='btrfs-progs v4.13.2'
+PACKAGE_VERSION='v4.13.3'
+PACKAGE_STRING='btrfs-progs v4.13.3'
PACKAGE_BUGREPORT='linux-bt...@vger.kernel.org'
PACKAGE_URL='http://btrfs.wiki.kernel.org'
@@ -1302,7 +1302,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures btrfs-progs v4.13.2 to adapt to many kinds of systems.
+\`configure' configures btrfs-progs v4.13.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1367,7 +1367,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of btrfs-progs v4.13.2:";;
+ short | recursive ) echo "Configuration of btrfs-progs v4.13.3:";;
esac
cat <<\_ACEOF
@@ -1490,7 +1490,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-btrfs-progs configure v4.13.2
+btrfs-progs configure v4.13.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1859,7 +1859,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by btrfs-progs $as_me v4.13.2, which was
+It was created by btrfs-progs $as_me v4.13.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -5935,7 +5935,7 @@
# catch typos
-tmp=$(echo "$with_convert" | sed -e 's/auto//' | sed -e 's/ext2//' | sed -e
's/reiserfs//' | sed -e 's/,\+/,/')
+tmp=$(echo "$with_convert" | sed -e 's/auto//' | sed -e 's/ext2//' | sed -e
's/reiserfs//' | sed -e 's/,\+//')
if ! test "x$tmp" = "x"; then
as_fn_error $? "unknown tokens for --with-convert: $tmp" "$LINENO" 5
fi
@@ -7021,7 +7021,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by btrfs-progs $as_me v4.13.2, which was
+This file was extended by btrfs-progs $as_me v4.13.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7084,7 +7084,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-btrfs-progs config.status v4.13.2
+btrfs-progs config.status v4.13.3
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btrfs-progs-v4.13.2/configure.ac
new/btrfs-progs-v4.13.3/configure.ac
--- old/btrfs-progs-v4.13.2/configure.ac 2017-10-06 14:37:57.000000000
+0200
+++ new/btrfs-progs-v4.13.3/configure.ac 2017-10-16 18:47:48.000000000
+0200
@@ -148,7 +148,7 @@
AC_SUBST([BTRFSCONVERT_REISERFS])
# catch typos
-tmp=$(echo "$with_convert" | sed -e 's/auto//' | sed -e 's/ext2//' | sed -e
's/reiserfs//' | sed -e 's/,\+/,/')
+tmp=$(echo "$with_convert" | sed -e 's/auto//' | sed -e 's/ext2//' | sed -e
's/reiserfs//' | sed -e 's/,\+//')
if ! test "x$tmp" = "x"; then
AC_MSG_ERROR([unknown tokens for --with-convert: $tmp])
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btrfs-progs-v4.13.2/tests/build-tests.sh
new/btrfs-progs-v4.13.3/tests/build-tests.sh
--- old/btrfs-progs-v4.13.2/tests/build-tests.sh 2017-10-06
14:37:57.000000000 +0200
+++ new/btrfs-progs-v4.13.3/tests/build-tests.sh 2017-10-16
18:47:48.000000000 +0200
@@ -87,6 +87,15 @@
conf='--disable-convert'
build_make_targets
+conf='--with-convert=ext2'
+build_make_targets
+
+conf='--with-convert=ext2,reiserfs'
+build_make_targets
+
+conf='--enable-zstd'
+build_make_targets
+
# debugging builds, just the default targets
target='D=1'
buildme
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/btrfs-progs-v4.13.2/tests/cli-tests/007-check-force/test.sh
new/btrfs-progs-v4.13.3/tests/cli-tests/007-check-force/test.sh
--- old/btrfs-progs-v4.13.2/tests/cli-tests/007-check-force/test.sh
2017-10-06 14:37:57.000000000 +0200
+++ new/btrfs-progs-v4.13.3/tests/cli-tests/007-check-force/test.sh
2017-10-16 18:47:48.000000000 +0200
@@ -8,9 +8,15 @@
check_prereq btrfs
setup_root_helper
-prepare_test_dev
-run_check "$TOP/mkfs.btrfs" -f "$TEST_DEV"
+# we need to use a real block device, because the check opens the device in
+# exclusive mode, that unfortunatelly behaves differently for direct file
+# access and for the real /dev/loop0 device
+setup_loopdevs 1
+prepare_loopdevs
+TEST_DEV=${loopdevs[1]}
+
+run_check $SUDO_HELPER "$TOP/mkfs.btrfs" -f "$TEST_DEV"
run_check_mount_test_dev
run_mustfail "checking mounted filesystem without --force" \
$SUDO_HELPER "$TOP/btrfs" check "$TEST_DEV"
@@ -22,3 +28,5 @@
run_check $SUDO_HELPER "$TOP/btrfs" check --force "$TEST_DEV"
run_mustfail "--force --repair on unmounted filesystem" \
$SUDO_HELPER "$TOP/btrfs" check --force --repair "$TEST_DEV"
+
+cleanup_loopdevs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btrfs-progs-v4.13.2/travis/should-run-test
new/btrfs-progs-v4.13.3/travis/should-run-test
--- old/btrfs-progs-v4.13.2/travis/should-run-test 1970-01-01
01:00:00.000000000 +0100
+++ new/btrfs-progs-v4.13.3/travis/should-run-test 2017-10-16
18:47:48.000000000 +0200
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+if [ -z "$TRAVIS_BRANCH" ] ; then
+ # no branch? run anyway
+ exit 0
+fi
+
+# no tests
+if [ "$TRAVIS_BRANCH" = 'coverity_scan' ]; then
+ exit 1
+fi
+
+# quick tests
+if [ "$TRAVIS_BRANCH" = 'devel' -o "$TRAVIS_BRANCH" = 'master' ]; then
+ exit 0
+fi
+
+# all tests
+if [ "$TRAVIS_BRANCH" = 'release-test' ]; then
+ exit 0
+fi
+
+# branch not recognized
+exit 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btrfs-progs-v4.13.2/travis-should-run-test
new/btrfs-progs-v4.13.3/travis-should-run-test
--- old/btrfs-progs-v4.13.2/travis-should-run-test 2017-10-06
14:37:57.000000000 +0200
+++ new/btrfs-progs-v4.13.3/travis-should-run-test 1970-01-01
01:00:00.000000000 +0100
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-if [ -z "$TRAVIS_BRANCH" ] ; then
- # no branch? run anyway
- exit 0
-fi
-
-# no tests
-if [ "$TRAVIS_BRANCH" = 'coverity_scan' ]; then
- exit 1
-fi
-
-# quick tests
-if [ "$TRAVIS_BRANCH" = 'devel' -o "$TRAVIS_BRANCH" = 'master' ]; then
- exit 0
-fi
-
-# all tests
-if [ "$TRAVIS_BRANCH" = 'release-test' ]; then
- exit 0
-fi
-
-# branch not recognized
-exit 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/btrfs-progs-v4.13.2/version.sh
new/btrfs-progs-v4.13.3/version.sh
--- old/btrfs-progs-v4.13.2/version.sh 2017-10-06 14:37:57.000000000 +0200
+++ new/btrfs-progs-v4.13.3/version.sh 2017-10-16 18:47:48.000000000 +0200
@@ -6,7 +6,7 @@
# Copyright 2008, Oracle
# Released under the GNU GPLv2
-v="v4.13.2"
+v="v4.13.3"
opt=$1
