Skip to content

Commit

Permalink
[libcap-ng] Update to 0.8.5. Contributes to JB#58868
Browse files Browse the repository at this point in the history
- Cherry-pick a commit to fix compilation without python2
  • Loading branch information
direc85 committed Nov 18, 2024
1 parent 38a1fc4 commit eba716f
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 3 deletions.
2 changes: 1 addition & 1 deletion libcap-ng
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
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
7 changes: 5 additions & 2 deletions rpm/libcap-ng.spec
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: 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

0 comments on commit eba716f

Please sign in to comment.