pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

net/megacmd: update to 1.7.0

Module Name:	pkgsrc-wip
Committed By:	kikadf <kikadf.01%gmail.com@localhost>
Pushed By:	kikadf
Date:		Fri May 24 18:03:19 2024 +0200
Changeset:	ea4dfceea20113f42ea6deaab436033db80bcdfc

Modified Files:
	megacmd/Makefile
	megacmd/PLIST
	megacmd/distinfo
	megacmd/patches/patch-Makefile.am
	megacmd/patches/patch-sdk_Makefile.am
	megacmd/patches/patch-sdk_configure.ac
	megacmd/patches/patch-sdk_src_http.cpp
	megacmd/patches/patch-sdk_src_posix_fs.cpp
	megacmd/patches/patch-src_include.am
Added Files:
	megacmd/patches/patch-configure.ac
	megacmd/patches/patch-sdk_include_mega_http.h
	megacmd/patches/patch-sdk_include_mega_posix_megafs.h
	megacmd/patches/patch-sdk_include_mega_posix_megasys.h
	megacmd/patches/patch-sdk_src_include.am
	megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications.cpp
Removed Files:
	megacmd/patches/patch-sdk_include_mega_http_h
	megacmd/patches/patch-sdk_include_mega_posix_megafs_h
	megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications_cpp

Log Message:
net/megacmd: update to 1.7.0

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

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                                      |   3 +-
 megacmd/distinfo                                   |  33 ++---
 megacmd/patches/patch-Makefile.am                  |  21 +--
 megacmd/patches/patch-configure.ac                 |  35 +++++
 megacmd/patches/patch-sdk_Makefile.am              |  21 +--
 megacmd/patches/patch-sdk_configure.ac             | 146 ++++++++++++++++++---
 megacmd/patches/patch-sdk_include_mega_http.h      |  13 ++
 megacmd/patches/patch-sdk_include_mega_http_h      |  16 ---
 .../patches/patch-sdk_include_mega_posix_megafs.h  |  13 ++
 .../patches/patch-sdk_include_mega_posix_megafs_h  |  16 ---
 .../patches/patch-sdk_include_mega_posix_megasys.h |  14 ++
 megacmd/patches/patch-sdk_src_http.cpp             |  14 +-
 megacmd/patches/patch-sdk_src_include.am           |  21 +++
 megacmd/patches/patch-sdk_src_posix_fs.cpp         |   6 +-
 megacmd/patches/patch-src_include.am               |  14 +-
 ...src_megacmdshell_megacmdshellcommunications.cpp |  13 ++
 ...src_megacmdshell_megacmdshellcommunications_cpp |  16 ---
 18 files changed, 305 insertions(+), 118 deletions(-)

diffs:
diff --git a/megacmd/Makefile b/megacmd/Makefile
index f859ece03b..16d5030eac 100644
--- a/megacmd/Makefile
+++ b/megacmd/Makefile
@@ -1,11 +1,11 @@
 # $NetBSD: Makefile,v 1.1 2024/03/11 07:49:12 wiz Exp $
 
-DISTNAME=	megacmd-1.6.3
+DISTNAME=	megacmd-1.7.0
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_GITHUB:=meganz/}
 GITHUB_PROJECT=	MEGAcmd
 GITHUB_TAG=	${PKGVERSION_NOREV}_Linux
-SDK_VERSION=	v4.17.1d
+SDK_VERSION=	v4.31.0b
 
 GITHUB_SUBMODULES=	meganz sdk ${SDK_VERSION} sdk
 
@@ -18,7 +18,7 @@ LICENSE=	gnu-gpl-v3 AND 2-clause-bsd
 USE_LANGUAGES+=		c c++
 USE_CXX_FEATURES+=	filesystem
 USE_LIBTOOL=		yes
-USE_TOOLS+=		autoreconf autoconf automake
+USE_TOOLS+=		autoreconf autoconf automake gmake
 GNU_CONFIGURE=		yes
 REPLACE_SH=		src/client/mega-*
 CXXFLAGS+=		-DCRYPTOPP_DISABLE_ASM -std=c++17
@@ -35,6 +35,7 @@ CONFIGURE_ARGS+=	--without-ffmpeg
 CONFIGURE_ARGS+=	--without-libraw
 CONFIGURE_ARGS+=	--without-libzen
 CONFIGURE_ARGS+=	--without-libmediainfo
+CONFIGURE_ARGS+=	--without-rt
 CONFIGURE_ARGS+=	--enable-gcc-hardening
 
 CHECK_PORTABILITY_SKIP+=	sdk/bindings/ios/3rdparty/*.sh
@@ -53,5 +54,6 @@ post-install:
 .include "../../net/libcares/buildlink3.mk"
 .include "../../security/crypto++/buildlink3.mk"
 .include "../../security/libsodium/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/megacmd/PLIST b/megacmd/PLIST
index 77e4709cc1..144262b064 100644
--- a/megacmd/PLIST
+++ b/megacmd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2024/03/11 07:49:12 wiz Exp $
+@comment $NetBSD$
 bin/mega-attr
 bin/mega-backup
 bin/mega-cancel
@@ -103,6 +103,7 @@ include/mega/posix/megafs.h
 include/mega/posix/meganet.h
 include/mega/posix/megasys.h
 include/mega/posix/megawaiter.h
+include/mega/process.h
 include/mega/proxy.h
 include/mega/pubkeyaction.h
 include/mega/raid.h
diff --git a/megacmd/distinfo b/megacmd/distinfo
index 98acb16405..aa1e62c92e 100644
--- a/megacmd/distinfo
+++ b/megacmd/distinfo
@@ -1,17 +1,20 @@
 $NetBSD: distinfo,v 1.1 2024/03/11 07:49:12 wiz Exp $
 
-BLAKE2s (megacmd-1.6.3.tar.gz) = c3df7a71184d4bc373e41273361e1a9818881d1b4b00ca4703fa1c199cd7093c
-SHA512 (megacmd-1.6.3.tar.gz) = 425584a1350e5965aea8a09076bb447b4d6a00fc0305e9a19ad91ed8292eae5b758e4c1a41ea7c0887c2f8e0644cf1d1154e3b33503ddcf4713e4a13dd80a6f6
-Size (megacmd-1.6.3.tar.gz) = 2085751 bytes
-BLAKE2s (meganz-sdk-v4.17.1d.tar.gz) = e3490a45338f2d1b62cbc607e80aa806906cc693ca8428b77973340bfba9ac39
-SHA512 (meganz-sdk-v4.17.1d.tar.gz) = bc67910b0a5fbbe9bb5d9d6ef9a746f1762dbb9968d9c825fd0ede256ab674670d804c2d99c9c472f72b2f06fd2bac4765bd7fa7dbebb3746cd1e1cfd780d71c
-Size (meganz-sdk-v4.17.1d.tar.gz) = 3695020 bytes
-SHA1 (patch-Makefile.am) = e6e092d8da00df3d2d73e542de61bea37336e9df
-SHA1 (patch-sdk_Makefile.am) = 8fedc590e7423e8a32d3cbe47b9503e8b197cf04
-SHA1 (patch-sdk_configure.ac) = 264edd914b05e24221a2fdd1c9890920f3f00521
-SHA1 (patch-sdk_include_mega_http_h) = 6d2acb2bdfe444d94c27ee523c9499f73f2fb5fe
-SHA1 (patch-sdk_include_mega_posix_megafs_h) = 69b099d0e8b5ac54c70808ec825d834d9edac2a9
-SHA1 (patch-sdk_src_http.cpp) = 23ebb74d092c27ed26c34c41c5a812a1ba835933
-SHA1 (patch-sdk_src_posix_fs.cpp) = a6e2b45e8e4740ae4eb362a11e165b7740daf7c2
-SHA1 (patch-src_include.am) = bd7f0899704b10e5c043ecd075adb750683f2272
-SHA1 (patch-src_megacmdshell_megacmdshellcommunications_cpp) = 99610633144ae5bcfcfbc52da43797c70ab9dd53
+BLAKE2s (megacmd-1.7.0.tar.gz) = 3b0008daa28b220ae909c491aebce7fd32a595607744acf7f7b0a6cef3a956c0
+SHA512 (megacmd-1.7.0.tar.gz) = 9e29a318d062a7d01d2a7e7e7655ef3adf079f2ff64c2eee3c035816821f9c981411f3676c8749a6fc51c44fad06a1428b1db0d6b61f32be5e222553bd9bb0dd
+Size (megacmd-1.7.0.tar.gz) = 2124305 bytes
+BLAKE2s (meganz-sdk-v4.31.0b.tar.gz) = ca471a7fc6fbcb3a5cea04aff2bfedcd77d33ca6cfd741f3954381f9bfc1af94
+SHA512 (meganz-sdk-v4.31.0b.tar.gz) = 525fbdb7bb4bb6e02cc0268a788f744258e41bb39e78c33c3ac1d21c54ad78a630775aa4440529cc3faa4c0679db0a72161f856c49e15d721487a748a0a08969
+Size (meganz-sdk-v4.31.0b.tar.gz) = 3592431 bytes
+SHA1 (patch-Makefile.am) = 4295c33db8d45efb832a127b8bfc499eef796c6f
+SHA1 (patch-configure.ac) = cd5949a20bf0d6f9116923d50364413ec321756e
+SHA1 (patch-sdk_Makefile.am) = e4e1967c0b32d97876d6521b9b4c1aa22c98f5b4
+SHA1 (patch-sdk_configure.ac) = c7b5d020b4562fcb4ca3e427665e14ad0a5dd6f7
+SHA1 (patch-sdk_include_mega_http.h) = 131d605db81b723a9e27ae9d73f34e8dac5e6512
+SHA1 (patch-sdk_include_mega_posix_megafs.h) = 9495689a2fd4b0d790c2853d5a1ebb42a55f083b
+SHA1 (patch-sdk_include_mega_posix_megasys.h) = fe66e9f3f49cc1fd2e023e11ad58a7709abc8da8
+SHA1 (patch-sdk_src_http.cpp) = ed22a97857f4cd5a092a0022745929ef9db1612c
+SHA1 (patch-sdk_src_include.am) = c07a81daafb7767a0c1c1b41e0cb37be30f52eaa
+SHA1 (patch-sdk_src_posix_fs.cpp) = 1fbf66ec3c5a84cc7bdedb1e19291433c26abec1
+SHA1 (patch-src_include.am) = 959fd2cff9c66816293842ad75805246281833c0
+SHA1 (patch-src_megacmdshell_megacmdshellcommunications.cpp) = 6ee5e623ec4b882fbb1c58042fc6207d5f02ab12
diff --git a/megacmd/patches/patch-Makefile.am b/megacmd/patches/patch-Makefile.am
index 6e9b37d42f..2e57f9807a 100644
--- a/megacmd/patches/patch-Makefile.am
+++ b/megacmd/patches/patch-Makefile.am
@@ -1,16 +1,19 @@
-$NetBSD: patch-Makefile.am,v 1.1 2024/03/11 07:49:12 wiz Exp $
+$NetBSD$
 
-* Add NetBSD support
-
---- Makefile.am.orig	2023-05-05 10:48:34.000000000 +0000
+--- Makefile.am.orig	2024-05-20 12:29:43.000000000 +0000
 +++ Makefile.am
-@@ -35,9 +35,7 @@ if ANDROID
+@@ -39,6 +39,14 @@ if LINUX
  AM_LIBTOOLFLAGS="--tag=CXX"
  endif
  
--if LINUX
- AM_LIBTOOLFLAGS="--tag=CXX"
--endif
- 
++if DRAGONFLY
++AM_LIBTOOLFLAGS="--tag=CXX"
++endif
++
++if NETBSD
++AM_LIBTOOLFLAGS="--tag=CXX"
++endif
++
  VERSION_INFO=$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
+ CLEANFILES=
diff --git a/megacmd/patches/patch-configure.ac b/megacmd/patches/patch-configure.ac
new file mode 100644
index 0000000000..a9b1a6419e
--- /dev/null
+++ b/megacmd/patches/patch-configure.ac
@@ -0,0 +1,35 @@
+$NetBSD$
+
+--- configure.ac.orig	2024-05-20 12:29:43.000000000 +0000
++++ configure.ac
+@@ -209,6 +209,8 @@ WIN32=no
+ DARWIN=no
+ ANDROID=no
+ LINUX=no
++DRAGONFLY=no
++NETBSD=no
+ AC_MSG_CHECKING([if building for Win32 platform])
+ case $host in
+   *-*-cygwin*)
+@@ -231,6 +233,12 @@ case $host in
+   *-linux*)
+     LINUX=yes
+     ;;
++  *-dragonfly*)
++    DRAGONFLY=yes
++    ;;
++  *-netbsd*)
++    NETBSD=yes
++    ;;
+   *)
+     LIBS_EXTRA=""
+     ;;
+@@ -240,6 +248,8 @@ AM_CONDITIONAL([WIN32], [test "${WIN32}"
+ AM_CONDITIONAL([DARWIN], [test "${DARWIN}" = "yes"])
+ AM_CONDITIONAL([ANDROID], [test "${ANDROID}" = "yes"])
+ AM_CONDITIONAL([LINUX], [test "${LINUX}" = "yes"])
++AM_CONDITIONAL([DRAGONFLY], [test "${DRAGONFLY}" = "yes"])
++AM_CONDITIONAL([NETBSD], [test "${NETBSD}" = "yes"])
+ 
+ SAVE_LDFLAGS=$LDFLAGS
+ SAVE_CXXFLAGS=$CXXFLAGS
diff --git a/megacmd/patches/patch-sdk_Makefile.am b/megacmd/patches/patch-sdk_Makefile.am
index 376b054472..59e318c57f 100644
--- a/megacmd/patches/patch-sdk_Makefile.am
+++ b/megacmd/patches/patch-sdk_Makefile.am
@@ -1,16 +1,19 @@
-$NetBSD: patch-sdk_Makefile.am,v 1.1 2024/03/11 07:49:12 wiz Exp $
+$NetBSD$
 
-* Add NetBSD support
-
---- sdk/Makefile.am.orig	2023-05-02 16:07:05.000000000 +0000
+--- sdk/Makefile.am.orig	2024-05-17 14:19:43.000000000 +0000
 +++ sdk/Makefile.am
-@@ -42,9 +42,7 @@ if ANDROID
+@@ -46,6 +46,14 @@ if LINUX
  AM_LIBTOOLFLAGS="--tag=CXX"
  endif
  
--if LINUX
- AM_LIBTOOLFLAGS="--tag=CXX"
--endif
- 
++if DRAGONFLY
++AM_LIBTOOLFLAGS="--tag=CXX"
++endif
++
++if NETBSD
++AM_LIBTOOLFLAGS="--tag=CXX"
++endif
++
  VERSION_INFO=$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
+ CLEANFILES=
diff --git a/megacmd/patches/patch-sdk_configure.ac b/megacmd/patches/patch-sdk_configure.ac
index 3b5097a9db..7f46b9ffcc 100644
--- a/megacmd/patches/patch-sdk_configure.ac
+++ b/megacmd/patches/patch-sdk_configure.ac
@@ -1,26 +1,142 @@
-$NetBSD: patch-sdk_configure.ac,v 1.1 2024/03/11 07:49:12 wiz Exp $
+$NetBSD$
 
-* mega-cmd-server not syncing with aio_write function,
-* workaround disable librt. #TODO
-
---- sdk/configure.ac.orig	2024-02-27 08:17:47.102044837 +0000
+--- sdk/configure.ac.orig	2024-05-17 14:19:43.000000000 +0000
 +++ sdk/configure.ac
-@@ -1382,12 +1382,12 @@ if test "x$WIN32" = "xno" ; then
+@@ -208,6 +208,8 @@ WIN32=no
+ DARWIN=no
+ ANDROID=no
+ LINUX=no
++DRAGONFLY=no
++NETBSD=no
+ AC_MSG_CHECKING([platform options])
+ case $host in
+   *-*-cygwin*)
+@@ -238,6 +240,12 @@ case $host in
+   *-linux*)
+     LINUX=yes
+     ;;
++  *-dragonfly*)
++    DRAGONFLY=yes
++    ;;
++  *-netbsd*)
++    NETBSD=yes
++    ;;
+   *)
+     LIBS_EXTRA=""
+     ;;
+@@ -247,6 +255,8 @@ AM_CONDITIONAL([WIN32], [test "${WIN32}"
+ AM_CONDITIONAL([DARWIN], [test "${DARWIN}" = "yes"])
+ AM_CONDITIONAL([ANDROID], [test "${ANDROID}" = "yes"])
+ AM_CONDITIONAL([LINUX], [test "${LINUX}" = "yes"])
++AM_CONDITIONAL([DRAGONFLY], [test "${DRAGONFLY}" = "yes"])
++AM_CONDITIONAL([NETBSD], [test "${NETBSD}" = "yes"])
+ 
+ AC_SUBST(LIBS_EXTRA)
+ 
+@@ -1369,6 +1379,7 @@ AM_CONDITIONAL([USE_LIBMEDIAINFO], [test
+ #
+ openssl=false
+ cares=false
++rt=undef
+ if test "x$WIN32" = "xno" ; then
+ 
+     AC_ARG_WITH([poll],
+@@ -1381,12 +1392,71 @@ if test "x$WIN32" = "xno" ; then
+         LDFLAGS="-pthread $LDFLAGS"
      fi
  
-     # librt #TODO: allow --with-rt=...
+-    # librt #TODO: allow --with-rt=...
 -    AC_CHECK_LIB([rt], [aio_write], [
 -    SAVE_LDFLAGS="-lrt $SAVE_LDFLAGS"
 -    LDFLAGS="-lrt $LDFLAGS"
 -    AC_DEFINE(HAVE_AIO_RT, [1], [Define to indicate AIO presence in librt])
 -    ],
--    )
-+    #AC_CHECK_LIB([rt], [aio_write], [
-+    #SAVE_LDFLAGS="-lrt $SAVE_LDFLAGS"
-+    #LDFLAGS="-lrt $LDFLAGS"
-+    #AC_DEFINE(HAVE_AIO_RT, [1], [Define to indicate AIO presence in librt])
-+    #],
-+    #)
++    # librt
++    AC_MSG_CHECKING(for rt)
++    AC_ARG_WITH([rt],
++      AS_HELP_STRING(--with-rt=PATH, base of Real-time Library installation),
++      [
++       case $with_rt in
++       no)
++            AC_MSG_RESULT([no])
++
++            rt=false
++         ;;
++       yes)
++            AC_CHECK_HEADERS([aio.h], [],
++                AC_MSG_ERROR([aio.h header not found or not usable])
++            )
++            AC_CHECK_LIB(rt, [aio_write], [LIBRT_LIBS="$LIBRT_LIBS -lrt"],
++                AC_MSG_ERROR([Could not find rt library!])
++            )
++
++            AC_SUBST(LIBRT_LIBS)
++            rt=true
++         ;;
++       *)
++        # determine if library is installed
++        if test -d "$with_rt/lib"; then
++            LDFLAGS="-L$with_rt/lib $LDFLAGS"
++            CXXFLAGS="-I$with_rt/include $CXXFLAGS"
++
++            AC_CHECK_HEADERS([aio.h], [
++                LIBRT_LDFLAGS="-L$with_rt/lib"
++                LIBRT_CXXFLAGS="-I$with_rt/include"],
++                AC_MSG_ERROR([aio.h header not found or not usable])
++            )
++        
++            AC_CHECK_LIB(rt, [aio_write], [LIBRT_LIBS="$LIBRT_LIBS -lrt"],
++                AC_MSG_ERROR([Could not find rt library!])
++            )
++        else
++            AC_MSG_ERROR([Could not find rt library in "$with_rt/lib"!])
++        fi
++
++        AC_SUBST(LIBRT_LDFLAGS)
++        AC_SUBST(LIBRT_CXXFLAGS)
++        AC_SUBST(LIBRT_LIBS)
++        rt=true
++
++        #restore
++        LDFLAGS=$SAVE_LDFLAGS
++        CXXFLAGS=$SAVE_CXXFLAGS
++        ;;
++       esac
++      ],
++      [
++        AC_MSG_RESULT([--with-rt not specified])
++
++        AC_CHECK_HEADERS([aio.h], [],
++            AC_MSG_ERROR([aio.h header not found or not usable])
++        )
++        AC_CHECK_LIB(rt, [aio_write], [LIBRT_LIBS="$LIBRT_LIBS -lrt"],
++            AC_MSG_NOTICE([Could not find librt])
++        )
++
++        AC_SUBST(LIBRT_LIBS)
++        rt=true
++      ]
+     )
  
      # OpenSSL
-     AC_MSG_CHECKING(for OpenSSL)
+@@ -1617,6 +1687,12 @@ if test "x$WIN32" = "xno" ; then
+ fi
+ 
+ # define on all platforms
++AM_CONDITIONAL(HAVE_RT, test x$rt = xtrue)
++if test "x$rt" = "xtrue" ; then
++    AC_DEFINE(HAVE_AIO_RT, [1], [Define to indicate AIO presence in librt])
++fi
++
++# define on all platforms
+ AM_CONDITIONAL(HAVE_OPENSSL, test x$openssl = xtrue)
+ if test "x$openssl" = "xtrue" ; then
+     AC_DEFINE(USE_OPENSSL, [1], [Define to use OpenSSL])
+@@ -2308,6 +2384,7 @@ AC_MSG_NOTICE([Configured to build Mega 
+   PCRE:             $PCRE_CXXFLAGS $PCRE_LDFLAGS $PCRE_LIBS
+   LIBUV:            $LIBUV_CXXFLAGS $LIBUV_LDFLAGS $LIBUV_LIBS
+   LIBRAW:           $LIBRAW_CXXFLAGS $LIBRAW_LDFLAGS $LIBRAW_LIBS
++  LIBRT:            $LIBRT_CXXFLAGS $LIBRT_LDFLAGS $LIBRT_LIBS
+   LIBMEDIAINFO:     $LIBMEDIAINFO_CXXFLAGS $LIBMEDIAINFO_LDFLAGS $LIBMEDIAINFO_LIBS
+   FFMPEG:           $FFMPEG_CXXFLAGS $FFMPEG_LDFLAGS $FFMPEG_LIBS
+ 
diff --git a/megacmd/patches/patch-sdk_include_mega_http.h b/megacmd/patches/patch-sdk_include_mega_http.h
new file mode 100644
index 0000000000..6af5789b43
--- /dev/null
+++ b/megacmd/patches/patch-sdk_include_mega_http.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- sdk/include/mega/http.h.orig	2024-05-17 14:19:43.000000000 +0000
++++ sdk/include/mega/http.h
+@@ -42,7 +42,7 @@
+ #pragma warning(pop)
+ #endif
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ #include <netinet/in.h>
+ #endif
+ 
diff --git a/megacmd/patches/patch-sdk_include_mega_http_h b/megacmd/patches/patch-sdk_include_mega_http_h
deleted file mode 100644
index 316818e3a7..0000000000
--- a/megacmd/patches/patch-sdk_include_mega_http_h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-sdk_include_mega_http_h,v 1.1 2024/03/11 07:49:12 wiz Exp $
-
-* Add NetBSD support
-
-Index: sdk/include/mega/http.h
---- sdk/include/mega/http.h.orig	2023-05-02 16:07:05.000000000 +0000
-+++ sdk/include/mega/http.h
-@@ -42,7 +42,7 @@
- #pragma warning(pop)
- #endif
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <netinet/in.h>
- #endif
- 
diff --git a/megacmd/patches/patch-sdk_include_mega_posix_megafs.h b/megacmd/patches/patch-sdk_include_mega_posix_megafs.h
new file mode 100644
index 0000000000..4a3b248990
--- /dev/null
+++ b/megacmd/patches/patch-sdk_include_mega_posix_megafs.h
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- sdk/include/mega/posix/megafs.h.orig	2024-05-17 14:19:43.000000000 +0000
++++ sdk/include/mega/posix/megafs.h
+@@ -32,7 +32,7 @@
+ #define O_DIRECT 0
+ #include <sys/param.h>
+ #include <sys/mount.h>
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ #include <sys/mount.h>
+ #else
+ #include <sys/vfs.h>
diff --git a/megacmd/patches/patch-sdk_include_mega_posix_megafs_h b/megacmd/patches/patch-sdk_include_mega_posix_megafs_h
deleted file mode 100644
index 9c333a4203..0000000000
--- a/megacmd/patches/patch-sdk_include_mega_posix_megafs_h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-sdk_include_mega_posix_megafs_h,v 1.1 2024/03/11 07:49:12 wiz Exp $
-
-* Add NetBSD support
-
-Index: sdk/include/mega/posix/megafs.h
---- sdk/include/mega/posix/megafs.h.orig
-+++ sdk/include/mega/posix/megafs.h
-@@ -28,7 +28,7 @@
- #define O_DIRECT 0
- #include <sys/param.h>
- #include <sys/mount.h>
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__NetBSD__)
- #include <sys/mount.h>
- #else
- #include <sys/vfs.h>
diff --git a/megacmd/patches/patch-sdk_include_mega_posix_megasys.h b/megacmd/patches/patch-sdk_include_mega_posix_megasys.h
new file mode 100644
index 0000000000..61ee86f0f4
--- /dev/null
+++ b/megacmd/patches/patch-sdk_include_mega_posix_megasys.h
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- sdk/include/mega/posix/megasys.h.orig	2024-05-17 14:19:43.000000000 +0000
++++ sdk/include/mega/posix/megasys.h
+@@ -99,7 +99,8 @@
+ #include <endian.h>
+ #endif
+ 
+-#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__minix)
++#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) || defined(__minix) || \
++    defined(__OpenBSD__)
+ #include <sys/endian.h>
+ #endif
+ 
diff --git a/megacmd/patches/patch-sdk_src_http.cpp b/megacmd/patches/patch-sdk_src_http.cpp
index a7bb7e9274..126809f42f 100644
--- a/megacmd/patches/patch-sdk_src_http.cpp
+++ b/megacmd/patches/patch-sdk_src_http.cpp
@@ -1,15 +1,17 @@
-$NetBSD: patch-sdk_src_http.cpp,v 1.1 2024/03/11 07:49:12 wiz Exp $
+$NetBSD$
 
-* Fix build on NetBSD, missing AI_V4MAPPED
-
---- sdk/src/http.cpp.orig	2023-06-20 16:04:22.829147987 +0000
+--- sdk/src/http.cpp.orig	2024-05-17 14:19:43.000000000 +0000
 +++ sdk/src/http.cpp
-@@ -270,7 +270,7 @@ void HttpIO::getMEGADNSservers(string *d
+@@ -270,8 +270,12 @@ void HttpIO::getMEGADNSservers(string *d
          hints.ai_family = AF_UNSPEC;
  
  #ifndef __MINGW32__
--        hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG;
++#if defined(__NetBSD__) || defined(__OpenBSD__)
 +        hints.ai_flags = AI_ADDRCONFIG;
++#else
+         hints.ai_flags = AI_V4MAPPED | AI_ADDRCONFIG;
  #endif
++#endif
  
          if (!getaddrinfo("ns.mega.co.nz", NULL, &hints, &aiList))
+         {
diff --git a/megacmd/patches/patch-sdk_src_include.am b/megacmd/patches/patch-sdk_src_include.am
new file mode 100644
index 0000000000..c0db913070
--- /dev/null
+++ b/megacmd/patches/patch-sdk_src_include.am
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- sdk/src/include.am.orig	2024-05-17 14:19:43.000000000 +0000
++++ sdk/src/include.am
+@@ -5,14 +5,14 @@ lib_LTLIBRARIES = src/libmega.la
+ if WIN32
+ src_libmega_la_CXXFLAGS = -D_WIN32=1 -Iinclude/ -Iinclude/mega/win32 $(LIBS_EXTRA) $(ZLIB_CXXFLAGS) $(LIBUV_CXXFLAGS) $(LIBRAW_CXXFLAGS) $(LIBMEDIAINFO_CXXFLAGS) $(FFMPEG_CXXFLAGS) $(CRYPTO_CXXFLAGS) $(SODIUM_CXXFLAGS) $(DB_CXXFLAGS) $(CXXFLAGS) $(WINHTTP_CXXFLAGS) $(FI_CXXFLAGS) $(PDF_CXXFLAGS) $(ICU_CXXFLAGS) $(PCRE_CXXFLAGS)
+ else
+-src_libmega_la_CXXFLAGS = $(CARES_FLAGS) $(LIBCURL_FLAGS) $(ZLIB_CXXFLAGS) $(LIBUV_CXXFLAGS) $(LIBRAW_CXXFLAGS) $(LIBMEDIAINFO_CXXFLAGS) $(FFMPEG_CXXFLAGS) $(CRYPTO_CXXFLAGS) $(SODIUM_CXXFLAGS) $(DB_CXXFLAGS) $(FI_CXXFLAGS) $(PDF_CXXFLAGS) $(ICU_CXXFLAGS) $(LIBSSL_FLAGS) $(PCRE_CXXFLAGS)
++src_libmega_la_CXXFLAGS = $(CARES_FLAGS) $(LIBCURL_FLAGS) $(ZLIB_CXXFLAGS) $(LIBUV_CXXFLAGS) $(LIBRAW_CXXFLAGS) $(LIBRT_CXXFLAGS) $(LIBMEDIAINFO_CXXFLAGS) $(FFMPEG_CXXFLAGS) $(CRYPTO_CXXFLAGS) $(SODIUM_CXXFLAGS) $(DB_CXXFLAGS) $(FI_CXXFLAGS) $(PDF_CXXFLAGS) $(ICU_CXXFLAGS) $(LIBSSL_FLAGS) $(PCRE_CXXFLAGS)
+ endif
+ 
+ # Libs
+ if WIN32
+ src_libmega_la_LIBADD = $(LIBS_EXTRA)  $(FFMPEG_LDFLAGS) $(FFMPEG_LIBS) $(LIBUV_LDFLAGS) $(LIBUV_LIBS) $(LIBRAW_LDFLAGS) $(LIBRAW_LIBS) $(LIBMEDIAINFO_LDFLAGS) $(LIBMEDIAINFO_LIBS) $(ZLIB_LDFLAGS) $(ZLIB_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(SODIUM_LDFLAGS) $(SODIUM_LIBS) $(DB_LDFLAGS) $(DB_LIBS) $(WINHTTP_LDFLAGS) $(WINHTTP_LIBS) $(FI_LDFLAGS) $(FI_LIBS) $(PDF_LDFLAGS) $(PDF_LIBS) $(ICU_LDFLAGS) $(ICU_LIBS) $(PCRE_LDFLAGS) $(PCRE_LIBS)
+ else
+-src_libmega_la_LIBADD = $(CARES_LDFLAGS) $(CARES_LIBS) $(LIBCURL_LIBS) $(FFMPEG_LDFLAGS) $(FFMPEG_LIBS) $(LIBUV_LDFLAGS) $(LIBUV_LIBS) $(LIBRAW_LDFLAGS) $(LIBRAW_LIBS) $(LIBMEDIAINFO_LDFLAGS) $(LIBMEDIAINFO_LIBS) $(ZLIB_LDFLAGS) $(ZLIB_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(SODIUM_LDFLAGS) $(SODIUM_LIBS) $(DB_LDFLAGS) $(DB_LIBS) $(FI_LDFLAGS) $(FI_LIBS) $(PDF_LDFLAGS) $(PDF_LIBS) $(ICU_LDFLAGS) $(ICU_LIBS) $(LIBSSL_LDFLAGS) $(LIBSSL_LIBS) $(PCRE_LDFLAGS) $(PCRE_LIBS)
++src_libmega_la_LIBADD = $(CARES_LDFLAGS) $(CARES_LIBS) $(LIBCURL_LIBS) $(FFMPEG_LDFLAGS) $(FFMPEG_LIBS) $(LIBUV_LDFLAGS) $(LIBUV_LIBS) $(LIBRAW_LDFLAGS) $(LIBRAW_LIBS) $(LIBRT_LDFLAGS) $(LIBRT_LIBS) $(LIBMEDIAINFO_LDFLAGS) $(LIBMEDIAINFO_LIBS) $(ZLIB_LDFLAGS) $(ZLIB_LIBS) $(CRYPTO_LDFLAGS) $(CRYPTO_LIBS) $(SODIUM_LDFLAGS) $(SODIUM_LIBS) $(DB_LDFLAGS) $(DB_LIBS) $(FI_LDFLAGS) $(FI_LIBS) $(PDF_LDFLAGS) $(PDF_LIBS) $(ICU_LDFLAGS) $(ICU_LIBS) $(LIBSSL_LDFLAGS) $(LIBSSL_LIBS) $(PCRE_LDFLAGS) $(PCRE_LIBS)
+ endif
+ 
+ # add library version
diff --git a/megacmd/patches/patch-sdk_src_posix_fs.cpp b/megacmd/patches/patch-sdk_src_posix_fs.cpp
index 0493f026ff..c570cf040d 100644
--- a/megacmd/patches/patch-sdk_src_posix_fs.cpp
+++ b/megacmd/patches/patch-sdk_src_posix_fs.cpp
@@ -1,8 +1,6 @@
-$NetBSD: patch-sdk_src_posix_fs.cpp,v 1.1 2024/03/11 07:49:12 wiz Exp $
+$NetBSD$
 
-* Add NetBSD support
-
---- sdk/src/posix/fs.cpp.orig	2023-05-02 16:07:05.000000000 +0000
+--- sdk/src/posix/fs.cpp.orig	2024-05-17 14:19:43.000000000 +0000
 +++ sdk/src/posix/fs.cpp
 @@ -27,6 +27,9 @@
  #include <sys/utsname.h>
diff --git a/megacmd/patches/patch-src_include.am b/megacmd/patches/patch-src_include.am
index 0c945160b5..46ef96156c 100644
--- a/megacmd/patches/patch-src_include.am
+++ b/megacmd/patches/patch-src_include.am
@@ -1,15 +1,13 @@
-$NetBSD: patch-src_include.am,v 1.1 2024/03/11 07:49:12 wiz Exp $
+$NetBSD$
 
-* Add NetBSD support
-
---- src/include.am.orig	2023-05-05 10:48:34.000000000 +0000
+--- src/include.am.orig	2024-05-20 12:29:43.000000000 +0000
 +++ src/include.am
-@@ -9,7 +9,7 @@ MEGACMD = mega-cmd mega-exec mega-cmd-se
- bin_PROGRAMS += $(MEGACMD)
+@@ -16,7 +16,7 @@ bin_PROGRAMS += $(MEGACMD) $(TESTS)
  $(MEGACMD): $(top_builddir)/sdk/src/libmega.la
- noinst_HEADERS += src/comunicationsmanager.h src/configurationmanager.h src/megacmd.h src/megacmdlogger.h src/megacmdsandbox.h src/megacmdutils.h src/megacmdcommonutils.h src/listeners.h src/megacmdexecuter.h src/megacmdtransfermanager.h src/megacmdversion.h src/megacmdplatform.h src/comunicationsmanagerportsockets.h
+ 
+ #scripst (to install and where)
 -megacmdcompletiondir = $(sysconfdir)/bash_completion.d/
 +megacmdcompletiondir = $(datadir)/bash-completion/completions/
  megacmdcompletion_DATA = src/client/megacmd_completion.sh
  megacmdscripts_bindir = $(bindir)
- 
+ megacmdscripts_bin_SCRIPTS = src/client/mega-attr src/client/mega-cd src/client/mega-confirm src/client/mega-cp src/client/mega-debug src/client/mega-du src/client/mega-df src/client/mega-proxy src/client/mega-export src/client/mega-find src/client/mega-get src/client/mega-help src/client/mega-https src/client/mega-webdav src/client/mega-permissions src/client/mega-deleteversions src/client/mega-transfers src/client/mega-import src/client/mega-invite src/client/mega-ipc src/client/mega-killsession src/client/mega-lcd src/client/mega-log src/client/mega-login src/client/mega-logout src/client/mega-lpwd src/client/mega-ls src/client/mega-backup src/client/mega-mkdir src/client/mega-mount src/client/mega-mv src/client/mega-passwd src/client/mega-preview src/client/mega-put src/client/mega-speedlimit src/client/mega-pwd src/client/mega-quit src/client/mega-reload src/client/mega-rm src/client/mega-session src/client/mega-share src/client/mega-showpcr src/client/mega-signup src/
client/mega-sync src/client/mega-exclude src/client/mega-thumbnail src/client/mega-userattr src/client/mega-users src/client/mega-version src/client/mega-whoami src/client/mega-cat src/client/mega-tree src/client/mega-mediainfo src/client/mega-graphics src/client/mega-ftp src/client/mega-cancel src/client/mega-confirmcancel src/client/mega-errorcode
diff --git a/megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications.cpp b/megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications.cpp
new file mode 100644
index 0000000000..d9017ebd08
--- /dev/null
+++ b/megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications.cpp
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- src/megacmdshell/megacmdshellcommunications.cpp.orig	2024-05-20 12:29:43.000000000 +0000
++++ src/megacmdshell/megacmdshellcommunications.cpp
+@@ -55,7 +55,7 @@
+ #include <limits.h>
+ #endif
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+ #include <netinet/in.h>
+ #endif
+ 
diff --git a/megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications_cpp b/megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications_cpp
deleted file mode 100644
index 0f285c8045..0000000000
--- a/megacmd/patches/patch-src_megacmdshell_megacmdshellcommunications_cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_megacmdshell_megacmdshellcommunications_cpp,v 1.1 2024/03/11 07:49:12 wiz Exp $
-
-* Add NetBSD support
-
-Index: src/megacmdshell/megacmdshellcommunications.cpp
---- src/megacmdshell/megacmdshellcommunications.cpp.orig
-+++ src/megacmdshell/megacmdshellcommunications.cpp
-@@ -54,7 +54,7 @@
- #include <limits.h>
- #endif
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- #include <netinet/in.h>
- #endif
-
Home | Main Index | Thread Index | Old Index