<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/beee2d72d666a20bf0689be548d8994d3901ce45">https://github.com/macports/macports-ports/commit/beee2d72d666a20bf0689be548d8994d3901ce45</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit beee2d72d666a20bf0689be548d8994d3901ce45
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sat Nov 2 10:11:39 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> FileZilla: update to 3.68.0
</span>---
www/FileZilla/Portfile | 24 +++---
www/FileZilla/files/patch-cloexec.diff | 88 ----------------------
www/FileZilla/files/patch-fix-mac-wxgtk.diff | 15 ++++
.../files/patch-relax-wxwidgets-version.diff | 12 +++
4 files changed, 36 insertions(+), 103 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/FileZilla/Portfile b/www/FileZilla/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 14c78e8b4b2..ca4e72f0289 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/FileZilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/FileZilla/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,10 +6,10 @@ PortGroup legacysupport 1.1
</span> PortGroup wxWidgets 1.0
# LegacySupport only used for providing wrappers here.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-legacysupport.newest_darwin_requires_legacy 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+legacysupport.newest_darwin_requires_legacy 10
</span>
name FileZilla
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.67.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.68.0
</span> revision 0
categories www net aqua
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +35,9 @@ master_sites https://deb.debian.org/debian/pool/main/f/filezilla/
</span> use_xz yes
distname filezilla_${version}.orig
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 06fb47a8f3cf23914c1015ad6edeff94dea1f2a2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 10468e6ef623ad9789996df61f588ca7417d39353678313611d54f2d8131a1db \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 4065540
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8e4c67ddd1ac6ce04b2df48111ab481fa3711866 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 dc559b1fce98d996b49a4e8528d61da2a1cd360cf64c134b14f15848d414c356 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 4106812
</span>
# FileZilla 3.67 dropped support for wxWidgets < 3.2.1.
# However, wxWidgets-3.2 does not build on < 10.11,
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,11 +68,12 @@ if {${wxWidgets.version} < 3.2} {
</span> patch-wx3.0.diff
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Build files are generated with older autotools,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and the build fails to find automake 1.16 now.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span> port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool \
</span> path:bin/pkg-config:pkgconfig
depends_lib-append port:dbus \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -106,13 +107,6 @@ platform darwin {
</span> # for linking on macOS, whether or not app bundle is built.
patchfiles-append \
patch-fix-mac-wxgtk.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # O_CLOEXEC was added in Mac OS X 10.7. Only apply this patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # on system versions which need it because it could create
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # a race condition in multi-threaded applications.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-cloexec.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
# http://trac.filezilla-project.org/ticket/5473
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/FileZilla/files/patch-cloexec.diff b/www/FileZilla/files/patch-cloexec.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b3308089a82..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/FileZilla/files/patch-cloexec.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,88 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-O_CLOEXEC was added in Mac OS X 10.7.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Revert to fcntl() to set the CLOEXEC flag for older system versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/commonui/ipcmutex.cpp.orig 2021-03-19 14:29:09.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/commonui/ipcmutex.cpp 2023-03-25 19:31:11.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,7 +42,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fz::scoped_lock lock{private_mutex};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fn = lockfile_path + L"lockfile";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_fd = open(fz::to_native(fn).c_str(), O_CREAT | O_RDWR | O_CLOEXEC, 0644);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_fd = open(fz::to_native(fn).c_str(), O_CREAT | O_RDWR, 0644);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fcntl(m_fd, F_SETFD, FD_CLOEXEC);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --m_instanceCount;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/engine/logging.cpp.orig 2020-06-18 16:06:46.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/engine/logging.cpp 2023-03-25 19:26:47.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,8 +108,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (m_log_fd == INVALID_HANDLE_VALUE) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DWORD err = GetLastError();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_log_fd = open(m_file.c_str(), O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0644);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (m_log_fd == -1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_log_fd = open(m_file.c_str(), O_WRONLY | O_APPEND | O_CREAT, 0644);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (m_log_fd != -1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fcntl(m_log_fd, F_SETFD, FD_CLOEXEC);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int err = errno;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- l.unlock(); //Avoid recursion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -272,7 +274,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while ((rc = fcntl(m_log_fd, F_SETLKW, &lock)) == -1 && errno == EINTR);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Ignore any other failures
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int fd = open(m_file.c_str(), O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0644);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int fd = open(m_file.c_str(), O_WRONLY | O_APPEND | O_CREAT, 0644);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fd == -1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int err = errno;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -283,6 +285,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- log(logmsg::error, _("Could not open log file: %s"), GetSystemErrorDescription(err));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fcntl(fd, F_SETFD, FD_CLOEXEC);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct stat buf2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rc = fstat(fd, &buf2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -302,13 +305,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- close(fd);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Get the new file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_log_fd = open(m_file.c_str(), O_WRONLY | O_APPEND | O_CREAT | O_CLOEXEC, 0644);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_log_fd = open(m_file.c_str(), O_WRONLY | O_APPEND | O_CREAT, 0644);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (m_log_fd == -1) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int err = errno;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- l.unlock(); // Avoid recursion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- log(logmsg::error, _("Could not open log file: %s"), GetSystemErrorDescription(err));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fcntl(m_log_fd, F_SETFD, FD_CLOEXEC);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!rc) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Rename didn't fail
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./src/interface/edithandler.cpp.orig 2022-04-21 05:30:03.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./src/interface/edithandler.cpp 2023-03-25 19:58:15.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -143,8 +143,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- std::wstring const lockfile = temp + L"fz3temp-lockfile";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (wxFileName::FileExists(lockfile)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef __WXMSW__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int fd = open(fz::to_string(lockfile).c_str(), O_RDWR | O_CLOEXEC, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int fd = open(fz::to_string(lockfile).c_str(), O_RDWR, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fd >= 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fcntl(fd, F_SETFD, FD_CLOEXEC);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Try to lock 1 byte region in the lockfile. m_type specifies the byte to lock.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct flock f = {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f.l_type = F_WRLCK;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -234,8 +235,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- auto file = fz::to_native(m_localDir) + "fz3temp-lockfile";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m_lockfile_descriptor = open(file.c_str(), O_CREAT | O_RDWR | O_CLOEXEC, 0600);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m_lockfile_descriptor = open(file.c_str(), O_CREAT | O_RDWR, 0600);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (m_lockfile_descriptor >= 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fcntl(m_lockfile_descriptor, F_SETFD, FD_CLOEXEC);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Lock 1 byte region in the lockfile.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- struct flock f = {};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f.l_type = F_WRLCK;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/FileZilla/files/patch-fix-mac-wxgtk.diff b/www/FileZilla/files/patch-fix-mac-wxgtk.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b181c6eeea0..6902ab74ee9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/FileZilla/files/patch-fix-mac-wxgtk.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/FileZilla/files/patch-fix-mac-wxgtk.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,6 +2,9 @@ We do not want a bundle with wxGTK in this case.
</span> (It might be possible to still build this as a bundle,
but it will require more patches to the sources. No need.)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+Patch both configure and configure.ac, otherwise if we need
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+to switch, the build breaks.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --- configure 2024-04-16 02:20:29.000000000 +0800
+++ configure 2024-04-27 22:26:10.000000000 +0800
@@ -21311,7 +21311,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,6 +17,18 @@ but it will require more patches to the sources. No need.)
</span> else
macappbundle="no"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac 2024-04-16 02:20:29.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2024-11-02 09:40:58.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -393,7 +393,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ------------------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Create application bundle on OS X
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "$mac" = "1"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if echo $WX_CPPFLAGS | grep __WXMAC__ > /dev/null 2>&1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macappbundle="yes"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ macappbundle="no"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --- src/commonui/Makefile.am 2023-05-10 16:01:51.000000000 +0800
+++ src/commonui/Makefile.am 2024-04-24 09:31:15.000000000 +0800
@@ -65,8 +65,6 @@
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/FileZilla/files/patch-relax-wxwidgets-version.diff b/www/FileZilla/files/patch-relax-wxwidgets-version.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dc0aeda2983..fe0e10ea172 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/FileZilla/files/patch-relax-wxwidgets-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/FileZilla/files/patch-relax-wxwidgets-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,3 +11,15 @@ Until wxWidgets 3.2.x is fixed for older macOS, this is unavoidable.
</span>
if test x${WX_CONFIG_NAME+set} != xset ; then
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac 2024-07-10 21:21:38.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2024-10-29 02:39:18.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -199,7 +199,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_OPTIONS_WXCONFIG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- MIN_WX_VERSION="3.2.1" # Do not downgrade this. wx 3.2.0 and older have too many known and fixed bugs affecting FileZilla.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ MIN_WX_VERSION="3.0.4" # Do not downgrade this. wx 3.0.3 and older have too many known and fixed bugs affecting FileZilla.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_PATH_WXCONFIG([$MIN_WX_VERSION], [wxWin=1], , [aui,xrc,adv,core,xml,base], [--unicode=yes --universal=no])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "$wxWin" != 1; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_MSG_ERROR([
</span></pre><pre style='margin:0'>
</pre>