------------------------------------------------------------
revno: 2009
committer: Rene Engelhard <r...@debian.org>
branch nick: debian
timestamp: Thu 2010-06-03 21:58:55 +0200
message:
add backport-ftruncate-check.diff and
fix-incorrect-automatic-print-area-assignment.diff from ooo-build-3-2-1
added:
patches/backport-ftruncate-check.diff
patches/fix-incorrect-automatic-print-area-assignment.diff
modified:
changelog
patches/series
=== modified file 'changelog'
--- a/changelog 2010-06-01 13:21:38 +0000
+++ b/changelog 2010-06-03 19:58:55 +0000
@@ -10,12 +10,17 @@
* debian/patches/hu-translation-fixes.diff: add hu translation fixes
from ooo-build-3-2-1 branch
+ * debian/patches/backport-ftruncate-check.diff: add from ooo-build-3-2-1
+ branch - check for success of ftruncate(). Fixes OOo start when $HOME is
+ on cifs
+ * debian/patches/fix-incorrect-automatic-print-area-assignment.diff: as name
says,
+ also from ooo-build-3-2-1 branch
* debian/rules:
- use Oracles tarballs again
* debian/changelog: mention security fix in rc1s changelog
- -- Rene Engelhard <r...@debian.org> Sun, 30 May 2010 19:43:23 +0200
+ -- Rene Engelhard <r...@debian.org> Thu, 03 Jun 2010 21:57:13 +0200
openoffice.org (1:3.2.1~rc2-2) experimental; urgency=low
=== added file 'patches/backport-ftruncate-check.diff'
--- a/patches/backport-ftruncate-check.diff 1970-01-01 00:00:00 +0000
+++ b/patches/backport-ftruncate-check.diff 2010-06-03 19:58:55 +0000
@@ -0,0 +1,46 @@
+diff --git a/patches/dev300/apply b/patches/dev300/apply
+index 6ba77b8..d9a7e7b 100644
+--- openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
++++ openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/apply
+@@ -2843,6 +2843,8 @@ icu-arm.diff, doko
+ [ Fixes ]
+ svx-sdrobjeditview-update-edit-area.diff, n#305205, n#347355, rodo
+ goodies-eps-filter-unix.diff, n#200053, rodo
++# allow to start OOo on cifs; do not truncate the files there
++backport-ftruncate-check.diff, i#108106, cmc
+
+ [ EMFPlus ]
+ SectionOwner => rodo
+diff --git a/patches/dev300/backport-ftruncate-check.diff
b/patches/dev300/backport-ftruncate-check.diff
+new file mode 100644
+index 0000000..ceb2d5c
+--- /dev/null
++++
openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/backport-ftruncate-check.diff
+@@ -0,0 +1,27 @@
++diff -r 28ba3ecf6c22 -r db44de918518
bridges/source/cpp_uno/shared/vtablefactory.cxx
++--- bridges/source/cpp_uno/shared/vtablefactory.cxx Mon Oct 12 09:26:03
2009 +0000
+++++ bridges/source/cpp_uno/shared/vtablefactory.cxx Mon Oct 12 13:29:25
2009 +0000
++@@ -272,7 +272,7 @@
++ char *tmpfname = new char[aTmpName.getLength()+1];
++ strncpy(tmpfname, aTmpName.getStr(), aTmpName.getLength()+1);
++ if ((block.fd = mkstemp(tmpfname)) == -1)
++- perror("creation of executable memory area failed");
+++ perror("creation of executable memory area failed");
++ if (block.fd == -1)
++ {
++ delete[] tmpfname;
++@@ -280,7 +280,13 @@
++ }
++ unlink(tmpfname);
++ delete[] tmpfname;
++- ftruncate(block.fd, block.size);
+++ if (ftruncate(block.fd, block.size) == -1)
+++ {
+++ perror("truncation of executable memory area failed");
+++ close(block.fd);
+++ block.fd = -1;
+++ break;
+++ }
++ block.start = mmap(NULL, block.size, PROT_READ | PROT_WRITE,
MAP_SHARED, block.fd, 0);
++ if (block.start== MAP_FAILED) {
++ block.start = 0;
=== added file 'patches/fix-incorrect-automatic-print-area-assignment.diff'
--- a/patches/fix-incorrect-automatic-print-area-assignment.diff
1970-01-01 00:00:00 +0000
+++ b/patches/fix-incorrect-automatic-print-area-assignment.diff
2010-06-03 19:58:55 +0000
@@ -0,0 +1,15 @@
+diff --git a/patches/dev300/calc-perf-extend-print-area.diff
b/patches/dev300/calc-perf-extend-print-area.diff
+index 04337c4..72d864e 100644
+---
openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/calc-perf-extend-print-area.diff
++++
openoffice.org-3.2.1/ooo-build-3-2-1-3/patches/dev300/calc-perf-extend-print-area.diff
+@@ -231,8 +231,8 @@ index e55582b..614a9b5 100644
+ + pCell = aIter.next();
+ }
+ +
+-+ rEndCol = nPrintCol;
+-+ return;
+++ if (nPrintCol > rEndCol)
+++ rEndCol = nPrintCol;
+ }
+ + nCol = aColData.mnCol1; // move toward 0.
+ }
=== modified file 'patches/series'
--- a/patches/series 2010-06-01 13:11:46 +0000
+++ b/patches/series 2010-06-03 19:58:55 +0000
@@ -1,1 +1,3 @@
hu-translation-fixes.diff
+backport-ftruncate-check.diff
+fix-incorrect-automatic-print-area-assignment.diff
