Verified Commit 4dcd3fc7 authored by TBK's avatar TBK
Browse files

main/nfs-utils: upgrade to 2.4.3

parent 16c4ecf1
Pipeline #8092 passed with stages
in 2 minutes and 4 seconds
# Contributor: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=nfs-utils
pkgver=2.4.1
pkgrel=2
pkgver=2.4.3
pkgrel=0
pkgdesc="kernel-mode NFS"
url="http://linux-nfs.org"
url="https://linux-nfs.org/"
arch="all"
license="GPL-2.0+, BSD-3-Clause"
license="GPL-2.0-or-later BSD-3-Clause"
depends="rpcbind"
options="suid"
makedepends="util-linux-dev libtirpc-dev libcap-dev libevent-dev
keyutils-dev lvm2-dev krb5-dev sqlite-dev
autoconf automake libtool bsd-compat-headers openldap-dev"
makedepends="autoconf automake bsd-compat-headers keyutils-dev krb5-dev
libcap-dev libevent-dev libtirpc-dev libtool lvm2-dev musl-libintl
openldap-dev sqlite-dev util-linux-dev"
subpackages="$pkgname-dev $pkgname-doc $pkgname-dbg $pkgname-openrc rpcgen
libnfsidmap libnfsidmap-ldap"
source="https://www.kernel.org/pub/linux/utils/nfs-utils/$pkgver/nfs-utils-$pkgver.tar.gz
nfs-utils-mtab-sym.patch
source="https://www.kernel.org/pub/linux/utils/nfs-utils/$pkgver/nfs-utils-$pkgver.tar.xz
musl-configure_ac.patch
musl-getservbyport.patch
musl-svcgssd-sysconf.patch
limits.patch
nfs.initd
nfsmount.initd
......@@ -35,16 +32,13 @@ source="https://www.kernel.org/pub/linux/utils/nfs-utils/$pkgver/nfs-utils-$pkgv
nfsclient.initd
nfsclient.confd
"
builddir="$srcdir/$pkgname-$pkgver"
prepare() {
default_prepare
cd $builddir
./autogen.sh
}
build() {
cd $builddir
./configure \
--build=$CBUILD \
--host=$CHOST \
......@@ -59,25 +53,24 @@ build() {
--enable-uuid \
--enable-gss \
--enable-svcgss \
--enable-libmount-mount
--enable-libmount-mount \
--enable-static=no
make
}
# Simple test, `make check` requires running nfsd
# Simple test, "make check" requires running nfsd
check() {
cd $builddir
./utils/showmount/showmount -v
}
package() {
cd $builddir
make -j1 DESTDIR="$pkgdir" install
install -Dm644 "$srcdir"/nfs.exports "$pkgdir"/etc/exports
mv "$pkgdir"/usr/sbin/rpc.statd "$pkgdir"/sbin/
local file=
local file
for file in $source; do
case "${file}" in
case "$file" in
*.confd) install -Dm644 "$srcdir"/"$file" \
"$pkgdir"/etc/conf.d/${file%.*} ;;
*.initd) install -Dm755 "$srcdir"/"$file" \
......@@ -118,12 +111,10 @@ ldap() {
mv "$pkgdir"/usr/lib/libnfsidmap/*ldap* "$subpkgdir"/usr/lib/libnfsidmap/
}
sha512sums="5f1e301de0bd75a12ff501e20784fe316553c162872fac08ccdc91d33abae91037e2c56abf49ea05149f2dd17ef7c623c6e5bdc0ec0600212bd510aeccbbe1da nfs-utils-2.4.1.tar.gz
674ecf2c4bc8e9364ddd0f34cc03c96674753494cbc5a5d157bd70ed4342ff90356c3e85c544510648dbe90cb43b7fd83ba50653bddffc4b3b5550367b6d0b8e nfs-utils-mtab-sym.patch
99609058351733dc9d02bd90156ded96bb04924b7c00c07be485e06f60d5fb77d1dbc4deca7d9fb88c5bb8fe96c483c5ec5a8fac26ca61fd351304def79b057d musl-configure_ac.patch
sha512sums="260359f06c1114915a96ee2a593137b02e24db03a414d8d52dadbccb272f7272cb2907e3877c824c80a5c9efeba09f5493c2c9144ef17e43e24c22b9e97cd605 nfs-utils-2.4.3.tar.xz
3f245b1870a47998d90cee191dba528dede7d2e18abad3f045864f95039057cda5a22708d89fcc086eeed452729c397a0284c73c1c7037277943a9890504e250 musl-configure_ac.patch
94d7ba23164660f1da9298494dff75c57f5a300cb32b2922bc2226fcdaded7eaaa0c50a59a145ac7c75639d177558b5f5594fb1f03a50f60f4c577c93b135748 musl-getservbyport.patch
52eeade44753f2002bf99d58ad4982086aab74ef8b14de46be547f23508197f58a6ff529145f96de7f031ac0bb7779b648d05fd981cdd91556dd13d068dfe57b musl-svcgssd-sysconf.patch
9647d8f4a64a95a7abf5e26f040cf5567670e2194ce307a971a36eaae7fe490af5a494e7b380a48c88e309f4c25777d73d6c140b224aeed829fbc46b1d0baa64 limits.patch
f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018 nfs.initd
89259b9f0878658d48792b5b2f42b43c966ed098dba1fecf9e07fb0de4aab37ad67655ea8dbcc2361ddab2b5013b2de35a03048a513aaeedf790e4b416a35a54 nfsmount.initd
6e23897885cc33c49d9c7353b456585a1e0c7300822edba81bc48ba4ccc18297adce137260cc0aa9487aa5ef0aab3eecf931532cfa5bd40fd03bc9e0ddacfb28 nfsmount.confd
......
--- nfs-utils-2.3.1.orig/support/export/export.c
+++ nfs-utils-2.3.1/support/export/export.c
@@ -17,6 +17,7 @@
#include <stdlib.h>
#include <dirent.h>
#include <errno.h>
+#include <limits.h>
#include "xmalloc.h"
#include "nfslib.h"
#include "exportfs.h"
--- nfs-utils-2.3.1.orig/support/export/xtab.c
+++ nfs-utils-2.3.1/support/export/xtab.c
@@ -18,6 +18,7 @@
#include <sys/stat.h>
#include <errno.h>
#include <libgen.h>
+#include <limits.h>
#include "nfslib.h"
#include "exportfs.h"
--- nfs-utils-2.3.1.orig/support/nfs/xcommon.c
+++ nfs-utils-2.3.1/support/nfs/xcommon.c
@@ -16,6 +16,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <limits.h>
#include "xcommon.h"
#include "nls.h" /* _() */
--- nfs-utils-2.3.1.orig/support/nsm/file.c
+++ nfs-utils-2.3.1/support/nsm/file.c
@@ -85,6 +85,7 @@
#include <fcntl.h>
#include <dirent.h>
#include <grp.h>
+#include <limits.h>
#include "xlog.h"
#include "nsm.h"
--- nfs-utils-2.3.1.orig/utils/blkmapd/device-discovery.c
+++ nfs-utils-2.3.1/utils/blkmapd/device-discovery.c
@@ -49,6 +49,7 @@
#include <unistd.h>
#include <libgen.h>
#include <errno.h>
+#include <limits.h>
#include <libdevmapper.h>
#ifdef HAVE_CONFIG_H
--- nfs-utils-2.3.1.orig/utils/gssd/krb5_util.c
+++ nfs-utils-2.3.1/utils/gssd/krb5_util.c
@@ -120,6 +120,7 @@
#endif
#include <krb5.h>
#include <rpc/auth_gss.h>
+#include <limits.h>
#include "gssd.h"
#include "err_util.h"
--- nfs-utils-2.3.1.orig/utils/mountd/cache.c
+++ nfs-utils-2.3.1/utils/mountd/cache.c
@@ -26,6 +26,7 @@
#include <pwd.h>
#include <grp.h>
#include <mntent.h>
+#include <limits.h>
#include "misc.h"
#include "nfslib.h"
#include "exportfs.h"
--- nfs-utils-2.3.1.orig/utils/mountd/mountd.c
+++ nfs-utils-2.3.1/utils/mountd/mountd.c
@@ -22,6 +22,7 @@
#include <fcntl.h>
#include <sys/resource.h>
#include <sys/wait.h>
+#include <limits.h>
#include "conffile.h"
#include "xmalloc.h"
--- nfs-utils-2.3.1.orig/utils/mountd/rmtab.c
+++ nfs-utils-2.3.1/utils/mountd/rmtab.c
@@ -16,6 +16,7 @@
#include <netinet/in.h>
#include <arpa/inet.h>
#include <netdb.h>
+#include <limits.h>
#include "misc.h"
#include "exportfs.h"
--- nfs-utils-2.3.4.orig/utils/nfsdcld/legacy.c
+++ nfs-utils-2.3.4/utils/nfsdcld/legacy.c
@@ -24,6 +24,7 @@
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
+#include <limits.h>
#include "cld.h"
#include "sqlite.h"
#include "xlog.h"
......@@ -14,13 +14,14 @@
-Werror=missing-include-dirs \
-Werror=strict-aliasing=2 \
-Werror=init-self \
@@ -610,10 +610,10 @@
@@ -617,11 +617,11 @@
CHECK_CCSUPPORT([-Werror=format-overflow=2], [flg1])
CHECK_CCSUPPORT([-Werror=int-conversion], [flg2])
-CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3])
+#CHECK_CCSUPPORT([-Werror=incompatible-pointer-types], [flg3])
CHECK_CCSUPPORT([-Werror=misleading-indentation], [flg4])
AX_GCC_FUNC_ATTRIBUTE([format])
-AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg3 $flg4"])
+AC_SUBST([AM_CFLAGS], ["$my_am_cflags $flg1 $flg2 $flg4"])
......
--- ./utils/mount/fstab.c
+++ ./utils/mount/fstab.c
@@ -57,7 +57,7 @@ mtab_does_not_exist(void) {
return var_mtab_does_not_exist;
}
-static int
+int
mtab_is_a_symlink(void) {
get_mtab_info();
return var_mtab_is_a_symlink;
--- ./utils/mount/fstab.h
+++ ./utils/mount/fstab.h
@@ -7,6 +7,7 @@
#define _PATH_FSTAB "/etc/fstab"
#endif
+int mtab_is_a_symlink(void);
int mtab_is_writable(void);
int mtab_does_not_exist(void);
void reset_mtab_info(void);
--- ./utils/mount/mount.c
+++ ./utils/mount/mount.c
@@ -204,6 +204,13 @@
int flags;
mntFILE *mfp;
+ /* Avoid writing if the mtab is a symlink to /proc/mounts, since
+ that would create a file /proc/mounts in case the proc filesystem
+ is not mounted, and the fchmod below would also fail. */
+ if (mtab_is_a_symlink()) {
+ return EX_SUCCESS;
+ }
+
lock_mtab();
mfp = nfs_setmntent (MOUNTED, "a+");
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment