summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-11 20:32:37 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-11 20:32:37 +0000
commitfce7c59dffeb486a2c772ce031f152fe884f75f5 (patch)
tree5c67761f21248d89ad4f1d932544dd797309082c
parentMerging upstream version 2018.7. (diff)
downloadostree-fce7c59dffeb486a2c772ce031f152fe884f75f5.zip
ostree-fce7c59dffeb486a2c772ce031f152fe884f75f5.tar.xz
Merging debian version 2018.7-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog15
-rw-r--r--debian/control2
-rw-r--r--debian/copyright47
-rw-r--r--debian/libostree-1-1.symbols4
-rw-r--r--debian/ostree-boot.install2
-rw-r--r--debian/ostree-tests.install4
-rw-r--r--debian/ostree-tests.lintian-overrides10
-rw-r--r--debian/patches/OstreeRepoFinderConfig-Fix-guint-gsize-confusion.patch52
-rw-r--r--debian/patches/avahi-Fail-immediately-if-we-can-t-talk-to-D-Bus-or-Avahi.patch31
-rw-r--r--debian/patches/lib-pull-Fix-minor-memleak-in-error-path.patch33
-rw-r--r--debian/patches/lib-repo-Fix-32-bit-format-string-error.patch31
-rw-r--r--debian/patches/series4
-rwxr-xr-xdebian/rules6
13 files changed, 65 insertions, 176 deletions
diff --git a/debian/changelog b/debian/changelog
index 262c96a..a3c4b16 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+ostree (2018.7-1) unstable; urgency=medium
+
+ * New upstream release
+ - d/libostree-1-1.symbols: Update
+ - Drop all patches, applied upstream
+ - d/copyright: Remove details of Rust files not included in this
+ release
+ * d/p/lib-pull-Fix-minor-memleak-in-error-path.patch:
+ Apply a memory leak fix from upstream
+ * Use upstream default ${libexecdir} now that Debian Policy allows
+ /usr/libexec (via FHS 3.0)
+ * Standards-Version: 4.1.5 (no changes required)
+
+ -- Simon McVittie <smcv@debian.org> Wed, 25 Jul 2018 23:46:29 +0100
+
ostree (2018.6-3~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/control b/debian/control
index 8589e37..b406aad 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,7 @@ Build-Depends:
Build-Depends-Indep:
libglib2.0-doc,
Rules-Requires-Root: no
-Standards-Version: 4.1.4
+Standards-Version: 4.1.5
Homepage: https://github.com/ostreedev/ostree/
Vcs-Browser: https://sources.progress-linux.org/distributions/dschinn-backports/packages/ostree
Vcs-Git: https://sources.progress-linux.org/distributions/dschinn-backports/packages/ostree
diff --git a/debian/copyright b/debian/copyright
index dbbdcea..7b26287 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -72,26 +72,11 @@ License: GPL-3+ with Autoconf exception
Files:
bsdiff/*
- rust/src/bupsplit.rs
Copyright:
© 2003-2005 Colin Percival
- © 2011 Avery Pennarun
© 2012 Matthew Endsley
- © 2017 Colin Walters
License: BSD-2-clause
-Files:
- rust/vendor/libc/*
-Copyright:
- © 2012-2017 The Rust Project Developers
-License: Apache-2.0 or Expat
-Comment:
- Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
- http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
- <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
- option. This file may not be copied, modified, or distributed
- except according to those terms.
-
Files: debian/*
Copyright:
© 2015 David King <amigadave@amigadave.com>
@@ -262,35 +247,3 @@ License: BSD-3-clause
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-License: Apache-2.0
- Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
- http://www.apache.org/licenses/LICENSE-2.0>
-Comment:
- On Debian systems, the full text of the Apache License version 2.0
- can be found in the file '/usr/share/common-licenses/Apache-2.0'.
-
-License: Expat
- Permission is hereby granted, free of charge, to any
- person obtaining a copy of this software and associated
- documentation files (the "Software"), to deal in the
- Software without restriction, including without
- limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of
- the Software, and to permit persons to whom the Software
- is furnished to do so, subject to the following
- conditions:
- .
- The above copyright notice and this permission notice
- shall be included in all copies or substantial portions
- of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
- ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
- TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
- SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
- IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
diff --git a/debian/libostree-1-1.symbols b/debian/libostree-1-1.symbols
index a00d9fd..7cb1660 100644
--- a/debian/libostree-1-1.symbols
+++ b/debian/libostree-1-1.symbols
@@ -26,6 +26,7 @@ libostree-1.so.1 libostree-1-1 #MINVER#
LIBOSTREE_2018.3@LIBOSTREE_2018.3 2018.3
LIBOSTREE_2018.5@LIBOSTREE_2018.5 2018.5
LIBOSTREE_2018.6@LIBOSTREE_2018.6 2018.6
+ LIBOSTREE_2018.7@LIBOSTREE_2018.7 2018.7
ostree_async_progress_finish@LIBOSTREE_2016.3 2016.4
ostree_async_progress_get@LIBOSTREE_2017.6 2017.6
ostree_async_progress_get_status@LIBOSTREE_2016.3 2016.4
@@ -131,8 +132,10 @@ libostree-1.so.1 libostree-1-1 #MINVER#
ostree_gpg_verify_result_require_valid_signature@LIBOSTREE_2016.6 2016.6
ostree_hash_object_name@LIBOSTREE_2016.3 2016.4
ostree_metadata_variant_type@LIBOSTREE_2016.3 2016.4
+ ostree_mutable_tree_check_error@LIBOSTREE_2018.7 2018.7
ostree_mutable_tree_ensure_dir@LIBOSTREE_2016.3 2016.4
ostree_mutable_tree_ensure_parent_dirs@LIBOSTREE_2016.3 2016.4
+ ostree_mutable_tree_fill_empty_from_dirtree@LIBOSTREE_2018.7 2018.7
ostree_mutable_tree_get_contents_checksum@LIBOSTREE_2016.3 2016.4
ostree_mutable_tree_get_files@LIBOSTREE_2016.3 2016.4
ostree_mutable_tree_get_metadata_checksum@LIBOSTREE_2016.3 2016.4
@@ -140,6 +143,7 @@ libostree-1.so.1 libostree-1-1 #MINVER#
ostree_mutable_tree_get_type@LIBOSTREE_2016.3 2016.4
ostree_mutable_tree_lookup@LIBOSTREE_2016.3 2016.4
ostree_mutable_tree_new@LIBOSTREE_2016.3 2016.4
+ ostree_mutable_tree_new_from_checksum@LIBOSTREE_2018.7 2018.7
ostree_mutable_tree_replace_file@LIBOSTREE_2016.3 2016.4
ostree_mutable_tree_set_contents_checksum@LIBOSTREE_2016.3 2016.4
ostree_mutable_tree_set_metadata_checksum@LIBOSTREE_2016.3 2016.4
diff --git a/debian/ostree-boot.install b/debian/ostree-boot.install
index 045b738..195e5d1 100644
--- a/debian/ostree-boot.install
+++ b/debian/ostree-boot.install
@@ -5,7 +5,7 @@ lib/systemd/system/ostree-finalize-staged.service
lib/systemd/system/ostree-prepare-root.service
lib/systemd/system/ostree-remount.service
usr/lib/dracut/modules.d/98ostree
-usr/lib/libostree/grub2-15_ostree
usr/lib/ostree/ostree-prepare-root
usr/lib/ostree/ostree-remount
usr/lib/tmpfiles.d/ostree-tmpfiles.conf
+usr/libexec/libostree/grub2-15_ostree
diff --git a/debian/ostree-tests.install b/debian/ostree-tests.install
index 47ef148..5ccecb3 100644
--- a/debian/ostree-tests.install
+++ b/debian/ostree-tests.install
@@ -1,3 +1,3 @@
-usr/lib/installed-tests/libostree
-usr/lib/libostree/ostree-trivial-httpd
+usr/libexec/installed-tests/libostree
+usr/libexec/libostree/ostree-trivial-httpd
usr/share/installed-tests/libostree
diff --git a/debian/ostree-tests.lintian-overrides b/debian/ostree-tests.lintian-overrides
index d565288..87efd11 100644
--- a/debian/ostree-tests.lintian-overrides
+++ b/debian/ostree-tests.lintian-overrides
@@ -1,14 +1,14 @@
# This is deliberate: it's just some random signed file to be verified, and
# upstream happens to have used the text of the LGPL as the signed file
-ostree-tests: extra-license-file usr/lib/installed-tests/libostree/gpg-verify-data/lgpl2
-ostree-tests: extra-license-file usr/lib/installed-tests/libostree/gpg-verify-data/lgpl2.sig
+ostree-tests: extra-license-file usr/libexec/installed-tests/libostree/gpg-verify-data/lgpl2
+ostree-tests: extra-license-file usr/libexec/installed-tests/libostree/gpg-verify-data/lgpl2.sig
# This is deliberate, working around the assumption of recursive make
-ostree-tests: symlink-is-self-recursive usr/lib/installed-tests/libostree/tests .
+ostree-tests: symlink-is-self-recursive usr/libexec/installed-tests/libostree/tests .
# We won't run this on sparc64 currently
-[sparc64]: missing-dep-for-interpreter gjs => gjs (usr/lib/installed-tests/libostree/corrupt-repo-ref.js)
+[sparc64]: missing-dep-for-interpreter gjs => gjs (usr/libexec/installed-tests/libostree/corrupt-repo-ref.js)
# This shared object genuinely doesn't use any libc ABIs directly,
# only via GLib
-library-not-linked-against-libc usr/lib/installed-tests/libostree/libreaddir-rand.so
+library-not-linked-against-libc usr/libexec/installed-tests/libostree/libreaddir-rand.so
diff --git a/debian/patches/OstreeRepoFinderConfig-Fix-guint-gsize-confusion.patch b/debian/patches/OstreeRepoFinderConfig-Fix-guint-gsize-confusion.patch
deleted file mode 100644
index 9964c71..0000000
--- a/debian/patches/OstreeRepoFinderConfig-Fix-guint-gsize-confusion.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Sun, 24 Jun 2018 12:56:49 +0100
-Subject: OstreeRepoFinderConfig: Fix guint/gsize confusion
-
-If a function has a guint "out argument", passing a pointer to a gsize
-is not, in general, valid. On an ILP64 platform there is no problem
-since guint and gsize are identical, but on an LP64 platform it will
-overwrite only the first word of the gsize, leaving the second word
-unaffected. On little-endian machines, if the second word is
-zero-initialized (as it is here), the result is numerically equal to
-the guint, but on big-endian machines the result is around 4 billion
-times what it should be, resulting in
-ostree_repo_finder_config_resolve_async() reading past the end of
-the array and causing undefined behaviour.
-
-In practice this caused assertion failures (and consequently test
-failures) on Debian's s390x (z/Architecture), ppc64 (64-bit PowerPC)
-and sparc64 (64-bit SPARC) ports.
-
-Bug: https://github.com/ostreedev/ostree/issues/1640
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=902209
-Forwarded: https://github.com/ostreedev/ostree/pull/1641
-Signed-off-by: Simon McVittie <smcv@debian.org>
----
- src/libostree/ostree-repo-finder-config.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/libostree/ostree-repo-finder-config.c b/src/libostree/ostree-repo-finder-config.c
-index 4366d72..06f6165 100644
---- a/src/libostree/ostree-repo-finder-config.c
-+++ b/src/libostree/ostree-repo-finder-config.c
-@@ -96,7 +96,7 @@ ostree_repo_finder_config_resolve_async (OstreeRepoFinder *find
- GHashTableIter iter;
- const gchar *remote_name;
- g_auto(GStrv) remotes = NULL;
-- gsize n_remotes = 0;
-+ guint n_remotes = 0;
-
- task = g_task_new (finder, cancellable, callback, user_data);
- g_task_set_source_tag (task, ostree_repo_finder_config_resolve_async);
-@@ -106,9 +106,9 @@ ostree_repo_finder_config_resolve_async (OstreeRepoFinder *find
-
- /* List all remotes in this #OstreeRepo and see which of their ref lists
- * intersect with @refs. */
-- remotes = ostree_repo_remote_list (parent_repo, (guint *) &n_remotes);
-+ remotes = ostree_repo_remote_list (parent_repo, &n_remotes);
-
-- g_debug ("%s: Checking %" G_GSIZE_FORMAT " remotes", G_STRFUNC, n_remotes);
-+ g_debug ("%s: Checking %u remotes", G_STRFUNC, n_remotes);
-
- for (i = 0; i < n_remotes; i++)
- {
diff --git a/debian/patches/avahi-Fail-immediately-if-we-can-t-talk-to-D-Bus-or-Avahi.patch b/debian/patches/avahi-Fail-immediately-if-we-can-t-talk-to-D-Bus-or-Avahi.patch
deleted file mode 100644
index a6559ca..0000000
--- a/debian/patches/avahi-Fail-immediately-if-we-can-t-talk-to-D-Bus-or-Avahi.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Fri, 22 Jun 2018 01:10:55 +0100
-Subject: avahi: Fail immediately if we can't talk to D-Bus or Avahi
-
-We special-case AVAHI_ERR_NO_DAEMON to not cause warnings, but if
-we pass AVAHI_CLIENT_NO_FAIL to avahi_client_new, we never actually
-see AVAHI_ERR_NO_DAEMON. Instead, we will get AVAHI_ERR_BAD_STATE
-when we try to use the client.
-
-Bug: https://github.com/ostreedev/ostree/issues/1618
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Forwarded: https://github.com/ostreedev/ostree/pull/1639
-Applied-upstream: 2018.7, commit:https://github.com/ostreedev/ostree/commit/e120a6b1198aaa785533c76316898f15a804dae1
----
- src/libostree/ostree-repo-finder-avahi.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/libostree/ostree-repo-finder-avahi.c b/src/libostree/ostree-repo-finder-avahi.c
-index 223d8f0..bc38376 100644
---- a/src/libostree/ostree-repo-finder-avahi.c
-+++ b/src/libostree/ostree-repo-finder-avahi.c
-@@ -1432,8 +1432,7 @@ ostree_repo_finder_avahi_start (OstreeRepoFinderAvahi *self,
-
- g_assert (self->client == NULL);
-
-- client = avahi_client_new (avahi_glib_poll_get (self->poll),
-- AVAHI_CLIENT_NO_FAIL,
-+ client = avahi_client_new (avahi_glib_poll_get (self->poll), 0,
- client_cb, self, &failure);
-
- if (client == NULL)
diff --git a/debian/patches/lib-pull-Fix-minor-memleak-in-error-path.patch b/debian/patches/lib-pull-Fix-minor-memleak-in-error-path.patch
new file mode 100644
index 0000000..36d625b
--- /dev/null
+++ b/debian/patches/lib-pull-Fix-minor-memleak-in-error-path.patch
@@ -0,0 +1,33 @@
+From: Colin Walters <walters@verbum.org>
+Date: Thu, 19 Jul 2018 12:46:23 +0000
+Subject: lib/pull: Fix minor memleak in error path
+
+Spotted by a downstream Coverity build.
+
+Bug: #1684
+Reviewed-by: jlebon
+Origin: upstream, 2018.8, commit:93da56842259f18bde23daf17dcefcf213b30b81
+---
+ src/libostree/ostree-repo-pull.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/libostree/ostree-repo-pull.c b/src/libostree/ostree-repo-pull.c
+index 9553272..a8fee07 100644
+--- a/src/libostree/ostree-repo-pull.c
++++ b/src/libostree/ostree-repo-pull.c
+@@ -4131,7 +4131,6 @@ ostree_repo_pull_with_options (OstreeRepo *self,
+ {
+ const char *delta;
+ g_autoptr(GVariant) csum_v = NULL;
+- guchar *csum_data = g_malloc (OSTREE_SHA256_DIGEST_LEN);
+ g_autoptr(GVariant) ref = g_variant_get_child_value (deltas, i);
+
+ g_variant_get_child (ref, 0, "&s", &delta);
+@@ -4140,6 +4139,7 @@ ostree_repo_pull_with_options (OstreeRepo *self,
+ if (!validate_variant_is_csum (csum_v, error))
+ goto out;
+
++ guchar *csum_data = g_malloc (OSTREE_SHA256_DIGEST_LEN);
+ memcpy (csum_data, ostree_checksum_bytes_peek (csum_v), 32);
+ g_hash_table_insert (pull_data->summary_deltas_checksums,
+ g_strdup (delta),
diff --git a/debian/patches/lib-repo-Fix-32-bit-format-string-error.patch b/debian/patches/lib-repo-Fix-32-bit-format-string-error.patch
deleted file mode 100644
index 28000a1..0000000
--- a/debian/patches/lib-repo-Fix-32-bit-format-string-error.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Colin Walters <walters@verbum.org>
-Date: Thu, 21 Jun 2018 14:17:28 +0000
-Subject: lib/repo: Fix 32 bit format string error
-
-Origin: upstream, 2018.7, commit:1174d9f5ba537562c67084caf0214544fbb14ffc
----
- src/libostree/ostree-repo-commit.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
-index 37be748..7e1d707 100644
---- a/src/libostree/ostree-repo-commit.c
-+++ b/src/libostree/ostree-repo-commit.c
-@@ -903,7 +903,7 @@ write_content_object (OstreeRepo *self,
- return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s more required",
- self->min_free_space_percent, formatted_required);
- else
-- return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s more required",
-+ return glnx_throw (error, "min-free-space-size %" G_GUINT64_FORMAT "MB would be exceeded, %s more required",
- self->min_free_space_mb, formatted_required);
- }
- /* This is the main bit that needs mutex protection */
-@@ -1617,7 +1617,7 @@ ostree_repo_prepare_transaction (OstreeRepo *self,
- return glnx_throw (error, "min-free-space-percent '%u%%' would be exceeded, %s available",
- self->min_free_space_percent, formatted_free);
- else
-- return glnx_throw (error, "min-free-space-size %luMB would be exceeded, %s available",
-+ return glnx_throw (error, "min-free-space-size %" G_GUINT64_FORMAT "MB would be exceeded, %s available",
- self->min_free_space_mb, formatted_free);
- }
- g_mutex_unlock (&self->txn_lock);
diff --git a/debian/patches/series b/debian/patches/series
index 0959dad..ad0ed6a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-lib-repo-Fix-32-bit-format-string-error.patch
-avahi-Fail-immediately-if-we-can-t-talk-to-D-Bus-or-Avahi.patch
-OstreeRepoFinderConfig-Fix-guint-gsize-confusion.patch
+lib-pull-Fix-minor-memleak-in-error-path.patch
diff --git a/debian/rules b/debian/rules
index 3f92293..223050d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ override_dh_autoreconf:
configure_options = \
GJS=some-nonexistent-gjs-binary \
--enable-installed-tests \
- --libexecdir='$${prefix}/lib' \
+ --libexecdir='$${prefix}/libexec' \
--with-avahi \
--with-dracut \
--with-grub2 \
@@ -66,7 +66,7 @@ endif
override_dh_install:
rm -f debian/tmp/usr/lib/*/*.la
- rm -f debian/tmp/usr/lib/installed-tests/libostree/*.la
+ rm -f debian/tmp/usr/libexec/installed-tests/libostree/*.la
:
# TODO: when someone documents how to test these (#824649) they
# should be installed in a new ostree-boot package: see
@@ -78,7 +78,7 @@ override_dh_install:
rm -f debian/tmp/lib/systemd/system/ostree-prepare-root.service
rm -f debian/tmp/lib/systemd/system/ostree-remount.service
rm -fr debian/tmp/usr/lib/dracut/modules.d/98ostree/
- rm -f debian/tmp/usr/lib/libostree/grub2-15_ostree
+ rm -f debian/tmp/usr/libexec/libostree/grub2-15_ostree
rm -f debian/tmp/usr/lib/ostree/ostree-prepare-root
rm -f debian/tmp/usr/lib/ostree/ostree-remount
rm -f debian/tmp/usr/lib/tmpfiles.d/ostree-tmpfiles.conf