autofs: rebuild to fix #3316 and fix musl support.

This commit is contained in:
Juan RP 2016-01-10 10:13:11 +01:00
parent ede8576e43
commit 5467c5239c
2 changed files with 37 additions and 6 deletions

View file

@ -0,0 +1,30 @@
--- lib/nss_parse.y.orig 2016-01-10 10:07:26.854512310 +0100
+++ lib/nss_parse.y 2016-01-10 10:07:53.134783321 +0100
@@ -28,6 +28,10 @@
#include "nsswitch.h"
#include "nss_parse.tab.h"
+#ifndef _PATH_NSSWITCH_CONF
+#define _PATH_NSSWITCH_CONF "/etc/nsswitch.conf"
+#endif
+
static pthread_mutex_t parse_mutex = PTHREAD_MUTEX_INITIALIZER;
static struct list_head *nss_list;
--- daemon/automount.c.orig 2016-01-10 10:10:23.680333952 +0100
+++ daemon/automount.c 2016-01-10 10:10:35.599456586 +0100
@@ -37,6 +37,14 @@
#include <sys/vfs.h>
#include <sys/utsname.h>
+#ifndef __SWORD_TYPE
+# if __WORDSIZE == 32 /* System word size */
+# define __SWORD_TYPE int
+# else /* __WORDSIZE == 64 */
+# define __SWORD_TYPE long int
+# endif
+#endif
+
#include "automount.h"
#if defined(LIBXML2_WORKAROUND) || defined(TIRPC_WORKAROUND)
#include <dlfcn.h>

View file

@ -1,7 +1,7 @@
# Template file for 'autofs' # Template file for 'autofs'
pkgname=autofs pkgname=autofs
version=5.1.1 version=5.1.1
revision=4 revision=5
build_style=gnu-configure build_style=gnu-configure
conf_files=" conf_files="
/etc/autofs/auto.master /etc/autofs/auto.master
@ -9,7 +9,7 @@ conf_files="
/etc/autofs/autofs.conf /etc/autofs/autofs.conf
/etc/autofs/autofs_ldap_auth.conf" /etc/autofs/autofs_ldap_auth.conf"
configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin" configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin"
hostmakedepends="flex kmod" hostmakedepends="flex kmod rpcgen"
makedepends="libtirpc-devel" makedepends="libtirpc-devel"
short_desc="A kernel-based automounter for Linux" short_desc="A kernel-based automounter for Linux"
maintainer="Juan RP <xtraeme@voidlinux.eu>" maintainer="Juan RP <xtraeme@voidlinux.eu>"
@ -18,14 +18,15 @@ homepage="${KERNEL_SITE}/daemons/autofs"
distfiles="${KERNEL_SITE}/daemons/autofs/v5/autofs-${version}.tar.xz" distfiles="${KERNEL_SITE}/daemons/autofs/v5/autofs-${version}.tar.xz"
checksum=e08ff0ef9ff365d87b6c33dca136d20e4e07675197a324f2816894cb437021c3 checksum=e08ff0ef9ff365d87b6c33dca136d20e4e07675197a324f2816894cb437021c3
CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/gssglue" CFLAGS="-I${XBPS_CROSS_BASE}/usr/include/gssglue -I${XBPS_CROSS_BASE}/usr/include/tirpc"
pre_build() { pre_configure() {
sed -i "s,/usr/include/tirpc,${XBPS_CROSS_BASE}/usr/include/tirpc,g" Makefile.rules sed -i 's,nfs/nfs.h,linux/nfs.h,g' */*.[ch]
sed -i 's,__S_IEXEC,S_IXUSR,g' */*.[ch]
} }
post_install() { post_install() {
vsv $pkgname vsv $pkgname
# Remove unused stuff # Remove unused stuff
rm ${DESTDIR}/usr/share/man/man5/autofs.5 rm ${DESTDIR}/usr/share/man/man5/autofs.5
rm -r ${DESTDIR}/etc/default rm -r ${DESTDIR}/etc/default || :
} }