Author: branden
Date: 2005-05-25 01:54:33 -0500 (Wed, 25 May 2005)
New Revision: 2269
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/patches/000_stolen_from_xorg.diff
Log:
Grab fixes from freedesktop.org xorg CVS that make the DPMS extension
header (dpms.h) and Xpm library header file (xpm.h) usable with C++ code
by using the _XFUNCPROTO{BEGIN,END} macros instead of nothing at all (in
the DPMS case) or a literal 'extern "C" {' construct (in the XPM case).
C++ applications using the DPMS headers were likely to crash; see
<URL: https://bugs.freedesktop.org/show_bug.cgi?id=830 >. The DPMS fix
also adds a header self-inclusion guard to dpms.h.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-05-25 06:37:19 UTC (rev 2268)
+++ trunk/debian/CHANGESETS 2005-05-25 06:54:33 UTC (rev 2269)
@@ -20,4 +20,13 @@
000_stolen_from_HEAD.diff at the top of the file.
2268
+Grab fixes from freedesktop.org xorg CVS that make the DPMS extension
+header (dpms.h) and Xpm library header file (xpm.h) usable with C++ code
+by using the _XFUNCPROTO{BEGIN,END} macros instead of nothing at all (in
+the DPMS case) or a literal 'extern "C" {' construct (in the XPM case).
+C++ applications using the DPMS headers were likely to crash; see
+<URL: https://bugs.freedesktop.org/show_bug.cgi?id=830 >. The DPMS fix
+also adds a header self-inclusion guard to dpms.h.
+ 2269
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-05-25 06:37:19 UTC (rev 2268)
+++ trunk/debian/TODO 2005-05-25 06:54:33 UTC (rev 2269)
@@ -17,17 +17,6 @@
4.3.0.dfsg.1-14
---------------
* Grab Xpm library fixes from freedesktop.org xorg CVS:
- * xc/extras/Xpm/lib/xpm.h
- Bugzilla #830 (https://bugs.freedesktop.org/show_bug.cgi?id=830)
- attachment #1493 (https://bugs.freedesktop.org/attachment.cgi?id=1493):
- Fix libXpm header (xpm.h) to use the X11 function begin/end marker
- macros (_XFUNCPROTOBEGIN, _XFUNCPROTOEND) instead of homegrown
- (native) C++ code.
- Patch by Kevin DeKorte <[EMAIL PROTECTED]>.
-
- Changes needed:
- xc/extras/Xpm/lib/xpm.h 1.2 -> 1.3
-
+ Replace security-flawed s_popen() fix for CAN-2004-0914 with better fix by
Alex Reisen and Matthieu Herrb.
* extras/Xpm/lib/RdFToI.c:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-05-25 06:37:19 UTC (rev 2268)
+++ trunk/debian/changelog 2005-05-25 06:54:33 UTC (rev 2269)
@@ -12,8 +12,16 @@
* Fix grammar error in Spanish debconf template translations (thanks, Steve
Langasek). (Closes: #309450)
- -- Branden Robinson <[EMAIL PROTECTED]> Tue, 17 May 2005 19:01:32 -0500
+ * Grab fixes from freedesktop.org xorg CVS that make the DPMS extension
+ header (dpms.h) and Xpm library header file (xpm.h) usable with C++ code
+ by using the _XFUNCPROTO{BEGIN,END} macros instead of nothing at all (in
+ the DPMS case) or a literal 'extern "C" {' construct (in the XPM case).
+ C++ applications using the DPMS headers were likely to crash; see
+ <URL: https://bugs.freedesktop.org/show_bug.cgi?id=830 >. The DPMS fix
+ also adds a header self-inclusion guard to dpms.h.
+ -- Branden Robinson <[EMAIL PROTECTED]> Wed, 25 May 2005 01:45:55 -0500
+
xfree86 (4.3.0.dfsg.1-13) unstable; urgency=high
Urgency set to high due to fix for security flaw CAN-2005-0605 (see below).
Modified: trunk/debian/patches/000_stolen_from_xorg.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_xorg.diff 2005-05-25 06:37:19 UTC
(rev 2268)
+++ trunk/debian/patches/000_stolen_from_xorg.diff 2005-05-25 06:54:33 UTC
(rev 2269)
@@ -37,6 +37,24 @@
flush to ensure the icache is coherent when modules
are loaded (Alex Williamson). [Egbert Eich]
+xc/include/extensions/dpms.h @ 1.3
+ 2004-12-07 Roland Mainz <[EMAIL PROTECTED]>
+ * xc/include/extensions/dpms.h
+ Bugzilla #830 (https://bugs.freedesktop.org/show_bug.cgi?id=830):
+ Get DPMS header file (include/extensions/dpms.h) working with C++
+ applications.
+ Patch by Kevin DeKorte <[EMAIL PROTECTED]> and Roland
+ Mainz <[EMAIL PROTECTED]>.
+
+xc/extras/Xpm/lib/xpm.h @ 1.3
+ 2004-12-07 Roland Mainz <[EMAIL PROTECTED]>
+ * xc/extras/Xpm/lib/xpm.h
+ Bugzilla #830 (https://bugs.freedesktop.org/show_bug.cgi?id=830):
+ Fix libXpm header (xpm.h) to use the X11 function begin/end marker
+ macros (_XFUNCPROTOBEGIN, _XFUNCPROTOEND) instead of homegrown
+ (native) C++ code.
+ Patch by Kevin DeKorte <[EMAIL PROTECTED]>.
+
diff -Naurd xc.orig/programs/Xserver/hw/xfree86/common/xf86str.h
xc/programs/Xserver/hw/xfree86/common/xf86str.h
--- xc.orig/programs/Xserver/hw/xfree86/common/xf86str.h 2004-09-15
10:05:46.000000000 +0000
+++ xc/programs/Xserver/hw/xfree86/common/xf86str.h 2004-09-15
10:14:05.000000000 +0000
@@ -484,3 +502,59 @@
break;
#endif
case SHT_SYMTAB:
+--- xc/include/extensions/dpms.h~ 2005-05-25 01:42:55.393907910 -0500
++++ xc/include/extensions/dpms.h 2005-05-25 01:43:05.857875701 -0500
+@@ -28,6 +28,9 @@
+ ******************************************************************/
+ /* $XFree86: xc/include/extensions/dpms.h,v 3.5 2001/01/17 17:53:20 dawes Exp
$ */
+
++#ifndef _X11_EXTENSIONS_DPMS_H
++#define _X11_EXTENSIONS_DPMS_H 1
++
+ /*
+ * HISTORY
+ */
+@@ -46,6 +49,8 @@
+ #include <X11/X.h>
+ #include <X11/Xmd.h>
+
++_XFUNCPROTOBEGIN
++
+ extern Bool DPMSQueryExtension(Display *, int *, int *);
+ extern Status DPMSGetVersion(Display *, int *, int *);
+ extern Bool DPMSCapable(Display *);
+@@ -55,6 +60,8 @@
+ extern Status DPMSDisable(Display *);
+ extern Status DPMSForceLevel(Display *, CARD16);
+ extern Status DPMSInfo(Display *, CARD16 *, BOOL *);
+-#endif
+
++_XFUNCPROTOEND
++#endif /* !DPMS_SERVER */
++#endif /* !_X11_EXTENSIONS_DPMS_H */
+
+--- xc/extras/Xpm/lib/xpm.h~ 2005-05-25 01:34:38.697475999 -0500
++++ xc/extras/Xpm/lib/xpm.h 2005-05-25 01:35:29.022204683 -0500
+@@ -303,9 +303,7 @@
+ * functions declarations
+ */
+
+-#ifdef __cplusplus
+-extern "C" {
+-#endif
++_XFUNCPROTOBEGIN
+
+ /* FOR_MSW, all ..Pixmap.. are excluded, only the ..XImage.. are used */
+ /* Same for Amiga! */
+@@ -459,10 +457,7 @@
+
+ FUNC(XpmFree, void, (void *ptr));
+
+-#ifdef __cplusplus
+-} /* for C++ V2.0 */
+-#endif
+-
++_XFUNCPROTOEND
+
+ /* backward compatibility */
+
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
