X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=libcap.spec;h=6332cf9334b90ae8b6c4d1eaeb251ac9dce02b78;hb=e175e3007d4bb13e3c219b2e84997efb9d642234;hp=0111dda6726b0de3ee51bdd86d88256cbb7b6b94;hpb=73e0abb98c77596ba92ec5c9a283c9dad84d0c3a;p=packages%2Flibcap.git

diff --git a/libcap.spec b/libcap.spec
index 0111dda..6332cf9 100644
--- a/libcap.spec
+++ b/libcap.spec
@@ -1,18 +1,30 @@
+#
+# Conditional build:
+%bcond_with	golang	# Go components (nothing useful yet?)
+
+%ifnarch %{ix86} %{x8664} %{arm} aarch64 mips64 mips64le ppc64le
+%undefine	with_golang
+%endif
 Summary:	POSIX.1e capability suite
 Summary(pl.UTF-8):	Wsparcie dla standardu "capability" POSIX.1e
 Summary(pt_BR.UTF-8):	Biblioteca para leitura e configuração de capabilities.
 Name:		libcap
-Version:	2.05
+Version:	2.31
 Release:	1
 Epoch:		1
-License:	GPL or BSD
+License:	GPL v2 or BSD
 Group:		Applications/System
-Source0:	ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/%{name}-%{version}.tar.gz
-# Source0-md5:	430a17a01ee7906e67903e713b7bacbc
+Source0:	https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.xz
+# Source0-md5:	52120c05dc797b01f5a7ae70f4335e96
 Patch0:		%{name}-make.patch
-Patch1:		%{name}-pam-conf.patch
-Patch2:		http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/support-for-prctl-based-securebits.patch
-URL:		http://www.kernel.org/pub/linux/libs/security/linux-privs/
+URL:		https://sites.google.com/site/fullycapable/
+BuildRequires:	attr-devel
+%{?with_golang:BuildRequires:	golang}
+BuildRequires:	pam-devel
+BuildRequires:	perl-base
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_sbindir		/sbin
@@ -28,12 +40,24 @@ Biblioteka, programy oraz strony manuala zawierające implementację
 %description -l pt_BR.UTF-8
 Biblioteca para leitura e configuração de capabilities.
 
+%package libs
+Summary:	libcap library
+Summary(pl.UTF-8):	Biblioteka libcap
+Group:		Libraries
+Conflicts:	libcap < 1:2.16-2
+
+%description libs
+libcap library.
+
+%description libs -l pl.UTF-8
+Biblioteka libcap.
+
 %package devel
 Summary:	Header files and development documentation for libcap
 Summary(pl.UTF-8):	Pliki nagłówkowe i dokumentacja do libcap
 Summary(pt_BR.UTF-8):	Arquivos de desenvolvimento para capabilities
 Group:		Development/Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 
 %description devel
 Header files and development documentation for libcap.
@@ -60,7 +84,7 @@ Statyczna biblioteka libcap.
 Summary:	Capability module for PAM
 Summary(pl.UTF-8):	Moduł PAM capability
 Group:		Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	pam
 
 %description -n pam-pam_cap
@@ -72,43 +96,44 @@ Moduł PAM capability wymuszający dziedziczone zbiory uprawnień.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
-%{__make} \
+%{__make} -j1 \
 	CC="%{__cc}" \
-	COPTFLAG="%{rpmcflags}" \
 	DEBUG= \
-	LDFLAGS="%{rpmldflags}"
+	%{!?with_golang:GOLANG=0} \
+	OPT_CFLAGS="-Iinclude %{rpmcflags} %{rpmcppflags}" \
+	OPT_LDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
+%{__make} -j1 install \
 	FAKEROOT=$RPM_BUILD_ROOT \
+	%{!?with_golang:GOLANG=0} \
+	RAISE_SETFCAP=no \
 	lib=%{_lib}
 
+cp -p libcap/libpsx.a $RPM_BUILD_ROOT%{_libdir}
+
 install -d $RPM_BUILD_ROOT/%{_lib}/security
-install pam_cap/pam_cap.so $RPM_BUILD_ROOT/%{_lib}/security
+install -p pam_cap/pam_cap.so $RPM_BUILD_ROOT/%{_lib}/security
 install -d $RPM_BUILD_ROOT/etc/security
-install pam_cap/capability.conf $RPM_BUILD_ROOT/etc/security
+cp -a pam_cap/capability.conf $RPM_BUILD_ROOT/etc/security
 
 install -d $RPM_BUILD_ROOT%{_libdir}
-install libcap/libcap.a $RPM_BUILD_ROOT%{_libdir}
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libcap.so.*.*) \
 	$RPM_BUILD_ROOT%{_libdir}/libcap.so
-rm $RPM_BUILD_ROOT/%{_lib}/libcap.so
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/libcap.so
+%{__mv} $RPM_BUILD_ROOT/%{_lib}/lib{cap,psx}.a $RPM_BUILD_ROOT%{_libdir}
 
-# newer versions exist in man-pages
-# and these syscalls are specific to Linux/glibc, not libcap
-rm -f $RPM_BUILD_ROOT%{_mandir}/man2/cap{get,set}.2
+chmod a+x $RPM_BUILD_ROOT/%{_lib}/*.so*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post   libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -116,20 +141,32 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/capsh
 %attr(755,root,root) %{_sbindir}/getcap
 %attr(755,root,root) %{_sbindir}/getpcaps
+# TODO: cap_setfcap=i
 %attr(755,root,root) %{_sbindir}/setcap
-%attr(755,root,root) /%{_lib}/libcap.so.*.*
-%attr(755,root,root) %ghost /%{_lib}/libcap.so.2
+%{_mandir}/man1/capsh.1*
 %{_mandir}/man8/getcap.8*
+%{_mandir}/man8/getpcaps.8*
 %{_mandir}/man8/setcap.8*
 
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) /%{_lib}/libcap.so.*.*
+%attr(755,root,root) %ghost /%{_lib}/libcap.so.2
+
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcap.so
+%{_libdir}/libpsx.a
 %{_includedir}/sys/capability.h
-%{_mandir}/man3/_cap_names.3*
+%{_includedir}/sys/psx_syscall.h
+%{_pkgconfigdir}/libcap.pc
+%{_pkgconfigdir}/libpsx.pc
+%{_mandir}/man3/libcap*.3*
+%{_mandir}/man3/libpsx*.3*
 %{_mandir}/man3/cap_*
 %{_mandir}/man3/capgetp.3*
 %{_mandir}/man3/capsetp.3*
+%{_mandir}/man3/psx*.3*
 
 %files static
 %defattr(644,root,root,755)