Hello community,
here is the log from the commit of package file-roller for openSUSE:Factory
checked in at 2014-01-28 12:02:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/file-roller (Old)
and /work/SRC/openSUSE:Factory/.file-roller.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "file-roller"
Changes:
--------
--- /work/SRC/openSUSE:Factory/file-roller/file-roller.changes 2013-11-24
11:26:48.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.file-roller.new/file-roller.changes
2014-01-28 12:02:46.000000000 +0100
@@ -1,0 +2,7 @@
+Fri Jan 24 23:02:04 UTC 2014 - zai...@opensuse.org
+
+- Update to version 3.10.2.1:
+ + rar: fixed error with some password protected files
+ (bgo#711745).
+
+-------------------------------------------------------------------
Old:
----
file-roller-3.10.2.tar.xz
New:
----
file-roller-3.10.2.1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ file-roller.spec ++++++
--- /var/tmp/diff_new_pack.9HfF6g/_old 2014-01-28 12:02:47.000000000 +0100
+++ /var/tmp/diff_new_pack.9HfF6g/_new 2014-01-28 12:02:47.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package file-roller
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: file-roller
-Version: 3.10.2
+Version: 3.10.2.1
Release: 0
Summary: An Archive Manager for GNOME
License: GPL-2.0+
++++++ file-roller-3.10.2.tar.xz -> file-roller-3.10.2.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/file-roller-3.10.2/ChangeLog
new/file-roller-3.10.2.1/ChangeLog
--- old/file-roller-3.10.2/ChangeLog 2013-11-11 20:36:32.000000000 +0100
+++ new/file-roller-3.10.2.1/ChangeLog 2013-11-11 21:29:27.000000000 +0100
@@ -1,7 +1,34 @@
-commit ab4e6d4ddc2747eebc0394705a7e5ec9054714c6
+commit b556b20fb6ab758a7ddc7b950d44a9f99afcc836
Author: Paolo Bacchilega <pao...@src.gnome.org>
Date: 2013-11-11
+ updated for version 3.10.2.1
+
+M NEWS
+M configure.ac
+
+commit c347289fc21e5a2c86810b7b8216c400556fdee9
+Author: Paolo Bacchilega <pao...@src.gnome.org>
+Date: 2013-11-11
+
+ rar: fixed error with some password protected files
+
+ [bug #711745]
+
+M src/fr-command-rar.c
+
+commit afa5cc968d8fd8275089524aa36a90f697b7f9a2
+Author: Paolo Bacchilega <pao...@src.gnome.org>
+Date: 2013-11-11
+
+ added a missing semicolon
+
+M po/nl.po
+
+commit ab4e6d4ddc2747eebc0394705a7e5ec9054714c6
+Author: Paolo Bacchilega <pao...@src.gnome.org>
+Date: 2013-11-11
+
updated for version 3.10.2
M NEWS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/file-roller-3.10.2/NEWS new/file-roller-3.10.2.1/NEWS
--- old/file-roller-3.10.2/NEWS 2013-11-11 20:34:10.000000000 +0100
+++ new/file-roller-3.10.2.1/NEWS 2013-11-11 21:27:55.000000000 +0100
@@ -1,3 +1,10 @@
+version 3.10.2.1
+----------------
+
+ Bugs fixed:
+
+ * rar: fixed error with some password protected files (#711745)
+
version 3.10.2
--------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/file-roller-3.10.2/configure
new/file-roller-3.10.2.1/configure
--- old/file-roller-3.10.2/configure 2013-11-11 20:30:36.000000000 +0100
+++ new/file-roller-3.10.2.1/configure 2013-11-11 21:25:27.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for file-roller 3.10.2.
+# Generated by GNU Autoconf 2.69 for file-roller 3.10.2.1.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller>.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='file-roller'
PACKAGE_TARNAME='file-roller'
-PACKAGE_VERSION='3.10.2'
-PACKAGE_STRING='file-roller 3.10.2'
+PACKAGE_VERSION='3.10.2.1'
+PACKAGE_STRING='file-roller 3.10.2.1'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller'
PACKAGE_URL=''
@@ -1430,7 +1430,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 file-roller 3.10.2 to adapt to many kinds of systems.
+\`configure' configures file-roller 3.10.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1500,7 +1500,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of file-roller 3.10.2:";;
+ short | recursive ) echo "Configuration of file-roller 3.10.2.1:";;
esac
cat <<\_ACEOF
@@ -1644,7 +1644,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-file-roller configure 3.10.2
+file-roller configure 3.10.2.1
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1922,7 +1922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by file-roller $as_me 3.10.2, which was
+It was created by file-roller $as_me 3.10.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2785,7 +2785,7 @@
# Define the identity of the package.
PACKAGE='file-roller'
- VERSION='3.10.2'
+ VERSION='3.10.2.1'
cat >>confdefs.h <<_ACEOF
@@ -14541,7 +14541,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by file-roller $as_me 3.10.2, which was
+This file was extended by file-roller $as_me 3.10.2.1, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14607,7 +14607,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-file-roller config.status 3.10.2
+file-roller config.status 3.10.2.1
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/file-roller-3.10.2/configure.ac
new/file-roller-3.10.2.1/configure.ac
--- old/file-roller-3.10.2/configure.ac 2013-11-11 20:29:19.000000000 +0100
+++ new/file-roller-3.10.2.1/configure.ac 2013-11-11 21:25:15.000000000
+0100
@@ -2,7 +2,7 @@
AC_PREREQ([2.68])
-AC_INIT([file-roller],[3.10.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller],[file-roller])
+AC_INIT([file-roller],[3.10.2.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller],[file-roller])
AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/file-roller-3.10.2/data/file-roller.desktop
new/file-roller-3.10.2.1/data/file-roller.desktop
--- old/file-roller-3.10.2/data/file-roller.desktop 2013-11-11
20:36:23.000000000 +0100
+++ new/file-roller-3.10.2.1/data/file-roller.desktop 2013-11-11
21:26:47.000000000 +0100
@@ -271,5 +271,5 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=file-roller
X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.10.2
+X-GNOME-Bugzilla-Version=3.10.2.1
X-GNOME-UsesNotifications=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/file-roller-3.10.2/data/file-roller.desktop.in
new/file-roller-3.10.2.1/data/file-roller.desktop.in
--- old/file-roller-3.10.2/data/file-roller.desktop.in 2013-11-11
20:30:49.000000000 +0100
+++ new/file-roller-3.10.2.1/data/file-roller.desktop.in 2013-11-11
21:26:43.000000000 +0100
@@ -15,5 +15,5 @@
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=file-roller
X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=3.10.2
+X-GNOME-Bugzilla-Version=3.10.2.1
X-GNOME-UsesNotifications=true
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/file-roller-3.10.2/file-roller.spec
new/file-roller-3.10.2.1/file-roller.spec
--- old/file-roller-3.10.2/file-roller.spec 2013-11-11 20:30:49.000000000
+0100
+++ new/file-roller-3.10.2.1/file-roller.spec 2013-11-11 21:26:43.000000000
+0100
@@ -1,7 +1,7 @@
%define release 6
%define prefix /usr
%define name file-roller
-%define version 3.10.2
+%define version 3.10.2.1
Summary: An archive manager for GNOME.
Name: %{name}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/file-roller-3.10.2/src/fr-command-rar.c
new/file-roller-3.10.2.1/src/fr-command-rar.c
--- old/file-roller-3.10.2/src/fr-command-rar.c 2013-10-27 13:28:46.000000000
+0100
+++ new/file-roller-3.10.2.1/src/fr-command-rar.c 2013-11-11
21:19:23.000000000 +0100
@@ -117,6 +117,16 @@
*/
+static gboolean
+attribute_field_with_space (char *line)
+{
+ /* sometimes when the archive is encrypted the attributes field is
+ * like this: "* ..A...."
+ * */
+ return ((line[0] != ' ') && (line[1] == ' '));
+}
+
+
static void
parse_name_field (char *line,
FrCommandRar *rar_comm)
@@ -132,7 +142,7 @@
if (rar_comm->rar5)
/* rar-5 output adds trailing spaces to short file names :( */
- name_field = g_strchomp (g_strdup (_g_str_get_last_field (line,
8)));
+ name_field = g_strchomp (g_strdup (_g_str_get_last_field (line,
attribute_field_with_space (line) ? 9 : 8)));
else
name_field = g_strdup (line + 1);
@@ -210,13 +220,15 @@
/* read file info. */
- fields = _g_str_split_line (line, 6);
+ fields = _g_str_split_line (line, attribute_field_with_space
(line) ? 7 : 6);
if (rar_comm->rar5) {
- size_field = fields[1];
- ratio_field = fields[3];
- date_field = fields[4];
- time_field = fields[5];
- attr_field = fields[0];
+ int offset = attribute_field_with_space (line) ? 1 : 0;
+
+ size_field = fields[1+offset];
+ ratio_field = fields[3+offset];
+ date_field = fields[4+offset];
+ time_field = fields[5+offset];
+ attr_field = fields[0+offset];
}
else {
size_field = fields[0];
@@ -653,6 +665,11 @@
fr_error_take_gerror (error, g_error_new_literal
(FR_ERROR, FR_ERROR_ASK_PASSWORD, ""));
break;
}
+
+ if (strstr (line, "password is incorrect") != NULL) {
+ fr_error_take_gerror (error, g_error_new_literal
(FR_ERROR, FR_ERROR_ASK_PASSWORD, ""));
+ break;
+ }
if (strstr (line, "wrong password") != NULL) {
fr_error_take_gerror (error, g_error_new_literal
(FR_ERROR, FR_ERROR_ASK_PASSWORD, ""));
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
