Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gnome-autoar for openSUSE:Factory checked in at 2021-06-09 21:51:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gnome-autoar (Old) and /work/SRC/openSUSE:Factory/.gnome-autoar.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gnome-autoar" Wed Jun 9 21:51:36 2021 rev:9 rq:897539 version:0.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/gnome-autoar/gnome-autoar.changes 2021-05-06 22:52:04.238887238 +0200 +++ /work/SRC/openSUSE:Factory/.gnome-autoar.new.32437/gnome-autoar.changes 2021-06-09 21:51:46.190417820 +0200 @@ -1,0 +2,7 @@ +Fri Jun 4 09:58:28 UTC 2021 - Bj??rn Lie <[email protected]> + +- Update to version 0.3.3: + + extractor: Fix extraction of one file archives + + compressor: Fix usage of uninitialized value + +------------------------------------------------------------------- Old: ---- gnome-autoar-0.3.2.tar.xz New: ---- gnome-autoar-0.3.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-autoar.spec ++++++ --- /var/tmp/diff_new_pack.64I9MQ/_old 2021-06-09 21:51:46.614418575 +0200 +++ /var/tmp/diff_new_pack.64I9MQ/_new 2021-06-09 21:51:46.618418583 +0200 @@ -17,7 +17,7 @@ Name: gnome-autoar -Version: 0.3.2 +Version: 0.3.3 Release: 0 Summary: Automatic archives creating and extracting library License: LGPL-2.0-or-later ++++++ gnome-autoar-0.3.2.tar.xz -> gnome-autoar-0.3.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-autoar-0.3.2/NEWS new/gnome-autoar-0.3.3/NEWS --- old/gnome-autoar-0.3.2/NEWS 2021-04-30 13:29:31.000000000 +0200 +++ new/gnome-autoar-0.3.3/NEWS 2021-06-04 09:59:58.000000000 +0200 @@ -1,3 +1,7 @@ +Major changes in 0.3.3: +* extractor: Fix extraction of one file archives (Ondrej Holy) +* compressor: Fix usage of uninitialized value (Ondrej Holy) + Major changes in 0.3.2: * compressor: Fix hardlink handling for new cpio format (Ondrej Holy) * compressor: Fix hardlink detection for remote files (Ondrej Holy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-autoar-0.3.2/configure new/gnome-autoar-0.3.3/configure --- old/gnome-autoar-0.3.2/configure 2021-04-30 13:49:56.000000000 +0200 +++ new/gnome-autoar-0.3.3/configure 2021-06-04 10:03:36.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gnome-autoar 0.3.2. +# Generated by GNU Autoconf 2.69 for gnome-autoar 0.3.3. # # Report bugs to <https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-autoar>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gnome-autoar' PACKAGE_TARNAME='gnome-autoar' -PACKAGE_VERSION='0.3.2' -PACKAGE_STRING='gnome-autoar 0.3.2' +PACKAGE_VERSION='0.3.3' +PACKAGE_STRING='gnome-autoar 0.3.3' PACKAGE_BUGREPORT='https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-autoar' PACKAGE_URL='' @@ -1411,7 +1411,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 gnome-autoar 0.3.2 to adapt to many kinds of systems. +\`configure' configures gnome-autoar 0.3.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1482,7 +1482,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gnome-autoar 0.3.2:";; + short | recursive ) echo "Configuration of gnome-autoar 0.3.3:";; esac cat <<\_ACEOF @@ -1627,7 +1627,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gnome-autoar configure 0.3.2 +gnome-autoar configure 0.3.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1959,7 +1959,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gnome-autoar $as_me 0.3.2, which was +It was created by gnome-autoar $as_me 0.3.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2828,7 +2828,7 @@ # Define the identity of the package. PACKAGE='gnome-autoar' - VERSION='0.3.2' + VERSION='0.3.3' cat >>confdefs.h <<_ACEOF @@ -3108,7 +3108,7 @@ -LIBGNOME_AUTOAR_LT_VERSION=302:0:302 +LIBGNOME_AUTOAR_LT_VERSION=303:0:303 LIBGNOME_AUTOAR_API_VERSION=0 @@ -15013,7 +15013,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gnome-autoar $as_me 0.3.2, which was +This file was extended by gnome-autoar $as_me 0.3.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15079,7 +15079,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gnome-autoar config.status 0.3.2 +gnome-autoar config.status 0.3.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-autoar-0.3.2/configure.ac new/gnome-autoar-0.3.3/configure.ac --- old/gnome-autoar-0.3.2/configure.ac 2021-04-30 13:27:43.000000000 +0200 +++ new/gnome-autoar-0.3.3/configure.ac 2021-06-04 09:55:21.000000000 +0200 @@ -6,7 +6,7 @@ m4_define([major_version], [0]) m4_define([minor_version], [3]) -m4_define([micro_version], [2]) +m4_define([micro_version], [3]) AC_INIT([gnome-autoar], [major_version.minor_version.micro_version], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-autoar-0.3.2/gnome-autoar/autoar-compressor.c new/gnome-autoar-0.3.3/gnome-autoar/autoar-compressor.c --- old/gnome-autoar-0.3.2/gnome-autoar/autoar-compressor.c 2021-04-29 17:05:38.000000000 +0200 +++ new/gnome-autoar-0.3.3/gnome-autoar/autoar-compressor.c 2021-06-04 09:53:47.000000000 +0200 @@ -963,7 +963,7 @@ g_object_ref (file)); { - struct archive_entry *sparse; + struct archive_entry *sparse = NULL; /* Hardlinks are handled in different ways by the archive formats. The * archive_entry_linkify function is a unified interface, which handling diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-autoar-0.3.2/gnome-autoar/autoar-extractor.c new/gnome-autoar-0.3.3/gnome-autoar/autoar-extractor.c --- old/gnome-autoar-0.3.2/gnome-autoar/autoar-extractor.c 2021-04-29 17:05:38.000000000 +0200 +++ new/gnome-autoar-0.3.3/gnome-autoar/autoar-extractor.c 2021-06-01 09:25:46.000000000 +0200 @@ -1817,9 +1817,12 @@ autoar_extractor_signal_decide_destination (self, self->prefix, files, - &new_destination); + &self->new_prefix); - self->new_prefix = new_destination; + if (self->new_prefix && g_file_equal (self->prefix, self->new_prefix)) { + /* This prevents redundant path name handling later. */ + g_clear_object (&self->new_prefix); + } } else { autoar_extractor_signal_decide_destination (self, self->destination_dir, @@ -1832,28 +1835,11 @@ } } - new_destination = (self->new_prefix != NULL) ? self->new_prefix : self->destination_dir; - destination_name = g_file_get_path (new_destination); + destination_name = g_file_get_path (self->new_prefix != NULL ? + self->new_prefix : + self->destination_dir); g_debug ("autoar_extractor_step_decide_destination: destination %s", destination_name); - g_file_make_directory_with_parents (new_destination, - self->cancellable, - &(self->error)); - - if (g_error_matches (self->error, G_IO_ERROR, G_IO_ERROR_EXISTS)) { - GFileType file_type; - - file_type = g_file_query_file_type (new_destination, - G_FILE_QUERY_INFO_NONE, - NULL); - - if (file_type == G_FILE_TYPE_DIRECTORY) { - /* FIXME: Implement a way to solve directory conflicts */ - g_debug ("autoar_extractor_step_decide_destination: destination directory exists"); - g_clear_error (&self->error); - } - } - g_list_free_full (files, g_object_unref); } @@ -1911,6 +1897,8 @@ while (file_conflict) { GFile *new_extracted_filename = NULL; + g_debug ("autoar_extractor_step_extract: conflict detected"); + /* Do not try to solve any conflicts in parents for now. Especially * symlinks in parents are dangerous as it can easily happen that files * are written outside of the destination. The tar cmd fails to extract diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-autoar-0.3.2/tests/test-extract-unit.c new/gnome-autoar-0.3.3/tests/test-extract-unit.c --- old/gnome-autoar-0.3.2/tests/test-extract-unit.c 2021-04-29 17:05:38.000000000 +0200 +++ new/gnome-autoar-0.3.3/tests/test-extract-unit.c 2021-05-25 07:27:38.000000000 +0200 @@ -211,16 +211,9 @@ if (key_found) { action = GPOINTER_TO_UINT (value); - - switch (action) { - case AUTOAR_CONFLICT_OVERWRITE: - break; - case AUTOAR_CONFLICT_CHANGE_DESTINATION: - *new_file = g_object_ref (g_hash_table_lookup (data->conflict_files_destinations, - file)); - break; - case AUTOAR_CONFLICT_SKIP: - break; + if (action == AUTOAR_CONFLICT_CHANGE_DESTINATION) { + *new_file = g_object_ref (g_hash_table_lookup (data->conflict_files_destinations, + file)); } } @@ -718,7 +711,6 @@ g_autoptr (ExtractTestData) data = NULL; g_autoptr (GFile) archive = NULL; g_autoptr (GFile) conflict_file = NULL; - g_autoptr (GFile) reference_file = NULL; g_autoptr (AutoarExtractor) extractor = NULL; extract_test = extract_test_new ("test-conflict-overwrite"); @@ -728,13 +720,13 @@ return; } - reference_file = g_file_get_child (extract_test->reference, - "arextract.txt"); conflict_file = g_file_get_child (extract_test->output, "arextract.txt"); - g_file_replace_contents (conflict_file, "this file should be overwritten", 31, - NULL, FALSE, G_FILE_CREATE_NONE, NULL, NULL, NULL); + g_assert_true (g_file_replace_contents (conflict_file, + "this file should be overwritten", 31, + NULL, FALSE, G_FILE_CREATE_NONE, NULL, + NULL, NULL)); archive = g_file_get_child (extract_test->input, "arextract.zip"); @@ -956,8 +948,8 @@ conflict_file = g_file_get_child (extract_test->output, "arextract.txt"); - g_file_copy (reference_file, conflict_file, G_FILE_COPY_NONE, - NULL, NULL, NULL, NULL); + g_assert_true (g_file_copy (reference_file, conflict_file, G_FILE_COPY_NONE, + NULL, NULL, NULL, NULL)); archive = g_file_get_child (extract_test->input, "arextract.zip"); @@ -1018,8 +1010,8 @@ conflict_file = g_file_get_child (extract_test->output, "arextract.txt"); - g_file_copy (reference_file, conflict_file, G_FILE_COPY_NONE, - NULL, NULL, NULL, NULL); + g_assert_true (g_file_copy (reference_file, conflict_file, G_FILE_COPY_NONE, + NULL, NULL, NULL, NULL)); archive = g_file_get_child (extract_test->input, "arextract.zip"); @@ -1076,8 +1068,8 @@ conflict_file = g_file_get_child (extract_test->output, "arextract.txt"); - g_file_copy (reference_file, conflict_file, G_FILE_COPY_NONE, - NULL, NULL, NULL, NULL); + g_assert_true (g_file_copy (reference_file, conflict_file, G_FILE_COPY_NONE, + NULL, NULL, NULL, NULL)); archive = g_file_get_child (extract_test->input, "arextract.zip"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gnome-autoar-0.3.2/tests/test-extract.c new/gnome-autoar-0.3.3/tests/test-extract.c --- old/gnome-autoar-0.3.2/tests/test-extract.c 2021-02-22 15:12:44.000000000 +0100 +++ new/gnome-autoar-0.3.3/tests/test-extract.c 2021-06-04 09:53:47.000000000 +0200 @@ -65,7 +65,7 @@ g_print ("Conflict on: %s\n", path); - return AUTOAR_CONFLICT_OVERWRITE; + return AUTOAR_CONFLICT_UNHANDLED; } static void
