diff --git a/.gitattributes b/.gitattributes index 55a25b8..cd44d14 100644 --- a/.gitattributes +++ b/.gitattributes @@ -22,4 +22,4 @@ *.zip filter=lfs diff=lfs merge=lfs -text *.zst filter=lfs diff=lfs merge=lfs -text ## Specific LFS patterns -aaa_base-84.87+git20240906.742565b.tar filter=lfs diff=lfs merge=lfs -text +aaa_base-84.87+git20250903.33e5ba4.tar filter=lfs diff=lfs merge=lfs -text diff --git a/_servicedata b/_servicedata index 4e16731..dd6b1cf 100644 --- a/_servicedata +++ b/_servicedata @@ -1,5 +1,5 @@ https://github.com/openSUSE/aaa_base.git - 742565b964545a2618f0809a3219cf0cdf185cd3 + 33e5ba4d78ca7ade4dc2effad62e989d90858f85 \ No newline at end of file diff --git a/aaa_base-84.87+git20240906.742565b.tar b/aaa_base-84.87+git20240906.742565b.tar deleted file mode 100644 index 9fedc51..0000000 --- a/aaa_base-84.87+git20240906.742565b.tar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a955b86b99b50f658006fddedc73e64b963a40ce6b76af50e214842165b9e57a -size 348160 diff --git a/aaa_base-84.87+git20250903.33e5ba4.tar b/aaa_base-84.87+git20250903.33e5ba4.tar new file mode 100644 index 0000000..320aa35 --- /dev/null +++ b/aaa_base-84.87+git20250903.33e5ba4.tar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8815d045aef92add59291212d546cc4f2beda67084965922f25fc09b32fa16a6 +size 348160 diff --git a/aaa_base.changes b/aaa_base.changes index 1be402e..64a2302 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,81 @@ +------------------------------------------------------------------- +Wed Sep 03 12:23:39 UTC 2025 - Ruediger Oertel + +- Update to version 84.87+git20250903.33e5ba4: + * Correct fix for boo#1247495 (boo#1248158) + +------------------------------------------------------------------- +Tue Aug 05 15:28:33 UTC 2025 - Ruediger Oertel + +- Update to version 84.87+git20250805.3069494: + * Remove initviocons for tcsh as well and + * Update csh.login + * Add missing quoting and remove unneeded uses of eval + +------------------------------------------------------------------- +Fri Aug 01 09:04:06 UTC 2025 - Thorsten Kukuk + +- Update to version 84.87+git20250801.f305627: + * Remove sysconfig.language [bsc#1247286] + +------------------------------------------------------------------- +Fri Aug 01 08:53:32 UTC 2025 - Thorsten Kukuk + +- Update to version 84.87+git20250801.b2fa3fe: + * Allow /etc/locale.conf to have no newline + +------------------------------------------------------------------- +Tue Apr 29 16:08:04 UTC 2025 - Ruediger Oertel + +- Update to version 84.87+git20250429.1cad3bc: + * Remove alias "you" (boo#1242011) + +------------------------------------------------------------------- +Fri Apr 25 08:08:49 UTC 2025 - Dominique Leuenberger + +- Update to version 84.87+git20250425.1664836: + * Fix bug boo#1241205 by adding missed endif + * alias.bash: future-proof egrep/fgrep color aliases + +------------------------------------------------------------------- +Thu Apr 10 12:35:44 UTC 2025 - Ruediger Oertel + +- Update to version 84.87+git20250410.71df276: + * Modern s390x uses TERM=linux for ttysclp + +------------------------------------------------------------------- +Thu Mar 13 15:37:47 UTC 2025 - ro@suse.com + +- Update to version 84.87+git20250313.4dd1cfd: + * DIR_COLORS: add backup and temporary file extensions + * DIR_COLORS: sort audio formats + * DIR_COLORS: use cyan for audio formats instead of green + * DIR_COLORS: add 'avif' to image formats + * DIR_COLORS: add updated and sorted list of archive formats + * DIR_COLORS: don't colour DOS/Windows executables + * DIR_COLORS: update existing colours and add missing ones + * DIR_COLORS: add COLORTERM and 'st' terminal + * DIR_COLORS: update file description + * DIR_COLORS: sort TERM entries + * DIR_COLORS: remove COLOR, OPTIONS and EIGHTBIT + +------------------------------------------------------------------- +Thu Mar 13 14:38:00 UTC 2025 - ro@suse.com + +- Update to version 84.87+git20250313.e71c2f4: + * Respect PROFILEREAD/CSHRCREAD at shell switch + * Modernize specfile + * Add safety quotes and proper escaping + * Avoid bashisms in build recipe + * Add setup-systemd-proxy-env + * profile.{sh,csh}: Drop useless proxy variables cleanup + +------------------------------------------------------------------- +Thu Jan 02 15:03:01 UTC 2025 - dmueller@suse.com + +- Update to version 84.87+git20250102.c08e614: + * Load distrobox_profile.sh + ------------------------------------------------------------------- Fri Sep 06 09:04:40 UTC 2024 - dmueller@suse.com @@ -1053,7 +1131,7 @@ Mon Jan 26 12:30:54 UTC 2015 - werner@suse.de - Merge pull request #21 from arvidjaar/bnc/907873 ------------------------------------------------------------------- -Fri Dec 5 10:55:09 2014 UTC arvidjaar@gmail.com +Fri Dec 5 10:55:09 UTC 2014 - arvidjaar@gmail.com - Avoid sourcing /etc/bash_completion.d twice diff --git a/aaa_base.spec b/aaa_base.spec index edb68b2..ad957d1 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -1,7 +1,7 @@ # # spec file for package aaa_base # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 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+git20240906.742565b%{git_version} +Version: 84.87+git20250903.33e5ba4%{git_version} Release: 0 Summary: openSUSE Base Package License: GPL-2.0-or-later @@ -116,7 +116,7 @@ this package contains a setting that allows ptrace again. See https://docs.kernel.org/admin-guide/LSM/Yama.html %prep -%setup -q +%autosetup -p1 %build %make_build CFLAGS="%{optflags}" CC="%{__cc}" @@ -136,20 +136,20 @@ done touch %buildroot/etc/inittab # Backup directories -install -d -m 755 %{buildroot}/var/adm/backup/{rpmdb,sysconfig} +install -d -m 755 %{buildroot}/var/adm/backup/rpmdb %{buildroot}/var/adm/backup/sysconfig mkdir -p %{buildroot}%{_fillupdir} %if "%{_fillupdir}" != "/var/adm/fillup-templates" for f in %{buildroot}/var/adm/fillup-templates/* ; do test -e "$f" || continue - mv $f %{buildroot}%{_fillupdir}/ + mv "$f" "%{buildroot}/%{_fillupdir}/" done rm -vrf %{buildroot}/var/adm/fillup-templates %endif %if "%{_fillupdir}" != "/usr/share/fillup-templates" for f in %{buildroot}/usr/share/fillup-templates/* ; do test -e "$f" || continue - mv $f %{buildroot}%{_fillupdir}/ + mv "$f" "%{buildroot}/%{_fillupdir}/" done rm -vrf %{buildroot}/usr/share/fillup-templates %endif @@ -166,14 +166,13 @@ export LC_ALL=C #XXX Fix /etc/nsswitch.conf to include usrfiles [bsc#1162916] if [ -e /etc/nsswitch.conf ]; then for key in services protocols rpc ; do - if ! grep -q ^${key}.*usrfiles /etc/nsswitch.conf ; then - cp /etc/nsswitch.conf /etc/nsswitch.conf.pre-usrfiles.${key} - sed -i -e "s|^\(${key}:.*[[:space:]]\)files\([[:space:]].*\)*$|\1files usrfiles\2|" /etc/nsswitch.conf + if ! grep -q "^${key}.*usrfiles" /etc/nsswitch.conf ; then + cp /etc/nsswitch.conf "/etc/nsswitch.conf.pre-usrfiles.${key}" + sed -i -e "s|^\(${key}:.*[[:space:]]\)files\([[:space:]].*\)*\$|\1files usrfiles\2|" /etc/nsswitch.conf fi done fi -%{fillup_only -n language} %{fillup_only -n proxy} %service_add_post soft-reboot-cleanup.service @@ -181,17 +180,17 @@ fi %service_del_postun_without_restart soft-reboot-cleanup.service %pre extras -%service_add_pre backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer +%service_add_pre backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer setup-systemd-proxy-env.path setup-systemd-proxy-env.service %post extras %fillup_only -n backup -%service_add_post backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer +%service_add_post backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer setup-systemd-proxy-env.path setup-systemd-proxy-env.service %preun extras -%service_del_preun backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer +%service_del_preun backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer setup-systemd-proxy-env.path setup-systemd-proxy-env.service %postun extras -%service_del_postun backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer +%service_del_postun backup-rpmdb.service backup-rpmdb.timer backup-sysconfig.service backup-sysconfig.timer check-battery.service check-battery.timer setup-systemd-proxy-env.path setup-systemd-proxy-env.service %post yama-enable-ptrace # check if yama is active @@ -265,10 +264,10 @@ fi /usr/lib/sysctl.d/50-pid-max.conf %endif /usr/lib/sysctl.d/51-network.conf -%{_fillupdir}/sysconfig.language %{_fillupdir}/sysconfig.proxy %files extras +/usr/bin/setup-systemd-proxy-env /usr/etc/skel/.emacs /usr/etc/skel/.inputrc %dir /usr/lib/base-scripts @@ -276,6 +275,7 @@ fi /usr/lib/base-scripts/backup-sysconfig /usr/lib/base-scripts/check-battery /usr/lib/systemd/system/[bc]* +/usr/lib/systemd/system/setup-systemd-proxy-env.* /var/adm/backup/rpmdb /var/adm/backup/sysconfig %{_fillupdir}/sysconfig.backup