From 38b3d78d05231151a058c6c46235d6334c6c784afd6ecaca73fb465fcb65ab33 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Mon, 20 Feb 2023 17:08:31 +0000 Subject: [PATCH 1/3] - Update to version 84.87+git20230220.2991cfd: * Add instructions to build in place * Remove pre scriptlet * Don't create mtab symlink * Don't create /root/.bash_history * Don't enable lastlog by default * Fix #91: do not accidental unset shell functions * Prepare more /etc cleanup OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=764 --- .gitattributes | 2 +- _servicedata | 2 +- aaa_base-84.87+git20220822.6b9f7a3.tar | 3 --- aaa_base-84.87+git20230220.2991cfd.tar | 3 +++ aaa_base.changes | 12 ++++++++++++ aaa_base.spec | 20 ++++++++++---------- 6 files changed, 27 insertions(+), 15 deletions(-) delete mode 100644 aaa_base-84.87+git20220822.6b9f7a3.tar create mode 100644 aaa_base-84.87+git20230220.2991cfd.tar diff --git a/.gitattributes b/.gitattributes index ba5e2e3..7f759f6 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+git20220822.6b9f7a3.tar filter=lfs diff=lfs merge=lfs -text +aaa_base-84.87+git20230220.2991cfd.tar filter=lfs diff=lfs merge=lfs -text diff --git a/_servicedata b/_servicedata index 04c2ebe..4056545 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/openSUSE/aaa_base.git - 166d5ae84c4d401a4432883e6eec6d00a9c1b369 + 2991cfd27d23c66c913fe3f386e7da3f6b69643a https://github.com/lnussel/aaa_base.git 0f8eaba2cf2e69db15cce8a4dcf005b6e88f61e6 \ No newline at end of file diff --git a/aaa_base-84.87+git20220822.6b9f7a3.tar b/aaa_base-84.87+git20220822.6b9f7a3.tar deleted file mode 100644 index 2af1e3b..0000000 --- a/aaa_base-84.87+git20220822.6b9f7a3.tar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f82663d878c481c967cf52fe64f86ed5eb5cf6f2e0380c9b05cd5f7f4ae4a77 -size 378880 diff --git a/aaa_base-84.87+git20230220.2991cfd.tar b/aaa_base-84.87+git20230220.2991cfd.tar new file mode 100644 index 0000000..b6b0a81 --- /dev/null +++ b/aaa_base-84.87+git20230220.2991cfd.tar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2848b9bafb2bedf18169cb1903e885c8607f5569962e85cbb3821bf3fb7096b +size 378880 diff --git a/aaa_base.changes b/aaa_base.changes index ce1d54f..0823c22 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Feb 20 17:07:58 UTC 2023 - lnussel@suse.de + +- Update to version 84.87+git20230220.2991cfd: + * Add instructions to build in place + * Remove pre scriptlet + * Don't create mtab symlink + * Don't create /root/.bash_history + * Don't enable lastlog by default + * Fix #91: do not accidental unset shell functions + * Prepare more /etc cleanup + ------------------------------------------------------------------- Tue Sep 06 07:10:57 UTC 2022 - lnussel@suse.de diff --git a/aaa_base.spec b/aaa_base.spec index ec26f77..51d6bc3 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -1,7 +1,7 @@ # # spec file for package aaa_base # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 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+git20220822.6b9f7a3%{git_version} +Version: 84.87+git20230220.2991cfd%{git_version} Release: 0 Summary: openSUSE Base Package License: GPL-2.0-or-later @@ -52,9 +52,7 @@ Requires: /usr/bin/tput Requires: /usr/bin/xz Requires: distribution-release Requires: filesystem -Requires(pre): /usr/bin/rm -Requires(pre): (glibc >= 2.30 if glibc) -Requires(post): fillup /usr/bin/chmod /usr/bin/chown +Requires(post): fillup Recommends: aaa_base-extras Recommends: iproute2 Recommends: iputils @@ -148,8 +146,6 @@ mkdir -p %{buildroot}%{_fillupdir} rm -vrf %{buildroot}/usr/share/fillup-templates %endif -%pre -f aaa_base.pre - %post -f aaa_base.post %pre extras @@ -167,15 +163,19 @@ mkdir -p %{buildroot}%{_fillupdir} %files %license COPYING -%config(noreplace) /etc/DIR_COLORS -%config(noreplace) /etc/sysctl.conf %config /etc/bash.bashrc %config /etc/csh.cshrc %config /etc/csh.login %config /etc/inputrc -%config /etc/inputrc.keys %config /etc/mime.types %config /etc/profile +/usr/etc/DIR_COLORS +/usr/etc/csh.cshrc +/usr/etc/csh.login +/usr/etc/bash.bashrc +/usr/etc/profile +/usr/etc/inputrc +/usr/etc/inputrc.keys /usr/etc/profile.d/alljava.csh /usr/etc/profile.d/alljava.sh /usr/etc/profile.d/lang.csh From 0be462491844a2c63ccb0c1659299fe3244a99cf79cacff3c946cfa7dc95bc24 Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Thu, 9 Mar 2023 14:48:28 +0000 Subject: [PATCH 2/3] - Update to version 84.87+git20230309.04eae92: * Add conditional glibc requirement back * Keep owning /etc/sysctl.conf to avoid rpmsave OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=765 --- .gitattributes | 2 +- _servicedata | 2 +- aaa_base-84.87+git20230220.2991cfd.tar | 3 --- aaa_base-84.87+git20230309.04eae92.tar | 3 +++ aaa_base.changes | 7 +++++++ aaa_base.spec | 4 +++- 6 files changed, 15 insertions(+), 6 deletions(-) delete mode 100644 aaa_base-84.87+git20230220.2991cfd.tar create mode 100644 aaa_base-84.87+git20230309.04eae92.tar diff --git a/.gitattributes b/.gitattributes index 7f759f6..8d3bf18 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+git20230220.2991cfd.tar filter=lfs diff=lfs merge=lfs -text +aaa_base-84.87+git20230309.04eae92.tar filter=lfs diff=lfs merge=lfs -text diff --git a/_servicedata b/_servicedata index 4056545..a44a5ba 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/openSUSE/aaa_base.git - 2991cfd27d23c66c913fe3f386e7da3f6b69643a + 04eae922a815555a2170d2a3dc022864d04e3863 https://github.com/lnussel/aaa_base.git 0f8eaba2cf2e69db15cce8a4dcf005b6e88f61e6 \ No newline at end of file diff --git a/aaa_base-84.87+git20230220.2991cfd.tar b/aaa_base-84.87+git20230220.2991cfd.tar deleted file mode 100644 index b6b0a81..0000000 --- a/aaa_base-84.87+git20230220.2991cfd.tar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2848b9bafb2bedf18169cb1903e885c8607f5569962e85cbb3821bf3fb7096b -size 378880 diff --git a/aaa_base-84.87+git20230309.04eae92.tar b/aaa_base-84.87+git20230309.04eae92.tar new file mode 100644 index 0000000..161a8ab --- /dev/null +++ b/aaa_base-84.87+git20230309.04eae92.tar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:114cbaa732c72bf95eaf39cb80c092afdd546cda1f0110c03acf29c3e245c757 +size 378880 diff --git a/aaa_base.changes b/aaa_base.changes index 0823c22..338dbed 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Mar 09 14:47:56 UTC 2023 - lnussel@suse.de + +- Update to version 84.87+git20230309.04eae92: + * Add conditional glibc requirement back + * Keep owning /etc/sysctl.conf to avoid rpmsave + ------------------------------------------------------------------- Mon Feb 20 17:07:58 UTC 2023 - lnussel@suse.de diff --git a/aaa_base.spec b/aaa_base.spec index 51d6bc3..cf27384 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -33,7 +33,7 @@ BuildRequires: git-core %endif Name: aaa_base -Version: 84.87+git20230220.2991cfd%{git_version} +Version: 84.87+git20230309.04eae92%{git_version} Release: 0 Summary: openSUSE Base Package License: GPL-2.0-or-later @@ -52,6 +52,7 @@ Requires: /usr/bin/tput Requires: /usr/bin/xz Requires: distribution-release Requires: filesystem +Requires: (glibc >= 2.30 if glibc) Requires(post): fillup Recommends: aaa_base-extras Recommends: iproute2 @@ -163,6 +164,7 @@ mkdir -p %{buildroot}%{_fillupdir} %files %license COPYING +%ghost %config(noreplace) /etc/sysctl.conf %config /etc/bash.bashrc %config /etc/csh.cshrc %config /etc/csh.login From 1d51ef2cf7ee90c9d2a6dcf9a7a075664621c08580b5e51e832222bcd9c3568a Mon Sep 17 00:00:00 2001 From: Ludwig Nussel Date: Wed, 29 Mar 2023 08:17:39 +0000 Subject: [PATCH 3/3] - Update to version 84.87+git20230329.b39efbc: * Fix glibc requirement OBS-URL: https://build.opensuse.org/package/show/Base:System/aaa_base?expand=0&rev=766 --- .gitattributes | 2 +- _servicedata | 2 +- aaa_base-84.87+git20230309.04eae92.tar | 3 --- aaa_base-84.87+git20230329.b39efbc.tar | 3 +++ aaa_base.changes | 6 ++++++ aaa_base.spec | 5 +++-- 6 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 aaa_base-84.87+git20230309.04eae92.tar create mode 100644 aaa_base-84.87+git20230329.b39efbc.tar diff --git a/.gitattributes b/.gitattributes index 8d3bf18..91cb5b8 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+git20230309.04eae92.tar filter=lfs diff=lfs merge=lfs -text +aaa_base-84.87+git20230329.b39efbc.tar filter=lfs diff=lfs merge=lfs -text diff --git a/_servicedata b/_servicedata index a44a5ba..c1ba24f 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/openSUSE/aaa_base.git - 04eae922a815555a2170d2a3dc022864d04e3863 + b39efbc009fa82640ec066d714949ba2909a228f https://github.com/lnussel/aaa_base.git 0f8eaba2cf2e69db15cce8a4dcf005b6e88f61e6 \ No newline at end of file diff --git a/aaa_base-84.87+git20230309.04eae92.tar b/aaa_base-84.87+git20230309.04eae92.tar deleted file mode 100644 index 161a8ab..0000000 --- a/aaa_base-84.87+git20230309.04eae92.tar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:114cbaa732c72bf95eaf39cb80c092afdd546cda1f0110c03acf29c3e245c757 -size 378880 diff --git a/aaa_base-84.87+git20230329.b39efbc.tar b/aaa_base-84.87+git20230329.b39efbc.tar new file mode 100644 index 0000000..0153dff --- /dev/null +++ b/aaa_base-84.87+git20230329.b39efbc.tar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:71c059b8acfd8f26015575c5b3b08c428650b1aa7552747e5cfbb024054698d4 +size 378880 diff --git a/aaa_base.changes b/aaa_base.changes index 338dbed..c01ba29 100644 --- a/aaa_base.changes +++ b/aaa_base.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Mar 29 08:17:25 UTC 2023 - lnussel@suse.de + +- Update to version 84.87+git20230329.b39efbc: + * Fix glibc requirement + ------------------------------------------------------------------- Thu Mar 09 14:47:56 UTC 2023 - lnussel@suse.de diff --git a/aaa_base.spec b/aaa_base.spec index cf27384..b7a2690 100644 --- a/aaa_base.spec +++ b/aaa_base.spec @@ -33,7 +33,7 @@ BuildRequires: git-core %endif Name: aaa_base -Version: 84.87+git20230309.04eae92%{git_version} +Version: 84.87+git20230329.b39efbc%{git_version} Release: 0 Summary: openSUSE Base Package License: GPL-2.0-or-later @@ -52,7 +52,8 @@ Requires: /usr/bin/tput Requires: /usr/bin/xz Requires: distribution-release Requires: filesystem -Requires: (glibc >= 2.30 if glibc) +# required for nsswitch.conf usrfiles fixes in post script +Requires(post): (glibc >= 2.30 if glibc) Requires(post): fillup Recommends: aaa_base-extras Recommends: iproute2