[Lsb-messages] /var/www/bzr/lsb/devel/appbat r967: Patch Xaw, openglut, openssl, curl for FD* move in 5.0 (bug 3172)

Stew Benedict stewb at linux-foundation.org
Mon Jun 11 12:34:34 UTC 2012


------------------------------------------------------------
revno: 967
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: appbat
timestamp: Mon 2012-06-11 08:34:34 -0400
message:
  Patch Xaw, openglut, openssl, curl for FD* move in 5.0 (bug 3172)
modified:
  extras/md5sums
  patches/curl-7.19.7.patch
  patches/freeglut-2.4.0.patch
  patches/libXaw-1.0.7.patch
  patches/openssl-0.9.7m.patch
-------------- next part --------------
=== modified file 'extras/md5sums'
--- a/extras/md5sums	2012-06-08 20:20:19 +0000
+++ b/extras/md5sums	2012-06-11 12:34:34 +0000
@@ -66,8 +66,8 @@
 9f6162590ef6b9c8b543bc9c55d438fe  pidgin-2.6.3.patch
 254a72fc67505e3aa52884c729cd7b97  leafpad-0.8.18.1.tar.gz
 990c5d04bd515bd534d810a1ab9fd233  scribus-1.3.3.12.patch
-e7ad62916887df0a5f9d867eb08017da  openssl-0.9.7m.patch
-dfdc5d10161f46a595287becfcac210d  freeglut-2.4.0.patch
+0ac66bcebed1768703cae61c948a1975  openssl-0.9.7m.patch
+5610f5924a237386a2fe4864d3385e55  freeglut-2.4.0.patch
 095c4625c578cbbc7f830cefdfc60261  jpeg-6b.patch
 7eb4cc0531fe8346511a385eb4749051  tiff-3.9.2.patch
 307e698d6b74ce1562b6745d169bf6eb  libpng-1.2.18.patch
@@ -88,9 +88,9 @@
 fc0198982058294af8cd23dbcf19babc  groff-1.19.2.patch
 32b4ee1a3bcb558f8b43b76be8b6e183  gnupg-1.4.9-gcc43.patch
 66f6afbbf73781258f827b3fa8834697  lua-5.1.4.patch
-77a3aeb4918caf960e7199371c68d4d0  curl-7.19.7.patch
+950f01d55d08e4c3a95b8260b984d46e  curl-7.19.7.patch
 e290f2c190a43e1df933da5dcaba61aa  libXmu-1.0.5.patch
 5e6e0d07a20ff76e34f9753fe9a36ecd  libXau-1.0.5.patch
 d4a2abfc94282109b220dea11e8315ba  libXp-1.0.0.patch
 deb216053844465854fa2e9305c3574f  xorg-cf-files-1.0.3.patch
-cd99995d86fbb9f65dd7408a2ee50209  libXaw-1.0.7.patch
+0b468bf7cd90912a49f7ce5bef71f9fb  libXaw-1.0.7.patch

=== modified file 'patches/curl-7.19.7.patch'
--- a/patches/curl-7.19.7.patch	2009-11-25 17:57:53 +0000
+++ b/patches/curl-7.19.7.patch	2012-06-11 12:34:34 +0000
@@ -1,3 +1,15 @@
+This patch includes changes to source files in order to create a
+LSB compliant version of libXaw. Here are descriptions of the changes:
+
+- include/curl/curl.h
+
+     LSB SDK moved FD* from sys/types.h to sys/select.h as of 5.0
+     include the latter so the build finds the macros/typedefs
+
+- configure
+
+     don't modify LD_LIBRARY_PATH for openssl detection
+
 diff -up curl-7.19.7/configure.lsbcc curl-7.19.7/configure
 --- curl-7.19.7/configure.lsbcc	2009-11-25 12:54:03.000000000 -0500
 +++ curl-7.19.7/configure	2009-11-25 12:54:42.000000000 -0500
@@ -10,3 +22,14 @@
         export LD_LIBRARY_PATH
         { $as_echo "$as_me:${as_lineno-$LINENO}: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&5
  $as_echo "$as_me: Added $LIB_OPENSSL to LD_LIBRARY_PATH" >&6;}
+diff -up curl-7.19.7/include/curl/curl.h.lsbcc2 curl-7.19.7/include/curl/curl.h
+--- curl-7.19.7/include/curl/curl.h.lsbcc2	2012-06-11 08:21:49.979486676 -0400
++++ curl-7.19.7/include/curl/curl.h	2012-06-11 08:22:13.038486685 -0400
+@@ -57,6 +57,7 @@
+ 
+ /* The include stuff here below is mainly for time_t! */
+ #include <sys/types.h>
++#include <sys/select.h>
+ #include <time.h>
+ 
+ #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__) && \

=== modified file 'patches/freeglut-2.4.0.patch'
--- a/patches/freeglut-2.4.0.patch	2009-11-06 20:46:31 +0000
+++ b/patches/freeglut-2.4.0.patch	2012-06-11 12:34:34 +0000
@@ -19,6 +19,10 @@
         Modify the makefile to add -std=c99 to the CFLAGS so freeglut
         will compile correctly with gcc4.
 
+- src/freeglut_main.c
+
+	LSB SDK moved FD* from sys/types.h to sys/select.h for 5.0
+	Include the latter so the macros/typedefs can be found
 
 diff -up freeglut-2.4.0/configure.lsbcc freeglut-2.4.0/configure
 --- freeglut-2.4.0/configure.lsbcc	2009-11-06 14:34:09.000000000 -0500
@@ -97,3 +101,14 @@
  DIST_SOURCES = $(lib at LIBRARY@_la_SOURCES)
  HEADERS = $(noinst_HEADERS)
  
+diff -up freeglut-2.4.0/src/freeglut_main.c.lsbcc2 freeglut-2.4.0/src/freeglut_main.c
+--- freeglut-2.4.0/src/freeglut_main.c.lsbcc2	2012-06-11 07:57:38.717486063 -0400
++++ freeglut-2.4.0/src/freeglut_main.c	2012-06-11 07:57:57.980486065 -0400
+@@ -29,6 +29,7 @@
+ #include "freeglut_internal.h"
+ #include <errno.h>
+ #include <stdarg.h>
++#include <sys/select.h>
+ #if TARGET_HOST_WIN32
+ #    define VFPRINTF(s,f,a) vfprintf((s),(f),(a))
+ #else

=== modified file 'patches/libXaw-1.0.7.patch'
--- a/patches/libXaw-1.0.7.patch	2010-03-06 11:33:55 +0000
+++ b/patches/libXaw-1.0.7.patch	2012-06-11 12:34:34 +0000
@@ -1,5 +1,30 @@
---- libXaw-1.0.7/src/X11/CompositeP.h.lsbcc	2010-03-05 14:39:27.000000000 -0500
-+++ libXaw-1.0.7/src/X11/CompositeP.h	2010-03-05 14:39:27.000000000 -0500
+This patch includes changes to source files in order to create a
+LSB compliant version of libXaw. Here are descriptions of the changes:
+
+- src/TextAction.c
+
+     LSB SDK moved FD* from sys/types.h to sys/select.h as of 5.0
+     include the latter so the build finds the macros/typedefs
+
+- src/X11/*.h
+
+    patched in copies of X include files that are not part of LSB
+    required though to build libXaw
+
+diff -up libXaw-1.0.7/src/TextAction.c.lsbcc libXaw-1.0.7/src/TextAction.c
+--- libXaw-1.0.7/src/TextAction.c.lsbcc	2012-06-11 07:48:55.148485844 -0400
++++ libXaw-1.0.7/src/TextAction.c	2012-06-11 07:49:17.894485853 -0400
+@@ -32,6 +32,7 @@ in this Software without prior written a
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <sys/select.h>
+ #include <X11/Xos.h>		/* for select() and struct timeval */
+ #include <ctype.h>
+ #include <X11/IntrinsicP.h>
+diff -up /dev/null libXaw-1.0.7/src/X11/CompositeP.h
+--- /dev/null	2012-06-10 06:45:59.935041008 -0400
++++ libXaw-1.0.7/src/X11/CompositeP.h	2012-06-11 07:46:43.602485788 -0400
 @@ -0,0 +1,111 @@
 +/* $Xorg: CompositeP.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
 +
@@ -112,8 +137,9 @@
 +
 +#endif /* _XtCompositeP_h */
 +/* DON'T ADD STUFF AFTER THIS #endif */
---- libXaw-1.0.7/src/X11/ConstrainP.h.lsbcc	2010-03-05 14:39:27.000000000 -0500
-+++ libXaw-1.0.7/src/X11/ConstrainP.h	2010-03-05 14:39:27.000000000 -0500
+diff -up /dev/null libXaw-1.0.7/src/X11/ConstrainP.h
+--- /dev/null	2012-06-10 06:45:59.935041008 -0400
++++ libXaw-1.0.7/src/X11/ConstrainP.h	2012-06-11 07:46:43.602485788 -0400
 @@ -0,0 +1,94 @@
 +/* $Xorg: ConstrainP.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
 +/* $oHeader: ConstrainP.h,v 1.2 88/08/18 15:54:15 asente Exp $ */
@@ -209,8 +235,9 @@
 +
 +#endif /* _XtConstraintP_h */
 +/* DON'T ADD STUFF AFTER THIS #endif */
---- libXaw-1.0.7/src/X11/Constraint.h.lsbcc	2010-03-05 14:39:27.000000000 -0500
-+++ libXaw-1.0.7/src/X11/Constraint.h	2010-03-05 14:39:27.000000000 -0500
+diff -up /dev/null libXaw-1.0.7/src/X11/Constraint.h
+--- /dev/null	2012-06-10 06:45:59.935041008 -0400
++++ libXaw-1.0.7/src/X11/Constraint.h	2012-06-11 07:46:43.620485788 -0400
 @@ -0,0 +1,60 @@
 +/* $Xorg: Constraint.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $ */
 +/* $oHeader: Constraint.h,v 1.2 88/08/18 15:54:18 asente Exp $ */
@@ -272,8 +299,9 @@
 +
 +#endif /* _XtConstraint_h */
 +/* DON'T ADD STUFF AFTER THIS #endif */
---- libXaw-1.0.7/src/X11/CoreP.h.lsbcc	2010-03-05 14:39:27.000000000 -0500
-+++ libXaw-1.0.7/src/X11/CoreP.h	2010-03-05 14:39:27.000000000 -0500
+diff -up /dev/null libXaw-1.0.7/src/X11/CoreP.h
+--- /dev/null	2012-06-10 06:45:59.935041008 -0400
++++ libXaw-1.0.7/src/X11/CoreP.h	2012-06-11 07:46:43.655485787 -0400
 @@ -0,0 +1,171 @@
 +/*
 +* $Xorg: CoreP.h,v 1.4 2001/02/09 02:03:54 xorgcvs Exp $
@@ -446,8 +474,9 @@
 +
 +#endif /* _XtCoreP_h */
 +/* DON'T ADD STUFF AFTER THIS #endif */
---- libXaw-1.0.7/src/X11/Intrinsic.h.lsbcc	2010-03-05 14:39:27.000000000 -0500
-+++ libXaw-1.0.7/src/X11/Intrinsic.h	2010-03-05 14:39:27.000000000 -0500
+diff -up /dev/null libXaw-1.0.7/src/X11/Intrinsic.h
+--- /dev/null	2012-06-10 06:45:59.935041008 -0400
++++ libXaw-1.0.7/src/X11/Intrinsic.h	2012-06-11 07:46:43.681485787 -0400
 @@ -0,0 +1,2589 @@
 +/* $Xorg: Intrinsic.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */
 +
@@ -3038,8 +3067,9 @@
 +
 +#endif /*_XtIntrinsic_h*/
 +/* DON'T ADD STUFF AFTER THIS #endif */
---- libXaw-1.0.7/src/X11/IntrinsicP.h.lsbcc	2010-03-05 14:39:27.000000000 -0500
-+++ libXaw-1.0.7/src/X11/IntrinsicP.h	2010-03-05 14:39:27.000000000 -0500
+diff -up /dev/null libXaw-1.0.7/src/X11/IntrinsicP.h
+--- /dev/null	2012-06-10 06:45:59.935041008 -0400
++++ libXaw-1.0.7/src/X11/IntrinsicP.h	2012-06-11 07:46:43.687485787 -0400
 @@ -0,0 +1,327 @@
 +/* $Xorg: IntrinsicP.h,v 1.4 2001/02/09 02:03:55 xorgcvs Exp $ */
 +
@@ -3368,8 +3398,9 @@
 +
 +#endif /* _XtIntrinsicP_h */
 +/* DON'T ADD STUFF AFTER THIS #endif */
---- libXaw-1.0.7/src/X11/Object.h.lsbcc	2010-03-05 14:39:27.000000000 -0500
-+++ libXaw-1.0.7/src/X11/Object.h	2010-03-05 14:39:27.000000000 -0500
+diff -up /dev/null libXaw-1.0.7/src/X11/Object.h
+--- /dev/null	2012-06-10 06:45:59.935041008 -0400
++++ libXaw-1.0.7/src/X11/Object.h	2012-06-11 07:46:43.696485787 -0400
 @@ -0,0 +1,60 @@
 +/* $Xorg: Object.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
 +/* $oHeader: Object.h,v 1.2 88/08/18 15:55:32 asente Exp $ */
@@ -3431,8 +3462,9 @@
 +#endif
 +#endif /* _XtObject_h */
 +/* DON'T ADD STUFF AFTER THIS #endif */
---- libXaw-1.0.7/src/X11/ObjectP.h.lsbcc	2010-03-05 14:39:27.000000000 -0500
-+++ libXaw-1.0.7/src/X11/ObjectP.h	2010-03-05 14:39:27.000000000 -0500
+diff -up /dev/null libXaw-1.0.7/src/X11/ObjectP.h
+--- /dev/null	2012-06-10 06:45:59.935041008 -0400
++++ libXaw-1.0.7/src/X11/ObjectP.h	2012-06-11 07:46:43.713485787 -0400
 @@ -0,0 +1,139 @@
 +/* $Xorg: ObjectP.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
 +
@@ -3573,8 +3605,9 @@
 +#define XtInheritDeallocate ((XtDeallocateProc) _XtInherit)
 +
 +#endif /*_Xt_ObjectP_h_*/
---- libXaw-1.0.7/src/X11/RectObj.h.lsbcc	2010-03-05 14:39:27.000000000 -0500
-+++ libXaw-1.0.7/src/X11/RectObj.h	2010-03-05 14:39:27.000000000 -0500
+diff -up /dev/null libXaw-1.0.7/src/X11/RectObj.h
+--- /dev/null	2012-06-10 06:45:59.935041008 -0400
++++ libXaw-1.0.7/src/X11/RectObj.h	2012-06-11 07:46:43.730485787 -0400
 @@ -0,0 +1,60 @@
 +/* $Xorg: RectObj.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
 +/* $oHeader: RectObj.h,v 1.2 88/08/18 17:39:17 asente Exp $ */
@@ -3636,8 +3669,9 @@
 +#endif
 +#endif /* _XtRect_h */
 +/* DON'T ADD STUFF AFTER THIS #endif */
---- libXaw-1.0.7/src/X11/RectObjP.h.lsbcc	2010-03-05 14:39:27.000000000 -0500
-+++ libXaw-1.0.7/src/X11/RectObjP.h	2010-03-05 14:39:27.000000000 -0500
+diff -up /dev/null libXaw-1.0.7/src/X11/RectObjP.h
+--- /dev/null	2012-06-10 06:45:59.935041008 -0400
++++ libXaw-1.0.7/src/X11/RectObjP.h	2012-06-11 07:46:43.738485787 -0400
 @@ -0,0 +1,129 @@
 +/* $Xorg: RectObjP.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
 +/* $oHeader: RectObjP.h,v 1.2 88/08/18 15:55:52 asente Exp $ */
@@ -3768,8 +3802,113 @@
 +externalref RectObjClassRec rectObjClassRec;
 +
 +#endif /*_Xt_RectObjP_h_*/
---- libXaw-1.0.7/src/X11/Shell.h.lsbcc	2010-03-05 14:39:27.000000000 -0500
-+++ libXaw-1.0.7/src/X11/Shell.h	2010-03-05 14:39:27.000000000 -0500
+diff -up /dev/null libXaw-1.0.7/src/X11/ResourceI.h
+--- /dev/null	2012-06-10 06:45:59.935041008 -0400
++++ libXaw-1.0.7/src/X11/ResourceI.h	2012-06-11 07:46:43.797485787 -0400
+@@ -0,0 +1,100 @@
++/* $Xorg: ResourceI.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
++
++/***********************************************************
++
++Copyright 1987, 1988, 1994, 1998  The Open Group
++
++Permission to use, copy, modify, distribute, and sell this software and its
++documentation for any purpose is hereby granted without fee, provided that
++the above copyright notice appear in all copies and that both that
++copyright notice and this permission notice appear in supporting
++documentation.
++
++The above copyright notice and this permission notice shall be included in
++all copies or substantial portions of the Software.
++
++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
++OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
++AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
++CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++
++Except as contained in this notice, the name of The Open Group shall not be
++used in advertising or otherwise to promote the sale, use or other dealings
++in this Software without prior written authorization from The Open Group.
++
++
++Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
++
++                        All Rights Reserved
++
++Permission to use, copy, modify, and distribute this software and its
++documentation for any purpose and without fee is hereby granted,
++provided that the above copyright notice appear in all copies and that
++both that copyright notice and this permission notice appear in
++supporting documentation, and that the name of Digital not be
++used in advertising or publicity pertaining to distribution of the
++software without specific, written prior permission.
++
++DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
++ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
++DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
++ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
++WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
++ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
++SOFTWARE.
++
++******************************************************************/
++/* $XFree86: xc/lib/Xt/ResourceI.h,v 1.5 2001/12/14 19:56:28 dawes Exp $ */
++
++/****************************************************************
++ *
++ * Resources
++ *
++ ****************************************************************/
++
++#ifndef _XtresourceI_h
++#define _XtresourceI_h
++
++#define StringToQuark(string) XrmStringToQuark(string)
++#define StringToName(string) XrmStringToName(string)
++#define StringToClass(string) XrmStringToClass(string)
++
++extern void _XtDependencies(
++    XtResourceList  * /* class_resp */,
++    Cardinal	    * /* class_num_resp */,
++    XrmResourceList * /* super_res */,
++    Cardinal	     /* super_num_res */,
++    Cardinal	     /* super_widget_size */);
++
++extern void _XtResourceDependencies(
++    WidgetClass  /* wc */
++);
++
++extern void _XtConstraintResDependencies(
++    ConstraintWidgetClass  /* wc */
++);
++
++extern XtCacheRef* _XtGetResources(
++    Widget	    /* w */,
++    ArgList	    /* args */,
++    Cardinal	    /* num_args */,
++    XtTypedArgList  /* typed_args */,
++    Cardinal*	    /* num_typed_args */
++);
++
++extern void _XtCopyFromParent(
++    Widget		/* widget */,
++    int			/* offset */,
++    XrmValue*		/* value */
++);
++
++extern void _XtCopyToArg(char *src, XtArgVal *dst, unsigned int size);
++extern void _XtCopyFromArg(XtArgVal src, char *dst, unsigned int size);
++extern XrmResourceList* _XtCreateIndirectionTable(XtResourceList resources,
++						  Cardinal num_resources);
++extern void _XtResourceListInitialize(void);
++
++
++#endif /* _XtresourceI_h */
+diff -up /dev/null libXaw-1.0.7/src/X11/Shell.h
+--- /dev/null	2012-06-10 06:45:59.935041008 -0400
++++ libXaw-1.0.7/src/X11/Shell.h	2012-06-11 07:46:43.750485787 -0400
 @@ -0,0 +1,567 @@
 +/* $Xorg: Shell.ht,v 1.5 2001/02/09 02:03:59 xorgcvs Exp $ */
 +
@@ -4338,8 +4477,9 @@
 +
 +#endif /* _XtShell_h */
 +/* DON'T ADD STUFF AFTER THIS #endif */
---- libXaw-1.0.7/src/X11/ShellP.h.lsbcc	2010-03-05 14:39:27.000000000 -0500
-+++ libXaw-1.0.7/src/X11/ShellP.h	2010-03-05 14:39:27.000000000 -0500
+diff -up /dev/null libXaw-1.0.7/src/X11/ShellP.h
+--- /dev/null	2012-06-10 06:45:59.935041008 -0400
++++ libXaw-1.0.7/src/X11/ShellP.h	2012-06-11 07:46:43.764485787 -0400
 @@ -0,0 +1,428 @@
 +/* $Xorg: ShellP.h,v 1.4 2001/02/09 02:03:58 xorgcvs Exp $ */
 +
@@ -4769,8 +4909,9 @@
 +} SessionShellRec, *SessionShellWidget;
 +
 +#endif /* _XtShellPrivate_h */
---- libXaw-1.0.7/src/X11/Vendor.h.lsbcc	2010-03-05 14:39:27.000000000 -0500
-+++ libXaw-1.0.7/src/X11/Vendor.h	2010-03-05 14:39:27.000000000 -0500
+diff -up /dev/null libXaw-1.0.7/src/X11/Vendor.h
+--- /dev/null	2012-06-10 06:45:59.935041008 -0400
++++ libXaw-1.0.7/src/X11/Vendor.h	2012-06-11 07:46:43.772485787 -0400
 @@ -0,0 +1,71 @@
 +/*
 +* $Xorg: Vendor.h,v 1.5 2001/02/09 02:03:59 xorgcvs Exp $
@@ -4843,8 +4984,9 @@
 +
 +#endif /* _XtVendor_h */
 +/* DON'T ADD STUFF AFTER THIS #endif */
---- libXaw-1.0.7/src/X11/VendorP.h.lsbcc	2010-03-05 14:39:27.000000000 -0500
-+++ libXaw-1.0.7/src/X11/VendorP.h	2010-03-05 14:39:27.000000000 -0500
+diff -up /dev/null libXaw-1.0.7/src/X11/VendorP.h
+--- /dev/null	2012-06-10 06:45:59.935041008 -0400
++++ libXaw-1.0.7/src/X11/VendorP.h	2012-06-11 07:46:43.789485786 -0400
 @@ -0,0 +1,103 @@
 +/*
 +* $Xorg: VendorP.h,v 1.4 2001/02/09 02:03:59 xorgcvs Exp $
@@ -4949,111 +5091,9 @@
 +} VendorShellRec, *VendorShellWidget;
 +
 +#endif  /* _XtVendorPrivate_h */
---- libXaw-1.0.7/src/X11/ResourceI.h.lsbcc	2010-03-05 14:40:11.000000000 -0500
-+++ libXaw-1.0.7/src/X11/ResourceI.h	2010-03-05 14:39:57.000000000 -0500
-@@ -0,0 +1,100 @@
-+/* $Xorg: ResourceI.h,v 1.4 2001/02/09 02:03:56 xorgcvs Exp $ */
-+
-+/***********************************************************
-+
-+Copyright 1987, 1988, 1994, 1998  The Open Group
-+
-+Permission to use, copy, modify, distribute, and sell this software and its
-+documentation for any purpose is hereby granted without fee, provided that
-+the above copyright notice appear in all copies and that both that
-+copyright notice and this permission notice appear in supporting
-+documentation.
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-+OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+Except as contained in this notice, the name of The Open Group shall not be
-+used in advertising or otherwise to promote the sale, use or other dealings
-+in this Software without prior written authorization from The Open Group.
-+
-+
-+Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
-+
-+                        All Rights Reserved
-+
-+Permission to use, copy, modify, and distribute this software and its
-+documentation for any purpose and without fee is hereby granted,
-+provided that the above copyright notice appear in all copies and that
-+both that copyright notice and this permission notice appear in
-+supporting documentation, and that the name of Digital not be
-+used in advertising or publicity pertaining to distribution of the
-+software without specific, written prior permission.
-+
-+DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-+ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-+DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-+ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-+WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-+ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-+SOFTWARE.
-+
-+******************************************************************/
-+/* $XFree86: xc/lib/Xt/ResourceI.h,v 1.5 2001/12/14 19:56:28 dawes Exp $ */
-+
-+/****************************************************************
-+ *
-+ * Resources
-+ *
-+ ****************************************************************/
-+
-+#ifndef _XtresourceI_h
-+#define _XtresourceI_h
-+
-+#define StringToQuark(string) XrmStringToQuark(string)
-+#define StringToName(string) XrmStringToName(string)
-+#define StringToClass(string) XrmStringToClass(string)
-+
-+extern void _XtDependencies(
-+    XtResourceList  * /* class_resp */,
-+    Cardinal	    * /* class_num_resp */,
-+    XrmResourceList * /* super_res */,
-+    Cardinal	     /* super_num_res */,
-+    Cardinal	     /* super_widget_size */);
-+
-+extern void _XtResourceDependencies(
-+    WidgetClass  /* wc */
-+);
-+
-+extern void _XtConstraintResDependencies(
-+    ConstraintWidgetClass  /* wc */
-+);
-+
-+extern XtCacheRef* _XtGetResources(
-+    Widget	    /* w */,
-+    ArgList	    /* args */,
-+    Cardinal	    /* num_args */,
-+    XtTypedArgList  /* typed_args */,
-+    Cardinal*	    /* num_typed_args */
-+);
-+
-+extern void _XtCopyFromParent(
-+    Widget		/* widget */,
-+    int			/* offset */,
-+    XrmValue*		/* value */
-+);
-+
-+extern void _XtCopyToArg(char *src, XtArgVal *dst, unsigned int size);
-+extern void _XtCopyFromArg(XtArgVal src, char *dst, unsigned int size);
-+extern XrmResourceList* _XtCreateIndirectionTable(XtResourceList resources,
-+						  Cardinal num_resources);
-+extern void _XtResourceListInitialize(void);
-+
-+
-+#endif /* _XtresourceI_h */
---- libXaw-1.0.7/src/X11/Xresource.h.lsbcc	2010-03-05 14:40:16.000000000 -0500
-+++ libXaw-1.0.7/src/X11/Xresource.h	2010-03-05 14:40:04.000000000 -0500
+diff -up /dev/null libXaw-1.0.7/src/X11/Xresource.h
+--- /dev/null	2012-06-10 06:45:59.935041008 -0400
++++ libXaw-1.0.7/src/X11/Xresource.h	2012-06-11 07:46:43.805485787 -0400
 @@ -0,0 +1,360 @@
 +/* $Xorg: Xresource.h,v 1.7 2001/02/09 02:03:39 xorgcvs Exp $ */
 +

=== modified file 'patches/openssl-0.9.7m.patch'
--- a/patches/openssl-0.9.7m.patch	2008-07-01 15:36:09 +0000
+++ b/patches/openssl-0.9.7m.patch	2012-06-11 12:34:34 +0000
@@ -23,6 +23,11 @@
 
      Avoid installing the openssl documentation.
 
+- apps/s_{server,client,time}.c
+
+     LSB SDK moved FD* from sys/types.h to sys/select.h as of 5.0
+     include the latter so the build finds the macros/typedefs
+
 --- openssl-0.9.7m.orig/Configure	2008-06-30 23:31:09 +0000
 +++ openssl-0.9.7m/Configure	2008-06-30 23:36:54 +0000
 @@ -142,8 +142,8 @@
@@ -195,3 +200,36 @@
  # define TERMIO
  # undef  SGTTY
 
+diff -up openssl-0.9.7m/apps/s_client.c.lsbcc2 openssl-0.9.7m/apps/s_client.c
+--- openssl-0.9.7m/apps/s_client.c.lsbcc2	2012-06-11 08:09:53.208486373 -0400
++++ openssl-0.9.7m/apps/s_client.c	2012-06-11 08:10:18.873486384 -0400
+@@ -113,6 +113,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/select.h>
+ #include <openssl/e_os2.h>
+ #ifdef OPENSSL_NO_STDIO
+ #define APPS_WIN16
+diff -up openssl-0.9.7m/apps/s_server.c.lsbcc2 openssl-0.9.7m/apps/s_server.c
+--- openssl-0.9.7m/apps/s_server.c.lsbcc2	2012-06-11 08:07:54.431486324 -0400
++++ openssl-0.9.7m/apps/s_server.c	2012-06-11 08:08:15.419486332 -0400
+@@ -114,6 +114,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <sys/types.h>
++#include <sys/select.h>
+ #include <sys/stat.h>
+ #include <openssl/e_os2.h>
+ #ifdef OPENSSL_NO_STDIO
+diff -up openssl-0.9.7m/apps/s_time.c.lsbcc2 openssl-0.9.7m/apps/s_time.c
+--- openssl-0.9.7m/apps/s_time.c.lsbcc2	2012-06-11 08:10:31.447486389 -0400
++++ openssl-0.9.7m/apps/s_time.c	2012-06-11 08:10:51.217486396 -0400
+@@ -66,6 +66,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/select.h>
+ 
+ #define USE_SOCKETS
+ #include "apps.h"



More information about the lsb-messages mailing list