diff options
| author | Francesco Colista <fcolista@alpinelinux.org> | 2018-03-14 08:26:41 +0000 |
|---|---|---|
| committer | Francesco Colista <fcolista@alpinelinux.org> | 2018-03-14 08:26:41 +0000 |
| commit | 82e641718bc621d02b29d1a0ce031dea2d25f125 (patch) | |
| tree | b61f2d391d481d87b1c9d6a15070082319399bba | |
| parent | 25ba0f223a73b2a6dd04b47b57504adde3be83a6 (diff) | |
| download | aports-82e641718bc621d02b29d1a0ce031dea2d25f125.tar.bz2 aports-82e641718bc621d02b29d1a0ce031dea2d25f125.tar.xz | |
main/cifs-utils: upgrade to 6.8, added patch for missing musl includes
| -rw-r--r-- | main/cifs-utils/APKBUILD | 26 | ||||
| -rw-r--r-- | main/cifs-utils/xattr_size_max.patch | 32 |
2 files changed, 48 insertions, 10 deletions
diff --git a/main/cifs-utils/APKBUILD b/main/cifs-utils/APKBUILD index 3c6fcfaab0..611d169250 100644 --- a/main/cifs-utils/APKBUILD +++ b/main/cifs-utils/APKBUILD @@ -1,17 +1,18 @@ # Contributor: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org> pkgname=cifs-utils -pkgver=6.7 -pkgrel=1 +pkgver=6.8 +pkgrel=0 pkgdesc="CIFS filesystem user-space tools" url="https://wiki.samba.org/index.php/LinuxCIFS_utils" arch="all" license="GPL-2.0-or-later" makedepends="libcap-dev keyutils-dev krb5-dev talloc-dev - autoconf automake" + autoconf automake samba-dev py-docutils" subpackages="$pkgname-doc $pkgname-dev" source="https://ftp.samba.org/pub/linux-cifs/$pkgname/$pkgname-$pkgver.tar.bz2 - musl-fix-includes.patch" + musl-fix-includes.patch + xattr_size_max.patch" options=suid builddir=$srcdir/$pkgname-$pkgver @@ -22,18 +23,23 @@ build() { ./configure \ --build=$CBUILD \ --host=$CHOST \ - --prefix=/usr \ - || return 1 - make AM_CFLAGS="" || return 1 + --prefix=/usr + make AM_CFLAGS="" +} + +check() { + cd "$builddir" + make check } package() { cd "$builddir" - make DESTDIR="$pkgdir" install || return 1 + make DESTDIR="$pkgdir" install rm -r $pkgdir/usr/bin # set mount.cifs uid, to enable none root mounting form fstab chmod +s $pkgdir/sbin/mount.cifs } -sha512sums="ee050a0eb4a72fbc8d773e86fbe6839ea2bf11cda5ebd071c8ead66e31b46d50ea4e1d1b26478373be53227cd60b32a90b65b5cb989b5a8237cddfc65bad8e5e cifs-utils-6.7.tar.bz2 -99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch" +sha512sums="54a094f78c9e07acc997adfe0c8d4c2fb8e15c18adcc1805450e2180f8539aaec8619e781e985b289e097932637e2de3e6815e32f59ec2fc06cfc3762b832e13 cifs-utils-6.8.tar.bz2 +99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch +2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch" diff --git a/main/cifs-utils/xattr_size_max.patch b/main/cifs-utils/xattr_size_max.patch new file mode 100644 index 0000000000..041041a61e --- /dev/null +++ b/main/cifs-utils/xattr_size_max.patch @@ -0,0 +1,32 @@ +diff --git a/getcifsacl.c b/getcifsacl.c +index f08cdea..5c46999 100644 +--- a/getcifsacl.c ++++ b/getcifsacl.c +@@ -38,6 +38,11 @@ + #include "cifsacl.h" + #include "idmap_plugin.h" + ++#ifdef __linux__ ++#include <linux/limits.h> /* for XATTR_SIZE_MAX */ ++#include <endian.h> /* le16toh, le32toh etc */ ++#endif ++ + static void *plugin_handle; + static bool plugin_loaded; + +diff --git a/setcifsacl.c b/setcifsacl.c +index ba34403..64e6eaa 100644 +--- a/setcifsacl.c ++++ b/setcifsacl.c +@@ -39,6 +39,11 @@ + #include "cifsacl.h" + #include "idmap_plugin.h" + ++#ifdef __linux__ ++#include <linux/limits.h> /* for XATTR_SIZE_MAX */ ++#include <endian.h> /* le16toh, le32toh etc */ ++#endif ++ + enum setcifsacl_actions { + ActUnknown = -1, + ActDelete, |