update to 3.46.3 [release 3.46.3-1mamba;Mon Apr 13 2020]
This commit is contained in:
parent
c1d35b5c9a
commit
78f2654dac
10
FileZilla-3.46.3-build-add-missing-cassert-include.patch
Normal file
10
FileZilla-3.46.3-build-add-missing-cassert-include.patch
Normal file
@ -0,0 +1,10 @@
|
||||
--- filezilla-3.46.3.orig/src/engine/filezilla.h 2019-06-07 05:30:05.000000000 +0200
|
||||
+++ filezilla-3.46.3/src/engine/filezilla.h 2020-04-14 11:54:33.313000000 +0200
|
||||
@@ -1,6 +1,7 @@
|
||||
#include "libfilezilla_engine.h"
|
||||
|
||||
#include <libfilezilla/translate.hpp>
|
||||
+#include <cassert>
|
||||
|
||||
#ifdef _
|
||||
#undef _
|
||||
22
FileZilla-3.46.3-libfilezilla-0.20.2.patch
Normal file
22
FileZilla-3.46.3-libfilezilla-0.20.2.patch
Normal file
@ -0,0 +1,22 @@
|
||||
--- filezilla-3.46.3/src/interface/xmlfunctions.cpp.orig 2020-08-13 19:02:02.277000000 +0200
|
||||
+++ filezilla-3.46.3/src/interface/xmlfunctions.cpp 2020-08-13 19:02:15.226000000 +0200
|
||||
@@ -344,7 +344,7 @@
|
||||
std::wstring encoding = GetTextAttribute(passElement, "encoding");
|
||||
|
||||
if (encoding == _T("base64")) {
|
||||
- std::string decoded = fz::base64_decode(passElement.child_value());
|
||||
+ std::string decoded = fz::base64_decode_s(passElement.child_value());
|
||||
pass = fz::to_wstring_from_utf8(decoded);
|
||||
}
|
||||
else if (encoding == _T("crypt")) {
|
||||
--- filezilla-3.46.3/src/interface/wxfilesystem_blob_handler.cpp.orig 2020-08-13 19:01:27.818000000 +0200
|
||||
+++ filezilla-3.46.3/src/interface/wxfilesystem_blob_handler.cpp 2020-08-13 19:00:14.175000000 +0200
|
||||
@@ -46,7 +46,7 @@
|
||||
}
|
||||
else if (pos == 6) {
|
||||
// base64
|
||||
- std::string data = fz::base64_decode(fz::to_utf8(location.Mid(pos + 1)));
|
||||
+ std::string data = fz::base64_decode_s(fz::to_utf8(location.Mid(pos + 1)));
|
||||
if (!data.empty()) {
|
||||
buf = static_cast<unsigned char*>(malloc(data.size()));
|
||||
if (buf) {
|
||||
@ -1,5 +1,5 @@
|
||||
Name: FileZilla
|
||||
Version: 3.15.0.1
|
||||
Version: 3.46.3
|
||||
Release: 1mamba
|
||||
Summary: FTP, FTPS and SFTP client
|
||||
Group: Graphical Desktop/Applications/Networking
|
||||
@ -7,11 +7,14 @@ Vendor: openmamba
|
||||
Distribution: openmamba
|
||||
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
|
||||
URL: http://filezilla-project.org/
|
||||
Source0: http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/%{version}/FileZilla_%{version}_src.tar.bz2
|
||||
Source0: https://download.filezilla-project.org/client/FileZilla_%{version}_src.tar.bz2
|
||||
Source1: filezilapng.tar.gz
|
||||
Patch0: FileZilla-3.46.3-build-add-missing-cassert-include.patch
|
||||
Patch1: FileZilla-3.46.3-libfilezilla-0.20.2.patch
|
||||
License: GPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
BuildRequires: ldconfig
|
||||
BuildRequires: libatk-devel
|
||||
BuildRequires: libcairo-devel
|
||||
BuildRequires: libdbus-devel
|
||||
@ -19,13 +22,14 @@ BuildRequires: libfilezilla-devel
|
||||
BuildRequires: libgcc
|
||||
BuildRequires: libgdk-pixbuf-devel
|
||||
BuildRequires: libglib-devel
|
||||
BuildRequires: libgnutls-devel
|
||||
BuildRequires: libgtk-devel
|
||||
BuildRequires: libharfbuzz-devel
|
||||
BuildRequires: libnettle-devel
|
||||
BuildRequires: libpango-devel
|
||||
BuildRequires: libsqlite-devel
|
||||
BuildRequires: libstdc++6-devel
|
||||
BuildRequires: libwx_baseu-devel
|
||||
BuildRequires: libwx_gtk3u-devel
|
||||
BuildRequires: libwx_baseu30-devel
|
||||
BuildRequires: libwx_gtk3u30-devel
|
||||
BuildRequires: pugixml-devel
|
||||
## AUTOBUILDREQ-END
|
||||
BuildRequires: automake
|
||||
@ -49,8 +53,12 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
- Filename filters
|
||||
- Network configuration wizard
|
||||
|
||||
%debug_package
|
||||
|
||||
%prep
|
||||
%setup -q -n filezilla-%{version}
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
%configure \
|
||||
@ -59,10 +67,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
||||
--disable-manualupdatecheck \
|
||||
--with-tinyxml=system \
|
||||
--disable-autoupdatecheck \
|
||||
--with-wx-config=wx-config-unicode-3 \
|
||||
--with-wx-config=wx-config-unicode-30 \
|
||||
CXXFLAGS="%{optflags} -I."
|
||||
|
||||
%make -j1
|
||||
%make
|
||||
|
||||
%install
|
||||
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
|
||||
@ -81,12 +89,14 @@ touch --no-create %{_datadir}/icons/hicolor
|
||||
if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
||||
/usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
|
||||
fi
|
||||
:
|
||||
|
||||
%postun
|
||||
touch --no-create %{_datadir}/icons/hicolor
|
||||
if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
||||
/usr/bin/gtk-update-icon-cache -q %{_datadir}/icons/hicolor;
|
||||
fi
|
||||
:
|
||||
|
||||
%files -f filezilla.lang
|
||||
%defattr(-,root,root)
|
||||
@ -101,12 +111,15 @@ fi
|
||||
%dir %{_datadir}/filezilla
|
||||
%{_datadir}/filezilla/docs
|
||||
%{_datadir}/filezilla/resources
|
||||
%{_mandir}/man1/*.1.gz
|
||||
%{_mandir}/man5/fzdefaults.xml.5.gz
|
||||
%{_mandir}/man1/*.1*
|
||||
%{_mandir}/man5/fzdefaults.xml.5*
|
||||
%doc AUTHORS COPYING
|
||||
#ChangeLog NEWS README
|
||||
|
||||
%changelog
|
||||
* Mon Apr 13 2020 Silvan Calarco <silvan.calarco@mambasoft.it> 3.46.3-1mamba
|
||||
- update to 3.46.3
|
||||
|
||||
* Tue Feb 02 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 3.15.0.1-1mamba
|
||||
- update to 3.15.0.1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user