mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-06 05:47:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

main/cifs-utils: upgrade to 6.8, added patch for missing musl includes

Browse Source
This commit is contained in:
Francesco Colista 2018-03-14 08:26:41 +00:00
parent 25ba0f223a
commit 82e641718b
2 changed files with 48 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
main/cifs-utils/APKBUILD
View File

@ -1,17 +1,18 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org> # Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org> # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=cifs-utils pkgname=cifs-utils
pkgver=6.7 pkgver=6.8
pkgrel=1 pkgrel=0
pkgdesc="CIFS filesystem user-space tools" pkgdesc="CIFS filesystem user-space tools"
url="https://wiki.samba.org/index.php/LinuxCIFS_utils" url="https://wiki.samba.org/index.php/LinuxCIFS_utils"
arch="all" arch="all"
license="GPL-2.0-or-later" license="GPL-2.0-or-later"
makedepends="libcap-dev keyutils-dev krb5-dev talloc-dev makedepends="libcap-dev keyutils-dev krb5-dev talloc-dev
autoconf automake" autoconf automake samba-dev py-docutils"
subpackages="$pkgname-doc $pkgname-dev" subpackages="$pkgname-doc $pkgname-dev"
source="https://ftp.samba.org/pub/linux-cifs/$pkgname/$pkgname-$pkgver.tar.bz2 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 options=suid
builddir=$srcdir/$pkgname-$pkgver builddir=$srcdir/$pkgname-$pkgver
@ -22,18 +23,23 @@ build() {
./configure \ ./configure \
--build=$CBUILD \ --build=$CBUILD \
--host=$CHOST \ --host=$CHOST \
--prefix=/usr \ --prefix=/usr
|| return 1 make AM_CFLAGS=""
make AM_CFLAGS="" || return 1 }
check() {
cd "$builddir"
make check
} }
package() { package() {
cd "$builddir" cd "$builddir"
make DESTDIR="$pkgdir" install || return 1 make DESTDIR="$pkgdir" install
rm -r $pkgdir/usr/bin rm -r $pkgdir/usr/bin
# set mount.cifs uid, to enable none root mounting form fstab # set mount.cifs uid, to enable none root mounting form fstab
chmod +s $pkgdir/sbin/mount.cifs chmod +s $pkgdir/sbin/mount.cifs
} }
sha512sums="ee050a0eb4a72fbc8d773e86fbe6839ea2bf11cda5ebd071c8ead66e31b46d50ea4e1d1b26478373be53227cd60b32a90b65b5cb989b5a8237cddfc65bad8e5e cifs-utils-6.7.tar.bz2 sha512sums="54a094f78c9e07acc997adfe0c8d4c2fb8e15c18adcc1805450e2180f8539aaec8619e781e985b289e097932637e2de3e6815e32f59ec2fc06cfc3762b832e13 cifs-utils-6.8.tar.bz2
99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch" 99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe musl-fix-includes.patch
2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98 xattr_size_max.patch"

32
main/cifs-utils/xattr_size_max.patch Normal file
View File

@ -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,