From eeaa489aeb1fa87c49add1ce8b1237fe7daddc42 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Wed, 31 Mar 2021 15:20:46 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/acl.git#08c7e74d0a58c9483d2f4f55a3fba2baffb09c3a
---
 .gitignore                         |   2 +-
 0002-acl-2.2.53-setattr-segv.patch |  29 -----------------------------
 acl-2.2.53.tar.gz.sig              | Bin 566 -> 0 bytes
 acl-2.3.1.tar.gz.sig               | Bin 0 -> 566 bytes
 acl.spec                           |  13 ++++++++-----
 sources                            |   2 +-
 6 files changed, 10 insertions(+), 36 deletions(-)
 delete mode 100644 0002-acl-2.2.53-setattr-segv.patch
 delete mode 100644 acl-2.2.53.tar.gz.sig
 create mode 100644 acl-2.3.1.tar.gz.sig

diff --git a/.gitignore b/.gitignore
index 1985515..393078a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/acl-2.2.*.tar.gz
+/acl-2.[23].*.tar.gz
diff --git a/0002-acl-2.2.53-setattr-segv.patch b/0002-acl-2.2.53-setattr-segv.patch
deleted file mode 100644
index 430838c..0000000
--- a/0002-acl-2.2.53-setattr-segv.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From c03773259fbe6d3f3355efc8e66990718d5cab54 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka@redhat.com>
-Date: Mon, 31 Aug 2020 17:16:34 +0200
-Subject: [PATCH] __acl_create_entry_obj: do not break strict aliasing rules
-
-... to avoid SIGSEGV with link-time optimisation enabled
-
-Bug: https://bugzilla.redhat.com/1873975
-Upstream-report: https://lists.nongnu.org/archive/html/acl-devel/2020-08/msg00000.html
----
- libacl/acl_create_entry.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libacl/acl_create_entry.c b/libacl/acl_create_entry.c
-index 2214c1a..8ee72a3 100644
---- a/libacl/acl_create_entry.c
-+++ b/libacl/acl_create_entry.c
-@@ -42,7 +42,7 @@ __acl_create_entry_obj(acl_obj *acl_obj_p)
- 	entry_obj_p->eprev = acl_obj_p->aprev;
- 	entry_obj_p->enext = (acl_entry_obj *)acl_obj_p;
- 	entry_obj_p->eprev->enext = entry_obj_p;
--	entry_obj_p->enext->eprev = entry_obj_p;
-+	acl_obj_p->aprev = entry_obj_p;
- 	
- 	entry_obj_p->econtainer = acl_obj_p;
- 	init_acl_entry_obj(*entry_obj_p);
--- 
-2.25.4
-
diff --git a/acl-2.2.53.tar.gz.sig b/acl-2.2.53.tar.gz.sig
deleted file mode 100644
index 52f5e19e16f5f7b66eb263a38b2eb494f622b826..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 566
zcmV-60?GY}0y6{v0SEvc79j+=0<|X-CHRu8B^uO0V>_SdH}!!90$V6}Q~(MI5J6)*
zpXfLBfu?j1{wX>E=VIYYnsqL-NMRXyI)Snco{>xRUe%46&f%{m_z`!t^56NFZep#!
z^ufXr-TS%t&tw&ogTdQqwK&{$(Fp<UmK|2Fhv^5F|B|Crnk3XU0B=AZ$GaCQe{C5Z
zS*7oRfUb+2@Vb3(2D@G&eSRRseOP6T;@`1*E_6dr{o8s1l-#rSLM4=1Fx$vfN>^)~
zV6K-sZvZ1tzvZ)Fvp)GlBP3i0Q5p2hj&&pI9u)J`)zRV~#eh&zc}|Q(*rSNW;;@ds
zAgOow3&SfWbc66Fi8=KNPHg$8R2MQJH4x3Dk@x%9T5f_T&W5U`Pp!{2Y@^ldJCQAA
ze<R!@y0a+qXjT#vfdKDrJ24sAM&oVf=+YS;QCh5qWMWVrf~z<y;uJ6dC^w;?dk;_{
z>YM>=8D_gXYG|Ahmj!Ia*T{F9*)&v1Di^GK!d`D#KGf)~DkG4Tr$v)N!O0U5uWRKJ
zX-k^Ohn`WWTQL`ByW;xq9PYK5Yf-U`VJbASkP7WQj)1ShtQE|{ooVugi(dtTM8k`6
zj_xLHL0u{+hYa&r%S_-D51~a<l~r3tRGo6y&x=_7!$5u?pso|=9(W|0?}mg2a#P~o
zIp}d@s5wEQ5&2<GpnhjhHWRp=2o63pPD>WIj&4(POR@dwk=l@C&c50=58Vl<grjnA
E!>geS1ONa4

diff --git a/acl-2.3.1.tar.gz.sig b/acl-2.3.1.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..ff407868ba463a1f7c0ea5cd31f0b3d90fcf6b8a
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j*Bn>UiP*3%gwEX3T^zn|*^6J<ID0$@;6)&L3#5Y@k*
z>jM*II-C~|{wrVaJo#oDmW4{^+W(cLOcaAfS7EQEoe4a5nQggf_bP43X>`7_`=+V$
z(7%K~*9bk{Ob@|FYh@%$NM1pJrJ~Hy3BAb!*Uwg<xYNh<iv@Ew@#al7vyTw~lRxr=
z6`*RScX8l3nC+mIbnZep<KHxAPGC`0m*I~zjuEHQ%s}QwYUoSwG2^Hx2`_~g3bbm1
z_98_wv@`Sudf!(j4f4z(8#Uz;Fg})Jf>*3Ip$KOIdaU>yyUf99bfBEs(A>ZKJ8~QP
zY6RSTOjQ^|Y-?Q)Z@@m!L%HK~0<jW?LxZ5FARAVu3ZU`)ZuyQ-mEW|7R<?X*^<4D)
zaVqAmx#x|D7;pvn6tgQkFg70~TdZ+(>0R&~M%8M^-eZgl1~yX@Zgy>K)|IUc$bsBs
zWf()tHa0*_6E7vQ1pEzK1deu>ZdrY~SAae|aCDOjDiP7SXlh?eb>e?kVxgX|iC!0+
z3;Od<*^!F04lp9|GD;}Z=kIIn1~Whtyk5D8jaMvYz^_c{_>nM!xle4L8T>2Oh&7?@
ziKeV0Aw|)qZhgF2@NW%a>mKZIlGtgU4zKE_$r!D}2Ze>y!}DwwP^6fZ<8Ir1!eQ5H
zheOxnoAx#xp@I6*!Ko!$va&(v9M8v?b`pFr4%nI#jp<n}I5RktJ%1q7;~VURB_kK+
ECaN9{HUIzs

literal 0
HcmV?d00001

diff --git a/acl.spec b/acl.spec
index 3400db8..2bf7182 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,7 +1,7 @@
 Summary: Access control list utilities
 Name: acl
-Version: 2.2.53
-Release: 10%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
 BuildRequires: gawk
 BuildRequires: gcc
 BuildRequires: gettext
@@ -15,9 +15,6 @@ Source: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar
 # avoid permission denied problem with LD_PRELOAD in the test-suite
 Patch1: 0001-acl-2.2.53-test-runwrapper.patch
 
-# make __acl_create_entry_obj() work with LTO enabled (#1873975)
-Patch2: 0002-acl-2.2.53-setattr-segv.patch
-
 License: GPLv2+
 URL: https://savannah.nongnu.org/projects/acl
 
@@ -122,6 +119,12 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* Tue Mar 16 2021 Kamil Dudka <kdudka@redhat.com> - 2.3.1-1
+- new upstream release
+
+* Fri Mar 12 2021 Kamil Dudka <kdudka@redhat.com> - 2.3.0-1
+- new upstream release
+
 * Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.53-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index d8584fe..9acc87d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (acl-2.2.53.tar.gz) = 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
+SHA512 (acl-2.3.1.tar.gz) = f101e27058c959f4c412f475c3fc77a90d1ead8728701e4ce04ff08b34139d35e0e72278c9ac7622ba6054e81c0aeca066e09491b5f5666462e3866705a0e892