Merge "Merge branch 'f/centos76'"

This commit is contained in:
Zuul 2019-03-12 01:18:36 +00:00 committed by Gerrit Code Review
commit be78454a52
204 changed files with 1599 additions and 1848 deletions

View File

@ -1 +1 @@
TIS_PATCH_VER=5 TIS_PATCH_VER=6

View File

@ -14,7 +14,7 @@ index e2d706d..00b19c4 100644
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
Summary: Graphical system installer Summary: Graphical system installer
Name: anaconda Name: anaconda
Version: 21.48.22.121 Version: 21.48.22.147
-Release: 1%{?dist} -Release: 1%{?dist}
+Release: 1.el7.centos%{?_tis_dist}.%{tis_patch_ver} +Release: 1.el7.centos%{?_tis_dist}.%{tis_patch_ver}
License: GPLv2+ and MIT License: GPLv2+ and MIT

View File

@ -4,28 +4,26 @@ Date: Mon, 13 Nov 2017 17:22:49 -0500
Subject: [PATCH] Add TIS patches Subject: [PATCH] Add TIS patches
--- ---
SPECS/anaconda.spec | 8 +++++++- SPECS/anaconda.spec | 6 ++++++
1 file changed, 7 insertions(+), 1 deletion(-) 1 file changed, 6 insertions(+)
diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index 00b19c4..79e1c55 100644 index 00b19c4..79e1c55 100644
--- a/SPECS/anaconda.spec --- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec
@@ -22,7 +22,10 @@ Patch6: anaconda-centos-help-text.patch @@ -24,6 +24,9 @@ Patch8: 9800-rpmostreepayload-Rework-remote-add-handling.patch
Patch7: anaconda-centos-skip-retry-if-not-connected.patch Patch9: yumpayload-dont-verify-disabled-repos.patch
Patch8: 9800-rpmostreepayload-Rework-remote-add-handling.patch Patch10: anaconda-centos-armhfp-extloader.patch
Patch1000: yumpayload-dont-verify-disabled-repos.patch
-
+
+# WRS +# WRS
+Patch10001: 0001-TIS-Progress-and-error-handling.patch +Patch10001: 0001-TIS-Progress-and-error-handling.patch
+ +
# Versions of required components (done so we make sure the buildrequires # Versions of required components (done so we make sure the buildrequires
# match the requires versions of things). # match the requires versions of things).
%define gettextver 0.18.1 %define dbusver 1.2.3
@@ -243,6 +246,9 @@ runtime on NFS/HTTP/FTP servers or local disks. @@ -250,6 +253,9 @@ runtime on NFS/HTTP/FTP servers or local disks.
%patch8 -p1 %patch10 -p1
%patch1000 -p1 %endif
+# WRS +# WRS
+%patch10001 -p1 +%patch10001 -p1

View File

@ -11,7 +11,7 @@ diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index 79e1c55..2e5ece9 100644 index 79e1c55..2e5ece9 100644
--- a/SPECS/anaconda.spec --- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec
@@ -25,6 +25,7 @@ Patch1000: yumpayload-dont-verify-disabled-repos.patch @@ -26,6 +26,7 @@ Patch10: anaconda-centos-armhfp-extloader.patch
# WRS # WRS
Patch10001: 0001-TIS-Progress-and-error-handling.patch Patch10001: 0001-TIS-Progress-and-error-handling.patch
@ -19,7 +19,7 @@ index 79e1c55..2e5ece9 100644
# Versions of required components (done so we make sure the buildrequires # Versions of required components (done so we make sure the buildrequires
# match the requires versions of things). # match the requires versions of things).
@@ -248,6 +249,7 @@ runtime on NFS/HTTP/FTP servers or local disks. @@ -255,6 +256,7 @@ runtime on NFS/HTTP/FTP servers or local disks.
# WRS # WRS
%patch10001 -p1 %patch10001 -p1

View File

@ -11,15 +11,15 @@ diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index 2e5ece9..174dbee 100644 index 2e5ece9..174dbee 100644
--- a/SPECS/anaconda.spec --- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec
@@ -48,7 +48,7 @@ Patch10002: 0002-revert-7.4-grub2-efi-handling.patch @@ -51,7 +51,7 @@ Patch10002: 0002-revert-7.4-grub2-efi-handling.patch
%define isomd5sum 1.0.10 %define pypartedver 2.5-2
%define fcoeutilsver 1.0.12-3.20100323git %define pythonpyblockver 0.45
%define iscsiver 6.2.0.870-3 %define pythonurlgrabberver 3.9.1-5
-%define rpmver 4.10.0 -%define rpmver 4.10.0
+%define rpmver 4.14.0 +%define rpmver 4.14.0
%define libarchivever 3.0.4 %define sckeyboardver 1.3.1
%define langtablever 0.0.31-3 %define utillinuxver 2.15.1
%define libxklavierver 5.4 %define yumutilsver 1.1.11-3
-- --
1.8.3.1 1.8.3.1

View File

@ -11,7 +11,7 @@ diff --git a/SPECS/anaconda.spec b/SPECS/anaconda.spec
index 174dbee..8541334 100644 index 174dbee..8541334 100644
--- a/SPECS/anaconda.spec --- a/SPECS/anaconda.spec
+++ b/SPECS/anaconda.spec +++ b/SPECS/anaconda.spec
@@ -26,6 +26,8 @@ Patch1000: yumpayload-dont-verify-disabled-repos.patch @@ -27,6 +27,8 @@ Patch10: anaconda-centos-armhfp-extloader.patch
# WRS # WRS
Patch10001: 0001-TIS-Progress-and-error-handling.patch Patch10001: 0001-TIS-Progress-and-error-handling.patch
Patch10002: 0002-revert-7.4-grub2-efi-handling.patch Patch10002: 0002-revert-7.4-grub2-efi-handling.patch
@ -20,7 +20,7 @@ index 174dbee..8541334 100644
# Versions of required components (done so we make sure the buildrequires # Versions of required components (done so we make sure the buildrequires
# match the requires versions of things). # match the requires versions of things).
@@ -250,6 +252,8 @@ runtime on NFS/HTTP/FTP servers or local disks. @@ -257,6 +259,8 @@ runtime on NFS/HTTP/FTP servers or local disks.
# WRS # WRS
%patch10001 -p1 %patch10001 -p1
%patch10002 -p1 %patch10002 -p1
@ -29,7 +29,7 @@ index 174dbee..8541334 100644
%build %build
%configure --disable-static \ %configure --disable-static \
@@ -268,6 +272,10 @@ desktop-file-install ---dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_ @@ -275,6 +279,10 @@ desktop-file-install ---dir=%{buildroot}%{_datadir}/applications %{buildroot}%{_
mkdir -p %{buildroot}%{_datadir}/anaconda/site-python mkdir -p %{buildroot}%{_datadir}/anaconda/site-python
install -m 0644 pyanaconda/sitecustomize.py %{buildroot}%{_datadir}/anaconda/site-python/ install -m 0644 pyanaconda/sitecustomize.py %{buildroot}%{_datadir}/anaconda/site-python/
%endif %endif
@ -40,7 +40,7 @@ index 174dbee..8541334 100644
# NOTE: If you see "error: Installed (but unpackaged) file(s) found" that include liveinst files, # NOTE: If you see "error: Installed (but unpackaged) file(s) found" that include liveinst files,
# check the IS_LIVEINST_ARCH in configure.ac to make sure your architecture is properly defined # check the IS_LIVEINST_ARCH in configure.ac to make sure your architecture is properly defined
@@ -316,6 +324,7 @@ update-desktop-database &> /dev/null || : @@ -323,6 +331,7 @@ update-desktop-database &> /dev/null || :
%{_sysconfdir}/X11/xinit/xinitrc.d/* %{_sysconfdir}/X11/xinit/xinitrc.d/*
%{_datadir}/applications/*.desktop %{_datadir}/applications/*.desktop
%endif %endif

View File

@ -92,7 +92,7 @@ diff --git a/pyanaconda/flags.py b/pyanaconda/flags.py
index 8a97f95..3d0d2da 100644 index 8a97f95..3d0d2da 100644
--- a/pyanaconda/flags.py --- a/pyanaconda/flags.py
+++ b/pyanaconda/flags.py +++ b/pyanaconda/flags.py
@@ -70,6 +70,7 @@ class Flags(object): @@ -71,6 +71,7 @@ class Flags(object):
self.ksprompt = True self.ksprompt = True
self.rescue_mode = False self.rescue_mode = False
self.kexec = False self.kexec = False
@ -126,16 +126,16 @@ diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 50515c8..d95b2df 100644 index 50515c8..d95b2df 100644
--- a/pyanaconda/kickstart.py --- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py +++ b/pyanaconda/kickstart.py
@@ -81,6 +81,8 @@ from pykickstart.sections import NullSection, PackageSection, PostScriptSection, @@ -90,6 +90,8 @@ from pykickstart.sections import NullSection, PackageSection, PostScriptSection,
from pykickstart.sections import Section
from pykickstart.version import returnClassForVersion, RHEL7 from pykickstart.version import returnClassForVersion, RHEL7
from pykickstart.options import KSOptionParser
+from pyanaconda.tisnotify import tisnotify +from pyanaconda.tisnotify import tisnotify
+ +
import logging import logging
log = logging.getLogger("anaconda") log = logging.getLogger("anaconda")
stderrLog = logging.getLogger("anaconda.stderr") stderrLog = logging.getLogger("anaconda.stderr")
@@ -2342,6 +2344,7 @@ def runPreScripts(scripts): @@ -2481,6 +2483,7 @@ def runPreScripts(scripts):
if len(preScripts) == 0: if len(preScripts) == 0:
return return
@ -164,15 +164,15 @@ index 7cf59d7..8896ba1 100644
exn = PayloadInstallError("%s %s exited with code %d" % (cmd, argv, rc)) exn = PayloadInstallError("%s %s exited with code %d" % (cmd, argv, rc))
if errors.errorHandler.cb(exn) == errors.ERROR_RAISE: if errors.errorHandler.cb(exn) == errors.ERROR_RAISE:
raise exn raise exn
@@ -170,6 +173,7 @@ class RPMOSTreePayload(ArchivePayload): @@ -183,6 +186,7 @@ class RPMOSTreePayload(ArchivePayload):
try: GLib.Variant('a{sv}', pull_opts),
repo.pull(ostreesetup.remote, [ostreesetup.ref], 0, progress, cancellable) progress, cancellable)
except GLib.GError as e: except GLib.GError as e:
+ tisnotify.failed() + tisnotify.failed()
exn = PayloadInstallError("Failed to pull from repository: %s" % e) exn = PayloadInstallError("Failed to pull from repository: %s" % e)
log.error(str(exn)) log.error(str(exn))
if errors.errorHandler.cb(exn) == errors.ERROR_RAISE: if errors.errorHandler.cb(exn) == errors.ERROR_RAISE:
@@ -213,6 +217,7 @@ class RPMOSTreePayload(ArchivePayload): @@ -227,6 +231,7 @@ class RPMOSTreePayload(ArchivePayload):
try: try:
self._copyBootloaderData() self._copyBootloaderData()
except (OSError, RuntimeError) as e: except (OSError, RuntimeError) as e:
@ -202,7 +202,7 @@ index c6aa234..a0497e0 100644
self.reset() self.reset()
def reset(self, root=None, releasever=None): def reset(self, root=None, releasever=None):
@@ -1338,6 +1342,8 @@ reposdir=%s @@ -1347,6 +1351,8 @@ reposdir=%s
if self.data.packages.handleMissing == KS_MISSING_IGNORE: if self.data.packages.handleMissing == KS_MISSING_IGNORE:
return return
@ -211,7 +211,7 @@ index c6aa234..a0497e0 100644
# If we're doing non-interactive ks install, raise CmdlineError, # If we're doing non-interactive ks install, raise CmdlineError,
# otherwise the system will just reboot automatically # otherwise the system will just reboot automatically
if flags.automatedInstall and not flags.ksprompt: if flags.automatedInstall and not flags.ksprompt:
@@ -1515,6 +1521,7 @@ reposdir=%s @@ -1524,6 +1530,7 @@ reposdir=%s
try: try:
self.checkSoftwareSelection() self.checkSoftwareSelection()
except DependencyError as e: except DependencyError as e:
@ -219,7 +219,7 @@ index c6aa234..a0497e0 100644
if errorHandler.cb(e) == ERROR_RAISE: if errorHandler.cb(e) == ERROR_RAISE:
progressQ.send_quit(1) progressQ.send_quit(1)
while True: while True:
@@ -1569,6 +1576,10 @@ reposdir=%s @@ -1578,6 +1585,10 @@ reposdir=%s
key, text = line.split(":", 1) key, text = line.split(":", 1)
msg = progress_map[key] + text msg = progress_map[key] + text
progressQ.send_message(msg) progressQ.send_message(msg)
@ -230,7 +230,7 @@ index c6aa234..a0497e0 100644
log.debug(msg) log.debug(msg)
elif line.startswith("DEBUG:"): elif line.startswith("DEBUG:"):
log.debug(line[6:]) log.debug(line[6:])
@@ -1581,7 +1592,8 @@ reposdir=%s @@ -1590,7 +1601,8 @@ reposdir=%s
install_errors.append(line[6:]) install_errors.append(line[6:])
else: else:
log.debug(line) log.debug(line)
@ -240,7 +240,7 @@ index c6aa234..a0497e0 100644
log.error("Error running anaconda-yum: %s", e) log.error("Error running anaconda-yum: %s", e)
exn = PayloadInstallError(str(e)) exn = PayloadInstallError(str(e))
if errorHandler.cb(exn) == ERROR_RAISE: if errorHandler.cb(exn) == ERROR_RAISE:
@@ -1603,6 +1615,7 @@ reposdir=%s @@ -1612,6 +1624,7 @@ reposdir=%s
shutil.rmtree(iutil.getSysroot()+"/var/tmp/yum.cache") shutil.rmtree(iutil.getSysroot()+"/var/tmp/yum.cache")
if install_errors: if install_errors:

View File

@ -11,7 +11,7 @@ diff --git a/pyanaconda/bootloader.py b/pyanaconda/bootloader.py
index 9db9cf3..24e8b56 100644 index 9db9cf3..24e8b56 100644
--- a/pyanaconda/bootloader.py --- a/pyanaconda/bootloader.py
+++ b/pyanaconda/bootloader.py +++ b/pyanaconda/bootloader.py
@@ -1388,9 +1388,7 @@ class GRUB2(GRUB): @@ -1404,9 +1404,7 @@ class GRUB2(GRUB):
""" """
name = "GRUB2" name = "GRUB2"
@ -22,7 +22,7 @@ index 9db9cf3..24e8b56 100644
_config_file = "grub.cfg" _config_file = "grub.cfg"
_config_dir = "grub2" _config_dir = "grub2"
_passwd_file = "user.cfg" _passwd_file = "user.cfg"
@@ -1664,28 +1662,12 @@ class GRUB2(GRUB): @@ -1680,28 +1678,12 @@ class GRUB2(GRUB):
return ret return ret
class EFIGRUB(GRUB2): class EFIGRUB(GRUB2):
@ -53,7 +53,7 @@ index 9db9cf3..24e8b56 100644
@property @property
def _config_dir(self): def _config_dir(self):
@@ -1695,15 +1677,6 @@ class EFIGRUB(GRUB2): @@ -1711,15 +1693,6 @@ class EFIGRUB(GRUB2):
super(EFIGRUB, self).__init__() super(EFIGRUB, self).__init__()
self.efi_dir = 'BOOT' self.efi_dir = 'BOOT'
@ -69,7 +69,7 @@ index 9db9cf3..24e8b56 100644
def efibootmgr(self, *args, **kwargs): def efibootmgr(self, *args, **kwargs):
if flags.imageInstall or flags.dirInstall: if flags.imageInstall or flags.dirInstall:
log.info("Skipping efibootmgr for image/directory install.") log.info("Skipping efibootmgr for image/directory install.")
@@ -1796,12 +1769,9 @@ class EFIGRUB(GRUB2): @@ -1812,12 +1785,9 @@ class EFIGRUB(GRUB2):
return True return True
class Aarch64EFIGRUB(EFIGRUB): class Aarch64EFIGRUB(EFIGRUB):

View File

@ -11,7 +11,7 @@ diff --git a/pyanaconda/network.py b/pyanaconda/network.py
index c6f7bb7..26c24a3 100644 index c6f7bb7..26c24a3 100644
--- a/pyanaconda/network.py --- a/pyanaconda/network.py
+++ b/pyanaconda/network.py +++ b/pyanaconda/network.py
@@ -63,7 +63,7 @@ networkConfFile = "%s/network" % (sysconfigDir) @@ -65,7 +65,7 @@ networkConfFile = "%s/network" % (sysconfigDir)
hostnameFile = "/etc/hostname" hostnameFile = "/etc/hostname"
ipv6ConfFile = "/etc/sysctl.d/anaconda.conf" ipv6ConfFile = "/etc/sysctl.d/anaconda.conf"
ifcfgLogFile = "/tmp/ifcfg.log" ifcfgLogFile = "/tmp/ifcfg.log"

View File

@ -1 +1 @@
mirror:Source/anaconda-21.48.22.121-1.el7.centos.src.rpm mirror:Source/anaconda-21.48.22.147-1.el7.centos.src.rpm

View File

@ -1,3 +1,3 @@
COPY_LIST="files/*" COPY_LIST="files/*"
TIS_PATCH_VER=3 TIS_PATCH_VER=4
BUILD_IS_SLOW=3 BUILD_IS_SLOW=3

View File

@ -3,8 +3,6 @@ From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 16:05:36 -0400 Date: Mon, 2 Oct 2017 16:05:36 -0400
Subject: [PATCH 2/3] WRS: 0001-Update-package-versioning-for-TIS-format.patch Subject: [PATCH 2/3] WRS: 0001-Update-package-versioning-for-TIS-format.patch
Conflicts:
SPECS/bash.spec
--- ---
SPECS/bash.spec | 2 +- SPECS/bash.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
@ -17,8 +15,8 @@ index 4f16c8c..d749f92 100644
Version: %{baseversion}%{patchleveltag} Version: %{baseversion}%{patchleveltag}
Name: bash Name: bash
Summary: The GNU Bourne Again shell Summary: The GNU Bourne Again shell
-Release: 30%{?dist} -Release: 31%{?dist}
+Release: 30.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 31.el7%{?_tis_dist}.%{tis_patch_ver}
Group: System Environment/Shells Group: System Environment/Shells
License: GPLv3+ License: GPLv3+
Url: http://www.gnu.org/software/bash Url: http://www.gnu.org/software/bash

View File

@ -3,8 +3,6 @@ From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 16:05:36 -0400 Date: Mon, 2 Oct 2017 16:05:36 -0400
Subject: [PATCH 1/3] WRS: spec-TiS-bash-history.patch Subject: [PATCH 1/3] WRS: spec-TiS-bash-history.patch
Conflicts:
SPECS/bash.spec
--- ---
SPECS/bash.spec | 8 ++++++++ SPECS/bash.spec | 8 ++++++++
1 file changed, 8 insertions(+) 1 file changed, 8 insertions(+)
@ -13,9 +11,9 @@ diff --git a/SPECS/bash.spec b/SPECS/bash.spec
index 4b2ec49..4f16c8c 100644 index 4b2ec49..4f16c8c 100644
--- a/SPECS/bash.spec --- a/SPECS/bash.spec
+++ b/SPECS/bash.spec +++ b/SPECS/bash.spec
@@ -195,6 +195,10 @@ Patch152: bash-4.3-pipefd-leak.patch @@ -198,6 +198,10 @@ Patch153: bash-4.3-wshouldquote.patch
#1487615 - bash fails to execute commands containing multibyte characters #1495398 - Append '/' while tab completing directory names
Patch153: bash-4.3-wshouldquote.patch Patch154: bash-4.3-dircomp-append-slash.patch
+# Patches from WindRiver +# Patches from WindRiver
+Patch500: bash-history-syslog.patch +Patch500: bash-history-syslog.patch
@ -24,9 +22,9 @@ index 4b2ec49..4f16c8c 100644
BuildRequires: texinfo bison BuildRequires: texinfo bison
BuildRequires: ncurses-devel BuildRequires: ncurses-devel
BuildRequires: autoconf, gettext BuildRequires: autoconf, gettext
@@ -327,6 +331,10 @@ This package contains documentation files for %{name}. @@ -331,6 +335,10 @@ This package contains documentation files for %{name}.
%patch152 -p1 -b .pipefd-leak
%patch153 -p1 -b .wshouldquote %patch153 -p1 -b .wshouldquote
%patch154 -p1 -b .append-slash
+# WindRiver patches +# WindRiver patches
+%patch500 -p1 -b .history-syslog +%patch500 -p1 -b .history-syslog

View File

@ -1 +1 @@
mirror:Source/bash-4.2.46-30.el7.src.rpm mirror:Source/bash-4.2.46-31.el7.src.rpm

View File

@ -1 +1 @@
TIS_PATCH_VER=12 TIS_PATCH_VER=1

View File

@ -11,13 +11,13 @@ diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
index 21fa049..fd8bc97 100644 index 21fa049..fd8bc97 100644
--- a/SPECS/resource-agents.spec --- a/SPECS/resource-agents.spec
+++ b/SPECS/resource-agents.spec +++ b/SPECS/resource-agents.spec
@@ -48,7 +48,7 @@ @@ -89,7 +89,7 @@
Name: resource-agents Name: resource-agents
Summary: Open Source HA Reusable Cluster Resource Scripts Summary: Open Source HA Reusable Cluster Resource Scripts
Version: 3.9.5 Version: 4.1.1
-Release: 124%{?dist} -Release: 12%{?dist}.7
+Release: 124.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 12.el7_6.7%{?_tis_dist}.%{tis_patch_ver}
License: GPLv2+, LGPLv2+ and ASL 2.0 License: GPLv2+ and LGPLv2+ and ASL 2.0
URL: https://github.com/ClusterLabs/resource-agents URL: https://github.com/ClusterLabs/resource-agents
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
-- --

View File

@ -20,7 +20,7 @@ index 2536cb7..e5fbbeb 100644
+%define debug_package %{nil} +%define debug_package %{nil}
+ +
%global upstream_prefix ClusterLabs-resource-agents %global upstream_prefix ClusterLabs-resource-agents
%global upstream_version 5434e96 %global upstream_version e711383f
-- --
1.8.3.1 1.8.3.1

View File

@ -12,7 +12,7 @@ diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
index ec85fc2..bb96485 100644 index ec85fc2..bb96485 100644
--- a/SPECS/resource-agents.spec --- a/SPECS/resource-agents.spec
+++ b/SPECS/resource-agents.spec +++ b/SPECS/resource-agents.spec
@@ -723,14 +723,11 @@ rm -rf %{buildroot} @@ -725,14 +725,11 @@ rm -rf %{buildroot}
%endif %endif
%if %{with linuxha} %if %{with linuxha}
@ -31,7 +31,7 @@ index ec85fc2..bb96485 100644
%if %{with rgmanager} %if %{with rgmanager}
/usr/lib/ocf/resource.d/redhat /usr/lib/ocf/resource.d/redhat
%endif %endif
@@ -753,8 +750,6 @@ rm -rf %{buildroot} @@ -758,8 +755,6 @@ rm -rf %{buildroot}
%{_includedir}/heartbeat %{_includedir}/heartbeat
@ -40,7 +40,7 @@ index ec85fc2..bb96485 100644
%{_mandir}/man7/*.7* %{_mandir}/man7/*.7*
### ###
@@ -864,7 +859,6 @@ rm -rf %{buildroot} @@ -912,7 +907,6 @@ rm -rf %{buildroot}
%exclude %{_mandir}/man8/ldirectord.8.gz %exclude %{_mandir}/man8/ldirectord.8.gz
# For compatability with pre-existing agents # For compatability with pre-existing agents

View File

@ -5,18 +5,18 @@ Subject: [PATCH] WRS: spec-include-TiS-patches.patch
Signed-off-by: zhipengl <zhipengs.liu@intel.com> Signed-off-by: zhipengl <zhipengs.liu@intel.com>
--- ---
SPECS/resource-agents.spec | 39 +++++++++++++++++++++++++++++++++++++++ SPECS/resource-agents.spec | 37 +++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+) 1 file changed, 37 insertions(+)
diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec
index a16660a..ec85fc2 100644 index a16660a..ec85fc2 100644
--- a/SPECS/resource-agents.spec --- a/SPECS/resource-agents.spec
+++ b/SPECS/resource-agents.spec +++ b/SPECS/resource-agents.spec
@@ -263,6 +263,25 @@ Patch202: bz1536548-sap_redhat_cluster_connector-fix-unknown-gvi-function.patch @@ -148,6 +148,24 @@ Patch1002: bz1568588-9-google-cloud-sdk-oauth2client-python-rsa-to-cryptography.
Patch203: bz1543366-redis-add-support-for-tunneling-replication-traffic.patch Patch1003: bz1568588-10-gcloud-support-info.patch
Patch204: bz1546083-galera-fix-temp-logfile-rights.patch Patch1004: bz1568589-4-aliyun-vpc-move-ip-bundled.patch
+# WRS +# STX
+Patch1105: filesystem_rmon.patch +Patch1105: filesystem_rmon.patch
+Patch1106: new_ocf_return_codes.patch +Patch1106: new_ocf_return_codes.patch
+Patch1107: ipaddr2_check_if_state.patch +Patch1107: ipaddr2_check_if_state.patch
@ -32,17 +32,16 @@ index a16660a..ec85fc2 100644
+Patch1117: lvm_cleanup_refs_on_stop.patch +Patch1117: lvm_cleanup_refs_on_stop.patch
+Patch1118: ipaddr2_if_down.patch +Patch1118: ipaddr2_if_down.patch
+Patch1119: ipaddr2_ignore_lo_if_state.patch +Patch1119: ipaddr2_ignore_lo_if_state.patch
+Patch1120: Re-enable-background-execution-of-arp-commands.patch
+Patch1121: ipaddr2-avoid-failing-svc-if-down.patch +Patch1121: ipaddr2-avoid-failing-svc-if-down.patch
+Patch1122: ipaddr2-use-host-scope-for-addresses-on-loopback.patch +Patch1122: ipaddr2-use-host-scope-for-addresses-on-loopback.patch
Obsoletes: heartbeat-resources <= %{version} Obsoletes: heartbeat-resources <= %{version}
Provides: heartbeat-resources = %{version} Provides: heartbeat-resources = %{version}
@@ -582,6 +601,26 @@ exit 1 @@ -508,6 +526,25 @@ cp %{aliyuncli_dir}/LICENSE %{aliyuncli}_LICENSE
%patch203 -p1 %patch1004 -p1
%patch204 -p1 %endif
+# WRS +# STX
+%patch1105 -p1 +%patch1105 -p1
+%patch1106 -p1 +%patch1106 -p1
+%patch1107 -p1 +%patch1107 -p1
@ -58,7 +57,6 @@ index a16660a..ec85fc2 100644
+%patch1117 -p1 +%patch1117 -p1
+%patch1118 -p1 +%patch1118 -p1
+%patch1119 -p1 +%patch1119 -p1
+%patch1120 -p1
+%patch1121 -p1 +%patch1121 -p1
+%patch1122 -p1 +%patch1122 -p1
+ +

View File

@ -30,11 +30,10 @@ diff --git a/heartbeat/LVM b/heartbeat/LVM
index 893ece8..1efb207 100755 index 893ece8..1efb207 100755
--- a/heartbeat/LVM --- a/heartbeat/LVM
+++ b/heartbeat/LVM +++ b/heartbeat/LVM
@@ -338,19 +338,16 @@ LVM_status() { @@ -191,18 +191,15 @@ LVM_status() {
fi
fi fi
fi fi
-
- if [ -d /dev/$1 ]; then - if [ -d /dev/$1 ]; then
- test "`cd /dev/$1 && ls`" != "" - test "`cd /dev/$1 && ls`" != ""
- rc=$? - rc=$?
@ -42,7 +41,7 @@ index 893ece8..1efb207 100755
- ocf_exit_reason "VG $1 with no logical volumes is not supported by this RA!" - ocf_exit_reason "VG $1 with no logical volumes is not supported by this RA!"
- fi - fi
- fi - fi
-
- if [ $rc -ne 0 ]; then - if [ $rc -ne 0 ]; then
+ # Ask lvm whether the volume group is active. This maps to + # Ask lvm whether the volume group is active. This maps to
+ # the question "Are there any logical volumes that are active in + # the question "Are there any logical volumes that are active in
@ -53,9 +52,9 @@ index 893ece8..1efb207 100755
rc=$OCF_NOT_RUNNING rc=$OCF_NOT_RUNNING
else else
+ rc=0 + rc=0
case $(get_vg_mode) in lvm_status
1) # exclusive with tagging. rc=$?
# If vg is running, make sure the correct tag is present. Otherwise we fi
-- --
2.7.4 2.7.4

View File

@ -1,36 +0,0 @@
From 9cdb2de3b5f1d08d74a762cfda2ade16692ef9db Mon Sep 17 00:00:00 2001
From: Al Bailey <Al.Bailey@windriver.com>
Date: Mon, 28 May 2018 14:09:47 -0500
Subject: [PATCH] WRS. Re-enable background execution of arp commands.
Typical ARP commands are taking 6 seconds due to no responses back after 7 attempts.
This change allows that delay to be backgrounded
---
heartbeat/IPaddr2 | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
index 59620d2..86009b9 100755
--- a/heartbeat/IPaddr2
+++ b/heartbeat/IPaddr2
@@ -719,12 +719,13 @@ run_send_arp() {
if [ $ARP_COUNT -ne 0 ] ; then
ARGS="-i $OCF_RESKEY_arp_interval -c $ARP_COUNT -p $SENDARPPIDFILE -I $NIC -m $MY_MAC $OCF_RESKEY_ip"
ocf_log $LOGLEVEL "$SENDARP $ARGS"
- output=$($SENDARP $ARGS 2>&1)
+ if ocf_is_true $OCF_RESKEY_arp_bg; then
+ ($SENDARP $ARGS || ocf_log err "Could not send gratuitous arps")& >&2
+ else
+ $SENDARP $ARGS || ocf_log err "Could not send gratuitous arps"
+ fi
rc=$?
if [ $rc -ne $OCF_SUCCESS ]; then
- if ! ocf_is_true $OCF_RESKEY_arp_bg; then
- ocf_log err "send_arp output: $output"
- fi
ocf_exit_reason "Could not send gratuitous arps"
exit $OCF_ERR_GENERIC
fi
--
1.8.3.1

View File

@ -15,7 +15,7 @@ index 27f03d2..af821b2 100755
+++ b/heartbeat/Filesystem +++ b/heartbeat/Filesystem
@@ -2,6 +2,8 @@ @@ -2,6 +2,8 @@
# #
# Support: linux-ha@lists.linux-ha.org # Support: users@clusterlabs.org
# License: GNU General Public License (GPL) # License: GNU General Public License (GPL)
+# +#
+# Copyright (c) 2014 Wind River Systems, Inc. All rights reserved. +# Copyright (c) 2014 Wind River Systems, Inc. All rights reserved.
@ -27,7 +27,7 @@ index e435e7b..c11fed7 100755
--- a/heartbeat/LVM --- a/heartbeat/LVM
+++ b/heartbeat/LVM +++ b/heartbeat/LVM
@@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
# Support: linux-ha@lists.linux-ha.org # Support: users@clusterlabs.org
# License: GNU General Public License (GPL) # License: GNU General Public License (GPL)
# Copyright: (C) 2002 - 2005 International Business Machines, Inc. # Copyright: (C) 2002 - 2005 International Business Machines, Inc.
+# Copyright (c) 2014 Wind River Systems, Inc. All rights reserved. +# Copyright (c) 2014 Wind River Systems, Inc. All rights reserved.
@ -38,7 +38,7 @@ diff --git a/heartbeat/pgsql b/heartbeat/pgsql
index 794f85e..b176b1d 100755 index 794f85e..b176b1d 100755
--- a/heartbeat/pgsql --- a/heartbeat/pgsql
+++ b/heartbeat/pgsql +++ b/heartbeat/pgsql
@@ -9,6 +9,7 @@ @@ -10,6 +10,7 @@
# #
# Copyright: 2006-2012 Serge Dubrouski <sergeyfd@gmail.com> # Copyright: 2006-2012 Serge Dubrouski <sergeyfd@gmail.com>
# and other Linux-HA contributors # and other Linux-HA contributors

View File

@ -16,7 +16,7 @@ index d834096..8cd9c6b 100755
# OCF_RESKEY_run_fsck # OCF_RESKEY_run_fsck
# OCF_RESKEY_fast_stop # OCF_RESKEY_fast_stop
# OCF_RESKEY_force_clones # OCF_RESKEY_force_clones
+# OCF_RESKEY_rmon_rsc_name +# OCF_RESKEY_rmon_rsc_name
# #
#OCF_RESKEY_device : name of block device for the filesystem. e.g. /dev/sda1, /dev/md0 #OCF_RESKEY_device : name of block device for the filesystem. e.g. /dev/sda1, /dev/md0
# Or a -U or -L option for mount, or an NFS mount specification # Or a -U or -L option for mount, or an NFS mount specification
@ -28,7 +28,7 @@ index d834096..8cd9c6b 100755
# #
# #
# This assumes you want to manage a filesystem on a shared (SCSI) bus, # This assumes you want to manage a filesystem on a shared (SCSI) bus,
@@ -1137,20 +1139,65 @@ if [ "$OP" != "monitor" ]; then @@ -822,18 +824,63 @@ if [ "$OP" != "monitor" ]; then
ocf_log info "Running $OP for $DEVICE on $MOUNTPOINT" ocf_log info "Running $OP for $DEVICE on $MOUNTPOINT"
fi fi
@ -61,55 +61,53 @@ index d834096..8cd9c6b 100755
+ fi + fi
+} +}
+ +
# These operations do not require the clone checking + OCFS2
# initialization.
case $OP in case $OP in
status) Filesystem_status status) Filesystem_status
- exit $? - exit $?
+ rc=$? + rc=$?
+ if [ $rc -eq $OCF_SUCCESS ] + if [ $rc -eq $OCF_SUCCESS ]
+ then + then
+ rmon_notify "enabled" 300 + rmon_notify "enabled" 300
+ else + else
+ rmon_notify "disabled" 300 + rmon_notify "disabled" 300
+ fi + fi
+ exit $rc + exit $rc
;; ;;
monitor) Filesystem_monitor monitor) Filesystem_monitor
- exit $? - exit $?
+ rc=$? + rc=$?
+ if [ $rc -eq $OCF_SUCCESS ] + if [ $rc -eq $OCF_SUCCESS ]
+ then + then
+ rmon_notify "enabled" 300 + rmon_notify "enabled" 300
+ else + else
+ rmon_notify "disabled" 300 + rmon_notify "disabled" 300
+ fi + fi
+ exit $rc + exit $rc
;; ;;
validate-all) Filesystem_validate_all validate-all) Filesystem_validate_all
exit $? exit $?
;; ;;
stop) Filesystem_stop stop) Filesystem_stop
- exit $? - exit $?
+ rc=$? + rc=$?
+ rmon_notify "disabled" 300 + rmon_notify "disabled" 300
+ exit $rc + exit $rc
;; ;;
esac esac
@@ -1199,6 +1246,12 @@ fi @@ -879,6 +926,12 @@ fi
case $OP in case $OP in
start) Filesystem_start start) Filesystem_start
+ rc=$? + rc=$?
+ if [ $rc -eq $OCF_SUCCESS ] + if [ $rc -eq $OCF_SUCCESS ]
+ then + then
+ rmon_notify "enabled" 300 + rmon_notify "enabled" 300
+ fi + fi
+ exit $rc + exit $rc
;;
notify) Filesystem_notify
;; ;;
*) usage
exit $OCF_ERR_UNIMPLEMENTED
diff --git a/heartbeat/LVM b/heartbeat/LVM diff --git a/heartbeat/LVM b/heartbeat/LVM
index 425a60a..ba6c198 100755 index 425a60a..ba6c198 100755
--- a/heartbeat/LVM --- a/heartbeat/LVM
@ -118,11 +116,11 @@ index 425a60a..ba6c198 100755
# #
# OCF parameters are as below: # OCF parameters are as below:
# OCF_RESKEY_volgrpname # OCF_RESKEY_volgrpname
+# OCF_RESKEY_rmon_rsc_name +# OCF_RESKEY_rmon_rsc_name
# #
####################################################################### #######################################################################
# Initialization: # Initialization:
@@ -699,6 +700,34 @@ then @@ -406,6 +407,34 @@ then
exit $OCF_ERR_CONFIGURED exit $OCF_ERR_CONFIGURED
fi fi
@ -157,45 +155,45 @@ index 425a60a..ba6c198 100755
# Get the LVM version number, for this to work we assume(thanks to panjiam): # Get the LVM version number, for this to work we assume(thanks to panjiam):
# #
# LVM1 outputs like this # LVM1 outputs like this
@@ -740,16 +769,37 @@ case "$1" in @@ -449,16 +478,37 @@ case "$1" in
start) start)
LVM_validate_all LVM_validate_all
LVM_start $VOLUME LVM_start $VOLUME
- exit $?;; - exit $?;;
+ rc=$? + rc=$?
+ if [ $rc -eq $OCF_SUCCESS ] + if [ $rc -eq $OCF_SUCCESS ]
+ then + then
+ rmon_notify "enabled" 300 + rmon_notify "enabled" 300
+ fi + fi
+ exit $rc;; + exit $rc;;
stop) LVM_stop $VOLUME stop) LVM_stop $VOLUME
- exit $?;; - exit $?;;
+ rc=$? + rc=$?
+ rmon_notify "disabled" 300 + rmon_notify "disabled" 300
+ exit $rc;; + exit $rc;;
status) LVM_status $VOLUME $1 status) LVM_status $VOLUME $1
- exit $?;; - exit $?;;
+ rc=$? + rc=$?
+ if [ $rc -eq $OCF_SUCCESS ] + if [ $rc -eq $OCF_SUCCESS ]
+ then + then
+ rmon_notify "enabled" 300 + rmon_notify "enabled" 300
+ else + else
+ rmon_notify "disabled" 300 + rmon_notify "disabled" 300
+ fi + fi
+ exit $rc;; + exit $rc;;
monitor) LVM_status $VOLUME monitor) LVM_status $VOLUME
- exit $?;; - exit $?;;
+ rc=$? + rc=$?
+ if [ $rc -eq $OCF_SUCCESS ] + if [ $rc -eq $OCF_SUCCESS ]
+ then + then
+ rmon_notify "enabled" 300 + rmon_notify "enabled" 300
+ else + else
+ rmon_notify "disabled" 300 + rmon_notify "disabled" 300
+ fi + fi
+ exit $rc;; + exit $rc;;
validate-all) LVM_validate_all validate-all) LVM_validate_all
;; ;;

View File

@ -11,49 +11,49 @@ diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
index 86009b9..2da5c5e 100755 index 86009b9..2da5c5e 100755
--- a/heartbeat/IPaddr2 --- a/heartbeat/IPaddr2
+++ b/heartbeat/IPaddr2 +++ b/heartbeat/IPaddr2
@@ -885,12 +885,8 @@ ip_start() { @@ -968,12 +968,8 @@ ip_start() {
then then
exit $OCF_SUCCESS exit $OCF_SUCCESS
else else
- if [ "$OCF_RESKEY_dc" = "yes" ]; then - if [ "$OCF_RESKEY_dc" = "yes" ]; then
- ocf_log info "NIC $NIC is DOWN..." - ocf_log info "NIC $NIC is DOWN..."
- exit $OCF_SUCCESS - exit $OCF_SUCCESS
- else - else
- exit $OCF_ERR_GENERIC - exit $OCF_ERR_GENERIC
- fi - fi
+ ocf_log info "NIC $NIC is DOWN..." + ocf_log info "NIC $NIC is DOWN..."
+ exit $OCF_SUCCESS + exit $OCF_SUCCESS
fi fi
fi fi
@@ -954,12 +950,8 @@ ip_start() { @@ -1037,12 +1033,8 @@ ip_start() {
then then
exit $OCF_SUCCESS exit $OCF_SUCCESS
else else
- if [ "$OCF_RESKEY_dc" = "yes" ]; then - if [ "$OCF_RESKEY_dc" = "yes" ]; then
- ocf_log info "NIC $NIC is DOWN" - ocf_log info "NIC $NIC is DOWN"
- exit $OCF_SUCCESS - exit $OCF_SUCCESS
- else - else
- exit $OCF_ERR_GENERIC - exit $OCF_ERR_GENERIC
- fi - fi
+ ocf_log info "NIC $NIC is DOWN" + ocf_log info "NIC $NIC is DOWN"
+ exit $OCF_SUCCESS + exit $OCF_SUCCESS
fi fi
} }
@@ -1040,12 +1032,8 @@ ip_monitor() { @@ -1123,12 +1115,8 @@ ip_monitor() {
then then
return $OCF_SUCCESS return $OCF_SUCCESS
else else
- if [ "$OCF_RESKEY_dc" = "yes" ]; then - if [ "$OCF_RESKEY_dc" = "yes" ]; then
- ocf_log info "NIC $NIC is DOWN" - ocf_log info "NIC $NIC is DOWN"
- return $OCF_SUCCESS - return $OCF_SUCCESS
- else - else
- return $OCF_NOT_RUNNING - return $OCF_NOT_RUNNING
- fi - fi
+ ocf_log info "NIC $NIC is DOWN" + ocf_log info "NIC $NIC is DOWN"
+ return $OCF_SUCCESS + exit $OCF_SUCCESS
fi fi
;; ;;
partial|no|partial2) partial|no|partial2)
-- --

View File

@ -11,7 +11,7 @@ diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
index 2da5c5e..79dbdcf 100755 index 2da5c5e..79dbdcf 100755
--- a/heartbeat/IPaddr2 --- a/heartbeat/IPaddr2
+++ b/heartbeat/IPaddr2 +++ b/heartbeat/IPaddr2
@@ -584,10 +584,18 @@ add_interface () { @@ -622,10 +622,18 @@ add_interface () {
add_ipv6_addrlabel $ipaddr add_ipv6_addrlabel $ipaddr
fi fi

View File

@ -11,45 +11,45 @@ diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
index aef6dc7..67a7ca3 100755 index aef6dc7..67a7ca3 100755
--- a/heartbeat/IPaddr2 --- a/heartbeat/IPaddr2
+++ b/heartbeat/IPaddr2 +++ b/heartbeat/IPaddr2
@@ -880,7 +880,12 @@ ip_start() { @@ -964,7 +964,12 @@ ip_start() {
local ip_status=`ip_served` local ip_status=`ip_served`
if [ "$ip_status" = "ok" ]; then if [ "$ip_status" = "ok" ]; then
- exit $OCF_SUCCESS - exit $OCF_SUCCESS
+ if [ -n "`ip link show $NIC | grep \"state UP\"`" ] + if [ -n "`ip link show $NIC | grep \"state UP\"`" ]
+ then + then
+ exit $OCF_SUCCESS + exit $OCF_SUCCESS
+ else + else
+ exit $OCF_ERR_GENERIC + exit $OCF_ERR_GENERIC
+ fi + fi
fi fi
if [ -n "$IP_CIP" ] && [ $ip_status = "no" ] || [ $ip_status = "partial2" ]; then if [ -n "$IP_CIP" ] && ([ $ip_status = "no" ] || [ $ip_status = "partial2" ]); then
@@ -939,7 +944,12 @@ ip_start() { @@ -1023,7 +1028,12 @@ ip_start() {
fi fi
;; ;;
esac esac
- exit $OCF_SUCCESS - exit $OCF_SUCCESS
+ if [ -n "`ip link show $NIC | grep \"state UP\"`" ] + if [ -n "`ip link show $NIC | grep \"state UP\"`" ]
+ then + then
+ exit $OCF_SUCCESS + exit $OCF_SUCCESS
+ else + else
+ exit $OCF_ERR_GENERIC + exit $OCF_ERR_GENERIC
+ fi + fi
} }
ip_stop() { ip_stop() {
@@ -1015,7 +1025,12 @@ ip_monitor() { @@ -1099,7 +1109,12 @@ ip_monitor() {
case $ip_status in case $ip_status in
ok) ok)
$ARP_SEND_FUN refresh run_arp_sender refresh
- return $OCF_SUCCESS - return $OCF_SUCCESS
+ if [ -n "`ip link show $NIC | grep \"state UP\"`" ] + if [ -n "`ip link show $NIC | grep \"state UP\"`" ]
+ then + then
+ return $OCF_SUCCESS + return $OCF_SUCCESS
+ else + else
+ return $OCF_NOT_RUNNING + return $OCF_NOT_RUNNING
+ fi + fi
;; ;;
partial|no|partial2) partial|no|partial2)
exit $OCF_NOT_RUNNING exit $OCF_NOT_RUNNING

View File

@ -11,46 +11,46 @@ diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
index 67a7ca3..2cd822d 100755 index 67a7ca3..2cd822d 100755
--- a/heartbeat/IPaddr2 --- a/heartbeat/IPaddr2
+++ b/heartbeat/IPaddr2 +++ b/heartbeat/IPaddr2
@@ -884,7 +884,12 @@ ip_start() { @@ -968,7 +968,12 @@ ip_start() {
then then
exit $OCF_SUCCESS exit $OCF_SUCCESS
else else
- exit $OCF_ERR_GENERIC - exit $OCF_ERR_GENERIC
+ if [ "$OCF_RESKEY_dc" = "yes" ]; then + if [ "$OCF_RESKEY_dc" = "yes" ]; then
+ ocf_log info "NIC $NIC is DOWN..." + ocf_log info "NIC $NIC is DOWN..."
+ exit $OCF_SUCCESS + exit $OCF_SUCCESS
+ else + else
+ exit $OCF_ERR_GENERIC + exit $OCF_ERR_GENERIC
+ fi + fi
fi fi
fi fi
@@ -948,7 +953,12 @@ ip_start() { @@ -1032,7 +1037,12 @@ ip_start() {
then then
exit $OCF_SUCCESS exit $OCF_SUCCESS
else else
- exit $OCF_ERR_GENERIC - exit $OCF_ERR_GENERIC
+ if [ "$OCF_RESKEY_dc" = "yes" ]; then + if [ "$OCF_RESKEY_dc" = "yes" ]; then
+ ocf_log info "NIC $NIC is DOWN" + ocf_log info "NIC $NIC is DOWN"
+ exit $OCF_SUCCESS + exit $OCF_SUCCESS
+ else + else
+ exit $OCF_ERR_GENERIC + exit $OCF_ERR_GENERIC
+ fi + fi
fi fi
} }
@@ -1029,7 +1039,12 @@ ip_monitor() { @@ -1113,7 +1123,12 @@ ip_monitor() {
then then
return $OCF_SUCCESS return $OCF_SUCCESS
else else
- return $OCF_NOT_RUNNING - return $OCF_NOT_RUNNING
+ if [ "$OCF_RESKEY_dc" = "yes" ]; then + if [ "$OCF_RESKEY_dc" = "yes" ]; then
+ ocf_log info "NIC $NIC is DOWN" + ocf_log info "NIC $NIC is DOWN"
+ return $OCF_SUCCESS + return $OCF_SUCCESS
+ else + else
+ return $OCF_NOT_RUNNING + return $OCF_NOT_RUNNING
+ fi + fi
fi fi
;; ;;
partial|no|partial2) partial|no|partial2)
-- --

View File

@ -11,33 +11,33 @@ diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
index 2cd822d..59620d2 100755 index 2cd822d..59620d2 100755
--- a/heartbeat/IPaddr2 --- a/heartbeat/IPaddr2
+++ b/heartbeat/IPaddr2 +++ b/heartbeat/IPaddr2
@@ -880,7 +880,7 @@ ip_start() { @@ -964,7 +964,7 @@ ip_start() {
local ip_status=`ip_served` local ip_status=`ip_served`
if [ "$ip_status" = "ok" ]; then if [ "$ip_status" = "ok" ]; then
- if [ -n "`ip link show $NIC | grep \"state UP\"`" ] - if [ -n "`ip link show $NIC | grep \"state UP\"`" ]
+ if [ -n "`ip link show $NIC | grep \"state UP\"`" ] || [ "$NIC" = "lo" ] + if [ -n "`ip link show $NIC | grep \"state UP\"`" ] || [ "$NIC" = "lo" ]
then then
exit $OCF_SUCCESS exit $OCF_SUCCESS
else else
@@ -949,7 +949,7 @@ ip_start() { @@ -1033,7 +1033,7 @@ ip_start() {
fi fi
;; ;;
esac esac
- if [ -n "`ip link show $NIC | grep \"state UP\"`" ] - if [ -n "`ip link show $NIC | grep \"state UP\"`" ]
+ if [ -n "`ip link show $NIC | grep \"state UP\"`" ] || [ "$NIC" = "lo" ] + if [ -n "`ip link show $NIC | grep \"state UP\"`" ] || [ "$NIC" = "lo" ]
then then
exit $OCF_SUCCESS exit $OCF_SUCCESS
else else
@@ -1035,7 +1035,7 @@ ip_monitor() { @@ -1119,7 +1119,7 @@ ip_monitor() {
case $ip_status in case $ip_status in
ok) ok)
$ARP_SEND_FUN refresh run_arp_sender refresh
- if [ -n "`ip link show $NIC | grep \"state UP\"`" ] - if [ -n "`ip link show $NIC | grep \"state UP\"`" ]
+ if [ -n "`ip link show $NIC | grep \"state UP\"`" ] || [ "$NIC" = "lo" ] + if [ -n "`ip link show $NIC | grep \"state UP\"`" ] || [ "$NIC" = "lo" ]
then then
return $OCF_SUCCESS return $OCF_SUCCESS
else else
-- --
1.9.1 1.9.1

View File

@ -30,7 +30,7 @@ diff --git a/heartbeat/LVM b/heartbeat/LVM
index 1efb207..bde381c 100755 index 1efb207..bde381c 100755
--- a/heartbeat/LVM --- a/heartbeat/LVM
+++ b/heartbeat/LVM +++ b/heartbeat/LVM
@@ -601,6 +601,81 @@ EOF @@ -367,6 +367,81 @@ LVM_start() {
} }
# #
@ -112,7 +112,7 @@ index 1efb207..bde381c 100755
# Disable the LVM volume # Disable the LVM volume
# #
LVM_stop() { LVM_stop() {
@@ -632,6 +707,7 @@ LVM_stop() { @@ -395,6 +470,7 @@ LVM_stop() {
break break
fi fi

View File

@ -4,14 +4,14 @@ Date: Mon, 2 Oct 2017 15:12:54 -0400
Subject: [PATCH 06/13] WRS: Patch1110: lvm_vg_activation.patch Subject: [PATCH 06/13] WRS: Patch1110: lvm_vg_activation.patch
--- ---
heartbeat/LVM | 130 +++++++++++++++++++++++++++++++++++++++++++++++++++------- heartbeat/LVM | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 116 insertions(+), 14 deletions(-) 1 file changed, 116 insertions(+), 1 deletion(-)
diff --git a/heartbeat/LVM b/heartbeat/LVM diff --git a/heartbeat/LVM b/heartbeat/LVM
index b0ca87a..38092f9 100755 index b0ca87a..38092f9 100755
--- a/heartbeat/LVM --- a/heartbeat/LVM
+++ b/heartbeat/LVM +++ b/heartbeat/LVM
@@ -437,6 +437,81 @@ retry_exclusive_start() @@ -222,6 +222,81 @@ LVM_status() {
} }
# #
@ -93,68 +93,58 @@ index b0ca87a..38092f9 100755
# Enable LVM volume # Enable LVM volume
# #
LVM_start() { LVM_start() {
@@ -477,20 +552,47 @@ EOF @@ -241,10 +316,50 @@ LVM_start() {
: ;; ocf_run vgscan
esac fi
- if ! ocf_run vgchange $vgchange_options $vg; then + # Kick off activation of all volumes. If it doesn't complete within
- if [ $clvmd -eq 0 ]; then + # the timeout period, then we'll log the not-yet-activated volumes and
- return $OCF_ERR_GENERIC + # continue on.
- fi lvm_pre_activate || exit
- - ocf_run vgchange $vgchange_activate_options $vg
- # Failure to exclusively activate cluster vg.: + (ocf_run vgchange $vgchange_activate_options $1) & PID=$!
- # This could be caused by a remotely active LV, Attempt lvm_post_activate $?
- # to disable volume group cluster wide and try again.
- # Allow for some settling
- sleep 5
- if ! retry_exclusive_start; then
- return $OCF_ERR_GENERIC
- fi
- fi
+ # Kick off activation of all volumes. If it doesn't complete within
+ # the timeout period, then we'll log the not-yet-activated volumes and
+ # continue on.
+ (ocf_run vgchange $vgchange_options $1) & PID=$!
+
+ # Check every second for up to TIMEOUT seconds whether the vgchange has
+ # completed.
+ TIMEOUT=300
+ TIMED_OUT=true
+ SECONDS=0;
+ PARALLEL_ACTIVATE_DELAY=10
+ PARALLEL_ACTIVATE_DONE=false
+ while [ $SECONDS -lt $TIMEOUT ] ; do
+ kill -0 $PID &> /dev/null
+ if [ $? -eq 1 ] ; then
+ # process with pid of $PID doesn't exist, vgchange command completed
+ TIMED_OUT=false
+ break
+ fi
+ if [ $SECONDS -ge $PARALLEL_ACTIVATE_DELAY ] && \
+ [ "$PARALLEL_ACTIVATE_DONE" != true ] && \
+ [ "$1" == "cinder-volumes" ] ; then
+ # This will kick off parallel activation of all LVs in the VG.
+ # The delay is to ensure the VG is activated first.
+ PARALLEL_ACTIVATE_DONE=true
+ ocf_log info Explicitly activating all volumes in $1 with: $vgchange_options
+ activate_all_volumes $1 $vgchange_options
+ fi
+ sleep 1
+ done
+
+ if [ "$TIMED_OUT" = true ] ; then
+ ocf_log err "Timed out running ocf_run vgchange $vgchange_options $1"
+ log_inactive_volumes $1
+ else
+ # Child process completed, get its status.
+ wait $PID
+ if [ $? -ne 0 ] ; then
+ return $OCF_ERR_GENERIC
+ fi
+ fi
+ # Check every second for up to TIMEOUT seconds whether the vgchange has
+ # completed.
+ TIMEOUT=300
+ TIMED_OUT=true
+ SECONDS=0;
+ PARALLEL_ACTIVATE_DELAY=10
+ PARALLEL_ACTIVATE_DONE=false
+ while [ $SECONDS -lt $TIMEOUT ] ; do
+ kill -0 $PID &> /dev/null
+ if [ $? -eq 1 ] ; then
+ # process with pid of $PID doesn't exist, vgchange command completed
+ TIMED_OUT=false
+ break
+ fi
+ if [ $SECONDS -ge $PARALLEL_ACTIVATE_DELAY ] && \
+ [ "$PARALLEL_ACTIVATE_DONE" != true ] && \
+ [ "$1" == "cinder-volumes" ] ; then
+ # This will kick off parallel activation of all LVs in the VG.
+ # The delay is to ensure the VG is activated first.
+ PARALLEL_ACTIVATE_DONE=true
+ ocf_log info Explicitly activating all volumes in $1 with: $vgchange_activate_options
+ activate_all_volumes $1 $vgchange_activate_options
+ fi
+ sleep 1
+ done
+
+ if [ "$TIMED_OUT" = true ] ; then
+ ocf_log err "Timed out running ocf_run vgchange $vgchange_activate_options $1"
+ log_inactive_volumes $1
+ else
+ # Child process completed, get its status.
+ wait $PID
+ if [ $? -ne 0 ] ; then
+ return $OCF_ERR_GENERIC
+ fi
+ fi
+
if LVM_status $vg; then if LVM_status $vg; then
: OK Volume $vg activated just fine! : OK Volume $vg activated just fine!
return $OCF_SUCCESS
-- --
2.7.4 2.7.4

View File

@ -5,50 +5,44 @@ Subject: [PATCH 1/1] Notify rmon of shutdown before shutting down LVM and
Filesystem Filesystem
--- ---
heartbeat/Filesystem | 9 +++++---- heartbeat/Filesystem | 5 +++--
heartbeat/LVM | 9 +++++---- heartbeat/LVM | 5 +++--
2 files changed, 10 insertions(+), 8 deletions(-) 2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
index 05e4097..d5f3417 100755 index 05e4097..d5f3417 100755
--- a/heartbeat/Filesystem --- a/heartbeat/Filesystem
+++ b/heartbeat/Filesystem +++ b/heartbeat/Filesystem
@@ -1200,10 +1200,11 @@ case $OP in @@ -883,9 +883,10 @@ case $OP in
validate-all) Filesystem_validate_all validate-all) Filesystem_validate_all
exit $? exit $?
;; ;;
- stop) Filesystem_stop - stop) Filesystem_stop
- rc=$? - rc=$?
- rmon_notify "disabled" 300
- exit $rc
+ stop) + stop)
+ rmon_notify "disabled" 300 rmon_notify "disabled" 300
+ Filesystem_stop + Filesystem_stop
+ rc=$? + rc=$?
+ exit $rc exit $rc
;; ;;
esac esac
diff --git a/heartbeat/LVM b/heartbeat/LVM diff --git a/heartbeat/LVM b/heartbeat/LVM
index 38092f9..893ece8 100755 index 38092f9..893ece8 100755
--- a/heartbeat/LVM --- a/heartbeat/LVM
+++ b/heartbeat/LVM +++ b/heartbeat/LVM
@@ -879,10 +879,11 @@ case "$1" in @@ -601,9 +601,10 @@ case "$1" in
fi fi
exit $rc;; exit $rc;;
- stop) LVM_stop $VOLUME - stop) LVM_stop $VOLUME
- rc=$? - rc=$?
- rmon_notify "disabled" 300
- exit $rc;;
+ stop) + stop)
+ rmon_notify "disabled" 300 rmon_notify "disabled" 300
+ LVM_stop $VOLUME + LVM_stop $VOLUME
+ rc=$? + rc=$?
+ exit $rc;; exit $rc;;
status) LVM_status $VOLUME $1 status) LVM_status $VOLUME $1
rc=$?
-- --
2.7.4 2.7.4

View File

@ -11,7 +11,7 @@ diff --git a/heartbeat/ocf-shellfuncs.in b/heartbeat/ocf-shellfuncs.in
index 3565e20..688c150 100644 index 3565e20..688c150 100644
--- a/heartbeat/ocf-shellfuncs.in --- a/heartbeat/ocf-shellfuncs.in
+++ b/heartbeat/ocf-shellfuncs.in +++ b/heartbeat/ocf-shellfuncs.in
@@ -180,9 +180,9 @@ hadate() { @@ -176,9 +176,9 @@ hadate() {
set_logtag() { set_logtag() {
if [ -z "$HA_LOGTAG" ]; then if [ -z "$HA_LOGTAG" ]; then
if [ -n "$OCF_RESOURCE_INSTANCE" ]; then if [ -n "$OCF_RESOURCE_INSTANCE" ]; then

View File

@ -4,14 +4,14 @@ Date: Mon, 2 Oct 2017 15:12:59 -0400
Subject: [PATCH 07/13] WRS: Patch1111: pgsql.patch Subject: [PATCH 07/13] WRS: Patch1111: pgsql.patch
--- ---
heartbeat/pgsql | 23 ++++++++++++++++++++--- heartbeat/pgsql | 23 ++++++++++++++++++++---
1 file changed, 20 insertions(+), 3 deletions(-) 1 file changed, 20 insertions(+), 3 deletions(-)
diff --git a/heartbeat/pgsql b/heartbeat/pgsql diff --git a/heartbeat/pgsql b/heartbeat/pgsql
index 768608e..28cc046 100755 index 768608e..28cc046 100755
--- a/heartbeat/pgsql --- a/heartbeat/pgsql
+++ b/heartbeat/pgsql +++ b/heartbeat/pgsql
@@ -38,6 +38,7 @@ get_pgsql_param() { @@ -46,6 +46,7 @@ get_pgsql_param() {
OCF_RESKEY_pgctl_default=/usr/bin/pg_ctl OCF_RESKEY_pgctl_default=/usr/bin/pg_ctl
OCF_RESKEY_psql_default=/usr/bin/psql OCF_RESKEY_psql_default=/usr/bin/psql
OCF_RESKEY_pgdata_default=/var/lib/pgsql/data OCF_RESKEY_pgdata_default=/var/lib/pgsql/data
@ -19,7 +19,7 @@ index 768608e..28cc046 100755
OCF_RESKEY_pgdba_default=postgres OCF_RESKEY_pgdba_default=postgres
OCF_RESKEY_pghost_default="" OCF_RESKEY_pghost_default=""
OCF_RESKEY_pgport_default=5432 OCF_RESKEY_pgport_default=5432
@@ -67,10 +68,11 @@ OCF_RESKEY_stop_escalate_in_slave_default=30 @@ -78,11 +79,12 @@ OCF_RESKEY_replication_slot_name_default=""
: ${OCF_RESKEY_pgctl=${OCF_RESKEY_pgctl_default}} : ${OCF_RESKEY_pgctl=${OCF_RESKEY_pgctl_default}}
: ${OCF_RESKEY_psql=${OCF_RESKEY_psql_default}} : ${OCF_RESKEY_psql=${OCF_RESKEY_psql_default}}
: ${OCF_RESKEY_pgdata=${OCF_RESKEY_pgdata_default}} : ${OCF_RESKEY_pgdata=${OCF_RESKEY_pgdata_default}}
@ -27,12 +27,13 @@ index 768608e..28cc046 100755
: ${OCF_RESKEY_pgdba=${OCF_RESKEY_pgdba_default}} : ${OCF_RESKEY_pgdba=${OCF_RESKEY_pgdba_default}}
: ${OCF_RESKEY_pghost=${OCF_RESKEY_pghost_default}} : ${OCF_RESKEY_pghost=${OCF_RESKEY_pghost_default}}
: ${OCF_RESKEY_pgport=${OCF_RESKEY_pgport_default}} : ${OCF_RESKEY_pgport=${OCF_RESKEY_pgport_default}}
: ${OCF_RESKEY_pglibs=${OCF_RESKEY_pglibs_default}}
-: ${OCF_RESKEY_config=${OCF_RESKEY_pgdata}/postgresql.conf} -: ${OCF_RESKEY_config=${OCF_RESKEY_pgdata}/postgresql.conf}
+: ${OCF_RESKEY_config=${OCF_RESKEY_pgconf}/postgresql.conf} +: ${OCF_RESKEY_config=${OCF_RESKEY_pgconf}/postgresql.conf}
: ${OCF_RESKEY_start_opt=${OCF_RESKEY_start_opt_default}} : ${OCF_RESKEY_start_opt=${OCF_RESKEY_start_opt_default}}
: ${OCF_RESKEY_ctl_opt=${OCF_RESKEY_ctl_opt_default}}
: ${OCF_RESKEY_pgdb=${OCF_RESKEY_pgdb_default}} : ${OCF_RESKEY_pgdb=${OCF_RESKEY_pgdb_default}}
: ${OCF_RESKEY_logfile=${OCF_RESKEY_logfile_default}} @@ -180,6 +182,14 @@ Path to PostgreSQL data directory.
@@ -166,6 +168,14 @@ Path to PostgreSQL data directory.
<content type="string" default="${OCF_RESKEY_pgdata_default}" /> <content type="string" default="${OCF_RESKEY_pgdata_default}" />
</parameter> </parameter>
@ -47,7 +48,7 @@ index 768608e..28cc046 100755
<parameter name="pgdba" unique="0" required="0"> <parameter name="pgdba" unique="0" required="0">
<longdesc lang="en"> <longdesc lang="en">
User that owns PostgreSQL. User that owns PostgreSQL.
@@ -220,7 +230,7 @@ SQL script that will be used for monitor operations. @@ -243,7 +253,7 @@ SQL script that will be used for monitor operations.
Path to the PostgreSQL configuration file for the instance. Path to the PostgreSQL configuration file for the instance.
</longdesc> </longdesc>
<shortdesc lang="en">Configuration file</shortdesc> <shortdesc lang="en">Configuration file</shortdesc>
@ -56,10 +57,10 @@ index 768608e..28cc046 100755
</parameter> </parameter>
<parameter name="pgdb" unique="0" required="0"> <parameter name="pgdb" unique="0" required="0">
@@ -549,6 +559,12 @@ pgsql_real_start() { @@ -630,6 +640,12 @@ pgsql_real_start() {
ocf_log debug "PostgreSQL still hasn't started yet. Waiting..." fi
done fi
+ # WRS: Create an unversioned symlink under /var/run so SM can easily + # WRS: Create an unversioned symlink under /var/run so SM can easily
+ # find the PID file. + # find the PID file.
+ if [ ! -h $PIDFILE_SYMLINK ]; then + if [ ! -h $PIDFILE_SYMLINK ]; then
@ -69,8 +70,8 @@ index 768608e..28cc046 100755
ocf_log info "PostgreSQL is started." ocf_log info "PostgreSQL is started."
return $rc return $rc
} }
@@ -1756,10 +1772,11 @@ fi @@ -2078,10 +2094,11 @@ then
fi
PIDFILE=${OCF_RESKEY_pgdata}/postmaster.pid PIDFILE=${OCF_RESKEY_pgdata}/postmaster.pid
+PIDFILE_SYMLINK=/var/run/postmaster.pid +PIDFILE_SYMLINK=/var/run/postmaster.pid
@ -81,7 +82,7 @@ index 768608e..28cc046 100755
+RECOVERY_CONF=${OCF_RESKEY_pgconf}/recovery.conf +RECOVERY_CONF=${OCF_RESKEY_pgconf}/recovery.conf
NODENAME=$(ocf_local_nodename | tr '[A-Z]' '[a-z]') NODENAME=$(ocf_local_nodename | tr '[A-Z]' '[a-z]')
if is_replication; then case "$1" in
-- --
1.9.1 1.9.1

View File

@ -11,7 +11,7 @@ diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem
index f536298..05e4097 100755 index f536298..05e4097 100755
--- a/heartbeat/Filesystem --- a/heartbeat/Filesystem
+++ b/heartbeat/Filesystem +++ b/heartbeat/Filesystem
@@ -804,6 +804,10 @@ signal_processes() { @@ -503,6 +503,10 @@ signal_processes() {
} }
try_umount() { try_umount() {
local SUB=$1 local SUB=$1

View File

@ -1,2 +1,2 @@
mirror:Source/resource-agents-3.9.5-124.el7.src.rpm mirror:Source/resource-agents-4.1.1-12.el7_6.7.src.rpm

View File

@ -16,8 +16,8 @@ index 4d30b0a..689158e 100644
Name: dnsmasq Name: dnsmasq
Version: 2.76 Version: 2.76
-Release: 5%{?extraversion}%{?dist} -Release: 7%{?extraversion}%{?dist}
+Release: 5.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 7.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: A lightweight DHCP/caching DNS server Summary: A lightweight DHCP/caching DNS server
Group: System Environment/Daemons Group: System Environment/Daemons

View File

@ -12,9 +12,9 @@ diff --git a/SPECS/dnsmasq.spec b/SPECS/dnsmasq.spec
index b312ef3..4d30b0a 100644 index b312ef3..4d30b0a 100644
--- a/SPECS/dnsmasq.spec --- a/SPECS/dnsmasq.spec
+++ b/SPECS/dnsmasq.spec +++ b/SPECS/dnsmasq.spec
@@ -55,6 +55,10 @@ Patch17: dnsmasq-2.76-gita3303e196.patch @@ -57,6 +57,10 @@ Patch19: dnsmasq-2.76-misc-cleanups.patch
Patch18: dnsmasq-2.76-underflow.patch Patch20: dnsmasq-2.76-CVE-2017-14491-2.patch
Patch19: dnsmasq-2.76-misc-cleanups.patch Patch21: dnsmasq-2.76-inotify.patch
+# WRS patches +# WRS patches
+Patch30: dnsmasq-update-ipv6-leases-from-config.patch +Patch30: dnsmasq-update-ipv6-leases-from-config.patch
@ -23,9 +23,9 @@ index b312ef3..4d30b0a 100644
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-devel BuildRequires: dbus-devel
@@ -109,6 +113,10 @@ query/remove a DHCP server's leases. @@ -113,6 +117,10 @@ query/remove a DHCP server's leases.
%patch18 -p1 -b .underflow %patch20 -p1 -b .CVE-2017-14491-2
%patch19 -p1 -b .misc %patch21 -p1 -b .inotify
+# WRS patches +# WRS patches
+%patch30 -p1 +%patch30 -p1
@ -34,7 +34,7 @@ index b312ef3..4d30b0a 100644
# use /var/lib/dnsmasq instead of /var/lib/misc # use /var/lib/dnsmasq instead of /var/lib/misc
for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do for file in dnsmasq.conf.example man/dnsmasq.8 man/es/dnsmasq.8 src/config.h; do
sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file" sed -i 's|/var/lib/misc/dnsmasq.leases|/var/lib/dnsmasq/dnsmasq.leases|g' "$file"
@@ -164,25 +172,11 @@ rm -rf %{buildroot}%{_initrddir} @@ -168,25 +176,11 @@ rm -rf %{buildroot}%{_initrddir}
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT

View File

@ -1 +1 @@
mirror:Source/dnsmasq-2.76-5.el7.src.rpm mirror:Source/dnsmasq-2.76-7.el7.src.rpm

View File

@ -16,8 +16,8 @@ index 39c0c86..b0d5862 100644
Name: haproxy Name: haproxy
Version: 1.5.18 Version: 1.5.18
-Release: 7%{?dist} -Release: 8%{?dist}
+Release: 7.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 8.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: TCP/HTTP proxy and load balancer for high availability environments Summary: TCP/HTTP proxy and load balancer for high availability environments
Group: System Environment/Daemons Group: System Environment/Daemons

View File

@ -1 +1 @@
mirror:Source/haproxy-1.5.18-7.el7.src.rpm mirror:Source/haproxy-1.5.18-8.el7.src.rpm

View File

@ -13,7 +13,7 @@ diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec
index ad32f19..ace1326 100644 index ad32f19..ace1326 100644
--- a/SPECS/initscripts.spec --- a/SPECS/initscripts.spec
+++ b/SPECS/initscripts.spec +++ b/SPECS/initscripts.spec
@@ -4,7 +4,7 @@ Version: 9.49.41 @@ -4,7 +4,7 @@ Version: 9.49.46
# ppp-watch is GPLv2+, everything else is GPLv2 # ppp-watch is GPLv2+, everything else is GPLv2
License: GPLv2 and GPLv2+ License: GPLv2 and GPLv2+
Group: System Environment/Base Group: System Environment/Base

View File

@ -44,22 +44,22 @@ index 3da5c16..9bcf57f 100755
+++ b/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth
@@ -204,7 +204,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then @@ -204,7 +204,7 @@ if [ -n "${DYNCONFIG}" ] && [ -x /sbin/dhclient ]; then
generate_lease_file_name generate_lease_file_name
# Initialize the dhclient args and obtain the hostname options if needed: # Initialize the dhclient args and obtain the hostname options if needed:
- DHCLIENTARGS="${DHCLIENTARGS} ${ONESHOT} -q ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient-${DEVICE}.pid" - DHCLIENTARGS="${DHCLIENTARGS} ${ONESHOT} -q ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient-${DEVICE}.pid"
+ DHCLIENTARGS="${DHCLIENTARGS} ${ONESHOT} -q ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -pf /var/run/dhclient-${DEVICE}.pid" + DHCLIENTARGS="${DHCLIENTARGS} ${ONESHOT} -q ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -pf /var/run/dhclient-${DEVICE}.pid"
set_hostname_options DHCLIENTARGS set_hostname_options DHCLIENTARGS
echo echo
@@ -354,7 +354,7 @@ if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then @@ -355,7 +355,7 @@ if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then
echo -n $"Determining IPv6 information for ${DEVICE}..." echo -n $"Determining IPv6 information for ${DEVICE}..."
# Initialize the dhclient args for IPv6 and obtain the hostname options if needed: # Initialize the dhclient args for IPv6 and obtain the hostname options if needed:
- DHCLIENTARGS="-6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient6-${DEVICE}.pid ${DEVICE}" - DHCLIENTARGS="-6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} -pf /var/run/dhclient6-${DEVICE}.pid ${DEVICE}"
+ DHCLIENTARGS="-6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -pf /var/run/dhclient6-${DEVICE}.pid ${DEVICE}" + DHCLIENTARGS="-6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -pf /var/run/dhclient6-${DEVICE}.pid ${DEVICE}"
set_hostname_options DHCLIENTARGS set_hostname_options DHCLIENTARGS
if /sbin/dhclient $DHCLIENTARGS; then if /sbin/dhclient $DHCLIENTARGS; then
-- --
1.9.1 1.9.1

View File

@ -11,7 +11,7 @@ diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup
index 4b8b992..ccb5c75 100755 index 4b8b992..ccb5c75 100755
--- a/sysconfig/network-scripts/ifup-eth --- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth
@@ -363,13 +363,14 @@ if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then @@ -364,13 +364,14 @@ if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then
echo -n $"Determining IPv6 information for ${DEVICE}..." echo -n $"Determining IPv6 information for ${DEVICE}..."
# Initialize the dhclient args for IPv6 and obtain the hostname options if needed: # Initialize the dhclient args for IPv6 and obtain the hostname options if needed:

View File

@ -11,7 +11,7 @@ diff --git a/rc.d/init.d/network b/rc.d/init.d/network
index a8deed3..852ef94 100755 index a8deed3..852ef94 100755
--- a/rc.d/init.d/network --- a/rc.d/init.d/network
+++ b/rc.d/init.d/network +++ b/rc.d/init.d/network
@@ -214,6 +214,9 @@ stop) @@ -228,6 +228,9 @@ stop)
if ! check_device_down $DEVICE; then if ! check_device_down $DEVICE; then
action $"Shutting down interface $i: " ./ifdown $i boot action $"Shutting down interface $i: " ./ifdown $i boot
[ $? -ne 0 ] && rc=1 [ $? -ne 0 ] && rc=1

View File

@ -1 +1 @@
mirror:Source/initscripts-9.49.41-1.el7.src.rpm mirror:Source/initscripts-9.49.46-1.el7.src.rpm

View File

@ -16,7 +16,7 @@ index 2f7b261..2553b27 100644
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
Summary: Lightning fast webserver with light system requirements Summary: Lightning fast webserver with light system requirements
Name: lighttpd Name: lighttpd
Version: 1.4.51 Version: 1.4.52
-Release: 1%{?dist} -Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
License: BSD License: BSD

View File

@ -54,7 +54,7 @@ index 213a87e..8c97f45 100644
static int request_check_hostname(buffer *host) { static int request_check_hostname(buffer *host) {
enum { DOMAINLABEL, TOPLABEL } stage = TOPLABEL; enum { DOMAINLABEL, TOPLABEL } stage = TOPLABEL;
@@ -1149,6 +1178,22 @@ int http_request_parse(server *srv, connection *con) { @@ -1176,6 +1205,22 @@ int http_request_parse(server *srv, connection *con) {
con->http_status = 411; con->http_status = 411;
goto failure; goto failure;
} }

View File

@ -48,9 +48,9 @@ index 2fe60b6..bddcd01 100644
+ EVP_PKEY *tpm_key; + EVP_PKEY *tpm_key;
+#endif +#endif
buffer *syslog_facility; buffer *syslog_facility;
} server_config;
@@ -384,6 +406,8 @@ struct server { unsigned short compat_module_load;
@@ -386,6 +408,8 @@ struct server {
int con_written; int con_written;
int con_closed; int con_closed;
@ -63,7 +63,7 @@ diff --git a/src/configfile.c b/src/configfile.c
index c3b0f16..dca2a29 100644 index c3b0f16..dca2a29 100644
--- a/src/configfile.c --- a/src/configfile.c
+++ b/src/configfile.c +++ b/src/configfile.c
@@ -273,8 +273,10 @@ static int config_insert(server *srv) { @@ -277,8 +277,10 @@ static int config_insert(server *srv) {
{ "server.syslog-facility", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER }, /* 80 */ { "server.syslog-facility", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_SERVER }, /* 80 */
{ "server.socket-perms", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 81 */ { "server.socket-perms", NULL, T_CONFIG_STRING, T_CONFIG_SCOPE_CONNECTION }, /* 81 */
{ "server.http-parseopts", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_SERVER }, /* 82 */ { "server.http-parseopts", NULL, T_CONFIG_ARRAY, T_CONFIG_SCOPE_SERVER }, /* 82 */
@ -75,7 +75,7 @@ index c3b0f16..dca2a29 100644
}; };
/* all T_CONFIG_SCOPE_SERVER options */ /* all T_CONFIG_SCOPE_SERVER options */
@@ -315,6 +317,8 @@ static int config_insert(server *srv) { @@ -321,6 +323,8 @@ static int config_insert(server *srv) {
cv[80].destination = srv->srvconf.syslog_facility; cv[80].destination = srv->srvconf.syslog_facility;
http_parseopts = array_init(); http_parseopts = array_init();
cv[82].destination = http_parseopts; cv[82].destination = http_parseopts;
@ -88,7 +88,7 @@ diff --git a/src/mod_openssl.c b/src/mod_openssl.c
index 75e0873..4cb0335 100644 index 75e0873..4cb0335 100644
--- a/src/mod_openssl.c --- a/src/mod_openssl.c
+++ b/src/mod_openssl.c +++ b/src/mod_openssl.c
@@ -444,6 +444,29 @@ error: @@ -451,6 +451,29 @@ error:
return NULL; return NULL;
} }
@ -118,7 +118,7 @@ index 75e0873..4cb0335 100644
static EVP_PKEY * static EVP_PKEY *
evp_pkey_load_pem_file (server *srv, const char *file) evp_pkey_load_pem_file (server *srv, const char *file)
@@ -498,15 +521,23 @@ network_openssl_load_pemfile (server *srv, plugin_config *s, size_t ndx) @@ -505,15 +528,23 @@ network_openssl_load_pemfile (server *srv, plugin_config *s, size_t ndx)
s->ssl_pemfile_x509 = x509_load_pem_file(srv, s->ssl_pemfile->ptr); s->ssl_pemfile_x509 = x509_load_pem_file(srv, s->ssl_pemfile->ptr);
if (NULL == s->ssl_pemfile_x509) return -1; if (NULL == s->ssl_pemfile_x509) return -1;
@ -151,7 +151,7 @@ index 75e0873..4cb0335 100644
} }
return 0; return 0;
@@ -673,6 +704,43 @@ network_init_ssl (server *srv, void *p_d) @@ -680,6 +711,43 @@ network_init_ssl (server *srv, void *p_d)
force_assert(NULL != local_send_buffer); force_assert(NULL != local_send_buffer);
} }
@ -195,7 +195,7 @@ index 75e0873..4cb0335 100644
if (!buffer_string_is_empty(s->ssl_pemfile)) { if (!buffer_string_is_empty(s->ssl_pemfile)) {
#ifdef OPENSSL_NO_TLSEXT #ifdef OPENSSL_NO_TLSEXT
data_config *dc = (data_config *)srv->config_context->data[i]; data_config *dc = (data_config *)srv->config_context->data[i];
@@ -935,29 +1003,36 @@ network_init_ssl (server *srv, void *p_d) @@ -949,29 +1017,36 @@ network_init_ssl (server *srv, void *p_d)
} }
} }
@ -258,7 +258,7 @@ index f6409bb..2ace3f8 100644
CLEAN(tmp_chunk_len); CLEAN(tmp_chunk_len);
#undef CLEAN #undef CLEAN
@@ -348,6 +353,14 @@ static void server_free(server *srv) { @@ -349,6 +354,14 @@ static void server_free(server *srv) {
CLEAN(srvconf.xattr_name); CLEAN(srvconf.xattr_name);
CLEAN(srvconf.syslog_facility); CLEAN(srvconf.syslog_facility);
@ -273,7 +273,7 @@ index f6409bb..2ace3f8 100644
CLEAN(tmp_chunk_len); CLEAN(tmp_chunk_len);
#undef CLEAN #undef CLEAN
@@ -782,7 +795,9 @@ static int log_error_open(server *srv) { @@ -784,7 +797,9 @@ static int log_error_open(server *srv) {
if (-1 == (errfd = fdevent_open_devnull())) { if (-1 == (errfd = fdevent_open_devnull())) {
log_error_write(srv, __FILE__, __LINE__, "ss", log_error_write(srv, __FILE__, __LINE__, "ss",
"opening /dev/null failed:", strerror(errno)); "opening /dev/null failed:", strerror(errno));

View File

@ -1 +1 @@
mirror:Source/lighttpd-1.4.51-1.el7.src.rpm mirror:Source/lighttpd-1.4.52-1.el7.src.rpm

View File

@ -15,11 +15,11 @@ index a59db4f..8a24ba1 100644
Summary: A collection of SNMP protocol tools and libraries Summary: A collection of SNMP protocol tools and libraries
Name: net-snmp Name: net-snmp
Version: 5.7.2 Version: 5.7.2
-Release: 33%{?dist}.2 -Release: 37%{?dist}
+Release: 33.el7_5.2%{?_tis_dist}.%{tis_patch_ver} +Release: 37.el7%{?_tis_dist}.%{tis_patch_ver}
Epoch: 1 Epoch: 1
License: BSD License: BSD
-- --
2.7.4 2.7.4

View File

@ -9,7 +9,7 @@ index 8a24ba1..40af31f 100644
# use netsnmp_tcp_wrappers 0 to disable tcp_wrappers support # use netsnmp_tcp_wrappers 0 to disable tcp_wrappers support
%{!?netsnmp_tcp_wrappers:%global netsnmp_tcp_wrappers 1} %{!?netsnmp_tcp_wrappers:%global netsnmp_tcp_wrappers 1}
# use nestnmp_check 0 to speed up packaging by disabling 'make test' # use nestnmp_check 0 to speed up packaging by disabling 'make test'
@@ -333,7 +336,7 @@ rm testing/fulltests/default/T200* @@ -339,7 +342,7 @@ rm testing/fulltests/default/T200*
%endif %endif
%build %build
@ -18,7 +18,7 @@ index 8a24ba1..40af31f 100644
ucd-snmp/diskio tcp-mib udp-mib mibII/mta_sendmail \ ucd-snmp/diskio tcp-mib udp-mib mibII/mta_sendmail \
ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable \ ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable \
ip-mib/ipAddressPrefixTable/ipAddressPrefixTable \ ip-mib/ipAddressPrefixTable/ipAddressPrefixTable \
@@ -354,6 +357,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib" @@ -360,6 +363,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
--with-logfile="/var/log/snmpd.log" \ --with-logfile="/var/log/snmpd.log" \
--with-persistent-directory="/var/lib/net-snmp" \ --with-persistent-directory="/var/lib/net-snmp" \
--with-mib-modules="$MIBS" \ --with-mib-modules="$MIBS" \
@ -26,7 +26,7 @@ index 8a24ba1..40af31f 100644
%if %{netsnmp_tcp_wrappers} %if %{netsnmp_tcp_wrappers}
--with-libwrap=yes \ --with-libwrap=yes \
%endif %endif
@@ -372,6 +376,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib" @@ -378,6 +382,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
--with-security-modules=tsm \ --with-security-modules=tsm \
--with-mysql \ --with-mysql \
--with-systemd \ --with-systemd \

View File

@ -1 +1 @@
mirror:Source/net-snmp-5.7.2-33.el7_5.2.src.rpm mirror:Source/net-snmp-5.7.2-37.el7.src.rpm

View File

@ -15,11 +15,11 @@ index 3ad2458..8f5fc46 100644
Summary: A set of system configuration and setup files Summary: A set of system configuration and setup files
Name: setup Name: setup
Version: 2.8.71 Version: 2.8.71
-Release: 9%{?dist} -Release: 10%{?dist}
+Release: 9.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 10.el7%{?_tis_dist}.%{tis_patch_ver}
License: Public Domain License: Public Domain
Group: System Environment/Base Group: System Environment/Base
URL: https://pagure.io/setup/ URL: https://pagure.io/setup/
-- --
2.7.4 2.7.4

View File

@ -11,20 +11,20 @@ diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 0bd1e98..a173b95 100644 index 0bd1e98..a173b95 100644
--- a/SPECS/setup.spec --- a/SPECS/setup.spec
+++ b/SPECS/setup.spec +++ b/SPECS/setup.spec
@@ -21,6 +21,8 @@ Patch5: setup-2.8.71-fullpath.patch @@ -23,6 +23,8 @@ Patch7: setup-2.8.71-shlocal.patch
Patch6: setup-2.8.71-tapeid.patch Patch8: setup-2.8.71-protocolscrudp.patch
Patch7: setup-2.8.71-shlocal.patch Patch9: setup-2.8.71-shellsnologin.patch
+Patch8: 0001-Change-group-passwd-and-uidgid.patch +Patch1001: 0001-Change-group-passwd-and-uidgid.patch
+ +
%description %description
The setup package contains a set of important system configuration and The setup package contains a set of important system configuration and
setup files, such as passwd, group, and profile. setup files, such as passwd, group, and profile.
@@ -36,6 +38,8 @@ setup files, such as passwd, group, and profile. @@ -40,6 +42,8 @@ setup files, such as passwd, group, and profile.
%patch6 -p1 %patch8 -p1
%patch7 -p1 %patch9 -p1
+%patch8 -p1 +%patch1001 -p1
+ +
./shadowconvert.sh ./shadowconvert.sh

View File

@ -1 +1 @@
mirror:Source/setup-2.8.71-9.el7.src.rpm mirror:Source/setup-2.8.71-10.el7.src.rpm

View File

@ -1,10 +1,8 @@
From 21db84dcb55f87c792a6d59cef0c68741a9d24b1 Mon Sep 17 00:00:00 2001 From 21db84dcb55f87c792a6d59cef0c68741a9d24b1 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 16:50:44 -0400 Date: Mon, 2 Oct 2017 16:50:44 -0400
Subject: [PATCH 1/4] WRS: 0001-Update-package-versioning-for-TIS-format.patch Subject: [PATCH 1/4] STX: 0001-Update-package-versioning-for-TIS-format.patch
Conflicts:
SPECS/sudo.spec
--- ---
SPECS/sudo.spec | 2 +- SPECS/sudo.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
@ -16,9 +14,9 @@ index c8d2f64..b6402bb 100644
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
Summary: Allows restricted root access for specified users Summary: Allows restricted root access for specified users
Name: sudo Name: sudo
Version: 1.8.19p2 Version: 1.8.23
-Release: 14%{?dist} -Release: 3%{?dist}
+Release: 14.el7_5%{?_tis_dist}.%{tis_patch_ver} +Release: 3.el7%{?_tis_dist}.%{tis_patch_ver}
License: ISC License: ISC
Group: Applications/System Group: Applications/System
URL: http://www.courtesan.com/sudo/ URL: http://www.courtesan.com/sudo/

View File

@ -1,35 +1,17 @@
From 70046603b8d607445e2fbf5e7d934bcd43a77dc8 Mon Sep 17 00:00:00 2001 From 70046603b8d607445e2fbf5e7d934bcd43a77dc8 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com> From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 16:50:44 -0400 Date: Mon, 2 Oct 2017 16:50:44 -0400
Subject: [PATCH 2/4] WRS: 0002-spec-include-TiS-changes.patch Subject: [PATCH 2/4] STX: 0002-spec-include-TiS-changes.patch
--- ---
SPECS/sudo.spec | 15 +++++++++++++-- SPECS/sudo.spec | 6 +++++-
1 file changed, 13 insertions(+), 2 deletions(-) 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/SPECS/sudo.spec b/SPECS/sudo.spec diff --git a/SPECS/sudo.spec b/SPECS/sudo.spec
index b6402bb..acbcb26 100644 index b6402bb..acbcb26 100644
--- a/SPECS/sudo.spec --- a/SPECS/sudo.spec
+++ b/SPECS/sudo.spec +++ b/SPECS/sudo.spec
@@ -78,6 +78,8 @@ Patch24: sudo-1.8.19p2-sssd-double-free.patch @@ -111,7 +111,7 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SHL
# 1560657 - sudo blocks in poll() for /dev/ptmx with iolog enabled
Patch25: sudo-1.8.19p2-iolog-zombie.patch
+# WRS patches
+
%description
Sudo (superuser do) allows a system administrator to give certain
users (or groups of users) the ability to run some (or all) commands
@@ -127,6 +129,8 @@ plugins that use %{name}.
%patch24 -p1 -b .double-free
%patch25 -p1 -b .iolog-zombie
+# WRS patches
+
%build
autoreconf -I m4 -fv --install
@@ -153,7 +157,7 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SHL
--with-ignore-dot \ --with-ignore-dot \
--with-tty-tickets \ --with-tty-tickets \
--with-ldap \ --with-ldap \
@ -38,26 +20,21 @@ index b6402bb..acbcb26 100644
--with-selinux \ --with-selinux \
--with-passprompt="[sudo] password for %p: " \ --with-passprompt="[sudo] password for %p: " \
--with-linux-audit \ --with-linux-audit \
@@ -179,6 +183,12 @@ install -p -c -m 0440 %{SOURCE1} $RPM_BUILD_ROOT/etc/sudoers @@ -138,6 +138,9 @@ install -p -c -m 0440 %{SOURCE1} %{buildroot}%{_sysconfdir}/sudoers
install -p -c -m 0640 %{SOURCE3} $RPM_BUILD_ROOT/etc/sudo.conf install -p -c -m 0640 %{SOURCE3} %{buildroot}%{_sysconfdir}/sudo.conf
install -p -c -m 0640 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/sudo-ldap.conf install -p -c -m 0640 %{SOURCE2} %{buildroot}%{_sysconfdir}/sudo-ldap.conf
+install -d $RPM_BUILD_ROOT/%{_sysconfdir}/openldap/schema/ +install -d %{buildroot}%{_sysconfdir}/openldap/schema/
+install -m 644 doc/schema.OpenLDAP $RPM_BUILD_ROOT/%{_sysconfdir}/openldap/schema/sudo.schema +install -m 644 doc/schema.OpenLDAP %{buildroot}%{_sysconfdir}/openldap/schema/sudo.schema
+ +
+install -d $RPM_BUILD_ROOT/%{_datadir}/sudo # Remove upstream sudoers file
+install -m 700 plugins/sudoers/sudoers2ldif $RPM_BUILD_ROOT/%{_datadir}/sudo/sudoers2ldif rm -f %{buildroot}%{_sysconfdir}/sudoers.dist
+
# Remove execute permission on this script so we don't pull in perl deps
chmod -x $RPM_BUILD_ROOT%{_docdir}/sudo-*/sudoers2ldif
@@ -247,7 +257,8 @@ rm -rf $RPM_BUILD_ROOT @@ -210,6 +213,7 @@ rm -rf %{buildroot}
%{_mandir}/man8/visudo.8* %{_mandir}/man5/sudoers_timestamp.5.gz
%dir %{_docdir}/sudo-%{version} %dir %{_docdir}/sudo-%{version}
%{_docdir}/sudo-%{version}/* %{_docdir}/sudo-%{version}/*
-
+%{_sysconfdir}/openldap/schema/sudo.schema +%{_sysconfdir}/openldap/schema/sudo.schema
+%{_datadir}/sudo/sudoers2ldif
# Make sure permissions are ok even if we're updating # Make sure permissions are ok even if we're updating
%post %post

View File

@ -2,16 +2,16 @@ diff --git a/SPECS/sudo.spec b/SPECS/sudo.spec
index 8c3f395..17531f7 100644 index 8c3f395..17531f7 100644
--- a/SPECS/sudo.spec --- a/SPECS/sudo.spec
+++ b/SPECS/sudo.spec +++ b/SPECS/sudo.spec
@@ -166,7 +166,8 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SHL @@ -120,7 +120,8 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SHL
# --without-kerb4
make make
%check
-make check -make check
+# "make check" fails if there is no group named "bin" in the mock system +# "make check" fails if there is no group named "bin" in the mock system
+# make check +# make check
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf %{buildroot}
-- --
2.7.4 2.7.4

View File

@ -1 +1 @@
mirror:Source/sudo-1.8.19p2-14.el7_5.src.rpm mirror:Source/sudo-1.8.23-3.el7.src.rpm

View File

@ -9,7 +9,7 @@ URL: unknown
Source: %name-%version.tar.gz Source: %name-%version.tar.gz
BuildArch: noarch BuildArch: noarch
BuildRequires: systemd = 219-57.el7 BuildRequires: systemd = 219-62.el7
Requires: systemd Requires: systemd
%define debug_package %{nil} %define debug_package %{nil}

View File

@ -1,2 +1,2 @@
TIS_PATCH_VER=10 TIS_PATCH_VER=11
BUILD_IS_SLOW=7 BUILD_IS_SLOW=7

View File

@ -2,3 +2,4 @@ update-package-versioning-for-TIS-format.patch
Protect-sections-of-systemd-post-from-running-on-pat.patch Protect-sections-of-systemd-post-from-running-on-pat.patch
spec-millisec-in-syslog-date.patch spec-millisec-in-syslog-date.patch
fix-build-error-for-unused-variable.patch fix-build-error-for-unused-variable.patch
fix-build-error-for-CentOS76.patch

View File

@ -12,36 +12,36 @@ diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 6e1d7e1..6a04c16 100644 index 6e1d7e1..6a04c16 100644
--- a/SPECS/systemd.spec --- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec +++ b/SPECS/systemd.spec
@@ -1159,6 +1159,7 @@ fi @@ -1213,6 +1213,7 @@ fi
rm -f /etc/sysconfig/i18n >/dev/null 2>&1 || : rm -f /etc/sysconfig/i18n >/dev/null 2>&1 || :
rm -f /etc/sysconfig/keyboard >/dev/null 2>&1 || : rm -f /etc/sysconfig/keyboard >/dev/null 2>&1 || :
+if [ $1 -eq 1 ]; then +if [ $1 -eq 1 ]; then
# Migrate HOSTNAME= from /etc/sysconfig/network # Migrate HOSTNAME= from /etc/sysconfig/network
if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then
unset HOSTNAME unset HOSTNAME
@@ -1166,6 +1167,7 @@ if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then @@ -1220,6 +1221,7 @@ if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then
[ -n "$HOSTNAME" ] && echo $HOSTNAME > /etc/hostname 2>&1 || : [ -n "$HOSTNAME" ] && echo $HOSTNAME > /etc/hostname 2>&1 || :
fi fi
sed -i '/^HOSTNAME=/d' /etc/sysconfig/network >/dev/null 2>&1 || : sed -i '/^HOSTNAME=/d' /etc/sysconfig/network >/dev/null 2>&1 || :
+fi +fi
# Migrate the old systemd-setup-keyboard X11 configuration fragment # Migrate the old systemd-setup-keyboard X11 configuration fragment
if [ ! -e /etc/X11/xorg.conf.d/00-keyboard.conf ] ; then if [ ! -e /etc/X11/xorg.conf.d/00-keyboard.conf ] ; then
@@ -1174,6 +1176,7 @@ else @@ -1228,6 +1230,7 @@ else
rm -f /etc/X11/xorg.conf.d/00-system-setup-keyboard.conf >/dev/null 2>&1 || : rm -f /etc/X11/xorg.conf.d/00-system-setup-keyboard.conf >/dev/null 2>&1 || :
fi fi
+if [ 1 -eq 0 ] ; then # TIS: Skip this. We don't want myhostname in nsswitch.conf +if [ 1 -eq 0 ] ; then # TIS: Skip this. We don't want myhostname in nsswitch.conf
# sed-fu to add myhostname to the hosts line of /etc/nsswitch.conf # sed-fu to add myhostname to the hosts line of /etc/nsswitch.conf
# Only do that when installing, not when updating. # Only do that when installing, not when updating.
if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then
@@ -1183,6 +1186,7 @@ if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then @@ -1237,6 +1240,7 @@ if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then
s/[[:blank:]]*$/ myhostname/ s/[[:blank:]]*$/ myhostname/
' /etc/nsswitch.conf >/dev/null 2>&1 || : ' /etc/nsswitch.conf >/dev/null 2>&1 || :
fi fi
+fi +fi
%posttrans %posttrans
# Convert old /etc/sysconfig/desktop settings # Convert old /etc/sysconfig/desktop settings
-- --

View File

@ -0,0 +1,25 @@
From 0816ac70222fec2609ed893c30d55f8c37fba632 Mon Sep 17 00:00:00 2001
From: Shuicheng Lin <shuicheng.lin@intel.com>
Date: Tue, 8 Jan 2019 21:06:06 +0800
Subject: [PATCH] Add patch to fix build failure in CentOS 7.6
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---
SPECS/systemd.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index f794c3b..8e3715b 100644
--- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec
@@ -707,6 +707,7 @@ Patch0664: 0664-Make-sure-the-mount-units-pulled-by-RequiresMountsFo.patch
#WRS Patches
Patch0701: 0701-inject-millisec-in-syslog-date.patch
Patch0702: 0702-fix-build-error-for-unused-variable.patch
+Patch0703: 0703-fix-build-error-for-CentOS7.6.patch
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
--
2.7.4

View File

@ -12,8 +12,8 @@ diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index ffd0770..3f7cc10 100644 index ffd0770..3f7cc10 100644
--- a/SPECS/systemd.spec --- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec +++ b/SPECS/systemd.spec
@@ -655,6 +655,7 @@ Patch0613: 0613-sd-journal-when-picking-up-a-new-file-compare-inode-.patch @@ -706,6 +706,7 @@ Patch0664: 0664-Make-sure-the-mount-units-pulled-by-RequiresMountsFo.patch
#WRS Patches #WRS Patches
Patch0701: 0701-inject-millisec-in-syslog-date.patch Patch0701: 0701-inject-millisec-in-syslog-date.patch
+Patch0702: 0702-fix-build-error-for-unused-variable.patch +Patch0702: 0702-fix-build-error-for-unused-variable.patch

View File

@ -3,8 +3,6 @@ From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 17:53:00 -0400 Date: Mon, 2 Oct 2017 17:53:00 -0400
Subject: [PATCH] WRS: 0005-spec-millisec-in-syslog-date.patch Subject: [PATCH] WRS: 0005-spec-millisec-in-syslog-date.patch
Conflicts:
SPECS/systemd.spec
--- ---
SPECS/systemd.spec | 3 +++ SPECS/systemd.spec | 3 +++
1 file changed, 3 insertions(+) 1 file changed, 3 insertions(+)
@ -13,10 +11,10 @@ diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec
index 6a04c16..845d1dd 100644 index 6a04c16..845d1dd 100644
--- a/SPECS/systemd.spec --- a/SPECS/systemd.spec
+++ b/SPECS/systemd.spec +++ b/SPECS/systemd.spec
@@ -653,6 +653,9 @@ Patch0611: 0611-sd-journal-make-sure-it-s-safe-to-call-sd_journal_pr.patch @@ -704,6 +704,9 @@ Patch0662: 0662-cryptsetup-generator-don-t-return-error-if-target-di.patch
Patch0612: 0612-journalctl-Periodically-call-sd_journal_process-in-j.patch Patch0663: 0663-cryptsetup-generator-allow-whitespace-characters-in-.patch
Patch0613: 0613-sd-journal-when-picking-up-a-new-file-compare-inode-.patch Patch0664: 0664-Make-sure-the-mount-units-pulled-by-RequiresMountsFo.patch
+#WRS Patches +#WRS Patches
+Patch0701: 0701-inject-millisec-in-syslog-date.patch +Patch0701: 0701-inject-millisec-in-syslog-date.patch
+ +

View File

@ -3,8 +3,6 @@ From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 17:53:00 -0400 Date: Mon, 2 Oct 2017 17:53:00 -0400
Subject: [PATCH] WRS: 0001-update-package-versioning-for-TIS-format.patch Subject: [PATCH] WRS: 0001-update-package-versioning-for-TIS-format.patch
Conflicts:
SPECS/systemd.spec
--- ---
SPECS/systemd.spec | 2 +- SPECS/systemd.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
@ -17,8 +15,8 @@ index 6bdbb74..3b2aa7f 100644
Name: systemd Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 219 Version: 219
-Release: 57%{?dist} -Release: 62%{?dist}
+Release: 57.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 62.el7%{?_tis_dist}.%{tis_patch_ver}
# For a breakdown of the licensing, see README # For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+ License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager Summary: A System and Service Manager

View File

@ -56,7 +56,7 @@ index 4e118aa..85cdeb9 100644
static void forward_syslog_iovec(Server *s, const struct iovec *iovec, unsigned n_iovec, const struct ucred *ucred, const struct timeval *tv) { static void forward_syslog_iovec(Server *s, const struct iovec *iovec, unsigned n_iovec, const struct ucred *ucred, const struct timeval *tv) {
static const union sockaddr_union sa = { static const union sockaddr_union sa = {
@@ -143,13 +181,11 @@ void server_forward_syslog(Server *s, int priority, const char *identifier, cons @@ -145,13 +183,11 @@ void server_forward_syslog(Server *s, int priority, const char *identifier, cons
xsprintf(header_priority, "<%i>", priority); xsprintf(header_priority, "<%i>", priority);
IOVEC_SET_STRING(iovec[n++], header_priority); IOVEC_SET_STRING(iovec[n++], header_priority);

View File

@ -12,7 +12,7 @@ diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c
index 33062ea..fd4e070 100644 index 33062ea..fd4e070 100644
--- a/src/journal/journald-syslog.c --- a/src/journal/journald-syslog.c
+++ b/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c
@@ -165,8 +165,6 @@ void server_forward_syslog(Server *s, int priority, const char *identifier, cons @@ -167,8 +167,6 @@ void server_forward_syslog(Server *s, int priority, const char *identifier, cons
char header_priority[DECIMAL_STR_MAX(priority) + 3], header_time[64], char header_priority[DECIMAL_STR_MAX(priority) + 3], header_time[64],
header_pid[sizeof("[]: ")-1 + DECIMAL_STR_MAX(pid_t) + 1]; header_pid[sizeof("[]: ")-1 + DECIMAL_STR_MAX(pid_t) + 1];
int n = 0; int n = 0;

View File

@ -0,0 +1,68 @@
From 424bb6c3f56f6c445b7bd3d06150ab2993f1b611 Mon Sep 17 00:00:00 2001
From: Shuicheng Lin <shuicheng.lin@intel.com>
Date: Tue, 8 Jan 2019 20:59:43 +0800
Subject: [PATCH] Fix compile failure due to deprecated value
Issue occur after upgrade build tool chain. Fix it per tool chain's
suggestion.
Error message is like below:
"
Value MHD_HTTP_REQUEST_ENTITY_TOO_LARGE is deprecated,
use MHD_HTTP_PAYLOAD_TOO_LARGE [-Werror]
Value MHD_HTTP_METHOD_NOT_ACCEPTABLE is deprecated,
use MHD_HTTP_NOT_ACCEPTABLE [-Werror]
"
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---
src/journal-remote/journal-gatewayd.c | 4 ++--
src/journal-remote/journal-remote.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index d1f0ce3..8364044 100644
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -684,7 +684,7 @@ static int request_handler_file(
if (fstat(fd, &st) < 0)
return mhd_respondf(connection, MHD_HTTP_INTERNAL_SERVER_ERROR, "Failed to stat file: %m\n");
- response = MHD_create_response_from_fd_at_offset(st.st_size, fd, 0);
+ response = MHD_create_response_from_fd_at_offset64(st.st_size, fd, 0);
if (!response)
return respond_oom(connection);
@@ -824,7 +824,7 @@ static int request_handler(
assert(method);
if (!streq(method, "GET"))
- return mhd_respond(connection, MHD_HTTP_METHOD_NOT_ACCEPTABLE,
+ return mhd_respond(connection, MHD_HTTP_NOT_ACCEPTABLE,
"Unsupported method.\n");
diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index a455fb6..1d7df07 100644
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -526,7 +526,7 @@ static int process_http_upload(
log_warning("Failed to process data for connection %p", connection);
if (r == -E2BIG)
return mhd_respondf(connection,
- MHD_HTTP_REQUEST_ENTITY_TOO_LARGE,
+ MHD_HTTP_PAYLOAD_TOO_LARGE,
"Entry is too large, maximum is %u bytes.\n",
DATA_SIZE_MAX);
else
@@ -579,7 +579,7 @@ static int request_handler(
*connection_cls);
if (!streq(method, "POST"))
- return mhd_respond(connection, MHD_HTTP_METHOD_NOT_ACCEPTABLE,
+ return mhd_respond(connection, MHD_HTTP_NOT_ACCEPTABLE,
"Unsupported method.\n");
if (!streq(url, "/upload"))
--
2.7.4

View File

@ -1 +1 @@
mirror:Source/systemd-219-57.el7.src.rpm mirror:Source/systemd-219-62.el7.src.rpm

View File

@ -11,12 +11,12 @@ diff --git a/SPECS/watchdog.spec b/SPECS/watchdog.spec
index 75ce3dd..88c4245 100644 index 75ce3dd..88c4245 100644
--- a/SPECS/watchdog.spec --- a/SPECS/watchdog.spec
+++ b/SPECS/watchdog.spec +++ b/SPECS/watchdog.spec
@@ -1,7 +1,7 @@ @@ -2,7 +2,7 @@
Summary: Software and/or Hardware watchdog daemon Summary: Software and/or Hardware watchdog daemon
Name: watchdog Name: watchdog
Version: 5.13 Version: 5.13
-Release: 11%{?dist} -Release: 12%{?dist}
+Release: 11.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 12.el7%{?_tis_dist}.%{tis_patch_ver}
License: GPLv2+ License: GPLv2+
URL: http://sourceforge.net/projects/watchdog/ URL: http://sourceforge.net/projects/watchdog/

View File

@ -14,7 +14,7 @@ diff --git a/SPECS/watchdog.spec b/SPECS/watchdog.spec
index 7eeacc9..75ce3dd 100644 index 7eeacc9..75ce3dd 100644
--- a/SPECS/watchdog.spec --- a/SPECS/watchdog.spec
+++ b/SPECS/watchdog.spec +++ b/SPECS/watchdog.spec
@@ -18,6 +18,7 @@ Patch1: 0001-watchdog-Clearer-help-output.patch @@ -19,6 +19,7 @@ Patch1: 0001-watchdog-Clearer-help-output.patch
Patch2: 0002-wd_identify-wd_keepalive-Document-c-config-file-in-h.patch Patch2: 0002-wd_identify-wd_keepalive-Document-c-config-file-in-h.patch
Patch3: 0003-watchdog-5.13-rhsel.patch Patch3: 0003-watchdog-5.13-rhsel.patch
Patch4: 0004-watchdog-5.13-rhseldoc.patch Patch4: 0004-watchdog-5.13-rhseldoc.patch
@ -22,7 +22,7 @@ index 7eeacc9..75ce3dd 100644
BuildRequires: systemd-units BuildRequires: systemd-units
@@ -49,6 +50,7 @@ expiration) initiated by the BMC. @@ -50,6 +51,7 @@ expiration) initiated by the BMC.
%patch2 -p1 -b .keepalive %patch2 -p1 -b .keepalive
%patch3 -p1 -b .rhsel %patch3 -p1 -b .rhsel
%patch4 -p1 -b .rhseldoc %patch4 -p1 -b .rhseldoc

View File

@ -1 +1 @@
mirror:Source/watchdog-5.13-11.el7.src.rpm mirror:Source/watchdog-5.13-12.el7.src.rpm

View File

@ -14,12 +14,12 @@ index 7f3bbd8..8bf2c1b 100644
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
%{!?upstream_version: %global upstream_version %{version}%{?milestone}} %{!?upstream_version: %global upstream_version %{version}%{?milestone}}
Name: puppet-openstacklib Name: puppet-openstacklib
Version: 11.3.0 Version: 11.5.0
-Release: 1%{?dist} -Release: 1%{?dist}
+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 1.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Puppet OpenStack Libraries Summary: Puppet OpenStack Libraries
License: ASL 2.0 License: ASL 2.0
-- --
1.8.3.1 2.7.4

View File

@ -11,7 +11,7 @@ diff --git a/SPECS/puppet-openstacklib.spec b/SPECS/puppet-openstacklib.spec
index 0ed0c1d..38faf85 100644 index 0ed0c1d..38faf85 100644
--- a/SPECS/puppet-openstacklib.spec --- a/SPECS/puppet-openstacklib.spec
+++ b/SPECS/puppet-openstacklib.spec +++ b/SPECS/puppet-openstacklib.spec
@@ -8,6 +8,7 @@ License: Apache-2.0 @@ -8,6 +8,7 @@ License: ASL 2.0
URL: https://launchpad.net/puppet-openstacklib URL: https://launchpad.net/puppet-openstacklib
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz

View File

@ -1,14 +1,17 @@
From 2d8bb7de61c91b3adbf7486a3f0ad43f97f49a52 Mon Sep 17 00:00:00 2001
From: Kam Nasim <kam.nasim@windriver.com> From: Kam Nasim <kam.nasim@windriver.com>
Date: Fri, 11 May 2018 11:35:59 -0600 Date: Fri, 11 May 2018 11:35:59 -0600
Subject: [PATCH 1/1] Add Distributed Keystone region name option for system controller Subject: [PATCH 1/1] Add Distributed Keystone region name option for system controller
--- ---
lib/puppet/provider/openstack.rb | 1 + lib/puppet/provider/openstack.rb | 1 +
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/lib/puppet/provider/openstack.rb b/lib/puppet/provider/openstack.rb
index 53f2366..232d615 100644
--- a/lib/puppet/provider/openstack.rb --- a/lib/puppet/provider/openstack.rb
+++ b/lib/puppet/provider/openstack.rb +++ b/lib/puppet/provider/openstack.rb
@@ -55,6 +55,7 @@ class Puppet::Provider::Openstack < Pupp @@ -55,6 +55,7 @@ class Puppet::Provider::Openstack < Puppet::Provider
Timeout.timeout(command_timeout(action)) do Timeout.timeout(command_timeout(action)) do
args.unshift('--os-interface', 'internal') args.unshift('--os-interface', 'internal')
if systemcontroller? if systemcontroller?
@ -16,3 +19,6 @@ Subject: [PATCH 1/1] Add Distributed Keystone region name option for system cont
args.unshift('--os-region-name', 'SystemController') args.unshift('--os-region-name', 'SystemController')
end end
openstack_command *args openstack_command *args
--
2.7.4

View File

@ -1 +1 @@
mirror:Source/puppet-openstacklib-11.3.0-1.el7.src.rpm mirror:Source/puppet-openstacklib-11.5.0-1.el7.src.rpm

View File

@ -11,12 +11,12 @@ diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index 12d34ad..88c6c09 100644 index 12d34ad..88c6c09 100644
--- a/SPECS/grub2.spec --- a/SPECS/grub2.spec
+++ b/SPECS/grub2.spec +++ b/SPECS/grub2.spec
@@ -6,7 +6,7 @@ @@ -17,7 +17,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.02 Version: 2.02
-Release: 0.65%{?dist}%{?buildid}.2 -Release: 0.76%{?dist}%{?buildid}
+Release: 0.65.el7.centos.2%{?_tis_dist}.%{tis_patch_ver} +Release: 0.76.el7.centos%{?_tis_dist}.%{tis_patch_ver}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
Group: System Environment/Base Group: System Environment/Base
License: GPLv3+ License: GPLv3+

View File

@ -12,7 +12,7 @@ diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index 88c6c09..11f6b0e 100644 index 88c6c09..11f6b0e 100644
--- a/SPECS/grub2.spec --- a/SPECS/grub2.spec
+++ b/SPECS/grub2.spec +++ b/SPECS/grub2.spec
@@ -172,7 +172,6 @@ rm -f grub-%{tarversion}/util/grub-setpassword.in.orig @@ -187,7 +187,6 @@ rm -f grub-%{tarversion}/util/grub-setpassword.in.orig
%install %install
set -e set -e
rm -fr $RPM_BUILD_ROOT rm -fr $RPM_BUILD_ROOT
@ -20,7 +20,7 @@ index 88c6c09..11f6b0e 100644
%do_common_install %do_common_install
%if 0%{with_efi_arch} %if 0%{with_efi_arch}
%do_efi_install %{grubefiarch} %{grubefiname} %{grubeficdname} %do_efi_install %{grubefiarch} %{grubefiname} %{grubeficdname}
@@ -199,25 +198,6 @@ cat << EOF > ${RPM_BUILD_ROOT}%{_sysconfdir}/prelink.conf.d/grub2.conf @@ -215,25 +214,6 @@ cat << EOF > ${RPM_BUILD_ROOT}%{_sysconfdir}/prelink.conf.d/grub2.conf
-b /usr/sbin/grub2-sparc64-setup -b /usr/sbin/grub2-sparc64-setup
EOF EOF

View File

@ -2,7 +2,7 @@ diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index 11f6b0e..613f2e1 100644 index 11f6b0e..613f2e1 100644
--- a/SPECS/grub2.spec --- a/SPECS/grub2.spec
+++ b/SPECS/grub2.spec +++ b/SPECS/grub2.spec
@@ -37,11 +37,6 @@ BuildRequires: /usr/lib64/crt1.o glibc-static glibc-devel @@ -49,11 +49,6 @@ BuildRequires: /usr/lib64/crt1.o glibc-static glibc-devel
BuildRequires: /usr/lib64/crt1.o glibc-static(x86-64) glibc-devel(x86-64) BuildRequires: /usr/lib64/crt1.o glibc-static(x86-64) glibc-devel(x86-64)
# glibc32 is what will be in the buildroots, but glibc-static(x86-32) is what # glibc32 is what will be in the buildroots, but glibc-static(x86-32) is what
# will be in an epel-7 (i.e. centos) mock root. I think. # will be in an epel-7 (i.e. centos) mock root. I think.

View File

@ -11,7 +11,7 @@ diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
index 10f74df..075727c 100644 index 10f74df..075727c 100644
--- a/SOURCES/grub.macros --- a/SOURCES/grub.macros
+++ b/SOURCES/grub.macros +++ b/SOURCES/grub.macros
@@ -81,15 +81,6 @@ @@ -82,15 +82,6 @@
%global legacy_package_arch pc %global legacy_package_arch pc
%global platform pc %global platform pc
@ -25,11 +25,11 @@ index 10f74df..075727c 100644
- -e 's/-m64//g' \\\ - -e 's/-m64//g' \\\
- ) %{nil} - ) %{nil}
%endif %endif
%ifarch %{ix86}
%ifarch aarch64 %global target_cpu_name %{_arch}
@@ -381,6 +372,7 @@ cd grub-%{1}-%{tarversion} \ @@ -401,6 +392,7 @@ cd grub-%{1}-%{tarversion} \
install -m 755 -d $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/ \ install -m 700 -d $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/ \
install -m 755 -d $RPM_BUILD_ROOT/boot/grub2/ \ install -m 700 -d $RPM_BUILD_ROOT/boot/grub2/ \
make DESTDIR=$RPM_BUILD_ROOT install \ make DESTDIR=$RPM_BUILD_ROOT install \
+find $RPM_BUILD_ROOT -name "grub2-bios-setup*" | xargs rm -f \ +find $RPM_BUILD_ROOT -name "grub2-bios-setup*" | xargs rm -f \
if [ -f $RPM_BUILD_ROOT%{_infodir}/grub.info ]; then \ if [ -f $RPM_BUILD_ROOT%{_infodir}/grub.info ]; then \

View File

@ -11,8 +11,8 @@ diff --git a/SPECS/grub2.spec b/SPECS/grub2.spec
index 613f2e1..7e11008 100644 index 613f2e1..7e11008 100644
--- a/SPECS/grub2.spec --- a/SPECS/grub2.spec
+++ b/SPECS/grub2.spec +++ b/SPECS/grub2.spec
@@ -265,6 +265,8 @@ fi @@ -299,6 +299,8 @@ fi
%ifarch x86_64
%files common -f grub.lang %files common -f grub.lang
%dir %{_libdir}/grub/ %dir %{_libdir}/grub/
+%dir %{_libdir}/grub/%{grubefiarch}/ +%dir %{_libdir}/grub/%{grubefiarch}/

View File

@ -11,10 +11,10 @@ diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
index bac4594..d7475f0 100644 index bac4594..d7475f0 100644
--- a/SOURCES/grub.patches --- a/SOURCES/grub.patches
+++ b/SOURCES/grub.patches +++ b/SOURCES/grub.patches
@@ -258,3 +258,4 @@ Patch0257: 0257-set-rootpath.patch @@ -286,3 +286,4 @@ Patch0285: 0285-editenv-handle-relative-symlinks.patch
Patch0258: 0258-Fix-one-more-coverity-complaint.patch Patch0286: 0286-efinet-also-use-the-firmware-acceleration-for-http.patch
Patch0260: 0260-Fix-up-linux-params-usage.patch Patch0287: 0287-Make-root_url-reflect-the-protocol-hostname-of-our-b.patch
Patch0261: 0261-Fix-grub_net_hwaddr_to_str.patch Patch0289: 0288-efi-uga-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled.patch
+Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch +Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
-- --
2.7.4 2.7.4

View File

@ -11,7 +11,7 @@ diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
index 075727c..5581deb 100644 index 075727c..5581deb 100644
--- a/SOURCES/grub.macros --- a/SOURCES/grub.macros
+++ b/SOURCES/grub.macros +++ b/SOURCES/grub.macros
@@ -215,6 +215,13 @@ Requires: %{name}-common = %{evr} \ @@ -235,6 +235,13 @@ Requires: %{name}-common = %{evr} \
%{expand:%%description %{1}-cdboot} \ %{expand:%%description %{1}-cdboot} \
%{desc} \ %{desc} \
This subpackage provides optional components of grub used with removeable media on %{1} systems.\ This subpackage provides optional components of grub used with removeable media on %{1} systems.\
@ -25,7 +25,7 @@ index 075727c..5581deb 100644
%{nil} %{nil}
%global do_common_setup() \ %global do_common_setup() \
@@ -289,6 +296,8 @@ done \ @@ -309,6 +316,8 @@ done \
-p /EFI/%{efidir} -d grub-core ${GRUB_MODULES} \ -p /EFI/%{efidir} -d grub-core ${GRUB_MODULES} \
%{4}./grub-mkimage -O %{1} -o %{3}.orig \\\ %{4}./grub-mkimage -O %{1} -o %{3}.orig \\\
-p /EFI/BOOT -d grub-core ${GRUB_MODULES} \ -p /EFI/BOOT -d grub-core ${GRUB_MODULES} \
@ -34,20 +34,20 @@ index 075727c..5581deb 100644
%{expand:%%{pesign -s -i %{2}.orig -o %{2} -a %{5} -c %{6} -n %{7}}} \ %{expand:%%{pesign -s -i %{2}.orig -o %{2} -a %{5} -c %{6} -n %{7}}} \
%{expand:%%{pesign -s -i %{3}.orig -o %{3} -a %{5} -c %{6} -n %{7}}} \ %{expand:%%{pesign -s -i %{3}.orig -o %{3} -a %{5} -c %{6} -n %{7}}} \
%{nil} %{nil}
@@ -383,6 +392,8 @@ find $RPM_BUILD_ROOT -iname "*.module" -exec chmod a-x {} '\;' \ @@ -403,6 +412,8 @@ find $RPM_BUILD_ROOT -iname "*.module" -exec chmod a-x {} '\;' \
touch $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/grub.cfg \ touch $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/grub.cfg \
ln -sf ../boot/efi/EFI/%{efidir}/grub.cfg \\\ ln -sf ../boot/efi/EFI/%{efidir}/grub.cfg \\\
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg \ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg \
+install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2}.unsigned \ +install -m 700 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2}.unsigned \
+install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3}.unsigned \ +install -m 700 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3}.unsigned \
install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2} \ install -m 700 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2} \
install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \ install -m 700 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \
install -D -m 644 unicode.pf2 \\\ install -D -m 700 unicode.pf2 \\\
@@ -473,4 +484,8 @@ cd .. \ @@ -490,4 +501,8 @@ cd .. \
%defattr(-,root,root,-) \ %defattr(-,root,root,-) \
%attr(0755,root,root)/boot/efi/EFI/%{efidir}/%{3} \ %attr(0700,root,root)/boot/efi/EFI/%{efidir}/%{3} \
%attr(0755,root,root)/boot/efi/EFI/%{efidir}/fonts \ %attr(0700,root,root)/boot/efi/EFI/%{efidir}/fonts \
+ \ + \
+%{expand:%%files %{1}-unsigned} \ +%{expand:%%files %{1}-unsigned} \
+/boot/efi/EFI/%{efidir}/%{grubefiname}.unsigned \ +/boot/efi/EFI/%{efidir}/%{grubefiname}.unsigned \
+/boot/efi/EFI/%{efidir}/%{grubeficdname}.unsigned \ +/boot/efi/EFI/%{efidir}/%{grubeficdname}.unsigned \

View File

@ -11,7 +11,7 @@ diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
index 5581deb..9ef91d6 100644 index 5581deb..9ef91d6 100644
--- a/SOURCES/grub.macros --- a/SOURCES/grub.macros
+++ b/SOURCES/grub.macros +++ b/SOURCES/grub.macros
@@ -222,6 +222,13 @@ Summary: Unsigned versions of GRUB EFI binaries \ @@ -242,6 +242,13 @@ Summary: Unsigned versions of GRUB EFI binaries \
%description %{1}-unsigned \ %description %{1}-unsigned \
This package contains unsigned version of GRUB EFI binaries. \ This package contains unsigned version of GRUB EFI binaries. \
\ \
@ -25,15 +25,15 @@ index 5581deb..9ef91d6 100644
%{nil} %{nil}
%global do_common_setup() \ %global do_common_setup() \
@@ -394,6 +401,7 @@ ln -sf ../boot/efi/EFI/%{efidir}/grub.cfg \\\ @@ -414,6 +421,7 @@ ln -sf ../boot/efi/EFI/%{efidir}/grub.cfg \\\
$RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg \ $RPM_BUILD_ROOT%{_sysconfdir}/%{name}-efi.cfg \
install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2}.unsigned \ install -m 700 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2}.unsigned \
install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3}.unsigned \ install -m 700 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3}.unsigned \
+install -D -m 755 %{2} $RPM_BUILD_ROOT/pxeboot/EFI/%{2} \ +install -D -m 755 %{2} $RPM_BUILD_ROOT/pxeboot/EFI/%{2} \
install -m 755 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2} \ install -m 700 %{2} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{2} \
install -m 755 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \ install -m 700 %{3} $RPM_BUILD_ROOT/boot/efi/EFI/%{efidir}/%{3} \
install -D -m 644 unicode.pf2 \\\ install -D -m 700 unicode.pf2 \\\
@@ -488,4 +496,8 @@ cd .. \ @@ -505,4 +513,8 @@ cd .. \
%{expand:%%files %{1}-unsigned} \ %{expand:%%files %{1}-unsigned} \
/boot/efi/EFI/%{efidir}/%{grubefiname}.unsigned \ /boot/efi/EFI/%{efidir}/%{grubefiname}.unsigned \
/boot/efi/EFI/%{efidir}/%{grubeficdname}.unsigned \ /boot/efi/EFI/%{efidir}/%{grubeficdname}.unsigned \

View File

@ -12,7 +12,7 @@ diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
index 9ef91d6..ffdd23c 100644 index 9ef91d6..ffdd23c 100644
--- a/SOURCES/grub.macros --- a/SOURCES/grub.macros
+++ b/SOURCES/grub.macros +++ b/SOURCES/grub.macros
@@ -81,6 +81,10 @@ @@ -82,6 +82,10 @@
%global legacy_package_arch pc %global legacy_package_arch pc
%global platform pc %global platform pc
@ -21,9 +21,9 @@ index 9ef91d6..ffdd23c 100644
+%global wrs_modules "" +%global wrs_modules ""
+ +
%endif %endif
%ifarch %{ix86}
%ifarch aarch64 %global target_cpu_name %{_arch}
@@ -327,6 +331,7 @@ GRUB_MODULES=" all_video boot btrfs cat chain configfile echo \\\ @@ -347,6 +351,7 @@ GRUB_MODULES=" all_video boot btrfs cat chain configfile echo \\\
search_label serial sleep syslinuxcfg test tftp \\\ search_label serial sleep syslinuxcfg test tftp \\\
video xfs" \ video xfs" \
GRUB_MODULES+=%{efi_modules} \ GRUB_MODULES+=%{efi_modules} \
@ -35,9 +35,9 @@ diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
index d7475f0..e24bd8c 100644 index d7475f0..e24bd8c 100644
--- a/SOURCES/grub.patches --- a/SOURCES/grub.patches
+++ b/SOURCES/grub.patches +++ b/SOURCES/grub.patches
@@ -259,3 +259,4 @@ Patch0258: 0258-Fix-one-more-coverity-complaint.patch @@ -287,3 +287,4 @@ Patch0286: 0286-efinet-also-use-the-firmware-acceleration-for-http.patch
Patch0260: 0260-Fix-up-linux-params-usage.patch Patch0287: 0287-Make-root_url-reflect-the-protocol-hostname-of-our-b.patch
Patch0261: 0261-Fix-grub_net_hwaddr_to_str.patch Patch0289: 0288-efi-uga-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled.patch
Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
+Patch1001: 1001-add-tboot.patch +Patch1001: 1001-add-tboot.patch
-- --

View File

@ -1,7 +1,8 @@
From 5e0c8a6125403db7e90990d20c1cdda5cb9deb78 Mon Sep 17 00:00:00 2001 From 5e0c8a6125403db7e90990d20c1cdda5cb9deb78 Mon Sep 17 00:00:00 2001
From: jmckenna <jason.mckenna@windriver.com> From: jmckenna <jason.mckenna@windriver.com>
Date: Wed, 28 Mar 2018 14:08:57 -0400 Date: Wed, 28 Mar 2018 14:08:57 -0400
Subject: Patch GRUB so that it doesn't add a trailing colon after MAC Subject: [PATCH 11/12] Patch GRUB so that it doesn't add a trailing colon
after MAC
A CentOS GRUB patch added support for macs > 6B in size. This A CentOS GRUB patch added support for macs > 6B in size. This
breaks PXEbooting the installer, because a routine within grub breaks PXEbooting the installer, because a routine within grub
@ -15,7 +16,7 @@ diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
index ffdd23c..8fcb272 100644 index ffdd23c..8fcb272 100644
--- a/SOURCES/grub.macros --- a/SOURCES/grub.macros
+++ b/SOURCES/grub.macros +++ b/SOURCES/grub.macros
@@ -81,7 +81,7 @@ @@ -82,7 +82,7 @@
%global legacy_package_arch pc %global legacy_package_arch pc
%global platform pc %global platform pc
@ -28,8 +29,8 @@ diff --git a/SOURCES/grub.patches b/SOURCES/grub.patches
index e24bd8c..73ccdee 100644 index e24bd8c..73ccdee 100644
--- a/SOURCES/grub.patches --- a/SOURCES/grub.patches
+++ b/SOURCES/grub.patches +++ b/SOURCES/grub.patches
@@ -260,3 +260,5 @@ Patch0260: 0260-Fix-up-linux-params-usage.patch @@ -288,3 +288,5 @@ Patch0287: 0287-Make-root_url-reflect-the-protocol-hostname-of-our-b.patch
Patch0261: 0261-Fix-grub_net_hwaddr_to_str.patch Patch0289: 0288-efi-uga-Fix-PCIe-LER-when-GRUB2-accesses-non-enabled.patch
Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch Patch1000: 1000_linux-mktitle-de-brand-the-grub.cfg-menu.patch
Patch1001: 1001-add-tboot.patch Patch1001: 1001-add-tboot.patch
+Patch1002: 1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch +Patch1002: 1002-Don-t-write-trailing-colon-when-populating-MAC-strin.patch

View File

@ -11,7 +11,7 @@ diff --git a/SOURCES/grub.macros b/SOURCES/grub.macros
index 8fcb272..cd2da06 100644 index 8fcb272..cd2da06 100644
--- a/SOURCES/grub.macros --- a/SOURCES/grub.macros
+++ b/SOURCES/grub.macros +++ b/SOURCES/grub.macros
@@ -471,8 +471,6 @@ cd .. \ @@ -488,8 +488,6 @@ cd .. \
%defattr(-,root,root) \ %defattr(-,root,root) \
%dir %{_libdir}/grub/%{2}/ \ %dir %{_libdir}/grub/%{2}/ \
%{_libdir}/grub/%{2}/* \ %{_libdir}/grub/%{2}/* \

View File

@ -11,7 +11,7 @@ diff --git a/grub-core/net/net.c b/grub-core/net/net.c
index a6566bd..f3f964e 100644 index a6566bd..f3f964e 100644
--- a/grub-core/net/net.c --- a/grub-core/net/net.c
+++ b/grub-core/net/net.c +++ b/grub-core/net/net.c
@@ -794,11 +794,18 @@ grub_net_hwaddr_to_str (const grub_net_link_level_address_t *addr, char *str) @@ -797,11 +797,18 @@ grub_net_hwaddr_to_str (const grub_net_link_level_address_t *addr, char *str)
return; return;
} }
maxstr = addr->len * grub_strlen ("XX:"); maxstr = addr->len * grub_strlen ("XX:");

View File

@ -1 +1 @@
mirror:Source/grub2-2.02-0.65.el7.centos.2.src.rpm mirror:Source/grub2-2.02-0.76.el7.centos.src.rpm

View File

@ -17,8 +17,8 @@ index dd8fa7f..22bff31 100644
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
Name: grubby Name: grubby
Version: 8.28 Version: 8.28
-Release: 23%{?dist} -Release: 25%{?dist}
+Release: 23.el7%{?_tis_dist}.%{tis_patch_ver} +Release: 25.el7%{?_tis_dist}.%{tis_patch_ver}
Summary: Command line tool for updating bootloader configs Summary: Command line tool for updating bootloader configs
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+

View File

@ -11,9 +11,9 @@ diff --git a/SPECS/grubby.spec b/SPECS/grubby.spec
index 22bff31..882339a 100644 index 22bff31..882339a 100644
--- a/SPECS/grubby.spec --- a/SPECS/grubby.spec
+++ b/SPECS/grubby.spec +++ b/SPECS/grubby.spec
@@ -83,6 +83,9 @@ Patch0073: 0073-Fix-info-for-s390x-s390-1285601.patch @@ -84,6 +84,9 @@ Patch0074: 0074-Add-s390-s390x-set-default-index-test-1285601.patch
Patch0074: 0074-Add-s390-s390x-set-default-index-test-1285601.patch
Patch0075: 0075-Fix-setDefaultImage-for-s390-s390x-1285601.patch Patch0075: 0075-Fix-setDefaultImage-for-s390-s390x-1285601.patch
Patch0076: 0076-grubby-Make-sure-configure-BOOTLOADER-variables-are-.patch
+# WRS Titanium patches +# WRS Titanium patches
+Patch1000: 1000-Generic-name-for-Titanium.patch +Patch1000: 1000-Generic-name-for-Titanium.patch

View File

@ -11,7 +11,7 @@ diff --git a/SPECS/grubby.spec b/SPECS/grubby.spec
index 071463a..a3bb371 100644 index 071463a..a3bb371 100644
--- a/SPECS/grubby.spec --- a/SPECS/grubby.spec
+++ b/SPECS/grubby.spec +++ b/SPECS/grubby.spec
@@ -85,6 +85,7 @@ Patch0075: 0075-Fix-setDefaultImage-for-s390-s390x-1285601.patch @@ -86,6 +86,7 @@ Patch0076: 0076-grubby-Make-sure-configure-BOOTLOADER-variables-are-.patch
# WRS Titanium patches # WRS Titanium patches
Patch1000: 1000-Generic-name-for-Titanium.patch Patch1000: 1000-Generic-name-for-Titanium.patch
@ -19,7 +19,7 @@ index 071463a..a3bb371 100644
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: pkgconfig glib2-devel popt-devel BuildRequires: pkgconfig glib2-devel popt-devel
@@ -101,6 +102,10 @@ Requires: s390utils-base @@ -102,6 +103,10 @@ Requires: s390utils-base
Requires: uboot-tools Requires: uboot-tools
%endif %endif
Requires: system-release Requires: system-release
@ -30,7 +30,7 @@ index 071463a..a3bb371 100644
%description %description
grubby is a command line tool for updating and displaying information about grubby is a command line tool for updating and displaying information about
@@ -140,6 +145,11 @@ mkdir -p $RPM_BUILD_ROOT/boot @@ -142,6 +147,11 @@ mkdir -p $RPM_BUILD_ROOT/boot
echo " " >> $RPM_BUILD_ROOT/boot/boot.scr echo " " >> $RPM_BUILD_ROOT/boot/boot.scr
%endif %endif
@ -42,7 +42,7 @@ index 071463a..a3bb371 100644
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@@ -152,6 +162,11 @@ rm -rf $RPM_BUILD_ROOT @@ -154,6 +164,11 @@ rm -rf $RPM_BUILD_ROOT
%{_prefix}/sbin/installkernel %{_prefix}/sbin/installkernel
%{_prefix}/sbin/new-kernel-pkg %{_prefix}/sbin/new-kernel-pkg
%{_prefix}/sbin/grubby %{_prefix}/sbin/grubby
@ -53,7 +53,7 @@ index 071463a..a3bb371 100644
+ +
%{_mandir}/man8/*.8* %{_mandir}/man8/*.8*
/usr/libexec/grubby/prune_debug /usr/libexec/grubby/prune_debug
%ghost %config(noreplace) %{_sysconfdir}/sysconfig/kernel %ghost %attr(0644,-,-) %config(noreplace) %{_sysconfdir}/sysconfig/kernel
-- --
1.8.3.1 1.8.3.1

View File

@ -1 +1 @@
mirror:Source/grubby-8.28-23.el7.src.rpm mirror:Source/grubby-8.28-25.el7.src.rpm

View File

@ -2,4 +2,4 @@ COPY_LIST=" \
$FILES_BASE/* \ $FILES_BASE/* \
$PATCHES_BASE/* \ $PATCHES_BASE/* \
$STX_BASE/downloads/integrity-kmod-e6aef069.tar.gz" $STX_BASE/downloads/integrity-kmod-e6aef069.tar.gz"
TIS_PATCH_VER=5 TIS_PATCH_VER=7

View File

@ -36,6 +36,7 @@ Patch02: 0002-integrity-expose-module-params.patch
Patch03: 0003-integrity-restrict-by-iversion.patch Patch03: 0003-integrity-restrict-by-iversion.patch
Patch04: 0004-integrity-disable-set-xattr-on-imasig.patch Patch04: 0004-integrity-disable-set-xattr-on-imasig.patch
Patch05: Changes-for-CentOS-7.4-support.patch Patch05: Changes-for-CentOS-7.4-support.patch
Patch06: Changes-for-CentOS-7.6-support.patch
%define kversion %(rpm -q kernel%{?bt_ext}-devel | sort --version-sort | tail -1 | sed 's/kernel%{?bt_ext}-devel-//') %define kversion %(rpm -q kernel%{?bt_ext}-devel | sort --version-sort | tail -1 | sed 's/kernel%{?bt_ext}-devel-//')

View File

@ -0,0 +1,78 @@
From 5b60e1a889246a5a0d131e74ceaf240fc0637c9f Mon Sep 17 00:00:00 2001
From: Shuicheng Lin <shuicheng.lin@intel.com>
Date: Sat, 29 Dec 2018 02:51:39 +0800
Subject: [PATCH] pick upstream patch to fix build failure with CentOS 7.6
3.10.0-957.1.3 kernel
Pick upstream patch from "git://git.infradead.org/users/jjs/linux-tpmdd.git"
"
From aad887f6641145fec2a801da2ce4ed36cf99c6a5 Mon Sep 17 00:00:00 2001
From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Date: Sun, 5 Nov 2017 13:16:26 +0200
Subject: [PATCH] tpm: use struct tpm_chip for tpm_chip_find_get()
Device number (the character device index) is not a stable identifier
for a TPM chip. That is the reason why every call site passes
TPM_ANY_NUM to tpm_chip_find_get().
This commit changes the API in a way that instead a struct tpm_chip
instance is given and NULL means the default chip. In addition, this
commit refines the documentation to be up to date with the
implementation.
Suggested-by: Jason Gunthorpe <jgunthorpe@obsidianresearch.com> (@chip_num -> @chip part)
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Reviewed-by: Jason Gunthorpe <jgg@ziepe.ca>
Tested-by: PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com>
"
Signed-off-by: Shuicheng Lin <shuicheng.lin@intel.com>
---
ima/ima_crypto.c | 2 +-
ima/ima_init.c | 2 +-
ima/ima_queue.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ima/ima_crypto.c b/ima/ima_crypto.c
index 802d5d2..3371d13 100644
--- a/ima/ima_crypto.c
+++ b/ima/ima_crypto.c
@@ -644,7 +644,7 @@ static void __init ima_pcrread(int idx, u8 *pcr)
if (!ima_used_chip)
return;
- if (tpm_pcr_read(TPM_ANY_NUM, idx, pcr) != 0)
+ if (tpm_pcr_read(NULL, idx, pcr) != 0)
pr_err("Error Communicating to TPM chip\n");
}
diff --git a/ima/ima_init.c b/ima/ima_init.c
index a7362e8..577c7b7 100644
--- a/ima/ima_init.c
+++ b/ima/ima_init.c
@@ -115,7 +115,7 @@ int __init ima_init(void)
if (ima_used_chip != 0) {
ima_used_chip = 0;
- rc = tpm_pcr_read(TPM_ANY_NUM, 0, pcr_i);
+ rc = tpm_pcr_read(NULL, 0, pcr_i);
if (rc == 0)
ima_used_chip = 1;
}
diff --git a/ima/ima_queue.c b/ima/ima_queue.c
index d9aa5ab..9946363 100644
--- a/ima/ima_queue.c
+++ b/ima/ima_queue.c
@@ -145,7 +145,7 @@ static int ima_pcr_extend(const u8 *hash, int pcr)
if (!ima_used_chip)
return result;
- result = tpm_pcr_extend(TPM_ANY_NUM, pcr, hash);
+ result = tpm_pcr_extend(NULL, pcr, hash);
if (result != 0)
pr_err("Error Communicating to TPM chip, result: %d\n", result);
return result;
--
2.7.4

View File

@ -1,4 +1,4 @@
COPY_LIST=" \ COPY_LIST=" \
$PKG_BASE/files/* \ $PKG_BASE/files/* \
$STX_BASE/downloads/i40e-2.4.10.tar.gz" $STX_BASE/downloads/i40e-2.7.29.tar.gz"
TIS_PATCH_VER=1 TIS_PATCH_VER=1

View File

@ -8,7 +8,7 @@
%define kmod_name i40e %define kmod_name i40e
Name: %{kmod_name}-kmod%{?bt_ext} Name: %{kmod_name}-kmod%{?bt_ext}
Version: 2.4.10 Version: 2.7.29
Release: 0%{?_tis_dist}.%{tis_patch_ver} Release: 0%{?_tis_dist}.%{tis_patch_ver}
Group: System Environment/Kernel Group: System Environment/Kernel
License: GPLv2 License: GPLv2

Some files were not shown because too many files have changed in this diff Show More