Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 30 Dec 2024 08:59:51 GMT
From:      Kurt Jaeger <pi@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 24d0fe9dc3b1 - main - ftp/{lib}filezilla: update libfilezilla 0.47.0 -> 0.49.0, filezilla 3.67.0 -> 3.68.1
Message-ID:  <202412300859.4BU8xpCc095092@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by pi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=24d0fe9dc3b17ae496c4733e34efabad71bedcce

commit 24d0fe9dc3b17ae496c4733e34efabad71bedcce
Author:     Martin Neubauer <m.ne@gmx.net>
AuthorDate: 2024-12-30 08:52:13 +0000
Commit:     Kurt Jaeger <pi@FreeBSD.org>
CommitDate: 2024-12-30 08:58:43 +0000

    ftp/{lib}filezilla: update libfilezilla 0.47.0 -> 0.49.0, filezilla 3.67.0 -> 3.68.1
    
    - Changed Downloads to LOCAL/pi because of new download obfuscation upstream
    
    PR:             283371, 283373, 283374
    Author:         Martin Neubauer <m.ne@gmx.net>
    Date:           Mon Dec 30 09:52:13 2024 +0100
    Changes:        https://lib.filezilla-project.org/
                    https://filezilla-project.org/versions.php#3.68.1
    Reported-by:    andy@neu.net, rhurlin
---
 ftp/filezilla/Makefile                             |  5 ++-
 ftp/filezilla/distinfo                             |  6 ++--
 ftp/filezilla/pkg-plist                            |  5 +--
 ftp/libfilezilla/Makefile                          |  4 +--
 ftp/libfilezilla/distinfo                          |  6 ++--
 .../files/extra-patch-lib_libfilezilla_string.hpp  | 42 ++++++++++++++++++++++
 ftp/libfilezilla/pkg-plist                         |  5 ++-
 7 files changed, 57 insertions(+), 16 deletions(-)

diff --git a/ftp/filezilla/Makefile b/ftp/filezilla/Makefile
index 788a11b6d34f..33a4166193b6 100644
--- a/ftp/filezilla/Makefile
+++ b/ftp/filezilla/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	filezilla
-PORTVERSION=	3.67.0
-PORTREVISION=	2
+PORTVERSION=	3.68.1
 CATEGORIES=	ftp
-MASTER_SITES=	https://download.filezilla-project.org/client/
+MASTER_SITES=	LOCAL/pi
 DISTNAME=	FileZilla_${PORTVERSION}_src
 
 MAINTAINER=	pi@FreeBSD.org
diff --git a/ftp/filezilla/distinfo b/ftp/filezilla/distinfo
index df2e87c95a85..76a5c324a93f 100644
--- a/ftp/filezilla/distinfo
+++ b/ftp/filezilla/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713539909
-SHA256 (FileZilla_3.67.0_src.tar.xz) = e5dadc807db999ceb464984f974d3ef59b562c59546658057e9b201183adaf9a
-SIZE (FileZilla_3.67.0_src.tar.xz) = 4058264
+TIMESTAMP = 1735511356
+SHA256 (FileZilla_3.68.1_src.tar.xz) = 9df9209e29564ad92bcdee4a8ebe0e07648ef473028cdbde160f3d0612517679
+SIZE (FileZilla_3.68.1_src.tar.xz) = 4105072
diff --git a/ftp/filezilla/pkg-plist b/ftp/filezilla/pkg-plist
index 8f4571784618..c97f722bafff 100644
--- a/ftp/filezilla/pkg-plist
+++ b/ftp/filezilla/pkg-plist
@@ -1,9 +1,9 @@
 bin/filezilla
 bin/fzputtygen
 bin/fzsftp
-lib/libfzclient-commonui-private-3.67.0.so
+lib/libfzclient-commonui-private-3.68.1.so
 lib/libfzclient-commonui-private.so
-lib/libfzclient-private-3.67.0.so
+lib/libfzclient-private-3.68.1.so
 lib/libfzclient-private.so
 share/man/man1/filezilla.1.gz
 share/man/man1/fzputtygen.1.gz
@@ -708,6 +708,7 @@ share/icons/hicolor/scalable/apps/filezilla.svg
 %%NLS%%share/locale/fa_IR/LC_MESSAGES/filezilla.mo
 %%NLS%%share/locale/fi_FI/LC_MESSAGES/filezilla.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/filezilla.mo
+%%NLS%%share/locale/ga/LC_MESSAGES/filezilla.mo
 %%NLS%%share/locale/gl_ES/LC_MESSAGES/filezilla.mo
 %%NLS%%share/locale/he_IL/LC_MESSAGES/filezilla.mo
 %%NLS%%share/locale/hr/LC_MESSAGES/filezilla.mo
diff --git a/ftp/libfilezilla/Makefile b/ftp/libfilezilla/Makefile
index 87306506b97f..d9377f7017af 100644
--- a/ftp/libfilezilla/Makefile
+++ b/ftp/libfilezilla/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libfilezilla
-PORTVERSION=	0.47.0
+PORTVERSION=	0.49.0
 CATEGORIES=	ftp
-MASTER_SITES=	https://download.filezilla-project.org/${PORTNAME}/
+MASTER_SITES=	LOCAL/pi
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	C++ library for building platform-independent programs
diff --git a/ftp/libfilezilla/distinfo b/ftp/libfilezilla/distinfo
index b142fd53f8af..863b83935204 100644
--- a/ftp/libfilezilla/distinfo
+++ b/ftp/libfilezilla/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713540004
-SHA256 (libfilezilla-0.47.0.tar.xz) = 618a586b613bef710a633c42bfdda61666cbb0fc8a92ad490361d0bc91c58341
-SIZE (libfilezilla-0.47.0.tar.xz) = 551484
+TIMESTAMP = 1735484885
+SHA256 (libfilezilla-0.49.0.tar.xz) = 79ff30e5124068c116c8dc8fc4581922afa2d3720f7b6bee9c8f8fe419617488
+SIZE (libfilezilla-0.49.0.tar.xz) = 554000
diff --git a/ftp/libfilezilla/files/extra-patch-lib_libfilezilla_string.hpp b/ftp/libfilezilla/files/extra-patch-lib_libfilezilla_string.hpp
new file mode 100644
index 000000000000..87880be3e807
--- /dev/null
+++ b/ftp/libfilezilla/files/extra-patch-lib_libfilezilla_string.hpp
@@ -0,0 +1,42 @@
+--- lib/libfilezilla/string.hpp.orig	2024-10-15 12:59:21 UTC
++++ lib/libfilezilla/string.hpp
+@@ -11,6 +11,39 @@
+ #include <string_view>
+ #include <vector>
+ 
++template<class CharT, class BaseT>
++class traits_cloner
++{
++public:
++	using char_type = CharT;
++
++	using base_type = BaseT;
++	using base_traits = std::char_traits<base_type>;
++
++	static std::size_t length(char_type const* s) {
++		return base_traits::length(reinterpret_cast<base_type const*>(s));
++	}
++	static int compare(char_type const* s1, char_type const* s2, std::size_t count) {
++		return base_traits::compare(reinterpret_cast<base_type const*>(s1), reinterpret_cast<base_type const*>(s2), count);
++	}
++	static char_type* copy(char_type* dest, char_type const* src, std::size_t count) {
++		return reinterpret_cast<char_type*>(base_traits::copy(reinterpret_cast<base_type*>(dest), reinterpret_cast<base_type const*>(src), count));
++	}
++	static void assign( char_type& c1, char_type const& c2 ) noexcept {
++	c1 = c2;
++	}
++	static char_type const* find(char_type const* ptr, std::size_t count, char_type const& ch) {
++		return reinterpret_cast<char_type const*>(base_traits::find(reinterpret_cast<base_type const*>(ptr), count, reinterpret_cast<base_type const&>(ch)));
++	}
++	static bool eq(char_type a, char_type b) {
++		return base_traits::eq(static_cast<base_type>(a), static_cast<base_type>(b));
++	}
++};
++
++template<>
++class std::char_traits<uint8_t> : public traits_cloner<uint8_t, char>
++{};
++
+ /** \file
+  * \brief String types and assorted functions.
+  *
diff --git a/ftp/libfilezilla/pkg-plist b/ftp/libfilezilla/pkg-plist
index 0aba8a734d84..7cebbcd4b688 100644
--- a/ftp/libfilezilla/pkg-plist
+++ b/ftp/libfilezilla/pkg-plist
@@ -60,10 +60,9 @@ include/libfilezilla/util.hpp
 include/libfilezilla/version.hpp
 include/libfilezilla/visibility_helper.hpp
 include/libfilezilla/xml.hpp
-lib/libfilezilla.a
 lib/libfilezilla.so
-lib/libfilezilla.so.43
-lib/libfilezilla.so.43.0.0
+lib/libfilezilla.so.46
+lib/libfilezilla.so.46.0.0
 libdata/pkgconfig/libfilezilla.pc
 share/locale/an/LC_MESSAGES/libfilezilla.mo
 share/locale/ar/LC_MESSAGES/libfilezilla.mo



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412300859.4BU8xpCc095092>