Date: Sun, 6 Nov 2016 14:16:11 +0000 (UTC) From: "Jason E. Hale" <jhale@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r425492 - in head/net/megatools: . files Message-ID: <201611061416.uA6EGBqP086963@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jhale Date: Sun Nov 6 14:16:11 2016 New Revision: 425492 URL: https://svnweb.freebsd.org/changeset/ports/425492 Log: Update to 1.9.98 PR: 214212 Submitted by: Max Kostikov <max@kostikov.co> (maintainer) Added: head/net/megatools/files/ head/net/megatools/files/patch-lib_mega.c (contents, props changed) Modified: head/net/megatools/Makefile head/net/megatools/distinfo head/net/megatools/pkg-plist Modified: head/net/megatools/Makefile ============================================================================== --- head/net/megatools/Makefile Sun Nov 6 13:34:17 2016 (r425491) +++ head/net/megatools/Makefile Sun Nov 6 14:16:11 2016 (r425492) @@ -2,35 +2,30 @@ # $FreeBSD$ PORTNAME= megatools -PORTVERSION= 1.9.97 +PORTVERSION= 1.9.98 CATEGORIES= net MASTER_SITES= http://megatools.megous.com/builds/ MAINTAINER= max@kostikov.co -COMMENT= Tools for MEGA.CO.NZ cloud drive +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= gmake pkgconfig libtool pathfix -USE_LDCONFIG= yes +USES= gettext-runtime gmake libtool pathfix pkgconfig ssl GNU_CONFIGURE= yes USE_GNOME= glib20 -USE_OPENSSL= yes INSTALL_TARGET= install-strip -CONFIGURE_ARGS= --enable-introspection=no -OPTIONS_DEFINE= FUSE -OPTIONS_DEFAULT= FUSE -OPTIONS_SUB= yes - -FUSE_USES= fuse -FUSE_CONFIGURE_WITH= fuse +post-patch: +# Unsilence build + ${REINPLACE_CMD} -e '/^export\ MAKEFLAGS/s|^|#|' ${WRKSRC}/Makefile.in .include <bsd.port.mk> Modified: head/net/megatools/distinfo ============================================================================== --- head/net/megatools/distinfo Sun Nov 6 13:34:17 2016 (r425491) +++ head/net/megatools/distinfo Sun Nov 6 14:16:11 2016 (r425492) @@ -1,2 +1,3 @@ -SHA256 (megatools-1.9.97.tar.gz) = 3316c56ee55adef0ab113aad41ef95eb28fc15218639f69b1e04362b1c725af3 -SIZE (megatools-1.9.97.tar.gz) = 446801 +TIMESTAMP = 1478256777 +SHA256 (megatools-1.9.98.tar.gz) = 9b0521a4d27dbc417fc8e12610ac1e1da729bf6d6eb5bef927ef3670b372a16f +SIZE (megatools-1.9.98.tar.gz) = 285805 Added: head/net/megatools/files/patch-lib_mega.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/megatools/files/patch-lib_mega.c Sun Nov 6 14:16:11 2016 (r425492) @@ -0,0 +1,33 @@ +Fix build for FreeBSD 9.x base OpenSSL and LibreSSL. Fix for LibreSSL is +already in upstream repository, so this file can be removed once FreeBSD 9.x +support is dropped AND the next version of megatools is released. +--- 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 >= 0x101000000L && !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 >= 0x101000000L && !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 >= 0x101000000L && !defined(LIBRESSL_VERSION_NUMBER) + void AES_ctr128_encrypt( + const unsigned char *in, + unsigned char *out, Modified: head/net/megatools/pkg-plist ============================================================================== --- head/net/megatools/pkg-plist Sun Nov 6 13:34:17 2016 (r425491) +++ head/net/megatools/pkg-plist Sun Nov 6 14:16:11 2016 (r425492) @@ -1,29 +1,15 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611061416.uA6EGBqP086963>