removed two files as they got accecpted upstream
Update SRC_URI to location where this version exists
Includes security fix CVE-2014-9765
CVE-2014-9765 xdelta: buffer overflow in main_get_appheader
(fixed in 3.0.9 and after)
Signed-off-by: Armin Kuster <akuster808 at gmail.com>
---
.../xdelta/files/compilation-fix.patch | 29 ------------
.../files/with-liblzma-configure-option.patch | 55 ----------------------
.../xdelta/{xdelta3_3.0.8.bb => xdelta3_3.0.11.bb} | 11 ++---
3 files changed, 4 insertions(+), 91 deletions(-)
delete mode 100644 meta-oe/recipes-support/xdelta/files/compilation-fix.patch
delete mode 100644 meta-oe/recipes-support/xdelta/files/with-liblzma-configure-option.patch
rename meta-oe/recipes-support/xdelta/{xdelta3_3.0.8.bb => xdelta3_3.0.11.bb} (60%)
diff --git a/meta-oe/recipes-support/xdelta/files/compilation-fix.patch b/meta-oe/recipes-support/xdelta/files/compilation-fix.patch
deleted file mode 100644
index 377a043..0000000
--- a/meta-oe/recipes-support/xdelta/files/compilation-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Upstream-Status: Pending
-http://code.google.com/p/xdelta/issues/detail?id=174
-
-Compilation fix:
-<code>
-| testing/regtest.cc:763:3: error: no matching function for call to 'max(xoff_t, size_t&)'
-</code>
-
-Signed-off-by: Matthieu Crapet <Matthieu.Crapet at ingenico.com>
----
- testing/regtest.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/testing/regtest.cc b/testing/regtest.cc
-index 12b712e..b63a1f9 100644
---- a/testing/regtest.cc
-+++ b/testing/regtest.cc
-@@ -12,7 +12,7 @@ public:
- Options() : encode_srcwin_maxsz(1<<20),
- block_size(Constants::BLOCK_SIZE),
- size_known(false) { }
-- size_t encode_srcwin_maxsz;
-+ xoff_t encode_srcwin_maxsz;
- size_t block_size;
- bool size_known;
- };
---
-1.8.5.4
-
diff --git a/meta-oe/recipes-support/xdelta/files/with-liblzma-configure-option.patch b/meta-oe/recipes-support/xdelta/files/with-liblzma-configure-option.patch
deleted file mode 100644
index 4b99290..0000000
--- a/meta-oe/recipes-support/xdelta/files/with-liblzma-configure-option.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Upstream-Status: Pending, Submitted
-http://code.google.com/p/xdelta/issues/detail?id=178
-
-xdelta3: add --with-liblzma configure option
-
-As xdelta3 can be compiled with or without liblzma external library, make it configurable.
-Default is autodetect (unchanged behavior).
-
-Signed-off-by: Matthieu Crapet <mcrapet at gmail.com>
----
- configure.ac | 21 +++++++++++++++++++--
- 1 file changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 3b430d7..8c53ba8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8,8 +8,6 @@ AM_INIT_AUTOMAKE([1.9 no-define foreign tar-ustar])
- AX_CHECK_ALIGNED_ACCESS_REQUIRED
- AC_PROG_CC
- AC_PROG_CXX
--AC_CHECK_HEADERS([lzma.h])
--AC_CHECK_LIB(lzma, lzma_easy_buffer_encode)
- AC_CHECK_SIZEOF(size_t)
- #AM_PATH_PYTHON(,, [:])
- #AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != :])
-@@ -22,6 +20,25 @@ AC_ARG_ENABLE(debug-symbols,
- AS_HELP_STRING(--enable-debug-symbols,[Build with debug symbols (default is NO)]),,enableval=no)
- AM_CONDITIONAL([DEBUG_SYMBOLS], [test ${enableval} = "yes"])
-
-+AC_ARG_WITH(
-+ [liblzma],
-+ [AC_HELP_STRING(
-+ [--with-liblzma],
-+ [build with liblzma support @<:@default=autodetect@:>@])],
-+ [USE_LIBLZMA=$withval],
-+ [USE_LIBLZMA=auto])
-+
-+if test "x$USE_LIBLZMA" != xno ; then
-+ AC_CHECK_HEADERS([lzma.h],,[
-+ if test "x$with_liblzma" = xyes ; then
-+ AC_MSG_FAILURE([liblzma includes was not found])
-+ fi])
-+ AC_CHECK_LIB([lzma], [lzma_easy_buffer_encode],,[
-+ if test "x$with_liblzma" = xyes ; then
-+ AC_MSG_FAILURE([liblzma library was not found])
-+ fi])
-+fi
-+
- AC_CONFIG_HEADERS([config.h])
- AC_CONFIG_FILES([Makefile])
- AC_OUTPUT
---
-1.8.5.4
-
diff --git a/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb b/meta-oe/recipes-support/xdelta/xdelta3_3.0.11.bb
similarity index 60%
rename from meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb
rename to meta-oe/recipes-support/xdelta/xdelta3_3.0.11.bb
index baa92e4..9669d9b 100644
--- a/meta-oe/recipes-support/xdelta/xdelta3_3.0.8.bb
+++ b/meta-oe/recipes-support/xdelta/xdelta3_3.0.11.bb
@@ -6,13 +6,10 @@ SECTION = "console/utils"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
-
-SRC_URI = "http://xdelta.googlecode.com/files/${BPN}-${PV}.tar.xz \
- file://compilation-fix.patch \
- file://with-liblzma-configure-option.patch \
-"
-SRC_URI[md5sum] = "c3ae3286ce4193de8e03d5bcaccf3bc3"
-SRC_URI[sha256sum] = "3a86f29c95664fb44b8a40ff22d9bcc3e87aa8c01f0ff75931a7fa78ed3d2e55"
+SRC_URI = "https://github.com/jmacd/xdelta-devel/releases/download/v${PV}/${BPN}-${PV}.tar.gz \
+ "
+SRC_URI[md5sum] = "445d8be2ac512113d5ca601ae8359626"
+SRC_URI[sha256sum] = "0ccc9751ceaa4d90d6b06938a4deddb481816f5d9284bd07d2e728609cb300aa"
inherit autotools
--
2.3.5