[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#682301: marked as done (unblock: libreoffice/1:3.5.4-6, openoffice.org/1:3.4.0~ooo340m1-7)

Your message dated Sat, 21 Jul 2012 19:24:48 +0200
with message-id <20120721172448.GY7369@radis.cristau.org>
and subject line Re: Bug#682301: unblock: libreoffice/1:3.5.4-6, openoffice.org/1:3.4.0~ooo340m1-7
has caused the Debian Bug report #682301,
regarding unblock: libreoffice/1:3.5.4-6,  openoffice.org/1:3.4.0~ooo340m1-7
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
682301: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=682301
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock packages libreoffice and openoffice.org
(transitional packages)

- I missed some (minor) additional fix for CVE-2012-2334
  (which is in stable.) Applied now
- Now that libgcj-bc with the shlibs bump migrated we can
  re-enable libreoffice-gcj to speed up LO when used with
  gcj (only option on kfreebsd-*)
- fix for partial upgrade (#633929)
- two other minor but trivial fixes

unblock libreoffice/1:3.5.4-6
unblock openoffice.org/1:3.4.0~ooo340m1-7

diff of libreoffice:

see attachment

diff of openoffice.org:

diff -Nru openoffice.org-3.4.0~ooo340m1/debian/changelog openoffice.org-3.4.0~ooo340m1/debian/changelog
--- openoffice.org-3.4.0~ooo340m1/debian/changelog      2012-05-31 22:35:56.000000000 +0200
+++ openoffice.org-3.4.0~ooo340m1/debian/changelog      2012-07-20 21:40:22.000000000 +0200
@@ -1,3 +1,9 @@
+openoffice.org (1:3.4.0~ooo340m1-7) unstable; urgency=low
+
+  * re-add -gcj, enabled in LO again
+
+ -- Rene Engelhard <rene@debian.org>  Fri, 20 Jul 2012 21:40:02 +0200
+
 openoffice.org (1:3.4.0~ooo340m1-6) unstable; urgency=high

   * skip mozilla-openoffice.org and openoffice.org-gcj, LO counterparts
diff -Nru openoffice.org-3.4.0~ooo340m1/debian/control openoffice.org-3.4.0~ooo340m1/debian/control
--- openoffice.org-3.4.0~ooo340m1/debian/control        2012-05-31 22:36:12.000000000 +0200
+++ openoffice.org-3.4.0~ooo340m1/debian/control        2012-07-20 21:40:52.000000000 +0200
@@ -1395,6 +1395,17 @@
  .
  It can be safely removed after an upgrade.

+Package: openoffice.org-gcj
+Architecture: kfreebsd-i386 kfreebsd-amd64
+Priority: extra
+Section: editors
+Depends: libreoffice-gcj (>= 1:3.4.0~)
+Description: office productivity suite -- Java libraries for GIJ
+ This is a transitional package, replacing the OpenOffice.org packaging
+ with the LibreOffice packaging.
+ .
+ It can be safely removed after an upgrade.
+
 Package: openoffice.org-dmaths
 Architecture: all
 Priority: extra
diff -Nru openoffice.org-3.4.0~ooo340m1/debian/scripts/gentranspkgs.py openoffice.org-3.4.0~ooo340m1/debian/scripts/gentranspkgs.py
--- openoffice.org-3.4.0~ooo340m1/debian/scripts/gentranspkgs.py        2012-05-31 22:34:49.000000000 +0200
+++ openoffice.org-3.4.0~ooo340m1/debian/scripts/gentranspkgs.py        2012-07-20 21:40:36.000000000 +0200
@@ -2,7 +2,7 @@

 import re, sys, fileinput

-skip_packages = ('openoffice.org-core', 'openoffice.org-report-builder-bin', 'openoffice.org-base-core', 'openoffice.org-dev', 'openoffice.org-dev-doc', 'openoffice.org-dbg', 'openoffice.org-help-sk', 'openoffice.org-nlpsolver', 'openoffice.org-hyphenation-show', 'openoffice.org-script-provider-bsh', 'openoffice.org-hyphenation-bn','openoffice.org-hyphenation-gu', 'openoffice.org-hyphenation-kn', 'openoffice.org-hyphenation-hi', 'openoffice.org-hyphenation-pa', 'openoffice.org-l10n-is','mozilla-openoffice.org','openoffice.org-gcj')
+skip_packages = ('openoffice.org-core', 'openoffice.org-report-builder-bin', 'openoffice.org-base-core', 'openoffice.org-dev', 'openoffice.org-dev-doc', 'openoffice.org-dbg', 'openoffice.org-help-sk', 'openoffice.org-nlpsolver', 'openoffice.org-hyphenation-show', 'openoffice.org-script-provider-bsh', 'openoffice.org-hyphenation-bn','openoffice.org-hyphenation-gu', 'openoffice.org-hyphenation-kn', 'openoffice.org-hyphenation-hi', 'openoffice.org-hyphenation-pa', 'openoffice.org-l10n-is','mozilla-openoffice.org')
 other_source_packages = ('docvert-openoffice.org', 'openclipart-openoffice.org','openoffice.org-dmaths','openoffice.org-mysql-connector','openoffice.org-pdfimport','openoffice.org-presentation-minimizer','openoffice.org-report-builder', 'openoffice.org-voikko','openoffice.org-writer2latex','openoffice.org-wiki-publisher','openoffice.org-zemberek', 'openoffice.org-presenter-console', 'openoffice.org-writer2xhtml', 'openoffice.org-sdbc-postgresql');

 def gen_transitonal_packages():

-- System Information:
Debian Release: wheezy/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.2.0-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Regards,

Rene

diff -Nru libreoffice-3.5.4/debian/changelog libreoffice-3.5.4/debian/changelog
--- libreoffice-3.5.4/debian/changelog	2012-06-20 10:49:23.000000000 +0200
+++ libreoffice-3.5.4/debian/changelog	2012-07-20 00:21:57.000000000 +0200
@@ -1,3 +1,18 @@
+libreoffice (1:3.5.4-6) unstable; urgency=medium
+
+  * debian/patches/CVE-2012-2334-clip-max-entries.diff: add additional
+    fix for CVE-2012-2334 from Florian Weimer which we missed to apply
+    so far..
+
+  * debian/templates/soffice-template.desktop.in: fix Icon= (remove
+    obsolete 3), thanks Miros◈aw Zalewski (closes: #678313)
+  * debian/control.in: make -filter-mobiledev Break libreoffice-core
+    (<< 1:3.5~) (closes: #633929)
+  * debian/control.mediawiki.in: add missing epoch to -core dependency
+  * debian/rules: re-enable -gcj
+
+ -- Rene Engelhard <rene@debian.org>  Tue, 17 Jul 2012 20:21:31 +0200
+
 libreoffice (1:3.5.4-5) unstable; urgency=low
 
   * debian/patches/evolution-3.4.diff: as name says,
diff -Nru libreoffice-3.5.4/debian/control libreoffice-3.5.4/debian/control
--- libreoffice-3.5.4/debian/control	2012-06-20 00:53:48.000000000 +0200
+++ libreoffice-3.5.4/debian/control	2012-07-20 09:41:23.000000000 +0200
@@ -400,6 +400,7 @@
 Section: misc
 Architecture: all
 Depends: ${java-runtime-depends}, ${java-common-depends}, ${java:Depends}, ${misc:Depends}
+Breaks: libreoffice-core (<< 1:3.5~)
 Description: office productivity suite -- mobile devices filters
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
@@ -3113,6 +3114,20 @@
  .
  This package contains the (detached) debug symbols for the URE.
 
+Package: libreoffice-gcj
+Architecture: hppa kfreebsd-amd64 kfreebsd-i386
+Section: java
+Depends: ${shlibs:Depends}, gcj-jre, libreoffice-core (= ${binary:Version}), libreoffice-java-common (= ${source:Version}), ${java:Depends}, ${java-gcj-depends}, ${misc:Depends}
+Enhances: libreoffice-writer, libreoffice-base
+Description: office productivity suite -- Java libraries for GIJ
+ LibreOffice is a full-featured office productivity suite that provides
+ a near drop-in replacement for Microsoft(R) Office.
+ .
+ This package contains the .jars from libreoffice-java-common compiled to
+ native to make the Java features of LibreOffice faster when using gij.
+ .
+ This package has NO effect with Suns/Blackdowns/IBMs/etc. JDK.
+
 Package: libreoffice-ogltrans
 Section: graphics
 Priority: extra
@@ -3131,7 +3146,7 @@
 Section: misc
 Architecture: all
 Pre-Depends: ${java-runtime-depends}
-Depends: ${mediawiki-jar-depends}, libreoffice-core (>= 3.4~), libreoffice-java-common, ${java:Depends}, ${misc:Depends}
+Depends: ${mediawiki-jar-depends}, libreoffice-core (>= 1:3.4~), libreoffice-java-common, ${java:Depends}, ${misc:Depends}
 Enhances: libreoffice-writer
 Recommends: ${lucene-depends}
 Conflicts: ure (<< 1.5.1+OOo3.1.1-15), libreoffice-core (<< 1:3.5~), libreoffice-common (<< 1:3.5~)
diff -Nru libreoffice-3.5.4/debian/control.in libreoffice-3.5.4/debian/control.in
--- libreoffice-3.5.4/debian/control.in	2012-06-18 18:30:16.000000000 +0200
+++ libreoffice-3.5.4/debian/control.in	2012-07-01 22:03:22.000000000 +0200
@@ -554,6 +554,7 @@
  ${java-common-depends},
  ${java:Depends},
  ${misc:Depends}
+Breaks: libreofficeVER-core (<< 1:3.5~)
 Description: office productivity suite -- mobile devices filters
  LibreOffice is a full-featured office productivity suite that provides
  a near drop-in replacement for Microsoft(R) Office.
diff -Nru libreoffice-3.5.4/debian/control.mediawiki.in libreoffice-3.5.4/debian/control.mediawiki.in
--- libreoffice-3.5.4/debian/control.mediawiki.in	2012-05-11 20:38:06.000000000 +0200
+++ libreoffice-3.5.4/debian/control.mediawiki.in	2012-07-09 23:12:40.000000000 +0200
@@ -2,7 +2,7 @@
 Section: misc
 Architecture: all
 Pre-Depends: ${java-runtime-depends}
-Depends: ${mediawiki-jar-depends}, libreofficeVER-core (>= 3.4~), libreofficeVER-java-common,
+Depends: ${mediawiki-jar-depends}, libreofficeVER-core (>= 1:3.4~), libreofficeVER-java-common,
  ${java:Depends},
  ${misc:Depends}
 Enhances: libreofficeVER-writer
diff -Nru libreoffice-3.5.4/debian/libreoffice-gcj.postinst.debhelper libreoffice-3.5.4/debian/libreoffice-gcj.postinst.debhelper
--- libreoffice-3.5.4/debian/libreoffice-gcj.postinst.debhelper	1970-01-01 01:00:00.000000000 +0100
+++ libreoffice-3.5.4/debian/libreoffice-gcj.postinst.debhelper	2012-06-26 17:55:15.000000000 +0200
@@ -0,0 +1,5 @@
+# Automatically added by dh_nativejava
+if which rebuild-gcj-db >/dev/null 2>&1; then
+	rebuild-gcj-db
+fi
+# End automatically added section
diff -Nru libreoffice-3.5.4/debian/libreoffice-gcj.postrm.debhelper libreoffice-3.5.4/debian/libreoffice-gcj.postrm.debhelper
--- libreoffice-3.5.4/debian/libreoffice-gcj.postrm.debhelper	1970-01-01 01:00:00.000000000 +0100
+++ libreoffice-3.5.4/debian/libreoffice-gcj.postrm.debhelper	2012-06-26 17:55:15.000000000 +0200
@@ -0,0 +1,5 @@
+# Automatically added by dh_nativejava
+if which rebuild-gcj-db >/dev/null 2>&1; then
+	rebuild-gcj-db
+fi
+# End automatically added section
diff -Nru libreoffice-3.5.4/debian/libreoffice-gcj.substvars libreoffice-3.5.4/debian/libreoffice-gcj.substvars
--- libreoffice-3.5.4/debian/libreoffice-gcj.substvars	1970-01-01 01:00:00.000000000 +0100
+++ libreoffice-3.5.4/debian/libreoffice-gcj.substvars	2012-06-26 18:06:35.000000000 +0200
@@ -0,0 +1,4 @@
+misc:Depends=libgcj-common (>> 1:4.1.1-13)
+shlibs:Depends=libc6 (>= 2.2.5), libgcc1 (>= 1:4.1.1), libgcj-bc (>= 4.6.3-1~), zlib1g (>= 1:1.1.4)
+java:Depends=
+java:Recommends=
diff -Nru libreoffice-3.5.4/debian/patches/CVE-2012-2334-clip-max-entries.diff libreoffice-3.5.4/debian/patches/CVE-2012-2334-clip-max-entries.diff
--- libreoffice-3.5.4/debian/patches/CVE-2012-2334-clip-max-entries.diff	1970-01-01 01:00:00.000000000 +0100
+++ libreoffice-3.5.4/debian/patches/CVE-2012-2334-clip-max-entries.diff	2012-07-02 17:40:15.000000000 +0200
@@ -0,0 +1,23 @@
+From 63dbfa8386159c2f22b7e3ef786f3c93fd4217aa Mon Sep 17 00:00:00 2001
+From: Caolán McNamara <caolanm@redhat.com>
+Date: Mon, 28 May 2012 15:13:09 +0000
+Subject: clip max entries
+
+Signed-off-by: Petr Mladek <pmladek@suse.cz>
+---
+diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
+index 3107635..56234e2 100644
+--- a/filter/source/msfilter/msdffimp.cxx
++++ b/filter/source/msfilter/msdffimp.cxx
+@@ -6049,6 +6049,9 @@ void SvxMSDffManager::GetFidclData( sal_uInt32 nOffsDggL )
+                         "escher", "FIDCL list longer than remaining bytes, ppt or parser is wrong");
+                     mnIdClusters = std::min(nMaxEntriesPossible, static_cast<sal_Size>(mnIdClusters));
+ 
++                    sal_Size nMaxEntriesAllocatable = SAL_MAX_INT32 / sizeof(FIDCL);
++                    mnIdClusters = std::min(nMaxEntriesAllocatable, static_cast<sal_Size>(mnIdClusters));
++
+                     mpFidcls = new FIDCL[ mnIdClusters ];
+                     memset(mpFidcls, 0, mnIdClusters * sizeof(FIDCL));
+                     for (sal_uInt32 i = 0; i < mnIdClusters; ++i)
+--
+cgit v0.9.0.2-2-gbebe
diff -Nru libreoffice-3.5.4/debian/patches/series libreoffice-3.5.4/debian/patches/series
--- libreoffice-3.5.4/debian/patches/series	2012-06-18 18:28:25.000000000 +0200
+++ libreoffice-3.5.4/debian/patches/series	2012-07-19 11:09:22.000000000 +0200
@@ -41,3 +41,4 @@
 make-shortcuts-in-menus-localized-again.diff
 fix-legacy-report-opening.diff
 evolution-3.4.diff
+CVE-2012-2334-clip-max-entries.diff
diff -Nru libreoffice-3.5.4/debian/rules libreoffice-3.5.4/debian/rules
--- libreoffice-3.5.4/debian/rules	2012-06-18 18:30:16.000000000 +0200
+++ libreoffice-3.5.4/debian/rules	2012-07-20 09:40:05.000000000 +0200
@@ -443,7 +443,7 @@
   endif
 endif
 ifneq (,$(filter $(DEB_HOST_ARCH),$(OOO_GCJ_ARCHS)))
-	BUILD_JARS_NATIVE=n
+	BUILD_JARS_NATIVE=y
 endif
 
 ifeq "$(PACKAGE_NSPLUGIN)" "y"
@@ -1377,10 +1377,10 @@
 		>> debian/control < debian/control.ure.in
 ifeq "$(ENABLE_JAVA)" "y"
   ifneq "$(OOO_GCJ_JDK_ARCHS)" ""
-    ifeq "$(BUILD_JARS_NATIVE)" "y"
+#    ifeq "$(BUILD_JARS_NATIVE)" "y"
 	sed -e "s|libreofficeVER|libreoffice$(VER)|g" \
 		>> debian/control < debian/control.gcj.in
-    endif
+ #   endif
   endif
 endif
 ifneq "$(OOO_NSPLUGIN_ARCHS)" ""
diff -Nru libreoffice-3.5.4/debian/templates/soffice-template.desktop.in libreoffice-3.5.4/debian/templates/soffice-template.desktop.in
--- libreoffice-3.5.4/debian/templates/soffice-template.desktop.in	2012-05-11 20:38:12.000000000 +0200
+++ libreoffice-3.5.4/debian/templates/soffice-template.desktop.in	2012-06-20 23:27:01.000000000 +0200
@@ -4,5 +4,5 @@
 Comment[de]=Name der LibreOffice @APP@-Datei eingeben:
 Type=Link
 URL=.source/soffice.@EXT@
-Icon=libreoffice3-oasis-@TYPE@
+Icon=libreoffice-oasis-@TYPE@

--- End Message ---
--- Begin Message --- 
On Sat, Jul 21, 2012 at 10:49:58 +0200, Rene Engelhard wrote:

> Please unblock packages libreoffice and openoffice.org
> (transitional packages)
> 
> - I missed some (minor) additional fix for CVE-2012-2334
>   (which is in stable.) Applied now
> - Now that libgcj-bc with the shlibs bump migrated we can
>   re-enable libreoffice-gcj to speed up LO when used with
>   gcj (only option on kfreebsd-*)
> - fix for partial upgrade (#633929)
> - two other minor but trivial fixes
> 
> unblock libreoffice/1:3.5.4-6
> unblock openoffice.org/1:3.4.0~ooo340m1-7
> 
These look like cruft:

 libreoffice-gcj.postinst.debhelper          |    5 +++++
 libreoffice-gcj.postrm.debhelper            |    5 +++++
 libreoffice-gcj.substvars                   |    4 ++++

Anyway, unblocked.

Cheers,
Julien

Attachment: signature.asc
Description: Digital signature


--- End Message ---
Reply to: