Attachment #250925 for bug #279273

View | Details | Raw Unified | Return to bug 279273
Collapse All | Expand All




PORTNAME=	megacmd
DISTVERSION=	1.7.0
PORTREVISION=	3
DISTVERSIONSUFFIX=	_Linux
CATEGORIES=	net



LIB_DEPENDS=	libcares.so:dns/c-ares libcryptopp.so:security/cryptopp \
		libcurl.so:ftp/curl libsodium.so:security/libsodium \
		libuv.so:devel/libuv libpcre.so:devel/pcre \
		libicudata.so:devel/icu libicuuc.so:devel/icu

USES=		autoreconf libtool sqlite:3 readline shebangfix ssl pathfix \
		gmake

USE_GITHUB=	yes
GH_ACCOUNT=	meganz
GH_PROJECT=	MEGAcmd sdk:sdk
GH_SUBDIR=	sdk:sdk
GH_TAGNAME=	v4.31.0b:sdk

USE_LDCONFIG=	yes



.include <bsd.port.options.mk>

.if ${OPSYS} == DragonFly
BUILD_DEPENDS+=	cxxfs_gcc8>0:misc/cxxfs_gcc8
SUB_FILES=	pkg-message
CXXFLAGS+=	-isystem ${LOCALBASE}/cxxfs_gcc8
LDFLAGS+=	-L${LOCALBASE}/cxxfs_gcc8
.endif

.if ${ARCH} == i386 || ${ARCH} == amd64
CXXFLAGS+=	-DCRYPTOPP_DISABLE_ASM
.endif

Lines 1-5 Link Here

(-)b/net/megacmd/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1683991308	1	TIMESTAMP = 1716448787
2	SHA256 (meganz-MEGAcmd-1.6.3_Linux_GH0.tar.gz) = d0378d2a6787f72467eadf27c82145f232b456bc7cd8719abb0ce51e7f719796	2	SHA256 (meganz-MEGAcmd-1.7.0_Linux_GH0.tar.gz) = 32aa9863ab4c8c4c2497bf1734b59a23086985bc67a90e88d8599fe2a2bf1b89
3	SIZE (meganz-MEGAcmd-1.6.3_Linux_GH0.tar.gz) = 2085751	3	SIZE (meganz-MEGAcmd-1.7.0_Linux_GH0.tar.gz) = 2124305
4	SHA256 (meganz-sdk-v4.17.1d_GH0.tar.gz) = a9d3fffd6ecdfac4005cc84b9972a36b28aeb049febd4c688c537f4f097aaeec	4	SHA256 (meganz-sdk-v4.31.0b_GH0.tar.gz) = b81812578f7c5c689f7f221b0a07f1b0a17712f4b662c7c497946555991c0d1a
5	SIZE (meganz-sdk-v4.17.1d_GH0.tar.gz) = 3695020	5	SIZE (meganz-sdk-v4.31.0b_GH0.tar.gz) = 3592431




--- Makefile.am.orig	2024-05-20 12:29:43 UTC
+++ Makefile.am
@@ -39,6 +39,14 @@ endif
 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=




--- configure.ac.orig	2024-05-20 12:29:43 UTC
+++ configure.ac
@@ -209,6 +209,8 @@ LINUX=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([LINUX], [test "${LINUX}" = "yes"])
 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




--- sdk/Makefile.am.orig	2024-05-17 14:19:43 UTC
+++ sdk/Makefile.am
@@ -46,6 +46,14 @@ endif
 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=




--- sdk/configure.ac.orig	2024-05-17 14:19:43 UTC
+++ sdk/configure.ac
@@ -208,6 +208,8 @@ LINUX=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([LINUX], [test "${LINUX}" = "yes"])
 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 @@ cares=false
 #
 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=...
-    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
@@ -1617,6 +1687,12 @@ fi
 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 SDK:
   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
 

Added Link Here

(-)b/net/megacmd/files/patch-sdk_include_mega_http.h (+11 lines)
1	--- sdk/include/mega/http.h.orig 2024-05-17 14:19:43 UTC
2	+++ sdk/include/mega/http.h
3	@@ -42,7 +42,7 @@
4	#pragma warning(pop)
5	#endif
6
7	-#ifdef __FreeBSD__
8	+#if defined(__FreeBSD__) \|\| defined(__OpenBSD__) \|\| defined(__NetBSD__) \|\| defined(__DragonFly__)
9	#include <netinet/in.h>
10	#endif
11

Added Link Here

(-)b/net/megacmd/files/patch-sdk_include_mega_posix_megafs.h (+11 lines)
1	--- sdk/include/mega/posix/megafs.h.orig 2024-05-17 14:19:43 UTC
2	+++ sdk/include/mega/posix/megafs.h
3	@@ -32,7 +32,7 @@
4	#define O_DIRECT 0
5	#include <sys/param.h>
6	#include <sys/mount.h>
7	-#elif defined(__FreeBSD__)
8	+#elif defined(__FreeBSD__) \|\| defined(__OpenBSD__) \|\| defined(__NetBSD__) \|\| defined(__DragonFly__)
9	#include <sys/mount.h>
10	#else
11	#include <sys/vfs.h>




--- sdk/include/mega/posix/megasys.h.orig	2024-05-17 14:19:43 UTC
+++ 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
 




--- sdk/src/http.cpp.orig	2024-05-17 14:19:43 UTC
+++ sdk/src/http.cpp
@@ -270,7 +270,11 @@ void HttpIO::getMEGADNSservers(string *dnsservers, boo
         hints.ai_family = AF_UNSPEC;
 
 #ifndef __MINGW32__
+#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))




--- sdk/src/include.am.orig	2024-05-17 14:19:43 UTC
+++ sdk/src/include.am
@@ -5,14 +5,14 @@ else
 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




--- sdk/src/mega_evt_tls.cpp.orig	2023-06-13 08:00:40 UTC
+++ sdk/src/mega_evt_tls.cpp
@@ -64,9 +64,13 @@ static void tls_begin(void)
 {
     SSL_library_init();
     SSL_load_error_strings();
+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
+    OpenSSL_add_all_algorithms();
+#else
     ERR_load_BIO_strings();
     OpenSSL_add_all_algorithms();
     ERR_load_crypto_strings();
+#endif
 }
 
 evt_tls_t *evt_ctx_get_tls(evt_ctx_t *d_eng)

Added Link Here

(-)b/net/megacmd/files/patch-src_megacmdshell_megacmdshellcommunications.cpp (+11 lines)
1	--- src/megacmdshell/megacmdshellcommunications.cpp.orig 2024-05-20 12:29:43 UTC
2	+++ src/megacmdshell/megacmdshellcommunications.cpp
3	@@ -55,7 +55,7 @@
4	#include <limits.h>
5	#endif
6
7	-#ifdef __FreeBSD__
8	+#if defined(__FreeBSD__) \|\| defined(__OpenBSD__) \|\| defined(__NetBSD__) \|\| defined(__DragonFly__)
9	#include <netinet/in.h>
10	#endif
11

Added Link Here

(-)b/net/megacmd/files/pkg-message.in (+10 lines)
1	[
2	{ type: install
3	message: <<EOM
4	To use %%PORTNAME%% features on DragonFly you need to generate a machine-id.
5	For that, run the following command as root:
6
7	# dbus-uuidgen --ensure
8	EOM
9	}
10	]

Lines 126-131 include/mega/waiter.h Link Here

(-)b/net/megacmd/pkg-plist (-2 / +2 lines)
126	include/megaapi.h	126	include/megaapi.h
127	include/megaapi_impl.h	127	include/megaapi_impl.h
128	lib/libmega.so	128	lib/libmega.so
129	lib/libmega.so.41701	129	lib/libmega.so.43000
130	lib/libmega.so.41701.0.0	130	lib/libmega.so.43000.0.0
131	libdata/pkgconfig/libmega.pc	131	libdata/pkgconfig/libmega.pc

Return to bug 279273

Lines 1-6 Link Here

(-)b/net/megacmd/Makefile (-5 / +13 lines)
1	PORTNAME= megacmd	1	PORTNAME= megacmd
2	DISTVERSION= 1.6.3	2	DISTVERSION= 1.7.0
3	PORTREVISION= 3
4	DISTVERSIONSUFFIX= _Linux	3	DISTVERSIONSUFFIX= _Linux
5	CATEGORIES= net	4	CATEGORIES= net
6		5
Lines 13-27 LICENSE_COMB= multi Link Here
13		12
14	LIB_DEPENDS= libcares.so:dns/c-ares libcryptopp.so:security/cryptopp \	13	LIB_DEPENDS= libcares.so:dns/c-ares libcryptopp.so:security/cryptopp \
15	libcurl.so:ftp/curl libsodium.so:security/libsodium \	14	libcurl.so:ftp/curl libsodium.so:security/libsodium \
16	libuv.so:devel/libuv libpcre.so:devel/pcre	15	libuv.so:devel/libuv libpcre.so:devel/pcre \
		16	libicudata.so:devel/icu libicuuc.so:devel/icu
17		17
18	USES= autoreconf libtool sqlite:3 readline shebangfix ssl pathfix	18	USES= autoreconf libtool sqlite:3 readline shebangfix ssl pathfix \
		19	gmake
19		20
20	USE_GITHUB= yes	21	USE_GITHUB= yes
21	GH_ACCOUNT= meganz	22	GH_ACCOUNT= meganz
22	GH_PROJECT= MEGAcmd sdk:sdk	23	GH_PROJECT= MEGAcmd sdk:sdk
23	GH_SUBDIR= sdk:sdk	24	GH_SUBDIR= sdk:sdk
24	GH_TAGNAME= v4.17.1d:sdk	25	GH_TAGNAME= v4.31.0b:sdk
25		26
26	USE_LDCONFIG= yes	27	USE_LDCONFIG= yes
27		28
Lines 42-47 CONFIGURE_ARGS= --disable-examples \ Link Here
42		43
43	.include <bsd.port.options.mk>	44	.include <bsd.port.options.mk>
44		45
		46	.if ${OPSYS} == DragonFly
		47	BUILD_DEPENDS+= cxxfs_gcc8>0:misc/cxxfs_gcc8
		48	SUB_FILES= pkg-message
		49	CXXFLAGS+= -isystem ${LOCALBASE}/cxxfs_gcc8
		50	LDFLAGS+= -L${LOCALBASE}/cxxfs_gcc8
		51	.endif
		52
45	.if ${ARCH} == i386 \|\| ${ARCH} == amd64	53	.if ${ARCH} == i386 \|\| ${ARCH} == amd64
46	CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM	54	CXXFLAGS+= -DCRYPTOPP_DISABLE_ASM
47	.endif	55	.endif

Added Link Here

(-)b/net/megacmd/files/patch-Makefile.am (+17 lines)
1	--- Makefile.am.orig 2024-05-20 12:29:43 UTC
2	+++ Makefile.am
3	@@ -39,6 +39,14 @@ endif
4	AM_LIBTOOLFLAGS="--tag=CXX"
5	endif
6
7	+if DRAGONFLY
8	+AM_LIBTOOLFLAGS="--tag=CXX"
9	+endif
10	+
11	+if NETBSD
12	+AM_LIBTOOLFLAGS="--tag=CXX"
13	+endif
14	+
15	VERSION_INFO=$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
16
17	CLEANFILES=

Added Link Here

(-)b/net/megacmd/files/patch-configure.ac (+33 lines)
1	--- configure.ac.orig 2024-05-20 12:29:43 UTC
2	+++ configure.ac
3	@@ -209,6 +209,8 @@ LINUX=no
4	DARWIN=no
5	ANDROID=no
6	LINUX=no
7	+DRAGONFLY=no
8	+NETBSD=no
9	AC_MSG_CHECKING([if building for Win32 platform])
10	case $host in
11	--cygwin*)
12	@@ -231,6 +233,12 @@ case $host in
13	-linux)
14	LINUX=yes
15	;;
16	+ -dragonfly)
17	+ DRAGONFLY=yes
18	+ ;;
19	+ -netbsd)
20	+ NETBSD=yes
21	+ ;;
22	*)
23	LIBS_EXTRA=""
24	;;
25	@@ -240,6 +248,8 @@ AM_CONDITIONAL([LINUX], [test "${LINUX}" = "yes"])
26	AM_CONDITIONAL([DARWIN], [test "${DARWIN}" = "yes"])
27	AM_CONDITIONAL([ANDROID], [test "${ANDROID}" = "yes"])
28	AM_CONDITIONAL([LINUX], [test "${LINUX}" = "yes"])
29	+AM_CONDITIONAL([DRAGONFLY], [test "${DRAGONFLY}" = "yes"])
30	+AM_CONDITIONAL([NETBSD], [test "${NETBSD}" = "yes"])
31
32	SAVE_LDFLAGS=$LDFLAGS
33	SAVE_CXXFLAGS=$CXXFLAGS

Added Link Here

(-)b/net/megacmd/files/patch-sdk_Makefile.am (+17 lines)
1	--- sdk/Makefile.am.orig 2024-05-17 14:19:43 UTC
2	+++ sdk/Makefile.am
3	@@ -46,6 +46,14 @@ endif
4	AM_LIBTOOLFLAGS="--tag=CXX"
5	endif
6
7	+if DRAGONFLY
8	+AM_LIBTOOLFLAGS="--tag=CXX"
9	+endif
10	+
11	+if NETBSD
12	+AM_LIBTOOLFLAGS="--tag=CXX"
13	+endif
14	+
15	VERSION_INFO=$(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
16
17	CLEANFILES=

Added Link Here

(-)b/net/megacmd/files/patch-sdk_configure.ac (+140 lines)
1	--- sdk/configure.ac.orig 2024-05-17 14:19:43 UTC
2	+++ sdk/configure.ac
3	@@ -208,6 +208,8 @@ LINUX=no
4	DARWIN=no
5	ANDROID=no
6	LINUX=no
7	+DRAGONFLY=no
8	+NETBSD=no
9	AC_MSG_CHECKING([platform options])
10	case $host in
11	--cygwin*)
12	@@ -238,6 +240,12 @@ case $host in
13	-linux)
14	LINUX=yes
15	;;
16	+ -dragonfly)
17	+ DRAGONFLY=yes
18	+ ;;
19	+ -netbsd)
20	+ NETBSD=yes
21	+ ;;
22	*)
23	LIBS_EXTRA=""
24	;;
25	@@ -247,6 +255,8 @@ AM_CONDITIONAL([LINUX], [test "${LINUX}" = "yes"])
26	AM_CONDITIONAL([DARWIN], [test "${DARWIN}" = "yes"])
27	AM_CONDITIONAL([ANDROID], [test "${ANDROID}" = "yes"])
28	AM_CONDITIONAL([LINUX], [test "${LINUX}" = "yes"])
29	+AM_CONDITIONAL([DRAGONFLY], [test "${DRAGONFLY}" = "yes"])
30	+AM_CONDITIONAL([NETBSD], [test "${NETBSD}" = "yes"])
31
32	AC_SUBST(LIBS_EXTRA)
33
34	@@ -1369,6 +1379,7 @@ cares=false
35	#
36	openssl=false
37	cares=false
38	+rt=undef
39	if test "x$WIN32" = "xno" ; then
40
41	AC_ARG_WITH([poll],
42	@@ -1381,12 +1392,71 @@ if test "x$WIN32" = "xno" ; then
43	LDFLAGS="-pthread $LDFLAGS"
44	fi
45
46	- # librt #TODO: allow --with-rt=...
47	- AC_CHECK_LIB([rt], [aio_write], [
48	- SAVE_LDFLAGS="-lrt $SAVE_LDFLAGS"
49	- LDFLAGS="-lrt $LDFLAGS"
50	- AC_DEFINE(HAVE_AIO_RT, [1], [Define to indicate AIO presence in librt])
51	- ],
52	+ # librt
53	+ AC_MSG_CHECKING(for rt)
54	+ AC_ARG_WITH([rt],
55	+ AS_HELP_STRING(--with-rt=PATH, base of Real-time Library installation),
56	+ [
57	+ case $with_rt in
58	+ no)
59	+ AC_MSG_RESULT([no])
60	+
61	+ rt=false
62	+ ;;
63	+ yes)
64	+ AC_CHECK_HEADERS([aio.h], [],
65	+ AC_MSG_ERROR([aio.h header not found or not usable])
66	+ )
67	+ AC_CHECK_LIB(rt, [aio_write], [LIBRT_LIBS="$LIBRT_LIBS -lrt"],
68	+ AC_MSG_ERROR([Could not find rt library!])
69	+ )
70	+
71	+ AC_SUBST(LIBRT_LIBS)
72	+ rt=true
73	+ ;;
74	+ *)
75	+ # determine if library is installed
76	+ if test -d "$with_rt/lib"; then
77	+ LDFLAGS="-L$with_rt/lib $LDFLAGS"
78	+ CXXFLAGS="-I$with_rt/include $CXXFLAGS"
79	+
80	+ AC_CHECK_HEADERS([aio.h], [
81	+ LIBRT_LDFLAGS="-L$with_rt/lib"
82	+ LIBRT_CXXFLAGS="-I$with_rt/include"],
83	+ AC_MSG_ERROR([aio.h header not found or not usable])
84	+ )
85	+
86	+ AC_CHECK_LIB(rt, [aio_write], [LIBRT_LIBS="$LIBRT_LIBS -lrt"],
87	+ AC_MSG_ERROR([Could not find rt library!])
88	+ )
89	+ else
90	+ AC_MSG_ERROR([Could not find rt library in "$with_rt/lib"!])
91	+ fi
92	+
93	+ AC_SUBST(LIBRT_LDFLAGS)
94	+ AC_SUBST(LIBRT_CXXFLAGS)
95	+ AC_SUBST(LIBRT_LIBS)
96	+ rt=true
97	+
98	+ #restore
99	+ LDFLAGS=$SAVE_LDFLAGS
100	+ CXXFLAGS=$SAVE_CXXFLAGS
101	+ ;;
102	+ esac
103	+ ],
104	+ [
105	+ AC_MSG_RESULT([--with-rt not specified])
106	+
107	+ AC_CHECK_HEADERS([aio.h], [],
108	+ AC_MSG_ERROR([aio.h header not found or not usable])
109	+ )
110	+ AC_CHECK_LIB(rt, [aio_write], [LIBRT_LIBS="$LIBRT_LIBS -lrt"],
111	+ AC_MSG_NOTICE([Could not find librt])
112	+ )
113	+
114	+ AC_SUBST(LIBRT_LIBS)
115	+ rt=true
116	+ ]
117	)
118
119	# OpenSSL
120	@@ -1617,6 +1687,12 @@ fi
121	fi
122
123	# define on all platforms
124	+AM_CONDITIONAL(HAVE_RT, test x$rt = xtrue)
125	+if test "x$rt" = "xtrue" ; then
126	+ AC_DEFINE(HAVE_AIO_RT, [1], [Define to indicate AIO presence in librt])
127	+fi
128	+
129	+# define on all platforms
130	AM_CONDITIONAL(HAVE_OPENSSL, test x$openssl = xtrue)
131	if test "x$openssl" = "xtrue" ; then
132	AC_DEFINE(USE_OPENSSL, [1], [Define to use OpenSSL])
133	@@ -2308,6 +2384,7 @@ AC_MSG_NOTICE([Configured to build Mega SDK:
134	PCRE: $PCRE_CXXFLAGS $PCRE_LDFLAGS $PCRE_LIBS
135	LIBUV: $LIBUV_CXXFLAGS $LIBUV_LDFLAGS $LIBUV_LIBS
136	LIBRAW: $LIBRAW_CXXFLAGS $LIBRAW_LDFLAGS $LIBRAW_LIBS
137	+ LIBRT: $LIBRT_CXXFLAGS $LIBRT_LDFLAGS $LIBRT_LIBS
138	LIBMEDIAINFO: $LIBMEDIAINFO_CXXFLAGS $LIBMEDIAINFO_LDFLAGS $LIBMEDIAINFO_LIBS
139	FFMPEG: $FFMPEG_CXXFLAGS $FFMPEG_LDFLAGS $FFMPEG_LIBS
140

Added Link Here

(-)b/net/megacmd/files/patch-sdk_include_mega_posix_megasys.h (+12 lines)
1	--- sdk/include/mega/posix/megasys.h.orig 2024-05-17 14:19:43 UTC
2	+++ sdk/include/mega/posix/megasys.h
3	@@ -99,7 +99,8 @@
4	#include <endian.h>
5	#endif
6
7	-#if defined(__FreeBSD__) \|\| defined(__NetBSD__) \|\| defined(__DragonFly__) \|\| defined(__minix)
8	+#if defined(__FreeBSD__) \|\| defined(__NetBSD__) \|\| defined(__DragonFly__) \|\| defined(__minix) \|\| \
9	+ defined(__OpenBSD__)
10	#include <sys/endian.h>
11	#endif
12

Added Link Here

(-)b/net/megacmd/files/patch-sdk_src_http.cpp (+14 lines)
1	--- sdk/src/http.cpp.orig 2024-05-17 14:19:43 UTC
2	+++ sdk/src/http.cpp
3	@@ -270,7 +270,11 @@ void HttpIO::getMEGADNSservers(string *dnsservers, boo
4	hints.ai_family = AF_UNSPEC;
5
6	#ifndef __MINGW32__
7	+#if defined(__NetBSD__) \|\| defined(__OpenBSD__)
8	+ hints.ai_flags = AI_ADDRCONFIG;
9	+#else
10	hints.ai_flags = AI_V4MAPPED \| AI_ADDRCONFIG;
11	+#endif
12	#endif
13
14	if (!getaddrinfo("ns.mega.co.nz", NULL, &hints, &aiList))

Added Link Here

(-)b/net/megacmd/files/patch-sdk_src_include.am (+19 lines)
1	--- sdk/src/include.am.orig 2024-05-17 14:19:43 UTC
2	+++ sdk/src/include.am
3	@@ -5,14 +5,14 @@ else
4	if WIN32
5	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)
6	else
7	-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)
8	+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)
9	endif
10
11	# Libs
12	if WIN32
13	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)
14	else
15	-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)
16	+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)
17	endif
18
19	# add library version

Removed Link Here

(-)a/net/megacmd/files/patch-sdk_src_mega__evt__tls.cpp (-16 lines)
1	--- sdk/src/mega_evt_tls.cpp.orig 2023-06-13 08:00:40 UTC
2	+++ sdk/src/mega_evt_tls.cpp
3	@@ -64,9 +64,13 @@ static void tls_begin(void)
4	{
5	SSL_library_init();
6	SSL_load_error_strings();
7	+#if OPENSSL_VERSION_NUMBER >= 0x30000000L
8	+ OpenSSL_add_all_algorithms();
9	+#else
10	ERR_load_BIO_strings();
11	OpenSSL_add_all_algorithms();
12	ERR_load_crypto_strings();
13	+#endif
14	}
15
16	evt_tls_t evt_ctx_get_tls(evt_ctx_t d_eng)