* [PATCH] libcap: Update to 2.25
@ 2016-03-30 6:14 Alexander Marx
0 siblings, 0 replies; 3+ messages in thread
From: Alexander Marx @ 2016-03-30 6:14 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 788 bytes --]
Signed-off-by: Alexander Marx <alexander.marx(a)ipfire.org>
---
libcap/libcap.nm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/libcap/libcap.nm b/libcap/libcap.nm
index 6941bda..145cf2f 100644
--- a/libcap/libcap.nm
+++ b/libcap/libcap.nm
@@ -4,11 +4,11 @@
###############################################################################
name = libcap
-version = 2.22
-release = 3
+version = 2.25
+release = 1
groups = System/Libraries
-url = http://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
+url = http://ftp.kernel.org/pub/linux/libs/security/linux-privs/libcap2/
license = LGPL2+
summary = Library for getting and setting POSIX.1e capabilities.
--
2.6.3
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] libcap: update to 2.25
@ 2016-06-26 8:33 Marcel Lorenz
0 siblings, 0 replies; 3+ messages in thread
From: Marcel Lorenz @ 2016-06-26 8:33 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2707 bytes --]
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
config/rootfiles/common/libcap | 4 ++--
lfs/libcap | 15 +++++++++------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/config/rootfiles/common/libcap b/config/rootfiles/common/libcap
index 0049f0a..294eca6 100644
--- a/config/rootfiles/common/libcap
+++ b/config/rootfiles/common/libcap
@@ -1,14 +1,14 @@
-#lib/libcap.a
lib/libcap.so
lib/libcap.so.1
lib/libcap.so.2
-lib/libcap.so.2.24
+lib/libcap.so.2.25
lib/security/pam_cap.so
sbin/capsh
sbin/getcap
sbin/getpcaps
sbin/setcap
#usr/include/sys/capability.h
+usr/lib/libcap.so
#usr/lib/pkgconfig/libcap.pc
#usr/share/man/man1/capsh.1
#usr/share/man/man3/cap_clear.3
diff --git a/lfs/libcap b/lfs/libcap
index 66ab555..836f9c7 100644
--- a/lfs/libcap
+++ b/lfs/libcap
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2014 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,10 +24,10 @@
include Config
-VER = 2.24
+VER = 2.25
THISAPP = libcap-$(VER)
-DL_FILE = $(THISAPP).tar.gz
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ffb154f29b1d28466c6fe6add8286a2d
+$(DL_FILE)_MD5 = 6666b839e5d46c2ad33fc8aa2ceb5f77
install : $(TARGET)
@@ -69,11 +69,14 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ # Prevent a static library from being installed
+ cd $(DIR_APP) && sed -i '/install.*STALIBNAME/d' libcap/Makefile
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
- # link for old binaries
+ # links for old binaries
ln -svf libcap.so.2 /lib/libcap.so.1
+ ln -svf /lib/libcap.so.2.25 /usr/lib/libcap.so
chmod +x /lib/libcap.so.*
@rm -rf $(DIR_APP)
@$(POSTBUILD)
--
1.9.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] libcap: update to 2.25
@ 2016-06-26 8:31 Marcel Lorenz
0 siblings, 0 replies; 3+ messages in thread
From: Marcel Lorenz @ 2016-06-26 8:31 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 2707 bytes --]
Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
config/rootfiles/common/libcap | 4 ++--
lfs/libcap | 15 +++++++++------
2 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/config/rootfiles/common/libcap b/config/rootfiles/common/libcap
index 0049f0a..294eca6 100644
--- a/config/rootfiles/common/libcap
+++ b/config/rootfiles/common/libcap
@@ -1,14 +1,14 @@
-#lib/libcap.a
lib/libcap.so
lib/libcap.so.1
lib/libcap.so.2
-lib/libcap.so.2.24
+lib/libcap.so.2.25
lib/security/pam_cap.so
sbin/capsh
sbin/getcap
sbin/getpcaps
sbin/setcap
#usr/include/sys/capability.h
+usr/lib/libcap.so
#usr/lib/pkgconfig/libcap.pc
#usr/share/man/man1/capsh.1
#usr/share/man/man3/cap_clear.3
diff --git a/lfs/libcap b/lfs/libcap
index 66ab555..836f9c7 100644
--- a/lfs/libcap
+++ b/lfs/libcap
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2014 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2016 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,10 +24,10 @@
include Config
-VER = 2.24
+VER = 2.25
THISAPP = libcap-$(VER)
-DL_FILE = $(THISAPP).tar.gz
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = ffb154f29b1d28466c6fe6add8286a2d
+$(DL_FILE)_MD5 = 6666b839e5d46c2ad33fc8aa2ceb5f77
install : $(TARGET)
@@ -69,11 +69,14 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ # Prevent a static library from being installed
+ cd $(DIR_APP) && sed -i '/install.*STALIBNAME/d' libcap/Makefile
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
- # link for old binaries
+ # links for old binaries
ln -svf libcap.so.2 /lib/libcap.so.1
+ ln -svf /lib/libcap.so.2.25 /usr/lib/libcap.so
chmod +x /lib/libcap.so.*
@rm -rf $(DIR_APP)
@$(POSTBUILD)
--
1.9.1
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-06-26 8:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-03-30 6:14 [PATCH] libcap: Update to 2.25 Alexander Marx
2016-06-26 8:31 [PATCH] libcap: update " Marcel Lorenz
2016-06-26 8:33 Marcel Lorenz
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox