aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Teräs <timo.teras@iki.fi>2015-04-15 08:46:40 +0300
committerTimo Teräs <timo.teras@iki.fi>2015-04-15 08:46:40 +0300
commit1690cd31269ce9db0f3d3aaafda730e20296e7b4 (patch)
tree69a03240ecc42cb3d4872b5a0b0e06e67dceb338
parent624577a1fc0186f25f7bd532acee001befd96d90 (diff)
downloadaports-1690cd31269ce9db0f3d3aaafda730e20296e7b4.tar.bz2
aports-1690cd31269ce9db0f3d3aaafda730e20296e7b4.tar.xz
main/libcap-ng: fix endianess detection
-rw-r--r--main/libcap-ng/APKBUILD8
-rw-r--r--main/libcap-ng/fix-includes.patch22
2 files changed, 18 insertions, 12 deletions
diff --git a/main/libcap-ng/APKBUILD b/main/libcap-ng/APKBUILD
index c04b710d32..b570b540ae 100644
--- a/main/libcap-ng/APKBUILD
+++ b/main/libcap-ng/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=libcap-ng
pkgver=0.7.4
-pkgrel=1
+pkgrel=2
pkgdesc="posix capabilities library"
url="http://people.redhat.com/sgrubb/libcap-ng/index.html"
arch="all"
@@ -52,8 +52,8 @@ utils() {
}
md5sums="55c57c0673b944ea1a755bcb2636dabd libcap-ng-0.7.4.tar.gz
-1fb40026b1439ff4cb6566c96f653775 fix-includes.patch"
+e53b83924635fddc92e4f553396afc4a fix-includes.patch"
sha256sums="48a2083276f9820cb92dcb05d001b30733bcbf48c14c230303cac3cd08b45b6b libcap-ng-0.7.4.tar.gz
-577db727f4918e89a2695de4035244a6dc3b5280a9338c1c80ad30567e7292c3 fix-includes.patch"
+5f40a10b9902ac812c6c10705874b991125f6b803b672dd35db4eb6d791a0b69 fix-includes.patch"
sha512sums="443b92f44cffd4b436a2651eb3539c560382102d918faf63f993d3b6627c03e80f7b4a5105ddb040890ef82122a42ca6881795ab0639de337f693705f5506cf0 libcap-ng-0.7.4.tar.gz
-a7ffa9b196b92398755c9409b28e966faa0143bdd115cdd7409eb65b87f09fcd6fec2937b5cc847a2eed895134fe6dd79c075cce652cb11f146eb3f0889bca59 fix-includes.patch"
+62bf6093ca091b4ae364480a6f8866db0e55b4733e9f69dd9d8caba6a92d9714e242da0f4eecbe958fcf17d028ac3ed52f6ec2c99c30a981af045010ce6678a0 fix-includes.patch"
diff --git a/main/libcap-ng/fix-includes.patch b/main/libcap-ng/fix-includes.patch
index 8a52a4efb3..90388e8117 100644
--- a/main/libcap-ng/fix-includes.patch
+++ b/main/libcap-ng/fix-includes.patch
@@ -1,10 +1,17 @@
-Only in libcap-ng-0.7.3: utils/.libs/filecap
-Only in libcap-ng-0.7.3: utils/.libs/netcap
-Only in libcap-ng-0.7.3: utils/filecap
-Only in libcap-ng-0.7.3: utils/netcap
-Only in libcap-ng-0.7.3: utils/netcap.o
---- libcap-ng-0.7.3.orig/utils/proc-llist.h
-+++ libcap-ng-0.7.3/utils/proc-llist.h
+diff -ru libcap-ng-0.7.4.orig/src/cap-ng.c libcap-ng-0.7.4/src/cap-ng.c
+--- libcap-ng-0.7.4.orig/src/cap-ng.c 2014-04-24 15:41:43.000000000 -0300
++++ libcap-ng-0.7.4/src/cap-ng.c 2015-04-15 08:45:10.783335463 -0300
+@@ -34,6 +34,7 @@
+ #include <stdarg.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <endian.h>
+ #include <byteswap.h>
+ #ifdef HAVE_SYSCALL_H
+ #include <sys/syscall.h>
+diff -ru libcap-ng-0.7.4.orig/utils/proc-llist.h libcap-ng-0.7.4/utils/proc-llist.h
+--- libcap-ng-0.7.4.orig/utils/proc-llist.h 2014-04-24 15:41:45.000000000 -0300
++++ libcap-ng-0.7.4/utils/proc-llist.h 2015-04-15 08:44:48.820001003 -0300
@@ -25,7 +25,7 @@
#define PROC_HEADER
@@ -14,4 +21,3 @@ Only in libcap-ng-0.7.3: utils/netcap.o
/* This is the node of the linked list. Any data elements that are per
* record goes here. */
-Only in libcap-ng-0.7.3: utils/proc-llist.o