diff --git a/Fix-lib-path-to-anolis-release.patch b/Fix-lib-path-to-anolis-release.patch new file mode 100644 index 0000000000000000000000000000000000000000..18ff5391caf682082024f738c6ad6ca0b554a4fe --- /dev/null +++ b/Fix-lib-path-to-anolis-release.patch @@ -0,0 +1,11 @@ +--- cloud-init-19.1.23/setup.py 2021-12-14 11:10:30.000000000 +0800 ++++ cloud-init-19.1.23-edit/setup.py 2023-09-15 10:57:09.060790268 +0800 +@@ -172,7 +172,7 @@ LIB = "lib" + if os.uname()[0] == 'FreeBSD': + USR = "usr/local" + USR_LIB_EXEC = "usr/local/lib" +-elif os.path.isfile('/etc/redhat-release'): ++elif os.path.isfile('/etc/anolis-release'): + USR_LIB_EXEC = "usr/libexec" + + diff --git a/cloud-init-19.1.17.tgz b/cloud-init-19.1.17.tgz deleted file mode 100644 index efb9e6ca12bca791051bde7b988ec14bfd759f5b..0000000000000000000000000000000000000000 Binary files a/cloud-init-19.1.17.tgz and /dev/null differ diff --git a/cloud-init-19.1.23.tgz b/cloud-init-19.1.23.tgz new file mode 100644 index 0000000000000000000000000000000000000000..ccb799ea7330e2c8a77736127c3a23cd35f80005 Binary files /dev/null and b/cloud-init-19.1.23.tgz differ diff --git a/cloud-init.spec b/cloud-init.spec index 936b1fc33d28757d712ee28af387b62ac39d8e2b..d2eeb565dc6de8e0a5adb7711cfe992d715bf72c 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -16,7 +16,7 @@ # Or: http://www.rpm.org/max-rpm/ch-rpm-inside.html Name: cloud-init -Version: 19.1.17 +Version: 19.1.23 Release: 1%{anolis_release}%{?dist} Summary: Cloud instance init scripts @@ -24,9 +24,10 @@ Group: System Environment/Base License: Dual-licesed GPLv3 or Apache 2.0 URL: http://launchpad.net/cloud-init -Source0: cloud-init-19.1.17.tgz +Source0: cloud-init-19.1.23.tgz Patch0: Enable-ipv6-network-by-default.patch +Patch1: Fix-lib-path-to-anolis-release.patch BuildArch: noarch BuildRoot: %{_tmppath} @@ -116,8 +117,9 @@ need special scripts to run during initialization to retrieve and install ssh keys and to let the user run various scripts. %prep -%setup -q -n cloud-init-19.1.17 +%setup -q -n cloud-init-19.1.23 %patch0 -p1 +%patch1 -p1 # Custom patches activation @@ -251,6 +253,10 @@ fi %{python_sitelib}/* %changelog +* Mon Sep 11 2023 Xiaoping Liu - 19.1.23-1.0.1 +- update to 19.1.23 +- Fix lib path to anolis release + * Tue Jun 28 2022 Chang Gao - 19.1.17-1.0.1 - Reversion to 19.1.17 - cancel disable network config @@ -259,7 +265,7 @@ fi * Thu Dec 16 2021 Mingyue Zhao - 19.1.14-1.1 - Supports non-root logins -* Fri Dec 12 2021 Mingyue Zhao - 19.1.13-1.2 +* Fri Dec 10 2021 Mingyue Zhao - 19.1.13-1.2 - Fixed the Qboot image startup link timeout problem * Wed Dec 08 2021 Mingyue Zhao - 19.1.13-1.1