Compare commits

...

No commits in common. "c8" and "c10s" have entirely different histories.
c8 ... c10s

19 changed files with 428 additions and 467 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

91
.gitignore vendored
View File

@ -1 +1,90 @@
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
/setup-2.13.8.tar.bz2
/setup-2.13.9.tar.gz
/setup-2.13.9.1.tar.gz
/setup-2.13.10.tar.gz
/setup-2.14.1.tar.gz
/setup-2.14.2.tar.gz
/setup-2.14.3.tar.gz
/setup-2.14.4.tar.gz
/setup-2.14.5.tar.gz

View File

@ -1 +0,0 @@
49420801c2cd3499feb2332670988d34a00aceb2 SOURCES/setup-2.12.2.tar.bz2

View File

@ -1,13 +0,0 @@
diff --git a/bashrc b/bashrc
index d19a7c1..d462ac7 100644
--- a/bashrc
+++ b/bashrc
@@ -19,8 +19,6 @@ if [ -z "$BASHRCSOURCED" ]; then
xterm*|vte*)
if [ -e /etc/sysconfig/bash-prompt-xterm ]; then
PROMPT_COMMAND=/etc/sysconfig/bash-prompt-xterm
- elif [ "${VTE_VERSION:-0}" -ge 3405 ]; then
- PROMPT_COMMAND="__vte_prompt_command"
else
PROMPT_COMMAND='printf "\033]0;%s@%s:%s\007" "${USER}" "${HOSTNAME%%.*}" "${PWD/#$HOME/\~}"'
fi

View File

@ -1,12 +0,0 @@
diff --git a/csh.login b/csh.login
index e4b1990..18c5136 100644
--- a/csh.login
+++ b/csh.login
@@ -23,6 +23,7 @@ else
breaksw
endsw
end
+ unset p
endif
setenv HOSTNAME `/usr/bin/hostname`

View File

@ -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

View File

@ -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})

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

22
add-clock-group.patch Normal file
View File

@ -0,0 +1,22 @@
diff --git a/group b/group
index 13a6276..6a25aea 100644
--- a/group
+++ b/group
@@ -21,4 +21,5 @@ ftp::50:
lock::54:
audio::63:
users::100:
+clock::103:
nobody::65534:
diff --git a/uidgid b/uidgid
index c895738..38b4108 100644
--- a/uidgid
+++ b/uidgid
@@ -111,6 +111,7 @@ ident 98 98 / /usr/sbin/nologin ident
# Note: 99 used to be the old uid for nobody, now moved to 65534, do not reuse
users - 100 - - setup
ssh_keys - 101 - - openssh
+clock - 103 - - systemd
input - 104 - - systemd
render - 105 - - systemd
sgx - 106 - - systemd

View File

@ -1,166 +1,140 @@
Summary: A set of system configuration and setup files
Name: setup
Version: 2.12.2
Release: 9%{?dist}
License: Public Domain
Group: System Environment/Base
URL: https://pagure.io/setup/
Source0: http://releases.pagure.org/%{name}/%{name}-%{version}.tar.bz2
BuildArch: noarch
BuildRequires: bash tcsh perl-interpreter
#require system release for saner dependency order
Requires: system-release
Conflicts: filesystem < 3
Conflicts: initscripts < 4.26, bash <= 2.0.4-21
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 2.14.5-4
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
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
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.14.5-3
- Bump release for June 2024 mass rebuild
%description
The setup package contains a set of important system configuration and
setup files, such as passwd, group, and profile.
* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
%prep
%setup -q
* Wed Nov 29 2023 Martin Osvald <mosvald@redhat.com> - 2.14.5-1
- bashrc: switch PROMPT_COMMAND to be an array (rhbz#2097525)
- profile: don't overwrite the HISTSIZE environment variable
- hosts: use "example.org" as example domain (rhbz#2246220)
- csh.login: source csh.local (RHEL-17226)
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
* Tue Jul 25 2023 Martin Osvald <mosvald@redhat.com> - 2.14.4-1
- protocols: add mptcp (262)
- setup.spec: make setup protected package (rhbz#2155547)
- setup.spec: don't report rpm -Va error on /run/motd (rhbz#2160954)
- services: replace hostmon with llmnr for port 5355 (rhbz#2216914)
./shadowconvert.sh
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
%build
* Tue Feb 21 2023 Than Ngo <than@redhat.com> - 2.14.3-3
- migrated to SPDX license
%check
# Run any sanity checks.
make check
* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/etc/profile.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
chmod 0400 %{buildroot}/etc/{shadow,gshadow}
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
* Sun Nov 27 2022 Martin Osvald <mosvald@redhat.com> - 2.14.3-1
- sysusers.d: add script and generate configuration fragment for users
- Add fallback to hostname determination for csh.login (rhbz#2079768)
- Remove ancient Conflicts
- files: mark /run/motd as an ephemeral ghost entry
# 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
rm -rf %{buildroot}/etc/contrib
* Thu Sep 08 2022 Martin Osvald <mosvald@redhat.com> - 2.14.2-1
- sysusers.d: add script and configuration fragments for groups
- passwd: align 'nologin' shell path with systemd defaults
- uidgid: assign GID 101 for 'ssh_keys' group
- uidgid: assign UID/GID 114 for 'polkitd'
- passwd: update GECOS field for 'root' user
- services: remove commas from aliases for ircu-3
- setup.spec: throw away newaliases output again
# make setup a protected package
install -p -d -m 755 %{buildroot}/etc/dnf/protected.d/
touch %{name}.conf
echo setup > %{name}.conf
install -p -c -m 0644 %{name}.conf %{buildroot}/etc/dnf/protected.d/
rm -f %{name}.conf
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.14.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
#throw away useless and dangerous update stuff until rpm will be able to
#handle it ( http://rpm.org/ticket/6 )
%post -p <lua>
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
* Wed Jul 20 2022 Martin Osvald <mosvald@redhat.com> - 2.14.1-1
- bashrc sets hardcoded umask (#1902166)
- bashrc: clean up unused references to VTE
- uidgid: simplify table format and other format enhancements
- uidgid: fix news and lock entries, move basic groups to systemd
%files
%license COPYING
%doc uidgid
%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
%verify(not md5 size mtime) %config(noreplace) /etc/subuid
%verify(not md5 size mtime) %config(noreplace) /etc/subgid
%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
%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
%config(noreplace) /etc/ethertypes
%config(noreplace) /etc/csh.login
%config(noreplace) /etc/csh.cshrc
%config(noreplace) /etc/networks
%dir /etc/profile.d
%config(noreplace) /etc/profile.d/sh.local
%config(noreplace) /etc/profile.d/csh.local
/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
/etc/dnf/protected.d/%{name}.conf
* Fri May 27 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.13.10-2
- Fix %%post scriptlet to not require the shell
%changelog
* Mon Nov 28 2022 Martin Osvald <mosvald@redhat.com> - 2.12.2-9
- Add missing %patch macro
* Sat May 07 2022 Martin Osvald <mosvald@redhat.com> - 2.13.10-1
- Move /var/log/lastlog ownership to systemd (#1798685)
- tcsh sets variable p to /usr/sbin from /etc/csh.login (#2019874)
- 'history -a' doesn't belong in /etc/bashrc (#1871744)
- localhost.localdomain in wrong order /etc/hosts (#1724539)
* Sat Nov 26 2022 Martin Osvald <mosvald@redhat.com> - 2.12.2-8
- Don't set LANG as a per-shell variable (#2029787)
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.9.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* 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)
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.9.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Wed Apr 15 2020 Pavel Zhukov <pzhukov@redhat.com> - 2.12.2-6
- make setup protected package (#1755997)
* Fri Jul 16 2021 Pavel Zhukov <pzhukov@redhat.com> - 2.13.9.1-1
- Bugfix release 2.13.9.1
* Wed Oct 30 2019 Martin Osvald <mosvald@redhat.com> - 2.12.2-5
- rebuilt to fix version
* Thu Jul 15 2021 Pavel Zhukov <pzhukov@redhat.com> - 2.13.9-1
- New version v2.13.9
* 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)
* Thu Mar 11 2021 Pavel Zhukov <pzhukov@redhat.com> - 2.13.8-1
- New version v2.13.8
* Wed Sep 25 2019 Martin Osvald <mosvald@redhat.com> - 2.12.2-2.1
- fix lang.csh script so .cshrc gets read again (#1755360)
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.13.7-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Sat Mar 16 2019 Ondrej Vasik <ovasik@redhat.com> - 2.12.2-2
* 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)
* Fri Jul 13 2018 Ondrej Vasik <ovasik@redhat.com> - 2.12.1-1
- fix cut&paste error in lang.csh script (#1598268)
@ -201,7 +175,7 @@ end
- updated IANA services based on input from K.Vogel
* Thu Aug 10 2017 Ondrej Vasik <ovasik@redhat.com> - 2.10.6-1
- create contrib directory,
- create contrib directory,
add IANA parser script by V.Skyttä (#1380333)
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.10.5-3
@ -236,7 +210,7 @@ end
* Fri Jan 30 2015 Ondrej Vasik <ovasik@redhat.com> - 2.9.5-1
- assign uidgid for systemd-network(192:192) - FPC 481,bz#1102002
- assign uidgid for systemd-resolve(193:193) - FPC 481,bz#1102002
- assign uidgid for systemd-resolve(193:193) - FPC 481,bz#1102002
* Wed Jan 07 2015 Ondrej Vasik <ovasik@redhat.com> - 2.9.4-1
- group tape should use 33 and not 30 (#1179585)

1
ci.fmf Normal file
View File

@ -0,0 +1 @@
resultsdb-testcase: separate

25
gating.yaml Normal file
View File

@ -0,0 +1,25 @@
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_testing
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#Rawhide
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_stable
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#gating rhel
--- !Policy
product_versions:
- rhel-*
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}

36
plans.fmf Normal file
View File

@ -0,0 +1,36 @@
/tier1-internal:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/setup.git
name: /plans/tier1/internal
/tier1-public:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/setup.git
name: /plans/tier1/public
/tier2-tier3-internal:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/setup.git
name: /plans/tier2-tier3/internal
/tier2-tier3-public:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/setup.git
name: /plans/tier2-tier3/public
/others-internal:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/setup.git
name: /plans/others/internal
/others-public:
plan:
import:
url: https://gitlab.com/redhat/centos-stream/tests/setup.git
name: /plans/others/public

137
setup.spec Normal file
View File

@ -0,0 +1,137 @@
Summary: A set of system configuration and setup files
Name: setup
Version: 2.14.5
Release: %autorelease
License: LicenseRef-Fedora-Public-Domain
Group: System Environment/Base
URL: https://pagure.io/setup/
Source0: https://releases.pagure.org/%{name}/%{name}-%{version}.tar.gz
BuildArch: noarch
#systemd-rpm-macros: required to use _tmpfilesdir macro
# https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
BuildRequires: make
BuildRequires: bash tcsh perl-interpreter systemd-rpm-macros
#require system release for saner dependency order
Requires: system-release
Patch0: add-clock-group.patch
%description
The setup package contains a set of important system configuration and
setup files, such as passwd, group, and profile.
%prep
%setup -q
%autopatch -p1
./generate-sysusers-fragments.sh
./shadowconvert.sh
%build
%check
# Run any sanity checks.
make check
%install
rm -rf %{buildroot}
mkdir -p %{buildroot}/etc
cp -ar * %{buildroot}/etc
mkdir -p %(dirname %{buildroot}%{_sysusersdir})
mv %{buildroot}/etc/sysusers.d %{buildroot}%{_sysusersdir}
mkdir -p %{buildroot}/etc/profile.d
mv %{buildroot}/etc/lang* %{buildroot}/etc/profile.d/
rm -f %{buildroot}/etc/uidgid
rm -f %{buildroot}/etc/COPYING
mkdir -p %{buildroot}/var/log
touch %{buildroot}/etc/environment
chmod 0644 %{buildroot}/etc/environment
chmod 0400 %{buildroot}/etc/{shadow,gshadow}
touch %{buildroot}/etc/fstab
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}/etc/motd.d
mkdir -p %{buildroot}/run/motd.d
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
rm -f %{buildroot}/etc/serviceslint
rm -f %{buildroot}/etc/uidgidlint
rm -f %{buildroot}/etc/generate-sysusers-fragments.sh
rm -f %{buildroot}/etc/shadowconvert.sh
rm -f %{buildroot}/etc/setup.spec
rm -rf %{buildroot}/etc/contrib
# make setup a protected package
install -p -d -m 755 %{buildroot}/etc/dnf/protected.d/
touch %{name}.conf
echo setup > %{name}.conf
install -p -c -m 0644 %{name}.conf %{buildroot}/etc/dnf/protected.d/
rm -f %{name}.conf
#throw away useless and dangerous update stuff until rpm will be able to
#handle it ( http://rpm.org/ticket/6 )
%post -p <lua>
for i, name in ipairs({"passwd", "shadow", "group", "gshadow"}) do
os.remove("/etc/"..name..".rpmnew")
end
if posix.access("/usr/bin/newaliases", "x") then
local pid = posix.fork()
if pid == 0 then
posix.redirect2null(1)
posix.exec("/usr/bin/newaliases")
elseif pid > 0 then
posix.wait(pid)
end
end
%files
%license COPYING
%doc uidgid
%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
%verify(not md5 size mtime) %config(noreplace) /etc/subuid
%verify(not md5 size mtime) %config(noreplace) /etc/subgid
%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
%verify(not md5 size mtime) %config(noreplace) /etc/motd
%dir /etc/motd.d
%ghost %verify(not md5 size mtime) %attr(0644,root,root) /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
%config(noreplace) /etc/profile
%config(noreplace) /etc/protocols
%config(noreplace) /etc/ethertypes
%config(noreplace) /etc/csh.login
%config(noreplace) /etc/csh.cshrc
%config(noreplace) /etc/networks
%dir /etc/profile.d
%config(noreplace) /etc/profile.d/sh.local
%config(noreplace) /etc/profile.d/csh.local
/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
%{_sysusersdir}/20-setup-groups.conf
%{_sysusersdir}/20-setup-users.conf
/etc/dnf/protected.d/%{name}.conf
%changelog
%autochangelog

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (setup-2.14.5.tar.gz) = d9ed7ac05767cf8e52a2dc1d5f22c2027db89fa9ec7f6c6801e614a7855cee947624958f717de6ff4c7e9217036b155aaf4770fbd309c9aa7679ba1a74cbc5fb