From patchwork Sun Jul 2 11:04:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1802304 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Qv5mp6X24z20ZF for ; Sun, 2 Jul 2023 21:04:58 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 1E857408F8; Sun, 2 Jul 2023 11:04:56 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 1E857408F8 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pWWzoQMW-HQx; Sun, 2 Jul 2023 11:04:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id C1052408B4; Sun, 2 Jul 2023 11:04:53 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org C1052408B4 X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 46EDA1BF5E6 for ; Sun, 2 Jul 2023 11:04:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 1D704408B4 for ; Sun, 2 Jul 2023 11:04:52 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org 1D704408B4 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z_YIdvbjT0k6 for ; Sun, 2 Jul 2023 11:04:50 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp4.osuosl.org A3AE1408AD Received: from dd20012.kasserver.com (dd20012.kasserver.com [85.13.140.57]) by smtp4.osuosl.org (Postfix) with ESMTPS id A3AE1408AD for ; Sun, 2 Jul 2023 11:04:50 +0000 (UTC) Received: from fli4l.lan.fli4l (p54a1b71b.dip0.t-ipconnect.de [84.161.183.27]) by dd20012.kasserver.com (Postfix) with ESMTPSA id DA094A4C01A0; Sun, 2 Jul 2023 13:04:47 +0200 (CEST) Received: from bruckner.lan.fli4l ([192.168.1.1]:49006) by fli4l.lan.fli4l with esmtp (Exim 4.96) (envelope-from ) id 1qFusp-0005gh-1g; Sun, 02 Jul 2023 13:04:47 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sun, 2 Jul 2023 13:04:47 +0200 Message-Id: <20230702110447.1877621-1-bernd@kuhls.net> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spamd-Bar: + X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kuhls.net; s=kas202306131828; t=1688295887; bh=pN6eBciMv6LuwVevKJzfjyE0SmquW4nksGAu3h7J7uE=; h=From:To:Cc:Subject:Date:From; b=C3rbbjJW8Nt/ybBWBDisf04yct1sDXzdNwVNKA0aPXXcSCniQcT+oili3X7sC0JmL ejvDeVXLVb9jt877FZSe6cYXRTJ5BOcEJ173vQ+mjHnJwviy6AKVGtTRkJ4dTf3yPJ JwpHIssmvjJDnHYD3jnpnpTXMFKxM0P2HjkTxPlE/eZ6HcWEiFqwNocYFHQWZNWMDe UJ/88XdygDp8heOm7pKING43sgkC1aRa602XvrnR0YJaPNW0quBrmePWp6EZ6l5Tjl 6Lbj2OmmgRH7ng6iy9Ak1ajkFbkbEIZx9CcyjDMvUXEi60RWvq+4MwU6BcRV2LVOwQ IW1+TOdAmUekQ== X-Mailman-Original-Authentication-Results: smtp4.osuosl.org; dkim=pass (2048-bit key) header.d=kuhls.net header.i=@kuhls.net header.a=rsa-sha256 header.s=kas202306131828 header.b=C3rbbjJW Subject: [Buildroot] [PATCH v2 1/1] package/putty: bump version to 0.78 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Samuel Martin Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Changelog: https://www.chiark.greenend.org.uk/~sgtatham/putty/changes.html Removed patch, the patched file does not exist anymore in this release. Updated license hash due to copyright year bump: https://git.tartarus.org/?p=simon/putty.git;a=commitdiff;h=ce59d8bb4f7a1c6aff677d1431ec84a803a24091 Switched build system to cmake. Added optional dependency to libgtk3. Signed-off-by: Bernd Kuhls --- v2: fixed license hash, added optional dependency to libgtk3 (Peter) .checkpackageignore | 1 - ...1-unix-uxutils.h-fix-build-on-uclibc.patch | 41 ------------------- package/putty/putty.hash | 11 +++-- package/putty/putty.mk | 13 +++--- 4 files changed, 11 insertions(+), 55 deletions(-) delete mode 100644 package/putty/0001-unix-uxutils.h-fix-build-on-uclibc.patch diff --git a/.checkpackageignore b/.checkpackageignore index 7d544a6e61..0c003157d3 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1240,7 +1240,6 @@ package/pulseaudio/S50pulseaudio ConsecutiveEmptyLines EmptyLastLine Indent Vari package/pulseview/0001-Replace-obsolete-deprecated-Qt-methods.patch Upstream package/pulseview/0002-Fix-broken-build-due-to-C-template-behind-C-linkage.patch Upstream package/pulseview/0003-Support-glibmm-2.68.patch Upstream -package/putty/0001-unix-uxutils.h-fix-build-on-uclibc.patch Upstream package/python-aiohttp-remotes/0001-Fix-flit_core-build-requires-backend.patch Upstream package/python-automat/0001-Remove-uneeded-dependency-to-wheel.patch Upstream package/python-crossbar/0001-Avoid-intentional-syntax-error.patch Upstream diff --git a/package/putty/0001-unix-uxutils.h-fix-build-on-uclibc.patch b/package/putty/0001-unix-uxutils.h-fix-build-on-uclibc.patch deleted file mode 100644 index 78cef8b908..0000000000 --- a/package/putty/0001-unix-uxutils.h-fix-build-on-uclibc.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 3f30f3a7e3f07f5ca3cef0f405b02e22a018c6e4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 9 May 2021 15:22:29 +0200 -Subject: [PATCH] unix/uxutils.h: fix build on uclibc - -Build on uclibc is broken since version 0.75 and commit -65383082bf0c49cec63f4b36001a40bd9b13edf6 because AT_HWCAP2 is used -even if is not available: - -unix/uxutils.c: In function 'platform_aes_hw_available': -unix/uxutils.c:13:22: error: 'AT_HWCAP2' undeclared (first use in this function) - 13 | return getauxval(AT_HWCAP2) & HWCAP2_AES; - | ^~~~~~~~~ - -To fix this build failure, include - -Fixes: - - http://autobuild.buildroot.org/results/726f7c5ce13e78ed91e827b872e9d7ccfa13f298 - -Signed-off-by: Fabrice Fontaine -[Upstream status: sent to Simon Tatham ] ---- - unix/uxutils.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/unix/uxutils.h b/unix/uxutils.h -index c9acff53..b80bf972 100644 ---- a/unix/uxutils.h -+++ b/unix/uxutils.h -@@ -18,6 +18,8 @@ - - #if defined __arm__ || defined __aarch64__ - -+#include -+ - #ifdef HAVE_SYS_TYPES_H - #include - #endif --- -2.30.2 - diff --git a/package/putty/putty.hash b/package/putty/putty.hash index 861d45cb76..c691a4f975 100644 --- a/package/putty/putty.hash +++ b/package/putty/putty.hash @@ -1,8 +1,7 @@ -# Hashes from: http://the.earth.li/~sgtatham/putty/0.76/{md5,sha1,sha256,sha512}sums -md5 9d22f8c56c1eaa1c0af3098438f25908 putty-0.76.tar.gz -sha1 de09f50aee330eb05ad0cb81b970d0cc8e5c9b25 putty-0.76.tar.gz -sha256 547cd97a8daa87ef71037fab0773bceb54a8abccb2f825a49ef8eba5e045713f putty-0.76.tar.gz -sha512 4576b359593928c6eba923f2d7b66ac0f2cf00e0c217cdbbb124471c3b35feb090e623847bfc507a4ef106cb3067aac47419e241b11dd8bf4ae554061fa93c25 putty-0.76.tar.gz +# Hashes from: http://the.earth.li/~sgtatham/putty/0.78/{sha1,sha256,sha512}sums +sha1 198f01db6bea708e480fb11dd23026eda7b3f49f putty-0.78.tar.gz +sha256 274e01bcac6bd155dfd647b2f18f791b4b17ff313753aa919fcae2e32d34614f putty-0.78.tar.gz +sha512 d7a3e2eabd5f1f65fc0f3f1ee0789c30fbe891b57f63ddeac0b92befcb6aecd4a748f04a21c76ee42d992deb77c2e1a0454a71cc620ef26fbf23af660bd84bb5 putty-0.78.tar.gz # Locally calculated -sha256 3f3e870dd3d0867d79370b1d433602c60bb91b59de04e5d8f2a149b788530d53 LICENCE +sha256 7b10c93f0d582e820a9e6f8c6abbcff54192e41e60644f4d09b96b14fdbc74f8 LICENCE diff --git a/package/putty/putty.mk b/package/putty/putty.mk index e57a78be96..c591694659 100644 --- a/package/putty/putty.mk +++ b/package/putty/putty.mk @@ -4,18 +4,17 @@ # ################################################################################ -PUTTY_VERSION = 0.76 +PUTTY_VERSION = 0.78 PUTTY_SITE = http://the.earth.li/~sgtatham/putty/$(PUTTY_VERSION) PUTTY_LICENSE = MIT PUTTY_LICENSE_FILES = LICENCE PUTTY_CPE_ID_VENDOR = putty -PUTTY_CONF_OPTS = --disable-gtktest +PUTTY_DEPENDENCIES += host-pkgconf -ifeq ($(BR2_PACKAGE_LIBGTK2),y) -PUTTY_CONF_OPTS += --with-gtk=2 +ifeq ($(BR2_PACKAGE_LIBGTK3),y) +PUTTY_DEPENDENCIES += libgtk3 +else ifeq ($(BR2_PACKAGE_LIBGTK2),y) PUTTY_DEPENDENCIES += libgtk2 -else -PUTTY_CONF_OPTS += --without-gtk endif -$(eval $(autotools-package)) +$(eval $(cmake-package))