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

7 files changed, 49 insertions, 2 deletions

diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index bc12b4e13..80dad73aa 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -58,7 +58,8 @@ $(eval $(call PKG_template,MKE2FS,mke2fs,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_M
 $(eval $(call PKG_template,E2FSCK,e2fsck,${PKG_VERSION}-${PKG_RELEASE},$(PKGSS_E2FSCK),${PKGSD_E2FSCK},${PKGSC_E2FSCK}))
 
 CONFIGURE_ARGS+=	--enable-elf-shlibs --disable-rpath \
-			--disable-libuuid --disable-libblkid 
+			--disable-libuuid --disable-libblkid \
+			--disable-defrag
 INSTALL_TARGET+=	install-libs
 TARGET_LDFLAGS+=	-lpthread
 TARGET_CFLAGS+=		$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include
diff --git a/package/krb5/Makefile b/package/krb5/Makefile
index 3227a6b57..268385b64 100644
--- a/package/krb5/Makefile
+++ b/package/krb5/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		krb5
 PKG_VERSION:=		1.11.3
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		56f0ae274b285320b8a597cb89442449
 PKG_DESCR:=		MIT kerberos server
 PKG_SECTION:=		crypto
diff --git a/package/krb5/patches/patch-src_kadmin_ktutil_ktutil_funcs_c b/package/krb5/patches/patch-src_kadmin_ktutil_ktutil_funcs_c
new file mode 100644
index 000000000..0851bb08a
--- /dev/null
+++ b/package/krb5/patches/patch-src_kadmin_ktutil_ktutil_funcs_c
@@ -0,0 +1,11 @@
+--- krb5-1.11.3.orig/src/kadmin/ktutil/ktutil_funcs.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/kadmin/ktutil/ktutil_funcs.c	2013-10-09 09:54:40.000000000 +0200
+@@ -64,7 +64,7 @@ krb5_error_code ktutil_delete(context, l
+     krb5_kt_list *list;
+     int idx;
+ {
+-    krb5_kt_list lp, prev;
++    krb5_kt_list lp, prev = NULL;
+     int i;
+ 
+     for (lp = *list, i = 1; lp; prev = lp, lp = lp->next, i++) {
diff --git a/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c b/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c
new file mode 100644
index 000000000..dd47baea6
--- /dev/null
+++ b/package/krb5/patches/patch-src_lib_kadm5_alt_prof_c
@@ -0,0 +1,11 @@
+--- krb5-1.11.3.orig/src/lib/kadm5/alt_prof.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/lib/kadm5/alt_prof.c	2013-10-09 09:42:35.000000000 +0200
+@@ -164,7 +164,7 @@ krb5_aprof_get_boolean(krb5_pointer acon
+     char **values;
+     char *valp;
+     int idx;
+-    krb5_boolean val;
++    krb5_boolean val = 0;
+ 
+     kret = krb5_aprof_getvals (acontext, hierarchy, &values);
+     if (kret)
diff --git a/package/krb5/patches/patch-src_lib_krb5_krb_preauth2_c b/package/krb5/patches/patch-src_lib_krb5_krb_preauth2_c
new file mode 100644
index 000000000..c2d8a1a0e
--- /dev/null
+++ b/package/krb5/patches/patch-src_lib_krb5_krb_preauth2_c
@@ -0,0 +1,11 @@
+--- krb5-1.11.3.orig/src/lib/krb5/krb/preauth2.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/lib/krb5/krb/preauth2.c	2013-10-09 09:30:28.000000000 +0200
+@@ -957,7 +957,7 @@ krb5_do_preauth(krb5_context context, kr
+     size_t i, h;
+     int out_pa_list_size = 0;
+     krb5_pa_data **out_pa_list = NULL;
+-    krb5_error_code ret, module_ret;
++    krb5_error_code ret, module_ret = 0;
+     krb5_responder_fn responder = opte->opt_private->responder;
+     static const int paorder[] = { PA_INFO, PA_REAL };
+ 
diff --git a/package/krb5/patches/patch-src_lib_krb5_unicode_ucstr_c b/package/krb5/patches/patch-src_lib_krb5_unicode_ucstr_c
new file mode 100644
index 000000000..1651c4df7
--- /dev/null
+++ b/package/krb5/patches/patch-src_lib_krb5_unicode_ucstr_c
@@ -0,0 +1,11 @@
+--- krb5-1.11.3.orig/src/lib/krb5/unicode/ucstr.c	2013-06-03 23:39:43.000000000 +0200
++++ krb5-1.11.3/src/lib/krb5/unicode/ucstr.c	2013-10-09 09:34:54.000000000 +0200
+@@ -109,7 +109,7 @@ krb5int_utf8_normalize(
+ 		       krb5_data ** newdataptr,
+ 		       unsigned flags)
+ {
+-    int i, j, len, clen, outpos, ucsoutlen, outsize;
++    int i, j, len, clen, outpos = 0, ucsoutlen, outsize;
+     char *out = NULL, *outtmp, *s;
+     krb5_ucs4 *ucs = NULL, *p, *ucsout = NULL;
+     krb5_data *newdata;
diff --git a/package/libqb/Makefile b/package/libqb/Makefile
index a2d897bcd..f4e73ac20 100644
--- a/package/libqb/Makefile
+++ b/package/libqb/Makefile
@@ -12,6 +12,8 @@ PKG_SECTION:=		libs
 PKG_URL:=		https://github.com/asalkeld/libqb/wiki#wiki-Releases
 PKG_SITES:=		https://fedorahosted.org/releases/q/u/quarterback/
 
+PKG_LIBC_DEPENDS:=	eglibc glibc musl
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,LIBQB,libqb,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))