10.15

Resolves: #1832897

.gitignore

@@ -52,14 +52,3 @@
 /initscripts-10.13.tar.gz
 /initscripts-10.14.tar.gz
 /initscripts-10.15.tar.gz
-/initscripts-10.16.tar.gz
-/initscripts-10.17.tar.gz
-/initscripts-10.18.tar.gz
-/initscripts-10.19.tar.gz
-/initscripts-10.20.tar.gz
-/initscripts-10.21.tar.gz
-/initscripts-10.23.tar.gz
-/initscripts-10.24.tar.gz
-/initscripts-10.25.tar.gz
-/initscripts-10.26.tar.gz
-/initscripts-10.27.tar.gz

initscripts.spec

@@ -18,10 +18,10 @@ Requires:         gawk                       \
 
 Name:             initscripts
 Summary:          Basic support for legacy System V init scripts
-Version:          10.27
+Version:          10.15
 Release:          1%{?dist}
 
-License:          GPL-2.0-only
+License:          GPLv2
 
 URL:              https://github.com/fedora-sysv/initscripts
 Source:           https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -36,7 +36,6 @@ Requires:         systemd
 Requires:         util-linux
 Requires:         chkconfig
 Requires:         initscripts-service
-Requires:         initscripts-rename-device
 
 Requires(pre):    shadow-utils
 Requires(post):   coreutils
@@ -54,8 +53,7 @@ BuildRequires:    make
 %{?systemd_requires}
 BuildRequires:    systemd
 
-Obsoletes:        %{name}            < 10.16-1
-Obsoletes:        network-scripts    < 10.25-1
+Obsoletes:        %{name}            < 10.10-1
 
 # === PATCHES =================================================================
 
@@ -91,16 +89,6 @@ other legacy tools & utilities.
 
 # === SUBPACKAGES =============================================================
 
-%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
@@ -111,11 +99,64 @@ Requires:         systemd
 
 Provides:         /sbin/service
 
+Obsoletes:        %{name}            < 10.10-1
+
 %description -n initscripts-service
 This package provides service command.
 
 # ---------------
 
+%package -n network-scripts
+Summary:          Legacy scripts for manipulating of network devices
+Requires:         %{name}%{?_isa} = %{version}-%{release}
+
+%shared_requirements
+
+Requires:         bc
+Requires:         dbus
+Requires:         dbus-tools
+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
+
+Requires(post):   %{_sbindir}/update-alternatives
+Requires(postun): %{_sbindir}/update-alternatives
+
+Obsoletes:        %{name}            < 9.82-2
+
+# This is legacy and deprecated, so nobody should depend on this!
+# If ifcfg-style configuration is still desired, NetworkManager can do this.
+# Thus, mark this as deprecated to ensure people know to not depend on it.
+# Cf. https://docs.fedoraproject.org/en-US/packaging-guidelines/deprecating-packages/
+Provides:         deprecated()
+
+%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.
+
+# ---------------
+
 %package -n netconsole-service
 Summary:          Service for initializing of network console logging
 Requires:         %{name} = %{version}-%{release}
@@ -175,16 +216,25 @@ Please use systemd-volatile-root functionality instead, if possible.
 # ---------------
 
 %install
-%make_install NO_NETWORK_SCRIPTS=true
+%make_install
 
 # This installs the NLS language files:
 %find_lang %{name}
 
-%if "%{_sbindir}" == "%{_bindir}"
-# Some files get installed wrong, but if $(sbindir) is overriden, the build fails :(
-mv -v %{buildroot}/usr/sbin/* %{buildroot}%{_bindir}/
+%ifnarch s390 s390x
+  rm -f %{buildroot}%{_sysconfdir}/sysconfig/network-scripts/ifup-ctc
 %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
@@ -198,6 +248,24 @@ mv -v %{buildroot}/usr/sbin/* %{buildroot}%{_bindir}/
 
 # ---------------
 
+%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
 
@@ -245,7 +313,7 @@ mv -v %{buildroot}/usr/sbin/* %{buildroot}%{_bindir}/
 
 # ---------------
 
-%{_bindir}/usleep
+%{_bindir}/*
 %{_sbindir}/consoletype
 %{_sbindir}/genhostid
 
@@ -254,22 +322,15 @@ mv -v %{buildroot}/usr/sbin/* %{buildroot}%{_bindir}/
 
 %{_prefix}/lib/systemd/system/import-state.service
 %{_prefix}/lib/systemd/system/loadmodules.service
+%{_prefix}/lib/udev/rename_device
+
+%{_udevrulesdir}/*
 
 %{_mandir}/man1/*
 
 # =============================================================================
 
-%files -n initscripts-rename-device
-%license COPYING
-
-%{_prefix}/lib/udev/rename_device
-
-%{_udevrulesdir}/*
-
-# ---------------
-
 %files -n initscripts-service
-%license COPYING
 
 %dir %{_libexecdir}/%{name}
 %dir %{_libexecdir}/%{name}/legacy-actions
@@ -280,8 +341,27 @@ mv -v %{buildroot}/usr/sbin/* %{buildroot}%{_bindir}/
 
 # ---------------
 
+%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
-%license COPYING
 %config(noreplace) %{_sysconfdir}/sysconfig/netconsole
 
 %{_libexecdir}/netconsole
@@ -290,8 +370,6 @@ mv -v %{buildroot}/usr/sbin/* %{buildroot}%{_bindir}/
 # ---------------
 
 %files -n readonly-root
-%license COPYING
-
 %dir %{_sharedstatedir}/stateless
 %dir %{_sharedstatedir}/stateless/state
 %dir %{_sharedstatedir}/stateless/writable
@@ -306,137 +384,6 @@ mv -v %{buildroot}/usr/sbin/* %{buildroot}%{_bindir}/
 # =============================================================================
 
 %changelog
-* Thu Dec 11 2025 Jan Macku <jamacku@redhat.com> - 10.27-1
-- spec: add missing license files
-- build(deps): bump actions/checkout from 5 to 6
-- build(deps): bump actions/upload-artifact from 4 to 5
-- build(deps): bump github/codeql-action from 3 to 4
-- ci: fix issues with missing base commit
-- Translated using Weblate (Georgian)
-- Translated using Weblate (Indonesian)
-- Translated using Weblate (English (United Kingdom))
-- Translated using Weblate (Korean)
-- Translated using Weblate (Turkish)
-- man: add ifdown.8
-- build(deps): bump actions/checkout from 4 to 5
-- Translated using Weblate (Spanish)
-- Translated using Weblate (Georgian)
-- Translated using Weblate (Korean)
-- Translated using Weblate (Portuguese (Brazil))
-- Translated using Weblate (Polish)
-- Translated using Weblate (Greek)
-- Translated using Weblate (Greek)
-- Translated using Weblate (Spanish)
-- Translated using Weblate (Georgian)
-- Translated using Weblate (Greek)
-- Translated using Weblate (Italian)
-- Translated using Weblate (Chinese (Traditional) (zh_TW))
-- Translated using Weblate (Spanish)
-- Translated using Weblate (Finnish)
-- retry arping one more time in ifup-eth when sendto failed
-- Translated using Weblate (French)
-- ci: add dependency glib-2.0
-- network-functions: Fix a bug in is_nm_handling()
-
-* Tue Aug 27 2024 Jan Macku <jamacku@redhat.com> - 10.26-1
-- Translated using Weblate (Turkish)
-- netconsole: var/lock -> run/lock
-- netconsole: source sysconfig/network only if it exists
-- netconsole: remove unused variables
-- netconsole: remove trailing whitespaces
-- Translated using Weblate (Turkish)
-
-* Tue Jun 25 2024 Jan Macku <jamacku@redhat.com> - 10.25-1
-- Revert "fix: return support for network-scripts for Fedora 40"
-
-* Wed May 29 2024 Jan Macku <jamacku@redhat.com> - 10.24-1
-- Fix build when %_bindir==%_sbindir
-
-* Tue Apr 16 2024 Jan Macku <jamacku@redhat.com> - 10.23-1
-- fix: return support for network-scripts for Fedora 40
-
-* Wed Mar 06 2024 Jan Macku <jamacku@redhat.com> - 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 <jamacku@redhat.com> - 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 <jamacku@redhat.com> - 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 <jamacku@redhat.com> - 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 <jamacku@redhat.com> - 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 <jamacku@redhat.com> - 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 <awilliam@redhat.com> - 10.16-2
-- Drop unnecessary obsoletes
-
-* Wed Feb 23 2022 Jan Macku <jamacku@redhat.com> - 10.16-1
-- spec: Move rename_device to subpackage `initscripts-rename-device`
-
 * Tue Feb 15 2022 Jan Macku <jamacku@redhat.com> - 10.15-1
 - spec: network-scripts needs to depend on dbus-tools for NetworkManager detection
 - packit: Run copr builds on release as well

rebase.sh

@@ -16,10 +16,10 @@ curl https://raw.githubusercontent.com/fedora-sysv/initscripts/master/initscript
 spectool -g initscripts.spec
 
 # Make a local scratch build in mock first. If it fails, do not upload new tarball!
-# srpm_file="$(basename $(fedpkg srpm | grep -i "wrote" | cut -d ':' -f 2))"
-# arch="$(uname -p)"
+srpm_file="$(basename $(fedpkg srpm | grep -i "wrote" | cut -d ':' -f 2))"
+arch="$(uname -p)"
 
-# mock -r "fedora-rawhide-${arch}" "${srpm_file}" || exit 2
+mock -r "fedora-rawhide-${arch}" "${srpm_file}" || exit 2
 
 # Scratch build passed, the build should pass in Koji as well. Let's proceed:
 fedpkg new-sources "$(basename $(spectool -S -l initscripts.spec | gawk '{print $2;}'))" || exit 3

sources

@@ -1 +1 @@
-SHA512 (initscripts-10.27.tar.gz) = 951f88158eaf7409f7d65c9875c9ba2611e6a805c17112ddbb34167a1638d87d2433c3962d20e66564669f3424dd7be1265cbe03a1a7d6b1c5413ed43d80148d
+SHA512 (initscripts-10.15.tar.gz) = c7fc1f7b91d766be84ee7b71dcbbba604e1024e25481460f60736119c654f134506371ef758d3c1dccf6479640d56019797e7316891689a3267d96da5ee18707