From eb91c5703067c7091532222e9d1112ca0e71c143 Mon Sep 17 00:00:00 2001
From: lnussel <>
Date: Apr 03 2023 15:50:29 +0000
Subject: Update aaa_base to version 84.87+git20230329.b39efbc / rev 492 via SR 1075154


https://build.opensuse.org/request/show/1075154
by user lnussel + dimstar_suse
- Update to version 84.87+git20230329.b39efbc:
  * Fix glibc requirement

- Update to version 84.87+git20230309.04eae92:
  * Add conditional glibc requirement back
  * Keep owning /etc/sysctl.conf to avoid rpmsave

- 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

---

diff --git a/.files b/.files
index 0ea42b6..ddeb1f7 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index 9ffeb4f..bd9ed4d 100644
--- a/.rev
+++ b/.rev
@@ -4046,4 +4046,26 @@
   * Simplify XDG_CONFIG_DIRS (boo#1201802)</comment>
     <requestid>1001371</requestid>
   </revision>
+  <revision rev="492" vrev="1">
+    <srcmd5>1d50b59b2b5b7cb6d5cbd16c5218ea24</srcmd5>
+    <version>84.87+git20230329.b39efbc</version>
+    <time>1680536716</time>
+    <user>dimstar_suse</user>
+    <comment>- Update to version 84.87+git20230329.b39efbc:
+  * Fix glibc requirement
+
+- Update to version 84.87+git20230309.04eae92:
+  * Add conditional glibc requirement back
+  * Keep owning /etc/sysctl.conf to avoid rpmsave
+
+- 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</comment>
+    <requestid>1075154</requestid>
+  </revision>
 </revisionlist>
diff --git a/.servicemark b/.servicemark
deleted file mode 100644
index e18c8ef..0000000
--- a/.servicemark
+++ /dev/null
@@ -1 +0,0 @@
-bd95a6fcf0ace731bf0d8269dfd44222
diff --git a/_servicedata b/_servicedata
index 1925fc4..f019f5c 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,6 +1,6 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/openSUSE/aaa_base.git</param>
-              <param name="changesrevision">166d5ae84c4d401a4432883e6eec6d00a9c1b369</param></service><service name="tar_scm">
+              <param name="changesrevision">b39efbc009fa82640ec066d714949ba2909a228f</param></service><service name="tar_scm">
                 <param name="url">https://github.com/lnussel/aaa_base.git</param>
               <param name="changesrevision">0f8eaba2cf2e69db15cce8a4dcf005b6e88f61e6</param></service></servicedata>
\ 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 120000
index d44ce62..0000000
--- a/aaa_base-84.87+git20220822.6b9f7a3.tar
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafybeigcromtrqxpdn6faoh3xmidgxkf5pvkn5jwrqdpviwf2spkbsc6xm
\ No newline at end of file
diff --git a/aaa_base-84.87+git20230329.b39efbc.tar b/aaa_base-84.87+git20230329.b39efbc.tar
new file mode 120000
index 0000000..cd8c7c7
--- /dev/null
+++ b/aaa_base-84.87+git20230329.b39efbc.tar
@@ -0,0 +1 @@
+/ipfs/bafybeihyp6mc72ytscot47nuqtg6bqrf4tgntygarkot3yniaeg6skslgy
\ No newline at end of file
diff --git a/aaa_base.changes b/aaa_base.changes
index 622798e..37648d3 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,4 +1,29 @@
 -------------------------------------------------------------------
+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
+
+- 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
+
+- 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
 
 - Update to version 84.87+git20220822.6b9f7a3:
diff --git a/aaa_base.spec b/aaa_base.spec
index ff31296..5c176c9 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+git20230329.b39efbc%{git_version}
 Release:        0
 Summary:        openSUSE Base Package
 License:        GPL-2.0-or-later
@@ -52,9 +52,9 @@ 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
+# 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
 Recommends:     iputils
@@ -148,8 +148,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 +165,20 @@ mkdir -p %{buildroot}%{_fillupdir}
 
 %files
 %license COPYING
-%config(noreplace) /etc/DIR_COLORS
-%config(noreplace) /etc/sysctl.conf
+%ghost %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