Commit b2b55b45 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

libcap: security bump to version 2.22 



Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent d134ce8b

package/libcap/libcap-2.20-build-system.patch→package/libcap/libcap-2.22-build-system.patch

+17 −17
Original line number Diff line number Diff line
@@ -3,21 +3,33 @@ Also install the shared lib +x 


Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>



diff -Nura libcap-2.20/Make.Rules libcap-2.20-build/Make.Rules

--- libcap-2.20/Make.Rules	2011-01-19 02:06:44.000000000 -0300

+++ libcap-2.20-build/Make.Rules	2011-04-19 14:07:53.544903094 -0300

diff -Nura libcap-2.22.orig/libcap/Makefile libcap-2.22/libcap/Makefile

--- libcap-2.22.orig/libcap/Makefile	2010-08-08 19:26:04.000000000 -0300

+++ libcap-2.22/libcap/Makefile	2011-12-14 11:33:51.761800334 -0300

@@ -65,7 +65,7 @@

 	install -m 0644 include/sys/capability.h $(INCDIR)/sys

 	mkdir -p -m 0755 $(LIBDIR)

 	install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)

-	install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)

+	install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)

 	ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)

 	ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)

 ifeq ($(FAKEROOT),)

diff -Nura libcap-2.22.orig/Make.Rules libcap-2.22/Make.Rules

--- libcap-2.22.orig/Make.Rules	2011-07-24 23:18:23.000000000 -0300

+++ libcap-2.22/Make.Rules	2011-12-14 11:33:28.707278685 -0300

@@ -47,25 +47,25 @@

 KERNEL_HEADERS := $(topdir)/libcap/include

 IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)

 

-CC := gcc

-CFLAGS := -O2

-CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64

-BUILD_CC := $(CC)

-BUILD_CFLAGS := $(CFLAGS) $(IPATH)

-AR := ar

-RANLIB := ranlib

+CC ?= gcc

+CFLAGS ?= -O2

+CFLAGS ?= -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64

+BUILD_CC ?= $(CC)

+BUILD_CFLAGS ?= $(CFLAGS) $(IPATH)

+AR ?= ar
@@ -40,15 +52,3 @@ diff -Nura libcap-2.20/Make.Rules libcap-2.20-build/Make.Rules 
 INDENT := $(shell if [ -n "$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi)

 DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi)

 LIBATTR := yes
 
diff -Nura libcap-2.20/libcap/Makefile libcap-2.20-build/libcap/Makefile

--- libcap-2.20/libcap/Makefile	2010-08-08 19:26:04.000000000 -0300

+++ libcap-2.20-build/libcap/Makefile	2011-04-19 14:08:29.377146094 -0300

@@ -65,7 +65,7 @@

 	install -m 0644 include/sys/capability.h $(INCDIR)/sys

 	mkdir -p -m 0755 $(LIBDIR)

 	install -m 0644 $(STALIBNAME) $(LIBDIR)/$(STALIBNAME)

-	install -m 0644 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)

+	install -m 0755 $(MINLIBNAME) $(LIBDIR)/$(MINLIBNAME)

 	ln -sf $(MINLIBNAME) $(LIBDIR)/$(MAJLIBNAME)

 	ln -sf $(MAJLIBNAME) $(LIBDIR)/$(LIBNAME)

 ifeq ($(FAKEROOT),)

package/libcap/libcap.mk

+5 −2
Original line number Diff line number Diff line
@@ -4,8 +4,11 @@ 
#

#############################################################



LIBCAP_VERSION = 2.20

LIBCAP_SITE = http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2

LIBCAP_VERSION = 2.22

# Until kernel.org is completely back up use debian mirror

#LIBCAP_SITE = http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2

LIBCAP_SITE = $(BR2_DEBIAN_MIRROR)/debian/pool/main/libc/libcap2

LIBCAP_SOURCE = libcap2_$(LIBCAP_VERSION).orig.tar.gz

LIBCAP_DEPENDENCIES = host-libcap

LIBCAP_INSTALL_STAGING = YES