[PATCH 0/3] multiple package upgrades

[PATCH 0/3] multiple package upgrades

[Bogdan Marinescu]

Upgrades for git, python-dbus and autogen-native.

The following changes since commit 676fd3f394a0c0576b63c77ed2184bf5f42c29b6:

  dropbear: a fix for hang in dropbearkey, built for x32 (2013-05-24 14:14:49 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib bogdanm/work
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=bogdanm/work

Bogdan Marinescu (3):
  git: upgraded to 1.8.3
  python-dbus: upgraded to 1.2.0
  autogen-native: upgraded to 5.17.4

 ...en-native_5.17.3.bb => autogen-native_5.17.4.bb} |    4 ++--
 meta/recipes-devtools/autogen/files/guile.patch     |   19 +++++++++----------
 .../git/{git_1.8.2.2.bb => git_1.8.3.bb}            |    4 ++--
 .../obsolete_automake_macros.patch                  |   14 --------------
 .../{python-dbus_1.1.1.bb => python-dbus_1.2.0.bb}  |    8 +++-----
 5 files changed, 16 insertions(+), 33 deletions(-)
 rename meta/recipes-devtools/autogen/{autogen-native_5.17.3.bb => autogen-native_5.17.4.bb} (90%)
 rename meta/recipes-devtools/git/{git_1.8.2.2.bb => git_1.8.3.bb} (67%)
 delete mode 100644 meta/recipes-devtools/python/python-dbus-1.1.1/obsolete_automake_macros.patch
 rename meta/recipes-devtools/python/{python-dbus_1.1.1.bb => python-dbus_1.2.0.bb} (70%)

-- 
1.7.10.4

[PATCH 0/3] multiple package upgrades

[Bogdan Marinescu]

Upgrades for diffstat, libpcre and subversion.

The following changes since commit 73dae11852c656adbf5a2b0e44ac4c7e0078cd8d:

  rpm: remove .real hacks in argument parsing (2013-05-31 14:02:45 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib bogdanm/work2
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=bogdanm/work2

Bogdan Marinescu (3):
  diffstat: upgraded to 1.57
  libpcre: upgraded to 8.33
  subversion: upgraded to 1.7.10

 .../diffstat/diffstat/aclocal.patch                |   37 ++++++++++++++++++++
 .../{diffstat_1.55.bb => diffstat_1.57.bb}         |    8 ++---
 .../fix-install-depends.patch                      |    0
 .../libtool2.patch                                 |    0
 .../{subversion_1.7.9.bb => subversion_1.7.10.bb}  |    4 +--
 .../libpcre/{libpcre_8.32.bb => libpcre_8.33.bb}   |    7 ++--
 6 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 meta/recipes-devtools/diffstat/diffstat/aclocal.patch
 rename meta/recipes-devtools/diffstat/{diffstat_1.55.bb => diffstat_1.57.bb} (76%)
 rename meta/recipes-devtools/subversion/{subversion-1.7.9 => subversion-1.7.10}/fix-install-depends.patch (100%)
 rename meta/recipes-devtools/subversion/{subversion-1.7.9 => subversion-1.7.10}/libtool2.patch (100%)
 rename meta/recipes-devtools/subversion/{subversion_1.7.9.bb => subversion_1.7.10.bb} (88%)
 rename meta/recipes-support/libpcre/{libpcre_8.32.bb => libpcre_8.33.bb} (90%)

-- 
1.7.10.4

[PATCH 1/3] diffstat: upgraded to 1.57

[Bogdan Marinescu]

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
---
 .../diffstat/diffstat/aclocal.patch                |   37 ++++++++++++++++++++
 .../{diffstat_1.55.bb => diffstat_1.57.bb}         |    8 ++---
 2 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-devtools/diffstat/diffstat/aclocal.patch
 rename meta/recipes-devtools/diffstat/{diffstat_1.55.bb => diffstat_1.57.bb} (76%)

diff --git a/meta/recipes-devtools/diffstat/diffstat/aclocal.patch b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch
new file mode 100644
index 0000000..37e518f
--- /dev/null
+++ b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch
@@ -0,0 +1,37 @@
+Use the correct macro name (AC_AUTOCONF_VERSION) in the CF_ACVERSION_CHECK macro.
+The original macro name (AC_ACVERSION) leads to this error:
+
+| autoreconf: running: aclocal --system-acdir=/poky/buildnew/tmp/work/i586-poky-linux/diffstat/1.57-r0/build/aclocal-copy/ --automake-acdir=/poky/buildnew/tmp/sysroots/x86_64-linux/usr/share/aclocal-1.12 --force
+| aclocal: warning: autoconf input should be named 'configure.ac', not 'configure.in'
+| configure.in:9: error: m4_defn: undefined macro: AC_ACVERSION
+| acinclude.m4:989: CF_PROG_CC is expanded from...
+| configure.in:9: the top level
+| autom4te: m4 failed with exit status: 1
+
+Upstream-Status: Inappropriate [embedded specific]
+Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 144a074..fce6eba 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -13,15 +13,15 @@ dnl ------------------
+ dnl Conditionally generate script according to whether we're using a given autoconf.
+ dnl
+ dnl $1 = version to compare against
+-dnl $2 = code to use if AC_ACVERSION is at least as high as $1.
+-dnl $3 = code to use if AC_ACVERSION is older than $1.
++dnl $2 = code to use if AC_AUTOCONF_VERSION is at least as high as $1.
++dnl $3 = code to use if AC_AUTOCONF_VERSION is older than $1.
+ define([CF_ACVERSION_CHECK],
+ [
+ ifdef([m4_version_compare],
+-[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
++[m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [$1]), -1, [$3], [$2])],
+ [CF_ACVERSION_COMPARE(
+ AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])),
+-AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl
++AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_AUTOCONF_VERSION)), AC_AUTOCONF_VERSION, [$2], [$3])])])dnl
+ dnl ---------------------------------------------------------------------------
+ dnl CF_ACVERSION_COMPARE version: 3 updated: 2012/10/03 18:39:53
+ dnl --------------------
diff --git a/meta/recipes-devtools/diffstat/diffstat_1.55.bb b/meta/recipes-devtools/diffstat/diffstat_1.57.bb
similarity index 76%
rename from meta/recipes-devtools/diffstat/diffstat_1.55.bb
rename to meta/recipes-devtools/diffstat/diffstat_1.57.bb
index 9b347e8..c25005f 100644
--- a/meta/recipes-devtools/diffstat/diffstat_1.55.bb
+++ b/meta/recipes-devtools/diffstat/diffstat_1.57.bb
@@ -6,13 +6,13 @@ HOMEPAGE = "http://invisible-island.net/diffstat/"
 SECTION = "devel"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://install-sh;endline=42;md5=b3549726c1022bee09c174c72a0ca4a5"
-PR = "r0"
 
 SRC_URI = "ftp://invisible-island.net/diffstat/diffstat-${PV}.tgz \
-           file://dirfix.patch"
+           file://dirfix.patch \
+           file://aclocal.patch"
 
-SRC_URI[md5sum] = "630d5278f1cd874dc3cc68cff3fddecf"
-SRC_URI[sha256sum] = "59a46c75a99f2c373a81880051adc43a17b71c55478691e702c61c13c6d61b55"
+SRC_URI[md5sum] = "a70ae35e479ab91da7eb6023a4e9240a"
+SRC_URI[sha256sum] = "cb9845839d695f178d6b5458b08d3e04773e400f35c0c062c4c0102220fba1e6"
 
 S = "${WORKDIR}/diffstat-${PV}"
 
-- 
1.7.10.4

[PATCH 2/3] libpcre: upgraded to 8.33

[Bogdan Marinescu]

The license didn't modify, just the license years (2012->2013).

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
---
 .../libpcre/{libpcre_8.32.bb => libpcre_8.33.bb}                |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
 rename meta/recipes-support/libpcre/{libpcre_8.32.bb => libpcre_8.33.bb} (90%)

diff --git a/meta/recipes-support/libpcre/libpcre_8.32.bb b/meta/recipes-support/libpcre/libpcre_8.33.bb
similarity index 90%
rename from meta/recipes-support/libpcre/libpcre_8.32.bb
rename to meta/recipes-support/libpcre/libpcre_8.33.bb
index a2a8d80..50930b4 100644
--- a/meta/recipes-support/libpcre/libpcre_8.32.bb
+++ b/meta/recipes-support/libpcre/libpcre_8.33.bb
@@ -5,15 +5,14 @@ to the POSIX regular expression API."
 SUMMARY = "Perl Compatible Regular Expressions"
 HOMEPAGE = "http://www.pcre.org"
 SECTION = "devel"
-PR = "r1"
 LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=115e2bee152e2e23e838a29136094877"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=0920cc1a9f7ba95464491fa83c86afd8"
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/pcre/pcre/${PV}/pcre-${PV}.tar.bz2 \
            file://pcre-cross.patch \
            file://fix-pcre-name-collision.patch"
 
-SRC_URI[md5sum] = "62f02a76bb57a40bc66681760ed511d5"
-SRC_URI[sha256sum] = "a913fb9bd058ef380a2d91847c3c23fcf98e92dc3b47cd08a53c021c5cde0f55"
+SRC_URI[md5sum] = "21514018448ac10062ece7a668fca949"
+SRC_URI[sha256sum] = "c603957a4966811c04af5f6048c71cfb4966ec93312d7b3118116ed9f3bc0478"
 
 S = "${WORKDIR}/pcre-${PV}"
 
-- 
1.7.10.4

[PATCH 3/3] subversion: upgraded to 1.7.10

[Bogdan Marinescu]

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com>
---
 .../fix-install-depends.patch                                      |    0
 .../{subversion-1.7.9 => subversion-1.7.10}/libtool2.patch         |    0
 .../subversion/{subversion_1.7.9.bb => subversion_1.7.10.bb}       |    4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-devtools/subversion/{subversion-1.7.9 => subversion-1.7.10}/fix-install-depends.patch (100%)
 rename meta/recipes-devtools/subversion/{subversion-1.7.9 => subversion-1.7.10}/libtool2.patch (100%)
 rename meta/recipes-devtools/subversion/{subversion_1.7.9.bb => subversion_1.7.10.bb} (88%)

diff --git a/meta/recipes-devtools/subversion/subversion-1.7.9/fix-install-depends.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch
similarity index 100%
rename from meta/recipes-devtools/subversion/subversion-1.7.9/fix-install-depends.patch
rename to meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch
diff --git a/meta/recipes-devtools/subversion/subversion-1.7.9/libtool2.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/libtool2.patch
similarity index 100%
rename from meta/recipes-devtools/subversion/subversion-1.7.9/libtool2.patch
rename to meta/recipes-devtools/subversion/subversion-1.7.10/libtool2.patch
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.9.bb b/meta/recipes-devtools/subversion/subversion_1.7.10.bb
similarity index 88%
rename from meta/recipes-devtools/subversion/subversion_1.7.9.bb
rename to meta/recipes-devtools/subversion/subversion_1.7.10.bb
index 641655e..9d189fe 100644
--- a/meta/recipes-devtools/subversion/subversion_1.7.9.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.7.10.bb
@@ -13,8 +13,8 @@ SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
            file://libtool2.patch \
            file://fix-install-depends.patch \
 "
-SRC_URI[md5sum] = "8d532025771a67c06c23f299699f056f"
-SRC_URI[sha256sum] = "f8454c585f99afed764232a5048d9b8bfd0a25a9ab8e339ea69fe1204c453ef4"
+SRC_URI[md5sum] = "4088a77e14232876c9b4ff1541e6e200"
+SRC_URI[sha256sum] = "c1df222bec83d014d17785e2ceba6bc80962f64b280967de0285836d8d77a8e7"
 
 LIC_FILES_CHKSUM = "file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4"
 
-- 
1.7.10.4