From 5467c5239cf59b64db57ad6aecbc27501f62ffd0 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 10 Jan 2016 10:13:11 +0100 Subject: [PATCH] autofs: rebuild to fix #3316 and fix musl support. --- srcpkgs/autofs/patches/musl.patch | 30 ++++++++++++++++++++++++++++++ srcpkgs/autofs/template | 13 +++++++------ 2 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 srcpkgs/autofs/patches/musl.patch diff --git a/srcpkgs/autofs/patches/musl.patch b/srcpkgs/autofs/patches/musl.patch new file mode 100644 index 00000000000..ce802dcfbf6 --- /dev/null +++ b/srcpkgs/autofs/patches/musl.patch @@ -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 + #include + ++#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 diff --git a/srcpkgs/autofs/template b/srcpkgs/autofs/template index fa5d0444124..af6a23b8520 100644 --- a/srcpkgs/autofs/template +++ b/srcpkgs/autofs/template @@ -1,7 +1,7 @@ # Template file for 'autofs' pkgname=autofs version=5.1.1 -revision=4 +revision=5 build_style=gnu-configure conf_files=" /etc/autofs/auto.master @@ -9,7 +9,7 @@ conf_files=" /etc/autofs/autofs.conf /etc/autofs/autofs_ldap_auth.conf" configure_args="--with-libtirpc --with-mapdir=/etc/autofs --sbindir=/usr/bin" -hostmakedepends="flex kmod" +hostmakedepends="flex kmod rpcgen" makedepends="libtirpc-devel" short_desc="A kernel-based automounter for Linux" maintainer="Juan RP " @@ -18,14 +18,15 @@ homepage="${KERNEL_SITE}/daemons/autofs" distfiles="${KERNEL_SITE}/daemons/autofs/v5/autofs-${version}.tar.xz" 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() { - sed -i "s,/usr/include/tirpc,${XBPS_CROSS_BASE}/usr/include/tirpc,g" Makefile.rules +pre_configure() { + sed -i 's,nfs/nfs.h,linux/nfs.h,g' */*.[ch] + sed -i 's,__S_IEXEC,S_IXUSR,g' */*.[ch] } post_install() { vsv $pkgname # Remove unused stuff rm ${DESTDIR}/usr/share/man/man5/autofs.5 - rm -r ${DESTDIR}/etc/default + rm -r ${DESTDIR}/etc/default || : }