[gummi] 04/15: dropped no-predictable-tmpfiles.patch

[Daniel Stender]

This is an automated email from the git hooks/post-receive script.

danstender-guest pushed a commit to branch master
in repository gummi.

commit 8b3ed879977044381642c6fdb6b1e3679ff7ebe8
Author: Daniel Stender <debian at danielstender.com>
Date:   Wed Jan 27 20:52:42 2016 +0100

    dropped no-predictable-tmpfiles.patch
---
 debian/changelog                             |  4 ++-
 debian/patches/no-predictable-tmpfiles.patch | 39 ----------------------------
 debian/patches/series                        |  1 -
 3 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e5ac9af..a217b68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 gummi (0.6.6-1) UNRELEASED; urgency=medium
 
   * New upstream release (Closes: #812577).
+  * Dropped:
+    + no-predictable-tmpfiles.patch (CVE-2015-7758 solved by upstream).
 
- -- Daniel Stender <debian at danielstender.com>  Wed, 27 Jan 2016 20:49:30 +0100
+ -- Daniel Stender <debian at danielstender.com>  Wed, 27 Jan 2016 20:51:51 +0100
 
 gummi (0.6.5-7) unstable; urgency=medium
 
diff --git a/debian/patches/no-predictable-tmpfiles.patch b/debian/patches/no-predictable-tmpfiles.patch
deleted file mode 100644
index 182c57a..0000000
--- a/debian/patches/no-predictable-tmpfiles.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Description: don't generate predictable tmpfile names if filename is given
- Quick fix for CVE-2015-7758 (#756432).
-Author: Daniel Stender <debian at danielstender.com>
-Bug: https://bugs.debian.org/756432
-Forwarded: https://github.com/alexandervdm/gummi/issues/20
-Last-Update: 2015-11-29
-
---- a/src/editor.c
-+++ b/src/editor.c
-@@ -204,10 +204,9 @@
-         gchar* base = g_path_get_basename (filename);
-         gchar* dir = g_path_get_dirname (filename);
-         ec->filename = g_strdup (filename);
--        ec->basename = g_strdup_printf ("%s%c.%s", dir, G_DIR_SEPARATOR, base);
--        ec->workfile = g_strdup_printf ("%s.swp", ec->basename);
--        ec->pdffile =  g_strdup_printf ("%s%c.%s.pdf", C_TMPDIR,
--                                       G_DIR_SEPARATOR, base);
-+        ec->basename = g_strdup (ec->fdname);
-+        ec->workfile = g_strdup (ec->fdname);
-+        ec->pdffile =  g_strdup_printf ("%s.pdf", ec->fdname);
-         g_free (base);
-         g_free (dir);
-     } else {
-@@ -237,12 +236,9 @@
-     if (ec->filename) {
-         gchar* dirname = g_path_get_dirname (ec->filename);
-         gchar* basename = g_path_get_basename (ec->filename);
--        auxfile = g_strdup_printf ("%s%c.%s.aux", C_TMPDIR,
--                G_DIR_SEPARATOR, basename);
--        logfile = g_strdup_printf ("%s%c.%s.log", C_TMPDIR,
--                G_DIR_SEPARATOR, basename);
--        syncfile = g_strdup_printf ("%s%c.%s.synctex.gz", C_TMPDIR,
--                G_DIR_SEPARATOR, basename);
-+        auxfile = g_strdup_printf ("%s.aux", ec->fdname);
-+        logfile = g_strdup_printf ("%s.log", ec->fdname);
-+        syncfile = g_strdup_printf ("%s.synctex.gz", ec->fdname);
-         g_free (basename);
-         g_free (dirname);
-     } else {
diff --git a/debian/patches/series b/debian/patches/series
index 3cab938..b5ccfe6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,3 @@ gummi.desktop.patch
 automake-subdirs.patch
 libgthread-2.0_link.patch
 use-system-synctex.patch
-no-predictable-tmpfiles.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gummi.git