Attachment 160504 Details for Bug 202761 – ftp/filezilla update to 3.13.1

[patch] ftp/filezilla update to 3.13.1

ftp_filezilla.patch (text/plain), 3.47 KB, created by Matthew Rezny on 2015-08-29 23:06:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Rezny

Created: 2015-08-29 23:06:01 UTC

Size: 3.47 KB

patch

obsolete

>Index: ftp/filezilla/Makefile
>===================================================================
>--- ftp/filezilla/Makefile	(revision 395525)
>+++ ftp/filezilla/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	filezilla
>-PORTVERSION=	3.13.0
>+PORTVERSION=	3.13.1
> CATEGORIES=	ftp
> MASTER_SITES=	SF/${PORTNAME}/FileZilla_Client/${PORTVERSION}
> DISTNAME=	FileZilla_${PORTVERSION}_src
>Index: ftp/filezilla/distinfo
>===================================================================
>--- ftp/filezilla/distinfo	(revision 395525)
>+++ ftp/filezilla/distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (FileZilla_3.13.0_src.tar.bz2) = e6c21b41b1318d0d75273aca94cfda3039c9847bdb5adc4b9d480ecdcdfa4fc7
>-SIZE (FileZilla_3.13.0_src.tar.bz2) = 4542742
>+SHA256 (FileZilla_3.13.1_src.tar.bz2) = c16e7dc9f6b6663ff67de608df930148d693b61e70d76783a81db710f117e8c7
>+SIZE (FileZilla_3.13.1_src.tar.bz2) = 4548641
>Index: ftp/filezilla/files/patch-src_interface_Makefile.am
>===================================================================
>--- ftp/filezilla/files/patch-src_interface_Makefile.am	(revision 395412)
>+++ ftp/filezilla/files/patch-src_interface_Makefile.am	(working copy)
>@@ -1,11 +0,0 @@
>---- src/interface/Makefile.am.orig	2015-07-31 03:30:02 UTC
>-+++ src/interface/Makefile.am
>-@@ -155,7 +155,7 @@ noinst_HEADERS = aboutdialog.h \
>- 		 filter_conditions_dialog.h \
>- 		 filteredit.h \
>- 		 file_utils.h \
>--		 fzputtygen_interface.cpp \
>-+		 fzputtygen_interface.h \
>- 		 import.h \
>- 		 inputdialog.h \
>- 		 ipcmutex.h \
>Index: ftp/filezilla/files/patch-src_interface_Makefile.in
>===================================================================
>--- ftp/filezilla/files/patch-src_interface_Makefile.in	(revision 395412)
>+++ ftp/filezilla/files/patch-src_interface_Makefile.in	(working copy)
>@@ -1,11 +0,0 @@
>---- src/interface/Makefile.in.orig	2015-08-18 16:03:24 UTC
>-+++ src/interface/Makefile.in
>-@@ -630,7 +630,7 @@ noinst_HEADERS = aboutdialog.h \
>- 		 filter_conditions_dialog.h \
>- 		 filteredit.h \
>- 		 file_utils.h \
>--		 fzputtygen_interface.cpp \
>-+		 fzputtygen_interface.h \
>- 		 import.h \
>- 		 inputdialog.h \
>- 		 ipcmutex.h \
>Index: ftp/filezilla/files/patch-src_interface_fzputtygen__interface.h
>===================================================================
>--- ftp/filezilla/files/patch-src_interface_fzputtygen__interface.h	(revision 395412)
>+++ ftp/filezilla/files/patch-src_interface_fzputtygen__interface.h	(working copy)
>@@ -1,43 +0,0 @@
>---- src/interface/fzputtygen_interface.h.orig	2015-08-18 16:02:52 UTC
>-+++ src/interface/fzputtygen_interface.h
>-@@ -0,0 +1,40 @@
>-+#ifndef FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER
>-+#define FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER
>-+
>-+#include <wx/process.h>
>-+
>-+class CFZPuttyGenInterface
>-+{
>-+public:
>-+	CFZPuttyGenInterface(wxWindow* parent);
>-+	virtual ~CFZPuttyGenInterface();
>-+	bool LoadKeyFile(wxString& keyFile, bool silent, wxString& comment, wxString& data);
>-+
>-+	void EndProcess();
>-+	void DeleteProcess();
>-+	bool IsProcessCreated();
>-+	bool IsProcessStarted();
>-+
>-+protected:
>-+	// return -1 on error
>-+	int NeedsConversion(wxString keyFile, bool silent);
>-+
>-+	// return -1 on error
>-+	int IsKeyFileEncrypted(wxString keyFile, bool silent);
>-+
>-+	wxProcess* m_pProcess{};
>-+	bool m_initialized{};
>-+	wxWindow* m_parent;
>-+	
>-+	enum ReplyCode {
>-+		success,
>-+		error,
>-+		failure
>-+	};
>-+
>-+	bool LoadProcess(bool silent);
>-+	bool Send(const wxString& cmd);
>-+	ReplyCode GetReply(wxString& reply);
>-+};
>-+
>-+#endif /* FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER */

Flags:

rezny: maintainer-approval+

Actions: View | Diff

Attachments on bug 202761: 160504 | 161166