Skip to content

Commit 5a05750

Browse files
committed
netplan: upgrade 1.1.2 -> 1.2.1 via Fedora f44 import pointer
1 parent 892f6f0 commit 5a05750

6 files changed

Lines changed: 32 additions & 109 deletions

File tree

base/comps/components.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2178,7 +2178,6 @@ includes = ["**/*.comp.toml", "component-check-disablement.toml", "component-min
21782178
[components.netcdf-cxx]
21792179
[components.netlabel_tools]
21802180
[components.netpbm]
2181-
[components.netplan]
21822181
[components.nettle]
21832182
[components.network-manager-applet]
21842183
[components.newt]
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# Upgrade netplan 1.1.2 -> 1.2.1 by moving the dist-git import pointer from the
2+
# global Fedora f43 snapshot to the Fedora f44 head.
3+
#
4+
# f44 ships netplan 1.2.1-2, which contains the upstream generate/configure
5+
# split (PR #552, first released in 1.2). That split makes the boot-time
6+
# systemd generator validation-only and defers virtual-device creation to
7+
# netplan-configure.service, resolving the AZL4 rollback PID1 generator
8+
# self-deadlock (getgrnam NSS lookup under the generator sandbox).
9+
#
10+
# Fedora f44 dist-git: https://src.fedoraproject.org/rpms/netplan/commits/f44
11+
[components.netplan]
12+
spec = { type = "upstream", upstream-distro = { name = "fedora", version = "44" }, upstream-commit = "66c31bcd3e9aeb8d15a5b4184009e57d799b0158" }

locks/netplan.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Managed by azldev component update. Do not edit manually.
22
version = 1
33
import-commit = 'cf326c3fc62b1588db0c9c2bc006946d572e7636'
4-
upstream-commit = 'cf326c3fc62b1588db0c9c2bc006946d572e7636'
5-
input-fingerprint = 'sha256:e9ab4f13fcdf4f80674cb76630cd9f870549e84767ac0c85a1dbfd9fc30da922'
6-
resolution-input-hash = 'sha256:466421704711c4fd3c71f0b2ed715a0e61d49e3e26f3a2637fee755795849c8e'
4+
upstream-commit = '66c31bcd3e9aeb8d15a5b4184009e57d799b0158'
5+
input-fingerprint = 'sha256:508a5f729ebc07d70f2dbfff24e4993b6d0cd2784354cb20b3f54cdf9d43e749'
6+
resolution-input-hash = 'sha256:9daf4c01a90bab4922abb6c6386bd863c91a74133383a966fe5fc6cfe6fcd63a'

specs/n/netplan/netplan.spec

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,18 +20,15 @@
2020
%bcond_with tests
2121

2222
Name: netplan
23-
Version: 1.1.2
24-
Release: 5%{?dist}
23+
Version: 1.2.1
24+
Release: 4%{?dist}
2525
Summary: Network configuration tool using YAML
2626
License: GPL-3.0-only
2727
URL: http://netplan.io/
2828
Source0: https://github.com/canonical/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
2929

3030
# Downstream only
3131
Patch1001: netplan-fallback-renderer.patch
32-
# https://github.com/canonical/netplan/pull/555
33-
# probably won't be necessary in > 1.1.2
34-
Patch1002: status_fail_cleanly.patch
3532

3633
BuildRequires: gcc
3734
BuildRequires: meson
@@ -43,6 +40,7 @@ BuildRequires: pkgconfig(systemd)
4340
BuildRequires: pkgconfig(yaml-0.1)
4441
BuildRequires: pkgconfig(uuid)
4542
BuildRequires: python3-devel
43+
BuildRequires: python3-setuptools
4644
BuildRequires: systemd-rpm-macros
4745
BuildRequires: %{_bindir}/pandoc
4846
BuildRequires: python3dist(cffi)
@@ -81,6 +79,8 @@ Requires: python3-%{name}%{?_isa} = %{version}-%{release}
8179
Provides: %{ubuntu_name} = %{version}-%{release}
8280
Provides: %{ubuntu_name}%{?_isa} = %{version}-%{release}
8381

82+
# provides "netplan status" functionality
83+
Suggests: systemd-networkd
8484

8585

8686
%description
@@ -104,8 +104,10 @@ Currently supported backends are NetworkManager and systemd-networkd.
104104
%dir %{_sysconfdir}/%{name}
105105
%dir %{_libexecdir}/%{name}
106106
%{_libexecdir}/%{name}/generate
107+
%{_libexecdir}/%{name}/configure
107108
%{_libexecdir}/%{name}/%{name}-dbus
108109
%{_datadir}/bash-completion/completions/%{name}
110+
%{_unitdir}/netplan-configure.service
109111

110112
# ------------------------------------------------------------------------------------------------
111113

@@ -285,6 +287,15 @@ EOF
285287

286288

287289
%changelog
290+
* Tue May 05 2026 Jonathan Wright <jonathan@almalinux.org> - 1.2.1-2
291+
- Suggest systemd-networkd for "netplan status" functionality
292+
293+
* Tue May 05 2026 Jonathan Wright <jonathan@almalinux.org> - 1.2.1-1
294+
- update to netplan 1.2.1 rhbz#2422802
295+
296+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.2-5
297+
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
298+
288299
* Fri Sep 19 2025 Python Maint <python-maint@redhat.com> - 1.1.2-4
289300
- Rebuilt for Python 3.14.0rc3 bytecode
290301

specs/n/netplan/sources

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
SHA512 (netplan-1.1.2.tar.gz) = 717c0da58de37f764332883881ae6185fd932d55256a88122b8462a51eeb0bef123f29e75f897e067b6d1b1fdcf67f6eba0054146609deb4456c1cf673bd794c
1+
SHA512 (netplan-1.2.1.tar.gz) = c347d5f086bc25010dd25022d87c5859b366592112f1a506af3885e2f16a8af66c7f6a61e1bf0effe8ac5bd32222235f2f51f3f4cbdaae36d4c3f98aa8b92999

specs/n/netplan/status_fail_cleanly.patch

Lines changed: 0 additions & 99 deletions
This file was deleted.

0 commit comments

Comments
 (0)