mtasaka pushed to gnome-commander (f21). "Update to 1.4.6"
notifications at fedoraproject.org
notifications at fedoraproject.org
Wed May 20 05:34:02 UTC 2015
From 969e64a99469fe9fe45b46b3783d2f7ae03a2558 Mon Sep 17 00:00:00 2001
From: Mamoru TASAKA <mtasaka at fedoraproject.org>
Date: Wed, 20 May 2015 14:32:02 +0900
Subject: Update to 1.4.6
diff --git a/.gitignore b/.gitignore
index fa3e98a..7cc831a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ gnome-commander-1.2.8.7.tar.bz2
/gnome-commander-1.4.4.tar.xz
/gnome-commander-1.4.5.tar.xz
/gnome-commander-5a4806f7e5789a7d29d62550e9128436ffdef00a.tar.xz
+/gnome-commander-1.4.6.tar.xz
diff --git a/gnome-commander-1.4.5-GNOMEbug746003-fix-about-on-ftp-mount.patch b/gnome-commander-1.4.5-GNOMEbug746003-fix-about-on-ftp-mount.patch
deleted file mode 100644
index d9931f7..0000000
--- a/gnome-commander-1.4.5-GNOMEbug746003-fix-about-on-ftp-mount.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2e648e4b7d0740a0583568c017d12a9d9a359799 Mon Sep 17 00:00:00 2001
-From: Mamoru Tasaka <mtasaka at fedoraproject.org>
-Date: Sun, 15 Mar 2015 00:09:05 +0100
-Subject: Removed unnecessary g_assert call, fixes #746003
-
-Removing the g_assert call leads to a return of NULL when no ID could be
-found.
-
-Signed-off-by: Uwe Scholz <uwescholz at src.gnome.org>
-
-
-diff --git a/src/owner.h b/src/owner.h
-index a5e8e5d..85305ca 100644
---- a/src/owner.h
-+++ b/src/owner.h
-@@ -162,8 +162,6 @@ inline const gchar *GnomeCmdOwner::HashTable<T,ID>::operator [] (ID id)
- {
- Entry *entry = lookup(id);
-
-- g_assert (entry != NULL);
--
- return entry ? entry->name : NULL;
- }
-
---
-cgit v0.10.2
-
diff --git a/gnome-commander-1.4.5-GNOMEbug748869-fix-infinite-loop-on-search.patch b/gnome-commander-1.4.5-GNOMEbug748869-fix-infinite-loop-on-search.patch
deleted file mode 100644
index f035148..0000000
--- a/gnome-commander-1.4.5-GNOMEbug748869-fix-infinite-loop-on-search.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 7fdf3251a44ba6a829d9ab02302751f4973fa5b3 Mon Sep 17 00:00:00 2001
-From: Mamoru TASAKA <mtasaka at fedoraproject.org>
-Date: Thu, 7 May 2015 14:55:29 +0900
-Subject: [PATCH] update_search_status_widgets: reset response enum when
- searching is done
-
-https://bugzilla.gnome.org/show_bug.cgi?id=748869
-
-On GnomeCmdSearchDialog::Private::on_dialog_response,
-default response was set to GCMD_RESPONSE_STOP and
-the sensitiveness to GCMD_RESPONSE_FIND was set to false.
-
-Now when searching is done, on update_search_status_widgets
-now the sensitiveness to GCMD_RESPONSE_STOP was also
-set to false, while the default response was still set
-to GCMD_RESPONSE_STOP, which seems to be causing infinite
-loop issue when searching is executed (when "Enter" key is pressed).
-
-So reset the default response to match the current
-response sensitiveness.
----
- src/dialogs/gnome-cmd-search-dialog.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/dialogs/gnome-cmd-search-dialog.cc b/src/dialogs/gnome-cmd-search-dialog.cc
-index 8bd48da..7597dcd 100644
---- a/src/dialogs/gnome-cmd-search-dialog.cc
-+++ b/src/dialogs/gnome-cmd-search-dialog.cc
-@@ -532,6 +532,7 @@ static gboolean update_search_status_widgets (SearchData *data)
- gtk_dialog_set_response_sensitive (*data->dialog, GnomeCmdSearchDialog::GCMD_RESPONSE_GOTO, matches>0);
- gtk_dialog_set_response_sensitive (*data->dialog, GnomeCmdSearchDialog::GCMD_RESPONSE_STOP, FALSE);
- gtk_dialog_set_response_sensitive (*data->dialog, GnomeCmdSearchDialog::GCMD_RESPONSE_FIND, TRUE);
-+ gtk_dialog_set_default_response (*data->dialog, GnomeCmdSearchDialog::GCMD_RESPONSE_FIND);
-
- if (matches)
- gtk_widget_grab_focus (*data->dialog->priv->result_list); // set focus to result list
---
-2.4.0
-
diff --git a/gnome-commander-1.4.6-add_sec_check_for_mime_exec_file.patch b/gnome-commander-1.4.6-add_sec_check_for_mime_exec_file.patch
new file mode 100644
index 0000000..1642ee7
--- /dev/null
+++ b/gnome-commander-1.4.6-add_sec_check_for_mime_exec_file.patch
@@ -0,0 +1,29 @@
+commit 5b0b3a469ab426feb596b0edfcc61cde4c0e6e80
+Author: Uwe Scholz <uwescholz at src.gnome.org>
+Date: Sat Mar 7 00:26:04 2015 +0100
+
+ Added security check for mime_exec_file
+
+diff --git a/src/gnome-cmd-file-list.cc b/src/gnome-cmd-file-list.cc
+index 0312a85..d46ed16 100644
+--- a/src/gnome-cmd-file-list.cc
++++ b/src/gnome-cmd-file-list.cc
+@@ -1172,14 +1172,15 @@ static gboolean on_button_press (GtkCList *clist, GdkEventButton *event, GnomeCm
+
+ inline gboolean mime_exec_file (GnomeCmdFile *f)
+ {
++ g_return_val_if_fail (f != NULL, FALSE);
++
+ if (f->info->type == GNOME_VFS_FILE_TYPE_REGULAR)
+ {
+ mime_exec_single (f);
+- return TRUE;
+ }
+
+- return FALSE;
+-}
++ return TRUE;
++ }
+
+
+ static void on_file_clicked (GnomeCmdFileList *fl, GnomeCmdFile *f, GdkEventButton *event, gpointer data)
diff --git a/gnome-commander.spec b/gnome-commander.spec
index 920409d..d34fac2 100644
--- a/gnome-commander.spec
+++ b/gnome-commander.spec
@@ -28,9 +28,9 @@
%global use_autotool 0
%global update_po 0
%global if_pre 0
-%global main_release 5
-%global extratag %{git_pull_JST}git%{shorthash}
-#%%undefine extratag
+%global main_release 1
+#%%global extratag %{git_pull_JST}git%{shorthash}
+%undefine extratag
%global mimeedit_rev 1958
%if 0%{?if_pre} > 0
@@ -50,7 +50,7 @@
%global fedora_rel %( [ 0%{?if_pre} -gt 0 ] && echo 0. )%{main_release}%{?extratag:.%extratag}
Name: gnome-commander
-Version: 1.4.5
+Version: 1.4.6
# Downgrade 3 times, sorry...
Epoch: 4
Release: %{fedora_rel}%{?dist}
@@ -61,18 +61,13 @@ Summary(sv): GNOME Commander är en snabb och smidig filhanderare för GNOME
Group: Applications/File
License: GPLv2+
URL: http://gcmd.github.io/
-#Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.4/%{name}-%{version}%{?extratag:-%extratag}.tar.xz
-Source0: https://git.gnome.org/browse/gnome-commander/snapshot/%{name}-%{githash}.tar.xz
+Source0: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.4/%{name}-%{version}%{?extratag:-%extratag}.tar.xz
+#Source0: https://git.gnome.org/browse/gnome-commander/snapshot/%{name}-%{githash}.tar.xz
Source1: gnome-commander.sh
Source10: mimeedit-svn%{mimeedit_rev}.sh
Patch10: mimeedit-svn1958.diff
-# Fix abort on opening property dialog on directory on ftp server with "odd" uid
-# (bug 1200349, GNOME bug 746003)
-Patch100: gnome-commander-1.4.5-GNOMEbug746003-fix-about-on-ftp-mount.patch
-# Fix infinite loop when pressing "Enter" on seaching dialog after
-# searching is done
-# (bug 1190508, GNOME bug 748869)
-Patch101: gnome-commander-1.4.5-GNOMEbug748869-fix-infinite-loop-on-search.patch
+# backport 5b0b3a469ab426feb596b0edfcc61cde4c0e6e80
+Patch100: gnome-commander-1.4.6-add_sec_check_for_mime_exec_file.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -140,8 +135,8 @@ Utöver att kunna hantera filer på din egen dator så kan programmet även
ansluta till FTP-servrar och SMB-nätverk.
%prep
-#%%setup -q -n %{name}-%{version}%{?extratag:-%extratag}
-%setup -q -n %{name}-%{githash}
+%setup -q -n %{name}-%{version}%{?extratag:-%extratag}
+#%%setup -q -n %{name}-%{githash}
%if 0%{use_autotool} > 0
( export NOCONFIGURE=1 ; sh autogen.sh )
@@ -149,7 +144,7 @@ ansluta till FTP-servrar och SMB-nätverk.
#%{__cp} -p %SOURCE10 mimeedit.sh
#%%patch10 -p0
-%patch101 -p1
+%patch100 -p1
%{__sed} -i.pylib \
-e 's|\$PY_EXEC_PREFIX/lib|%{_libdir}|' \
@@ -262,6 +257,9 @@ desktop-file-install \
%{_datadir}/pixmaps/%{name}/
%changelog
+* Wed May 20 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 4:1.4.6-1
+- Update to 1.4.6
+
* Thu May 7 2015 Mamoru TASAKA <mtasaka at fedoraproject.org> - 4:1.4.5-5.D20150504git5a4806f
- Fix infinite loop when pressing "Enter" on seaching dialog after
searching is done
diff --git a/sources b/sources
index 3f5771e..7b23379 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fda7df19a9a99b6deb9d3e7be9733cd2 gnome-commander-5a4806f7e5789a7d29d62550e9128436ffdef00a.tar.xz
+9029f0c0c423ff40b82b6e13ad8e95aa gnome-commander-1.4.6.tar.xz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/gnome-commander.git/commit/?h=f21&id=969e64a99469fe9fe45b46b3783d2f7ae03a2558
More information about the scm-commits
mailing list