x11-libs/libfm : version bump

2 files changed, 23 insertions, 53 deletions

diff --git a/x11-libs/libfm/files/add_file_compare_attributes.patch b/x11-libs/libfm/files/add_file_compare_attributes.patch
deleted file mode 100644
index 65f0323c..00000000
--- a/x11-libs/libfm/files/add_file_compare_attributes.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff --git a/src/gtk/fm-progress-dlg.c b/src/gtk/fm-progress-dlg.c
-index 49aebe47..1d124a60 100644
---- a/src/gtk/fm-progress-dlg.c
-+++ b/src/gtk/fm-progress-dlg.c
-@@ -166,6 +166,8 @@ static gint on_ask_rename(FmFileOpsJob* job, FmFileInfo* src, FmFileInfo* dest,
-     GtkLabel *src_fi, *dest_fi;
-     GtkEntry *filename;
-     GtkToggleButton *apply_all;
-+    char* comparedate;
-+    char* comparesize;
-     char* tmp;
-     const char* disp_size;
-     FmPath* path;
-@@ -200,18 +202,34 @@ static gint on_ask_rename(FmFileOpsJob* job, FmFileInfo* src, FmFileInfo* dest,
-     gtk_window_set_transient_for(GTK_WINDOW(dlg), GTK_WINDOW(data->dlg));
- 
-     gtk_image_set_from_gicon(src_icon, G_ICON(icon), GTK_ICON_SIZE_DIALOG);
-+    if (fm_file_info_get_mtime(src) > fm_file_info_get_mtime(dest))
-+        comparedate = _("newer");
-+    else
-+    if (fm_file_info_get_mtime(src) < fm_file_info_get_mtime(dest))
-+        comparedate = _("older");
-+    else
-+    if (fm_file_info_get_mtime(src) == fm_file_info_get_mtime(dest))
-+        comparedate = _("same date/time");
-     disp_size = fm_file_info_get_disp_size(src);
-     if(disp_size)
-     {
--        tmp = g_strdup_printf(_("Type: %s\nSize: %s\nModified: %s"),
--                              fm_file_info_get_desc(src), disp_size,
--                              fm_file_info_get_disp_mtime(src));
-+        if (fm_file_info_get_size(src) > fm_file_info_get_size(dest))
-+            comparesize = _("larger");
-+        else
-+        if (fm_file_info_get_size(src) < fm_file_info_get_size(dest))
-+            comparesize = _("less");
-+        else
-+        if (fm_file_info_get_size(src) == fm_file_info_get_size(dest))
-+            comparesize = _("same size");
-+        tmp = g_strdup_printf(_("Type: %s\nSize: %s (%s)\nModified: %s (%s)"),
-+                              fm_file_info_get_desc(src), disp_size, comparesize,
-+                              fm_file_info_get_disp_mtime(src), comparedate);
-     }
-     else
-     {
--        tmp = g_strdup_printf(_("Type: %s\nModified: %s"),
-+        tmp = g_strdup_printf(_("Type: %s\nModified: %s (%s)"),
-                               fm_file_info_get_desc(src),
--                              fm_file_info_get_disp_mtime(src));
-+                              fm_file_info_get_disp_mtime(src), comparedate);
-     }
- 
-     gtk_label_set_text(src_fi, tmp);
diff --git a/x11-libs/libfm/files/libfm-fix-use-after-free.diff b/x11-libs/libfm/files/libfm-fix-use-after-free.diff
new file mode 100644
index 00000000..4a0ae61c
--- /dev/null
+++ b/x11-libs/libfm/files/libfm-fix-use-after-free.diff
@@ -0,0 +1,23 @@
+diff -Naur libfm-1.2.3/src/base/fm-config.c libfm-1.2.3-fix-uaf-new2/src/base/fm-config.c
+--- libfm-1.2.3/src/base/fm-config.c	2014-10-14 18:29:21.000000000 +0200
++++ libfm-1.2.3-fix-uaf-new2/src/base/fm-config.c	2016-06-18 18:23:35.721837971 +0200
+@@ -346,7 +346,8 @@
+     cfg->modules_blacklist = NULL;
+     cfg->system_modules_blacklist = NULL;
+     _cfg_monitor_free(cfg);
+-    g_free(cfg->_cfg_name);
++    if(name != cfg->_cfg_name)
++        g_free(cfg->_cfg_name);
+     if(G_LIKELY(!name))
+         name = "libfm/libfm.conf";
+     else
+@@ -363,7 +364,8 @@
+         }
+     }
+ 
+-    cfg->_cfg_name = g_strdup(name);
++    if(name != cfg->_cfg_name)
++        cfg->_cfg_name = g_strdup(name);
+     dirs = g_get_system_config_dirs();
+     /* bug SF #887: first dir in XDG_CONFIG_DIRS is the most relevant
+        so we shoult process the list in reverse order */