summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2014-11-12 12:42:35 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-11-25 13:03:26 +0000
commit1379659da5658c01ce2aa040ae924c7b0f5c6fd1 (patch)
tree5566d312e6ddf92a44e73d5a94af3bbf9b2021fa /meta
parent16edf5c21289dd2fb9f1adde813f0634dff0ea1a (diff)
downloadpoky-1379659da5658c01ce2aa040ae924c7b0f5c6fd1.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/nfs-utils/files/fix-a-Gcc-undefined-behavior.patch38
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-fixed-the-with-statdpath-flag.patch41
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/fix-the-start-statd.patch30
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch27
-rw-r--r--meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb (renamed from meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb)8
5 files changed, 2 insertions, 142 deletions
diff --git a/meta/recipes-connectivity/nfs-utils/files/fix-a-Gcc-undefined-behavior.patch b/meta/recipes-connectivity/nfs-utils/files/fix-a-Gcc-undefined-behavior.patch
deleted file mode 100644
index 5843ba0fb9..0000000000
--- a/meta/recipes-connectivity/nfs-utils/files/fix-a-Gcc-undefined-behavior.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1[PATCH] fix a Gcc undefined behavior
2
3Upstream-Status: Pending
4
5Calling strncpy with NULL second argument, even when the size is 0,
6is undefined behavior, which leads to GCC to drop the check old
7variable with NULL in following code.
8
9https://bugzilla.yoctoproject.org/show_bug.cgi?id=6743
10
11Signed-off-by: Roy Li <rongqing.li@windriver.com>
12---
13 support/export/client.c | 9 +++++++--
14 1 file changed, 7 insertions(+), 2 deletions(-)
15
16diff --git a/support/export/client.c b/support/export/client.c
17index dbf47b9..a37ef69 100644
18--- a/support/export/client.c
19+++ b/support/export/client.c
20@@ -482,8 +482,13 @@ add_name(char *old, const char *add)
21 else
22 cp = cp + strlen(cp);
23 }
24- strncpy(new, old, cp-old);
25- new[cp-old] = 0;
26+
27+ if (old) {
28+ strncpy(new, old, cp-old);
29+ new[cp-old] = 0;
30+ } else
31+ new[0] = 0;
32+
33 if (cp != old && !*cp)
34 strcat(new, ",");
35 strcat(new, add);
36--
371.7.10.4
38
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-fixed-the-with-statdpath-flag.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-fixed-the-with-statdpath-flag.patch
deleted file mode 100644
index 2ce824cf9e..0000000000
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/0001-statd-fixed-the-with-statdpath-flag.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 3b1457d219ceb1058d44bacc657581f13437ae40 Mon Sep 17 00:00:00 2001
2From: Steve Dickson <steved@redhat.com>
3Date: Tue, 17 Jun 2014 13:28:53 -0400
4Subject: [PATCH] statd: fixed the --with-statdpath= flag
5
6Create the given path set with --with-statdpath
7
8Signed-off-by: chendt.fnst@cn.fujitsu.com
9Reported-by: yaoxp@cn.fujitsu.com
10Signed-off-by: Steve Dickson <steved@redhat.com>
11Upstream-Status: Backport
12---
13 Makefile.am | 10 +++++-----
14 1 file changed, 5 insertions(+), 5 deletions(-)
15
16diff --git a/Makefile.am b/Makefile.am
17index ae7cd16..5824adc 100644
18--- a/Makefile.am
19+++ b/Makefile.am
20@@ -54,13 +54,13 @@ install-data-hook:
21 touch $(DESTDIR)$(statedir)/xtab; chmod 644 $(DESTDIR)$(statedir)/xtab
22 touch $(DESTDIR)$(statedir)/etab; chmod 644 $(DESTDIR)$(statedir)/etab
23 touch $(DESTDIR)$(statedir)/rmtab; chmod 644 $(DESTDIR)$(statedir)/rmtab
24- mkdir -p $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak
25- touch $(DESTDIR)$(statedir)/state
26- chmod go-rwx $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state
27- -chown $(statduser) $(DESTDIR)$(statedir)/sm $(DESTDIR)$(statedir)/sm.bak $(DESTDIR)$(statedir)/state
28+ mkdir -p $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak
29+ touch $(DESTDIR)$(statdpath)/state
30+ chmod go-rwx $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak $(DESTDIR)$(statdpath)/state
31+ -chown $(statduser) $(DESTDIR)$(statdpath)/sm $(DESTDIR)$(statdpath)/sm.bak $(DESTDIR)$(statdpath)/state
32
33 uninstall-hook:
34 rm $(DESTDIR)$(statedir)/xtab
35 rm $(DESTDIR)$(statedir)/etab
36 rm $(DESTDIR)$(statedir)/rmtab
37- rm $(DESTDIR)$(statedir)/state
38+ rm $(DESTDIR)$(statdpath)/state
39--
401.8.4.2
41
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/fix-the-start-statd.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/fix-the-start-statd.patch
deleted file mode 100644
index b7e835ed35..0000000000
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/fix-the-start-statd.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1[PATCH] fix the start-statd
2
3Upstream-Status: Pending
4
51. add /bin/ to PATH, since systemctl is installed under /bin/
62. redirect error to /dev/null
7
8Signed-off-by: Roy Li <rongqing.li@windriver.com>
9---
10 utils/statd/start-statd | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/utils/statd/start-statd b/utils/statd/start-statd
14index cde3583..098ce70 100644
15--- a/utils/statd/start-statd
16+++ b/utils/statd/start-statd
17@@ -4,8 +4,8 @@
18 # /var/run/rpc.statd.pid).
19 # It should run statd with whatever flags are apropriate for this
20 # site.
21-PATH=/sbin:/usr/sbin
22-if systemctl start statd.service
23+PATH=/sbin:/usr/sbin:/bin
24+if systemctl start statd.service 2>/dev/null
25 then :
26 else
27 exec rpc.statd --no-notify
28--
291.7.10.4
30
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch b/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch
deleted file mode 100644
index c3442380e1..0000000000
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils/nfs-utils-1.0.6-uclibc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1Signed-off-by: Khem Raj <raj.khem@gmail.com>
2
3Upstream-Status: Inappropriate [embedded specific]
4
5Index: nfs-utils-1.2.6/support/nfs/svc_socket.c
6===================================================================
7--- nfs-utils-1.2.6.orig/support/nfs/svc_socket.c 2012-05-14 07:40:52.000000000 -0700
8+++ nfs-utils-1.2.6/support/nfs/svc_socket.c 2012-10-28 02:42:50.179222457 -0700
9@@ -40,8 +40,9 @@
10 char rpcdata[1024], servdata[1024];
11 struct rpcent rpcbuf, *rpcp;
12 struct servent servbuf, *servp = NULL;
13- int ret;
14+ int ret = 0;
15
16+#ifndef __UCLIBC__ /* neither getrpcbynumber() nor getrpcbynumber_r() is SuSv3 */
17 ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof rpcdata,
18 &rpcp);
19 if (ret == 0 && rpcp != NULL) {
20@@ -60,6 +61,7 @@
21 }
22 }
23 }
24+#endif /* __UCLIBC__ */
25
26 if (ret == 0 && servp != NULL)
27 return ntohs(servp->s_port);
diff --git a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
index 37a2e1a6da..d312349fe4 100644
--- a/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.0.bb
+++ b/meta/recipes-connectivity/nfs-utils/nfs-utils_1.3.1.bb
@@ -21,7 +21,6 @@ USERADD_PARAM_${PN}-client = "--system --home-dir /var/lib/nfs \
21 21
22SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.xz \ 22SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.xz \
23 file://0001-configure-Allow-to-explicitly-disable-nfsidmap.patch \ 23 file://0001-configure-Allow-to-explicitly-disable-nfsidmap.patch \
24 file://nfs-utils-1.0.6-uclibc.patch \
25 file://nfs-utils-1.2.3-sm-notify-res_init.patch \ 24 file://nfs-utils-1.2.3-sm-notify-res_init.patch \
26 file://nfsserver \ 25 file://nfsserver \
27 file://nfscommon \ 26 file://nfscommon \
@@ -30,13 +29,10 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/nfs-utils/${PV}/nfs-utils-${PV}.tar.x
30 file://nfs-mountd.service \ 29 file://nfs-mountd.service \
31 file://nfs-statd.service \ 30 file://nfs-statd.service \
32 file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \ 31 file://nfs-utils-Do-not-pass-CFLAGS-to-gcc-while-building.patch \
33 file://0001-statd-fixed-the-with-statdpath-flag.patch \
34 file://fix-a-Gcc-undefined-behavior.patch \
35 file://fix-the-start-statd.patch \
36" 32"
37 33
38SRC_URI[md5sum] = "6e93a7997ca3a1eac56bf219adab72a8" 34SRC_URI[md5sum] = "8de676b9ff34b8f9addc1d0800fabdf8"
39SRC_URI[sha256sum] = "ab8384d0e487ed6a18c5380d5df28015f7dd98680bf08f3247c97d9f7d99e56f" 35SRC_URI[sha256sum] = "ff79d70b7b58b2c8f9b798c58721127e82bb96022adc04a5c4cb251630e696b8"
40 36
41PARALLEL_MAKE = "" 37PARALLEL_MAKE = ""
42 38