Attachment #176681 for bug #214212




# $FreeBSD$

PORTNAME=	megatools
PORTVERSION=	1.9.98
CATEGORIES=	net
MASTER_SITES=	http://megatools.megous.com/builds/

MAINTAINER=	max@kostikov.co
COMMENT=	Command line tools for MEGA.NZ cloud drive

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/LICENSE

LIB_DEPENDS=	libcurl.so:ftp/curl
BUILD_DEPENDS=	asciidoc:textproc/asciidoc
RUN_DEPENDS=	glib-networking>=2.32.0:net/glib-networking

CONFIGURE_ENV=	OPENSSL_CFLAGS="-I${OPENSSLINC}" \
		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
USES=		gettext-runtime gmake libtool pathfix pkgconfig ssl
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
USE_GNOME=	glib20
USE_OPENSSL=	yes

INSTALL_TARGET=	install-strip
CONFIGURE_ARGS=	--enable-introspection=no

post-patch:
# Unsilence build
	${REINPLACE_CMD} -e '/^export\ MAKEFLAGS/s|^|#|' ${WRKSRC}/Makefile.in

FUSE_USES=	fuse
FUSE_CONFIGURE_WITH=	fuse

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (megatools-1.9.97.tar.gz) = 3316c56ee55adef0ab113aad41ef95eb28fc15218639f69b1e04362b1c725af3	1	TIMESTAMP = 1478256777
2	SIZE (megatools-1.9.97.tar.gz) = 446801	2	SHA256 (megatools-1.9.98.tar.gz) = 9b0521a4d27dbc417fc8e12610ac1e1da729bf6d6eb5bef927ef3670b372a16f
		3	SIZE (megatools-1.9.98.tar.gz) = 285805




--- lib/mega.c.orig	2016-11-03 13:45:42 UTC
+++ lib/mega.c
@@ -29,7 +29,9 @@
 #include <string.h>
 #include <time.h>
 #include <openssl/aes.h>
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
 #include <openssl/modes.h>
+#endif
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
 #include <openssl/rand.h>
@@ -803,7 +805,7 @@ static gboolean rsa_key_gen(rsa_key* k)
     return FALSE;
   }
 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
   RSA_get0_key(key, &k->m, &k->e, &k->d);
   RSA_get0_factors(key, &k->q, &k->p);
   RSA_get0_crt_params(key, NULL, NULL, &k->u);
@@ -2988,7 +2990,7 @@ struct _put_data
   GByteArray* buffer;
 };
 
-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
 void AES_ctr128_encrypt(
   const unsigned char *in, 
   unsigned char *out,




bin/megacopy
bin/megadf
bin/megadl
%%FUSE%%bin/megafs
bin/megaget
bin/megals
bin/megamkdir

bin/megaput
bin/megareg
bin/megarm
include/mega/mega-aes-ctr-encryptor.h
include/mega/mega-aes-key.h
include/mega/mega-chunked-cbc-mac.h
include/mega/mega-enum-types.h
include/mega/mega-rsa-key.h
include/mega/mega.h
include/mega/utils.h
lib/libmega.a
lib/libmega.so
lib/libmega.so.0
lib/libmega.so.0.0.0
libdata/pkgconfig/libmega.pc
man/man1/megacopy.1.gz
man/man1/megadf.1.gz
man/man1/megadl.1.gz
%%FUSE%%man/man1/megafs.1.gz
man/man1/megaget.1.gz
man/man1/megals.1.gz
man/man1/megamkdir.1.gz

Return to bug 214212

Lines 2-36 Link Here

(-)Makefile (-12 / +7 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= megatools	4	PORTNAME= megatools
5	PORTVERSION= 1.9.97	5	PORTVERSION= 1.9.98
6	CATEGORIES= net	6	CATEGORIES= net
7	MASTER_SITES= http://megatools.megous.com/builds/	7	MASTER_SITES= http://megatools.megous.com/builds/
8		8
9	MAINTAINER= max@kostikov.co	9	MAINTAINER= max@kostikov.co
10	COMMENT= Tools for MEGA.CO.NZ cloud drive	10	COMMENT= Command line tools for MEGA.NZ cloud drive
11		11
12	LICENSE= GPLv2	12	LICENSE= GPLv2
13	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/LICENSE
14		14
15	LIB_DEPENDS= libcurl.so:ftp/curl	15	LIB_DEPENDS= libcurl.so:ftp/curl
		16	BUILD_DEPENDS= asciidoc:textproc/asciidoc
16	RUN_DEPENDS= glib-networking>=2.32.0:net/glib-networking	17	RUN_DEPENDS= glib-networking>=2.32.0:net/glib-networking
17		18
18	CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \	19	CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \
19	OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"	20	OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
20	USES= gmake pkgconfig libtool pathfix	21	USES= gettext-runtime gmake libtool pathfix pkgconfig ssl
21	USE_LDCONFIG= yes
22	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
23	USE_GNOME= glib20	23	USE_GNOME= glib20
24	USE_OPENSSL= yes
25		24
26	INSTALL_TARGET= install-strip	25	INSTALL_TARGET= install-strip
27	CONFIGURE_ARGS= --enable-introspection=no
28		26
29	OPTIONS_DEFINE= FUSE	27	post-patch:
30	OPTIONS_DEFAULT= FUSE	28	# Unsilence build
31	OPTIONS_SUB= yes	29	${REINPLACE_CMD} -e '/^export\ MAKEFLAGS/s\|^\|#\|' ${WRKSRC}/Makefile.in
32		30
33	FUSE_USES= fuse
34	FUSE_CONFIGURE_WITH= fuse
35
36	.include <bsd.port.mk>	31	.include <bsd.port.mk>

Line 0 Link Here

(-)files/patch-lib_mega.c (+30 lines)
	1	--- lib/mega.c.orig 2016-11-03 13:45:42 UTC
	2	+++ lib/mega.c
	3	@@ -29,7 +29,9 @@
	4	#include <string.h>
	5	#include <time.h>
	6	#include <openssl/aes.h>
	7	+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
	8	#include <openssl/modes.h>
	9	+#endif
	10	#include <openssl/bn.h>
	11	#include <openssl/rsa.h>
	12	#include <openssl/rand.h>
	13	@@ -803,7 +805,7 @@ static gboolean rsa_key_gen(rsa_key* k)
	14	return FALSE;
	15	}
	16
	17	-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
	18	+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
	19	RSA_get0_key(key, &k->m, &k->e, &k->d);
	20	RSA_get0_factors(key, &k->q, &k->p);
	21	RSA_get0_crt_params(key, NULL, NULL, &k->u);
	22	@@ -2988,7 +2990,7 @@ struct _put_data
	23	GByteArray* buffer;
	24	};
	25
	26	-#if OPENSSL_VERSION_NUMBER >= 0x10100000L
	27	+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
	28	void AES_ctr128_encrypt(
	29	const unsigned char *in,
	30	unsigned char *out,

Lines 1-7 Link Here

(-)pkg-plist (-14 lines)
1	bin/megacopy	1	bin/megacopy
2	bin/megadf	2	bin/megadf
3	bin/megadl	3	bin/megadl
4	%%FUSE%%bin/megafs
5	bin/megaget	4	bin/megaget
6	bin/megals	5	bin/megals
7	bin/megamkdir	6	bin/megamkdir
Lines 8-29 Link Here
8	bin/megaput	7	bin/megaput
9	bin/megareg	8	bin/megareg
10	bin/megarm	9	bin/megarm
11	include/mega/mega-aes-ctr-encryptor.h
12	include/mega/mega-aes-key.h
13	include/mega/mega-chunked-cbc-mac.h
14	include/mega/mega-enum-types.h
15	include/mega/mega-rsa-key.h
16	include/mega/mega.h
17	include/mega/utils.h
18	lib/libmega.a
19	lib/libmega.so
20	lib/libmega.so.0
21	lib/libmega.so.0.0.0
22	libdata/pkgconfig/libmega.pc
23	man/man1/megacopy.1.gz	10	man/man1/megacopy.1.gz
24	man/man1/megadf.1.gz	11	man/man1/megadf.1.gz
25	man/man1/megadl.1.gz	12	man/man1/megadl.1.gz
26	%%FUSE%%man/man1/megafs.1.gz
27	man/man1/megaget.1.gz	13	man/man1/megaget.1.gz
28	man/man1/megals.1.gz	14	man/man1/megals.1.gz
29	man/man1/megamkdir.1.gz	15	man/man1/megamkdir.1.gz