From 37709171c993983ad1909083ffb5b7a6860e4b25 Mon Sep 17 00:00:00 2001 From: Marian Csontos Date: Wed, 2 Aug 2023 15:15:49 +0200 Subject: [PATCH] New upstream release v2.03.22 --- ...ompile-script-works-with-Python-3.12.patch | 261 ------------------ LVM2.2.03.21.tgz.asc | 16 -- LVM2.2.03.22.tgz.asc | 16 ++ lvm2.spec | 15 +- sources | 2 +- upstream | 2 +- 6 files changed, 25 insertions(+), 287 deletions(-) delete mode 100644 0001-Update-the-py-compile-script-works-with-Python-3.12.patch delete mode 100644 LVM2.2.03.21.tgz.asc create mode 100644 LVM2.2.03.22.tgz.asc diff --git a/0001-Update-the-py-compile-script-works-with-Python-3.12.patch b/0001-Update-the-py-compile-script-works-with-Python-3.12.patch deleted file mode 100644 index 7b3f0d2..0000000 --- a/0001-Update-the-py-compile-script-works-with-Python-3.12.patch +++ /dev/null @@ -1,261 +0,0 @@ -From 00d42c89d97315594bb715805462826899e62bd0 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Tue, 4 Jul 2023 15:12:55 -0700 -Subject: [PATCH] Update the py-compile script (works with Python 3.12) - -The version of automake's py-compile that lvm2 carries around in -autoconf/ is ancient. Particularly, it assumes the 'imp' module -exists, which as of Python 3.12 is no longer a safe assumption. -This just updates lvm2's copy of the file to the latest version -in upstream automake - -https://raw.githubusercontent.com/autotools-mirror/automake/4bd4640e03670e267d9763d377f107c09b4f2202/lib/py-compile -. From a quick look at the changes, the interface shouldn't have -changed, this should just work better with modern Python. - -Signed-off-by: Adam Williamson ---- - autoconf/py-compile | 162 ++++++++++++++++++++++++++++++++------------ - 1 file changed, 117 insertions(+), 45 deletions(-) - -diff --git a/autoconf/py-compile b/autoconf/py-compile -index bc2039140..d11962e96 100755 ---- a/autoconf/py-compile -+++ b/autoconf/py-compile -@@ -1,9 +1,9 @@ - #!/bin/sh - # py-compile - Compile a Python program - --scriptversion=2011-06-08.12; # UTC -+scriptversion=2023-03-30.00; # UTC - --# Copyright (C) 2000-2014 Free Software Foundation, Inc. -+# Copyright (C) 2000-2023 Free Software Foundation, Inc. - - # 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 -@@ -16,7 +16,7 @@ scriptversion=2011-06-08.12; # UTC - # 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 . -+# along with this program. If not, see . - - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -27,7 +27,7 @@ scriptversion=2011-06-08.12; # UTC - # bugs to or send patches to - # . - --if [ -z "$PYTHON" ]; then -+if test -z "$PYTHON"; then - PYTHON=python - fi - -@@ -62,13 +62,19 @@ while test $# -ne 0; do - ;; - -h|--help) - cat <<\EOF --Usage: py-compile [--help] [--version] [--basedir DIR] [--destdir DIR] FILES..." -+Usage: py-compile [options] FILES... - - Byte compile some python scripts FILES. Use --destdir to specify any - leading directory path to the FILES that you don't want to include in the - byte compiled file. Specify --basedir for any additional path information you - do want to be shown in the byte compiled file. - -+Options: -+ --basedir DIR Prefix all FILES with DIR, and include in error messages. -+ --destdir DIR Prefix all FILES with DIR before compiling. -+ -v, --version Display version information. -+ -h, --help This help screen. -+ - Example: - py-compile --destdir /tmp/pkg-root --basedir /usr/share/test test.py test2.py - -@@ -94,77 +100,143 @@ EOF - shift - done - --files=$* --if test -z "$files"; then -- usage_error "no files given" -+if test $# -eq 0; then -+ usage_error "no files given" - fi - - # if basedir was given, then it should be prepended to filenames before - # byte compilation. --if [ -z "$basedir" ]; then -- pathtrans="path = file" -+if test -z "$basedir"; then -+ pathtrans="path = file" - else -- pathtrans="path = os.path.join('$basedir', file)" -+ pathtrans="path = os.path.join('$basedir', file)" - fi - - # if destdir was given, then it needs to be prepended to the filename to - # byte compile but not go into the compiled file. --if [ -z "$destdir" ]; then -- filetrans="filepath = path" -+if test -z "$destdir"; then -+ filetrans="filepath = path" - else -- filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)" -+ filetrans="filepath = os.path.normpath('$destdir' + os.sep + path)" - fi - --$PYTHON -c " --import sys, os, py_compile, imp -+python_major=`$PYTHON -c 'import sys; print(sys.version_info[0])'` -+if test -z "$python_major"; then -+ usage_error "could not determine $PYTHON major version" -+fi - --files = '''$files''' -+case $python_major in -+[01]) -+ usage_error "python version 0.x and 1.x not supported" -+ ;; -+esac -+ -+python_minor=`$PYTHON -c 'import sys; print(sys.version_info[1])'` -+ -+# NB: When adding support for newer versions, prefer copying & adding new cases -+# rather than try to keep things merged with shell variables. -+ -+# First byte compile (no optimization) all the modules. -+# This works for all currently known Python versions. -+$PYTHON -c " -+import sys, os, py_compile -+ -+try: -+ import importlib -+except ImportError: -+ importlib = None -+ -+# importlib.util.cache_from_source was added in 3.4 -+if ( -+ hasattr(importlib, 'util') -+ and hasattr(importlib.util, 'cache_from_source') -+): -+ destpath = importlib.util.cache_from_source -+else: -+ destpath = lambda filepath: filepath + 'c' - - sys.stdout.write('Byte-compiling python modules...\n') --for file in files.split(): -+for file in sys.argv[1:]: - $pathtrans - $filetrans -- if not os.path.exists(filepath) or not (len(filepath) >= 3 -- and filepath[-3:] == '.py'): -- continue -- sys.stdout.write(file) -+ if ( -+ not os.path.exists(filepath) -+ or not (len(filepath) >= 3 and filepath[-3:] == '.py') -+ ): -+ continue -+ sys.stdout.write(file + ' ') - sys.stdout.flush() -- if hasattr(imp, 'get_tag'): -- py_compile.compile(filepath, imp.cache_from_source(filepath), path) -- else: -- py_compile.compile(filepath, filepath + 'c', path) --sys.stdout.write('\n')" || exit $? -+ py_compile.compile(filepath, destpath(filepath), path) -+sys.stdout.write('\n')" "$@" || exit $? - --# this will fail for python < 1.5, but that doesn't matter ... -+# Then byte compile w/optimization all the modules. - $PYTHON -O -c " --import sys, os, py_compile, imp -- --# pypy does not use .pyo optimization --if hasattr(sys, 'pypy_translation_info'): -+import sys, os, py_compile -+ -+try: -+ import importlib -+except ImportError: -+ importlib = None -+ -+# importlib.util.cache_from_source was added in 3.4 -+if ( -+ hasattr(importlib, 'util') -+ and hasattr(importlib.util, 'cache_from_source') -+): -+ destpath = importlib.util.cache_from_source -+else: -+ destpath = lambda filepath: filepath + 'o' -+ -+# pypy2 does not use .pyo optimization -+if sys.version_info.major <= 2 and hasattr(sys, 'pypy_translation_info'): - sys.exit(0) - --files = '''$files''' - sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n') --for file in files.split(): -+for file in sys.argv[1:]: -+ $pathtrans -+ $filetrans -+ if ( -+ not os.path.exists(filepath) -+ or not (len(filepath) >= 3 and filepath[-3:] == '.py') -+ ): -+ continue -+ sys.stdout.write(file + ' ') -+ sys.stdout.flush() -+ py_compile.compile(filepath, destpath(filepath), path) -+sys.stdout.write('\n')" "$@" 2>/dev/null || exit $? -+ -+# Then byte compile w/more optimization. -+# Only do this for Python 3.5+, see https://bugs.gnu.org/38043 for background. -+case $python_major.$python_minor in -+2.*|3.[0-4]) -+ ;; -+*) -+ $PYTHON -OO -c " -+import sys, os, py_compile, importlib -+ -+sys.stdout.write('Byte-compiling python modules (more optimized versions)' -+ ' ...\n') -+for file in sys.argv[1:]: - $pathtrans - $filetrans -- if not os.path.exists(filepath) or not (len(filepath) >= 3 -- and filepath[-3:] == '.py'): -- continue -- sys.stdout.write(file) -+ if ( -+ not os.path.exists(filepath) -+ or not (len(filepath) >= 3 and filepath[-3:] == '.py') -+ ): -+ continue -+ sys.stdout.write(file + ' ') - sys.stdout.flush() -- if hasattr(imp, 'get_tag'): -- py_compile.compile(filepath, imp.cache_from_source(filepath, False), path) -- else: -- py_compile.compile(filepath, filepath + 'o', path) --sys.stdout.write('\n')" 2>/dev/null || : -+ py_compile.compile(filepath, importlib.util.cache_from_source(filepath), path) -+sys.stdout.write('\n')" "$@" 2>/dev/null || exit $? -+ ;; -+esac - - # Local Variables: - # mode: shell-script - # sh-indentation: 2 --# eval: (add-hook 'write-file-hooks 'time-stamp) -+# eval: (add-hook 'before-save-hook 'time-stamp) - # time-stamp-start: "scriptversion=" - # time-stamp-format: "%:y-%02m-%02d.%02H" --# time-stamp-time-zone: "UTC" -+# time-stamp-time-zone: "UTC0" - # time-stamp-end: "; # UTC" - # End: --- -2.41.0 - diff --git a/LVM2.2.03.21.tgz.asc b/LVM2.2.03.21.tgz.asc deleted file mode 100644 index 80f3eb1..0000000 --- a/LVM2.2.03.21.tgz.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCAAdFiEE1QGkeEQK4v0TChvouREkMeUJA58FAmRCTIYACgkQuREkMeUJ -A5/EaRAArFXpfIrbdjMyKWS6X8c+rRyVrYZZbpDos7oXk7KgICFsEAoVoweEgb9Z -oZ48ijR15NyERiajI6v97eVsd+fjGNe6u8g0sW2azOY8teqB4vyMNWQ1BpU2J536 -eXxvvd0PhkG4fqf9mTdktkE/wvjM1BeRmWltDbTSyNCMYrHiMKTd2GmpT/x4QchW -K/UCcvqR6Fj+Shb7Z1wyD2RH3JZs4eOaT2VFWx1BOe6sMd+kQBVDqPR9OTyWv+Ss -/3uWUYlrlGQ93gbLVOyGnt2B7fiJzcs5wQGlg97QAaXECAv58C0/2B50jzberk/r -4mPe8KTIWkPsG2iGec5s1cVJvXTuJzs6zp65QGgWSb0T5TC8s7/FNzJgkWYn3gmk -VKvIqjjI+mfdI34124MP1ptfVp1PbQjENTZuwkIpu6tb4fJQfl6QKmaZ42iCLN3z -qT+bB+QkvTIObvML/LRUAFOktj+UKHtFgUBNENLtUdqp0ExfYnunfAlTydUDBSlS -FEOnPB33kYW74GmBc337iG9V9bo+XPA7paZut6xySTDcy6y5sIbgafrHJSin1kAD -AkkAw24WD32Csj9clS3hsb10P3EWnZoi0CnIruoqKQuXc7nf0mDbWXoUSbyYAP4X -T70kY59QIybAYVdUNtgR844WxFY8odXd+g2FaIMzghEW9dga59k= -=QDd4 ------END PGP SIGNATURE----- diff --git a/LVM2.2.03.22.tgz.asc b/LVM2.2.03.22.tgz.asc new file mode 100644 index 0000000..5d90987 --- /dev/null +++ b/LVM2.2.03.22.tgz.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCAAdFiEE1QGkeEQK4v0TChvouREkMeUJA58FAmTKUZsACgkQuREkMeUJ +A5+Z1A//eTi65tos1se3+iivR+K1soXQLagU3WdwgOUbPu5amjipNZ6iMWCuGLOH +XleuHRGQb0ytnkRwlUeYgUkcaFqbofH9FmY5Hugp20BE+8P3bfeAX5a5ApsoU0wF +fY+XlSyuq3waFAM7XadxTgiOqWNT4Y+CnO3IUfAlkupOZi2h+00U8FlroIZdLqKR +919CpIyh9obPxvvQeE30vNQVA8jUazG7pkq9J/bVFf4ZYqJ1AieDFQ05dqAvdO4e +I8A/0Hc6n5OZBgbK1eX8EvpYuQOd5YYVFtsLoYzCl6Q1AZ5hviddifqxwnSHyPX7 +iXt82ppRBIEO500QK/R+6ZAu1qF7S5ZVQMvWuSQM4hYwxJfipFaWDljpS2Gc8x8h +YIB7BSbNJMFu1Qf1iE/I8yqTt7x+Q/zL8paat5P5ZpsD//tG/CAWyfcml7ieTGDY +yoMuIY8GzAFYYzSWtubQEJx75E757cexOeZu5oiDfjSU6JxYFzoNWoF79NUVzTgU +bscvzWnibIjGpDoSD6aCjjmmNbbpnSALjUdKnUlt+KDR72u66KDssTQOpbg/W17T +Ghxe+I0kF8FObSD9T7CockCx81dqS7lrq8jLkMmAk9TKzr4OPi8mMjCMqGha+swg +Z/Sy/z/V7BAdknyRvg4ZQKxrA+9rRizt/xMlgpnRY8nvk+8VgYw= +=yBW6 +-----END PGP SIGNATURE----- diff --git a/lvm2.spec b/lvm2.spec index 95cdfad..dc0b067 100644 --- a/lvm2.spec +++ b/lvm2.spec @@ -1,4 +1,4 @@ -%global device_mapper_version 1.02.195 +%global device_mapper_version 1.02.196 %global enable_cache 1 %global enable_lvmdbusd 1 @@ -44,16 +44,11 @@ Name: lvm2 %if 0%{?rhel} Epoch: %{rhel} %endif -Version: 2.03.21 -Release: 4%{?dist} +Version: 2.03.22 +Release: 1%{?dist} License: GPLv2 URL: https://sourceware.org/lvm2/ Source0: https://sourceware.org/pub/lvm2/releases/LVM2.%{version}.tgz -# update py-compile script to a modern version that works with Python -# 3.12. byte compiling during install isn't even necessary on Fedora, -# but fixing it is easier than dropping it -# https://github.com/lvmteam/lvm2/pull/121 -Patch0: 0001-Update-the-py-compile-script-works-with-Python-3.12.patch BuildRequires: make BuildRequires: gcc @@ -659,6 +654,10 @@ An extensive functional testsuite for LVM2. %endif %changelog +* Wed Aug 02 2023 Marian Csontos - 2.03.22-1 +- Update to upstream version 2.03.22. +- Allow snapshots of raid+integrity LV. + * Thu Jul 20 2023 Fedora Release Engineering - 2.03.21-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 94030ed..c62c420 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (LVM2.2.03.21.tgz) = 6024811c3fa92afd2fc13a10d1c3542352aa9a016f40c3ef588bd2f5f3e41245fed4b36c8a87d9f7f8dddc6e13b7253396f5c811f99665df27751676dc7b5bde +SHA512 (LVM2.2.03.22.tgz) = 17cd24ceee8026481566824b688dafd03ec816201d5cb3549cb7fc8a36f4cdaa982faaef4dcd26debfe775dea5ffa2744798164314ea6dc99a84f8ccccfc33ff diff --git a/upstream b/upstream index 5430b06..f296609 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -LVM2.2.03.21.tgz +LVM2.2.03.22.tgz