From b5169710b4b05f74a87ffe394aabafa28d88cd26 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 25 2018 17:34:00 +0000 Subject: import initscripts-9.49.41-1.el7_5.2 --- 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 new file mode 100644 index 0000000..3a1f547 --- /dev/null +++ b/SOURCES/initscripts-9.49.41-fix-incorrect-condition-for-RESOLV_MODS.patch @@ -0,0 +1,32 @@ +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/SPECS/initscripts.spec b/SPECS/initscripts.spec index 2d42499..825ce24 100644 --- a/SPECS/initscripts.spec +++ b/SPECS/initscripts.spec @@ -4,7 +4,7 @@ Version: 9.49.41 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.1 +Release: 1%{?dist}.2 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 @@ -37,6 +37,7 @@ 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 @@ -57,6 +58,7 @@ Currently, this consists of various memory checking code. %prep %setup -q %patch001 -p1 +%patch002 -p1 %build make @@ -223,6 +225,9 @@ 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)