Compare commits
No commits in common. "c8" and "c9s" have entirely different histories.
|
|
@ -1 +1,81 @@
|
|||
SOURCES/setup-2.12.2.tar.bz2
|
||||
setup-2.8.23.tar.bz2
|
||||
setup-2.8.24.tar.bz2
|
||||
setup-2.8.25.tar.bz2
|
||||
/setup-2.8.26.tar.bz2
|
||||
/setup-2.8.27.tar.bz2
|
||||
/setup-2.8.28.tar.bz2
|
||||
/setup-2.8.29.tar.bz2
|
||||
/setup-2.8.30.tar.bz2
|
||||
/setup-2.8.31.tar.bz2
|
||||
/setup-2.8.32.tar.bz2
|
||||
/setup-2.8.33.tar.bz2
|
||||
/setup-2.8.34.tar.bz2
|
||||
/setup-2.8.35.tar.bz2
|
||||
/setup-2.8.37.tar.bz2
|
||||
/setup-2.8.38.tar.bz2
|
||||
/setup-2.8.39.tar.bz2
|
||||
/setup-2.8.40.tar.bz2
|
||||
/setup-2.8.42.tar.bz2
|
||||
/setup-2.8.43.tar.bz2
|
||||
/setup-2.8.44.tar.bz2
|
||||
/setup-2.8.45.tar.bz2
|
||||
/setup-2.8.46.tar.bz2
|
||||
/setup-2.8.47.tar.bz2
|
||||
/setup-2.8.48.tar.bz2
|
||||
/setup-2.8.49.tar.bz2
|
||||
/setup-2.8.50.tar.bz2
|
||||
/setup-2.8.51.tar.bz2
|
||||
/setup-2.8.53.tar.bz2
|
||||
/setup-2.8.54.tar.bz2
|
||||
/setup-2.8.55.tar.bz2
|
||||
/setup-2.8.56.tar.bz2
|
||||
/setup-2.8.57.tar.bz2
|
||||
/setup-2.8.58.tar.bz2
|
||||
/setup-2.8.59.tar.bz2
|
||||
/setup-2.8.61.tar.bz2
|
||||
/setup-2.8.62.tar.bz2
|
||||
/setup-2.8.64.tar.bz2
|
||||
/setup-2.8.65.tar.bz2
|
||||
/setup-2.8.66.tar.bz2
|
||||
/setup-2.8.67.tar.bz2
|
||||
/setup-2.8.68.tar.bz2
|
||||
/setup-2.8.69.tar.bz2
|
||||
/setup-2.8.70.tar.bz2
|
||||
/setup-2.8.71.tar.bz2
|
||||
/setup-2.8.72.tar.bz2
|
||||
/setup-2.8.73.tar.bz2
|
||||
/setup-2.8.74.tar.bz2
|
||||
/setup-2.8.75.tar.bz2
|
||||
/setup-2.9.0.tar.bz2
|
||||
/setup-2.9.1.tar.bz2
|
||||
/setup-2.9.2.tar.bz2
|
||||
/setup-2.9.3.tar.bz2
|
||||
/setup-2.9.4.tar.bz2
|
||||
/setup-2.9.5.tar.bz2
|
||||
/setup-2.9.6.tar.bz2
|
||||
/setup-2.9.7.tar.bz2
|
||||
/setup-2.9.8.tar.bz2
|
||||
/setup-2.10.1.tar.bz2
|
||||
/setup-2.10.2.tar.bz2
|
||||
/setup-2.10.3.tar.bz2
|
||||
/setup-2.10.4.tar.bz2
|
||||
/setup-2.10.5.tar.bz2
|
||||
/setup-2.10.7.tar.bz2
|
||||
/setup-2.10.8.tar.bz2
|
||||
/setup-2.10.9.tar.bz2
|
||||
/setup-2.10.10.tar.bz2
|
||||
/setup-2.11.1.tar.bz2
|
||||
/setup-2.11.2.tar.bz2
|
||||
/setup-2.11.3.tar.bz2
|
||||
/setup-2.11.4.tar.bz2
|
||||
/setup-2.12.0.tar.bz2
|
||||
/setup-2.12.1.tar.bz2
|
||||
/setup-2.12.2.tar.bz2
|
||||
/setup-2.12.3.tar.bz2
|
||||
/setup-2.12.5.tar.bz2
|
||||
/setup-2.12.6.tar.bz2
|
||||
/setup-2.13.1.tar.bz2
|
||||
/setup-2.13.2.tar.bz2
|
||||
/setup-2.13.3.tar.bz2
|
||||
/setup-2.13.6.tar.bz2
|
||||
/setup-2.13.7.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
49420801c2cd3499feb2332670988d34a00aceb2 SOURCES/setup-2.12.2.tar.bz2
|
||||
a1120010a76a7415975de6a977114e0805063b60 setup-2.13.7.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,47 +0,0 @@
|
|||
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,13 +0,0 @@
|
|||
diff --git a/lang.csh b/lang.csh
|
||||
index 1dc78f8..695c1bc 100644
|
||||
--- a/lang.csh
|
||||
+++ b/lang.csh
|
||||
@@ -36,7 +36,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})
|
||||
|
|
@ -1,88 +0,0 @@
|
|||
diff --git a/lang.csh b/lang.csh
|
||||
index 67faefc..1dc78f8 100644
|
||||
--- a/lang.csh
|
||||
+++ b/lang.csh
|
||||
@@ -34,45 +34,47 @@ 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*:
|
||||
- m 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*:
|
||||
+ case ar*:
|
||||
+ case fa*:
|
||||
+ case he*:
|
||||
+ case *_IN*:
|
||||
+ setenv LANG en_US
|
||||
+ breaksw
|
||||
+ endsw
|
||||
+ 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.
|
||||
+ # 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
|
||||
endif
|
||||
|
||||
unset in_console utf8_used
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/services b/services
|
||||
index b9eb06c..470bf86 100644
|
||||
--- a/services
|
||||
+++ b/services
|
||||
@@ -8828,7 +8828,7 @@ cssc 5637/tcp # Symantec CSSC
|
||||
flcrs 5638/tcp # Symantec Fingerprint Lookup and Container Reference
|
||||
ics 5639/tcp # Symantec Integrity Checking
|
||||
vfmobile 5646/tcp # Ventureforth Mobile
|
||||
-###UNAUTHORIZED USE: Port 5666 used by SAIC NRPE############
|
||||
+nrpe 5666/tcp # Nagios Remote Plugin Executor
|
||||
filemq 5670/tcp # ZeroMQ file
|
||||
zre-disc 5670/udp # Local area discovery and msging over ZeroMQ
|
||||
amqps 5671/tcp # amqp protocol over TLS/SSL
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff --git a/aliases b/aliases
|
||||
index 7f99300..5d7b9e2 100644
|
||||
--- a/aliases
|
||||
+++ b/aliases
|
||||
@@ -63,6 +63,7 @@ desktop: root
|
||||
rpcuser: root
|
||||
rpc: root
|
||||
nfsnobody: root
|
||||
+pcp: root
|
||||
|
||||
ingres: root
|
||||
system: root
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
diff --git a/lang.csh b/lang.csh
|
||||
index 94c4625..4e5f014 100644
|
||||
--- a/lang.csh
|
||||
+++ b/lang.csh
|
||||
@@ -13,7 +13,7 @@ foreach config (/etc/locale.conf "${HOME}/.i18n")
|
||||
end
|
||||
|
||||
if (${?LANG_backup}) then
|
||||
- set LANG="${LANG_backup}"
|
||||
+ setenv LANG "${LANG_backup}"
|
||||
endif
|
||||
|
||||
unset LANG_backup config
|
||||
|
|
@ -1,113 +0,0 @@
|
|||
diff --git a/bashrc b/bashrc
|
||||
index ddc4699..d19a7c1 100644
|
||||
--- a/bashrc
|
||||
+++ b/bashrc
|
||||
@@ -71,7 +71,7 @@ if [ -z "$BASHRCSOURCED" ]; then
|
||||
# Current threshold for system reserved uid/gids is 200
|
||||
# You could check uidgid reservation validity in
|
||||
# /usr/share/doc/setup-*/uidgid file
|
||||
- if [ $UID -gt 199 ] && [ "`id -gn`" = "`id -un`" ]; then
|
||||
+ if [ $UID -gt 199 ] && [ "`/usr/bin/id -gn`" = "`/usr/bin/id -un`" ]; then
|
||||
umask 002
|
||||
else
|
||||
umask 022
|
||||
diff --git a/csh.cshrc b/csh.cshrc
|
||||
index d6fae9d..b83d5da 100644
|
||||
--- a/csh.cshrc
|
||||
+++ b/csh.cshrc
|
||||
@@ -7,7 +7,7 @@
|
||||
# Current threshold for system reserved uid/gids is 200
|
||||
# You could check uidgid reservation validity in
|
||||
# /usr/share/doc/setup-*/uidgid file
|
||||
-if ($uid > 199 && "`id -gn`" == "`id -un`") then
|
||||
+if ($uid > 199 && "`/usr/bin/id -gn`" == "`/usr/bin/id -un`") then
|
||||
umask 002
|
||||
else
|
||||
umask 022
|
||||
@@ -20,7 +20,7 @@ if ($?prompt) then
|
||||
# make completion work better by default
|
||||
set autolist
|
||||
else
|
||||
- set prompt=\[$user@`hostname -s`\]\$\
|
||||
+ set prompt=\[$user@`/usr/bin/hostname -s`\]\$\
|
||||
endif
|
||||
endif
|
||||
|
||||
diff --git a/lang.csh b/lang.csh
|
||||
index 695c1bc..94c4625 100644
|
||||
--- a/lang.csh
|
||||
+++ b/lang.csh
|
||||
@@ -8,7 +8,7 @@ endif
|
||||
foreach config (/etc/locale.conf "${HOME}/.i18n")
|
||||
if (-f "${config}") then
|
||||
# NOTE: We are using eval & sed here to avoid invoking of any commands & functions from those files.
|
||||
- eval `sed -r -e 's/^[[:blank:]]*([[:upper:]_]+)=([[:print:][:digit:]\._-]+|"[[:print:][:digit:]\._-]+")/setenv \1 \2;/;t;d' ${config}`
|
||||
+ eval `/usr/bin/sed -r -e 's/^[[:blank:]]*([[:upper:]_]+)=([[:print:][:digit:]\._-]+|"[[:print:][:digit:]\._-]+")/setenv \1 \2;/;t;d' ${config}`
|
||||
endif
|
||||
end
|
||||
|
||||
@@ -32,11 +32,11 @@ if (${?LC_ALL}) then
|
||||
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'`
|
||||
+set in_console=`/usr/bin/tty | /usr/bin/grep -vc -e '/dev/tty'`
|
||||
|
||||
if (${?LANG} && ${?TERM}) then
|
||||
if (${TERM} == 'linux' && $in_console == 0) then
|
||||
- set utf8_used=`echo ${LANG} | grep -vc -E -i -e '^.+\.utf-?8$'`
|
||||
+ set utf8_used=`echo ${LANG} | /usr/bin/grep -vc -E -i -e '^.+\.utf-?8$'`
|
||||
|
||||
if (${utf8_used} == 0) then
|
||||
switch (${LANG})
|
||||
diff --git a/lang.sh b/lang.sh
|
||||
index 0252b0f..c9022d0 100644
|
||||
--- a/lang.sh
|
||||
+++ b/lang.sh
|
||||
@@ -8,7 +8,7 @@ fi
|
||||
for config in /etc/locale.conf "${HOME}/.i18n"; do
|
||||
# NOTE: We are using eval & sed here to avoid invoking of any commands & functions from those files.
|
||||
if [ -f "${config}" ]; then
|
||||
- eval $(sed -r -e 's/^[[:blank:]]*([[:upper:]_]+)=([[:print:][:digit:]\._-]+|"[[:print:][:digit:]\._-]+")/export \1=\2/;t;d' ${config})
|
||||
+ eval $(/usr/bin/sed -r -e 's/^[[:blank:]]*([[:upper:]_]+)=([[:print:][:digit:]\._-]+|"[[:print:][:digit:]\._-]+")/export \1=\2/;t;d' ${config})
|
||||
fi
|
||||
done
|
||||
|
||||
@@ -32,8 +32,8 @@ if [ -n "${LC_ALL}" ]; then
|
||||
fi
|
||||
|
||||
# The ${LANG} manipulation is necessary only in virtual terminal (a.k.a. console - /dev/tty*):
|
||||
-if [ -n "${LANG}" ] && [ "${TERM}" = 'linux' ] && tty | grep --quiet -e '/dev/tty'; then
|
||||
- if grep --quiet -E -i -e '^.+\.utf-?8$' <<< "${LANG}"; then
|
||||
+if [ -n "${LANG}" ] && [ "${TERM}" = 'linux' ] && /usr/bin/tty | /usr/bin/grep --quiet -e '/dev/tty'; then
|
||||
+ if /usr/bin/grep --quiet -E -i -e '^.+\.utf-?8$' <<< "${LANG}"; then
|
||||
case ${LANG} in
|
||||
ja*) LANG=en_US.UTF-8 ;;
|
||||
ko*) LANG=en_US.UTF-8 ;;
|
||||
diff --git a/profile b/profile
|
||||
index 1feb987..16b2e69 100644
|
||||
--- a/profile
|
||||
+++ b/profile
|
||||
@@ -25,10 +25,10 @@ pathmunge () {
|
||||
if [ -x /usr/bin/id ]; then
|
||||
if [ -z "$EUID" ]; then
|
||||
# ksh workaround
|
||||
- EUID=`id -u`
|
||||
- UID=`id -ru`
|
||||
+ EUID=`/usr/bin/id -u`
|
||||
+ UID=`/usr/bin/id -ru`
|
||||
fi
|
||||
- USER="`id -un`"
|
||||
+ USER="`/usr/bin/id -un`"
|
||||
LOGNAME=$USER
|
||||
MAIL="/var/spool/mail/$USER"
|
||||
fi
|
||||
@@ -56,7 +56,7 @@ export PATH USER LOGNAME MAIL HOSTNAME HISTSIZE HISTCONTROL
|
||||
# Current threshold for system reserved uid/gids is 200
|
||||
# You could check uidgid reservation validity in
|
||||
# /usr/share/doc/setup-*/uidgid file
|
||||
-if [ $UID -gt 199 ] && [ "`id -gn`" = "`id -un`" ]; then
|
||||
+if [ $UID -gt 199 ] && [ "`/usr/bin/id -gn`" = "`/usr/bin/id -un`" ]; then
|
||||
umask 002
|
||||
else
|
||||
umask 022
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
diff --git a/csh.login b/csh.login
|
||||
index 18c5136..3a8e5ce 100644
|
||||
--- a/csh.login
|
||||
+++ b/csh.login
|
||||
@@ -31,7 +31,7 @@ set history=1000
|
||||
|
||||
if ( -d /etc/profile.d ) then
|
||||
set nonomatch
|
||||
- foreach i ( /etc/profile.d/*.csh )
|
||||
+ foreach i ( /etc/profile.d/*.csh /etc/profile.d/csh.local )
|
||||
if ( -r "$i" ) then
|
||||
if ($?prompt) then
|
||||
source "$i"
|
||||
|
|
@ -0,0 +1,43 @@
|
|||
diff --git a/bashrc b/bashrc
|
||||
index d462ac7..b0740cb 100644
|
||||
--- a/bashrc
|
||||
+++ b/bashrc
|
||||
@@ -65,15 +65,8 @@ if [ -z "$BASHRCSOURCED" ]; then
|
||||
esac
|
||||
}
|
||||
|
||||
- # By default, we want umask to get set. This sets it for non-login shell.
|
||||
- # Current threshold for system reserved uid/gids is 200
|
||||
- # You could check uidgid reservation validity in
|
||||
- # /usr/share/doc/setup-*/uidgid file
|
||||
- if [ $UID -gt 199 ] && [ "`/usr/bin/id -gn`" = "`/usr/bin/id -un`" ]; then
|
||||
- umask 002
|
||||
- else
|
||||
- umask 022
|
||||
- fi
|
||||
+ # Set default umask for non-login shell only if it is set to 0
|
||||
+ [ `umask` -eq 0 ] && umask 022
|
||||
|
||||
SHELL=/bin/bash
|
||||
# Only display echos from profile.d scripts if we are no login shell
|
||||
diff --git a/csh.cshrc b/csh.cshrc
|
||||
index eda4aa7..8f169a1 100644
|
||||
--- a/csh.cshrc
|
||||
+++ b/csh.cshrc
|
||||
@@ -2,14 +2,8 @@
|
||||
#
|
||||
# csh configuration for all shell invocations.
|
||||
|
||||
-# By default, we want this to get set.
|
||||
-# Even for non-interactive, non-login shells.
|
||||
-# Current threshold for system reserved uid/gids is 200
|
||||
-# You could check uidgid reservation validity in
|
||||
-# /usr/share/doc/setup-*/uidgid file
|
||||
-if ($uid > 199 && "`/usr/bin/id -gn`" == "`/usr/bin/id -un`") then
|
||||
- umask 002
|
||||
-else
|
||||
+# Set default umask for non-login shell only if it is set to 0
|
||||
+if ( `umask` == 0 ) then
|
||||
umask 022
|
||||
endif
|
||||
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
|
||||
|
||||
|
||||
|
|
@ -0,0 +1,58 @@
|
|||
commit ddd74b5d971a734c7e88cda3764f7e059f163b51
|
||||
Author: Pavel Zhukov <pzhukov@redhat.com>
|
||||
Date: Wed Jul 14 11:43:39 2021 +0200
|
||||
|
||||
Add fallback to hostname determination
|
||||
|
||||
Use hostname in case if hostnamectl is not available/not functional.
|
||||
fallback to uname in case if both hostname and hostnamectl are
|
||||
missed (in containers)
|
||||
|
||||
diff --git a/profile b/profile
|
||||
index 783fe17..542add4 100644
|
||||
--- a/profile
|
||||
+++ b/profile
|
||||
@@ -42,7 +42,10 @@ else
|
||||
pathmunge /usr/sbin after
|
||||
fi
|
||||
|
||||
-HOSTNAME=`/usr/bin/hostnamectl --transient 2>/dev/null`
|
||||
+HOSTNAME=$(/usr/bin/hostnamectl --transient 2>/dev/null) || \
|
||||
+HOSTNAME=$(/usr/bin/hostname 2>/dev/null) || \
|
||||
+HOSTNAME=$(/usr/bin/uname -n)
|
||||
+
|
||||
HISTSIZE=1000
|
||||
if [ "$HISTCONTROL" = "ignorespace" ] ; then
|
||||
export HISTCONTROL=ignoreboth
|
||||
commit f20b64fc99267d2343aa9141cf709ac1131bc178
|
||||
Author: Pavel Zhukov <pzhukov@redhat.com>
|
||||
Date: Thu Jul 15 10:31:57 2021 +0200
|
||||
|
||||
Do not use hostnamectl in csh
|
||||
|
||||
diff --git a/csh.cshrc b/csh.cshrc
|
||||
index c3a37a3..eda4aa7 100644
|
||||
--- a/csh.cshrc
|
||||
+++ b/csh.cshrc
|
||||
@@ -20,7 +20,7 @@ if ($?prompt) then
|
||||
# make completion work better by default
|
||||
set autolist
|
||||
else
|
||||
- set prompt=\[$user@`/usr/bin/hostnamectl --transient | cut -d'.' -f1`\]\$\
|
||||
+ set prompt=\[$user@`/usr/bin/hostname`\]\$\
|
||||
endif
|
||||
endif
|
||||
|
||||
diff --git a/csh.login b/csh.login
|
||||
index 2da86c9..e4b1990 100644
|
||||
--- a/csh.login
|
||||
+++ b/csh.login
|
||||
@@ -25,7 +25,7 @@ else
|
||||
end
|
||||
endif
|
||||
|
||||
-setenv HOSTNAME `/usr/bin/hostnamectl --transient`
|
||||
+setenv HOSTNAME `/usr/bin/hostname`
|
||||
set history=1000
|
||||
|
||||
if ( -d /etc/profile.d ) then
|
||||
|
|
@ -1,45 +1,32 @@
|
|||
Summary: A set of system configuration and setup files
|
||||
Name: setup
|
||||
Version: 2.12.2
|
||||
Release: 9%{?dist}
|
||||
Version: 2.13.7
|
||||
Release: 10%{?dist}
|
||||
License: Public Domain
|
||||
Group: System Environment/Base
|
||||
URL: https://pagure.io/setup/
|
||||
Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
|
||||
Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
|
||||
BuildArch: noarch
|
||||
BuildRequires: bash tcsh perl-interpreter
|
||||
#systemd-rpm-macros: required to use _tmpfilesdir macro
|
||||
BuildRequires: make
|
||||
BuildRequires: bash tcsh perl-interpreter systemd-rpm-macros
|
||||
#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.12.2-lang.csh-typos.patch
|
||||
Patch2: setup-2.12.2-pcp-aliases.patch
|
||||
Patch3: setup-2.12.2-empty-path.patch
|
||||
Patch4: setup-2.12.2-lang.csh-prevent-grep-from-failing.patch
|
||||
Patch5: setup-2.12.2-use-full-path-for-non-builtins.patch
|
||||
Patch6: setup-2.12.2-nrpe-services.patch
|
||||
Patch7: setup-2.12.2-csh.login-unset-p.patch
|
||||
Patch8: setup-2.12.2-bashrc-remove-VTE-specific-PROMPT_COMMAND.patch
|
||||
Patch9: setup-2.12.2-set-lang-as-env-var.patch
|
||||
Patch0: setup-hostname.patch
|
||||
Patch1: csh.login-unset-p.patch
|
||||
Patch2: bashrc-remove-VTE-specific-PROMPT_COMMAND.patch
|
||||
Patch3: dont-set-hardcoded-umask.patch
|
||||
Patch4: csh.login-source-csh.local.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
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch9 -p1
|
||||
|
||||
%autosetup -p1
|
||||
./shadowconvert.sh
|
||||
|
||||
%build
|
||||
|
|
@ -51,12 +38,11 @@ make check
|
|||
%install
|
||||
rm -rf %{buildroot}
|
||||
mkdir -p %{buildroot}/etc/profile.d
|
||||
mkdir -p %{buildroot}/etc/motd.d
|
||||
cp -ar * %{buildroot}/etc
|
||||
mv %{buildroot}/etc/lang* %{buildroot}/etc/profile.d/
|
||||
rm -f %{buildroot}/etc/uidgid
|
||||
rm -f %{buildroot}/etc/COPYING
|
||||
rm -f %{buildroot}/etc/hosts.allow
|
||||
rm -f %{buildroot}/etc/hosts.deny
|
||||
mkdir -p %{buildroot}/var/log
|
||||
touch %{buildroot}/etc/environment
|
||||
chmod 0644 %{buildroot}/etc/environment
|
||||
|
|
@ -65,6 +51,15 @@ touch %{buildroot}/etc/fstab
|
|||
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
|
||||
mkdir -p %{buildroot}/run/motd.d
|
||||
touch %{buildroot}/run/motd
|
||||
mkdir -p %{buildroot}/usr/lib/motd.d
|
||||
touch %{buildroot}/usr/lib/motd
|
||||
#tmpfiles needed for files in /run
|
||||
mkdir -p %{buildroot}%{_tmpfilesdir}
|
||||
echo "f /run/motd 0644 root root -" >%{buildroot}%{_tmpfilesdir}/%{name}.conf
|
||||
echo "d /run/motd.d 0755 root root -" >>%{buildroot}%{_tmpfilesdir}/%{name}.conf
|
||||
chmod 0644 %{buildroot}%{_tmpfilesdir}/%{name}.conf
|
||||
|
||||
# remove unpackaged files from the buildroot
|
||||
rm -f %{buildroot}/etc/Makefile
|
||||
|
|
@ -108,6 +103,11 @@ end
|
|||
%config(noreplace) /etc/host.conf
|
||||
%verify(not md5 size mtime) %config(noreplace) /etc/hosts
|
||||
%verify(not md5 size mtime) %config(noreplace) /etc/motd
|
||||
%dir /etc/motd.d
|
||||
%verify(not md5 size mtime) %config(noreplace) /run/motd
|
||||
%dir /run/motd.d
|
||||
%verify(not md5 size mtime) %config(noreplace) /usr/lib/motd
|
||||
%dir /usr/lib/motd.d
|
||||
%config(noreplace) /etc/printcap
|
||||
%verify(not md5 size mtime) %config(noreplace) /etc/inputrc
|
||||
%config(noreplace) /etc/bashrc
|
||||
|
|
@ -123,40 +123,88 @@ end
|
|||
/etc/profile.d/lang.{sh,csh}
|
||||
%config(noreplace) %verify(not md5 size mtime) /etc/shells
|
||||
%ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/fstab
|
||||
%{_tmpfilesdir}/%{name}.conf
|
||||
/etc/dnf/protected.d/%{name}.conf
|
||||
|
||||
%changelog
|
||||
* Mon Nov 28 2022 Martin Osvald <mosvald@redhat.com> - 2.12.2-9
|
||||
- Add missing %patch macro
|
||||
* Wed Feb 07 2024 Martin Osvald <mosvald@redhat.com> - 2.13.7-10
|
||||
- csh.login: Add csh.local into foreach loop (RHEL-17226)
|
||||
|
||||
* Sat Nov 26 2022 Martin Osvald <mosvald@redhat.com> - 2.12.2-8
|
||||
- Don't set LANG as a per-shell variable (#2029787)
|
||||
* Wed Dec 21 2022 Martin Osvald <mosvald@redhat.com> - 2.13.7-9
|
||||
- make setup protected package (#2155529)
|
||||
|
||||
* Mon May 09 2022 Martin Osvald <mosvald@redhat.com> - 2.12.2-7
|
||||
- Move /var/log/lastlog ownership to systemd (#2044589)
|
||||
- tcsh sets variable p to /usr/sbin from /etc/csh.login (#1945400)
|
||||
- bashrc: Don't set up VTE-specific PROMPT_COMMAND (#1917934)
|
||||
* Thu Nov 24 2022 Martin Osvald <mosvald@redhat.com> - 2.13.7-8
|
||||
- Set default umask for non-login shell only if it is set to 0 (#2062601)
|
||||
|
||||
* Wed Apr 15 2020 Pavel Zhukov <pzhukov@redhat.com> - 2.12.2-6
|
||||
- make setup protected package (#1755997)
|
||||
* Mon May 09 2022 Martin Osvald <mosvald@redhat.com> - 2.13.7-7
|
||||
- Move /var/log/lastlog ownership to systemd (#2066753)
|
||||
- tcsh sets variable p to /usr/sbin from /etc/csh.login (#2066767)
|
||||
- bashrc: Don't set up VTE-specific PROMPT_COMMAND (#2026892)
|
||||
|
||||
* Wed Oct 30 2019 Martin Osvald <mosvald@redhat.com> - 2.12.2-5
|
||||
- rebuilt to fix version
|
||||
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 2.13.7-6
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Wed Oct 09 2019 Martin Osvald <mosvald@redhat.com> - 2.12.2-3
|
||||
- add pcp user to /etc/aliases (#1744089)
|
||||
- set PATH if it is empty in csh.login (#1744104)
|
||||
- lang.csh: prevent grep from failing so scripts do not end
|
||||
prematurely when tcsh -e option in use (#1678706)
|
||||
- use full path for non-builtins (#1688302)
|
||||
- add nrpe tcp port 5666 to /etc/services (#1730396)
|
||||
* Fri Jul 16 2021 Pavel Zhukov <pzhukov@redhat.com> - 2.13.7-5
|
||||
- Add fallback for hostname determination (#1958745)
|
||||
|
||||
* Wed Sep 25 2019 Martin Osvald <mosvald@redhat.com> - 2.12.2-2.1
|
||||
- fix lang.csh script so .cshrc gets read again (#1755360)
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 2.13.7-4
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Sat Mar 16 2019 Ondrej Vasik <ovasik@redhat.com> - 2.12.2-2
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.7-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.7-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Tue Jun 23 2020 Pavel Zhukov <pzhukov@redhat.com> - 2.13.7-1
|
||||
- Switch to hostnamectl
|
||||
- Add nrpe tcp port 5666 to /etc/services
|
||||
- Do not set umask from profile
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Oct 03 2019 Martin Osvald <mosvald@redhat.com> - 2.13.6-1
|
||||
- csh.login: set PATH again (if empty) to prevent interpreter error (#1744106)
|
||||
- aliases: add pcp user (#1744091)
|
||||
- lang.csh: fix several variable substitution bugs and typos (#1746749)
|
||||
- don't set LANG as a per-shell variable
|
||||
- fix lang.csh script so it doesn't break tcsh -e scripts II (#1620004)
|
||||
- use full path for non-builtins in csh.cshrc, csh.login, lang.csh, lang.sh and profile (#1747493)
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Tue Apr 09 2019 Ondrej Vasik <ovasik@redhat.com> - 2.13.3-1
|
||||
- fix typo in lang.sh (#1697311)
|
||||
|
||||
* Sat Feb 23 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.13.2-1
|
||||
- reset inherited locale settings to C.UTF-8 if invalid (PR#18)
|
||||
|
||||
* Wed Feb 20 2019 Ondrej Vasik <ovasik@redhat.com> - 2.13.1-1
|
||||
- do not ship /etc/hosts.allow and /etc/hosts.deny (no need for them
|
||||
as we don't allow tcp_wrappers in RHEL8, #1663556)
|
||||
in default Fedora)
|
||||
- require systemd-rpm-macros instead of systemd
|
||||
|
||||
* Sat Feb 02 2019 Robert Fairley <rfairley@redhat.com> - 2.12.7-1
|
||||
- add setup.conf tmpfile to create /run/{motd,motd.d} on boot
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.12.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Thu Dec 13 2018 Robert Fairley <rfairley@redhat.com> - 2.12.6-1
|
||||
- add ownership of /run/{motd,motd.d} and /usr/lib/{motd,motd.d}
|
||||
|
||||
* Wed Dec 12 2018 Ondrej Vasik <ovasik@redhat.com> - 2.12.5-1
|
||||
- use full path for non-builtins in profile and lang.sh (#1648589)
|
||||
|
||||
* Mon Dec 10 2018 Robert Fairley <rfairley@redhat.com> - 2.12.4-1
|
||||
- own /etc/motd.d
|
||||
|
||||
* Fri Oct 26 2018 Ondrej Vasik <ovasik@redhat.com> - 2.12.3-1
|
||||
- inputrc - replace quoted-insert with overwrite-mode
|
||||
for the "Insert" key
|
||||
|
||||
* Mon Sep 10 2018 Ondrej Vasik <ovasik@redhat.com> - 2.12.2-1
|
||||
- fix lang.csh script so it doesn't break tcsh -e scripts (#1620004)
|
||||
Loading…
Reference in New Issue