From aa830b4469274dd5375f88a63ef14b766417780c Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 14 Jan 2020 06:09:52 +0000
Subject: user/nfs-utils: Bump to 2.4.2

---
 user/nfs-utils/APKBUILD                       | 14 +++++++-------
 user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch |  2 +-
 user/nfs-utils/nfsdcld.patch                  | 12 +-----------
 user/nfs-utils/posixish.patch                 |  4 ++--
 user/nfs-utils/undef-def.patch                | 11 -----------
 5 files changed, 11 insertions(+), 32 deletions(-)

(limited to 'user/nfs-utils')

diff --git a/user/nfs-utils/APKBUILD b/user/nfs-utils/APKBUILD
index 8b1039750..43685cc59 100644
--- a/user/nfs-utils/APKBUILD
+++ b/user/nfs-utils/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=nfs-utils
-pkgver=2.4.1
-pkgrel=1
+pkgver=2.4.2
+pkgrel=0
 pkgdesc="NFS file sharing client and server"
 url="http://nfs.sourceforge.net/"
 arch="all"
@@ -59,11 +59,11 @@ package() {
 	done
 }
 
-sha512sums="9aec8465be4bba300c5cd2e0d22f9f6db489a989bfbf01b10f62a7e628347dda06aa3079d18abc6ff5b0d5df54fdd9f27297e3e80b5f7fe525ab78df8fd88d8e  nfs-utils-2.4.1.tar.xz
-1cd916028a8515772f05ef63832d73a09e9720055aedc9e2e4ce3a08ce1820948700a4f00ca9c4ee684880f18e67aca888dd857fc7931d923021ba50964be998  nfs-utils-1.1.4-mtab-sym.patch
-0275cacdaf399e9a9f132a79a6eab09aea176204181f2a1c1c7f062faeef5c4d979912aaf751bdfdfd3fc3d4dc166dca89ac1fabf2655d222379dd4e7ccab419  nfsdcld.patch
-db5927d533ff8c1bfd5f4948bc1ea6a375a779f3ab10f7520367556cf195245fbeaf28ff9974daeec319b47f1f0344c7f93a354e8ab28de5c4203f0d2b273a6b  posixish.patch
-3436064c2aa8e8a645fdae11e87a1bc932cfe60883f1516a218fe3dc65d2abe962c9322dd1c59c2c117dd942e6b72d7311f51280d0d71fc69ed4ed543ac6d841  undef-def.patch
+sha512sums="60cd74294d0a68f481a962a0ece6ac6385b933d1f2b0e733ef098d6ce4d4177da81128884f9b1ae8299b5067dec717dfe9fee573d01629c1fffa226a3ba20c84  nfs-utils-2.4.2.tar.xz
+afa0b913a21880f91580a2953cbd9057310367d406d2fff9d9985ec24f20288191600d81bf58daf6e3de376866b02662e573e59478e859f455d94f225d884465  nfs-utils-1.1.4-mtab-sym.patch
+2f4c519cce81b2a29ffe2b7554cb5e524fde32db1338442f9ecbdf5d468552d1ad406918b3710340239bba741f5316742ee209fd5b76c5ccd10e466d7beaefa1  nfsdcld.patch
+10501b1956e81b3a3db0829fcfb6f25d734d33be1cbc9169ff45594d8db355a337f61f41ec59e51484e5c5bcb77b2f969527edd477528621f8866ae412ddf03f  posixish.patch
+1fbe6f017ddde9a2edc5b8a8a2958c8c4f8ccc8764e15b8817da3cc315a5529519782c34df6154d76e146c83ee9f911fa8590aefd6902c0de1f6e6d9855b9b04  undef-def.patch
 fd8052dc8e17eccb0bb1443f341c97ec7c9dac5824294cadf486d91475bc728d4bb69300034b528a690707520590f6675ee371f92e9838afc8ed88092ee0f220  exports
 bc11b073735ee86c96b9c249ee187f4d16329c279a4e26760875059d2b5fa1d510ef3e4df5ee9dfb2a3133d755e1eb5c323d2fadc432a0cf630191ec353ac535  nfs.confd
 f7feb79cfcab0478affb640d1e5ad059757c88d51cc790fd54cde2fd7ed2e3cfd8f7f4c2de993d99da03e8ce3bdfb2750a4cb997b850fe33d0ef76d9b91c9018  nfs.initd
diff --git a/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch b/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
index c9e60afc7..0a7d70bc4 100644
--- a/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
+++ b/user/nfs-utils/nfs-utils-1.1.4-mtab-sym.patch
@@ -23,7 +23,7 @@ ripped from Debian
  void reset_mtab_info(void);
 --- nfs-utils-1.1.4/utils/mount/mount.c
 +++ nfs-utils-1.1.4/utils/mount/mount.c
-@@ -230,6 +230,13 @@ create_mtab (void) {
+@@ -204,6 +204,13 @@ create_mtab (void) {
  	int flags;
  	mntFILE *mfp;
  
diff --git a/user/nfs-utils/nfsdcld.patch b/user/nfs-utils/nfsdcld.patch
index e80956bb8..f5532e1d6 100644
--- a/user/nfs-utils/nfsdcld.patch
+++ b/user/nfs-utils/nfsdcld.patch
@@ -1,16 +1,6 @@
---- nfs-utils-2.4.1/utils/nfsdcld/legacy.c.old	2019-06-10 14:34:37.000000000 +0000
-+++ nfs-utils-2.4.1/utils/nfsdcld/legacy.c	2019-06-20 00:29:10.493973462 +0000
-@@ -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"
 --- nfs-utils-2.4.1/utils/nfsdcld/nfsdcld.c.old	2019-06-10 14:34:37.000000000 +0000
 +++ nfs-utils-2.4.1/utils/nfsdcld/nfsdcld.c	2019-06-20 00:28:42.926915402 +0000
-@@ -645,7 +645,7 @@
+@@ -737,7 +737,7 @@
  int
  main(int argc, char **argv)
  {
diff --git a/user/nfs-utils/posixish.patch b/user/nfs-utils/posixish.patch
index 9bc817ad0..d973bf9c7 100644
--- a/user/nfs-utils/posixish.patch
+++ b/user/nfs-utils/posixish.patch
@@ -1,6 +1,6 @@
 --- nfs-utils-2.3.3/configure.old	2018-09-06 18:10:07.000000000 +0000
 +++ nfs-utils-2.3.3/configure	2019-01-10 16:01:32.110000000 +0000
-@@ -20302,9 +20302,9 @@
+@@ -20594,9 +20594,9 @@
    fi
  fi
  
@@ -13,7 +13,7 @@
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
-@@ -20318,27 +20318,27 @@
+@@ -20610,27 +20610,27 @@
  #ifdef __cplusplus
  extern "C"
  #endif
diff --git a/user/nfs-utils/undef-def.patch b/user/nfs-utils/undef-def.patch
index a8b03ac03..8c1899ab5 100644
--- a/user/nfs-utils/undef-def.patch
+++ b/user/nfs-utils/undef-def.patch
@@ -9,14 +9,3 @@
  	struct {
  		struct file_handle fh;
  		unsigned char handle[128];
---- nfs-utils-2.3.3/utils/mount/network.c.old	2018-09-06 18:09:08.000000000 +0000
-+++ nfs-utils-2.3.3/utils/mount/network.c	2019-01-10 16:28:46.840000000 +0000
-@@ -39,7 +39,7 @@
- #include <sys/socket.h>
- #include <sys/wait.h>
- #include <sys/stat.h>
--#if defined(__GLIBC__) && (__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24)
-+#if defined(__GLIBC__) && ((__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 24))
- /* Cannot safely include linux/in6.h in old glibc, so hardcode the needed values */
- # define IPV6_PREFER_SRC_PUBLIC 2
- # define IPV6_ADDR_PREFERENCES 72
-- 
cgit v1.2.3-60-g2f50