nfs-utils: libnfsidmap is part of nfs-utils.
Get rid of the old libnfsidmap pkg and create subpkgs for it from nfs-utils.
This commit is contained in:
parent
bd1fb39d17
commit
e5b0e52f84
5 changed files with 30 additions and 43 deletions
|
@ -1085,7 +1085,7 @@ libobrender.so.32 libopenbox-3.6.1_1
|
||||||
libgssglue.so.1 libgssglue-0.3_1
|
libgssglue.so.1 libgssglue-0.3_1
|
||||||
libtirpc.so.3 libtirpc-1.0.2_1
|
libtirpc.so.3 libtirpc-1.0.2_1
|
||||||
librpcsecgss.so.3 librpcsecgss-0.19_1
|
librpcsecgss.so.3 librpcsecgss-0.19_1
|
||||||
libnfsidmap.so.0 libnfsidmap-0.24_1
|
libnfsidmap.so.1 libnfsidmap-2.4.3_2
|
||||||
libbind9.so.161 bind-libs-9.11.5_1
|
libbind9.so.161 bind-libs-9.11.5_1
|
||||||
libdns.so.1107 bind-libs-9.11.10_1
|
libdns.so.1107 bind-libs-9.11.10_1
|
||||||
libirs.so.161 bind-libs-9.11.5_1
|
libirs.so.161 bind-libs-9.11.5_1
|
||||||
|
|
1
srcpkgs/libnfsidmap
Symbolic link
1
srcpkgs/libnfsidmap
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
nfs-utils
|
|
@ -1 +1 @@
|
||||||
libnfsidmap
|
nfs-utils
|
|
@ -1,36 +0,0 @@
|
||||||
# Template file for 'libnfsidmap'
|
|
||||||
pkgname=libnfsidmap
|
|
||||||
version=0.26
|
|
||||||
revision=3
|
|
||||||
build_style=gnu-configure
|
|
||||||
configure_args="--disable-static"
|
|
||||||
hostmakedepends="automake libtool"
|
|
||||||
makedepends="libldap-devel"
|
|
||||||
short_desc="Library to help mapping IDs, mainly for NFSv4"
|
|
||||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
|
||||||
license="BSD-3-Clause"
|
|
||||||
homepage="http://www.citi.umich.edu/projects/nfsv4/linux/"
|
|
||||||
distfiles="https://fedorapeople.org/~steved/${pkgname}/${version}/${pkgname}-${version}.tar.bz2"
|
|
||||||
checksum=391cd35a8aa48bcba1678b483c3e2525d0990eca963bb035962fcf1e3ee2a8bf
|
|
||||||
|
|
||||||
post_install() {
|
|
||||||
vlicense COPYING
|
|
||||||
}
|
|
||||||
|
|
||||||
pre_configure() {
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
|
||||||
*-musl) sed -i 's,u_int,uint,g;s,u_char,unsigned char,g' *.[ch];;
|
|
||||||
esac
|
|
||||||
autoreconf -fi
|
|
||||||
}
|
|
||||||
|
|
||||||
libnfsidmap-devel_package() {
|
|
||||||
depends="libldap-devel ${sourcepkg}>=${version}_${revision}"
|
|
||||||
short_desc+=" - development files"
|
|
||||||
pkg_install() {
|
|
||||||
vmove usr/include
|
|
||||||
vmove usr/lib/pkgconfig
|
|
||||||
vmove "usr/lib/*.so"
|
|
||||||
vmove usr/share/man/man3
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'nfs-utils'
|
# Template file for 'nfs-utils'
|
||||||
pkgname=nfs-utils
|
pkgname=nfs-utils
|
||||||
version=2.4.3
|
version=2.4.3
|
||||||
revision=1
|
revision=2
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
|
configure_args="--with-statduser=nobody --enable-gss --enable-nfsv4
|
||||||
--with-statedir=/var/lib/nfs --enable-libmount-mount --enable-svcgss
|
--with-statedir=/var/lib/nfs --enable-libmount-mount --enable-svcgss
|
||||||
|
@ -19,11 +19,11 @@ replaces="rpcgen>=0"
|
||||||
|
|
||||||
hostmakedepends="pkg-config libtirpc-devel rpcsvc-proto"
|
hostmakedepends="pkg-config libtirpc-devel rpcsvc-proto"
|
||||||
makedepends="libblkid-devel libmount-devel libtirpc-devel
|
makedepends="libblkid-devel libmount-devel libtirpc-devel
|
||||||
libnfsidmap-devel keyutils-devel libevent-devel mit-krb5-devel
|
keyutils-devel libevent-devel mit-krb5-devel
|
||||||
device-mapper-devel libcap-devel sqlite-devel"
|
device-mapper-devel libcap-devel sqlite-devel"
|
||||||
depends="rpcbind"
|
depends="rpcbind"
|
||||||
python_version=3
|
python_version=3
|
||||||
conf_files="/etc/exports /etc/idmapd.conf"
|
conf_files="/etc/exports"
|
||||||
make_dirs="
|
make_dirs="
|
||||||
/var/lib/nfs/rpc_pipefs 0755 root root
|
/var/lib/nfs/rpc_pipefs 0755 root root
|
||||||
/var/lib/nfs/sm 0750 root root
|
/var/lib/nfs/sm 0750 root root
|
||||||
|
@ -39,6 +39,7 @@ pre_configure() {
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
*-musl)
|
*-musl)
|
||||||
vsed -i -e 's/__res_querydomain/res_querydomain/g' configure*
|
vsed -i -e 's/__res_querydomain/res_querydomain/g' configure*
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -46,10 +47,8 @@ post_install() {
|
||||||
mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin
|
mv ${DESTDIR}/sbin/* ${DESTDIR}/usr/bin
|
||||||
# conffiles
|
# conffiles
|
||||||
vconf ${FILESDIR}/exports
|
vconf ${FILESDIR}/exports
|
||||||
vconf ${FILESDIR}/idmapd.conf
|
|
||||||
# runit services
|
# runit services
|
||||||
vsv rpcblkmapd
|
vsv rpcblkmapd
|
||||||
vsv rpcidmapd
|
|
||||||
vsv rpcgssd
|
vsv rpcgssd
|
||||||
vsv rpcsvcgssd
|
vsv rpcsvcgssd
|
||||||
vsv statd
|
vsv statd
|
||||||
|
@ -60,3 +59,26 @@ post_install() {
|
||||||
|
|
||||||
rm -rf ${DESTDIR}/var/lib/nfs
|
rm -rf ${DESTDIR}/var/lib/nfs
|
||||||
}
|
}
|
||||||
|
|
||||||
|
libnfsidmap_package() {
|
||||||
|
short_desc="Library to help mapping IDs, mainly for NFSv4"
|
||||||
|
conf_files="/etc/idmapd.conf"
|
||||||
|
pkg_install() {
|
||||||
|
vsv rpcidmapd
|
||||||
|
vconf ${FILESDIR}/idmapd.conf
|
||||||
|
vmove usr/bin/rpc.idmapd
|
||||||
|
vmove usr/lib/libnfsidmap*
|
||||||
|
vmove usr/share/man/man5/idmapd.conf.5
|
||||||
|
vmove usr/share/man/man8/rpc.idmapd.8
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
libnfsidmap-devel_package() {
|
||||||
|
short_desc="Library to help mapping IDs, mainly for NFSv4 - development files"
|
||||||
|
depends="libnfsidmap-${version}_${revision}"
|
||||||
|
pkg_install() {
|
||||||
|
vmove usr/include
|
||||||
|
vmove usr/lib/pkgconfig
|
||||||
|
vmove usr/share/man/man3
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue