From 858e40d52150482f4821ac777930227a7d46726b Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 20 Nov 2024 13:40:43 +0000 Subject: [PATCH] import RHEL 10 Beta initscripts-10.25-1.el10 --- .gitignore | 2 +- .initscripts.metadata | 1 - SPECS/initscripts.spec => initscripts.spec | 380 +++++++++++++-------- sources | 1 + 4 files changed, 242 insertions(+), 142 deletions(-) delete mode 100644 .initscripts.metadata rename SPECS/initscripts.spec => initscripts.spec (94%) create mode 100644 sources diff --git a/.gitignore b/.gitignore index 99d8a52..50585bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/initscripts-10.00.18.tar.gz +initscripts-10.25.tar.gz diff --git a/.initscripts.metadata b/.initscripts.metadata deleted file mode 100644 index 5f26d7c..0000000 --- a/.initscripts.metadata +++ /dev/null @@ -1 +0,0 @@ -07869d0e85730c355471ff37c311663369864d56 SOURCES/initscripts-10.00.18.tar.gz diff --git a/SPECS/initscripts.spec b/initscripts.spec similarity index 94% rename from SPECS/initscripts.spec rename to initscripts.spec index 9879d3c..b3abed6 100644 --- a/SPECS/initscripts.spec +++ b/initscripts.spec @@ -18,10 +18,10 @@ Requires: gawk \ Name: initscripts Summary: Basic support for legacy System V init scripts -Version: 10.00.18 +Version: 10.25 Release: 1%{?dist} -License: GPLv2 +License: GPL-2.0-only URL: https://github.com/fedora-sysv/initscripts Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz @@ -34,6 +34,9 @@ Requires: procps-ng Requires: setup Requires: systemd Requires: util-linux +Requires: chkconfig +Requires: initscripts-service +Requires: initscripts-rename-device Requires(pre): shadow-utils Requires(post): coreutils @@ -46,14 +49,13 @@ BuildRequires: glib2-devel BuildRequires: pkgconfig BuildRequires: popt-devel BuildRequires: setup -BuildRequires: python3-devel +BuildRequires: make %{?systemd_requires} BuildRequires: systemd -Provides: /sbin/service - -Obsoletes: %{name} < 9.82-2 +Obsoletes: %{name} < 10.16-1 +Obsoletes: network-scripts < 10.25-1 # === PATCHES ================================================================= @@ -89,47 +91,28 @@ other legacy tools & utilities. # === SUBPACKAGES ============================================================= -%package -n network-scripts -Summary: Legacy scripts for manipulating of network devices -Requires: %{name}%{?_isa} = %{version}-%{release} +%package -n initscripts-rename-device +Summary: Udev helper utility that provides network interface naming + +%shared_requirements + +%description -n initscripts-rename-device +Udev helper utility that provides network interface naming + +# --------------- + +%package -n initscripts-service +Summary: Support for service command +BuildArch: noarch %shared_requirements -Requires: bc -Requires: dbus -Requires: gawk -Requires: grep -Requires: hostname -Requires: iproute -Requires: ipcalc -Requires: kmod -Requires: procps-ng -Requires: sed Requires: systemd -Requires(post): chkconfig -Requires(preun): chkconfig +Provides: /sbin/service -Requires(post): %{_sbindir}/update-alternatives -Requires(postun): %{_sbindir}/update-alternatives - -Obsoletes: %{name} < 9.82-2 - -%description -n network-scripts -This package contains the legacy scripts for activating & deactivating of most -network interfaces. It also provides a legacy version of 'network' service. - -The 'network' service is enabled by default after installation of this package, -and if the network-scripts are installed alongside NetworkManager, then the -ifup/ifdown commands from network-scripts take precedence over the ones provided -by NetworkManager. - -If user has both network-scripts & NetworkManager installed, and wishes to -use ifup/ifdown from NetworkManager primarily, then they has to run command: - $ update-alternatives --config ifup - -Please note that running the command above will also disable the 'network' -service. +%description -n initscripts-service +This package provides service command. # --------------- @@ -176,6 +159,9 @@ Obsoletes: %{name} < 9.82-2 This package provides script & configuration file for setting up read-only root support. Additional configuration is required after installation. +Please note that readonly-root package is considered deprecated with limited support. +Please use systemd-volatile-root functionality instead, if possible. + # === BUILD INSTRUCTIONS ====================================================== %prep @@ -189,25 +175,16 @@ support. Additional configuration is required after installation. # --------------- %install -%make_install +%make_install NO_NETWORK_SCRIPTS=true # This installs the NLS language files: %find_lang %{name} -%ifnarch s390 s390x - rm -f %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-ctc +%if "%{_sbindir}" == "%{_bindir}" +# Some files get installed wrong, but if $(sbindir) is overriden, the build fails :( +mv -v %{buildroot}/usr/sbin/* %{buildroot}%{_bindir}/ %endif -# Additional ways to access documentation: -install -m 0755 -d %{buildroot}%{_docdir}/network-scripts - -ln -s %{_docdir}/%{name}/sysconfig.txt %{buildroot}%{_docdir}/network-scripts/ -ln -sr %{_mandir}/man8/ifup.8 %{buildroot}%{_mandir}/man8/ifdown.8 - -# We are now using alternatives approach to better co-exist with NetworkManager: -touch %{buildroot}%{_sbindir}/ifup -touch %{buildroot}%{_sbindir}/ifdown - # ============================================================================= %post @@ -221,24 +198,6 @@ touch %{buildroot}%{_sbindir}/ifdown # --------------- -%post -n network-scripts -chkconfig --add network > /dev/null 2>&1 || : - -[ -L %{_sbindir}/ifup ] || rm -f %{_sbindir}/ifup -[ -L %{_sbindir}/ifdown ] || rm -f %{_sbindir}/ifdown - -%{_sbindir}/update-alternatives --install %{_sbindir}/ifup ifup %{_sysconfdir}/sysconfig/network-scripts/ifup 90 \ - --slave %{_sbindir}/ifdown ifdown %{_sysconfdir}/sysconfig/network-scripts/ifdown \ - --initscript network - -%preun -n network-scripts -if [ $1 -eq 0 ]; then - chkconfig --del network > /dev/null 2>&1 || : - %{_sbindir}/update-alternatives --remove ifup %{_sysconfdir}/sysconfig/network-scripts/ifup -fi - -# --------------- - %post -n netconsole-service %systemd_post netconsole.service @@ -282,45 +241,41 @@ fi # RC symlinks: %{_sysconfdir}/rc[0-6].d +%{_sysconfdir}/init.d + # --------------- -%{_bindir}/* +%{_bindir}/usleep %{_sbindir}/consoletype %{_sbindir}/genhostid -%{_sbindir}/service %{_libexecdir}/import-state %{_libexecdir}/loadmodules %{_prefix}/lib/systemd/system/import-state.service %{_prefix}/lib/systemd/system/loadmodules.service + +%{_mandir}/man1/* + +# ============================================================================= + +%files -n initscripts-rename-device + %{_prefix}/lib/udev/rename_device %{_udevrulesdir}/* -%{_mandir}/man1/* +# --------------- + +%files -n initscripts-service + +%dir %{_libexecdir}/%{name} +%dir %{_libexecdir}/%{name}/legacy-actions + +%{_sbindir}/service + %{_mandir}/man8/service.* -# ============================================================================= - -%files -n network-scripts -%doc doc/examples/ -%dir %{_sysconfdir}/sysconfig/network-scripts - -%{_sysconfdir}/rc.d/init.d/network -%{_sysconfdir}/sysconfig/network-scripts/* - -%config(noreplace) %{_sysconfdir}/sysconfig/network-scripts/ifcfg-lo - -%ghost %{_sbindir}/ifup -%ghost %{_sbindir}/ifdown -%attr(4755,root,root) %{_sbindir}/usernetctl - -%{_mandir}/man8/ifup.* -%{_mandir}/man8/ifdown.* -%{_mandir}/man8/usernetctl.* -%{_docdir}/network-scripts/* - # --------------- %files -n netconsole-service @@ -346,84 +301,229 @@ fi # ============================================================================= %changelog -* Wed Aug 10 2022 Jan Macku - 10.00.18-1 -- ci: Update `.packit.yml` to run on `c8s` -- ci: Use Differential ShellCheck action +* Tue Jun 25 2024 Jan Macku - 10.25-1 +- Revert "fix: return support for network-scripts for Fedora 40" -* Mon Jan 24 2022 Jan Macku - 10.00.17-1 +* Wed May 29 2024 Jan Macku - 10.24-1 +- Fix build when %_bindir==%_sbindir + +* Tue Apr 16 2024 Jan Macku - 10.23-1 +- fix: return support for network-scripts for Fedora 40 + +* Wed Mar 06 2024 Jan Macku - 10.22-1 +- Translated using Weblate (Georgian) +- rename_device: free path after it is used +- rename_device: remove trailing whitespaces + +* Wed Feb 07 2024 Jan Macku - 10.21-1 +- fedora: don't build network-scripts rpm in f40+ (2/2) +- ci: trigger copr build on every push to main branch +- ifup-routes: print warning when ADDRESS0 entry is missing +- fedora: don't build network-scripts rpm in f40+ + +* Tue Jan 30 2024 Jan Macku - 10.20-1 +- Translated using Weblate (Georgian) +- Add -r to while read as per shellcheck +- Fix splitting spaces in paths from statetab files +- build(deps): bump actions/upload-artifact from 3 to 4 +- build(deps): bump github/codeql-action from 2 to 3 +- Translated using Weblate (Georgian) +- Translated using Weblate (Czech) +- Translated using Weblate (Punjabi) +- Translated using Weblate (Portuguese (Brazil)) +- build(deps): bump redhat-plumbers-in-action/differential-shellcheck +- build(deps): bump actions/checkout from 3 to 4 +- Translated using Weblate (Hungarian) +- Translated using Weblate (Finnish) +- Translated using Weblate (Georgian) +- Translated using Weblate (Chinese (Simplified) (zh_CN)) +- Translated using Weblate (English (United Kingdom)) +- Translated using Weblate (Korean) +- Translated using Weblate (Ukrainian) +- Translated using Weblate (Swedish) +- Translated using Weblate (Polish) +- Update translation files +- Translated using Weblate (Korean) + +* Fri May 05 2023 Jan Macku - 10.19-1 +- ci: update Packit configuration +- spec: add missing changelog entry +- Revert "releng: Enable Packit to handle Fedora updates" +- Revert "releng: Convert to rpmautospec" +- doc: update translations +- spec: remove changelog + +* Thu Mar 23 2023 Jan Macku - 10.18-1 +- Translated using Weblate (English (United Kingdom)) +- migrate to SPDX license +- ci(Mergify): configuration update +- Translated using Weblate (German) +- Translated using Weblate (English (United Kingdom)) +- doc: update badges +- ci(lint): Add Differential PyLint GitHub Action +- ci(lint): Add permission `security-events: write` +- ci: Update Differential ShellCheck to `@v4` +- doc: fix markdown warnings and update badge +- ci: Setup CodeQL to replace deprecated LGTM +- releng: Enable Packit to handle Fedora updates +- releng: Convert to rpmautospec +- build(deps): bump redhat-plumbers-in-action/differential-shellcheck + +* Wed Aug 24 2022 Jan Macku - 10.17-1 +- service: Exit when `/etc/init.d` is missing +- ci: Update workflows to run on main branch +- ci: remove differential-shellcheck configs +- doc: Use main branch in links +- dependabot: Monthly updates +- ci(Mergify): configuration update +- Translated using Weblate (Georgian) +- Translated using Weblate (Georgian) +- ci: Update `packit.yml` +- ci: Update Github workflows & add Dependabot +- Translated using Weblate (Estonian) +- Translated using Weblate (Georgian) +- Translated using Weblate (Georgian) +- Translated using Weblate (Czech) +- Drop unnecessary obsoletes + +* Wed Feb 23 2022 Adam Williamson - 10.16-2 +- Drop unnecessary obsoletes + +* Wed Feb 23 2022 Jan Macku - 10.16-1 +- spec: Move rename_device to subpackage `initscripts-rename-device` + +* Tue Feb 15 2022 Jan Macku - 10.15-1 +- spec: network-scripts needs to depend on dbus-tools for NetworkManager detection +- packit: Run copr builds on release as well +- ci: Update `.packit.yml` to run on `c8s` `c9s` and `rawhide` +- Translated using Weblate (Finnish) +- ci: Use Differential ShellCheck action +- ci(Mergify): configuration update + +* Mon Jan 24 2022 Jan Macku - 10.14-1 - ifup-routes: Revert quotes - ifup-routes: Use `ip replace` only on type `route` -- ci: introduce GA ci from master to rhel8-branch -- ci: Setup packit for RHEL8 branch -- ci: Get rid of old ci files (travis and zanata) +- ci(Mergify): configuration update +- ci: remove testing branch from `shellcheck_test.yml` -* Fri Jan 14 2022 Jan Macku - 10.00.16-1 -- rename_device: also support dracut-style kernel cmdline configuration +* Thu Jan 13 2022 Jan Macku - 10.13-1 - ifup-routes: Log when using `ip $type replace` - ifup-routes: Use `ip route repace` to avoid race +- Translated using Weblate (German) +- Add LGTM badges to README +- ci: set default merge method to rebase +- ci: disable comments under opened PR in order to fix CI +- network scripts: do not use c-style for-loop +- network scripts: replace "<<<" with pipe +- rc.d/functions: do not use "+=" to concatenate string +- ci: Use default github-token (#395) +- ci(Mergify): configuration update (#394) +- ci: Output shellcheck results using PR comments (#393) +- ci: Update path to csdiff repository (#391) +- spec: Fix issue with $NEXT_VERSION (#390) +- Translated using Weblate (Indonesian) +- Translated using Weblate (Spanish) +- Translated using Weblate (Czech) -* Mon Feb 15 2021 Jan Macku - 10.00.15-1 +* Fri Sep 03 2021 Jan Macku - 10.12-1 +- spec: Update relation between initscripts and initscripts-service (#386) + +* Fri Aug 27 2021 Jan Macku - 10.11-1 +- specfile: Update obsoletes to allow upgrades (#385) + +* Thu Aug 26 2021 Jan Macku - 10.10-1 +- Translated using Weblate (Friulian) (#381) +- Translations update from Weblate (#378) +- added veth support +- ifup-eth: add a new PERSISTENT_DHCLIENT_IPV6 option for IPv6 dhclient daemon +- ifdown removes veth pair if both peers are down +- rename_device: also support dracut-style kernel cmdline configuration +- spec: Mark network-scripts as deprecated +- spec: Initscripts now requires chkconfig (#374) +- Translations update from Weblate (#371) +- spec: Move service script into subpackage +- ci: Onboard initscripts to Packit +- ci: Migrate from Travis to GH Actions + +* Mon Feb 15 2021 Jan Macku - 10.09-1 - doc: Document ARPING_WAIT and ARPING_UPDATE_WAIT - network scripts: Avoid infinite loop of arping -* Thu Feb 4 2021 Jan Macku - 10.00.14-1 +* Thu Feb 4 2021 Jan Macku - 10.08-1 - network: fix condition in set_link_up() +- spec: sync with Fedora -* Fri Jan 22 2021 Jan Macku - 10.00.13-1 +* Fri Jan 22 2021 Jan Macku - 10.07-1 +- doc: Fix "Duplicated string found in the file." +- doc: Documents RES_OPTIONS option - doc: Documents ifcfg option LINKSTATUS - -* Thu Dec 17 2020 Jan Macku - 10.00.12-1 +- ci: use up to date keywords and fix some warnings - network: fix set_link_up() - -* Tue Dec 15 2020 Jan Macku - 10.00.11-1 - network: add option to keep the link down +- Rework of shell ci +- Translations update from Weblate + +* Fri Nov 13 2020 Jan Macku - 10.06-1 +- service: catch unsupported action keywords - makefile: Use rpmdev-bumpspec's legacy date option -* Fri Nov 06 2020 Jan Macku - 10.00.10-1 -- Allow updating rfkill switch status while in readonly root mode +* Fri Nov 06 2020 Jan Macku - 10.05-1 - service: Prevent variables from globbing +- init.d/functions: Make usage msgs more clear +- network-scripts: Use net_log() instead of logger +- Allow updating rfkill switch status while in readonly root mode +- Add info into specfile about readonly-root deprecation - Allow updating mlocate.db while in readonly root mode - -* Fri Jul 24 2020 Jan Macku - 10.00.9-1 +- rc.d/functions: replace grep's --quiet with -q +- Add warning to warn user when ETHTOOL_OPTS is set and ethtool binary is missing - Olav Vitters +- Fix spacing in Makefile - Add optional 'dev' keyword -* Tue Jun 16 2020 Jan Macku - 10.00.8-1 +* Tue Jul 14 2020 Jan Macku - 10.04-1 +- Maintain permisision to set umask - rwtab: Add support for chrony -- ifup-eth: Switch to bc utility, which supports floating point computations. -- Replace grep -EL with subshell since -L changed behaviour +- Correct spelling, IP, … +- Fix spelling, for more info +- Fix spelling of SELinux +- Translations update from Weblate -* Wed Apr 15 2020 Jan Macku - 10.00.7-1 +* Tue Mar 24 2020 Jan Macku - 10.03-1 +- Replace grep -EL with subshell since -L changed behaviour - Wait for scope link addresses as well as for scope global addresses - Remove deprecated option -m of pidof - -* Tue Dec 10 2019 Jan Macku - 10.00.6-1 +- Use function is_true for testing true conditions +- Adding new travis job for testing shell-scripts +- Remove zanata conf +- pull latest translations +- Update of translations and remove files with no translations - Fix service network stop cmd -- Fix missing python3 during build phase - -* Wed Oct 30 2019 Jan Macku - 10.00.5-1 +- Change spacing of service file to folow spacing of project - network-function: bridges are created by ifup-eth -- network: don't fail with IFDOWN_ON_SHUTDOWN -- Add ip6gre tunnel option -- ifup-eth: Check that device name is set - Initscripts no longer care about rc.local - -* Fri Aug 23 2019 Lukas Nykryn - 10.00.4-1 +- Repalace hardcoded tests for yes and no with testing functions - ifup-eth: Fix bridge setting stp option - -* Wed Aug 07 2019 Jan Macku - 10.00.3-1 +- Fix bug in service(8) +- ifup-eth: Check that device name is set +- Fix missing python3 during build phase - rc.d/functions: fix escape sequence being output under systemd service units -- Replace not working awk command with sed +- Add ip6gre tunnel option +- ifup/ifdown: print DEPRECATION_WARNING_ISSUED waring info after source_config -* Thu Jun 06 2019 Jan Macku - 10.00.2-1 +* Fri Jun 28 2019 Jan Macku - 10.02-1 +- network: don't fail with IFDOWN_ON_SHUTDOWN +- rc.d/functions: remove support cgroups +- Create symlink (/etc/init.d) to /etc/rc.d/init.d +- Add option to wait until target is reachable +- ifup-eth: apply PERSISTENT_DHCLIENT to IPv6 dhclient daemon - ifup-post: fix incorrect condition for RESOLV_MODS +- make tag: updated message +- make release-commit: do not create tag automatically -* Fri Aug 03 2018 David Kaspar [Dee'Kej] - 10.00.1-1 -- consoletype/genhostid/usleep: allow disabling of deprecation warnings -- network/ifup/ifdown: allow disabling of deprecation warnings +* Mon Aug 06 2018 David Kaspar [Dee'Kej] - 10.01-1 +- network/ifup/ifdown: deprecations warnings redirected to stderr +- ifup-eth: use 'bc' instead of 'expr' when computing $forward_delay - network/ifup/ifdown: deprecation warnings for 'network-scripts' added - -* Thu Jun 21 2018 David Kaspar [Dee'Kej] - 10.00.0-1 -- fork for next major RHEL release +- network: parsing of /proc/mounts returned * Thu Jun 21 2018 David Kaspar [Dee'Kej] - 10.00-1 - Move the /etc/rwtab.d & /etc/statetab.d folders to 'filesystem' @@ -731,7 +831,7 @@ ng * Tue Jan 14 2014 Lukáš Nykrýn 9.51-1 - readonly-root: bind-mount only necessary subset of entries in rwtab - readonly-root: Add /var/log/audit/audit.log to rwtab -- readonly-root: restore selinux context after bind mount +- readonly-root: restore SELinux context after bind mount - rename_device: remove comments and trailing whitespaces - service: suggest using systemctl if unknown action is used - ifup-eth: fix typo in error message diff --git a/sources b/sources new file mode 100644 index 0000000..8e8dae4 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (initscripts-10.25.tar.gz) = 6bda528ba1ba59511d51e8b58e63631bd99e8f6dd4a8a1a93d62bc09f642682f9797ce795b4337a771179c65176a87b00f8da36a86a6d3d22aef26382f274163