configure.ac | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 make configure only warn if xdg-open is not present.

src/Makefile.am | 10 2 + 8 - 0 !
1 file changed, 2 insertions(+), 8 deletions(-)

 add patch to not build fzshellext

src/interface/settings/optionspage_filetype.cpp | 3 3 + 0 - 0 !
1 file changed, 3 insertions(+)

---

src/putty/ssh.h | 1 1 + 0 - 0 !
src/putty/ssh2bpp.c | 12 10 + 2 - 0 !
src/putty/ssh2transport.c | 104 84 + 20 - 0 !
src/putty/ssh2transport.h | 2 2 + 0 - 0 !
src/putty/sshbpp.h | 6 4 + 2 - 0 !
src/putty/sshcommon.c | 7 7 + 0 - 0 !
6 files changed, 108 insertions(+), 24 deletions(-)

 cherry pick and modify upstream fix for cve-2023-48795.

Picked from upstream commits:

filezilla: https://svn.filezilla-project.org/filezilla?view=revision&revision=11047
filezilla: https://svn.filezilla-project.org/filezilla?view=revision&revision=11048
filezilla: https://svn.filezilla-project.org/filezilla?view=revision&revision=11049
filezilla: https://svn.filezilla-project.org/filezilla?view=revision&revision=11051