Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[libcap-ng] Update to 0.8.5. Contributes to JB#58868 #4

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[libcap-ng] Update to 0.8.5. Contributes to JB#58868 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d0a632
Cleanup spec file
direc85 Nov 8, 2024
38a1fc4
[packaging] Package libdrop_ambient again. Contributes to JB#58868
direc85 Nov 8, 2024
eba716f
[libcap-ng] Update to 0.8.5. Contributes to JB#58868
direc85 Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libcap-ng
Open in desktop
Submodule libcap-ng updated 52 files
+11 −0 ChangeLog
+0 −504 LICENSE
+5 −4 Makefile.am
+0 −0 NEWS
+0 −5 README
+123 −49 README.md
+1 −0 autogen.sh
+6 −7 bindings/Makefile.am
+0 −46 bindings/python/Makefile.am
+13 −12 bindings/python3/Makefile.am
+6 −5 bindings/python3/test/Makefile.am
+3 −3 bindings/python3/test/capng-test.py
+5 −11 bindings/src/capng_swig.i
+21 −78 configure.ac
+5 −3 docs/capng_apply.3
+2 −2 docs/capng_apply_caps_fd.3
+2 −2 docs/capng_capability_to_name.3
+1 −1 docs/capng_change_id.3
+2 −2 docs/capng_clear.3
+3 −2 docs/capng_fill.3
+2 −2 docs/capng_get_caps_fd.3
+2 −2 docs/capng_get_caps_process.3
+1 −1 docs/capng_get_rootid.3
+2 −2 docs/capng_have_capabilities.3
+2 −2 docs/capng_have_capability.3
+1 −1 docs/capng_lock.3
+2 −2 docs/capng_name_to_capability.3
+2 −1 docs/capng_print_caps_numeric.3
+3 −2 docs/capng_print_caps_text.3
+1 −1 docs/capng_restore_state.3
+1 −1 docs/capng_save_state.3
+1 −1 docs/capng_set_rootid.3
+4 −4 docs/capng_setpid.3
+2 −2 docs/capng_update.3
+2 −2 docs/capng_updatev.3
+2 −2 docs/libdrop_ambient.7
+6 −6 libcap-ng.spec
+4 −3 src/Makefile.am
+62 −29 src/cap-ng.c
+19 −12 src/cap-ng.h
+4 −3 src/captab.h
+1 −1 src/libcap-ng.pc.in
+4 −3 src/libdrop_ambient.c
+6 −5 src/lookup_table.c
+5 −4 src/test/Makefile.am
+5 −4 src/test/lib_test.c
+8 −2 src/test/thread_test.c
+6 −5 utils/Makefile.am
+35 −12 utils/captest.c
+7 −1 utils/netcap.c
+2 −2 utils/pscap.8
+25 −3 utils/pscap.c
26 changes: 26 additions & 0 deletions rpm/0001-Fix-python-path-when-invoking-py-compile-54.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Jan Palus <[email protected]>
Date: Wed, 10 Apr 2024 21:30:51 +0200
Subject: [PATCH] Fix python path when invoking py-compile (#54)

48eebb2 replaced custom PYTHON3 variable with PYTHON by using standard
AM_PATH_PYTHON macro. Makefile however still referred to old one.
There's no need to set PYTHON explicitly anymore so drop it.

Fixes #53
---
bindings/python3/Makefile.am | 1 -
1 file changed, 1 deletion(-)

diff --git a/bindings/python3/Makefile.am b/bindings/python3/Makefile.am
index 70a1dd8..6072fc2 100644
--- a/bindings/python3/Makefile.am
+++ b/bindings/python3/Makefile.am
@@ -27,7 +27,6 @@ AM_CPPFLAGS = -I. -I$(top_builddir) $(PYTHON3_INCLUDES)
LIBS = ${top_builddir}/src/libcap-ng.la
SWIG_FLAGS = -python
SWIG_INCLUDES = ${AM_CPPFLAGS}
-PYTHON = $(PYTHON3)
pyexec_PYTHON = capng.py
pyexec_LTLIBRARIES = _capng.la
pyexec_SOLIBRARIES = _capng.so
27 changes: 14 additions & 13 deletions rpm/libcap-ng.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,15 @@

Summary: An alternate posix capabilities library
Name: libcap-ng
Version: 0.8.3
Version: 0.8.5
Release: 1
License: LGPLv2+
URL: http://people.redhat.com/sgrubb/libcap-ng
URL: https://github.com/sailfishos/libcap-ng
Source: %{name}-%{version}.tar.bz2
BuildRequires: kernel-headers >= 2.6.11

Patch1: 0001-Fix-python-path-when-invoking-py-compile-54.patch

BuildRequires: kernel-headers >= 2.6.11
BuildRequires: libattr-devel
BuildRequires: automake autoconf libtool
BuildRequires: python3-base
Expand Down Expand Up @@ -81,7 +84,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libdrop_ambient.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libdrop_ambient.a
rm -f $RPM_BUILD_ROOT%{_libdir}/python%{python3_version}/site-packages/_capng.a
rm -f $RPM_BUILD_ROOT%{_libdir}/python%{python3_version}/site-packages/_capng.la

rm -f $RPM_BUILD_ROOT%{_mandir}/man7/libdrop_ambient.*

%check
make check
Expand All @@ -94,22 +97,20 @@ make check
%files
%license COPYING.LIB
%{_libdir}/libcap-ng.so.*
#%%{_libdir}/libdrop_ambient.so.*
%attr(0644,root,root) %{_mandir}/man7/*
%{_libdir}/libdrop_ambient.so.*

%files devel
%attr(0644,root,root) %{_mandir}/man3/*
%attr(0644,root,root) %{_includedir}/cap-ng.h
%{_mandir}/man3/*
%{_includedir}/cap-ng.h
%{_libdir}/libcap-ng.so
#%%{_libdir}/libdrop_ambient.so
%attr(0644,root,root) %{_datadir}/aclocal/cap-ng.m4
%{_libdir}/libdrop_ambient.so
%{_datadir}/aclocal/cap-ng.m4
%{_libdir}/pkgconfig/libcap-ng.pc

%files python3
%attr(755,root,root) %{python3_sitearch}/*
%{python3_sitearch}/capng.py*

%files utils
%license COPYING
%attr(0755,root,root) %{_bindir}/*
%attr(0644,root,root) %{_mandir}/man8/*
%{_bindir}/*
%{_mandir}/man8/*