Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (89a0b26f7a77a0385d733b7fbaf9fa531bbdc433)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (89a0b26f7a77a0385d733b7fbaf9fa531bbdc433)
  • Date: Mon, 24 Nov 2014 09:04:20 -0600

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

ftp/gftp/DETAILS | 2 +-
ftp/gftp/HISTORY | 5 +++++
ftp/gftp/PRE_BUILD | 1 +
ftp/gftp/ftps.patch | 20 ++++++++++++++++++++
4 files changed, 27 insertions(+), 1 deletion(-)

New commits:
commit 89a0b26f7a77a0385d733b7fbaf9fa531bbdc433
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gftp: fixed FTPS connections

diff --git a/ftp/gftp/DETAILS b/ftp/gftp/DETAILS
index 4876fa9..813e2ef 100755
--- a/ftp/gftp/DETAILS
+++ b/ftp/gftp/DETAILS
@@ -1,6 +1,6 @@
SPELL=gftp
VERSION=2.0.19
- PATCHLEVEL=1
+ PATCHLEVEL=2
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 3e0318e..8153749 100644
--- a/ftp/gftp/HISTORY
+++ b/ftp/gftp/HISTORY
@@ -1,3 +1,8 @@
+2014-11-24 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: PATCHLEVEL++
+ * PRE_BUILD: apply patch
+ * ftps.patch: added, to fix FTPS connections
+
2014-11-23 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: PATCHLEVEL=1
* PRE_BUILD: apply patches
diff --git a/ftp/gftp/PRE_BUILD b/ftp/gftp/PRE_BUILD
index 4a6a256..3a2a1b6 100755
--- a/ftp/gftp/PRE_BUILD
+++ b/ftp/gftp/PRE_BUILD
@@ -1,5 +1,6 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&

+patch -p0 < "$SPELL_DIRECTORY/ftps.patch" &&
patch -p1 < "$SPELL_DIRECTORY/expand.patch" &&
patch -p1 < "$SPELL_DIRECTORY/tmpstr.patch"
diff --git a/ftp/gftp/ftps.patch b/ftp/gftp/ftps.patch
new file mode 100644
index 0000000..86c1649
--- /dev/null
+++ b/ftp/gftp/ftps.patch
@@ -0,0 +1,20 @@
+--- lib/ftps.c.orig 2008-11-30 17:41:37.000000000 +0300
++++ lib/ftps.c 2014-11-24 17:48:05.588908260 +0300
+@@ -76,7 +76,16 @@
+ if (ret < 0)
+ return (ret);
+
+- ret = rfc959_send_command (request, "PROT P\r\n", -1, 1, 0);
++ /*
++ * "PROT P" (Private Protection) forces encrypted file transfers in
SSL/TLS
++ * mode and requires TLS renegotiation and secondary connection while
++ * re-using SSL session ID. It is not supported by gFTP yet.
++ * Rolling back to 2.0.18 behaviour meaning FTPS support is available for
++ * control connection only.
++ *
++ * ret = rfc959_send_command (request, "PROT P\r\n", -1, 1, 0);
++ */
++ ret = 5;
+ if (ret < 0)
+ return (ret);
+ else if (ret == '2')



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (89a0b26f7a77a0385d733b7fbaf9fa531bbdc433), Vlad Glagolev, 11/24/2014

Archive powered by MHonArc 2.6.24.

Top of Page