From patchwork Mon Jan 13 12:35:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 1222105 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=tkos.co.il Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47xCk42L1lz9s1x for ; Mon, 13 Jan 2020 23:35:56 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 018FF20005; Mon, 13 Jan 2020 12:35:54 +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 TyUR0h8fkPKE; Mon, 13 Jan 2020 12:35:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id A481D20033; Mon, 13 Jan 2020 12:35:52 +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 374011BF399 for ; Mon, 13 Jan 2020 12:35:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 2F2E0847AB for ; Mon, 13 Jan 2020 12:35:51 +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 9RTAXPwavrEk for ; Mon, 13 Jan 2020 12:35:50 +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 5EEF2811F6 for ; Mon, 13 Jan 2020 12:35:50 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPS id D42244400C6; Mon, 13 Jan 2020 14:35:47 +0200 (IST) From: Baruch Siach To: buildroot@busybox.net Date: Mon, 13 Jan 2020 14:35:42 +0200 Message-Id: <3bc4ff78a19cf6d375b296acc01b79c3491258ee.1578918942.git.baruch@tkos.co.il> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2] package/socat: bump to version 1.7.3.4 X-BeenThere: buildroot@busybox.net 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Drop patch #2. Upstream commit d8a5d49c2d8359 includes stddef.h in a higher level header. Signed-off-by: Baruch Siach --- v2: Fix md5 hash --- ...h => 0002-compat-set-NETDB_INTERNAL.patch} | 0 ...002-ptrdiff_t-is-defined-in-stddef.h.patch | 28 ------------------- package/socat/socat.hash | 4 +-- package/socat/socat.mk | 2 +- 4 files changed, 3 insertions(+), 31 deletions(-) rename package/socat/{0003-compat-set-NETDB_INTERNAL.patch => 0002-compat-set-NETDB_INTERNAL.patch} (100%) delete mode 100644 package/socat/0002-ptrdiff_t-is-defined-in-stddef.h.patch diff --git a/package/socat/0003-compat-set-NETDB_INTERNAL.patch b/package/socat/0002-compat-set-NETDB_INTERNAL.patch similarity index 100% rename from package/socat/0003-compat-set-NETDB_INTERNAL.patch rename to package/socat/0002-compat-set-NETDB_INTERNAL.patch diff --git a/package/socat/0002-ptrdiff_t-is-defined-in-stddef.h.patch b/package/socat/0002-ptrdiff_t-is-defined-in-stddef.h.patch deleted file mode 100644 index acae641b34b6..000000000000 --- a/package/socat/0002-ptrdiff_t-is-defined-in-stddef.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 99c55f2694fe8621ca2344eb002610dac7f9c969 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 2 Feb 2016 09:34:24 -0300 -Subject: [PATCH] ptrdiff_t is defined in stddef.h - -Status: sent upstream via email. - -Signed-off-by: Gustavo Zacarias ---- - nestlex.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/nestlex.c b/nestlex.c -index f7950f0..f49482d 100644 ---- a/nestlex.c -+++ b/nestlex.c -@@ -4,6 +4,8 @@ - - /* a function for lexical scanning of nested character patterns */ - -+#include /* ptrdiff_t */ -+ - #include "config.h" - #include "mytypes.h" - --- -2.4.10 - diff --git a/package/socat/socat.hash b/package/socat/socat.hash index 92d62ab71642..e5b65925d191 100644 --- a/package/socat/socat.hash +++ b/package/socat/socat.hash @@ -1,7 +1,7 @@ # From http://www.dest-unreach.org/socat/download.md5sum -md5 b2a032a47b8b89a18485697fa975154f socat-1.7.3.3.tar.bz2 +md5 3cca4f8cd9d2d1caabd9cc099451bac9 socat-1.7.3.4.tar.bz2 # From http://www.dest-unreach.org/socat/download.sha256sum -sha256 0dd63ffe498168a4aac41d307594c5076ff307aa0ac04b141f8f1cec6594d04a socat-1.7.3.3.tar.bz2 +sha256 972374ca86f65498e23e3259c2ee1b8f9dbeb04d12c2a78c0c9b5d1cb97dfdfc socat-1.7.3.4.tar.bz2 # Locally calculated sha256 4846488cea98a2905dc75b7aa5eea721568e372447efe06b85bd896ee8c54f10 README sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING diff --git a/package/socat/socat.mk b/package/socat/socat.mk index 9e747e08fa62..3807d45379fc 100644 --- a/package/socat/socat.mk +++ b/package/socat/socat.mk @@ -4,7 +4,7 @@ # ################################################################################ -SOCAT_VERSION = 1.7.3.3 +SOCAT_VERSION = 1.7.3.4 SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 SOCAT_SITE = http://www.dest-unreach.org/socat/download SOCAT_LICENSE = GPL-2.0 with OpenSSL exception