diff --git a/_servicedata b/_servicedata
index 8ed08f2..05b0854 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,5 @@
https://github.com/openSUSE/aaa_base.git
- cab7b44076ce52124cfaf556f2e3f17be6ff3802
- https://github.com/lnussel/aaa_base.git
- 0f8eaba2cf2e69db15cce8a4dcf005b6e88f61e6
\ No newline at end of file
+ 57ee9e1a842e029646a8d9551ed492ef6993ec82
+
\ No newline at end of file
diff --git a/aaa_base-84.87+git20230815.cab7b44.tar b/aaa_base-84.87+git20240620.57ee9e1.tar
similarity index 90%
rename from aaa_base-84.87+git20230815.cab7b44.tar
rename to aaa_base-84.87+git20240620.57ee9e1.tar
index 636042d..26a6e79 100644
Binary files a/aaa_base-84.87+git20230815.cab7b44.tar and b/aaa_base-84.87+git20240620.57ee9e1.tar differ
diff --git a/aaa_base.changes b/aaa_base.changes
index c1ff312..6ca236a 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,3 +1,63 @@
+-------------------------------------------------------------------
+Fri Jun 21 07:42:46 UTC 2024 - kukuk@suse.com
+
+- Update to version 84.87+git20240620.57ee9e1:
+ * Remove legacy-actions support [jsc#PED-264]
+
+-------------------------------------------------------------------
+Mon Jun 17 16:05:14 UTC 2024 - ro@suse.com
+
+- Update to version 84.87+git20240617.f5ff27f:
+ * add /usr/bin/nu to etc/shells for nushell
+
+-------------------------------------------------------------------
+Fri Jun 14 12:18:04 UTC 2024 - ro@suse.com
+
+- Update to version 84.87+git20240614.332933e:
+ * Do not save/restore cursor for foot at status line
+ * Add tmux and others to DIR_COLORS (Issue #116)
+ * Remove kernel.pid_max limit (bsc#1219038)
+ * Add subpackge to enable ptrace
+
+-------------------------------------------------------------------
+Fri May 24 11:48:00 UTC 2024 - kukuk@suse.com
+
+- Update to version 84.87+git20240523.10a5692:
+ * Add tmpfiles.d/soft-reboot-cleanup.conf
+
+-------------------------------------------------------------------
+Mon Apr 15 15:49:43 UTC 2024 - lnussel@suse.com
+
+- Update to version 84.87+git20240415.e6815bf:
+ * drop obsolete 50-default-s390.conf (bsc#1211721)
+ * fix typo in alljava.csh and drop stderr redirection
+
+-------------------------------------------------------------------
+Tue Apr 02 11:16:55 UTC 2024 - lnussel@suse.com
+
+- Update to version 84.87+git20240402.16596d1:
+ * add alacritty to DIR_COLORS
+ * Make sure tput it present before resetting TERM
+ * Add mc helpers for both tcsh and bash resources
+ * Do not overwrite escape sequences for xterm like
+ * Check for valid TERM
+
+-------------------------------------------------------------------
+Fri Feb 02 12:55:26 UTC 2024 - ro@suse.com
+
+- Update to version 84.87+git20240202.9526d46:
+ * properly shorten the variable when setting JAVA_HOME and JRE_HOME
+ * silence output of alljava
+ * Restrict ptrace with Yama LSM by default
+ * patch alljava.sh and alljava.csh, use the links from update alternatives
+
+-------------------------------------------------------------------
+Mon Oct 23 07:15:15 UTC 2023 - lnussel@suse.de
+
+- Update to version 84.87+git20231023.f347d36:
+ * Remove %ghost lastlog entry, lastlog is long gone
+ * Remove shaky safe-rm and safe-rmdir helpers (bsc#1159103)
+
-------------------------------------------------------------------
Tue Aug 15 08:35:38 UTC 2023 - lnussel@suse.com
diff --git a/aaa_base.spec b/aaa_base.spec
index d794716..df670ad 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -1,7 +1,7 @@
#
# spec file for package aaa_base
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -33,7 +33,7 @@ BuildRequires: git-core
%endif
Name: aaa_base
-Version: 84.87+git20230815.cab7b44%{git_version}
+Version: 84.87+git20240620.57ee9e1%{git_version}
Release: 0
Summary: openSUSE Base Package
License: GPL-2.0-or-later
@@ -103,6 +103,18 @@ This package includes some special settings needed on Windows Subsystem
for Linux. It should only be installed on WSL and not on regular Linux
systems.
+%package yama-enable-ptrace
+Summary: sysctl setting to allow ptrace with the YAMA LSM enabled
+Group: System/Fhs
+Requires: %{name} = %{version}
+
+%description yama-enable-ptrace
+When the YAMA LSM is enabled, ptrace is restriced by default. On
+developer systems this has an impact on e.g. strace and gdb. So
+this package contains a setting that allows ptrace again.
+
+See https://docs.kernel.org/admin-guide/LSM/Yama.html
+
%prep
%setup -q
@@ -112,10 +124,6 @@ systems.
%install
%make_install
mkdir -p %{buildroot}/etc/sysctl.d
-case "$RPM_ARCH" in
- s390*) ;;
- *) rm -f %{buildroot}/usr/lib/sysctl.d/50-default-s390.conf ;;
-esac
#
# make sure it does not creep in again
test -d %{buildroot}/root/.gnupg && exit 1
@@ -124,8 +132,6 @@ mkdir -p %{buildroot}/etc/init.d
for i in boot.local after.local ; do
install -m 755 /dev/null %{buildroot}/etc/init.d/$i
done
-#
-install -d -m 755 %buildroot%{_libexecdir}/initscripts/legacy-actions
# keep as ghost for migration
touch %buildroot/etc/inittab
@@ -193,16 +199,16 @@ mkdir -p %{buildroot}%{_fillupdir}
/usr/etc/profile.d/ls.tcsh
/usr/etc/profile.d/ls.bash
/usr/etc/profile.d/ls.zsh
+/usr/etc/profile.d/terminal.sh
+/usr/etc/profile.d/terminal.csh
%dir /usr/lib/environment.d
/usr/lib/environment.d/50-xdg.conf
+%{_tmpfilesdir}/soft-reboot-cleanup.conf
%config /etc/shells
%ghost %dir /etc/init.d
%ghost %config(noreplace) /etc/init.d/boot.local
%ghost %config(noreplace) /etc/init.d/after.local
%ghost %config /etc/inittab
-# don't forget to also change aaa_base.post, boot.cleanup
-# and /etc/permissions!
-%ghost %attr(0644,root,root) %verify(not md5 size mtime) /var/log/lastlog
/usr/bin/get_kernel_version
/usr/sbin/refresh_initrd
/usr/sbin/service
@@ -210,17 +216,12 @@ mkdir -p %{buildroot}%{_fillupdir}
/usr/bin/filesize
/usr/bin/old
/usr/bin/rpmlocate
-/usr/bin/safe-rm
-/usr/bin/safe-rmdir
/usr/sbin/sysconf_addword
/usr/share/man/man1/smart_agetty.1*
/usr/share/man/man5/defaultdomain.5*
-/usr/share/man/man8/safe-rm.8*
-/usr/share/man/man8/safe-rmdir.8*
/usr/share/man/man8/service.8*
-/usr/lib/sysctl.d/*.conf
-%dir %{_libexecdir}/initscripts
-%dir %{_libexecdir}/initscripts/legacy-actions
+/usr/lib/sysctl.d/50-default.conf
+/usr/lib/sysctl.d/51-network.conf
%{_fillupdir}/sysconfig.language
%{_fillupdir}/sysconfig.proxy
%{_fillupdir}/sysconfig.windowmanager
@@ -246,4 +247,7 @@ mkdir -p %{buildroot}%{_fillupdir}
/usr/etc/profile.d/wsl.csh
/usr/etc/profile.d/wsl.sh
+%files yama-enable-ptrace
+/usr/lib/sysctl.d/52-yama.conf
+
%changelog