From patchwork Mon Jun 10 15:57:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vadym Kochan X-Patchwork-Id: 1113154 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X1JeJhvH"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 45MyTb4Wfyz9sBp for ; Tue, 11 Jun 2019 01:58:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 1EC7485C06; Mon, 10 Jun 2019 15:58:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iENA8ZggkjGl; Mon, 10 Jun 2019 15:58:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id C32F5842A4; Mon, 10 Jun 2019 15:58:06 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A7F0C1BF399 for ; Mon, 10 Jun 2019 15:58:05 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id A2F148552C for ; Mon, 10 Jun 2019 15:58:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6x5i65gIefr8 for ; Mon, 10 Jun 2019 15:58:03 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-lf1-f65.google.com (mail-lf1-f65.google.com [209.85.167.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 1A0F3850ED for ; Mon, 10 Jun 2019 15:58:03 +0000 (UTC) Received: by mail-lf1-f65.google.com with SMTP id y13so6989545lfh.9 for ; Mon, 10 Jun 2019 08:58:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=FIiq/CQKP/b/K0vnJGEJ3vhwUp+m2KS3pEgEU1uGF4M=; b=X1JeJhvH3uP2Mi57x3k/bMUn/7MTRwT253YUQPy72pIxxt2MT4CA82w00brsUAm6XP GHLcyaokNI4FQOXjDZhARhMAfgnjC4uH8spLCw4aCqbis7KYTa16hQtlyvcv7HDUuf/k HBMOL2KoW+hwz3u1dSyTbZE2j6qI/Ip6F4197POoKxaS38gSeKOWFTBrBSCs9Rd1cVpj lcos2QMMqkXB27Ucr1SxfhCx/YhMyzFUr3D5QV7p7kxsqoXjqDLDfZI6zXUimqi6WCcU 43Bddff09cPHmwiooOYv7Ce7GQRE32WTPIncoJCFBKHdjZYa9IbOwyE1RRfgbwjiMWoL YYkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=FIiq/CQKP/b/K0vnJGEJ3vhwUp+m2KS3pEgEU1uGF4M=; b=XaebGx63vwM2739IqJ+gg/MePF3GLK88jAg/q+oMRBvMZQZDJ84fJM8tppWe4DAcRt D9knigqlSzMd5NUHRTO1qzn+1RR7Iiu5qfj3SJbz7rdjGrXIOHOgOffiQVN8nUx5pZdN +2jl6/qJ+eicho/0NWE8uQPRng0qVsEEs9UVzDQ3d7nbGjv53WgxkpUXnimDkCZyhiCm spkjygYiN5yrl7iJwzL7XqdNjXdMIuOpf1kM41ydua+Q9EQDYhrGjegkKG7UeriBjE9y 43ZUNN5Vh6QXrfGuyMXMXoCgTohUQVb7N9OhrUQG+KgXxJfyVC3bKSJmwcxOo1PVyw8O i1fw== X-Gm-Message-State: APjAAAWkqRiAteWwc3hHCD/Hl7JR+ompa8PFKUZoTSBMDMVaggHp/g5q mKrhFO7bnlgjDGhHQ99ZcCHwrWtd X-Google-Smtp-Source: APXvYqz7qxTF7w/NU7rRST6GYH7AVHJTkaCpZKqJW+kVCWUIFIeGuiYqWIfy/TPg97d7vXRFXqDEHw== X-Received: by 2002:a19:ab1a:: with SMTP id u26mr27028056lfe.6.1560182281059; Mon, 10 Jun 2019 08:58:01 -0700 (PDT) Received: from lwo1-lhp-f71841.synapse.com ([195.234.74.207]) by smtp.gmail.com with ESMTPSA id h23sm2021938ljc.93.2019.06.10.08.58.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 10 Jun 2019 08:58:00 -0700 (PDT) From: Vadim Kochan X-Google-Original-From: Vadim Kochan To: buildroot@buildroot.org Date: Mon, 10 Jun 2019 18:57:55 +0300 Message-Id: <1560182275-11927-1-git-send-email-email@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [Buildroot] [PATCH 1/1] package/git: bump to version 2.22.0 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: , Cc: Vadim Kochan MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Vadim Kochan Remove patch with NLS fix because it is was added into latest version. Signed-off-by: Vadim Kochan --- ...1-configure.ac-Properly-check-for-libintl.patch | 49 ---------------------- package/git/git.hash | 2 +- package/git/git.mk | 2 +- 3 files changed, 2 insertions(+), 51 deletions(-) delete mode 100644 package/git/0001-configure.ac-Properly-check-for-libintl.patch diff --git a/package/git/0001-configure.ac-Properly-check-for-libintl.patch b/package/git/0001-configure.ac-Properly-check-for-libintl.patch deleted file mode 100644 index 2f367f5..0000000 --- a/package/git/0001-configure.ac-Properly-check-for-libintl.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 01da08fd60a0bdb2994f85f943dba148d9321d4d Mon Sep 17 00:00:00 2001 -From: Vadim Kochan -Date: Wed, 17 Apr 2019 01:25:40 +0300 -Subject: [PATCH 1/1] configure.ac: Properly check for libintl - -Some libc implementations like uclibc or musl provides -gettext stubs via libintl library but this case is not checked -by AC_CHECK_LIBRARY(c, gettext ...) because gcc has gettext as builtin -which passess the check. - -So check it with included libintl.h where gettext may unfold into -libintl_gettext which will cause check to fail if libintl_gettext are -needed to be linked with -lintl. - -Signed-off-by: Vadim Kochan ---- - configure.ac | 16 +++++++++++++--- - 1 file changed, 13 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7f84151..0b8e25f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -762,9 +762,19 @@ AC_CHECK_LIB([c], [basename], - GIT_CONF_SUBST([NEEDS_LIBGEN]) - test -n "$NEEDS_LIBGEN" && LIBS="$LIBS -lgen" - --AC_CHECK_LIB([c], [gettext], --[LIBC_CONTAINS_LIBINTL=YesPlease], --[LIBC_CONTAINS_LIBINTL=]) -+AC_DEFUN([LIBINTL_SRC], [ -+AC_LANG_PROGRAM([[ -+#include -+]],[[ -+char *msg = gettext("test"); -+]])]) -+ -+AC_MSG_CHECKING([if libc contains libintl]) -+AC_LINK_IFELSE([LIBINTL_SRC], -+ [AC_MSG_RESULT([yes]) -+ LIBC_CONTAINS_LIBINTL=YesPlease], -+ [AC_MSG_RESULT([no]) -+ LIBC_CONTAINS_LIBINTL=]) - GIT_CONF_SUBST([LIBC_CONTAINS_LIBINTL]) - - # --- -2.14.1 - diff --git a/package/git/git.hash b/package/git/git.hash index 35c8774..e02fd0d 100644 --- a/package/git/git.hash +++ b/package/git/git.hash @@ -1,4 +1,4 @@ # From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 dfb71b053cbc38a9c5b08c2fe8b5eae210b4e3b63892426923e10cfd6ba63862 git-2.16.5.tar.xz +sha256 159e4b599f8af4612e70b666600a3139541f8bacc18124daf2cbe8d1b934f29f git-2.22.0.tar.xz sha256 5b2198d1645f767585e8a88ac0499b04472164c0d2da22e75ecf97ef443ab32e COPYING sha256 1922f45d2c49e390032c9c0ba6d7cac904087f7cec51af30c2b2ad022ce0e76a LGPL-2.1 diff --git a/package/git/git.mk b/package/git/git.mk index 804a6e2..8d1fcd2 100644 --- a/package/git/git.mk +++ b/package/git/git.mk @@ -4,7 +4,7 @@ # ################################################################################ -GIT_VERSION = 2.16.5 +GIT_VERSION = 2.22.0 GIT_SOURCE = git-$(GIT_VERSION).tar.xz GIT_SITE = $(BR2_KERNEL_MIRROR)/software/scm/git GIT_LICENSE = GPL-2.0, LGPL-2.1+