Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libsoup2 for openSUSE:Factory checked in at 2022-10-14 15:40:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libsoup2 (Old) and /work/SRC/openSUSE:Factory/.libsoup2.new.2275 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsoup2" Fri Oct 14 15:40:11 2022 rev:5 rq:1010290 version:2.74.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libsoup2/libsoup2.changes 2021-12-02 02:17:12.626291252 +0100 +++ /work/SRC/openSUSE:Factory/.libsoup2.new.2275/libsoup2.changes 2022-10-14 15:40:19.103695886 +0200 @@ -1,0 +2,10 @@ +Wed Oct 12 09:32:22 UTC 2022 - Bj??rn Lie <[email protected]> + +- Update to version 2.74.3: + + Add missing g-i annotations to `soup_address_get_sockaddr()` + and `soup_socket_read_until()`. + + Add missing `extern` when building on Windows. + + Update libxml2 fallback for meson wrap. + + Improvements when using libsoup with meson wraps. + +------------------------------------------------------------------- Old: ---- libsoup-2.74.2.tar.xz New: ---- libsoup-2.74.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libsoup2.spec ++++++ --- /var/tmp/diff_new_pack.i0sR6q/_old 2022-10-14 15:40:19.599696714 +0200 +++ /var/tmp/diff_new_pack.i0sR6q/_new 2022-10-14 15:40:19.607696727 +0200 @@ -1,7 +1,7 @@ # # spec file for package libsoup2 # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: libsoup2 %define _name libsoup -Version: 2.74.2 +Version: 2.74.3 Release: 0 Summary: HTTP client/server library for GNOME License: LGPL-2.1-or-later @@ -28,6 +28,7 @@ Source99: baselibs.conf # PATCH-FIX-OPENSUSE disable tls_interaction-test https://gitlab.gnome.org/GNOME/libsoup/issues/120 Patch1: libsoup-skip-tls_interaction-test.patch +# PATCH-FIX-UPSTREAM libsoup2-extend-test-cert.patch boo#1102840 -- Fix tests after 2027 Patch2: libsoup2-extend-test-cert.patch BuildRequires: glib-networking BuildRequires: meson >= 0.50 ++++++ libsoup-2.74.2.tar.xz -> libsoup-2.74.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.74.2/.gitignore new/libsoup-2.74.3/.gitignore --- old/libsoup-2.74.2/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/libsoup-2.74.3/.gitignore 2022-10-11 20:27:22.000000000 +0200 @@ -0,0 +1,2 @@ +/po/libsoup.pot +/meson-build/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.74.2/NEWS new/libsoup-2.74.3/NEWS --- old/libsoup-2.74.2/NEWS 2021-11-24 21:32:05.952091000 +0100 +++ new/libsoup-2.74.3/NEWS 2022-10-11 20:27:22.000000000 +0200 @@ -1,3 +1,13 @@ +Changes in libsoup from 2.74.2 to 2.74.3: + + * Add missing g-i annotations to `soup_address_get_sockaddr()` and `soup_socket_read_until()` [Rico Tzschichholz] + + * Add missing `extern` when building on Windows [Melroy van den Berg] + + * Update libxml2 fallback for meson wrap [Xavier Claessens] + + * Improvements when using libsoup with meson wraps [Nirbheek Chauhan] + Changes in libsoup from 2.74.1 to 2.74.2: * Error when libsoup3 is already loaded before libsoup2 [Patrick Griffis] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.74.2/libsoup/meson.build new/libsoup-2.74.3/libsoup/meson.build --- old/libsoup-2.74.2/libsoup/meson.build 2021-11-24 21:32:05.953091100 +0100 +++ new/libsoup-2.74.3/libsoup/meson.build 2022-10-11 20:27:22.000000000 +0200 @@ -278,6 +278,10 @@ sources : soup_enum_h, dependencies : [ platform_deps, gssapi_dep, glib_deps ]) +if meson.version().version_compare('>=0.54.0') + meson.override_dependency('libsoup-2.4', libsoup_dep) +endif + if enable_gnome soup_gnome_api_name = 'soup-gnome-' + apiversion libsoup_gnome_api_name = 'lib' + soup_gnome_api_name @@ -297,6 +301,14 @@ install : true, dependencies : deps + [libsoup_dep]) + libsoup_gnome_dep = declare_dependency(link_with : libsoup_gnome, + include_directories : configinc, + dependencies : deps + [libsoup_dep]) + + if meson.version().version_compare('>=0.54.0') + meson.override_dependency('libsoup-gnome-2.4', libsoup_gnome_dep) + endif + pkg.generate( libraries : libsoup_gnome, version : soup_version, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.74.2/libsoup/soup-address.c new/libsoup-2.74.3/libsoup/soup-address.c --- old/libsoup-2.74.2/libsoup/soup-address.c 2021-11-24 21:32:05.953091100 +0100 +++ new/libsoup-2.74.3/libsoup/soup-address.c 2022-10-11 20:27:22.000000000 +0200 @@ -465,7 +465,7 @@ /** * soup_address_get_sockaddr: * @addr: a #SoupAddress - * @len: return location for sockaddr length + * @len: (out): return location for sockaddr length * * Returns the sockaddr associated with @addr, with its length in * *@len. If the sockaddr is not yet known, returns %NULL. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.74.2/libsoup/soup-socket.c new/libsoup-2.74.3/libsoup/soup-socket.c --- old/libsoup-2.74.2/libsoup/soup-socket.c 2021-11-24 21:32:05.960091000 +0100 +++ new/libsoup-2.74.3/libsoup/soup-socket.c 2022-10-11 20:27:22.000000000 +0200 @@ -1899,7 +1899,7 @@ * @boundary: boundary to read until * @boundary_len: length of @boundary in bytes * @nread: (out): on return, the number of bytes read into @buffer - * @got_boundary: on return, whether or not the data in @buffer + * @got_boundary: (out): on return, whether or not the data in @buffer * ends with the boundary string * @cancellable: a #GCancellable, or %NULL * @error: error pointer diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.74.2/libsoup/soup-version.h.in new/libsoup-2.74.3/libsoup/soup-version.h.in --- old/libsoup-2.74.2/libsoup/soup-version.h.in 2021-11-24 21:32:05.961091000 +0100 +++ new/libsoup-2.74.3/libsoup/soup-version.h.in 2022-10-11 20:27:22.000000000 +0200 @@ -33,7 +33,7 @@ # ifdef G_PLATFORM_WIN32 # ifdef LIBSOUP_COMPILATION # ifdef DLL_EXPORT -# define SOUP_VAR __declspec(dllexport) +# define SOUP_VAR extern __declspec(dllexport) # else /* !DLL_EXPORT */ # define SOUP_VAR extern # endif /* !DLL_EXPORT */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.74.2/meson.build new/libsoup-2.74.3/meson.build --- old/libsoup-2.74.2/meson.build 2021-11-24 21:32:05.962091200 +0100 +++ new/libsoup-2.74.3/meson.build 2022-10-11 20:27:22.000000000 +0200 @@ -1,5 +1,5 @@ project('libsoup', 'c', - version: '2.74.2', + version: '2.74.3', meson_version : '>=0.50', license : 'LGPL2', default_options : 'c_std=c99') @@ -119,7 +119,8 @@ endif if not libxml_dep.found() - libxml_dep = subproject('libxml2').get_variable('xml2lib_dep') + # Allows fallback to subproject + libxml_dep = dependency('libxml-2.0') endif cdata = configuration_data() @@ -232,11 +233,11 @@ have_apache=false apache_httpd2_version = '' if apache_httpd2.found() and apachectl.found() - apache_httpd2_version_raw = run_command(apachectl.path(), '-v') + apache_httpd2_version_raw = run_command(apachectl.path(), '-v', check: false) # It seems that from version 2.4.39 apachectl doesn't take arguments, fallback # to calling apache directly just in case. if apache_httpd2_version_raw.returncode() != 0 - apache_httpd2_version_raw = run_command(apache_httpd2.path(), '-v') + apache_httpd2_version_raw = run_command(apache_httpd2.path(), '-v', check: false) endif if apache_httpd2_version_raw.returncode() == 0 apache_httpd2_version = apache_httpd2_version_raw.stdout().split('\n')[0] @@ -251,11 +252,11 @@ endif if have_apache - apache_modules_dirs_out = run_command('get_apache_modules_dirs.py', apachectl.path()) + apache_modules_dirs_out = run_command('get_apache_modules_dirs.py', apachectl.path(), check: false) have_apache = (apache_modules_dirs_out.returncode() == 0) # Same as above, using apachectl might fail, try apache directly. if not have_apache - apache_modules_dirs_out = run_command('get_apache_modules_dirs.py', apache_httpd2.path()) + apache_modules_dirs_out = run_command('get_apache_modules_dirs.py', apache_httpd2.path(), check: false) have_apache = (apache_modules_dirs_out.returncode() == 0) endif if have_apache @@ -283,7 +284,7 @@ message(cdata.get('APACHE_PHP_MODULE_FILE')) if php.found() and cdata.get('APACHE_PHP_MODULE_FILE') != '' have_php = true - php_xmlrpc = run_command(php, '-d', 'extension=xmlrpc', '-r', 'exit(function_exists("xmlrpc_server_create")?0:1);') + php_xmlrpc = run_command(php, '-d', 'extension=xmlrpc', '-r', 'exit(function_exists("xmlrpc_server_create")?0:1);', check: false) if php_xmlrpc.returncode() == 0 message('php-xmlrpc found') have_php_xmlrpc = true @@ -325,8 +326,8 @@ endif krb5_config = find_program(krb5_config_path, required : gssapi_opt) if krb5_config.found() - libs_output = run_command (krb5_config, '--libs', 'gssapi', check: gssapi_opt.enabled()) - cflags_output = run_command (krb5_config, '--cflags', 'gssapi', check: gssapi_opt.enabled()) + libs_output = run_command(krb5_config, '--libs', 'gssapi', check: gssapi_opt.enabled()) + cflags_output = run_command(krb5_config, '--cflags', 'gssapi', check: gssapi_opt.enabled()) if libs_output.returncode() == 0 and cflags_output.returncode() == 0 enable_gssapi = true gssapi_dep = declare_dependency( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.74.2/tests/session-test.c new/libsoup-2.74.3/tests/session-test.c --- old/libsoup-2.74.2/tests/session-test.c 2021-11-24 21:32:05.971091000 +0100 +++ new/libsoup-2.74.3/tests/session-test.c 2022-10-11 20:27:22.000000000 +0200 @@ -340,11 +340,12 @@ */ if (tls_available) { GError *error = NULL; + char *db_path; - tlsdb = g_tls_file_database_new (g_test_get_filename (G_TEST_DIST, - "test-cert.pem", - NULL), &error); + db_path = soup_test_build_filename_abs (G_TEST_DIST, "test-cert.pem", NULL); + tlsdb = g_tls_file_database_new (db_path, &error); g_assert_no_error (error); + g_free (db_path); session = g_object_new (SOUP_TYPE_SESSION, SOUP_SESSION_TLS_DATABASE, tlsdb, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.74.2/tests/test-utils.c new/libsoup-2.74.3/tests/test-utils.c --- old/libsoup-2.74.2/tests/test-utils.c 2021-11-24 21:32:05.971091000 +0100 +++ new/libsoup-2.74.3/tests/test-utils.c 2022-10-11 20:27:22.000000000 +0200 @@ -9,6 +9,7 @@ #ifdef HAVE_APACHE static gboolean apache_running; +static char *server_root = NULL; #endif static SoupLogger *logger; @@ -150,20 +151,18 @@ apache_cmd (const char *cmd) { GPtrArray *argv; - char *server_root, *cwd, *pid_file; + char *cwd, *pid_file; #ifdef HAVE_APACHE_2_4 char *default_runtime_dir; #endif int status; gboolean ok; + GString *str; + guint i; - server_root = g_test_build_filename (G_TEST_BUILT, "", NULL); - if (!g_path_is_absolute (server_root)) { - char *abs_server_root; - - abs_server_root = g_canonicalize_filename (server_root, NULL); - g_free (server_root); - server_root = abs_server_root; + if (server_root == NULL) { + g_test_message ("Server root not initialized"); + return FALSE; } cwd = g_get_current_dir (); @@ -190,12 +189,23 @@ g_ptr_array_add (argv, (char *)cmd); g_ptr_array_add (argv, NULL); + str = g_string_new ("Apache command:"); + + for (i = 0; i < argv->len - 1; i++) { + char *escaped = g_shell_quote (argv->pdata[i]); + g_string_append_c (str, ' '); + g_string_append (str, escaped); + g_free (escaped); + } + + g_test_message ("%s", str->str); + g_string_free (str, TRUE); + ok = g_spawn_sync (cwd, (char **)argv->pdata, NULL, 0, NULL, NULL, NULL, NULL, &status, NULL); if (ok) ok = (status == 0); - g_free (server_root); g_free (cwd); g_free (pid_file); #ifdef HAVE_APACHE_2_4 @@ -203,6 +213,7 @@ #endif g_ptr_array_free (argv, TRUE); + g_test_message (ok ? "-> success" : "-> failed"); return ok; } @@ -214,6 +225,8 @@ if (g_getenv ("SOUP_TESTS_ALREADY_RUNNING_APACHE")) return; + server_root = soup_test_build_filename_abs (G_TEST_BUILT, "", NULL); + if (!apache_cmd ("start")) { g_printerr ("Could not start apache\n"); exit (1); @@ -241,6 +254,8 @@ while (kill (pid, 0) == 0) g_usleep (100); } + + g_clear_pointer (&server_root, g_free); } #endif /* HAVE_APACHE */ @@ -821,6 +836,42 @@ return index_buffer; } +char * +soup_test_build_filename_abs (GTestFileType file_type, + const gchar *first_path, + ...) +{ + const gchar *pathv[16]; + gsize num_path_segments; + char *path; + char *path_abs; + va_list ap; + + va_start (ap, first_path); + + pathv[0] = g_test_get_dir (file_type); + pathv[1] = first_path; + + for (num_path_segments = 2; num_path_segments < G_N_ELEMENTS (pathv); num_path_segments++) { + pathv[num_path_segments] = va_arg (ap, const char *); + if (pathv[num_path_segments] == NULL) + break; + } + + va_end (ap); + + g_assert_cmpint (num_path_segments, <, G_N_ELEMENTS (pathv)); + + path = g_build_filenamev ((gchar **) pathv); + if (g_path_is_absolute (path)) + return path; + + path_abs = g_canonicalize_filename (path, NULL); + g_free (path); + + return path_abs; +} + #ifndef G_HAVE_ISO_VARARGS void soup_test_assert (gboolean expr, const char *fmt, ...) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsoup-2.74.2/tests/test-utils.h new/libsoup-2.74.3/tests/test-utils.h --- old/libsoup-2.74.2/tests/test-utils.h 2021-11-24 21:32:05.971091000 +0100 +++ new/libsoup-2.74.3/tests/test-utils.h 2022-10-11 20:27:22.000000000 +0200 @@ -93,6 +93,10 @@ SoupBuffer *soup_test_get_index (void); +char *soup_test_build_filename_abs (GTestFileType file_type, + const gchar *first_path, + ...); + #ifdef G_HAVE_ISO_VARARGS #define soup_test_assert(expr, ...) \ G_STMT_START { \
