diff --git a/.gitignore b/.gitignore index 454a504..ff2acd3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/initscripts-9.49.41.tar.gz +SOURCES/initscripts-9.49.46.tar.gz diff --git a/.initscripts.metadata b/.initscripts.metadata index d2378b9..cdbf8d7 100644 --- a/.initscripts.metadata +++ b/.initscripts.metadata @@ -1 +1 @@ -6ad159c0e3fe019429c365fc74f41a3b54f1bac7 SOURCES/initscripts-9.49.41.tar.gz +5a1441664d0270f046804dfe083a9f2ac3ee9322 SOURCES/initscripts-9.49.46.tar.gz diff --git a/SOURCES/initscripts-9.49.41-fix-incorrect-condition-for-RESOLV_MODS.patch b/SOURCES/initscripts-9.49.41-fix-incorrect-condition-for-RESOLV_MODS.patch deleted file mode 100644 index 3a1f547..0000000 --- a/SOURCES/initscripts-9.49.41-fix-incorrect-condition-for-RESOLV_MODS.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d7e9663a063e087cd9c77844f56d1c17e7a19402 Mon Sep 17 00:00:00 2001 -From: "David Kaspar [Dee'Kej]" -Date: Mon, 20 Aug 2018 14:31:56 +0200 -Subject: [PATCH] ifup-post: fix incorrect condition for RESOLV_MODS - - This was causing the /etc/resolv.conf file to be always updated when - RESOLV_MODS was not set... - - Before the commit 5d6156454bf8f6dab4a5fdd7e1bf6 we were not updating - the /etc/resolv.conf file if the RESOLV_MODS was empty. - - See https://bugzilla.redhat.com/show_bug.cgi?id=1610411 for more info. ---- - sysconfig/network-scripts/ifup-post | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post -index c002503f..7bf81f2b 100755 ---- a/sysconfig/network-scripts/ifup-post -+++ b/sysconfig/network-scripts/ifup-post -@@ -28,7 +28,7 @@ if ! is_true "$NOROUTESET"; then - fi - - --if ! is_false "${PEERDNS}" || ! is_false "${RESOLV_MODS}"; then -+if ! is_false "${PEERDNS}" || is_true "${RESOLV_MODS}"; then - # Obtain the DNS entries when using PPP if necessary: - [ -n "${MS_DNS1}" ] && DNS1="${MS_DNS1}" - [ -n "${MS_DNS2}" ] && DNS2="${MS_DNS2}" --- -2.14.4 - diff --git a/SOURCES/initscripts-9.49.41-fix-setting-of-firewall-ZONE.patch b/SOURCES/initscripts-9.49.41-fix-setting-of-firewall-ZONE.patch deleted file mode 100644 index 167f0ff..0000000 --- a/SOURCES/initscripts-9.49.41-fix-setting-of-firewall-ZONE.patch +++ /dev/null @@ -1,70 +0,0 @@ -From d951e7c7d64c0378424b8b2edd406ae9eaa73ec1 Mon Sep 17 00:00:00 2001 -From: "David Kaspar [Dee'Kej]" -Date: Wed, 6 Jun 2018 19:19:11 +0200 -Subject: [PATCH] network-scripts: setting of firewall ZONE fixed - - For currently unknown reason the dbus-send calls will fail to set the - firewall zone for the given interface if we omit the --print-reply - option... - - This looks like some kind of race-condition in dbus-send, since the - --print-reply makes the call synchronous and slower. - - Hopefully this is only a temporary workaround until DBus is fixed. - - Resolves: #1586284 ---- - sysconfig/network-scripts/ifdown-post | 4 ++-- - sysconfig/network-scripts/ifup-eth | 3 ++- - sysconfig/network-scripts/ifup-post | 4 ++-- - 3 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/sysconfig/network-scripts/ifdown-post b/sysconfig/network-scripts/ifdown-post -index 9db16ad3..48a57ae4 100755 ---- a/sysconfig/network-scripts/ifdown-post -+++ b/sysconfig/network-scripts/ifdown-post -@@ -53,9 +53,9 @@ if ! check_default_route ; then - fi - fi - --# Reset firewall ZONE to "default": -+# Reset firewall zone (empty ZONE means default): - if [ "${REALDEVICE}" != "lo" ]; then -- dbus-send --system --dest=org.fedoraproject.FirewallD1 \ -+ dbus-send --print-reply --system --dest=org.fedoraproject.FirewallD1 \ - /org/fedoraproject/FirewallD1 \ - org.fedoraproject.FirewallD1.zone.removeInterface \ - string: "" string:"${DEVICE}" \ -diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth -index bee5c4f0..ab59244a 100755 ---- a/sysconfig/network-scripts/ifup-eth -+++ b/sysconfig/network-scripts/ifup-eth -@@ -339,7 +339,8 @@ fi - /etc/sysconfig/network-scripts/ifup-ipv6 ${CONFIG} - if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then - -- # Assign interface into a firewalld zone so we can obtain the IPv6 via DHCPv6: -+ # Assign interface into a firewalld zone so we can -+ # obtain the IPv6 via DHCPv6 (empty ZONE means default): - if [ "${REALDEVICE}" != "lo" ]; then - dbus-send --print-reply --system --dest=org.fedoraproject.FirewallD1 \ - /org/fedoraproject/FirewallD1 \ -diff --git a/sysconfig/network-scripts/ifup-post b/sysconfig/network-scripts/ifup-post -index c9d91700..c002503f 100755 ---- a/sysconfig/network-scripts/ifup-post -+++ b/sysconfig/network-scripts/ifup-post -@@ -132,9 +132,9 @@ if [ "$2" = "boot" -a \ - fi - fi - --# Set firewall ZONE for this device (empty means default): -+# Set firewall ZONE for this device (empty ZONE means default): - if [ "${REALDEVICE}" != "lo" ]; then -- dbus-send --system --dest=org.fedoraproject.FirewallD1 \ -+ dbus-send --print-reply --system --dest=org.fedoraproject.FirewallD1 \ - /org/fedoraproject/FirewallD1 \ - org.fedoraproject.FirewallD1.zone.changeZoneOfInterface \ - string:"${ZONE}" string:"${DEVICE}" \ --- -2.14.4 - diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec index 825ce24..fb0bd96 100644 --- a/SPECS/initscripts.spec +++ b/SPECS/initscripts.spec @@ -1,10 +1,10 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.49.41 +Version: 9.49.46 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.2 +Release: 1%{?dist} URL: https://github.com/fedora-sysv/initscripts Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -36,9 +36,6 @@ Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig systemd Provides: /sbin/service -Patch001: initscripts-9.49.41-fix-setting-of-firewall-ZONE.patch -Patch002: initscripts-9.49.41-fix-incorrect-condition-for-RESOLV_MODS.patch - %description The initscripts package contains basic system scripts used during a boot of the system. It also contains scripts which @@ -57,8 +54,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch001 -p1 -%patch002 -p1 %build make @@ -225,11 +220,29 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Tue Aug 28 2018 David Kaspar [Dee'Kej] - 9.49.41-1.el7_5.2 -- ifup-post: fix incorrect condition for RESOLV_MODS (bug #1622533) - -* Mon Jun 11 2018 David Kaspar [Dee'Kej] - 9.49.41-1.el7_5.1 -- network-scripts: setting of firewall ZONE fixed (bug #1588566) +* Fri Aug 24 2018 David Kaspar [Dee'Kej] - 9.49.46-1 +- ifup-post: fix incorrect condition for RESOLV_MODS (bug #1610411) + +* Tue Jul 24 2018 David Kaspar [Dee'Kej] - 9.49.45-1 +- network: parsing of /proc/mounts returned (bug #1572659) +- netconsole: LSB header added (bug #1508489) +- ifdown-eth: no longer needed 'pidof -x dhclient' condition removed (bug #1559384) + +* Thu Jun 07 2018 David Kaspar [Dee'Kej] - 9.49.44-1 +- network-scripts: setting of firewall ZONE fixed (bug #1586284) + +* Tue May 29 2018 David Kaspar [Dee'Kej] - 9.49.43-1 +- network: add knob to optionally keep interfaces up during shutdown + +* Fri May 25 2018 David Kaspar [Dee'Kej] - 9.49.42-1 +- rhel-autorelabel: set UEFI boot order (BootNext) same as BootCurrent +- network-functions: use tr to upper case strings rather than awk +- sysconfig/readonly-root: Clarify the usage of readonly-root +- network-functions: add error messages for bonding installation +- sysctl.conf.s390: drop SHMALL and SHMMAX +- network.service: 'reload' removed +- rhel-readonly.service: target name for random seed fixed +- init.d/functions: fix sourcing for ksh * Tue Jan 02 2018 David Kaspar [Dee'Kej] - 9.49.41-1 - ifdown-post: fix logical error in commit 5d61564