[PATCH 0/8] Packages Upgrade

[PATCH 0/8] Packages Upgrade

[Robert Yang]

The following changes since commit 5661d8cb7849df62358368743134c0aaf523965e:

  image: Really remove lockfiles flag (2016-01-07 13:41:47 +0000)

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 (8):
  autogen-native: 5.18.5 -> 5.18.6
  file: 5.24 -> 5.25
  git: 2.5.0 -> 2.7.0
  wget: 1.17 -> 1.17.1
  iputils: s20121221 -> s20151218
  less: 479 -> 481
  libbsd: 0.8.0 -> 0.8.1
  rsync: 3.1.1 -> 3.1.2

 ...n-native_5.18.5.bb => autogen-native_5.18.6.bb} |    4 +-
 .../autogen/autogen/increase-timeout-limit.patch   |   29 ++---
 .../file/{file_5.24.bb => file_5.25.bb}            |    2 +-
 meta/recipes-devtools/git/git_2.5.0.bb             |   11 --
 meta/recipes-devtools/git/git_2.7.0.bb             |   11 ++
 ...-an-inc-recursive-path-is-not-right-for-i.patch |  135 --------------------
 .../rsync/rsync-3.1.1/rsync.git-eac858085.patch    |  101 ---------------
 .../rsync/{rsync_3.1.1.bb => rsync_3.1.2.bb}       |    6 +-
 ...x-build-command-line-argument-with-gnutls.patch |   37 ------
 .../{iputils_s20121221.bb => iputils_s20151218.bb} |    7 +-
 .../less/{less_479.bb => less_481.bb}              |    4 +-
 meta/recipes-extended/wget/wget/fix_makefile.patch |   18 ---
 .../wget/{wget_1.17.bb => wget_1.17.1.bb}          |    5 +-
 .../libbsd/0001-Use-local-SHA512-header.patch      |   75 -----------
 .../libbsd/{libbsd_0.8.0.bb => libbsd_0.8.1.bb}    |    7 +-
 15 files changed, 39 insertions(+), 413 deletions(-)
 rename meta/recipes-devtools/autogen/{autogen-native_5.18.5.bb => autogen-native_5.18.6.bb} (90%)
 rename meta/recipes-devtools/file/{file_5.24.bb => file_5.25.bb} (96%)
 delete mode 100644 meta/recipes-devtools/git/git_2.5.0.bb
 create mode 100644 meta/recipes-devtools/git/git_2.7.0.bb
 delete mode 100644 meta/recipes-devtools/rsync/rsync-3.1.1/0001-Complain-if-an-inc-recursive-path-is-not-right-for-i.patch
 delete mode 100644 meta/recipes-devtools/rsync/rsync-3.1.1/rsync.git-eac858085.patch
 rename meta/recipes-devtools/rsync/{rsync_3.1.1.bb => rsync_3.1.2.bb} (72%)
 delete mode 100644 meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch
 rename meta/recipes-extended/iputils/{iputils_s20121221.bb => iputils_s20151218.bb} (90%)
 rename meta/recipes-extended/less/{less_479.bb => less_481.bb} (89%)
 delete mode 100644 meta/recipes-extended/wget/wget/fix_makefile.patch
 rename meta/recipes-extended/wget/{wget_1.17.bb => wget_1.17.1.bb} (47%)
 delete mode 100644 meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch
 rename meta/recipes-support/libbsd/{libbsd_0.8.0.bb => libbsd_0.8.1.bb} (73%)

-- 
1.7.9.5

[PATCH 1/8] autogen-native: 5.18.5 -> 5.18.6

[Robert Yang]

* Update increase-timeout-limit.patch

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 ...n-native_5.18.5.bb => autogen-native_5.18.6.bb} |    4 +--
 .../autogen/autogen/increase-timeout-limit.patch   |   29 +++++++++-----------
 2 files changed, 15 insertions(+), 18 deletions(-)
 rename meta/recipes-devtools/autogen/{autogen-native_5.18.5.bb => autogen-native_5.18.6.bb} (90%)

diff --git a/meta/recipes-devtools/autogen/autogen-native_5.18.5.bb b/meta/recipes-devtools/autogen/autogen-native_5.18.6.bb
similarity index 90%
rename from meta/recipes-devtools/autogen/autogen-native_5.18.5.bb
rename to meta/recipes-devtools/autogen/autogen-native_5.18.6.bb
index 373dd89..d77b827 100644
--- a/meta/recipes-devtools/autogen/autogen-native_5.18.5.bb
+++ b/meta/recipes-devtools/autogen/autogen-native_5.18.6.bb
@@ -14,8 +14,8 @@ SRC_URI = "${GNU_MIRROR}/autogen/rel${PV}/autogen-${PV}.tar.gz \
            file://redirect-output-dir.patch \
 "
 
-SRC_URI[md5sum] = "385d7c7dfbe60babbee261c054923a53"
-SRC_URI[sha256sum] = "7bbdb73b5518baf64c6d3739fb2ecc66d2cccda888ce5ad573abe235ab5d96ba"
+SRC_URI[md5sum] = "fdee403e524c0af3ded6b3becb365671"
+SRC_URI[sha256sum] = "2fc7f12a5ecb3b1e8bd4364aa906b837cff01f80edb7d2fb38ed8b9dfbcd3271"
 
 UPSTREAM_CHECK_URI = "http://ftp.gnu.org/gnu/autogen/"
 UPSTREAM_CHECK_REGEX = "rel(?P<pver>\d+(\.\d+)+)/"
diff --git a/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch b/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch
index 3d4c1d6..9efd7e5 100644
--- a/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch
+++ b/meta/recipes-devtools/autogen/autogen/increase-timeout-limit.patch
@@ -12,22 +12,19 @@ Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 0af7c18..5544f59 100644
+index 58a848b..170dd9e 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -175,9 +175,9 @@ config_end_time=`date +%s 2>/dev/null`
- time_delta=`expr ${config_end_time} - ${config_start_time} 2>/dev/null`
+@@ -178,9 +178,9 @@ time_delta=`expr ${config_end_time} - ${config_start_time} 2>/dev/null`
+ if test -z "${AG_TIMEOUT}"
+ then
+   if test -z "${time_delta}"
+-  then time_delta=10
+-  elif test ${time_delta} -lt 5
+-  then time_delta=5 ; fi
++  then time_delta=60
++  elif test ${time_delta} -lt 30
++  then time_delta=30 ; fi
  
- if test -z "${time_delta}"
--then time_delta=10
--elif test ${time_delta} -lt 5
--then time_delta=5 ; fi
-+then time_delta=60
-+elif test ${time_delta} -lt 30
-+then time_delta=30 ; fi
- 
- AG_TIMEOUT=${time_delta}
- ]
--- 
-1.7.9.5
-
+   AG_TIMEOUT=${time_delta}
+ fi
-- 
1.7.9.5

[PATCH 2/8] file: 5.24 -> 5.25

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../file/{file_5.24.bb => file_5.25.bb}            |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename meta/recipes-devtools/file/{file_5.24.bb => file_5.25.bb} (96%)

diff --git a/meta/recipes-devtools/file/file_5.24.bb b/meta/recipes-devtools/file/file_5.25.bb
similarity index 96%
rename from meta/recipes-devtools/file/file_5.24.bb
rename to meta/recipes-devtools/file/file_5.25.bb
index 39f185d..68bad69 100644
--- a/meta/recipes-devtools/file/file_5.24.bb
+++ b/meta/recipes-devtools/file/file_5.25.bb
@@ -20,7 +20,7 @@ SRC_URI = "git://github.com/file/file.git \
         file://host-file.patch \
         "
 
-SRCREV = "3c0874be4d3232d672b20f513451a39cfd7c585a"
+SRCREV = "f45db89ddc91692b662fffbabbdafc7bc4c00f5e"
 S = "${WORKDIR}/git"
 
 inherit autotools
-- 
1.7.9.5

[PATCH 3/8] git: 2.5.0 -> 2.7.0

[Robert Yang]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-devtools/git/git_2.5.0.bb |   11 -----------
 meta/recipes-devtools/git/git_2.7.0.bb |   11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)
 delete mode 100644 meta/recipes-devtools/git/git_2.5.0.bb
 create mode 100644 meta/recipes-devtools/git/git_2.7.0.bb

diff --git a/meta/recipes-devtools/git/git_2.5.0.bb b/meta/recipes-devtools/git/git_2.5.0.bb
deleted file mode 100644
index de686c2..0000000
--- a/meta/recipes-devtools/git/git_2.5.0.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require git.inc
-
-EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
-                 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
-                 "
-EXTRA_OEMAKE += "NO_GETTEXT=1"
-
-SRC_URI[tarball.md5sum] = "3bc9b0a803ae8ec6c5316cc64f0b7f78"
-SRC_URI[tarball.sha256sum] = "8fa13ba8434ff83d24f57f831d55dbb9046434c266641180a37744facfce72ac"
-SRC_URI[manpages.md5sum] = "134b049e51420a336049aac21c88a75a"
-SRC_URI[manpages.sha256sum] = "745e4e797fe5061e781c880d370b1beb480199127da5acaf4e376e0b09d4d685"
diff --git a/meta/recipes-devtools/git/git_2.7.0.bb b/meta/recipes-devtools/git/git_2.7.0.bb
new file mode 100644
index 0000000..2916a1c
--- /dev/null
+++ b/meta/recipes-devtools/git/git_2.7.0.bb
@@ -0,0 +1,11 @@
+require git.inc
+
+EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
+                 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
+                 "
+EXTRA_OEMAKE += "NO_GETTEXT=1"
+
+SRC_URI[tarball.md5sum] = "f3c3ed131e37e5e07cc0b81e9b539908"
+SRC_URI[tarball.sha256sum] = "db9df4435c70a9b25d20a9ee20d65101692dc907a5a4b30e8343c9ae1b913ead"
+SRC_URI[manpages.md5sum] = "dca693846672e68c31d2eb1fc32e763b"
+SRC_URI[manpages.sha256sum] = "444703d66d8441c3c67ba12997719d7510b67a6bc51ccd098474c417a334fb61"
-- 
1.7.9.5

[PATCH 4/8] wget: 1.17 -> 1.17.1

[Robert Yang]

* Remove fix_makefile.patch, it is already in the source.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-extended/wget/wget/fix_makefile.patch |   18 ------------------
 .../wget/{wget_1.17.bb => wget_1.17.1.bb}          |    5 ++---
 2 files changed, 2 insertions(+), 21 deletions(-)
 delete mode 100644 meta/recipes-extended/wget/wget/fix_makefile.patch
 rename meta/recipes-extended/wget/{wget_1.17.bb => wget_1.17.1.bb} (47%)

diff --git a/meta/recipes-extended/wget/wget/fix_makefile.patch b/meta/recipes-extended/wget/wget/fix_makefile.patch
deleted file mode 100644
index eaa2e7e..0000000
--- a/meta/recipes-extended/wget/wget/fix_makefile.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-
-Upstream-Status: Pending
-
-Signed-off-by: Saul Wold <sgw@linux.intel.com>
-
-Index: wget-1.12/configure.ac
-===================================================================
---- wget-1.12.orig/configure.ac	2009-09-22 09:39:49.000000000 -0700
-+++ wget-1.12/configure.ac	2011-10-19 20:32:53.714812160 -0700
-@@ -177,7 +177,7 @@
- dnl Gettext
- dnl
- AM_GNU_GETTEXT([external],[need-ngettext])
--AM_GNU_GETTEXT_VERSION([0.17])
-+AM_GNU_GETTEXT_VERSION([0.18])
- 
- AC_PROG_RANLIB
- 
diff --git a/meta/recipes-extended/wget/wget_1.17.bb b/meta/recipes-extended/wget/wget_1.17.1.bb
similarity index 47%
rename from meta/recipes-extended/wget/wget_1.17.bb
rename to meta/recipes-extended/wget/wget_1.17.1.bb
index 10434d3..dca5d1f 100644
--- a/meta/recipes-extended/wget/wget_1.17.bb
+++ b/meta/recipes-extended/wget/wget_1.17.1.bb
@@ -1,9 +1,8 @@
 SRC_URI = "${GNU_MIRROR}/wget/wget-${PV}.tar.gz \
-           file://fix_makefile.patch \
            file://0001-Unset-need_charset_alias-when-building-for-musl.patch \
           "
 
-SRC_URI[md5sum] = "c4c4727766f24ac716936275014a0536"
-SRC_URI[sha256sum] = "3e04ad027c5b6ebd67c616eec13e66fbedb3d4d8cbe19cc29dadde44b92bda55"
+SRC_URI[md5sum] = "a6a908c9ae0e6a4194c628974cc3f05a"
+SRC_URI[sha256sum] = "029fbb93bdc1c0c5a7507b6076a6ec2f8d34204a85aa87e5b2f61a9405b290f5"
 
 require wget.inc
-- 
1.7.9.5

[PATCH 5/8] iputils: s20121221 -> s20151218

[Robert Yang]

* Remove fix-build-command-line-argument-with-gnutls.patch which is
  already in the source.
* Add libgcrypt to DEPENDS since it depends on it.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 ...x-build-command-line-argument-with-gnutls.patch |   37 --------------------
 .../{iputils_s20121221.bb => iputils_s20151218.bb} |    7 ++--
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch
 rename meta/recipes-extended/iputils/{iputils_s20121221.bb => iputils_s20151218.bb} (90%)

diff --git a/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch b/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch
deleted file mode 100644
index b9cd82e..0000000
--- a/meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Upstream-Status: Backport
-
-From 568e990d30fc7e9416e0a6f8c74ea5013921eaec Mon Sep 17 00:00:00 2001
-From: Arjan van de Ven <arjanvandeven@gmail.com>
-Date: Wed, 16 Jan 2013 03:12:15 +0900
-Subject: [PATCH] ping6: Fix build command line argument with gnutls.
-
-The ping6 command can use either openssl or gnutls...
-and the Makefile has a bunch of setup for defining which of the two to use.
-
-Unfortunately, the final -D define on the commandline to enable gnutls
-inside the ping6.c file didn't actually make it onto the gcc
-commandline.
-This patch adds the $(DEF_CRYPTO) Makefile variable to fix this gap.
-
-Signed-off-by: Arjan van de Ven <arjanvandeven@gmail.com>
-Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
----
- Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index c62d9df..89249f5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -149,7 +149,7 @@ LIB_clockdiff = $(LIB_CAP)
- DEF_ping_common = $(DEF_CAP) $(DEF_IDN)
- DEF_ping  = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS)
- LIB_ping  = $(LIB_CAP) $(LIB_IDN)
--DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR)
-+DEF_ping6 = $(DEF_CAP) $(DEF_IDN) $(DEF_WITHOUT_IFADDRS) $(DEF_ENABLE_PING6_RTHDR) $(DEF_CRYPTO)
- LIB_ping6 = $(LIB_CAP) $(LIB_IDN) $(LIB_RESOLV) $(LIB_CRYPTO)
- 
- ping: ping_common.o
--- 
-1.7.2.5
-
diff --git a/meta/recipes-extended/iputils/iputils_s20121221.bb b/meta/recipes-extended/iputils/iputils_s20151218.bb
similarity index 90%
rename from meta/recipes-extended/iputils/iputils_s20121221.bb
rename to meta/recipes-extended/iputils/iputils_s20151218.bb
index 49913d6..4c3523d 100644
--- a/meta/recipes-extended/iputils/iputils_s20121221.bb
+++ b/meta/recipes-extended/iputils/iputils_s20151218.bb
@@ -11,18 +11,17 @@ LIC_FILES_CHKSUM = "file://ping.c;beginline=1;endline=35;md5=f9ceb201733e9a6cf8f
                     file://arping.c;beginline=1;endline=11;md5=fe84301b5c2655c950f8b92a057fafa6 \
                     file://tftpd.c;beginline=1;endline=32;md5=28834bf8a91a5b8a92755dbee709ef96 "
 
-DEPENDS = "gnutls docbook-utils-native sgmlspl-native libcap"
+DEPENDS = "gnutls docbook-utils-native sgmlspl-native libcap libgcrypt"
 
 
 SRC_URI = "http://www.skbuff.net/iputils/${BPN}-${PV}.tar.bz2 \
            file://debian/use_gethostbyname2.diff \
            file://debian/targets.diff \
            file://nsgmls-path-fix.patch \
-           file://fix-build-command-line-argument-with-gnutls.patch \
           "
 
-SRC_URI[md5sum] = "6072aef64205720dd1893b375e184171"
-SRC_URI[sha256sum] = "450f549fc5b620c23c5929aa6d54b7ddfc7ee1cb1e8efdc5e8bb21d8d0c5319f"
+SRC_URI[md5sum] = "8aaa7395f27dff9f57ae016d4bc753ce"
+SRC_URI[sha256sum] = "549f58d71951e52b46595829134d4e330642f522f50026917fadc349a54825a1"
 
 UPSTREAM_CHECK_REGEX = "iputils-(?P<pver>s\d+).tar"
 
-- 
1.7.9.5

[PATCH 6/8] less: 479 -> 481

[Robert Yang]

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

diff --git a/meta/recipes-extended/less/less_479.bb b/meta/recipes-extended/less/less_481.bb
similarity index 89%
rename from meta/recipes-extended/less/less_479.bb
rename to meta/recipes-extended/less/less_481.bb
index c1858f0..0fcd819 100644
--- a/meta/recipes-extended/less/less_479.bb
+++ b/meta/recipes-extended/less/less_481.bb
@@ -27,8 +27,8 @@ DEPENDS = "ncurses"
 SRC_URI = "http://www.greenwoodsoftware.com/${BPN}/${BPN}-${PV}.tar.gz \
 	  "
 
-SRC_URI[md5sum] = "049f51ccfe2686009c6ce943eeb4bbaf"
-SRC_URI[sha256sum] = "5bf06cb30ee2a2bd1f79f39aa91e46444e7cb19b48c95c4992fa63cfe4527a80"
+SRC_URI[md5sum] = "50ef46065c65257141a7340123527767"
+SRC_URI[sha256sum] = "3fa38f2cf5e9e040bb44fffaa6c76a84506e379e47f5a04686ab78102090dda5"
 
 UPSTREAM_CHECK_URI = "http://www.greenwoodsoftware.com/less/download.html"
 
-- 
1.7.9.5

[PATCH 7/8] libbsd: 0.8.0 -> 0.8.1

[Robert Yang]

* Remove 0001-Use-local-SHA512-header.patch which is already in the source.
* Update LIC_FILES_CHKSUM, the licenses are the same, it uses "Debian
  copyright machine readable format 1.0" now.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../libbsd/0001-Use-local-SHA512-header.patch      |   75 --------------------
 .../libbsd/{libbsd_0.8.0.bb => libbsd_0.8.1.bb}    |    7 +-
 2 files changed, 3 insertions(+), 79 deletions(-)
 delete mode 100644 meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch
 rename meta/recipes-support/libbsd/{libbsd_0.8.0.bb => libbsd_0.8.1.bb} (73%)

diff --git a/meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch b/meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch
deleted file mode 100644
index af47b2b..0000000
--- a/meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 8493c7f27da2dcd2de71e9c7782c3d020d89c2a2 Mon Sep 17 00:00:00 2001
-From: Guillem Jover <guillem@hadrons.org>
-Date: Tue, 1 Dec 2015 03:39:10 +0100
-Subject: [PATCH] Use local SHA512 header
-
-Actually use the local private SHA512 header instead of relying on the
-OpenSSL one for no good reason. Add definition for expected macro
-SHA512_DIGEST_LENGTH.
-
-Signed-off-by: Marek Vasut <marex@denx.de>
-Upstream-Status: Backport
----
- src/getentropy_aix.c   | 2 +-
- src/getentropy_hpux.c  | 3 ++-
- src/getentropy_linux.c | 3 ++-
- src/hash/sha512.h      | 2 ++
- 4 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/getentropy_aix.c b/src/getentropy_aix.c
-index cbd4037..d4ccab7 100644
---- a/src/getentropy_aix.c
-+++ b/src/getentropy_aix.c
-@@ -39,7 +39,7 @@
- #include <string.h>
- #include <termios.h>
- 
--#include <openssl/sha.h>
-+#include "hash/sha512.h"
- 
- #include <libperfstat.h>
- 
-diff --git a/src/getentropy_hpux.c b/src/getentropy_hpux.c
-index 45ac84b..294d83a 100644
---- a/src/getentropy_hpux.c
-+++ b/src/getentropy_hpux.c
-@@ -41,7 +41,8 @@
- #include <errno.h>
- #include <unistd.h>
- #include <time.h>
--#include <openssl/sha.h>
-+
-+#include "hash/sha512.h"
- 
- #include <sys/vfs.h>
- 
-diff --git a/src/getentropy_linux.c b/src/getentropy_linux.c
-index 0a5d6b8..d7a8ae5 100644
---- a/src/getentropy_linux.c
-+++ b/src/getentropy_linux.c
-@@ -47,7 +47,8 @@
- #include <errno.h>
- #include <unistd.h>
- #include <time.h>
--#include <openssl/sha.h>
-+
-+#include "hash/sha512.h"
- 
- #include <linux/types.h>
- #include <linux/random.h>
-diff --git a/src/hash/sha512.h b/src/hash/sha512.h
-index 43c5aaf..4f368a1 100644
---- a/src/hash/sha512.h
-+++ b/src/hash/sha512.h
-@@ -31,6 +31,8 @@
- 
- #include <sys/types.h>
- 
-+#define SHA512_DIGEST_LENGTH		64
-+
- typedef struct SHA512Context {
- 	uint64_t state[8];
- 	uint64_t count[2];
--- 
-2.6.2
-
diff --git a/meta/recipes-support/libbsd/libbsd_0.8.0.bb b/meta/recipes-support/libbsd/libbsd_0.8.1.bb
similarity index 73%
rename from meta/recipes-support/libbsd/libbsd_0.8.0.bb
rename to meta/recipes-support/libbsd/libbsd_0.8.1.bb
index 3456968..effd5df 100644
--- a/meta/recipes-support/libbsd/libbsd_0.8.0.bb
+++ b/meta/recipes-support/libbsd/libbsd_0.8.1.bb
@@ -9,16 +9,15 @@ DESCRIPTION = "This library provides useful functions commonly found on BSD syst
 
 HOMEPAGE = "http://libbsd.freedesktop.org/wiki/"
 LICENSE = "BSD-4-Clause & MIT"
-LIC_FILES_CHKSUM = "file://COPYING;md5=b99a70657f41053dc4b49d0ae73f7a78"
+LIC_FILES_CHKSUM = "file://COPYING;md5=145ec05a217d8f879f29cfc5f83084be"
 SECTION = "libs"
 DEPENDS = ""
 
 SRC_URI = " \
 	http://libbsd.freedesktop.org/releases/${BPN}-${PV}.tar.xz \
-	file://0001-Use-local-SHA512-header.patch \
 	"
 
-SRC_URI[md5sum] = "262bdd1aa3bee6066a8c9cb49bb6c584"
-SRC_URI[sha256sum] = "fbb732084bd960e4c78b688aac875be98e290cc6fe462b2ff8ee946a6473e38c"
+SRC_URI[md5sum] = "f3daff0283af6e30f25d68be2deac4ef"
+SRC_URI[sha256sum] = "adbc8781ad720bce939b689f38a9f0247732a36792147a7c28027c393c2af9b0"
 
 inherit autotools pkgconfig
-- 
1.7.9.5

[PATCH 8/8] rsync: 3.1.1 -> 3.1.2

[Robert Yang]

* Remove backport patches:
  - 0001-Complain-if-an-inc-recursive-path-is-not-right-for-i.patch
  - rsync.git-eac858085.patch

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 ...-an-inc-recursive-path-is-not-right-for-i.patch |  135 --------------------
 .../rsync/rsync-3.1.1/rsync.git-eac858085.patch    |  101 ---------------
 .../rsync/{rsync_3.1.1.bb => rsync_3.1.2.bb}       |    6 +-
 3 files changed, 2 insertions(+), 240 deletions(-)
 delete mode 100644 meta/recipes-devtools/rsync/rsync-3.1.1/0001-Complain-if-an-inc-recursive-path-is-not-right-for-i.patch
 delete mode 100644 meta/recipes-devtools/rsync/rsync-3.1.1/rsync.git-eac858085.patch
 rename meta/recipes-devtools/rsync/{rsync_3.1.1.bb => rsync_3.1.2.bb} (72%)

diff --git a/meta/recipes-devtools/rsync/rsync-3.1.1/0001-Complain-if-an-inc-recursive-path-is-not-right-for-i.patch b/meta/recipes-devtools/rsync/rsync-3.1.1/0001-Complain-if-an-inc-recursive-path-is-not-right-for-i.patch
deleted file mode 100644
index 5ece542..0000000
--- a/meta/recipes-devtools/rsync/rsync-3.1.1/0001-Complain-if-an-inc-recursive-path-is-not-right-for-i.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 962f8b90045ab331fc04c9e65f80f1a53e68243b Mon Sep 17 00:00:00 2001
-From: Wayne Davison <wayned@samba.org>
-Date: Wed, 31 Dec 2014 12:41:03 -0800
-Subject: [PATCH] Complain if an inc-recursive path is not right for its dir.
- This ensures that a malicious sender can't use a just-sent symlink as a
- trasnfer path.
-
-Upstream-Status: BackPort
-
-Fix the CVE-2014-9512, rsync 3.1.1 allows remote attackers to write to arbitrary
-files via a symlink attack on a file in the synchronization path.
-
-BackPort and fix this patch to make it able to apply to source code
-
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
----
- flist.c | 22 ++++++++++++++++++++--
- io.c    |  2 +-
- main.c  |  4 ++--
- rsync.c |  2 +-
- proto.h | 2 +-
- 6 files changed, 31 insertions(+), 8 deletions(-)
-
-diff --git a/flist.c b/flist.c
-index c24672e..92e4b65 100644
---- a/flist.c
-+++ b/flist.c
-@@ -2435,8 +2435,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
- 	return flist;
- }
- 
--struct file_list *recv_file_list(int f)
-+struct file_list *recv_file_list(int f, int dir_ndx)
- {
-+	const char *good_dirname = NULL;
- 	struct file_list *flist;
- 	int dstart, flags;
- 	int64 start_read;
-@@ -2492,6 +2493,23 @@ struct file_list *recv_file_list(int f)
- 		flist_expand(flist, 1);
- 		file = recv_file_entry(f, flist, flags);
- 
-+		if (inc_recurse) {
-+			static const char empty_dir[] = "\0";
-+			const char *cur_dir = file->dirname ? file->dirname : empty_dir;
-+			if (relative_paths && *cur_dir == '/')
-+				cur_dir++;
-+			if (cur_dir != good_dirname) {
-+				const char *d = dir_ndx >= 0 ? f_name(dir_flist->files[dir_ndx], NULL) : empty_dir;
-+				if (strcmp(cur_dir, d) != 0) {
-+					rprintf(FERROR,
-+						"ABORTING due to invalid dir prefix from sender: %s (should be: %s)\n",
-+						cur_dir, d);
-+					exit_cleanup(RERR_PROTOCOL);
-+				}
-+				good_dirname = cur_dir;
-+			}
-+		}
-+
- 		if (S_ISREG(file->mode)) {
- 			/* Already counted */
- 		} else if (S_ISDIR(file->mode)) {
-@@ -2615,7 +2633,7 @@ void recv_additional_file_list(int f)
- 			rprintf(FINFO, "[%s] receiving flist for dir %d\n",
- 				who_am_i(), ndx);
- 		}
--		flist = recv_file_list(f);
-+		flist = recv_file_list(f, ndx);
- 		flist->parent_ndx = ndx;
- 	}
- }
-diff --git a/io.c b/io.c
-index b9a9bd0..a868fa9 100644
---- a/io.c
-+++ b/io.c
-@@ -1685,7 +1685,7 @@ void wait_for_receiver(void)
- 				rprintf(FINFO, "[%s] receiving flist for dir %d\n",
- 					who_am_i(), ndx);
- 			}
--			flist = recv_file_list(iobuf.in_fd);
-+			flist = recv_file_list(iobuf.in_fd, ndx);
- 			flist->parent_ndx = ndx;
- #ifdef SUPPORT_HARD_LINKS
- 			if (preserve_hard_links)
-diff --git a/main.c b/main.c
-index e7a13f7..713b818 100644
---- a/main.c
-+++ b/main.c
-@@ -1009,7 +1009,7 @@ static void do_server_recv(int f_in, int f_out, int argc, char *argv[])
- 		filesfrom_fd = -1;
- 	}
- 
--	flist = recv_file_list(f_in);
-+	flist = recv_file_list(f_in, -1);
- 	if (!flist) {
- 		rprintf(FERROR,"server_recv: recv_file_list error\n");
- 		exit_cleanup(RERR_FILESELECT);
-@@ -1183,7 +1183,7 @@ int client_run(int f_in, int f_out, pid_t pid, int argc, char *argv[])
- 
- 	if (write_batch && !am_server)
- 		start_write_batch(f_in);
--	flist = recv_file_list(f_in);
-+	flist = recv_file_list(f_in, -1);
- 	if (inc_recurse && file_total == 1)
- 		recv_additional_file_list(f_in);
- 
-diff --git a/rsync.c b/rsync.c
-index 68ff6b1..c3ecc51 100644
---- a/rsync.c
-+++ b/rsync.c
-@@ -364,7 +364,7 @@ int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr,
- 		}
- 		/* Send all the data we read for this flist to the generator. */
- 		start_flist_forward(ndx);
--		flist = recv_file_list(f_in);
-+		flist = recv_file_list(f_in, ndx);
- 		flist->parent_ndx = ndx;
- 		stop_flist_forward();
- 	}
-diff --git a/proto.h b/proto.h
-index 22fc539..247c558 100644
---- a/proto.h
-+++ b/proto.h
-@@ -89,7 +89,7 @@ struct file_struct *make_file(const char *fname, struct file_list *flist,
- void unmake_file(struct file_struct *file);
- void send_extra_file_list(int f, int at_least);
- struct file_list *send_file_list(int f, int argc, char *argv[]);
--struct file_list *recv_file_list(int f);
-+struct file_list *recv_file_list(int f, int dir_ndx);
- void recv_additional_file_list(int f);
- int flist_find(struct file_list *flist, struct file_struct *f);
- int flist_find_ignore_dirness(struct file_list *flist, struct file_struct *f);
--- 
-1.9.1
-
diff --git a/meta/recipes-devtools/rsync/rsync-3.1.1/rsync.git-eac858085.patch b/meta/recipes-devtools/rsync/rsync-3.1.1/rsync.git-eac858085.patch
deleted file mode 100644
index 1fcac49..0000000
--- a/meta/recipes-devtools/rsync/rsync-3.1.1/rsync.git-eac858085.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From eac858085e3ac94ec0ab5061d11f52652c90a869 Mon Sep 17 00:00:00 2001
-From: Wayne Davison <wayned@samba.org>
-Date: Mon, 11 May 2015 12:36:20 -0700
-Subject: [PATCH 1/1] Add compat flag to allow proper seed checksum order.
- Fixes the equivalent of librsync's CVE-2014-8242 issue.
-
-Upstream-Status: Backport
-
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
----
- checksum.c | 17 +++++++++++++----
- compat.c   |  5 +++++
- options.c  |  1 +
- 3 files changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/checksum.c b/checksum.c
-index a1c2aa2..933b514 100644
---- a/checksum.c
-+++ b/checksum.c
-@@ -23,6 +23,7 @@
- 
- extern int checksum_seed;
- extern int protocol_version;
-+extern int proper_seed_order;
- 
- /*
-   a simple 32 bit checksum that can be upadted from either end
-@@ -54,10 +55,18 @@ void get_checksum2(char *buf, int32 len, char *sum)
- 	if (protocol_version >= 30) {
- 		uchar seedbuf[4];
- 		md5_begin(&m);
--		md5_update(&m, (uchar *)buf, len);
--		if (checksum_seed) {
--			SIVALu(seedbuf, 0, checksum_seed);
--			md5_update(&m, seedbuf, 4);
-+		if (proper_seed_order) {
-+			if (checksum_seed) {
-+				SIVALu(seedbuf, 0, checksum_seed);
-+				md5_update(&m, seedbuf, 4);
-+			}
-+			md5_update(&m, (uchar *)buf, len);
-+		} else {
-+			md5_update(&m, (uchar *)buf, len);
-+			if (checksum_seed) {
-+				SIVALu(seedbuf, 0, checksum_seed);
-+				md5_update(&m, seedbuf, 4);
-+			}
- 		}
- 		md5_result(&m, (uchar *)sum);
- 	} else {
-diff --git a/compat.c b/compat.c
-index 2454937..f89d466 100644
---- a/compat.c
-+++ b/compat.c
-@@ -27,6 +27,7 @@ int inc_recurse = 0;
- int compat_flags = 0;
- int use_safe_inc_flist = 0;
- int want_xattr_optim = 0;
-+int proper_seed_order = 0;
- 
- extern int am_server;
- extern int am_sender;
-@@ -78,6 +79,7 @@ int filesfrom_convert = 0;
- #define CF_SYMLINK_ICONV (1<<2)
- #define CF_SAFE_FLIST	 (1<<3)
- #define CF_AVOID_XATTR_OPTIM (1<<4)
-+#define CF_CHKSUM_SEED_FIX (1<<5)
- 
- static const char *client_info;
- 
-@@ -271,12 +273,15 @@ void setup_protocol(int f_out,int f_in)
- 				compat_flags |= CF_SAFE_FLIST;
- 			if (local_server || strchr(client_info, 'x') != NULL)
- 				compat_flags |= CF_AVOID_XATTR_OPTIM;
-+			if (local_server || strchr(client_info, 'C') != NULL)
-+				compat_flags |= CF_CHKSUM_SEED_FIX;
- 			write_byte(f_out, compat_flags);
- 		} else
- 			compat_flags = read_byte(f_in);
- 		/* The inc_recurse var MUST be set to 0 or 1. */
- 		inc_recurse = compat_flags & CF_INC_RECURSE ? 1 : 0;
- 		want_xattr_optim = protocol_version >= 31 && !(compat_flags & CF_AVOID_XATTR_OPTIM);
-+		proper_seed_order = compat_flags & CF_CHKSUM_SEED_FIX ? 1 : 0;
- 		if (am_sender) {
- 			receiver_symlink_times = am_server
- 			    ? strchr(client_info, 'L') != NULL
-diff --git a/options.c b/options.c
-index 19c2b7d..4128b59 100644
---- a/options.c
-+++ b/options.c
-@@ -2503,6 +2503,7 @@ void server_options(char **args, int *argc_p)
- #endif
- 		argstr[x++] = 'f'; /* flist I/O-error safety support */
- 		argstr[x++] = 'x'; /* xattr hardlink optimization not desired */
-+		argstr[x++] = 'C'; /* support checksum seed order fix */
- 	}
- 
- 	if (x >= (int)sizeof argstr) { /* Not possible... */
--- 
-1.9.1
-
diff --git a/meta/recipes-devtools/rsync/rsync_3.1.1.bb b/meta/recipes-devtools/rsync/rsync_3.1.2.bb
similarity index 72%
rename from meta/recipes-devtools/rsync/rsync_3.1.1.bb
rename to meta/recipes-devtools/rsync/rsync_3.1.2.bb
index c74cdda..71c2045 100644
--- a/meta/recipes-devtools/rsync/rsync_3.1.1.bb
+++ b/meta/recipes-devtools/rsync/rsync_3.1.2.bb
@@ -2,12 +2,10 @@ require rsync.inc
 
 
 SRC_URI += "file://acinclude.m4 \
-            file://0001-Complain-if-an-inc-recursive-path-is-not-right-for-i.patch \
-            file://rsync.git-eac858085.patch \
 "
 
-SRC_URI[md5sum] = "43bd6676f0b404326eee2d63be3cdcfe"
-SRC_URI[sha256sum] = "7de4364fcf5fe42f3bdb514417f1c40d10bbca896abe7e7f2c581c6ea08a2621"
+SRC_URI[md5sum] = "0f758d7e000c0f7f7d3792610fad70cb"
+SRC_URI[sha256sum] = "ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2"
 
 PACKAGECONFIG ??= "acl attr"
 PACKAGECONFIG[acl] = "--enable-acl-support,--disable-acl-support,acl,"
-- 
1.7.9.5

Re: [PATCH 0/8] Packages Upgrade

[Robert Yang]

Updated this patches a little, drop libbsd patches since Martin had
upgraded it:

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

Robert Yang (7):
   autogen-native: 5.18.5 -> 5.18.6
   file: 5.24 -> 5.25
   git: 2.5.0 -> 2.7.0
   wget: 1.17 -> 1.17.1
   iputils: s20121221 -> s20151218
   less: 479 -> 481
   rsync: 3.1.1 -> 3.1.2

// Robert

On 01/11/2016 03:19 PM, Robert Yang wrote:
> The following changes since commit 5661d8cb7849df62358368743134c0aaf523965e:
>
>    image: Really remove lockfiles flag (2016-01-07 13:41:47 +0000)
>
> 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 (8):
>    autogen-native: 5.18.5 -> 5.18.6
>    file: 5.24 -> 5.25
>    git: 2.5.0 -> 2.7.0
>    wget: 1.17 -> 1.17.1
>    iputils: s20121221 -> s20151218
>    less: 479 -> 481
>    libbsd: 0.8.0 -> 0.8.1
>    rsync: 3.1.1 -> 3.1.2
>
>   ...n-native_5.18.5.bb => autogen-native_5.18.6.bb} |    4 +-
>   .../autogen/autogen/increase-timeout-limit.patch   |   29 ++---
>   .../file/{file_5.24.bb => file_5.25.bb}            |    2 +-
>   meta/recipes-devtools/git/git_2.5.0.bb             |   11 --
>   meta/recipes-devtools/git/git_2.7.0.bb             |   11 ++
>   ...-an-inc-recursive-path-is-not-right-for-i.patch |  135 --------------------
>   .../rsync/rsync-3.1.1/rsync.git-eac858085.patch    |  101 ---------------
>   .../rsync/{rsync_3.1.1.bb => rsync_3.1.2.bb}       |    6 +-
>   ...x-build-command-line-argument-with-gnutls.patch |   37 ------
>   .../{iputils_s20121221.bb => iputils_s20151218.bb} |    7 +-
>   .../less/{less_479.bb => less_481.bb}              |    4 +-
>   meta/recipes-extended/wget/wget/fix_makefile.patch |   18 ---
>   .../wget/{wget_1.17.bb => wget_1.17.1.bb}          |    5 +-
>   .../libbsd/0001-Use-local-SHA512-header.patch      |   75 -----------
>   .../libbsd/{libbsd_0.8.0.bb => libbsd_0.8.1.bb}    |    7 +-
>   15 files changed, 39 insertions(+), 413 deletions(-)
>   rename meta/recipes-devtools/autogen/{autogen-native_5.18.5.bb => autogen-native_5.18.6.bb} (90%)
>   rename meta/recipes-devtools/file/{file_5.24.bb => file_5.25.bb} (96%)
>   delete mode 100644 meta/recipes-devtools/git/git_2.5.0.bb
>   create mode 100644 meta/recipes-devtools/git/git_2.7.0.bb
>   delete mode 100644 meta/recipes-devtools/rsync/rsync-3.1.1/0001-Complain-if-an-inc-recursive-path-is-not-right-for-i.patch
>   delete mode 100644 meta/recipes-devtools/rsync/rsync-3.1.1/rsync.git-eac858085.patch
>   rename meta/recipes-devtools/rsync/{rsync_3.1.1.bb => rsync_3.1.2.bb} (72%)
>   delete mode 100644 meta/recipes-extended/iputils/files/fix-build-command-line-argument-with-gnutls.patch
>   rename meta/recipes-extended/iputils/{iputils_s20121221.bb => iputils_s20151218.bb} (90%)
>   rename meta/recipes-extended/less/{less_479.bb => less_481.bb} (89%)
>   delete mode 100644 meta/recipes-extended/wget/wget/fix_makefile.patch
>   rename meta/recipes-extended/wget/{wget_1.17.bb => wget_1.17.1.bb} (47%)
>   delete mode 100644 meta/recipes-support/libbsd/libbsd/0001-Use-local-SHA512-header.patch
>   rename meta/recipes-support/libbsd/{libbsd_0.8.0.bb => libbsd_0.8.1.bb} (73%)
>