From patchwork Tue Feb 28 17:40:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 733708 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vXmCx5nzDz9s8K for ; Wed, 1 Mar 2017 04:44:13 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id C896030781; Tue, 28 Feb 2017 17:44:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZRLZ9zu82g3u; Tue, 28 Feb 2017 17:44:08 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 63D1F266B9; Tue, 28 Feb 2017 17:44:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id F32DE1C0485 for ; Tue, 28 Feb 2017 17:44:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id F19A082543 for ; Tue, 28 Feb 2017 17:44:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 1bXT7RJJ96Q7 for ; Tue, 28 Feb 2017 17:44:04 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id 9834D824D2 for ; Tue, 28 Feb 2017 17:44:03 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPSA id 0A1FB440677; Tue, 28 Feb 2017 19:44:00 +0200 (IST) From: Baruch Siach To: buildroot@busybox.net Date: Tue, 28 Feb 2017 19:40:29 +0200 Message-Id: X-Mailer: git-send-email 2.11.0 Subject: [Buildroot] [PATCH next] putty: bump to version 0.68 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop upstream patches. Signed-off-by: Baruch Siach --- package/putty/0001-uxcons-Fix-on-musl-libc.patch | 29 --------------------- ...02-Fix-__uint128_t-compile-error-on-MinGW.patch | 30 ---------------------- package/putty/putty.hash | 4 +-- package/putty/putty.mk | 2 +- 4 files changed, 3 insertions(+), 62 deletions(-) delete mode 100644 package/putty/0001-uxcons-Fix-on-musl-libc.patch delete mode 100644 package/putty/0002-Fix-__uint128_t-compile-error-on-MinGW.patch diff --git a/package/putty/0001-uxcons-Fix-on-musl-libc.patch b/package/putty/0001-uxcons-Fix-on-musl-libc.patch deleted file mode 100644 index 5f43af0d0555..000000000000 --- a/package/putty/0001-uxcons-Fix-on-musl-libc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4ae1577b432c1859704d2763f70a764dee23bd98 Mon Sep 17 00:00:00 2001 -From: Kylie McClain -Date: Thu, 28 Apr 2016 22:40:32 -0400 -Subject: [PATCH] uxcons: Fix on musl libc - -musl libc exports FD_SET and friends in sys/select.h. - -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit 4ae1577b432c - - unix/uxcons.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/unix/uxcons.c b/unix/uxcons.c -index b9fd67fe9274..f2a25f3fed70 100644 ---- a/unix/uxcons.c -+++ b/unix/uxcons.c -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - - #include "putty.h" - #include "storage.h" --- -2.8.1 - diff --git a/package/putty/0002-Fix-__uint128_t-compile-error-on-MinGW.patch b/package/putty/0002-Fix-__uint128_t-compile-error-on-MinGW.patch deleted file mode 100644 index 514b6298d93c..000000000000 --- a/package/putty/0002-Fix-__uint128_t-compile-error-on-MinGW.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3377ea57f5d333d65d44a1130161396782389e88 Mon Sep 17 00:00:00 2001 -From: Tim Kosse -Date: Tue, 11 Aug 2015 09:43:34 +0200 -Subject: [PATCH] Fix __uint128_t compile error on MinGW. - -MinGW has __uint128_t, but not __uint64_t. - -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit 3377ea57f5 - - sshbn.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sshbn.h b/sshbn.h -index a043241eea67..9366f614ae4c 100644 ---- a/sshbn.h -+++ b/sshbn.h -@@ -26,7 +26,7 @@ - * using the same 'two machine registers' kind of code generation that - * 32-bit targets use for 64-bit ints. If we have one of these, we can - * use a 64-bit BignumInt and a 128-bit BignumDblInt. */ --typedef __uint64_t BignumInt; -+typedef unsigned long long BignumInt; - typedef __uint128_t BignumDblInt; - #define BIGNUM_INT_MASK 0xFFFFFFFFFFFFFFFFULL - #define BIGNUM_TOP_BIT 0x8000000000000000ULL --- -2.8.1 - diff --git a/package/putty/putty.hash b/package/putty/putty.hash index 75990e417664..5aea4f308cd9 100644 --- a/package/putty/putty.hash +++ b/package/putty/putty.hash @@ -1,3 +1,3 @@ # Hashes from: http://the.earth.li/~sgtatham/putty/0.67/{sha256,sha512}sums -sha256 80192458e8a46229de512afeca5c757dd8fce09606b3c992fbaeeee29b994a47 putty-0.67.tar.gz -sha512 c2b17da46b8db3fe3837a10cb9cf5dd4b3ef6bfa15cadab83f3b87cf1479ed31fced90b774297ae53bdcbbdf230fc80d5c73d5ff3be6916fb591fd7ce3d35eca putty-0.67.tar.gz +sha256 7ba256f46e5a353cafe811ce7914d0e22a52bdfc0e6e2d183ad28b5af44cd09c putty-0.68.tar.gz +sha512 e3a6e4f45e1fce70d4cbb6d4769ab72b23c10920e48a88bba95b3f4c225b0193ddc1444e69d572bdec5e505d2c56fed365f07d990c156b35f272b56f978ef5d3 putty-0.68.tar.gz diff --git a/package/putty/putty.mk b/package/putty/putty.mk index 5155714c326a..a2a731e3ab6c 100644 --- a/package/putty/putty.mk +++ b/package/putty/putty.mk @@ -4,7 +4,7 @@ # ################################################################################ -PUTTY_VERSION = 0.67 +PUTTY_VERSION = 0.68 PUTTY_SITE = http://the.earth.li/~sgtatham/putty/$(PUTTY_VERSION) PUTTY_SUBDIR = unix PUTTY_LICENSE = MIT