rev 3966 - trunk/packages/wv2/debian

Christopher Martin chrsmrtn at costa.debian.org
Sat Jun 17 23:01:36 UTC 2006


Author: chrsmrtn
Date: 2006-06-17 23:01:34 +0000 (Sat, 17 Jun 2006)
New Revision: 3966

Modified:
   trunk/packages/wv2/debian/changelog
   trunk/packages/wv2/debian/control
   trunk/packages/wv2/debian/rules
Log:
Changelog update for upload.

Also, in debian/rules, ensure that our CFLAGS are
passed to configure.


Modified: trunk/packages/wv2/debian/changelog
===================================================================
--- trunk/packages/wv2/debian/changelog	2006-06-17 22:59:49 UTC (rev 3965)
+++ trunk/packages/wv2/debian/changelog	2006-06-17 23:01:34 UTC (rev 3966)
@@ -1,11 +1,20 @@
-wv2 (0.2.2-6) UNRELEASED; urgency=low
+wv2 (0.2.2-6) unstable; urgency=medium
 
+  +++ Changes by Christopher Martin:
+
+  * Add a patch which fixes CVE-2006-2197, missing boundary checks which could
+    allow the execution of arbitrary code. Urgency medium.
+
+  * Revamp patch system; should make further updates easier.
+
+  * Set Uploaders to the standard Qt/KDE team list.
+
   +++ Changes by Pierre Habouzit:
 
-  * add -DNDEBUG in the CFLAGS (no more horribly verbose debug output on
-    stderr, see wvlog.h), (Closes: #329109)
+  * Add -DNDEBUG in the CFLAGS (no more horribly verbose debug output on
+    stderr; see wvlog.h). (Closes: #329109)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 Mar 2006 14:45:05 -0500
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 Jun 2006 19:00:35 -0400
 
 wv2 (0.2.2-5) unstable; urgency=low
 

Modified: trunk/packages/wv2/debian/control
===================================================================
--- trunk/packages/wv2/debian/control	2006-06-17 22:59:49 UTC (rev 3965)
+++ trunk/packages/wv2/debian/control	2006-06-17 23:01:34 UTC (rev 3966)
@@ -9,7 +9,7 @@
 Package: libwv2-1c2
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends} ${misc:Depends}
+Depends: ${shlibs:Depends}
 Conflicts: libwv2-1
 Replaces: libwv2-1
 Description: a library for accessing Microsoft Word documents

Modified: trunk/packages/wv2/debian/rules
===================================================================
--- trunk/packages/wv2/debian/rules	2006-06-17 22:59:49 UTC (rev 3965)
+++ trunk/packages/wv2/debian/rules	2006-06-17 23:01:34 UTC (rev 3966)
@@ -8,13 +8,14 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = -Wall -g -DNDEBUG
+OPTFLAGS = -Wall -g -DNDEBUG
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+	OPTFLAGS += -O0
 else
-	CFLAGS += -O2
+	OPTFLAGS += -O2
 endif
+
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
 endif
@@ -26,7 +27,9 @@
 	dh_testdir
 
 	# Add here commands to configure the package.
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	CFLAGS="$(OPTFLAGS)" CXXFLAGS="$(OPTFLAGS)" ./configure \
+	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+	--prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
 	touch configure-stamp
 




More information about the pkg-kde-commits mailing list