gentoo auto-resync : 09:11:2024 - 03:03:12

5 files changed, 6 insertions, 753 deletions

diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index 716c5d30f579..825226114645 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 019ea6fa20eb..bc00bb68d873 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -3,10 +3,8 @@ AUX filezilla-3.47.0-disable-shellext_conf.patch 699 BLAKE2B 9d0209166f8e76b0575
 AUX filezilla-3.47.0-metainfo.patch 309 BLAKE2B b36d7f3e5446c76cc9e20be01b3a5005f140bef005b264c2956485cc9c33ed76d05319b53f51eea2b57606a6573e802e52bee94d373baefb5a317fcddd163090 SHA512 32e1a9e41dcd01322fd75cdb5d5bf16a1ce1241266d52a39e017c5eff64ae06592ae6799acfc6aaa935eb61023efc5fb3fcfadd43a9765a309a12c3fa3ee725c
 AUX filezilla-3.52.2-slibtool.patch 723 BLAKE2B f051ae8d8b1d9c75bf4752d009a3b710b742accb50ec46ad6d1be0d7c5f88ab77996e47b55e3f87432a9d5aee2fef61e915ed36c09e988e01bbf68943a64144b SHA512 7a7f1adc4144c5535d60e6dd6f18aecc04c93ff2c98f52660fa576dcbce9ff7bb53175eef2fee7671c472181ea7f5c388ccc8697e70b8841759fdec06e62d1a1
 AUX filezilla-3.60.1-desktop.patch 245 BLAKE2B 6bb06fcc851240d6bfe57c239084b7e9e22a94300cbbec2d4b8e22caf7452ac483f7de6cbea69b091e09dbcb0e9e5f23a1b70c73333fe1e8eb7a73c1365b08ea SHA512 31a1ab2715580519ca1dac30e7c3c88c9f6fcf802091740ce3a56e884a6ba5e3326935f7f55857211effe4646650e71c3051b13f5995a493a0f809be920cf6b4
-AUX filezilla-3.67.0-odr.patch 15853 BLAKE2B f00960ae91c2441223fcc46911377da9af7193a0c5d8e4fdd96deb084939a05e2be632bf345c9f0c938b19d7dee822701eaa98e2fab1ae01668a664504e46ee0 SHA512 9d951d0dff1f33d65f27dc3b7df9959316d39713a2c19a4ffa0479dcb53dbe84d6c1d1aca3305bcf98e92744a2a6e8377c4d5168c5262c795bf0d0035b14995a
-DIST FileZilla_3.67.0_src.tar.xz 4058264 BLAKE2B 28799d60188ed94bc80143ccabf073eced4caa9960daa2b8d7f617252355735647fe4b3776ee38eb179fdb2667fd05536a89b6c17b25d056c72e565585ddef98 SHA512 b2d4cd45f2ed7e70fbb11500a42fe0d0e51919831a35bcfb439455d03af8eb744eb25d7f7b6ea9a94c424065e4d071d9706fcf46019da829d1318c099ab8108c
 DIST FileZilla_3.67.1_src.tar.xz 4065540 BLAKE2B e3e286da6c8777df4fe3a66f440b1e0e2c9f99777fbcf75c709e1290b37df6ed2db7e5e9fd73403bec0733a04a04989351005b7455a5d2620f213b1d18c20f36 SHA512 630820a0c67ee8b1d48a8ff4193e066d35bbf9048526c91b8804d786defc28a635dac252b298de518b506506607abd96ce35c455c21a50503844a57c47ea78e7
-EBUILD filezilla-3.67.0-r1.ebuild 1780 BLAKE2B bda7fedb42deaed2778876cda48f76d8f112893821a9a75be8ccd18c007ba16c5b1a50aa49d9767355cefd723deea1176eef64b60f95240a8f67c95fc71c3d16 SHA512 767eb55904c795356a6a62de94b1a99e6162edd1fb1a883e8fccfa8148a863c37274cea3434049b0b49487bf3db0086b3ab2fa801888c183b10692196b44eb25
-EBUILD filezilla-3.67.0.ebuild 1708 BLAKE2B 8483f401d4764bf83a882291dfcb5c73d51aa2b8e01d0292cc5b0d0c9687341ef0cf83f2918e1addf1d3ff7790620e0c1c71793c438ecf2f46c26fac526092b4 SHA512 44b4223e53d5d258e5307eee1414be18820e297eeb928c3e315621c5ca7d7d726acf5e6b00517d0df49242da4c1f5af1a21c1f00a6489be0b1431aa4c1f7a490
+DIST FileZilla_3.68.1_src.tar.xz 4105072 BLAKE2B d0e65adae49e68204de035c70d6abea3313dae6f0f3c2d55bfee2b63fb86979b54108d88c36b2c87e978c7caa3268518902966cdd7f9c4b7564ec93fb5f6fcd6 SHA512 b8cd7a524c13753118f8c48b0f4063a3459d119efe2bfd11c0ca40e35573885e2cae85007e7958d6eec4bcbdd557eba76bcaa72a922d3bd4f85385fc06d0df6b
 EBUILD filezilla-3.67.1.ebuild 1708 BLAKE2B c731ef6cee6b74abd098018c6d374dada5b26f44dbcc64bacc369ab4f4480ca9201664f6fbea1cc7372b12ed24c109080ecd64dcb53f216457ad7f5e81413af7 SHA512 9a56a52537833b2a09b98a4f06098a7798f082a358cc063a53348c1556680edcf08a23986c1ee632f7163596304eec33cc43a73b70a1b19d5c16da7a2bdc8980
+EBUILD filezilla-3.68.1.ebuild 1736 BLAKE2B e4dd139ff0d0cc4ce82e019295fe5b2d182d6d3fa68b6859a495373fa7adbc0958aebe4790acc81683e56d24d5ceca92adee8255d2a4c5b5276e8ba2b17bc6c7 SHA512 ad399dd71414a56460b9a4f00330d3653367bf2399986b63d6fc0bcabf9d1eaa4a12e47a29f8b1aa5d36916f1b5f18b9c2615bb853395b392253968a64461b70
 MISC metadata.xml 449 BLAKE2B 3a9fbf5c444404c3922fac61b0a36429acda9bd582d3b2049e9637088acf1a33af6c9a68052325969037951640ec3b9c8e2d357cbbd06a4655a504cb363e0c58 SHA512 f33dccada194313d97e91f514ca89685a2c643a0fb736e3a90065b246aced161fc45198aa05fea8fb96ff7827ddb8722344158e7d4c4b68c1bd008097fa99b7c
diff --git a/net-ftp/filezilla/files/filezilla-3.67.0-odr.patch b/net-ftp/filezilla/files/filezilla-3.67.0-odr.patch
deleted file mode 100644
index ec6af91b56cb..000000000000
--- a/net-ftp/filezilla/files/filezilla-3.67.0-odr.patch
+++ /dev/null
@@ -1,670 +0,0 @@
-https://bugs.gentoo.org/927178#c3
-
-No upstream bug link -- their trac was temporarily down so I had to send the
-report in via email.
-
-Revision exported from:
-
-```
-svn diff -c 11167 https://svn.filezilla-project.org/svn/FileZilla3
-```
-
-https://svn.filezilla-project.org/filezilla?view=revision&revision=11167
-
-
-Index: trunk/src/engine/storj/delete.cpp
-===================================================================
---- trunk/src/engine/storj/delete.cpp	(revision 11166)
-+++ trunk/src/engine/storj/delete.cpp	(revision 11167)
-@@ -3,6 +3,7 @@
- #include "../directorycache.h"
- #include "delete.h"
- 
-+namespace {
- enum DeleteStates
- {
- 	delete_init,
-@@ -9,6 +10,7 @@
- 	delete_resolve,
- 	delete_delete
- };
-+}
- 
- int CStorjDeleteOpData::Send()
- {
-Index: trunk/src/engine/storj/list.cpp
-===================================================================
---- trunk/src/engine/storj/list.cpp	(revision 11166)
-+++ trunk/src/engine/storj/list.cpp	(revision 11167)
-@@ -3,6 +3,7 @@
- #include "../directorycache.h"
- #include "list.h"
- 
-+namespace {
- enum listStates
- {
- 	list_init = 0,
-@@ -9,6 +10,7 @@
- 	list_waitlock,
- 	list_list
- };
-+}
- 
- int CStorjListOpData::Send()
- {
-Index: trunk/src/engine/storj/rmd.cpp
-===================================================================
---- trunk/src/engine/storj/rmd.cpp	(revision 11166)
-+++ trunk/src/engine/storj/rmd.cpp	(revision 11167)
-@@ -5,6 +5,7 @@
- 
- #include <assert.h>
- 
-+namespace {
- enum mkdStates
- {
- 	rmd_init = 0,
-@@ -11,8 +12,8 @@
- 	rmd_rmbucket,
- 	rmd_rmdir
- };
-+}
- 
--
- int CStorjRemoveDirOpData::Send()
- {
- 	switch (opState) {
-Index: trunk/src/engine/ftp/chmod.cpp
-===================================================================
---- trunk/src/engine/ftp/chmod.cpp	(revision 11166)
-+++ trunk/src/engine/ftp/chmod.cpp	(revision 11167)
-@@ -3,6 +3,7 @@
- #include "chmod.h"
- #include "../directorycache.h"
- 
-+namespace {
- enum chmodStates
- {
- 	chmod_init,
-@@ -9,6 +10,7 @@
- 	chmod_waitcwd,
- 	chmod_chmod
- };
-+}
- 
- int CFtpChmodOpData::Send()
- {
-Index: trunk/src/engine/ftp/cwd.cpp
-===================================================================
---- trunk/src/engine/ftp/cwd.cpp	(revision 11166)
-+++ trunk/src/engine/ftp/cwd.cpp	(revision 11167)
-@@ -3,6 +3,7 @@
- #include "cwd.h"
- #include "../pathcache.h"
- 
-+namespace {
- enum cwdStates
- {
- 	cwd_init = 0,
-@@ -12,6 +13,7 @@
- 	cwd_cwd_subdir,
- 	cwd_pwd_subdir
- };
-+}
- 
- int CFtpChangeDirOpData::Send()
- {
-Index: trunk/src/engine/ftp/delete.cpp
-===================================================================
---- trunk/src/engine/ftp/delete.cpp	(revision 11166)
-+++ trunk/src/engine/ftp/delete.cpp	(revision 11167)
-@@ -3,6 +3,7 @@
- #include "delete.h"
- #include "../directorycache.h"
- 
-+namespace {
- enum rmdStates
- {
- 	del_init,
-@@ -9,6 +10,7 @@
- 	del_waitcwd,
- 	del_del
- };
-+}
- 
- int CFtpDeleteOpData::Send()
- {
-Index: trunk/src/engine/ftp/filetransfer.cpp
-===================================================================
---- trunk/src/engine/ftp/filetransfer.cpp	(revision 11166)
-+++ trunk/src/engine/ftp/filetransfer.cpp	(revision 11167)
-@@ -12,6 +12,22 @@
- 
- #include <assert.h>
- 
-+namespace {
-+enum filetransferStates
-+{
-+        filetransfer_init = 0,
-+        filetransfer_waitcwd,
-+        filetransfer_waitlist,
-+        filetransfer_size,
-+        filetransfer_mdtm,
-+        filetransfer_resumetest,
-+        filetransfer_transfer,
-+        filetransfer_waittransfer,
-+        filetransfer_waitresumetest,
-+        filetransfer_mfmt
-+};
-+}
-+
- CFtpFileTransferOpData::CFtpFileTransferOpData(CFtpControlSocket& controlSocket, CFileTransferCommand const& cmd)
- 	: CFileTransferOpData(L"CFtpFileTransferOpData", cmd)
- 	, CFtpOpData(controlSocket)
-Index: trunk/src/engine/ftp/filetransfer.h
-===================================================================
---- trunk/src/engine/ftp/filetransfer.h	(revision 11166)
-+++ trunk/src/engine/ftp/filetransfer.h	(revision 11167)
-@@ -3,20 +3,6 @@
- 
- #include "ftpcontrolsocket.h"
- 
--enum filetransferStates
--{
--	filetransfer_init = 0,
--	filetransfer_waitcwd,
--	filetransfer_waitlist,
--	filetransfer_size,
--	filetransfer_mdtm,
--	filetransfer_resumetest,
--	filetransfer_transfer,
--	filetransfer_waittransfer,
--	filetransfer_waitresumetest,
--	filetransfer_mfmt
--};
--
- class CFtpFileTransferOpData final : public CFileTransferOpData, public CFtpTransferOpData, public CFtpOpData
- {
- public:
-Index: trunk/src/engine/ftp/ftpcontrolsocket.cpp
-===================================================================
---- trunk/src/engine/ftp/ftpcontrolsocket.cpp	(revision 11166)
-+++ trunk/src/engine/ftp/ftpcontrolsocket.cpp	(revision 11167)
-@@ -34,6 +34,9 @@
- 
- #include <assert.h>
- 
-+using namespace ftpLogonStates;
-+using namespace FtpRawTransferStates;
-+
- CFtpControlSocket::CFtpControlSocket(CFileZillaEnginePrivate & engine)
- 	: CRealControlSocket(engine)
- {
-Index: trunk/src/engine/ftp/list.cpp
-===================================================================
---- trunk/src/engine/ftp/list.cpp	(revision 11166)
-+++ trunk/src/engine/ftp/list.cpp	(revision 11167)
-@@ -9,6 +9,15 @@
- #include <assert.h>
- 
- namespace {
-+enum listStates
-+{
-+        list_init,
-+        list_waitcwd,
-+        list_waitlock,
-+        list_waittransfer,
-+        list_mdtm
-+};
-+
- // Some servers are broken. Instead of an empty listing, some MVS servers
- // for example they return "550 no members found"
- // Other servers return "550 No files found."
-Index: trunk/src/engine/ftp/list.h
-===================================================================
---- trunk/src/engine/ftp/list.h	(revision 11166)
-+++ trunk/src/engine/ftp/list.h	(revision 11167)
-@@ -6,15 +6,6 @@
- 
- class CDirectoryListingParser;
- 
--enum listStates
--{
--	list_init,
--	list_waitcwd,
--	list_waitlock,
--	list_waittransfer,
--	list_mdtm
--};
--
- class CFtpListOpData final : public COpData, public CFtpOpData, public CFtpTransferOpData
- {
- public:
-Index: trunk/src/engine/ftp/logon.cpp
-===================================================================
---- trunk/src/engine/ftp/logon.cpp	(revision 11166)
-+++ trunk/src/engine/ftp/logon.cpp	(revision 11167)
-@@ -10,6 +10,7 @@
- #include "../../include/engine_options.h"
- 
- using namespace std::literals;
-+using namespace ftpLogonStates;
- 
- CFtpLogonOpData::CFtpLogonOpData(CFtpControlSocket& controlSocket)
- 	: COpData(Command::connect, L"CFtpLogonOpData")
-Index: trunk/src/engine/ftp/logon.h
-===================================================================
---- trunk/src/engine/ftp/logon.h	(revision 11166)
-+++ trunk/src/engine/ftp/logon.h	(revision 11167)
-@@ -3,27 +3,27 @@
- 
- #include "ftpcontrolsocket.h"
- 
--enum loginStates
--{
--	LOGON_CONNECT,
--	LOGON_WELCOME,
--	LOGON_AUTH_TLS,
--	LOGON_AUTH_SSL,
--	LOGON_AUTH_WAIT,
--	LOGON_SECURITY,
--	LOGON_LOGON,
--	LOGON_SYST,
--	LOGON_FEAT,
--	LOGON_CLNT,
--	LOGON_OPTSUTF8,
--	LOGON_PBSZ,
--	LOGON_PROT,
--	LOGON_OPTSMLST,
--	LOGON_CUSTOMCOMMANDS,
--	LOGON_DONE
-+namespace ftpLogonStates {
-+enum type {
-+        LOGON_CONNECT,
-+        LOGON_WELCOME,
-+        LOGON_AUTH_TLS,
-+        LOGON_AUTH_SSL,
-+        LOGON_AUTH_WAIT,
-+        LOGON_SECURITY,
-+        LOGON_LOGON,
-+        LOGON_SYST,
-+        LOGON_FEAT,
-+        LOGON_CLNT,
-+        LOGON_OPTSUTF8,
-+        LOGON_PBSZ,
-+        LOGON_PROT,
-+        LOGON_OPTSMLST,
-+        LOGON_CUSTOMCOMMANDS,
-+        LOGON_DONE
- };
-+}
- 
--
- enum class loginCommandType
- {
- 	user,
-@@ -73,7 +73,7 @@
- 
- 	unsigned int customCommandIndex{};
- 
--	int neededCommands[LOGON_DONE]{};
-+	int neededCommands[ftpLogonStates::LOGON_DONE]{};
- 
- 	std::deque<t_loginCommand> loginSequence;
- 
-Index: trunk/src/engine/ftp/mkd.cpp
-===================================================================
---- trunk/src/engine/ftp/mkd.cpp	(revision 11166)
-+++ trunk/src/engine/ftp/mkd.cpp	(revision 11167)
-@@ -5,6 +5,7 @@
- 
- using namespace std::literals;
- 
-+namespace {
- enum mkdStates
- {
- 	mkd_init = 0,
-@@ -13,6 +14,7 @@
- 	mkd_cwdsub,
- 	mkd_tryfull
- };
-+}
- 
- /* Directory creation works like this: First find a parent directory into
-  * which we can CWD, then create the subdirs one by one. If either part
-Index: trunk/src/engine/ftp/rawtransfer.cpp
-===================================================================
---- trunk/src/engine/ftp/rawtransfer.cpp	(revision 11166)
-+++ trunk/src/engine/ftp/rawtransfer.cpp	(revision 11167)
-@@ -7,7 +7,7 @@
- 
- #include <libfilezilla/iputils.hpp>
- 
--#include <assert.h>
-+using namespace FtpRawTransferStates;
- 
- int CFtpRawTransferOpData::Send()
- {
-@@ -423,7 +423,6 @@
- {
- 	std::wstring ret = L"PASV";
- 
--	assert(bPasv);
- 	bTriedPasv = true;
- 
- 	if (controlSocket_.proxy_layer_) {
-Index: trunk/src/engine/ftp/rawtransfer.h
-===================================================================
---- trunk/src/engine/ftp/rawtransfer.h	(revision 11166)
-+++ trunk/src/engine/ftp/rawtransfer.h	(revision 11167)
-@@ -3,18 +3,20 @@
- 
- #include "ftpcontrolsocket.h"
- 
--enum rawtransferStates
-+namespace FtpRawTransferStates {
-+enum type
- {
--	rawtransfer_init = 0,
--	rawtransfer_type,
--	rawtransfer_port_pasv,
--	rawtransfer_rest,
--	rawtransfer_transfer,
--	rawtransfer_waitfinish,
--	rawtransfer_waittransferpre,
--	rawtransfer_waittransfer,
--	rawtransfer_waitsocket
-+        rawtransfer_init = 0,
-+        rawtransfer_type,
-+        rawtransfer_port_pasv,
-+        rawtransfer_rest,
-+        rawtransfer_transfer,
-+        rawtransfer_waitfinish,
-+        rawtransfer_waittransferpre,
-+        rawtransfer_waittransfer,
-+        rawtransfer_waitsocket
- };
-+}
- 
- class CFtpRawTransferOpData final : public COpData, public CFtpOpData
- {
-Index: trunk/src/engine/ftp/rename.cpp
-===================================================================
---- trunk/src/engine/ftp/rename.cpp	(revision 11166)
-+++ trunk/src/engine/ftp/rename.cpp	(revision 11167)
-@@ -4,6 +4,7 @@
- #include "../directorycache.h"
- #include "../pathcache.h"
- 
-+namespace {
- enum renameStates
- {
- 	rename_init,
-@@ -11,6 +12,7 @@
- 	rename_rnfrom,
- 	rename_rnto
- };
-+}
- 
- int CFtpRenameOpData::Send()
- {
-Index: trunk/src/engine/ftp/rmd.cpp
-===================================================================
---- trunk/src/engine/ftp/rmd.cpp	(revision 11166)
-+++ trunk/src/engine/ftp/rmd.cpp	(revision 11167)
-@@ -4,6 +4,7 @@
- #include "../directorycache.h"
- #include "../pathcache.h"
- 
-+namespace {
- enum rmdStates
- {
- 	rmd_init,
-@@ -10,6 +11,7 @@
- 	rmd_waitcwd,
- 	rmd_rmd
- };
-+}
- 
- int CFtpRemoveDirOpData::Send()
- {
-Index: trunk/src/engine/http/filetransfer.cpp
-===================================================================
---- trunk/src/engine/http/filetransfer.cpp	(revision 11166)
-+++ trunk/src/engine/http/filetransfer.cpp	(revision 11167)
-@@ -7,6 +7,7 @@
- #include <assert.h>
- #include <string.h>
- 
-+namespace {
- enum filetransferStates
- {
- 	filetransfer_init = 0,
-@@ -13,6 +14,7 @@
- 	filetransfer_transfer,
- 	filetransfer_waittransfer
- };
-+}
- 
- CHttpFileTransferOpData::CHttpFileTransferOpData(CHttpControlSocket & controlSocket, CFileTransferCommand const& cmd)
- 	: CFileTransferOpData(L"CHttpFileTransferOpData", cmd)
-Index: trunk/src/engine/sftp/chmod.cpp
-===================================================================
---- trunk/src/engine/sftp/chmod.cpp	(revision 11166)
-+++ trunk/src/engine/sftp/chmod.cpp	(revision 11167)
-@@ -3,6 +3,7 @@
- #include "chmod.h"
- #include "../directorycache.h"
- 
-+namespace {
- enum chmodStates
- {
- 	chmod_init,
-@@ -9,6 +10,7 @@
- 	chmod_waitcwd,
- 	chmod_chmod
- };
-+}
- 
- int CSftpChmodOpData::Send()
- {
-Index: trunk/src/engine/sftp/connect.cpp
-===================================================================
---- trunk/src/engine/sftp/connect.cpp	(revision 11166)
-+++ trunk/src/engine/sftp/connect.cpp	(revision 11167)
-@@ -21,6 +21,7 @@
- #include <sys/mman.h>
- #endif
- 
-+namespace {
- enum connectStates
- {
- 	connect_init,
-@@ -28,6 +29,7 @@
- 	connect_keys,
- 	connect_open
- };
-+}
- 
- int CSftpConnectOpData::Send()
- {
-Index: trunk/src/engine/sftp/cwd.cpp
-===================================================================
---- trunk/src/engine/sftp/cwd.cpp	(revision 11166)
-+++ trunk/src/engine/sftp/cwd.cpp	(revision 11167)
-@@ -3,6 +3,7 @@
- #include "cwd.h"
- #include "../pathcache.h"
- 
-+namespace {
- enum cwdStates
- {
- 	cwd_init = 0,
-@@ -10,6 +11,7 @@
- 	cwd_cwd,
- 	cwd_cwd_subdir
- };
-+}
- 
- int CSftpChangeDirOpData::Send()
- {
-Index: trunk/src/engine/sftp/filetransfer.cpp
-===================================================================
---- trunk/src/engine/sftp/filetransfer.cpp	(revision 11166)
-+++ trunk/src/engine/sftp/filetransfer.cpp	(revision 11167)
-@@ -10,6 +10,7 @@
- 
- #include <assert.h>
- 
-+namespace {
- enum filetransferStates
- {
- 	filetransfer_init = 0,
-@@ -19,6 +20,7 @@
- 	filetransfer_transfer,
- 	filetransfer_chmtime
- };
-+}
- 
- CSftpFileTransferOpData::~CSftpFileTransferOpData()
- {
-Index: trunk/src/engine/sftp/list.cpp
-===================================================================
---- trunk/src/engine/sftp/list.cpp	(revision 11166)
-+++ trunk/src/engine/sftp/list.cpp	(revision 11167)
-@@ -5,6 +5,7 @@
- 
- #include <assert.h>
- 
-+namespace {
- enum listStates
- {
- 	list_init = 0,
-@@ -12,6 +13,7 @@
- 	list_waitlock,
- 	list_list
- };
-+}
- 
- int CSftpListOpData::Send()
- {
-Index: trunk/src/engine/sftp/mkd.cpp
-===================================================================
---- trunk/src/engine/sftp/mkd.cpp	(revision 11166)
-+++ trunk/src/engine/sftp/mkd.cpp	(revision 11167)
-@@ -3,6 +3,7 @@
- #include "../directorycache.h"
- #include "mkd.h"
- 
-+namespace {
- enum mkdStates
- {
- 	mkd_init = 0,
-@@ -11,6 +12,7 @@
- 	mkd_cwdsub,
- 	mkd_tryfull
- };
-+}
- 
- /* Directory creation works like this: First find a parent directory into
-  * which we can CWD, then create the subdirs one by one. If either part
-Index: trunk/src/engine/sftp/rename.cpp
-===================================================================
---- trunk/src/engine/sftp/rename.cpp	(revision 11166)
-+++ trunk/src/engine/sftp/rename.cpp	(revision 11167)
-@@ -4,6 +4,7 @@
- #include "../pathcache.h"
- #include "rename.h"
- 
-+namespace {
- enum renameStates
- {
- 	rename_init,
-@@ -10,6 +11,7 @@
- 	rename_waitcwd,
- 	rename_rename
- };
-+}
- 
- int CSftpRenameOpData::Send()
- {
-Index: trunk/src/engine/storj/connect.cpp
-===================================================================
---- trunk/src/engine/storj/connect.cpp	(revision 11166)
-+++ trunk/src/engine/storj/connect.cpp	(revision 11167)
-@@ -22,6 +22,16 @@
- #include <sys/mman.h>
- #endif
- 
-+namespace {
-+enum connectStates
-+{
-+        connect_init,
-+        connect_host,
-+        connect_user,
-+        connect_pass
-+};
-+}
-+
- int CStorjConnectOpData::Send()
- {
- 	switch (opState)
-Index: trunk/src/engine/storj/connect.h
-===================================================================
---- trunk/src/engine/storj/connect.h	(revision 11166)
-+++ trunk/src/engine/storj/connect.h	(revision 11167)
-@@ -3,14 +3,6 @@
- 
- #include "storjcontrolsocket.h"
- 
--enum connectStates
--{
--	connect_init,
--	connect_host,
--	connect_user,
--	connect_pass
--};
--
- class CStorjConnectOpData final : public COpData, public CStorjOpData
- {
- public:
-Index: trunk/src/engine/storj/file_transfer.cpp
-===================================================================
---- trunk/src/engine/storj/file_transfer.cpp	(revision 11166)
-+++ trunk/src/engine/storj/file_transfer.cpp	(revision 11167)
-@@ -7,6 +7,7 @@
- #include <libfilezilla/local_filesys.hpp>
- #include <libfilezilla/process.hpp>
- 
-+namespace {
- enum FileTransferStates
- {
- 	filetransfer_init,
-@@ -15,6 +16,7 @@
- 	filetransfer_delete,
- 	filetransfer_transfer
- };
-+}
- 
- CStorjFileTransferOpData::~CStorjFileTransferOpData()
- {
-Index: trunk/src/engine/storj/mkd.cpp
-===================================================================
---- trunk/src/engine/storj/mkd.cpp	(revision 11166)
-+++ trunk/src/engine/storj/mkd.cpp	(revision 11167)
-@@ -3,6 +3,7 @@
- #include "../directorycache.h"
- #include "mkd.h"
- 
-+namespace {
- enum mkdStates
- {
- 	mkd_init = 0,
-@@ -9,6 +10,7 @@
- 	mkd_mkbucket,
- 	mkd_put
- };
-+}
- 
- int CStorjMkdirOpData::Send()
- {
diff --git a/net-ftp/filezilla/filezilla-3.67.0.ebuild b/net-ftp/filezilla/filezilla-3.67.0.ebuild
deleted file mode 100644
index 8e7d6d453348..000000000000
--- a/net-ftp/filezilla/filezilla-3.67.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-gtk3"
-
-inherit autotools flag-o-matic wxwidgets xdg
-
-MY_PV="${PV/_/-}"
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.xz"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
-IUSE="cpu_flags_x86_sse2 dbus nls test"
-RESTRICT="!test? ( test )"
-
-# pugixml 1.7 minimal dependency is for c++11 proper configuration
-RDEPEND="
-	>=dev-libs/nettle-3.1:=
-	>=dev-db/sqlite-3.7
-	>=dev-libs/boost-1.76.0:=
-	>=dev-libs/libfilezilla-0.47.0:=
-	>=dev-libs/pugixml-1.7
-	>=net-libs/gnutls-3.5.7
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	x11-misc/xdg-utils
-	dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cppunit-1.13.0 )"
-BDEPEND="
-	virtual/pkgconfig
-	>=dev-build/libtool-1.4
-	nls? ( >=sys-devel/gettext-0.11 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.22.1-debug.patch
-	"${FILESDIR}"/${PN}-3.47.0-metainfo.patch
-	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
-	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
-	"${FILESDIR}"/${PN}-3.60.1-desktop.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use x86 && ! use cpu_flags_x86_sse2; then
-		append-cppflags -D_FORCE_SOFTWARE_SHA
-	fi
-	setup-wxwidgets
-
-	local myeconfargs=(
-		--disable-autoupdatecheck
-		--with-pugixml=system
-		$(use_enable nls locales)
-		$(use_with dbus)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# no static archives
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-ftp/filezilla/filezilla-3.67.0-r1.ebuild b/net-ftp/filezilla/filezilla-3.68.1.ebuild
index bdff3eaada9e..ca0e779d039d 100644
--- a/net-ftp/filezilla/filezilla-3.67.0-r1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.68.1.ebuild
@@ -12,7 +12,9 @@ MY_P="FileZilla_${MY_PV}"
 
 DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
 HOMEPAGE="https://filezilla-project.org/"
-SRC_URI="https://download.filezilla-project.org/client/${MY_P}_src.tar.xz"
+# Broken URL behind CDN
+SRC_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}/${MY_P}_src.tar.xz"
+
 S="${WORKDIR}/${PN}-${MY_PV}"
 
 LICENSE="GPL-2"
@@ -26,7 +28,7 @@ RDEPEND="
 	>=dev-libs/nettle-3.1:=
 	>=dev-db/sqlite-3.7
 	>=dev-libs/boost-1.76.0:=
-	>=dev-libs/libfilezilla-0.47.0:=
+	>=dev-libs/libfilezilla-0.49.0:=
 	>=dev-libs/pugixml-1.7
 	>=net-libs/gnutls-3.5.7
 	x11-libs/wxGTK:${WX_GTK_VER}[X]
@@ -45,8 +47,6 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-3.47.0-disable-shellext_conf.patch
 	"${FILESDIR}"/${PN}-3.52.2-slibtool.patch
 	"${FILESDIR}"/${PN}-3.60.1-desktop.patch
-	# backport patch for ODR
-	"${FILESDIR}"/filezilla-3.67.0-odr.patch
 )
 
 src_prepare() {