diff --git a/dist b/dist
new file mode 100644
index 0000000000000000000000000000000000000000..9c0e36ec42a2d9bfefacb21ac6354c9ddd910533
--- /dev/null
+++ b/dist
@@ -0,0 +1 @@
+an8
diff --git a/download b/download
new file mode 100644
index 0000000000000000000000000000000000000000..2dbd3a70820fec8b4adc79531c9bcfe01fa83ce9
--- /dev/null
+++ b/download
@@ -0,0 +1 @@
+def03c51abff32cfdd87f041e063b146  setup-2.12.2.tar.bz2
diff --git a/setup-2.12.2-bashrc-remove-VTE-specific-PROMPT_COMMAND.patch b/setup-2.12.2-bashrc-remove-VTE-specific-PROMPT_COMMAND.patch
new file mode 100644
index 0000000000000000000000000000000000000000..ba98face4e045def7043dd685c66600bfa0cee24
--- /dev/null
+++ b/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/setup-2.12.2-csh.login-unset-p.patch b/setup-2.12.2-csh.login-unset-p.patch
new file mode 100644
index 0000000000000000000000000000000000000000..42654dfab933f885099b738bc856ed3c63ec13e6
--- /dev/null
+++ b/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/setup-2.12.2.tar.bz2 b/setup-2.12.2.tar.bz2
deleted file mode 100644
index 0cbc33e31b8e3bed45e9cabbfb5fcbc166cc284d..0000000000000000000000000000000000000000
Binary files a/setup-2.12.2.tar.bz2 and /dev/null differ
diff --git a/setup.spec b/setup.spec
index 5bbf1731118ca68cafea5af2b3d03ee3dd9bd8f9..b29ef5a3bc561ef715a8b77a021d4591a1882743 100644
--- a/setup.spec
+++ b/setup.spec
@@ -3,7 +3,7 @@
 Summary: A set of system configuration and setup files
 Name: setup
 Version: 2.12.2
-Release: 6%{anolis_release}%{?dist}
+Release: 7%{anolis_release}%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: https://pagure.io/setup/
@@ -21,6 +21,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
@@ -43,6 +45,8 @@ Doc pages for %{name}.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 ./shadowconvert.sh
 
@@ -62,11 +66,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
@@ -127,7 +129,6 @@ 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
 
@@ -135,9 +136,14 @@ end
 %doc uidgid
 
 %changelog
-* Sun Jul 17 2022 Xiaoping Liu <liuxiaoping@alibaba-inc.com> - 2.12.2-6.0.1
+* Tue Jan 03 2023 Xiaoping Liu <liuxiaoping@alibaba-inc.com> - 2.12.2-7.0.1
 - Add doc sub package
 
+* 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)
+
 * Wed Apr 15 2020 Pavel Zhukov <pzhukov@redhat.com> - 2.12.2-6
 - make setup protected package (#1755997)