Notification time stamped 2023-03-01 00:59:20 UTC
From 87444be943500b1ef50ced40a28ab6b3226a3050 Mon Sep 17 00:00:00 2001 From: Ondřej Nosek onosek@redhat.com Date: Mar 01 2023 00:55:29 +0000 Subject: Two patches for previous 1.66 release
- Process source URLs with fragment in pre-push hook - container-build: update --signing-intent help for OSBS 2
Signed-off-by: Ondřej Nosek onosek@redhat.com
---
diff --git a/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch b/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch new file mode 100644 index 0000000..e252038 --- /dev/null +++ b/0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch @@ -0,0 +1,42 @@ +From 6d813d40aff91345b171323512b3ae641a168d45 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= lsedlar@redhat.com +Date: Mon, 27 Feb 2023 08:36:20 +0100 +Subject: [PATCH] Process source URLs with fragment in pre-push hook +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Some download services do not have the actual filename in the URL. +Packagers work around that by adding a fragment to the URL. This is then +ignored by any server, but tricks RPM into getting the correct filename. + +Example: + + Source0: https://crates.io/api/v1/crates/actix/0.13.0/download#/actix-0.13.0.crate + +The filename is obviously `actix-0.13.0.crate`, but rpkg without this +patch will come up with `download`. + +Signed-off-by: Lubomír Sedlář lsedlar@redhat.com +--- + pyrpkg/__init__.py | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/pyrpkg/__init__.py b/pyrpkg/__init__.py +index 6a0e9eb..c650851 100644 +--- a/pyrpkg/__init__.py ++++ b/pyrpkg/__init__.py +@@ -4464,7 +4464,9 @@ class Commands(object): + # find out the format of the source file path. From URL use just the file name. + # We want to keep hierarchy of the files if possible + res = urllib.parse.urlparse(file_location) +- if res.scheme and res.netloc: ++ if res.scheme and res.fragment: ++ source_files.append(os.path.basename(res.fragment)) ++ elif res.scheme and res.netloc: + source_files.append(os.path.basename(res.path)) + else: + source_files.append(file_location) +-- +2.39.2 + diff --git a/0005-container-build-update-signing-intent-help-for-OSBS-.patch b/0005-container-build-update-signing-intent-help-for-OSBS-.patch new file mode 100644 index 0000000..4ead6a3 --- /dev/null +++ b/0005-container-build-update-signing-intent-help-for-OSBS-.patch @@ -0,0 +1,30 @@ +From e38cfe4b688b600c411a9745922b77ebb9c14122 Mon Sep 17 00:00:00 2001 +From: Ken Dreyer kdreyer@redhat.com +Date: Tue, 28 Feb 2023 16:17:03 -0500 +Subject: [PATCH] container-build: update --signing-intent help for OSBS 2 + +OSBS 2 logs the reactor configuration in a slightly different way. +Update the --help text for --signing-intent to point users at the new +location. + +Signed-off-by: Ken Dreyer kdreyer@redhat.com +--- + pyrpkg/cli.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyrpkg/cli.py b/pyrpkg/cli.py +index 41c4354..c3672b3 100644 +--- a/pyrpkg/cli.py ++++ b/pyrpkg/cli.py +@@ -1724,7 +1724,7 @@ class cliClient(object): + " server. If unspecified, the server will use the signing intent" + " of the compose_ids you specify, or the server's" + " default_signing_intent. To view the full list of possible" +- " names, see REACTOR_CONFIG in orchestrator.log.") ++ " names, see atomic_reactor.config in osbs-build.log.") + + parser.add_argument( + '--skip-remote-rules-validation', +-- +2.39.2 + diff --git a/rpkg.spec b/rpkg.spec index 3d46980..4c557e0 100644 --- a/rpkg.spec +++ b/rpkg.spec @@ -1,6 +1,6 @@ Name: rpkg Version: 1.66 -Release: 2%{?dist} +Release: 3%{?dist}
Summary: Python library for interacting with rpm+git License: GPLv2+ and LGPLv2 @@ -37,6 +37,8 @@ Patch2: 0002-Remove-pytest-coverage-execution.patch %if 0%{?with_python2} Patch3: 0003-Remove-Environment-Markers-syntax.patch %endif +Patch4: 0004-Process-source-URLs-with-fragment-in-pre-push-hook.patch +Patch5: 0005-container-build-update-signing-intent-help-for-OSBS-.patch
%description Python library for interacting with rpm+git @@ -253,6 +255,10 @@ example_cli_dir=$RPM_BUILD_ROOT%{_datadir}/%{name}/examples/cli
%changelog +* Wed Mar 1 2023 Ondřej Nosek onosek@redhat.com - 1.66-3 +- Patch: Process source URLs with fragment in pre-push hook +- Patch: container-build: update --signing-intent help for OSBS 2 + * Tue Feb 21 2023 Ondřej Nosek onosek@redhat.com - 1.66-2 - rebuild for unification of all branches
https://src.fedoraproject.org/rpms/rpkg/c/87444be943500b1ef50ced40a28ab6b322...