From 2afb480854b634d836c10e45a3522d87ee308fd9 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 1 Apr 2020 09:32:35 -0400 Subject: [PATCH 1/4] Fix build against Python 3.9 Resolves: rhbz#1817665 Signed-off-by: Stephen Gallagher --- ...-valgrind-suppression-for-Python-3.9.patch | 37 +++++++++++++++++++ libmodulemd.spec | 7 +++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 0001-additional-valgrind-suppression-for-Python-3.9.patch diff --git a/0001-additional-valgrind-suppression-for-Python-3.9.patch b/0001-additional-valgrind-suppression-for-Python-3.9.patch new file mode 100644 index 0000000..1eafb6b --- /dev/null +++ b/0001-additional-valgrind-suppression-for-Python-3.9.patch @@ -0,0 +1,37 @@ +From b1feeb990f536147d5c49c6d002b04a9436eeea2 Mon Sep 17 00:00:00 2001 +From: Merlin Mathesius +Date: Fri, 27 Mar 2020 13:53:13 -0500 +Subject: [PATCH] additional valgrind suppression for Python 3.9 + +--- + contrib/valgrind/libmodulemd-python.supp | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/contrib/valgrind/libmodulemd-python.supp b/contrib/valgrind/libmodulemd-python.supp +index fe9814d86daa340ec1283becee78514d1d93e3ff..080669825eab28459e032488f348cf8a90455e23 100644 +--- a/contrib/valgrind/libmodulemd-python.supp ++++ b/contrib/valgrind/libmodulemd-python.supp +@@ -54,10 +54,20 @@ + fun:g_malloc + fun:g_strdup + ... + fun:PyObject_SetAttr + } ++{ ++ Handle Python 3.9 PyMalloc confusing valgrind ++ Memcheck:Leak ++ fun:malloc ++ fun:PyThread_allocate_lock ++ ... ++ fun:Py_InitializeFromConfig ++ ... ++ fun:Py_BytesMain ++} + { + Python3 Unicode uninitialized value + Memcheck:Cond + fun:PyUnicode_Decode + ... +-- +2.25.1 + diff --git a/libmodulemd.spec b/libmodulemd.spec index 75c1677..a62f3c9 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -15,7 +15,7 @@ Name: %{upstream_name}%{?v2_suffix} Version: 2.9.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Module metadata manipulation library License: MIT @@ -46,6 +46,7 @@ BuildRequires: help2man # Patches +Patch0001: 0001-additional-valgrind-suppression-for-Python-3.9.patch %description @@ -177,6 +178,10 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \ %changelog +* Wed Apr 01 2020 Stephen Gallagher - 2.9.2-3 +- Fix build against Python 3.9 +- Resolves: rhbz#1817665 + * Wed Mar 11 2020 Stephen Gallagher - 2.9.2-2 - new upstream release: 2.9.2 From 35d8ffd6d601bd496a55edbd99a8313a107c2d77 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 1 Apr 2020 10:04:57 -0400 Subject: [PATCH 2/4] Add gating for updates Signed-off-by: Stephen Gallagher --- gating.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 gating.yaml diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..a10084d --- /dev/null +++ b/gating.yaml @@ -0,0 +1,19 @@ +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_testing +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: dist.rpmdeplint} + - !PassingTestCaseRule {test_case_name: dist.abicheck} + +--- !Policy +product_versions: + - fedora-* +decision_context: bodhi_update_push_stable +subject_type: koji_build +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: dist.rpmdeplint} + - !PassingTestCaseRule {test_case_name: dist.abicheck} From 05f8dde7a257bda1fd466ecfbecf10c67197fe7b Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 1 Apr 2020 11:27:54 -0400 Subject: [PATCH 3/4] Skip rpmdeplint from gating due to https://github.com/fedora-infra/bodhi/issues/3944 Signed-off-by: Stephen Gallagher --- gating.yaml | 2 -- libmodulemd.spec | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/gating.yaml b/gating.yaml index a10084d..ee84da4 100644 --- a/gating.yaml +++ b/gating.yaml @@ -5,7 +5,6 @@ decision_context: bodhi_update_push_testing subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} - - !PassingTestCaseRule {test_case_name: dist.rpmdeplint} - !PassingTestCaseRule {test_case_name: dist.abicheck} --- !Policy @@ -15,5 +14,4 @@ decision_context: bodhi_update_push_stable subject_type: koji_build rules: - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional} - - !PassingTestCaseRule {test_case_name: dist.rpmdeplint} - !PassingTestCaseRule {test_case_name: dist.abicheck} diff --git a/libmodulemd.spec b/libmodulemd.spec index a62f3c9..14fbef2 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -15,7 +15,7 @@ Name: %{upstream_name}%{?v2_suffix} Version: 2.9.2 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Module metadata manipulation library License: MIT @@ -178,6 +178,9 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \ %changelog +* Wed Apr 01 2020 Stephen Gallagher - 2.9.2-4 +- Skip rpmdeplint from gating due to https://github.com/fedora-infra/bodhi/issues/3944 + * Wed Apr 01 2020 Stephen Gallagher - 2.9.2-3 - Fix build against Python 3.9 - Resolves: rhbz#1817665 From b55b1da4f2a979c7da1453c7bdb21c62b9127615 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Wed, 8 Apr 2020 10:45:26 -0400 Subject: [PATCH 4/4] [packit] 2.9.3 upstream release Upstream tag: libmodulemd-2.9.3 Upstream commit: e4a27c0963f45a3d6ae9f98791aeff0597b50c76 Signed-off-by: Stephen Gallagher --- .gitignore | 1 + README.packit | 2 +- libmodulemd.spec | 8 +++++--- sources | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f709060..1a63ee0 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ /modulemd-2.9.0.tar.xz /modulemd-2.9.1.tar.xz /modulemd-2.9.2.tar.xz +/modulemd-2.9.3.tar.xz diff --git a/README.packit b/README.packit index 19936d7..7fa1bff 100644 --- a/README.packit +++ b/README.packit @@ -1,3 +1,3 @@ This repository is maintained by packit. https://packit.dev/ -The file was generated using packit 0.8.1. +The file was generated using packit 0.7.1. diff --git a/libmodulemd.spec b/libmodulemd.spec index 14fbef2..8d682c7 100644 --- a/libmodulemd.spec +++ b/libmodulemd.spec @@ -14,8 +14,8 @@ %endif Name: %{upstream_name}%{?v2_suffix} -Version: 2.9.2 -Release: 4%{?dist} +Version: 2.9.3 +Release: 1%{?dist} Summary: Module metadata manipulation library License: MIT @@ -46,7 +46,6 @@ BuildRequires: help2man # Patches -Patch0001: 0001-additional-valgrind-suppression-for-Python-3.9.patch %description @@ -178,6 +177,9 @@ mv %{buildroot}%{_mandir}/man1/modulemd-validator.1 \ %changelog +* Wed Apr 08 2020 Stephen Gallagher - 2.9.3-1 +- new upstream release: 2.9.3 + * Wed Apr 01 2020 Stephen Gallagher - 2.9.2-4 - Skip rpmdeplint from gating due to https://github.com/fedora-infra/bodhi/issues/3944 diff --git a/sources b/sources index 6c76530..c160d1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (modulemd-2.9.2.tar.xz) = 7605f5d0f90a4af0ca2b40a90a5701c71d5ee4c4e276433f440670102100809b2d026c8c676f11adf2b0d50201df5caf326e464b6f4f3c139cb62bc711f3ee28 +SHA512 (modulemd-2.9.3.tar.xz) = 48f09210a42ac6e8ee25cc4c1cf4ac527339ec4fa580f0f98766243d53d7b71e45d3a63d32be2efa9143d2d145652ea7cb12f8f0135e886304350c8210d7c884