------------------------------------------------------------
revno: 588
committer: Rene Engelhard <[EMAIL PROTECTED]>
branch nick: etch
timestamp: Mon 2007-06-25 00:44:07 +0200
message:
changes for -7etch1
modified:
changelog
control
rules
=== modified file 'changelog'
--- a/changelog 2007-03-30 09:17:28 +0000
+++ b/changelog 2007-06-24 22:44:07 +0000
@@ -1,8 +1,17 @@
-openoffice.org (2.0.4.dfsg.2-5etch1) testing-security; urgency=high
-
- * rebuild for testing as neon will block 2.0.4.dfsg.2-6 in sid..
-
- -- Rene Engelhard <[EMAIL PROTECTED]> Wed, 21 Mar 2007 08:40:04 +0000
+openoffice.org (2.0.4.dfsg.2-7etch1) stable-security; urgency=high
+
+ * ooo-build/patches/src680/sw.rtf.prtdata.diff: fix RTF parser heap
+ overflow (CVE-2007-0244)
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 9 Apr 2007 20:13:23 +0200
+
+openoffice.org (2.0.4.dfsg.2-7) unstable; urgency=high
+
+ * merge from openofficeorg--experimental--2.2.0:
+ - revert to build with libneon25
+ (closes: #406926, #396094, #401286, #410917)
+
+ -- Rene Engelhard <[EMAIL PROTECTED]> Mon, 2 Apr 2007 22:11:54 +0200
openoffice.org (2.0.4.dfsg.2-6) unstable; urgency=high
=== modified file 'control'
--- a/control 2007-02-20 09:48:11 +0000
+++ b/control 2007-06-24 22:44:07 +0000
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian OpenOffice Team <debian-openoffice@lists.debian.org>
Uploaders: Chris Halls <[EMAIL PROTECTED]>, Rene Engelhard <[EMAIL PROTECTED]>
-Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
amd64], flex [i386 powerpc sparc amd64], libpam0g-dev [i386 powerpc sparc
amd64], libxaw7-dev [i386 powerpc sparc amd64], unzip [i386 powerpc sparc
amd64], zip [i386 powerpc sparc amd64], autoconf [i386 powerpc sparc amd64],
sharutils [i386 powerpc sparc amd64], libgtk2.0-dev [i386 powerpc sparc amd64],
pkg-config [i386 powerpc sparc amd64], xutils [i386 powerpc sparc amd64],
libfontconfig1-dev [i386 powerpc sparc amd64], binutils (>= 2.14.90.0.6-3)
[sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64],
libfreetype6-dev [i386 powerpc sparc amd64], libaudio-dev [i386 powerpc sparc
amd64], libx11-dev [i386 powerpc sparc amd64], libsm-dev [i386 powerpc sparc
amd64], libxt-dev [i386 powerpc sparc amd64], libxext-dev [i386 powerpc sparc
amd64], libice-dev [i386 powerpc sparc amd64], libsane-dev [i386 powerpc sparc
amd64], libxrender-dev [i386 powerpc sparc amd64], libcupsys2-dev [i386 powerpc
sparc amd64], libarchive-zip-perl [i386 powerpc sparc amd64],
libstartup-notification0-dev [i386 powerpc sparc amd64], libpng12-dev [i386
powerpc sparc amd64], libjpeg62-dev [i386 powerpc sparc amd64], libxml2-dev
[i386 powerpc sparc amd64], dmake (>= 1:4.6) [i386 powerpc sparc amd64],
libldap2-dev [i386 powerpc sparc amd64], libexpat1-dev [i386 powerpc sparc
amd64], libgnomevfs2-dev [i386 powerpc sparc amd64], fastjar [i386 powerpc
sparc amd64], libsndfile1-dev [i386 powerpc sparc amd64], xsltproc [i386
powerpc sparc amd64], imagemagick [i386 powerpc sparc amd64], fdupes [i386
powerpc sparc amd64], xml-core [i386 powerpc sparc amd64], ,
libcurl3-openssl-dev [i386 powerpc sparc amd64] , libxkbfile-dev [i386 powerpc
sparc amd64], libxinerama-dev [i386 powerpc sparc amd64], x11proto-render-dev
[i386 powerpc sparc amd64] , unixodbc-dev (>= 2.2.11) [i386 powerpc sparc
amd64] , libdb4.4-dev [i386 powerpc sparc amd64] , python-central (>= 0.5)
[i386 powerpc sparc amd64], debhelper (>= 5.0.37.2), python-dev (>= 2.4) [i386
powerpc sparc amd64] , dpkg-dev (>= 1.13.19) , java-gcj-compat-dev (>=
1.0.65-4) [i386 powerpc sparc amd64] , ant (>= 1.6.5) [i386 powerpc sparc
amd64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64] ,
libxerces2-java [i386 powerpc sparc amd64] , libxalan2-java (>= 2.6.0-1) [i386
powerpc sparc amd64] , libdb4.4-java [i386 powerpc sparc amd64] , mingw32 [i386
powerpc sparc amd64] , libxul-dev [i386 powerpc sparc amd64], libnss3-dev [i386
powerpc sparc amd64] , libhunspell-dev (>= 1.0.8-3) [i386 powerpc sparc amd64]
, libaltlinuxhyph-dev (>= 0.1.1-7) [i386 powerpc sparc amd64] ,
libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64] , libboost-dev [i386
powerpc sparc amd64] , libportaudio-dev [i386 powerpc sparc amd64] ,
libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64] , libicu36-dev [i386
powerpc sparc amd64] , libxslt1-dev [i386 powerpc sparc amd64] , libcairo2-dev
[i386 powerpc sparc amd64], libglitz-glx1-dev [i386 powerpc sparc amd64] ,
mdbtools-dev (>= 0.5.99.0.6pre1.0.20050409-1) [i386 powerpc sparc amd64] ,
kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64] , libhsqldb-java (>=
1.8.0.0-2) [i386 powerpc sparc amd64] , bsh (>= 2.0b4-1) [i386 powerpc sparc
amd64] , liblpsolve55-dev [i386 powerpc sparc amd64], libufsparse-dev [i386
powerpc sparc amd64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64]
, libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64] , libneon26-dev
[i386 powerpc sparc amd64]
+Build-Depends: lsb-release, bzip2, bison (>= 1:1.875a-1) [i386 powerpc sparc
amd64], flex [i386 powerpc sparc amd64], libpam0g-dev [i386 powerpc sparc
amd64], libxaw7-dev [i386 powerpc sparc amd64], unzip [i386 powerpc sparc
amd64], zip [i386 powerpc sparc amd64], autoconf [i386 powerpc sparc amd64],
sharutils [i386 powerpc sparc amd64], libgtk2.0-dev [i386 powerpc sparc amd64],
pkg-config [i386 powerpc sparc amd64], xutils [i386 powerpc sparc amd64],
libfontconfig1-dev [i386 powerpc sparc amd64], binutils (>= 2.14.90.0.6-3)
[sparc], libc6 (>= 2.3.2-1) [powerpc], zlib1g-dev [i386 powerpc sparc amd64],
libfreetype6-dev [i386 powerpc sparc amd64], libaudio-dev [i386 powerpc sparc
amd64], libx11-dev [i386 powerpc sparc amd64], libsm-dev [i386 powerpc sparc
amd64], libxt-dev [i386 powerpc sparc amd64], libxext-dev [i386 powerpc sparc
amd64], libice-dev [i386 powerpc sparc amd64], libsane-dev [i386 powerpc sparc
amd64], libxrender-dev [i386 powerpc sparc amd64], libcupsys2-dev [i386 powerpc
sparc amd64], libarchive-zip-perl [i386 powerpc sparc amd64],
libstartup-notification0-dev [i386 powerpc sparc amd64], libpng12-dev [i386
powerpc sparc amd64], libjpeg62-dev [i386 powerpc sparc amd64], libxml2-dev
[i386 powerpc sparc amd64], dmake (>= 1:4.6) [i386 powerpc sparc amd64],
libldap2-dev [i386 powerpc sparc amd64], libexpat1-dev [i386 powerpc sparc
amd64], libgnomevfs2-dev [i386 powerpc sparc amd64], fastjar [i386 powerpc
sparc amd64], libsndfile1-dev [i386 powerpc sparc amd64], xsltproc [i386
powerpc sparc amd64], imagemagick [i386 powerpc sparc amd64], fdupes [i386
powerpc sparc amd64], xml-core [i386 powerpc sparc amd64], ,
libcurl3-openssl-dev [i386 powerpc sparc amd64] , libxkbfile-dev [i386 powerpc
sparc amd64], libxinerama-dev [i386 powerpc sparc amd64], x11proto-render-dev
[i386 powerpc sparc amd64] , unixodbc-dev (>= 2.2.11) [i386 powerpc sparc
amd64] , libdb4.4-dev [i386 powerpc sparc amd64] , python-central (>= 0.5)
[i386 powerpc sparc amd64], debhelper (>= 5.0.37.2), python-dev (>= 2.4) [i386
powerpc sparc amd64] , dpkg-dev (>= 1.13.19) , java-gcj-compat-dev (>=
1.0.65-4) [i386 powerpc sparc amd64] , ant (>= 1.6.5) [i386 powerpc sparc
amd64] , libxt-java (>= 0.20050823) [i386 powerpc sparc amd64] ,
libxerces2-java [i386 powerpc sparc amd64] , libxalan2-java (>= 2.6.0-1) [i386
powerpc sparc amd64] , libdb4.4-java [i386 powerpc sparc amd64] , mingw32 [i386
powerpc sparc amd64] , libxul-dev [i386 powerpc sparc amd64], libnss3-dev [i386
powerpc sparc amd64] , libhunspell-dev (>= 1.0.8-3) [i386 powerpc sparc amd64]
, libaltlinuxhyph-dev (>= 0.1.1-7) [i386 powerpc sparc amd64] ,
libstlport4.6-dev (>= 4.6.2-3) [i386 powerpc sparc amd64] , libboost-dev [i386
powerpc sparc amd64] , libportaudio-dev [i386 powerpc sparc amd64] ,
libwpd8-dev (>= 0.8.3-3) [i386 powerpc sparc amd64] , libicu36-dev [i386
powerpc sparc amd64] , libxslt1-dev [i386 powerpc sparc amd64] , libcairo2-dev
[i386 powerpc sparc amd64], libglitz-glx1-dev [i386 powerpc sparc amd64] ,
mdbtools-dev (>= 0.5.99.0.6pre1.0.20050409-1) [i386 powerpc sparc amd64] ,
kdelibs4-dev (>= 4:3.4.3-2) [i386 powerpc sparc amd64] , libhsqldb-java (>=
1.8.0.0-2) [i386 powerpc sparc amd64] , bsh (>= 2.0b4-1) [i386 powerpc sparc
amd64] , liblpsolve55-dev [i386 powerpc sparc amd64], libufsparse-dev [i386
powerpc sparc amd64] , libdbus-glib-1-dev (>= 0.60) [i386 powerpc sparc amd64]
, libgstreamer-plugins-base0.10-dev [i386 powerpc sparc amd64] , libneon25-dev
[i386 powerpc sparc amd64]
Standards-Version: 3.7.2
XS-Python-Version: current
=== modified file 'rules'
--- a/rules 2007-03-30 09:17:28 +0000
+++ b/rules 2007-06-24 22:44:07 +0000
@@ -608,8 +608,8 @@
ifeq "$(SARGE_BACKPORT)" "y"
BUILD_DEPS += , libneon24-dev [$(OOO_ARCHS)]
else
- BUILD_DEPS += , libneon26-dev [$(OOO_ARCHS)]
- DBG_DBG_SUGGESTS+= , libneon26-dbg
+ BUILD_DEPS += , libneon25-dev [$(OOO_ARCHS)]
+ DBG_DBG_SUGGESTS+= , libneon25-dbg
endif
CONFIGURE_FLAGS += --with-system-neon
endif
