From dc1ad98f86d138a402b3b8f0ce44fc83a56dad6b Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 31 2020 09:39:26 +0000
Subject: import setup-2.8.71-11.el7


---

diff --git a/SOURCES/setup-2.8.71-empty-path.patch b/SOURCES/setup-2.8.71-empty-path.patch
new file mode 100644
index 0000000..4852893
--- /dev/null
+++ b/SOURCES/setup-2.8.71-empty-path.patch
@@ -0,0 +1,46 @@
+diff -up setup-2.8.71/csh.login.empty_path setup-2.8.71/csh.login
+--- setup-2.8.71/csh.login.empty_path	2019-08-23 08:07:16.281947710 +0200
++++ setup-2.8.71/csh.login	2019-08-23 08:33:14.813348211 +0200
+@@ -2,20 +2,28 @@
+ 
+ # System wide environment and startup programs, for login setup
+ 
+-#add sbin directories to the path
+-foreach p ( /usr/local/sbin /usr/sbin )
+-	switch (":${PATH}:")
+-	case "*:${p}:*":
+-		breaksw
+-	default:
+-		if ( $uid == 0 ) then
+-                        set path = ( ${p} ${path:q} )
+-		else
+-                        set path = ( ${path:q} ${p} )
+-		endif
+-		breaksw
+-	endsw
+-end
++if ( ! ${?PATH} ) then
++        if ( $uid == 0 ) then
++		setenv PATH "/usr/local/sbin:/usr/sbin:/usr/local/bin:/usr/bin"
++        else
++		setenv PATH "/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin"
++        endif
++else
++	#add sbin directories to the path
++	foreach p ( /usr/local/sbin /usr/sbin )
++		switch (":${PATH}:")
++		case "*:${p}:*":
++			breaksw
++		default:
++			if ( $uid == 0 ) then
++                        	set path = ( ${p} ${path:q} )
++			else
++                        	set path = ( ${path:q} ${p} )
++			endif
++			breaksw
++		endsw
++	end
++endif
+ 
+ setenv HOSTNAME `/usr/bin/hostname`
+ set history=1000
diff --git a/SOURCES/setup-2.8.71-pcp-aliases.patch b/SOURCES/setup-2.8.71-pcp-aliases.patch
new file mode 100644
index 0000000..0023e30
--- /dev/null
+++ b/SOURCES/setup-2.8.71-pcp-aliases.patch
@@ -0,0 +1,11 @@
+diff -up setup-2.8.71/aliases.pcp setup-2.8.71/aliases
+--- setup-2.8.71/aliases.pcp	2013-06-07 16:31:32.000000000 +0200
++++ setup-2.8.71/aliases	2019-08-21 14:16:23.086960006 +0200
+@@ -63,6 +63,7 @@ desktop:	root
+ rpcuser:	root
+ rpc:		root
+ nfsnobody:	root
++pcp:		root
+ 
+ ingres:		root
+ system:		root
diff --git a/SPECS/setup.spec b/SPECS/setup.spec
index 0e243e2..5011f4d 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: 10%{?dist}
+Release: 11%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://pagure.io/setup/
@@ -22,6 +22,8 @@ Patch6: setup-2.8.71-tapeid.patch
 Patch7: setup-2.8.71-shlocal.patch
 Patch8: setup-2.8.71-protocolscrudp.patch
 Patch9: setup-2.8.71-shellsnologin.patch
+Patch10: setup-2.8.71-pcp-aliases.patch
+Patch11: setup-2.8.71-empty-path.patch
 
 %description
 The setup package contains a set of important system configuration and
@@ -39,6 +41,8 @@ setup files, such as passwd, group, and profile.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
 
 ./shadowconvert.sh
 
@@ -127,6 +131,10 @@ end
 %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
 
 %changelog
+* Wed Aug 21 2019 Martin Osvald <mosvald@redhat.com> - 2.8.71-11
+- add pcp to /etc/aliases (#1609875)
+- set PATH if it is empty in csh.login (#1625629)
+
 * Thu Jun 21 2018 Ondrej Vasik <ovasik@redhat.com> - 2.8.71-10
 - fix crudp name in /etc/protocols (#1566469)
 - do not list /sbin/nologin and /usr/sbin/nologin in /etc/shells