!3 回退 'Pull Request !1 : 升级libcap到2.32版本'

Merge pull request !3 from 惊奇脆片饼干/revert-merge-1-master

libcap-2.25-buildflags.patch

@@ -0,0 +1,22 @@
+diff -up libcap-2.25/Make.Rules.rh libcap-2.25/Make.Rules
+--- libcap-2.25/Make.Rules.rh	2016-04-11 18:52:01.418065682 +0200
++++ libcap-2.25/Make.Rules	2016-04-11 18:52:10.790113866 +0200
+@@ -49,7 +49,8 @@ KERNEL_HEADERS := $(topdir)/libcap/inclu
+ IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
+ 
+ CC := gcc
+-CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++CFLAGS := $(RPM_OPT_FLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
++
+ BUILD_CC := $(CC)
+ BUILD_CFLAGS := $(CFLAGS) $(IPATH)
+ AR := ar
+@@ -60,7 +61,7 @@ WARNINGS=-Wall -Wwrite-strings \
+         -Wstrict-prototypes -Wmissing-prototypes \
+         -Wnested-externs -Winline -Wshadow
+ LD=$(CC) -Wl,-x -shared
+-LDFLAGS := #-g
++LDFLAGS := $(RPM_LD_FLAGS) #-g
+ BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes)
+ 
+ SYSTEM_HEADERS = /usr/include

libcap-buildflags.patch

@@ -1,34 +0,0 @@
-From 11bdd43001c41d96769e437498bc57e8665ada2f Mon Sep 17 00:00:00 2001
-From: zhangchenfeng <zhangchenfeng1@huawei.com>
-Date: Fri, 17 Apr 2020 10:21:28 +0800
-Subject: [PATCH] bcap-2.32-buildflags
-
----
- Make.Rules | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Make.Rules b/Make.Rules
-index f02c770..b5d682b 100644
---- a/Make.Rules
-+++ b/Make.Rules
-@@ -50,7 +50,7 @@ KERNEL_HEADERS := $(topdir)/libcap/include/uapi
- IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
- 
- CC := gcc
--CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-+CFLAGS := $(RPM_OPT_FLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
- BUILD_CC := $(CC)
- BUILD_CFLAGS := $(CFLAGS) $(IPATH)
- AR := ar
-@@ -61,7 +61,7 @@ WARNINGS=-Wall -Wwrite-strings \
-         -Wstrict-prototypes -Wmissing-prototypes \
-         -Wnested-externs -Winline -Wshadow
- LD=$(CC) -Wl,-x -shared
--LDFLAGS := #-g
-+LDFLAGS := $(RPM_LD_FLAGS) #-g
- LIBCAPLIB := -L$(topdir)/libcap -lcap
- LIBPSXLIB := -L$(topdir)/libcap -lpsx -lpthread
- 
--- 
-1.8.3.1
-

libcap.spec

@@ -1,12 +1,12 @@
 Name:     libcap
-Version:  2.32
+Version:  2.27
 Release:  1
 Summary:  A library for getting and setting POSIX.1e draft 15 capabilities        
 License:  GPLv2
 URL:      https://sites.google.com/site/fullycapable
 Source0:  https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.gz
 
-Patch6000:   libcap-buildflags.patch
+Patch1:   libcap-2.25-buildflags.patch
 
 BuildRequires: libattr-devel pam-devel perl-interpreter gcc
 
@@ -67,12 +67,6 @@ chmod +x %{buildroot}/%{_libdir}/*.so.*
 %{_mandir}/man8/*.gz
 
 %changelog
-* Thu Apr 16 2020 zhangchenfeng<zhangchenfeng1@huawei.com> - 2.32-1
-- Type:enhancement
-- ID:NA
-- SUG:NA
-- DESC: upgrade version to 2.32
-
 * Mon Oct 14 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.27-1
 - update to 2.27