[PATCH 00/10] Upgrade packages: libxml-parser-perl/elfutils/xmlto/gnupg/man-pages/dhcp/rpcbind

[PATCH 00/10] Upgrade packages: libxml-parser-perl/elfutils/xmlto/gnupg/man-pages/dhcp/rpcbind

[Hongxu Jia]

The following changes since commit c45589a55c67bfd0bf9da5050141f4d18835e113:

  poky.conf: mark all CentOS 6/7 versions as compatible (2015-01-12 13:31:08 +0000)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib hongxu/upgrade-packages-0113
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/upgrade-packages-0113

Hongxu Jia (10):
  libxml-parser-perl: upgrade to 2.43
  elfutils: upgrade to 1.161
  xmlto: upgrade to 0.0.25
  gnupg: upgrade to 2.1.1
  man-pages: upgrade to 3.76
  dhcp: upgrade to 4.3.1
  dhcp: not override site.h
  upstream_tracking.inc: update entries for bash
  rpcbind: upgrade to 0.2.2
  rpcbind: add PACKAGECONFIG for systemd

 .../conf/distro/include/upstream_tracking.inc      |   1 +
 meta/conf/distro/include/tcmode-default.inc        |   1 -
 meta/recipes-connectivity/dhcp/dhcp.inc            |   6 +-
 ...o-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch |  26 +
 .../dhcp/dhcp/fixsepbuild.patch                    | 112 ++--
 meta/recipes-connectivity/dhcp/dhcp/site.h         |  21 -
 .../dhcp/{dhcp_4.3.0.bb => dhcp_4.3.1.bb}          |   4 +-
 .../arm_backend.diff                               |   0
 .../arm_func_value.patch                           |   0
 .../arm_unwind_ret_mask.patch                      |   0
 .../fixheadercheck.patch                           |   0
 .../hppa_backend.diff                              |   0
 .../m68k_backend.diff                              |   0
 .../mips_backend.diff                              |   0
 .../mips_readelf_w.patch                           |   0
 .../non_linux.patch                                |   0
 .../redhat-portability.diff                        | 564 +++++++++++----------
 .../scanf-format.patch                             |   0
 .../testsuite-ignore-elflint.diff                  |   0
 .../{elfutils_0.160.bb => elfutils_0.161.bb}       |   4 +-
 ...ser-perl_2.41.bb => libxml-parser-perl_2.43.bb} |   4 +-
 .../xmlto-0.0.25/obsolete_automake_macros.patch    |  12 -
 ....in-drop-the-test-of-xmllint-and-xsltproc.patch |   0
 .../xmlto/{xmlto_0.0.25.bb => xmlto_0.0.26.bb}     |   5 +-
 .../{man-pages_3.75.bb => man-pages_3.76.bb}       |   4 +-
 ...bind-rpcuser-not-being-set-in-Makefile.am.patch |  34 --
 .../rpcbind/{rpcbind_0.2.1.bb => rpcbind_0.2.2.bb} |  11 +-
 .../gnupg/{gnupg_2.1.0.bb => gnupg_2.1.1.bb}       |   4 +-
 28 files changed, 416 insertions(+), 397 deletions(-)
 create mode 100644 meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/site.h
 rename meta/recipes-connectivity/dhcp/{dhcp_4.3.0.bb => dhcp_4.3.1.bb} (70%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/arm_backend.diff (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/arm_func_value.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/arm_unwind_ret_mask.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/fixheadercheck.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/hppa_backend.diff (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/m68k_backend.diff (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/mips_backend.diff (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/mips_readelf_w.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/non_linux.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/redhat-portability.diff (76%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/scanf-format.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/testsuite-ignore-elflint.diff (100%)
 rename meta/recipes-devtools/elfutils/{elfutils_0.160.bb => elfutils_0.161.bb} (95%)
 rename meta/recipes-devtools/perl/{libxml-parser-perl_2.41.bb => libxml-parser-perl_2.43.bb} (88%)
 delete mode 100644 meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch
 rename meta/recipes-devtools/xmlto/{xmlto-0.0.25 => xmlto-0.0.26}/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch (100%)
 rename meta/recipes-devtools/xmlto/{xmlto_0.0.25.bb => xmlto_0.0.26.bb} (84%)
 rename meta/recipes-extended/man-pages/{man-pages_3.75.bb => man-pages_3.76.bb} (86%)
 delete mode 100644 meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch
 rename meta/recipes-extended/rpcbind/{rpcbind_0.2.1.bb => rpcbind_0.2.2.bb} (83%)
 rename meta/recipes-support/gnupg/{gnupg_2.1.0.bb => gnupg_2.1.1.bb} (89%)

-- 
1.9.1

[PATCH 01/10] libxml-parser-perl: upgrade to 2.43

[Hongxu Jia]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 .../perl/{libxml-parser-perl_2.41.bb => libxml-parser-perl_2.43.bb}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/perl/{libxml-parser-perl_2.41.bb => libxml-parser-perl_2.43.bb} (88%)

diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.43.bb
similarity index 88%
rename from meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
rename to meta/recipes-devtools/perl/libxml-parser-perl_2.43.bb
index 26241e8..f0e5754 100644
--- a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
+++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.43.bb
@@ -8,8 +8,8 @@ DEPENDS += "expat expat-native"
 PR = "r3"
 
 SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz"
-SRC_URI[md5sum] = "c320d2ffa459e6cdc6f9f59c1185855e"
-SRC_URI[sha256sum] = "b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740894de9"
+SRC_URI[md5sum] = "2c9ca46832d8e7578bcda99eba3a47f1"
+SRC_URI[sha256sum] = "e56ce06b516eff5335cb3b7e0bb268537c77991af1bfd86c39cebabc407f4549"
 
 S = "${WORKDIR}/XML-Parser-${PV}"
 
-- 
1.9.1

[PATCH V2 01/10] libxml-parser-perl: upgrade to 2.43

[Hongxu Jia]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 .../perl/{libxml-parser-perl_2.41.bb => libxml-parser-perl_2.43.bb} | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/perl/{libxml-parser-perl_2.41.bb => libxml-parser-perl_2.43.bb} (87%)

diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.43.bb
similarity index 87%
rename from meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
rename to meta/recipes-devtools/perl/libxml-parser-perl_2.43.bb
index 26241e8..061f538 100644
--- a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
+++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.43.bb
@@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://README;beginline=2;endline=6;md5=c8767d7516229f07b26e
 
 DEPENDS += "expat expat-native"
 
-PR = "r3"
-
 SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz"
-SRC_URI[md5sum] = "c320d2ffa459e6cdc6f9f59c1185855e"
-SRC_URI[sha256sum] = "b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740894de9"
+SRC_URI[md5sum] = "2c9ca46832d8e7578bcda99eba3a47f1"
+SRC_URI[sha256sum] = "e56ce06b516eff5335cb3b7e0bb268537c77991af1bfd86c39cebabc407f4549"
 
 S = "${WORKDIR}/XML-Parser-${PV}"
 
-- 
1.9.1

Re: [PATCH V2 01/10] libxml-parser-perl: upgrade to 2.43

[Hongxu Jia]

On 01/13/2015 02:16 PM, Hongxu Jia wrote:
> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
> ---
>   .../perl/{libxml-parser-perl_2.41.bb => libxml-parser-perl_2.43.bb} | 6 ++----
>   1 file changed, 2 insertions(+), 4 deletions(-)
>   rename meta/recipes-devtools/perl/{libxml-parser-perl_2.41.bb => libxml-parser-perl_2.43.bb} (87%)
>
> diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.43.bb
> similarity index 87%
> rename from meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
> rename to meta/recipes-devtools/perl/libxml-parser-perl_2.43.bb
> index 26241e8..061f538 100644
> --- a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
> +++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.43.bb
> @@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://README;beginline=2;endline=6;md5=c8767d7516229f07b26e
>   
>   DEPENDS += "expat expat-native"
>   
> -PR = "r3"

Changed in V2:
- Clean up obsolete 'PR'

Update git repository at:

   git://git.pokylinux.org/poky-contrib hongxu/upgrade-packages-0113
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/upgrade-packages-0113

//Hongxu

> -
>   SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz"
> -SRC_URI[md5sum] = "c320d2ffa459e6cdc6f9f59c1185855e"
> -SRC_URI[sha256sum] = "b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740894de9"
> +SRC_URI[md5sum] = "2c9ca46832d8e7578bcda99eba3a47f1"
> +SRC_URI[sha256sum] = "e56ce06b516eff5335cb3b7e0bb268537c77991af1bfd86c39cebabc407f4549"
>   
>   S = "${WORKDIR}/XML-Parser-${PV}"
>   

Re: [PATCH V2 01/10] libxml-parser-perl: upgrade to 2.43

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 286 bytes --]

On 13 January 2015 at 06:19, Hongxu Jia <hongxu.jia@windriver.com> wrote:

> --- a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
>> +++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.43.bb
>
>
2.43 doesn't exist anymore, can you update and test 2.44?

Cheers,
Ross

[-- Attachment #2: Type: text/html, Size: 926 bytes --]

[PATCH V3 01/10] libxml-parser-perl: upgrade to 2.44

[Hongxu Jia]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 .../perl/{libxml-parser-perl_2.41.bb => libxml-parser-perl_2.44.bb} | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
 rename meta/recipes-devtools/perl/{libxml-parser-perl_2.41.bb => libxml-parser-perl_2.44.bb} (87%)

diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb
similarity index 87%
rename from meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
rename to meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb
index 26241e8..b08e79a 100644
--- a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
+++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb
@@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://README;beginline=2;endline=6;md5=c8767d7516229f07b26e
 
 DEPENDS += "expat expat-native"
 
-PR = "r3"
-
 SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz"
-SRC_URI[md5sum] = "c320d2ffa459e6cdc6f9f59c1185855e"
-SRC_URI[sha256sum] = "b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740894de9"
+SRC_URI[md5sum] = "af4813fe3952362451201ced6fbce379"
+SRC_URI[sha256sum] = "1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216"
 
 S = "${WORKDIR}/XML-Parser-${PV}"
 
-- 
1.9.1

[PATCH 02/10] elfutils: upgrade to 1.161

[Hongxu Jia]

Drop PREFERRED_VERSION_elfutils in meta/conf/distro/include/
tcmode-default.inc, it builds the latest version by default.

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/conf/distro/include/tcmode-default.inc        |   1 -
 .../arm_backend.diff                               |   0
 .../arm_func_value.patch                           |   0
 .../arm_unwind_ret_mask.patch                      |   0
 .../fixheadercheck.patch                           |   0
 .../hppa_backend.diff                              |   0
 .../m68k_backend.diff                              |   0
 .../mips_backend.diff                              |   0
 .../mips_readelf_w.patch                           |   0
 .../non_linux.patch                                |   0
 .../redhat-portability.diff                        | 564 +++++++++++----------
 .../scanf-format.patch                             |   0
 .../testsuite-ignore-elflint.diff                  |   0
 .../{elfutils_0.160.bb => elfutils_0.161.bb}       |   4 +-
 14 files changed, 305 insertions(+), 264 deletions(-)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/arm_backend.diff (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/arm_func_value.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/arm_unwind_ret_mask.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/fixheadercheck.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/hppa_backend.diff (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/m68k_backend.diff (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/mips_backend.diff (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/mips_readelf_w.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/non_linux.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/redhat-portability.diff (76%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/scanf-format.patch (100%)
 rename meta/recipes-devtools/elfutils/{elfutils-0.160 => elfutils-0.161}/testsuite-ignore-elflint.diff (100%)
 rename meta/recipes-devtools/elfutils/{elfutils_0.160.bb => elfutils_0.161.bb} (95%)

diff --git a/meta/conf/distro/include/tcmode-default.inc b/meta/conf/distro/include/tcmode-default.inc
index 2b41090..2b871f8 100644
--- a/meta/conf/distro/include/tcmode-default.inc
+++ b/meta/conf/distro/include/tcmode-default.inc
@@ -59,7 +59,6 @@ PREFERRED_VERSION_nativesdk-glibc-initial  ?= "${GLIBCVERSION}"
 PREFERRED_VERSION_cross-localedef-native   ?= "${GLIBCVERSION}"
 PREFERRED_VERSION_uclibc                   ?= "${UCLIBCVERSION}"
 PREFERRED_VERSION_uclibc-initial           ?= "${UCLIBCVERSION}"
-PREFERRED_VERSION_elfutils ?= "0.160"
 # don't use version earlier than 1.4 for gzip-native, as it's necessary for
 # some packages using an archive format incompatible with earlier gzip
 PREFERRED_VERSION_gzip-native ?= "1.6"
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/arm_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/arm_backend.diff
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.160/arm_backend.diff
rename to meta/recipes-devtools/elfutils/elfutils-0.161/arm_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/arm_func_value.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/arm_func_value.patch
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.160/arm_func_value.patch
rename to meta/recipes-devtools/elfutils/elfutils-0.161/arm_func_value.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/arm_unwind_ret_mask.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/arm_unwind_ret_mask.patch
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.160/arm_unwind_ret_mask.patch
rename to meta/recipes-devtools/elfutils/elfutils-0.161/arm_unwind_ret_mask.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/fixheadercheck.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/fixheadercheck.patch
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.160/fixheadercheck.patch
rename to meta/recipes-devtools/elfutils/elfutils-0.161/fixheadercheck.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/hppa_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/hppa_backend.diff
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.160/hppa_backend.diff
rename to meta/recipes-devtools/elfutils/elfutils-0.161/hppa_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/m68k_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/m68k_backend.diff
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.160/m68k_backend.diff
rename to meta/recipes-devtools/elfutils/elfutils-0.161/m68k_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/mips_backend.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/mips_backend.diff
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.160/mips_backend.diff
rename to meta/recipes-devtools/elfutils/elfutils-0.161/mips_backend.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/mips_readelf_w.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/mips_readelf_w.patch
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.160/mips_readelf_w.patch
rename to meta/recipes-devtools/elfutils/elfutils-0.161/mips_readelf_w.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/non_linux.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/non_linux.patch
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.160/non_linux.patch
rename to meta/recipes-devtools/elfutils/elfutils-0.161/non_linux.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/redhat-portability.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/redhat-portability.diff
similarity index 76%
rename from meta/recipes-devtools/elfutils/elfutils-0.160/redhat-portability.diff
rename to meta/recipes-devtools/elfutils/elfutils-0.161/redhat-portability.diff
index a358b11..08f25a5 100644
--- a/meta/recipes-devtools/elfutils/elfutils-0.160/redhat-portability.diff
+++ b/meta/recipes-devtools/elfutils/elfutils-0.161/redhat-portability.diff
@@ -1,58 +1,47 @@
-Index: elfutils-0.159/backends/ChangeLog
-===================================================================
---- elfutils-0.159.orig/backends/ChangeLog
-+++ elfutils-0.159/backends/ChangeLog
-@@ -364,6 +364,10 @@
- 	* ppc_attrs.c (ppc_check_object_attribute): Handle tag
- 	GNU_Power_ABI_Struct_Return.
- 
-+2009-01-23  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (libebl_%.so): Use $(LD_AS_NEEDED).
-+
- 2008-10-04  Ulrich Drepper  <drepper@redhat.com>
- 
- 	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
-@@ -691,6 +695,11 @@
- 	* sparc_init.c: Likewise.
- 	* x86_64_init.c: Likewise.
- 
-+2005-11-22  Roland McGrath  <roland@redhat.com>
-+
-+	* Makefile.am (LD_AS_NEEDED): New variable, substituted by configure.
-+	(libebl_%.so rule): Use it in place of -Wl,--as-needed.
-+
- 2005-11-19  Roland McGrath  <roland@redhat.com>
- 
- 	* ppc64_reloc.def: REL30 -> ADDR30.
-@@ -713,6 +722,9 @@
- 	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
- 	(CLEANFILES): Add libebl_$(m).so.
- 
-+	* Makefile.am (WEXTRA): New variable, substituted by configure.
-+	(AM_CFLAGS): Use it in place of -Wextra.
-+
- 	* ppc_reloc.def: Update bits per Alan Modra <amodra@bigpond.net.au>.
- 	* ppc64_reloc.def: Likewise.
- 
-Index: elfutils-0.159/backends/Makefile.am
-===================================================================
---- elfutils-0.159.orig/backends/Makefile.am
-+++ elfutils-0.159/backends/Makefile.am
-@@ -119,7 +119,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a
- 	$(LINK) -shared -o $(@:.map=.so) \
- 		-Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
- 		-Wl,--version-script,$(@:.so=.map) \
--		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw)
-+		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw)
- 	$(textrel_check)
- 
- libebl_i386.so: $(cpu_i386)
-Index: elfutils-0.159/ChangeLog
-===================================================================
---- elfutils-0.159.orig/ChangeLog
-+++ elfutils-0.159/ChangeLog
-@@ -148,6 +148,8 @@
+Rebase to 1.161
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ ChangeLog                   | 30 +++++++++++++++++++++++
+ backends/ChangeLog          | 12 +++++++++
+ backends/Makefile.am        |  2 +-
+ config/ChangeLog            |  4 +++
+ config/eu.am                | 14 ++++++++---
+ configure.ac                | 60 +++++++++++++++++++++++++++++++++++++++++++--
+ lib/ChangeLog               |  8 ++++++
+ lib/eu-config.h             | 11 +++++++++
+ libasm/ChangeLog            |  5 ++++
+ libcpu/ChangeLog            |  8 ++++++
+ libcpu/i386_disasm.c        |  1 +
+ libdw/ChangeLog             | 13 ++++++++++
+ libdw/dwarf_begin_elf.c     |  8 ++++++
+ libdw/libdw.h               |  2 +-
+ libdwfl/ChangeLog           | 20 +++++++++++++++
+ libdwfl/linux-core-attach.c | 29 ++++++++++++++++++++++
+ libdwfl/linux-pid-attach.c  | 14 +++++++++++
+ libebl/ChangeLog            |  5 ++++
+ libelf/ChangeLog            | 10 ++++++++
+ libelf/common.h             |  4 +--
+ libelf/gnuhash_xlate.h      |  6 +++--
+ src/ChangeLog               | 30 +++++++++++++++++++++++
+ src/Makefile.am             |  5 ++++
+ src/addr2line.c             |  4 +--
+ src/findtextrel.c           |  6 ++++-
+ src/ld.h                    |  2 ++
+ src/readelf.c               | 15 ++++++++----
+ src/strings.c               | 11 +++++++++
+ src/strip.c                 | 20 +++++++++++++--
+ tests/ChangeLog             | 14 +++++++++++
+ tests/Makefile.am           |  1 +
+ tests/backtrace.c           |  1 +
+ tests/line2addr.c           |  2 +-
+ 33 files changed, 355 insertions(+), 22 deletions(-)
+
+diff --git a/ChangeLog b/ChangeLog
+index f81b302..3f9eaf1 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -187,6 +187,8 @@
  
  2012-01-24  Mark Wielaard  <mjw@redhat.com>
  
@@ -61,7 +50,7 @@ Index: elfutils-0.159/ChangeLog
  	* COPYING: Fix address. Updated version from gnulib.
  
  2012-01-23  Mark Wielaard  <mjw@redhat.com>
-@@ -166,6 +168,9 @@
+@@ -205,6 +207,9 @@
  
  2011-10-08  Mike Frysinger  <vapier@gentoo.org>
  
@@ -71,7 +60,7 @@ Index: elfutils-0.159/ChangeLog
  	* configure.ac: Fix use of AC_ARG_ENABLE to handle $enableval correctly.
  
  2011-10-02  Ulrich Drepper  <drepper@gmail.com>
-@@ -187,6 +192,10 @@
+@@ -226,6 +231,10 @@
  
  	* configure.ac (LOCALEDIR, DATADIRNAME): Removed.
  
@@ -82,7 +71,7 @@ Index: elfutils-0.159/ChangeLog
  2009-09-21  Ulrich Drepper  <drepper@redhat.com>
  
  	* configure.ac: Update for more modern autoconf.
-@@ -195,6 +204,10 @@
+@@ -234,6 +243,10 @@
  
  	* configure.ac (zip_LIBS): Check for liblzma too.
  
@@ -93,7 +82,7 @@ Index: elfutils-0.159/ChangeLog
  2009-04-19  Roland McGrath  <roland@redhat.com>
  
  	* configure.ac (eu_version): Round down here, not in version.h macros.
-@@ -206,6 +219,8 @@
+@@ -245,6 +258,8 @@
  
  2009-01-23  Roland McGrath  <roland@redhat.com>
  
@@ -102,7 +91,7 @@ Index: elfutils-0.159/ChangeLog
  	* configure.ac (zlib check): Check for gzdirect, need zlib >= 1.2.2.3.
  
  	* configure.ac (__thread check): Use AC_LINK_IFELSE, in case of
-@@ -286,6 +301,10 @@
+@@ -325,6 +340,10 @@
  	* configure.ac: Add dummy automake conditional to get dependencies
  	for non-generic linker right.  See src/Makefile.am.
  
@@ -113,7 +102,7 @@ Index: elfutils-0.159/ChangeLog
  2005-11-18  Roland McGrath  <roland@redhat.com>
  
  	* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New variable.
-@@ -333,6 +352,17 @@
+@@ -372,6 +391,17 @@
  	* Makefile.am (all_SUBDIRS): Add libdwfl.
  	* configure.ac: Write libdwfl/Makefile.
  
@@ -131,11 +120,61 @@ Index: elfutils-0.159/ChangeLog
  2005-05-19  Roland McGrath  <roland@redhat.com>
  
  	* configure.ac [AH_BOTTOM] (INTDECL, _INTDECL): New macros.
-Index: elfutils-0.159/config/ChangeLog
-===================================================================
---- elfutils-0.159.orig/config/ChangeLog
-+++ elfutils-0.159/config/ChangeLog
-@@ -58,6 +58,10 @@
+diff --git a/backends/ChangeLog b/backends/ChangeLog
+index e800d16..6a86248 100644
+--- a/backends/ChangeLog
++++ b/backends/ChangeLog
+@@ -433,6 +433,10 @@
+ 	* ppc_attrs.c (ppc_check_object_attribute): Handle tag
+ 	GNU_Power_ABI_Struct_Return.
+ 
++2009-01-23  Roland McGrath  <roland@redhat.com>
++
++	* Makefile.am (libebl_%.so): Use $(LD_AS_NEEDED).
++
+ 2008-10-04  Ulrich Drepper  <drepper@redhat.com>
+ 
+ 	* i386_reloc.def: Fix entries for TLS_GOTDESC, TLS_DESC_CALL, and
+@@ -760,6 +764,11 @@
+ 	* sparc_init.c: Likewise.
+ 	* x86_64_init.c: Likewise.
+ 
++2005-11-22  Roland McGrath  <roland@redhat.com>
++
++	* Makefile.am (LD_AS_NEEDED): New variable, substituted by configure.
++	(libebl_%.so rule): Use it in place of -Wl,--as-needed.
++
+ 2005-11-19  Roland McGrath  <roland@redhat.com>
+ 
+ 	* ppc64_reloc.def: REL30 -> ADDR30.
+@@ -782,6 +791,9 @@
+ 	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
+ 	(CLEANFILES): Add libebl_$(m).so.
+ 
++	* Makefile.am (WEXTRA): New variable, substituted by configure.
++	(AM_CFLAGS): Use it in place of -Wextra.
++
+ 	* ppc_reloc.def: Update bits per Alan Modra <amodra@bigpond.net.au>.
+ 	* ppc64_reloc.def: Likewise.
+ 
+diff --git a/backends/Makefile.am b/backends/Makefile.am
+index 4d15a5d..507c9df 100644
+--- a/backends/Makefile.am
++++ b/backends/Makefile.am
+@@ -131,7 +131,7 @@ libebl_%.so libebl_%.map: libebl_%_pic.a $(libelf) $(libdw)
+ 	$(LINK) -shared -o $(@:.map=.so) \
+ 		-Wl,--whole-archive $< $(cpu_$*) -Wl,--no-whole-archive \
+ 		-Wl,--version-script,$(@:.so=.map) \
+-		-Wl,-z,defs -Wl,--as-needed $(libelf) $(libdw)
++		-Wl,-z,defs $(LD_AS_NEEDED) $(libelf) $(libdw)
+ 	@$(textrel_check)
+ 
+ libebl_i386.so: $(cpu_i386)
+diff --git a/config/ChangeLog b/config/ChangeLog
+index 1b4e896..058dd88 100644
+--- a/config/ChangeLog
++++ b/config/ChangeLog
+@@ -71,6 +71,10 @@
  
  	* known-dwarf.awk: Use gawk.
  
@@ -146,10 +185,10 @@ Index: elfutils-0.159/config/ChangeLog
  2010-07-02  Ulrich Drepper  <drepper@redhat.com>
  
  	* elfutils.spec.in: Add more BuildRequires.
-Index: elfutils-0.159/config/eu.am
-===================================================================
---- elfutils-0.159.orig/config/eu.am
-+++ elfutils-0.159/config/eu.am
+diff --git a/config/eu.am b/config/eu.am
+index faf8add..6ca36a5 100644
+--- a/config/eu.am
++++ b/config/eu.am
 @@ -1,6 +1,6 @@
  ## Common automake fragments for elfutils subdirectory makefiles.
  ##
@@ -182,10 +221,10 @@ Index: elfutils-0.159/config/eu.am
  COMPILE.os = $(filter-out -fprofile-arcs -ftest-coverage, $(COMPILE))
  
  %.os: %.c %.o
-Index: elfutils-0.159/configure.ac
-===================================================================
---- elfutils-0.159.orig/configure.ac
-+++ elfutils-0.159/configure.ac
+diff --git a/configure.ac b/configure.ac
+index 0e67a79..a1ad6db 100644
+--- a/configure.ac
++++ b/configure.ac
 @@ -89,6 +89,54 @@ CFLAGS="$old_CFLAGS"])
  AS_IF([test "x$ac_cv_c99" != xyes],
        AC_MSG_ERROR([gcc with C99 support required]))
@@ -241,7 +280,7 @@ Index: elfutils-0.159/configure.ac
  AC_CACHE_CHECK([for __thread support], ac_cv_tls, [dnl
  # Use the same flags that we use for our DSOs, so the test is representative.
  # Some old compiler/linker/libc combinations fail some ways and not others.
-@@ -104,7 +152,10 @@ static __thread int a; int foo (int b) {
+@@ -104,7 +152,10 @@ static __thread int a; int foo (int b) { return a + b; }]],
  CFLAGS="$save_CFLAGS"
  LDFLAGS="$save_LDFLAGS"])
  AS_IF([test "x$ac_cv_tls" != xyes],
@@ -253,7 +292,7 @@ Index: elfutils-0.159/configure.ac
  
  dnl This test must come as early as possible after the compiler configuration
  dnl tests, because the choice of the file model can (in principle) affect
-@@ -183,6 +234,11 @@ AM_CONDITIONAL(USE_VALGRIND, test "$use_
+@@ -183,6 +234,11 @@ AM_CONDITIONAL(USE_VALGRIND, test "$use_valgrind" = yes)
  AM_CONDITIONAL(BUILD_STATIC, [dnl
  test "$use_gprof" = yes -o "$use_gcov" = yes])
  
@@ -265,7 +304,7 @@ Index: elfutils-0.159/configure.ac
  AC_ARG_ENABLE([tests-rpath],
  AS_HELP_STRING([--enable-tests-rpath],[build $ORIGIN-using rpath into tests]),
  	       [tests_use_rpath=$enableval], [tests_use_rpath=no])
-@@ -297,7 +353,7 @@ case "$eu_version" in
+@@ -302,7 +358,7 @@ case "$eu_version" in
  esac
  
  # Round up to the next release API (x.y) version.
@@ -274,10 +313,10 @@ Index: elfutils-0.159/configure.ac
  
  AC_CHECK_SIZEOF(long)
  
-Index: elfutils-0.159/lib/ChangeLog
-===================================================================
---- elfutils-0.159.orig/lib/ChangeLog
-+++ elfutils-0.159/lib/ChangeLog
+diff --git a/lib/ChangeLog b/lib/ChangeLog
+index 4415213..4911cc1 100644
+--- a/lib/ChangeLog
++++ b/lib/ChangeLog
 @@ -65,6 +65,9 @@
  
  2009-01-23  Roland McGrath  <roland@redhat.com>
@@ -300,11 +339,11 @@ Index: elfutils-0.159/lib/ChangeLog
  2005-04-30  Ulrich Drepper  <drepper@redhat.com>
  
  	* Makefile.am: Use -ffunction-sections for xmalloc.c.
-Index: elfutils-0.159/lib/eu-config.h
-===================================================================
---- elfutils-0.159.orig/lib/eu-config.h
-+++ elfutils-0.159/lib/eu-config.h
-@@ -162,6 +162,17 @@ asm (".section predict_data, \"aw\"; .pr
+diff --git a/lib/eu-config.h b/lib/eu-config.h
+index 3afff26..d89f3a8 100644
+--- a/lib/eu-config.h
++++ b/lib/eu-config.h
+@@ -162,6 +162,17 @@ asm (".section predict_data, \"aw\"; .previous\n"
  /* This macro is used by the tests conditionalize for standalone building.  */
  #define ELFUTILS_HEADER(name) <lib##name.h>
  
@@ -322,11 +361,11 @@ Index: elfutils-0.159/lib/eu-config.h
  
  #ifdef SHARED
  # define OLD_VERSION(name, version) \
-Index: elfutils-0.159/libasm/ChangeLog
-===================================================================
---- elfutils-0.159.orig/libasm/ChangeLog
-+++ elfutils-0.159/libasm/ChangeLog
-@@ -79,6 +79,11 @@
+diff --git a/libasm/ChangeLog b/libasm/ChangeLog
+index 9b25af9..32b9fd0 100644
+--- a/libasm/ChangeLog
++++ b/libasm/ChangeLog
+@@ -87,6 +87,11 @@
  	* asm_error.c: Add new error ASM_E_IOERROR.
  	* libasmP.h: Add ASM_E_IOERROR definition.
  
@@ -338,10 +377,10 @@ Index: elfutils-0.159/libasm/ChangeLog
  2005-02-15  Ulrich Drepper  <drepper@redhat.com>
  
  	* Makefile.am (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
-Index: elfutils-0.159/libcpu/ChangeLog
-===================================================================
---- elfutils-0.159.orig/libcpu/ChangeLog
-+++ elfutils-0.159/libcpu/ChangeLog
+diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog
+index a20f440..5ea23b7 100644
+--- a/libcpu/ChangeLog
++++ b/libcpu/ChangeLog
 @@ -51,6 +51,9 @@
  
  2009-01-23  Roland McGrath  <roland@redhat.com>
@@ -364,11 +403,11 @@ Index: elfutils-0.159/libcpu/ChangeLog
  2005-02-15  Ulrich Drepper  <drepper@redhat.com>
  
  	* Makefile (AM_CFLAGS): Add -Wunused -Wextra -Wformat=2.
-Index: elfutils-0.159/libcpu/i386_disasm.c
-===================================================================
---- elfutils-0.159.orig/libcpu/i386_disasm.c
-+++ elfutils-0.159/libcpu/i386_disasm.c
-@@ -822,6 +822,7 @@ i386_disasm (const uint8_t **startp, con
+diff --git a/libcpu/i386_disasm.c b/libcpu/i386_disasm.c
+index 832241f..c7a0df0 100644
+--- a/libcpu/i386_disasm.c
++++ b/libcpu/i386_disasm.c
+@@ -822,6 +822,7 @@ i386_disasm (const uint8_t **startp, const uint8_t *end, GElf_Addr addr,
  
  			default:
  			  assert (! "INVALID not handled");
@@ -376,11 +415,11 @@ Index: elfutils-0.159/libcpu/i386_disasm.c
  			}
  		    }
  		  else
-Index: elfutils-0.159/libdw/ChangeLog
-===================================================================
---- elfutils-0.159.orig/libdw/ChangeLog
-+++ elfutils-0.159/libdw/ChangeLog
-@@ -420,6 +420,10 @@
+diff --git a/libdw/ChangeLog b/libdw/ChangeLog
+index abc2d71..a9ee0b0 100644
+--- a/libdw/ChangeLog
++++ b/libdw/ChangeLog
+@@ -717,6 +717,10 @@
  
  	* Makefile.am (known-dwarf.h): Run gawk on config/known-dwarf.awk.
  
@@ -391,7 +430,7 @@ Index: elfutils-0.159/libdw/ChangeLog
  2011-07-14  Mark Wielaard  <mjw@redhat.com>
  
  	* libdw.h (dwarf_offdie): Fix documentation to mention .debug_info.
-@@ -779,6 +783,10 @@
+@@ -1076,6 +1080,10 @@
  
  	* dwarf_hasattr_integrate.c: Integrate DW_AT_specification too.
  
@@ -402,7 +441,7 @@ Index: elfutils-0.159/libdw/ChangeLog
  2009-08-10  Roland McGrath  <roland@redhat.com>
  
  	* dwarf_getscopevar.c: Use dwarf_diename.
-@@ -1547,6 +1555,11 @@
+@@ -1844,6 +1852,11 @@
  
  2005-05-31  Roland McGrath  <roland@redhat.com>
  
@@ -414,10 +453,10 @@ Index: elfutils-0.159/libdw/ChangeLog
  	* dwarf_formref_die.c (dwarf_formref_die): Add CU header offset to
  	formref offset.
  
-Index: elfutils-0.159/libdw/dwarf_begin_elf.c
-===================================================================
---- elfutils-0.159.orig/libdw/dwarf_begin_elf.c
-+++ elfutils-0.159/libdw/dwarf_begin_elf.c
+diff --git a/libdw/dwarf_begin_elf.c b/libdw/dwarf_begin_elf.c
+index 4c49ce2..7ea1430 100644
+--- a/libdw/dwarf_begin_elf.c
++++ b/libdw/dwarf_begin_elf.c
 @@ -47,6 +47,14 @@
  #if USE_ZLIB
  # include <endian.h>
@@ -433,11 +472,11 @@ Index: elfutils-0.159/libdw/dwarf_begin_elf.c
  # include <zlib.h>
  # undef crc32
  #endif
-Index: elfutils-0.159/libdw/libdw.h
-===================================================================
---- elfutils-0.159.orig/libdw/libdw.h
-+++ elfutils-0.159/libdw/libdw.h
-@@ -891,7 +891,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (
+diff --git a/libdw/libdw.h b/libdw/libdw.h
+index b2b2282..722c589 100644
+--- a/libdw/libdw.h
++++ b/libdw/libdw.h
+@@ -1003,7 +1003,7 @@ extern Dwarf_OOM dwarf_new_oom_handler (Dwarf *dbg, Dwarf_OOM handler);
  
  
  /* Inline optimizations.  */
@@ -446,11 +485,11 @@ Index: elfutils-0.159/libdw/libdw.h
  /* Return attribute code of given attribute.  */
  __libdw_extern_inline unsigned int
  dwarf_whatattr (Dwarf_Attribute *attr)
-Index: elfutils-0.159/libdwfl/ChangeLog
-===================================================================
---- elfutils-0.159.orig/libdwfl/ChangeLog
-+++ elfutils-0.159/libdwfl/ChangeLog
-@@ -421,6 +421,21 @@
+diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog
+index 69e59a6..15c2987 100644
+--- a/libdwfl/ChangeLog
++++ b/libdwfl/ChangeLog
+@@ -571,6 +571,21 @@
  	(dwfl_module_addrsym) (i_to_symfile): New function.
  	(dwfl_module_addrsym) (search_table): Use it.
  
@@ -472,7 +511,7 @@ Index: elfutils-0.159/libdwfl/ChangeLog
  2013-11-07  Jan Kratochvil  <jan.kratochvil@redhat.com>
  	    Mark Wielaard  <mjw@redhat.com>
  
-@@ -2186,6 +2201,11 @@
+@@ -2336,6 +2351,11 @@
  
  2005-07-21  Roland McGrath  <roland@redhat.com>
  
@@ -484,10 +523,10 @@ Index: elfutils-0.159/libdwfl/ChangeLog
  	* Makefile.am (noinst_HEADERS): Add loc2c.c.
  
  	* test2.c (main): Check sscanf result to quiet warning.
-Index: elfutils-0.159/libdwfl/linux-core-attach.c
-===================================================================
---- elfutils-0.159.orig/libdwfl/linux-core-attach.c
-+++ elfutils-0.159/libdwfl/linux-core-attach.c
+diff --git a/libdwfl/linux-core-attach.c b/libdwfl/linux-core-attach.c
+index 5a7b3b3..d05ac7e 100644
+--- a/libdwfl/linux-core-attach.c
++++ b/libdwfl/linux-core-attach.c
 @@ -29,6 +29,35 @@
  #include "libdwflP.h"
  #include <fcntl.h>
@@ -522,12 +561,12 @@ Index: elfutils-0.159/libdwfl/linux-core-attach.c
 +# endif
 +#endif
  
- #ifndef MIN
- # define MIN(a, b) ((a) < (b) ? (a) : (b))
-Index: elfutils-0.159/libdwfl/linux-pid-attach.c
-===================================================================
---- elfutils-0.159.orig/libdwfl/linux-pid-attach.c
-+++ elfutils-0.159/libdwfl/linux-pid-attach.c
+ #include "../libdw/memory-access.h"
+ 
+diff --git a/libdwfl/linux-pid-attach.c b/libdwfl/linux-pid-attach.c
+index efbcf03..ae5af38 100644
+--- a/libdwfl/linux-pid-attach.c
++++ b/libdwfl/linux-pid-attach.c
 @@ -255,6 +255,11 @@ void
  internal_function
  __libdwfl_ptrace_detach (pid_t tid, bool tid_was_stopped)
@@ -540,7 +579,7 @@ Index: elfutils-0.159/libdwfl/linux-pid-attach.c
    /* This handling is needed only on older Linux kernels such as
       2.6.32-358.23.2.el6.ppc64.  Later kernels such as
       3.11.7-200.fc19.x86_64 remember the T (stopped) state
-@@ -262,6 +267,15 @@ __libdwfl_ptrace_detach (pid_t tid, bool
+@@ -262,6 +267,15 @@ __libdwfl_ptrace_detach (pid_t tid, bool tid_was_stopped)
       PTRACE_DETACH.  */
    ptrace (PTRACE_DETACH, tid, NULL,
  	  (void *) (intptr_t) (tid_was_stopped ? SIGSTOP : 0));
@@ -556,11 +595,11 @@ Index: elfutils-0.159/libdwfl/linux-pid-attach.c
  }
  
  static void
-Index: elfutils-0.159/libebl/ChangeLog
-===================================================================
---- elfutils-0.159.orig/libebl/ChangeLog
-+++ elfutils-0.159/libebl/ChangeLog
-@@ -748,6 +748,11 @@
+diff --git a/libebl/ChangeLog b/libebl/ChangeLog
+index 5e635f2..998544f 100644
+--- a/libebl/ChangeLog
++++ b/libebl/ChangeLog
+@@ -765,6 +765,11 @@
  	* Makefile.am (libebl_*_so_SOURCES): Set to $(*_SRCS) so dependency
  	tracking works right.
  
@@ -572,11 +611,11 @@ Index: elfutils-0.159/libebl/ChangeLog
  2005-05-21  Ulrich Drepper  <drepper@redhat.com>
  
  	* libebl_x86_64.map: Add x86_64_core_note.
-Index: elfutils-0.159/libelf/ChangeLog
-===================================================================
---- elfutils-0.159.orig/libelf/ChangeLog
-+++ elfutils-0.159/libelf/ChangeLog
-@@ -135,6 +135,11 @@
+diff --git a/libelf/ChangeLog b/libelf/ChangeLog
+index 3b88d03..cb6cad5 100644
+--- a/libelf/ChangeLog
++++ b/libelf/ChangeLog
+@@ -244,6 +244,11 @@
  
  	* elf-knowledge.h (SECTION_STRIP_P): Remove < SHT_NUM check.
  
@@ -588,7 +627,7 @@ Index: elfutils-0.159/libelf/ChangeLog
  2011-02-26  Mark Wielaard  <mjw@redhat.com>
  
  	* elf_end.c (elf_end): Call rwlock_unlock before rwlock_fini.
-@@ -812,6 +817,11 @@
+@@ -921,6 +926,11 @@
  
  	* elf.h: Update from glibc.
  
@@ -600,10 +639,10 @@ Index: elfutils-0.159/libelf/ChangeLog
  2005-05-08  Roland McGrath  <roland@redhat.com>
  
  	* elf_begin.c (read_file) [_MUDFLAP]: Don't use mmap for now.
-Index: elfutils-0.159/libelf/common.h
-===================================================================
---- elfutils-0.159.orig/libelf/common.h
-+++ elfutils-0.159/libelf/common.h
+diff --git a/libelf/common.h b/libelf/common.h
+index 744f1bb..185ea59 100644
+--- a/libelf/common.h
++++ b/libelf/common.h
 @@ -139,7 +139,7 @@ libelf_release_all (Elf *elf)
    (Var) = (sizeof (Var) == 1						      \
  	   ? (unsigned char) (Var)					      \
@@ -622,10 +661,10 @@ Index: elfutils-0.159/libelf/common.h
  	      : (sizeof (Var) == 4					      \
  		 ? bswap_32 (Var)					      \
  		 : bswap_64 (Var))))
-Index: elfutils-0.159/libelf/gnuhash_xlate.h
-===================================================================
---- elfutils-0.159.orig/libelf/gnuhash_xlate.h
-+++ elfutils-0.159/libelf/gnuhash_xlate.h
+diff --git a/libelf/gnuhash_xlate.h b/libelf/gnuhash_xlate.h
+index 04d9ca1..3e25936 100644
+--- a/libelf/gnuhash_xlate.h
++++ b/libelf/gnuhash_xlate.h
 @@ -1,5 +1,5 @@
  /* Conversion functions for versioning information.
 -   Copyright (C) 2006, 2007 Red Hat, Inc.
@@ -633,7 +672,7 @@ Index: elfutils-0.159/libelf/gnuhash_xlate.h
     This file is part of elfutils.
     Written by Ulrich Drepper <drepper@redhat.com>, 2006.
  
-@@ -68,7 +68,9 @@ elf_cvt_gnuhash (void *dest, const void
+@@ -69,7 +69,9 @@ elf_cvt_gnuhash (void *dest, const void *src, size_t len, int encode)
    dest32 = (Elf32_Word *) &dest64[bitmask_words];
    while (len >= 4)
      {
@@ -644,28 +683,11 @@ Index: elfutils-0.159/libelf/gnuhash_xlate.h
        len -= 4;
      }
  }
-Index: elfutils-0.159/src/addr2line.c
-===================================================================
---- elfutils-0.159.orig/src/addr2line.c
-+++ elfutils-0.159/src/addr2line.c
-@@ -540,10 +540,10 @@ handle_address (const char *string, Dwfl
-       bool parsed = false;
-       int i, j;
-       char *name = NULL;
--      if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
-+      if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
- 	  && string[i] == '\0')
- 	parsed = adjust_to_section (name, &addr, dwfl);
--      switch (sscanf (string, "%m[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
-+      switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
- 	{
- 	default:
- 	  break;
-Index: elfutils-0.159/src/ChangeLog
-===================================================================
---- elfutils-0.159.orig/src/ChangeLog
-+++ elfutils-0.159/src/ChangeLog
-@@ -1112,8 +1112,16 @@
+diff --git a/src/ChangeLog b/src/ChangeLog
+index 0ae863e..1162f6e 100644
+--- a/src/ChangeLog
++++ b/src/ChangeLog
+@@ -1371,8 +1371,16 @@
  	* readelf.c (attr_callback): Use print_block only when we don't use
  	print_ops.
  
@@ -682,7 +704,7 @@ Index: elfutils-0.159/src/ChangeLog
  	* ar.c (do_oper_extract): Use pathconf instead of statfs.
  
  2009-08-01  Ulrich Drepper  <drepper@redhat.com>
-@@ -1277,6 +1285,8 @@
+@@ -1536,6 +1544,8 @@
  	* readelf.c (print_debug_frame_section): Use t instead of j formats
  	for ptrdiff_t OFFSET.
  
@@ -691,7 +713,7 @@ Index: elfutils-0.159/src/ChangeLog
  2009-01-21  Ulrich Drepper  <drepper@redhat.com>
  
  	* elflint.c (check_program_header): Fix typo in .eh_frame_hdr section
-@@ -1460,6 +1470,11 @@
+@@ -1719,6 +1729,11 @@
  	that matches its PT_LOAD's p_flags &~ PF_W.  On sparc, PF_X really
  	is valid in RELRO.
  
@@ -703,7 +725,7 @@ Index: elfutils-0.159/src/ChangeLog
  2008-02-29  Roland McGrath  <roland@redhat.com>
  
  	* readelf.c (print_attributes): Add a cast.
-@@ -1711,6 +1726,8 @@
+@@ -1970,6 +1985,8 @@
  
  	* readelf.c (hex_dump): Fix rounding error in whitespace calculation.
  
@@ -712,7 +734,7 @@ Index: elfutils-0.159/src/ChangeLog
  2007-10-15  Roland McGrath  <roland@redhat.com>
  
  	* make-debug-archive.in: New file.
-@@ -2150,6 +2167,10 @@
+@@ -2409,6 +2426,10 @@
  	* elflint.c (valid_e_machine): Add EM_ALPHA.
  	Reported by Christian Aichinger <Greek0@gmx.net>.
  
@@ -723,7 +745,7 @@ Index: elfutils-0.159/src/ChangeLog
  2006-08-08  Ulrich Drepper  <drepper@redhat.com>
  
  	* elflint.c (check_dynamic): Don't require DT_HASH for DT_SYMTAB.
-@@ -2226,6 +2247,10 @@
+@@ -2485,6 +2506,10 @@
  	* Makefile.am: Add hacks to create dependency files for non-generic
  	linker.
  
@@ -734,7 +756,7 @@ Index: elfutils-0.159/src/ChangeLog
  2006-06-12  Ulrich Drepper  <drepper@redhat.com>
  
  	* ldgeneric.c (ld_generic_generate_sections): Don't create .interp
-@@ -2574,6 +2599,11 @@
+@@ -2833,6 +2858,11 @@
  	* readelf.c (print_debug_loc_section): Fix indentation for larger
  	address size.
  
@@ -746,11 +768,44 @@ Index: elfutils-0.159/src/ChangeLog
  2005-05-30  Roland McGrath  <roland@redhat.com>
  
  	* readelf.c (print_debug_line_section): Print section offset of each
-Index: elfutils-0.159/src/findtextrel.c
-===================================================================
---- elfutils-0.159.orig/src/findtextrel.c
-+++ elfutils-0.159/src/findtextrel.c
-@@ -496,7 +496,11 @@ ptrcompare (const void *p1, const void *
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 4f198da..a612cf6 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -89,6 +89,11 @@ endif
+ # XXX While the file is not finished, don't warn about this
+ ldgeneric_no_Wunused = yes
+ 
++# Buggy old compilers or libc headers.
++readelf_no_Werror = yes
++strings_no_Werror = yes
++addr2line_no_Wformat = yes
++
+ readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl
+ nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \
+ 	   $(demanglelib)
+diff --git a/src/addr2line.c b/src/addr2line.c
+index de80294..e982982 100644
+--- a/src/addr2line.c
++++ b/src/addr2line.c
+@@ -540,10 +540,10 @@ handle_address (const char *string, Dwfl *dwfl)
+       bool parsed = false;
+       int i, j;
+       char *name = NULL;
+-      if (sscanf (string, "(%m[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
++      if (sscanf (string, "(%a[^)])%" PRIiMAX "%n", &name, &addr, &i) == 2
+ 	  && string[i] == '\0')
+ 	parsed = adjust_to_section (name, &addr, dwfl);
+-      switch (sscanf (string, "%m[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
++      switch (sscanf (string, "%a[^-+]%n%" PRIiMAX "%n", &name, &i, &addr, &j))
+ 	{
+ 	default:
+ 	  break;
+diff --git a/src/findtextrel.c b/src/findtextrel.c
+index 264a06b..d7de202 100644
+--- a/src/findtextrel.c
++++ b/src/findtextrel.c
+@@ -502,7 +502,11 @@ ptrcompare (const void *p1, const void *p2)
  
  
  static void
@@ -763,10 +818,10 @@ Index: elfutils-0.159/src/findtextrel.c
  	   GElf_Addr addr, Elf *elf, Elf_Scn *symscn, Dwarf *dw,
  	   const char *fname, bool more_than_one, void **knownsrcs)
  {
-Index: elfutils-0.159/src/ld.h
-===================================================================
---- elfutils-0.159.orig/src/ld.h
-+++ elfutils-0.159/src/ld.h
+diff --git a/src/ld.h b/src/ld.h
+index 29f4031..8695c31 100644
+--- a/src/ld.h
++++ b/src/ld.h
 @@ -1114,6 +1114,7 @@ extern bool dynamically_linked_p (void);
  
  /* Checked whether the symbol is undefined and referenced from a DSO.  */
@@ -775,34 +830,18 @@ Index: elfutils-0.159/src/ld.h
  #ifdef __GNUC_STDC_INLINE__
  __attribute__ ((__gnu_inline__))
  #endif
-@@ -1131,5 +1132,6 @@ linked_from_dso_p (struct scninfo *scnin
+@@ -1131,5 +1132,6 @@ linked_from_dso_p (struct scninfo *scninfo, size_t symidx)
  
    return sym->defined && sym->in_dso;
  }
 +#endif	/* Optimizing and not GCC 4.2.  */
  
  #endif	/* ld.h */
-Index: elfutils-0.159/src/Makefile.am
-===================================================================
---- elfutils-0.159.orig/src/Makefile.am
-+++ elfutils-0.159/src/Makefile.am
-@@ -89,6 +89,11 @@ endif
- # XXX While the file is not finished, don't warn about this
- ldgeneric_no_Wunused = yes
- 
-+# Buggy old compilers or libc headers.
-+readelf_no_Werror = yes
-+strings_no_Werror = yes
-+addr2line_no_Wformat = yes
-+
- readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl
- nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) -ldl \
- 	   $(demanglelib)
-Index: elfutils-0.159/src/readelf.c
-===================================================================
---- elfutils-0.159.orig/src/readelf.c
-+++ elfutils-0.159/src/readelf.c
-@@ -4239,10 +4239,12 @@ listptr_base (struct listptr *p)
+diff --git a/src/readelf.c b/src/readelf.c
+index d49544f..15dbe62 100644
+--- a/src/readelf.c
++++ b/src/readelf.c
+@@ -4368,10 +4368,12 @@ listptr_base (struct listptr *p)
    return base;
  }
  
@@ -817,7 +856,7 @@ Index: elfutils-0.159/src/readelf.c
    struct listptr *p1 = (void *) a;
    struct listptr *p2 = (void *) b;
  
-@@ -4331,8 +4333,11 @@ static void
+@@ -4467,8 +4469,11 @@ static void
  sort_listptr (struct listptr_table *table, const char *name)
  {
    if (table->n > 0)
@@ -831,7 +870,7 @@ Index: elfutils-0.159/src/readelf.c
  }
  
  static bool
-@@ -9252,7 +9257,7 @@ dump_archive_index (Elf *elf, const char
+@@ -9540,7 +9545,7 @@ dump_archive_index (Elf *elf, const char *fname)
  	  if (unlikely (elf_rand (elf, as_off) == 0)
  	      || unlikely ((subelf = elf_begin (-1, ELF_C_READ_MMAP, elf))
  			   == NULL))
@@ -840,10 +879,10 @@ Index: elfutils-0.159/src/readelf.c
  	    while (1)
  #endif
  	      error (EXIT_FAILURE, 0,
-Index: elfutils-0.159/src/strings.c
-===================================================================
---- elfutils-0.159.orig/src/strings.c
-+++ elfutils-0.159/src/strings.c
+diff --git a/src/strings.c b/src/strings.c
+index f60e4b4..dae6ab2 100644
+--- a/src/strings.c
++++ b/src/strings.c
 @@ -43,6 +43,10 @@
  
  #include <system.h>
@@ -855,7 +894,7 @@ Index: elfutils-0.159/src/strings.c
  
  /* Prototypes of local functions.  */
  static int read_fd (int fd, const char *fname, off64_t fdlen);
-@@ -489,8 +493,13 @@ map_file (int fd, off64_t start_off, off
+@@ -489,8 +493,13 @@ map_file (int fd, off64_t start_off, off64_t fdlen, size_t *map_sizep)
  		    fd, start_off);
        if (mem != MAP_FAILED)
  	{
@@ -869,7 +908,7 @@ Index: elfutils-0.159/src/strings.c
  	  break;
  	}
        if (errno != EINVAL && errno != ENOMEM)
-@@ -581,9 +590,11 @@ read_block (int fd, const char *fname, o
+@@ -581,9 +590,11 @@ read_block (int fd, const char *fname, off64_t fdlen, off64_t from, off64_t to)
        elfmap_off = from & ~(ps - 1);
        elfmap_base = elfmap = map_file (fd, elfmap_off, fdlen, &elfmap_size);
  
@@ -881,10 +920,10 @@ Index: elfutils-0.159/src/strings.c
      }
  
    if (unlikely (elfmap == MAP_FAILED))
-Index: elfutils-0.159/src/strip.c
-===================================================================
---- elfutils-0.159.orig/src/strip.c
-+++ elfutils-0.159/src/strip.c
+diff --git a/src/strip.c b/src/strip.c
+index 2b21799..1b34eee 100644
+--- a/src/strip.c
++++ b/src/strip.c
 @@ -45,6 +45,12 @@
  #include <libebl.h>
  #include <system.h>
@@ -917,7 +956,7 @@ Index: elfutils-0.159/src/strip.c
      }
  
    /* Open the file.  */
-@@ -2086,7 +2102,7 @@ while computing checksum for debug infor
+@@ -2091,7 +2107,7 @@ while computing checksum for debug information"));
    /* If requested, preserve the timestamp.  */
    if (tvp != NULL)
      {
@@ -926,7 +965,7 @@ Index: elfutils-0.159/src/strip.c
  	{
  	  error (0, errno, gettext ("\
  cannot set access and modification date of '%s'"),
-@@ -2143,7 +2159,7 @@ handle_ar (int fd, Elf *elf, const char
+@@ -2148,7 +2164,7 @@ handle_ar (int fd, Elf *elf, const char *prefix, const char *fname,
  
    if (tvp != NULL)
      {
@@ -935,23 +974,11 @@ Index: elfutils-0.159/src/strip.c
  	{
  	  error (0, errno, gettext ("\
  cannot set access and modification date of '%s'"), fname);
-Index: elfutils-0.159/tests/backtrace.c
-===================================================================
---- elfutils-0.159.orig/tests/backtrace.c
-+++ elfutils-0.159/tests/backtrace.c
-@@ -36,6 +36,7 @@
- #include <fcntl.h>
- #include <string.h>
- #include <argp.h>
-+#include <sys/syscall.h>
- #include ELFUTILS_HEADER(dwfl)
- 
- #ifndef __linux__
-Index: elfutils-0.159/tests/ChangeLog
-===================================================================
---- elfutils-0.159.orig/tests/ChangeLog
-+++ elfutils-0.159/tests/ChangeLog
-@@ -283,6 +283,13 @@
+diff --git a/tests/ChangeLog b/tests/ChangeLog
+index 59048f6..02eccfc 100644
+--- a/tests/ChangeLog
++++ b/tests/ChangeLog
+@@ -421,6 +421,13 @@
  
  2013-12-02  Jan Kratochvil  <jan.kratochvil@redhat.com>
  
@@ -965,7 +992,7 @@ Index: elfutils-0.159/tests/ChangeLog
  	* Makefile.am (check_PROGRAMS): Add backtrace, backtrace-child,
  	backtrace-data and backtrace-dwarf.
  	(BUILT_SOURCES, clean-local, backtrace-child-biarch): New.
-@@ -1147,6 +1154,8 @@
+@@ -1285,6 +1292,8 @@
  
  2008-01-21  Roland McGrath  <roland@redhat.com>
  
@@ -974,7 +1001,7 @@ Index: elfutils-0.159/tests/ChangeLog
  	* testfile45.S.bz2: Add tests for cltq, cqto.
  	* testfile45.expect.bz2: Adjust.
  
-@@ -1855,6 +1864,11 @@
+@@ -1993,6 +2002,11 @@
  	* Makefile.am (TESTS): Add run-elflint-test.sh.
  	(EXTRA_DIST): Add run-elflint-test.sh and testfile18.bz2.
  
@@ -986,10 +1013,34 @@ Index: elfutils-0.159/tests/ChangeLog
  2005-05-24  Ulrich Drepper  <drepper@redhat.com>
  
  	* get-files.c (main): Use correct format specifier.
-Index: elfutils-0.159/tests/line2addr.c
-===================================================================
---- elfutils-0.159.orig/tests/line2addr.c
-+++ elfutils-0.159/tests/line2addr.c
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index f32e4d0..2652fb8 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -365,6 +365,7 @@ get_lines_LDADD = $(libdw) $(libelf)
+ get_files_LDADD = $(libdw) $(libelf)
+ get_aranges_LDADD = $(libdw) $(libelf)
+ allfcts_LDADD = $(libdw) $(libelf)
++line2addr_no_Wformat = yes
+ line2addr_LDADD = $(libdw)
+ addrscopes_LDADD = $(libdw)
+ funcscopes_LDADD = $(libdw)
+diff --git a/tests/backtrace.c b/tests/backtrace.c
+index 331ba0f..46af9b5 100644
+--- a/tests/backtrace.c
++++ b/tests/backtrace.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <argp.h>
++#include <sys/syscall.h>
+ #include ELFUTILS_HEADER(dwfl)
+ 
+ #ifndef __linux__
+diff --git a/tests/line2addr.c b/tests/line2addr.c
+index e0d65d3..7c171b9 100644
+--- a/tests/line2addr.c
++++ b/tests/line2addr.c
 @@ -124,7 +124,7 @@ main (int argc, char *argv[])
      {
        struct args a = { .arg = argv[cnt] };
@@ -999,15 +1050,6 @@ Index: elfutils-0.159/tests/line2addr.c
  	{
  	default:
  	case 0:
-Index: elfutils-0.159/tests/Makefile.am
-===================================================================
---- elfutils-0.159.orig/tests/Makefile.am
-+++ elfutils-0.159/tests/Makefile.am
-@@ -356,6 +356,7 @@ get_lines_LDADD = $(libdw) $(libelf)
- get_files_LDADD = $(libdw) $(libelf)
- get_aranges_LDADD = $(libdw) $(libelf)
- allfcts_LDADD = $(libdw) $(libelf)
-+line2addr_no_Wformat = yes
- line2addr_LDADD = $(libdw)
- addrscopes_LDADD = $(libdw)
- funcscopes_LDADD = $(libdw)
+-- 
+1.9.1
+
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/scanf-format.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/scanf-format.patch
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.160/scanf-format.patch
rename to meta/recipes-devtools/elfutils/elfutils-0.161/scanf-format.patch
diff --git a/meta/recipes-devtools/elfutils/elfutils-0.160/testsuite-ignore-elflint.diff b/meta/recipes-devtools/elfutils/elfutils-0.161/testsuite-ignore-elflint.diff
similarity index 100%
rename from meta/recipes-devtools/elfutils/elfutils-0.160/testsuite-ignore-elflint.diff
rename to meta/recipes-devtools/elfutils/elfutils-0.161/testsuite-ignore-elflint.diff
diff --git a/meta/recipes-devtools/elfutils/elfutils_0.160.bb b/meta/recipes-devtools/elfutils/elfutils_0.161.bb
similarity index 95%
rename from meta/recipes-devtools/elfutils/elfutils_0.160.bb
rename to meta/recipes-devtools/elfutils/elfutils_0.161.bb
index e02918e..a3c1f36 100644
--- a/meta/recipes-devtools/elfutils/elfutils_0.160.bb
+++ b/meta/recipes-devtools/elfutils/elfutils_0.161.bb
@@ -7,8 +7,8 @@ DEPENDS = "libtool bzip2 zlib virtual/libintl"
 
 SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/${PV}/elfutils-${PV}.tar.bz2"
 
-SRC_URI[md5sum] = "7527f22dff8b1ac8c122cfc4d3d3bb1e"
-SRC_URI[sha256sum] = "741b556863c069ceab2d81eb54aeda8c34f46728859704eaf9baef8503e9a9d1"
+SRC_URI[md5sum] = "e1b9847c9a6a1ad340de8d47a863ec52"
+SRC_URI[sha256sum] = "570c91a1783fa5386aaa2dfdd08dda1de777c2b63bf3b9c1437d635ffdd7a070"
 
 SRC_URI += "\
         file://mempcpy.patch \
-- 
1.9.1

[PATCH 03/10] xmlto: upgrade to 0.0.25

[Hongxu Jia]

Drop obsolete_automake_macros.patch, it has been merged to 0.0.25

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 .../xmlto/xmlto-0.0.25/obsolete_automake_macros.patch        | 12 ------------
 .../configure.in-drop-the-test-of-xmllint-and-xsltproc.patch |  0
 .../xmlto/{xmlto_0.0.25.bb => xmlto_0.0.26.bb}               |  5 ++---
 3 files changed, 2 insertions(+), 15 deletions(-)
 delete mode 100644 meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch
 rename meta/recipes-devtools/xmlto/{xmlto-0.0.25 => xmlto-0.0.26}/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch (100%)
 rename meta/recipes-devtools/xmlto/{xmlto_0.0.25.bb => xmlto_0.0.26.bb} (84%)

diff --git a/meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch b/meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch
deleted file mode 100644
index faa8acc..0000000
--- a/meta/recipes-devtools/xmlto/xmlto-0.0.25/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nurd xmlto-0.0.25/configure.in xmlto-0.0.25/configure.in
---- xmlto-0.0.25/configure.in	2011-12-01 17:49:00.000000000 +0200
-+++ xmlto-0.0.25/configure.in	2013-01-07 05:24:16.169953519 +0200
-@@ -1,7 +1,7 @@
- AC_INIT(xmlto, 0.0.25)
- AC_CONFIG_SRCDIR(xmlto.spec.in)
- AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects 1.6])
--AM_CONFIG_HEADER(config.h)
-+AC_CONFIG_HEADERS(config.h)
-
- AC_PROG_CC
- AM_PROG_CC_C_O
diff --git a/meta/recipes-devtools/xmlto/xmlto-0.0.25/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch b/meta/recipes-devtools/xmlto/xmlto-0.0.26/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch
similarity index 100%
rename from meta/recipes-devtools/xmlto/xmlto-0.0.25/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch
rename to meta/recipes-devtools/xmlto/xmlto-0.0.26/configure.in-drop-the-test-of-xmllint-and-xsltproc.patch
diff --git a/meta/recipes-devtools/xmlto/xmlto_0.0.25.bb b/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb
similarity index 84%
rename from meta/recipes-devtools/xmlto/xmlto_0.0.25.bb
rename to meta/recipes-devtools/xmlto/xmlto_0.0.26.bb
index 2698b1c..160aa5d 100644
--- a/meta/recipes-devtools/xmlto/xmlto_0.0.25.bb
+++ b/meta/recipes-devtools/xmlto/xmlto_0.0.26.bb
@@ -6,12 +6,11 @@ LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 SRC_URI = "https://fedorahosted.org/releases/x/m/xmlto/xmlto-${PV}.tar.gz \
-           file://obsolete_automake_macros.patch \
            file://configure.in-drop-the-test-of-xmllint-and-xsltproc.patch \
            file://catalog.xml \
 "
-SRC_URI[md5sum] = "a88cd3f08789b4825d1ac89fa065170d"
-SRC_URI[sha256sum] = "c52b56d929e8d20fc19cd3b7ec238f8d039730c56ee311cc352e843147e3e31a"
+SRC_URI[md5sum] = "0cca8be787ba01e00c618cb390c988b9"
+SRC_URI[sha256sum] = "cfd8d2a26077be1d5566dfe22dd66099ae4f4600dea97d6e113a2cc5b8708977"
 
 inherit autotools
 
-- 
1.9.1

[PATCH 04/10] gnupg: upgrade to 2.1.1

[Hongxu Jia]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/recipes-support/gnupg/{gnupg_2.1.0.bb => gnupg_2.1.1.bb} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-support/gnupg/{gnupg_2.1.0.bb => gnupg_2.1.1.bb} (89%)

diff --git a/meta/recipes-support/gnupg/gnupg_2.1.0.bb b/meta/recipes-support/gnupg/gnupg_2.1.1.bb
similarity index 89%
rename from meta/recipes-support/gnupg/gnupg_2.1.0.bb
rename to meta/recipes-support/gnupg/gnupg_2.1.1.bb
index e9ade3b..a7c4254 100644
--- a/meta/recipes-support/gnupg/gnupg_2.1.0.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.1.1.bb
@@ -14,8 +14,8 @@ SRC_URI = "ftp://ftp.gnupg.org/gcrypt/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://dirmngr-uses-libgpg-error.patch \
           "
 
-SRC_URI[md5sum] = "43a809789a1d897f4386680be0b09d02"
-SRC_URI[sha256sum] = "16a8c3f50a15bf37d2dfb1c5e4bb3ec533e1d0b6a4043ff3680a376a3ad4058b"
+SRC_URI[md5sum] = "9a314c3dcef0a091de90b6aa4d467db5"
+SRC_URI[sha256sum] = "70ecd01d2875db62624c911c2fd815742f50aef5492698eb3bfc09a08690ce49"
 
 EXTRA_OECONF = "--disable-ldap \
 		--disable-ccid-driver \
-- 
1.9.1

[PATCH 05/10] man-pages: upgrade to 3.76

[Hongxu Jia]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 .../man-pages/{man-pages_3.75.bb => man-pages_3.76.bb}                | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-extended/man-pages/{man-pages_3.75.bb => man-pages_3.76.bb} (86%)

diff --git a/meta/recipes-extended/man-pages/man-pages_3.75.bb b/meta/recipes-extended/man-pages/man-pages_3.76.bb
similarity index 86%
rename from meta/recipes-extended/man-pages/man-pages_3.75.bb
rename to meta/recipes-extended/man-pages/man-pages_3.76.bb
index 18e2bca..ed8a15f 100644
--- a/meta/recipes-extended/man-pages/man-pages_3.75.bb
+++ b/meta/recipes-extended/man-pages/man-pages_3.76.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] = "74ad4aef657a046fe214bf981a9a2b30"
-SRC_URI[sha256sum] = "ba23f57a98d032a742ff506f32550dfa2c3076c8bf8d5f6b59305c6b015077d3"
+SRC_URI[md5sum] = "d00cf09677caefc3e827737afc565583"
+SRC_URI[sha256sum] = "eff558c13b61a46136994514b3ec00a74dcf00414d3bde4f0edca80a36d36359"
 
 RDEPENDS_${PN} = "man"
 
-- 
1.9.1

[PATCH 06/10] dhcp: upgrade to 4.3.1

[Hongxu Jia]

Rebase fixsepbuild.patch to 4.3.1

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 .../dhcp/dhcp/fixsepbuild.patch                    | 112 ++++++++++++---------
 .../dhcp/{dhcp_4.3.0.bb => dhcp_4.3.1.bb}          |   4 +-
 2 files changed, 67 insertions(+), 49 deletions(-)
 rename meta/recipes-connectivity/dhcp/{dhcp_4.3.0.bb => dhcp_4.3.1.bb} (70%)

diff --git a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch b/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
index e686afd..14e75a3 100644
--- a/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
+++ b/meta/recipes-connectivity/dhcp/dhcp/fixsepbuild.patch
@@ -4,47 +4,32 @@ Upstream-Status: Pending
 
 RP 2013/03/21
 
-Index: dhcp-4.2.5/common/Makefile.am
-===================================================================
---- dhcp-4.2.5.orig/common/Makefile.am	2013-03-21 12:54:11.345063519 +0000
-+++ dhcp-4.2.5/common/Makefile.am	2013-03-21 12:54:11.805063510 +0000
-@@ -1,4 +1,4 @@
--AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
-+AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
- AM_CFLAGS = $(LDAP_CFLAGS)
- 
- noinst_LIBRARIES = libdhcp.a
-Index: dhcp-4.2.5/dst/Makefile.am
-===================================================================
---- dhcp-4.2.5.orig/dst/Makefile.am	2013-03-21 12:54:11.345063519 +0000
-+++ dhcp-4.2.5/dst/Makefile.am	2013-03-21 12:54:11.805063510 +0000
-@@ -1,4 +1,4 @@
--AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5
-+AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 -I$(top_srcdir)/includes
- 
- lib_LIBRARIES = libdst.a
- 
-Index: dhcp-4.2.5/omapip/Makefile.am
-===================================================================
---- dhcp-4.2.5.orig/omapip/Makefile.am	2013-03-21 12:54:11.677063511 +0000
-+++ dhcp-4.2.5/omapip/Makefile.am	2013-03-21 12:54:11.809063510 +0000
-@@ -1,3 +1,5 @@
-+AM_CPPFLAGS = -I$(top_srcdir)/includes
-+
- lib_LIBRARIES = libomapi.a
- noinst_PROGRAMS = svtest
+Rebase to 4.3.1
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ client/Makefile.am  | 6 ++++--
+ common/Makefile.am  | 2 +-
+ dhcpctl/Makefile.am | 2 ++
+ dst/Makefile.am     | 2 +-
+ omapip/Makefile.am  | 2 ++
+ relay/Makefile.am   | 2 +-
+ server/Makefile.am  | 2 +-
+ 7 files changed, 12 insertions(+), 6 deletions(-)
+
+diff --git a/client/Makefile.am b/client/Makefile.am
+index 8411960..1740f72 100644
+--- a/client/Makefile.am
++++ b/client/Makefile.am
+@@ -4,6 +4,8 @@
+ # production code. Sadly, we are not there yet.
+ SUBDIRS = . tests
  
-Index: dhcp-4.2.5/client/Makefile.am
-===================================================================
---- dhcp-4.2.5.orig/client/Makefile.am	2013-03-21 12:54:11.677063511 +0000
-+++ dhcp-4.2.5/client/Makefile.am	2013-03-21 12:54:11.809063510 +0000
-@@ -1,3 +1,5 @@
 +AM_CPPFLAGS = -I$(top_srcdir)/includes
 +
  dist_sysconf_DATA = dhclient.conf.example
  sbin_PROGRAMS = dhclient
  dhclient_SOURCES = clparse.c dhclient.c dhc6.c \
-@@ -11,8 +13,8 @@
+@@ -17,8 +19,8 @@ EXTRA_DIST = $(man_MANS)
  
  dhclient.o: dhclient.c
  	$(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
@@ -55,30 +40,60 @@ Index: dhcp-4.2.5/client/Makefile.am
  	$(COMPILE) -DCLIENT_PATH='"PATH=$(sbindir):/sbin:/bin:/usr/sbin:/usr/bin"' \
 -		   -DLOCALSTATEDIR='"$(localstatedir)"' -c dhc6.c
 +		   -DLOCALSTATEDIR='"$(localstatedir)"' -c $(srcdir)/dhc6.c
-Index: dhcp-4.2.5/dhcpctl/Makefile.am
-===================================================================
---- dhcp-4.2.5.orig/dhcpctl/Makefile.am	2013-03-21 12:54:11.677063511 +0000
-+++ dhcp-4.2.5/dhcpctl/Makefile.am	2013-03-21 12:54:11.809063510 +0000
+diff --git a/common/Makefile.am b/common/Makefile.am
+index eddef05..5ce045f 100644
+--- a/common/Makefile.am
++++ b/common/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS = -I.. -DLOCALSTATEDIR='"@localstatedir@"'
++AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir) -DLOCALSTATEDIR='"@localstatedir@"'
+ AM_CFLAGS = $(LDAP_CFLAGS)
+ 
+ noinst_LIBRARIES = libdhcp.a
+diff --git a/dhcpctl/Makefile.am b/dhcpctl/Makefile.am
+index 2987a53..cd72d75 100644
+--- a/dhcpctl/Makefile.am
++++ b/dhcpctl/Makefile.am
 @@ -1,3 +1,5 @@
 +AM_CPPFLAGS = -I$(top_srcdir)/includes -I$(top_srcdir)
 +
  bin_PROGRAMS = omshell
  lib_LIBRARIES = libdhcpctl.a
  noinst_PROGRAMS = cltest
-Index: dhcp-4.2.5/relay/Makefile.am
-===================================================================
---- dhcp-4.2.5.orig/relay/Makefile.am	2013-03-21 12:54:11.677063511 +0000
-+++ dhcp-4.2.5/relay/Makefile.am	2013-03-21 12:54:11.809063510 +0000
+diff --git a/dst/Makefile.am b/dst/Makefile.am
+index 8937fe8..a14798b 100644
+--- a/dst/Makefile.am
++++ b/dst/Makefile.am
+@@ -1,4 +1,4 @@
+-AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5
++AM_CPPFLAGS = -DMINIRES_LIB -DHMAC_MD5 -I$(top_srcdir)/includes
+ 
+ lib_LIBRARIES = libdst.a
+ 
+diff --git a/omapip/Makefile.am b/omapip/Makefile.am
+index 5074479..9c0fab3 100644
+--- a/omapip/Makefile.am
++++ b/omapip/Makefile.am
+@@ -1,3 +1,5 @@
++AM_CPPFLAGS = -I$(top_srcdir)/includes
++
+ lib_LIBRARIES = libomapi.a
+ noinst_PROGRAMS = svtest
+ 
+diff --git a/relay/Makefile.am b/relay/Makefile.am
+index ec72a31..f842071 100644
+--- a/relay/Makefile.am
++++ b/relay/Makefile.am
 @@ -1,4 +1,4 @@
 -AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"'
 +AM_CPPFLAGS = -DLOCALSTATEDIR='"@localstatedir@"' -I$(top_srcdir)/includes
  
  sbin_PROGRAMS = dhcrelay
  dhcrelay_SOURCES = dhcrelay.c
-Index: dhcp-4.2.5/server/Makefile.am
-===================================================================
---- dhcp-4.2.5.orig/server/Makefile.am	2013-03-21 12:54:11.677063511 +0000
-+++ dhcp-4.2.5/server/Makefile.am	2013-03-21 12:55:01.509062081 +0000
+diff --git a/server/Makefile.am b/server/Makefile.am
+index a446f0b..d0b873a 100644
+--- a/server/Makefile.am
++++ b/server/Makefile.am
 @@ -4,7 +4,7 @@
  # production code. Sadly, we are not there yet.
  SUBDIRS = . tests
@@ -88,3 +103,6 @@ Index: dhcp-4.2.5/server/Makefile.am
  
  dist_sysconf_DATA = dhcpd.conf.example
  sbin_PROGRAMS = dhcpd
+-- 
+1.9.1
+
diff --git a/meta/recipes-connectivity/dhcp/dhcp_4.3.0.bb b/meta/recipes-connectivity/dhcp/dhcp_4.3.1.bb
similarity index 70%
rename from meta/recipes-connectivity/dhcp/dhcp_4.3.0.bb
rename to meta/recipes-connectivity/dhcp/dhcp_4.3.1.bb
index 13bcceb..3f82a25 100644
--- a/meta/recipes-connectivity/dhcp/dhcp_4.3.0.bb
+++ b/meta/recipes-connectivity/dhcp/dhcp_4.3.1.bb
@@ -8,5 +8,5 @@ SRC_URI += "file://dhcp-3.0.3-dhclient-dbus.patch;striplevel=0 \
             file://replace-ifconfig-route.patch \
            "
 
-SRC_URI[md5sum] = "1020d77e1a4c1f01b76279caff9beb80"
-SRC_URI[sha256sum] = "a7b6517d5cf32c5e49d2323a63de00efe5391df7cb0045dfa0ec8f6ee46ebe8a"
+SRC_URI[md5sum] = "b3a42ece3c7f2cd2e74a3e12ca881d20"
+SRC_URI[sha256sum] = "266cbca8a7a6bb8f9ccc5765da0d2b04099329314a54a4fc1022d510ad3e9af0"
-- 
1.9.1

[PATCH 07/10] dhcp: not override site.h

[Hongxu Jia]

Previously, site.h was overridden for setting _PATH_DHCPD_CONF
and _PATH_DHCLIENT_CONF, it caused other MACROs were missing,
so we use a patch to instead.

The macros NSUPDATE and COMPACT_LEASES existed in site.h

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/recipes-connectivity/dhcp/dhcp.inc            |  6 +----
 ...o-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch | 26 ++++++++++++++++++++++
 meta/recipes-connectivity/dhcp/dhcp/site.h         | 21 -----------------
 3 files changed, 27 insertions(+), 26 deletions(-)
 create mode 100644 meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
 delete mode 100644 meta/recipes-connectivity/dhcp/dhcp/site.h

diff --git a/meta/recipes-connectivity/dhcp/dhcp.inc b/meta/recipes-connectivity/dhcp/dhcp.inc
index 4949e02..6ced775 100644
--- a/meta/recipes-connectivity/dhcp/dhcp.inc
+++ b/meta/recipes-connectivity/dhcp/dhcp.inc
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;beginline=4;md5=c5c64d696107f84b56fe337d14da1
 DEPENDS = "openssl bind"
 
 SRC_URI = "ftp://ftp.isc.org/isc/dhcp/${PV}/dhcp-${PV}.tar.gz \
-           file://site.h \
+           file://define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch \
            file://init-relay file://default-relay \
            file://init-server file://default-server \
            file://dhclient.conf file://dhcpd.conf \
@@ -36,10 +36,6 @@ EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
                 --with-libbind=${STAGING_LIBDIR}/ \
                "
 
-do_compile_prepend () {
-	cp -f ${WORKDIR}/site.h ${S}/includes
-}
-
 do_install_append () {
 	install -d ${D}${sysconfdir}/init.d
 	install -d ${D}${sysconfdir}/default
diff --git a/meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch b/meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
new file mode 100644
index 0000000..12d3c9b
--- /dev/null
+++ b/meta/recipes-connectivity/dhcp/dhcp/define-macro-_PATH_DHCPD_CONF-and-_PATH_DHCLIENT_CON.patch
@@ -0,0 +1,26 @@
+define macro _PATH_DHCPD_CONF and _PATH_DHCLIENT_CONF
+
+Upstream-Status: inappropriate <oe specific>
+
+Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
+---
+ includes/site.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/includes/site.h b/includes/site.h
+index d87b309..17bc40d 100644
+--- a/includes/site.h
++++ b/includes/site.h
+@@ -139,7 +139,8 @@
+ /* Define this if you want the dhcpd.conf file to go somewhere other than
+    the default location.   By default, it goes in /etc/dhcpd.conf. */
+ 
+-/* #define _PATH_DHCPD_CONF	"/etc/dhcpd.conf" */
++#define _PATH_DHCPD_CONF	"/etc/dhcp/dhcpd.conf"
++#define _PATH_DHCLIENT_CONF	"/etc/dhcp/dhclient.conf"
+ 
+ /* Network API definitions.   You do not need to choose one of these - if
+    you don't choose, one will be chosen for you in your system's config
+-- 
+1.9.1
+
diff --git a/meta/recipes-connectivity/dhcp/dhcp/site.h b/meta/recipes-connectivity/dhcp/dhcp/site.h
deleted file mode 100644
index 2289554..0000000
--- a/meta/recipes-connectivity/dhcp/dhcp/site.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * define config file location in ${S}/includes/site.h
- * still need to take care of installation path (${sysconfdir}/dhcpd.conf)
- *
- * 7/22/2010 - qhe
- */
-
-/* Define this if you want DNS update functionality to be available. */
-
-#define NSUPDATE
-
-/* Define this if you aren't debugging and you want to save memory
-   (potentially a _lot_ of memory) by allocating leases in chunks rather
-   than one at a time. */
-
-#define COMPACT_LEASES
-
-
-/* local */
-#define _PATH_DHCPD_CONF     "/etc/dhcp/dhcpd.conf"
-#define _PATH_DHCLIENT_CONF  "/etc/dhcp/dhclient.conf"
-- 
1.9.1

[PATCH 08/10] upstream_tracking.inc: update entries for bash

[Hongxu Jia]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta-yocto/conf/distro/include/upstream_tracking.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-yocto/conf/distro/include/upstream_tracking.inc b/meta-yocto/conf/distro/include/upstream_tracking.inc
index 923fa1b..7032067 100644
--- a/meta-yocto/conf/distro/include/upstream_tracking.inc
+++ b/meta-yocto/conf/distro/include/upstream_tracking.inc
@@ -51,6 +51,7 @@ CHECK_DATE_pn-gnome-keyring = "Mar 5, 2013"
 RECIPE_NO_UPDATE_REASON_pn-gnome-keyring = "waiting for the sato gtk3 port"
 RECIPE_NO_UPDATE_REASON_pn-gobject_introspection = "Does not cross-compile"
 RECIPE_NO_UPDATE_REASON_pn-groff = "1.18.1.4 is latest GPLv2 Version no 1.21"
+RECIPE_NO_UPDATE_REASON_pn-bash = "The latest version in yocto is 4.3.30"
 RECIPE_UPSTREAM_DATE_pn-gst-meta-base="n/a"
 RECIPE_NO_UPDATE_REASON_pn-gst-plugins-base = "not compatible with gst-fluendo 0.10.x"
 RECIPE_NO_UPDATE_REASON_pn-gst-plugins-bad = "not compatible with gst-fluendo 0.10.x"
-- 
1.9.1

[PATCH 09/10] rpcbind: upgrade to 0.2.2

[Hongxu Jia]

Drop 0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch
which has been merged to 0.2.2

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 ...bind-rpcuser-not-being-set-in-Makefile.am.patch | 34 ----------------------
 .../rpcbind/{rpcbind_0.2.1.bb => rpcbind_0.2.2.bb} |  5 ++--
 2 files changed, 2 insertions(+), 37 deletions(-)
 delete mode 100644 meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch
 rename meta/recipes-extended/rpcbind/{rpcbind_0.2.1.bb => rpcbind_0.2.2.bb} (90%)

diff --git a/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch b/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch
deleted file mode 100644
index b556a46..0000000
--- a/meta/recipes-extended/rpcbind/rpcbind/0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 914507aa6980129fefb4decaabea1a4f60c7182b Mon Sep 17 00:00:00 2001
-From: Steve Dickson <steved@redhat.com>
-Date: Wed, 21 Aug 2013 14:40:22 -0400
-Subject: [PATCH 1/1] rpcbind: rpcuser not being set in Makefile.am
-
-Upstream-Status: backport
-
-Commit 8d7a0708 cause a regression where the rpcuser id was not
-being set, which in turn cause rpcbind to immediately exit.
-This patch removes the extra ',' that was in the AC_ARG_WITH
-statement in the configure.ac file.
-
-Signed-off-by: Steve Dickson <steved@redhat.com>
-Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2b67720..1cf42d3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,7 +23,7 @@ AC_ARG_WITH([statedir],
- AC_SUBST([statedir], [$with_statedir])
- 
- AC_ARG_WITH([rpcuser],
--  AS_HELP_STRING([--with-rpcuser=ARG], [use ARG for RPC @<:@default=root@:>@]),
-+  AS_HELP_STRING([--with-rpcuser=ARG], [use ARG for RPC @<:@default=root@:>@])
-   ,, [with_rpcuser=root])
- AC_SUBST([rpcuser], [$with_rpcuser])
-  
--- 
-1.8.3.2
-
diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb
similarity index 90%
rename from meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb
rename to meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb
index b732476..44c79eb 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.1.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b46486e4c4a416602693a711bb5bfa39 \
                     file://src/rpcinfo.c;beginline=1;endline=27;md5=f8a8cd2cb25ac5aa16767364fb0e3c24"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/rpcbind/rpcbind-${PV}.tar.bz2 \
-           file://0001-rpcbind-rpcuser-not-being-set-in-Makefile.am.patch \
            file://init.d \
            ${UCLIBCPATCHES} \
            file://rpcbind.conf \
@@ -24,8 +23,8 @@ UCLIBCPATCHES_libc-uclibc = "file://0001-uclibc-nss.patch \
                             "
 UCLIBCPATCHES ?= ""
 
-SRC_URI[md5sum] = "0a5f9c2142af814c55d957aaab3bcc68"
-SRC_URI[sha256sum] = "da169ff877a5a07581fad50a9a808ac6e96f0c277a3df49a7ef005778428496e"
+SRC_URI[md5sum] = "8acf839bfef2364a05fbd6be5f8edf9a"
+SRC_URI[sha256sum] = "13dbc8c796dbe0ce8df873007bea0490c8460b56202d918c9eb6fa0358a08f29"
 
 inherit autotools update-rc.d systemd pkgconfig
 
-- 
1.9.1

[PATCH 10/10] rpcbind: add PACKAGECONFIG for systemd

[Hongxu Jia]

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
---
 meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb b/meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb
index 44c79eb..fd4b2b5 100644
--- a/meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb
+++ b/meta/recipes-extended/rpcbind/rpcbind_0.2.2.bb
@@ -42,6 +42,12 @@ USERADD_PACKAGES = "${PN}"
 USERADD_PARAM_${PN} = "--system --no-create-home --home-dir / \
                        --shell /bin/false --user-group rpc"
 
+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
+PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/, \
+                          --without-systemdsystemunitdir, \
+                          systemd \
+"
+
 EXTRA_OECONF += " --enable-warmstarts --with-rpcuser=rpc"
 
 do_install_append () {
-- 
1.9.1