- 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 adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- 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 info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # 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 =
- Previous update of python3-trio to 0.22.0 removed this dependency.
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- 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 info@ipfire.org # -# # -# 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 http://www.gnu.org/licenses/. # -# # -############################################################################### - -############################################################################### -# 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)
Fixes: Bug#13076 Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- .../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 info@ipfire.org # +# # +# 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 http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# 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)
Fixes: Bug#13076 Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- 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 info@ipfire.org # +# # +# 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 http://www.gnu.org/licenses/. # +# # +############################################################################### + +############################################################################### +# 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)
- 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 adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- .../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 info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # 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 ###############################################################################
Tested-by: Adolf Belka adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- 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 =
- 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 adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org --- 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
Hi All,
Could this patch set be reviewed for CU175.
The borgbackup fuse mount option stopped working since CU173. This patch set is the fix for that.
Regards, Adolf.
On 10/05/2023 15:04, Adolf Belka wrote:
- 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 adolf.belka@ipfire.org Signed-off-by: Adolf Belka adolf.belka@ipfire.org
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 info@ipfire.org # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # # # # 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 =
-
Adolf Belka