summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2017-11-15 16:47:16 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-03-07 06:34:50 -0800
commit9e6be8b149516d406d9b3d1d870cb2b8f5ddb4b4 (patch)
tree27fc811dec1303b05c1d0332cb7d763aeb926b17 /meta/recipes-connectivity
parent5b63a64f7f47f76667bd1933d9a716e320b9bbb5 (diff)
downloadpoky-9e6be8b149516d406d9b3d1d870cb2b8f5ddb4b4.tar.gz
nfs-utils: refresh patches
The patch tool will apply patches by default with "fuzz", which is where if the hunk context isn't present but what is there is close enough, it will force the patch in. Whilst this is useful when there's just whitespace changes, when applied to source it is possible for a patch applied with fuzz to produce broken code which still compiles (see #10450). This is obviously bad. We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For that to be realistic the existing patches with fuzz need to be rebased and reviewed. (From OE-Core rev: 0902bef12c815f302f04fa28606ece4b014260d6) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch15
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch19
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch11
3 files changed, 20 insertions, 25 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch b/meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch
index 14bd4036af..822939f0d2 100644
--- a/meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch
+++ b/meta/recipes-connectivity/nfs-utils/files/bugfix-adjust-statd-service-name.patch
@@ -16,11 +16,11 @@ Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
16 utils/statd/start-statd | 2 +- 16 utils/statd/start-statd | 2 +-
17 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
18 18
19diff --git a/utils/statd/start-statd b/utils/statd/start-statd 19Index: nfs-utils-2.1.1/utils/statd/start-statd
20index 8211a90..3c2aa6f 100755 20===================================================================
21--- a/utils/statd/start-statd 21--- nfs-utils-2.1.1.orig/utils/statd/start-statd
22+++ b/utils/statd/start-statd 22+++ nfs-utils-2.1.1/utils/statd/start-statd
23@@ -16,7 +16,7 @@ fi 23@@ -28,7 +28,7 @@ fi
24 # First try systemd if it's installed. 24 # First try systemd if it's installed.
25 if [ -d /run/systemd/system ]; then 25 if [ -d /run/systemd/system ]; then
26 # Quit only if the call worked. 26 # Quit only if the call worked.
@@ -28,7 +28,4 @@ index 8211a90..3c2aa6f 100755
28+ systemctl start nfs-statd.service && exit 28+ systemctl start nfs-statd.service && exit
29 fi 29 fi
30 30
31 # Fall back to launching it ourselves. 31 cd /
32--
332.1.4
34
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
index 7025fb555c..26b558c81f 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-configure-Allow-to-explicitly-disable-nfsidmap.patch
@@ -12,11 +12,11 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
12 configure.ac | 10 +++++++++- 12 configure.ac | 10 +++++++++-
13 1 file changed, 9 insertions(+), 1 deletion(-) 13 1 file changed, 9 insertions(+), 1 deletion(-)
14 14
15diff --git a/configure.ac b/configure.ac 15Index: nfs-utils-2.1.1/configure.ac
16index bf433d6..28a8f62 100644 16===================================================================
17--- a/configure.ac 17--- nfs-utils-2.1.1.orig/configure.ac
18+++ b/configure.ac 18+++ nfs-utils-2.1.1/configure.ac
19@@ -69,6 +69,12 @@ AC_ARG_ENABLE(nfsv4, 19@@ -92,6 +92,12 @@ AC_ARG_ENABLE(nfsv4,
20 AC_SUBST(enable_nfsv4) 20 AC_SUBST(enable_nfsv4)
21 AM_CONDITIONAL(CONFIG_NFSV4, [test "$enable_nfsv4" = "yes"]) 21 AM_CONDITIONAL(CONFIG_NFSV4, [test "$enable_nfsv4" = "yes"])
22 22
@@ -27,9 +27,9 @@ index bf433d6..28a8f62 100644
27+ enable_nfsidmap=yes) 27+ enable_nfsidmap=yes)
28+ 28+
29 AC_ARG_ENABLE(nfsv41, 29 AC_ARG_ENABLE(nfsv41,
30 [AC_HELP_STRING([--enable-nfsv41], 30 [AC_HELP_STRING([--disable-nfsv41],
31 [enable support for NFSv41 @<:@default=yes@:>@])], 31 [disable support for NFSv41 @<:@default=no@:>@])],
32@@ -296,7 +302,7 @@ fi 32@@ -339,7 +345,7 @@ fi
33 33
34 dnl enable nfsidmap when its support by libnfsidmap 34 dnl enable nfsidmap when its support by libnfsidmap
35 AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ]) 35 AM_CONDITIONAL(CONFIG_NFSDCLTRACK, [test "$enable_nfsdcltrack" = "yes" ])
@@ -38,6 +38,3 @@ index bf433d6..28a8f62 100644
38 38
39 39
40 if test "$knfsd_cv_glibc2" = no; then 40 if test "$knfsd_cv_glibc2" = no; then
41--
421.8.4.3
43
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
index d8f8181670..89a8a57260 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.2.3-sm-notify-res_init.patch
@@ -13,9 +13,10 @@ Upstream-Status: Pending
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 14
15 15
16diff -up nfs-utils-1.2.3/utils/statd/sm-notify.c.orig nfs-utils-1.2.3/utils/statd/sm-notify.c 16Index: nfs-utils-2.1.1/utils/statd/sm-notify.c
17--- nfs-utils-1.2.3/utils/statd/sm-notify.c.orig 2010-09-28 08:24:16.000000000 -0400 17===================================================================
18+++ nfs-utils-1.2.3/utils/statd/sm-notify.c 2010-10-15 16:44:43.487119601 -0400 18--- nfs-utils-2.1.1.orig/utils/statd/sm-notify.c
19+++ nfs-utils-2.1.1/utils/statd/sm-notify.c
19@@ -28,6 +28,9 @@ 20@@ -28,6 +28,9 @@
20 #include <netdb.h> 21 #include <netdb.h>
21 #include <errno.h> 22 #include <errno.h>
@@ -24,9 +25,9 @@ diff -up nfs-utils-1.2.3/utils/statd/sm-notify.c.orig nfs-utils-1.2.3/utils/stat
24+#include <arpa/nameser.h> 25+#include <arpa/nameser.h>
25+#include <resolv.h> 26+#include <resolv.h>
26 27
28 #include "conffile.h"
27 #include "sockaddr.h" 29 #include "sockaddr.h"
28 #include "xlog.h" 30@@ -89,6 +92,7 @@ smn_lookup(const char *name)
29@@ -84,6 +87,7 @@ smn_lookup(const char *name)
30 }; 31 };
31 int error; 32 int error;
32 33