libcap: update to 2.54.
This commit is contained in:
parent
c4358ba0b0
commit
b2636f5e5d
2 changed files with 2 additions and 49 deletions
|
@ -1,47 +0,0 @@
|
||||||
From afbc554d16a32ed352191e49b3673f2f72d0002f Mon Sep 17 00:00:00 2001
|
|
||||||
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
|
|
||||||
Date: Tue, 24 Aug 2021 01:22:57 +0200
|
|
||||||
Subject: libcap/Makefile: don't overwrite 'empty' when generating loader.txt
|
|
||||||
|
|
||||||
objcopy takes an input file and an output file as arguments. If the
|
|
||||||
output file is left out, the input file will be overwritten.
|
|
||||||
|
|
||||||
Since the objcopy command used to generate loader.txt only does a
|
|
||||||
dump-section and no filtering, in practice there is no change to empty.
|
|
||||||
However, as a side-effect, its timestamp is updated. The timestamp of
|
|
||||||
empty and of loader.txt will be more or less the same; however,
|
|
||||||
loader.txt is closed just before the output file is closed, so it's
|
|
||||||
possible that the timestamp of loader.txt is just a little bit earlier.
|
|
||||||
If this happens, it causes loader.txt to be rebuilt later, which in turn
|
|
||||||
causes a number of other object files to be rebuilt.
|
|
||||||
|
|
||||||
Usually that's harmless, but it sometimes causes the rebuild to happen
|
|
||||||
during 'make install'. This is particularly annoying if 'make install'
|
|
||||||
is done as root, since loader.txt becomes owned by root in that case.
|
|
||||||
|
|
||||||
Fix this by specifying a harmless output file: /dev/null.
|
|
||||||
|
|
||||||
Fixes: ee3b25c0a877fa74d1aec88f325ac45b09963c82
|
|
||||||
|
|
||||||
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
|
|
||||||
Signed-off-by: Andrew G. Morgan <morgan@kernel.org>
|
|
||||||
---
|
|
||||||
libcap/Makefile | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/libcap/Makefile b/libcap/Makefile
|
|
||||||
index 56fb0af..399aa66 100644
|
|
||||||
--- a/libcap/Makefile
|
|
||||||
+++ b/libcap/Makefile
|
|
||||||
@@ -108,7 +108,7 @@ empty: empty.c
|
|
||||||
$(CC) -o $@ $<
|
|
||||||
|
|
||||||
loader.txt: empty
|
|
||||||
- $(OBJCOPY) --dump-section .interp=$@ $<
|
|
||||||
+ $(OBJCOPY) --dump-section .interp=$@ $< /dev/null
|
|
||||||
|
|
||||||
cap_magic.o: execable.h execable.c loader.txt
|
|
||||||
$(CC) $(CFLAGS) $(CPPFLAGS) -DLIBRARY_VERSION=\"$(LIBTITLE)-$(VERSION).$(MINOR)\" -DSHARED_LOADER=\"$(shell cat loader.txt)\" -c execable.c -o $@
|
|
||||||
--
|
|
||||||
cgit 1.2.3-1.el7
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'libcap'
|
# Template file for 'libcap'
|
||||||
pkgname=libcap
|
pkgname=libcap
|
||||||
version=2.53
|
version=2.54
|
||||||
revision=1
|
revision=1
|
||||||
bootstrap=yes
|
bootstrap=yes
|
||||||
build_style=gnu-makefile
|
build_style=gnu-makefile
|
||||||
|
@ -14,7 +14,7 @@ license="GPL-2.0-only"
|
||||||
homepage="http://sites.google.com/site/fullycapable/"
|
homepage="http://sites.google.com/site/fullycapable/"
|
||||||
changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
|
changelog="https://sites.google.com/site/fullycapable/release-notes-for-libcap"
|
||||||
distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
|
distfiles="${KERNEL_SITE}/libs/security/linux-privs/libcap2/${pkgname}-${version}.tar.xz"
|
||||||
checksum=9546b7e5358a67a6a4fb0f51715b628efdeff00ee0e629666847ed7de3c63571
|
checksum=5091b24247999fd7a5e62bd9ac8bc761cda29f9baa0d1a2ca6a46f13891b4f0f
|
||||||
|
|
||||||
if [ "$CROSS_BUILD" ]; then
|
if [ "$CROSS_BUILD" ]; then
|
||||||
make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
|
make_build_args="CROSS_COMPILE=${XBPS_CROSS_TRIPLET}-"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue