diff --git a/libcap-2.66.tar.gz b/libcap-2.66.tar.gz deleted file mode 100644 index dc92e661117f5e10678f88eb0cdfe29be6173dc4..0000000000000000000000000000000000000000 Binary files a/libcap-2.66.tar.gz and /dev/null differ diff --git a/libcap-2.67-fix-pam-test-link-flag.patch b/libcap-2.67-fix-pam-test-link-flag.patch new file mode 100644 index 0000000000000000000000000000000000000000..2f6caaf3b2b07fc21a000d879f3c4f624e3f63d4 --- /dev/null +++ b/libcap-2.67-fix-pam-test-link-flag.patch @@ -0,0 +1,11 @@ +--- libcap-2.67/pam_cap/Makefile.orig 2023-02-16 21:53:07.086134146 +0800 ++++ libcap-2.67/pam_cap/Makefile 2023-02-16 21:53:16.618134146 +0800 +@@ -65,7 +65,7 @@ + # Avoid $(LDFLAGS) here to avoid conflicts with --static for a in-tree + # test binary. + test_pam_cap: test_pam_cap.c pam_cap.c ../libcap/libcap.a +- $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ test_pam_cap.c $(LIBCAPLIB) --static ++ $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ test_pam_cap.c $(LIBCAPLIB) + + testlink: test.o pam_cap.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $+ -lpam -ldl $(LIBCAPLIB) diff --git a/libcap-2.67.tar.gz b/libcap-2.67.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9d50bdac4437d45e7eb650b79ab6d25538d518f4 Binary files /dev/null and b/libcap-2.67.tar.gz differ diff --git a/libcap.spec b/libcap.spec index 6a2450f15b8126cbf53fb6734b53d3778ec75b97..9d440943fad2140dd7013fa923c219acfbf35c39 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,16 +1,16 @@ %define anolis_release 1 -%global debug_package %{nil} Name: libcap -Version: 2.66 +Version: 2.67 Release: %{anolis_release}%{?dist} Summary: Library for getting and setting POSIX.1e capabilities License: BSD or GPLv2 URL: ihttps://sites.google.com/site/fullycapable/ Source0: https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/%{name}-%{version}.tar.gz - -BuildRequires: libattr-devel pam-devel perl-interpreter gcc make +Patch0: libcap-2.67-fix-pam-test-link-flag.patch +BuildRequires: pam-devel perl-interpreter gcc make +Conflicts: libcap-devel < 2.67 %description libcap is a library for getting and setting POSIX.1e (formerly POSIX 6) @@ -18,7 +18,7 @@ draft 15 capabilities. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} %description devel The %{name}-devel package contains libraries and header files for @@ -37,25 +37,22 @@ draft 15 capabilities. %prep -%autosetup - +%autosetup -p1 %build %{make_build} %install -rm -rf $RPM_BUILD_ROOT %make_install DESTDIR=%{buildroot} LIBDIR=%{_libdir} SBINDIR=%{_sbindir} PKGCONFIGDIR=%{_libdir}/pkgconfig/ mkdir -p %{buildroot}/%{_mandir}/man{2,3,8} mv -f doc/*.3 %{buildroot}/%{_mandir}/man3/ -chmod +x %{buildroot}/%{_libdir}/*.so.* - -%ldconfig_scriptlets - %generate_compatibility_deps +%check +%make_build test + %files %license License %doc doc/capability.notes @@ -65,6 +62,8 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %{_mandir}/man8/* %{_libdir}/security/pam_cap.so %{abidir}/*.list +%{abidir}/libcap.dump +%{abidir}/libpsx.dump %{abidir}/pam_cap.dump %files static @@ -75,11 +74,11 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %{_libdir}/*.so %{_mandir}/man3/* %{_libdir}/pkgconfig/*.pc -%{abidir}/libcap.dump -%{abidir}/libpsx.dump - %changelog +* Thu Feb 16 2023 Funda Wang - 2.67-1 +- New version 2.67 + * Tue Jan 10 2023 Kun(llfl) - 2.66-1 - update version to 2.66