From 3b266dc344a52a276e07a35d0539ea8f702bae2e Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Fri, 12 Mar 2021 09:22:46 +0100
Subject: [PATCH] upstream release - 2.3.0

---
 .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.0.tar.gz.sig               | Bin 0 -> 566 bytes
 acl.spec                           |  10 +++++-----
 sources                            |   2 +-
 6 files changed, 7 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.0.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.0.tar.gz.sig b/acl-2.3.0.tar.gz.sig
new file mode 100644
index 0000000000000000000000000000000000000000..9cb025323bf024f53c5e444876db9fa66d4b2689
GIT binary patch
literal 566
zcmV-60?GY}0y6{v0SEvc79j*Bn>UiP*3%gwEX3T^zn|*^6J<ID0$@sM*#HU&5Y@k*
z>jM*IItTF(0I2XB-@>L6N~+dt=<1+bMpTL0?n}e|ms-4BY#WIO*>!9T5`Hbcfrdlm
z%mmH}?2B!>yn0KZpY>KjLeprZx=6Kdx6)(^^XH{2RCaVY5+m1rX<NmVLV&Dk5o#R|
z16a)>6V#-8<FI_}d${HR<35e<wkknZSH<=}mxP7VUerD{ct|gYkheD_ZhkTMu6u#v
zzxaayr|{YHffy>7NfX-Y{V+-L(YDP(OU>zgc9dO;9Bb(Tytj#BvC--@FJHkX-Sdp^
zps7;Jp@jdyUsG~%!n)OM9l`rpN{TT9D3w+E6Bs;=*gIfHMazm!NmmiS@~w>RxG8^c
zP%hR82#4_FJ1Fe0Nobm`p@gVP?kD-)JV5_*(Hi^$P0s|5b3+qpaJ9$@i%;!%^nnHs
z_xXO!Evl0{#JIPf`{~M+d1F~-Lb}#~K(72$>Y)uTmiuZtoggcOfso&w%u?CyXz<mm
zlj%W1EA`;9Cj@rIM2LQjS>9kvO|}fkEXN<BjglpXqPV0H-MK~kgSMjmLeF<QT_3`K
z5zyxbCYM2C7pD78^1eTKd+?SQ4YmGn%zVtf{~x2r^UZNodDWF=q^p~Y@LfY|E~C|&
z5uMT87K!Ij%^~yHbOTd*m@ZZQy$I727dY*xE#9;nMx&CmDS;y30sD59$G$Pi5-DOY
EupwU@LI3~&

literal 0
HcmV?d00001

diff --git a/acl.spec b/acl.spec
index 3400db8..7e3ff10 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.0
+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,9 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
 %{_libdir}/libacl.so.*
 
 %changelog
+* 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..9a0204e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (acl-2.2.53.tar.gz) = 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
+SHA512 (acl-2.3.0.tar.gz) = 77c0f387955d98ee086020943ea5d50ddcf5a36981cb28d2e90c74c20c3893c13c3fa9bc5bc47f79957987ec19afd00ad0b144a1387562b887c1f5fb5e6850cc