* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. de6ef4d40adec7e1093b73c4397f042e830db15e
@ 2022-06-25 9:12 Peter Müller
0 siblings, 0 replies; only message in thread
From: Peter Müller @ 2022-06-25 9:12 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 14796 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via de6ef4d40adec7e1093b73c4397f042e830db15e (commit)
via 006309eaafb66136193356fc73bf0e5a63ab199e (commit)
via c9336f7a1f7f8293012b4a23db941039f9572b4c (commit)
from 2a4b5f0ab415e326cb1e5d55327867e440c9d7fc (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit de6ef4d40adec7e1093b73c4397f042e830db15e
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 24 14:14:26 2022 +0200
python3-msgpack: Required for build and execution of borgbackup 1.2.0
- New python module required for borgbackup. In borgbackup version 1.1.18 or 1.1.19
the old bundled msgpack in borgbackup was removed and a specified version range
of python3-msgpack required.
- This patch adds the lfs and rootfiles for this module
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit 006309eaafb66136193356fc73bf0e5a63ab199e
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 24 14:14:25 2022 +0200
python3-packaging: Moved to rootfiles/packages/ directory
- Required for borgbackup execution
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
commit c9336f7a1f7f8293012b4a23db941039f9572b4c
Author: Adolf Belka <adolf.belka(a)ipfire.org>
Date: Fri Jun 24 14:14:24 2022 +0200
borgbackup: Fix bug #12884 - borgbackup 1.2.0 crashes on running any borg command
- When borgbackup was upgraded from version 1.1.17 to 1.2.0 the build was sucessfully
completed but there was no testing feedback till after full release. It turned out
that it did not successfully run.
- python3-packaging which had been installed for the build of borgbackup needed to also
be available for the execution.
- When borgbackup was upgraded to 1.2.0 it was noticed that the old python3-msgpack was
no longer needed as borgbackup used its own bundled msgpack since around version 1.1.10
What was not seen was that in version 1.1.19 or 1.1.18 the bundled version of msgpack
had been removed and that the newer version of python3-msgpack now needed to be
installed but the version number has to meet the borgbackup requirements which currently
require it to be =<1.0.3
- This patch adds the python3-packaging and python3-msgpack modules as dependencies for
borgbackup
- The egg-info files are uncommented in the rootfile so that the borgbackup metadata can
be found by python.
- The updated borgbackup build together with the python3-packaging and python3-msgpack
modules were installed into a vm system using the .ipfire packages.
Successfully initialised a borgbackup repo and ran two backups to the repo and checked
the stats for the backup. Everything ran fine.
Fixes: Bug #12884
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/common/python3-packaging | 19 -------------------
config/rootfiles/packages/borgbackup | 14 +++++++-------
config/rootfiles/packages/python3-msgpack | 12 ++++++++++++
config/rootfiles/packages/python3-packaging | 19 +++++++++++++++++++
lfs/borgbackup | 4 ++--
lfs/{python3-pkgconfig => python3-msgpack} | 10 +++++-----
lfs/python3-packaging | 2 +-
make.sh | 1 +
8 files changed, 47 insertions(+), 34 deletions(-)
delete mode 100644 config/rootfiles/common/python3-packaging
create mode 100644 config/rootfiles/packages/python3-msgpack
create mode 100644 config/rootfiles/packages/python3-packaging
copy lfs/{python3-pkgconfig => python3-msgpack} (91%)
Difference in files:
diff --git a/config/rootfiles/common/python3-packaging b/config/rootfiles/common/python3-packaging
deleted file mode 100644
index 075e21455..000000000
--- a/config/rootfiles/common/python3-packaging
+++ /dev/null
@@ -1,19 +0,0 @@
-#usr/lib/python3.10/site-packages/packaging
-#usr/lib/python3.10/site-packages/packaging-21.3-py3.10.egg-info
-#usr/lib/python3.10/site-packages/packaging-21.3-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/packaging-21.3-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/packaging-21.3-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/packaging-21.3-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/packaging-21.3-py3.10.egg-info/top_level.txt
-#usr/lib/python3.10/site-packages/packaging/__about__.py
-#usr/lib/python3.10/site-packages/packaging/__init__.py
-#usr/lib/python3.10/site-packages/packaging/_manylinux.py
-#usr/lib/python3.10/site-packages/packaging/_musllinux.py
-#usr/lib/python3.10/site-packages/packaging/_structures.py
-#usr/lib/python3.10/site-packages/packaging/markers.py
-#usr/lib/python3.10/site-packages/packaging/py.typed
-#usr/lib/python3.10/site-packages/packaging/requirements.py
-#usr/lib/python3.10/site-packages/packaging/specifiers.py
-#usr/lib/python3.10/site-packages/packaging/tags.py
-#usr/lib/python3.10/site-packages/packaging/utils.py
-#usr/lib/python3.10/site-packages/packaging/version.py
diff --git a/config/rootfiles/packages/borgbackup b/config/rootfiles/packages/borgbackup
index a27b7c11c..b744b0b99 100644
--- a/config/rootfiles/packages/borgbackup
+++ b/config/rootfiles/packages/borgbackup
@@ -92,10 +92,10 @@ usr/lib/python3.10/site-packages/borg/upgrader.py
usr/lib/python3.10/site-packages/borg/version.py
usr/lib/python3.10/site-packages/borg/xattr.py
#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info
-#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/PKG-INFO
-#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/SOURCES.txt
-#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/dependency_links.txt
-#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/entry_points.txt
-#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/not-zip-safe
-#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/requires.txt
-#usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/top_level.txt
+usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/PKG-INFO
+usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/SOURCES.txt
+usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/dependency_links.txt
+usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/entry_points.txt
+usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/not-zip-safe
+usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/requires.txt
+usr/lib/python3.10/site-packages/borgbackup-1.2.0-py3.10.egg-info/top_level.txt
diff --git a/config/rootfiles/packages/python3-msgpack b/config/rootfiles/packages/python3-msgpack
new file mode 100644
index 000000000..c5e0e7a39
--- /dev/null
+++ b/config/rootfiles/packages/python3-msgpack
@@ -0,0 +1,12 @@
+usr/lib/python3.10/site-packages/msgpack
+#usr/lib/python3.10/site-packages/msgpack-1.0.3-py3.10.egg-info
+#usr/lib/python3.10/site-packages/msgpack-1.0.3-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/msgpack-1.0.3-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/msgpack-1.0.3-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/msgpack-1.0.3-py3.10.egg-info/top_level.txt
+usr/lib/python3.10/site-packages/msgpack/__init__.py
+usr/lib/python3.10/site-packages/msgpack/_cmsgpack.cpython-310-xxxMACHINExxx-linux-gnu.so
+usr/lib/python3.10/site-packages/msgpack/_version.py
+usr/lib/python3.10/site-packages/msgpack/exceptions.py
+usr/lib/python3.10/site-packages/msgpack/ext.py
+usr/lib/python3.10/site-packages/msgpack/fallback.py
diff --git a/config/rootfiles/packages/python3-packaging b/config/rootfiles/packages/python3-packaging
new file mode 100644
index 000000000..ef6d7497a
--- /dev/null
+++ b/config/rootfiles/packages/python3-packaging
@@ -0,0 +1,19 @@
+usr/lib/python3.10/site-packages/packaging
+#usr/lib/python3.10/site-packages/packaging-21.3-py3.10.egg-info
+#usr/lib/python3.10/site-packages/packaging-21.3-py3.10.egg-info/PKG-INFO
+#usr/lib/python3.10/site-packages/packaging-21.3-py3.10.egg-info/SOURCES.txt
+#usr/lib/python3.10/site-packages/packaging-21.3-py3.10.egg-info/dependency_links.txt
+#usr/lib/python3.10/site-packages/packaging-21.3-py3.10.egg-info/requires.txt
+#usr/lib/python3.10/site-packages/packaging-21.3-py3.10.egg-info/top_level.txt
+usr/lib/python3.10/site-packages/packaging/__about__.py
+usr/lib/python3.10/site-packages/packaging/__init__.py
+usr/lib/python3.10/site-packages/packaging/_manylinux.py
+usr/lib/python3.10/site-packages/packaging/_musllinux.py
+usr/lib/python3.10/site-packages/packaging/_structures.py
+usr/lib/python3.10/site-packages/packaging/markers.py
+usr/lib/python3.10/site-packages/packaging/py.typed
+usr/lib/python3.10/site-packages/packaging/requirements.py
+usr/lib/python3.10/site-packages/packaging/specifiers.py
+usr/lib/python3.10/site-packages/packaging/tags.py
+usr/lib/python3.10/site-packages/packaging/utils.py
+usr/lib/python3.10/site-packages/packaging/version.py
diff --git a/lfs/borgbackup b/lfs/borgbackup
index bfdc9e3ff..c2faaac21 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 = 11
+PAK_VER = 12
-DEPS = python3-pkgconfig
+DEPS = python3-pkgconfig python3-msgpack python3-packaging
SERVICES =
diff --git a/lfs/python3-msgpack b/lfs/python3-msgpack
new file mode 100644
index 000000000..d32820fdf
--- /dev/null
+++ b/lfs/python3-msgpack
@@ -0,0 +1,86 @@
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007-2020 IPFire Team <info(a)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.0.3
+SUMMARY = Python module for reading and writing MessagePack data
+
+THISAPP = msgpack-$(VER)
+DL_FILE = $(THISAPP).tar.gz
+DL_FROM = $(URL_IPFIRE)
+DIR_APP = $(DIR_SRC)/$(THISAPP)
+TARGET = $(DIR_INFO)/$(THISAPP)
+PROG = python3-msgpack
+PAK_VER = 1
+
+DEPS =
+
+SERVICES =
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_BLAKE2 = 308af03206fef18edb0acd3c1d91ccd28385731c02cb930e8f64786bbcd8925510cf4ca0b924830b84fd6eaa7edf91e6a43f79c77d856651768eeaa1ab8cf855
+
+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)
diff --git a/lfs/python3-packaging b/lfs/python3-packaging
index 836b93bd8..81697c115 100644
--- a/lfs/python3-packaging
+++ b/lfs/python3-packaging
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = python3-packaging
-PAK_VER = 1
+PAK_VER = 2
###############################################################################
# Top-level Rules
diff --git a/make.sh b/make.sh
index fde39bb29..ff58c75a9 100755
--- a/make.sh
+++ b/make.sh
@@ -1612,6 +1612,7 @@ buildipfire() {
lfsmake2 python3-arrow
lfsmake2 python3-terminaltables
lfsmake2 python3-pkgconfig
+ lfsmake2 python3-msgpack
lfsmake2 aws-cli
lfsmake2 oci-python-sdk
lfsmake2 oci-cli
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2022-06-25 9:12 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-25 9:12 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. de6ef4d40adec7e1093b73c4397f042e830db15e Peter Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox