diff -Nru yelp-42.0/configure yelp-42.1/configure --- yelp-42.0/configure 2022-03-19 16:09:57.000000000 +0000 +++ yelp-42.1/configure 2022-03-26 20:15:52.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Yelp 42.0. +# Generated by GNU Autoconf 2.69 for Yelp 42.1. # # Report bugs to . # @@ -590,8 +590,8 @@ # Identity of this package. PACKAGE_NAME='Yelp' PACKAGE_TARNAME='yelp' -PACKAGE_VERSION='42.0' -PACKAGE_STRING='Yelp 42.0' +PACKAGE_VERSION='42.1' +PACKAGE_STRING='Yelp 42.1' PACKAGE_BUGREPORT='https://gitlab.gnome.org/GNOME/yelp/-/issues/' PACKAGE_URL='' @@ -1432,7 +1432,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Yelp 42.0 to adapt to many kinds of systems. +\`configure' configures Yelp 42.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1503,7 +1503,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Yelp 42.0:";; + short | recursive ) echo "Configuration of Yelp 42.1:";; esac cat <<\_ACEOF @@ -1663,7 +1663,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Yelp configure 42.0 +Yelp configure 42.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1941,7 +1941,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Yelp $as_me 42.0, which was +It was created by Yelp $as_me 42.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2811,7 +2811,7 @@ # Define the identity of the package. PACKAGE='yelp' - VERSION='42.0' + VERSION='42.1' cat >>confdefs.h <<_ACEOF @@ -18606,7 +18606,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Yelp $as_me 42.0, which was +This file was extended by Yelp $as_me 42.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18672,7 +18672,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Yelp config.status 42.0 +Yelp config.status 42.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru yelp-42.0/configure.ac yelp-42.1/configure.ac --- yelp-42.0/configure.ac 2022-03-19 16:07:19.000000000 +0000 +++ yelp-42.1/configure.ac 2022-03-26 20:15:38.000000000 +0000 @@ -1,6 +1,6 @@ AC_PREREQ([2.63]) # Reminder: add some release notes to data/yelp.appdata.xml.in on major releases -AC_INIT([Yelp],[42.0],[https://gitlab.gnome.org/GNOME/yelp/-/issues/],[yelp]) +AC_INIT([Yelp],[42.1],[https://gitlab.gnome.org/GNOME/yelp/-/issues/],[yelp]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR([src/yelp.c]) diff -Nru yelp-42.0/debian/changelog yelp-42.1/debian/changelog --- yelp-42.0/debian/changelog 2022-03-21 13:43:27.000000000 +0000 +++ yelp-42.1/debian/changelog 2022-03-28 12:21:00.000000000 +0000 @@ -1,3 +1,9 @@ +yelp (42.1-1) unstable; urgency=medium + + * New upstream release + + -- Jeremy Bicha Mon, 28 Mar 2022 08:21:00 -0400 + yelp (42.0-1) unstable; urgency=medium * New upstream release diff -Nru yelp-42.0/debian/control yelp-42.1/debian/control --- yelp-42.0/debian/control 2022-03-21 13:43:27.000000000 +0000 +++ yelp-42.1/debian/control 2022-03-28 12:21:00.000000000 +0000 @@ -6,7 +6,7 @@ Section: gnome Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Jeremy Bicha +Uploaders: Jeremy Bicha , Laurent Bigonville , Michael Biebl Build-Depends: appstream-util, autoconf-archive, debhelper-compat (= 13), diff -Nru yelp-42.0/libyelp/yelp-document.c yelp-42.1/libyelp/yelp-document.c --- yelp-42.0/libyelp/yelp-document.c 2022-01-11 16:58:53.000000000 +0000 +++ yelp-42.1/libyelp/yelp-document.c 2022-03-25 16:07:55.000000000 +0000 @@ -220,7 +220,7 @@ return g_object_ref (document); } - switch (yelp_uri_get_document_type (uri)) { + switch (doctype) { case YELP_URI_DOCUMENT_TYPE_TEXT: case YELP_URI_DOCUMENT_TYPE_HTML: case YELP_URI_DOCUMENT_TYPE_XHTML: diff -Nru yelp-42.0/libyelp/yelp-uri-builder.c yelp-42.1/libyelp/yelp-uri-builder.c --- yelp-42.0/libyelp/yelp-uri-builder.c 2022-01-11 16:58:53.000000000 +0000 +++ yelp-42.1/libyelp/yelp-uri-builder.c 2022-03-25 16:07:55.000000000 +0000 @@ -109,7 +109,13 @@ memmove (resource, resource + 1, strlen (resource)); } else if (g_str_has_prefix (uri, "ghelp:")) { - if (resource[0] == '/' && resource[1] == '/') + /* This is an ugly heuristic that probably always works. The URI + mangling ends up not distinguishing between absolute file paths + and ordinary old ghelp URIs. But absolute file paths should + have more than one slash, right? This will fail: + cp foo.xml / && yelp /foo.xml + */ + if (resource[0] == '/' && !strchr (resource + 1, '/')) memmove (resource, resource + 1, strlen (resource)); } } diff -Nru yelp-42.0/NEWS yelp-42.1/NEWS --- yelp-42.0/NEWS 2022-03-19 16:07:13.000000000 +0000 +++ yelp-42.1/NEWS 2022-03-26 20:13:29.000000000 +0000 @@ -1,3 +1,8 @@ +42.1 +==== +* Fixed URI parsing issue that can lead to crash [#187] +* Updated location for appdata screenshot (Sophie Herold) + 42.0 ==== * Updated appdata screenshot (Sophie Herold)