diff --git a/debian/changelog b/debian/changelog index 79442dea..e32bad85 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,11 @@ -ostree (2016.5-5) UNRELEASED; urgency=medium +ostree (2016.6-1) UNRELEASED; urgency=medium [ Jeremy Bicha ] * Fix debian/watch (Closes: #827440) [ Simon McVittie ] - * d/p/Build-on-older-versions-of-glib.patch, - d/p/tests-Fix-build-with-old-glib.patch: apply patches from - upstream to make ostree buildable on Debian jessie + * New upstream release + - drop all patches, included upstream * d/watch: fetch releases from GitHub instead of GNOME * d/gbp.conf: configure to use upstream/latest for upstream imports * d/gbp.conf: configure to merge upstream tags into upstream/latest diff --git a/debian/patches/Build-on-older-versions-of-glib.patch b/debian/patches/Build-on-older-versions-of-glib.patch deleted file mode 100644 index 01bfcbdc..00000000 --- a/debian/patches/Build-on-older-versions-of-glib.patch +++ /dev/null @@ -1,183 +0,0 @@ -From: Alexander Larsson -Date: Wed, 25 May 2016 11:00:19 +0200 -Subject: Build on older versions of glib -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Various places need to include libglnx.h for the autoptr backport -fallbacks to be there before ostree-autocleanups.h is included. - -This fixes the build on centos7ยท - -Closes: #309 -Approved by: giuseppe -Origin: upstream, 2016.6, commit:d36862479860df5b133dca51dbf0607bbe849a5b ---- - src/libostree/ostree-core.c | 2 +- - src/libostree/ostree-diff.c | 1 + - src/libostree/ostree-fetcher.c | 1 + - src/libostree/ostree-repo-pull.c | 1 + - src/libostree/ostree-repo-traverse.c | 1 + - src/ostree/ot-admin-builtin-instutil.c | 2 +- - src/ostree/ot-admin-functions.c | 1 + - src/ostree/ot-builtin-admin.c | 2 +- - src/ostree/ot-editor.c | 2 +- - src/ostree/ot-main.c | 2 +- - src/ostree/ot-main.h | 2 +- - 11 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/src/libostree/ostree-core.c b/src/libostree/ostree-core.c -index ded5e97..de84419 100644 ---- a/src/libostree/ostree-core.c -+++ b/src/libostree/ostree-core.c -@@ -26,11 +26,11 @@ - #include - #include - #include -+#include "libglnx.h" - #include "ostree.h" - #include "ostree-core-private.h" - #include "ostree-chain-input-stream.h" - #include "otutil.h" --#include "libglnx.h" - - #define ALIGN_VALUE(this, boundary) \ - (( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1))) -diff --git a/src/libostree/ostree-diff.c b/src/libostree/ostree-diff.c -index 4b73346..8496102 100644 ---- a/src/libostree/ostree-diff.c -+++ b/src/libostree/ostree-diff.c -@@ -22,6 +22,7 @@ - - #include "config.h" - -+#include "libglnx.h" - #include "ostree.h" - #include "otutil.h" - -diff --git a/src/libostree/ostree-fetcher.c b/src/libostree/ostree-fetcher.c -index d7915ba..55deee8 100644 ---- a/src/libostree/ostree-fetcher.c -+++ b/src/libostree/ostree-fetcher.c -@@ -25,6 +25,7 @@ - #include - #include - -+#include "libglnx.h" - #include "ostree-fetcher.h" - #ifdef HAVE_LIBSOUP_CLIENT_CERTS - #include "ostree-tls-cert-interaction.h" -diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c -index eef5f03..f87b709 100644 ---- a/src/libostree/ostree-repo-pull.c -+++ b/src/libostree/ostree-repo-pull.c -@@ -22,6 +22,7 @@ - - #include "config.h" - -+#include "libglnx.h" - #include "ostree.h" - #include "ostree-core-private.h" - #include "ostree-repo-private.h" -diff --git a/src/libostree/ostree-repo-traverse.c b/src/libostree/ostree-repo-traverse.c -index bb437c3..503ab32 100644 ---- a/src/libostree/ostree-repo-traverse.c -+++ b/src/libostree/ostree-repo-traverse.c -@@ -22,6 +22,7 @@ - - #include "config.h" - -+#include "libglnx.h" - #include "ostree.h" - #include "otutil.h" - -diff --git a/src/ostree/ot-admin-builtin-instutil.c b/src/ostree/ot-admin-builtin-instutil.c -index 1087b38..88894a6 100644 ---- a/src/ostree/ot-admin-builtin-instutil.c -+++ b/src/ostree/ot-admin-builtin-instutil.c -@@ -20,11 +20,11 @@ - - #include "config.h" - -+#include "ot-main.h" - #include "ot-builtins.h" - #include "ot-admin-instutil-builtins.h" - #include "ot-admin-builtins.h" - #include "ot-admin-functions.h" --#include "ot-main.h" - #include "ostree.h" - - #include -diff --git a/src/ostree/ot-admin-functions.c b/src/ostree/ot-admin-functions.c -index bc9034e..ed4dfdf 100644 ---- a/src/ostree/ot-admin-functions.c -+++ b/src/ostree/ot-admin-functions.c -@@ -22,6 +22,7 @@ - - #include "config.h" - -+#include "libglnx.h" - #include "ot-admin-functions.h" - #include "otutil.h" - #include "ostree.h" -diff --git a/src/ostree/ot-builtin-admin.c b/src/ostree/ot-builtin-admin.c -index 8b86617..7e7b04b 100644 ---- a/src/ostree/ot-builtin-admin.c -+++ b/src/ostree/ot-builtin-admin.c -@@ -22,10 +22,10 @@ - - #include "config.h" - -+#include "ot-main.h" - #include "ot-builtins.h" - #include "ot-admin-builtins.h" - #include "ot-admin-functions.h" --#include "ot-main.h" - #include "ostree.h" - #include "ostree-repo-file.h" - -diff --git a/src/ostree/ot-editor.c b/src/ostree/ot-editor.c -index 4c29c81..2e04584 100644 ---- a/src/ostree/ot-editor.c -+++ b/src/ostree/ot-editor.c -@@ -22,9 +22,9 @@ - - #include "config.h" - -+#include "libglnx.h" - #include "ot-editor.h" - #include "libgsystem.h" --#include "libglnx.h" - - #include - #include -diff --git a/src/ostree/ot-main.c b/src/ostree/ot-main.c -index 93f841d..18c1323 100644 ---- a/src/ostree/ot-main.c -+++ b/src/ostree/ot-main.c -@@ -27,9 +27,9 @@ - #include - #include - -+#include "ot-main.h" - #include "ostree.h" - #include "ot-admin-functions.h" --#include "ot-main.h" - #include "otutil.h" - - static char *opt_repo; -diff --git a/src/ostree/ot-main.h b/src/ostree/ot-main.h -index 32620c5..3bb7524 100644 ---- a/src/ostree/ot-main.h -+++ b/src/ostree/ot-main.h -@@ -22,8 +22,8 @@ - - #pragma once - --#include "ostree.h" - #include "libglnx.h" -+#include "ostree.h" - - typedef enum { - OSTREE_BUILTIN_FLAG_NONE = 0, diff --git a/debian/patches/Link-libreaddir-rand-to-libdl.patch b/debian/patches/Link-libreaddir-rand-to-libdl.patch deleted file mode 100644 index 9e246771..00000000 --- a/debian/patches/Link-libreaddir-rand-to-libdl.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Simon McVittie -Date: Sun, 12 Jun 2016 10:25:21 -0400 -Subject: Link libreaddir-rand to libdl - -It uses dlsym(). There's no point in being extra-portable here -because OSTree only targets Linux anyway. - -Signed-off-by: Simon McVittie - -Closes: #336 -Approved by: cgwalters -Applied-upstream: 2016.6, commit:b9e18b83fd195c980c5dffab4bedf3fa79b19a2e ---- - Makefile-tests.am | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Makefile-tests.am b/Makefile-tests.am -index b3d7514..c7e78cf 100644 ---- a/Makefile-tests.am -+++ b/Makefile-tests.am -@@ -130,7 +130,10 @@ endif - test_ltlibraries = libreaddir-rand.la - libreaddir_rand_la_SOURCES = tests/readdir-rand.c - libreaddir_rand_la_CFLAGS = $(OT_INTERNAL_GIO_UNIX_CFLAGS) --libreaddir_rand_la_LIBADD = $(OT_INTERNAL_GIO_UNIX_LIBS) -+libreaddir_rand_la_LIBADD = \ -+ -ldl \ -+ $(OT_INTERNAL_GIO_UNIX_LIBS) \ -+ $(NULL) - libreaddir_rand_la_LDFLAGS = -avoid-version - if !ENABLE_INSTALLED_TESTS - libreaddir_rand_la_LDFLAGS += -rpath $(abs_builddir) diff --git a/debian/patches/libtest-show-files-contents-when-assertions-about-them-fa.patch b/debian/patches/libtest-show-files-contents-when-assertions-about-them-fa.patch deleted file mode 100644 index a5d64ce4..00000000 --- a/debian/patches/libtest-show-files-contents-when-assertions-about-them-fa.patch +++ /dev/null @@ -1,61 +0,0 @@ -From: Simon McVittie -Date: Sun, 17 Apr 2016 09:57:06 +0100 -Subject: libtest: show files' contents when assertions about them fail - -I've seen an intermittent test failure in an autobuilder (sbuild) -environment where logs from failed builds cannot be retrieved, -but I can no longer reproduce it. Put the contents of the offending -file in the test's failing output so that if the failure comes back, -it can be debugged. - -Signed-off-by: Simon McVittie -Forwarded: https://github.com/ostreedev/ostree/pull/264 -Applied-upstream: 2016.6, commit:24cab773a2c849a8153529e3eb5f967302339f68 ---- - tests/libtest.sh | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/tests/libtest.sh b/tests/libtest.sh -index 572f023..afdf364 100755 ---- a/tests/libtest.sh -+++ b/tests/libtest.sh -@@ -100,13 +100,17 @@ assert_has_dir () { - - assert_not_has_file () { - if test -f "$1"; then -- echo 1>&2 "File '$1' exists"; exit 1 -+ sed -e 's/^/# /' < "$1" >&2 -+ echo 1>&2 "File '$1' exists" -+ exit 1 - fi - } - - assert_not_file_has_content () { - if grep -q -e "$2" "$1"; then -- echo 1>&2 "File '$1' incorrectly matches regexp '$2'"; exit 1 -+ sed -e 's/^/# /' < "$1" >&2 -+ echo 1>&2 "File '$1' incorrectly matches regexp '$2'" -+ exit 1 - fi - } - -@@ -118,13 +122,17 @@ assert_not_has_dir () { - - assert_file_has_content () { - if ! grep -q -e "$2" "$1"; then -- echo 1>&2 "File '$1' doesn't match regexp '$2'"; exit 1 -+ sed -e 's/^/# /' < "$1" >&2 -+ echo 1>&2 "File '$1' doesn't match regexp '$2'" -+ exit 1 - fi - } - - assert_file_empty() { - if test -s "$1"; then -- echo 1>&2 "File '$1' is not empty"; exit 1 -+ sed -e 's/^/# /' < "$1" >&2 -+ echo 1>&2 "File '$1' is not empty" -+ exit 1 - fi - } - diff --git a/debian/patches/series b/debian/patches/series index d4099712..e69de29b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +0,0 @@ -libtest-show-files-contents-when-assertions-about-them-fa.patch -test-parent-this-test-requires-user-xattrs.patch -tests-Use-strict-mode-by-default-for-C-tests.patch -test-sysroot.js-set-strict-mode-when-sourcing-libtest.sh.patch -Link-libreaddir-rand-to-libdl.patch -Build-on-older-versions-of-glib.patch -tests-Fix-build-with-old-glib.patch diff --git a/debian/patches/test-parent-this-test-requires-user-xattrs.patch b/debian/patches/test-parent-this-test-requires-user-xattrs.patch deleted file mode 100644 index c06994b2..00000000 --- a/debian/patches/test-parent-this-test-requires-user-xattrs.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Simon McVittie -Date: Mon, 25 Apr 2016 12:50:32 +0100 -Subject: test-parent: this test requires user xattrs - -Signed-off-by: Simon McVittie -Applied-upstream: 2016.6, commit:542df553e2c51a9d2f9cfc4212dfd996f54b3f8b ---- - tests/test-parent.sh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/test-parent.sh b/tests/test-parent.sh -index 05b102a..d1f5d7c 100755 ---- a/tests/test-parent.sh -+++ b/tests/test-parent.sh -@@ -21,6 +21,8 @@ set -euo pipefail - - . $(dirname $0)/libtest.sh - -+skip_without_user_xattrs -+ - echo '1..2' - - setup_test_repository "archive-z2" diff --git a/debian/patches/test-sysroot.js-set-strict-mode-when-sourcing-libtest.sh.patch b/debian/patches/test-sysroot.js-set-strict-mode-when-sourcing-libtest.sh.patch deleted file mode 100644 index 365f56f4..00000000 --- a/debian/patches/test-sysroot.js-set-strict-mode-when-sourcing-libtest.sh.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Simon McVittie -Date: Sat, 11 Jun 2016 19:07:40 +0100 -Subject: test-sysroot.js: set "strict mode" when sourcing libtest.sh - -As with the C tests in commit 08580118, this makes sure the test -fails as soon as something goes wrong. - -Signed-off-by: Simon McVittie -Forwarded: https://github.com/ostreedev/ostree/pull/335 -Applied-upstream: 2016.6, commit:0cf0fa815414eebb3e642429085fa75dda05c24d ---- - tests/test-sysroot.js | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/test-sysroot.js b/tests/test-sysroot.js -index 9468d2f..7c31659 100644 ---- a/tests/test-sysroot.js -+++ b/tests/test-sysroot.js -@@ -37,7 +37,7 @@ function libtestExec(shellCode) { - let testdatadir = GLib.getenv("G_TEST_SRCDIR"); - let libtestPath = GLib.build_filenamev([testdatadir, 'libtest.sh']) - let proc = GSystem.Subprocess.new_simple_argv(['bash', '-c', -- '. ' + GLib.shell_quote(libtestPath) + '; ' + shellCode], -+ 'set -xeuo pipefail; . ' + GLib.shell_quote(libtestPath) + '; ' + shellCode], - GSystem.SubprocessStreamDisposition.INHERIT, - GSystem.SubprocessStreamDisposition.INHERIT, - null); diff --git a/debian/patches/tests-Fix-build-with-old-glib.patch b/debian/patches/tests-Fix-build-with-old-glib.patch deleted file mode 100644 index 31003529..00000000 --- a/debian/patches/tests-Fix-build-with-old-glib.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Alexander Larsson -Date: Fri, 20 May 2016 10:59:59 +0200 -Subject: tests: Fix build with old glib - -test-checksum.c was using g_autofree without including libglnx.h which -has the backport for that. - -Closes: #304 -Approved by: cgwalters -Origin: upstream, 2016.6, commit:86ac8062f5311fe94ef4096f4e136ce993d5e9b2 ---- - tests/test-checksum.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/test-checksum.c b/tests/test-checksum.c -index 25d3c37..e7fd7be 100644 ---- a/tests/test-checksum.c -+++ b/tests/test-checksum.c -@@ -20,6 +20,7 @@ - - #include "config.h" - -+#include "libglnx.h" - #include "libgsystem.h" - #include - #include diff --git a/debian/patches/tests-Use-strict-mode-by-default-for-C-tests.patch b/debian/patches/tests-Use-strict-mode-by-default-for-C-tests.patch deleted file mode 100644 index 54d9f56c..00000000 --- a/debian/patches/tests-Use-strict-mode-by-default-for-C-tests.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Colin Walters -Date: Mon, 6 Jun 2016 15:00:13 -0400 -Subject: tests: Use strict mode by default for C tests - -I was extending the C-based test suite to cover more, and noticed that -we weren't aborting if a command failed. That made the tests somewhat -less useful, so let's fix it. - -Closes: #321 -Approved by: jlebon -Origin: upstream, commit:085801185125893a53d7a65732c6832f875ed5d6 ---- - tests/libostreetest.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/libostreetest.c b/tests/libostreetest.c -index 5828336..a557ee3 100644 ---- a/tests/libostreetest.c -+++ b/tests/libostreetest.c -@@ -40,7 +40,7 @@ run_libtest (const char *cmd, GError **error) - g_ptr_array_add (argv, "bash"); - g_ptr_array_add (argv, "-c"); - -- g_string_append (cmdstr, ". "); -+ g_string_append (cmdstr, "set -xeuo pipefail; . "); - g_string_append (cmdstr, builddir); - g_string_append (cmdstr, "/tests/libtest.sh; "); - g_string_append (cmdstr, cmd); -@@ -68,7 +68,7 @@ ot_test_setup_repo (GCancellable *cancellable, - g_autoptr(GFile) repo_path = g_file_new_for_path ("repo"); - glnx_unref_object OstreeRepo* ret_repo = NULL; - -- if (!run_libtest ("setup_test_repository", error)) -+ if (!run_libtest ("setup_test_repository archive-z2", error)) - goto out; - - ret_repo = ostree_repo_new (repo_path);