megacmd: update to 2.1.1

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: megacmd: update to 2.1.1
From: kikadf (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Thu, 17 Apr 2025 10:08:20 +0000
Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Thu Apr 17 11:28:05 2025 +0200
Changeset:	a8904c7c0d7d3e21d79de1eb256a2612c4978e83

Modified Files:
	megacmd/Makefile
	megacmd/PLIST
	megacmd/distinfo
	megacmd/patches/patch-sdk_src_posix_fs.cpp
Added Files:
	megacmd/TODO

Log Message:
megacmd: update to 2.1.1

Crash when syncing

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a8904c7c0d7d3e21d79de1eb256a2612c4978e83

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 megacmd/Makefile                           |  8 +++++---
 megacmd/PLIST                              |  9 ++++++++-
 megacmd/TODO                               |  4 ++++
 megacmd/distinfo                           | 14 +++++++-------
 megacmd/patches/patch-sdk_src_posix_fs.cpp | 30 +++++++++++++++---------------
 5 files changed, 39 insertions(+), 26 deletions(-)

diffs:
diff --git a/megacmd/Makefile b/megacmd/Makefile
index 465d5e20bc..70d3e00a43 100644
--- a/megacmd/Makefile
+++ b/megacmd/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.10 2025/02/15 07:40:13 wiz Exp $
 
-DISTNAME=	megacmd-2.0.0
+DISTNAME=	megacmd-2.1.1
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=meganz/}
 GITHUB_PROJECT=	MEGAcmd
 GITHUB_TAG=	${PKGVERSION_NOREV}_Linux
-SDK_VERSION=	v8.3.1
+SDK_VERSION=	v9.1.1
 
 GITHUB_SUBMODULES=	meganz sdk ${SDK_VERSION} sdk
 
@@ -23,7 +23,8 @@ FORCE_CXX_STD=		c++17
 USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
 REPLACE_SH=		src/client/mega-*
-CXXFLAGS+=		-DCRYPTOPP_DISABLE_ASM
+CXXFLAGS+=		-DCRYPTOPP_DISABLE_ASM -ggdb
+INSTALL_UNSTRIPPED=	yes
 
 CMAKE_CONFIGURE_ARGS+=	-DCMAKE_BUILD_TYPE=Release
 CMAKE_CONFIGURE_ARGS+=	-DFULL_REQS=OFF
@@ -31,6 +32,7 @@ CMAKE_CONFIGURE_ARGS+=	-DUSE_MEDIAINFO=OFF
 CMAKE_CONFIGURE_ARGS+=	-DUSE_FREEIMAGE=OFF
 CMAKE_CONFIGURE_ARGS+=	-DUSE_FFMPEG=OFF
 CMAKE_CONFIGURE_ARGS+=	-DUSE_PDFIUM=OFF
+CMAKE_CONFIGURE_ARGS+=	-DWITH_FUSE=OFF
 
 CHECK_PORTABILITY_SKIP+=	sdk/bindings/ios/3rdparty/*.sh
 
diff --git a/megacmd/PLIST b/megacmd/PLIST
index 9807eacf79..2c5906a67e 100644
--- a/megacmd/PLIST
+++ b/megacmd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2025/02/15 07:40:13 wiz Exp $
+@comment $NetBSD$
 bin/mega-attr
 bin/mega-backup
 bin/mega-cancel
@@ -19,6 +19,12 @@ bin/mega-exec
 bin/mega-export
 bin/mega-find
 bin/mega-ftp
+bin/mega-fuse-add
+bin/mega-fuse-config
+bin/mega-fuse-disable
+bin/mega-fuse-enable
+bin/mega-fuse-remove
+bin/mega-fuse-show
 bin/mega-get
 bin/mega-graphics
 bin/mega-help
@@ -52,6 +58,7 @@ bin/mega-showpcr
 bin/mega-signup
 bin/mega-speedlimit
 bin/mega-sync
+bin/mega-sync-config
 bin/mega-sync-ignore
 bin/mega-sync-issues
 bin/mega-thumbnail
diff --git a/megacmd/TODO b/megacmd/TODO
new file mode 100644
index 0000000000..6bb1277319
--- /dev/null
+++ b/megacmd/TODO
@@ -0,0 +1,4 @@
+/usr/pkgsrc/wip/megacmd/work/MEGAcmd-2.1.1_Linux/sdk/src/posix/fs.cpp: In member function 'virtual bool mega::PosixFileSystemAccess::getlocalfstype(const mega::LocalPath&, mega::FileSystemType&) const':
+/usr/pkgsrc/wip/megacmd/work/MEGAcmd-2.1.1_Linux/sdk/src/posix/fs.cpp:2485:61: warning: unused parameter 'path' [-Wunused-parameter]
+ 2485 | bool PosixFileSystemAccess::getlocalfstype(const LocalPath& path, FileSystemType& type) const
+      |                                            ~~~~~~~~~~~~~~~~~^~~~
diff --git a/megacmd/distinfo b/megacmd/distinfo
index 61be5c08cf..c668e8ff16 100644
--- a/megacmd/distinfo
+++ b/megacmd/distinfo
@@ -1,17 +1,17 @@
 $NetBSD: distinfo,v 1.3 2025/02/15 07:40:13 wiz Exp $
 
-BLAKE2s (megacmd-2.0.0.tar.gz) = 46f5f94b6cb1af5dbdb8afb595608f88a14727f33c7aea46a0604fb8c3037b86
-SHA512 (megacmd-2.0.0.tar.gz) = a0ff37c33de492f0751d27f46bd83f506314f43985a247e1fe0de7683f3a8bfc059d05441816147acbda95b349b4d39e56cdac5f3893b697cda4f77efb197ce4
-Size (megacmd-2.0.0.tar.gz) = 2104772 bytes
-BLAKE2s (meganz-sdk-v8.3.1.tar.gz) = 4851001b7556d6a25f6d39e1e082e057b877cf68b55e85eba5b30486f1a0559c
-SHA512 (meganz-sdk-v8.3.1.tar.gz) = d80c7aa7a27f9f56405cd0bb5943135d6fb3590196c1a8f74b41ad3e94dc7704fe905342d6bdd431fc80e38eac74b0d8b11d8b8802b2c868931d0d11bb78f883
-Size (meganz-sdk-v8.3.1.tar.gz) = 4061833 bytes
+BLAKE2s (megacmd-2.1.1.tar.gz) = 493c50974e425b54d952dea2f066b10d8d4dec13721b52808c7cba36074eac5d
+SHA512 (megacmd-2.1.1.tar.gz) = 5b510cca8a1cc8480aa759856ca6f4af5a81967f34b05a03af66334a0004ebe295f7825b3d560d86371f71a57ab60952b3dc8b020480a47b35fee2ec781962bc
+Size (megacmd-2.1.1.tar.gz) = 2087992 bytes
+BLAKE2s (meganz-sdk-v9.1.1.tar.gz) = 3923b242bae105806d10959978ff58a0c0db9e494a1ce04bc59a5bb6cf5946cf
+SHA512 (meganz-sdk-v9.1.1.tar.gz) = bb39b0c5d35caeeed70f373fc9b94dd19b995931d4ba843f1d45a28525a4d4ab681c7d5f992f4e0eb4506a44303fcc771c4e31b216edc0b97b5692bd466b0021
+Size (meganz-sdk-v9.1.1.tar.gz) = 4151889 bytes
 SHA1 (patch-CMakeLists.txt) = f8936fbcd4200139fec6ada0bad5644ddb54145b
 SHA1 (patch-build_cmake_modules_megacmd__libraries.cmake) = afabd22177c0437fbe1d13fdf6601832bc60cd96
 SHA1 (patch-sdk_cmake_modules_sdklib__libraries.cmake) = 67c919b57515659075ea43e26e349d9a94180a8c
 SHA1 (patch-sdk_cmake_modules_sdklib__target.cmake) = 33f5b16dc561e37f076c60fa537a4c5b8d8c992e
 SHA1 (patch-sdk_include_mega_posix_megafs.h) = b266e3a568925df3227387e16e1cb9f6670d9b4a
-SHA1 (patch-sdk_src_posix_fs.cpp) = 90d71c411c8fd733b9fdef288880fb9d74d12fed
+SHA1 (patch-sdk_src_posix_fs.cpp) = 94a4d050f11e60e088b55603e9e9a9365f078a83
 SHA1 (patch-src_megacmdcommonutils.cpp) = 6128e295e1a816ad4d7ea1ec59fa963391eb3bfb
 SHA1 (patch-src_megacmdcommonutils.h) = 194d991a02e8e48c9c31c60384549c276e4ee735
 SHA1 (patch-src_megacmdshell_megacmdshellcommunications.cpp) = ff794d128ffa6e0626296a504b22f391e0fc923b
diff --git a/megacmd/patches/patch-sdk_src_posix_fs.cpp b/megacmd/patches/patch-sdk_src_posix_fs.cpp
index 142a3deee5..993b3ca221 100644
--- a/megacmd/patches/patch-sdk_src_posix_fs.cpp
+++ b/megacmd/patches/patch-sdk_src_posix_fs.cpp
@@ -5,7 +5,7 @@ $NetBSD: patch-sdk_src_posix_fs.cpp,v 1.3 2025/02/15 07:40:14 wiz Exp $
 * O_NOATIME not available on BSDs
 * BSDs use LinuxFileSystemAccess
 
---- sdk/src/posix/fs.cpp.orig	2025-01-24 13:56:57.000000000 +0100
+--- sdk/src/posix/fs.cpp.orig	2025-04-02 09:16:59.000000000 +0200
 +++ sdk/src/posix/fs.cpp
 @@ -22,7 +22,8 @@
   * You should have received a copy of the license along with this
@@ -27,7 +27,7 @@ $NetBSD: patch-sdk_src_posix_fs.cpp,v 1.3 2025/02/15 07:40:14 wiz Exp $
  #include <sys/types.h>
  #include <sys/utsname.h>
  #ifdef TARGET_OS_MAC
-@@ -818,7 +822,8 @@ PosixFileSystemAccess::PosixFileSystemAc
+@@ -821,7 +825,8 @@ PosixFileSystemAccess::PosixFileSystemAc
      defaultfolderpermissions = 0700;
  }
  
@@ -37,7 +37,7 @@ $NetBSD: patch-sdk_src_posix_fs.cpp,v 1.3 2025/02/15 07:40:14 wiz Exp $
  #ifdef ENABLE_SYNC
  
  bool LinuxFileSystemAccess::initFilesystemNotificationSystem()
-@@ -878,7 +883,8 @@ bool PosixFileSystemAccess::cwd_static(L
+@@ -881,7 +886,8 @@ bool PosixFileSystemAccess::cwd_static(L
  
  // wake up from filesystem updates
  
@@ -47,7 +47,7 @@ $NetBSD: patch-sdk_src_posix_fs.cpp,v 1.3 2025/02/15 07:40:14 wiz Exp $
  void LinuxFileSystemAccess::addevents([[maybe_unused]] Waiter* waiter, int /*flags*/)
  {
  #ifdef ENABLE_SYNC
-@@ -1637,7 +1643,8 @@ void PosixFileSystemAccess::statsid(stri
+@@ -1640,7 +1646,8 @@ void PosixFileSystemAccess::statsid(stri
  }
  
  #if defined(ENABLE_SYNC)
@@ -57,7 +57,7 @@ $NetBSD: patch-sdk_src_posix_fs.cpp,v 1.3 2025/02/15 07:40:14 wiz Exp $
  
  LinuxDirNotify::LinuxDirNotify(LinuxFileSystemAccess& owner,
                                 LocalNode& /*root*/,
-@@ -1802,8 +1809,8 @@ private:
+@@ -1805,8 +1812,8 @@ private:
      // open with O_NOATIME if possible
      int open(const char *path)
      {
@@ -68,7 +68,7 @@ $NetBSD: patch-sdk_src_posix_fs.cpp,v 1.3 2025/02/15 07:40:14 wiz Exp $
          int fd = ::open(path, O_RDONLY) ;
  #else
          // for sync in particular, try to open without setting access-time
-@@ -2062,6 +2069,7 @@ ScanResult PosixFileSystemAccess::direct
+@@ -2065,6 +2072,7 @@ ScanResult PosixFileSystemAccess::direct
  }
  
  #ifndef __APPLE__
@@ -76,7 +76,7 @@ $NetBSD: patch-sdk_src_posix_fs.cpp,v 1.3 2025/02/15 07:40:14 wiz Exp $
  
  // Determine which device contains the specified path.
  static std::string deviceOf(const std::string& database,
-@@ -2230,6 +2238,7 @@ static std::string deviceOf(const std::s
+@@ -2233,6 +2241,7 @@ static std::string deviceOf(const std::s
      // No database has a mapping for this path.
      return std::string();
  }
@@ -84,7 +84,7 @@ $NetBSD: patch-sdk_src_posix_fs.cpp,v 1.3 2025/02/15 07:40:14 wiz Exp $
  
  // Compute legacy filesystem fingerprint.
  static std::uint64_t fingerprintOf(const std::string& path)
-@@ -2258,6 +2267,7 @@ static std::uint64_t fingerprintOf(const
+@@ -2261,6 +2270,7 @@ static std::uint64_t fingerprintOf(const
      return ++value;
  }
  
@@ -92,7 +92,7 @@ $NetBSD: patch-sdk_src_posix_fs.cpp,v 1.3 2025/02/15 07:40:14 wiz Exp $
  // Determine the UUID of the specified device.
  static std::string uuidOf(const std::string& device)
  {
-@@ -2334,6 +2344,7 @@ static std::string uuidOf(const std::str
+@@ -2337,6 +2347,7 @@ static std::string uuidOf(const std::str
      // Couldn't determine device's UUID.
      return std::string();
  }
@@ -100,7 +100,7 @@ $NetBSD: patch-sdk_src_posix_fs.cpp,v 1.3 2025/02/15 07:40:14 wiz Exp $
  
  fsfp_t FileSystemAccess::fsFingerprint(const LocalPath& path) const
  {
-@@ -2344,6 +2355,7 @@ fsfp_t FileSystemAccess::fsFingerprint(c
+@@ -2347,6 +2358,7 @@ fsfp_t FileSystemAccess::fsFingerprint(c
      if (!fingerprint)
          return fsfp_t();
  
@@ -109,15 +109,15 @@ $NetBSD: patch-sdk_src_posix_fs.cpp,v 1.3 2025/02/15 07:40:14 wiz Exp $
      auto device = deviceOf(path.localpath);
  
 @@ -2360,6 +2372,7 @@ fsfp_t FileSystemAccess::fsFingerprint(c
- 
-     LOG_warn << "Falling back to legacy filesystem fingerprint: "
-              << path;
+         if (!uuid.empty())
+             return fsfp_t(fingerprint, std::move(uuid));
+     }
 +#endif
  
      // Couldn't determine filesystem UUID.
      return fsfp_t(fingerprint, std::string());
-@@ -2419,7 +2432,8 @@ unique_ptr<DirAccess>  PosixFileSystemAc
-     return unique_ptr<DirAccess>(new PosixDirAccess());
+@@ -2443,7 +2456,8 @@ unique_ptr<DirAccess>  PosixFileSystemAc
+ #endif
  }
  
 -#ifdef __linux__
Prev by Date: powerdns-recursor52: Version upgrade to 5.2.2
Next by Date: megacmd: import from pkgsrc
Previous by Thread: powerdns-recursor52: Version upgrade to 5.2.2
Next by Thread: megacmd: import from pkgsrc
Indexes:
Home | Main Index | Thread Index | Old Index