Add openssh
[kopensolaris-gnu/patches.git] / firebird2.0.diff
1 diff -uraN firebird2.0-2.0.4.13130-1.ds1.orig/debian/patches/fix-os-detection.patch firebird2.0-2.0.4.13130-1.ds1/debian/patches/fix-os-detection.patch
2 --- firebird2.0-2.0.4.13130-1.ds1.orig/debian/patches/fix-os-detection.patch    2008-09-27 21:11:44.000000000 -0400
3 +++ firebird2.0-2.0.4.13130-1.ds1/debian/patches/fix-os-detection.patch 2008-09-27 21:11:58.496902067 -0400
4 @@ -5,7 +5,7 @@
5       ;;
6   
7  -  x86_64*-*-linux*)
8 -+  x86_64*-*-linux* | x86_64*-*-gnu* | x86_64*-*-k*bsd*-gnu)
9 ++  x86_64*-*-linux* | x86_64*-*-gnu* | x86_64*-*-k*bsd*-gnu | x86_64*-*-kopensolaris*-gnu)
10       MAKEFILE_PREFIX=linux_amd64
11       INSTALL_PREFIX=linux
12       PLATFORM=LINUX
13 @@ -14,7 +14,7 @@
14       ;;
15   
16  -  sparc*-*-linux*)
17 -+  sparc*-*-linux* | sparc*-*-gnu* | sparc*-*-k*bsd*-gnu)
18 ++  sparc*-*-linux* | sparc*-*-gnu* | sparc*-*-k*bsd*-gnu | sparc*-*-kopensolaris*-gnu)
19       MAKEFILE_PREFIX=linux_sparc32
20       INSTALL_PREFIX=linux
21       PLATFORM=LINUX
22 @@ -23,7 +23,7 @@
23       ;;
24   
25  -  *-*-linux*)
26 -+  *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu)
27 ++  *-*-linux* | *-*-gnu* | *-*-k*bsd*-gnu | *-*-kopensolaris*-gnu)
28       MAKEFILE_PREFIX=linux_generic
29       INSTALL_PREFIX=linux
30       PLATFORM=LINUX
31 diff -uraN firebird2.0-2.0.4.13130-1.ds1.orig/debian/patches/kopensolaris-gun.diff firebird2.0-2.0.4.13130-1.ds1/debian/patches/kopensolaris-gun.diff
32 --- firebird2.0-2.0.4.13130-1.ds1.orig/debian/patches/kopensolaris-gun.diff     1969-12-31 19:00:00.000000000 -0500
33 +++ firebird2.0-2.0.4.13130-1.ds1/debian/patches/kopensolaris-gun.diff  2008-09-27 21:20:37.056358051 -0400
34 @@ -0,0 +1,50 @@
35 +--- a/src/config/ScanDir.cpp
36 ++++ b/src/config/ScanDir.cpp
37 +@@ -148,10 +148,12 @@
38 + #else
39 + #ifndef SOLARIS
40 + #ifndef HPUX
41 ++#ifndef __OpenSolaris_kernel__
42 +       if (data->d_type == DT_DIR)
43 +               return true;
44 + #endif
45 + #endif
46 ++#endif
47
48 +       struct stat buf;
49
50 +--- a/src/gpre/cob.cpp
51 ++++ b/src/gpre/cob.cpp
52 +@@ -126,7 +126,7 @@
53 + static const char* const COMMIT                       = "commit";
54 + static const char* const ROLLBACK             = "rollback";
55
56 +-#if defined AIX || defined AIX_PPC || defined SOLARIS || defined HP10 || defined HP11 || defined SINIXZ || defined LINUX || defined DARWIN || defined FREEBSD || defined NETBSD || defined WIN_NT
57 ++#if defined AIX || defined AIX_PPC || defined SOLARIS || defined HP10 || defined HP11 || defined SINIXZ || defined LINUX || defined DARWIN || defined FREEBSD || defined NETBSD || defined WIN_NT || defined __OpenSolaris_kernel__
58 + static const char* const OMITTED              = "BY VALUE 0";
59 + static const char* const BY_VALUE             = "BY VALUE ";
60 + static const char* const END_VALUE            = "";
61 +--- a/src/jrd/gds.cpp
62 ++++ b/src/jrd/gds.cpp
63 +@@ -3536,7 +3536,7 @@
64 + #ifdef UNIX
65 +       gds_pid = getpid();
66 + #ifdef SUPERSERVER
67 +-#if (defined SOLARIS || defined HPUX || defined LINUX)
68 ++#if (defined SOLARIS || defined HPUX || defined LINUX || defined __OpenSolaris_kernel__)
69 +       {
70 +               /* Increase max open files to hard limit for Unix
71 +                  platforms which are known to have low soft limits. */
72 +--- a/src/jrd/license.h
73 ++++ b/src/jrd/license.h
74 +@@ -91,6 +91,10 @@
75 + #endif
76 + #endif /* sun */
77
78 ++#ifndef __OpenSolaris_kernel__
79 ++#define FB_PLATFORM "SO"
80 ++#endif
81 ++
82 + #ifdef VMS
83 + #ifdef __ALPHA
84 + #define FB_PLATFORM     "AV"
85 diff -uraN firebird2.0-2.0.4.13130-1.ds1.orig/debian/patches/series firebird2.0-2.0.4.13130-1.ds1/debian/patches/series
86 --- firebird2.0-2.0.4.13130-1.ds1.orig/debian/patches/series    2008-09-27 21:11:44.000000000 -0400
87 +++ firebird2.0-2.0.4.13130-1.ds1/debian/patches/series 2008-09-27 21:17:28.917365503 -0400
88 @@ -12,6 +12,7 @@
89  use-debian-icu.patch
90  use-debian-editline.patch
91  cvs-powerpc-double-define.patch
92 +kopensolaris-gun.diff
93  port-mipsel.patch
94  port-mips.patch
95  port-arm.patch