!23 [sync] PR-22: 【Mainline】Backport upstream patch to fix syntax error
From: @openeuler-sync-bot Reviewed-by: @HuaxinLuGitee Signed-off-by: @HuaxinLuGitee
This commit is contained in:
commit
f1a6b0b3a7
35
backport-Fix-the-syntax-error-in-cap-ng-c-50.patch
Normal file
35
backport-Fix-the-syntax-error-in-cap-ng-c-50.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
From 10ef4b05da8a46117b7ba65e01bf5367cc73777c Mon Sep 17 00:00:00 2001
|
||||||
|
From: yixiangzhike <yixiangzhike007@163.com>
|
||||||
|
Date: Wed, 20 Mar 2024 20:47:59 +0800
|
||||||
|
Subject: [PATCH] Fix the syntax error in cap-ng.c (#50)
|
||||||
|
|
||||||
|
Signed-off-by: yixiangzhike <yixiangzhike007@163.com>
|
||||||
|
---
|
||||||
|
src/cap-ng.c | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/cap-ng.c b/src/cap-ng.c
|
||||||
|
index d178e35..ed7d718 100644
|
||||||
|
--- a/src/cap-ng.c
|
||||||
|
+++ b/src/cap-ng.c
|
||||||
|
@@ -445,7 +445,7 @@ static int get_bounding_set(void)
|
||||||
|
#ifdef HAVE_SYSCALL_H
|
||||||
|
(int)syscall(__NR_gettid));
|
||||||
|
#else
|
||||||
|
- (int)getpid();
|
||||||
|
+ (int)getpid());
|
||||||
|
#endif
|
||||||
|
f = fopen(buf, "re");
|
||||||
|
if (f) {
|
||||||
|
@@ -490,7 +490,7 @@ static int get_ambient_set(void)
|
||||||
|
#ifdef HAVE_SYSCALL_H
|
||||||
|
(int)syscall(__NR_gettid));
|
||||||
|
#else
|
||||||
|
- (int)getpid();
|
||||||
|
+ (int)getpid());
|
||||||
|
#endif
|
||||||
|
f = fopen(buf, "re");
|
||||||
|
if (f) {
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -3,12 +3,13 @@
|
|||||||
Summary: Libcap-ng is a library used for posix capabilities programming
|
Summary: Libcap-ng is a library used for posix capabilities programming
|
||||||
Name: libcap-ng
|
Name: libcap-ng
|
||||||
Version: 0.8.3
|
Version: 0.8.3
|
||||||
Release: 1
|
Release: 2
|
||||||
License: LGPLv2+ and GPLv2+
|
License: LGPLv2+ and GPLv2+
|
||||||
URL: http://people.redhat.com/sgrubb/libcap-ng
|
URL: http://people.redhat.com/sgrubb/libcap-ng
|
||||||
Source0: https://people.redhat.com/sgrubb/libcap-ng/%{name}-%{version}.tar.gz
|
Source0: https://people.redhat.com/sgrubb/libcap-ng/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
Patch1: backport-Make-Python-test-script-compatible-with-Python2-and-Python3.patch
|
Patch1: backport-Make-Python-test-script-compatible-with-Python2-and-Python3.patch
|
||||||
|
Patch2: backport-Fix-the-syntax-error-in-cap-ng-c-50.patch
|
||||||
|
|
||||||
BuildRequires: gcc, kernel-headers >= 2.6.11, libattr-devel
|
BuildRequires: gcc, kernel-headers >= 2.6.11, libattr-devel
|
||||||
Provides: %{name}-utils = %{version}-%{release}
|
Provides: %{name}-utils = %{version}-%{release}
|
||||||
@ -99,6 +100,12 @@ make check
|
|||||||
%attr(0644,root,root) %{_mandir}/man8/*
|
%attr(0644,root,root) %{_mandir}/man8/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Apr 8 2024 yixiangzhike <yixiangzhike007@163.com> - 0.8.3-2
|
||||||
|
- Type:bugfix
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:backport upstream patch to fix syntax error
|
||||||
|
|
||||||
* Sat Oct 29 2022 yixiangzhike <yixiangzhike007@163.com> - 0.8.3-1
|
* Sat Oct 29 2022 yixiangzhike <yixiangzhike007@163.com> - 0.8.3-1
|
||||||
- Type:enhancement
|
- Type:enhancement
|
||||||
- ID:NA
|
- ID:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user