!32 [sync] PR-31: 【openEuler-20.03-LTS-SP1】Backport upstream patch to fix syntax error

From: @openeuler-sync-bot 
Reviewed-by: @HuaxinLuGitee 
Signed-off-by: @HuaxinLuGitee
This commit is contained in:
openeuler-ci-bot 2024-06-04 03:47:50 +00:00 committed by Gitee
commit 745b1b7173
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 42 additions and 1 deletions

View 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
@@ -354,7 +354,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) {
@@ -399,7 +399,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

View File

@ -3,10 +3,13 @@
Summary: Libcap-ng is a library used for posix capabilities programming
Name: libcap-ng
Version: 0.8.1
Release: 1
Release: 2
License: LGPLv2+ and GPLv2+
URL: http://people.redhat.com/sgrubb/libcap-ng
Source0: http://people.redhat.com/sgrubb/libcap-ng/%{name}-%{version}.tar.gz
Patch1: backport-Fix-the-syntax-error-in-cap-ng-c-50.patch
BuildRequires: gcc, kernel-headers >= 2.6.11, libattr-devel
Provides: %{name}-utils = %{version}-%{release}
Obsoletes: %{name}-utils < %{version}-%{release}
@ -111,6 +114,9 @@ make check
%attr(0644,root,root) %{_mandir}/man8/*
%changelog
* Thu May 30 2024 yixiangzhike <yixiangzhike007@163.com> - 0.8.1-2
- backport upstream patch to fix syntax error
* Fri Sep 24 2021 fuanan <fuanan3@huawei.com> - 0.8.1-1
- update version to 0.8.1