| 1e08d9be | 2017-06-08 06:50:10 | Slávek Banko |
Update LibreOffice packaging patches: + 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@...> |
||
|
A libreoffice/5.2.7/jessie-backports/debian.diff M libreoffice/4.2.8/trusty/debian.diff M libreoffice/4.3.3/jessie/debian.diff M libreoffice/4.3.3/wheezy-backports/debian.diff R libreoffice/5.2.5/jessie-backports/debian.diff |
||
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 @@
--- 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@...> 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/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 @@
--- 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@...> Sun, 26 Feb 2017 03:12:30 +0100
++ -- Sl��vek Banko <slavek.banko@...> 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@...> Fri, 03 Mar 2017 13:43:23 +0100
++ -- Sl��vek Banko <slavek.banko@...> 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 @@
+ * 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.5/jessie-backports/debian.diff
deleted file mode 100644
index 3d15ced..0000000
--- a/libreoffice/5.2.5/jessie-backports/debian.diff
+++ /dev/null
@@ -1,358 +0,0 @@
-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
-+
-+ * Enable TDE module
-+ * Enable crystal icons
-+
-+ -- Sl��vek Banko <slavek.banko@...> Sun, 26 Feb 2017 14:14:14 +0100
-+
- libreoffice (1:5.2.5-1~bpo8+1) jessie-backports; urgency=medium
-
- * Rebuild for jessie-backports.
-diff -ruN a/debian/control b/debian/control
---- a/debian/control 2017-01-27 10:27:50.000000000 +0000
-+++ b/debian/control 2017-02-26 14:14:24.364000000 +0000
-@@ -131,6 +131,8 @@
- pkg-config,
- python3,
- python3-dev (>= 3.3),
-+ tdelibs14-trinity-dev,
-+ tdepim-trinity-dev,
- ucpp,
- unixodbc-dev (>= 2.2.11),
- unzip,
-@@ -257,6 +259,7 @@
- * hyphen-*: Hyphenation patterns for LibreOffice
- * libreoffice-gtk(2|3): Gtk UI Plugin, GNOME File Picker support
- * libreoffice-gnome: GIO backend
-+ * libreoffice-trinity: TDE UI Plugin and TDE File Picker support
- * unixodbc: ODBC database support
- * cups-bsd: Allows LibreOffice to detect your CUPS printer queues
- automatically
-@@ -374,6 +377,7 @@
- libreoffice-style-hicontrast (<< 1:3.3.0-1),
- libreoffice-style-oxygen (<< 1:3.3.0-1),
- libreoffice-style-tango (<< 1:3.3.0-1),
-+ libreoffice-trinity (<< ${binary:Version}),
- libreoffice-writer (<< ${binary:Version}),
- mozilla-libreoffice (<< 1:3.5.0~beta~),
- mozilla-plugin-vlc (<< 1.0),
-@@ -613,6 +617,19 @@
- .
- This package contains the database component for LibreOffice.
-
-+Package: libreoffice-style-crystal
-+Architecture: all
-+Enhances: libreoffice-core
-+Depends: ${misc:Depends}
-+Suggests: crystalcursors, kde-icons-crystal
-+Provides: libreoffice-style
-+Replaces: libreoffice-common (<< 1:3.3.0~rc4-2)
-+Description: office productivity suite -- Crystal symbol style
-+ LibreOffice is a full-featured office productivity suite that provides
-+ a near drop-in replacement for Microsoft(R) Office.
-+ .
-+ This package contains the "crystal" symbol style, default style for TDE.
-+
- Package: libreoffice-style-oxygen
- Architecture: all
- Enhances: libreoffice-core
-@@ -4601,6 +4618,28 @@
- .
- * konqueror / kmail
-
-+Package: libreoffice-trinity
-+Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc ppc64el arm64
-+Depends: libreoffice-core (= ${binary:Version}),
-+ ${misc:Depends},
-+ ${shlibs:Depends}
-+Recommends: ${trinity-iconset-dep}
-+Suggests: kmail-trinity, konqueror-trinity, libreoffice-tdeab-trinity
-+Section: tde
-+Enhances: libreoffice
-+Replaces: libreoffice-core (= 1:3.5.0~beta2-1),
-+ openoffice.org-trinity (<< 1:3.3.0~)
-+Description: office productivity suite -- TDE integration
-+ LibreOffice is a full-featured office productivity suite that provides
-+ a near drop-in replacement for Microsoft(R) Office.
-+ .
-+ This package contains the TDE plugin for drawing OOo's widgets with
-+ TDE/Qt and a TDEish File Picker when running under TDE.
-+ You can extend the functionality of this by installing these packages:
-+ .
-+ * konqueror / kmail
-+ * libreoffice-tdeab-trinity: TDE Addressbook support
-+
- 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 @@
- This package allows LibreOffice to access Evolution address books.
- You need to install evolution separately.
-
-+Package: libreoffice-tdeab-trinity
-+Architecture: alpha amd64 armel armhf hppa i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc powerpcspe ppc64 s390 s390x sparc ppc64el arm64
-+Depends: libreoffice-common (>= 1:3.4.0~),
-+ libreoffice-core (= ${binary:Version}),
-+ ${misc:Depends},
-+ ${shlibs:Depends}
-+Recommends: kaddressbook-trinity
-+Conflicts: ure (<< 1.5.1+OOo3.1.1-15)
-+Description: office productivity suite -- TDE adressbook support
-+ LibreOffice is a full-featured office productivity suite that provides
-+ a near drop-in replacement for Microsoft(R) Office.
-+ .
-+ This package allows LibreOffice to access the TDE Addressbook.
-+ You need to install kaddressbook-trinity separately.
-+
- Package: libreoffice-subsequentcheckbase
- Section: libs
- Priority: extra
-diff -ruN a/debian/control.in b/debian/control.in
---- a/debian/control.in 2016-11-29 07:29:00.000000000 +0000
-+++ b/debian/control.in 2017-02-26 14:14:24.364000000 +0000
-@@ -213,6 +213,7 @@
- libreoffice-impress (<< ${binary:Version}),
- libreoffice-kab (<< 1:3.4.1~),
- libreoffice-kde (<< ${binary:Version}),
-+ libreoffice-trinity (<< ${binary:Version}),
- libreoffice-officebean (<< ${binary:Version}),
- libreoffice-presentation-minimizer (<< 1:4.2~),
- libreoffice-sdbc-postgresql (<< 0.8.1~),
** Diff limit reached (max: 250 lines) **
|
||