From 5afd5f90b29f6e097824f7c6f2fe7762597d9ad6 Mon Sep 17 00:00:00 2001 From: Andy Ning Date: Tue, 5 Nov 2019 00:12:26 -0500 Subject: [PATCH 1/8] update Barbican admin secret's user/project IDs during bootstrap In a DC system when subcloud is managed, keystone user/project IDs are synced with Central Cloud, including admin user and project. But the admin's secrets in Barbian still use the original user/project IDs, causing docker registry access failure when platform-integ-apps is reapplied. This change added a patch to keystone puppet manifest, that updates keystone admin user/project IDs to be the same as Central Cloud right after keystone is bootstrapped during subcloud deployment. This way any referece to admin user/project IDs after bootstrap will be using the IDs same as Central Cloud, including the ones in Barbican. This will solve the problem of retrieving central registry credential failure when platform-integ-apps is reapplied. Change-Id: I509a06b4b810620a1b3648837726f7f2771162a5 Closes-Bug: 1851247 Signed-off-by: Andy Ning --- .../centos/build_srpm.data | 2 +- ...ican-admin-secret-s-user-project-IDs.patch | 33 ++++++++++ .../centos/meta_patches/PATCH_ORDER | 1 + ...admin-secret-s-user-project-IDs-duri.patch | 63 +++++++++++++++++++ 4 files changed, 98 insertions(+), 1 deletion(-) create mode 100644 config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0007-update-Barbican-admin-secret-s-user-project-IDs.patch create mode 100644 config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0006-update-Barbican-admin-secret-s-user-project-IDs-duri.patch diff --git a/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data index 898fe26d9..c428b1f1d 100644 --- a/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data +++ b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/build_srpm.data @@ -1 +1 @@ -TIS_PATCH_VER=8 +TIS_PATCH_VER=9 diff --git a/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0007-update-Barbican-admin-secret-s-user-project-IDs.patch b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0007-update-Barbican-admin-secret-s-user-project-IDs.patch new file mode 100644 index 000000000..b596409f3 --- /dev/null +++ b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/0007-update-Barbican-admin-secret-s-user-project-IDs.patch @@ -0,0 +1,33 @@ +From a53d9bfc15e1d24a604fcc461f9a6e1483ed262d Mon Sep 17 00:00:00 2001 +From: Andy Ning +Date: Mon, 4 Nov 2019 20:51:22 -0500 +Subject: [PATCH 1/1] update Barbican admin secret's user/project IDs + +Signed-off-by: Andy Ning +--- + SPECS/puppet-keystone.spec | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/SPECS/puppet-keystone.spec b/SPECS/puppet-keystone.spec +index 5b5e255..ae233f0 100644 +--- a/SPECS/puppet-keystone.spec ++++ b/SPECS/puppet-keystone.spec +@@ -15,6 +15,7 @@ Patch0002: 0002-remove-the-Keystone-admin-app.patch + Patch0003: 0003-remove-eventlet_bindhost-from-Keystoneconf.patch + Patch0004: 0004-escape-special-characters-in-bootstrap.patch + Patch0005: 0005-Add-support-for-fernet-receipts.patch ++Patch0006: 0006-update-Barbican-admin-secret-s-user-project-IDs-duri.patch + + BuildArch: noarch + +@@ -37,6 +38,7 @@ Puppet module for OpenStack Keystone + %patch0003 -p1 + %patch0004 -p1 + %patch0005 -p1 ++%patch0006 -p1 + + find . -type f -name ".*" -exec rm {} + + find . -size 0 -exec rm {} + +-- +1.8.3.1 + diff --git a/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/PATCH_ORDER b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/PATCH_ORDER index be22cf58c..ce35c5e99 100644 --- a/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/PATCH_ORDER +++ b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/meta_patches/PATCH_ORDER @@ -4,3 +4,4 @@ 0004-remove-eventlet_and_bindhost-from-keystoneconf.patch 0005-escape-special-characters-in-bootstrap.patch 0006-Add-support-for-fernet-receipts.patch +0007-update-Barbican-admin-secret-s-user-project-IDs.patch diff --git a/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0006-update-Barbican-admin-secret-s-user-project-IDs-duri.patch b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0006-update-Barbican-admin-secret-s-user-project-IDs-duri.patch new file mode 100644 index 000000000..0132b487f --- /dev/null +++ b/config/puppet-modules/openstack/puppet-keystone-11.3.0/centos/patches/0006-update-Barbican-admin-secret-s-user-project-IDs-duri.patch @@ -0,0 +1,63 @@ +From 60f023e20c7e1f98d1f71fb04e829a3ff0477f65 Mon Sep 17 00:00:00 2001 +From: Andy Ning +Date: Mon, 4 Nov 2019 20:20:28 -0500 +Subject: [PATCH 1/1] update Barbican admin secret's user/project IDs during + bootstrap + +In a DC system when subcloud is managed, keystone user/project IDs are +synced with Central Cloud, including admin user and project. But the +admin's secrets in Barbian still use the original user/project IDs, +causing docker registry access failure when platform-integ-apps is +reapplied. + +This updated keystone admin user/project IDs to be the same as Central +Cloud right after keystone is bootstrapped during subcloud deployment. +This way any referece to admin user/project IDs after bootstrap will be +using the IDs same as Central Cloud, including the ones in Barbican. +This will solve the problem of registry access failure issue. + +Closes-Bug: 1851247 +Signed-off-by: Andy Ning +--- + manifests/init.pp | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) + +diff --git a/manifests/init.pp b/manifests/init.pp +index 7bb0094..421259c 100644 +--- a/manifests/init.pp ++++ b/manifests/init.pp +@@ -791,6 +791,8 @@ class keystone( + $rabbit_port = $::os_service_default, + $rabbit_userid = $::os_service_default, + $rabbit_virtual_host = $::os_service_default, ++ $dc_admin_user_id = undef, ++ $dc_admin_project_id = undef, + ) inherits keystone::params { + + include ::keystone::deps +@@ -1311,6 +1313,22 @@ running as a standalone service, or httpd for being run by a httpd server") + subscribe => Anchor['keystone::dbsync::end'], + tag => 'keystone-exec', + } ++ ++ if $dc_admin_user_id and $dc_admin_project_id { ++ exec { 'update keystone admin assignment actor_id': ++ command => "sudo -u postgres psql -d keystone -c \"update public.assignment set actor_id='$dc_admin_user_id' from public.local_user where public.assignment.actor_id=public.local_user.user_id and public.local_user.name='admin'\"", ++ require => Exec['keystone-manage bootstrap'], ++ } ++ -> exec { 'update keystone admin assignment target_id': ++ command => "sudo -u postgres psql -d keystone -c \"update public.assignment set target_id='$dc_admin_project_id' from public.project where public.assignment.target_id=public.project.id and public.project.name='admin'\"", ++ } ++ -> exec { 'update keystone admin user id': ++ command => "sudo -u postgres psql -d keystone -c \"update public.user set id='$dc_admin_user_id' from public.local_user where public.user.id=public.local_user.user_id and public.local_user.name='admin'\"", ++ } ++ -> exec { 'update keystone admin project id': ++ command => "sudo -u postgres psql -d keystone -c \"update public.project set id='$dc_admin_project_id' where name='admin'\"", ++ } ++ } + } + + # WRS: Now that the keystone service has started, +-- +1.8.3.1 + From 8a3722089d821573ce6766e6fa40d78a0fdbaded Mon Sep 17 00:00:00 2001 From: Joseph Richard Date: Tue, 29 Oct 2019 10:54:58 -0400 Subject: [PATCH 2/8] Drop initscripts patch running ipv6 dhcp as daemon This commit rebases initscripts patch set, dropping run-dhclient-as-daemon-for-ipv6.patch Currently, ifup-eth tries running ipv6 dhclient with the one-shot option, and if that fails, then retries indefinitely in the background. That has the side-effect of causing the ifup-post script to not be run if the first dhclient attempt fails, which will prevent routes on that interface from being created. This is especially problematic in the case of a DOR, where the compute nodes may come up before dnsmasq is up on the controller. This is different from upstream centos, which will only try running dhclient with the one-shot option for ipv6. By reverting the initscripts patch to run as a daemon, ipv6 dhclient now runs as one-shot only, and if it fails, ifup-eth script exits without getting an address, and then the node fails to come up and reboot. While this may result in the compute node having an extra reboot in a DOR, that is preferable to the compute coming up incorrectly and requiring a lock/unlock to recover. Closes-bug: 1844579 Change-Id: I5b7f6b7c878dc4e4737d986f11fae3301585fb1c Signed-off-by: Joseph Richard --- ...nclude-starlingx-initscripts-changes.patch | 110 ++++++++++++++++++ ...te-package-versioning-for-TIS-format.patch | 27 ----- .../centos/meta_patches/PATCH_ORDER | 7 +- .../added-ifup-alias-check-ipaddr.patch | 32 ----- ...-build-failures-due-to-unwanted-sgid.patch | 26 ----- .../meta_patches/ifup-alias-scope.patch | 34 ------ .../spec-include-TiS-changes.patch | 57 --------- .../stop-creating-shared-dirs.patch | 45 ------- .../run-dhclient-as-daemon-for-ipv6.patch | 34 ------ 9 files changed, 111 insertions(+), 261 deletions(-) create mode 100644 base/initscripts/centos/meta_patches/0001-Include-starlingx-initscripts-changes.patch delete mode 100644 base/initscripts/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch delete mode 100644 base/initscripts/centos/meta_patches/added-ifup-alias-check-ipaddr.patch delete mode 100644 base/initscripts/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch delete mode 100644 base/initscripts/centos/meta_patches/ifup-alias-scope.patch delete mode 100644 base/initscripts/centos/meta_patches/spec-include-TiS-changes.patch delete mode 100644 base/initscripts/centos/meta_patches/stop-creating-shared-dirs.patch delete mode 100644 base/initscripts/centos/patches/run-dhclient-as-daemon-for-ipv6.patch diff --git a/base/initscripts/centos/meta_patches/0001-Include-starlingx-initscripts-changes.patch b/base/initscripts/centos/meta_patches/0001-Include-starlingx-initscripts-changes.patch new file mode 100644 index 000000000..fa1b9308d --- /dev/null +++ b/base/initscripts/centos/meta_patches/0001-Include-starlingx-initscripts-changes.patch @@ -0,0 +1,110 @@ +From 764ce9e69477b47577fc0231f4a0190b119937f7 Mon Sep 17 00:00:00 2001 +From: Joseph Richard +Date: Tue, 19 Nov 2019 13:06:43 -0500 +Subject: [PATCH] Include starlingx initscripts changes + +This is build with build-pkgs --edit initscripts, and then rebased with +git rebase -i --root, with all existing meta-patches squashed into this +commit, and then the new meta-patch created from the output of +git format-patch HEAD~ + +Signed-off-by: Joseph Richard +--- + SPECS/initscripts.spec | 38 ++++++++++++++++++++++++++++++-------- + 1 file changed, 30 insertions(+), 8 deletions(-) + +diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec +index fb0bd96..a446775 100644 +--- a/SPECS/initscripts.spec ++++ b/SPECS/initscripts.spec +@@ -4,7 +4,7 @@ Version: 9.49.46 + # ppp-watch is GPLv2+, everything else is GPLv2 + License: GPLv2 and GPLv2+ + Group: System Environment/Base +-Release: 1%{?dist} ++Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} + URL: https://github.com/fedora-sysv/initscripts + Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +@@ -36,6 +36,20 @@ Requires(preun): /sbin/chkconfig + BuildRequires: glib2-devel popt-devel gettext pkgconfig systemd + Provides: /sbin/service + ++Patch1: support-interface-scriptlets.patch ++Patch2: relocate-dhclient-leases-to-var-run.patch ++Patch3: dhclient-restrict-interfaces-to-those-on-c.patch ++Patch4: support-interface-promisc.patch ++Patch5: 0001-dhclient-remove-1-arg.patch ++Patch6: 0001-force-delay-check-link-down.patch ++Patch7: run-ifdown-on-all-interfaces.patch ++Patch8: sysconfig-affirmative-check-for-link-carrier.patch ++Patch9: sysconfig-unsafe-usage-of-linkdelay-variable.patch ++Patch10: ipv6-static-route-support.patch ++Patch11: ifup-eth-stop-waiting-if-link-is-up.patch ++Patch12: ifup-alias-scope.patch ++Patch13: ifup-alias-check-ipaddr.patch ++ + %description + The initscripts package contains basic system scripts used + during a boot of the system. It also contains scripts which +@@ -55,6 +69,20 @@ Currently, this consists of various memory checking code. + %prep + %setup -q + ++%patch1 -p1 ++%patch2 -p1 ++%patch3 -p1 ++%patch4 -p1 ++%patch5 -p1 ++%patch6 -p1 ++%patch7 -p1 ++%patch8 -p1 ++%patch9 -p1 ++%patch10 -p1 ++%patch11 -p1 ++%patch12 -p1 ++%patch13 -p1 ++ + %build + make + +@@ -163,10 +191,7 @@ rm -rf $RPM_BUILD_ROOT + /usr/lib/systemd/rhel-* + /usr/lib/systemd/system/* + /etc/inittab +-%dir /etc/rc.d +-%dir /etc/rc.d/rc[0-9].d + /etc/rc[0-9].d +-%dir /etc/rc.d/init.d + /etc/rc.d/init.d/* + %config(noreplace) /etc/sysctl.conf + /usr/lib/sysctl.d/00-system.conf +@@ -188,7 +213,6 @@ rm -rf $RPM_BUILD_ROOT + /usr/sbin/ppp-watch + %{_mandir}/man*/* + %dir %attr(775,root,root) /var/run/netreport +-%dir /etc/ppp + %dir /etc/ppp/peers + /etc/ppp/ip-up + /etc/ppp/ip-down +@@ -196,8 +220,6 @@ rm -rf $RPM_BUILD_ROOT + /etc/ppp/ip-down.ipv6to4 + /etc/ppp/ipv6-up + /etc/ppp/ipv6-down +-%dir /etc/NetworkManager +-%dir /etc/NetworkManager/dispatcher.d + /etc/NetworkManager/dispatcher.d/00-netreport + %doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING + %doc examples +@@ -207,7 +229,7 @@ rm -rf $RPM_BUILD_ROOT + %ghost %attr(0664,root,utmp) /var/run/utmp + %ghost %attr(0644,root,root) /etc/sysconfig/kvm + %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab +-%dir /usr/lib/tmpfiles.d ++%dir %attr(0755,root,root) /usr/lib/tmpfiles.d + /usr/lib/tmpfiles.d/initscripts.conf + %dir /usr/libexec/initscripts + %dir /usr/libexec/initscripts/legacy-actions +-- +1.8.3.1 + diff --git a/base/initscripts/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/initscripts/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch deleted file mode 100644 index a01cd0d22..000000000 --- a/base/initscripts/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f77c05868c164eebe1c84eb3fdd920ef3305cebc Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 14:49:27 -0400 -Subject: [PATCH 09/13] WRS: - 0001-Update-package-versioning-for-TIS-format.patch - -Signed-off-by: zhipengl ---- - SPECS/initscripts.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec -index ad32f19..ace1326 100644 ---- a/SPECS/initscripts.spec -+++ b/SPECS/initscripts.spec -@@ -4,7 +4,7 @@ Version: 9.49.46 - # ppp-watch is GPLv2+, everything else is GPLv2 - License: GPLv2 and GPLv2+ - Group: System Environment/Base --Release: 1%{?dist} -+Release: 1.el7%{?_tis_dist}.%{tis_patch_ver} - URL: https://github.com/fedora-sysv/initscripts - Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root --- -1.8.3.1 - diff --git a/base/initscripts/centos/meta_patches/PATCH_ORDER b/base/initscripts/centos/meta_patches/PATCH_ORDER index e9baa496a..863805c85 100644 --- a/base/initscripts/centos/meta_patches/PATCH_ORDER +++ b/base/initscripts/centos/meta_patches/PATCH_ORDER @@ -1,6 +1 @@ -spec-include-TiS-changes.patch -stop-creating-shared-dirs.patch -fix-build-failures-due-to-unwanted-sgid.patch -0001-Update-package-versioning-for-TIS-format.patch -ifup-alias-scope.patch -added-ifup-alias-check-ipaddr.patch +0001-Include-starlingx-initscripts-changes.patch diff --git a/base/initscripts/centos/meta_patches/added-ifup-alias-check-ipaddr.patch b/base/initscripts/centos/meta_patches/added-ifup-alias-check-ipaddr.patch deleted file mode 100644 index 777bb439b..000000000 --- a/base/initscripts/centos/meta_patches/added-ifup-alias-check-ipaddr.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7f65521a9cee14ecd136f4caf44409b2acc86bdd Mon Sep 17 00:00:00 2001 -From: Teresa Ho -Date: Wed, 25 Sep 2019 16:19:26 -0400 -Subject: [PATCH 1/1] Added ifup-alias-check-ipaddr.patch - ---- - SPECS/initscripts.spec | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec -index fc7115c..9309d03 100644 ---- a/SPECS/initscripts.spec -+++ b/SPECS/initscripts.spec -@@ -49,6 +49,7 @@ Patch10: ipv6-static-route-support.patch - Patch11: ifup-eth-stop-waiting-if-link-is-up.patch - Patch12: run-dhclient-as-daemon-for-ipv6.patch - Patch13: ifup-alias-scope.patch -+Patch14: ifup-alias-check-ipaddr.patch - - %description - The initscripts package contains basic system scripts used -@@ -82,6 +83,7 @@ Currently, this consists of various memory checking code. - %patch11 -p1 - %patch12 -p1 - %patch13 -p1 -+%patch14 -p1 - - %build - make --- -1.8.3.1 - diff --git a/base/initscripts/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch b/base/initscripts/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch deleted file mode 100644 index 1e32ed0c7..000000000 --- a/base/initscripts/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 2c096cfd84fea55fd1f2df466d5635c06daab2a2 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 14:49:27 -0400 -Subject: [PATCH] WRS: fix-build-failures-due-to-unwanted-sgid.patch - -Signed-off-by: zhipengl ---- - SPECS/initscripts.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec -index 967317f..ad32f19 100644 ---- a/SPECS/initscripts.spec -+++ b/SPECS/initscripts.spec -@@ -227,7 +227,7 @@ rm -rf $RPM_BUILD_ROOT - %ghost %attr(0664,root,utmp) /var/run/utmp - %ghost %attr(0644,root,root) /etc/sysconfig/kvm - %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab --%dir /usr/lib/tmpfiles.d -+%dir %attr(0755,root,root) /usr/lib/tmpfiles.d - /usr/lib/tmpfiles.d/initscripts.conf - %dir /usr/libexec/initscripts - %dir /usr/libexec/initscripts/legacy-actions --- -1.8.3.1 - diff --git a/base/initscripts/centos/meta_patches/ifup-alias-scope.patch b/base/initscripts/centos/meta_patches/ifup-alias-scope.patch deleted file mode 100644 index 654329fa5..000000000 --- a/base/initscripts/centos/meta_patches/ifup-alias-scope.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ad85db9465da885a5f186db7f23655a3735a43c5 Mon Sep 17 00:00:00 2001 -From: Teresa Ho -Date: Fri, 4 Jan 2019 10:49:27 -0500 -Subject: [PATCH 1/1] Added ifup-alias-scope.patch - ---- - SPECS/initscripts.spec | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec -index 6e9fc13..bff1e12 100644 ---- a/SPECS/initscripts.spec -+++ b/SPECS/initscripts.spec -@@ -48,6 +48,7 @@ Patch9: sysconfig-unsafe-usage-of-linkdelay-variable.patch - Patch10: ipv6-static-route-support.patch - Patch11: ifup-eth-stop-waiting-if-link-is-up.patch - Patch12: run-dhclient-as-daemon-for-ipv6.patch -+Patch13: ifup-alias-scope.patch - - %description - The initscripts package contains basic system scripts used -@@ -80,7 +81,8 @@ Currently, this consists of various memory checking code. - %patch10 -p1 - %patch11 -p1 - %patch12 -p1 -- -+%patch13 -p1 -+ - %build - make - --- -1.8.3.1 - diff --git a/base/initscripts/centos/meta_patches/spec-include-TiS-changes.patch b/base/initscripts/centos/meta_patches/spec-include-TiS-changes.patch deleted file mode 100644 index bab4a68ea..000000000 --- a/base/initscripts/centos/meta_patches/spec-include-TiS-changes.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 29d8980d8c67a302a27a3084f58657414578a2b9 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 14:49:27 -0400 -Subject: [PATCH] WRS: spec-include-TiS-changes.patch - -Signed-off-by: zhipengl ---- - SPECS/initscripts.spec | 26 ++++++++++++++++++++++++++ - 1 file changed, 26 insertions(+) - -diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec -index e96290a..d3c2ce6 100644 ---- a/SPECS/initscripts.spec -+++ b/SPECS/initscripts.spec -@@ -36,6 +36,19 @@ Requires(preun): /sbin/chkconfig - BuildRequires: glib2-devel popt-devel gettext pkgconfig systemd - Provides: /sbin/service - -+Patch1: support-interface-scriptlets.patch -+Patch2: relocate-dhclient-leases-to-var-run.patch -+Patch3: dhclient-restrict-interfaces-to-those-on-c.patch -+Patch4: support-interface-promisc.patch -+Patch5: 0001-dhclient-remove-1-arg.patch -+Patch6: 0001-force-delay-check-link-down.patch -+Patch7: run-ifdown-on-all-interfaces.patch -+Patch8: sysconfig-affirmative-check-for-link-carrier.patch -+Patch9: sysconfig-unsafe-usage-of-linkdelay-variable.patch -+Patch10: ipv6-static-route-support.patch -+Patch11: ifup-eth-stop-waiting-if-link-is-up.patch -+Patch12: run-dhclient-as-daemon-for-ipv6.patch -+ - %description - The initscripts package contains basic system scripts used - during a boot of the system. It also contains scripts which -@@ -55,6 +68,19 @@ Currently, this consists of various memory checking code. - %prep - %setup -q - -+%patch1 -p1 -+%patch2 -p1 -+%patch3 -p1 -+%patch4 -p1 -+%patch5 -p1 -+%patch6 -p1 -+%patch7 -p1 -+%patch8 -p1 -+%patch9 -p1 -+%patch10 -p1 -+%patch11 -p1 -+%patch12 -p1 -+ - %build - make - --- -1.8.3.1 - diff --git a/base/initscripts/centos/meta_patches/stop-creating-shared-dirs.patch b/base/initscripts/centos/meta_patches/stop-creating-shared-dirs.patch deleted file mode 100644 index 63825fb64..000000000 --- a/base/initscripts/centos/meta_patches/stop-creating-shared-dirs.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f93a873f57cf8134e371668c7514923e6fda80f3 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 14:49:27 -0400 -Subject: [PATCH 02/13] WRS: stop-creating-shared-dirs.patch - -Signed-off-by: zhipengl ---- - SPECS/initscripts.spec | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec -index d3c2ce6..967317f 100644 ---- a/SPECS/initscripts.spec -+++ b/SPECS/initscripts.spec -@@ -189,10 +189,7 @@ rm -rf $RPM_BUILD_ROOT - /usr/lib/systemd/rhel-* - /usr/lib/systemd/system/* - /etc/inittab --%dir /etc/rc.d --%dir /etc/rc.d/rc[0-9].d - /etc/rc[0-9].d --%dir /etc/rc.d/init.d - /etc/rc.d/init.d/* - %config(noreplace) /etc/sysctl.conf - /usr/lib/sysctl.d/00-system.conf -@@ -214,7 +211,6 @@ rm -rf $RPM_BUILD_ROOT - /usr/sbin/ppp-watch - %{_mandir}/man*/* - %dir %attr(775,root,root) /var/run/netreport --%dir /etc/ppp - %dir /etc/ppp/peers - /etc/ppp/ip-up - /etc/ppp/ip-down -@@ -222,8 +218,6 @@ rm -rf $RPM_BUILD_ROOT - /etc/ppp/ip-down.ipv6to4 - /etc/ppp/ipv6-up - /etc/ppp/ipv6-down --%dir /etc/NetworkManager --%dir /etc/NetworkManager/dispatcher.d - /etc/NetworkManager/dispatcher.d/00-netreport - %doc sysconfig.txt sysvinitfiles static-routes-ipv6 ipv6-tunnel.howto ipv6-6to4.howto changes.ipv6 COPYING - %doc examples --- -1.8.3.1 - diff --git a/base/initscripts/centos/patches/run-dhclient-as-daemon-for-ipv6.patch b/base/initscripts/centos/patches/run-dhclient-as-daemon-for-ipv6.patch deleted file mode 100644 index ea638588d..000000000 --- a/base/initscripts/centos/patches/run-dhclient-as-daemon-for-ipv6.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 580624314b1b93f84264e9d60583dcde4f6b86f3 Mon Sep 17 00:00:00 2001 -From: Joseph Richard -Date: Thu, 11 Jan 2018 11:18:19 -0500 -Subject: [PATCH] run dhclient as daemon for ipv6. - ---- - sysconfig/network-scripts/ifup-eth | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth -index 4b8b992..ccb5c75 100755 ---- a/sysconfig/network-scripts/ifup-eth -+++ b/sysconfig/network-scripts/ifup-eth -@@ -364,13 +364,14 @@ if is_true "${DHCPV6C}" && [ -x /sbin/dhclient ]; then - echo -n $"Determining IPv6 information for ${DEVICE}..." - - # Initialize the dhclient args for IPv6 and obtain the hostname options if needed: -- DHCLIENTARGS="-6 -1 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -pf /var/run/dhclient6-${DEVICE}.pid ${DEVICE}" -+ DHCLIENTARGS="-6 ${DHCPV6C_OPTIONS} ${DHCLIENTCONF} -lf ${LEASEFILE} --restrict-interfaces -pf /var/run/dhclient6-${DEVICE}.pid ${DEVICE}" - set_hostname_options DHCLIENTARGS - -- if /sbin/dhclient $DHCLIENTARGS; then -+ if /sbin/dhclient -1 $DHCLIENTARGS; then - echo $" done." - else -- echo $" failed." -+ /sbin/dhclient $DHCLIENTARGS& -+ echo $" failed. Retrying in background." - if [ "${dhcpipv4}" = "good" -o -n "${IPADDR}" ]; then - net_log "Unable to obtain IPv6 DHCP address ${DEVICE}." warning - else --- -1.8.3.1 - From 2718976ddc5c272a97cc60651fe5d63a9a037406 Mon Sep 17 00:00:00 2001 From: Jim Somerville Date: Tue, 29 Oct 2019 15:39:05 -0400 Subject: [PATCH 3/8] i40e Driver Upgrade in support of N3000 on-board NICs Uprev i40e to version 2.10.19.30 i40evf gets replaced by iavf version 3.7.61.20 The iavf driver supports both fortville and columbiaville, so they decided to rename from i40evf to something more generic. We get to drop the patch which polls for coming out of reset as it was incorporated upstream. The Intel FPGA Programmable Acceleration Card N3000 contains dual Intel XL710 NICs and an FPGA for acceleration purposes. This driver upgrade is required to support those NICs. Change-Id: Ifbec94bcc00a8cce9fe97bf0eb41556b8bd3e592 Story: 2006740 Task: 37542 Depends-On: https://review.opendev.org/#/c/695061 Signed-off-by: Jim Somerville --- centos_guest_image.inc | 4 +- centos_guest_image_rt.inc | 4 +- centos_iso_image.inc | 6 +-- centos_pkg_dirs | 2 +- centos_pkg_dirs_rt | 2 +- .../intel-i40e/centos/build_srpm.data | 2 +- .../intel-i40e/centos/i40e-kmod.spec | 3 +- ...e-Enable-getting-link-status-from-VF.patch | 18 +++---- ...re-debug-info-for-VFs-still-in-reset.patch | 40 +++++++-------- ...t_vf_config-poll-for-out-of-vf-reset.patch | 49 ------------------- .../intel-i40evf/files/modules-load.conf | 1 - .../centos/build_srpm.data | 2 +- .../centos/iavf-kmod.spec} | 38 +++++++------- .../files/GPL-v2.0.txt | 0 .../intel-iavf/files/modules-load.conf | 1 + 15 files changed, 61 insertions(+), 111 deletions(-) delete mode 100644 kernel/kernel-modules/intel-i40e/files/ndo_get_vf_config-poll-for-out-of-vf-reset.patch delete mode 100644 kernel/kernel-modules/intel-i40evf/files/modules-load.conf rename kernel/kernel-modules/{intel-i40evf => intel-iavf}/centos/build_srpm.data (53%) rename kernel/kernel-modules/{intel-i40evf/centos/i40evf-kmod.spec => intel-iavf/centos/iavf-kmod.spec} (80%) rename kernel/kernel-modules/{intel-i40evf => intel-iavf}/files/GPL-v2.0.txt (100%) create mode 100644 kernel/kernel-modules/intel-iavf/files/modules-load.conf diff --git a/centos_guest_image.inc b/centos_guest_image.inc index c72cec857..1dd8f28fd 100644 --- a/centos_guest_image.inc +++ b/centos_guest_image.inc @@ -10,8 +10,8 @@ perf # Network Drivers # -# i40evf-kmod -kmod-i40evf +# iavf-kmod +kmod-iavf # i40e-kmod kmod-i40e diff --git a/centos_guest_image_rt.inc b/centos_guest_image_rt.inc index 7990eee28..c80892cad 100644 --- a/centos_guest_image_rt.inc +++ b/centos_guest_image_rt.inc @@ -7,8 +7,8 @@ # Network Drivers # -# i40evf-kmod -kmod-i40evf-rt +# iavf-kmod +kmod-iavf-rt # i40e-kmod kmod-i40e-rt diff --git a/centos_iso_image.inc b/centos_iso_image.inc index 35ba4863f..8634a8590 100644 --- a/centos_iso_image.inc +++ b/centos_iso_image.inc @@ -80,9 +80,9 @@ kmod-e1000e-rt kmod-i40e kmod-i40e-rt -# i40evf-kmod -kmod-i40evf -kmod-i40evf-rt +# iavf-kmod +kmod-iavf +kmod-iavf-rt # ixgbevf-kmod kmod-ixgbevf diff --git a/centos_pkg_dirs b/centos_pkg_dirs index 52f22c54a..843a3e3b4 100644 --- a/centos_pkg_dirs +++ b/centos_pkg_dirs @@ -65,7 +65,7 @@ kubernetes/etcd kubernetes/helm grub/grubby kernel/kernel-modules/intel-e1000e -kernel/kernel-modules/intel-i40evf +kernel/kernel-modules/intel-iavf kernel/kernel-modules/intel-i40e kernel/kernel-modules/intel-ixgbevf kernel/kernel-modules/intel-ixgbe diff --git a/centos_pkg_dirs_rt b/centos_pkg_dirs_rt index 2c504494b..51a2ed799 100644 --- a/centos_pkg_dirs_rt +++ b/centos_pkg_dirs_rt @@ -3,7 +3,7 @@ networking/mellanox/libibverbs kernel/kernel-modules/mlnx-ofa_kernel networking/mellanox/rdma-core kernel/kernel-modules/intel-e1000e -kernel/kernel-modules/intel-i40evf +kernel/kernel-modules/intel-iavf kernel/kernel-modules/intel-i40e kernel/kernel-modules/intel-ixgbevf kernel/kernel-modules/intel-ixgbe diff --git a/kernel/kernel-modules/intel-i40e/centos/build_srpm.data b/kernel/kernel-modules/intel-i40e/centos/build_srpm.data index 47321e589..2410f7041 100644 --- a/kernel/kernel-modules/intel-i40e/centos/build_srpm.data +++ b/kernel/kernel-modules/intel-i40e/centos/build_srpm.data @@ -1,4 +1,4 @@ COPY_LIST=" \ $PKG_BASE/files/* \ - $STX_BASE/downloads/i40e-2.7.29.tar.gz" + $STX_BASE/downloads/i40e-2.10.19.30.tar.gz" TIS_PATCH_VER=1 diff --git a/kernel/kernel-modules/intel-i40e/centos/i40e-kmod.spec b/kernel/kernel-modules/intel-i40e/centos/i40e-kmod.spec index 04cd3eb34..6221c006b 100644 --- a/kernel/kernel-modules/intel-i40e/centos/i40e-kmod.spec +++ b/kernel/kernel-modules/intel-i40e/centos/i40e-kmod.spec @@ -8,7 +8,7 @@ %define kmod_name i40e Name: %{kmod_name}-kmod%{?bt_ext} -Version: 2.7.29 +Version: 2.10.19.30 Release: 0%{?_tis_dist}.%{tis_patch_ver} Group: System Environment/Kernel License: GPLv2 @@ -25,7 +25,6 @@ Source11: modules-load.conf Patch01: i40e-Enable-getting-link-status-from-VF.patch Patch02: i40e-add-more-debug-info-for-VFs-still-in-reset.patch -Patch03: ndo_get_vf_config-poll-for-out-of-vf-reset.patch %define kversion %(rpm -q kernel%{?bt_ext}-devel | sort --version-sort | tail -1 | sed 's/kernel%{?bt_ext}-devel-//') diff --git a/kernel/kernel-modules/intel-i40e/files/i40e-Enable-getting-link-status-from-VF.patch b/kernel/kernel-modules/intel-i40e/files/i40e-Enable-getting-link-status-from-VF.patch index 9807529d0..747f567e5 100644 --- a/kernel/kernel-modules/intel-i40e/files/i40e-Enable-getting-link-status-from-VF.patch +++ b/kernel/kernel-modules/intel-i40e/files/i40e-Enable-getting-link-status-from-VF.patch @@ -1,8 +1,8 @@ -From 412fdc8c0d51500e42e76e788ece3ca7dd260ced Mon Sep 17 00:00:00 2001 -Message-Id: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com> +From b8c666367cd98a2b0033c043f6f206abd8e238a6 Mon Sep 17 00:00:00 2001 +Message-Id: From: Vadim Suraev Date: Mon, 8 Feb 2016 15:57:30 -0500 -Subject: [PATCH 1/3] i40e: Enable getting link status from VF +Subject: [PATCH 1/2] i40e: Enable getting link status from VF Add handling of custom OP code sent from the PMD VF to get link status via the virtual channel interface. @@ -16,10 +16,10 @@ Signed-off-by: Jim Somerville 2 files changed, 79 insertions(+) diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c -index 020bacb..126ec19 100644 +index 9e48f0d..21b4606 100644 --- a/src/i40e_virtchnl_pf.c +++ b/src/i40e_virtchnl_pf.c -@@ -2559,6 +2559,81 @@ static int i40e_vc_config_promiscuous_mode_msg(struct i40e_vf *vf, u8 *msg) +@@ -2467,6 +2467,81 @@ err_out: aq_ret); } @@ -101,7 +101,7 @@ index 020bacb..126ec19 100644 /** * i40e_vc_config_queues_msg * @vf: pointer to the VF info -@@ -4300,6 +4375,9 @@ int i40e_vc_process_vf_msg(struct i40e_pf *pf, s16 vf_id, u32 v_opcode, +@@ -4166,6 +4241,9 @@ int i40e_vc_process_vf_msg(struct i40e_pf *pf, s16 vf_id, u32 v_opcode, case VIRTCHNL_OP_REQUEST_QUEUES: ret = i40e_vc_request_queues_msg(vf, msg); break; @@ -112,17 +112,17 @@ index 020bacb..126ec19 100644 case VIRTCHNL_OP_ENABLE_CHANNELS: ret = i40e_vc_add_qch_msg(vf, msg); diff --git a/src/virtchnl.h b/src/virtchnl.h -index afde603..b9b38c0 100644 +index a22cc43..d3d9324 100644 --- a/src/virtchnl.h +++ b/src/virtchnl.h -@@ -124,6 +124,7 @@ enum virtchnl_ops { +@@ -128,6 +128,7 @@ enum virtchnl_ops { VIRTCHNL_OP_DISABLE_CHANNELS = 31, VIRTCHNL_OP_ADD_CLOUD_FILTER = 32, VIRTCHNL_OP_DEL_CLOUD_FILTER = 33, + VIRTCHNL_OP_GET_LINK_STAT = 0x101, - }; + /* These macros are used to generate compilation errors if a structure/union -- 1.8.3.1 diff --git a/kernel/kernel-modules/intel-i40e/files/i40e-add-more-debug-info-for-VFs-still-in-reset.patch b/kernel/kernel-modules/intel-i40e/files/i40e-add-more-debug-info-for-VFs-still-in-reset.patch index 530aada97..7f1fba6e6 100644 --- a/kernel/kernel-modules/intel-i40e/files/i40e-add-more-debug-info-for-VFs-still-in-reset.patch +++ b/kernel/kernel-modules/intel-i40e/files/i40e-add-more-debug-info-for-VFs-still-in-reset.patch @@ -1,10 +1,10 @@ -From d60e87567eb5418fbb848bf30f72d3d8bec3bad6 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com> -References: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com> +From 40b257ecf5d36abf14a4ef98fc2e44dba7100fea Mon Sep 17 00:00:00 2001 +Message-Id: <40b257ecf5d36abf14a4ef98fc2e44dba7100fea.1572295393.git.Jim.Somerville@windriver.com> +In-Reply-To: +References: From: Jim Somerville Date: Mon, 26 Mar 2018 11:03:47 -0400 -Subject: [PATCH 2/3] i40e add more debug info for VFs still in reset +Subject: [PATCH 2/2] i40e add more debug info for VFs still in reset Signed-off-by: Jim Somerville --- @@ -12,10 +12,21 @@ Signed-off-by: Jim Somerville 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c -index 126ec19..da29fc3 100644 +index 21b4606..dfb9568 100644 --- a/src/i40e_virtchnl_pf.c +++ b/src/i40e_virtchnl_pf.c -@@ -4650,8 +4650,8 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, +@@ -4363,8 +4363,8 @@ static int i40e_set_vf_mac(struct i40e_vf *vf, struct i40e_vsi *vsi, + msleep(20); + } + if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { +- dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n", +- vf->vf_id); ++ dev_err(&pf->pdev->dev, "%s: VF %d still in reset. Try again.\n", ++ __func__, vf->vf_id); + ret = -EAGAIN; + goto error_param; + } +@@ -4522,8 +4522,8 @@ int i40e_ndo_set_vf_port_vlan(struct net_device *netdev, vf = &pf->vf[vf_id]; vsi = pf->vsi[vf->lan_vsi_idx]; if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { @@ -26,7 +37,7 @@ index 126ec19..da29fc3 100644 ret = -EAGAIN; goto error_pvid; } -@@ -4784,8 +4784,8 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int max_tx_rate) +@@ -4678,8 +4678,8 @@ int i40e_ndo_set_vf_bw(struct net_device *netdev, int vf_id, int max_tx_rate) vf = &pf->vf[vf_id]; vsi = pf->vsi[vf->lan_vsi_idx]; if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { @@ -37,18 +48,7 @@ index 126ec19..da29fc3 100644 ret = -EAGAIN; goto error; } -@@ -4844,8 +4844,8 @@ int i40e_ndo_get_vf_config(struct net_device *netdev, - /* first vsi is always the LAN vsi */ - vsi = pf->vsi[vf->lan_vsi_idx]; - if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { -- dev_err(&pf->pdev->dev, "VF %d still in reset. Try again.\n", -- vf_id); -+ dev_err(&pf->pdev->dev, "%s: VF %d still in reset. Try again.\n", -+ __func__, vf_id); - ret = -EAGAIN; - goto error_param; - } -@@ -4989,8 +4989,8 @@ int i40e_ndo_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool enable) +@@ -4881,8 +4881,8 @@ int i40e_ndo_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool enable) vf = &(pf->vf[vf_id]); if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { diff --git a/kernel/kernel-modules/intel-i40e/files/ndo_get_vf_config-poll-for-out-of-vf-reset.patch b/kernel/kernel-modules/intel-i40e/files/ndo_get_vf_config-poll-for-out-of-vf-reset.patch deleted file mode 100644 index e8b6ffb38..000000000 --- a/kernel/kernel-modules/intel-i40e/files/ndo_get_vf_config-poll-for-out-of-vf-reset.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 25b521f58b33bf070c0b31d077333c13c3ad25e8 Mon Sep 17 00:00:00 2001 -Message-Id: <25b521f58b33bf070c0b31d077333c13c3ad25e8.1528830095.git.Jim.Somerville@windriver.com> -In-Reply-To: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com> -References: <412fdc8c0d51500e42e76e788ece3ca7dd260ced.1528830095.git.Jim.Somerville@windriver.com> -From: Jim Somerville -Date: Mon, 2 Apr 2018 15:35:12 -0400 -Subject: [PATCH 3/3] ndo_get_vf_config poll for out of vf reset - -Same solution as 028daf80117376b22909becd9720daaefdfceff4 from the -net-next tree as supplied by Intel, but we apply it to -ndo_get_vf_config instead. - -Signed-off-by: Jim Somerville ---- - src/i40e_virtchnl_pf.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/i40e_virtchnl_pf.c b/src/i40e_virtchnl_pf.c -index da29fc3..d5935d6 100644 ---- a/src/i40e_virtchnl_pf.c -+++ b/src/i40e_virtchnl_pf.c -@@ -4829,6 +4829,7 @@ int i40e_ndo_get_vf_config(struct net_device *netdev, - struct i40e_pf *pf = vsi->back; - struct i40e_vf *vf; - int ret = 0; -+ u8 i; - - if (test_and_set_bit(__I40E_VIRTCHNL_OP_PENDING, pf->state)) { - dev_warn(&pf->pdev->dev, "Unable to configure VFs, other operation is pending.\n"); -@@ -4843,6 +4844,16 @@ int i40e_ndo_get_vf_config(struct net_device *netdev, - vf = &pf->vf[vf_id]; - /* first vsi is always the LAN vsi */ - vsi = pf->vsi[vf->lan_vsi_idx]; -+ -+ /* When the VF is resetting wait until it is done. -+ * It can take up to 200 milliseconds, -+ * but wait for up to 300 milliseconds to be safe. -+ */ -+ for (i = 0; i < 15; i++) { -+ if (test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) -+ break; -+ msleep(20); -+ } - if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states)) { - dev_err(&pf->pdev->dev, "%s: VF %d still in reset. Try again.\n", - __func__, vf_id); --- -1.8.3.1 - diff --git a/kernel/kernel-modules/intel-i40evf/files/modules-load.conf b/kernel/kernel-modules/intel-i40evf/files/modules-load.conf deleted file mode 100644 index c647f0ef7..000000000 --- a/kernel/kernel-modules/intel-i40evf/files/modules-load.conf +++ /dev/null @@ -1 +0,0 @@ -i40evf diff --git a/kernel/kernel-modules/intel-i40evf/centos/build_srpm.data b/kernel/kernel-modules/intel-iavf/centos/build_srpm.data similarity index 53% rename from kernel/kernel-modules/intel-i40evf/centos/build_srpm.data rename to kernel/kernel-modules/intel-iavf/centos/build_srpm.data index ee17d7021..8833d2d6a 100644 --- a/kernel/kernel-modules/intel-i40evf/centos/build_srpm.data +++ b/kernel/kernel-modules/intel-iavf/centos/build_srpm.data @@ -1,4 +1,4 @@ COPY_LIST=" \ $PKG_BASE/files/* \ - $STX_BASE/downloads/i40evf-3.6.15.tar.gz" + $STX_BASE/downloads/iavf-3.7.61.20.tar.gz" TIS_PATCH_VER=1 diff --git a/kernel/kernel-modules/intel-i40evf/centos/i40evf-kmod.spec b/kernel/kernel-modules/intel-iavf/centos/iavf-kmod.spec similarity index 80% rename from kernel/kernel-modules/intel-i40evf/centos/i40evf-kmod.spec rename to kernel/kernel-modules/intel-iavf/centos/iavf-kmod.spec index c02915217..6a4a37726 100644 --- a/kernel/kernel-modules/intel-i40evf/centos/i40evf-kmod.spec +++ b/kernel/kernel-modules/intel-iavf/centos/iavf-kmod.spec @@ -5,10 +5,10 @@ %endif # Define the kmod package name here. -%define kmod_name i40evf +%define kmod_name iavf Name: %{kmod_name}-kmod%{?bt_ext} -Version: 3.6.15 +Version: 3.7.61.20 Release: 0%{?_tis_dist}.%{tis_patch_ver} Group: System Environment/Kernel License: GPLv2 @@ -25,52 +25,52 @@ Source11: modules-load.conf %define kversion %(rpm -q kernel%{?bt_ext}-devel | sort --version-sort | tail -1 | sed 's/kernel%{?bt_ext}-devel-//') -%package -n kmod-i40evf%{?bt_ext} -Summary: i40evf kernel module(s) +%package -n kmod-iavf%{?bt_ext} +Summary: iavf kernel module(s) Group: System Environment/Kernel %global _use_internal_dependency_generator 0 Provides: kernel-modules >= %{kversion} -Provides: i40evf-kmod = %{?epoch:%{epoch}:}%{version}-%{release} +Provides: iavf-kmod = %{?epoch:%{epoch}:}%{version}-%{release} Requires(post): /usr/sbin/depmod Requires(postun): /usr/sbin/depmod -%description -n kmod-i40evf%{?bt_ext} -This package provides the i40evf kernel module(s) built +%description -n kmod-iavf%{?bt_ext} +This package provides the iavf kernel module(s) built for the Linux kernel using the %{_target_cpu} family of processors. -%post -n kmod-i40evf%{?bt_ext} +%post -n kmod-iavf%{?bt_ext} echo "Working. This may take some time ..." if [ -e "/boot/System.map-%{kversion}" ]; then /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || : fi -modules=( $(find /lib/modules/%{kversion}/extra/i40evf | grep '\.ko$') ) +modules=( $(find /lib/modules/%{kversion}/extra/iavf | grep '\.ko$') ) if [ -x "/sbin/weak-modules" ]; then printf '%s\n' "${modules[@]}" | /sbin/weak-modules --add-modules fi echo "Done." -%preun -n kmod-i40evf%{?bt_ext} -rpm -ql kmod-i40evf%{?bt_ext}-%{version}-%{release}.x86_64 | grep '\.ko$' > /var/run/rpm-kmod-i40evf%{?bt_ext}-modules +%preun -n kmod-iavf%{?bt_ext} +rpm -ql kmod-iavf%{?bt_ext}-%{version}-%{release}.x86_64 | grep '\.ko$' > /var/run/rpm-kmod-iavf%{?bt_ext}-modules -%postun -n kmod-i40evf%{?bt_ext} +%postun -n kmod-iavf%{?bt_ext} echo "Working. This may take some time ..." if [ -e "/boot/System.map-%{kversion}" ]; then /usr/sbin/depmod -aeF "/boot/System.map-%{kversion}" "%{kversion}" > /dev/null || : fi -modules=( $(cat /var/run/rpm-kmod-i40evf%{?bt_ext}-modules) ) -rm /var/run/rpm-kmod-i40evf%{?bt_ext}-modules +modules=( $(cat /var/run/rpm-kmod-iavf%{?bt_ext}-modules) ) +rm /var/run/rpm-kmod-iavf%{?bt_ext}-modules if [ -x "/sbin/weak-modules" ]; then printf '%s\n' "${modules[@]}" | /sbin/weak-modules --remove-modules fi echo "Done." -%files -n kmod-i40evf%{?bt_ext} +%files -n kmod-iavf%{?bt_ext} %defattr(644,root,root,755) /lib/modules/%{kversion}/ -%config(noreplace)/etc/depmod.d/kmod-i40evf.conf -%doc /usr/share/doc/kmod-i40evf-%{version}/ +%config(noreplace)/etc/depmod.d/kmod-iavf.conf +%doc /usr/share/doc/kmod-iavf-%{version}/ %doc /usr/share/man/man7/ -%{_sysconfdir}/modules-load.d/i40evf.conf +%{_sysconfdir}/modules-load.d/iavf.conf # Disable the building of the debug package(s). %define debug_package %{nil} @@ -102,7 +102,7 @@ popd >/dev/null %{__install} -d %{buildroot}%{_mandir}/man7/ %{__install} %{kmod_name}.7.gz %{buildroot}%{_mandir}/man7/ %{__install} -d %{buildroot}%{_sysconfdir}/modules-load.d -%{__install} -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/modules-load.d/i40evf.conf +%{__install} -m 644 %{SOURCE11} %{buildroot}%{_sysconfdir}/modules-load.d/iavf.conf # Strip the modules(s). find %{buildroot} -type f -name \*.ko -exec %{__strip} --strip-debug \{\} \; diff --git a/kernel/kernel-modules/intel-i40evf/files/GPL-v2.0.txt b/kernel/kernel-modules/intel-iavf/files/GPL-v2.0.txt similarity index 100% rename from kernel/kernel-modules/intel-i40evf/files/GPL-v2.0.txt rename to kernel/kernel-modules/intel-iavf/files/GPL-v2.0.txt diff --git a/kernel/kernel-modules/intel-iavf/files/modules-load.conf b/kernel/kernel-modules/intel-iavf/files/modules-load.conf new file mode 100644 index 000000000..54c14c832 --- /dev/null +++ b/kernel/kernel-modules/intel-iavf/files/modules-load.conf @@ -0,0 +1 @@ +iavf From 0231aba5cdcb96b15106591acfff280159050366 Mon Sep 17 00:00:00 2001 From: Jim Somerville Date: Thu, 21 Nov 2019 15:54:15 -0500 Subject: [PATCH 4/8] Uprev systemd to version 219-67.el7 This solves: systemd: line splitting via fgets() allows for state injection during daemon-reexec (CVE-2018-15686) along with some other less critical issues. See the security announcement link: https://lists.centos.org/pipermail/centos-cr-announce/2019-August/006149.html for more details. Here we rebase the patches, and fix the atrocious crime of "name of patch file doesn't match what git format-patch generates". We also squash down the meta patches which add the patches to the spec file as part of good housekeeping. Change-Id: I01a3fa329bbad541a063cb604d1756892139967f Closes-Bug: 1849200 Depends-On: https://review.opendev.org/#/c/695560 Signed-off-by: Jim Somerville --- base/systemd/centos/build_srpm.data | 2 +- .../centos/meta_patches/Add-STX-patches.patch | 32 +++++++++++++++++++ base/systemd/centos/meta_patches/PATCH_ORDER | 6 ++-- ...-of-systemd-post-from-running-on-pat.patch | 21 ++++++------ .../fix-build-error-for-CentOS76.patch | 25 --------------- .../fix-build-error-for-unused-variable.patch | 25 --------------- .../spec-millisec-in-syslog-date.patch | 26 --------------- ...> update-package-versioning-for-STX.patch} | 16 ++++++---- ... 801-inject-millisec-in-syslog-date.patch} | 10 +++--- ...fix-build-error-for-unused-variable.patch} | 16 ++++++---- ...ile-failure-due-to-deprecated-value.patch} | 19 +++++++---- base/systemd/centos/srpm_path | 2 +- 12 files changed, 85 insertions(+), 115 deletions(-) create mode 100644 base/systemd/centos/meta_patches/Add-STX-patches.patch delete mode 100644 base/systemd/centos/meta_patches/fix-build-error-for-CentOS76.patch delete mode 100644 base/systemd/centos/meta_patches/fix-build-error-for-unused-variable.patch delete mode 100644 base/systemd/centos/meta_patches/spec-millisec-in-syslog-date.patch rename base/systemd/centos/meta_patches/{update-package-versioning-for-TIS-format.patch => update-package-versioning-for-STX.patch} (57%) rename base/systemd/centos/patches/{0701-inject-millisec-in-syslog-date.patch => 801-inject-millisec-in-syslog-date.patch} (89%) rename base/systemd/centos/patches/{0702-fix-build-error-for-unused-variable.patch => 802-fix-build-error-for-unused-variable.patch} (58%) rename base/systemd/centos/patches/{0703-fix-build-error-for-CentOS7.6.patch => 803-Fix-compile-failure-due-to-deprecated-value.patch} (83%) diff --git a/base/systemd/centos/build_srpm.data b/base/systemd/centos/build_srpm.data index 73018cc23..e13aab400 100644 --- a/base/systemd/centos/build_srpm.data +++ b/base/systemd/centos/build_srpm.data @@ -1,2 +1,2 @@ -TIS_PATCH_VER=11 +TIS_PATCH_VER=1 BUILD_IS_SLOW=7 diff --git a/base/systemd/centos/meta_patches/Add-STX-patches.patch b/base/systemd/centos/meta_patches/Add-STX-patches.patch new file mode 100644 index 000000000..a33a95edf --- /dev/null +++ b/base/systemd/centos/meta_patches/Add-STX-patches.patch @@ -0,0 +1,32 @@ +From 3c0e59a677c921f60f27002a27eb5f4776475e44 Mon Sep 17 00:00:00 2001 +Message-Id: <3c0e59a677c921f60f27002a27eb5f4776475e44.1574265913.git.Jim.Somerville@windriver.com> +In-Reply-To: +References: +From: Jim Somerville +Date: Wed, 20 Nov 2019 10:59:45 -0500 +Subject: [PATCH 3/3] Add STX patches + +Signed-off-by: Jim Somerville +--- + SPECS/systemd.spec | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec +index 4c83150..e1e98bb 100644 +--- a/SPECS/systemd.spec ++++ b/SPECS/systemd.spec +@@ -786,6 +786,11 @@ Patch0744: 0744-selinux-don-t-log-SELINUX_INFO-and-SELINUX_WARNING-m.patch + Patch0745: 0745-fix-mis-merge.patch + Patch0746: 0746-fs-util-chase_symlinks-prevent-double-free.patch + ++# STX Patches ++Patch0801: 801-inject-millisec-in-syslog-date.patch ++Patch0802: 802-fix-build-error-for-unused-variable.patch ++Patch0803: 803-Fix-compile-failure-due-to-deprecated-value.patch ++ + Patch9999: 9999-Update-kernel-install-script-by-backporting-fedora-p.patch + + %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);} +-- +1.8.3.1 + diff --git a/base/systemd/centos/meta_patches/PATCH_ORDER b/base/systemd/centos/meta_patches/PATCH_ORDER index 5ac36678b..bf2db2190 100644 --- a/base/systemd/centos/meta_patches/PATCH_ORDER +++ b/base/systemd/centos/meta_patches/PATCH_ORDER @@ -1,5 +1,3 @@ -update-package-versioning-for-TIS-format.patch +update-package-versioning-for-STX.patch Protect-sections-of-systemd-post-from-running-on-pat.patch -spec-millisec-in-syslog-date.patch -fix-build-error-for-unused-variable.patch -fix-build-error-for-CentOS76.patch +Add-STX-patches.patch diff --git a/base/systemd/centos/meta_patches/Protect-sections-of-systemd-post-from-running-on-pat.patch b/base/systemd/centos/meta_patches/Protect-sections-of-systemd-post-from-running-on-pat.patch index 408f53a0e..1e2efa43c 100644 --- a/base/systemd/centos/meta_patches/Protect-sections-of-systemd-post-from-running-on-pat.patch +++ b/base/systemd/centos/meta_patches/Protect-sections-of-systemd-post-from-running-on-pat.patch @@ -1,18 +1,21 @@ -From e54be64fa16349c94826b17a4dc206a7513f0d9c Mon Sep 17 00:00:00 2001 +From eece9585b5f9258c7180247b1664e92b5ef83efe Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: +References: From: Scott Little Date: Mon, 2 Oct 2017 17:53:00 -0400 -Subject: [PATCH] WRS: - 0004-Protect-sections-of-systemd-post-from-running-on-pat.patch +Subject: [PATCH 2/3] Protect sections of systemd post from running on patch +Signed-off-by: Jim Somerville --- SPECS/systemd.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec -index 6e1d7e1..6a04c16 100644 +index 16262fb..4c83150 100644 --- a/SPECS/systemd.spec +++ b/SPECS/systemd.spec -@@ -1221,6 +1221,7 @@ fi +@@ -1297,6 +1297,7 @@ fi rm -f /etc/sysconfig/i18n >/dev/null 2>&1 || : rm -f /etc/sysconfig/keyboard >/dev/null 2>&1 || : @@ -20,7 +23,7 @@ index 6e1d7e1..6a04c16 100644 # Migrate HOSTNAME= from /etc/sysconfig/network if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then unset HOSTNAME -@@ -1228,6 +1229,7 @@ if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then +@@ -1304,6 +1305,7 @@ if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then [ -n "$HOSTNAME" ] && echo $HOSTNAME > /etc/hostname 2>&1 || : fi sed -i '/^HOSTNAME=/d' /etc/sysconfig/network >/dev/null 2>&1 || : @@ -28,7 +31,7 @@ index 6e1d7e1..6a04c16 100644 # Migrate the old systemd-setup-keyboard X11 configuration fragment if [ ! -e /etc/X11/xorg.conf.d/00-keyboard.conf ] ; then -@@ -1236,6 +1238,7 @@ else +@@ -1312,6 +1314,7 @@ else rm -f /etc/X11/xorg.conf.d/00-system-setup-keyboard.conf >/dev/null 2>&1 || : fi @@ -36,7 +39,7 @@ index 6e1d7e1..6a04c16 100644 # sed-fu to add myhostname to the hosts line of /etc/nsswitch.conf # Only do that when installing, not when updating. if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then -@@ -1245,6 +1248,7 @@ if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then +@@ -1321,6 +1324,7 @@ if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then s/[[:blank:]]*$/ myhostname/ ' /etc/nsswitch.conf >/dev/null 2>&1 || : fi @@ -45,5 +48,5 @@ index 6e1d7e1..6a04c16 100644 %posttrans # Convert old /etc/sysconfig/desktop settings -- -2.7.4 +1.8.3.1 diff --git a/base/systemd/centos/meta_patches/fix-build-error-for-CentOS76.patch b/base/systemd/centos/meta_patches/fix-build-error-for-CentOS76.patch deleted file mode 100644 index f41e42cd8..000000000 --- a/base/systemd/centos/meta_patches/fix-build-error-for-CentOS76.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0816ac70222fec2609ed893c30d55f8c37fba632 Mon Sep 17 00:00:00 2001 -From: Shuicheng Lin -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 ---- - 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 -@@ -715,6 +715,7 @@ Patch0672: 0672-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.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 - diff --git a/base/systemd/centos/meta_patches/fix-build-error-for-unused-variable.patch b/base/systemd/centos/meta_patches/fix-build-error-for-unused-variable.patch deleted file mode 100644 index 2eea31c5c..000000000 --- a/base/systemd/centos/meta_patches/fix-build-error-for-unused-variable.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6aead74fb56ae75cc16be507165d3fc75c38fac0 Mon Sep 17 00:00:00 2001 -From: slin14 -Date: Thu, 9 Aug 2018 18:40:36 +0800 -Subject: [PATCH] Add 0702-fix-build-error-for-unused-variable.patch - -Signed-off-by: slin14 ---- - SPECS/systemd.spec | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec -index ffd0770..3f7cc10 100644 ---- a/SPECS/systemd.spec -+++ b/SPECS/systemd.spec -@@ -714,6 +714,7 @@ Patch0672: 0672-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch - - #WRS Patches - Patch0701: 0701-inject-millisec-in-syslog-date.patch -+Patch0702: 0702-fix-build-error-for-unused-variable.patch - - %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);} - --- -2.7.4 - diff --git a/base/systemd/centos/meta_patches/spec-millisec-in-syslog-date.patch b/base/systemd/centos/meta_patches/spec-millisec-in-syslog-date.patch deleted file mode 100644 index 2dc5cb714..000000000 --- a/base/systemd/centos/meta_patches/spec-millisec-in-syslog-date.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6f9a8e792bad1f4bb8d9dad4f2430d89a1058d0c Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 17:53:00 -0400 -Subject: [PATCH] WRS: 0005-spec-millisec-in-syslog-date.patch - ---- - SPECS/systemd.spec | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec -index 6a04c16..845d1dd 100644 ---- a/SPECS/systemd.spec -+++ b/SPECS/systemd.spec -@@ -712,6 +712,9 @@ Patch0670: 0670-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch - Patch0671: 0671-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch - Patch0672: 0672-sd-bus-if-we-receive-an-invalid-dbus-message-ignore-.patch - -+#WRS Patches -+Patch0701: 0701-inject-millisec-in-syslog-date.patch -+ - %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);} - - BuildRequires: libcap-devel --- -2.7.4 - diff --git a/base/systemd/centos/meta_patches/update-package-versioning-for-TIS-format.patch b/base/systemd/centos/meta_patches/update-package-versioning-for-STX.patch similarity index 57% rename from base/systemd/centos/meta_patches/update-package-versioning-for-TIS-format.patch rename to base/systemd/centos/meta_patches/update-package-versioning-for-STX.patch index fcb7b6c37..5fbc01d07 100644 --- a/base/systemd/centos/meta_patches/update-package-versioning-for-TIS-format.patch +++ b/base/systemd/centos/meta_patches/update-package-versioning-for-STX.patch @@ -1,25 +1,27 @@ -From e1b3591beb36a45f7cc4bf9340dd640b359955b7 Mon Sep 17 00:00:00 2001 +From eeb3e979288cb8c14d8546d12a27da4c88fbb0e4 Mon Sep 17 00:00:00 2001 +Message-Id: From: Scott Little Date: Mon, 2 Oct 2017 17:53:00 -0400 -Subject: [PATCH] WRS: 0001-update-package-versioning-for-TIS-format.patch +Subject: [PATCH 1/3] update package versioning for STX +Signed-off-by: Jim Somerville --- SPECS/systemd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec -index 6bdbb74..3b2aa7f 100644 +index b1ffe88..16262fb 100644 --- a/SPECS/systemd.spec +++ b/SPECS/systemd.spec @@ -7,7 +7,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 219 --Release: 62%{?dist}.5 -+Release: 62.el7_6.5%{?_tis_dist}.%{tis_patch_ver} +-Release: 67%{?dist} ++Release: 67.el7%{?_tis_dist}.%{tis_patch_ver} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ Summary: A System and Service Manager --- -2.7.4 +-- +1.8.3.1 diff --git a/base/systemd/centos/patches/0701-inject-millisec-in-syslog-date.patch b/base/systemd/centos/patches/801-inject-millisec-in-syslog-date.patch similarity index 89% rename from base/systemd/centos/patches/0701-inject-millisec-in-syslog-date.patch rename to base/systemd/centos/patches/801-inject-millisec-in-syslog-date.patch index 5eee0f141..9a0074e57 100644 --- a/base/systemd/centos/patches/0701-inject-millisec-in-syslog-date.patch +++ b/base/systemd/centos/patches/801-inject-millisec-in-syslog-date.patch @@ -1,14 +1,16 @@ -From 08353c7cc596d2d09fd7f22a9bfde4d83bd9ebda Mon Sep 17 00:00:00 2001 +From 8b63ddb68a39d48ebb621d76a2b1f07f5ff67ac7 Mon Sep 17 00:00:00 2001 +Message-Id: <8b63ddb68a39d48ebb621d76a2b1f07f5ff67ac7.1574264572.git.Jim.Somerville@windriver.com> From: systemd team Date: Tue, 8 Nov 2016 17:06:01 -0500 -Subject: [PATCH 1/1] inject millisec in syslog date +Subject: [PATCH 1/3] inject millisec in syslog date +Signed-off-by: Jim Somerville --- src/journal/journald-syslog.c | 48 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 42 insertions(+), 6 deletions(-) diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c -index 4e118aa..85cdeb9 100644 +index 1a9db59..36288cb 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -35,6 +35,44 @@ @@ -75,5 +77,5 @@ index 4e118aa..85cdeb9 100644 /* Third: identifier and PID */ -- -1.9.1 +1.8.3.1 diff --git a/base/systemd/centos/patches/0702-fix-build-error-for-unused-variable.patch b/base/systemd/centos/patches/802-fix-build-error-for-unused-variable.patch similarity index 58% rename from base/systemd/centos/patches/0702-fix-build-error-for-unused-variable.patch rename to base/systemd/centos/patches/802-fix-build-error-for-unused-variable.patch index 8d31d8946..7de125485 100644 --- a/base/systemd/centos/patches/0702-fix-build-error-for-unused-variable.patch +++ b/base/systemd/centos/patches/802-fix-build-error-for-unused-variable.patch @@ -1,15 +1,19 @@ -From 193fcf879dbee168238227e2123d63f5bf8a135d Mon Sep 17 00:00:00 2001 +From 7cc3363381f83bb060e8e686eb64b5425f2d4409 Mon Sep 17 00:00:00 2001 +Message-Id: <7cc3363381f83bb060e8e686eb64b5425f2d4409.1574264572.git.Jim.Somerville@windriver.com> +In-Reply-To: <8b63ddb68a39d48ebb621d76a2b1f07f5ff67ac7.1574264572.git.Jim.Somerville@windriver.com> +References: <8b63ddb68a39d48ebb621d76a2b1f07f5ff67ac7.1574264572.git.Jim.Somerville@windriver.com> From: slin14 Date: Thu, 9 Aug 2018 18:38:18 +0800 -Subject: [PATCH] fix build error for unused variable +Subject: [PATCH 2/3] fix build error for unused variable Signed-off-by: slin14 +Signed-off-by: Jim Somerville --- src/journal/journald-syslog.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/journal/journald-syslog.c b/src/journal/journald-syslog.c -index 33062ea..fd4e070 100644 +index 36288cb..2e49b4c 100644 --- a/src/journal/journald-syslog.c +++ b/src/journal/journald-syslog.c @@ -167,8 +167,6 @@ void server_forward_syslog(Server *s, int priority, const char *identifier, cons @@ -19,8 +23,8 @@ index 33062ea..fd4e070 100644 - time_t t; - struct tm *tm; char *ident_buf = NULL; - + assert(s); --- -2.7.4 +-- +1.8.3.1 diff --git a/base/systemd/centos/patches/0703-fix-build-error-for-CentOS7.6.patch b/base/systemd/centos/patches/803-Fix-compile-failure-due-to-deprecated-value.patch similarity index 83% rename from base/systemd/centos/patches/0703-fix-build-error-for-CentOS7.6.patch rename to base/systemd/centos/patches/803-Fix-compile-failure-due-to-deprecated-value.patch index 3d9470fe7..11bad1bfd 100644 --- a/base/systemd/centos/patches/0703-fix-build-error-for-CentOS7.6.patch +++ b/base/systemd/centos/patches/803-Fix-compile-failure-due-to-deprecated-value.patch @@ -1,7 +1,10 @@ -From bcfe2b0e50fed2a445f4e0dd43f33aee45d9ac5f Mon Sep 17 00:00:00 2001 +From 339ea8b005c037eaad217dfd3cc10b2b110bdd28 Mon Sep 17 00:00:00 2001 +Message-Id: <339ea8b005c037eaad217dfd3cc10b2b110bdd28.1574264572.git.Jim.Somerville@windriver.com> +In-Reply-To: <8b63ddb68a39d48ebb621d76a2b1f07f5ff67ac7.1574264572.git.Jim.Somerville@windriver.com> +References: <8b63ddb68a39d48ebb621d76a2b1f07f5ff67ac7.1574264572.git.Jim.Somerville@windriver.com> From: Shuicheng Lin Date: Tue, 2 Apr 2019 16:43:03 +0000 -Subject: [PATCH] Fix compile failure due to deprecated value +Subject: [PATCH 3/3] Fix compile failure due to deprecated value Issue occur after upgrade build tool chain. Fix it per tool chain's suggestion. @@ -15,10 +18,11 @@ use MHD_HTTP_NOT_ACCEPTABLE [-Werror] Signed-off-by: Shuicheng Lin Signed-off-by: Mawrer Ramirez +Signed-off-by: Jim Somerville --- src/journal-remote/journal-gatewayd.c | 4 ++-- - src/journal-remote/journal-remote.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) + src/journal-remote/journal-remote.c | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c index d1f0ce3..8364044 100644 @@ -43,7 +47,7 @@ index d1f0ce3..8364044 100644 diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c -index e65daf6..9780ecb 100644 +index 431e283..476c826 100644 --- a/src/journal-remote/journal-remote.c +++ b/src/journal-remote/journal-remote.c @@ -526,13 +526,13 @@ static int process_http_upload( @@ -54,14 +58,14 @@ index e65daf6..9780ecb 100644 + MHD_HTTP_PAYLOAD_TOO_LARGE, "Entry is too large, maximum is %u bytes.\n", DATA_SIZE_MAX); - + else if (r == -E2BIG) return mhd_respondf(connection, - MHD_HTTP_REQUEST_ENTITY_TOO_LARGE, + MHD_HTTP_PAYLOAD_TOO_LARGE, "Entry with more fields than the maximum of %u\n", ENTRY_FIELD_COUNT_MAX); - + @@ -586,7 +586,7 @@ static int request_handler( *connection_cls); @@ -73,3 +77,4 @@ index e65daf6..9780ecb 100644 if (!streq(url, "/upload")) -- 1.8.3.1 + diff --git a/base/systemd/centos/srpm_path b/base/systemd/centos/srpm_path index bb7c557b3..6cf114d90 100644 --- a/base/systemd/centos/srpm_path +++ b/base/systemd/centos/srpm_path @@ -1 +1 @@ -mirror:Source/systemd-219-62.el7_6.5.src.rpm +mirror:Source/systemd-219-67.el7.src.rpm From f30cb74fef4b97721010ca9bc6a6b6dde03c4add Mon Sep 17 00:00:00 2001 From: Robin Lu Date: Fri, 22 Nov 2019 11:01:27 +0800 Subject: [PATCH 5/8] Update sudo srpm patch for CVE bug To fix below CVE, we will use sudo-1.8.23-4.el7_7.1.src.rpm And we have to update some patches according to new srpm. https://lists.centos.org/pipermail/centos-announce/2019-October/023499.html CVE bug: CVE-2019-14287: sudo: can bypass certain policy blacklists Closes-Bug: 1852825 Depends-On: https://review.opendev.org/#/c/695637/ Change-Id: Ifc0a3423464fafce06cd504d9b427fc3433fb756 Signed-off-by: Robin Lu --- .../0001-Update-package-versioning-for-TIS-format.patch | 4 ++-- .../centos/meta_patches/0002-spec-include-TiS-changes.patch | 6 +++--- base/sudo/centos/meta_patches/0003-remove-make-check.patch | 2 +- base/sudo/centos/srpm_path | 2 +- centos_srpms_centos.lst | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/base/sudo/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/sudo/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index 794d66d2a..5b475e427 100644 --- a/base/sudo/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/base/sudo/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -15,8 +15,8 @@ index c8d2f64..b6402bb 100644 Summary: Allows restricted root access for specified users Name: sudo Version: 1.8.23 --Release: 3%{?dist} -+Release: 3.el7%{?_tis_dist}.%{tis_patch_ver} +-Release: 4%{?dist}.1 ++Release: 4.el7_7.1%{?_tis_dist}.%{tis_patch_ver} License: ISC Group: Applications/System URL: http://www.courtesan.com/sudo/ diff --git a/base/sudo/centos/meta_patches/0002-spec-include-TiS-changes.patch b/base/sudo/centos/meta_patches/0002-spec-include-TiS-changes.patch index 1c5083b5d..0ee52261f 100644 --- a/base/sudo/centos/meta_patches/0002-spec-include-TiS-changes.patch +++ b/base/sudo/centos/meta_patches/0002-spec-include-TiS-changes.patch @@ -11,7 +11,7 @@ diff --git a/SPECS/sudo.spec b/SPECS/sudo.spec index b6402bb..acbcb26 100644 --- a/SPECS/sudo.spec +++ b/SPECS/sudo.spec -@@ -111,7 +111,7 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SHL +@@ -126,7 +126,7 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SHL --with-ignore-dot \ --with-tty-tickets \ --with-ldap \ @@ -20,7 +20,7 @@ index b6402bb..acbcb26 100644 --with-selinux \ --with-passprompt="[sudo] password for %p: " \ --with-linux-audit \ -@@ -138,6 +138,9 @@ install -p -c -m 0440 %{SOURCE1} %{buildroot}%{_sysconfdir}/sudoers +@@ -153,6 +153,9 @@ install -p -c -m 0440 %{SOURCE1} %{buildroot}%{_sysconfdir}/sudoers install -p -c -m 0640 %{SOURCE3} %{buildroot}%{_sysconfdir}/sudo.conf install -p -c -m 0640 %{SOURCE2} %{buildroot}%{_sysconfdir}/sudo-ldap.conf @@ -30,7 +30,7 @@ index b6402bb..acbcb26 100644 # Remove upstream sudoers file rm -f %{buildroot}%{_sysconfdir}/sudoers.dist -@@ -210,6 +213,7 @@ rm -rf %{buildroot} +@@ -225,6 +228,7 @@ rm -rf %{buildroot} %{_mandir}/man5/sudoers_timestamp.5.gz %dir %{_docdir}/sudo-%{version} %{_docdir}/sudo-%{version}/* diff --git a/base/sudo/centos/meta_patches/0003-remove-make-check.patch b/base/sudo/centos/meta_patches/0003-remove-make-check.patch index f6ab0c2a0..ded83eaf1 100644 --- a/base/sudo/centos/meta_patches/0003-remove-make-check.patch +++ b/base/sudo/centos/meta_patches/0003-remove-make-check.patch @@ -2,7 +2,7 @@ diff --git a/SPECS/sudo.spec b/SPECS/sudo.spec index 8c3f395..17531f7 100644 --- a/SPECS/sudo.spec +++ b/SPECS/sudo.spec -@@ -120,7 +120,8 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SHL +@@ -135,7 +135,8 @@ export CFLAGS="$RPM_OPT_FLAGS $F_PIE" LDFLAGS="-pie -Wl,-z,relro -Wl,-z,now" SHL make %check diff --git a/base/sudo/centos/srpm_path b/base/sudo/centos/srpm_path index 227d96962..469d2e4e3 100644 --- a/base/sudo/centos/srpm_path +++ b/base/sudo/centos/srpm_path @@ -1 +1 @@ -mirror:Source/sudo-1.8.23-3.el7.src.rpm +mirror:Source/sudo-1.8.23-4.el7_7.1.src.rpm diff --git a/centos_srpms_centos.lst b/centos_srpms_centos.lst index f1b4c5a24..1c848759d 100644 --- a/centos_srpms_centos.lst +++ b/centos_srpms_centos.lst @@ -40,7 +40,7 @@ resource-agents-4.1.1-12.el7_6.7.src.rpm setup-2.8.71-10.el7.src.rpm shim-15-1.el7.centos.src.rpm shim-signed-15-1.el7.centos.src.rpm -sudo-1.8.23-3.el7.src.rpm +sudo-1.8.23-4.el7_7.1.src.rpm systemd-219-62.el7_6.5.src.rpm tboot-1.9.6-3.el7.src.rpm tpm2-tools-3.0.4-2.el7.src.rpm From 11fd5d9cd48a1539b9c7a4ebc8aaad69ed24ae5b Mon Sep 17 00:00:00 2001 From: Dan Voiculeasa Date: Thu, 21 Nov 2019 15:01:36 +0200 Subject: [PATCH 6/8] ceph-init-wrapper: Detect stuck peering OSDs and restart them OSDs might become stuck peering. Recover from such state. Closes-bug: 1851287 Change-Id: I2ef1a0e93d38c3d041ee0c5c1e66a4ac42785a68 Signed-off-by: Dan Voiculeasa --- ceph/ceph/files/ceph-init-wrapper.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/ceph/ceph/files/ceph-init-wrapper.sh b/ceph/ceph/files/ceph-init-wrapper.sh index de1bb3549..ddbbc8443 100755 --- a/ceph/ceph/files/ceph-init-wrapper.sh +++ b/ceph/ceph/files/ceph-init-wrapper.sh @@ -156,8 +156,9 @@ log_and_restart_blocked_osds () { # Log info about the blocked osd daemons and then restart it local names=$1 + local message=$2 for name in $names; do - wlog $name "INFO" "Restarting OSD with blocked operations" + wlog $name "INFO" "$message" ${CEPH_SCRIPT} restart $name done } @@ -253,6 +254,7 @@ status () erred_procs=`echo "$result" | sort | uniq | awk ' /not running|dead|failed/ {printf "%s ", $1}' | sed 's/://g' | sed 's/, $//g'` hung_procs=`echo "$result" | sort | uniq | awk ' /hung/ {printf "%s ", $1}' | sed 's/://g' | sed 's/, $//g'` blocked_ops_procs=`echo "$result" | sort | uniq | awk ' /blocked ops/ {printf "%s ", $1}' | sed 's/://g' | sed 's/, $//g'` + stuck_peering_procs=`echo "$result" | sort | uniq | awk ' /stuck peering/ {printf "%s ", $1}' | sed 's/://g' | sed 's/, $//g'` invalid=0 host=`hostname` if [[ "$system_type" == "All-in-one" ]] && [[ "$system_mode" != "simplex" ]]; then @@ -267,14 +269,12 @@ status () fi done - log_and_restart_blocked_osds $blocked_ops_procs + log_and_restart_blocked_osds "$blocked_ops_procs"\ + "Restarting OSD with blocked operations" + log_and_restart_blocked_osds "$stuck_peering_procs"\ + "Restarting OSD stuck peering" log_and_kill_hung_procs $hung_procs - hung_procs_text="" - for i in $(echo $hung_procs); do - hung_procs_text+="$i(process hung) " - done - rm -f $CEPH_STATUS_FAILURE_TEXT_FILE if [ $invalid -eq 0 ]; then text="" From 5d854355d873702b78ff6aa8c6fddc025c45be2d Mon Sep 17 00:00:00 2001 From: Jim Somerville Date: Mon, 25 Nov 2019 16:07:17 -0500 Subject: [PATCH 7/8] Uprev ntp to version 4.2.6p5-29.el7 This solves: ntp: Stack-based buffer overflow in ntpq and ntpdc allows denial of service or code execution (CVE-2018-12327) See the announcement link: https://lists.centos.org/pipermail/centos-cr-announce/2019-August/006016.html for more details. Here we refresh the meta patches and correct the crime of "name of patch file differs from git format-patch". We also clean up the commit short logs. Change-Id: I263465d85f06096296fdd478a302eb110ab1259c Closes-Bug: 1849197 Depends-On: https://review.opendev.org/#/c/695983 Signed-off-by: Jim Somerville --- .../Fix-ntpq-truncates-IPV6-addresses.patch | 41 +++++++++++++++++++ ...ch-Fix-ntpq-truncates-IPV6-addresses.patch | 37 ----------------- base/ntp/centos/meta_patches/PATCH_ORDER | 2 +- ...te-package-versioning-for-TIS-format.patch | 12 +++--- base/ntp/centos/srpm_path | 2 +- 5 files changed, 50 insertions(+), 44 deletions(-) create mode 100644 base/ntp/centos/meta_patches/Fix-ntpq-truncates-IPV6-addresses.patch delete mode 100644 base/ntp/centos/meta_patches/Include-patch-Fix-ntpq-truncates-IPV6-addresses.patch diff --git a/base/ntp/centos/meta_patches/Fix-ntpq-truncates-IPV6-addresses.patch b/base/ntp/centos/meta_patches/Fix-ntpq-truncates-IPV6-addresses.patch new file mode 100644 index 000000000..283078ed1 --- /dev/null +++ b/base/ntp/centos/meta_patches/Fix-ntpq-truncates-IPV6-addresses.patch @@ -0,0 +1,41 @@ +From fbfbbc827d080370f71a76284dde4dc3dd1d16da Mon Sep 17 00:00:00 2001 +Message-Id: +In-Reply-To: <536afc9500d65768db35f6ca07c21c490b19bda7.1574708120.git.Jim.Somerville@windriver.com> +References: <536afc9500d65768db35f6ca07c21c490b19bda7.1574708120.git.Jim.Somerville@windriver.com> +From: Kristine Bujold +Date: Tue, 3 Sep 2019 16:18:58 -0400 +Subject: [PATCH 2/2] Fix ntpq truncates IPV6 addresses + +Signed-off-by: Kristine Bujold +Signed-off-by: Jim Somerville +--- + SPECS/ntp.spec | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/SPECS/ntp.spec b/SPECS/ntp.spec +index 84aa1ac..4d32d8c 100644 +--- a/SPECS/ntp.spec ++++ b/SPECS/ntp.spec +@@ -204,6 +204,9 @@ Patch78: ntp-4.2.6p5-netlinknobuf.patch + # add bugs for compatibility with original EL7 ntpstat + Patch100: ntpstat-compat.patch + ++# STX IPV6 ntpq patch ++Patch500: Fix-ntpq-truncates-IPV6-addresses.patch ++ + URL: http://www.ntp.org + Requires(post): systemd-units + Requires(preun): systemd-units +@@ -361,6 +364,9 @@ This package contains NTP documentation in HTML format. + + %patch100 -p1 -b .compat + ++%patch500 -p1 -b .ntpq-truncates-IPV6-addresses ++ ++ + # set default path to sntp KoD database + sed -i 's|/var/db/ntp-kod|%{_localstatedir}/lib/sntp/kod|' sntp/{sntp.1,main.c} + +-- +1.8.3.1 + diff --git a/base/ntp/centos/meta_patches/Include-patch-Fix-ntpq-truncates-IPV6-addresses.patch b/base/ntp/centos/meta_patches/Include-patch-Fix-ntpq-truncates-IPV6-addresses.patch deleted file mode 100644 index cec15ee70..000000000 --- a/base/ntp/centos/meta_patches/Include-patch-Fix-ntpq-truncates-IPV6-addresses.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 44c7f5aa4df30c2ac8eae5a956dc503d7e62e1fd Mon Sep 17 00:00:00 2001 -From: Kristine Bujold -Date: Tue, 3 Sep 2019 16:18:58 -0400 -Subject: [PATCH] Include patch Fix-ntpq-truncates-IPV6-addresses.patch. - -Signed-off-by: Kristine Bujold ---- - SPECS/ntp.spec | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/SPECS/ntp.spec b/SPECS/ntp.spec -index a9ebf30..330d5b0 100644 ---- a/SPECS/ntp.spec -+++ b/SPECS/ntp.spec -@@ -207,6 +207,9 @@ Patch104: ntpstat-0.2-errorbit.patch - # improve man page - Patch105: ntpstat-0.2-manual.patch - -+# STX IPV6 ntpq patch -+Patch500: Fix-ntpq-truncates-IPV6-addresses.patch -+ - URL: http://www.ntp.org - Requires(post): systemd-units - Requires(preun): systemd-units -@@ -366,6 +369,9 @@ This package contains NTP documentation in HTML format. - %patch104 -p1 -b .errorbit - %patch105 -p1 -b .manual - -+%patch500 -p1 -b .ntpq-truncates-IPV6-addresses -+ -+ - # set default path to sntp KoD database - sed -i 's|/var/db/ntp-kod|%{_localstatedir}/lib/sntp/kod|' sntp/{sntp.1,main.c} - --- -1.8.3.1 - diff --git a/base/ntp/centos/meta_patches/PATCH_ORDER b/base/ntp/centos/meta_patches/PATCH_ORDER index 0bfdab01e..dd3f82721 100644 --- a/base/ntp/centos/meta_patches/PATCH_ORDER +++ b/base/ntp/centos/meta_patches/PATCH_ORDER @@ -1,2 +1,2 @@ Update-package-versioning-for-TIS-format.patch -Include-patch-Fix-ntpq-truncates-IPV6-addresses.patch +Fix-ntpq-truncates-IPV6-addresses.patch diff --git a/base/ntp/centos/meta_patches/Update-package-versioning-for-TIS-format.patch b/base/ntp/centos/meta_patches/Update-package-versioning-for-TIS-format.patch index 7b56ad4e4..69d8524a9 100644 --- a/base/ntp/centos/meta_patches/Update-package-versioning-for-TIS-format.patch +++ b/base/ntp/centos/meta_patches/Update-package-versioning-for-TIS-format.patch @@ -1,23 +1,25 @@ -From b7992d01d3ce4ccb51f73e7c1c4e3f4cb9e8e454 Mon Sep 17 00:00:00 2001 +From 536afc9500d65768db35f6ca07c21c490b19bda7 Mon Sep 17 00:00:00 2001 +Message-Id: <536afc9500d65768db35f6ca07c21c490b19bda7.1574708120.git.Jim.Somerville@windriver.com> From: Kristine Bujold Date: Tue, 3 Sep 2019 16:08:25 -0400 -Subject: [PATCH] Update-package-versioning-for-TIS-format +Subject: [PATCH 1/2] Update package versioning for TIS format Signed-off-by: Kristine Bujold +Signed-off-by: Jim Somerville --- SPECS/ntp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/ntp.spec b/SPECS/ntp.spec -index 52ad9aa..a9ebf30 100644 +index 178a961..84aa1ac 100644 --- a/SPECS/ntp.spec +++ b/SPECS/ntp.spec @@ -1,7 +1,7 @@ Summary: The NTP daemon and utilities Name: ntp Version: 4.2.6p5 --Release: 28%{?dist} -+Release: 28.el7.centos%{?_tis_dist}.%{tis_patch_ver} +-Release: 29%{?dist} ++Release: 29.el7.centos%{?_tis_dist}.%{tis_patch_ver} # primary license (COPYRIGHT) : MIT # ElectricFence/ (not used) : GPLv2 # kernel/sys/ppsclock.h (not used) : BSD with advertising diff --git a/base/ntp/centos/srpm_path b/base/ntp/centos/srpm_path index b5e385938..4d0761b8b 100644 --- a/base/ntp/centos/srpm_path +++ b/base/ntp/centos/srpm_path @@ -1 +1 @@ -mirror:Source/ntp-4.2.6p5-28.el7.centos.src.rpm +mirror:Source/ntp-4.2.6p5-29.el7.centos.src.rpm From 4aa661ce5666220d6beb2a3a3fac987cba4feb74 Mon Sep 17 00:00:00 2001 From: "Martin, Chen" Date: Thu, 21 Nov 2019 10:28:13 +0800 Subject: [PATCH 8/8] Build layering Rebase tarball for i40e Driver Rebase srpm for systemd 219-67.el7 Rebase srpm for sudo Rebase srpm for ntp Depends-On: https://review.opendev.org/#/c/695061/ Depends-On: https://review.opendev.org/#/c/695560/ Depends-On: https://review.opendev.org/#/c/695637/ Depends-On: https://review.opendev.org/#/c/695983/ Story: 2006166 Task: 37570 Change-Id: I7f33e0fb1319df3421318c4927d2a5675a490273 Signed-off-by: Martin, Chen --- centos_srpms_centos.lst | 4 ++-- centos_tarball-dl.lst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/centos_srpms_centos.lst b/centos_srpms_centos.lst index 1c848759d..aa26928c9 100644 --- a/centos_srpms_centos.lst +++ b/centos_srpms_centos.lst @@ -15,7 +15,7 @@ logrotate-3.8.6-17.el7.src.rpm # mlnx-ofa_kernel-4.5-OFED.4.5.1.0.1.1.gb4fdfac.src.rpm net-snmp-5.7.2-37.el7.src.rpm net-tools-2.0-0.24.20131004git.el7.src.rpm -ntp-4.2.6p5-28.el7.centos.src.rpm +ntp-4.2.6p5-29.el7.centos.src.rpm openldap-2.4.44-20.el7.src.rpm openssh-7.4p1-16.el7.src.rpm parted-3.1-29.el7.src.rpm @@ -41,7 +41,7 @@ setup-2.8.71-10.el7.src.rpm shim-15-1.el7.centos.src.rpm shim-signed-15-1.el7.centos.src.rpm sudo-1.8.23-4.el7_7.1.src.rpm -systemd-219-62.el7_6.5.src.rpm +systemd-219-67.el7.src.rpm tboot-1.9.6-3.el7.src.rpm tpm2-tools-3.0.4-2.el7.src.rpm watchdog-5.13-12.el7.src.rpm diff --git a/centos_tarball-dl.lst b/centos_tarball-dl.lst index ee2ad92d5..2457370ed 100644 --- a/centos_tarball-dl.lst +++ b/centos_tarball-dl.lst @@ -23,8 +23,8 @@ googletest-fdb850479284e2aae047b87df6beae84236d0135.tar.gz#googletest#https://ap # gorilla-context-08b5f424b9271eedf6f9f0ce86cb9396ed337a42.tar.gz#gorilla-context#https://github.com/gorilla/context/archive/08b5f424b9271eedf6f9f0ce86cb9396ed337a42.tar.gz#http## # gorilla-mux-456bcfa82d672db7cae587c9b541463f65bc2718.tar.gz#gorilla-mux#https://github.com/gorilla/mux/archive/456bcfa82d672db7cae587c9b541463f65bc2718.tar.gz#http## helm-v2.13.1-linux-amd64.tar.gz#linux-amd64#https://storage.googleapis.com/kubernetes-helm/helm-v2.13.1-linux-amd64.tar.gz#http## -i40e-2.7.29.tar.gz#i40e-2.7.29#https://sourceforge.net/projects/e1000/files/i40e%20stable/2.7.29/i40e-2.7.29.tar.gz/download#http## -i40evf-3.6.15.tar.gz#i40evf-3.6.15#https://sourceforge.net/projects/e1000/files/i40evf%20stable/3.6.15/i40evf-3.6.15.tar.gz/download#http## +i40e-2.10.19.30.tar.gz#i40e-2.10.19.30#https://sourceforge.net/projects/e1000/files/i40e%20stable/2.10.19.30/i40e-2.10.19.30.tar.gz/download#http## +iavf-3.7.61.20.tar.gz#iavf-3.7.61.20#https://sourceforge.net/projects/e1000/files/iavf%20stable/3.7.61.20/iavf-3.7.61.20.tar.gz/download#http## ibsh-0.3e.tar.gz#cgcs-users-1.0#https://sourceforge.net/projects/ibsh/files/ibsh/ibsh-0.3e/ibsh-0.3e.tar.gz/download#http## !integrity-kmod-e6aef069.tar.gz#integrity#http://git.infradead.org/users/jjs/linux-tpmdd.git/snapshot/e6aef069b6e97790cb127d5eeb86ae9ff0b7b0e3.tar.gz#http_script##post-dl-script/integrity-kmod.sh isa-l-7e1a337433a340bc0974ed0f04301bdaca374af6.tar.gz#isa-l#https://api.github.com/repos/ceph/isa-l/tarball/7e1a337433a340bc0974ed0f04301bdaca374af6#https##