[gnome-continuous-yocto/gnomeostree-3.14-dizzy] meta: Update libcap recipe to 2.24

[Emmanuele Bassi <ebassi src gnome org>]

commit 430509c5e63174e616dc95f695cf7f4ae9fba867
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Mon Aug 22 10:26:35 2016 +0100

    meta: Update libcap recipe to 2.24
    
    Instead of using the latest recipe, let's try with the one from Jethro
    (AKA Yocto 2.0, released 2015).

 .../libcap/libcap/fix-CAP_LAST_CAP.patch           |   39 --------------------
 meta/recipes-support/libcap/libcap_2.22.bb         |    6 ---
 .../libcap/{libcap.inc => libcap_2.24.bb}          |   21 +++++++----
 3 files changed, 14 insertions(+), 52 deletions(-)
---
diff --git a/meta/recipes-support/libcap/libcap.inc b/meta/recipes-support/libcap/libcap_2.24.bb
similarity index 67%
rename from meta/recipes-support/libcap/libcap.inc
rename to meta/recipes-support/libcap/libcap_2.24.bb
index 0e28ea0..36b94ee 100644
--- a/meta/recipes-support/libcap/libcap.inc
+++ b/meta/recipes-support/libcap/libcap_2.24.bb
@@ -7,10 +7,10 @@ LIC_FILES_CHKSUM = "file://License;md5=3f84fd6f29d453a56514cb7e4ead25f1"
 
 DEPENDS = "perl-native-runtime"
 
-SRC_URI = "${DEBIAN_MIRROR}/main/libc/libcap2/${BPN}2_${PV}.orig.tar.gz \
-           file://fix-CAP_LAST_CAP.patch"
+SRC_URI = "${KERNELORG_MIRROR}/linux/libs/security/linux-privs/${BPN}2/${BPN}-${PV}.tar.xz"
 
-PR = "r1"
+SRC_URI[md5sum] = "d43ab9f680435a7fff35b4ace8d45b80"
+SRC_URI[sha256sum] = "cee4568f78dc851d726fc93f25f4ed91cc223b1fe8259daa4a77158d174e6c65"
 
 inherit lib_package
 
@@ -26,20 +26,25 @@ do_configure() {
        sed -e '/shell gperf/cifeq (,yes)' -i libcap/Makefile
 }
 
-PACKAGECONFIG ??= "attr ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}"
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \
+                   ${@bb.utils.contains('DISTRO_FEATURES', 'xattr', 'attr', '', d)}"
 PACKAGECONFIG_class-native ??= ""
 
 PACKAGECONFIG[attr] = "LIBATTR=yes,LIBATTR=no,attr"
 PACKAGECONFIG[pam] = "PAM_CAP=yes,PAM_CAP=no,libpam"
 
-EXTRA_OEMAKE += " \
+EXTRA_OEMAKE = " \
   INDENT=  \
   lib=${@os.path.basename('${libdir}')} \
   RAISE_SETFCAP=no \
+  DYNAMIC=yes \
 "
 
 EXTRA_OEMAKE_append_class-target = " SYSTEM_HEADERS=${STAGING_INCDIR}"
 
+# these are present in the libcap defaults, so include in our CFLAGS too
+CFLAGS += "-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
+
 do_compile() {
        oe_runmake ${EXTRA_OECONF}
 }
@@ -56,8 +61,10 @@ do_install_append() {
        # Move the library to base_libdir
        install -d ${D}${base_libdir}
        if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then
-               mv ${D}${libdir}/* ${D}${base_libdir}
-               rmdir ${D}${libdir}
+               mv ${D}${libdir}/libcap* ${D}${base_libdir}
+                if [ -d ${D}${libdir}/security ]; then
+                       mv ${D}${libdir}/security ${D}${base_libdir}
+               fi
        fi
 }