Release to unstabledebian/2.66.6-2

6 files changed, 18 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index d391d7dae..74fb13729 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+glib2.0 (2.66.6-2) unstable; urgency=high
+
+  * d/patches: Add proposed fixes for regressions in 2.66.6.
+    Two functions that took either a positive length, or -1 to indicate
+    strlen(), had assertions with the wrong sense in 2.66.6, causing some
+    valid uses of those functions to regress.
+  * d/p/debian/61_glib-compile-binaries-path.patch: Remove.
+    This patch turns out to be unnecessary, and is harmful for
+    cross-compiling. Thanks to Helmut Grohne (Closes: #982213)
+  * Set high urgency to get the regression fixes into bullseye
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 08 Feb 2021 19:43:08 +0000
+
 glib2.0 (2.66.6-1) unstable; urgency=high
 
   * New upstream release
diff --git a/debian/patches/giochannel-Don-t-store-negative-line_term_len-in-GIOChann.patch b/debian/patches/giochannel-Don-t-store-negative-line_term_len-in-GIOChann.patch
index 70ea274e5..5a7198fcd 100644
--- a/debian/patches/giochannel-Don-t-store-negative-line_term_len-in-GIOChann.patch
+++ b/debian/patches/giochannel-Don-t-store-negative-line_term_len-in-GIOChann.patch
@@ -8,6 +8,7 @@ Fixes: 0cc11f74 "giochannel: Forbid very long line terminator strings"
 Bug: https://gitlab.gnome.org/GNOME/glib/-/issues/2323
 Forwarded: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1931
 Signed-off-by: Simon McVittie <smcv@collabora.com>
+Applied-upstream: 2.66.7, commit:e069c50467712e6d607822afd6b6c15c2c343dff
 ---
  glib/giochannel.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/giochannel-Fix-length_size-bounds-check.patch b/debian/patches/giochannel-Fix-length_size-bounds-check.patch
index 5e431ec88..4b0054b20 100644
--- a/debian/patches/giochannel-Fix-length_size-bounds-check.patch
+++ b/debian/patches/giochannel-Fix-length_size-bounds-check.patch
@@ -6,6 +6,7 @@ The inverted condition is an obvious error introduced by ecdf91400e9a.
 
 Bug: https://gitlab.gnome.org/GNOME/glib/-/issues/2323
 Forwarded: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1931
+Applied-upstream: 2.66.7, commit:f8273b9aded135fe07094faebd527e43851aaf6e
 ---
  glib/giochannel.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/gtlspassword-Fix-inverted-assertion.patch b/debian/patches/gtlspassword-Fix-inverted-assertion.patch
index dc16e6b4f..a7d981f7f 100644
--- a/debian/patches/gtlspassword-Fix-inverted-assertion.patch
+++ b/debian/patches/gtlspassword-Fix-inverted-assertion.patch
@@ -9,6 +9,7 @@ probably excessive.
 Fixes: a8b204ff "gtlspassword: Forbid very long TLS passwords"
 Forwarded: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1932
 Signed-off-by: Simon McVittie <smcv@collabora.com>
+Applied-upstream: 2.66.7, commit:4506d1859a863087598c8d122740bae25b65b099
 ---
  gio/gtlspassword.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/debian/patches/io-channel-test-Add-coverage-for-g_io_channel_set_line_te.patch b/debian/patches/io-channel-test-Add-coverage-for-g_io_channel_set_line_te.patch
index 632327ec2..529da49a3 100644
--- a/debian/patches/io-channel-test-Add-coverage-for-g_io_channel_set_line_te.patch
+++ b/debian/patches/io-channel-test-Add-coverage-for-g_io_channel_set_line_te.patch
@@ -6,6 +6,7 @@ Subject: io-channel test: Add coverage for g_io_channel_set_line_term(., .,
 Bug: https://gitlab.gnome.org/GNOME/glib/-/issues/2323
 Forwarded: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1931
 Signed-off-by: Simon McVittie <smcv@collabora.com>
+Applied-upstream: 2.66.7, commit:d9db1faac565beac55582488583fad0a82992319
 ---
  glib/tests/io-channel.c | 6 ++++--
  1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/debian/patches/tls-interaction-Add-test-coverage-for-various-ways-to-set.patch b/debian/patches/tls-interaction-Add-test-coverage-for-various-ways-to-set.patch
index 1a0dd1a22..cdcc1c577 100644
--- a/debian/patches/tls-interaction-Add-test-coverage-for-various-ways-to-set.patch
+++ b/debian/patches/tls-interaction-Add-test-coverage-for-various-ways-to-set.patch
@@ -5,6 +5,7 @@ Subject: tls-interaction: Add test coverage for various ways to set the
 
 Forwarded: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1932
 Signed-off-by: Simon McVittie <smcv@collabora.com>
+Applied-upstream: 2.66.7, commit:3d1550354c3c6a8491c39881752d51cb7515f2c2
 ---
  gio/tests/tls-interaction.c | 55 +++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 55 insertions(+)