From patchwork Wed May 10 13:04:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6848 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 4QGZxH2g8Gz3wk1 for ; Wed, 10 May 2023 13:04:35 +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 4QGZxC2BYzzdN; Wed, 10 May 2023 13:04:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4QGZxC0VM6z30JL; Wed, 10 May 2023 13:04:31 +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 4QGZxB1c9Gz2xg1 for ; Wed, 10 May 2023 13:04:30 +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 4QGZx76sY6zYq; Wed, 10 May 2023 13:04:27 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1683723868; 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=T5ch6P0hH/hXyhNqdLVjlUKhmPl9M9fWKXhIfCqkZzI=; b=IS3i1f97D/xJUgy0iPVBbVDrQhdxhzxUuhhxRAZKZx75PjPhzxy4joB6nmAH8L7lOQauZx ngINXGnHX7xjDbDg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1683723868; 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=T5ch6P0hH/hXyhNqdLVjlUKhmPl9M9fWKXhIfCqkZzI=; b=Mpa8RAit350JjxQQbAwf0mxFyLx1Q4CfpzpUKfNIFNHiLPplD4r1siNs+AmsrzO8uQQEDV OKrm5SnjVJ9MCNl6vnuxTjDZCv356elLxl+p3XQ/NAPCREO/ECbKJJLzKn2mv1z64zu49n f1pQD/4PIKeNWLboRQbOC4ezJhwe5SVXR+cqulQTo+duTgVKYJWVCl35z3OucHTeW+2bH1 zqYt41GjmaOeA2emlqQ4jkrlj3VPh6DwSkADDJ8LR1cYgDQXpbzRN8B3+yFM4Uoae5Stu9 g64a79eHRJjPIUVTjHW19ml4GIWAL/ntDKUkZUQrxAoCKeN5FsmO0gyGCXXJYg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 1/7] python3-trio: Fixes Bug#13076 - allows fuse mount to work again Date: Wed, 10 May 2023 15:04:16 +0200 Message-Id: <20230510130422.2676356-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" - In Core 173 python3-trio was updated to version 0.22.0 when python was upgraded to 3.10.8 Although the build of python3-trio was successful it was missed that there was a new run-time dependency of python3-exceptiongroup for python3-pyfuse3 to work. python2-flit_scm is required as a build dependency for python3-exceptiongroup. - The modified packages were installed in my vm testbed and confirmed that borg mount then worked again. - It was also noted that python3-attr was no longer needed neither as a runtime dependency nor as a build time dependency. - Dependencies line of python3-trio updated for these two changes. Fixes: Bug#13076 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- lfs/python3-trio | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lfs/python3-trio b/lfs/python3-trio index 2cae4bcf6..49f1207ab 100644 --- a/lfs/python3-trio +++ b/lfs/python3-trio @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team # +# Copyright (C) 2007-2023 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -33,9 +33,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = python3-trio -PAK_VER = 2 +PAK_VER = 3 -DEPS = python3-attr python3-async_generator python3-attrs python3-sniffio python3-sortedcontainers python3-outcome python3-idna +DEPS = python3-async_generator python3-attrs python3-sniffio python3-sortedcontainers python3-outcome python3-idna python3-exceptiongroup SERVICES = From patchwork Wed May 10 13:04:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6850 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4QGZxK2VJ1z3wlc for ; Wed, 10 May 2023 13:04:37 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4QGZxC5LTGz1GG; Wed, 10 May 2023 13:04:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4QGZxC1KkPz30JR; Wed, 10 May 2023 13:04:31 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4QGZxB23k5z2ybD for ; Wed, 10 May 2023 13:04:30 +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 4QGZx95dyFzdN; Wed, 10 May 2023 13:04:29 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1683723869; 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: in-reply-to:in-reply-to:references:references; bh=93yiQPxxLLSIrqu2CGlBQLHsZv/+IHWysu7qHunnIBg=; b=rZCsWmfwvt9e5ZTN5gECVOdKqqCaeQYbuqR0IYHbKthTLfVJkeG8ieCt6BwqtgCP3+0wdn HLdmSAXpvOzM4QDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1683723869; 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: in-reply-to:in-reply-to:references:references; bh=93yiQPxxLLSIrqu2CGlBQLHsZv/+IHWysu7qHunnIBg=; b=AXB4oUrcg7O2IsCgxKpZpJeTGRrs0UEKT+J+NsJPugLaz0z/RpH7397gfTPfvLp+8zdm5l gVjPpGK/qnsWhdKDltWlJAW0fi7Eume40W7l4tki0nzLxJqvDzCAR1HuMVWZbYwt5gogb4 iHnjoboRNk4d8vHXnvECmkv/TnBJzbuwTPQu0eXp/RsjGe00mzpnEXFfEz6xbwPajhtRQH Mm/uk7+IYhY+R4jpnuqU25koU6KrvrANYdjW0JzhWoUBCq1orQikFlNbmUrs8LIWsaFhMF DqPlwbueVQBvITE0COMBpZ+ICIi/ePxU8QamPoIWP12Xms3yNrw8qs0xd+B1oQ== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/7] python3-attr: Module no longer needed in the borgbackup dependency chain Date: Wed, 10 May 2023 15:04:17 +0200 Message-Id: <20230510130422.2676356-2-adolf.belka@ipfire.org> In-Reply-To: <20230510130422.2676356-1-adolf.belka@ipfire.org> References: <20230510130422.2676356-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" - Previous update of python3-trio to 0.22.0 removed this dependency. Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/rootfiles/packages/python3-attr | 7 --- lfs/python3-attr | 86 -------------------------- 2 files changed, 93 deletions(-) delete mode 100644 config/rootfiles/packages/python3-attr delete mode 100644 lfs/python3-attr diff --git a/config/rootfiles/packages/python3-attr b/config/rootfiles/packages/python3-attr deleted file mode 100644 index 138a4c08c..000000000 --- a/config/rootfiles/packages/python3-attr +++ /dev/null @@ -1,7 +0,0 @@ -#usr/lib/python3.10/site-packages/attr-0.3.2-py3.10.egg-info -#usr/lib/python3.10/site-packages/attr-0.3.2-py3.10.egg-info/PKG-INFO -#usr/lib/python3.10/site-packages/attr-0.3.2-py3.10.egg-info/SOURCES.txt -#usr/lib/python3.10/site-packages/attr-0.3.2-py3.10.egg-info/dependency_links.txt -#usr/lib/python3.10/site-packages/attr-0.3.2-py3.10.egg-info/top_level.txt -usr/lib/python3.10/site-packages/attr.py -usr/lib/python3.10/site-packages/dry_attr.py diff --git a/lfs/python3-attr b/lfs/python3-attr deleted file mode 100644 index 1be4d2b0c..000000000 --- a/lfs/python3-attr +++ /dev/null @@ -1,86 +0,0 @@ -############################################################################### -# # -# IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team # -# # -# This program is free software: you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation, either version 3 of the License, or # -# (at your option) any later version. # -# # -# This program is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with this program. If not, see . # -# # -############################################################################### - -############################################################################### -# Definitions -############################################################################### - -include Config - -VER = 0.3.2 -SUMMARY = Simple decorator to set attributes of target function or class in a DRY way - -THISAPP = attr-$(VER) -DL_FILE = $(THISAPP).tar.gz -DL_FROM = $(URL_IPFIRE) -DIR_APP = $(DIR_SRC)/$(THISAPP) -TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python3-attr -PAK_VER = 1 - -DEPS = - -SERVICES = - -############################################################################### -# Top-level Rules -############################################################################### - -objects = $(DL_FILE) - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) - -$(DL_FILE)_BLAKE2 = 7e2b145d6d416bc634a70ae7e88d1dc1e2bc65efa6163d53446de8942511768247439078df8fb3d51966b482a3b8603d4becfed6ccf365aea1b3156ba638ac6f - -install : $(TARGET) - -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -b2 : $(subst %,%_BLAKE2,$(objects)) - -dist: - @$(PAK) - -############################################################################### -# Downloading, checking, b2sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) - -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_BLAKE2,$(objects)) : - @$(B2SUM) - -############################################################################### -# Installation Details -############################################################################### - -$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) - @$(PREBUILD) - @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && python3 setup.py build - cd $(DIR_APP) && python3 setup.py install --root=/ - @rm -rf $(DIR_APP) - @$(POSTBUILD) From patchwork Wed May 10 13:04:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6849 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4QGZxJ5TcZz3wk1 for ; Wed, 10 May 2023 13:04:36 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4QGZxC5SqNz1VP; Wed, 10 May 2023 13:04:31 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4QGZxC1spQz30Jw; Wed, 10 May 2023 13:04:31 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4QGZxB2sKdz2ydg for ; Wed, 10 May 2023 13:04:30 +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 4QGZxB1S8zz1QH; Wed, 10 May 2023 13:04:30 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1683723870; 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: in-reply-to:in-reply-to:references:references; bh=GDKNvgHsPpHNWZkgfdEAy0SjmEQ2qx4fH1qNQqMNCV4=; b=qJT/z6XGAcu3p8M/HZpCOEtnRoOUIW6hi9NA4RDDhHIWqGZgUXgnWcwkkCL6NlTv89UCC7 i8NSPBXEEYrylSBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1683723870; 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: in-reply-to:in-reply-to:references:references; bh=GDKNvgHsPpHNWZkgfdEAy0SjmEQ2qx4fH1qNQqMNCV4=; b=wJbnV9Agx2/0/B8m8tX74xPMpbOo152e0F40VMIbIQokreQ0zVS/SpqVqFvXY5b/W/gpZc 6fwW7UyYFB6TO7se1GbFcRuOZ3JJjhOs3ppHYb5oEv8rvGzb7UuqbDcO5bXu3TBGsUhkES iQVKl8GMyhFsjnO16HwuNvVY1vvcrqZ94rJ7hX41dVk1ebVR9CFl5ooCvjD9hh5cKa2H0z tJmmEwKUhrh+qrUCCgFT6Wc6RQGpSMuEVl/obfesEQIn2BayUMQfBdoz9nS/4AKLNqSe7a HibzzNjdr+fLbgoqXIAUu4RiozQVpkZSYFMj1xGm71tKpTUfGfNmY3RvqwUlkg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 3/7] python3-exceptiongroup: Fixes Bug#13076 - New run time dependency for borgbackup fuse mount Date: Wed, 10 May 2023 15:04:18 +0200 Message-Id: <20230510130422.2676356-3-adolf.belka@ipfire.org> In-Reply-To: <20230510130422.2676356-1-adolf.belka@ipfire.org> References: <20230510130422.2676356-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" Fixes: Bug#13076 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- .../rootfiles/packages/python3-exceptiongroup | 15 +++ lfs/python3-exceptiongroup | 95 +++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 config/rootfiles/packages/python3-exceptiongroup create mode 100644 lfs/python3-exceptiongroup diff --git a/config/rootfiles/packages/python3-exceptiongroup b/config/rootfiles/packages/python3-exceptiongroup new file mode 100644 index 000000000..0ed2ae1f5 --- /dev/null +++ b/config/rootfiles/packages/python3-exceptiongroup @@ -0,0 +1,15 @@ +usr/lib/python3.10/site-packages/exceptiongroup +#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info +#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/INSTALLER +#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/LICENSE +#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/METADATA +#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/RECORD +#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/REQUESTED +#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/WHEEL +#usr/lib/python3.10/site-packages/exceptiongroup-1.1.1.dist-info/direct_url.json +usr/lib/python3.10/site-packages/exceptiongroup/__init__.py +usr/lib/python3.10/site-packages/exceptiongroup/_catch.py +usr/lib/python3.10/site-packages/exceptiongroup/_exceptions.py +usr/lib/python3.10/site-packages/exceptiongroup/_formatting.py +usr/lib/python3.10/site-packages/exceptiongroup/_version.py +usr/lib/python3.10/site-packages/exceptiongroup/py.typed diff --git a/lfs/python3-exceptiongroup b/lfs/python3-exceptiongroup new file mode 100644 index 000000000..f1de6bb6f --- /dev/null +++ b/lfs/python3-exceptiongroup @@ -0,0 +1,95 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2023 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.1.1 +SUMMARY = This is a backport of the BaseExceptionGroup and ExceptionGroup classes from Python 3.11. + +THISAPP = exceptiongroup-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = python3-exceptiongroup +PAK_VER = 1 + +DEPS = + +SERVICES = + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = c396d1e1ab15265e06d76d11e6cbbff5c4e52284f890d727aab65d0ab40fcd17e3db8827ba4bba6b34d13f66606ca34ac8bcc361dd4aecf9afe624d5001de327 + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +dist: + @$(PAK) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && python3 -m build \ + --no-isolation \ + --wheel + cd $(DIR_APP) && pip3 install \ + --no-build-isolation \ + --root="/" \ + --no-deps \ + --ignore-installed \ + dist/*.whl + # remove temp build files in /root/.cache from rootfile + cd $(DIR_APP) && rm -R /root/.cache/ + @rm -rf $(DIR_APP) + @$(POSTBUILD) From patchwork Wed May 10 13:04:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6851 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4QGZxK6FRJz3wk1 for ; Wed, 10 May 2023 13:04:37 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4QGZxD1rXBz1XX; Wed, 10 May 2023 13:04:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4QGZxC2Mszz30Km; Wed, 10 May 2023 13:04:31 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4QGZxB47LGz2ybD for ; Wed, 10 May 2023 13:04:30 +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 4QGZxB2hT1zdN; Wed, 10 May 2023 13:04:30 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1683723870; 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: in-reply-to:in-reply-to:references:references; bh=Aa4RruK88WZApurjjE3veEQeoxNDrwn48Ksg9361Lfk=; b=4dzoCwTDf987+MOdWur7YmhGXRQqHbwfjrYJ5VqvAcUndy0bFh9cJzh/8MnxNQEVNYeLkH /LUur0snnaOBNaAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1683723870; 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: in-reply-to:in-reply-to:references:references; bh=Aa4RruK88WZApurjjE3veEQeoxNDrwn48Ksg9361Lfk=; b=pGqIyNHP1AnHiFj1eMOw50OnuXVSldE1lhggt0Ee/xciYsTd7eyiMcnbMk6LOUUd+kI1/5 M0YxKRqTly49ky/mwcHmC95Np0Dw8DVrJeruBTbhk7vXl/Ag3GKhqUnN5j1CFUDoBTgOr5 q1tOuNtOQpwhOv2byKoM/fpnwD+5rmQkWbOXaoEqnx6NCrXX7AxKHyoM1QtG4BhtMUyzJ2 qjogcVL7FKKaV8Qb5GHregqOPQRxD2JpxGLsrzfRsUZ1/xFlLCqX6S5BaCe8ubx38M8ZWn mx9buyaOtr1UwrvBYhTrM/lfTVquahP0aSEr2kTxUXL0GbyHRnC1nor2Ece60w== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 4/7] python3-flit_scm: Fixes Bug#13076 - Build time dependency for python3-exceptiongroup Date: Wed, 10 May 2023 15:04:19 +0200 Message-Id: <20230510130422.2676356-4-adolf.belka@ipfire.org> In-Reply-To: <20230510130422.2676356-1-adolf.belka@ipfire.org> References: <20230510130422.2676356-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" Fixes: Bug#13076 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/rootfiles/common/python3-flit_scm | 11 +++ lfs/python3-flit_scm | 86 ++++++++++++++++++++++++ 2 files changed, 97 insertions(+) create mode 100644 config/rootfiles/common/python3-flit_scm create mode 100644 lfs/python3-flit_scm diff --git a/config/rootfiles/common/python3-flit_scm b/config/rootfiles/common/python3-flit_scm new file mode 100644 index 000000000..9634ac460 --- /dev/null +++ b/config/rootfiles/common/python3-flit_scm @@ -0,0 +1,11 @@ +#usr/lib/python3.10/site-packages/flit_scm +#usr/lib/python3.10/site-packages/flit_scm-1.7.0.dist-info +#usr/lib/python3.10/site-packages/flit_scm-1.7.0.dist-info/INSTALLER +#usr/lib/python3.10/site-packages/flit_scm-1.7.0.dist-info/LICENSE +#usr/lib/python3.10/site-packages/flit_scm-1.7.0.dist-info/METADATA +#usr/lib/python3.10/site-packages/flit_scm-1.7.0.dist-info/RECORD +#usr/lib/python3.10/site-packages/flit_scm-1.7.0.dist-info/REQUESTED +#usr/lib/python3.10/site-packages/flit_scm-1.7.0.dist-info/WHEEL +#usr/lib/python3.10/site-packages/flit_scm-1.7.0.dist-info/direct_url.json +#usr/lib/python3.10/site-packages/flit_scm/__init__.py +#usr/lib/python3.10/site-packages/flit_scm/_version.py diff --git a/lfs/python3-flit_scm b/lfs/python3-flit_scm new file mode 100644 index 000000000..0201045e9 --- /dev/null +++ b/lfs/python3-flit_scm @@ -0,0 +1,86 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2023 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### + +############################################################################### +# Definitions +############################################################################### + +include Config + +VER = 1.7.0 +SUMMARY = A PEP 518 build backend that uses setuptools_scm to generate a version file from your version control system, then flit_core to build the package. + +THISAPP = flit_scm-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) + +############################################################################### +# Top-level Rules +############################################################################### + +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = a9363dbb759ef49f1bcab44f2ff51e27451ef3c4bd7cbde4e5cb534854bd1833ac85f90a908a55ff3de274980ef841cf8e8c00d428741aa967305f1f0235842d + +install : $(TARGET) + +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) + +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) + +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) + +############################################################################### +# Installation Details +############################################################################### + +$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + @$(PREBUILD) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && python3 -m build \ + --no-isolation \ + --wheel + cd $(DIR_APP) && pip3 install \ + --no-build-isolation \ + --root="/" \ + --no-deps \ + --ignore-installed \ + dist/*.whl + # remove temp build files in /root/.cache from rootfile + cd $(DIR_APP) && rm -R /root/.cache/ + @rm -rf $(DIR_APP) + @$(POSTBUILD) From patchwork Wed May 10 13:04:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6852 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4QGZxL6Rg8z3wlc for ; Wed, 10 May 2023 13:04:38 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4QGZxD68HXz1Xf; Wed, 10 May 2023 13:04:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4QGZxD3L8cz30JR; Wed, 10 May 2023 13:04:32 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4QGZxB5Fvgz2ydg for ; Wed, 10 May 2023 13:04:30 +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 4QGZxB3ymCz1GG; Wed, 10 May 2023 13:04:30 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1683723870; 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: in-reply-to:in-reply-to:references:references; bh=YPgt29itUH/etEgHwCVX5QGZNyM85i+830YHsL8/bZQ=; b=04uoVjNom0NyzkF+13Hk+yeACz60d8qCuUz9+rICR9WE/s+4tcM/OJak5RNvwsAgI6ej1l fBrLGc+EY/K5/oDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1683723870; 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: in-reply-to:in-reply-to:references:references; bh=YPgt29itUH/etEgHwCVX5QGZNyM85i+830YHsL8/bZQ=; b=h7bTYPupqqAeAMk6nm8egNs6pn5MwO5zSk0FSI6XbM7eY24BZMGqI6/st3zYEUPRUn6wHf Fh0XiYrSTHPg3hSdk8FZLkpFiQ/Hhq99OO9Of7Cyj2cF/eYOyrdFK5LsGJb1EhMpkf6EaD Y4HYitWqzRvZbcRbvkqvyCY2cPrWl5rmd5mBWRxfbFgUyH2Nu0HVNnjfjuEWvp9zrYPz0B YP7q2ryupzwf9Vot5MjagcuYwxpERXLsywfCsQVJySa+AQ6htBR/VaEM1I6H40XSX48t/c qGBqiC/oJhQw1+j8ECy3WcdWSzG6hYOqLr+bfYqUUxdmCVi4Yx9UT6T4x/cb5w== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 5/7] python3-pkgconfig: Identified that this module is only required as a build time dependency Date: Wed, 10 May 2023 15:04:20 +0200 Message-Id: <20230510130422.2676356-5-adolf.belka@ipfire.org> In-Reply-To: <20230510130422.2676356-1-adolf.belka@ipfire.org> References: <20230510130422.2676356-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" - Moved rootfile from common to packages and commented out all entries. - Updated lfs file from addon to core package that is only used for build Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- .../rootfiles/{packages => common}/python3-pkgconfig | 6 +++--- lfs/python3-pkgconfig | 11 +---------- 2 files changed, 4 insertions(+), 13 deletions(-) rename config/rootfiles/{packages => common}/python3-pkgconfig (71%) diff --git a/config/rootfiles/packages/python3-pkgconfig b/config/rootfiles/common/python3-pkgconfig similarity index 71% rename from config/rootfiles/packages/python3-pkgconfig rename to config/rootfiles/common/python3-pkgconfig index 54c0155a4..8f436a3eb 100644 --- a/config/rootfiles/packages/python3-pkgconfig +++ b/config/rootfiles/common/python3-pkgconfig @@ -1,8 +1,8 @@ -usr/lib/python3.10/site-packages/pkgconfig +#usr/lib/python3.10/site-packages/pkgconfig #usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info #usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/PKG-INFO #usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/SOURCES.txt #usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/dependency_links.txt #usr/lib/python3.10/site-packages/pkgconfig-1.5.5-py3.10.egg-info/top_level.txt -usr/lib/python3.10/site-packages/pkgconfig/__init__.py -usr/lib/python3.10/site-packages/pkgconfig/pkgconfig.py +#usr/lib/python3.10/site-packages/pkgconfig/__init__.py +#usr/lib/python3.10/site-packages/pkgconfig/pkgconfig.py diff --git a/lfs/python3-pkgconfig b/lfs/python3-pkgconfig index a91aca39b..7cf18988d 100644 --- a/lfs/python3-pkgconfig +++ b/lfs/python3-pkgconfig @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2020 IPFire Team # +# Copyright (C) 2007-2023 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -32,12 +32,6 @@ DL_FILE = $(THISAPP).tar.gz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -PROG = python3-pkgconfig -PAK_VER = 1 - -DEPS = - -SERVICES = ############################################################################### # Top-level Rules @@ -57,9 +51,6 @@ download :$(patsubst %,$(DIR_DL)/%,$(objects)) b2 : $(subst %,%_BLAKE2,$(objects)) -dist: - @$(PAK) - ############################################################################### # Downloading, checking, b2sum ############################################################################### From patchwork Wed May 10 13:04:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6854 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4QGZxP451nz3wlc for ; Wed, 10 May 2023 13:04:41 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4QGZxF1XqRz1TK; Wed, 10 May 2023 13:04:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4QGZxD45H5z30Jw; Wed, 10 May 2023 13:04:32 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4QGZxB6kzNz2ydg for ; Wed, 10 May 2023 13:04:30 +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 4QGZxB57T0zdN; Wed, 10 May 2023 13:04:30 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1683723870; 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: in-reply-to:in-reply-to:references:references; bh=qEwJ4M7b0ouZQxIixJT57c9V2JqtL88kthajfV7/IYY=; b=4CbZSqN0eC9Yfxq0x5sSMlYviBcFWmKbjOftBV08VE1/cDmSWs205v5/yGjZxOiLCnPUmU MzTZw+6xqDVXw3CQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1683723870; 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: in-reply-to:in-reply-to:references:references; bh=qEwJ4M7b0ouZQxIixJT57c9V2JqtL88kthajfV7/IYY=; b=pL6ePD7FTAa2dVIhv38vb9VEcopqsV/6WSKAvvyKJahbRuqUrQD4XwMFV2YO6cqi9TNV38 yTiKYW5Rx89zcNjprMeMn3Zt+9kEFU/s1j2vS1pTtuAnTgoR6iz6h5vY9QXEpFbNFmlLEM owqJLP8133ciLCusD8oCQJo2qjaDEdUiDmscZ7sBFTk7SHA4QoNTQYPjyhjkJeJfODyqZz aGRPRTgeTFE4siCDIcKfAAo79IQDCUh3eM5wYKs1RwSilcZ43rUcajxuHkoc5EXR9uxhjI DmrEwIvKqj0A9YXEIc3uurgKZS44j0B3Ga/kMg8EaFYqX+LaS+CPzUELyt6DDg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 6/7] borgbackup: Removed python3-pkgconfig as run time dependency Date: Wed, 10 May 2023 15:04:21 +0200 Message-Id: <20230510130422.2676356-6-adolf.belka@ipfire.org> In-Reply-To: <20230510130422.2676356-1-adolf.belka@ipfire.org> References: <20230510130422.2676356-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" Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- lfs/borgbackup | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lfs/borgbackup b/lfs/borgbackup index 0cbb809b7..79d6446ee 100644 --- a/lfs/borgbackup +++ b/lfs/borgbackup @@ -33,9 +33,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = borgbackup -PAK_VER = 14 +PAK_VER = 15 -DEPS = python3-pkgconfig python3-msgpack python3-packaging python3-pyfuse3 +DEPS = python3-msgpack python3-packaging python3-pyfuse3 # borgbackup only works with specific versions of python3-msgpack SERVICES = From patchwork Wed May 10 13:04:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6853 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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4QGZxP2hZ0z3wk1 for ; Wed, 10 May 2023 13:04:41 +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) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4QGZxF5jrcz1VR; Wed, 10 May 2023 13:04:33 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4QGZxD4XRcz30L2; Wed, 10 May 2023 13:04:32 +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) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4QGZxC4NB1z30JD for ; Wed, 10 May 2023 13:04:31 +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 4QGZxB6d6Nz1GG; Wed, 10 May 2023 13:04:30 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1683723871; 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: in-reply-to:in-reply-to:references:references; bh=JF2rjyixtFSz3STMxE+u+TIvzqwmKILsQGR4p04dGv4=; b=PumomklNqdIjSCVobnutn5Z5RVHWKuIzntTtMXdjGfD/d4KLIqAY4J/kmyNig6ro3oB0PN 5RWZurtWW674kODw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1683723871; 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: in-reply-to:in-reply-to:references:references; bh=JF2rjyixtFSz3STMxE+u+TIvzqwmKILsQGR4p04dGv4=; b=KArCDlsX83ljKa8+JFjfp7wB1q0melWrIrjerRag/DiqtixxWKduRNQs1lPsP2MsekfRoo c1Mf6zPl0goVMSr/sXq6Vfo6r3OcwNn74We/3bj5P60KS00bxwu05wnfCaZNvYU3zJ+uki 8VCqrSRNNEymFCIwZa4XiranClK9WrpkoUN88WMP1a0qG+F36tI7G8urXRwtK98z0MYKwq YtGE1oAw3GRt371b2V8hD7fSVn+HW/PtEZoO3xKdcayGs27AYV0hjUTMQAjgEbvF8hM55q aqdR8OSBvaDwkDbB68SLRF8MpGFHX1q3lYdru18gKy2PEVXIrlGXhCQ9+G7n5A== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 7/7] make.sh: Fixes Bug#13076 Date: Wed, 10 May 2023 15:04:22 +0200 Message-Id: <20230510130422.2676356-7-adolf.belka@ipfire.org> In-Reply-To: <20230510130422.2676356-1-adolf.belka@ipfire.org> References: <20230510130422.2676356-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" - Adds borgbackup run time dependency - python3-exceptiongroup - Adds python3-exceptiongroup build time dependency - python3-flit_scm - Removes python3-attr that is no longer required in borgbackup dependency chain Fixes: Bug#13076 Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- make.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/make.sh b/make.sh index 6eafd62d9..e0ea7326c 100755 --- a/make.sh +++ b/make.sh @@ -1606,12 +1606,13 @@ buildipfire() { lfsmake2 python3-terminaltables lfsmake2 python3-pkgconfig lfsmake2 python3-msgpack - lfsmake2 python3-attr lfsmake2 python3-attrs lfsmake2 python3-sniffio lfsmake2 python3-sortedcontainers lfsmake2 python3-outcome lfsmake2 python3-async_generator + lfsmake2 python3-flit_scm + lfsmake2 python3-exceptiongroup lfsmake2 python3-trio lfsmake2 python3-pyfuse3 lfsmake2 aws-cli