From 22bf8568cc38930b14763def59174166937592ec Mon Sep 17 00:00:00 2001
From: oertel <>
Date: Mar 11 2021 23:28:45 +0000
Subject: Update aaa_base to version 84.87+git20210308.d7a7d3a / rev 477 via SR 877770
https://build.opensuse.org/request/show/877770
by user oertel + dimstar_suse
- Update to version 84.87+git20210308.d7a7d3a:
* excluding new kernel string in version search
* Fixing possible resource leak. Found by running ccpcheck on the source code.
* Comment out 8-bit C1 conflicting with UTF-8 in /etc/inputrc
* Fix keyseq specifications in /etc/inputrc{,.keys}
---
diff --git a/.files b/.files
index 947824d..a84c343 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index be80d68..db23c95 100644
--- a/.rev
+++ b/.rev
@@ -3869,8 +3869,6 @@
851301
-<<<<<<< Updated upstream
-=======
b90c95a4417b628b787c7798db17f964
84.87+git20210308.d7a7d3a
@@ -3883,5 +3881,4 @@
* Fix keyseq specifications in /etc/inputrc{,.keys}
877770
->>>>>>> Stashed changes
diff --git a/.servicemark b/.servicemark
index a4fae22..b55d908 100644
--- a/.servicemark
+++ b/.servicemark
@@ -1,5 +1 @@
-<<<<<<< Updated upstream
-f63effe819d5dcd8751addcfc0dc9386
-=======
6488d05fc988e8c2d2e32c9999b80675
->>>>>>> Stashed changes
diff --git a/_servicedata b/_servicedata
index 3df512e..90e0dd2 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,10 +1,6 @@
https://github.com/openSUSE/aaa_base.git
-<<<<<<< Updated upstream
- 4f16b1614fac8432188271c8363b1e6217944b4c
-=======
d7a7d3adc3b583e0951b985aa4f72ec3f6e58415
->>>>>>> Stashed changes
\ No newline at end of file
diff --git a/aaa_base-84.87+git20201123.4f16b16.tar.xz b/aaa_base-84.87+git20201123.4f16b16.tar.xz
deleted file mode 120000
index 1c7b2ed..0000000
--- a/aaa_base-84.87+git20201123.4f16b16.tar.xz
+++ /dev/null
@@ -1 +0,0 @@
-/ipfs/bafkreig5euxktqff3k4uweaxqrhakkl3toxmun5a3i437ug75roqcvrvs4
\ No newline at end of file
diff --git a/aaa_base.changes b/aaa_base.changes
index 4e22ec5..1ff6541 100644
--- a/aaa_base.changes
+++ b/aaa_base.changes
@@ -1,6 +1,4 @@
-------------------------------------------------------------------
-<<<<<<< Updated upstream
-=======
Mon Mar 08 15:11:13 UTC 2021 - ro@suse.de
- Update to version 84.87+git20210308.d7a7d3a:
@@ -10,7 +8,6 @@ Mon Mar 08 15:11:13 UTC 2021 - ro@suse.de
* Fix keyseq specifications in /etc/inputrc{,.keys}
-------------------------------------------------------------------
->>>>>>> Stashed changes
Mon Nov 23 09:41:55 UTC 2020 - Ludwig Nussel
- clean up rpmlintrc. Add filter for deprecated init scripts. We'll have to
diff --git a/aaa_base.spec b/aaa_base.spec
index adca968..c6325ad 100644
--- a/aaa_base.spec
+++ b/aaa_base.spec
@@ -23,11 +23,7 @@
%endif
Name: aaa_base
-<<<<<<< Updated upstream
-Version: 84.87+git20201123.4f16b16
-=======
Version: 84.87+git20210308.d7a7d3a
->>>>>>> Stashed changes
Release: 0
URL: https://github.com/openSUSE/aaa_base
# do not require systemd - aaa_base is in the build environment and we don't