Adapt to the changes done in acl-2.2.53

Upstream switched to autotools so we can drop our workarounds
required before.

Also they do things that require newer GCC than the one available
on RHEL/Debian 6.

Author: vpodzime

deps-packaging/libacl/acl.destdir.diff.gz

@@ -5,6 +5,7 @@ Name: cfbuild-libacl
 Version: %{version}
 Release: 1
 Source: acl-%{acl_version}.tar.gz
+Patch0: no_fancy_gcc.patch
 License: MIT
 Group: Other
 Url: http://example.com
@@ -16,10 +17,9 @@ AutoReqProv: no
 
 %prep
 mkdir -p %{_builddir}
-%setup -q -n %{acl_version}
-
-zcat ../../SOURCES/acl.destdir.diff.gz | $PATCH -p1 || true
+%setup -q -n acl-%{acl_version}
 
+%patch0 -p1
 ./configure --prefix=%{prefix} --enable-gettext=no
 
 %build
@@ -29,15 +29,15 @@ make
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-make install -C getfacl DESTDIR=${RPM_BUILD_ROOT} DIST_ROOT=/
-make install-dev install-lib DESTDIR=${RPM_BUILD_ROOT} DIST_ROOT=/
+make install DESTDIR=${RPM_BUILD_ROOT}
 
 cp ${RPM_BUILD_ROOT}%{prefix}/include/sys/acl.h ${RPM_BUILD_ROOT}%{prefix}/include/
 
+rm -rf ${RPM_BUILD_ROOT}%{prefix}/share
 rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib/*.a
 rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib/*.la
-rm -rf ${RPM_BUILD_ROOT}%{prefix}/libexec
-rm -rf ${RPM_BUILD_ROOT}%{prefix}/share
+rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib/pkgconfig
+find ${RPM_BUILD_ROOT}%{prefix}/bin/ -mindepth 1 -name 'getfacl' -o -print0 | xargs -0 rm -rf
 
 %clean
 rm -rf $RPM_BUILD_ROOT

deps-packaging/libacl/cfbuild-libacl.spec

@@ -11,7 +11,7 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 
-	zcat acl.destdir.diff.gz | $(PATCH) -p1 || true
+	patch -p1 -i no_fancy_gcc.patch
 
 	./configure --prefix=$(PREFIX) --enable-gettext=no
 
@@ -25,17 +25,18 @@ install: build
 	dh_clean -k
 	dh_installdirs
 
-	make install -C getfacl DESTDIR=$(CURDIR)/debian/tmp DIST_ROOT=/
-	make install-dev install-lib DESTDIR=$(CURDIR)/debian/tmp DIST_ROOT=/
+	make install DESTDIR=$(CURDIR)/debian/tmp
 
 # configure fails because acl.h does't exist in include dir
 # it's placed by default in include/sys
 
 	cp $(CURDIR)/debian/tmp$(PREFIX)/include/sys/acl.h $(CURDIR)/debian/tmp$(PREFIX)/include/
 
+	rm -rf $(CURDIR)/debian/tmp$(PREFIX)/share
 	rm -rf $(CURDIR)/debian/tmp$(PREFIX)/lib/*.a
 	rm -rf $(CURDIR)/debian/tmp$(PREFIX)/lib/*.la
-	rm -rf $(CURDIR)/debian/tmp$(PREFIX)/libexec
+	rm -rf $(CURDIR)/debian/tmp$(PREFIX)/lib/pkgconfig
+	find $(CURDIR)/debian/tmp$(PREFIX)/bin/ -mindepth 1 -name 'getfacl' -o -print0 | xargs -0 rm -rf
 
 binary-indep: build install
 

deps-packaging/libacl/debian/rules

@@ -0,0 +1,28 @@
+--- ./libacl/acl_from_text.c.orig	2018-01-21 06:18:26.000000000 +0100
++++ ./libacl/acl_from_text.c	2018-10-20 12:15:33.667925049 +0200
+@@ -191,6 +191,8 @@
+ 		-1 on error, 0 on success.
+ */
+ 
++#pragma GCC diagnostic push
++#pragma GCC diagnostic ignored "-Waddress"
+ static int
+ parse_acl_entry(const char **text_p, acl_t *acl_p)
+ {
+@@ -304,15 +306,12 @@
+ create_entry:
+ 	if (acl_create_entry(acl_p, &entry_d) != 0)
+ 		return -1;
+-#pragma GCC diagnostic push
+-#pragma GCC diagnostic ignored "-Waddress"
+ 	if (acl_copy_entry(entry_d, int2ext(&entry_obj)) != 0)
+ 		return -1;
+-#pragma GCC diagnostic pop
+ 	return 0;
+ 
+ fail:
+ 	errno = EINVAL;
+ 	return -1;
+ }
+-
++#pragma GCC diagnostic pop