Mercurial Mercurial > upstream > oracle > userland-gate / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
components/subversion/patches/001-configure.patch
author Mike Sullivan <Mike.Sullivan@Oracle.COM>
Thu, 14 Apr 2016 16:43:46 -0700
changeset 5778 d4593dbbc6ce
parent 5771 990bebf35fb9
child 5854 a31f17a6ce08
permissions -rw-r--r--
backout 22853244 - needs more work
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
5778
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
     1
 
# Internal patch.
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
     2
 
# apr-config and apu-config use the wrong options
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
     3
 
# neon library pkg-config should not print the library path
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
     4
 
# Our Kerberos installation is not 100% compatible with MIT-Kerberos
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
     5
 
--- configure	2014-12-08 23:32:25.000000000 -0800
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
     6
 
+++ configure	2015-01-20 10:36:42.439487008 -0800
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
     7
 
@@ -4686,14 +4686,14 @@
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     8
 
   fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
     9
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    10
 
   if test "$enable_all_static" = "yes"; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    11
 
-    SVN_APR_LIBS="`$apr_config --link-ld --libs`"
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    12
 
+    SVN_APR_LIBS="`$apr_config --link-libtool --libs`"
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    13
 
     if test $? -ne 0; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    14
 
-      as_fn_error $? "apr-config --link-ld --libs failed" "$LINENO" 5
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    15
 
+      as_fn_error $? "apr-config --link-libtool --libs failed" "$LINENO" 5
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    16
 
     fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    17
 
   else
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    18
 
-    SVN_APR_LIBS="`$apr_config --link-ld`"
3865
10347aa825d2 19476174 upgrade Subversion to 1.7.19
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1493
diff changeset 
    19
 
+    SVN_APR_LIBS="`$apr_config --link-libtool`"
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    20
 
     if test $? -ne 0; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    21
 
-      as_fn_error $? "apr-config --link-ld failed" "$LINENO" 5
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    22
 
+      as_fn_error $? "apr-config --link-libtool failed" "$LINENO" 5
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    23
 
     fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    24
 
   fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    25
 
   SVN_APR_LIBS="`
5778
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    26
 
@@ -5089,14 +5089,14 @@
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    27
 
   fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    28
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    29
 
   if test "$enable_all_static" = "yes"; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    30
 
-    SVN_APRUTIL_LIBS="`$apu_config --link-ld --libs`"
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    31
 
+    SVN_APRUTIL_LIBS="`$apu_config --link-libtool --libs`"
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    32
 
     if test $? -ne 0; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    33
 
-      as_fn_error $? "apu-config --link-ld --libs failed" "$LINENO" 5
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    34
 
+      as_fn_error $? "apu-config --link-libtool --libs failed" "$LINENO" 5
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    35
 
     fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    36
 
   else
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    37
 
-    SVN_APRUTIL_LIBS="`$apu_config --link-ld`"
3865
10347aa825d2 19476174 upgrade Subversion to 1.7.19
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1493
diff changeset 
    38
 
+    SVN_APRUTIL_LIBS="`$apu_config --link-libtool`"
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    39
 
     if test $? -ne 0; then
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    40
 
-      as_fn_error $? "apu-config --link-ld failed" "$LINENO" 5
3865
10347aa825d2 19476174 upgrade Subversion to 1.7.19
Stefan Teleman <stefan.teleman@oracle.com>
parents: 1493
diff changeset 
    41
 
+      as_fn_error $? "apu-config --link-libtool failed" "$LINENO" 5
845
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    42
 
     fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    43
 
   fi
f38158deaa77 7075156 Upgrade Subversion to 1.7.5
Stefan Teleman <stefan.teleman@oracle.com>
parents:
diff changeset 
    44
 
   SVN_APRUTIL_LIBS="`
5778
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    45
 
@@ -5300,6 +5300,8 @@
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    46
 
               old_CFLAGS="$CFLAGS"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    47
 
               old_LIBS="$LIBS"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    48
 
               NEON_LIBS=`$PKG_CONFIG neon --libs`
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    49
 
+              NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    50
 
+              NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    51
 
               CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    52
 
               LIBS="$LIBS $NEON_LIBS"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    53
 
               neon_test_code="
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    54
 
@@ -5320,6 +5322,8 @@
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    55
 
     conftest$ac_exeext conftest.$ac_ext
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    56
 
               if test "$shared_linking" = "no"; then
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    57
 
                 NEON_LIBS=`$PKG_CONFIG neon --libs --static`
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    58
 
+                NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    59
 
+                NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    60
 
                 LIBS="$LIBS $NEON_LIBS"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    61
 
                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    62
 
 /* end confdefs.h.  */
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    63
 
@@ -5481,6 +5485,8 @@
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    64
 
               old_CFLAGS="$CFLAGS"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    65
 
               old_LIBS="$LIBS"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    66
 
               NEON_LIBS=`$PKG_CONFIG neon --libs`
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    67
 
+              NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    68
 
+              NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    69
 
               CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    70
 
               LIBS="$LIBS $NEON_LIBS"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    71
 
               neon_test_code="
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    72
 
@@ -5501,6 +5507,8 @@
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    73
 
     conftest$ac_exeext conftest.$ac_ext
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    74
 
               if test "$shared_linking" = "no"; then
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    75
 
                 NEON_LIBS=`$PKG_CONFIG neon --libs --static`
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    76
 
+                NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    77
 
+                NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    78
 
                 LIBS="$LIBS $NEON_LIBS"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    79
 
                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    80
 
 /* end confdefs.h.  */
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    81
 
@@ -5576,9 +5584,9 @@
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    82
 
 fi
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    83
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    84
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    85
 
-
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    86
 
-
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    87
 
-
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    88
 
+NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    89
 
+NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    90
 
+export NEON_LIBS
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    91
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    92
 
 if test "$svn_lib_neon" = "yes"; then
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    93
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    94
 
@@ -6106,11 +6114,11 @@
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    95
 
       old_CFLAGS="$CFLAGS"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    96
 
       old_LIBS="$LIBS"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    97
 
       CFLAGS=""
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    98
 
-      SVN_GSSAPI_INCLUDES="`$KRB5_CONFIG --cflags`"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
    99
 
-      SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs gssapi`"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
   100
 
+      SVN_GSSAPI_INCLUDES="-I/usr/include/gssapi -I/usr/include/kerberosv5"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
   101
 
+      SVN_GSSAPI_LIBS="-lgss"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
   102
 
       if test $? -ne 0; then
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
   103
 
-                                SVN_GSSAPI_INCLUDES="$SVN_GSSAPI_INCLUDES -I/usr/include/gssapi"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
   104
 
-        SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs krb5` -lgss"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
   105
 
+        SVN_GSSAPI_INCLUDES="-I/usr/include/gssapi -I/usr/include/kerberosv5"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
   106
 
+        SVN_GSSAPI_LIBS="-lgss"
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
   107
 
         if test $? -ne 0; then
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
   108
 
                     as_fn_error $? "krb5-config returned an error" "$LINENO" 5
d4593dbbc6ce backout 22853244 - needs more work
Mike Sullivan <Mike.Sullivan@Oracle.COM>
parents: 5771
diff changeset 
   109
 
         fi
upstream/oracle/userland-gate