bulk package update

4 files changed, 4 insertions, 75 deletions

diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index b9efa2b2c..e7f3b1f22 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -4,15 +4,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		krb5
-PKG_VERSION:=		1.7
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		9f7b3402b4731a7fa543db193bf1b564
+PKG_VERSION:=		1.8.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		e29a78b108c4687f7e7937110d1d0415
 PKG_DESCR:=		MIT kerberos server
 PKG_SECTION:=		net
 PKG_DEPENDS:=		libkrb5 libncurses libss libcom-err
 PKG_BUILDDEP+=		ncurses e2fsprogs
 PKG_URL:=		http://web.mit.edu/kerberos
-PKG_SITES:=		http://web.mit.edu/kerberos/dist/krb5/1.7/
+PKG_SITES:=		http://web.mit.edu/kerberos/dist/krb5/1.8/
 
 PKG_NOPARALLEL:=	1
 
diff --git a/package/krb5/patches/patch-src_Makefile_in b/package/krb5/patches/patch-src_Makefile_in
deleted file mode 100644
index ef48b68ed..000000000
--- a/package/krb5/patches/patch-src_Makefile_in
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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)
- LOCALINCLUDES = -I$(srcdir) 
diff --git a/package/krb5/patches/patch-src_include_osconf_hin b/package/krb5/patches/patch-src_include_osconf_hin
deleted file mode 100644
index 834f28292..000000000
--- a/package/krb5/patches/patch-src_include_osconf_hin
+++ /dev/null
@@ -1,50 +0,0 @@
---- 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  */
- 
--#define DEFAULT_KDB_FILE        "@LOCALSTATEDIR/krb5kdc/principal"
--#define	DEFAULT_KEYFILE_STUB	"@LOCALSTATEDIR/krb5kdc/.k5."
--#define KRB5_DEFAULT_ADMIN_ACL	"@LOCALSTATEDIR/krb5kdc/krb5_adm.acl"
-+#define DEFAULT_KDB_FILE        "@SYSCONFDIR/krb5kdc/principal"
-+#define	DEFAULT_KEYFILE_STUB	"@SYSCONFDIR/krb5kdc/.k5."
-+#define KRB5_DEFAULT_ADMIN_ACL	"@SYSCONFDIR/krb5kdc/krb5_adm.acl"
- /* Used by old admin server */
--#define	DEFAULT_ADMIN_ACL	"@LOCALSTATEDIR/krb5kdc/kadm_old.acl"
-+#define	DEFAULT_ADMIN_ACL	"@SYSCONFDIR/krb5kdc/kadm_old.acl"
- 
- /* Location of KDC profile */
--#define	DEFAULT_KDC_PROFILE	"@LOCALSTATEDIR/krb5kdc/kdc.conf"
-+#define	DEFAULT_KDC_PROFILE	"@SYSCONFDIR/krb5kdc/kdc.conf"
- #define	KDC_PROFILE_ENV		"KRB5_KDC_PROFILE"
- 
- #if TARGET_OS_MAC
-@@ -97,8 +97,8 @@
- /*
-  * Defaults for the KADM5 admin system.
-  */
--#define DEFAULT_KADM5_KEYTAB	"@LOCALSTATEDIR/krb5kdc/kadm5.keytab"
--#define DEFAULT_KADM5_ACL_FILE	"@LOCALSTATEDIR/krb5kdc/kadm5.acl"
-+#define DEFAULT_KADM5_KEYTAB	"@SYSCONFDIR/krb5kdc/kadm5.keytab"
-+#define DEFAULT_KADM5_ACL_FILE	"@SYSCONFDIR/krb5kdc/kadm5.acl"
- #define DEFAULT_KADM5_PORT	749 /* assigned by IANA */
- 
- #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_util_profile_prof_int_h b/package/krb5/patches/patch-src_util_profile_prof_int_h
deleted file mode 100644
index 5be692f11..000000000
--- a/package/krb5/patches/patch-src_util_profile_prof_int_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;