From a5618c6f15415e4ab27f3ce1afb66276a7b808b0 Mon Sep 17 00:00:00 2001
From: Martin Jansa <martin.jansa@gmail.com>
Date: Thu, 26 Sep 2013 12:17:13 +0000
Subject: krb5: Upgrade to 1.11.3

* 1.11 is often failing with:
  | common.o: file not recognized: File truncated
  | collect2: ld returned 1 exit status
  | make[2]: *** [t_export_name] Error 1
  when higher parallelism is used
  1.11.2 and newer have fix for that:
  http://krbdev.mit.edu/rt/Ticket/Display.html?id=7587
* LIC_FILES_CHKSUM is only from year update
  < Copyright (C) 1985-2012 by the Massachusetts Institute of Technology.
  ---
  > Copyright (C) 1985-2013 by the Massachusetts Institute of Technology.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-connectivity/krb5/krb5_1.11.3.bb | 46 +++++++++++++++++++++++
 meta-oe/recipes-connectivity/krb5/krb5_1.11.bb   | 47 ------------------------
 2 files changed, 46 insertions(+), 47 deletions(-)
 create mode 100644 meta-oe/recipes-connectivity/krb5/krb5_1.11.3.bb
 delete mode 100644 meta-oe/recipes-connectivity/krb5/krb5_1.11.bb

diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.11.3.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.11.3.bb
new file mode 100644
index 0000000000..820a13515b
--- /dev/null
+++ b/meta-oe/recipes-connectivity/krb5/krb5_1.11.3.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "A network authentication protocol"
+HOMEPAGE = "http://web.mit.edu/Kerberos/"
+SECTION = "console/network"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=1d9c8180d79838c02eb5eb1a3b184eb9"
+DEPENDS = "ncurses util-linux e2fsprogs e2fsprogs-native"
+
+inherit autotools binconfig perlnative
+
+SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
+SRC_URI = "http://web.mit.edu/kerberos/dist/${PN}/${SHRT_VER}/${P}-signed.tar"
+SRC_URI[md5sum] = "56f0ae274b285320b8a597cb89442449"
+SRC_URI[sha256sum] = "9abd94bb94a70996da0f8d90408957154bb543271b097e86c63eb33e5f5751b5"
+
+S = "${WORKDIR}/${P}/src/"
+
+PACKAGECONFIG ??= "openssl"
+PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit"
+PACKAGECONFIG[openssl] = "--with-pkinit-crypto-impl=openssl,,openssl"
+
+EXTRA_OECONF += " --without-tcl --with-system-et --disable-rpath"
+CACHED_CONFIGUREVARS += "krb5_cv_attr_constructor_destructor=yes ac_cv_func_regcomp=yes \
+                  ac_cv_printf_positional=yes ac_cv_file__etc_environment=yes \
+                  ac_cv_file__etc_TIMEZONE=no"
+
+CFLAGS_append += "-DDESTRUCTOR_ATTR_WORKS=1 -I${STAGING_INCDIR}/et"
+LDFLAGS_append += "-lpthread"
+
+FILES_${PN}-doc += "${datadir}/examples"
+FILES_${PN} += "${datadir}/gnats"
+FILES_${PN}-dbg += "${libdir}/krb5/plugins/*/.debug"
+
+krb5_do_unpack() {
+    # ${P}-signed.tar contains ${P}.tar.gz.asc and ${P}.tar.gz
+    tar xzf ${WORKDIR}/${P}.tar.gz -C ${WORKDIR}/
+}
+
+python do_unpack() {
+    bb.build.exec_func('base_do_unpack', d)
+    bb.build.exec_func('krb5_do_unpack', d)
+}
+
+do_configure() {
+    gnu-configize --force
+    oe_runconf
+}
diff --git a/meta-oe/recipes-connectivity/krb5/krb5_1.11.bb b/meta-oe/recipes-connectivity/krb5/krb5_1.11.bb
deleted file mode 100644
index a68e85d131..0000000000
--- a/meta-oe/recipes-connectivity/krb5/krb5_1.11.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-DESCRIPTION = "A network authentication protocol"
-HOMEPAGE = "http://web.mit.edu/Kerberos/"
-SECTION = "console/network"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=e8fad1d174de32f8da0ddc56b67b6941"
-DEPENDS = "ncurses util-linux e2fsprogs e2fsprogs-native"
-
-inherit autotools binconfig perlnative
-
-PR = "r2"
-
-SRC_URI = "http://web.mit.edu/kerberos/dist/${PN}/${PV}/${P}-signed.tar"
-SRC_URI[md5sum] = "1a13c53899806c4da99a798a04d25545"
-SRC_URI[sha256sum] = "fe37fb93b398db98a1b23f814673ea2ae4b90138f85e1a4027ef639456a78651"
-
-S = "${WORKDIR}/${P}/src/"
-
-PACKAGECONFIG ??= "openssl"
-PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit"
-PACKAGECONFIG[openssl] = "--with-pkinit-crypto-impl=openssl,,openssl"
-
-EXTRA_OECONF += " --without-tcl --with-system-et --disable-rpath"
-CACHED_CONFIGUREVARS += "krb5_cv_attr_constructor_destructor=yes ac_cv_func_regcomp=yes \
-                  ac_cv_printf_positional=yes ac_cv_file__etc_environment=yes \
-                  ac_cv_file__etc_TIMEZONE=no"
-
-CFLAGS_append += "-DDESTRUCTOR_ATTR_WORKS=1 -I${STAGING_INCDIR}/et"
-LDFLAGS_append += "-lpthread"
-
-FILES_${PN}-doc += "${datadir}/examples"
-FILES_${PN} += "${datadir}/gnats"
-FILES_${PN}-dbg += "${libdir}/krb5/plugins/*/.debug"
-
-krb5_do_unpack() {
-    # ${P}-signed.tar contains ${P}.tar.gz.asc and ${P}.tar.gz
-    tar xzf ${WORKDIR}/${P}.tar.gz -C ${WORKDIR}/
-}
-
-python do_unpack() {
-    bb.build.exec_func('base_do_unpack', d)
-    bb.build.exec_func('krb5_do_unpack', d)
-}
-
-do_configure() {
-    gnu-configize --force
-    oe_runconf
-}
-- 
cgit v1.2.3-54-g00ecf