From c1c0191257d97fceee3892c64a0a77b4ac93f2e7 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 08 2022 07:05:49 +0000 Subject: import setup-2.12.2-7.el8 --- diff --git a/SOURCES/setup-2.12.2-bashrc-remove-VTE-specific-PROMPT_COMMAND.patch b/SOURCES/setup-2.12.2-bashrc-remove-VTE-specific-PROMPT_COMMAND.patch new file mode 100644 index 0000000..ba98fac --- /dev/null +++ b/SOURCES/setup-2.12.2-bashrc-remove-VTE-specific-PROMPT_COMMAND.patch @@ -0,0 +1,13 @@ +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 diff --git a/SOURCES/setup-2.12.2-csh.login-unset-p.patch b/SOURCES/setup-2.12.2-csh.login-unset-p.patch new file mode 100644 index 0000000..42654df --- /dev/null +++ b/SOURCES/setup-2.12.2-csh.login-unset-p.patch @@ -0,0 +1,12 @@ +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` diff --git a/SPECS/setup.spec b/SPECS/setup.spec index daa5db9..77bd89b 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.12.2 -Release: 6%{?dist} +Release: 7%{?dist} License: Public Domain Group: System Environment/Base URL: https://pagure.io/setup/ @@ -19,6 +19,8 @@ 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 %description The setup package contains a set of important system configuration and @@ -33,6 +35,8 @@ setup files, such as passwd, group, and profile. %patch4 -p1 %patch5 -p1 %patch6 -p1 +%patch7 -p1 +%patch8 -p1 ./shadowconvert.sh @@ -52,11 +56,9 @@ rm -f %{buildroot}/etc/COPYING rm -f %{buildroot}/etc/hosts.allow rm -f %{buildroot}/etc/hosts.deny 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 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 @@ -118,11 +120,15 @@ end %config(noreplace) /etc/profile.d/csh.local /etc/profile.d/lang.{sh,csh} %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 /etc/dnf/protected.d/%{name}.conf %changelog +* Mon May 09 2022 Martin Osvald - 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) + * Wed Apr 15 2020 Pavel Zhukov - 2.12.2-6 - make setup protected package (#1755997)