1 files changed, 0 insertions, 53 deletions
diff --git a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
deleted file mode 100644
index dabec32c6a..0000000000
--- a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-removes kerberos completely to avoid conflicts with installed kerberos
--- configure.in.orig   2007-01-05 19:42:26.418541610 +0200
-+++ configure.in        2007-01-05 19:42:56.604261797 +0200
-@@ -436,47 +436,6 @@
- ])
- AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes)
- AC_SUBST(CDDA_LIBS)
-
-dnl GSSAPI
-dnl Check for Kerberos installation
-have_gssapi=no
-AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
-                                          
-if test "x$KRB5_CONFIG" != "xnone"; then
-   GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
-   GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
-   
-   saved_CPPFLAGS="$CPPFLAGS"
-   saved_LIBS="$LIBS"
-   LIBS="$LIBS $GSSAPI_LIBS"
-   CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
-   # MIT and Heimdal put gssapi.h in different places
-   AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [
-       AC_CHECK_FUNCS(gss_init_sec_context, [
-           AC_MSG_NOTICE([GSSAPI authentication support enabled])
-           AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled])
-           AC_CHECK_HEADERS(gssapi/gssapi_generic.h)
-                have_gssapi=yes
-        
-       # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE
-       AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],,
-          [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name, 
-             [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise])
-               ], [
-                   #ifdef HAVE_GSSAPI_GSSAPI_H
-                   #include <gssapi/gssapi.h>
-                   #else          
-                   #include <gssapi.h>
-                   #endif
-               ])
-         ])
-     break
-   ])
-   LIBS="$saved_LIBS" 
-   CPPFLAGS="$saved_CPPFLAGS" 
-fi   
-AC_SUBST(GSSAPI_LIBS)
-AC_SUBST(GSSAPI_CFLAGS)
-           
- dnl ******************************
- dnl http-method (neon checks)

diff --git a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch deleted file mode 100644 index dabec32c6a..0000000000 --- a/meta/recipes-gnome/gnome/gnome-vfs-2.24.4/gnome-vfs-no-kerberos.patch +++ /dev/null
@@ -1,53 +0,0 @@
1	Upstream-Status: Inappropriate [configuration]
2
3	removes kerberos completely to avoid conflicts with installed kerberos
4	--- configure.in.orig 2007-01-05 19:42:26.418541610 +0200
5	+++ configure.in 2007-01-05 19:42:56.604261797 +0200
6	@@ -436,47 +436,6 @@
7	])
8	AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes)
9	AC_SUBST(CDDA_LIBS)
10	-
11	-dnl GSSAPI
12	-dnl Check for Kerberos installation
13	-have_gssapi=no
14	-AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
15	-
16	-if test "x$KRB5_CONFIG" != "xnone"; then
17	- GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`"
18	- GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`"
19	-
20	- saved_CPPFLAGS="$CPPFLAGS"
21	- saved_LIBS="$LIBS"
22	- LIBS="$LIBS $GSSAPI_LIBS"
23	- CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS"
24	- # MIT and Heimdal put gssapi.h in different places
25	- AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [
26	- AC_CHECK_FUNCS(gss_init_sec_context, [
27	- AC_MSG_NOTICE([GSSAPI authentication support enabled])
28	- AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled])
29	- AC_CHECK_HEADERS(gssapi/gssapi_generic.h)
30	- have_gssapi=yes
31	-
32	- # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE
33	- AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],,
34	- [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name,
35	- [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise])
36	- ], [
37	- #ifdef HAVE_GSSAPI_GSSAPI_H
38	- #include <gssapi/gssapi.h>
39	- #else
40	- #include <gssapi.h>
41	- #endif
42	- ])
43	- ])
44	- break
45	- ])
46	- LIBS="$saved_LIBS"
47	- CPPFLAGS="$saved_CPPFLAGS"
48	-fi
49	-AC_SUBST(GSSAPI_LIBS)
50	-AC_SUBST(GSSAPI_CFLAGS)
51
52	dnl ******************************
53	dnl http-method (neon checks)