Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 ftp/gftp/DEPENDS      |    4 ++--
 ftp/gftp/DETAILS      |    1 +
 ftp/gftp/HISTORY      |    8 ++++++--
 ftp/gftp/PRE_BUILD    |    5 +++++
 ftp/gftp/expand.patch |   21 +++++++++++++++++++++
 ftp/gftp/tmpstr.patch |   12 ++++++++++++
 6 files changed, 47 insertions(+), 4 deletions(-)

New commits:
commit 79140001b281c70605ddb2b95d0a773fa0b4858c
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    gftp: use SSL provider

commit 6a331abba1e47ba7718b6fd8479a7a625a38478e
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    gftp: fixed several crashes by third-party patches

commit 4f76b4546eaa0b534b7c2d3d16ad1e37d0e9e453
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    Revert "gftp: depends SSL"
    
    This reverts commit 633e55fcfac51abf4bfe67cb1fd7f1a4dc1c024a.

diff --git a/ftp/gftp/DEPENDS b/ftp/gftp/DEPENDS
index 4a9da07..432b520 100755
--- a/ftp/gftp/DEPENDS
+++ b/ftp/gftp/DEPENDS
@@ -1,6 +1,6 @@
 depends gtk+2 &&
 
 optional_depends SSL \
-                 "--enable-SSL" \
-                 "--disable-SSL" \
+                 "--enable-openssl" \
+                 "--disable-openssl" \
                  "for SSL support"
diff --git a/ftp/gftp/DETAILS b/ftp/gftp/DETAILS
index a468d02..4876fa9 100755
--- a/ftp/gftp/DETAILS
+++ b/ftp/gftp/DETAILS
@@ -1,5 +1,6 @@
            SPELL=gftp
          VERSION=2.0.19
+      PATCHLEVEL=1
           SOURCE=$SPELL-$VERSION.tar.bz2
    SOURCE_URL[0]=http://www.gftp.org/$SOURCE
    SOURCE_URL[1]=ftp://www.gftp.org/pub/gftp/$SOURCE
diff --git a/ftp/gftp/HISTORY b/ftp/gftp/HISTORY
index e49825b..3e0318e 100644
--- a/ftp/gftp/HISTORY
+++ b/ftp/gftp/HISTORY
@@ -1,5 +1,9 @@
-2014-08-19  Treeve Jelbert <treeve AT sourcemage.org>
-        * DEPENDS: openssl => SSL
+2014-11-23 Vlad Glagolev <stealth AT sourcemage.org>
+       * DETAILS: PATCHLEVEL=1
+       * PRE_BUILD: apply patches
+       * DEPENDS: use SSL provider
+       * expanded.patch: backported patch from Gentoo to fix a crash
+       * tmpstr.patch: backported patch from Mageia to fix a crash
 
 2010-04-02 Vlad Glagolev <stealth AT sourcemage.org>
        * DEPENDS: added openssl as opt dep
diff --git a/ftp/gftp/PRE_BUILD b/ftp/gftp/PRE_BUILD
new file mode 100755
index 0000000..4a6a256
--- /dev/null
+++ b/ftp/gftp/PRE_BUILD
@@ -0,0 +1,5 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+
+patch -p1 < "$SPELL_DIRECTORY/expand.patch" &&
+patch -p1 < "$SPELL_DIRECTORY/tmpstr.patch"
diff --git a/ftp/gftp/expand.patch b/ftp/gftp/expand.patch
new file mode 100644
index 0000000..f3e029d
--- /dev/null
+++ b/ftp/gftp/expand.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);
+ 
diff --git a/ftp/gftp/tmpstr.patch b/ftp/gftp/tmpstr.patch
new file mode 100644
index 0000000..2b9e8dc
--- /dev/null
+++ b/ftp/gftp/tmpstr.patch
@@ -0,0 +1,12 @@
+--- ./src/gtk/misc-gtk.c~      2007-04-27 01:47:33.000000000 +0200
++++ ./src/gtk/misc-gtk.c       2008-12-21 19:31:37.000000000 +0100
+@@ -757,7 +757,8 @@
+     tempstr = insert_commas (fle->size, NULL, 0);
+ 
+   gtk_clist_set_text (GTK_CLIST (wdata->listbox), clist_num, 2, tempstr);
+-  g_free (tempstr);
++  if (tempstr)
++      g_free (tempstr);
+ 
+   if (fle->user)
+     gtk_clist_set_text (GTK_CLIST (wdata->listbox), clist_num, 3, 
fle->user);