Package init
This commit is contained in:
dogsheng
parent
c531a80f5d
commit
a8e474a1d6
@ -0,0 +1,59 @@
|
|||||||
|
From ead65179f83ba4359795055cde76c4f46417951d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Martin Osvald <mosvald@redhat.com>
|
||||||
|
Date: Thu, 29 Aug 2019 09:31:31 +0200
|
||||||
|
Subject: [PATCH 18/23] csh.login: set PATH again (if empty) to prevent
|
||||||
|
interpreter error (#1744106)
|
||||||
|
|
||||||
|
---
|
||||||
|
csh.login | 36 ++++++++++++++++++++++--------------
|
||||||
|
1 file changed, 22 insertions(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/csh.login b/csh.login
|
||||||
|
index 51902e8..e4b1990 100644
|
||||||
|
--- a/csh.login
|
||||||
|
+++ b/csh.login
|
||||||
|
@@ -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
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
100
0020-lang.csh-fix-several-variable-substitution-bugs-and-.patch
Normal file
100
0020-lang.csh-fix-several-variable-substitution-bugs-and-.patch
Normal file
@ -0,0 +1,100 @@
|
|||||||
|
From b22cf3a3665fe6a3b05c1188a91db884b5a18c72 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Martin Osvald <mosvald@redhat.com>
|
||||||
|
Date: Thu, 29 Aug 2019 12:42:33 +0200
|
||||||
|
Subject: [PATCH 20/23] lang.csh: fix several variable substitution bugs and
|
||||||
|
typos (#1746749)
|
||||||
|
|
||||||
|
---
|
||||||
|
lang.csh | 73 ++++++++++++++++++++++++++++----------------------------
|
||||||
|
1 file changed, 37 insertions(+), 36 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/lang.csh b/lang.csh
|
||||||
|
index c9ed880..d9cdcce 100644
|
||||||
|
--- a/lang.csh
|
||||||
|
+++ b/lang.csh
|
||||||
|
@@ -58,45 +58,46 @@ endif
|
||||||
|
# The ${LANG} manipulation is necessary only in virtual terminal (a.k.a. console - /dev/tty*):
|
||||||
|
set in_console=`tty | grep -vc -e '/dev/tty'`
|
||||||
|
|
||||||
|
-if (${?LANG} && ${?TERM} == 'linux' && in_console == 0) then
|
||||||
|
- set utf8_used=`echo ${LANG} | grep --quiet -E -i -e '^.+\.utf-?8$'; echo $?`
|
||||||
|
+if (${?LANG} && ${?TERM}) then
|
||||||
|
+ if (${TERM} == 'linux' && $in_console == 0) then
|
||||||
|
+ set utf8_used=`echo ${LANG} | grep --quiet -E -i -e '^.+\.utf-?8$'; echo $?`
|
||||||
|
|
||||||
|
- if (${utf8_used} == 0) then
|
||||||
|
- switch (${LANG})
|
||||||
|
- case en_IN*:
|
||||||
|
- breaksw
|
||||||
|
+ if (${utf8_used} == 0) then
|
||||||
|
+ switch (${LANG})
|
||||||
|
+ case en_IN*:
|
||||||
|
+ breaksw
|
||||||
|
+ case ja*:
|
||||||
|
+ case ko*:
|
||||||
|
+ case si*:
|
||||||
|
+ case zh*:
|
||||||
|
+ case ar*:
|
||||||
|
+ case fa*:
|
||||||
|
+ case he*:
|
||||||
|
+ case *_IN*:
|
||||||
|
+ setenv LANG en_US.UTF-8
|
||||||
|
+ breaksw
|
||||||
|
+ endsw
|
||||||
|
+ else
|
||||||
|
+ switch (${LANG})
|
||||||
|
+ case en_IN*:
|
||||||
|
+ breaksw
|
||||||
|
+ case ja*:
|
||||||
|
+ case ko*:
|
||||||
|
+ case si*:
|
||||||
|
+ case zh*:
|
||||||
|
+ case ar*:
|
||||||
|
+ case fa*:
|
||||||
|
+ case he*:
|
||||||
|
+ case *_IN*:
|
||||||
|
+ setenv LANG en_US
|
||||||
|
+ breaksw
|
||||||
|
+ endsw
|
||||||
|
+ endif
|
||||||
|
|
||||||
|
- case ja*:
|
||||||
|
- case ko*:
|
||||||
|
- case si*:
|
||||||
|
- case zh*:
|
||||||
|
- case ar*:
|
||||||
|
- case fa*:
|
||||||
|
- case he*:
|
||||||
|
- case *_IN*:
|
||||||
|
- setenv LANG en_US.UTF-8
|
||||||
|
- breaksw
|
||||||
|
- endsw
|
||||||
|
- else
|
||||||
|
- switch (${LANG})
|
||||||
|
- case en_IN*:
|
||||||
|
- breaksw
|
||||||
|
- case ja*:
|
||||||
|
- case ko*:
|
||||||
|
- case si*:
|
||||||
|
- case zh*:
|
||||||
|
- m case ar*:
|
||||||
|
- case fa*:
|
||||||
|
- case he*:
|
||||||
|
- case *_IN*:
|
||||||
|
- setenv LANG en_US
|
||||||
|
- breaksw
|
||||||
|
- endsw
|
||||||
|
+ # NOTE: We are not exporting the ${LANG} here again on purpose.
|
||||||
|
+ # If user starts GUI session from console manually, then
|
||||||
|
+ # the previously set LANG should be okay to use.
|
||||||
|
endif
|
||||||
|
-
|
||||||
|
- # NOTE: We are not exporting the ${LANG} here again on purpose.
|
||||||
|
- # If user starts GUI session from console manually, then
|
||||||
|
- # the previously set LANG should be okay to use.
|
||||||
|
endif
|
||||||
|
|
||||||
|
unset in_console utf8_used
|
||||||
|
--
|
||||||
|
2.19.1
|
||||||
|
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
From ef35ac39f3b280e03590cc13362b1086e843b3ca Mon Sep 17 00:00:00 2001
|
||||||
|
From: Martin Osvald <mosvald@redhat.com>
|
||||||
|
Date: Fri, 30 Aug 2019 16:51:35 +0200
|
||||||
|
Subject: [PATCH 22/23] fix lang.csh script so it doesn't break tcsh -e scripts
|
||||||
|
(#1620004) II
|
||||||
|
|
||||||
|
---
|
||||||
|
lang.csh | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/lang.csh b/lang.csh
|
||||||
|
index 3ebd023..f81de15 100644
|
||||||
|
--- a/lang.csh
|
||||||
|
+++ b/lang.csh
|
||||||
|
@@ -66,7 +66,7 @@ set in_console=`tty | grep -vc -e '/dev/tty'`
|
||||||
|
|
||||||
|
if (${?LANG} && ${?TERM}) then
|
||||||
|
if (${TERM} == 'linux' && $in_console == 0) then
|
||||||
|
- set utf8_used=`echo ${LANG} | grep --quiet -E -i -e '^.+\.utf-?8$'; echo $?`
|
||||||
|
+ set utf8_used=`echo ${LANG} | grep -vc -E -i -e '^.+\.utf-?8$'`
|
||||||
|
|
||||||
|
if (${utf8_used} == 0) then
|
||||||
|
switch (${LANG})
|
||||||
|
--
|
||||||
|
2.19.1
|
||||||
|
|
||||||
12
setup.spec
12
setup.spec
@ -1,7 +1,7 @@
|
|||||||
Summary: A set of system configuration and setup files
|
Summary: A set of system configuration and setup files
|
||||||
Name: setup
|
Name: setup
|
||||||
Version: 2.13.3
|
Version: 2.13.3
|
||||||
Release: 3
|
Release: 4
|
||||||
License: Public Domain
|
License: Public Domain
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
URL: https://pagure.io/setup/
|
URL: https://pagure.io/setup/
|
||||||
@ -15,6 +15,10 @@ Requires: system-release
|
|||||||
Conflicts: filesystem < 3
|
Conflicts: filesystem < 3
|
||||||
Conflicts: initscripts < 4.26, bash <= 2.0.4-21
|
Conflicts: initscripts < 4.26, bash <= 2.0.4-21
|
||||||
|
|
||||||
|
Patch6000: 0018-csh.login-set-PATH-again-if-empty-to-prevent-interpr.patch
|
||||||
|
Patch6001: 0020-lang.csh-fix-several-variable-substitution-bugs-and-.patch
|
||||||
|
Patch6002: 0022-fix-lang.csh-script-so-it-doesn-t-break-tcsh-e-scrip.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The setup package contains a set of important system configuration and
|
The setup package contains a set of important system configuration and
|
||||||
setup files, such as passwd, group, and profile.
|
setup files, such as passwd, group, and profile.
|
||||||
@ -116,6 +120,12 @@ end
|
|||||||
%{_tmpfilesdir}/%{name}.conf
|
%{_tmpfilesdir}/%{name}.conf
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Dec 19 2019 jiangchuangang <jiangchuangang@huawei.com> - 2.13.3-4
|
||||||
|
- Type:enhancement
|
||||||
|
- ID:NA
|
||||||
|
- SUG:restart
|
||||||
|
- DESC:Synchronize patches
|
||||||
|
|
||||||
* Fri Sep 20 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.13.3-3
|
* Fri Sep 20 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.13.3-3
|
||||||
- Delete redundant information
|
- Delete redundant information
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user