[arch-commits] Commit in nfs-utils/trunk (2 files)
Date: Friday, September 7, 2018 @ 18:04:17
Author: andyrtr
Revision: 333831
upgpkg: nfs-utils 2.3.3-1
upstream update 2.3.3
Modified:
nfs-utils/trunk/PKGBUILD
Deleted:
nfs-utils/trunk/0001-Only_compile_the_command_when_configured.diff
+
0001-Only_compile_the_command_when_configured.diff | 33 ---
PKGBUILD | 15 ++--
2 files changed, 5 insertions(+), 43 deletions(-)
Deleted: 0001-Only_compile_the_command_when_configured.diff
===
--- 0001-Only_compile_the_command_when_configured.diff 2018-09-07 17:46:10 UTC
(rev 333830)
+++ 0001-Only_compile_the_command_when_configured.diff 2018-09-07 18:04:17 UTC
(rev 333831)
@@ -1,33 +0,0 @@
-From fd5ccdc449a0ef79498191aecb3e44120e813618 Mon Sep 17 00:00:00 2001
-From: Steve Dickson
-Date: Thu, 31 May 2018 11:02:58 -0400
-Subject: [PATCH] rpcgen: Only compile the command when configured.
-
-Only compile and use the internal rpcgen
-when required via the --with-rpcgen flag
-
-It is strongly suggested to use the rpcgen from
-the new created rpcsvc-proto package be used.
-
-Signed-off-by: Steve Dickson
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 276dec3..4b698dd 100644
a/configure.ac
-+++ b/configure.ac
-@@ -157,7 +157,7 @@ AC_ARG_WITH(rpcgen,
- RPCGEN_PATH=$rpcgen_path
- fi
- AC_SUBST(RPCGEN_PATH)
-- AM_CONDITIONAL(CONFIG_RPCGEN, [test "$RPCGEN_PATH" = ""])
-+ AM_CONDITIONAL(CONFIG_RPCGEN, [test "$RPCGEN_PATH" = "internal"])
- AC_ARG_ENABLE(uuid,
- [AC_HELP_STRING([--disable-uuid],
- [Exclude uuid support to avoid buggy libblkid.
@<:@default=no@:>@])],
---
-1.8.3.1
-
-
Modified: PKGBUILD
===
--- PKGBUILD2018-09-07 17:46:10 UTC (rev 333830)
+++ PKGBUILD2018-09-07 18:04:17 UTC (rev 333831)
@@ -8,8 +8,8 @@
pkgbase=nfs-utils
pkgname=('nfs-utils' 'nfsidmap')
-pkgver=2.3.2
-pkgrel=2
+pkgver=2.3.3
+pkgrel=1
arch=('x86_64')
url='http://nfs.sourceforge.net'
makedepends=('libevent' 'sqlite' 'rpcsvc-proto')
@@ -16,22 +16,17 @@
# http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=summary
source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.{xz,sign}
id_resolver.conf
-exports
-0001-Only_compile_the_command_when_configured.diff)
+exports)
# https://www.kernel.org/pub/linux/utils/nfs-utils/2.1.1/sha256sums.asc
-sha256sums=('3cfe50805c4c9f57bec845eaa28dfbe5a8acb90a8d21d8d56d2840e424335b19'
+sha256sums=('f68b34793831b05f1fd5760d6bdec92772c7684177586a99a61e7b444f336322'
'SKIP'
'ed31ae843cf66d3c262b39ed54533a861876231c5f5bb3811c0c498ac2ffa102'
-'610715ed3daedc43b2536f541c7c57e138fb31eab5d837d9a6187a7403e30154'
-'6d1ddd597e7371afae92727cd6620631d9c5acaba1565e4a8f7998c97bb89783')
+'610715ed3daedc43b2536f541c7c57e138fb31eab5d837d9a6187a7403e30154')
validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson
prepare() {
cd ${pkgbase}-${pkgver}
- # fix build
- patch -Np1 -i ../0001-Only_compile_the_command_when_configured.diff
-
# fix hardcoded sbin path to our needs
sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am
autoreconf -vfi
[arch-commits] Commit in nfs-utils/trunk (2 files)
Date: Thursday, June 7, 2018 @ 17:18:23
Author: andyrtr
Revision: 326437
upgpkg: nfs-utils 2.3.2-2
use rpcsvc-proto - not internal rpcgen per upstream recommendation - apply a
build fix from upstream git
Added:
nfs-utils/trunk/0001-Only_compile_the_command_when_configured.diff
Modified:
nfs-utils/trunk/PKGBUILD
+
0001-Only_compile_the_command_when_configured.diff | 33 +++
PKGBUILD | 12 --
2 files changed, 40 insertions(+), 5 deletions(-)
Added: 0001-Only_compile_the_command_when_configured.diff
===
--- 0001-Only_compile_the_command_when_configured.diff
(rev 0)
+++ 0001-Only_compile_the_command_when_configured.diff 2018-06-07 17:18:23 UTC
(rev 326437)
@@ -0,0 +1,33 @@
+From fd5ccdc449a0ef79498191aecb3e44120e813618 Mon Sep 17 00:00:00 2001
+From: Steve Dickson
+Date: Thu, 31 May 2018 11:02:58 -0400
+Subject: [PATCH] rpcgen: Only compile the command when configured.
+
+Only compile and use the internal rpcgen
+when required via the --with-rpcgen flag
+
+It is strongly suggested to use the rpcgen from
+the new created rpcsvc-proto package be used.
+
+Signed-off-by: Steve Dickson
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 276dec3..4b698dd 100644
+--- a/configure.ac
b/configure.ac
+@@ -157,7 +157,7 @@ AC_ARG_WITH(rpcgen,
+ RPCGEN_PATH=$rpcgen_path
+ fi
+ AC_SUBST(RPCGEN_PATH)
+- AM_CONDITIONAL(CONFIG_RPCGEN, [test "$RPCGEN_PATH" = ""])
++ AM_CONDITIONAL(CONFIG_RPCGEN, [test "$RPCGEN_PATH" = "internal"])
+ AC_ARG_ENABLE(uuid,
+ [AC_HELP_STRING([--disable-uuid],
+ [Exclude uuid support to avoid buggy libblkid.
@<:@default=no@:>@])],
+--
+1.8.3.1
+
+
Modified: PKGBUILD
===
--- PKGBUILD2018-06-07 17:01:26 UTC (rev 326436)
+++ PKGBUILD2018-06-07 17:18:23 UTC (rev 326437)
@@ -9,19 +9,21 @@
pkgbase=nfs-utils
pkgname=('nfs-utils' 'nfsidmap')
pkgver=2.3.2
-pkgrel=1
+pkgrel=2
arch=('x86_64')
url='http://nfs.sourceforge.net'
-makedepends=('libevent' 'sqlite')
+makedepends=('libevent' 'sqlite' 'rpcsvc-proto')
# http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=summary
source=(https://www.kernel.org/pub/linux/utils/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.{xz,sign}
id_resolver.conf
-exports)
+exports
+0001-Only_compile_the_command_when_configured.diff)
# https://www.kernel.org/pub/linux/utils/nfs-utils/2.1.1/sha256sums.asc
sha256sums=('3cfe50805c4c9f57bec845eaa28dfbe5a8acb90a8d21d8d56d2840e424335b19'
'SKIP'
'ed31ae843cf66d3c262b39ed54533a861876231c5f5bb3811c0c498ac2ffa102'
-'610715ed3daedc43b2536f541c7c57e138fb31eab5d837d9a6187a7403e30154')
+'610715ed3daedc43b2536f541c7c57e138fb31eab5d837d9a6187a7403e30154'
+'6d1ddd597e7371afae92727cd6620631d9c5acaba1565e4a8f7998c97bb89783')
validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson
prepare() {
@@ -28,7 +30,7 @@
cd ${pkgbase}-${pkgver}
# fix build
- sed -i "/-Werror=strict-prototypes/d" configure.ac
+ patch -Np1 -i ../0001-Only_compile_the_command_when_configured.diff
# fix hardcoded sbin path to our needs
sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am
[arch-commits] Commit in nfs-utils/trunk (2 files)
Date: Monday, October 19, 2015 @ 18:07:24
Author: andyrtr
Revision: 249510
upgpkg: nfs-utils 1.3.3-2
fix use with IPv6-less kernels; FS#46739
Added:
nfs-utils/trunk/ignore_unsupported_address_types_in_nfssvc_setfds.diff
Modified:
nfs-utils/trunk/PKGBUILD
+
PKGBUILD | 11 +++-
ignore_unsupported_address_types_in_nfssvc_setfds.diff | 37 +++
2 files changed, 45 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===
--- PKGBUILD2015-10-19 14:26:54 UTC (rev 249509)
+++ PKGBUILD2015-10-19 16:07:24 UTC (rev 249510)
@@ -8,7 +8,7 @@
pkgname=nfs-utils
pkgver=1.3.3
-pkgrel=1
+pkgrel=2
pkgdesc="Support programs for Network File Systems"
arch=('i686' 'x86_64')
url='http://nfs.sourceforge.net'
@@ -19,7 +19,8 @@
makedepends=('sqlite')
source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.{bz2,sign}
nfs-common.conf nfs-server.conf exports nfs-utils.conf id_resolver.conf
-nfs-utils_env.sh)
+nfs-utils_env.sh
+ignore_unsupported_address_types_in_nfssvc_setfds.diff)
install=nfs-utils.install
optdepends=('sqlite: for nfsdcltrack usage'
'python2: for nfsiostat and mountstats usage')
@@ -30,11 +31,15 @@
'170a929d9c0f22edb13b656648cadf372efea841'
'c109f2300f2d841104adb09fe76a5f2583015c72'
'24b3c10b47dc120b2d252cf1e5001effa8f76a62'
- '96734598a0b851da10cb9e02afb52ec55fed6273')
+ '96734598a0b851da10cb9e02afb52ec55fed6273'
+ '0fa72f3e3485abf71b1199caa1e6089f9f129a77')
validpgpkeys=('E1B71E339E20A10A676F7CB69AFB1D681A125177') # Steve Dickson
prepare() {
cd ${pkgname}-${pkgver}
+
+ # fix IPv6-less kernels; FS#46739
+ patch -Np1 -i $srcdir/ignore_unsupported_address_types_in_nfssvc_setfds.diff
# fix hardcoded sbin path to our needs
sed -i "s|sbindir = /sbin|sbindir = /usr/bin|g" utils/*/Makefile.am
Added: ignore_unsupported_address_types_in_nfssvc_setfds.diff
===
--- ignore_unsupported_address_types_in_nfssvc_setfds.diff
(rev 0)
+++ ignore_unsupported_address_types_in_nfssvc_setfds.diff 2015-10-19
16:07:24 UTC (rev 249510)
@@ -0,0 +1,37 @@
+From: Christoph Hellwig
+Subject: nfsd: ignore unsupported address types in nfssvc_setfds
+
+Just continue and try a different record returned from getaddrinfo
+if the kernel does not support an address family. This fixes nfsd
+startup on kernels without IPv6 support.
+
+Suggested-by: Chuck Lever
+Signed-off-by: Christoph Hellwig
+
+diff --git a/utils/nfsd/nfssvc.c b/utils/nfsd/nfssvc.c
+index a2b11d8..fc11d23 100644
+--- a/utils/nfsd/nfssvc.c
b/utils/nfsd/nfssvc.c
+@@ -174,15 +174,14 @@ nfssvc_setfds(const struct addrinfo *hints, const char
*node, const char *port)
+ sockfd = socket(addr->ai_family, addr->ai_socktype,
+ addr->ai_protocol);
+ if (sockfd < 0) {
+- if (errno == EAFNOSUPPORT)
+- xlog(L_NOTICE, "address family %s not "
+- "supported by protocol %s",
+- family, proto);
+- else
++ if (errno != EAFNOSUPPORT) {
+ xlog(L_ERROR, "unable to create %s %s socket: "
+"errno %d (%m)", family, proto, errno);
+- rc = errno;
+- goto error;
++ rc = errno;
++ goto error;
++ }
++ addr = addr->ai_next;
++ continue;
+ }
+ #ifdef IPV6_SUPPORTED
+ if (addr->ai_family == AF_INET6 &&
+--
