Merge branch 'master' of git+ssh://openadk.org/git/openadk

Conflicts:
	BUGS
	package/autoconf/Makefile

9 files changed, 37 insertions, 83 deletions

diff --git a/package/krb5/patches/patch-src_Makefile_in b/package/krb5/patches/patch-src_Makefile_in
index 01533ad39..ef48b68ed 100644
--- a/package/krb5/patches/patch-src_Makefile_in
+++ b/package/krb5/patches/patch-src_Makefile_in
@@ -1,10 +1,9 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- krb5-1.6.3.orig/src/Makefile.in	2007-09-18 05:38:17.000000000 +0200
-+++ krb5-1.6.3/src/Makefile.in	2009-01-29 11:50:21.000000000 +0100
-@@ -7,7 +7,6 @@ mydir=.
- SUBDIRS=util include lib @krb524@ kdc kadmin @ldap_plugin_dir@ slave clients \
+--- krb5-1.7.orig/src/Makefile.in	Wed Apr 15 22:07:03 2009
++++ krb5-1.7/src/Makefile.in	Mon Dec 28 16:13:47 2009
+@@ -13,7 +13,6 @@ SUBDIRS=util include lib kdc kadmin @ldap_plugin_dir@ 
  	plugins/kdb/db2 \
  	plugins/preauth/pkinit \
+ 	plugins/preauth/encrypted_challenge \
 -	appl tests \
  	config-files gen-manpages
  BUILDTOP=$(REL)$(C)
diff --git a/package/krb5/patches/patch-src_include_stock_osconf_h b/package/krb5/patches/patch-src_include_osconf_hin
index b774623fa..834f28292 100644
--- a/package/krb5/patches/patch-src_include_stock_osconf_h
+++ b/package/krb5/patches/patch-src_include_osconf_hin
@@ -1,7 +1,6 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- krb5-1.6.3.orig/src/include/stock/osconf.h	2006-05-26 01:37:33.000000000 +0200
-+++ krb5-1.6.3/src/include/stock/osconf.h	2009-02-03 19:13:37.508177540 +0100
-@@ -60,14 +60,14 @@
+--- krb5-1.7.orig/src/include/osconf.hin	2009-01-31 04:57:20.000000000 +0100
++++ krb5-1.7/src/include/osconf.hin	2009-11-01 11:41:43.171362928 +0100
+@@ -61,14 +61,14 @@
  #define	DEFAULT_LNAME_FILENAME	"@PREFIX/lib/krb5.aname"
  #endif /* _WINDOWS  */
  
@@ -21,7 +20,7 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
  #define	KDC_PROFILE_ENV		"KRB5_KDC_PROFILE"
  
  #if TARGET_OS_MAC
-@@ -96,8 +96,8 @@
+@@ -97,8 +97,8 @@
  /*
   * Defaults for the KADM5 admin system.
   */
@@ -31,4 +30,21 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $
 +#define DEFAULT_KADM5_ACL_FILE	"@SYSCONFDIR/krb5kdc/kadm5.acl"
  #define DEFAULT_KADM5_PORT	749 /* assigned by IANA */
  
- #define MAX_DGRAM_SIZE	4096
+ #define KRB5_DEFAULT_SUPPORTED_ENCTYPES			\
+@@ -123,13 +123,13 @@
+  * krb5 slave support follows
+  */
+ 
+-#define KPROP_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/slave_datatrans"
+-#define KPROPD_DEFAULT_FILE "@LOCALSTATEDIR/krb5kdc/from_master"
++#define KPROP_DEFAULT_FILE "@SYSCONFDIR/krb5kdc/slave_datatrans"
++#define KPROPD_DEFAULT_FILE "@SYSCONFDIR/krb5kdc/from_master"
+ #define KPROPD_DEFAULT_KDB5_UTIL "@SBINDIR/kdb5_util"
+ #define KPROPD_DEFAULT_KDB5_EDIT "@SBINDIR/kdb5_edit"
+ #define KPROPD_DEFAULT_KPROP "@SBINDIR/kprop"
+ #define KPROPD_DEFAULT_KRB_DB DEFAULT_KDB_FILE
+-#define KPROPD_ACL_FILE "@LOCALSTATEDIR/krb5kdc/kpropd.acl"
++#define KPROPD_ACL_FILE "@SYSCONFDIR/krb5kdc/kpropd.acl"
+ 
+ /*
+  * GSS mechglue
diff --git a/package/krb5/patches/patch-src_lib_kadm5_Makefile_in b/package/krb5/patches/patch-src_lib_kadm5_Makefile_in
deleted file mode 100644
index dfcae989b..000000000
--- a/package/krb5/patches/patch-src_lib_kadm5_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- krb5-1.6.3.orig/src/lib/kadm5/Makefile.in	2007-09-18 06:22:24.000000000 +0200
-+++ krb5-1.6.3/src/lib/kadm5/Makefile.in	2009-01-29 12:42:33.000000000 +0100
-@@ -2,7 +2,7 @@ thisconfigdir=../..
- myfulldir=lib/kadm5
- mydir=lib/kadm5
- BUILDTOP=$(REL)..$(S)..
--LOCAL_SUBDIRS = clnt srv unit-test
-+LOCAL_SUBDIRS = clnt srv 
- DEFS=
- 
- ##DOSBUILDTOP = ..\..
diff --git a/package/krb5/patches/patch-src_lib_kadm5_clnt_Makefile_in b/package/krb5/patches/patch-src_lib_kadm5_clnt_Makefile_in
deleted file mode 100644
index 601506c83..000000000
--- a/package/krb5/patches/patch-src_lib_kadm5_clnt_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- krb5-1.6.3.orig/src/lib/kadm5/clnt/Makefile.in	2007-09-18 06:22:24.000000000 +0200
-+++ krb5-1.6.3/src/lib/kadm5/clnt/Makefile.in	2009-01-30 18:38:15.000000000 +0100
-@@ -15,7 +15,7 @@ SHLIB_EXPDEPS=\
- 	$(TOPLIBD)/libkrb5$(SHLIBEXT) \
- 	$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
- 	$(COM_ERR_DEPLIB)
--SHLIB_EXPLIBS=-lgssrpc -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
-+SHLIB_EXPLIBS=-pthread -lgssrpc -lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err
- SHLIB_DIRS=-L$(TOPLIBD)
- SHLIB_RDIRS=$(KRB5_LIBDIR)
- RELDIR=kadm5/clnt
diff --git a/package/krb5/patches/patch-src_lib_kadm5_srv_Makefile_in b/package/krb5/patches/patch-src_lib_kadm5_srv_Makefile_in
deleted file mode 100644
index d33470c8f..000000000
--- a/package/krb5/patches/patch-src_lib_kadm5_srv_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- krb5-1.6.3.orig/src/lib/kadm5/srv/Makefile.in	2007-09-18 06:22:24.000000000 +0200
-+++ krb5-1.6.3/src/lib/kadm5/srv/Makefile.in	2009-01-30 18:31:56.000000000 +0100
-@@ -23,7 +23,7 @@ SHLIB_EXPDEPS=\
- 	$(TOPLIBD)/libkrb5$(SHLIBEXT) \
- 	$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
- 	$(COM_ERR_DEPLIB)
--SHLIB_EXPLIBS =	-lgssrpc -lgssapi_krb5 -lkdb5 $(KDB5_DB_LIB) \
-+SHLIB_EXPLIBS =	-pthread -lgssrpc -lgssapi_krb5 -lkdb5 $(KDB5_DB_LIB) \
- 		-lkrb5 -lk5crypto -lcom_err @GEN_LIB@
- SHLIB_DIRS=-L$(TOPLIBD)
- SHLIB_RDIRS=$(KRB5_LIBDIR)
diff --git a/package/krb5/patches/patch-src_lib_kdb_Makefile_in b/package/krb5/patches/patch-src_lib_kdb_Makefile_in
deleted file mode 100644
index 50e184e73..000000000
--- a/package/krb5/patches/patch-src_lib_kdb_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- krb5-1.6.3.orig/src/lib/kdb/Makefile.in	2007-09-18 06:22:24.000000000 +0200
-+++ krb5-1.6.3/src/lib/kdb/Makefile.in	2009-01-30 18:35:24.000000000 +0100
-@@ -21,7 +21,7 @@ RELDIR=kdb
- SHLIB_EXPDEPS = \
- 	$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
- 	$(TOPLIBD)/libkrb5$(SHLIBEXT)
--SHLIB_EXPLIBS=-lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(DL_LIB) $(LIBS)
-+SHLIB_EXPLIBS=-pthread -lkrb5 -lcom_err -lk5crypto $(SUPPORT_LIB) $(DL_LIB) $(LIBS)
- SHLIB_DIRS=-L$(TOPLIBD)
- SHLIB_RDIRS=$(KRB5_LIBDIR)
- 
diff --git a/package/krb5/patches/patch-src_lib_krb5_Makefile_in b/package/krb5/patches/patch-src_lib_krb5_Makefile_in
deleted file mode 100644
index e844e8750..000000000
--- a/package/krb5/patches/patch-src_lib_krb5_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- krb5-1.6.3.orig/src/lib/krb5/Makefile.in	2007-09-18 06:22:24.000000000 +0200
-+++ krb5-1.6.3/src/lib/krb5/Makefile.in	2009-01-30 18:41:20.000000000 +0100
-@@ -55,7 +55,7 @@ RELDIR=krb5
- SHLIB_EXPDEPS = \
- 	$(TOPLIBD)/libk5crypto$(SHLIBEXT) \
- 	$(COM_ERR_DEPLIB) $(SUPPORT_DEPLIB)
--SHLIB_EXPLIBS=-lk5crypto -lcom_err $(SUPPORT_LIB) @GEN_LIB@ $(LIBS)
-+SHLIB_EXPLIBS=-pthread -lk5crypto -lcom_err $(SUPPORT_LIB) @GEN_LIB@ $(LIBS)
- SHLIB_DIRS=-L$(TOPLIBD)
- SHLIB_RDIRS=$(KRB5_LIBDIR)
- 
diff --git a/package/krb5/patches/patch-src_lib_rpc_Makefile_in b/package/krb5/patches/patch-src_lib_rpc_Makefile_in
deleted file mode 100644
index 6276dc4e3..000000000
--- a/package/krb5/patches/patch-src_lib_rpc_Makefile_in
+++ /dev/null
@@ -1,12 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- krb5-1.6.3.orig/src/lib/rpc/Makefile.in	2006-10-05 16:05:40.000000000 +0200
-+++ krb5-1.6.3/src/lib/rpc/Makefile.in	2009-01-29 12:39:25.000000000 +0100
-@@ -5,7 +5,7 @@ BUILDTOP=$(REL)..$(S)..
- DEFINES = -DGSSAPI_KRB5 -DDEBUG_GSSAPI=0 -DGSSRPC__IMPL
- DEFS=
- 
--SUBDIRS=unit-test
-+#SUBDIRS=unit-test
- 
- ##DOSBUILDTOP = ..\..
- ##DOSLIBNAME=libgssrpc.lib
diff --git a/package/krb5/patches/patch-src_util_profile_prof_int_h b/package/krb5/patches/patch-src_util_profile_prof_int_h
new file mode 100644
index 000000000..5be692f11
--- /dev/null
+++ b/package/krb5/patches/patch-src_util_profile_prof_int_h
@@ -0,0 +1,11 @@
+--- krb5-1.7.orig/src/util/profile/prof_int.h	2008-05-27 18:25:51.000000000 +0200
++++ krb5-1.7/src/util/profile/prof_int.h	2009-11-19 20:20:53.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ #include "k5-thread.h"
+ #include "k5-platform.h"
+-#include "com_err.h"
++#include "et/com_err.h"
+ #include "profile.h"
+ 
+ typedef long prf_magic_t;