Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions base/comps/components.toml
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml"]
[components.cups]
[components.cups-filters]
[components.cups-pk-helper]
[components.curl]
[components.cvs]
[components.cyrus-imapd]
[components.cyrus-sasl]
Expand Down Expand Up @@ -3959,7 +3958,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml"]
[components.python-imageio]
[components.python-imagesize]
[components.python-immutables]
[components.python-impacket]
[components.python-importlib-metadata]
[components.python-incremental]
[components.python-iniconfig]
Expand Down
16 changes: 16 additions & 0 deletions base/comps/curl/curl.comp.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[components.curl]

[[components.curl.overlays]]
description = "Drop python3-impacket BuildRequires (only used by Fedora-gated upstream test 1451; python-impacket is not packaged for Azure Linux due to RPM-signing issues)"
type = "spec-remove-tag"
tag = "BuildRequires"
value = "python3-impacket"
Comment thread
anphel31 marked this conversation as resolved.

# Update the now-stale comment in the (empty) `%if 0%{?fedora}` block left
# behind by removing the BuildRequires above, so future readers know the
# omission is intentional rather than an oversight.
[[components.curl.overlays]]
description = "Annotate the now-empty %if 0%{?fedora} block to make the AZL deviation explicit (avoid confusion with the original 'needed for upstream test 1451' comment)"
type = "spec-search-replace"
regex = '^# needed for upstream test 1451$'
replacement = '# python3-impacket BuildRequires intentionally omitted in Azure Linux — see curl.comp.toml overlay (RPM signing blocker; test 1451 is Fedora-gated)'
1 change: 0 additions & 1 deletion base/packages/sdk.packages.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5853,7 +5853,6 @@ packages = [
"python3-igraph-devel", # srpm: python-igraph
"python3-imageio", # srpm: python-imageio
"python3-immutables", # srpm: python-immutables
"python3-impacket", # srpm: python-impacket
"python3-importlib-metadata", # srpm: python-importlib-metadata
"python3-incremental", # srpm: python-incremental
"python3-inkex", # srpm: python-inkex
Expand Down
2 changes: 1 addition & 1 deletion locks/curl.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
version = 1
import-commit = '0e4af6147551051527b731925d55c37b164260d5'
upstream-commit = '0e4af6147551051527b731925d55c37b164260d5'
input-fingerprint = 'sha256:d88c5263f3f89ced12aee96a4254837d0c2858539c76a97a10eadd3deabf8b84'
input-fingerprint = 'sha256:e12a3388d48de45bc572148ab3264d55cb991514bb820e37eada4fc3ee220650'
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
6 changes: 0 additions & 6 deletions locks/python-impacket.lock

This file was deleted.

5 changes: 2 additions & 3 deletions specs/c/curl/curl.spec
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
Name: curl
Version: 8.15.0
Release: 6%{?dist}
Release: 7%{?dist}
License: curl
Source0: https://curl.se/download/%{name}-%{version_no_tilde}.tar.xz
Source1: https://curl.se/download/%{name}-%{version_no_tilde}.tar.xz.asc
Expand Down Expand Up @@ -121,8 +121,7 @@ BuildRequires: perl(Time::Local)
BuildRequires: perl(vars)

%if 0%{?fedora}
# needed for upstream test 1451
BuildRequires: python3-impacket
# python3-impacket BuildRequires intentionally omitted in Azure Linux — see curl.comp.toml overlay (RPM signing blocker; test 1451 is Fedora-gated)
%endif

# The test-suite runs automatically through valgrind if valgrind is available
Expand Down
8 changes: 0 additions & 8 deletions specs/p/python-impacket/python-impacket-0.12.0-cleanup.patch

This file was deleted.

36 changes: 0 additions & 36 deletions specs/p/python-impacket/python-impacket-0.12.0-pyopenssl.patch

This file was deleted.

Loading
Loading