mirror of
https://git.yoctoproject.org/poky
synced 2026-02-11 11:13:04 +01:00
nfs-utils: Upgrade to 1.3.1
Removed: fix-a-Gcc-undefined-behavior.patch - Upstream Removed: 0001-statd-fixed-the-with-statdpath-flag.patch - Upstream Removed: fix-the-start-statd.patch - Different solution on upstream Removed: nfs-utils-1.0.6-uclibc.patch - Different solution on upstream (From OE-Core rev: 7cd8b38f4f53d25a6dec8ec3b130a345480ff6b7) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alejandro Hernandez
committed by
Richard Purdie
Richard Purdie
parent
16edf5c212
commit
1379659da5
@@ -1,38 +0,0 @@
|
||||
[PATCH] fix a Gcc undefined behavior
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Calling strncpy with NULL second argument, even when the size is 0,
|
||||
is undefined behavior, which leads to GCC to drop the check old
|
||||
variable with NULL in following code.
|
||||
|
||||
https://bugzilla.yoctoproject.org/show_bug.cgi?id=6743
|
||||
|
||||
Signed-off-by: Roy Li <rongqing.li@windriver.com>
|
||||
---
|
||||
support/export/client.c | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/support/export/client.c b/support/export/client.c
|
||||
index dbf47b9..a37ef69 100644
|
||||
--- a/support/export/client.c
|
||||
+++ b/support/export/client.c
|
||||
@@ -482,8 +482,13 @@ add_name(char *old, const char *add)
|
||||
else
|
||||
cp = cp + strlen(cp);
|
||||
}
|
||||
- strncpy(new, old, cp-old);
|
||||
- new[cp-old] = 0;
|
||||
+
|
||||
+ if (old) {
|
||||
+ strncpy(new, old, cp-old);
|
||||
+ new[cp-old] = 0;
|
||||
+ } else
|
||||
+ new[0] = 0;
|
||||
+
|
||||
if (cp != old && !*cp)
|
||||
strcat(new, ",");
|
||||
strcat(new, add);
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
From 3b1457d219ceb1058d44bacc657581f13437ae40 Mon Sep 17 00:00:00 2001
|
||||
From: Steve Dickson <steved@redhat.com>
|
||||
Date: Tue, 17 Jun 2014 13:28:53 -0400
|
||||
Subject: [PATCH] statd: fixed the --with-statdpath= flag
|
||||
|
||||
Create the given path set with --with-statdpath
|
||||
|
||||
Signed-off-by: chendt.fnst@cn.fujitsu.com
|
||||
Reported-by: yaoxp@cn.fujitsu.com
|
||||
Signed-off-by: Steve Dickson <steved@redhat.com>
|
||||
Upstream-Status: Backport
|
||||
---
|
||||
Makefile.am | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index ae7cd16..5824adc 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -54,13 +54,13 @@ install-data-hook:
|
||||
touch $(DESTDIR)$(statedir)/xtab; chmod 644 $(DESTDIR)$(statedir)/xtab
|
||||
touch $(DESTDIR)$(statedir)/etab; chmod 644 $(DESTDIR)$(statedir)/etab
|
||||
touch $(DESTDIR)$(statedir)/rmtab; chmod 644 $(DESTDIR)$(statedir)/rmtab
|
||||
- mkdir -p $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak
|
||||
- touch $(DESTDIR)$(statedir)/state
|
||||
- chmod go-rwx $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state
|
||||
- -chown $(statduser) $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state
|
||||
+ mkdir -p $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak
|
||||
+ touch $(DESTDIR)$(statdpath)/state
|
||||
+ chmod go-rwx $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak $(DESTDIR)$(statdpath)/state
|
||||
+ -chown $(statduser) $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak $(DESTDIR)$(statdpath)/state
|
||||
|
||||
uninstall-hook:
|
||||
rm $(DESTDIR)$(statedir)/xtab
|
||||
rm $(DESTDIR)$(statedir)/etab
|
||||
rm $(DESTDIR)$(statedir)/rmtab
|
||||
- rm $(DESTDIR)$(statedir)/state
|
||||
+ rm $(DESTDIR)$(statdpath)/state
|
||||
--
|
||||
1.8.4.2
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
[PATCH] fix the start-statd
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
1. add /bin/ to PATH, since systemctl is installed under /bin/
|
||||
2. redirect error to /dev/null
|
||||
|
||||
Signed-off-by: Roy Li <rongqing.li@windriver.com>
|
||||
---
|
||||
utils/statd/start-statd | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/utils/statd/start-statd b/utils/statd/start-statd
|
||||
index cde3583..098ce70 100644
|
||||
--- a/utils/statd/start-statd
|
||||
+++ b/utils/statd/start-statd
|
||||
@@ -4,8 +4,8 @@
|
||||
# /var/run/rpc.statd.pid).
|
||||
# It should run statd with whatever flags are apropriate for this
|
||||
# site.
|
||||
-PATH=/sbin:/usr/sbin
|
||||
-if systemctl start statd.service
|
||||
+PATH=/sbin:/usr/sbin:/bin
|
||||
+if systemctl start statd.service 2>/dev/null
|
||||
then :
|
||||
else
|
||||
exec rpc.statd --no-notify
|
||||
--
|
||||
1.7.10.4
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Index: nfs-utils-1.2.6/support/nfs/svc_socket.c
|
||||
===================================================================
|
||||
--- nfs-utils-1.2.6.orig/support/nfs/svc_socket.c 2012-05-14 07:40:52.000000000 -0700
|
||||
+++ nfs-utils-1.2.6/support/nfs/svc_socket.c 2012-10-28 02:42:50.179222457 -0700
|
||||
@@ -40,8 +40,9 @@
|
||||
char rpcdata[1024], servdata[1024];
|
||||
struct rpcent rpcbuf, *rpcp;
|
||||
struct servent servbuf, *servp = NULL;
|
||||
- int ret;
|
||||
+ int ret = 0;
|
||||
|
||||
+#ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
|
||||
ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof rpcdata,
|
||||
&rpcp);
|
||||
if (ret == 0 && rpcp != NULL) {
|
||||
@@ -60,6 +61,7 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
+#endif /* __UCLIBC__ */
|
||||
|
||||
if (ret == 0 && servp != NULL)
|
||||
return ntohs(servp->s_port);
|
||||
@@ -21,7 +21,6 @@ USERADD_PARAM_${PN}-client = "--system --home-dir /var/lib/nfs \
|
||||
|
||||
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.xz \
|
||||
file://0001-configure-Allow-to-explicitly-disable-nfsidmap.patch \
|
||||
file://nfs-utils-1.0.6-uclibc.patch \
|
||||
file://nfs-utils-1.2.3-sm-notify-res_init.patch \
|
||||
file://nfsserver \
|
||||
file://nfscommon \
|
||||
@@ -30,13 +29,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
|
||||
file://nfs-mountd.service \
|
||||
file://nfs-statd.service \
|
||||
file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \
|
||||
file://0001-statd-fixed-the-with-statdpath-flag.patch \
|
||||
file://fix-a-Gcc-undefined-behavior.patch \
|
||||
file://fix-the-start-statd.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8"
|
||||
SRC_URI[sha256sum] = "ab8384d0e487ed6a18c5380d5df28015f7dd98680bf08f3247c97d9f7d99e56f"
|
||||
SRC_URI[md5sum] = "8de676b9ff34b8f9addc1d0800fabdf8"
|
||||
SRC_URI[sha256sum] = "ff79d70b7b58b2c8f9b798c58721127e82bb96022adc04a5c4cb251630e696b8"
|
||||
|
||||
PARALLEL_MAKE = ""
|
||||
|
||||
Reference in New Issue
Block a user