[ptxdist] [PATCH 1/2] libcap-ng: Version bump. 0.9.3 -> 0.9.5

[ptxdist] [PATCH 1/2] libcap-ng: Version bump. 0.9.3 -> 0.9.5

[Christian Melki]

https://github.com/stevegrubb/libcap-ng/releases/tag/v0.9.4
https://github.com/stevegrubb/libcap-ng/releases/tag/v0.9.5

* Adjust patchset slightly.

* Adjust build options slightly.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 ...0001-Makefile.am-Remove-bindings-dir.patch | 31 ++++---------------
 .../autogen.sh                                |  0
 .../series                                    |  0
 rules/libcap-ng.make                          |  5 +--
 4 files changed, 9 insertions(+), 27 deletions(-)
 rename patches/{libcap-ng-0.9.3 => libcap-ng-0.9.5}/0001-Makefile.am-Remove-bindings-dir.patch (58%)
 rename patches/{libcap-ng-0.9.3 => libcap-ng-0.9.5}/autogen.sh (100%)
 rename patches/{libcap-ng-0.9.3 => libcap-ng-0.9.5}/series (100%)

diff --git a/patches/libcap-ng-0.9.3/0001-Makefile.am-Remove-bindings-dir.patch b/patches/libcap-ng-0.9.5/0001-Makefile.am-Remove-bindings-dir.patch
similarity index 58%
rename from patches/libcap-ng-0.9.3/0001-Makefile.am-Remove-bindings-dir.patch
rename to patches/libcap-ng-0.9.5/0001-Makefile.am-Remove-bindings-dir.patch
index 3cc6e9cd3..dcea02949 100644
--- a/patches/libcap-ng-0.9.3/0001-Makefile.am-Remove-bindings-dir.patch
+++ b/patches/libcap-ng-0.9.5/0001-Makefile.am-Remove-bindings-dir.patch
@@ -12,9 +12,8 @@ Signed-off-by: Christian Melki <christian.melki@t2data.com>
 ---
  Makefile.am              | 3 ---
  NEWS                     | 0
- bindings/src/Makefile.am | 3 ---
- configure.ac             | 6 ------
- 4 files changed, 12 deletions(-)
+ bindings/src/Makefile.am | 1 -
+ 3 files changed, 4 deletions(-)
  create mode 100644 NEWS
 
 diff --git a/Makefile.am b/Makefile.am
@@ -35,30 +34,12 @@ diff --git a/NEWS b/NEWS
 new file mode 100644
 index 000000000000..e69de29bb2d1
 diff --git a/bindings/src/Makefile.am b/bindings/src/Makefile.am
-index 924e3d0877b4..626241c6328c 100644
+index 924e3d0877b4..d84fb3023993 100644
 --- a/bindings/src/Makefile.am
 +++ b/bindings/src/Makefile.am
-@@ -19,6 +19,3 @@
- # Authors:
+@@ -20,5 +20,4 @@
  #   Steve Grubb <sgrubb@redhat.com>
  #
--
--EXTRA_DIST = capng_swig.i
--CONFIG_CLEAN_FILES = *.loT *.rej *.orig
-diff --git a/configure.ac b/configure.ac
-index 44ef598d0676..d987698e2062 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -257,12 +257,6 @@ if test x"${ac_cv_have_decl_PR_CAP_AMBIENT}" = x"no" ; then
- fi
- AM_CONDITIONAL(BUILD_LIBDROP_AMBIENT, test x"${ac_cv_have_decl_PR_CAP_AMBIENT}" = x"yes")
  
--AC_CHECK_PROG(swig_found, swig, yes, no)
--if test x"${swig_found}" = x"no" ; then
--	AC_MSG_WARN("Swig not found - python bindings will not be made")
--fi
--AM_CONDITIONAL(HAVE_SWIG, test x"${swig_found}" = x"yes")
--
- withval=""
- AC_MSG_CHECKING(whether to create python3 bindings)
- AC_ARG_WITH(python3,
+-EXTRA_DIST = capng_swig.i
+ CONFIG_CLEAN_FILES = *.loT *.rej *.orig
diff --git a/patches/libcap-ng-0.9.3/autogen.sh b/patches/libcap-ng-0.9.5/autogen.sh
similarity index 100%
rename from patches/libcap-ng-0.9.3/autogen.sh
rename to patches/libcap-ng-0.9.5/autogen.sh
diff --git a/patches/libcap-ng-0.9.3/series b/patches/libcap-ng-0.9.5/series
similarity index 100%
rename from patches/libcap-ng-0.9.3/series
rename to patches/libcap-ng-0.9.5/series
diff --git a/rules/libcap-ng.make b/rules/libcap-ng.make
index 19083429e..2762f6432 100644
--- a/rules/libcap-ng.make
+++ b/rules/libcap-ng.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAP_NG) += libcap-ng
 #
 # Paths and names
 #
-LIBCAP_NG_VERSION	:= 0.9.3
-LIBCAP_NG_SHA256	:= fe11ebbb55904763b3532f19069f13ec319042634620180a03bd4653d301563e
+LIBCAP_NG_VERSION	:= 0.9.5
+LIBCAP_NG_SHA256	:= a2b4211f59b231d607c61ea2a13e9ecb38f446fe769b44e12da939d5af6d978a
 LIBCAP_NG		:= libcap-ng-$(LIBCAP_NG_VERSION)
 LIBCAP_NG_SUFFIX	:= tar.gz
 LIBCAP_NG_URL		:= \
@@ -38,6 +38,7 @@ LIBCAP_NG_CONF_OPT := \
 	$(CROSS_AUTOCONF_USR) \
 	--disable-cap-audit \
 	--without-warn \
+	--without-python \
 	--without-python3
 
 # ----------------------------------------------------------------------------
-- 
2.43.0

[ptxdist] [PATCH 2/2] host-libcap-ng: Follow target libcap-ng bump. 0.9.3 -> 0.9.5

[Christian Melki]

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/host-libcap-ng.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/host-libcap-ng.make b/rules/host-libcap-ng.make
index b5dd75448..f1b837e31 100644
--- a/rules/host-libcap-ng.make
+++ b/rules/host-libcap-ng.make
@@ -23,6 +23,7 @@ HOST_LIBCAP_NG_CONF_OPT := \
 	$(HOST_AUTOCONF) \
 	--disable-cap-audit \
 	--without-warn \
+	--without-python \
 	--without-python3
 
 # needed for old glibc versions
-- 
2.43.0