rpms/acl
6
0
Fork 0
Code Issues Pull Requests Releases Activity

fix RPATH rpminspect reports

Browse Source 
... and actually apply an included patch

Related: RHEL-3909
This commit is contained in:
Lukáš Zaoral 2023-10-06 17:29:05 +02:00
parent 750a03c708
commit 64d42070c2
No known key found for this signature in database
GPG Key ID: 39157506DD67752D
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
acl.spec
View File

@ -1,9 +1,9 @@
Summary: Access control list utilities Summary: Access control list utilities
Name: acl Name: acl
Version: 2.2.53 Version: 2.2.53
Release: 2%{?dist} Release: 3%{?dist}
BuildRequires: gawk BuildRequires: gawk
BuildRequires: gettext BuildRequires: gettext-devel
BuildRequires: libattr-devel BuildRequires: libattr-devel
BuildRequires: libtool BuildRequires: libtool
Requires: libacl = %{version}-%{release} Requires: libacl = %{version}-%{release}
@ -12,9 +12,12 @@ Source: https://download-mirror.savannah.gnu.org/releases/acl/acl-%{version}.tar
License: GPLv2+ License: GPLv2+
URL: https://savannah.nongnu.org/projects/acl URL: https://savannah.nongnu.org/projects/acl
# avoid permission denied problem with LD_PRELOAD in the test-suite
Patch1: 0001-acl-2.2.53-test-runwrapper.patch
# preserve failed setfacl return code (RHEL-3909) # preserve failed setfacl return code (RHEL-3909)
# https://git.savannah.nongnu.org/cgit/acl.git/commit/?id=7ce89c695e76ec41fcebd83f8b728f63b0361a2d # https://git.savannah.nongnu.org/cgit/acl.git/commit/?id=7ce89c695e76ec41fcebd83f8b728f63b0361a2d
Patch1: 0001-acl-2.2.53-setfacl-preserve-failed-status.patch Patch2: 0001-acl-2.2.53-setfacl-preserve-failed-status.patch
%description %description
This package contains the getfacl and setfacl utilities needed for This package contains the getfacl and setfacl utilities needed for
@ -45,6 +48,9 @@ defined in POSIX 1003.1e draft standard 17.
%prep %prep
%autosetup -p1 %autosetup -p1
# newer autoconf fixes rpath warnings from rpminspect
autoreconf -fvi
%build %build
%configure %configure
@ -52,7 +58,7 @@ defined in POSIX 1003.1e draft standard 17.
# sed -i 's/-O2/-O0/' libtool include/builddefs # sed -i 's/-O2/-O0/' libtool include/builddefs
# unset CFLAGS # unset CFLAGS
make %{?_smp_mflags} %make_build
%check %check
if ./setfacl -m "u:$(id -u):rwx" .; then if ./setfacl -m "u:$(id -u):rwx" .; then
@ -73,14 +79,14 @@ if ./setfacl -m "u:$(id -u):rwx" .; then
fi fi
# run the upstream test-suite # run the upstream test-suite
make check || exit $? %make_build check || exit $?
else else
echo '*** ACLs are probably not supported by the file system,' \ echo '*** ACLs are probably not supported by the file system,' \
'the test-suite will NOT run ***' 'the test-suite will NOT run ***'
fi fi
%install %install
make install DESTDIR=$RPM_BUILD_ROOT %make_install
# get rid of libacl.a and libacl.la # get rid of libacl.a and libacl.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.a rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.a
@ -117,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}*
%{_libdir}/libacl.so.* %{_libdir}/libacl.so.*
%changelog %changelog
* Fri Oct 06 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.2.53-3
- fix RPATH rpminspect reports
- actually apply an included patch
* Fri Oct 06 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.2.53-2 * Fri Oct 06 2023 Lukáš Zaoral <lzaoral@redhat.com> - 2.2.53-2
- preserve failed setfacl return code (RHEL-3909) - preserve failed setfacl return code (RHEL-3909)