import pyparted-3.12.0-1.el9
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
b5f79afd05
commit
5df5fa8043
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,3 +1,3 @@
|
||||
SOURCES/keyring.gpg
|
||||
SOURCES/pyparted-3.11.7.tar.gz
|
||||
SOURCES/pyparted-3.12.0.tar.gz
|
||||
SOURCES/trustdb.gpg
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
d272fb3943123d3e62c480b17520fb5532021a4f SOURCES/keyring.gpg
|
||||
8084cb0b64542e57066716505fa4f1d28c031b09 SOURCES/pyparted-3.11.7.tar.gz
|
||||
c52dfa02064a67d5a09b5fbe4d85f9bdea104db9 SOURCES/pyparted-3.12.0.tar.gz
|
||||
cff4e174c36e950906f15a2fc139bc59539929ad SOURCES/trustdb.gpg
|
||||
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEECPfIs8YhlQwTj3ZhYpd7uchBuWUFAl+TMZcACgkQYpd7uchB
|
||||
uWVcSxAAnxFazKx1LzgOcJbNxpL9dY6CkeexYGA9TPj9Fq0PtPIZVxSAir3Dd56m
|
||||
0MxO5cZxEkuzKUB2z6se4WhxQp0f6sbcniMdLyUk5H5aJ14GDNDUoM31Mz7X0Zr2
|
||||
fr5Nu05BTwW1vW0sgom++j/8CX0pSeDUyXaq/bxc8xBXRf6vEX+7tr7b900iXXjB
|
||||
luSpgSVs7lkJ8bYFkyBWvhlkYhixGypuk2PGsvaN13O4xvSJMu+ebxvNdwKOt6JQ
|
||||
tido7I6hPceMoc0owDppju3RLY4IHZ9DVE69+7GrpMZcS5UECLO0pUm6mt0bZ46a
|
||||
oc+sZ3ot0COTQpSRKflq3/JEnxnhReaLFNzNTombon6Ww+uFczyE1o6GwZaicYU1
|
||||
vGP/9DIfKGJTw7ZAH5F9Xe4jPDhyW58u3jFOeR0Epa46MosRjAbbU5VeqXVMWevc
|
||||
zm3RQhfNdqpt0tHgMEiRR8+7RWIKQrjLW2Jj9Vvn7+5oe+LLxkOkATLjiTZk1eJe
|
||||
MDO2nDYXEQoXVmZhIBS1YGijR9LsBJPoOqfYqoSQVQLO7cPnreX64H5sX9aLO3in
|
||||
oZocDmdpJZNiJWJX56UxK3d702ZeAvJ1EM6cTRwXzKzx2Lxol93q6DpvNbOxy9yg
|
||||
WYWV6xOfmQKwPBeDzWObdkBLXb2lrVYGWRdugdNWNbtCkic9I4Y=
|
||||
=sLpH
|
||||
-----END PGP SIGNATURE-----
|
||||
115
SOURCES/pyparted-3.12.0-types.patch
Normal file
115
SOURCES/pyparted-3.12.0-types.patch
Normal file
@ -0,0 +1,115 @@
|
||||
diff -up pyparted-3.12.0/src/parted/__init__.py.orig pyparted-3.12.0/src/parted/__init__.py
|
||||
--- pyparted-3.12.0/src/parted/__init__.py.orig 2022-03-07 12:38:56.000000000 -0500
|
||||
+++ pyparted-3.12.0/src/parted/__init__.py 2022-07-14 12:28:09.687155151 -0400
|
||||
@@ -217,6 +217,14 @@ from _ped import DISK_GPT_PMBR_BOOT
|
||||
from _ped import DISK_TYPE_EXTENDED
|
||||
from _ped import DISK_TYPE_PARTITION_NAME
|
||||
|
||||
+if hasattr(_ped, 'DISK_TYPE_PARTITION_TYPE_ID'):
|
||||
+ # pylint: disable=E0611
|
||||
+ from _ped import DISK_TYPE_PARTITION_TYPE_ID
|
||||
+
|
||||
+if hasattr(_ped, 'DISK_TYPE_PARTITION_TYPE_UUID'):
|
||||
+ # pylint: disable=E0611
|
||||
+ from _ped import DISK_TYPE_PARTITION_TYPE_UUID
|
||||
+
|
||||
from _ped import EXCEPTION_TYPE_INFORMATION
|
||||
from _ped import EXCEPTION_TYPE_WARNING
|
||||
from _ped import EXCEPTION_TYPE_ERROR
|
||||
diff -up pyparted-3.12.0/src/_pedmodule.c.orig pyparted-3.12.0/src/_pedmodule.c
|
||||
--- pyparted-3.12.0/src/_pedmodule.c.orig 2022-03-07 12:49:11.000000000 -0500
|
||||
+++ pyparted-3.12.0/src/_pedmodule.c 2022-07-14 12:59:46.270416021 -0400
|
||||
@@ -648,42 +648,20 @@ MOD_INIT(_ped) {
|
||||
PyModule_AddIntConstant(m, "PARTITION_BIOS_GRUB", PED_PARTITION_BIOS_GRUB);
|
||||
PyModule_AddIntConstant(m, "PARTITION_DIAG", PED_PARTITION_DIAG);
|
||||
PyModule_AddIntConstant(m, "PARTITION_LEGACY_BOOT", PED_PARTITION_LEGACY_BOOT);
|
||||
-
|
||||
- /* NOTE: You cannot evaluate the enum PED_PARTITION_* values using the
|
||||
- * preprocessor. DO NOT use #if or #ifdef with them.
|
||||
- *
|
||||
- * Conditionally add constants, based on PED_PARTITION_LAST_FLAG, and what
|
||||
- * we know about parted/disk.h
|
||||
- */
|
||||
-#if PED_PARTITION_LAST_FLAG > 15
|
||||
PyModule_AddIntConstant(m, "PARTITION_MSFT_DATA", PED_PARTITION_MSFT_DATA);
|
||||
-#endif
|
||||
-
|
||||
-#if PED_PARTITION_LAST_FLAG > 16
|
||||
PyModule_AddIntConstant(m, "PARTITION_IRST", PED_PARTITION_IRST);
|
||||
-#endif
|
||||
-
|
||||
-#if PED_PARTITION_LAST_FLAG > 17
|
||||
PyModule_AddIntConstant(m, "PARTITION_ESP", PED_PARTITION_ESP);
|
||||
-#endif
|
||||
-
|
||||
-#if PED_PARTITION_LAST_FLAG > 18
|
||||
PyModule_AddIntConstant(m, "PARTITION_CHROMEOS_KERNEL", PED_PARTITION_CHROMEOS_KERNEL);
|
||||
-#endif
|
||||
-
|
||||
-#if PED_PARTITION_LAST_FLAG > 19
|
||||
PyModule_AddIntConstant(m, "PARTITION_BLS_BOOT", PED_PARTITION_BLS_BOOT);
|
||||
-#endif
|
||||
-
|
||||
-#if PED_PARTITION_LAST_FLAG > 20
|
||||
PyModule_AddIntConstant(m, "PARTITION_LINUX_HOME", PED_PARTITION_LINUX_HOME);
|
||||
-#endif
|
||||
|
||||
PyModule_AddIntConstant(m, "DISK_CYLINDER_ALIGNMENT", PED_DISK_CYLINDER_ALIGNMENT);
|
||||
PyModule_AddIntConstant(m, "DISK_GPT_PMBR_BOOT", PED_DISK_GPT_PMBR_BOOT);
|
||||
|
||||
PyModule_AddIntConstant(m, "DISK_TYPE_EXTENDED", PED_DISK_TYPE_EXTENDED);
|
||||
PyModule_AddIntConstant(m, "DISK_TYPE_PARTITION_NAME", PED_DISK_TYPE_PARTITION_NAME);
|
||||
+ PyModule_AddIntConstant(m, "DISK_TYPE_PARTITION_TYPE_ID", PED_DISK_TYPE_PARTITION_TYPE_ID);
|
||||
+ PyModule_AddIntConstant(m, "DISK_TYPE_PARTITION_TYPE_UUID", PED_DISK_TYPE_PARTITION_TYPE_UUID);
|
||||
|
||||
/* add PedFileSystemType as _ped.FileSystemType */
|
||||
if (PyType_Ready(&_ped_FileSystemType_Type_obj) < 0)
|
||||
diff -up pyparted-3.12.0/tests/test__ped_disktype.py.orig pyparted-3.12.0/tests/test__ped_disktype.py
|
||||
--- pyparted-3.12.0/tests/test__ped_disktype.py.orig 2018-01-12 13:31:40.000000000 -0500
|
||||
+++ pyparted-3.12.0/tests/test__ped_disktype.py 2022-07-14 12:28:09.687155151 -0400
|
||||
@@ -63,11 +63,22 @@ class DiskTypeCheckFeatureTestCase(Requi
|
||||
self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_EXTENDED))
|
||||
self.assertFalse(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_NAME))
|
||||
|
||||
+ if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_ID"):
|
||||
+ self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_TYPE_ID))
|
||||
+
|
||||
+ if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_UUID"):
|
||||
+ self.assertFalse(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_TYPE_UUID))
|
||||
+
|
||||
# The following types support DISK_TYPE_PARTITION_NAME
|
||||
for name in ['amiga', 'gpt', 'mac', 'pc98']:
|
||||
self.assertFalse(self.disktype[name].check_feature(_ped.DISK_TYPE_EXTENDED))
|
||||
self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_NAME))
|
||||
|
||||
+ # The following types support DISK_TYPE_PARTITION_TYPE_UUID
|
||||
+ for name in ['gpt']:
|
||||
+ if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_UUID"):
|
||||
+ self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_PARTITION_TYPE_UUID))
|
||||
+
|
||||
# The following types support all features
|
||||
for name in ['dvh']:
|
||||
self.assertTrue(self.disktype[name].check_feature(_ped.DISK_TYPE_EXTENDED))
|
||||
@@ -75,11 +86,20 @@ class DiskTypeCheckFeatureTestCase(Requi
|
||||
|
||||
class DiskTypeStrTestCase(RequiresDiskTypes):
|
||||
def runTest(self):
|
||||
- self.assertEqual(str(self.disktype['msdos']), '_ped.DiskType instance --\n name: msdos features: 1')
|
||||
+ if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_ID"):
|
||||
+ self.assertEqual(str(self.disktype['msdos']), '_ped.DiskType instance --\n name: msdos features: 5')
|
||||
+ else:
|
||||
+ self.assertEqual(str(self.disktype['msdos']), '_ped.DiskType instance --\n name: msdos features: 1')
|
||||
+
|
||||
self.assertEqual(str(self.disktype['aix']), '_ped.DiskType instance --\n name: aix features: 0')
|
||||
self.assertEqual(str(self.disktype['sun']), '_ped.DiskType instance --\n name: sun features: 0')
|
||||
self.assertEqual(str(self.disktype['amiga']), '_ped.DiskType instance --\n name: amiga features: 2')
|
||||
- self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 2')
|
||||
+
|
||||
+ if hasattr(_ped, "DISK_TYPE_PARTITION_TYPE_UUID"):
|
||||
+ self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 10')
|
||||
+ else:
|
||||
+ self.assertEqual(str(self.disktype['gpt']), '_ped.DiskType instance --\n name: gpt features: 2')
|
||||
+
|
||||
self.assertEqual(str(self.disktype['mac']), '_ped.DiskType instance --\n name: mac features: 2')
|
||||
self.assertEqual(str(self.disktype['bsd']), '_ped.DiskType instance --\n name: bsd features: 0')
|
||||
self.assertEqual(str(self.disktype['pc98']), '_ped.DiskType instance --\n name: pc98 features: 2')
|
||||
16
SOURCES/pyparted-3.12.0.tar.gz.asc
Normal file
16
SOURCES/pyparted-3.12.0.tar.gz.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEECPfIs8YhlQwTj3ZhYpd7uchBuWUFAmImWioACgkQYpd7uchB
|
||||
uWXxWg//agGaATH8u0LsMeDTUFc3tM6fDhSyYnJX8QepqU0gu+FqfhG59FKrG/ey
|
||||
6DW05rLnbDySpL/O4rQvGsiM1t6zZPBWpxNSp0akT3mbSPxPBoqjtXw0bkXNIH46
|
||||
rreAXUEJnQ0TkXejv301zi6ZiiOEJ8rQSygw3lq66MS/8o1cN4mi1AopbWGsKWo0
|
||||
sR6MFoX7DImqx6SsaPVZo+362+eZKe4fNkkQVnM9R3/HUYjCcsM3MhRizkZeutJB
|
||||
ArBM+MvTvTyNddqa8qdUjZU4A2wrWs5ZQLRZci+MFS96zjhAlzAHMnsRoxeXqWL6
|
||||
DxIZXD/0nG2cDerJS8x8DX4gNhavQcJc+qdYKpAI+bLIz+6laRWILskao6JA9DRJ
|
||||
XFI1ChsPGrzj8kn2WGm08ctvXvxv+dG8tdufY32wIGl5j4fFFB2JI1pHoujegzQ5
|
||||
SfdpaXUSVfSuHhMYz7erZekncD6H3f/953+lNuA/J9bApViWGpFXpQIydC7JZ/6K
|
||||
2TT+VmcOlPmH38mBXY3A08k1ZTJTYI1UTDyD3s7PW+X4EVad6R4yGJFoQtausIpC
|
||||
Bkg7626W53xJvbRmby0gEV+CBjUKe3ZVRdTPkPKK9k4N4aPgkbi2PeUeT7ULYtLX
|
||||
Lv8WjhOa+lhUR9wOR59SaUf77Ev5CdheMO6R/mauCd/Jj25xoXA=
|
||||
=rtAz
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -33,8 +33,8 @@
|
||||
Summary: Python module for GNU parted
|
||||
Name: pyparted
|
||||
Epoch: 1
|
||||
Version: 3.11.7
|
||||
Release: 4%{?dist}
|
||||
Version: 3.12.0
|
||||
Release: 1%{?dist}
|
||||
License: GPLv2+
|
||||
URL: https://github.com/dcantrell/pyparted
|
||||
|
||||
@ -43,9 +43,14 @@ Source1: https://github.com/dcantrell/pyparted/releases/download/v%{version}/%{n
|
||||
Source2: keyring.gpg
|
||||
Source3: trustdb.gpg
|
||||
|
||||
# Support new disk type features from parted 3.5:
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=2098792
|
||||
# https://github.com/dcantrell/pyparted/issues/91
|
||||
Patch0: pyparted-3.12.0-types.patch
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc
|
||||
BuildRequires: parted-devel >= 3.3
|
||||
BuildRequires: parted-devel >= 3.5
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: e2fsprogs
|
||||
BuildRequires: gnupg2
|
||||
@ -53,6 +58,7 @@ BuildRequires: gnupg2
|
||||
%if %{with python3}
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-six
|
||||
BuildRequires: python3-setuptools
|
||||
%endif
|
||||
|
||||
%if %{with python2}
|
||||
@ -92,6 +98,7 @@ partition tables. This package provides Python 3 bindings for parted.
|
||||
gpg --no-default-keyring --keyring %{SOURCE2} --trustdb-name %{SOURCE3} --verify %{SOURCE1} %{SOURCE0} || exit 1
|
||||
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%if %{with python3}
|
||||
everything=$(ls)
|
||||
@ -149,6 +156,12 @@ popd
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Jun 21 2022 David Cantrell <dcantrell@redhat.com> - 1:3.12.0-1
|
||||
- Patch pyparted to handle PED_DISK_TYPE_PARTITION_TYPE_ID for the
|
||||
msdos disk type and PED_DISK_TYPE_PARTITION_TYPE_UUID for the gpt
|
||||
label
|
||||
Resolves: rhbz#2103243
|
||||
|
||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:3.11.7-4
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
Loading…
Reference in New Issue
Block a user