17230899 Enable Kerberos (GSSAPI) in Subversion s11-update
authorStefan Teleman <stefan.teleman@oracle.com>
Mon, 28 Oct 2013 17:52:58 -0700
branchs11-update
changeset 2804 7546c836fd87
parent 2803 39768512073b
child 2805 4888f6212f94
17230899 Enable Kerberos (GSSAPI) in Subversion
components/subversion/Makefile
components/subversion/patches/001-configure.patch
components/subversion/resolve.deps
--- a/components/subversion/Makefile	Mon Oct 28 11:54:26 2013 -0700
+++ b/components/subversion/Makefile	Mon Oct 28 17:52:58 2013 -0700
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
@@ -112,6 +112,7 @@
 CONFIGURE_OPTIONS += --enable-javahl
 CONFIGURE_OPTIONS += --with-swig
 CONFIGURE_OPTIONS += --with-neon=$(CONFIGURE_PREFIX)
+CONFIGURE_OPTIONS += --with-gssapi=$(CONFIGURE_PREFIX)
 
 # common targets - we only build 32-bit subversion
 build:		$(BUILD_32)
--- a/components/subversion/patches/001-configure.patch	Mon Oct 28 11:54:26 2013 -0700
+++ b/components/subversion/patches/001-configure.patch	Mon Oct 28 17:52:58 2013 -0700
@@ -1,5 +1,5 @@
 --- configure	2012-05-10 11:52:02.000000000 -0700
-+++ configure	2012-05-21 11:21:44.053205016 -0700
++++ configure	2013-03-20 14:20:04.139519952 -0700
 @@ -4686,14 +4686,14 @@
    fi
  
@@ -38,3 +38,73 @@
      fi
    fi
    SVN_APRUTIL_LIBS="`
[email protected]@ -5300,6 +5300,8 @@
+               old_CFLAGS="$CFLAGS"
+               old_LIBS="$LIBS"
+               NEON_LIBS=`$PKG_CONFIG neon --libs`
++              NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
++              NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
+               CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
+               LIBS="$LIBS $NEON_LIBS"
+               neon_test_code="
[email protected]@ -5320,6 +5322,8 @@
+     conftest$ac_exeext conftest.$ac_ext
+               if test "$shared_linking" = "no"; then
+                 NEON_LIBS=`$PKG_CONFIG neon --libs --static`
++		NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
++		NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
+                 LIBS="$LIBS $NEON_LIBS"
+                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
[email protected]@ -5481,6 +5485,8 @@
+               old_CFLAGS="$CFLAGS"
+               old_LIBS="$LIBS"
+               NEON_LIBS=`$PKG_CONFIG neon --libs`
++	      NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
++	      NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
+               CFLAGS="$CFLAGS $SVN_NEON_INCLUDES"
+               LIBS="$LIBS $NEON_LIBS"
+               neon_test_code="
[email protected]@ -5501,6 +5507,8 @@
+     conftest$ac_exeext conftest.$ac_ext
+               if test "$shared_linking" = "no"; then
+                 NEON_LIBS=`$PKG_CONFIG neon --libs --static`
++		NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
++		NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
+                 LIBS="$LIBS $NEON_LIBS"
+                 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
[email protected]@ -5520,6 +5528,8 @@
+               SVN_NEON_INCLUDES=`$neon_config --cflags | $SED -e 's/-D[^ ]*//g'`
+               CFLAGS="$CFLAGS `$neon_config --cflags | $SED -e 's/-I[^ ]*//g'`"
+               NEON_LIBS=`$neon_config --libs`
++	      NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
++	      NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
+             fi
+             svn_lib_neon="yes"
+             break
[email protected]@ -5576,8 +5586,9 @@
+ fi
+ 
+ 
+-
+-
++NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-m32##g'`
++NEON_LIBS=`echo ${NEON_LIBS} | sed -e 's#-L/usr/lib##g'`
++export NEON_LIBS
+ 
+ 
+ if test "$svn_lib_neon" = "yes"; then
+--- configure	2013-07-29 12:50:28.716771506 -0700
++++ configure	2013-07-29 13:04:59.668934315 -0700
[email protected]@ -6098,8 +6098,8 @@
+       old_CFLAGS="$CFLAGS"
+       old_LIBS="$LIBS"
+       CFLAGS=""
+-      SVN_GSSAPI_INCLUDES="`$KRB5_CONFIG --cflags`"
+-      SVN_GSSAPI_LIBS="`$KRB5_CONFIG --libs gssapi`"
++      SVN_GSSAPI_INCLUDES="-I/usr/include/gssapi -I/usr/include/kerberos5"
++      SVN_GSSAPI_LIBS="-lgss"
+       SVN_GSSAPI_LIBS="`
+   input_flags="$SVN_GSSAPI_LIBS"
+   output_flags=""
--- a/components/subversion/resolve.deps	Mon Oct 28 11:54:26 2013 -0700
+++ b/components/subversion/resolve.deps	Mon Oct 28 17:52:58 2013 -0700
@@ -7,3 +7,4 @@
 library/zlib
 system/library
 system/library/c++-runtime
+system/library/security/gss