[PATCH 0/4] Package upgrade

[PATCH 0/4] Package upgrade

[Robert Yang]

The following changes since commit 4dd4b96b6d60246338bb30ede9f3ab1b2e757be9:

  libxfont: Security Advisory - libxfont - CVE-2015-1804 (2015-04-28 07:56:01 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/PU
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/PU

Robert Yang (4):
  man-pages: 3.82 -> 3.83
  git: 2.3.5 -> 2.3.7
  ltp: 20150119 -> 20150420
  rpcbind: 0.2.2 -> 0.2.3

 .../git/{git_2.3.5.bb => git_2.3.7.bb}             |    8 +-
 .../ltp/{ltp_20150119.bb => ltp_20150420.bb}       |    4 +-
 .../{man-pages_3.82.bb => man-pages_3.83.bb}       |    4 +-
 ...001-Avoid-use-of-glibc-sys-cdefs.h-header.patch |  109 ++++++++++----------
 .../rpcbind/0002-uclibc-rpcsvc-defines.patch       |   60 -----------
 .../rpcbind/{rpcbind_0.2.2.bb => rpcbind_0.2.3.bb} |   10 +-
 6 files changed, 65 insertions(+), 130 deletions(-)
 rename meta/recipes-devtools/git/{git_2.3.5.bb => git_2.3.7.bb} (41%)
 rename meta/recipes-extended/ltp/{ltp_20150119.bb => ltp_20150420.bb} (97%)
 rename meta/recipes-extended/man-pages/{man-pages_3.82.bb => man-pages_3.83.bb} (86%)
 delete mode 100644 meta/recipes-extended/rpcbind/rpcbind/0002-uclibc-rpcsvc-defines.patch
 rename meta/recipes-extended/rpcbind/{rpcbind_0.2.2.bb => rpcbind_0.2.3.bb} (87%)

-- 
1.7.9.5

[PATCH 1/4] man-pages: 3.82 -> 3.83

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../{man-pages_3.82.bb => man-pages_3.83.bb}       |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/man-pages/{man-pages_3.82.bb => man-pages_3.83.bb} (86%)

diff --git a/meta/recipes-extended/man-pages/man-pages_3.82.bb b/meta/recipes-extended/man-pages/man-pages_3.83.bb
similarity index 86%
rename from meta/recipes-extended/man-pages/man-pages_3.82.bb
rename to meta/recipes-extended/man-pages/man-pages_3.83.bb
index 7c1a7dc..790995d 100644
--- a/meta/recipes-extended/man-pages/man-pages_3.82.bb
+++ b/meta/recipes-extended/man-pages/man-pages_3.83.bb
@@ -7,8 +7,8 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://README;md5=8f2a3d43057d458e5066714980567a60"
 SRC_URI = "${KERNELORG_MIRROR}/linux/docs/${BPN}/Archive/${BP}.tar.gz"
 
-SRC_URI[md5sum] = "ce4bffb9982d197bf35b59d0a12453ca"
-SRC_URI[sha256sum] = "9c22781f485d00e6b258dcaaf1efd220fee9f8d4ce59cd881b062be06be5efe8"
+SRC_URI[md5sum] = "f3ec499e5d2d164a14ac3f63b7c07c7b"
+SRC_URI[sha256sum] = "b12844bee3746fa0e4020d360e21f3ac66d121688eb5df5e9d937595240c6492"
 
 RDEPENDS_${PN} = "man"
 
-- 
1.7.9.5

[PATCH 2/4] git: 2.3.5 -> 2.3.7

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../git/{git_2.3.5.bb => git_2.3.7.bb}             |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/git/{git_2.3.5.bb => git_2.3.7.bb} (41%)

diff --git a/meta/recipes-devtools/git/git_2.3.5.bb b/meta/recipes-devtools/git/git_2.3.7.bb
similarity index 41%
rename from meta/recipes-devtools/git/git_2.3.5.bb
rename to meta/recipes-devtools/git/git_2.3.7.bb
index f7e6af1..61248c0 100644
--- a/meta/recipes-devtools/git/git_2.3.5.bb
+++ b/meta/recipes-devtools/git/git_2.3.7.bb
@@ -1,9 +1,9 @@
 require git.inc
 
-SRC_URI[tarball.md5sum] = "8101cd7497ee64d1ed07d12541826a30"
-SRC_URI[tarball.sha256sum] = "ab88b66b71bcf1918d57f2cb9d4f4763a63d6628c8c69ab331ba77263da1f096"
-SRC_URI[manpages.md5sum] = "209ed840bb155bc6fc129675ee7bb0a2"
-SRC_URI[manpages.sha256sum] = "56a1661df8c405b1ca54ee61c6e2327af517a0e14b686abc16480f02fec69819"
+SRC_URI[tarball.md5sum] = "370cc33cc0a77a1242b95cc703228162"
+SRC_URI[tarball.sha256sum] = "250ebf19c758bcf848f23f42bc632282ba8828b8965a306ad006bfb36ac1499a"
+SRC_URI[manpages.md5sum] = "4c3b585c74bd937b80e04cba6db71da2"
+SRC_URI[manpages.sha256sum] = "079fcd6b8dad124960578fe91964a1185c99cdf024149ad50bde141600b21628"
 
 EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no ac_cv_c_c99_format=yes \
                  ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
-- 
1.7.9.5

[PATCH 3/4] ltp: 20150119 -> 20150420

[Robert Yang]

The COPYING's md5sum is changed by this commit:
commit 945f9c69af665044448b0eb6816656acc84fca77
Author: Ken Dreyer <kdreyer@redhat.com>
Date:   Mon Jan 26 14:02:46 2015 -0700

    update GPLv2 text in COPYING

    The FSF has issued a couple of tiny updates to the GPLv2. The main
    change is a new mailing address for the FSF headquarters.

    This license text was taken verbatim from
    https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt

The main content are the same.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../ltp/{ltp_20150119.bb => ltp_20150420.bb}       |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/ltp/{ltp_20150119.bb => ltp_20150420.bb} (97%)

diff --git a/meta/recipes-extended/ltp/ltp_20150119.bb b/meta/recipes-extended/ltp/ltp_20150420.bb
similarity index 97%
rename from meta/recipes-extended/ltp/ltp_20150119.bb
rename to meta/recipes-extended/ltp/ltp_20150420.bb
index 90c5973..b4fc223 100644
--- a/meta/recipes-extended/ltp/ltp_20150119.bb
+++ b/meta/recipes-extended/ltp/ltp_20150420.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://ltp.sourceforge.net"
 SECTION = "console/utils"
 LICENSE = "GPLv2 & GPLv2+ & LGPLv2+ & LGPLv2.1+ & BSD-2-Clause"
 LIC_FILES_CHKSUM = "\
-    file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
+    file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
     file://testcases/kernel/controllers/freezer/COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
     file://testcases/kernel/controllers/freezer/run_freezer.sh;beginline=5;endline=17;md5=86a61d2c042d59836ffb353a21456498 \
     file://testcases/kernel/hotplug/memory_hotplug/COPYING;md5=e04a2e542b2b8629bf9cd2ba29b0fe41 \
@@ -20,7 +20,7 @@ LIC_FILES_CHKSUM = "\
 "
 
 DEPENDS = "attr libaio libcap acl openssl zip-native"
-SRCREV = "b6ab85d764339b025526bdaf0b5026a67b3a677a"
+SRCREV = "77d0b7fd0148ce657c5a25060667e978c07662a0"
 
 SRC_URI = "git://github.com/linux-test-project/ltp.git \
     file://0001-Rename-runtests_noltp.sh-script-so-have-unique-name.patch \
-- 
1.7.9.5

[PATCH 4/4] rpcbind: 0.2.2 -> 0.2.3

[Robert Yang]

* Updated 0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch
* Removed 0002-uclibc-rpcsvc-defines.patch since it is already in the
  source.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 ...001-Avoid-use-of-glibc-sys-cdefs.h-header.patch |  109 ++++++++++----------
 .../rpcbind/0002-uclibc-rpcsvc-defines.patch       |   60 -----------
 .../rpcbind/{rpcbind_0.2.2.bb => rpcbind_0.2.3.bb} |   10 +-
 3 files changed, 57 insertions(+), 122 deletions(-)
 delete mode 100644 meta/recipes-extended/rpcbind/rpcbind/0002-uclibc-rpcsvc-defines.patch
 rename meta/recipes-extended/rpcbind/{rpcbind_0.2.2.bb => rpcbind_0.2.3.bb} (87%)

diff --git a/meta/recipes-extended/rpcbind/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch b/meta/recipes-extended/rpcbind/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch
index 6f5f5dd..eeef9f1 100644
--- a/meta/recipes-extended/rpcbind/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch
+++ b/meta/recipes-extended/rpcbind/rpcbind/0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch
@@ -5,21 +5,21 @@ Subject: [PATCH] Avoid use of glibc sys/cdefs.h header
 
 Upstream-Status: Pending
 ---
- src/check_bound.c  |  2 +-
- src/pmap_svc.c     | 10 +++++-----
- src/rpcb_svc.c     | 10 +++++-----
- src/rpcb_svc_4.c   | 14 +++++++-------
- src/rpcb_svc_com.c | 46 +++++++++++++++++++++++-----------------------
- src/rpcbind.c      | 12 ++++++------
- src/util.c         |  2 +-
- src/warmstart.c    |  4 ++--
+ src/check_bound.c  |    2 +-
+ src/pmap_svc.c     |   10 +++++-----
+ src/rpcb_svc.c     |   10 +++++-----
+ src/rpcb_svc_4.c   |   14 +++++++-------
+ src/rpcb_svc_com.c |   46 +++++++++++++++++++++++-----------------------
+ src/rpcbind.c      |   12 ++++++------
+ src/util.c         |    2 +-
+ src/warmstart.c    |    4 ++--
  8 files changed, 50 insertions(+), 50 deletions(-)
 
-Index: rpcbind-0.2.2/src/check_bound.c
-===================================================================
---- rpcbind-0.2.2.orig/src/check_bound.c
-+++ rpcbind-0.2.2/src/check_bound.c
-@@ -70,7 +70,7 @@ static struct fdlist *fdhead;	/* Link li
+diff --git a/src/check_bound.c b/src/check_bound.c
+index c70b845..5d21730 100644
+--- a/src/check_bound.c
++++ b/src/check_bound.c
+@@ -70,7 +70,7 @@ static struct fdlist *fdhead;	/* Link list of the check fd's */
  static struct fdlist *fdtail;
  static char *nullstring = "";
  
@@ -28,13 +28,13 @@ Index: rpcbind-0.2.2/src/check_bound.c
  
  /*
   * Returns 1 if the given address is bound for the given addr & transport
-Index: rpcbind-0.2.2/src/pmap_svc.c
-===================================================================
---- rpcbind-0.2.2.orig/src/pmap_svc.c
-+++ rpcbind-0.2.2/src/pmap_svc.c
-@@ -58,11 +58,11 @@ static	char sccsid[] = "@(#)pmap_svc.c 1
- #endif
+diff --git a/src/pmap_svc.c b/src/pmap_svc.c
+index ad28b93..9c7d409 100644
+--- a/src/pmap_svc.c
++++ b/src/pmap_svc.c
+@@ -60,11 +60,11 @@ static	char sccsid[] = "@(#)pmap_svc.c 1.23 89/04/05 Copyr 1984 Sun Micro";
  #include "rpcbind.h"
+ #include "xlog.h"
  #include <rpc/svc_soc.h> /* svc_getcaller routine definition */
 -static struct pmaplist *find_service_pmap __P((rpcprog_t, rpcvers_t,
 -					       rpcprot_t));
@@ -49,13 +49,13 @@ Index: rpcbind-0.2.2/src/pmap_svc.c
  
  /*
   * Called for all the version 2 inquiries.
-Index: rpcbind-0.2.2/src/rpcb_svc.c
-===================================================================
---- rpcbind-0.2.2.orig/src/rpcb_svc.c
-+++ rpcbind-0.2.2/src/rpcb_svc.c
-@@ -52,10 +52,10 @@
- 
+diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c
+index bd92201..6c7f7fe 100644
+--- a/src/rpcb_svc.c
++++ b/src/rpcb_svc.c
+@@ -53,10 +53,10 @@
  #include "rpcbind.h"
+ #include "xlog.h"
  
 -static void *rpcbproc_getaddr_3_local __P((void *, struct svc_req *, SVCXPRT *,
 -					   rpcvers_t));
@@ -68,7 +68,7 @@ Index: rpcbind-0.2.2/src/rpcb_svc.c
  
  /*
   * Called by svc_getreqset. There is a separate server handle for
-@@ -74,7 +74,7 @@ rpcb_service_3(struct svc_req *rqstp, SV
+@@ -75,7 +75,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp)
  	} argument;
  	char *result;
  	xdrproc_t xdr_argument, xdr_result;
@@ -77,13 +77,13 @@ Index: rpcbind-0.2.2/src/rpcb_svc.c
  	rpcprog_t setprog = 0;
  
  	rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc);
-Index: rpcbind-0.2.2/src/rpcb_svc_4.c
-===================================================================
---- rpcbind-0.2.2.orig/src/rpcb_svc_4.c
-+++ rpcbind-0.2.2/src/rpcb_svc_4.c
-@@ -53,13 +53,13 @@
- #include <stdlib.h>
+diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c
+index b673452..6764c0a 100644
+--- a/src/rpcb_svc_4.c
++++ b/src/rpcb_svc_4.c
+@@ -54,13 +54,13 @@
  #include "rpcbind.h"
+ #include "xlog.h"
  
 -static void *rpcbproc_getaddr_4_local __P((void *, struct svc_req *, SVCXPRT *,
 -				      rpcvers_t));
@@ -101,7 +101,7 @@ Index: rpcbind-0.2.2/src/rpcb_svc_4.c
  
  /*
   * Called by svc_getreqset. There is a separate server handle for
-@@ -77,7 +77,7 @@ rpcb_service_4(struct svc_req *rqstp, SV
+@@ -78,7 +78,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp)
  	} argument;
  	char *result;
  	xdrproc_t xdr_argument, xdr_result;
@@ -110,11 +110,11 @@ Index: rpcbind-0.2.2/src/rpcb_svc_4.c
  	rpcprog_t setprog = 0;
  
  	rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc);
-Index: rpcbind-0.2.2/src/rpcb_svc_com.c
-===================================================================
---- rpcbind-0.2.2.orig/src/rpcb_svc_com.c
-+++ rpcbind-0.2.2/src/rpcb_svc_com.c
-@@ -99,29 +99,29 @@ struct finfo {
+diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c
+index ff9ce6b..8aef9e5 100644
+--- a/src/rpcb_svc_com.c
++++ b/src/rpcb_svc_com.c
+@@ -100,29 +100,29 @@ struct finfo {
  static struct finfo     FINFO[NFORWARD];
  
  
@@ -167,11 +167,11 @@ Index: rpcbind-0.2.2/src/rpcb_svc_com.c
  
  /*
   * Set a mapping of program, version, netid
-Index: rpcbind-0.2.2/src/rpcbind.c
-===================================================================
---- rpcbind-0.2.2.orig/src/rpcbind.c
-+++ rpcbind-0.2.2/src/rpcbind.c
-@@ -130,13 +130,13 @@ char *tcp_uaddr;	/* Universal TCP addres
+diff --git a/src/rpcbind.c b/src/rpcbind.c
+index 045daa1..137011b 100644
+--- a/src/rpcbind.c
++++ b/src/rpcbind.c
+@@ -135,13 +135,13 @@ char *tcp_uaddr;	/* Universal TCP address */
  static char servname[] = "rpcbind";
  static char superuser[] = "superuser";
  
@@ -191,26 +191,23 @@ Index: rpcbind-0.2.2/src/rpcbind.c
  
  int
  main(int argc, char *argv[])
-Index: rpcbind-0.2.2/src/util.c
-===================================================================
---- rpcbind-0.2.2.orig/src/util.c
-+++ rpcbind-0.2.2/src/util.c
-@@ -70,9 +70,9 @@ static struct sockaddr_in *local_in4;
+diff --git a/src/util.c b/src/util.c
+index a6c835b..33b9e4f 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -70,7 +70,7 @@ static struct sockaddr_in *local_in4;
  static struct sockaddr_in6 *local_in6;
  #endif
  
 -static int bitmaskcmp __P((void *, void *, void *, int));
 +static int bitmaskcmp (void *, void *, void *, int);
- #ifdef INET6
--static void in6_fillscopeid __P((struct sockaddr_in6 *));
-+static void in6_fillscopeid (struct sockaddr_in6 *);
- #endif
  
  /*
-Index: rpcbind-0.2.2/src/warmstart.c
-===================================================================
---- rpcbind-0.2.2.orig/src/warmstart.c
-+++ rpcbind-0.2.2/src/warmstart.c
+  * For all bits set in "mask", compare the corresponding bits in
+diff --git a/src/warmstart.c b/src/warmstart.c
+index b6eb73e..42dd3af 100644
+--- a/src/warmstart.c
++++ b/src/warmstart.c
 @@ -58,8 +58,8 @@
  #define	PMAPFILE	RPCBIND_STATEDIR "/portmap.xdr"
  #endif
diff --git a/meta/recipes-extended/rpcbind/rpcbind/0002-uclibc-rpcsvc-defines.patch b/meta/recipes-extended/rpcbind/rpcbind/0002-uclibc-rpcsvc-defines.patch
deleted file mode 100644
index 6b11316..0000000
--- a/meta/recipes-extended/rpcbind/rpcbind/0002-uclibc-rpcsvc-defines.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 077add040c2e30d3ac507362f4afe350f47be027 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Tue, 2 Feb 2010 09:47:57 +0000
-Subject: [PATCH 2/2] uclibc-rpcsvc-defines
-
-Upstream-Status: Pending
-
----
- src/security.c |   28 ++++++++++++++++++++++++++++
- 1 files changed, 28 insertions(+), 0 deletions(-)
-
-diff --git a/src/security.c b/src/security.c
-index 0edeac6..e9fed55 100644
---- a/src/security.c
-+++ b/src/security.c
-@@ -20,6 +20,32 @@
- /*
-  * XXX for special case checks in check_callit.
-  */
-+#if defined(__UCLIBC__) || !defined(__GLIBC__)
-+
-+#define MOUNTPROC_MNT 1
-+#define MOUNTPROC_UMNT 3
-+
-+#define NFS_PROGRAM	100003
-+#define YPPROG		100004
-+#define MOUNTPROG	100005
-+#define YPBINDPROG	100007
-+#define YPPASSWDPROG	100009
-+#define RQUOTAPROG	100011
-+
-+#define YPPROC_NULL	0
-+#define YPPROC_DOMAIN 	1
-+#define YPPROC_DOMAIN_NONACK 2
-+#define YPPROC_MATCH	3
-+#define YPPROC_FIRST	4
-+#define YPPROC_NEXT	5
-+#define YPPROC_XFR	6
-+#define YPPROC_CLEAR	7
-+#define YPPROC_ALL	8
-+
-+#define YPBINDPROC_SETDOM	2
-+
-+#else
-+
- #include <rpcsvc/mount.h>
- #include <rpcsvc/rquota.h>
- #include <rpcsvc/nfs_prot.h>
-@@ -27,6 +53,8 @@
- #include <rpcsvc/ypclnt.h>
- #include <rpcsvc/yppasswd.h>
- 
-+#endif
-+
- #include "rpcbind.h"
- 
- #ifdef LIBWRAP
--- 
-1.6.6.1
-
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
similarity index 87%
rename from meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb
rename to meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
index 51e456e..3336021 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.3.bb
@@ -12,9 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b46486e4c4a416602693a711bb5bfa39 \
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
            file://init.d \
-	   file://0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch \
-	   file://0002-uclibc-rpcsvc-defines.patch \
-	   file://remove-sys-queue.patch \
+           file://0001-Avoid-use-of-glibc-sys-cdefs.h-header.patch \
+           file://remove-sys-queue.patch \
            ${UCLIBCPATCHES} \
            ${MUSLPATCHES} \
            file://rpcbind.conf \
@@ -24,13 +23,12 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
 MUSLPATCHES_libc-musl = "file://musl-sunrpc.patch"
 
 UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \
-                             file://0002-uclibc-rpcsvc-defines.patch \
                             "
 UCLIBCPATCHES ?= ""
 MUSLPATCHES ?= ""
 
-SRC_URI[md5sum] = "8acf839bfef2364a05fbd6be5f8edf9a"
-SRC_URI[sha256sum] = "13dbc8c796dbe0ce8df873007bea0490c8460b56202d918c9eb6fa0358a08f29"
+SRC_URI[md5sum] = "c8875246b2688a1adfbd6ad43480278d"
+SRC_URI[sha256sum] = "9897823a9d820ea011d9ea02054d5ab99469b9ca5346265fee380713c8fed27b"
 
 inherit autotools update-rc.d systemd pkgconfig
 
-- 
1.7.9.5