diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /net-ftp/gftp/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'net-ftp/gftp/files')
-rw-r--r-- | net-ftp/gftp/files/gftp-2.0.19-desktop.patch | 26 | ||||
-rw-r--r-- | net-ftp/gftp/files/gftp-2.0.19-gftp-expand-path-sigsegv.patch | 21 |
2 files changed, 47 insertions, 0 deletions
diff --git a/net-ftp/gftp/files/gftp-2.0.19-desktop.patch b/net-ftp/gftp/files/gftp-2.0.19-desktop.patch new file mode 100644 index 000000000000..878a77b5bf72 --- /dev/null +++ b/net-ftp/gftp/files/gftp-2.0.19-desktop.patch @@ -0,0 +1,26 @@ +@@ -, +, @@ + <kevin.bernard.allies@gmail.com> + * the Encoding key is now deprecated, and UTF-8 is the default value. + * As the value of Icon is not an absolute path, there should be no extension. + * The Application category is deprecated. + docs/gftp.desktop | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +--- a/docs/gftp.desktop ++++ a/docs/gftp.desktop +@@ -1,5 +1,4 @@ + [Desktop Entry] +-Encoding=UTF-8 + Name=gFTP + Comment=Download and upload files using multiple file transfer protocols + Comment[fr]=Télécharge des fichiers en utilisant le protocole FTP +@@ -8,8 +7,8 @@ Exec=gftp %u + Terminal=false + X-MultipleArgs=false + Type=Application +-Icon=gftp.png +-Categories=Application;Network; ++Icon=gftp ++Categories=Network; + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=gftp + X-GNOME-Bugzilla-Component=general diff --git a/net-ftp/gftp/files/gftp-2.0.19-gftp-expand-path-sigsegv.patch b/net-ftp/gftp/files/gftp-2.0.19-gftp-expand-path-sigsegv.patch new file mode 100644 index 000000000000..f3e029dea0ca --- /dev/null +++ b/net-ftp/gftp/files/gftp-2.0.19-gftp-expand-path-sigsegv.patch @@ -0,0 +1,21 @@ +Fix segmentation fault, when gftpui_run_chdir is called with directory=0x0, +and then calls gftp_expand_path (src=0x0), +the NULL string was cloned using g_strdup, which returns NULL if +its only argument is NULL, then this returned string was unreferenced. + + lib/misc.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/lib/misc.c b/lib/misc.c +index 16c019b..2791466 100644 +--- a/lib/misc.c ++++ b/lib/misc.c +@@ -143,6 +143,8 @@ gftp_expand_path (gftp_request * request, const char *src) + tempchar; + struct passwd *pw; + ++ g_return_val_if_fail(src != NULL, NULL); ++ + pw = NULL; + str = g_strdup (src); + |