Update to yocto 1.8, and remove the use of meta-oe.

40 files changed, 779 insertions, 462 deletions

diff --git a/LAYERS b/LAYERS
index cf4f0df..ab0f290 100644
--- a/LAYERS
+++ b/LAYERS
@@ -1,3 +1,2 @@
 yocto/meta
-meta-oe/meta-oe
 meta-freedesktop
diff --git a/Makefile b/Makefile
index 7c6656c..c33a961 100644
--- a/Makefile
+++ b/Makefile
@@ -10,6 +10,6 @@ IMAGES=$(IMAGEDIR)/freedesktop-base-contents-sdk-$(ARCH)-$(HASH).tar.gz $(IMAGED
 all: $(IMAGES)
 
  $(IMAGES) allimages:
-	git submodule update --init
+	#git submodule update --init
 	mkdir -p build/$(ARCH)
 	./freedesktop-sdk-build-yocto $(srcdir)/ $(builddir)/build/ $(ARCH) $(HASH)
diff --git a/meta-freedesktop/recipes-core/glibc/glibc_2.20.bbappend b/meta-freedesktop/recipes-core/glibc/glibc_2.21.bbappend
index 72d991c..72d991c 100644
--- a/meta-freedesktop/recipes-core/glibc/glibc_2.20.bbappend
+++ b/meta-freedesktop/recipes-core/glibc/glibc_2.21.bbappend
diff --git a/meta-freedesktop/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb b/meta-freedesktop/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb
new file mode 100644
index 0000000..8e214c9
--- /dev/null
+++ b/meta-freedesktop/recipes-core/jpeg/libjpeg-turbo_8d+1.4.0.bb
@@ -0,0 +1,39 @@
+DESCRIPTION = "libjpeg-turbo is a derivative of libjpeg that uses SIMD instructions (MMX, SSE2, NEON) to accelerate baseline JPEG compression and decompression"
+HOMEPAGE = "http://libjpeg-turbo.org/"
+
+LICENSE = "BSD-3-Clause"
+LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=12;md5=cad955d15145c3fdceec6855e078e953 \
+                    file://jpeglib.h;endline=14;md5=dfc803dc51ae21178d1376ec73c4454d \
+                    file://djpeg.c;endline=9;md5=e93a8f2061e8a0ac71c7a485c10489e2 \
+"
+
+BASEPV = "${@d.getVar('PV',True).split('+')[1]}"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${BASEPV}.tar.gz"
+SRC_URI[md5sum] = "039153dabe61e1ac8d9323b5522b56b0"
+SRC_URI[sha256sum] = "d93ad8546b510244f863b39b4c0da0fa4c0d53a77b61a8a3880f258c232bbbee"
+
+S = "${WORKDIR}/${BPN}-${BASEPV}"
+
+# Drop-in replacement for jpeg
+PROVIDES = "jpeg"
+RPROVIDES_${PN} += "jpeg"
+RREPLACES_${PN} += "jpeg"
+RCONFLICTS_${PN} += "jpeg"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-jpeg8 "
+
+PACKAGES =+ "jpeg-tools libturbojpeg"
+
+DESCRIPTION_jpeg-tools = "The jpeg-tools package includes client programs to access libjpeg functionality.  These tools allow for the compression, decompression, transformation and display of JPEG files and benchmarking of the libjpeg library."
+FILES_jpeg-tools = "${bindir}/*"
+
+FILES_libturbojpeg = "${libdir}/libturbojpeg.so"
+INSANE_SKIP_libturbojpeg = "dev-so"
+
+BBCLASSEXTEND = "native"
+DEPENDS = "nasm-native"
+
+LEAD_SONAME = "libjpeg.so.8"
diff --git a/meta-freedesktop/recipes-core/krb5/krb5/0001-Return-only-new-keys-in-randkey-CVE-2014-5351.patch b/meta-freedesktop/recipes-core/krb5/krb5/0001-Return-only-new-keys-in-randkey-CVE-2014-5351.patch
new file mode 100644
index 0000000..0852661
--- /dev/null
+++ b/meta-freedesktop/recipes-core/krb5/krb5/0001-Return-only-new-keys-in-randkey-CVE-2014-5351.patch
@@ -0,0 +1,92 @@
+From af0ed4df4dfae762ab5fb605f5a0c8f59cb4f6ca Mon Sep 17 00:00:00 2001
+From: Greg Hudson <ghudson@mit.edu>
+Date: Thu, 21 Aug 2014 13:52:07 -0400
+Subject: [PATCH] Return only new keys in randkey [CVE-2014-5351]
+
+In kadmind's randkey operation, if a client specifies the keepold
+flag, do not include the preserved old keys in the response.
+
+CVE-2014-5351:
+
+An authenticated remote attacker can retrieve the current keys for a
+service principal when generating a new set of keys for that
+principal.  The attacker needs to be authenticated as a user who has
+the elevated privilege for randomizing the keys of other principals.
+
+Normally, when a Kerberos administrator randomizes the keys of a
+service principal, kadmind returns only the new keys.  This prevents
+an administrator who lacks legitimate privileged access to a service
+from forging tickets to authenticate to that service.  If the
+"keepold" flag to the kadmin randkey RPC operation is true, kadmind
+retains the old keys in the KDC database as intended, but also
+unexpectedly returns the old keys to the client, which exposes the
+service to ticket forgery attacks from the administrator.
+
+A mitigating factor is that legitimate clients of the affected service
+will start failing to authenticate to the service once they begin to
+receive service tickets encrypted in the new keys.  The affected
+service will be unable to decrypt the newly issued tickets, possibly
+alerting the legitimate administrator of the affected service.
+
+CVSSv2: AV:N/AC:H/Au:S/C:P/I:N/A:N/E:POC/RL:OF/RC:C
+
+[tlyu@mit.edu: CVE description and CVSS score]
+
+ticket: 8018 (new)
+target_version: 1.13
+tags: pullup
+
+Upstream-Status: Backport
+---
+ src/lib/kadm5/srv/svr_principal.c |   21 ++++++++++++++++++---
+ 1 files changed, 18 insertions(+), 3 deletions(-)
+
+diff --git a/lib/kadm5/srv/svr_principal.c b/lib/kadm5/srv/svr_principal.c
+index 5d358bd..d4e74cc 100644
+--- a/lib/kadm5/srv/svr_principal.c
++++ b/lib/kadm5/srv/svr_principal.c
+@@ -344,6 +344,20 @@ check_1_6_dummy(kadm5_principal_ent_t entry, long mask,
+     *passptr = NULL;
+ }
+ 
++/* Return the number of keys with the newest kvno.  Assumes that all key data
++ * with the newest kvno are at the front of the key data array. */
++static int
++count_new_keys(int n_key_data, krb5_key_data *key_data)
++{
++    int n;
++
++    for (n = 1; n < n_key_data; n++) {
++        if (key_data[n - 1].key_data_kvno != key_data[n].key_data_kvno)
++            return n;
++    }
++    return n_key_data;
++}
++
+ kadm5_ret_t
+ kadm5_create_principal(void *server_handle,
+                        kadm5_principal_ent_t entry, long mask,
+@@ -1593,7 +1607,7 @@ kadm5_randkey_principal_3(void *server_handle,
+     osa_princ_ent_rec           adb;
+     krb5_int32                  now;
+     kadm5_policy_ent_rec        pol;
+-    int                         ret, last_pwd;
++    int                         ret, last_pwd, n_new_keys;
+     krb5_boolean                have_pol = FALSE;
+     kadm5_server_handle_t       handle = server_handle;
+     krb5_keyblock               *act_mkey;
+@@ -1686,8 +1700,9 @@ kadm5_randkey_principal_3(void *server_handle,
+     kdb->fail_auth_count = 0;
+ 
+     if (keyblocks) {
+-        ret = decrypt_key_data(handle->context,
+-                               kdb->n_key_data, kdb->key_data,
++        /* Return only the new keys added by krb5_dbe_crk. */
++        n_new_keys = count_new_keys(kdb->n_key_data, kdb->key_data);
++        ret = decrypt_key_data(handle->context, n_new_keys, kdb->key_data,
+                                keyblocks, n_keys);
+         if (ret)
+             goto done;
+-- 
+1.7.4.1
+
diff --git a/meta-freedesktop/recipes-core/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch b/meta-freedesktop/recipes-core/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch
new file mode 100644
index 0000000..f0c310c
--- /dev/null
+++ b/meta-freedesktop/recipes-core/krb5/krb5/0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch
@@ -0,0 +1,33 @@
+From ecb62f3467f493cc0d679323f05367eebbf0fb67 Mon Sep 17 00:00:00 2001
+From: Martin Jansa <Martin.Jansa@gmail.com>
+Date: Tue, 1 Oct 2013 22:22:57 +0200
+Subject: [PATCH] aclocal: Add parameter to disable keyutils detection
+
+Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
+---
+ aclocal.m4 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/aclocal.m4 b/aclocal.m4
+index 210c473..83b1f02 100644
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1650,11 +1650,15 @@ fi
+ dnl
+ dnl If libkeyutils exists (on Linux) include it and use keyring ccache
+ AC_DEFUN(KRB5_AC_KEYRING_CCACHE,[
++AC_ARG_ENABLE([keyutils],
++AC_HELP_STRING([--disable-keyutils],don't enable using keyutils for keyring ccache @<:@enabled@:>@), , enable_keyutils=yes)
++if test "$enable_keyutils" = yes; then
+   AC_CHECK_HEADERS([keyutils.h],
+     AC_CHECK_LIB(keyutils, add_key, 
+       [dnl Pre-reqs were found
+        AC_DEFINE(USE_KEYRING_CCACHE, 1, [Define if the keyring ccache should be enabled])
+        LIBS="-lkeyutils $LIBS"
+       ]))
++fi
+ ])dnl
+ dnl
+-- 
+1.8.3.2
+
diff --git a/meta-freedesktop/recipes-core/krb5/krb5/crosscompile_nm.patch b/meta-freedesktop/recipes-core/krb5/krb5/crosscompile_nm.patch
new file mode 100644
index 0000000..d3e6937
--- /dev/null
+++ b/meta-freedesktop/recipes-core/krb5/krb5/crosscompile_nm.patch
@@ -0,0 +1,29 @@
+Modifies export-check.pl to use look for $ENV{'NM'} before
+defaulting to using 'nm'
+
+Upstream-Status: Pending
+
+Signed-off-by: Amy Fong <amy.fong@windriver.com>
+---
+
+ export-check.pl |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+Index: src/util/export-check.pl
+===================================================================
+--- src.orig/util/export-check.pl
++++ src/util/export-check.pl
+@@ -38,7 +38,12 @@
+ my($exfile, $libfile) = @ARGV;
+ 
+ @missing = ();
+-open NM, "nm -Dg --defined-only $libfile |" || die "can't run nm on $libfile: $!";
++if (defined($ENV{'NM'})) {
++	$nm = $ENV{'NM'};
++} else {
++	$nm = "nm";
++}
++open NM, "$nm -Dg --defined-only $libfile |" || die "can't run nm on $libfile: $!";
+ open EXPORT, "< $exfile" || die "can't read $exfile: $!";
+ 
+ @export = <EXPORT>;
diff --git a/meta-freedesktop/recipes-core/krb5/krb5/debian-suppress-usr-lib-in-krb5-config.patch b/meta-freedesktop/recipes-core/krb5/krb5/debian-suppress-usr-lib-in-krb5-config.patch
new file mode 100644
index 0000000..f0182ee
--- /dev/null
+++ b/meta-freedesktop/recipes-core/krb5/krb5/debian-suppress-usr-lib-in-krb5-config.patch
@@ -0,0 +1,48 @@
+Subject: [PATCH] debian: suppress /usr/lib in krb5-config
+
+Upstream-Status: Pending
+
+Handel multi-arch suppressions
+
+The patch is from debian.
+
+Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
+---
+ src/build-tools/krb5-config.in |   14 +++++++++-----
+ 1 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/src/build-tools/krb5-config.in b/src/build-tools/krb5-config.in
+index f6184da..637bad7 100755
+--- a/src/build-tools/krb5-config.in
++++ b/src/build-tools/krb5-config.in
+@@ -138,6 +138,7 @@ if test -n "$do_help"; then
+     echo "        [--defktname]     Show built-in default keytab name"
+     echo "        [--defcktname]    Show built-in default client keytab name"
+     echo "        [--cflags]        Compile time CFLAGS"
++    echo "        [--deps]          Include dependent libraries"
+     echo "        [--libs]          List libraries required to link [LIBRARIES]"
+     echo "Libraries:"
+     echo "        krb5              Kerberos 5 application"
+@@ -209,11 +210,14 @@ fi
+ 
+ if test -n "$do_libs"; then
+     # Assumes /usr/lib is the standard library directory everywhere...
+-    if test "$libdir" = /usr/lib; then
+-	libdirarg=
+-    else
+-	libdirarg="-L$libdir"
+-    fi
++    case $libdir in
++	/usr/lib*)
++	    libdirarg=
++	    ;;
++	*)
++	    libdirarg="-L$libdir"
++	    ;;
++    esac
+     # Ugly gross hack for our build tree
+     lib_flags=`echo $CC_LINK | sed -e 's/\$(CC)//' \
+ 	    -e 's/\$(PURE)//' \
+-- 
+1.7.1
+
diff --git a/meta-freedesktop/recipes-core/krb5/krb5/etc/default/krb5-admin-server b/meta-freedesktop/recipes-core/krb5/krb5/etc/default/krb5-admin-server
new file mode 100644
index 0000000..2835929
--- /dev/null
+++ b/meta-freedesktop/recipes-core/krb5/krb5/etc/default/krb5-admin-server
@@ -0,0 +1,6 @@
+# Automatically generated.  If you change anything in this file other than the
+# values of RUN_KADMIND or DAEMON_ARGS, first run dpkg-reconfigure
+# krb5-admin-server and disable managing the kadmin configuration with
+# debconf.  Otherwise, changes will be overwritten.
+
+RUN_KADMIND=true
diff --git a/meta-freedesktop/recipes-core/krb5/krb5/etc/default/krb5-kdc b/meta-freedesktop/recipes-core/krb5/krb5/etc/default/krb5-kdc
new file mode 100644
index 0000000..310bfcf
--- /dev/null
+++ b/meta-freedesktop/recipes-core/krb5/krb5/etc/default/krb5-kdc
@@ -0,0 +1,5 @@
+# Automatically generated.  Only the value of DAEMON_ARGS will be preserved.
+# If you change anything in this file other than DAEMON_ARGS, first run
+# dpkg-reconfigure krb5-kdc and disable managing the KDC configuration with
+# debconf.  Otherwise, changes will be overwritten.
+
diff --git a/meta-freedesktop/recipes-core/krb5/krb5/etc/init.d/krb5-admin-server b/meta-freedesktop/recipes-core/krb5/krb5/etc/init.d/krb5-admin-server
new file mode 100755
index 0000000..79238d4
--- /dev/null
+++ b/meta-freedesktop/recipes-core/krb5/krb5/etc/init.d/krb5-admin-server
@@ -0,0 +1,140 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:             krb5-admin-server
+# Required-Start:       $local_fs $remote_fs $network $syslog
+# Required-Stop:        $local_fs $remote_fs $network $syslog
+# Should-Start:         krb5-kdc
+# Should-Stop:          krb5-kdc
+# Default-Start:        2 3 4 5
+# Default-Stop:         0 1 6
+# Short-Description:    MIT Kerberos KDC administrative daemon
+# Description:          Starts, stops, or restarts the MIT Kerberos KDC
+#                       administrative daemon (kadmind).  This daemon answers
+#                       requests from kadmin clients and allows administrators
+#                       to create, delete, and modify principals in the KDC
+#                       database.
+### END INIT INFO
+
+# Author: Sam Hartman <hartmans@mit.edu>
+# Author: Russ Allbery <rra@debian.org>
+#
+# Based on the /etc/init.d/skeleton template as found in initscripts version
+# 2.86.ds1-15.
+
+# June, 2012: Adopted for yocto <amy.fong@windriver.com>
+
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+DESC="Kerberos administrative servers"
+NAME=kadmind
+DAEMON=/usr/sbin/$NAME
+DAEMON_ARGS=""
+SCRIPTNAME=/etc/init.d/krb5-admin-server
+DEFAULT=/etc/default/krb5-admin-server
+
+# Exit if the package is not installed.
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration if it is present.
+[ -r "$DEFAULT" ] && . "$DEFAULT"
+
+# Get the setting of VERBOSE and other rcS variables.
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+
+. /etc/init.d/functions
+
+ADMIN_SERVER_LOG=/var/log/kadmind.log
+[ -f $ADMIN_SERVER_LOG ] && (test ! -x /sbin/restorecon \
+    || /sbin/restorecon -F $ADMIN_SERVER_LOG)
+
+# Return
+#   0 if daemon has been started
+#   1 if daemon was already running
+#   2 if daemon could not be started
+do_start()
+{
+    start-stop-daemon --start --quiet --startas $DAEMON --name $NAME --test \
+        > /dev/null || return 1
+    start-stop-daemon --start --quiet --startas $DAEMON --name $NAME \
+        -- $DAEMON_ARGS || return 2
+}
+
+# Return
+#   0 if daemon has been stopped
+#   1 if daemon was already stopped
+#   2 if daemon could not be stopped
+#   other if a failure occurred
+do_stop()
+{
+    start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name $NAME
+    RETVAL="$?"
+    [ "$RETVAL" = 2 ] && return 2
+    return "$RETVAL"
+}
+
+
+case "$1" in
+  start)
+    if [ "$RUN_KADMIND" = false ] ; then
+        if [ "$VERBOSE" != no ] ; then
+            echo "Not starting $DESC per configuration"
+        fi
+        exit 0
+    fi
+    [ "$VERBOSE" != no ] && echo "Starting $DESC" "$NAME"
+    do_start
+    case "$?" in
+      0|1) [ "$VERBOSE" != no ] && echo 0 ;;
+      2)   [ "$VERBOSE" != no ] && echo 1 ;;
+    esac
+    ;;
+
+  stop)
+    [ "$VERBOSE" != no ] && echo "Stopping $DESC" "$NAME"
+    do_stop
+    case "$?" in
+      0|1) [ "$VERBOSE" != no ] && echo 0 ;;
+      2)   [ "$VERBOSE" != no ] && echo 1 ;;
+    esac
+    ;;
+
+  restart|force-reload)
+    if [ "$RUN_KADMIND" = false ] ; then
+        if [ "$VERBOSE" != no ] ; then
+            echo "Not restarting $DESC per configuration"
+        fi
+        exit 0
+    fi
+    echo "Restarting $DESC" "$NAME"
+    do_stop
+    case "$?" in
+      0|1)
+        do_start
+        case "$?" in
+          0) [ "$VERBOSE" != no ] && echo 0 ;;
+          *) [ "$VERBOSE" != no ] && echo 1 ;;
+        esac
+        ;;
+      *)
+        echo 1
+        ;;
+    esac
+    ;;
+
+  status)
+    pidofproc "$DAEMON" >/dev/null
+    status=$?
+    if [ $status -eq 0 ]; then
+        echo "$NAME is running."
+    else
+        echo "$NAME is not running."
+    fi
+    exit $status
+    ;;
+
+  *)
+    echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
+    exit 3
+    ;;
+esac
+
+:
diff --git a/meta-freedesktop/recipes-core/krb5/krb5/etc/init.d/krb5-kdc b/meta-freedesktop/recipes-core/krb5/krb5/etc/init.d/krb5-kdc
new file mode 100755
index 0000000..865d1b9
--- /dev/null
+++ b/meta-freedesktop/recipes-core/krb5/krb5/etc/init.d/krb5-kdc
@@ -0,0 +1,133 @@
+#! /bin/sh
+### BEGIN INIT INFO
+# Provides:             krb5-kdc
+# Required-Start:       $local_fs $remote_fs $network $syslog
+# Required-Stop:        $local_fs $remote_fs $network $syslog
+# X-Start-Before: $x-display-manager
+# Default-Start:        2 3 4 5
+# Default-Stop:         0 1 6
+# Short-Description:    MIT Kerberos KDC
+# Description:          Starts, stops, or restarts the MIT Kerberos KDC.  This
+#                       daemon responds to ticket requests from Kerberos
+#                       clients.
+### END INIT INFO
+
+# Author: Sam Hartman <hartmans@mit.edu>
+# Author: Russ Allbery <rra@debian.org>
+#
+# Based on the /etc/init.d/skeleton template as found in initscripts version
+# 2.86.ds1-15.
+
+# June, 2012: Adopted for yocto <amy.fong@windriver.com>
+
+PATH=/usr/sbin:/usr/bin:/sbin:/bin
+DESC="Kerberos KDC"
+NAME=krb5kdc
+DAEMON=/usr/sbin/$NAME
+DAEMON_ARGS=""
+SCRIPTNAME=/etc/init.d/krb5-kdc
+
+# Exit if the package is not installed.
+[ -x "$DAEMON" ] || exit 0
+
+# Read configuration if it is present.
+[ -r /etc/default/krb5-kdc ] && . /etc/default/krb5-kdc
+
+# Get the setting of VERBOSE and other rcS variables.
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+
+. /etc/init.d/functions
+
+# Return
+#   0 if daemon has been started
+#   1 if daemon was already running
+#   2 if daemon could not be started
+do_start_kdc()
+{
+    start-stop-daemon --start --quiet --startas $DAEMON --name $NAME --test \
+        > /dev/null || return 1
+    start-stop-daemon --start --quiet --startas $DAEMON --name $NAME \
+        -- $DAEMON_ARGS || return 2
+}
+
+
+# Return
+#   0 if daemon has been stopped
+#   1 if daemon was already stopped
+#   2 if daemon could not be stopped
+#   other if a failure occurred
+do_stop_kdc()
+{
+    start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --name $NAME
+    RETVAL="$?"
+    [ "$RETVAL" = 2 ] && return 2
+    return "$RETVAL"
+}
+
+
+case "$1" in
+  start)
+    [ "$VERBOSE" != no ] && echo "Starting $DESC" "$NAME"
+    do_start_kdc
+    case "$?" in
+      0|1)
+            [ "$VERBOSE" != no ] && echo 0
+        ;;
+      2)
+        [ "$VERBOSE" != no ] && echo 1
+        ;;
+    esac
+    ;;
+
+  stop)
+    [ "$VERBOSE" != no ] && echo "Stopping $DESC" "$NAME"
+    do_stop_kdc
+    case "$?" in
+      0|1)
+        [ "$VERBOSE" != no ] && echo "krb524d"
+        ;;
+      2)
+        [ "$VERBOSE" != no ] && echo 1
+        ;;
+    esac
+    ;;
+
+  restart|force-reload)
+    echo "Restarting $DESC" "$NAME"
+    do_stop_kdc
+    case "$?" in
+      0|1)
+        do_start_kdc
+        case "$?" in
+          0)
+	  echo 0
+	  ;;
+          1|2)
+            echo 1
+            ;;
+        esac
+        ;;
+      *)
+        echo 1
+        ;;
+    esac
+    ;;
+
+  status)
+    pidofproc "$DAEMON" >/dev/null
+    status=$?
+    if [ $status -eq 0 ]; then
+        echo "$NAME is running."
+    else
+        echo "$NAME is not running."
+    fi
+    exit $status
+    ;;
+
+  *)
+    echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload|status}" >&2
+    exit 3
+    ;;
+esac
+
+:
diff --git a/meta-freedesktop/recipes-core/krb5/krb5_1.11.bb b/meta-freedesktop/recipes-core/krb5/krb5_1.11.bb
deleted file mode 100644
index 862c563..0000000
--- a/meta-freedesktop/recipes-core/krb5/krb5_1.11.bb
+++ /dev/null
@@ -1,43 +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/"
-
-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() {
-    (cd ${S} && gnu-configize --force) || die "failure in running gnu-configize"
-    oe_runconf
-}
diff --git a/meta-freedesktop/recipes-core/krb5/krb5_1.12.2.bb b/meta-freedesktop/recipes-core/krb5/krb5_1.12.2.bb
new file mode 100644
index 0000000..c492496
--- /dev/null
+++ b/meta-freedesktop/recipes-core/krb5/krb5_1.12.2.bb
@@ -0,0 +1,80 @@
+SUMMARY = "A network authentication protocol"
+DESCRIPTION = "Kerberos is a system for authenticating users and services on a network. \
+ Kerberos is a trusted third-party service.  That means that there is a \
+ third party (the Kerberos server) that is trusted by all the entities on \
+ the network (users and services, usually called "principals"). \
+ . \
+ This is the MIT reference implementation of Kerberos V5. \
+ . \
+ This package contains the Kerberos key server (KDC).  The KDC manages all \
+ authentication credentials for a Kerberos realm, holds the master keys \
+ for the realm, and responds to authentication requests.  This package \
+ should be installed on both master and slave KDCs."
+
+HOMEPAGE = "http://web.mit.edu/Kerberos/"
+SECTION = "console/network"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=450c80c6258ce03387bd09df37638ebc"
+DEPENDS = "ncurses util-linux e2fsprogs e2fsprogs-native"
+
+inherit autotools-brokensep binconfig perlnative
+
+SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}"
+SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}-signed.tar \
+           file://0001-aclocal-Add-parameter-to-disable-keyutils-detection.patch \
+           file://0001-Return-only-new-keys-in-randkey-CVE-2014-5351.patch \
+           file://debian-suppress-usr-lib-in-krb5-config.patch;striplevel=2 \
+           file://crosscompile_nm.patch \
+           file://etc/init.d/krb5-kdc \
+           file://etc/init.d/krb5-admin-server \
+           file://etc/default/krb5-kdc \
+           file://etc/default/krb5-admin-server \
+"
+SRC_URI[md5sum] = "357f1312b7720a0a591e22db0f7829fe"
+SRC_URI[sha256sum] = "09bd180107b5c2b3b7378c57c023fb02a103d4cac39d6f2dd600275d7a4f3744"
+
+S = "${WORKDIR}/${BP}/src/"
+
+PACKAGECONFIG ??= "openssl"
+PACKAGECONFIG[libedit] = "--with-libedit,--without-libedit,libedit"
+PACKAGECONFIG[openssl] = "--with-pkinit-crypto-impl=openssl,,openssl"
+PACKAGECONFIG[keyutils] = "--enable-keyutils,--disable-keyutils,keyutils"
+PACKAGECONFIG[ldap] = "--with-ldap,--without-ldap,openldap"
+PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
+
+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} += "${datadir}/gnats"
+FILES_${PN}-doc += "${datadir}/examples"
+FILES_${PN}-dbg += "${libdir}/krb5/plugins/*/.debug"
+
+# As this recipe doesn't inherit update-rc.d, we need to add this dependency here
+RDEPENDS_${PN} += "initscripts-functions"
+
+krb5_do_unpack() {
+    # ${P}-signed.tar contains ${P}.tar.gz.asc and ${P}.tar.gz
+    tar xzf ${WORKDIR}/${BP}.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
+    autoreconf
+    oe_runconf
+}
+
+do_install_append() {
+    mkdir -p ${D}/etc/init.d ${D}/etc/default
+    install -m 0755 ${WORKDIR}/etc/init.d/* ${D}/etc/init.d
+    install -m 0644 ${WORKDIR}/etc/default/* ${D}/etc/default
+}
diff --git a/meta-freedesktop/recipes-core/libxml/libxml2_2.9.1.bbappend b/meta-freedesktop/recipes-core/libxml/libxml2_2.9.2.bbappend
index 4726523..4f52bb4 100644
--- a/meta-freedesktop/recipes-core/libxml/libxml2_2.9.1.bbappend
+++ b/meta-freedesktop/recipes-core/libxml/libxml2_2.9.2.bbappend
@@ -4,4 +4,4 @@ do_configure_prepend () {
         export PYTHON_SITE_PACKAGES="${PYTHON_SITEPACKAGES_DIR}"
 }
 
-EXTRA_OECONF = "--with-python=${STAGING_BINDIR}/python --without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions"
+EXTRA_OECONF = "--with-python=${STAGING_BINDIR}/python --without-debug --without-legacy --with-catalog --without-docbook --with-c14n --without-lzma --with-fexceptions --with-zlib"
diff --git a/meta-freedesktop/recipes-core/linux/files/9p.cfg b/meta-freedesktop/recipes-core/linux/files/9p.cfg
deleted file mode 100644
index c844bc1..0000000
--- a/meta-freedesktop/recipes-core/linux/files/9p.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-CONFIG_NET_9P_RDMA=m
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-CONFIG_9P_FS_POSIX_ACL=y
-CONFIG_9P_FS_SECURITY=y
diff --git a/meta-freedesktop/recipes-core/linux/files/drm.cfg b/meta-freedesktop/recipes-core/linux/files/drm.cfg
deleted file mode 100644
index 74e704b..0000000
--- a/meta-freedesktop/recipes-core/linux/files/drm.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-CONFIG_DRM=m
-CONFIG_DRM_LOAD_EDID_FIRMWARE=y
-CONFIG_DRM_CIRRUS_QEMU=m
-CONFIG_DRM_QXL=m
-CONFIG_DRM_VMWGFX=m
-CONFIG_DRM_VMWGFX_FBCON=y
-CONFIG_VIDEO_OUTPUT_CONTROL=y
diff --git a/meta-freedesktop/recipes-core/linux/files/fhandle.cfg b/meta-freedesktop/recipes-core/linux/files/fhandle.cfg
deleted file mode 100644
index edcdc05..0000000
--- a/meta-freedesktop/recipes-core/linux/files/fhandle.cfg
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_FHANDLE=y
diff --git a/meta-freedesktop/recipes-core/linux/files/kvm.cfg b/meta-freedesktop/recipes-core/linux/files/kvm.cfg
deleted file mode 100644
index cb880ce..0000000
--- a/meta-freedesktop/recipes-core/linux/files/kvm.cfg
+++ /dev/null
@@ -1,6 +0,0 @@
-CONFIG_HYPERVISOR_GUEST=y
-CONFIG_PARAVIRT=y
-CONFIG_PARAVIRT_TIME_ACCOUNTING=y
-PARAVIRT_SPINLOCKS=y
-CONFIG_KVM_CLOCK=y
-CONFIG_KVM_GUEST=y
diff --git a/meta-freedesktop/recipes-core/linux/files/tmpfs.cfg b/meta-freedesktop/recipes-core/linux/files/tmpfs.cfg
deleted file mode 100644
index 8385bb1..0000000
--- a/meta-freedesktop/recipes-core/linux/files/tmpfs.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_TMPFS_XATTR=y
diff --git a/meta-freedesktop/recipes-core/linux/files/uinput.cfg b/meta-freedesktop/recipes-core/linux/files/uinput.cfg
deleted file mode 100644
index fc267df..0000000
--- a/meta-freedesktop/recipes-core/linux/files/uinput.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_UINPUT=m
-
diff --git a/meta-freedesktop/recipes-core/linux/linux-yocto-dev.bbappend b/meta-freedesktop/recipes-core/linux/linux-yocto-dev.bbappend
deleted file mode 100644
index 870cb00..0000000
--- a/meta-freedesktop/recipes-core/linux/linux-yocto-dev.bbappend
+++ /dev/null
@@ -1,8 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += "file://kvm.cfg"
-SRC_URI += "file://uinput.cfg"
-SRC_URI += "file://drm.cfg"
-SRC_URI += "file://9p.cfg"
-SRC_URI += "file://tmpfs.cfg"
-SRC_URI += "file://fhandle.cfg"
-PRINC = "7"
diff --git a/meta-freedesktop/recipes-core/nss-altfiles/nss-altfiles.bb b/meta-freedesktop/recipes-core/nss-altfiles/nss-altfiles.bb
deleted file mode 100644
index a6db2db..0000000
--- a/meta-freedesktop/recipes-core/nss-altfiles/nss-altfiles.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "\
-NSS module to read user/group information from files in \
-alternate locations."
-HOMEPAGE = "https://github.com/aperezdc/nss-altfiles"
-AUTHOR = "Adrian Perez <aperez@igalia.com>"
-SECTION = "libs"
-LICENSE = "LGPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=fb1949d8d807e528c1673da700aff41f"
-SRC_URI = "http://github.com/downloads/aperezdc/${PN}/${PN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "53d26e6a4cdb1b662098db5b6dfa71701eeb957299895d021098f135ef3e4ad6"
-
-PV = "2.13.2"
-PR = "r1"
-DEPENDS += "glibc"
-
-# Generate only an extra split-debug package (no -doc/-dev packages)
-#
-PACKAGES = "${PN} ${PN}-dbg"
-
-# The package_rpm would rename generated packages to libnss_altfiles,
-# so override the package names to get nss-altfiles(-dbg)
-#
-PKG_${PN} = "${PN}"
-PKG_${PN}-dbg = "${PN}-dbg"
-
-# The .so has to be installed under /lib for the libc to use it.
-#
-EXTRA_OECONF = "--datadir=/lib --prefix=/"
-
-inherit autotools-brokensep
diff --git a/meta-freedesktop/recipes-core/pyparsing/python-pyparsing_1.5.5.bb b/meta-freedesktop/recipes-core/pyparsing/python-pyparsing_1.5.5.bb
deleted file mode 100644
index 3998faf..0000000
--- a/meta-freedesktop/recipes-core/pyparsing/python-pyparsing_1.5.5.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-SUMMARY = "Python module for parsing"
-SECTION = "devel/python"
-HOMEPAGE = "http://pyparsing.wikispaces.com/Download+and+Installation"
-DEPENDS = "python"
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=fb46329938e6bc829b256e37d5c1e31a"
-
-PR = "r1"
-
-SRC_URI = "http://cheeseshop.python.org/packages/source/p/pyparsing/pyparsing-1.5.5.tar.gz"
-
-SRC_URI[md5sum] = "0beba391cba3082d7914c289bffa52ce"
-SRC_URI[sha256sum] = "d1754df0801871d05a96f1cef50a4f32e5d40d49ea24aa1c6ca9529cbd562005"
-
-S = "${WORKDIR}/pyparsing-${PV}"
-
-inherit distutils
diff --git a/meta-freedesktop/recipes-core/ruby/ruby-dbus_0.2.1.bb b/meta-freedesktop/recipes-core/ruby/ruby-dbus_0.2.1.bb
deleted file mode 100644
index 35ea546..0000000
--- a/meta-freedesktop/recipes-core/ruby/ruby-dbus_0.2.1.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-DESCRIPTION = "${PN} bindings"
-SECTION = "devel/ruby"
-LICENSE = "LGPL"
-RDEPENDS_${PN} = "dbus ruby"
-PR = "r2"
-
-SRC_URI = "http://trac.luon.net/data/${PN}/releases/${PN}-0.2.1.tar.gz"
-
-RUBY_DIR = "${libdir}/ruby/1.8"
-
-S = "${WORKDIR}/${PN}-${PV}"
-
-FILES_${PN} += "${RUBY_DIR}"
-
-do_install() {
-	install -d ${D}${RUBY_DIR}
-	cp -R lib/* ${D}${RUBY_DIR}
-}
-
-
-SRC_URI[md5sum] = "1f6398d8bbafa272c0b43878fec43276"
-SRC_URI[sha256sum] = "cfcadc4ae860f2de3d6aa1a1230a410b1dedf783148a27a20205bb3b54e3c3ac"
diff --git a/meta-freedesktop/recipes-core/ruby/ruby.inc b/meta-freedesktop/recipes-core/ruby/ruby.inc
deleted file mode 100644
index 3ea94be..0000000
--- a/meta-freedesktop/recipes-core/ruby/ruby.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRIPTION = "Ruby is an interpreted scripting language \
-for quick and easy object-oriented programming."
-SECTION = "devel/ruby"
-PRIORITY = "optional"
-LICENSE = "GPL"
-LIC_FILES_CHKSUM = "file://COPYING;md5=99f88e67b65504d289a0326c59f9c148"
-DEPENDS = "ruby-native zlib openssl"
-DEPENDS_virtclass-native = ""
-
-INC_PR = "r2"
-
-SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
-SRC_URI = "ftp://ftp.ruby-lang.org/pub/ruby/${SHRT_VER}/ruby-${PV}.tar.gz \
-           file://extmk_run.patch \
-           file://extmk.patch \
-	   file://ext-dl-Work-around-bug-in-mkmf-causing-output-corrup.patch \
-"
-
-S = "${WORKDIR}/ruby-${PV}"
-
-inherit autotools
-
-# fix building of socket extension
-EXTRA_OECONF = "--enable-wide-getaddrinfo"
-
-# This snippet lets compiled extensions which rely on external libraries,
-# such as zlib, compile properly.  If we don't do this, then when extmk.rb
-# runs, it uses the native libraries instead of the target libraries, and so
-# none of the linking operations succeed -- which makes extconf.rb think
-# that the libraries aren't available and hence that the extension can't be
-# built.
-
-do_configure_prepend() {
-	sed -i "s#%%TARGET_CFLAGS%%#$TARGET_CFLAGS#; s#%%TARGET_LDFLAGS%%#$TARGET_LDFLAGS#" ${S}/common.mk
-	rm -rf ${S}/ruby/
-}
diff --git a/meta-freedesktop/recipes-core/ruby/ruby/0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch b/meta-freedesktop/recipes-core/ruby/ruby/0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch
deleted file mode 100644
index 64f093a..0000000
--- a/meta-freedesktop/recipes-core/ruby/ruby/0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9341293e71c03fe606edc9157bf1e13e3dd5b507 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Fri, 17 Dec 2010 11:35:38 +0100
-Subject: [PATCH] socket extconf: hardcode wide-getaddr info test outcome to true
-
-Without this the socket extension doesn't build correctly
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- ext/socket/extconf.rb |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/ext/socket/extconf.rb b/ext/socket/extconf.rb
-index ece6158..5fba46c 100644
---- a/ext/socket/extconf.rb
-+++ b/ext/socket/extconf.rb
-@@ -222,6 +222,11 @@ main()
-   exit(EXIT_FAILURE);
- }
- EOF
-+
-+# Ignore the actual result of the above test and assume that
-+# everything is OK.
-+getaddr_info_ok = true
-+
- end
- if ipv6 and not getaddr_info_ok
-   abort <<EOS
--- 
-1.6.6.1
-
diff --git a/meta-freedesktop/recipes-core/ruby/ruby/ext-dl-Work-around-bug-in-mkmf-causing-output-corrup.patch b/meta-freedesktop/recipes-core/ruby/ruby/ext-dl-Work-around-bug-in-mkmf-causing-output-corrup.patch
deleted file mode 100644
index 9252e0a..0000000
--- a/meta-freedesktop/recipes-core/ruby/ruby/ext-dl-Work-around-bug-in-mkmf-causing-output-corrup.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From a23ee433cae17151de3c9101ed4d31ca15c7974d Mon Sep 17 00:00:00 2001
-From: Colin Walters <walters@verbum.org>
-Date: Sun, 23 Sep 2012 13:27:50 -0400
-Subject: [PATCH] ext/dl: Work around bug in mkmf causing output corruption
-
-See http://bugs.ruby-lang.org/issues/5108
----
- ext/dl/mkcall.rb     | 1 +
- ext/dl/mkcallback.rb | 1 +
- ext/dl/mkcbtable.rb  | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/ext/dl/mkcall.rb b/ext/dl/mkcall.rb
-index 6a85570..730a9cc 100644
---- a/ext/dl/mkcall.rb
-+++ b/ext/dl/mkcall.rb
-@@ -59,4 +59,5 @@ DLTYPE.keys.sort.each{|t|
-     $stderr.printf("  #{DLTYPE[t][:ctype]}\n")
-     rec_output([t])
-   end
-+  STDOUT.flush
- }
-diff --git a/ext/dl/mkcallback.rb b/ext/dl/mkcallback.rb
-index c9f92e4..2d18be4 100644
---- a/ext/dl/mkcallback.rb
-+++ b/ext/dl/mkcallback.rb
-@@ -53,4 +53,5 @@ DLTYPE.keys.sort.each{|t|
-   for n in 0..(MAX_CALLBACK - 1)
-     print(mkfunc(t, n, 15), "\n\n")
-   end
-+  STDOUT.flush
- }
-diff --git a/ext/dl/mkcbtable.rb b/ext/dl/mkcbtable.rb
-index 165c4bd..5eb6203 100644
---- a/ext/dl/mkcbtable.rb
-+++ b/ext/dl/mkcbtable.rb
-@@ -15,4 +15,5 @@ DLTYPE.keys.sort.each{|t|
-   for n in 0..(MAX_CALLBACK - 1)
-     print(mktable(t, n, 15), "\n")
-   end
-+  STDOUT.flush
- }
--- 
-1.7.11.4
-
diff --git a/meta-freedesktop/recipes-core/ruby/ruby/extmk.patch b/meta-freedesktop/recipes-core/ruby/ruby/extmk.patch
deleted file mode 100644
index 8b68450..0000000
--- a/meta-freedesktop/recipes-core/ruby/ruby/extmk.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -ru ruby-1.8.7-p248.orig/ext/extmk.rb ruby-1.8.7-p248/ext/extmk.rb
---- ruby-1.8.7-p248.orig/ext/extmk.rb	2009-12-24 03:01:58.000000000 -0600
-+++ ruby-1.8.7-p248/ext/extmk.rb	2010-02-12 15:55:27.370061558 -0600
-@@ -354,8 +354,8 @@
-   $ruby = '$(topdir)/miniruby' + EXEEXT
- end
- $ruby << " -I'$(topdir)'"
-+$ruby << " -I'$(top_srcdir)/lib'"
- unless CROSS_COMPILING
--  $ruby << " -I'$(top_srcdir)/lib'"
-   $ruby << " -I'$(extout)/$(arch)' -I'$(extout)/common'" if $extout
-   $ruby << " -I./- -I'$(top_srcdir)/ext' -rpurelib.rb"
-   ENV["RUBYLIB"] = "-"
diff --git a/meta-freedesktop/recipes-core/ruby/ruby/extmk_run.patch b/meta-freedesktop/recipes-core/ruby/ruby/extmk_run.patch
deleted file mode 100644
index 57926f5..0000000
--- a/meta-freedesktop/recipes-core/ruby/ruby/extmk_run.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-============================================================
---- packages/ruby/ruby-1.8.5/extmk_run.patch	d9738b5a71e2f9a98d009af9fd0ef1ceaff9ef48
-+++ packages/ruby/ruby-1.8.5/extmk_run.patch	d9738b5a71e2f9a98d009af9fd0ef1ceaff9ef48
-@@ -0,0 +1,11 @@
-+--- ruby-1.8.5/common.mk.orig	2006-12-30 13:07:32.000000000 +1100
-++++ ruby-1.8.5/common.mk	2006-12-30 13:08:32.000000000 +1100
-+@@ -56,7 +56,7 @@
-+ 		--make="$(MAKE)" \
-+ 		--mflags="$(MFLAGS)" \
-+ 		--make-flags="$(MAKEFLAGS)"
-+-EXTMK_ARGS    =	$(SCRIPT_ARGS) --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) --
-++EXTMK_ARGS    =	$(SCRIPT_ARGS) --with-ldflags="%%TARGET_LDFLAGS%%" --with-cflags="%%TARGET_CFLAGS%%" --extout="$(EXTOUT)" --extension $(EXTS) --extstatic $(EXTSTATIC) --
-+ 
-+ all: $(MKFILES) $(PREP) $(RBCONFIG) $(LIBRUBY)
-+ 	@$(MINIRUBY) $(srcdir)/ext/extmk.rb $(EXTMK_ARGS)
diff --git a/meta-freedesktop/recipes-core/ruby/ruby/openssl.patch b/meta-freedesktop/recipes-core/ruby/ruby/openssl.patch
deleted file mode 100644
index 9de37ef..0000000
--- a/meta-freedesktop/recipes-core/ruby/ruby/openssl.patch
+++ /dev/null
@@ -1,156 +0,0 @@
-This patch backports changes from ruby 1.8.7 which only includes the
-openssl prototypes for functions that are not in the system openssl
-library.
-
-diff -u ruby-1.8.5.orig/ext/openssl/extconf.rb ruby-1.8.5/ext/openssl/extconf.rb
---- ruby-1.8.5.orig/ext/openssl/openssl_missing.c	2007-02-13 00:01:19.000000000 +0100
-+++ ruby-1.8.5/ext/openssl/openssl_missing.c	2008-05-19 05:00:52.000000000 +0200
-@@ -22,17 +22,15 @@
- #include "openssl_missing.h"
- 
- #if !defined(HAVE_HMAC_CTX_COPY)
--int
-+void
- HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in)
- {
--    if (!out || !in) return 0;
-+    if (!out || !in) return;
-     memcpy(out, in, sizeof(HMAC_CTX));
- 
--    if (!EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx)
--	    || !EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx)
--	    || !EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx))
--	return 0;
--    return 1;
-+    EVP_MD_CTX_copy(&out->md_ctx, &in->md_ctx);
-+    EVP_MD_CTX_copy(&out->i_ctx, &in->i_ctx);
-+    EVP_MD_CTX_copy(&out->o_ctx, &in->o_ctx);
- }
- #endif /* HAVE_HMAC_CTX_COPY */
- #endif /* NO_HMAC */
-diff -u ruby-1.8.5.orig/ext/openssl/openssl_missing.h ruby-1.8.5/ext/openssl/openssl_missing.h
---- ruby-1.8.5.orig/ext/openssl/openssl_missing.h	2008-08-04 06:43:34.000000000 +0200
-+++ ruby-1.8.5/ext/openssl/openssl_missing.h	2008-08-04 06:44:17.000000000 +0200
-@@ -60,14 +60,33 @@
- 	(char *(*)())d2i_PKCS7_RECIP_INFO, (char *)ri)
- #endif
- 
-+#if !defined(HAVE_EVP_MD_CTX_INIT)
- void HMAC_CTX_init(HMAC_CTX *ctx);
--int HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
-+#endif
-+
-+#if !defined(HAVE_HMAC_CTX_COPY)
-+void HMAC_CTX_copy(HMAC_CTX *out, HMAC_CTX *in);
-+#endif
-+
-+#if !defined(HAVE_HMAC_CTX_CLEANUP)
- void HMAC_CTX_cleanup(HMAC_CTX *ctx);
-+#endif
- 
-+#if !defined(HAVE_EVP_MD_CTX_CREATE)
- EVP_MD_CTX *EVP_MD_CTX_create(void);
-+#endif
-+
-+#if !defined(HAVE_EVP_MD_CTX_INIT)
- void EVP_MD_CTX_init(EVP_MD_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_EVP_MD_CTX_CLEANUP)
- int EVP_MD_CTX_cleanup(EVP_MD_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_EVP_MD_CTX_DESTROY)
- void EVP_MD_CTX_destroy(EVP_MD_CTX *ctx);
-+#endif
- 
- #if !defined(HAVE_EVP_CIPHER_CTX_COPY)
- int EVP_CIPHER_CTX_copy(EVP_CIPHER_CTX *out, EVP_CIPHER_CTX *in);
-@@ -111,19 +130,54 @@
- #define OPENSSL_cleanse(p, l) memset(p, 0, l)
- #endif
- 
-+#if !defined(HAVE_X509_STORE_SET_EX_DATA)
- void *X509_STORE_get_ex_data(X509_STORE *str, int idx);
- int X509_STORE_set_ex_data(X509_STORE *str, int idx, void *data);
-+#endif
-+
-+#if !defined(HAVE_X509_CRL_SET_VERSION)
- int X509_CRL_set_version(X509_CRL *x, long version);
-+#endif
-+
-+#if !defined(HAVE_X509_CRL_SET_ISSUER_NAME)
- int X509_CRL_set_issuer_name(X509_CRL *x, X509_NAME *name);
-+#endif
-+
-+#if !defined(HAVE_X509_CRL_SORT)
- int X509_CRL_sort(X509_CRL *c);
-+#endif
-+
-+#if !defined(HAVE_X509_CRL_ADD0_REVOKED)
- int X509_CRL_add0_revoked(X509_CRL *crl, X509_REVOKED *rev);
-+#endif
-+
-+#if !defined(HAVE_BN_MOD_SQR)
- int BN_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *m, BN_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_BN_MOD_ADD)
- int BN_mod_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_BN_MOD_SUB)
- int BN_mod_sub(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);
-+#endif
-+
-+#if !defined(HAVE_BN_RAND_RANGE)
- int BN_rand_range(BIGNUM *r, BIGNUM *range);
-+#endif
-+
-+#if !defined(HAVE_BN_PSEUDO_RAND_RANGE)
- int BN_pseudo_rand_range(BIGNUM *r, BIGNUM *range);
-+#endif
-+
-+#if !defined(HAVE_CONF_GET1_DEFAULT_CONFIG_FILE)
- char *CONF_get1_default_config_file(void);
-+#endif
-+
-+#if !defined(HAVE_PEM_DEF_CALLBACK)
- int PEM_def_callback(char *buf, int num, int w, void *key);
-+#endif
- 
- #if defined(__cplusplus)
- }
-diff -u ruby-1.8.5.orig/ext/openssl/ossl_hmac.c ruby-1.8.5/ext/openssl/ossl_hmac.c
---- ruby-1.8.5.orig/ext/openssl/ossl_hmac.c	2007-03-12 05:12:32.000000000 +0100
-+++ ruby-1.8.5/ext/openssl/ossl_hmac.c	2008-05-19 05:00:52.000000000 +0200
-@@ -81,12 +87,15 @@
-     GetHMAC(self, ctx1);
-     SafeGetHMAC(other, ctx2);
- 
--    if (!HMAC_CTX_copy(ctx1, ctx2)) {
--	ossl_raise(eHMACError, NULL);
--    }
-+    HMAC_CTX_copy(ctx1, ctx2);
-     return self;
- }
- 
-+/*
-+ *  call-seq:
-+ *     hmac.update(string) -> self
-+ *
-+ */
- static VALUE
- ossl_hmac_update(VALUE self, VALUE data)
- {
-@@ -104,9 +113,7 @@
- {
-     HMAC_CTX final;
- 
--    if (!HMAC_CTX_copy(&final, ctx)) {
--	ossl_raise(eHMACError, NULL);
--    }
-+    HMAC_CTX_copy(&final, ctx);
-     if (!(*buf = OPENSSL_malloc(HMAC_size(&final)))) {
- 	HMAC_CTX_cleanup(&final);
- 	OSSL_Debug("Allocating %d mem", HMAC_size(&final));
diff --git a/meta-freedesktop/recipes-core/ruby/ruby_1.8.7-p302.bb b/meta-freedesktop/recipes-core/ruby/ruby_1.8.7-p302.bb
deleted file mode 100644
index a51edd7..0000000
--- a/meta-freedesktop/recipes-core/ruby/ruby_1.8.7-p302.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require ruby.inc
-PR = "${INC_PR}.1"
-
-SRC_URI += "file://0001-socket-extconf-hardcode-wide-getaddr-info-test-outco.patch"
-
-SRC_URI[md5sum] = "f446550dfde0d8162a6ed8d5a38b3ac2"
-SRC_URI[sha256sum] = "5883df5204de70762602ce885b18c8bf6c856d33298c35df9151031b2ce044a1"
-
-FILES_${PN}-dbg += "${libdir}/ruby/1.8/*/.debug \
-                    ${libdir}/ruby/1.8/*/*/.debug"
-BBCLASSEXTEND = "native"
-
diff --git a/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-platform.bb b/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-platform.bb
index 8034b1c..a9548ae 100644
--- a/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-platform.bb
+++ b/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-platform.bb
@@ -44,7 +44,6 @@ RDEPENDS_${PN} += "\
          krb5 \
          less \
          ncurses-terminfo-base \
-         nss-altfiles \
          sed \
          update-alternatives-cworth \
          which \
@@ -69,7 +68,7 @@ RDEPENDS_${PN} += "\
          libpng \
          libsndfile1 \
          libvorbis \
-         libwebp \
+         libvpx \
          libtheora \
          tiff \
          libflac \
diff --git a/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-sdk.bb b/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-sdk.bb
index 964b2d3..5e1e74d 100644
--- a/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-sdk.bb
+++ b/meta-freedesktop/recipes-core/tasks/task-freedesktop-contents-sdk.bb
@@ -52,7 +52,6 @@ RDEPENDS_${PN} += "     \
          valgrind \
          valgrind-dev \
          \
-         ruby \
          libxml-parser-perl \
          libxml-parser-perl-dev \
          perl-modules \
@@ -62,7 +61,6 @@ RDEPENDS_${PN} += "     \
          python3-dev \
          python3-modules \
          python3-misc \
-         python-pyparsing \
          python-mako \
          \
          gdbm-dev \
@@ -95,7 +93,7 @@ RDEPENDS_${PN} += "     \
          libpng-dev \
          libsndfile1-dev \
          libvorbis-dev \
-         libwebp-dev \
+         libvpx-dev \
          libtheora-dev \
          tiff-dev \
          flac-dev \
diff --git a/meta-freedesktop/recipes-multimedia/webm/libvpx/0001-configure.sh-quote-local-variables.patch b/meta-freedesktop/recipes-multimedia/webm/libvpx/0001-configure.sh-quote-local-variables.patch
new file mode 100644
index 0000000..bf94b2d
--- /dev/null
+++ b/meta-freedesktop/recipes-multimedia/webm/libvpx/0001-configure.sh-quote-local-variables.patch
@@ -0,0 +1,40 @@
+From f45fe1668401d72c2937a52385b492216715c0f9 Mon Sep 17 00:00:00 2001
+From: James Zern <jzern@google.com>
+Date: Thu, 6 Mar 2014 15:58:37 -0800
+Subject: [PATCH] configure.sh: quote local variables
+
+fixes issue #711
+
+specifying a multiword CC, e.g., CC='gcc -m32', would cause the failure
+under dash
+
+reported in
+https://bugs.gentoo.org/show_bug.cgi?id=498136
+
+patch by floppymaster at gmail dot com
+
+Upstream-Status: Backport [f45fe1668401d72c2937a52385b492216715c0f9]
+
+Change-Id: I2ba246f765646161538622739961ec0f6c2d8c2d
+---
+ build/make/configure.sh | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/build/make/configure.sh b/build/make/configure.sh
+index 449d1b9..43f8e77 100755
+--- a/build/make/configure.sh
++++ b/build/make/configure.sh
+@@ -405,8 +405,8 @@ true
+ }
+ 
+ write_common_target_config_mk() {
+-    local CC=${CC}
+-    local CXX=${CXX}
++    local CC="${CC}"
++    local CXX="${CXX}"
+     enabled ccache && CC="ccache ${CC}"
+     enabled ccache && CXX="ccache ${CXX}"
+     print_webm_license $1 "##" ""
+-- 
+1.8.3.2
+
diff --git a/meta-freedesktop/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch b/meta-freedesktop/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch
new file mode 100644
index 0000000..1bf863d
--- /dev/null
+++ b/meta-freedesktop/recipes-multimedia/webm/libvpx/libvpx-configure-support-blank-prefix.patch
@@ -0,0 +1,43 @@
+Upstream: not yet
+
+Fix configure to accept "--prefix=" (a blank prefix).
+
+--- libvpx-0.9.1/build/make/configure.sh.orig	2010-06-17 09:08:56.000000000 -0400
++++ libvpx-0.9.1/build/make/configure.sh	2010-09-23 14:27:48.000000000 -0400
+@@ -444,6 +444,8 @@
+         ;;
+         --prefix=*)
+         prefix="${optval}"
++        # Distinguish between "prefix not set" and "prefix set to ''"
++        prefixset=1
+         ;;
+         --libdir=*)
+         libdir="${optval}"
+@@ -471,13 +473,23 @@
+ 
+ 
+ post_process_common_cmdline() {
+-    prefix="${prefix:-/usr/local}"
++    if [ "$prefixset" != "1" ]
++    then
++        prefix=/usr/local
++    fi
++
++    # Strip trailing slash
+     prefix="${prefix%/}"
++
+     libdir="${libdir:-${prefix}/lib}"
+     libdir="${libdir%/}"
+-    if [ "${libdir#${prefix}}" = "${libdir}" ]; then
+-        die "Libdir ${libdir} must be a subdirectory of ${prefix}"
+-    fi
++
++    case "$libdir" in
++        "${prefix}/"*) ;;
++        *)
++            die "Libdir ${libdir} must be a subdirectory of ${prefix}"
++            ;;
++    esac
+ }
+ 
+ 
diff --git a/meta-freedesktop/recipes-multimedia/webm/libvpx_1.3.0.bb b/meta-freedesktop/recipes-multimedia/webm/libvpx_1.3.0.bb
new file mode 100644
index 0000000..eb19a57
--- /dev/null
+++ b/meta-freedesktop/recipes-multimedia/webm/libvpx_1.3.0.bb
@@ -0,0 +1,55 @@
+SUMMARY = "VPX multi-format codec"
+DESCRIPTION = "The BSD-licensed libvpx reference implementation provides en- and decoders for VP8 and VP9 bitstreams."
+HOMEPAGE = "http://www.webmproject.org/code/"
+BUGTRACKER = "http://code.google.com/p/webm/issues/list"
+SECTION = "libs/multimedia"
+LICENSE = "BSD"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=d5b04755015be901744a78cc30d390d4"
+
+SRC_URI += "http://webm.googlecode.com/files/libvpx-v${PV}.tar.bz2 \
+            file://libvpx-configure-support-blank-prefix.patch \
+            file://0001-configure.sh-quote-local-variables.patch"
+SRC_URI[md5sum] = "14783a148872f2d08629ff7c694eb31f"
+SRC_URI[sha256sum] = "d3dcc8d84af51c6c382b214397c62402e37a799e8ebcda6f4217aef0010451a9"
+
+S = "${WORKDIR}/libvpx-v${PV}"
+
+# ffmpeg links with this and fails 
+# sysroots/armv4t-oe-linux-gnueabi/usr/lib/libvpx.a(vpx_encoder.c.o)(.text+0xc4): unresolvable R_ARM_THM_CALL relocation against symbol `memcpy@@GLIBC_2.4'
+ARM_INSTRUCTION_SET = "arm"
+
+CFLAGS += "-fPIC"
+
+export CC
+export LD = "${CC}"
+
+VPXTARGET_armv5te = "armv5te-linux-gcc"
+VPXTARGET_armv6 = "armv6-linux-gcc"
+VPXTARGET_armv7a = "armv7-linux-gcc"
+VPXTARGET ?= "generic-gnu"
+
+CONFIGUREOPTS = " \
+    --target=${VPXTARGET} \
+    --enable-vp8 \
+    --enable-vp9 \
+    --enable-libs \
+    --disable-install-docs \
+    --disable-static \
+    --enable-shared \
+    --prefix=${prefix} \
+    --libdir=${libdir} \
+"
+
+do_configure() {
+    ${S}/configure ${CONFIGUREOPTS}
+}
+
+do_compile() {
+    oe_runmake
+}
+
+do_install() {
+    oe_runmake install DESTDIR=${D}
+}
+
diff --git a/meta-freedesktop/recipes-support/iso-codes/iso-codes_1.4.bb b/meta-freedesktop/recipes-support/iso-codes/iso-codes_1.4.bb
new file mode 100644
index 0000000..ed89a12
--- /dev/null
+++ b/meta-freedesktop/recipes-support/iso-codes/iso-codes_1.4.bb
@@ -0,0 +1,17 @@
+SUMMARY = "ISO language, territory, currency, script codes and their translations"
+LICENSE = "LGPLv2.1"
+LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=fbc093901857fcd118f065f900982c24"
+
+PR = "r2"
+
+SRC_URI = "ftp://pkg-isocodes.alioth.debian.org/pub/pkg-isocodes/iso-codes-${PV}.tar.bz2"
+SRC_URI[md5sum] = "4073466e57df23d39721513219e4f7ae"
+SRC_URI[sha256sum] = "0a7cf177c25b3f0d77c60a5f1149aab9e03ba70f69bac70138a867efe19a1d97"
+
+# inherit gettext cannot be used, because it adds gettext-native to BASEDEPENDS which
+# are inhibited by allarch
+DEPENDS = "gettext-native"
+
+inherit autotools allarch
+
+FILES_${PN} += "${datadir}/xml/"
diff --git a/meta-freedesktop/recipes-support/lcms/lcms_2.6.bb b/meta-freedesktop/recipes-support/lcms/lcms_2.6.bb
new file mode 100644
index 0000000..ad727df
--- /dev/null
+++ b/meta-freedesktop/recipes-support/lcms/lcms_2.6.bb
@@ -0,0 +1,15 @@
+SUMMARY = "Little cms is a small-footprint, speed optimized color management engine"
+SECTION = "libs"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=6c786c3b7a4afbd3c990f1b81261d516"
+SRC_URI = "${SOURCEFORGE_MIRROR}/lcms/lcms2-${PV}.tar.gz"
+SRC_URI[md5sum] = "f4c08d38ceade4a664ebff7228910a33"
+SRC_URI[sha256sum] = "5172528839647c54c3da211837225e221be93e4733f5b5e9f57668f7107e14b1"
+
+DEPENDS = "tiff"
+
+BBCLASSEXTEND = "native"
+
+S = "${WORKDIR}/lcms2-${PV}"
+
+inherit autotools
diff --git a/yocto b/yocto
-Subproject ec75238f6cc2d2d8d40e0268f6d2acc070cbe9a
+Subproject cd2c9acdbd75c83790e8144d2a834f5b5de35df