This is an automated email from the git hooks/post-receive script. rene pushed a commit to branch master in repository libreoffice.
commit 9421ca3a57920572e90167d138bc53cb38e314db Author: Rene Engelhard <[email protected]> Date: Mon Jul 25 15:32:41 2016 +0200 backport patch to allow java update version number > 99 --- changelog | 7 +++++++ patches/jre-update-gt-99.diff | 31 +++++++++++++++++++++++++++++++ patches/series | 1 + 3 files changed, 39 insertions(+) diff --git a/changelog b/changelog index 5543ec8..93b4b8a 100644 --- a/changelog +++ b/changelog @@ -1,3 +1,10 @@ +libreoffice (1:5.1.5~rc1-2) UNRELEASED; urgency=medium + + * debian/patches/jre-update-gt-99.diff: backport from libreoffice-5-2; + allow java update version number > 99 + + -- Rene Engelhard <[email protected]> Mon, 25 Jul 2016 15:30:45 +0200 + libreoffice (1:5.1.5~rc1-1) unstable; urgency=medium * New upstream release candidate diff --git a/patches/jre-update-gt-99.diff b/patches/jre-update-gt-99.diff new file mode 100644 index 0000000..e92cd7e --- /dev/null +++ b/patches/jre-update-gt-99.diff @@ -0,0 +1,31 @@ +From 191e3809f5d62392bf98b940ad8f6937ae5ee6c6 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <[email protected]> +Date: Fri, 22 Jul 2016 08:22:47 +0100 +Subject: Related: tdf#101057 allow java update version number > 99 + +Change-Id: Icc37cf248fbf35f108eb5bbb25c36fbd54a9fe85 +(cherry picked from commit 64d3270a89fd88d4d0cf70329af2c66f722fd95e) +Reviewed-on: https://gerrit.libreoffice.org/27425 +Tested-by: Jenkins <[email protected]> +Reviewed-by: Markus Mohrhard <[email protected]> + +diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx +index 4787440..b4ad701 100644 +--- a/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx ++++ b/jvmfwk/plugins/sunmajor/pluginlib/sunversion.cxx +@@ -135,9 +135,9 @@ bool SunVersion::init(const char *szVersion) + { + if ( ! isdigit(*pCur)) + { +- //1.4.1_01-, 1.4.1_01a, the numerical part may only be 2 chars. +- int len = pCur - pLast; +- if (len > 2) ++ //1.8.0_102-, 1.8.0_01a, ++ size_t len = pCur - pLast; ++ if (len > sizeof(buf) - 1) + return false; + //we've got the update: 01, 02 etc + strncpy(buf, pLast, len); +-- +cgit v0.10.2 + diff --git a/patches/series b/patches/series index 5273052..4b00694 100644 --- a/patches/series +++ b/patches/series @@ -37,3 +37,4 @@ no-packagekit-per-default.diff liborcus-0.11.diff kde4-cflags-no-usr-include.diff mdds-1.2.0.diff +jre-update-gt-99.diff -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git
