From cb67fa83306cfda9de041a7c6ae452f144226c27 Mon Sep 17 00:00:00 2001 From: slin14 Date: Thu, 16 Aug 2018 03:28:59 +0800 Subject: [PATCH] rebase setup patch to CentOS7.5 Story: 2003389 Task: 24485 Change-Id: I04645b69e0e86e70cf168fbfe6c118af2cb961a3 Signed-off-by: slin14 --- ...te-package-versioning-for-TIS-format.patch | 12 +- ...ports-and-fstab-only-root-accessible.patch | 13 +- .../spec-add-TMOUT-variable.patch | 33 +- .../spec-add-ironic-uid-gid.patch | 33 +- .../spec-add-magnum-uid-gid.patch | 26 +- .../spec-add-murano-uid-gid.patch | 26 +- ...c-add-uid-gid-for-telemetry-services.patch | 26 +- .../spec-include-TiS-changes.patch | 32 +- ...c-include-add-fm-user-to-snmpd-group.patch | 31 +- .../spec-include-snmpd-fm-user-group.patch | 39 +- .../spec-include-tis-uid-gid.patch | 1074 +---------------- ...move-unused-default-users-and-groups.patch | 26 +- .../spec-remove-unused-default-groups.patch | 39 +- .../meta_patches/spec-set-custom-prompt.patch | 28 +- ...and-uids-to-support-upgrade-from-wrl.patch | 27 +- .../patches/add-fm-user-to-snmpd-group.patch | 13 +- .../centos/patches/add-ironic-uid-gid.patch | 18 +- ...move-unused-default-users-and-groups.patch | 8 +- .../remove-unused-default-groups.patch | 8 +- base/setup/centos/srpm_path | 2 +- 20 files changed, 251 insertions(+), 1263 deletions(-) diff --git a/base/setup/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/setup/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index 543253914..a33932f66 100644 --- a/base/setup/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/base/setup/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -1,14 +1,14 @@ -From 412fc338e588c92ee0be3bf1b1af0040fac9f500 Mon Sep 17 00:00:00 2001 +From 667cc2ccdd4451ce9d943064d714bcf1a8d1e4ed Mon Sep 17 00:00:00 2001 From: Don Penney Date: Mon, 26 Sep 2016 17:40:54 -0400 -Subject: [PATCH] Update package versioning for TIS format +Subject: [PATCH 09/15] Update package versioning for TIS format --- SPECS/setup.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/setup.spec b/SPECS/setup.spec -index 223bfd5..89a4d2f 100644 +index 3ad2458..8f5fc46 100644 --- a/SPECS/setup.spec +++ b/SPECS/setup.spec @@ -1,7 +1,7 @@ @@ -16,10 +16,10 @@ index 223bfd5..89a4d2f 100644 Name: setup Version: 2.8.71 -Release: 9%{?dist} -+Release: 7.el7%{?_tis_dist}.%{tis_patch_ver} ++Release: 9.el7%{?_tis_dist}.%{tis_patch_ver} License: Public Domain Group: System Environment/Base - URL: https://fedorahosted.org/setup/ + URL: https://pagure.io/setup/ -- -1.8.3.1 +2.7.4 diff --git a/base/setup/centos/meta_patches/security-make-exports-and-fstab-only-root-accessible.patch b/base/setup/centos/meta_patches/security-make-exports-and-fstab-only-root-accessible.patch index 464f5008a..23aae4d16 100644 --- a/base/setup/centos/meta_patches/security-make-exports-and-fstab-only-root-accessible.patch +++ b/base/setup/centos/meta_patches/security-make-exports-and-fstab-only-root-accessible.patch @@ -1,8 +1,7 @@ -From 2f6906e33b91dc28c7b48ce5604501ce09cfaed6 Mon Sep 17 00:00:00 2001 -Message-Id: <2f6906e33b91dc28c7b48ce5604501ce09cfaed6.1468352966.git.Jim.Somerville@windriver.com> +From 6d54fd5dff19e69d2d9c01e508fd4276e4eaef5b Mon Sep 17 00:00:00 2001 From: Jim Somerville Date: Tue, 12 Jul 2016 15:43:47 -0400 -Subject: [PATCH 1/1] security make exports and fstab only root accessible +Subject: [PATCH 07/15] security make exports and fstab only root accessible Apply a chmod of 600 to the two files. @@ -12,17 +11,17 @@ Signed-off-by: Jim Somerville 1 file changed, 1 insertion(+) diff --git a/SPECS/setup.spec b/SPECS/setup.spec -index d40113f..6c18614 100644 +index db3ed17..a612d24 100644 --- a/SPECS/setup.spec +++ b/SPECS/setup.spec -@@ -65,6 +65,7 @@ chmod 0644 %{buildroot}/var/log/lastlog +@@ -69,6 +69,7 @@ chmod 0644 %{buildroot}/var/log/lastlog touch %{buildroot}/etc/fstab touch %{buildroot}/etc/subuid touch %{buildroot}/etc/subgid +chmod 0600 %{buildroot}/etc/{exports,fstab} install -m 644 %{SOURCE1} %{buildroot}/etc/ install -m 644 %{SOURCE2} %{buildroot}/etc/profile.d/prompt.sh - + mkdir -p %{buildroot}/etc/profile.d -- -1.8.3.1 +2.7.4 diff --git a/base/setup/centos/meta_patches/spec-add-TMOUT-variable.patch b/base/setup/centos/meta_patches/spec-add-TMOUT-variable.patch index 458d3f6a7..93ad36f75 100644 --- a/base/setup/centos/meta_patches/spec-add-TMOUT-variable.patch +++ b/base/setup/centos/meta_patches/spec-add-TMOUT-variable.patch @@ -1,40 +1,43 @@ -From 13bee9ed7d91fae3d66f91d4e4aa139ca3d05f66 Mon Sep 17 00:00:00 2001 +From d8ab20a896750f9fcd257d3e64cb0ef34e35140a Mon Sep 17 00:00:00 2001 From: David Balme Date: Thu, 13 Oct 2016 08:40:27 -0400 -Subject: [PATCH 1/1] add TMOUT variable +Subject: [PATCH 10/15] add TMOUT variable --- - SPECS/setup.spec | 3 +++ - 1 file changed, 3 insertions(+) + SPECS/setup.spec | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/SPECS/setup.spec b/SPECS/setup.spec -index 89a4d2f..1f5c96a 100644 +index 8f5fc46..a6465dc 100644 --- a/SPECS/setup.spec +++ b/SPECS/setup.spec -@@ -8,6 +8,7 @@ URL: https://fedorahosted.org/setup/ - Source0: https://fedorahosted.org/releases/s/e/%{name}/%{name}-%{version}.tar.bz2 +@@ -8,6 +8,7 @@ URL: https://pagure.io/setup/ + Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2 Source1: motd Source2: prompt.sh +Source3: custom.sh BuildArch: noarch BuildRequires: bash tcsh perl #require system release for saner dependency order -@@ -70,6 +71,7 @@ touch %{buildroot}/etc/subgid +@@ -73,8 +74,9 @@ touch %{buildroot}/etc/subuid + touch %{buildroot}/etc/subgid chmod 0600 %{buildroot}/etc/{exports,fstab} install -m 644 %{SOURCE1} %{buildroot}/etc/ - install -m 644 %{SOURCE2} %{buildroot}/etc/profile.d/prompt.sh +-install -m 644 %{SOURCE2} %{buildroot}/etc/profile.d/prompt.sh + mkdir -p %{buildroot}/etc/profile.d ++install -m 644 %{SOURCE2} %{buildroot}/etc/profile.d/prompt.sh +install -m 644 %{SOURCE3} %{buildroot}/etc/profile.d/custom.sh + echo "#Add any required envvar overrides to this file, it is sourced from /etc/profile" >%{buildroot}/etc/profile.d/sh.local + echo "#Add any required envvar overrides to this file, is sourced from /etc/csh.login" >%{buildroot}/etc/profile.d/csh.local - # remove unpackaged files from the buildroot - rm -f %{buildroot}/etc/Makefile -@@ -125,6 +127,7 @@ end +@@ -133,6 +135,7 @@ end %config(noreplace) /etc/motd %dir /etc/profile.d /etc/profile.d/prompt.sh +/etc/profile.d/custom.sh + %config(noreplace) /etc/profile.d/sh.local + %config(noreplace) /etc/profile.d/csh.local %config(noreplace) %verify(not md5 size mtime) /etc/shells - %ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog - %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab -- -1.8.3.1 +2.7.4 diff --git a/base/setup/centos/meta_patches/spec-add-ironic-uid-gid.patch b/base/setup/centos/meta_patches/spec-add-ironic-uid-gid.patch index 7aa40568f..8311e7592 100644 --- a/base/setup/centos/meta_patches/spec-add-ironic-uid-gid.patch +++ b/base/setup/centos/meta_patches/spec-add-ironic-uid-gid.patch @@ -1,26 +1,33 @@ -commit f944ef677dc090e91b790ac54064d61d071edb5c -Author: Shoaib Nasir -Date: Mon Sep 25 12:20:43 2017 -0400 +From 1c1e025ff9cdf5a5041959434a79014e24015271 Mon Sep 17 00:00:00 2001 +From: Shoaib Nasir +Date: Mon, 27 Aug 2018 17:55:18 +0800 Add ironic-uid-gid.patch to SPECS +--- + SPECS/setup.spec | 2 ++ + 1 file changed, 2 insertions(+) + diff --git a/SPECS/setup.spec b/SPECS/setup.spec -index 2ec3541..55dd30b 100644 +index 367a13b..974113e 100644 --- a/SPECS/setup.spec +++ b/SPECS/setup.spec -@@ -28,6 +28,7 @@ Patch9: snmpd-fm-user-group.patch - Patch10: remove-unused-default-groups.patch - Patch11: add-fm-user-to-snmpd-group.patch - Patch12: add-magnum-uid-gid.patch -+Patch13: add-ironic-uid-gid.patch +@@ -30,6 +30,7 @@ Patch11: snmpd-fm-user-group.patch + Patch12: remove-unused-default-groups.patch + Patch13: add-fm-user-to-snmpd-group.patch + Patch14: add-magnum-uid-gid.patch ++Patch15: add-ironic-uid-gid.patch %description The setup package contains a set of important system configuration and -@@ -48,6 +49,7 @@ setup files, such as passwd, group, and profile. - %patch10 -p1 - %patch11 -p1 +@@ -52,6 +53,7 @@ setup files, such as passwd, group, and profile. %patch12 -p1 -+%patch13 -p1 + %patch13 -p1 + %patch14 -p1 ++%patch15 -p1 ./shadowconvert.sh +-- +2.7.4 + diff --git a/base/setup/centos/meta_patches/spec-add-magnum-uid-gid.patch b/base/setup/centos/meta_patches/spec-add-magnum-uid-gid.patch index c689da226..7294e29ae 100644 --- a/base/setup/centos/meta_patches/spec-add-magnum-uid-gid.patch +++ b/base/setup/centos/meta_patches/spec-add-magnum-uid-gid.patch @@ -1,32 +1,32 @@ -From 11086bd4422e8f24a0b070eb16e53b08f4561c61 Mon Sep 17 00:00:00 2001 +From 23dda8869b96f7df3db3fc885ca960b4889c82c0 Mon Sep 17 00:00:00 2001 From: Jerry Sun Date: Thu, 3 Aug 2017 16:18:34 -0400 -Subject: [PATCH 1/1] meta add magnum uid and gid +Subject: [PATCH 12/15] meta add magnum uid and gid --- SPECS/setup.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SPECS/setup.spec b/SPECS/setup.spec -index 9ee24ca..2ec3541 100644 +index 6a871f3..367a13b 100644 --- a/SPECS/setup.spec +++ b/SPECS/setup.spec -@@ -27,6 +27,7 @@ Patch8: passwd-remove-unused-default-users-and-groups.patch - Patch9: snmpd-fm-user-group.patch - Patch10: remove-unused-default-groups.patch - Patch11: add-fm-user-to-snmpd-group.patch -+Patch12: add-magnum-uid-gid.patch +@@ -29,6 +29,7 @@ Patch10: passwd-remove-unused-default-users-and-groups.patch + Patch11: snmpd-fm-user-group.patch + Patch12: remove-unused-default-groups.patch + Patch13: add-fm-user-to-snmpd-group.patch ++Patch14: add-magnum-uid-gid.patch %description The setup package contains a set of important system configuration and -@@ -46,6 +47,7 @@ setup files, such as passwd, group, and profile. - %patch9 -p1 - %patch10 -p1 +@@ -50,6 +51,7 @@ setup files, such as passwd, group, and profile. %patch11 -p1 -+%patch12 -p1 + %patch12 -p1 + %patch13 -p1 ++%patch14 -p1 ./shadowconvert.sh -- -1.8.3.1 +2.7.4 diff --git a/base/setup/centos/meta_patches/spec-add-murano-uid-gid.patch b/base/setup/centos/meta_patches/spec-add-murano-uid-gid.patch index e7e7bd4ef..552448228 100644 --- a/base/setup/centos/meta_patches/spec-add-murano-uid-gid.patch +++ b/base/setup/centos/meta_patches/spec-add-murano-uid-gid.patch @@ -1,32 +1,32 @@ -From bb774f39b779de4e31007fc70bead641820ae74f Mon Sep 17 00:00:00 2001 +From 07aca8a7f571059552dceb9a83d7b231e6ba01ff Mon Sep 17 00:00:00 2001 From: Jerry Sun Date: Mon, 8 Jan 2018 12:28:08 -0500 -Subject: [PATCH 1/1] meta add murano uid and gid +Subject: [PATCH 14/15] meta add murano uid and gid --- SPECS/setup.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SPECS/setup.spec b/SPECS/setup.spec -index 55dd30b..b652b3c 100644 +index 974113e..7f636ea 100644 --- a/SPECS/setup.spec +++ b/SPECS/setup.spec -@@ -29,6 +29,7 @@ Patch10: remove-unused-default-groups.patch - Patch11: add-fm-user-to-snmpd-group.patch - Patch12: add-magnum-uid-gid.patch - Patch13: add-ironic-uid-gid.patch -+Patch14: add-murano-uid-gid.patch +@@ -31,6 +31,7 @@ Patch12: remove-unused-default-groups.patch + Patch13: add-fm-user-to-snmpd-group.patch + Patch14: add-magnum-uid-gid.patch + Patch15: add-ironic-uid-gid.patch ++Patch16: add-murano-uid-gid.patch %description The setup package contains a set of important system configuration and -@@ -50,6 +51,7 @@ setup files, such as passwd, group, and profile. - %patch11 -p1 - %patch12 -p1 +@@ -54,6 +55,7 @@ setup files, such as passwd, group, and profile. %patch13 -p1 -+%patch14 -p1 + %patch14 -p1 + %patch15 -p1 ++%patch16 -p1 ./shadowconvert.sh -- -1.8.3.1 +2.7.4 diff --git a/base/setup/centos/meta_patches/spec-add-uid-gid-for-telemetry-services.patch b/base/setup/centos/meta_patches/spec-add-uid-gid-for-telemetry-services.patch index e6ce725e6..3e6c6bab0 100644 --- a/base/setup/centos/meta_patches/spec-add-uid-gid-for-telemetry-services.patch +++ b/base/setup/centos/meta_patches/spec-add-uid-gid-for-telemetry-services.patch @@ -1,32 +1,32 @@ -From 8c24c1c8bc9b703714c52b9b45cd3ea90f4a6604 Mon Sep 17 00:00:00 2001 +From 34c8b5f204877ae54d07248b9729353c8f8dfecf Mon Sep 17 00:00:00 2001 From: Angie Wang Date: Thu, 7 Jun 2018 16:39:08 -0400 -Subject: [PATCH] spec add uid gid for telemetry services +Subject: [PATCH 15/15] spec add uid gid for telemetry services --- SPECS/setup.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SPECS/setup.spec b/SPECS/setup.spec -index b652b3c..76d4feb 100644 +index 7f636ea..4f11a37 100644 --- a/SPECS/setup.spec +++ b/SPECS/setup.spec -@@ -30,6 +30,7 @@ Patch11: add-fm-user-to-snmpd-group.patch - Patch12: add-magnum-uid-gid.patch - Patch13: add-ironic-uid-gid.patch - Patch14: add-murano-uid-gid.patch -+Patch15: add-uid-gid-for-telemetry-services.patch +@@ -32,6 +32,7 @@ Patch13: add-fm-user-to-snmpd-group.patch + Patch14: add-magnum-uid-gid.patch + Patch15: add-ironic-uid-gid.patch + Patch16: add-murano-uid-gid.patch ++Patch17: add-uid-gid-for-telemetry-services.patch %description The setup package contains a set of important system configuration and -@@ -52,6 +53,7 @@ setup files, such as passwd, group, and profile. - %patch12 -p1 - %patch13 -p1 +@@ -56,6 +57,7 @@ setup files, such as passwd, group, and profile. %patch14 -p1 -+%patch15 -p1 + %patch15 -p1 + %patch16 -p1 ++%patch17 -p1 ./shadowconvert.sh -- -1.8.3.1 +2.7.4 diff --git a/base/setup/centos/meta_patches/spec-include-TiS-changes.patch b/base/setup/centos/meta_patches/spec-include-TiS-changes.patch index 3cbf3b64c..2b4d92d99 100644 --- a/base/setup/centos/meta_patches/spec-include-TiS-changes.patch +++ b/base/setup/centos/meta_patches/spec-include-TiS-changes.patch @@ -1,35 +1,43 @@ -setup.spec: to include Titanium Cloud specific changes +From 236314295289b829e6216022a247017f7c0851c7 Mon Sep 17 00:00:00 2001 +From: slin14 +Date: Tue, 7 Aug 2018 22:41:01 +0800 +Subject: [PATCH 01/15] setup.spec: to include Titanium Cloud specific changes To include files under cgcs/recipes-base/setup/files/* +Signed-off-by: slin14 +--- + SPECS/setup.spec | 3 +++ + 1 file changed, 3 insertions(+) + diff --git a/SPECS/setup.spec b/SPECS/setup.spec -index 9174b5a..efc52ca 100644 +index 317132b..4ac1019 100644 --- a/SPECS/setup.spec +++ b/SPECS/setup.spec @@ -6,6 +6,7 @@ License: Public Domain Group: System Environment/Base - URL: https://fedorahosted.org/setup/ - Source0: https://fedorahosted.org/releases/s/e/%{name}/%{name}-%{version}.tar.bz2 + URL: https://pagure.io/setup/ + Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2 +Source1: motd BuildArch: noarch BuildRequires: bash tcsh perl #require system release for saner dependency order -@@ -55,6 +56,7 @@ chmod 0644 %{buildroot}/var/log/lastlog +@@ -59,6 +60,7 @@ chmod 0644 %{buildroot}/var/log/lastlog touch %{buildroot}/etc/fstab touch %{buildroot}/etc/subuid touch %{buildroot}/etc/subgid +install -m 644 %{SOURCE1} %{buildroot}/etc/ - - # remove unpackaged files from the buildroot - rm -f %{buildroot}/etc/Makefile -@@ -107,6 +109,7 @@ end + mkdir -p %{buildroot}/etc/profile.d + echo "#Add any required envvar overrides to this file, it is sourced from /etc/profile" >%{buildroot}/etc/profile.d/sh.local + echo "#Add any required envvar overrides to this file, is sourced from /etc/csh.login" >%{buildroot}/etc/profile.d/csh.local +@@ -115,6 +117,7 @@ end %attr(0600,root,root) %config(noreplace,missingok) /etc/securetty %config(noreplace) /etc/csh.login %config(noreplace) /etc/csh.cshrc +%config(noreplace) /etc/motd %dir /etc/profile.d - %config(noreplace) %verify(not md5 size mtime) /etc/shells - %ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog + %config(noreplace) /etc/profile.d/sh.local + %config(noreplace) /etc/profile.d/csh.local -- -1.8.3.1 +2.7.4 diff --git a/base/setup/centos/meta_patches/spec-include-add-fm-user-to-snmpd-group.patch b/base/setup/centos/meta_patches/spec-include-add-fm-user-to-snmpd-group.patch index 44ea8bdaf..24c579c59 100644 --- a/base/setup/centos/meta_patches/spec-include-add-fm-user-to-snmpd-group.patch +++ b/base/setup/centos/meta_patches/spec-include-add-fm-user-to-snmpd-group.patch @@ -1,22 +1,33 @@ +From 3eb03183dc24b865dd3e84495a82899f39665690 Mon Sep 17 00:00:00 2001 +From: slin14 +Date: Tue, 7 Aug 2018 23:17:05 +0800 +Subject: [PATCH 11/15] spec-include-add-fm-user-to-snmpd-group + +Signed-off-by: slin14 --- - SPECS/setup.spec | 2 ++ + SPECS/setup.spec | 2 ++ 1 file changed, 2 insertions(+) +diff --git a/SPECS/setup.spec b/SPECS/setup.spec +index a6465dc..6a871f3 100644 --- a/SPECS/setup.spec +++ b/SPECS/setup.spec -@@ -26,6 +26,7 @@ Patch6: updating-gids-and-uids-to-suppor - Patch8: passwd-remove-unused-default-users-and-groups.patch - Patch9: snmpd-fm-user-group.patch - Patch10: remove-unused-default-groups.patch -+Patch11: add-fm-user-to-snmpd-group.patch +@@ -28,6 +28,7 @@ Patch9: updating-gids-and-uids-to-support-upgrade-from-wrl.patch + Patch10: passwd-remove-unused-default-users-and-groups.patch + Patch11: snmpd-fm-user-group.patch + Patch12: remove-unused-default-groups.patch ++Patch13: add-fm-user-to-snmpd-group.patch %description The setup package contains a set of important system configuration and -@@ -44,6 +45,7 @@ setup files, such as passwd, group, and - %patch8 -p1 - %patch9 -p1 +@@ -48,6 +49,7 @@ setup files, such as passwd, group, and profile. %patch10 -p1 -+%patch11 -p1 + %patch11 -p1 + %patch12 -p1 ++%patch13 -p1 ./shadowconvert.sh +-- +2.7.4 + diff --git a/base/setup/centos/meta_patches/spec-include-snmpd-fm-user-group.patch b/base/setup/centos/meta_patches/spec-include-snmpd-fm-user-group.patch index 3de93e31b..60980ec0a 100644 --- a/base/setup/centos/meta_patches/spec-include-snmpd-fm-user-group.patch +++ b/base/setup/centos/meta_patches/spec-include-snmpd-fm-user-group.patch @@ -1,41 +1,32 @@ -From 35ebbf2ca7e5e412f55cdaa875845728d203b34d Mon Sep 17 00:00:00 2001 +From f0882fad769c71cb70b44251c79f39e7e13dbc48 Mon Sep 17 00:00:00 2001 From: Kam Nasim Date: Fri, 12 Aug 2016 17:35:28 -0400 -Subject: [PATCH] meta patch for snmpd-user-group.patch +Subject: [PATCH 06/15] meta patch for snmpd-user-group.patch --- - SPECS/setup.spec | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + SPECS/setup.spec | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/SPECS/setup.spec b/SPECS/setup.spec -index 89ff683..d40113f 100644 +index 10d151b..db3ed17 100644 --- a/SPECS/setup.spec +++ b/SPECS/setup.spec -@@ -1,7 +1,7 @@ - Summary: A set of system configuration and setup files - Name: setup - Version: 2.8.71 --Release: 7%{?dist} -+Release: 8%{?dist} - License: Public Domain - Group: System Environment/Base - URL: https://fedorahosted.org/setup/ -@@ -23,6 +23,7 @@ Patch5: setup-2.8.71-fullpath.patch - Patch6: tis-uid-gid.patch - Patch7: updating-gids-and-uids-to-support-upgrade-from-wrl.patch - Patch8: passwd-remove-unused-default-users-and-groups.patch -+Patch9: snmpd-fm-user-group.patch +@@ -25,6 +25,7 @@ Patch7: setup-2.8.71-shlocal.patch + Patch8: tis-uid-gid.patch + Patch9: updating-gids-and-uids-to-support-upgrade-from-wrl.patch + Patch10: passwd-remove-unused-default-users-and-groups.patch ++Patch11: snmpd-fm-user-group.patch %description The setup package contains a set of important system configuration and -@@ -39,6 +40,7 @@ setup files, such as passwd, group, and profile. - %patch6 -p1 - %patch7 -p1 +@@ -43,6 +44,7 @@ setup files, such as passwd, group, and profile. %patch8 -p1 -+%patch9 -p1 + %patch9 -p1 + %patch10 -p1 ++%patch11 -p1 ./shadowconvert.sh -- -1.8.3.1 +2.7.4 diff --git a/base/setup/centos/meta_patches/spec-include-tis-uid-gid.patch b/base/setup/centos/meta_patches/spec-include-tis-uid-gid.patch index 665c14258..5c024a5c9 100644 --- a/base/setup/centos/meta_patches/spec-include-tis-uid-gid.patch +++ b/base/setup/centos/meta_patches/spec-include-tis-uid-gid.patch @@ -1,1078 +1,32 @@ -From ee087f57155f691c416857888a5655f4230becc8 Mon Sep 17 00:00:00 2001 +From e6d1a2794975f708a682a2094df65e14ddaa1eb0 Mon Sep 17 00:00:00 2001 From: Don Penney Date: Mon, 25 Apr 2016 13:15:13 -0400 -Subject: [PATCH 1/1] WRS: spec-include-tis-uid-gid.patch +Subject: [PATCH 02/15] WRS: spec-include-tis-uid-gid.patch --- - SPECS/setup.spec | 2 + - SPECS/setup.spec.orig | 1038 +++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 1040 insertions(+) - create mode 100644 SPECS/setup.spec.orig + SPECS/setup.spec | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/SPECS/setup.spec b/SPECS/setup.spec -index efc52ca..3f74b90 100644 +index 4ac1019..72cbcba 100644 --- a/SPECS/setup.spec +++ b/SPECS/setup.spec -@@ -19,6 +19,7 @@ Patch2: setup-2.8.71-bashrc-shellvar.patch - Patch3: setup-2.8.71-uidgidchanges.patch - Patch4: setup-2.8.71-filesystems.patch +@@ -21,6 +21,7 @@ Patch4: setup-2.8.71-filesystems.patch Patch5: setup-2.8.71-fullpath.patch -+Patch6: tis-uid-gid.patch + Patch6: setup-2.8.71-tapeid.patch + Patch7: setup-2.8.71-shlocal.patch ++Patch8: tis-uid-gid.patch %description The setup package contains a set of important system configuration and -@@ -32,6 +33,7 @@ setup files, such as passwd, group, and profile. - %patch3 -p1 - %patch4 -p1 +@@ -36,6 +37,7 @@ setup files, such as passwd, group, and profile. %patch5 -p1 -+%patch6 -p1 + %patch6 -p1 + %patch7 -p1 ++%patch8 -p1 ./shadowconvert.sh -diff --git a/SPECS/setup.spec.orig b/SPECS/setup.spec.orig -new file mode 100644 -index 0000000..3b20861 ---- /dev/null -+++ b/SPECS/setup.spec.orig -@@ -0,0 +1,1038 @@ -+Summary: A set of system configuration and setup files -+Name: setup -+Version: 2.8.71 -+Release: 6%{?dist} -+License: Public Domain -+Group: System Environment/Base -+URL: https://fedorahosted.org/setup/ -+Source0: https://fedorahosted.org/releases/s/e/%{name}/%{name}-%{version}.tar.bz2 -+Source1: motd -+BuildArch: noarch -+BuildRequires: bash tcsh perl -+#require system release for saner dependency order -+Requires: system-release -+Conflicts: filesystem < 3 -+Conflicts: initscripts < 4.26, bash <= 2.0.4-21 -+ -+Patch1: setup-2.8.71-securetty-mainframes.patch -+Patch2: setup-2.8.71-bashrc-shellvar.patch -+Patch3: setup-2.8.71-uidgidchanges.patch -+Patch4: setup-2.8.71-filesystems.patch -+ -+%description -+The setup package contains a set of important system configuration and -+setup files, such as passwd, group, and profile. -+ -+%prep -+%setup -q -+ -+%patch1 -p1 -b .mainframe -+%patch2 -p1 -b .envvar -+%patch3 -p1 -+%patch4 -p1 -+ -+./shadowconvert.sh -+ -+%build -+ -+%check -+# Run any sanity checks. -+make check -+ -+%install -+rm -rf %{buildroot} -+mkdir -p %{buildroot}/etc/profile.d -+cp -ar * %{buildroot}/etc -+rm -f %{buildroot}/etc/uidgid -+rm -f %{buildroot}/etc/COPYING -+mkdir -p %{buildroot}/var/log -+touch %{buildroot}/var/log/lastlog -+touch %{buildroot}/etc/environment -+chmod 0644 %{buildroot}/etc/environment -+chmod 0400 %{buildroot}/etc/{shadow,gshadow} -+chmod 0644 %{buildroot}/var/log/lastlog -+touch %{buildroot}/etc/fstab -+install -m 644 %{SOURCE1} %{buildroot}/etc/ -+ -+# remove unpackaged files from the buildroot -+rm -f %{buildroot}/etc/Makefile -+rm -f %{buildroot}/etc/serviceslint -+rm -f %{buildroot}/etc/uidgidlint -+rm -f %{buildroot}/etc/shadowconvert.sh -+rm -f %{buildroot}/etc/setup.spec -+# remove the "originals" of patched files -+rm -f %{buildroot}/etc/securetty.mainframe -+rm -f %{buildroot}/etc/bashrc.envvar -+rm -f %{buildroot}/etc/*.orig -+ -+%clean -+rm -rf %{buildroot} -+ -+#throw away useless and dangerous update stuff until rpm will be able to -+#handle it ( http://rpm.org/ticket/6 ) -+%post -p -+for i, name in ipairs({"passwd", "shadow", "group", "gshadow"}) do -+ os.remove("/etc/"..name..".rpmnew") -+end -+if posix.access("/usr/bin/newaliases", "x") then -+ os.execute("/usr/bin/newaliases >/dev/null") -+end -+ -+%files -+%defattr(-,root,root,-) -+%doc uidgid COPYING -+%verify(not md5 size mtime) %config(noreplace) /etc/passwd -+%verify(not md5 size mtime) %config(noreplace) /etc/group -+%verify(not md5 size mtime) %attr(0000,root,root) %config(noreplace,missingok) /etc/shadow -+%verify(not md5 size mtime) %attr(0000,root,root) %config(noreplace,missingok) /etc/gshadow -+%config(noreplace) /etc/services -+%verify(not md5 size mtime) %config(noreplace) /etc/exports -+%config(noreplace) /etc/aliases -+%config(noreplace) /etc/environment -+%config(noreplace) /etc/filesystems -+%config(noreplace) /etc/host.conf -+%verify(not md5 size mtime) %config(noreplace) /etc/hosts -+%config(noreplace) /etc/hosts.allow -+%config(noreplace) /etc/hosts.deny -+%verify(not md5 size mtime) %config(noreplace) /etc/motd -+%config(noreplace) /etc/printcap -+%verify(not md5 size mtime) %config(noreplace) /etc/inputrc -+%config(noreplace) /etc/bashrc -+%config(noreplace) /etc/profile -+%config(noreplace) /etc/protocols -+%attr(0600,root,root) %config(noreplace,missingok) /etc/securetty -+%config(noreplace) /etc/csh.login -+%config(noreplace) /etc/csh.cshrc -+%config(noreplace) /etc/motd -+%dir /etc/profile.d -+%config(noreplace) %verify(not md5 size mtime) /etc/shells -+%ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog -+%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab -+ -+%changelog -+* Fri May 22 2015 Ondrej Vasik - 2.8.71-6 -+- change reservation of 185:185 to jboss user (#1192413) -+- reserve uidgid pair 167:167 for ceph (#1221043) -+- reserve uidgid for systemd-network(192:192) (#1213820) -+- reserve uidgid for systemd-resolve(193:193) (#1213820) -+- mention systemd-jounal-gateway can be dynamic (#1213820) -+ -+ -+* Fri Aug 15 2014 Ondrej Vasik - 2.8.71-5 -+- reserve uidgid pair 142:142 for activemq (#1086923) -+- add xfs to /etc/filesystems, fallback to /proc/filesystems -+ (#1123832) -+ -+* Wed Mar 12 2014 Ondrej Vasik - 2.8.71-4 -+- require system-release for saner dependency order (#1075578) -+ -+* Tue Feb 25 2014 Ondrej Vasik - 2.8.71-3 -+- add more securetty required for mainframes (#1067347) -+- set SHELL envvar to /bin/bash in bashrc (#1063552) -+ -+* Fri Dec 27 2013 Daniel Mach - 2.8.71-2 -+- Mass rebuild 2013-12-27 -+ -+* Fri Jun 07 2013 Ondrej Vasik 2.8.71-1 -+- fix escape codes for screen (#969429) -+- handle vte terminals in bashrc (#924275) -+ -+* Tue May 14 2013 Ondrej Vasik 2.8.70-1 -+- fix typo in cdrom default group (#962486) -+ -+* Thu Apr 18 2013 Ondrej Vasik 2.8.69-1 -+- remove the rpmlib(X-CheckUnifiedSystemdir) requirement -+ hack - no longer required -+ -+* Sun Apr 14 2013 Ondrej Vasik 2.8.68-1 -+- assign gid :135 for mock (#928063) -+- update /etc/services to latest IANA reservations -+ -+* Wed Mar 20 2013 Ondrej Vasik 2.8.67-1 -+- assign 166:166 uidgid pair for ceilometer (#923891) -+- change 187:187 reservation from openstack-heat -+ to just heat(#923858) -+- longer shell names support caused by UsrMove to -+ the /etc/shells (#922527) -+- drop gopher (uid 13, gid 30) from groups created by default -+ -> dropped completely - no gopher server in Fedora (#918206) -+- drop dip (gid 40) from groups created by default -+ -> moved to ppp (#918206) -+- drop uucp (uidgid 14) from groups created by default -+ -> moved to uucp (#918206) -+- create cdrom, tape, dialout, floppy groups in setup(#919285) -+ -+* Tue Mar 05 2013 Ondrej Vasik 2.8.66-1 -+- assign :190 gid for systemd-journal (#918120) -+- assign 191:191 uidgid pair for systemd-journal-gateway (#918120) -+ -+* Wed Jan 23 2013 Ondrej Vasik 2.8.65-1 -+- assign 165:165 uidgid pair for cinder (#902987) -+ -+* Wed Jan 16 2013 Ondrej Vasik 2.8.64-1 -+- correct handling of 256 color terminals in bashrc -+ -+* Mon Dec 02 2012 Ondrej Vasik 2.8.63-1 -+- ovirtagent created by ovirt-guest-agent -+ -+* Mon Dec 02 2012 Ondrej Vasik 2.8.62-1 -+- rename rhevagent uidgid reservation to ovirtagent -+ -+* Fri Nov 02 2012 Ondrej Vasik 2.8.61-1 -+- reserve uid 189 for hacluster (#872208) -+- reserve gid 189 for haclient (#872208) -+ -+* Tue Oct 02 2012 Ondrej Vasik 2.8.60-1 -+- reserve 188:188 for haproxy (#860221) -+ -+* Wed Sep 19 2012 Ondrej Vasik 2.8.59-1 -+- update /etc/services to match with latest IANA -+ assignments -+ -+* Mon Aug 21 2012 Ondrej Vasik 2.8.58-1 -+- reserve 110:110 for jetty (#849927) -+ -+* Mon Aug 06 2012 Ondrej Vasik 2.8.57-1 -+- reserve 187:187 for openstack-heat (#845078) -+ -+* Sat Jul 21 2012 Fedora Release Engineering - 2.8.56-2 -+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild -+ -+* Fri Jul 13 2012 Ondrej Vasik 2.8.56-1 -+- Turn on parallel history in bash (#815810) -+ -+* Thu Jul 12 2012 Ondrej Vasik 2.8.55-1 -+- reserve 186 uid for jbosson-agent user, reserve 186 gid -+ for jbosson group (#839410) -+ -+* Fri May 11 2012 Ondrej Vasik 2.8.54-1 -+- use unset -f pathmunge in /etc/profile to work more nicely -+ with ksh (#791140) -+ -+* Wed Apr 11 2012 Ondrej Vasik 2.8.53-1 -+- reserve 185:185 for jboss-as (#809398) -+ -+* Fri Mar 23 2012 Ondrej Vasik 2.8.52-1 -+- reserve 184:184 for mongodb (#806052) -+ -+* Thu Mar 22 2012 Ondrej Vasik 2.8.51-1 -+- do not throw away the stderr output of profile.d scripts -+ in noninteractive bash/ksh sessions(#805507) -+ -+* Mon Mar 19 2012 Ondrej Vasik 2.8.50-1 -+- reserve 182:182 for katello (#804204) -+- reserve 183:183 for elasticsearch (#804205) -+ -+* Tue Feb 21 2012 Ondrej Vasik 2.8.49-1 -+- conflict with filesystems before usrmove change -+ -+* Sun Feb 12 2012 Ondrej Vasik 2.8.48-1 -+- remove /bin and /sbin from /etc/profile(#789616) -+- require usrmove -+- add sbin paths in csh.login consistently with bash(#773268) -+ -+* Tue Jan 10 2012 Ondrej Vasik 2.8.47-1 -+- reserve 181:181 uidgid pair for wallaby (#772747) -+ -+* Tue Dec 06 2011 Ondrej Vasik 2.8.46-1 -+- reserve 134:134 uidgid pair for cimsrvr (#760178) -+ -+* Fri Nov 25 2011 Ondrej Vasik 2.8.45-1 -+- reserve :156 groupid for stapusr - #756807 -+- reserve :157 groupid for stapsys - #756807 -+- reserve :158 groupid for stapdev - #756807 -+ -+* Wed Nov 16 2011 Ondrej Vasik 2.8.44-1 -+- reserve 180:180 for aeolus - #754274 -+ -+* Fri Nov 11 2011 Ondrej Vasik 2.8.43-1 -+- gopher home dir in uidgid should be /var/gopher - #752885 -+- reserve 163:163 for keystone (openstack-keystone) - #752842 -+- reserve 164:164 for quantum (openstack-quantum) - #752842 -+- update services to latest IANA -+ -+* Wed Nov 2 2011 Ondrej Vasik 2.8.42-1 -+- add ext4 to /etc/filesystems - #750506 -+ -+* Wed Sep 14 2011 Ondrej Vasik 2.8.41-1 -+- reserve 179:179 for sanlock - #727655 -+ -+* Fri Aug 26 2011 Ondrej Vasik 2.8.40-1 -+- reserve 178:178 for myproxy (myproxy-server) - #733671 -+ -+* Fri Aug 26 2011 Ondrej Vasik 2.8.39-1 -+- reserve 177:177 for dhcpd (dhcp) - #699713 -+ -+* Tue Aug 23 2011 Ondrej Vasik 2.8.38-1 -+- reserve 160:160 for swift (openstack-swift) - #732442 -+- reserve 161:161 for glance (openstack-glance) - #732442 -+- reserve 162:162 for nova (openstack-nova) - #732442 -+- comment out 0/tcp spr-itunes /etc/services entry (#710185) -+- add hvc[01], xvc0, hvsi[012] to /etc/securetty (#728030) -+ -+* Tue Aug 16 2011 Ondrej Vasik 2.8.37-1 -+- dropped all suplemental groups from basic /etc/group file -+ (#722529) -+ -+* Tue Aug 16 2011 Ondrej Vasik 2.8.36-1 -+- dropped suplemental root's groups(#722529) -+ -+* Wed Jun 29 2011 Ondrej Vasik 2.8.35-1 -+- reserve 176:176 for apache traffic server - ats(#715266) -+ -+* Mon Jun 13 2011 Ondrej Vasik 2.8.34-1 -+- update protocols and services to latest IANA -+- reserve 175:175 for rhevagent (#709599) -+ -+* Thu May 19 2011 Ondrej Vasik 2.8.33-1 -+- reflect the reserved username change of amanda -+ to amandabackup (#700807) -+- drop order hosts,bind from setup, no longer used by -+ glibc (#703049) -+- assign 174:174 uidgid for user/group retrace -+ (abrt retrace-server, #706012) -+ -+* Tue Apr 12 2011 Ondrej Vasik 2.8.32-1 -+- do not override already set PROMPT_COMMAND envvar(#691425) -+- do not quit uidgidlint after first error, show all -+- update services to latest IANA -+ -+* Mon Jan 24 2011 Ondrej Vasik 2.8.31-1 -+- drop ownership of /etc/mtab, now owned by util-linux -+ -+* Tue Jan 18 2011 Ondrej Vasik 2.8.30-1 -+- remove explicit buildroot -+- reserve uidgid pair 173:173 for abrt(#670231) -+ -+* Fri Dec 03 2010 Ondrej Vasik 2.8.29-1 -+- run newaliases in the post to prevent sendmail messages -+ about old alias database in the log(#658921) -+ -+* Fri Nov 12 2010 Ondrej Vasik 2.8.28-1 -+- update services and protocols to latest IANA reservations -+- reserve uidgid pair 109:109 for rhevm(#652287) -+ -+* Tue Sep 07 2010 Ondrej Vasik 2.8.27-1 -+- add double quotes arround sourced profile.d scripts - -+ allow special characters in script names -+ -+* Wed Aug 18 2010 Ondrej Vasik 2.8.26-1 -+- fix regression in the change to printf(#624900) -+ -+* Thu Aug 12 2010 Ondrej Vasik 2.8.25-1 -+- use printf instead of echo in bashrc scripts(#620435) -+- update services to latest IANA -+ -+* Wed Jul 28 2010 Ondrej Vasik 2.8.24-1 -+- do show messages from profile.d scripts in interactive -+ login ksh shell(#616418) -+- respect umask settings even with login shell -+ -+* Tue Jun 29 2010 Ondrej Vasik 2.8.23-1 -+- reserve uidgid pair 172:172 for rtkit (#609171) -+ -+* Tue Jun 15 2010 Ondrej Vasik 2.8.22-1 -+- reserve uidgid pair 170:170 for avahi-autoipd -+- reserve uidgid pair 171:171 for pulse (pulseaudio) -+- update reserved homedir for avahi -+ -+* Mon Jun 07 2010 Ondrej Vasik 2.8.21-1 -+- update name of group reserved by cyrus-imapd to saslauth -+ -+* Mon May 24 2010 Ondrej Vasik 2.8.20-1 -+- speedup pathmunge() by using portable case(#544652) -+ -+* Wed May 19 2010 Ondrej Vasik 2.8.19-1 -+- fix syntax error in bashrc pathmunge(since bash 3.2)(#592799) -+ -+* Tue Apr 27 2010 Ondrej Vasik 2.8.18-1 -+- reserve uidgid pair 140:140 for ricci daemon(#585957) -+- reserve uidgid pair 141:141 for luci daemon(#585958) -+ -+* Wed Mar 31 2010 Ondrej Vasik 2.8.17-1 -+- verify md5sum/size/mtime in the case of /etc/hosts.allow -+ and /etc/hosts.deny (#578263) -+- do the same for /etc/services and /etc/protocols, we -+ provide (almost) complete IANA set, so no reason to modify -+ it in most cases outside of setup package -+ -+* Fri Mar 26 2010 Ondrej Vasik 2.8.16-3 -+- bad ugly double-thirteen friday(fix previous badfix) -+ -+* Fri Mar 26 2010 Ondrej Vasik 2.8.16-2 -+- fix not set path for csh shell caused by 2.8.16 update -+ -+* Fri Mar 26 2010 Ondrej Vasik 2.8.16-1 -+- drop X11R6 hierarchy dir from tcsh path (#576940) -+- update services to latest IANA -+- update protocols to latest IANA -+ -+* Thu Jan 21 2010 Ondrej Vasik 2.8.15-1 -+- reserve uidgid pair 155:155 for stap-server(#555813) -+- reserve uidgid pair 113:113 for usbmuxd(#556525) -+ -+* Tue Jan 12 2010 Ondrej Vasik 2.8.14-1 -+- reserve uidgid pair 133:133 for bacula(#554705) -+ -+* Tue Jan 05 2010 Ondrej Vasik 2.8.13-1 -+- update services to latest IANA -+- avoid one /usr/bin/id stat call in /etc/profile(#549056) -+ -+* Thu Dec 17 2009 Ondrej Vasik 2.8.12-1 -+- speed up pathmunge inside bashrc (#544652) -+- do not use deprecated egrep in profile -+ -+* Thu Dec 03 2009 Ondrej Vasik 2.8.11-1 -+- don't have HISTCONTROL ignorespace by default (#520632), -+ but do not override it when it is already set -+- add csync alias for port 2005 / tcp, udp -+ -+* Wed Nov 11 2009 Ondrej Vasik 2.8.10-1 -+- reserve uidgid pair 112:112 for vhostmd (#534110) -+- update /etc/services to latest IANA -+ -+* Tue Sep 08 2009 Ondrej Vasik 2.8.9-1 -+- reserve uidgid pair 108:108 for ovirt from libvirt (#513261) -+- reserve uidgid pair 111:111 for saned from sane-backends -+ (#520634) -+ -+* Mon Aug 17 2009 Ondrej Vasik 2.8.8-1 -+- change permissions on /etc/shadow and /etc/gshadow to 0000 and -+ use capabilities for them(#517577) -+ -+* Sun Jul 26 2009 Fedora Release Engineering - 2.8.7-2 -+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild -+ -+* Tue Jul 21 2009 Ondrej Vasik 2.8.7-1 -+- increase threshold for uidgid reservations to 200 -+- reserve uidgid pair 107:107 for qemu (libvirt,#511957) -+- reflect threshold in profile and bashrc, do inform about -+ uidgid file existence there -+- remove old remnants about portmap from hosts.deny(#509919) -+ -+* Mon Jun 29 2009 Ondrej Vasik 2.8.6-1 -+- update protocols and services to latest IANA -+- add example for tty in prompt(#503304) -+ -+* Wed May 20 2009 Ondrej Vasik 2.8.5-1 -+- use history-search-backward/forward for pageup/pagedown -+ mapping in inputrc (#500989) -+- add HISTCONTROL="ignoreboth" to /etc/profile to not include -+ duplicities and lines starting with space into the history -+ (#500819) -+ -+* Tue May 12 2009 Ondrej Vasik 2.8.4-1 -+- add oprofile (16:16) to uidgid -+- use os.remove instead of os.execute in lua post -+ - no dependency on /bin/sh (thanks Panu Matilainen) -+ -+* Wed Apr 22 2009 Ondrej Vasik 2.8.3-2 -+- rewrite postun scriptlet to to prevent /bin/sh -+ dependency -+ -+* Fri Apr 10 2009 Ondrej Vasik 2.8.3-1 -+- do not disable coredumps in profile/csh.cshrc scripts, -+ coredumps already disabled in rawhide's RLIMIT_CORE(#495035) -+ -+* Wed Mar 25 2009 Ondrej Vasik 2.8.2-2 -+- reserve uid 65 for nslcd (will share group 55 ldap, #491899) -+ -+* Tue Mar 24 2009 Ondrej Vasik 2.8.2-1 -+- ship COPYING file, update protocols and services -+ to latest IANA -+ -+* Mon Mar 23 2009 Ondrej Vasik 2.8.1-2 -+- fix sources syntax, add sources URL (#226412) -+ -+* Thu Feb 26 2009 Ondrej Vasik 2.8.1-1 -+- do ship/generate /etc/{shadow,gshadow} files(#483251) -+- do ship default /etc/hosts with setup (#483244) -+- activate multi on (required for IPv6 only localhost -+ recognition out-of-the-box) (#486461) -+- added postun section for cleaning of dangerous .rpmnew -+ files after updates -+- make profile and bashrc more portable (ksh, #487419) -+ -+* Wed Feb 25 2009 Fedora Release Engineering - 2.7.7-5 -+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild -+ -+* Mon Feb 02 2009 Ondrej Vasik 2.7.7-4 -+- drop scriptlet completely(audio/video group -+ temporarily created by packages which use it for -+ updates(#477769)) -+ -+* Fri Jan 30 2009 Ondrej Vasik 2.7.7-3 -+- add support for ctrl+arrow shortcut in rxvt(#474110) -+ -+* Thu Jan 29 2009 Ondrej Vasik 2.7.7-2 -+- reserve 87 gid for polkituser (just uid was reserved), -+ reserve 18 gid for dialout(to prevent conflicts with -+ polkituser gid) -+ -+* Thu Jan 22 2009 Ondrej Vasik 2.7.7-1 -+- synchronize /etc/services with latest IANA, do not use -+ tabs in that file to have consistent output -+- fix indentation in /etc/profile and /etc/bashrc -+ (#481074) -+- assign uid 36 for vdsm, gid 36 for kvm -+ (#346151,#481021) -+ -+* Tue Jan 20 2009 Ondrej Vasik 2.7.6-1 -+- make uidgid file better parsable (synchronize tabs) -+- reserve gid 11 for group cdrom (udev,MAKEDEV) -+- reserve gid 33 for group tape (udev,MAKEDEV) -+- reserve gid 87 for group dialout (udev,MAKEDEV) -+ -+* Tue Jan 06 2009 Ondrej Vasik 2.7.5-4 -+- use lua language in post to prevent additional -+ dependencies -+ -+* Thu Dec 18 2008 Ondrej Vasik 2.7.5-3 -+- add pkiuser (17:17) to uidgid -+- temporarily create video/audio group in post section -+ (#476886) -+ -+* Wed Dec 10 2008 Ondrej Vasik 2.7.5-2 -+- do not export PATH twice(#449286 NOTABUG revert) -+- do not export INPUTRC(to respect just created ~/.inputrc) -+ (#443717) -+ -+* Thu Nov 27 2008 Ondrej Vasik 2.7.5-1 -+- Modified upstream URL, synchronized with upstream git -+ -+* Wed Nov 19 2008 Ondrej Vasik 2.7.4-3 -+- update protocols to latest IANA list (2008-04-18) -+- update services to latest IANA list (2008-11-17) -+- mark /etc/protocols and /etc/inputrc %%config(noreplace) -+- added URL, fixed few rpmlint warnings -+- do own audio and video group (#458843), create it in default -+ /etc/group -+ -+* Tue Nov 18 2008 Ondrej Vasik 2.7.4-2 -+- again process profile.d scripts in noninteractive shells, -+ but do not display stderr/stdout messages(#457243) -+- fix wrong prompt for csh/tcsh (#443854) -+- don't show error message about missing hostname in profile -+ (#301481) -+- reserve rquotad port 875 in /etc/services (#455859) -+- export PATH after processing profile.d scripts (#449286) -+- assign gid's for audio (:63) and video (:39) group(#458843), -+ assign uidgid pair (52:52) for puppet (#471918) -+- fix /etc/services duplicities to pass serviceslint -+ -+* Thu Oct 09 2008 Phil Knirsch 2.7.4-1 -+- Include new serviceslint for speedup (#465642) -+- Cleaned up services due to newly discovered bugs in it with new serviceslint -+ -+* Wed Sep 03 2008 Phil Knirsch 2.7.3-1 -+- Added SBinSanity patch as an approved feature (#458176) -+ -+* Wed Aug 06 2008 Phil Knirsch 2.7.2-1 -+- Added uidgid pair for condor -+- Added uidgid pair for trousers -+ -+* Fri Jul 25 2008 Phil Knirsch 2.7.1-1 -+- Bump to 2.7.1 to avoid version problems with F-9 -+- Removed group news as well (#437462) -+ -+* Tue Jun 17 2008 Phil Knirsch 2.6.16-1 -+- Dropped user news from default /etc/passwd (#437462) -+ -+* Thu Jun 05 2008 Phil Knirsch 2.6.15-1 -+- Added prelude-manager and snortd to uidgid list -+ -+* Mon Apr 07 2008 Phil Knirsch 2.6.14-1 -+- Updated /etc/services to latest IANA version (#315571) -+ -+* Fri Apr 04 2008 Phil Knirsch -+- Fixed a problem with the new prompt for tcsh and screen terminal (#438550) -+ -+* Thu Mar 20 2008 Phil Knirsch 2.6.13-1 -+- Drop the wrong precmd for csh for xterm and screen terminals -+ -+* Tue Feb 26 2008 Phil Knirsch 2.6.12-1 -+- Corrected wrong /etc/profile.d behaviour for non-interactive bash and tcsh -+ -+* Fri Feb 22 2008 Phil Knirsch 2.6.11-1 -+- Fixed problem with /etc/profile.d/* and non-interactive tcsh (#299221) -+- Fixed xterm -title problem (#387581) -+- Fixed problem with /etc/profile.d/*.csh not being executed for none loginshells anymore -+ (#381631, #429838) -+- Corrected missing shell for news user in uidgid and passwd -+ -+* Thu Aug 16 2007 Phil Knirsch 2.6.10-1 -+- License review and update -+ -+* Tue Jul 24 2007 Phil Knirsch 2.6.9-1 -+- Assigned uid 87 for PolicyKit package (#244950) -+- Fixed precmd fix if TERM isn't set (#242732) -+ -+* Wed Jun 06 2007 Phil Knirsch 2.6.7-1 -+- Fixed precmd setting to behave like bash for (t)csh (#242732) -+ -+* Thu May 24 2007 Phil Knirsch 2.6.6-1 -+- Added another set of proposed changes to /etc/csh.cshrc (#199817) -+- Added missing documentation in /etc/hosts.[allow|deny] (#157053) -+ -+* Wed May 23 2007 Phil Knirsch 2.6.5-1 -+- Fixed tcsh behaviour for non login shells (#191233) -+- Fixed umask setting for tcsh to behave identical to bash logins (#199817) -+- Added ipv6-crypt and ipv6-auth for backwards compatibility (#210546) -+ -+* Wed Apr 18 2007 Phil Knirsch 2.6.4-1 -+- Modified the 111/[tcp/udp] entries to work with rpcbind (#236639) -+ -+* Mon Mar 12 2007 Phil Knirsch 2.6.3-1 -+- Changed winbind_auth to wbpriv by request of the samba maintainer -+ -+* Tue Dec 12 2006 Phil Knirsch 2.6.2-1.fc7 -+- Updated uidgid for split of pcap into arpwatcher and tcpdump. -+ -+* Tue Nov 28 2006 Phil Knirsch 2.6.1-1.fc7 -+- Update version and rebuilt -+ -+* Tue Nov 28 2006 Phil Knirsch 2.5.57-1 -+- Revert change for umask in /etc/bashrc (#217523) -+ -+* Thu Nov 16 2006 Phil Knirsch 2.5.56-1 -+- Added an entry for samba and winbind_auth -+ -+* Wed Oct 11 2006 Phil Knirsch 2.5.55-1 -+- Extended the protocols to include the missing hopopt (#209191) -+ -+* Tue Oct 10 2006 Phil Knirsch 2.5.54-1 -+- Update /etc/protocols to latest officiall IANA version (#209191) -+ -+* Thu Jul 27 2006 Phil Knirsch 2.5.53-1 -+- Added utempter gid for new libutempter package (#200240) -+ -+* Mon Jun 19 2006 Phil Knirsch 2.5.52-1 -+- Lock password for root account by default (#182206) -+ -+* Wed May 03 2006 Karsten Hopp -+- remove gkrellmd from the reserved uid/gid list (#186974) -+ -+* Tue Mar 21 2006 Florian La Roche 2.5.50-1 -+- use stricter umask of 022 for all logins -+ -+* Thu Feb 23 2006 Phil Knirsch 2.5.49-1 -+- Really switch to new /etc/services file -+- Added /etc/fstab and /etc/mtab to ownership of setup (#177061) -+ -+* Tue Jan 31 2006 Phil Knirsch 2.5.48-1 -+- Switched to the new large /etc/services file which fixes #112298, #133683, -+ #166443, #168872, #171228. -+- Fixed pathmunge problem with bashrc (#123621) -+- Removed /usr/X11R6/bin from default PATH (#173856) -+ -+* Tue Jan 24 2006 Phil Knirsch -+- Fixed bug with PROMPT_COMMAND being broken for wierd dirs (#142125) -+- Added hfsplus to know filesystems (#172820) -+ -+* Mon Oct 17 2005 Bill Nottingham -+- make motd noreplace (#170539) -+ -+* Tue Sep 6 2005 Bill Nottingham 2.5.47-1 -+- make lastlog 0644 (#167200) -+ -+* Mon Jun 20 2005 Bill Nottingham 2.5.46-1 -+- add buildrequires on bash, tcsh (#161016) -+- move core dump size setting from csh.login to csh.cshrc (#156914) -+ -+* Fri Jun 17 2005 Bill Nottingham 2.5.45-1 -+- ksh doesn't implement EUID/UID. Work around that. (#160731) -+ -+* Thu May 19 2005 Bill Nottingham 2.5.44-1 -+- fix csh.cshrc when -e is used (#158265) -+ -+* Mon Apr 25 2005 Bill Nottingham 2.5.43-1 -+- remove mailman aliases (#155841) -+ -+* Mon Apr 18 2005 Bill Nottingham 2.5.42-1 -+- fix lastlog conflict (#155256) -+ -+* Fri Apr 15 2005 Bill Nottingham 2.5.41-1 -+- get rid of 'id' error messages if there is no /usr (#142707) -+ -+* Mon Jan 31 2005 Bill Nottingham 2.5.40-1 -+- have similar prompt changes for su to root in tcsh as in bash (#143826) -+ -+* Tue Nov 23 2004 Bill Nottingham 2.5.39-1 -+- ghost lastlog (#139539) -+ -+* Thu Nov 18 2004 Bill Nottingham 2.5.38-1 -+- fix bash/tcsh coredump size inconsistency (#139821) -+ -+* Wed Oct 27 2004 Bill Nottingham 2.5.37-1 -+- fix inconsistency in profile.d handling (#136859, ) -+ -+* Fri Oct 8 2004 Bill Nottingham 2.5.36-1 -+- fix duplicate alias -+ -+* Tue Sep 28 2004 Bill Nottingham 2.5.35-1 -+- add /etc/environment -+ -+* Mon Sep 27 2004 Rik van Riel 2.5.34-2 -+- mark /etc/services config(noreplace) (#133683) -+ -+* Thu Sep 23 2004 Bill Nottingham 2.5.34-1 -+- add dict (#107807) -+- add cyrus services (#118832) -+- move delete-char binding for csh (#113682) -+- do the same path munging for csh as for bash (#57708) -+- add postfix aliases (#117661) -+- fix bashrc login shell check (#104491) -+- add odmr to services (#101098) -+- add distcc to services (#91535) -+- add xterm forware/backward word bindings (#80860) -+ -+* Mon May 24 2004 Bill Nottingham -+- make pathmunge available for profile.d scripts (#123621) -+ -+* Wed May 19 2004 Joe Orton 2.5.33-2 -+- add IANA Register Port for svn to /etc/services (#122863) -+ -+* Wed May 5 2004 Nalin Dahyabhai 2.5.33-1 -+- fix syntax error in csh.cshrc -+ -+* Tue May 4 2004 Bill Nottingham 2.5.32-1 -+- set MAIL in csh.cshrc (#115376) -+- fix inputrc check in csh.login (#115073) -+ -+* Mon Jan 26 2004 Bill Nottingham 2.5.31-1 -+- move /etc/aliases here -+ -+* Mon Dec 8 2003 Bill Nottingham 2.5.30-1 -+- remove stty `tput kbs` section (#91357) -+ -+* Tue Sep 2 2003 Bill Nottingham 2.5.27-1 -+- securetty should be noreplace (#103585) -+ -+* Fri Mar 14 2003 Bill Nottingham 2.5.26-1 -+- clean up some typos in /etc/services (#86129) -+ -+* Mon Feb 17 2003 Florian La Roche -+- add "console" to /etc/securetty for mainframe -+ -+* Mon Jan 20 2003 Nalin Dahyabhai 2.5.24-1 -+- allocate uid/gid for mgetty -+ -+* Thu Jan 9 2003 Dan Walsh 2.5.23-1 -+- added PXE to /etc/services -+ -+* Wed Jan 1 2003 Bill Nottingham 2.5.22-1 -+- remove bogus entries from inputrc (#80652) -+ -+* Fri Nov 29 2002 Tim Powers 2.5.21-1 -+- remove unpackaged files from the buildroot -+ -+* Thu Aug 29 2002 Bill Nottingham 2.5.20-1 -+- shopt -s checkwinsize everywhere -+ -+* Wed Aug 28 2002 Preston Brown 2.5.19-1 -+- fix bug #61129 (~ substitution) -+ -+* Wed Aug 15 2002 Jens Petersen 2.5.18-1 -+- bring back the screen case in /etc/bashrc, since /etc/screenrc no -+ longer sets defhstatus (#60596, #60597) -+ -+* Sun Aug 11 2002 Florian La Roche 2.5.17-1 -+- add "set mark-symlinked-directories on" to /etc/inputrc -+ -+* Mon Jul 22 2002 Phil Knirsch 2.5.16-2 -+- Added shopt -s checkwinsize to /etc/bashrc for xterm resizing -+ -+* Fri Jul 19 2002 Jens Petersen 2.5.16-1 -+- dont special case screen in /etc/bashrc, since it overrides the user's -+ screenrc title setting (#60596) -+ -+* Thu Jul 18 2002 Florian La Roche 2.5.14-1 -+- move home dir of "news" to /etc/news -+ -+* Tue May 28 2002 Nalin Dahyabhai 2.5.13-1 -+- allocate uid/gid for privilege-separated sshd -+ -+* Thu May 23 2002 Tim Powers 2.5.12-2 -+- automated rebuild -+ -+* Wed Apr 3 2002 Bill Nottingham 2.5.12-1 -+- fix misformatted comment in /etc/services, allocate uid/gid for -+ frontpage -+ -+* Thu Mar 28 2002 Bill Nottingham 2.5.11-1 -+- add newline in /etc/shells (#62271) -+ -+* Thu Mar 28 2002 Nalin Dahyabhai 2.5.10-1 -+- allocate uid for the vcsa user -+ -+* Tue Mar 12 2002 Bill Nottingham 2.5.9-1 -+- re-add ext3 to /etc/filesystems -+ -+* Mon Mar 11 2002 Bill Nottingham 2.5.8-1 -+- add nologin to /etc/shells (#53963) -+- fix some quoting issues (#59627) -+- fix screen status line (#60596) -+- fix path regexps (#59624) -+- move profile.d stuff to csh.cshrc (#59946) -+ -+* Fri Mar 8 2002 Nalin Dahyabhai -+- add bprd, bpdbm, bpjava-msvc, vnetd, bpcd, and vopied to /etc/services -+ -+* Tue Sep 25 2001 Nalin Dahyabhai -+- change rmtcfg to an alias for bvcontrol, which is a registered name -+ -+* Mon Sep 17 2001 Nalin Dahyabhai 2.5.7-1 -+- add entries to services (ipp, wnn4, and so on) -+- try to remove duplicates in services (remove nameserver as alias for domain, -+ and readnews as alias for netnews) -+ -+* Mon Aug 20 2001 Bill Nottingham -+- change FTP user's home dir to /var/ftp (#52091) -+- %%ghost /etc/shadow, /etc/gshadow -+ -+* Fri Aug 17 2001 Bill Nottingham -+- add /etc/shells to filelist (#51813) -+ -+* Mon Aug 13 2001 Bill Nottingham -+- put lock in /etc/group (#51654) -+ -+* Wed Aug 8 2001 Bill Nottingham -+- lock only needs to be a gid -+- don't set dspmbyte=euc here; do it in lang.csh, and only if necessary (#50318) -+ -+* Mon Aug 6 2001 Jeff Johnson -+- add lock.lock uid/gid 54 to own /var/lock directory. -+ -+* Thu Jul 19 2001 Bill Nottingham -+- add forward/backward-word mappings (#48783) -+- add pgpkeyserver port to /etc/services (#49407) -+ -+* Thu Jul 19 2001 Preston Brown -+- core files disabled by default. Developers can enable them. -+ -+* Fri Jul 13 2001 Bill Nottingham 2.5.1-1 -+- revert news user back to no shell (#48701) -+ -+* Tue Jul 10 2001 Bill Nottingham 2.5.0-1 -+- move profile.d parsing from csh.cshrc to csh.login (#47417) -+ -+* Sat Jul 7 2001 Nalin Dahyabhai 2.4.15-1 -+- reorder /etc/services to match comments again -+- protocol 118 is stp, not st -+- update URLs in /etc/protocols and /etc/services -+ -+* Thu Jul 5 2001 Preston Brown 2.4.14-1 -+- put */sbin in path if user ID is 0. -+ -+* Mon Jun 25 2001 Bill Nottingham -+- add an entry to /etc/services for ssh X11 forwarding (#44944) -+ -+* Wed Jun 13 2001 Bill Nottingham -+- take ttyS0 out of securetty on main tree -+ -+* Tue Jun 12 2001 Philip Copeland -+- added ttyS0 to securetty for serial console usage -+ -+* Tue Jun 12 2001 Bill Nottingham -+- add rndc to /etc/services (#40265) -+- test for read bit, not execute bit, for profile.d (#35714) -+ -+* Sun Jun 03 2001 Florian La Roche -+- add "canna" entry to /etc/services -+ -+* Mon May 21 2001 Bernhard Rosenkraenzer 2.4.10-1 -+- Fix bugs #24159 and #30634 again; whoever moved bashrc from bash -+ to setup used an old version. :(( -+ -+* Wed May 2 2001 Preston Brown 2.4.9-1 -+- bashrc moved here from bash package -+- set umask in bashrc, so it applies for ALL shells. -+ -+* Fri Apr 27 2001 Preston Brown 2.4.8-1 -+- /sbin/nologin for accounts that aren't "real." -+ -+* Sat Apr 7 2001 Preston Brown -+- revert control-arrow forward/backward word (broken) -+ -+* Tue Mar 27 2001 Preston Brown -+- fix japanese input with tcsh (#33211) -+ -+* Tue Mar 6 2001 Bill Nottingham -+- fix some weirdness with rxvt (#30799) -+ -+* Wed Feb 28 2001 Bill Nottingham -+- add SKK input method (#29759) -+ -+* Fri Feb 23 2001 Preston Brown -+ -+* Wed Feb 21 2001 Bill Nottingham -+- fix inputrc, Yet Again. (#28617) -+ -+* Thu Feb 15 2001 Bill Nottingham -+- add in uidgid file, put it in %%doc -+ -+* Wed Feb 7 2001 Adrian Havill -+- bindkey for delete in the case of tcsh -+ -+* Wed Feb 7 2001 Bill Nottingham -+- add some more stuff to /etc/services (#25396, patch from -+ ) -+ -+* Tue Feb 6 2001 Nalin Dahyabhai -+- add gii/tcp = 616 for gated -+ -+* Tue Jan 30 2001 Bill Nottingham -+- wrap some inputrc settings with tests for mode, term (#24117) -+ -+* Mon Jan 29 2001 Bill Nottingham -+- overhaul /etc/protocols (#18530) -+- add port 587 to /etc/services (#25001) -+- add corbaloc (#19581) -+- don't set /usr/X11R6/bin in $PATH if it's already set (#19968) -+ -+* Fri Dec 1 2000 Nalin Dahyabhai -+- Clean up /etc/services, separating registered numbers from unregistered -+ ("squatted") numbers, and adding some. -+ -+* Mon Nov 20 2000 Bernhard Rosenkraenzer -+- Add smtps (465/tcp) and submission (587/tcp) to /etc/services for TLS -+ support (postfix >= 20001030-2) -+ -+* Sun Aug 6 2000 Bill Nottingham -+- /var/log/lastlog is %%config(noreplace) (#15412) -+- some of the various %%verify changes (#14819) -+ -+* Thu Aug 3 2000 Nalin Dahyabhai -+- linuxconf should be 98, not 99 -+ -+* Tue Jul 25 2000 Bill Nottingham -+- fix some of the csh stuff (#14622) -+ -+* Sun Jul 23 2000 Nalin Dahyabhai -+- stop setting "multi on" in /etc/host.conf -+ -+* Wed Jul 12 2000 Prospector -+- automatic rebuild -+ -+* Tue Jun 27 2000 Bill Nottingham -+- add hfs filesystem -+ -+* Wed Jun 21 2000 Preston Brown -+- printcap is a noreplace file now -+ -+* Sun Jun 18 2000 Bill Nottingham -+- fix typo -+ -+* Tue Jun 13 2000 Nalin Dahyabhai -+- add linuxconf/tcp = 99 to /etc/services -+ -+* Sat Jun 10 2000 Bill Nottingham -+- add some stuff to /etc/services -+- tweak ulimit call again -+ -+* Tue Jun 6 2000 Bernhard Rosenkraenzer -+- homedir of ftp is now /var/ftp -+ -+* Sun May 14 2000 Nalin Dahyabhai -+- move profile.d logic in csh.login to csh.cshrc -+ -+* Tue Apr 18 2000 Nalin Dahyabhai -+- redirect ulimit -S -c to /dev/null to avoid clutter -+ -+* Thu Apr 13 2000 Bernhard Rosenkraenzer -+- s/ulimit -c/ulimit -S -c/ - bash 2.x adaption -+ -+* Mon Apr 03 2000 Nalin Dahyabhai -+- Add more of the kerberos-related services from IANA's registry and krb5 -+ -+* Wed Mar 29 2000 Bernhard Rosenkraenzer -+- Add 2.4'ish vc/* devices to securetty -+ -+* Thu Feb 17 2000 Preston Brown -+- add /etc/filesystems with sane defaults -+ -+* Wed Feb 16 2000 Bill Nottingham -+- don't set prompt in /etc/profile (it's done in /etc/bashrc) -+ -+* Fri Feb 5 2000 Bill Nottingham -+- yet more inputrc tweaks from Hans de Goede (hans@highrise.nl) -+ -+* Sun Jan 30 2000 Bill Nottingham -+- yet more inputrc tweaks from Hans de Goede (hans@highrise.nl) -+ -+* Sun Jan 23 2000 Bill Nottingham -+- fix mailq line. (#7140) -+ -+* Fri Jan 21 2000 Bill Nottingham -+- add ldap to /etc/services -+ -+* Tue Jan 18 2000 Bill Nottingham -+- kill HISTFILESIZE, it's broken -+ -+* Tue Jan 18 2000 Preston Brown -+- some inputrc tweaks -+ -+* Wed Jan 12 2000 Bill Nottingham -+- make some more stuff noreplace -+ -+* Fri Nov 19 1999 Bill Nottingham -+- fix mailq line. (#7140) -+ -+* Fri Oct 29 1999 Bill Nottingham -+- split csh.login into csh.login and csh.cshrc (#various) -+- fix pop service names (#6206) -+- fix ipv6 protocols entries (#6219) -+ -+* Thu Sep 2 1999 Jeff Johnson -+- rename /etc/csh.cshrc to /etc/csh.login (#2931). -+- (note: modified /etc/csh.cshrc should end up in /etc/csh.cshrc.rpmsave) -+ -+* Fri Aug 20 1999 Jeff Johnson -+- add defattr. -+- fix limit command in /etc/csh.cshrc (#4582). -+ -+* Thu Jul 8 1999 Bill Nottingham -+- move /etc/inputrc here. -+ -+* Mon Apr 19 1999 Bill Nottingham -+- always use /etc/inputrc -+ -+* Wed Mar 31 1999 Preston Brown -+- added alias pointing to imap from imap2 -+ -+* Tue Mar 23 1999 Preston Brown -+- updated protocols/services from debian to comply with more modern -+- IETF/RFC standards -+ -+* Sun Mar 21 1999 Cristian Gafton -+- auto rebuild in the new build environment (release 4) -+ -+* Thu Feb 18 1999 Jeff Johnson -+- unset variables used in /etc/csh.cshrc (#1212) -+ -+* Mon Jan 18 1999 Jeff Johnson -+- compile for Raw Hide. -+ -+* Tue Oct 13 1998 Cristian Gafton -+- fix the csh.cshrc re: ${PATH} undefined -+ -+* Mon Apr 27 1998 Prospector System -+- translations modified for de, fr, tr -+ -+* Fri Dec 05 1997 Erik Troan -+- /etc/profile uses $i, which needs to be unset -+ -+* Mon Nov 03 1997 Donnie Barnes -+- made /etc/passwd and /etc/group %%config(noreplace) -+ -+* Mon Oct 20 1997 Erik Troan -+- removed /etc/inetd.conf, /etc/rpc -+- flagged /etc/securetty as missingok -+- fixed buildroot stuff in spec file -+ -+* Thu Jul 31 1997 Erik Troan -+- made a noarch package -+ -+* Wed Apr 16 1997 Erik Troan -+- Don't verify md5sum, size, or timestamp of /var/log/lastlog, /etc/passwd, -+ or /etc/group. -- -1.8.3.1 +2.7.4 diff --git a/base/setup/centos/meta_patches/spec-passwd-remove-unused-default-users-and-groups.patch b/base/setup/centos/meta_patches/spec-passwd-remove-unused-default-users-and-groups.patch index 4e67a50a1..5e22f9b5e 100644 --- a/base/setup/centos/meta_patches/spec-passwd-remove-unused-default-users-and-groups.patch +++ b/base/setup/centos/meta_patches/spec-passwd-remove-unused-default-users-and-groups.patch @@ -1,7 +1,7 @@ -From f882ce44d7e8574e9affc5e6471265029f9724ca Mon Sep 17 00:00:00 2001 +From 1285d1381237a94df55df913aa268cd5bb9c6b89 Mon Sep 17 00:00:00 2001 From: Michel Thebeau Date: Thu, 21 Jul 2016 11:47:55 -0400 -Subject: [PATCH] spec: add patch to remove unused users and groups +Subject: [PATCH 05/15] spec: add patch to remove unused users and groups Signed-off-by: Michel Thebeau --- @@ -9,25 +9,25 @@ Signed-off-by: Michel Thebeau 1 file changed, 2 insertions(+) diff --git a/SPECS/setup.spec b/SPECS/setup.spec -index 3debacf..89ff683 100644 +index 18283cd..10d151b 100644 --- a/SPECS/setup.spec +++ b/SPECS/setup.spec -@@ -22,6 +22,7 @@ Patch4: setup-2.8.71-filesystems.patch - Patch5: setup-2.8.71-fullpath.patch - Patch6: tis-uid-gid.patch - Patch7: updating-gids-and-uids-to-support-upgrade-from-wrl.patch -+Patch8: passwd-remove-unused-default-users-and-groups.patch +@@ -24,6 +24,7 @@ Patch6: setup-2.8.71-tapeid.patch + Patch7: setup-2.8.71-shlocal.patch + Patch8: tis-uid-gid.patch + Patch9: updating-gids-and-uids-to-support-upgrade-from-wrl.patch ++Patch10: passwd-remove-unused-default-users-and-groups.patch %description The setup package contains a set of important system configuration and -@@ -37,6 +38,7 @@ setup files, such as passwd, group, and profile. - %patch5 -p1 - %patch6 -p1 +@@ -41,6 +42,7 @@ setup files, such as passwd, group, and profile. %patch7 -p1 -+%patch8 -p1 + %patch8 -p1 + %patch9 -p1 ++%patch10 -p1 ./shadowconvert.sh -- -1.8.3.1 +2.7.4 diff --git a/base/setup/centos/meta_patches/spec-remove-unused-default-groups.patch b/base/setup/centos/meta_patches/spec-remove-unused-default-groups.patch index 60998771a..2a64ff1ce 100644 --- a/base/setup/centos/meta_patches/spec-remove-unused-default-groups.patch +++ b/base/setup/centos/meta_patches/spec-remove-unused-default-groups.patch @@ -1,42 +1,33 @@ -From e882a5dfad4ad41a256ea3867e1a4c4a08df9a98 Mon Sep 17 00:00:00 2001 +From 22d06a6c5c7b44db10060bf95b623dc3c1943a9a Mon Sep 17 00:00:00 2001 From: Michel Thebeau Date: Fri, 19 Aug 2016 09:28:43 -0400 -Subject: [PATCH] spec: add patch to remove unused groups +Subject: [PATCH 08/15] spec: add patch to remove unused groups Signed-off-by: Michel Thebeau --- - SPECS/setup.spec | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + SPECS/setup.spec | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/SPECS/setup.spec b/SPECS/setup.spec -index 6c18614..223bfd5 100644 +index a612d24..3ad2458 100644 --- a/SPECS/setup.spec +++ b/SPECS/setup.spec -@@ -1,7 +1,7 @@ - Summary: A set of system configuration and setup files - Name: setup - Version: 2.8.71 --Release: 8%{?dist} -+Release: 9%{?dist} - License: Public Domain - Group: System Environment/Base - URL: https://fedorahosted.org/setup/ -@@ -24,6 +24,7 @@ Patch6: tis-uid-gid.patch - Patch7: updating-gids-and-uids-to-support-upgrade-from-wrl.patch - Patch8: passwd-remove-unused-default-users-and-groups.patch - Patch9: snmpd-fm-user-group.patch -+Patch10: remove-unused-default-groups.patch +@@ -26,6 +26,7 @@ Patch8: tis-uid-gid.patch + Patch9: updating-gids-and-uids-to-support-upgrade-from-wrl.patch + Patch10: passwd-remove-unused-default-users-and-groups.patch + Patch11: snmpd-fm-user-group.patch ++Patch12: remove-unused-default-groups.patch %description The setup package contains a set of important system configuration and -@@ -41,6 +42,7 @@ setup files, such as passwd, group, and profile. - %patch7 -p1 - %patch8 -p1 +@@ -45,6 +46,7 @@ setup files, such as passwd, group, and profile. %patch9 -p1 -+%patch10 -p1 + %patch10 -p1 + %patch11 -p1 ++%patch12 -p1 ./shadowconvert.sh -- -1.8.3.1 +2.7.4 diff --git a/base/setup/centos/meta_patches/spec-set-custom-prompt.patch b/base/setup/centos/meta_patches/spec-set-custom-prompt.patch index b66279409..32ae0712d 100644 --- a/base/setup/centos/meta_patches/spec-set-custom-prompt.patch +++ b/base/setup/centos/meta_patches/spec-set-custom-prompt.patch @@ -1,42 +1,46 @@ -setup.spec: add custom shell login prompt +From d298b3b8a8a27e23d1589b99a2f9419505563a92 Mon Sep 17 00:00:00 2001 +From: slin14 +Date: Tue, 7 Aug 2018 22:53:18 +0800 +Subject: [PATCH 03/15] setup.spec: add custom shell login prompt A user can be set to use "sh" (which points to bash) as login prompt. This makes the login shell to enter "POSIX" mode which will only read/executes file /etc/profle and files in /etc/profiled.d. So create custom login prompt in /etc/profiles.d +Signed-off-by: slin14 --- SPECS/setup.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SPECS/setup.spec b/SPECS/setup.spec -index 3f74b90..184670f 100644 +index 72cbcba..aa6b36e 100644 --- a/SPECS/setup.spec +++ b/SPECS/setup.spec @@ -7,6 +7,7 @@ Group: System Environment/Base - URL: https://fedorahosted.org/setup/ - Source0: https://fedorahosted.org/releases/s/e/%{name}/%{name}-%{version}.tar.bz2 + URL: https://pagure.io/setup/ + Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2 Source1: motd +Source2: prompt.sh BuildArch: noarch BuildRequires: bash tcsh perl #require system release for saner dependency order -@@ -59,6 +60,7 @@ touch %{buildroot}/etc/fstab +@@ -63,6 +64,7 @@ touch %{buildroot}/etc/fstab touch %{buildroot}/etc/subuid touch %{buildroot}/etc/subgid install -m 644 %{SOURCE1} %{buildroot}/etc/ +install -m 644 %{SOURCE2} %{buildroot}/etc/profile.d/prompt.sh - - # remove unpackaged files from the buildroot - rm -f %{buildroot}/etc/Makefile -@@ -113,6 +115,7 @@ end + mkdir -p %{buildroot}/etc/profile.d + echo "#Add any required envvar overrides to this file, it is sourced from /etc/profile" >%{buildroot}/etc/profile.d/sh.local + echo "#Add any required envvar overrides to this file, is sourced from /etc/csh.login" >%{buildroot}/etc/profile.d/csh.local +@@ -121,6 +123,7 @@ end %config(noreplace) /etc/csh.cshrc %config(noreplace) /etc/motd %dir /etc/profile.d +/etc/profile.d/prompt.sh + %config(noreplace) /etc/profile.d/sh.local + %config(noreplace) /etc/profile.d/csh.local %config(noreplace) %verify(not md5 size mtime) /etc/shells - %ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog - %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab -- -1.8.3.1 +2.7.4 diff --git a/base/setup/centos/meta_patches/updating-gids-and-uids-to-support-upgrade-from-wrl.patch b/base/setup/centos/meta_patches/updating-gids-and-uids-to-support-upgrade-from-wrl.patch index c8eaf98a5..ede0a96d5 100644 --- a/base/setup/centos/meta_patches/updating-gids-and-uids-to-support-upgrade-from-wrl.patch +++ b/base/setup/centos/meta_patches/updating-gids-and-uids-to-support-upgrade-from-wrl.patch @@ -1,32 +1,33 @@ -From b4a83aefe522dc1674c4979436398661f3ae4572 Mon Sep 17 00:00:00 2001 +From 935277306d01c917b81fa33ebc7f27b0edd61f7f Mon Sep 17 00:00:00 2001 From: Bart Wensley Date: Mon, 27 Jun 2016 12:28:36 -0400 -Subject: [PATCH 1/1] updating-gids-and-uids-to-support-upgrade-from-wrl.patch +Subject: [PATCH 04/15] + updating-gids-and-uids-to-support-upgrade-from-wrl.patch --- SPECS/setup.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/SPECS/setup.spec b/SPECS/setup.spec -index 184670f..3debacf 100644 +index aa6b36e..18283cd 100644 --- a/SPECS/setup.spec +++ b/SPECS/setup.spec -@@ -21,6 +21,7 @@ Patch3: setup-2.8.71-uidgidchanges.patch - Patch4: setup-2.8.71-filesystems.patch - Patch5: setup-2.8.71-fullpath.patch - Patch6: tis-uid-gid.patch -+Patch7: updating-gids-and-uids-to-support-upgrade-from-wrl.patch +@@ -23,6 +23,7 @@ Patch5: setup-2.8.71-fullpath.patch + Patch6: setup-2.8.71-tapeid.patch + Patch7: setup-2.8.71-shlocal.patch + Patch8: tis-uid-gid.patch ++Patch9: updating-gids-and-uids-to-support-upgrade-from-wrl.patch %description The setup package contains a set of important system configuration and -@@ -35,6 +36,7 @@ setup files, such as passwd, group, and profile. - %patch4 -p1 - %patch5 -p1 +@@ -39,6 +40,7 @@ setup files, such as passwd, group, and profile. %patch6 -p1 -+%patch7 -p1 + %patch7 -p1 + %patch8 -p1 ++%patch9 -p1 ./shadowconvert.sh -- -1.8.3.1 +2.7.4 diff --git a/base/setup/centos/patches/add-fm-user-to-snmpd-group.patch b/base/setup/centos/patches/add-fm-user-to-snmpd-group.patch index ebcafea0a..0286535e8 100644 --- a/base/setup/centos/patches/add-fm-user-to-snmpd-group.patch +++ b/base/setup/centos/patches/add-fm-user-to-snmpd-group.patch @@ -1,7 +1,15 @@ +From 02610c6c7bf89593a9b1e98eb5ee0cfba5c48707 Mon Sep 17 00:00:00 2001 +From: slin14 +Date: Thu, 16 Aug 2018 00:13:14 +0800 +Subject: [PATCH] add-fm-user-to-snmpd-group + +Signed-off-by: slin14 --- - group | 2 +- + group | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/group b/group +index a3bb69e..9b77aae 100644 --- a/group +++ b/group @@ -21,7 +21,7 @@ neutron:x:164:neutron @@ -13,3 +21,6 @@ heat:x:187:heat nfv:x:172:nfv fm:x:195:fm +-- +2.7.4 + diff --git a/base/setup/centos/patches/add-ironic-uid-gid.patch b/base/setup/centos/patches/add-ironic-uid-gid.patch index 41bc40983..4360e8a00 100644 --- a/base/setup/centos/patches/add-ironic-uid-gid.patch +++ b/base/setup/centos/patches/add-ironic-uid-gid.patch @@ -1,11 +1,16 @@ -commit 51c505c59a1512c011fcda01d0583a2ddc6f3337 -Author: Shoaib Nasir -Date: Mon Sep 25 11:39:29 2017 -0400 +From 15d0ef24f88290887f1e154352b53f373a04e783 Mon Sep 17 00:00:00 2001 +From: slin14 +Date: Thu, 16 Aug 2018 00:15:04 +0800 +Subject: [PATCH] add-ironic-uid-gid - add ironic group and passwd +Signed-off-by: slin14 +--- + group | 1 + + passwd | 1 + + 2 files changed, 2 insertions(+) diff --git a/group b/group -index 7d0244f..9979b99 100644 +index f6a75e5..d9050fa 100644 --- a/group +++ b/group @@ -27,3 +27,4 @@ nfv:x:172:nfv @@ -22,3 +27,6 @@ index fce82e7..fb49ea3 100644 fm:x:195:195:fm-mgr:/var/lib/fm:/sbin/nologin magnum:x:1870:1870:OpenStack Magnum Daemons:/var/lib/magnum:/sbin/nologin +ironic:x:1874:1874:OpenStack Ironic Daemons:/var/lib/ironic:/sbin/nologin +-- +2.7.4 + diff --git a/base/setup/centos/patches/passwd-remove-unused-default-users-and-groups.patch b/base/setup/centos/patches/passwd-remove-unused-default-users-and-groups.patch index 5bdecabb6..bfeb9b690 100644 --- a/base/setup/centos/patches/passwd-remove-unused-default-users-and-groups.patch +++ b/base/setup/centos/patches/passwd-remove-unused-default-users-and-groups.patch @@ -1,4 +1,4 @@ -From 737295c6ad990e8e248fef6b378198c3326b90ba Mon Sep 17 00:00:00 2001 +From fed037afbe78b47d46dbbd5838468e57bfe19884 Mon Sep 17 00:00:00 2001 From: Michel Thebeau Date: Thu, 11 Aug 2016 18:24:25 -0400 Subject: [PATCH] passwd: remove unused default users and groups @@ -13,7 +13,7 @@ Signed-off-by: Michel Thebeau 2 files changed, 16 deletions(-) diff --git a/group b/group -index c21e2de..87a03c1 100644 +index 825edbb..0a0a1b0 100644 --- a/group +++ b/group @@ -1,11 +1,7 @@ @@ -33,7 +33,7 @@ index c21e2de..87a03c1 100644 dialout::18: floppy::19: -games::20: - tape::30: + tape::33: -video::39: -ftp::50: lock::54: @@ -62,5 +62,5 @@ index 548435f..46a3d52 100644 rabbitmq:x:121:121::/var/lib/rabbitmq:/bin/sh nova:x:994:162::/var/lib/nova:/bin/false -- -1.8.3.1 +2.7.4 diff --git a/base/setup/centos/patches/remove-unused-default-groups.patch b/base/setup/centos/patches/remove-unused-default-groups.patch index 8337389db..b88aea5aa 100644 --- a/base/setup/centos/patches/remove-unused-default-groups.patch +++ b/base/setup/centos/patches/remove-unused-default-groups.patch @@ -1,4 +1,4 @@ -From d79451c9a047313fb8da27007ea9d99435e05ff2 Mon Sep 17 00:00:00 2001 +From dbc791c8f24ffac0d98e86213e4d592660f6087c Mon Sep 17 00:00:00 2001 From: Michel Thebeau Date: Fri, 19 Aug 2016 09:21:44 -0400 Subject: [PATCH] CGTS-4685: setup: remove unused default groups @@ -14,7 +14,7 @@ Signed-off-by: Michel Thebeau 1 file changed, 2 deletions(-) diff --git a/group b/group -index 8794dde..0b93beb 100644 +index 42a8ed1..a3bb69e 100644 --- a/group +++ b/group @@ -2,12 +2,10 @@ root::0: @@ -29,7 +29,7 @@ index 8794dde..0b93beb 100644 -man::15: dialout::18: floppy::19: - tape::30: + tape::33: -- -1.8.3.1 +2.7.4 diff --git a/base/setup/centos/srpm_path b/base/setup/centos/srpm_path index 62834bcaf..82625af3f 100644 --- a/base/setup/centos/srpm_path +++ b/base/setup/centos/srpm_path @@ -1 +1 @@ -mirror:Source/setup-2.8.71-7.el7.src.rpm +mirror:Source/setup-2.8.71-9.el7.src.rpm