From patchwork Tue Dec 7 17:35:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 4906 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4J7nX60fNvz3wt3 for ; Tue, 7 Dec 2021 17:36:06 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4J7nX41RkdzYR; Tue, 7 Dec 2021 17:36:04 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4J7nX40MPyz2yvg; Tue, 7 Dec 2021 17:36:04 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4J7nX3029hz2xSN for ; Tue, 7 Dec 2021 17:36:02 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (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 mail01.ipfire.org (Postfix) with ESMTPSA id 4J7nX23WjTzYR; Tue, 7 Dec 2021 17:36:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1638898562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ZhQMJlSyoCi1q78MWAJMrmYJ+2khGPryIfUDCYw7I7Q=; b=Q1aRvUzi5p99rh+rnOTUIFK58TgDzMahwEnqxLAV560GDvl38Cpwigf0rIrola1Bwfbb5V 7Y6IWYg3jyAuS63G9IqjEipp95usYtg9O78RcUPO90oMRbpUkVIBNjvPIB/Kd4h62ODZd0 YZWaoGpvWGhuACqUunGT6TfxcWk09Vw/5Z6FfTxV3CrNUvbuMTTdfGAHLbbQvbWpFvZN6Q FWkRtkGsEkb5EqrGJw12r/NC+DMkOyGo/sQKawiMdj52f1TqSUJF1zPGmCAAnHCVDSX/am fs1ErTHq349B8o79cjVxHkHmi71cw16k/qRb1mS3HQ/4FZXZ4mfo2+0MYd+JUQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1638898562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=ZhQMJlSyoCi1q78MWAJMrmYJ+2khGPryIfUDCYw7I7Q=; b=fkRdQHJm1lkxkJt1YzDFnLlcua7FnrfEvKtnQDZ26a8jIits+xTsSXa3KezAITqrcbLPAw cQnfulfhpFx/EICw== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] git: Update version to 2.34.1 Date: Tue, 7 Dec 2021 18:35:58 +0100 Message-Id: <20211207173558.1918586-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Update from 2.33.1 to 2.34.1 - Update of rootfile - The "--preserve-merges" option of "git rebase" has been removed. - Changelog is too large to include here. The changes for version 2.34.0 can be found in the source tarball in Documentation/RelNotes/2.34.0.txt and for version 2.34.1 in Documentation/RelNotes/2.34.1.txt Signed-off-by: Adolf Belka Reviewed-by: Michael Tremer --- config/rootfiles/packages/git | 1 - lfs/git | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/packages/git b/config/rootfiles/packages/git index 67e2015bc..0c803e964 100644 --- a/config/rootfiles/packages/git +++ b/config/rootfiles/packages/git @@ -121,7 +121,6 @@ usr/libexec/git-core/git-quiltimport usr/libexec/git-core/git-range-diff usr/libexec/git-core/git-read-tree usr/libexec/git-core/git-rebase -usr/libexec/git-core/git-rebase--preserve-merges usr/libexec/git-core/git-receive-pack usr/libexec/git-core/git-reflog usr/libexec/git-core/git-remote diff --git a/lfs/git b/lfs/git index 59610a6a1..ca9bfc1d5 100644 --- a/lfs/git +++ b/lfs/git @@ -24,7 +24,7 @@ include Config -VER = 2.33.1 +VER = 2.34.1 THISAPP = git-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = git -PAK_VER = 20 +PAK_VER = 21 DEPS = perl-Authen-SASL perl-MIME-Base64 perl-Net-SMTP-SSL @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 3462f34d9c17288eee854b7645f6a0a1 +$(DL_FILE)_MD5 = f442dade3c73ea39473f6700b3e04dcd install : $(TARGET)