Attachment #160202 for bug #202563

View | Details | Raw Unified | Return to bug 202563
Collapse All | Expand All

Lines 2-8 Link Here

(-)ftp/filezilla/Makefile (-4 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= filezilla	4	PORTNAME= filezilla
5	PORTVERSION= 3.12.0.2	5	PORTVERSION= 3.13.0
6	CATEGORIES= ftp	6	CATEGORIES= ftp
7	MASTER_SITES= SF/${PORTNAME}/FileZilla_Client/${PORTVERSION}	7	MASTER_SITES= SF/${PORTNAME}/FileZilla_Client/${PORTVERSION}
8	DISTNAME= FileZilla_${PORTVERSION}_src	8	DISTNAME= FileZilla_${PORTVERSION}_src
Lines 18-27 Link Here
18	LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \	18	LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \
19	libgnutls.so:${PORTSDIR}/security/gnutls \	19	libgnutls.so:${PORTSDIR}/security/gnutls \
20	libidn.so:${PORTSDIR}/dns/libidn \	20	libidn.so:${PORTSDIR}/dns/libidn \
21	libtinyxml.so:${PORTSDIR}/textproc/tinyxml	21	libpugixml.so:${PORTSDIR}/textproc/pugixml
22		22
		23	BROKEN_FreeBSD_9= requires C++14 complier, 9.x lacks C++11 standard library
		24
23	INSTALLS_ICONS= yes	25	INSTALLS_ICONS= yes
24	USES= compiler:c++11-lib gmake pkgconfig tar:bzip2	26	USES= compiler:c++14-lang gmake pkgconfig tar:bzip2
25	USE_SQLITE= 3	27	USE_SQLITE= 3
26	USE_WX= 3.0	28	USE_WX= 3.0
27	WX_CONF_ARGS= relative	29	WX_CONF_ARGS= relative
Lines 48-54 Link Here
48	.include <bsd.port.pre.mk>	50	.include <bsd.port.pre.mk>
49		51
50	.if ${CHOSEN_COMPILER_TYPE} == "gcc"	52	.if ${CHOSEN_COMPILER_TYPE} == "gcc"
51	BROKEN_FreeBSD= GCC dies with Internal Compiler Error
52	.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}	53	.if ${ARCH} == i386 && ! ${CFLAGS:M-march=*}
53	# needed for __atomic_exchange_8, __atmoic_fetch_add_8, __atomic_store_8	54	# needed for __atomic_exchange_8, __atmoic_fetch_add_8, __atomic_store_8
54	CFLAGS+= -march=i586	55	CFLAGS+= -march=i586

Lines 1-2 Link Here

(-)ftp/filezilla/distinfo (-2 / +2 lines)
1	SHA256 (FileZilla_3.12.0.2_src.tar.bz2) = 7a296fc2cd94d00d3a14ad29b84ff081c60a791f4cddc07f0bd8022bd57e1d0d	1	SHA256 (FileZilla_3.13.0_src.tar.bz2) = e6c21b41b1318d0d75273aca94cfda3039c9847bdb5adc4b9d480ecdcdfa4fc7
2	SIZE (FileZilla_3.12.0.2_src.tar.bz2) = 4440836	2	SIZE (FileZilla_3.13.0_src.tar.bz2) = 4542742

Line 0 Link Here

(-)ftp/filezilla/files/patch-src_interface_Makefile.am (+11 lines)
	1	--- src/interface/Makefile.am.orig 2015-07-31 03:30:02 UTC
	2	+++ src/interface/Makefile.am
	3	@@ -155,7 +155,7 @@ noinst_HEADERS = aboutdialog.h \
	4	filter_conditions_dialog.h \
	5	filteredit.h \
	6	file_utils.h \
	7	- fzputtygen_interface.cpp \
	8	+ fzputtygen_interface.h \
	9	import.h \
	10	inputdialog.h \
	11	ipcmutex.h \

Line 0 Link Here

(-)ftp/filezilla/files/patch-src_interface_Makefile.in (+11 lines)
	1	--- src/interface/Makefile.in.orig 2015-08-18 16:03:24 UTC
	2	+++ src/interface/Makefile.in
	3	@@ -630,7 +630,7 @@ noinst_HEADERS = aboutdialog.h \
	4	filter_conditions_dialog.h \
	5	filteredit.h \
	6	file_utils.h \
	7	- fzputtygen_interface.cpp \
	8	+ fzputtygen_interface.h \
	9	import.h \
	10	inputdialog.h \
	11	ipcmutex.h \




--- 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 */

Return to bug 202563

Line 0 Link Here

(-)ftp/filezilla/files/patch-src_interface_fzputtygen__interface.h (+43 lines)
	1	--- src/interface/fzputtygen_interface.h.orig 2015-08-18 16:02:52 UTC
	2	+++ src/interface/fzputtygen_interface.h
	3	@@ -0,0 +1,40 @@
	4	+#ifndef FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER
	5	+#define FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER
	6	+
	7	+#include <wx/process.h>
	8	+
	9	+class CFZPuttyGenInterface
	10	+{
	11	+public:
	12	+ CFZPuttyGenInterface(wxWindow* parent);
	13	+ virtual ~CFZPuttyGenInterface();
	14	+ bool LoadKeyFile(wxString& keyFile, bool silent, wxString& comment, wxString& data);
	15	+
	16	+ void EndProcess();
	17	+ void DeleteProcess();
	18	+ bool IsProcessCreated();
	19	+ bool IsProcessStarted();
	20	+
	21	+protected:
	22	+ // return -1 on error
	23	+ int NeedsConversion(wxString keyFile, bool silent);
	24	+
	25	+ // return -1 on error
	26	+ int IsKeyFileEncrypted(wxString keyFile, bool silent);
	27	+
	28	+ wxProcess* m_pProcess{};
	29	+ bool m_initialized{};
	30	+ wxWindow* m_parent;
	31	+
	32	+ enum ReplyCode {
	33	+ success,
	34	+ error,
	35	+ failure
	36	+ };
	37	+
	38	+ bool LoadProcess(bool silent);
	39	+ bool Send(const wxString& cmd);
	40	+ ReplyCode GetReply(wxString& reply);
	41	+};
	42	+
	43	+#endif /* FILEZILLA_FZPUTTYGEN_INTERFACE_HEADER */