diff --git a/debian/changelog b/debian/changelog index 038c16c7..07d60fcb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +ostree (2018.8-1) UNRELEASED; urgency=medium + + * New upstream release + - d/p/debian/Skip-test-pull-repeated-during-CI.patch: + Drop, applied upstream + - d/copyright: Update + + -- Simon McVittie Thu, 23 Aug 2018 13:17:19 +0100 + ostree (2018.7-2) unstable; urgency=medium * d/p/debian/Skip-test-pull-repeated-during-CI.patch: diff --git a/debian/copyright b/debian/copyright index 7b262872..c99610f2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -23,6 +23,7 @@ Copyright: © 2015 Canonical Ltd. © 2017-2018 Endless Mobile, Inc. © 2018 Matthew Leeds + © 2018 Sinny Kumari License: LGPL-2+ Files: 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 deleted file mode 100644 index 36d625b9..00000000 --- a/debian/patches/lib-pull-Fix-minor-memleak-in-error-path.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Colin Walters -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/series b/debian/patches/series index 9adee331..b73e566a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ -lib-pull-Fix-minor-memleak-in-error-path.patch debian/Skip-test-pull-repeated-during-CI.patch