summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2017-06-08 11:50:10 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2017-06-08 11:50:10 (GMT)
commit1e08d9beddc3f011f28ad8b9375cc345a8856285 (patch)
tree2758cc8e5f90fb009240736ca6472e06e2eddffa
parent84314564254bec77cf9a339cb4290030a073873b (diff)
downloadthirdparty-1e08d9be.zip
thirdparty-1e08d9be.tar.gz
Update LibreOffice packaging patches:HEADorigin/masterorigin/HEADmaster
+ 4.2.8 - Ubuntu 14.04 - Trusty + 4.3.3 - Debian 7.x - Wheezy-backports + 4.3.3 - Debian 8.x - Jessie + 5.2.7 - Debian 8.x - Jessie-backports (updated from 5.2.5) Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--libreoffice/4.2.8/trusty/debian.diff10
-rw-r--r--libreoffice/4.3.3/jessie/debian.diff8
-rw-r--r--libreoffice/4.3.3/wheezy-backports/debian.diff38
-rw-r--r--libreoffice/5.2.7/jessie-backports/debian.diff (renamed from libreoffice/5.2.5/jessie-backports/debian.diff)16
4 files changed, 21 insertions, 51 deletions
diff --git a/libreoffice/4.2.8/trusty/debian.diff b/libreoffice/4.2.8/trusty/debian.diff
index 5908c9a..55f174d 100644
--- a/libreoffice/4.2.8/trusty/debian.diff
+++ b/libreoffice/4.2.8/trusty/debian.diff
@@ -2,15 +2,15 @@ diff -ruN a/debian/changelog b/debian/changelog
--- a/debian/changelog 2015-11-02 21:08:01.000000000 +0000
+++ b/debian/changelog 2015-11-14 15:19:36.524000000 +0000
@@ -1,3 +1,9 @@
-+libreoffice (1:4.2.8-0ubuntu5+tde1) trusty; urgency=medium
++libreoffice (1:4.2.8-0ubuntu5.1+tde1) trusty; urgency=medium
+
+ * Enable TDE module
+
+ -- Slávek Banko <slavek.banko@axis.cz> Mon, 27 Feb 2017 22:27:47 +0100
+
- libreoffice (1:4.2.8-0ubuntu5) trusty-security; urgency=medium
+ libreoffice (1:4.2.8-0ubuntu5.1) trusty-security; urgency=medium
- * SECURITY UPDATE: arbitrary file read via link update
+ * SECURITY UPDATE: out-of-bounds write in tools::Polygon::Insert function
diff -ruN a/debian/control b/debian/control
--- a/debian/control 2015-11-02 21:26:04.000000000 +0000
+++ b/debian/control 2015-11-14 15:19:36.524000000 +0000
@@ -156,10 +156,10 @@ diff -ruN a/debian/control.trinity.in b/debian/control.trinity.in
diff -ruN a/debian/patches/series b/debian/patches/series
--- a/debian/patches/series 2015-09-18 12:59:35.000000000 +0000
+++ b/debian/patches/series 2015-11-14 15:19:36.524000000 +0000
-@@ -46,3 +46,4 @@
- lwpfix4.diff
+@@ -47,3 +47,4 @@
lwpfix5.diff
olefix.diff
+ CVE-2017-7870.patch
+tde-update-r14.diff
diff -ruN a/debian/patches/tde-update-r14.diff b/debian/patches/tde-update-r14.diff
--- a/debian/patches/tde-update-r14.diff 1970-01-01 00:00:00.000000000 +0000
diff --git a/libreoffice/4.3.3/jessie/debian.diff b/libreoffice/4.3.3/jessie/debian.diff
index f4b0a98..4f0cdf4 100644
--- a/libreoffice/4.3.3/jessie/debian.diff
+++ b/libreoffice/4.3.3/jessie/debian.diff
@@ -2,15 +2,15 @@ diff -ruN a/debian/changelog b/debian/changelog
--- a/debian/changelog 2015-08-28 15:18:09.000000000 +0000
+++ b/debian/changelog 2016-06-30 02:03:40.000000000 +0000
@@ -1,3 +1,9 @@
-+libreoffice (1:4.3.3-2+tde1+deb8u6) jessie; urgency=medium
++libreoffice (1:4.3.3-2+tde1+deb8u7) jessie; urgency=high
+
+ * Enable TDE module
+
-+ -- Slávek Banko <slavek.banko@axis.cz> Sun, 26 Feb 2017 03:12:30 +0100
++ -- Slávek Banko <slavek.banko@axis.cz> Fri, 28 Apr 2017 14:02:22 +0200
+
- libreoffice (1:4.3.3-2+deb8u6) jessie-security; urgency=high
+ libreoffice (1:4.3.3-2+deb8u7) jessie-security; urgency=high
- * debian/patches/olefix.diff: fix CVE-2017-3157
+ * debian/patches/CVE-2017-7870.diff: fix CVE-2017-7870
diff -ruN a/debian/control b/debian/control
--- a/debian/control 2015-08-28 17:51:39.000000000 +0000
+++ b/debian/control 2015-11-14 17:25:07.096000000 +0000
diff --git a/libreoffice/4.3.3/wheezy-backports/debian.diff b/libreoffice/4.3.3/wheezy-backports/debian.diff
index 5b69a64..489b29d 100644
--- a/libreoffice/4.3.3/wheezy-backports/debian.diff
+++ b/libreoffice/4.3.3/wheezy-backports/debian.diff
@@ -1,15 +1,14 @@
diff -ruN a/debian/changelog b/debian/changelog
--- a/debian/changelog 2017-02-25 16:48:23.000000000 +0000
+++ b/debian/changelog 2017-03-03 12:42:16.000000000 +0000
-@@ -1,3 +1,10 @@
-+libreoffice (1:4.3.3-2+tde1+deb8u6~bpo70+1a) wheezy; urgency=high
+@@ -1,3 +1,9 @@
++libreoffice (1:4.3.3-2+tde1+deb8u7~bpo70+1) wheezy-backports; urgency=high
+
+ * Enable TDE module
-+ * Fix FTBFS with GCC < 4.7
+
-+ -- Slávek Banko <slavek.banko@axis.cz> Fri, 03 Mar 2017 13:43:23 +0100
++ -- Slávek Banko <slavek.banko@axis.cz> Wed, 07 Jun 2017 19:48:19 +0200
+
- libreoffice (1:4.3.3-2+deb8u6~bpo70+1) wheezy-backports; urgency=high
+ libreoffice (1:4.3.3-2+deb8u7~bpo70+1) wheezy-backports; urgency=high
* Rebuild for wheezy-backports.
diff -ruN a/debian/control b/debian/control
@@ -157,35 +156,6 @@ diff -ruN a/debian/control.trinity.in b/debian/control.trinity.in
+ * konqueror / kmail
+ * libreoffice-tdeab-trinity: TDE Addressbook support
+
-diff -ruN a/debian/patches/olefix-gcc-4.6.diff b/debian/patches/olefix-gcc-4.6.diff
---- a/debian/patches/olefix-gcc-4.6.diff 1970-01-01 00:00:00.000000000 +0000
-+++ b/debian/patches/olefix-gcc-4.6.diff 2017-03-03 12:12:03.000000000 +0000
-@@ -0,0 +1,16 @@
-+Index: b/include/svx/svdoole2.hxx
-+===================================================================
-+--- a/include/svx/svdoole2.hxx
-++++ b/include/svx/svdoole2.hxx
-+@@ -204,9 +204,9 @@
-+ explicit SdrEmbedObjectLink(SdrOle2Obj* pObj);
-+ virtual ~SdrEmbedObjectLink();
-+
-+- virtual void Closed() override;
-++ virtual void Closed();
-+ virtual ::sfx2::SvBaseLink::UpdateResult DataChanged(
-+- const OUString& rMimeType, const css::uno::Any & rValue ) override;
-++ const OUString& rMimeType, const css::uno::Any & rValue );
-+
-+ bool Connect() { return GetRealObject() != nullptr; }
-+ };
-diff -ruN a/debian/patches/series b/debian/patches/series
---- a/debian/patches/series 2017-02-25 16:47:19.000000000 +0000
-+++ b/debian/patches/series 2017-03-03 12:39:17.000000000 +0000
-@@ -48,4 +48,5 @@
- ppc64el-jdk-paths.diff
- CVE-2016-4324.diff
- olefix.diff
-+olefix-gcc-4.6.diff
- icu-icudata-link-fix-armhf.diff
diff -ruN a/debian/rules b/debian/rules
--- a/debian/rules 2015-04-06 12:49:47.000000000 +0000
+++ b/debian/rules 2015-05-12 17:07:51.160000000 +0000
diff --git a/libreoffice/5.2.5/jessie-backports/debian.diff b/libreoffice/5.2.7/jessie-backports/debian.diff
index 3d15ced..53a5e0a 100644
--- a/libreoffice/5.2.5/jessie-backports/debian.diff
+++ b/libreoffice/5.2.7/jessie-backports/debian.diff
@@ -2,14 +2,14 @@ diff -ruN a/debian/changelog b/debian/changelog
--- a/debian/changelog 2017-01-27 10:52:51.000000000 +0000
+++ b/debian/changelog 2017-02-26 14:14:24.364000000 +0000
@@ -1,3 +1,10 @@
-+libreoffice (1:5.2.5-1+tde0~bpo8+1) jessie-backports; urgency=medium
++libreoffice (1:5.2.7-1+tde0~bpo8+1) jessie-backports; urgency=medium
+
+ * Enable TDE module
+ * Enable crystal icons
+
-+ -- Slávek Banko <slavek.banko@axis.cz> Sun, 26 Feb 2017 14:14:14 +0100
++ -- Slávek Banko <slavek.banko@axis.cz> Thu, 08 Jun 2017 04:14:54 +0200
+
- libreoffice (1:5.2.5-1~bpo8+1) jessie-backports; urgency=medium
+ libreoffice (1:5.2.7-1~bpo8+1) jessie-backports; urgency=medium
* Rebuild for jessie-backports.
diff -ruN a/debian/control b/debian/control
@@ -60,7 +60,7 @@ diff -ruN a/debian/control b/debian/control
Package: libreoffice-style-oxygen
Architecture: all
Enhances: libreoffice-core
-@@ -4601,6 +4618,28 @@
+@@ -4609,6 +4626,28 @@
.
* konqueror / kmail
@@ -89,7 +89,7 @@ diff -ruN a/debian/control b/debian/control
Package: libreoffice-sdbc-postgresql
Section: misc
Architecture: alpha amd64 arm64 armel armhf arm64 i386 mips mipsel mips64el powerpc powerpcspe ppc64 ppc64el s390x hppa ia64 m68k s390 sparc sparc64 kfreebsd-amd64 kfreebsd-i386
-@@ -4653,6 +4692,21 @@
+@@ -4661,6 +47002,21 @@
This package allows LibreOffice to access Evolution address books.
You need to install evolution separately.
@@ -267,7 +267,7 @@ diff -ruN a/debian/rules b/debian/rules
ifeq "$(USE_DBUS)" "y"
ifeq "$(ENABLE_BLUETOOTH)" "y"
-@@ -2665,6 +2702,47 @@
+@@ -2667,6 +2704,47 @@
| sed -e "s/@TYPE@/drawing/" \
> $(PKGDIR)-kde/usr/share/templates/soffice.odg.desktop
endif
@@ -315,7 +315,7 @@ diff -ruN a/debian/rules b/debian/rules
# split out gtk stuff
rm -rf $(PKGDIR)-gtk2
-@@ -3216,6 +3294,12 @@
+@@ -3218,6 +3296,12 @@
# register technical.dic
perl -pi -e 's/standard.dic;/standard.dic;technical.dic;/' $(PKGDIR)-common/$(OODIR)/share/registry/main.xcd
@@ -328,7 +328,7 @@ diff -ruN a/debian/rules b/debian/rules
#ifeq "$(PACKAGE_SDK)" "y"
# # install gengal stuff into -dev
# mkdir -p $(PKGDIR)-dev/$(OODIR)/program
-@@ -3445,6 +3529,7 @@
+@@ -3448,6 +3532,7 @@
-V'Binary-Version=$(BINARY_VERSION)' \
-V'ooo-officebean-dep=$(OOO_OFFICEBEAN_DEP)' \
-V'kde-iconset-dep=$(KDE_ICONSET_DEP)' \