[gentoo-commits] repo/user/ssnb:master commit in: net-misc/megasync/, net-misc/megasync/files/

[Samuel Bernardo]

commit:     8958d53d0c638d287b5d1033e1a402b014044374
Author:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
AuthorDate: Sun Jan  7 01:10:31 2018 +0000
Commit:     Samuel Bernardo <samuelbernardo.mail <AT> gmail <DOT> com>
CommitDate: Sun Jan  7 01:10:31 2018 +0000
URL:        https://gitweb.gentoo.org/repo/user/ssnb.git/commit/?id=8958d53d

megasync update

 net-misc/megasync/Manifest                         |   5 +-
 .../megasync/files/MEGAsync-3.5.3.0_Linux.patch    |  27 +++++
 net-misc/megasync/files/megasync-glibc2.26.patch   | 123 +++++++++++++++++++++
 net-misc/megasync/megasync-3.1.4.ebuild            |   2 +
 ...megasync-3.1.4.ebuild => megasync-3.5.3.ebuild} |   9 +-
 5 files changed, 163 insertions(+), 3 deletions(-)

diff --git a/net-misc/megasync/Manifest b/net-misc/megasync/Manifest
index 493eacc..65f302c 100644
--- a/net-misc/megasync/Manifest
+++ b/net-misc/megasync/Manifest
@@ -1,7 +1,10 @@
 AUX MEGAsync-3.1.4.0_Linux.patch 1035 SHA256 803d59b314fbb91f3bd9c2c59b30cb8b18d52ea606c96af3298b3044cf8baf7d SHA512 afd9b11a8dcdc3240d3c3850dfccafce64078c95ae4fa44ef0f3fbd71aabb4fa129f46bbde470d916719174a19674ba3f14cf9cde1166f7c5e09e56feb9f943e WHIRLPOOL 10c3c73da7bd81453c47bc17fa179ec8c28d3c6f8c4dc3d9aeb7260752d62d7e6e57827cd967bcbc636db4365bf01a5b41b18d9de97be4f9fe4db48aa3801639
+AUX MEGAsync-3.5.3.0_Linux.patch 1035 SHA256 803d59b314fbb91f3bd9c2c59b30cb8b18d52ea606c96af3298b3044cf8baf7d SHA512 afd9b11a8dcdc3240d3c3850dfccafce64078c95ae4fa44ef0f3fbd71aabb4fa129f46bbde470d916719174a19674ba3f14cf9cde1166f7c5e09e56feb9f943e WHIRLPOOL 10c3c73da7bd81453c47bc17fa179ec8c28d3c6f8c4dc3d9aeb7260752d62d7e6e57827cd967bcbc636db4365bf01a5b41b18d9de97be4f9fe4db48aa3801639
+AUX megasync-glibc2.26.patch 5958 SHA256 8d19891f1a7f5d84edbff300cd3bcebd5db93c9524483c13f19cdcffc0f3ec8a SHA512 f8348b61028f34714dabe83fe88e5820686a35e1fa52206451152a97a286557168666142121936304d60aa18dae16d4474c3c3278274b62cc06d42587fc7016e WHIRLPOOL 69a26860bfc622e976ff87ce68cdb16daaea48f1e0a722c84b101fca4f78706e47f29dc31aa0f78a62a7c3a73297f62b384cc7c680a289443e0e70734ffb8847
 DIST megasync-3.0.1.tar.gz 10859538 SHA256 97c11019841c48dc1b88b9c4a15c2a2d69dda06e6544d30ff066f9b960af3d4d SHA512 0e3e0315f9a8f4694a59f7b50d6dd93c5e840d013d8c658288d7c0cafca9fbdc1faa2bbaec5c2d08e5f4c4d1790864a8595153808ea7b8c0a1c3550ae8398dbe WHIRLPOOL 6f67983cc76d1ec18ccc6ccd9145c9d57ac46ecd8de9e0433c964d7af728699b2250228dc40d736ad88552c71ed4b5575f2c710476ffeaca1ab85d119710342c
 DIST megasync-sdk-20170215.tar.gz 3475613 SHA256 085ad3db78f7b30d613f4ad1d62e811bdf4be070c8c48cdb5243e4e9963468e2 SHA512 738e30e3b66edb129247dcce87bf9033efe698303f0e6c81362a51d81464b2323fb41b41f4659fa7d8db4bc9992ff7718a5f975d782e558e51ab50efadd740ea WHIRLPOOL 7daea0d450e900af78f7d144883aebaf283725f0850b23e4ea5c4f86822e9804f9876b53a18426fc36ad375bce2c19ad80a4ed45a659b022805b54551ce23265
 EBUILD megasync-3.0.1.ebuild 3631 SHA256 6afcf5ee6a4d7c6a78f7599ac76c9c83523387769d647d6aec557f7a32e61181 SHA512 cef1286d280689516eb6fd754c70524c2acd48976637275a46493211151cd89e1ea45c6f0494de606a71c84876b7d186a3af55311279aca41267cbda9219bd9e WHIRLPOOL e0759fe60bbeb8dc1d0b5820e43afd3e98b35de7321749fe323a07f95b022ee60557f41dd1c929a844827f91ed6a04744667e4dc4048f28717c0347c7e8df8f0
-EBUILD megasync-3.1.4.ebuild 3113 SHA256 425463b42acd1c83853375c81582341431cb74e2cdebc7b9ee91b12cdb5a67d1 SHA512 58a937f8e2a13b7ccf5b26fd4ec8029b02a8e2a637c41cff9e309d147b88a1b6b0478cf2da33c2310dbd4e040d5d428b68d083c89864d171af92c9417e5a1549 WHIRLPOOL 18fb2afac19b85d9185cb6d0c509f521c2991771bab69467fc4f6aefff0cae7c25262a32d183b1005a88f80990bfd7ecea7598095012a8d2fd57f10f018988e1
+EBUILD megasync-3.1.4.ebuild 3165 SHA256 4f0c01436a4a28bc99b030d624872f68595412b360708cefe6b6c87270f0008f SHA512 964fbd703748194c5c2b109d89e03bdb7d99c2b793fb187875e7d7304e69ea0f7efce9a19d607ce1b87de5e229fbf9d2fbda86df02aa6c42ffeab908c8152dc1 WHIRLPOOL 4a78d7122e822b71f6337c59c424f0e2447ddfe699b6e29bea459b2a3281a8c6e5e2693ee0ea5823213e884182aedb8d740f6bf18e3716bc13b8623dc6d2e10b
+EBUILD megasync-3.5.3.ebuild 3277 SHA256 a2764c22465571bf24b3727f200032f59f182b4814701daf23c61d22f738fbb4 SHA512 3d063386c052ec6c673d31c37ac2d7a8e78ee47d627bc5961d0e8ea9f1b7fde76f58078de0cc7cd5e1aa968b1941e7f51d22e9632ffe6c0b8dda05d919b40f13 WHIRLPOOL f71103b368acab72571ad4e64dfb0603f3ab13a77a2ed75e13ef8523700bc6c5cdd2282c39419fa90ebe8a66ee8ea0a4f21a8a7ca3c36ec8f3eb553e6b155614
 EBUILD megasync-9999.ebuild 3637 SHA256 99e34fd9fe0ca8724804b2b3bdccd96b8606e5702476e4784ea7068faa8d275a SHA512 020ca96d8972f66cc79673bc31083af2fffacbb02dfeb12677d5d62f08605e1a4f9b29d55d5509231a416c39e7b1cd2e6b20d16c4af00a415cbaf4c133fa6c6d WHIRLPOOL 4e8540c01b07f60881ace62cf8015e92f830b8d0f8c2b00d3813cfaee4766e16d5025630e3456efe5ed3b9a871a8bce85bb1c462ae9d1c15b25309fc54948cdb
 MISC metadata.xml 318 SHA256 705510d197fc14d45313ea036c3ce472a72da8fe1be62743a7d00f38422b43ef SHA512 e4930a21d6f75f5395e2e96436b42c792771fd7167abceeff0db7a9036616c6feeb6beee890afa6ff5e4584f5bb6938084316e60df57997aa1c20ba0a025514c WHIRLPOOL 99eadcf32497e8a117b297242fa0ed8de588a2fa4a7f3a85c67ebc479faa66c83cdd155cd974b5b80aeab2c9e431f837d4453397568a5105957d5082a7541d65

diff --git a/net-misc/megasync/files/MEGAsync-3.5.3.0_Linux.patch b/net-misc/megasync/files/MEGAsync-3.5.3.0_Linux.patch
new file mode 100644
index 0000000..527892c
--- /dev/null
+++ b/net-misc/megasync/files/MEGAsync-3.5.3.0_Linux.patch
@@ -0,0 +1,27 @@
+--- src/MEGAShellExtDolphin/megasync-plugin.h	2017-07-24 03:22:14.894701134 +0100
++++ src/MEGAShellExtDolphin/megasync-plugin.h	2017-07-24 03:29:22.518056652 +0100
+@@ -5,7 +5,7 @@
+ #ifndef WITH_KF5
+ #include <kabstractfileitemactionplugin.h>
+ #else
+-#include <KIOWidgets/kabstractfileitemactionplugin.h>
++#include <KF5/KIOWidgets/kabstractfileitemactionplugin.h>
+ #endif
+ #include <QLocalSocket>
+ 
+--- src/MEGAShellExtDolphin/megasync-plugin.cpp	2017-07-24 03:22:28.616295121 +0100
++++ src/MEGAShellExtDolphin/megasync-plugin.cpp	2017-07-24 03:31:02.382106210 +0100
+@@ -13,10 +13,10 @@
+ #else
+ #include <KPluginFactory>
+ #include <KPluginLoader>
+-#include <KIOWidgets/kabstractfileitemactionplugin.h>
++#include <KF5/KIOWidgets/kabstractfileitemactionplugin.h>
+ #include <QtNetwork/QLocalSocket>
+-#include <KIOCore/kfileitem.h>
+-#include <KIOCore/KFileItemListProperties>
++#include <KF5/KIOCore/kfileitem.h>
++#include <KF5/KIOCore/KFileItemListProperties>
+ #include <QtWidgets/QAction>
+ #include <QtCore/QDir>
+ #include <QtCore/QTimer>

diff --git a/net-misc/megasync/files/megasync-glibc2.26.patch b/net-misc/megasync/files/megasync-glibc2.26.patch
new file mode 100644
index 0000000..c739ae9
--- /dev/null
+++ b/net-misc/megasync/files/megasync-glibc2.26.patch
@@ -0,0 +1,123 @@
+diff -Naur a/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc b/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc
+--- a/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc	2017-11-19 14:46:02.366790151 +0000
++++ b/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.cc	2017-11-19 14:52:43.760546710 +0000
+@@ -397,12 +397,12 @@
+   }
+   CrashContext context;
+   memcpy(&context.siginfo, info, sizeof(siginfo_t));
+-  memcpy(&context.context, uc, sizeof(struct ucontext));
++  memcpy(&context.context, uc, sizeof(ucontext_t));
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+   // FP state is not part of user ABI on ARM Linux.
+-  // In case of MIPS Linux FP state is already part of struct ucontext
++  // In case of MIPS Linux FP state is already part of ucontext_t
+   // and 'float_state' is not a member of CrashContext.
+-  struct ucontext *uc_ptr = (struct ucontext*)uc;
++  ucontext_t *uc_ptr = (ucontext_t*)uc;
+   if (uc_ptr->uc_mcontext.fpregs) {
+     memcpy(&context.float_state,
+            uc_ptr->uc_mcontext.fpregs,
+@@ -421,12 +421,13 @@
+ // This is a public interface to HandleSignal that allows the client to
+ // generate a crash dump. This function may run in a compromised context.
+ bool ExceptionHandler::SimulateSignalDelivery(int sig) {
+-  siginfo_t siginfo = {0, 0, 0, {0}};
++  siginfo_t siginfo;
++  memset(&siginfo, 0, sizeof(siginfo_t));
+   // Mimic a trusted signal to allow tracing the process (see
+   // ExceptionHandler::HandleSignal().
+   siginfo.si_code = SI_USER;
+   siginfo.si_pid = getpid();
+-  struct ucontext context;
++  ucontext_t context;
+   getcontext(&context);
+   return HandleSignal(sig, &siginfo, &context);
+ }
+diff -Naur a/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.h b/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.h
+--- a/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.h	2017-11-19 14:46:02.366790151 +0000
++++ b/src/MEGASync/google_breakpad/client/linux/handler/exception_handler.h	2017-11-19 14:51:28.364846717 +0000
+@@ -189,10 +189,10 @@
+   struct CrashContext {
+     siginfo_t siginfo;
+     pid_t tid;  // the crashing thread.
+-    struct ucontext context;
++    ucontext_t context;
+ #if !defined(__ARM_EABI__) && !defined(__mips__)
+     // #ifdef this out because FP state is not part of user ABI for Linux ARM.
+-    // In case of MIPS Linux FP state is already part of struct ucontext
++    // In case of MIPS Linux FP state is already part of ucontext_t
+     // so 'float_state' is not required.
+     struct _libc_fpstate float_state;
+ #endif
+diff -Naur a/src/MEGASync/google_breakpad/client/linux/minidump_writer/minidump_writer.cc b/src/MEGASync/google_breakpad/client/linux/minidump_writer/minidump_writer.cc
+--- a/src/MEGASync/google_breakpad/client/linux/minidump_writer/minidump_writer.cc	2017-11-19 14:46:02.369790060 +0000
++++ b/src/MEGASync/google_breakpad/client/linux/minidump_writer/minidump_writer.cc	2017-11-19 14:51:28.353847052 +0000
+@@ -1725,7 +1725,7 @@
+   const int fd_;  // File descriptor where the minidum should be written.
+   const char* path_;  // Path to the file where the minidum should be written.
+ 
+-  const struct ucontext* const ucontext_;  // also from the signal handler
++  const ucontext_t* const ucontext_;  // also from the signal handler
+   const struct _libc_fpstate* const float_state_;  // ditto
+   LinuxDumper* dumper_;
+   MinidumpFileWriter minidump_writer_;
+diff -Naur a/src/MEGASync/google_breakpad/common/android/include/sys/ucontext.h b/src/MEGASync/google_breakpad/common/android/include/sys/ucontext.h
+--- a/src/MEGASync/google_breakpad/common/android/include/sys/ucontext.h	2017-11-19 14:46:02.394789297 +0000
++++ b/src/MEGASync/google_breakpad/common/android/include/sys/ucontext.h	2017-11-19 14:51:28.333847662 +0000
+@@ -53,9 +53,9 @@
+ // The ARM kernel uses a 64-bit signal mask.
+ typedef uint32_t  kernel_sigmask_t[2];
+ 
+-typedef struct ucontext {
++typedef ucontext_t {
+   uint32_t uc_flags;
+-  struct ucontext* uc_link;
++  ucontext_t* uc_link;
+   stack_t uc_stack;
+   mcontext_t uc_mcontext;
+   kernel_sigmask_t uc_sigmask;
+@@ -117,9 +117,9 @@
+ // The i386 kernel uses a 64-bit signal mask.
+ typedef uint32_t kernel_sigmask_t[2];
+ 
+-typedef struct ucontext {
++typedef ucontext_t {
+   uint32_t uc_flags;
+-  struct ucontext* uc_link;
++  ucontext_t* uc_link;
+   stack_t uc_stack;
+   mcontext_t uc_mcontext;
+   kernel_sigmask_t uc_sigmask;
+@@ -152,9 +152,9 @@
+ // The MIPS kernel uses a 128-bit signal mask.
+ typedef uint32_t kernel_sigmask_t[4];
+ 
+-typedef struct ucontext {
++typedef ucontext_t {
+   uint32_t uc_flags;
+-  struct ucontext* uc_link;
++  ucontext_t* uc_link;
+   stack_t uc_stack;
+   mcontext_t uc_mcontext;
+   kernel_sigmask_t uc_sigmask;
+diff -Naur a/src/MEGASync/google_breakpad/client/linux/minidump_writer/minidump_writer.cc b/src/MEGASync/google_breakpad/client/linux/minidump_writer/minidump_writer.cc
+--- a/src/MEGASync/google_breakpad/client/linux/minidump_writer/minidump_writer.cc	2017-11-19 15:03:10.536413558 +0000
++++ b/src/MEGASync/google_breakpad/client/linux/minidump_writer/minidump_writer.cc	2017-11-19 15:16:27.828131605 +0000
+@@ -177,7 +177,7 @@
+ // Juggle an x86 ucontext into minidump format
+ //   out: the minidump structure
+ //   info: the collection of register structures.
+-void CPUFillFromUContext(MDRawContextX86 *out, const ucontext *uc,
++void CPUFillFromUContext(MDRawContextX86 *out, const ucontext_t *uc,
+                          const struct _libc_fpstate* fp) {
+   const greg_t* regs = uc->uc_mcontext.gregs;
+ 
+@@ -277,7 +277,7 @@
+   my_memcpy(&out->flt_save.xmm_registers, &info.fpregs.xmm_space, 16 * 16);
+ }
+ 
+-void CPUFillFromUContext(MDRawContextAMD64 *out, const ucontext *uc,
++void CPUFillFromUContext(MDRawContextAMD64 *out, const ucontext_t *uc,
+                          const struct _libc_fpstate* fpregs) {
+   const greg_t* regs = uc->uc_mcontext.gregs;
+ 

diff --git a/net-misc/megasync/megasync-3.1.4.ebuild b/net-misc/megasync/megasync-3.1.4.ebuild
index 8e48f5a..d9f4493 100644
--- a/net-misc/megasync/megasync-3.1.4.ebuild
+++ b/net-misc/megasync/megasync-3.1.4.ebuild
@@ -64,6 +64,8 @@ RDEPEND="${DEPEND}
 		readline? ( sys-libs/readline:0 )
 		"
 
+PATCHES=( "${FILESDIR}/megasync-glibc2.26.patch" )
+
 if [[ ${PV} != *9999* ]];then
 	src_prepare(){
 		cp -r ../sdk-${SDK_COMMIT}/* src/MEGASync/mega

diff --git a/net-misc/megasync/megasync-3.1.4.ebuild b/net-misc/megasync/megasync-3.5.3.ebuild
similarity index 91%
copy from net-misc/megasync/megasync-3.1.4.ebuild
copy to net-misc/megasync/megasync-3.5.3.ebuild
index 8e48f5a..131d683 100644
--- a/net-misc/megasync/megasync-3.1.4.ebuild
+++ b/net-misc/megasync/megasync-3.5.3.ebuild
@@ -64,10 +64,15 @@ RDEPEND="${DEPEND}
 		readline? ( sys-libs/readline:0 )
 		"
 
+#PATCHES=( "${FILESDIR}/megasync-glibc2.26.patch" )
+
 if [[ ${PV} != *9999* ]];then
 	src_prepare(){
-		cp -r ../sdk-${SDK_COMMIT}/* src/MEGASync/mega
-		EPATCH_OPTS="-p0" epatch "${FILESDIR}/MEGAsync-3.1.4.0_Linux.patch"
+		# Not needed, since using git submodules
+		#cp -r ../sdk-${SDK_COMMIT}/* src/MEGASync/mega
+		if [ -e "${FILESDIR}/MEGAsync-${PV}.0_Linux.patch" ]; then
+			EPATCH_OPTS="-p0" epatch "${FILESDIR}/MEGAsync-${PV}.0_Linux.patch"
+		fi
 		eapply_user
 		cd src/MEGASync/mega
 		eautoreconf