From d5e433de5f853821c4314a4b18b185bfe702b226 Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 10 Apr 2021 21:20:46 +0200 Subject: [PATCH 1/2] hiawatha: update to 10.12. --- srcpkgs/hiawatha/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/hiawatha/template b/srcpkgs/hiawatha/template index 7e50522c999b..04377f40b88b 100644 --- a/srcpkgs/hiawatha/template +++ b/srcpkgs/hiawatha/template @@ -1,6 +1,6 @@ # Template file for 'hiawatha' pkgname=hiawatha -version=10.11 +version=10.12 revision=1 build_style=cmake configure_args="-DLOG_DIR=/var/log/hiawatha -DPID_DIR=/run @@ -13,7 +13,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://hiawatha-webserver.org" distfiles="${homepage}/files/${pkgname}-${version}.tar.gz" -checksum=79d85d165d68dd7043bbd337f5bc7dd10d8632d68ba61d0e557f84bd687c9727 +checksum=61bf41146c51244769984135529fcffd0f6cb92be18dc12d460effc42f19f50d conf_files="/etc/${pkgname}/*.conf /etc/${pkgname}/*.xslt" make_dirs="/var/log/hiawatha 0755 root root" From fef7d2253d942e74c86cc55406a3a9b0ef5d8fbb Mon Sep 17 00:00:00 2001 From: Enno Boland Date: Sat, 10 Apr 2021 21:45:11 +0200 Subject: [PATCH 2/2] glib: update to 2.68.1. --- ...lations-on-a-second-load-to-glib-2-68.diff | 130 ------------------ srcpkgs/glib/template | 4 +- 2 files changed, 2 insertions(+), 132 deletions(-) delete mode 100644 srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff diff --git a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff b/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff deleted file mode 100644 index d3da19b4e10d..000000000000 --- a/srcpkgs/glib/patches/Backport-2009-gkeyfile-Fix-crash-when-parsing-translations-on-a-second-load-to-glib-2-68.diff +++ /dev/null @@ -1,130 +0,0 @@ -From 07ab2e26c937a93ae7389e002014e32aa78e4ec6 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Tue, 23 Mar 2021 16:27:49 +0000 -Subject: [PATCH 1/2] gkeyfile: Drop a redundant check - -It should not be possible for `->locales` to be set without -`->checked_locales` being set, so drop the redundant check. This helps -with branch code coverage. - -Signed-off-by: Philip Withnall ---- - glib/gkeyfile.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git glib/gkeyfile.c glib/gkeyfile.c -index 50859164b..06c4b7c47 100644 ---- glib/gkeyfile.c -+++ glib/gkeyfile.c -@@ -1232,7 +1232,7 @@ g_key_file_locale_is_interesting (GKeyFile *key_file, - if (key_file->flags & G_KEY_FILE_KEEP_TRANSLATIONS) - return TRUE; - -- if (!key_file->checked_locales && !key_file->locales) -+ if (!key_file->checked_locales) - { - key_file->locales = g_strdupv ((gchar **)g_get_language_names ()); - key_file->checked_locales = TRUE; --- -GitLab - - -From 77649d3d3d94b7cd57cd165eb44105d7d196c2e4 Mon Sep 17 00:00:00 2001 -From: Philip Withnall -Date: Tue, 23 Mar 2021 16:28:31 +0000 -Subject: [PATCH 2/2] gkeyfile: Fix crash when parsing translations on a second - load -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -If the same `GKeyFile` is reused to load multiple different key files, -any loads after the first which encounter translated keys will crash, -because clearing the data from the first load cleared the cached -language names, but didn’t clear `checked_locales`, so they were never -reloaded. - -Signed-off-by: Philip Withnall - -Fixes: #2361 ---- - glib/gkeyfile.c | 1 + - glib/tests/keyfile.c | 43 +++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 44 insertions(+) - -diff --git glib/gkeyfile.c glib/gkeyfile.c -index 06c4b7c47..0b58edb3f 100644 ---- glib/gkeyfile.c -+++ glib/gkeyfile.c -@@ -648,6 +648,7 @@ g_key_file_clear (GKeyFile *key_file) - g_strfreev (key_file->locales); - key_file->locales = NULL; - } -+ key_file->checked_locales = FALSE; - - if (key_file->parse_buffer) - { -diff --git glib/tests/keyfile.c glib/tests/keyfile.c -index 7530bc8c3..975ef8167 100644 ---- glib/tests/keyfile.c -+++ glib/tests/keyfile.c -@@ -758,6 +758,48 @@ test_locale_string (void) - g_free (old_locale); - } - -+static void -+test_locale_string_multiple_loads (void) -+{ -+ GKeyFile *keyfile = NULL; -+ GError *local_error = NULL; -+ gchar *old_locale = NULL; -+ guint i; -+ const gchar *data = -+ "[valid]\n" -+ "key1=v1\n" -+ "key1[de]=v1-de\n" -+ "key1[de_DE]=v1-de_DE\n" -+ "key1[de_DE.UTF8]=v1-de_DE.UTF8\n" -+ "key1[fr]=v1-fr\n" -+ "key1[en] =v1-en\n" -+ "key1[sr@Latn]=v1-sr\n"; -+ -+ g_test_summary ("Check that loading with translations multiple times works"); -+ g_test_bug ("https://gitlab.gnome.org/GNOME/glib/-/issues/2361"); -+ -+ old_locale = g_strdup (setlocale (LC_ALL, NULL)); -+ g_setenv ("LANGUAGE", "de", TRUE); -+ setlocale (LC_ALL, ""); -+ -+ keyfile = g_key_file_new (); -+ -+ for (i = 0; i < 3; i++) -+ { -+ g_key_file_load_from_data (keyfile, data, -1, G_KEY_FILE_NONE, &local_error); -+ g_assert_no_error (local_error); -+ -+ check_locale_string_value (keyfile, "valid", "key1", "it", "v1"); -+ check_locale_string_value (keyfile, "valid", "key1", "de", "v1-de"); -+ check_locale_string_value (keyfile, "valid", "key1", "de_DE", "v1-de"); -+ } -+ -+ g_key_file_free (keyfile); -+ -+ setlocale (LC_ALL, old_locale); -+ g_free (old_locale); -+} -+ - static void - test_lists (void) - { -@@ -1791,6 +1833,7 @@ main (int argc, char *argv[]) - g_test_add_func ("/keyfile/boolean", test_boolean); - g_test_add_func ("/keyfile/number", test_number); - g_test_add_func ("/keyfile/locale-string", test_locale_string); -+ g_test_add_func ("/keyfile/locale-string/multiple-loads", test_locale_string_multiple_loads); - g_test_add_func ("/keyfile/lists", test_lists); - g_test_add_func ("/keyfile/lists-set-get", test_lists_set_get); - g_test_add_func ("/keyfile/group-remove", test_group_remove); --- -GitLab - diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template index a412a0fb08a7..449f33846dcf 100644 --- a/srcpkgs/glib/template +++ b/srcpkgs/glib/template @@ -1,6 +1,6 @@ # Template file for 'glib' pkgname=glib -version=2.68.0 +version=2.68.1 revision=1 build_style=meson # static version is necessary for qemu-user-static; @@ -16,7 +16,7 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GLib" changelog="https://gitlab.gnome.org/GNOME/glib/raw/master/NEWS" distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz" -checksum=67734f584f3a05a2872f57e9a8db38f3b06c7087fb531c5a839d9171968103ea +checksum=241654b96bd36b88aaa12814efc4843b578e55d47440103727959ac346944333 build_options="gtk_doc" desc_option_gtk_doc="Build GTK API docs"