Fix the references to old config variables

Signed-off-by: Alexey Neyman <stilor@att.net>

432 files changed, 304 insertions, 237 deletions

diff --git a/packages/autoconf/package.desc b/packages/autoconf/package.desc
index bfec1252..27ac6c3a 100644
--- a/packages/autoconf/package.desc
+++ b/packages/autoconf/package.desc
@@ -1 +1,2 @@
-repository="git git://git.sv.gnu.org/autoconf"
+repository='git git://git.sv.gnu.org/autoconf'
+mirrors='$(CT_Mirrors GNU autoconf)'
diff --git a/packages/autoconf/version.desc b/packages/autoconf/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/autoconf/version.desc
+++ b/packages/autoconf/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/automake/1.11.1/version.desc b/packages/automake/1.11.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/automake/1.11.1/version.desc
+++ b/packages/automake/1.11.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/automake/1.11.6/version.desc b/packages/automake/1.11.6/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/automake/1.11.6/version.desc
+++ b/packages/automake/1.11.6/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/automake/1.14/version.desc b/packages/automake/1.14/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/automake/1.14/version.desc
+++ b/packages/automake/1.14/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/automake/package.desc b/packages/automake/package.desc
index ba73596a..7400a0fc 100644
--- a/packages/automake/package.desc
+++ b/packages/automake/package.desc
@@ -1 +1,2 @@
-repository="git https://git.savannah.gnu.org/git/automake.git"
+repository='git https://git.savannah.gnu.org/git/automake.git'
+mirrors='$(CT_Mirrors GNU automake)'
diff --git a/packages/avr-libc/1.8.0/version.desc b/packages/avr-libc/1.8.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/avr-libc/1.8.0/version.desc
+++ b/packages/avr-libc/1.8.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/avr-libc/package.desc b/packages/avr-libc/package.desc
index fa9571e3..8976862e 100644
--- a/packages/avr-libc/package.desc
+++ b/packages/avr-libc/package.desc
@@ -1 +1,2 @@
-repository="svn svn://svn.savannah.nongnu.org/avr-libc/trunk/avr-libc"
+repository='svn svn://svn.savannah.nongnu.org/avr-libc/trunk/avr-libc'
+mirrors='http://download.savannah.gnu.org/releases/avr-libc'
diff --git a/packages/binutils-linaro/2.23.2-2013.10-4/version.desc b/packages/binutils-linaro/2.23.2-2013.10-4/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/binutils-linaro/2.23.2-2013.10-4/version.desc
+++ b/packages/binutils-linaro/2.23.2-2013.10-4/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/binutils-linaro/2.24.0-2014.11-2/version.desc b/packages/binutils-linaro/2.24.0-2014.11-2/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/binutils-linaro/2.24.0-2014.11-2/version.desc
+++ b/packages/binutils-linaro/2.24.0-2014.11-2/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/binutils-linaro/2.25.0-2015.01-2/version.desc b/packages/binutils-linaro/2.25.0-2015.01-2/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/binutils-linaro/2.25.0-2015.01-2/version.desc
+++ b/packages/binutils-linaro/2.25.0-2015.01-2/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/binutils-linaro/package.desc b/packages/binutils-linaro/package.desc
index 5adfd4e1..ea5dc66c 100644
--- a/packages/binutils-linaro/package.desc
+++ b/packages/binutils-linaro/package.desc
@@ -1,5 +1,5 @@
-master="binutils"
-repository="git https://git.linaro.org/toolchain/binutils-gdb.git"
-download="TBD"
-origin="Linaro"
-experimental="yes"
+master='binutils'
+repository='git https://git.linaro.org/toolchain/binutils-gdb.git'
+mirrors='$(CT_Mirrors Linaro binutils ${CT_BINUTILS_LINARO_VERSION})'
+origin='Linaro'
+experimental='yes'
diff --git a/packages/binutils/2.23.2/version.desc b/packages/binutils/2.23.2/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/binutils/2.23.2/version.desc
+++ b/packages/binutils/2.23.2/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/binutils/2.24/version.desc b/packages/binutils/2.24/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/binutils/2.24/version.desc
+++ b/packages/binutils/2.24/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/binutils/2.25.1/version.desc b/packages/binutils/2.25.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/binutils/2.25.1/version.desc
+++ b/packages/binutils/2.25.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/binutils/package.desc b/packages/binutils/package.desc
index 54845f86..6854ee97 100644
--- a/packages/binutils/package.desc
+++ b/packages/binutils/package.desc
@@ -1,4 +1,4 @@
-repository="git git://sourceware.org/git/binutils-gdb.git"
-download_url="TBD other mirrors https://ftp.gnu.org/gnu/binutils/binutils-${version}.${format}"
-origin="GNU"
-milestones="2.23"
+repository='git git://sourceware.org/git/binutils-gdb.git'
+mirrors='$(CT_Mirrors GNU binutils) $(CT_Mirrors GCC_GNU binutils) $(CT_Mirrors sourceware)'
+origin='GNU'
+milestones='2.23'
diff --git a/packages/bionic/10e/version.desc b/packages/bionic/10e/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/bionic/10e/version.desc
+++ b/packages/bionic/10e/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/bionic/11c/version.desc b/packages/bionic/11c/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/bionic/11c/version.desc
+++ b/packages/bionic/11c/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/bionic/12b/version.desc b/packages/bionic/12b/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/bionic/12b/version.desc
+++ b/packages/bionic/12b/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/bionic/13b/version.desc b/packages/bionic/13b/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/bionic/13b/version.desc
+++ b/packages/bionic/13b/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/bionic/15-beta2/version.desc b/packages/bionic/15-beta2/version.desc
index 03502fc9..76f14476 100644
--- a/packages/bionic/15-beta2/version.desc
+++ b/packages/bionic/15-beta2/version.desc
@@ -1 +1 @@
-experimental="yes"
+experimental='yes'
diff --git a/packages/bionic/package.desc b/packages/bionic/package.desc
index fe2c7727..6e3d374a 100644
--- a/packages/bionic/package.desc
+++ b/packages/bionic/package.desc
@@ -1 +1,2 @@
 # We don't support building bionic (yet) so no official repository
+mirrors='https://dl.google.com/android/repository'
diff --git a/packages/cloog/0.18.0/version.desc b/packages/cloog/0.18.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/cloog/0.18.0/version.desc
+++ b/packages/cloog/0.18.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/cloog/0.18.1/version.desc b/packages/cloog/0.18.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/cloog/0.18.1/version.desc
+++ b/packages/cloog/0.18.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/cloog/package.desc b/packages/cloog/package.desc
index c5b98b7c..ac3c29a0 100644
--- a/packages/cloog/package.desc
+++ b/packages/cloog/package.desc
@@ -1,3 +1,4 @@
-name="CLooG"
-repository="git git://repo.or.cz/cloog.git"
-milestones="0.18"
+name='CLooG'
+repository='git git://repo.or.cz/cloog.git'
+mirrors='http://www.bastoul.net/cloog/pages/download ftp://gcc.gnu.org/pub/gcc/infrastructure'
+milestones='0.18'
diff --git a/packages/duma/package.desc b/packages/duma/package.desc
index a48afdd4..efedb9ed 100644
--- a/packages/duma/package.desc
+++ b/packages/duma/package.desc
@@ -1 +1,2 @@
-repository="cvs :pserver:anonymous@duma.cvs.sourceforge.net:/cvsroot/duma"
+repository='cvs :pserver:anonymous@duma.cvs.sourceforge.net:/cvsroot/duma'
+mirrors='http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION}'
diff --git a/packages/elf2flt/package.desc b/packages/elf2flt/package.desc
index a3b9dc23..c46788c1 100644
--- a/packages/elf2flt/package.desc
+++ b/packages/elf2flt/package.desc
@@ -1,2 +1,2 @@
-repository="git https://github.com/uclinux-dev/elf2flt.git"
-repository_cset="6d80ab6c93409e796f85da404bde84b841231531"
+repository='git https://github.com/uclinux-dev/elf2flt.git'
+repository_cset='6d80ab6c93409e796f85da404bde84b841231531'
diff --git a/packages/expat/2.1.1/version.desc b/packages/expat/2.1.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/expat/2.1.1/version.desc
+++ b/packages/expat/2.1.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/expat/package.desc b/packages/expat/package.desc
index f9e53c61..d1bfcf93 100644
--- a/packages/expat/package.desc
+++ b/packages/expat/package.desc
@@ -1 +1,2 @@
-repository="git https://github.com/libexpat/libexpat.git"
+repository='git https://github.com/libexpat/libexpat.git'
+mirrors='http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}'
diff --git a/packages/gcc-linaro/4.8-2015.06/version.desc b/packages/gcc-linaro/4.8-2015.06/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gcc-linaro/4.8-2015.06/version.desc
+++ b/packages/gcc-linaro/4.8-2015.06/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gcc-linaro/6.3-2017.05/1100-ubsan-fix-check-empty-string.patch b/packages/gcc-linaro/6.3-2017.05/1100-ubsan-fix-check-empty-string.patch
new file mode 100644
index 00000000..c0127198
--- /dev/null
+++ b/packages/gcc-linaro/6.3-2017.05/1100-ubsan-fix-check-empty-string.patch
@@ -0,0 +1,28 @@
+From 8db2cf6353c13f2a84cbe49b689654897906c499 Mon Sep 17 00:00:00 2001
+From: kyukhin <kyukhin@138bc75d-0d04-0410-961f-82ee72b054a4>
+Date: Sat, 3 Sep 2016 10:57:05 +0000
+Subject: [PATCH] gcc/ 	* ubsan.c (ubsan_use_new_style_p): Fix check for empty
+ string.
+
+git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239971 138bc75d-0d04-0410-961f-82ee72b054a4
+
+Upstream-Status: Backport
+Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
+
+---
+ gcc/ubsan.c   | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+Index: gcc-6.3.0/gcc/ubsan.c
+===================================================================
+--- gcc-6.3.0.orig/gcc/ubsan.c
++++ gcc-6.3.0/gcc/ubsan.c
+@@ -1471,7 +1471,7 @@ ubsan_use_new_style_p (location_t loc)
+ 
+   expanded_location xloc = expand_location (loc);
+   if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0
+-      || xloc.file == '\0' || xloc.file[0] == '\xff'
++      || xloc.file[0] == '\0' || xloc.file[0] == '\xff'
+       || xloc.file[1] == '\xff')
+     return false;
+ 
diff --git a/packages/gcc-linaro/package.desc b/packages/gcc-linaro/package.desc
index 126f5f27..1731843f 100644
--- a/packages/gcc-linaro/package.desc
+++ b/packages/gcc-linaro/package.desc
@@ -1,5 +1,5 @@
-master="gcc"
-repository="git https://git.linaro.org/toolchain/gcc.git"
-download="TBD"
-origin="Linaro"
-experimental="yes"
+master='gcc'
+repository='git https://git.linaro.org/toolchain/gcc.git'
+mirrors='$(CT_Mirrors Linaro gcc ${CT_GCC_LINARO_VERSION})'
+origin='Linaro'
+experimental='yes'
diff --git a/packages/gcc/4.8.5/version.desc b/packages/gcc/4.8.5/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gcc/4.8.5/version.desc
+++ b/packages/gcc/4.8.5/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gcc/package.desc b/packages/gcc/package.desc
index 81afb5b7..c38ead7e 100644
--- a/packages/gcc/package.desc
+++ b/packages/gcc/package.desc
@@ -1,4 +1,4 @@
-repository="svn svn://gcc.gnu.org/svn/gcc"
-download_url="TBD other mirrors ftp://ftp.gnu.org/gnu/gcc/gcc-${version}/gcc-${version}.${format}"
-origin="GNU"
-milestones="4.8 4.9 5 6 7"
+repository='svn svn://gcc.gnu.org/svn/gcc'
+mirrors='$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc gcc-${CT_GCC_VERSION})'
+origin='GNU'
+milestones='4.8 4.9 4.9.2 5 6 7'
diff --git a/packages/gdb-linaro/7.3-2011.12/version.desc b/packages/gdb-linaro/7.3-2011.12/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb-linaro/7.3-2011.12/version.desc
+++ b/packages/gdb-linaro/7.3-2011.12/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb-linaro/7.4-2012.06/version.desc b/packages/gdb-linaro/7.4-2012.06/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb-linaro/7.4-2012.06/version.desc
+++ b/packages/gdb-linaro/7.4-2012.06/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb-linaro/7.5-2012.12/version.desc b/packages/gdb-linaro/7.5-2012.12/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb-linaro/7.5-2012.12/version.desc
+++ b/packages/gdb-linaro/7.5-2012.12/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb-linaro/7.6.1-2013.10/version.desc b/packages/gdb-linaro/7.6.1-2013.10/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb-linaro/7.6.1-2013.10/version.desc
+++ b/packages/gdb-linaro/7.6.1-2013.10/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb-linaro/7.7-2014.05/version.desc b/packages/gdb-linaro/7.7-2014.05/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb-linaro/7.7-2014.05/version.desc
+++ b/packages/gdb-linaro/7.7-2014.05/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb-linaro/7.7.1-2014.06-1/version.desc b/packages/gdb-linaro/7.7.1-2014.06-1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb-linaro/7.7.1-2014.06-1/version.desc
+++ b/packages/gdb-linaro/7.7.1-2014.06-1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb-linaro/7.8-2014.09/version.desc b/packages/gdb-linaro/7.8-2014.09/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb-linaro/7.8-2014.09/version.desc
+++ b/packages/gdb-linaro/7.8-2014.09/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb-linaro/package.desc b/packages/gdb-linaro/package.desc
index 1b9bd688..f5ed8fac 100644
--- a/packages/gdb-linaro/package.desc
+++ b/packages/gdb-linaro/package.desc
@@ -1,5 +1,5 @@
-master="gdb"
-repository="git https://git.linaro.org/toolchain/binutils-gdb.git"
-download="TBD"
-origin="Linaro"
-experimental="yes"
+master='gdb'
+repository='git https://git.linaro.org/toolchain/binutils-gdb.git'
+mirrors='$(CT_Mirrors Linaro gdb ${CT_GDB_LINARO_VERSION})'
+origin='Linaro'
+experimental='yes'
diff --git a/packages/gdb/6.8a/version.desc b/packages/gdb/6.8a/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/6.8a/version.desc
+++ b/packages/gdb/6.8a/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.0.1a/version.desc b/packages/gdb/7.0.1a/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.0.1a/version.desc
+++ b/packages/gdb/7.0.1a/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.0a/version.desc b/packages/gdb/7.0a/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.0a/version.desc
+++ b/packages/gdb/7.0a/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.10.1/version.desc b/packages/gdb/7.10.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.10.1/version.desc
+++ b/packages/gdb/7.10.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.10/version.desc b/packages/gdb/7.10/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.10/version.desc
+++ b/packages/gdb/7.10/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.1a/version.desc b/packages/gdb/7.1a/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.1a/version.desc
+++ b/packages/gdb/7.1a/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.2a/version.desc b/packages/gdb/7.2a/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.2a/version.desc
+++ b/packages/gdb/7.2a/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.3.1/version.desc b/packages/gdb/7.3.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.3.1/version.desc
+++ b/packages/gdb/7.3.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.3a/version.desc b/packages/gdb/7.3a/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.3a/version.desc
+++ b/packages/gdb/7.3a/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.4.1/version.desc b/packages/gdb/7.4.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.4.1/version.desc
+++ b/packages/gdb/7.4.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.4/version.desc b/packages/gdb/7.4/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.4/version.desc
+++ b/packages/gdb/7.4/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.5.1/version.desc b/packages/gdb/7.5.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.5.1/version.desc
+++ b/packages/gdb/7.5.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.6.1/version.desc b/packages/gdb/7.6.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.6.1/version.desc
+++ b/packages/gdb/7.6.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.7.1/version.desc b/packages/gdb/7.7.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.7.1/version.desc
+++ b/packages/gdb/7.7.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.7/version.desc b/packages/gdb/7.7/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.7/version.desc
+++ b/packages/gdb/7.7/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.8.1/version.desc b/packages/gdb/7.8.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.8.1/version.desc
+++ b/packages/gdb/7.8.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.8/version.desc b/packages/gdb/7.8/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.8/version.desc
+++ b/packages/gdb/7.8/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.9.1/version.desc b/packages/gdb/7.9.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.9.1/version.desc
+++ b/packages/gdb/7.9.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/7.9/version.desc b/packages/gdb/7.9/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gdb/7.9/version.desc
+++ b/packages/gdb/7.9/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gdb/package.desc b/packages/gdb/package.desc
index 4753dc11..b9855a59 100644
--- a/packages/gdb/package.desc
+++ b/packages/gdb/package.desc
@@ -1,3 +1,4 @@
-origin="GNU"
-repository="git ssh://sourceware.org/git/binutils-gdb.git"
-milestones="7.0 7.2"
+origin='GNU'
+repository='git ssh://sourceware.org/git/binutils-gdb.git'
+mirrors='$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb)'
+milestones='7.0 7.2'
diff --git a/packages/gettext/0.19.7/version.desc b/packages/gettext/0.19.7/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gettext/0.19.7/version.desc
+++ b/packages/gettext/0.19.7/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gettext/package.desc b/packages/gettext/package.desc
index 65544195..ccd9f2f0 100644
--- a/packages/gettext/package.desc
+++ b/packages/gettext/package.desc
@@ -1 +1,2 @@
-repository="git https://git.savannah.gnu.org/git/gettext.git"
+repository='git https://git.savannah.gnu.org/git/gettext.git'
+mirrors='$(CT_Mirrors GNU gettext)'
diff --git a/packages/glibc-linaro/2.20-2014.11/version.desc b/packages/glibc-linaro/2.20-2014.11/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/glibc-linaro/2.20-2014.11/version.desc
+++ b/packages/glibc-linaro/2.20-2014.11/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/glibc-linaro/package.desc b/packages/glibc-linaro/package.desc
index c1f1a95f..91195f4b 100644
--- a/packages/glibc-linaro/package.desc
+++ b/packages/glibc-linaro/package.desc
@@ -1,4 +1,5 @@
-master="glibc"
-origin="Linaro"
-repository="git https://git.linaro.org/toolchain/glibc.git"
-experimental="yes"
+master='glibc'
+origin='Linaro'
+repository='git https://git.linaro.org/toolchain/glibc.git'
+mirrors='$(CT_Mirrors Linaro glibc ${CT_GLIBC_LINARO_VERSION})'
+experimental='yes'
diff --git a/packages/glibc/ports-2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch
index 1a632fe4..1a632fe4 100644
--- a/packages/glibc/ports-2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch
diff --git a/packages/glibc/ports-2.12.1/100-respect-env-CPPFLAGS.patch b/packages/glibc-ports/2.12.1/100-respect-env-CPPFLAGS.patch
index ed022beb..ed022beb 100644
--- a/packages/glibc/ports-2.12.1/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc-ports/2.12.1/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc/ports-2.12.1/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc-ports/2.12.1/120-i386-x86_64-revert-clone-cfi.patch
index 95f5aced..95f5aced 100644
--- a/packages/glibc/ports-2.12.1/120-i386-x86_64-revert-clone-cfi.patch
+++ b/packages/glibc-ports/2.12.1/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc/ports-2.12.1/140-disable-ldconfig.patch b/packages/glibc-ports/2.12.1/140-disable-ldconfig.patch
index 43330b87..43330b87 100644
--- a/packages/glibc/ports-2.12.1/140-disable-ldconfig.patch
+++ b/packages/glibc-ports/2.12.1/140-disable-ldconfig.patch
diff --git a/packages/glibc/ports-2.12.1/150-queue-header-updates.patch b/packages/glibc-ports/2.12.1/150-queue-header-updates.patch
index fe625e17..fe625e17 100644
--- a/packages/glibc/ports-2.12.1/150-queue-header-updates.patch
+++ b/packages/glibc-ports/2.12.1/150-queue-header-updates.patch
diff --git a/packages/glibc/ports-2.12.1/160-manual-no-perl.patch b/packages/glibc-ports/2.12.1/160-manual-no-perl.patch
index 2eb5414e..2eb5414e 100644
--- a/packages/glibc/ports-2.12.1/160-manual-no-perl.patch
+++ b/packages/glibc-ports/2.12.1/160-manual-no-perl.patch
diff --git a/packages/glibc/ports-2.12.1/170-localedef-fix-trampoline.patch b/packages/glibc-ports/2.12.1/170-localedef-fix-trampoline.patch
index fb0881d2..fb0881d2 100644
--- a/packages/glibc/ports-2.12.1/170-localedef-fix-trampoline.patch
+++ b/packages/glibc-ports/2.12.1/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc/ports-2.12.1/180-resolv-dynamic.patch b/packages/glibc-ports/2.12.1/180-resolv-dynamic.patch
index 8f74a537..8f74a537 100644
--- a/packages/glibc/ports-2.12.1/180-resolv-dynamic.patch
+++ b/packages/glibc-ports/2.12.1/180-resolv-dynamic.patch
diff --git a/packages/glibc/ports-2.12.1/190-localedef-mmap.patch b/packages/glibc-ports/2.12.1/190-localedef-mmap.patch
index b24ed802..b24ed802 100644
--- a/packages/glibc/ports-2.12.1/190-localedef-mmap.patch
+++ b/packages/glibc-ports/2.12.1/190-localedef-mmap.patch
diff --git a/packages/glibc/ports-2.12.1/200-fadvise64_64.patch b/packages/glibc-ports/2.12.1/200-fadvise64_64.patch
index a9f10cd9..a9f10cd9 100644
--- a/packages/glibc/ports-2.12.1/200-fadvise64_64.patch
+++ b/packages/glibc-ports/2.12.1/200-fadvise64_64.patch
diff --git a/packages/glibc/ports-2.12.1/220-section-comments.patch b/packages/glibc-ports/2.12.1/220-section-comments.patch
index 4d355357..4d355357 100644
--- a/packages/glibc/ports-2.12.1/220-section-comments.patch
+++ b/packages/glibc-ports/2.12.1/220-section-comments.patch
diff --git a/packages/glibc/ports-2.12.1/230-no-inline-gmon.patch b/packages/glibc-ports/2.12.1/230-no-inline-gmon.patch
index 594fb799..594fb799 100644
--- a/packages/glibc/ports-2.12.1/230-no-inline-gmon.patch
+++ b/packages/glibc-ports/2.12.1/230-no-inline-gmon.patch
diff --git a/packages/glibc/ports-2.12.1/240-check_native-headers.patch b/packages/glibc-ports/2.12.1/240-check_native-headers.patch
index de0cb5b6..de0cb5b6 100644
--- a/packages/glibc/ports-2.12.1/240-check_native-headers.patch
+++ b/packages/glibc-ports/2.12.1/240-check_native-headers.patch
diff --git a/packages/glibc/ports-2.12.1/250-fix-pr631.patch b/packages/glibc-ports/2.12.1/250-fix-pr631.patch
index af5b3477..af5b3477 100644
--- a/packages/glibc/ports-2.12.1/250-fix-pr631.patch
+++ b/packages/glibc-ports/2.12.1/250-fix-pr631.patch
diff --git a/packages/glibc/ports-2.12.1/260-assume-pipe2.patch b/packages/glibc-ports/2.12.1/260-assume-pipe2.patch
index b84f8821..b84f8821 100644
--- a/packages/glibc/ports-2.12.1/260-assume-pipe2.patch
+++ b/packages/glibc-ports/2.12.1/260-assume-pipe2.patch
diff --git a/packages/glibc/ports-2.12.1/270-china.patch b/packages/glibc-ports/2.12.1/270-china.patch
index 4cde1cfe..4cde1cfe 100644
--- a/packages/glibc/ports-2.12.1/270-china.patch
+++ b/packages/glibc-ports/2.12.1/270-china.patch
diff --git a/packages/glibc/ports-2.12.1/280-new-valencian-locale.patch b/packages/glibc-ports/2.12.1/280-new-valencian-locale.patch
index 6b46b44d..6b46b44d 100644
--- a/packages/glibc/ports-2.12.1/280-new-valencian-locale.patch
+++ b/packages/glibc-ports/2.12.1/280-new-valencian-locale.patch
diff --git a/packages/glibc/ports-2.12.1/300-nscd-one-fork.patch b/packages/glibc-ports/2.12.1/300-nscd-one-fork.patch
index 27eae51f..27eae51f 100644
--- a/packages/glibc/ports-2.12.1/300-nscd-one-fork.patch
+++ b/packages/glibc-ports/2.12.1/300-nscd-one-fork.patch
diff --git a/packages/glibc/ports-2.12.1/310-hppa-nptl-carlos.patch b/packages/glibc-ports/2.12.1/310-hppa-nptl-carlos.patch
index 947bb584..947bb584 100644
--- a/packages/glibc/ports-2.12.1/310-hppa-nptl-carlos.patch
+++ b/packages/glibc-ports/2.12.1/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc/ports-2.12.1/330-m68k-sys-user.patch b/packages/glibc-ports/2.12.1/330-m68k-sys-user.patch
index b441691a..b441691a 100644
--- a/packages/glibc/ports-2.12.1/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.12.1/330-m68k-sys-user.patch
diff --git a/packages/glibc/ports-2.12.1/340-dl_execstack-PaX-support.patch b/packages/glibc-ports/2.12.1/340-dl_execstack-PaX-support.patch
index afdb39c4..afdb39c4 100644
--- a/packages/glibc/ports-2.12.1/340-dl_execstack-PaX-support.patch
+++ b/packages/glibc-ports/2.12.1/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc/ports-2.12.1/350-pre20040117-pt_pax.patch b/packages/glibc-ports/2.12.1/350-pre20040117-pt_pax.patch
index 3f031694..3f031694 100644
--- a/packages/glibc/ports-2.12.1/350-pre20040117-pt_pax.patch
+++ b/packages/glibc-ports/2.12.1/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc/ports-2.12.1/360-tests-sandbox-libdl-paths.patch b/packages/glibc-ports/2.12.1/360-tests-sandbox-libdl-paths.patch
index a847cdba..a847cdba 100644
--- a/packages/glibc/ports-2.12.1/360-tests-sandbox-libdl-paths.patch
+++ b/packages/glibc-ports/2.12.1/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc/ports-2.12.1/370-fnmatch.patch b/packages/glibc-ports/2.12.1/370-fnmatch.patch
index f345b35c..f345b35c 100644
--- a/packages/glibc/ports-2.12.1/370-fnmatch.patch
+++ b/packages/glibc-ports/2.12.1/370-fnmatch.patch
diff --git a/packages/glibc/ports-2.12.1/380-dont-build-timezone.patch b/packages/glibc-ports/2.12.1/380-dont-build-timezone.patch
index 0a304363..0a304363 100644
--- a/packages/glibc/ports-2.12.1/380-dont-build-timezone.patch
+++ b/packages/glibc-ports/2.12.1/380-dont-build-timezone.patch
diff --git a/packages/glibc/ports-2.12.1/400-alpha-xstat.patch b/packages/glibc-ports/2.12.1/400-alpha-xstat.patch
index 97bea98e..97bea98e 100644
--- a/packages/glibc/ports-2.12.1/400-alpha-xstat.patch
+++ b/packages/glibc-ports/2.12.1/400-alpha-xstat.patch
diff --git a/packages/glibc/ports-2.12.1/430-alpha-creat.patch b/packages/glibc-ports/2.12.1/430-alpha-creat.patch
index bfb72d06..bfb72d06 100644
--- a/packages/glibc/ports-2.12.1/430-alpha-creat.patch
+++ b/packages/glibc-ports/2.12.1/430-alpha-creat.patch
diff --git a/packages/glibc/ports-2.12.1/440-alpha-cache-shape.patch b/packages/glibc-ports/2.12.1/440-alpha-cache-shape.patch
index ea85e99b..ea85e99b 100644
--- a/packages/glibc/ports-2.12.1/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.12.1/440-alpha-cache-shape.patch
diff --git a/packages/glibc/ports-2.12.1/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.12.1/460-alpha-fix-gcc-4.1-warnings.patch
index 64382675..64382675 100644
--- a/packages/glibc/ports-2.12.1/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.12.1/460-alpha-fix-gcc-4.1-warnings.patch
diff --git a/packages/glibc/ports-2.12.1/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc-ports/2.12.1/490-alpha_alpha-add-fdatasync-support.patch
index 9d35ebdd..9d35ebdd 100644
--- a/packages/glibc/ports-2.12.1/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc-ports/2.12.1/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc/ports-2.12.1/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.12.1/530-alpha-fix-rtld-fPIC.patch
index 621a6f3b..621a6f3b 100644
--- a/packages/glibc/ports-2.12.1/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.12.1/530-alpha-fix-rtld-fPIC.patch
diff --git a/packages/glibc/ports-2.12.1/560-ppc-atomic.patch b/packages/glibc-ports/2.12.1/560-ppc-atomic.patch
index 679ef183..679ef183 100644
--- a/packages/glibc/ports-2.12.1/560-ppc-atomic.patch
+++ b/packages/glibc-ports/2.12.1/560-ppc-atomic.patch
diff --git a/packages/glibc/ports-2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index fc42a920..fc42a920 100644
--- a/packages/glibc/ports-2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
diff --git a/packages/glibc/ports-2.12.1/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.12.1/580-nptl-lowlevellock.patch
index c243a76b..c243a76b 100644
--- a/packages/glibc/ports-2.12.1/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.12.1/580-nptl-lowlevellock.patch
diff --git a/packages/glibc/ports-2.12.1/610-fpu-cw-mips.patch b/packages/glibc-ports/2.12.1/610-fpu-cw-mips.patch
index 7d990de7..7d990de7 100644
--- a/packages/glibc/ports-2.12.1/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.12.1/610-fpu-cw-mips.patch
diff --git a/packages/glibc/ports-2.12.1/630-mips_shn_undef-hack.patch b/packages/glibc-ports/2.12.1/630-mips_shn_undef-hack.patch
index f6a5eb6e..f6a5eb6e 100644
--- a/packages/glibc/ports-2.12.1/630-mips_shn_undef-hack.patch
+++ b/packages/glibc-ports/2.12.1/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc/ports-2.12.1/640-alpha-atfcts.patch b/packages/glibc-ports/2.12.1/640-alpha-atfcts.patch
index 90a9d0df..90a9d0df 100644
--- a/packages/glibc/ports-2.12.1/640-alpha-atfcts.patch
+++ b/packages/glibc-ports/2.12.1/640-alpha-atfcts.patch
diff --git a/packages/glibc/ports-2.12.1/650-syslog.patch b/packages/glibc-ports/2.12.1/650-syslog.patch
index c20cafc8..c20cafc8 100644
--- a/packages/glibc/ports-2.12.1/650-syslog.patch
+++ b/packages/glibc-ports/2.12.1/650-syslog.patch
diff --git a/packages/glibc/ports-2.12.1/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc-ports/2.12.1/660-debug-readlink_chk-readklinkat_chk.patch
index a5a70528..a5a70528 100644
--- a/packages/glibc/ports-2.12.1/660-debug-readlink_chk-readklinkat_chk.patch
+++ b/packages/glibc-ports/2.12.1/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/glibc/ports-2.12.1/670-support-hard-float-eabi.patch b/packages/glibc-ports/2.12.1/670-support-hard-float-eabi.patch
index 3f2bc0f0..3f2bc0f0 100644
--- a/packages/glibc/ports-2.12.1/670-support-hard-float-eabi.patch
+++ b/packages/glibc-ports/2.12.1/670-support-hard-float-eabi.patch
diff --git a/packages/glibc-ports/2.12.1/version.desc b/packages/glibc-ports/2.12.1/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/glibc-ports/2.12.1/version.desc
diff --git a/packages/glibc/ports-2.13/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch
index 1a632fe4..1a632fe4 100644
--- a/packages/glibc/ports-2.13/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch
diff --git a/packages/glibc/ports-2.13/100-respect-env-CPPFLAGS.patch b/packages/glibc-ports/2.13/100-respect-env-CPPFLAGS.patch
index 3798cb21..3798cb21 100644
--- a/packages/glibc/ports-2.13/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc-ports/2.13/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc/ports-2.13/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc-ports/2.13/120-i386-x86_64-revert-clone-cfi.patch
index c7f6182d..c7f6182d 100644
--- a/packages/glibc/ports-2.13/120-i386-x86_64-revert-clone-cfi.patch
+++ b/packages/glibc-ports/2.13/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc/ports-2.13/140-disable-ldconfig.patch b/packages/glibc-ports/2.13/140-disable-ldconfig.patch
index 378e1df5..378e1df5 100644
--- a/packages/glibc/ports-2.13/140-disable-ldconfig.patch
+++ b/packages/glibc-ports/2.13/140-disable-ldconfig.patch
diff --git a/packages/glibc/ports-2.13/150-queue-header-updates.patch b/packages/glibc-ports/2.13/150-queue-header-updates.patch
index 7cbe70ef..7cbe70ef 100644
--- a/packages/glibc/ports-2.13/150-queue-header-updates.patch
+++ b/packages/glibc-ports/2.13/150-queue-header-updates.patch
diff --git a/packages/glibc/ports-2.13/160-manual-no-perl.patch b/packages/glibc-ports/2.13/160-manual-no-perl.patch
index 5e2b807d..5e2b807d 100644
--- a/packages/glibc/ports-2.13/160-manual-no-perl.patch
+++ b/packages/glibc-ports/2.13/160-manual-no-perl.patch
diff --git a/packages/glibc/ports-2.13/170-localedef-fix-trampoline.patch b/packages/glibc-ports/2.13/170-localedef-fix-trampoline.patch
index 3cc65597..3cc65597 100644
--- a/packages/glibc/ports-2.13/170-localedef-fix-trampoline.patch
+++ b/packages/glibc-ports/2.13/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc/ports-2.13/180-resolv-dynamic.patch b/packages/glibc-ports/2.13/180-resolv-dynamic.patch
index e916bce3..e916bce3 100644
--- a/packages/glibc/ports-2.13/180-resolv-dynamic.patch
+++ b/packages/glibc-ports/2.13/180-resolv-dynamic.patch
diff --git a/packages/glibc/ports-2.13/190-localedef-mmap.patch b/packages/glibc-ports/2.13/190-localedef-mmap.patch
index f3914cd1..f3914cd1 100644
--- a/packages/glibc/ports-2.13/190-localedef-mmap.patch
+++ b/packages/glibc-ports/2.13/190-localedef-mmap.patch
diff --git a/packages/glibc/ports-2.13/200-fadvise64_64.patch b/packages/glibc-ports/2.13/200-fadvise64_64.patch
index 71bca381..71bca381 100644
--- a/packages/glibc/ports-2.13/200-fadvise64_64.patch
+++ b/packages/glibc-ports/2.13/200-fadvise64_64.patch
diff --git a/packages/glibc/ports-2.13/220-section-comments.patch b/packages/glibc-ports/2.13/220-section-comments.patch
index d717829e..d717829e 100644
--- a/packages/glibc/ports-2.13/220-section-comments.patch
+++ b/packages/glibc-ports/2.13/220-section-comments.patch
diff --git a/packages/glibc/ports-2.13/230-no-inline-gmon.patch b/packages/glibc-ports/2.13/230-no-inline-gmon.patch
index fa33c2b4..fa33c2b4 100644
--- a/packages/glibc/ports-2.13/230-no-inline-gmon.patch
+++ b/packages/glibc-ports/2.13/230-no-inline-gmon.patch
diff --git a/packages/glibc/ports-2.13/240-check_native-headers.patch b/packages/glibc-ports/2.13/240-check_native-headers.patch
index c936f71e..c936f71e 100644
--- a/packages/glibc/ports-2.13/240-check_native-headers.patch
+++ b/packages/glibc-ports/2.13/240-check_native-headers.patch
diff --git a/packages/glibc/ports-2.13/250-fix-pr631.patch b/packages/glibc-ports/2.13/250-fix-pr631.patch
index a48912e1..a48912e1 100644
--- a/packages/glibc/ports-2.13/250-fix-pr631.patch
+++ b/packages/glibc-ports/2.13/250-fix-pr631.patch
diff --git a/packages/glibc/ports-2.13/260-assume-pipe2.patch b/packages/glibc-ports/2.13/260-assume-pipe2.patch
index 42e8f4ed..42e8f4ed 100644
--- a/packages/glibc/ports-2.13/260-assume-pipe2.patch
+++ b/packages/glibc-ports/2.13/260-assume-pipe2.patch
diff --git a/packages/glibc/ports-2.13/270-china.patch b/packages/glibc-ports/2.13/270-china.patch
index 41d77590..41d77590 100644
--- a/packages/glibc/ports-2.13/270-china.patch
+++ b/packages/glibc-ports/2.13/270-china.patch
diff --git a/packages/glibc/ports-2.13/280-new-valencian-locale.patch b/packages/glibc-ports/2.13/280-new-valencian-locale.patch
index 4cdd108e..4cdd108e 100644
--- a/packages/glibc/ports-2.13/280-new-valencian-locale.patch
+++ b/packages/glibc-ports/2.13/280-new-valencian-locale.patch
diff --git a/packages/glibc/ports-2.13/300-nscd-one-fork.patch b/packages/glibc-ports/2.13/300-nscd-one-fork.patch
index adc9b3f1..adc9b3f1 100644
--- a/packages/glibc/ports-2.13/300-nscd-one-fork.patch
+++ b/packages/glibc-ports/2.13/300-nscd-one-fork.patch
diff --git a/packages/glibc/ports-2.13/310-hppa-nptl-carlos.patch b/packages/glibc-ports/2.13/310-hppa-nptl-carlos.patch
index 4c028b27..4c028b27 100644
--- a/packages/glibc/ports-2.13/310-hppa-nptl-carlos.patch
+++ b/packages/glibc-ports/2.13/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc/ports-2.13/330-m68k-sys-user.patch b/packages/glibc-ports/2.13/330-m68k-sys-user.patch
index 191e0c6e..191e0c6e 100644
--- a/packages/glibc/ports-2.13/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.13/330-m68k-sys-user.patch
diff --git a/packages/glibc/ports-2.13/340-dl_execstack-PaX-support.patch b/packages/glibc-ports/2.13/340-dl_execstack-PaX-support.patch
index 2402af07..2402af07 100644
--- a/packages/glibc/ports-2.13/340-dl_execstack-PaX-support.patch
+++ b/packages/glibc-ports/2.13/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc/ports-2.13/350-pre20040117-pt_pax.patch b/packages/glibc-ports/2.13/350-pre20040117-pt_pax.patch
index f8f6b834..f8f6b834 100644
--- a/packages/glibc/ports-2.13/350-pre20040117-pt_pax.patch
+++ b/packages/glibc-ports/2.13/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc/ports-2.13/360-tests-sandbox-libdl-paths.patch b/packages/glibc-ports/2.13/360-tests-sandbox-libdl-paths.patch
index 9f78c52f..9f78c52f 100644
--- a/packages/glibc/ports-2.13/360-tests-sandbox-libdl-paths.patch
+++ b/packages/glibc-ports/2.13/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc/ports-2.13/380-dont-build-timezone.patch b/packages/glibc-ports/2.13/380-dont-build-timezone.patch
index 11c358ea..11c358ea 100644
--- a/packages/glibc/ports-2.13/380-dont-build-timezone.patch
+++ b/packages/glibc-ports/2.13/380-dont-build-timezone.patch
diff --git a/packages/glibc/ports-2.13/400-alpha-xstat.patch b/packages/glibc-ports/2.13/400-alpha-xstat.patch
index 6e4ab8fe..6e4ab8fe 100644
--- a/packages/glibc/ports-2.13/400-alpha-xstat.patch
+++ b/packages/glibc-ports/2.13/400-alpha-xstat.patch
diff --git a/packages/glibc/ports-2.13/410-alpha-SETPIPE-GETPIPE.patch b/packages/glibc-ports/2.13/410-alpha-SETPIPE-GETPIPE.patch
index fd555378..fd555378 100644
--- a/packages/glibc/ports-2.13/410-alpha-SETPIPE-GETPIPE.patch
+++ b/packages/glibc-ports/2.13/410-alpha-SETPIPE-GETPIPE.patch
diff --git a/packages/glibc/ports-2.13/420-alpha-statfs.patch b/packages/glibc-ports/2.13/420-alpha-statfs.patch
index 65c925a5..65c925a5 100644
--- a/packages/glibc/ports-2.13/420-alpha-statfs.patch
+++ b/packages/glibc-ports/2.13/420-alpha-statfs.patch
diff --git a/packages/glibc/ports-2.13/430-alpha-creat.patch b/packages/glibc-ports/2.13/430-alpha-creat.patch
index da6dddad..da6dddad 100644
--- a/packages/glibc/ports-2.13/430-alpha-creat.patch
+++ b/packages/glibc-ports/2.13/430-alpha-creat.patch
diff --git a/packages/glibc/ports-2.13/440-alpha-cache-shape.patch b/packages/glibc-ports/2.13/440-alpha-cache-shape.patch
index 62ade7b1..62ade7b1 100644
--- a/packages/glibc/ports-2.13/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.13/440-alpha-cache-shape.patch
diff --git a/packages/glibc/ports-2.13/450-alpha-DEFAULT_STACK_PERMS.patch b/packages/glibc-ports/2.13/450-alpha-DEFAULT_STACK_PERMS.patch
index ac3ea9a2..ac3ea9a2 100644
--- a/packages/glibc/ports-2.13/450-alpha-DEFAULT_STACK_PERMS.patch
+++ b/packages/glibc-ports/2.13/450-alpha-DEFAULT_STACK_PERMS.patch
diff --git a/packages/glibc/ports-2.13/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch
index 313e0e03..313e0e03 100644
--- a/packages/glibc/ports-2.13/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch
diff --git a/packages/glibc/ports-2.13/470-alpha-feupdateenv.patch b/packages/glibc-ports/2.13/470-alpha-feupdateenv.patch
index 45a7051a..45a7051a 100644
--- a/packages/glibc/ports-2.13/470-alpha-feupdateenv.patch
+++ b/packages/glibc-ports/2.13/470-alpha-feupdateenv.patch
diff --git a/packages/glibc/ports-2.13/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc-ports/2.13/490-alpha_alpha-add-fdatasync-support.patch
index 372f34c5..372f34c5 100644
--- a/packages/glibc/ports-2.13/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc-ports/2.13/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc/ports-2.13/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch
index b2ae9b53..b2ae9b53 100644
--- a/packages/glibc/ports-2.13/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch
diff --git a/packages/glibc/ports-2.13/560-ppc-atomic.patch b/packages/glibc-ports/2.13/560-ppc-atomic.patch
index ee1cb909..ee1cb909 100644
--- a/packages/glibc/ports-2.13/560-ppc-atomic.patch
+++ b/packages/glibc-ports/2.13/560-ppc-atomic.patch
diff --git a/packages/glibc/ports-2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index 4f4dbec7..4f4dbec7 100644
--- a/packages/glibc/ports-2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
diff --git a/packages/glibc/ports-2.13/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.13/580-nptl-lowlevellock.patch
index 08518e92..08518e92 100644
--- a/packages/glibc/ports-2.13/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.13/580-nptl-lowlevellock.patch
diff --git a/packages/glibc/ports-2.13/610-fpu-cw-mips.patch b/packages/glibc-ports/2.13/610-fpu-cw-mips.patch
index cd2b4d9a..cd2b4d9a 100644
--- a/packages/glibc/ports-2.13/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.13/610-fpu-cw-mips.patch
diff --git a/packages/glibc/ports-2.13/630-mips_shn_undef-hack.patch b/packages/glibc-ports/2.13/630-mips_shn_undef-hack.patch
index 791d76cf..791d76cf 100644
--- a/packages/glibc/ports-2.13/630-mips_shn_undef-hack.patch
+++ b/packages/glibc-ports/2.13/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc/ports-2.13/640-alpha-atfcts.patch b/packages/glibc-ports/2.13/640-alpha-atfcts.patch
index 7a8a94a5..7a8a94a5 100644
--- a/packages/glibc/ports-2.13/640-alpha-atfcts.patch
+++ b/packages/glibc-ports/2.13/640-alpha-atfcts.patch
diff --git a/packages/glibc/ports-2.13/650-syslog.patch b/packages/glibc-ports/2.13/650-syslog.patch
index c20cafc8..c20cafc8 100644
--- a/packages/glibc/ports-2.13/650-syslog.patch
+++ b/packages/glibc-ports/2.13/650-syslog.patch
diff --git a/packages/glibc/ports-2.13/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc-ports/2.13/660-debug-readlink_chk-readklinkat_chk.patch
index a5a70528..a5a70528 100644
--- a/packages/glibc/ports-2.13/660-debug-readlink_chk-readklinkat_chk.patch
+++ b/packages/glibc-ports/2.13/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/glibc/ports-2.13/670-support-hard-float-eabi.patch b/packages/glibc-ports/2.13/670-support-hard-float-eabi.patch
index 589f11e5..589f11e5 100644
--- a/packages/glibc/ports-2.13/670-support-hard-float-eabi.patch
+++ b/packages/glibc-ports/2.13/670-support-hard-float-eabi.patch
diff --git a/packages/glibc-ports/2.13/version.desc b/packages/glibc-ports/2.13/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/glibc-ports/2.13/version.desc
diff --git a/packages/glibc/ports-2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch
index 1a632fe4..1a632fe4 100644
--- a/packages/glibc/ports-2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch
diff --git a/packages/glibc/ports-2.14.1/100-respect-env-CPPFLAGS.patch b/packages/glibc-ports/2.14.1/100-respect-env-CPPFLAGS.patch
index 3798cb21..3798cb21 100644
--- a/packages/glibc/ports-2.14.1/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc-ports/2.14.1/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc/ports-2.14.1/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc-ports/2.14.1/120-i386-x86_64-revert-clone-cfi.patch
index c7f6182d..c7f6182d 100644
--- a/packages/glibc/ports-2.14.1/120-i386-x86_64-revert-clone-cfi.patch
+++ b/packages/glibc-ports/2.14.1/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc/ports-2.14.1/140-disable-ldconfig.patch b/packages/glibc-ports/2.14.1/140-disable-ldconfig.patch
index 378e1df5..378e1df5 100644
--- a/packages/glibc/ports-2.14.1/140-disable-ldconfig.patch
+++ b/packages/glibc-ports/2.14.1/140-disable-ldconfig.patch
diff --git a/packages/glibc/ports-2.14.1/150-queue-header-updates.patch b/packages/glibc-ports/2.14.1/150-queue-header-updates.patch
index 7cbe70ef..7cbe70ef 100644
--- a/packages/glibc/ports-2.14.1/150-queue-header-updates.patch
+++ b/packages/glibc-ports/2.14.1/150-queue-header-updates.patch
diff --git a/packages/glibc/ports-2.14.1/160-manual-no-perl.patch b/packages/glibc-ports/2.14.1/160-manual-no-perl.patch
index 5e2b807d..5e2b807d 100644
--- a/packages/glibc/ports-2.14.1/160-manual-no-perl.patch
+++ b/packages/glibc-ports/2.14.1/160-manual-no-perl.patch
diff --git a/packages/glibc/ports-2.14.1/170-localedef-fix-trampoline.patch b/packages/glibc-ports/2.14.1/170-localedef-fix-trampoline.patch
index 3cc65597..3cc65597 100644
--- a/packages/glibc/ports-2.14.1/170-localedef-fix-trampoline.patch
+++ b/packages/glibc-ports/2.14.1/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc/ports-2.14.1/180-resolv-dynamic.patch b/packages/glibc-ports/2.14.1/180-resolv-dynamic.patch
index e916bce3..e916bce3 100644
--- a/packages/glibc/ports-2.14.1/180-resolv-dynamic.patch
+++ b/packages/glibc-ports/2.14.1/180-resolv-dynamic.patch
diff --git a/packages/glibc/ports-2.14.1/190-localedef-mmap.patch b/packages/glibc-ports/2.14.1/190-localedef-mmap.patch
index f3914cd1..f3914cd1 100644
--- a/packages/glibc/ports-2.14.1/190-localedef-mmap.patch
+++ b/packages/glibc-ports/2.14.1/190-localedef-mmap.patch
diff --git a/packages/glibc/ports-2.14.1/200-fadvise64_64.patch b/packages/glibc-ports/2.14.1/200-fadvise64_64.patch
index 71bca381..71bca381 100644
--- a/packages/glibc/ports-2.14.1/200-fadvise64_64.patch
+++ b/packages/glibc-ports/2.14.1/200-fadvise64_64.patch
diff --git a/packages/glibc/ports-2.14.1/220-section-comments.patch b/packages/glibc-ports/2.14.1/220-section-comments.patch
index d717829e..d717829e 100644
--- a/packages/glibc/ports-2.14.1/220-section-comments.patch
+++ b/packages/glibc-ports/2.14.1/220-section-comments.patch
diff --git a/packages/glibc/ports-2.14.1/230-no-inline-gmon.patch b/packages/glibc-ports/2.14.1/230-no-inline-gmon.patch
index fa33c2b4..fa33c2b4 100644
--- a/packages/glibc/ports-2.14.1/230-no-inline-gmon.patch
+++ b/packages/glibc-ports/2.14.1/230-no-inline-gmon.patch
diff --git a/packages/glibc/ports-2.14.1/260-assume-pipe2.patch b/packages/glibc-ports/2.14.1/260-assume-pipe2.patch
index 42e8f4ed..42e8f4ed 100644
--- a/packages/glibc/ports-2.14.1/260-assume-pipe2.patch
+++ b/packages/glibc-ports/2.14.1/260-assume-pipe2.patch
diff --git a/packages/glibc/ports-2.14.1/270-china.patch b/packages/glibc-ports/2.14.1/270-china.patch
index 41d77590..41d77590 100644
--- a/packages/glibc/ports-2.14.1/270-china.patch
+++ b/packages/glibc-ports/2.14.1/270-china.patch
diff --git a/packages/glibc/ports-2.14.1/280-new-valencian-locale.patch b/packages/glibc-ports/2.14.1/280-new-valencian-locale.patch
index 4cdd108e..4cdd108e 100644
--- a/packages/glibc/ports-2.14.1/280-new-valencian-locale.patch
+++ b/packages/glibc-ports/2.14.1/280-new-valencian-locale.patch
diff --git a/packages/glibc/ports-2.14.1/300-nscd-one-fork.patch b/packages/glibc-ports/2.14.1/300-nscd-one-fork.patch
index adc9b3f1..adc9b3f1 100644
--- a/packages/glibc/ports-2.14.1/300-nscd-one-fork.patch
+++ b/packages/glibc-ports/2.14.1/300-nscd-one-fork.patch
diff --git a/packages/glibc/ports-2.14.1/310-hppa-nptl-carlos.patch b/packages/glibc-ports/2.14.1/310-hppa-nptl-carlos.patch
index 4c028b27..4c028b27 100644
--- a/packages/glibc/ports-2.14.1/310-hppa-nptl-carlos.patch
+++ b/packages/glibc-ports/2.14.1/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc/ports-2.14.1/330-m68k-sys-user.patch b/packages/glibc-ports/2.14.1/330-m68k-sys-user.patch
index 8fbe2e5a..8fbe2e5a 100644
--- a/packages/glibc/ports-2.14.1/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.14.1/330-m68k-sys-user.patch
diff --git a/packages/glibc/ports-2.14.1/340-dl_execstack-PaX-support.patch b/packages/glibc-ports/2.14.1/340-dl_execstack-PaX-support.patch
index 2402af07..2402af07 100644
--- a/packages/glibc/ports-2.14.1/340-dl_execstack-PaX-support.patch
+++ b/packages/glibc-ports/2.14.1/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc/ports-2.14.1/350-pre20040117-pt_pax.patch b/packages/glibc-ports/2.14.1/350-pre20040117-pt_pax.patch
index f8f6b834..f8f6b834 100644
--- a/packages/glibc/ports-2.14.1/350-pre20040117-pt_pax.patch
+++ b/packages/glibc-ports/2.14.1/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc/ports-2.14.1/360-tests-sandbox-libdl-paths.patch b/packages/glibc-ports/2.14.1/360-tests-sandbox-libdl-paths.patch
index 9f78c52f..9f78c52f 100644
--- a/packages/glibc/ports-2.14.1/360-tests-sandbox-libdl-paths.patch
+++ b/packages/glibc-ports/2.14.1/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc/ports-2.14.1/380-dont-build-timezone.patch b/packages/glibc-ports/2.14.1/380-dont-build-timezone.patch
index 11c358ea..11c358ea 100644
--- a/packages/glibc/ports-2.14.1/380-dont-build-timezone.patch
+++ b/packages/glibc-ports/2.14.1/380-dont-build-timezone.patch
diff --git a/packages/glibc/ports-2.14.1/400-alpha-xstat.patch b/packages/glibc-ports/2.14.1/400-alpha-xstat.patch
index 6e4ab8fe..6e4ab8fe 100644
--- a/packages/glibc/ports-2.14.1/400-alpha-xstat.patch
+++ b/packages/glibc-ports/2.14.1/400-alpha-xstat.patch
diff --git a/packages/glibc/ports-2.14.1/430-alpha-creat.patch b/packages/glibc-ports/2.14.1/430-alpha-creat.patch
index da6dddad..da6dddad 100644
--- a/packages/glibc/ports-2.14.1/430-alpha-creat.patch
+++ b/packages/glibc-ports/2.14.1/430-alpha-creat.patch
diff --git a/packages/glibc/ports-2.14.1/440-alpha-cache-shape.patch b/packages/glibc-ports/2.14.1/440-alpha-cache-shape.patch
index 8ca0bd68..8ca0bd68 100644
--- a/packages/glibc/ports-2.14.1/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.14.1/440-alpha-cache-shape.patch
diff --git a/packages/glibc/ports-2.14.1/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.14.1/460-alpha-fix-gcc-4.1-warnings.patch
index c3e59f45..c3e59f45 100644
--- a/packages/glibc/ports-2.14.1/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.14.1/460-alpha-fix-gcc-4.1-warnings.patch
diff --git a/packages/glibc/ports-2.14.1/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc-ports/2.14.1/490-alpha_alpha-add-fdatasync-support.patch
index 372f34c5..372f34c5 100644
--- a/packages/glibc/ports-2.14.1/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc-ports/2.14.1/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc/ports-2.14.1/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.14.1/530-alpha-fix-rtld-fPIC.patch
index 2691a99b..2691a99b 100644
--- a/packages/glibc/ports-2.14.1/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.14.1/530-alpha-fix-rtld-fPIC.patch
diff --git a/packages/glibc/ports-2.14.1/560-ppc-atomic.patch b/packages/glibc-ports/2.14.1/560-ppc-atomic.patch
index ee1cb909..ee1cb909 100644
--- a/packages/glibc/ports-2.14.1/560-ppc-atomic.patch
+++ b/packages/glibc-ports/2.14.1/560-ppc-atomic.patch
diff --git a/packages/glibc/ports-2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index 5e456827..5e456827 100644
--- a/packages/glibc/ports-2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
diff --git a/packages/glibc/ports-2.14.1/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.14.1/580-nptl-lowlevellock.patch
index 6bf52504..6bf52504 100644
--- a/packages/glibc/ports-2.14.1/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.14.1/580-nptl-lowlevellock.patch
diff --git a/packages/glibc/ports-2.14.1/610-fpu-cw-mips.patch b/packages/glibc-ports/2.14.1/610-fpu-cw-mips.patch
index e53ac781..e53ac781 100644
--- a/packages/glibc/ports-2.14.1/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.14.1/610-fpu-cw-mips.patch
diff --git a/packages/glibc/ports-2.14.1/630-mips_shn_undef-hack.patch b/packages/glibc-ports/2.14.1/630-mips_shn_undef-hack.patch
index 791d76cf..791d76cf 100644
--- a/packages/glibc/ports-2.14.1/630-mips_shn_undef-hack.patch
+++ b/packages/glibc-ports/2.14.1/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc/ports-2.14.1/640-alpha-atfcts.patch b/packages/glibc-ports/2.14.1/640-alpha-atfcts.patch
index 7a8a94a5..7a8a94a5 100644
--- a/packages/glibc/ports-2.14.1/640-alpha-atfcts.patch
+++ b/packages/glibc-ports/2.14.1/640-alpha-atfcts.patch
diff --git a/packages/glibc/ports-2.14.1/650-syslog.patch b/packages/glibc-ports/2.14.1/650-syslog.patch
index c20cafc8..c20cafc8 100644
--- a/packages/glibc/ports-2.14.1/650-syslog.patch
+++ b/packages/glibc-ports/2.14.1/650-syslog.patch
diff --git a/packages/glibc/ports-2.14.1/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc-ports/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch
index a5a70528..a5a70528 100644
--- a/packages/glibc/ports-2.14.1/660-debug-readlink_chk-readklinkat_chk.patch
+++ b/packages/glibc-ports/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/glibc-ports/2.14.1/version.desc b/packages/glibc-ports/2.14.1/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/glibc-ports/2.14.1/version.desc
diff --git a/packages/glibc/ports-2.14/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.14/090-Fix-ARM-build-with-GCC-trunk.patch
index 1a632fe4..1a632fe4 100644
--- a/packages/glibc/ports-2.14/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.14/090-Fix-ARM-build-with-GCC-trunk.patch
diff --git a/packages/glibc/ports-2.14/100-respect-env-CPPFLAGS.patch b/packages/glibc-ports/2.14/100-respect-env-CPPFLAGS.patch
index 3798cb21..3798cb21 100644
--- a/packages/glibc/ports-2.14/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc-ports/2.14/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc/ports-2.14/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc-ports/2.14/120-i386-x86_64-revert-clone-cfi.patch
index c7f6182d..c7f6182d 100644
--- a/packages/glibc/ports-2.14/120-i386-x86_64-revert-clone-cfi.patch
+++ b/packages/glibc-ports/2.14/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc/ports-2.14/140-disable-ldconfig.patch b/packages/glibc-ports/2.14/140-disable-ldconfig.patch
index 378e1df5..378e1df5 100644
--- a/packages/glibc/ports-2.14/140-disable-ldconfig.patch
+++ b/packages/glibc-ports/2.14/140-disable-ldconfig.patch
diff --git a/packages/glibc/ports-2.14/150-queue-header-updates.patch b/packages/glibc-ports/2.14/150-queue-header-updates.patch
index 7cbe70ef..7cbe70ef 100644
--- a/packages/glibc/ports-2.14/150-queue-header-updates.patch
+++ b/packages/glibc-ports/2.14/150-queue-header-updates.patch
diff --git a/packages/glibc/ports-2.14/160-manual-no-perl.patch b/packages/glibc-ports/2.14/160-manual-no-perl.patch
index 5e2b807d..5e2b807d 100644
--- a/packages/glibc/ports-2.14/160-manual-no-perl.patch
+++ b/packages/glibc-ports/2.14/160-manual-no-perl.patch
diff --git a/packages/glibc/ports-2.14/170-localedef-fix-trampoline.patch b/packages/glibc-ports/2.14/170-localedef-fix-trampoline.patch
index 3cc65597..3cc65597 100644
--- a/packages/glibc/ports-2.14/170-localedef-fix-trampoline.patch
+++ b/packages/glibc-ports/2.14/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc/ports-2.14/180-resolv-dynamic.patch b/packages/glibc-ports/2.14/180-resolv-dynamic.patch
index e916bce3..e916bce3 100644
--- a/packages/glibc/ports-2.14/180-resolv-dynamic.patch
+++ b/packages/glibc-ports/2.14/180-resolv-dynamic.patch
diff --git a/packages/glibc/ports-2.14/190-localedef-mmap.patch b/packages/glibc-ports/2.14/190-localedef-mmap.patch
index f3914cd1..f3914cd1 100644
--- a/packages/glibc/ports-2.14/190-localedef-mmap.patch
+++ b/packages/glibc-ports/2.14/190-localedef-mmap.patch
diff --git a/packages/glibc/ports-2.14/200-fadvise64_64.patch b/packages/glibc-ports/2.14/200-fadvise64_64.patch
index 71bca381..71bca381 100644
--- a/packages/glibc/ports-2.14/200-fadvise64_64.patch
+++ b/packages/glibc-ports/2.14/200-fadvise64_64.patch
diff --git a/packages/glibc/ports-2.14/220-section-comments.patch b/packages/glibc-ports/2.14/220-section-comments.patch
index d717829e..d717829e 100644
--- a/packages/glibc/ports-2.14/220-section-comments.patch
+++ b/packages/glibc-ports/2.14/220-section-comments.patch
diff --git a/packages/glibc/ports-2.14/230-no-inline-gmon.patch b/packages/glibc-ports/2.14/230-no-inline-gmon.patch
index fa33c2b4..fa33c2b4 100644
--- a/packages/glibc/ports-2.14/230-no-inline-gmon.patch
+++ b/packages/glibc-ports/2.14/230-no-inline-gmon.patch
diff --git a/packages/glibc/ports-2.14/240-check_native-headers.patch b/packages/glibc-ports/2.14/240-check_native-headers.patch
index c936f71e..c936f71e 100644
--- a/packages/glibc/ports-2.14/240-check_native-headers.patch
+++ b/packages/glibc-ports/2.14/240-check_native-headers.patch
diff --git a/packages/glibc/ports-2.14/260-assume-pipe2.patch b/packages/glibc-ports/2.14/260-assume-pipe2.patch
index 42e8f4ed..42e8f4ed 100644
--- a/packages/glibc/ports-2.14/260-assume-pipe2.patch
+++ b/packages/glibc-ports/2.14/260-assume-pipe2.patch
diff --git a/packages/glibc/ports-2.14/270-china.patch b/packages/glibc-ports/2.14/270-china.patch
index 41d77590..41d77590 100644
--- a/packages/glibc/ports-2.14/270-china.patch
+++ b/packages/glibc-ports/2.14/270-china.patch
diff --git a/packages/glibc/ports-2.14/280-new-valencian-locale.patch b/packages/glibc-ports/2.14/280-new-valencian-locale.patch
index 4cdd108e..4cdd108e 100644
--- a/packages/glibc/ports-2.14/280-new-valencian-locale.patch
+++ b/packages/glibc-ports/2.14/280-new-valencian-locale.patch
diff --git a/packages/glibc/ports-2.14/300-nscd-one-fork.patch b/packages/glibc-ports/2.14/300-nscd-one-fork.patch
index adc9b3f1..adc9b3f1 100644
--- a/packages/glibc/ports-2.14/300-nscd-one-fork.patch
+++ b/packages/glibc-ports/2.14/300-nscd-one-fork.patch
diff --git a/packages/glibc/ports-2.14/310-hppa-nptl-carlos.patch b/packages/glibc-ports/2.14/310-hppa-nptl-carlos.patch
index 4c028b27..4c028b27 100644
--- a/packages/glibc/ports-2.14/310-hppa-nptl-carlos.patch
+++ b/packages/glibc-ports/2.14/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc/ports-2.14/330-m68k-sys-user.patch b/packages/glibc-ports/2.14/330-m68k-sys-user.patch
index 28bcb116..28bcb116 100644
--- a/packages/glibc/ports-2.14/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.14/330-m68k-sys-user.patch
diff --git a/packages/glibc/ports-2.14/340-dl_execstack-PaX-support.patch b/packages/glibc-ports/2.14/340-dl_execstack-PaX-support.patch
index 2402af07..2402af07 100644
--- a/packages/glibc/ports-2.14/340-dl_execstack-PaX-support.patch
+++ b/packages/glibc-ports/2.14/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc/ports-2.14/350-pre20040117-pt_pax.patch b/packages/glibc-ports/2.14/350-pre20040117-pt_pax.patch
index f8f6b834..f8f6b834 100644
--- a/packages/glibc/ports-2.14/350-pre20040117-pt_pax.patch
+++ b/packages/glibc-ports/2.14/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc/ports-2.14/360-tests-sandbox-libdl-paths.patch b/packages/glibc-ports/2.14/360-tests-sandbox-libdl-paths.patch
index 9f78c52f..9f78c52f 100644
--- a/packages/glibc/ports-2.14/360-tests-sandbox-libdl-paths.patch
+++ b/packages/glibc-ports/2.14/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc/ports-2.14/380-dont-build-timezone.patch b/packages/glibc-ports/2.14/380-dont-build-timezone.patch
index 11c358ea..11c358ea 100644
--- a/packages/glibc/ports-2.14/380-dont-build-timezone.patch
+++ b/packages/glibc-ports/2.14/380-dont-build-timezone.patch
diff --git a/packages/glibc/ports-2.14/400-alpha-xstat.patch b/packages/glibc-ports/2.14/400-alpha-xstat.patch
index 6e4ab8fe..6e4ab8fe 100644
--- a/packages/glibc/ports-2.14/400-alpha-xstat.patch
+++ b/packages/glibc-ports/2.14/400-alpha-xstat.patch
diff --git a/packages/glibc/ports-2.14/430-alpha-creat.patch b/packages/glibc-ports/2.14/430-alpha-creat.patch
index da6dddad..da6dddad 100644
--- a/packages/glibc/ports-2.14/430-alpha-creat.patch
+++ b/packages/glibc-ports/2.14/430-alpha-creat.patch
diff --git a/packages/glibc/ports-2.14/440-alpha-cache-shape.patch b/packages/glibc-ports/2.14/440-alpha-cache-shape.patch
index def0181f..def0181f 100644
--- a/packages/glibc/ports-2.14/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.14/440-alpha-cache-shape.patch
diff --git a/packages/glibc/ports-2.14/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.14/460-alpha-fix-gcc-4.1-warnings.patch
index 1569ce40..1569ce40 100644
--- a/packages/glibc/ports-2.14/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.14/460-alpha-fix-gcc-4.1-warnings.patch
diff --git a/packages/glibc/ports-2.14/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc-ports/2.14/490-alpha_alpha-add-fdatasync-support.patch
index 372f34c5..372f34c5 100644
--- a/packages/glibc/ports-2.14/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc-ports/2.14/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc/ports-2.14/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.14/530-alpha-fix-rtld-fPIC.patch
index 3560e2a2..3560e2a2 100644
--- a/packages/glibc/ports-2.14/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.14/530-alpha-fix-rtld-fPIC.patch
diff --git a/packages/glibc/ports-2.14/560-ppc-atomic.patch b/packages/glibc-ports/2.14/560-ppc-atomic.patch
index ee1cb909..ee1cb909 100644
--- a/packages/glibc/ports-2.14/560-ppc-atomic.patch
+++ b/packages/glibc-ports/2.14/560-ppc-atomic.patch
diff --git a/packages/glibc/ports-2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index b297ff0c..b297ff0c 100644
--- a/packages/glibc/ports-2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
diff --git a/packages/glibc/ports-2.14/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.14/580-nptl-lowlevellock.patch
index a2a141c0..a2a141c0 100644
--- a/packages/glibc/ports-2.14/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.14/580-nptl-lowlevellock.patch
diff --git a/packages/glibc/ports-2.14/610-fpu-cw-mips.patch b/packages/glibc-ports/2.14/610-fpu-cw-mips.patch
index c6245654..c6245654 100644
--- a/packages/glibc/ports-2.14/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.14/610-fpu-cw-mips.patch
diff --git a/packages/glibc/ports-2.14/630-mips_shn_undef-hack.patch b/packages/glibc-ports/2.14/630-mips_shn_undef-hack.patch
index 791d76cf..791d76cf 100644
--- a/packages/glibc/ports-2.14/630-mips_shn_undef-hack.patch
+++ b/packages/glibc-ports/2.14/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc/ports-2.14/640-alpha-atfcts.patch b/packages/glibc-ports/2.14/640-alpha-atfcts.patch
index 7a8a94a5..7a8a94a5 100644
--- a/packages/glibc/ports-2.14/640-alpha-atfcts.patch
+++ b/packages/glibc-ports/2.14/640-alpha-atfcts.patch
diff --git a/packages/glibc/ports-2.14/650-syslog.patch b/packages/glibc-ports/2.14/650-syslog.patch
index c20cafc8..c20cafc8 100644
--- a/packages/glibc/ports-2.14/650-syslog.patch
+++ b/packages/glibc-ports/2.14/650-syslog.patch
diff --git a/packages/glibc/ports-2.14/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc-ports/2.14/660-debug-readlink_chk-readklinkat_chk.patch
index a5a70528..a5a70528 100644
--- a/packages/glibc/ports-2.14/660-debug-readlink_chk-readklinkat_chk.patch
+++ b/packages/glibc-ports/2.14/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/glibc-ports/2.14/version.desc b/packages/glibc-ports/2.14/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/glibc-ports/2.14/version.desc
diff --git a/packages/glibc/ports-2.15/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.15/090-Fix-ARM-build-with-GCC-trunk.patch
index 1a632fe4..1a632fe4 100644
--- a/packages/glibc/ports-2.15/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.15/090-Fix-ARM-build-with-GCC-trunk.patch
diff --git a/packages/glibc/ports-2.15/091-libmemusage-link-failure.patch b/packages/glibc-ports/2.15/091-libmemusage-link-failure.patch
index 9f9887c3..9f9887c3 100644
--- a/packages/glibc/ports-2.15/091-libmemusage-link-failure.patch
+++ b/packages/glibc-ports/2.15/091-libmemusage-link-failure.patch
diff --git a/packages/glibc/ports-2.15/100-respect-env-CPPFLAGS.patch b/packages/glibc-ports/2.15/100-respect-env-CPPFLAGS.patch
index 3798cb21..3798cb21 100644
--- a/packages/glibc/ports-2.15/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc-ports/2.15/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc/ports-2.15/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc-ports/2.15/120-i386-x86_64-revert-clone-cfi.patch
index c7f6182d..c7f6182d 100644
--- a/packages/glibc/ports-2.15/120-i386-x86_64-revert-clone-cfi.patch
+++ b/packages/glibc-ports/2.15/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc/ports-2.15/140-disable-ldconfig.patch b/packages/glibc-ports/2.15/140-disable-ldconfig.patch
index 378e1df5..378e1df5 100644
--- a/packages/glibc/ports-2.15/140-disable-ldconfig.patch
+++ b/packages/glibc-ports/2.15/140-disable-ldconfig.patch
diff --git a/packages/glibc/ports-2.15/150-queue-header-updates.patch b/packages/glibc-ports/2.15/150-queue-header-updates.patch
index 7cbe70ef..7cbe70ef 100644
--- a/packages/glibc/ports-2.15/150-queue-header-updates.patch
+++ b/packages/glibc-ports/2.15/150-queue-header-updates.patch
diff --git a/packages/glibc/ports-2.15/160-manual-no-perl.patch b/packages/glibc-ports/2.15/160-manual-no-perl.patch
index 5e2b807d..5e2b807d 100644
--- a/packages/glibc/ports-2.15/160-manual-no-perl.patch
+++ b/packages/glibc-ports/2.15/160-manual-no-perl.patch
diff --git a/packages/glibc/ports-2.15/170-localedef-fix-trampoline.patch b/packages/glibc-ports/2.15/170-localedef-fix-trampoline.patch
index 3cc65597..3cc65597 100644
--- a/packages/glibc/ports-2.15/170-localedef-fix-trampoline.patch
+++ b/packages/glibc-ports/2.15/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc/ports-2.15/180-resolv-dynamic.patch b/packages/glibc-ports/2.15/180-resolv-dynamic.patch
index e916bce3..e916bce3 100644
--- a/packages/glibc/ports-2.15/180-resolv-dynamic.patch
+++ b/packages/glibc-ports/2.15/180-resolv-dynamic.patch
diff --git a/packages/glibc/ports-2.15/200-fadvise64_64.patch b/packages/glibc-ports/2.15/200-fadvise64_64.patch
index 71bca381..71bca381 100644
--- a/packages/glibc/ports-2.15/200-fadvise64_64.patch
+++ b/packages/glibc-ports/2.15/200-fadvise64_64.patch
diff --git a/packages/glibc/ports-2.15/220-section-comments.patch b/packages/glibc-ports/2.15/220-section-comments.patch
index d717829e..d717829e 100644
--- a/packages/glibc/ports-2.15/220-section-comments.patch
+++ b/packages/glibc-ports/2.15/220-section-comments.patch
diff --git a/packages/glibc/ports-2.15/230-no-inline-gmon.patch b/packages/glibc-ports/2.15/230-no-inline-gmon.patch
index fa33c2b4..fa33c2b4 100644
--- a/packages/glibc/ports-2.15/230-no-inline-gmon.patch
+++ b/packages/glibc-ports/2.15/230-no-inline-gmon.patch
diff --git a/packages/glibc/ports-2.15/260-assume-pipe2.patch b/packages/glibc-ports/2.15/260-assume-pipe2.patch
index 42e8f4ed..42e8f4ed 100644
--- a/packages/glibc/ports-2.15/260-assume-pipe2.patch
+++ b/packages/glibc-ports/2.15/260-assume-pipe2.patch
diff --git a/packages/glibc/ports-2.15/270-china.patch b/packages/glibc-ports/2.15/270-china.patch
index 41d77590..41d77590 100644
--- a/packages/glibc/ports-2.15/270-china.patch
+++ b/packages/glibc-ports/2.15/270-china.patch
diff --git a/packages/glibc/ports-2.15/280-new-valencian-locale.patch b/packages/glibc-ports/2.15/280-new-valencian-locale.patch
index 4cdd108e..4cdd108e 100644
--- a/packages/glibc/ports-2.15/280-new-valencian-locale.patch
+++ b/packages/glibc-ports/2.15/280-new-valencian-locale.patch
diff --git a/packages/glibc/ports-2.15/300-nscd-one-fork.patch b/packages/glibc-ports/2.15/300-nscd-one-fork.patch
index adc9b3f1..adc9b3f1 100644
--- a/packages/glibc/ports-2.15/300-nscd-one-fork.patch
+++ b/packages/glibc-ports/2.15/300-nscd-one-fork.patch
diff --git a/packages/glibc/ports-2.15/310-hppa-nptl-carlos.patch b/packages/glibc-ports/2.15/310-hppa-nptl-carlos.patch
index 4c028b27..4c028b27 100644
--- a/packages/glibc/ports-2.15/310-hppa-nptl-carlos.patch
+++ b/packages/glibc-ports/2.15/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc/ports-2.15/330-m68k-sys-user.patch b/packages/glibc-ports/2.15/330-m68k-sys-user.patch
index faee18f3..faee18f3 100644
--- a/packages/glibc/ports-2.15/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.15/330-m68k-sys-user.patch
diff --git a/packages/glibc/ports-2.15/340-dl_execstack-PaX-support.patch b/packages/glibc-ports/2.15/340-dl_execstack-PaX-support.patch
index 2402af07..2402af07 100644
--- a/packages/glibc/ports-2.15/340-dl_execstack-PaX-support.patch
+++ b/packages/glibc-ports/2.15/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc/ports-2.15/350-pre20040117-pt_pax.patch b/packages/glibc-ports/2.15/350-pre20040117-pt_pax.patch
index f8f6b834..f8f6b834 100644
--- a/packages/glibc/ports-2.15/350-pre20040117-pt_pax.patch
+++ b/packages/glibc-ports/2.15/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc/ports-2.15/360-tests-sandbox-libdl-paths.patch b/packages/glibc-ports/2.15/360-tests-sandbox-libdl-paths.patch
index 9f78c52f..9f78c52f 100644
--- a/packages/glibc/ports-2.15/360-tests-sandbox-libdl-paths.patch
+++ b/packages/glibc-ports/2.15/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc/ports-2.15/380-dont-build-timezone.patch b/packages/glibc-ports/2.15/380-dont-build-timezone.patch
index 11c358ea..11c358ea 100644
--- a/packages/glibc/ports-2.15/380-dont-build-timezone.patch
+++ b/packages/glibc-ports/2.15/380-dont-build-timezone.patch
diff --git a/packages/glibc/ports-2.15/400-alpha-xstat.patch b/packages/glibc-ports/2.15/400-alpha-xstat.patch
index 6e4ab8fe..6e4ab8fe 100644
--- a/packages/glibc/ports-2.15/400-alpha-xstat.patch
+++ b/packages/glibc-ports/2.15/400-alpha-xstat.patch
diff --git a/packages/glibc/ports-2.15/430-alpha-creat.patch b/packages/glibc-ports/2.15/430-alpha-creat.patch
index da6dddad..da6dddad 100644
--- a/packages/glibc/ports-2.15/430-alpha-creat.patch
+++ b/packages/glibc-ports/2.15/430-alpha-creat.patch
diff --git a/packages/glibc/ports-2.15/440-alpha-cache-shape.patch b/packages/glibc-ports/2.15/440-alpha-cache-shape.patch
index b3158da6..b3158da6 100644
--- a/packages/glibc/ports-2.15/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.15/440-alpha-cache-shape.patch
diff --git a/packages/glibc/ports-2.15/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.15/460-alpha-fix-gcc-4.1-warnings.patch
index a54d823b..a54d823b 100644
--- a/packages/glibc/ports-2.15/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.15/460-alpha-fix-gcc-4.1-warnings.patch
diff --git a/packages/glibc/ports-2.15/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc-ports/2.15/490-alpha_alpha-add-fdatasync-support.patch
index acf250db..acf250db 100644
--- a/packages/glibc/ports-2.15/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc-ports/2.15/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc/ports-2.15/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.15/530-alpha-fix-rtld-fPIC.patch
index 800a7891..800a7891 100644
--- a/packages/glibc/ports-2.15/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.15/530-alpha-fix-rtld-fPIC.patch
diff --git a/packages/glibc/ports-2.15/560-ppc-atomic.patch b/packages/glibc-ports/2.15/560-ppc-atomic.patch
index ee1cb909..ee1cb909 100644
--- a/packages/glibc/ports-2.15/560-ppc-atomic.patch
+++ b/packages/glibc-ports/2.15/560-ppc-atomic.patch
diff --git a/packages/glibc/ports-2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index 8a05574b..8a05574b 100644
--- a/packages/glibc/ports-2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
diff --git a/packages/glibc/ports-2.15/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.15/580-nptl-lowlevellock.patch
index a39e4638..a39e4638 100644
--- a/packages/glibc/ports-2.15/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.15/580-nptl-lowlevellock.patch
diff --git a/packages/glibc/ports-2.15/610-fpu-cw-mips.patch b/packages/glibc-ports/2.15/610-fpu-cw-mips.patch
index 8692a1ff..8692a1ff 100644
--- a/packages/glibc/ports-2.15/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.15/610-fpu-cw-mips.patch
diff --git a/packages/glibc/ports-2.15/630-mips_shn_undef-hack.patch b/packages/glibc-ports/2.15/630-mips_shn_undef-hack.patch
index 791d76cf..791d76cf 100644
--- a/packages/glibc/ports-2.15/630-mips_shn_undef-hack.patch
+++ b/packages/glibc-ports/2.15/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc/ports-2.15/640-alpha-atfcts.patch b/packages/glibc-ports/2.15/640-alpha-atfcts.patch
index 7a8a94a5..7a8a94a5 100644
--- a/packages/glibc/ports-2.15/640-alpha-atfcts.patch
+++ b/packages/glibc-ports/2.15/640-alpha-atfcts.patch
diff --git a/packages/glibc/ports-2.15/650-syslog.patch b/packages/glibc-ports/2.15/650-syslog.patch
index c20cafc8..c20cafc8 100644
--- a/packages/glibc/ports-2.15/650-syslog.patch
+++ b/packages/glibc-ports/2.15/650-syslog.patch
diff --git a/packages/glibc/ports-2.15/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc-ports/2.15/660-debug-readlink_chk-readklinkat_chk.patch
index a5a70528..a5a70528 100644
--- a/packages/glibc/ports-2.15/660-debug-readlink_chk-readklinkat_chk.patch
+++ b/packages/glibc-ports/2.15/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/glibc-ports/2.15/version.desc b/packages/glibc-ports/2.15/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/glibc-ports/2.15/version.desc
diff --git a/packages/glibc/ports-2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch
index 59f95aad..59f95aad 100644
--- a/packages/glibc/ports-2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch
diff --git a/packages/glibc/ports-2.16.0/100-respect-env-CPPFLAGS.patch b/packages/glibc-ports/2.16.0/100-respect-env-CPPFLAGS.patch
index dce491cf..dce491cf 100644
--- a/packages/glibc/ports-2.16.0/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc-ports/2.16.0/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc/ports-2.16.0/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc-ports/2.16.0/120-i386-x86_64-revert-clone-cfi.patch
index c7f6182d..c7f6182d 100644
--- a/packages/glibc/ports-2.16.0/120-i386-x86_64-revert-clone-cfi.patch
+++ b/packages/glibc-ports/2.16.0/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc/ports-2.16.0/140-disable-ldconfig.patch b/packages/glibc-ports/2.16.0/140-disable-ldconfig.patch
index 378e1df5..378e1df5 100644
--- a/packages/glibc/ports-2.16.0/140-disable-ldconfig.patch
+++ b/packages/glibc-ports/2.16.0/140-disable-ldconfig.patch
diff --git a/packages/glibc/ports-2.16.0/150-queue-header-updates.patch b/packages/glibc-ports/2.16.0/150-queue-header-updates.patch
index 7cbe70ef..7cbe70ef 100644
--- a/packages/glibc/ports-2.16.0/150-queue-header-updates.patch
+++ b/packages/glibc-ports/2.16.0/150-queue-header-updates.patch
diff --git a/packages/glibc/ports-2.16.0/170-localedef-fix-trampoline.patch b/packages/glibc-ports/2.16.0/170-localedef-fix-trampoline.patch
index 3cc65597..3cc65597 100644
--- a/packages/glibc/ports-2.16.0/170-localedef-fix-trampoline.patch
+++ b/packages/glibc-ports/2.16.0/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc/ports-2.16.0/180-resolv-dynamic.patch b/packages/glibc-ports/2.16.0/180-resolv-dynamic.patch
index e916bce3..e916bce3 100644
--- a/packages/glibc/ports-2.16.0/180-resolv-dynamic.patch
+++ b/packages/glibc-ports/2.16.0/180-resolv-dynamic.patch
diff --git a/packages/glibc/ports-2.16.0/200-fadvise64_64.patch b/packages/glibc-ports/2.16.0/200-fadvise64_64.patch
index 71bca381..71bca381 100644
--- a/packages/glibc/ports-2.16.0/200-fadvise64_64.patch
+++ b/packages/glibc-ports/2.16.0/200-fadvise64_64.patch
diff --git a/packages/glibc/ports-2.16.0/260-assume-pipe2.patch b/packages/glibc-ports/2.16.0/260-assume-pipe2.patch
index 54f03829..54f03829 100644
--- a/packages/glibc/ports-2.16.0/260-assume-pipe2.patch
+++ b/packages/glibc-ports/2.16.0/260-assume-pipe2.patch
diff --git a/packages/glibc/ports-2.16.0/270-china.patch b/packages/glibc-ports/2.16.0/270-china.patch
index 41d77590..41d77590 100644
--- a/packages/glibc/ports-2.16.0/270-china.patch
+++ b/packages/glibc-ports/2.16.0/270-china.patch
diff --git a/packages/glibc/ports-2.16.0/280-new-valencian-locale.patch b/packages/glibc-ports/2.16.0/280-new-valencian-locale.patch
index 4cdd108e..4cdd108e 100644
--- a/packages/glibc/ports-2.16.0/280-new-valencian-locale.patch
+++ b/packages/glibc-ports/2.16.0/280-new-valencian-locale.patch
diff --git a/packages/glibc/ports-2.16.0/300-nscd-one-fork.patch b/packages/glibc-ports/2.16.0/300-nscd-one-fork.patch
index 13b28612..13b28612 100644
--- a/packages/glibc/ports-2.16.0/300-nscd-one-fork.patch
+++ b/packages/glibc-ports/2.16.0/300-nscd-one-fork.patch
diff --git a/packages/glibc/ports-2.16.0/310-hppa-nptl-carlos.patch b/packages/glibc-ports/2.16.0/310-hppa-nptl-carlos.patch
index 11e8a653..11e8a653 100644
--- a/packages/glibc/ports-2.16.0/310-hppa-nptl-carlos.patch
+++ b/packages/glibc-ports/2.16.0/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc/ports-2.16.0/330-m68k-sys-user.patch b/packages/glibc-ports/2.16.0/330-m68k-sys-user.patch
index f1139967..f1139967 100644
--- a/packages/glibc/ports-2.16.0/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.16.0/330-m68k-sys-user.patch
diff --git a/packages/glibc/ports-2.16.0/340-dl_execstack-PaX-support.patch b/packages/glibc-ports/2.16.0/340-dl_execstack-PaX-support.patch
index 2402af07..2402af07 100644
--- a/packages/glibc/ports-2.16.0/340-dl_execstack-PaX-support.patch
+++ b/packages/glibc-ports/2.16.0/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc/ports-2.16.0/350-pre20040117-pt_pax.patch b/packages/glibc-ports/2.16.0/350-pre20040117-pt_pax.patch
index f8f6b834..f8f6b834 100644
--- a/packages/glibc/ports-2.16.0/350-pre20040117-pt_pax.patch
+++ b/packages/glibc-ports/2.16.0/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc/ports-2.16.0/360-tests-sandbox-libdl-paths.patch b/packages/glibc-ports/2.16.0/360-tests-sandbox-libdl-paths.patch
index 9f78c52f..9f78c52f 100644
--- a/packages/glibc/ports-2.16.0/360-tests-sandbox-libdl-paths.patch
+++ b/packages/glibc-ports/2.16.0/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc/ports-2.16.0/380-dont-build-timezone.patch b/packages/glibc-ports/2.16.0/380-dont-build-timezone.patch
index 11c358ea..11c358ea 100644
--- a/packages/glibc/ports-2.16.0/380-dont-build-timezone.patch
+++ b/packages/glibc-ports/2.16.0/380-dont-build-timezone.patch
diff --git a/packages/glibc/ports-2.16.0/400-alpha-xstat.patch b/packages/glibc-ports/2.16.0/400-alpha-xstat.patch
index 6e4ab8fe..6e4ab8fe 100644
--- a/packages/glibc/ports-2.16.0/400-alpha-xstat.patch
+++ b/packages/glibc-ports/2.16.0/400-alpha-xstat.patch
diff --git a/packages/glibc/ports-2.16.0/430-alpha-creat.patch b/packages/glibc-ports/2.16.0/430-alpha-creat.patch
index da6dddad..da6dddad 100644
--- a/packages/glibc/ports-2.16.0/430-alpha-creat.patch
+++ b/packages/glibc-ports/2.16.0/430-alpha-creat.patch
diff --git a/packages/glibc/ports-2.16.0/440-alpha-cache-shape.patch b/packages/glibc-ports/2.16.0/440-alpha-cache-shape.patch
index 5b1a2983..5b1a2983 100644
--- a/packages/glibc/ports-2.16.0/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.16.0/440-alpha-cache-shape.patch
diff --git a/packages/glibc/ports-2.16.0/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.16.0/460-alpha-fix-gcc-4.1-warnings.patch
index f2ff04f7..f2ff04f7 100644
--- a/packages/glibc/ports-2.16.0/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.16.0/460-alpha-fix-gcc-4.1-warnings.patch
diff --git a/packages/glibc/ports-2.16.0/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc-ports/2.16.0/490-alpha_alpha-add-fdatasync-support.patch
index acf250db..acf250db 100644
--- a/packages/glibc/ports-2.16.0/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc-ports/2.16.0/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc/ports-2.16.0/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.16.0/530-alpha-fix-rtld-fPIC.patch
index 42faaa58..42faaa58 100644
--- a/packages/glibc/ports-2.16.0/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.16.0/530-alpha-fix-rtld-fPIC.patch
diff --git a/packages/glibc/ports-2.16.0/560-ppc-atomic.patch b/packages/glibc-ports/2.16.0/560-ppc-atomic.patch
index ee1cb909..ee1cb909 100644
--- a/packages/glibc/ports-2.16.0/560-ppc-atomic.patch
+++ b/packages/glibc-ports/2.16.0/560-ppc-atomic.patch
diff --git a/packages/glibc/ports-2.16.0/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch
index 185331c8..185331c8 100644
--- a/packages/glibc/ports-2.16.0/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch
diff --git a/packages/glibc/ports-2.16.0/610-fpu-cw-mips.patch b/packages/glibc-ports/2.16.0/610-fpu-cw-mips.patch
index 0c0daf3e..0c0daf3e 100644
--- a/packages/glibc/ports-2.16.0/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.16.0/610-fpu-cw-mips.patch
diff --git a/packages/glibc/ports-2.16.0/630-mips_shn_undef-hack.patch b/packages/glibc-ports/2.16.0/630-mips_shn_undef-hack.patch
index 791d76cf..791d76cf 100644
--- a/packages/glibc/ports-2.16.0/630-mips_shn_undef-hack.patch
+++ b/packages/glibc-ports/2.16.0/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc/ports-2.16.0/640-alpha-atfcts.patch b/packages/glibc-ports/2.16.0/640-alpha-atfcts.patch
index 7a8a94a5..7a8a94a5 100644
--- a/packages/glibc/ports-2.16.0/640-alpha-atfcts.patch
+++ b/packages/glibc-ports/2.16.0/640-alpha-atfcts.patch
diff --git a/packages/glibc/ports-2.16.0/650-syslog.patch b/packages/glibc-ports/2.16.0/650-syslog.patch
index c20cafc8..c20cafc8 100644
--- a/packages/glibc/ports-2.16.0/650-syslog.patch
+++ b/packages/glibc-ports/2.16.0/650-syslog.patch
diff --git a/packages/glibc/ports-2.16.0/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc-ports/2.16.0/660-debug-readlink_chk-readklinkat_chk.patch
index a5a70528..a5a70528 100644
--- a/packages/glibc/ports-2.16.0/660-debug-readlink_chk-readklinkat_chk.patch
+++ b/packages/glibc-ports/2.16.0/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/glibc-ports/2.16.0/version.desc b/packages/glibc-ports/2.16.0/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/glibc-ports/2.16.0/version.desc
diff --git a/packages/glibc-ports/package.desc b/packages/glibc-ports/package.desc
new file mode 100644
index 00000000..5df2f20c
--- /dev/null
+++ b/packages/glibc-ports/package.desc
@@ -0,0 +1,8 @@
+# This is not a true package, but rather a part of glibc. When
+# the ports were an external add-on, it used a separate repository
+# and separate tarballs.
+repository='git git://sourceware.org/git/glibc-ports.git'
+mirrors='$(CT_Mirrors GNU glibc) $(CT_Mirrors sourceware glibc)'
+
+# Version of this package must be the same as the glibc's
+versionlocked='glibc'
diff --git a/packages/glibc/2.12.2/version.desc b/packages/glibc/2.12.2/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/glibc/2.12.2/version.desc
+++ b/packages/glibc/2.12.2/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/glibc/2.13/version.desc b/packages/glibc/2.13/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/glibc/2.13/version.desc
+++ b/packages/glibc/2.13/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/glibc/2.14.1/version.desc b/packages/glibc/2.14.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/glibc/2.14.1/version.desc
+++ b/packages/glibc/2.14.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/glibc/2.14/version.desc b/packages/glibc/2.14/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/glibc/2.14/version.desc
+++ b/packages/glibc/2.14/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/glibc/2.15/version.desc b/packages/glibc/2.15/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/glibc/2.15/version.desc
+++ b/packages/glibc/2.15/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/glibc/2.16.0/version.desc b/packages/glibc/2.16.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/glibc/2.16.0/version.desc
+++ b/packages/glibc/2.16.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/glibc/2.18/version.desc b/packages/glibc/2.18/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/glibc/2.18/version.desc
+++ b/packages/glibc/2.18/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/glibc/2.20/version.desc b/packages/glibc/2.20/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/glibc/2.20/version.desc
+++ b/packages/glibc/2.20/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/glibc/2.21/version.desc b/packages/glibc/2.21/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/glibc/2.21/version.desc
+++ b/packages/glibc/2.21/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/glibc/2.22/version.desc b/packages/glibc/2.22/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/glibc/2.22/version.desc
+++ b/packages/glibc/2.22/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/glibc/package.desc b/packages/glibc/package.desc
index a7fd4990..f6cc8e24 100644
--- a/packages/glibc/package.desc
+++ b/packages/glibc/package.desc
@@ -1,3 +1,4 @@
-origin="GNU"
-repository="git git://sourceware.org/git/glibc.git"
-milestones="2.17 2.20 2.23"
+origin='GNU'
+repository='git git://sourceware.org/git/glibc.git'
+mirrors='$(CT_Mirrors GNU glibc) $(CT_Mirrors sourceware glibc)'
+milestones='2.17 2.20 2.23'
diff --git a/packages/gmp/4.3.0/version.desc b/packages/gmp/4.3.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gmp/4.3.0/version.desc
+++ b/packages/gmp/4.3.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gmp/4.3.1/version.desc b/packages/gmp/4.3.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gmp/4.3.1/version.desc
+++ b/packages/gmp/4.3.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gmp/4.3.2/version.desc b/packages/gmp/4.3.2/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gmp/4.3.2/version.desc
+++ b/packages/gmp/4.3.2/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gmp/5.0.1/version.desc b/packages/gmp/5.0.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gmp/5.0.1/version.desc
+++ b/packages/gmp/5.0.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gmp/5.0.2/version.desc b/packages/gmp/5.0.2/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gmp/5.0.2/version.desc
+++ b/packages/gmp/5.0.2/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gmp/5.1.1/version.desc b/packages/gmp/5.1.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gmp/5.1.1/version.desc
+++ b/packages/gmp/5.1.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gmp/5.1.3/version.desc b/packages/gmp/5.1.3/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gmp/5.1.3/version.desc
+++ b/packages/gmp/5.1.3/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gmp/6.0.0a/version.desc b/packages/gmp/6.0.0a/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gmp/6.0.0a/version.desc
+++ b/packages/gmp/6.0.0a/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gmp/6.1.0/version.desc b/packages/gmp/6.1.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/gmp/6.1.0/version.desc
+++ b/packages/gmp/6.1.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/gmp/package.desc b/packages/gmp/package.desc
index 8a974366..a7ed6eff 100644
--- a/packages/gmp/package.desc
+++ b/packages/gmp/package.desc
@@ -1,2 +1,3 @@
-repository="hg https://gmplib.org/repo/gmp/"
-milestones="5.1"
+repository='hg https://gmplib.org/repo/gmp/'
+mirrors='https://gmplib.org/download/gmp $(CT_Mirrors GNU gmp)'
+milestones='5.1'
diff --git a/packages/isl/0.11.1/version.desc b/packages/isl/0.11.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/isl/0.11.1/version.desc
+++ b/packages/isl/0.11.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/isl/0.12.2/version.desc b/packages/isl/0.12.2/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/isl/0.12.2/version.desc
+++ b/packages/isl/0.12.2/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/isl/0.14/version.desc b/packages/isl/0.14/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/isl/0.14/version.desc
+++ b/packages/isl/0.14/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/isl/package.desc b/packages/isl/package.desc
index 5fc14abe..e328b886 100644
--- a/packages/isl/package.desc
+++ b/packages/isl/package.desc
@@ -1,2 +1,3 @@
-repository="git git://repo.or.cz/isl.git"
-milestones="0.12 0.14"
+repository='git git://repo.or.cz/isl.git'
+mirrors='http://isl.gforge.inria.fr'
+milestones='0.12 0.14'
diff --git a/packages/libelf/0.8.12/version.desc b/packages/libelf/0.8.12/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/libelf/0.8.12/version.desc
+++ b/packages/libelf/0.8.12/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/libelf/package.desc b/packages/libelf/package.desc
index b015c2d2..4720cd41 100644
--- a/packages/libelf/package.desc
+++ b/packages/libelf/package.desc
@@ -1,2 +1,3 @@
 # FIXME No public repository and no new releases.
 # Consider switching to/adding project elftoolchain?
+mirrors='http://www.mr511.de/software'
diff --git a/packages/libiconv/1.14/version.desc b/packages/libiconv/1.14/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/libiconv/1.14/version.desc
+++ b/packages/libiconv/1.14/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/libiconv/package.desc b/packages/libiconv/package.desc
index eb8318e8..b733baef 100644
--- a/packages/libiconv/package.desc
+++ b/packages/libiconv/package.desc
@@ -1 +1,2 @@
-repository="git https://git.savannah.gnu.org/git/libiconv.git"
+repository='git https://git.savannah.gnu.org/git/libiconv.git'
+mirrors='$(CT_Mirrors GNU libiconv)'
diff --git a/packages/libtool/package.desc b/packages/libtool/package.desc
index 995546ea..2568f097 100644
--- a/packages/libtool/package.desc
+++ b/packages/libtool/package.desc
@@ -1 +1,2 @@
-repository="git git://git.savannah.gnu.org/libtool.git"
+repository='git git://git.savannah.gnu.org/libtool.git'
+mirrors='$(CT_Mirrors GNU libtool)'
diff --git a/packages/linux/2.6.33.7/version.desc b/packages/linux/2.6.33.7/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/2.6.33.7/version.desc
+++ b/packages/linux/2.6.33.7/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/2.6.34.7/version.desc b/packages/linux/2.6.34.7/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/2.6.34.7/version.desc
+++ b/packages/linux/2.6.34.7/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/2.6.35.9/version.desc b/packages/linux/2.6.35.9/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/2.6.35.9/version.desc
+++ b/packages/linux/2.6.35.9/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/2.6.36.4/version.desc b/packages/linux/2.6.36.4/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/2.6.36.4/version.desc
+++ b/packages/linux/2.6.36.4/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/2.6.37.6/version.desc b/packages/linux/2.6.37.6/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/2.6.37.6/version.desc
+++ b/packages/linux/2.6.37.6/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/2.6.38.8/version.desc b/packages/linux/2.6.38.8/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/2.6.38.8/version.desc
+++ b/packages/linux/2.6.38.8/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/2.6.39.4/version.desc b/packages/linux/2.6.39.4/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/2.6.39.4/version.desc
+++ b/packages/linux/2.6.39.4/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/3.0.101/version.desc b/packages/linux/3.0.101/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/3.0.101/version.desc
+++ b/packages/linux/3.0.101/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/3.1.10/version.desc b/packages/linux/3.1.10/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/3.1.10/version.desc
+++ b/packages/linux/3.1.10/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/3.11.10/version.desc b/packages/linux/3.11.10/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/3.11.10/version.desc
+++ b/packages/linux/3.11.10/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/3.14.79/version.desc b/packages/linux/3.14.79/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/3.14.79/version.desc
+++ b/packages/linux/3.14.79/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/3.15.10/version.desc b/packages/linux/3.15.10/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/3.15.10/version.desc
+++ b/packages/linux/3.15.10/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/3.17.8/version.desc b/packages/linux/3.17.8/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/3.17.8/version.desc
+++ b/packages/linux/3.17.8/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/3.18.48/version.desc b/packages/linux/3.18.48/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/3.18.48/version.desc
+++ b/packages/linux/3.18.48/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/3.19.8/version.desc b/packages/linux/3.19.8/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/3.19.8/version.desc
+++ b/packages/linux/3.19.8/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/3.3.8/version.desc b/packages/linux/3.3.8/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/3.3.8/version.desc
+++ b/packages/linux/3.3.8/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/3.5.7/version.desc b/packages/linux/3.5.7/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/3.5.7/version.desc
+++ b/packages/linux/3.5.7/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/3.6.11/version.desc b/packages/linux/3.6.11/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/3.6.11/version.desc
+++ b/packages/linux/3.6.11/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/3.7.10/version.desc b/packages/linux/3.7.10/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/3.7.10/version.desc
+++ b/packages/linux/3.7.10/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/3.8.13/version.desc b/packages/linux/3.8.13/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/3.8.13/version.desc
+++ b/packages/linux/3.8.13/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/3.9.11/version.desc b/packages/linux/3.9.11/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/3.9.11/version.desc
+++ b/packages/linux/3.9.11/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/4.0.9/version.desc b/packages/linux/4.0.9/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/4.0.9/version.desc
+++ b/packages/linux/4.0.9/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/4.10.8/version.desc b/packages/linux/4.10.8/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/4.10.8/version.desc
+++ b/packages/linux/4.10.8/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/4.2.8/version.desc b/packages/linux/4.2.8/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/4.2.8/version.desc
+++ b/packages/linux/4.2.8/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/4.3.6/version.desc b/packages/linux/4.3.6/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/4.3.6/version.desc
+++ b/packages/linux/4.3.6/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/4.5.7/version.desc b/packages/linux/4.5.7/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/4.5.7/version.desc
+++ b/packages/linux/4.5.7/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/4.6.7/version.desc b/packages/linux/4.6.7/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/4.6.7/version.desc
+++ b/packages/linux/4.6.7/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/4.7.10/version.desc b/packages/linux/4.7.10/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/4.7.10/version.desc
+++ b/packages/linux/4.7.10/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/4.8.17/version.desc b/packages/linux/4.8.17/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/linux/4.8.17/version.desc
+++ b/packages/linux/4.8.17/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/linux/package.desc b/packages/linux/package.desc
index 2e5f7a30..e34f9e44 100644
--- a/packages/linux/package.desc
+++ b/packages/linux/package.desc
@@ -1 +1,2 @@
-repository="git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
+repository='git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
+mirrors='$(CT_Mirrors linux ${CT_LINUX_VERSION})'
diff --git a/packages/ltrace/0.5.3/version.desc b/packages/ltrace/0.5.3/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/ltrace/0.5.3/version.desc
+++ b/packages/ltrace/0.5.3/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/ltrace/package.desc b/packages/ltrace/package.desc
index d80e7ce2..73d781b7 100644
--- a/packages/ltrace/package.desc
+++ b/packages/ltrace/package.desc
@@ -1 +1,2 @@
-repository="git git://git.debian.org/git/collab-maint/ltrace.git"
+repository='git git://git.debian.org/git/collab-maint/ltrace.git'
+mirrors='http://ftp.debian.org/debian/pool/main/l/ltrace ftp:://ftp.debian.org/debian/pool/main/l/ltrace'
diff --git a/packages/m4/1.4.13/version.desc b/packages/m4/1.4.13/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/m4/1.4.13/version.desc
+++ b/packages/m4/1.4.13/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/m4/1.4.17/version.desc b/packages/m4/1.4.17/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/m4/1.4.17/version.desc
+++ b/packages/m4/1.4.17/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/m4/package.desc b/packages/m4/package.desc
index 555cdd1d..f0d62cee 100644
--- a/packages/m4/package.desc
+++ b/packages/m4/package.desc
@@ -1 +1,2 @@
-repository="git git://git.sv.gnu.org/m4"
+repository='git git://git.sv.gnu.org/m4'
+mirrors='$(CT_Mirrors GNU m4)'
diff --git a/packages/make/3.81/version.desc b/packages/make/3.81/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/make/3.81/version.desc
+++ b/packages/make/3.81/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/make/4.0/version.desc b/packages/make/4.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/make/4.0/version.desc
+++ b/packages/make/4.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/make/4.1/version.desc b/packages/make/4.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/make/4.1/version.desc
+++ b/packages/make/4.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/make/package.desc b/packages/make/package.desc
index b0933247..8485d3e6 100644
--- a/packages/make/package.desc
+++ b/packages/make/package.desc
@@ -1 +1,2 @@
-repository="git https://git.savannah.gnu.org/git/make.git"
+repository='git https://git.savannah.gnu.org/git/make.git'
+mirrors='$(CT_Mirrors GNU make)'
diff --git a/packages/mingw-w64/package.desc b/packages/mingw-w64/package.desc
index 7bae1f7d..bbe507ac 100644
--- a/packages/mingw-w64/package.desc
+++ b/packages/mingw-w64/package.desc
@@ -1 +1,2 @@
-repository="git https://git.code.sf.net/p/mingw-w64/mingw-w64"
+repository='git https://git.code.sf.net/p/mingw-w64/mingw-w64'
+mirrors='http://downloads.sourceforge.net/sourceforge/mingw-w64 https://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/'
diff --git a/packages/mingw-w64/v2.0.7/version.desc b/packages/mingw-w64/v2.0.7/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mingw-w64/v2.0.7/version.desc
+++ b/packages/mingw-w64/v2.0.7/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mingw-w64/v2.0.8/version.desc b/packages/mingw-w64/v2.0.8/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mingw-w64/v2.0.8/version.desc
+++ b/packages/mingw-w64/v2.0.8/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mingw-w64/v2.0.9/version.desc b/packages/mingw-w64/v2.0.9/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mingw-w64/v2.0.9/version.desc
+++ b/packages/mingw-w64/v2.0.9/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mingw-w64/v3.0.0/version.desc b/packages/mingw-w64/v3.0.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mingw-w64/v3.0.0/version.desc
+++ b/packages/mingw-w64/v3.0.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mingw-w64/v3.1.0/version.desc b/packages/mingw-w64/v3.1.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mingw-w64/v3.1.0/version.desc
+++ b/packages/mingw-w64/v3.1.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mingw-w64/v3.2.0/version.desc b/packages/mingw-w64/v3.2.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mingw-w64/v3.2.0/version.desc
+++ b/packages/mingw-w64/v3.2.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mingw-w64/v3.3.0/version.desc b/packages/mingw-w64/v3.3.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mingw-w64/v3.3.0/version.desc
+++ b/packages/mingw-w64/v3.3.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mingw-w64/v4.0.0/version.desc b/packages/mingw-w64/v4.0.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mingw-w64/v4.0.0/version.desc
+++ b/packages/mingw-w64/v4.0.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mingw-w64/v4.0.1/version.desc b/packages/mingw-w64/v4.0.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mingw-w64/v4.0.1/version.desc
+++ b/packages/mingw-w64/v4.0.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mingw-w64/v4.0.2/version.desc b/packages/mingw-w64/v4.0.2/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mingw-w64/v4.0.2/version.desc
+++ b/packages/mingw-w64/v4.0.2/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mingw-w64/v4.0.4/version.desc b/packages/mingw-w64/v4.0.4/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mingw-w64/v4.0.4/version.desc
+++ b/packages/mingw-w64/v4.0.4/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mingw-w64/v4.0.5/version.desc b/packages/mingw-w64/v4.0.5/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mingw-w64/v4.0.5/version.desc
+++ b/packages/mingw-w64/v4.0.5/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mingw-w64/v5.0.0/version.desc b/packages/mingw-w64/v5.0.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mingw-w64/v5.0.0/version.desc
+++ b/packages/mingw-w64/v5.0.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mpc/0.7/version.desc b/packages/mpc/0.7/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mpc/0.7/version.desc
+++ b/packages/mpc/0.7/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mpc/0.8.1/version.desc b/packages/mpc/0.8.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mpc/0.8.1/version.desc
+++ b/packages/mpc/0.8.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mpc/0.8.2/version.desc b/packages/mpc/0.8.2/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mpc/0.8.2/version.desc
+++ b/packages/mpc/0.8.2/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mpc/0.9/version.desc b/packages/mpc/0.9/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mpc/0.9/version.desc
+++ b/packages/mpc/0.9/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mpc/1.0.1/version.desc b/packages/mpc/1.0.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mpc/1.0.1/version.desc
+++ b/packages/mpc/1.0.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mpc/1.0.2/version.desc b/packages/mpc/1.0.2/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mpc/1.0.2/version.desc
+++ b/packages/mpc/1.0.2/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mpc/1.0/version.desc b/packages/mpc/1.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mpc/1.0/version.desc
+++ b/packages/mpc/1.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mpc/package.desc b/packages/mpc/package.desc
index 2a7e47c4..c3681600 100644
--- a/packages/mpc/package.desc
+++ b/packages/mpc/package.desc
@@ -1 +1,2 @@
-repository="git https://scm.gforge.inria.fr/anonscm/git/mpc/mpc.git"
+repository='git https://scm.gforge.inria.fr/anonscm/git/mpc/mpc.git'
+mirrors='http://www.multiprecision.org/mpc/download $(CT_Mirrors GNU mpc)'
diff --git a/packages/mpfr/2.4.0/version.desc b/packages/mpfr/2.4.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mpfr/2.4.0/version.desc
+++ b/packages/mpfr/2.4.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mpfr/2.4.1/version.desc b/packages/mpfr/2.4.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mpfr/2.4.1/version.desc
+++ b/packages/mpfr/2.4.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mpfr/2.4.2/version.desc b/packages/mpfr/2.4.2/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mpfr/2.4.2/version.desc
+++ b/packages/mpfr/2.4.2/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mpfr/3.0.0/version.desc b/packages/mpfr/3.0.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mpfr/3.0.0/version.desc
+++ b/packages/mpfr/3.0.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mpfr/3.0.1/version.desc b/packages/mpfr/3.0.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mpfr/3.0.1/version.desc
+++ b/packages/mpfr/3.0.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mpfr/3.1.0/version.desc b/packages/mpfr/3.1.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mpfr/3.1.0/version.desc
+++ b/packages/mpfr/3.1.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mpfr/3.1.1/version.desc b/packages/mpfr/3.1.1/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mpfr/3.1.1/version.desc
+++ b/packages/mpfr/3.1.1/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mpfr/3.1.2/version.desc b/packages/mpfr/3.1.2/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mpfr/3.1.2/version.desc
+++ b/packages/mpfr/3.1.2/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mpfr/3.1.3/version.desc b/packages/mpfr/3.1.3/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/mpfr/3.1.3/version.desc
+++ b/packages/mpfr/3.1.3/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/mpfr/package.desc b/packages/mpfr/package.desc
index edd604a2..1eacb98f 100644
--- a/packages/mpfr/package.desc
+++ b/packages/mpfr/package.desc
@@ -1 +1,2 @@
-repository="svn https://scm.gforge.inria.fr/anonscm/svn/mpfr"
+repository='svn https://scm.gforge.inria.fr/anonscm/svn/mpfr'
+mirrors='http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)'
diff --git a/packages/musl/1.1.15/version.desc b/packages/musl/1.1.15/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/musl/1.1.15/version.desc
+++ b/packages/musl/1.1.15/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/musl/package.desc b/packages/musl/package.desc
index 23870dd8..f1b73dce 100644
--- a/packages/musl/package.desc
+++ b/packages/musl/package.desc
@@ -1 +1,2 @@
-repository="git git://git.musl-libc.org/musl"
+repository='git git://git.musl-libc.org/musl'
+mirrors='http://www.musl-libc.org/releases'
diff --git a/packages/ncurses/package.desc b/packages/ncurses/package.desc
index 8b966f1e..bb5646d5 100644
--- a/packages/ncurses/package.desc
+++ b/packages/ncurses/package.desc
@@ -1 +1,2 @@
 # No public repository for ncurses
+mirrors='ftp://invisible-island.net/ncurses $(CT_Mirrors GNU ncurses)'
diff --git a/packages/newlib-linaro/2.1.0-2014.09/version.desc b/packages/newlib-linaro/2.1.0-2014.09/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/newlib-linaro/2.1.0-2014.09/version.desc
+++ b/packages/newlib-linaro/2.1.0-2014.09/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/newlib-linaro/2.2.0-2015.01/version.desc b/packages/newlib-linaro/2.2.0-2015.01/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/newlib-linaro/2.2.0-2015.01/version.desc
+++ b/packages/newlib-linaro/2.2.0-2015.01/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/newlib-linaro/package.desc b/packages/newlib-linaro/package.desc
index d1bc373c..a11646d2 100644
--- a/packages/newlib-linaro/package.desc
+++ b/packages/newlib-linaro/package.desc
@@ -1,4 +1,5 @@
-origin="Linaro"
-master="newlib"
-repository="git https://git.linaro.org/toolchain/newlib.git"
-experimental="yes"
+origin='Linaro'
+master='newlib'
+repository='git https://git.linaro.org/toolchain/newlib.git'
+mirrors='$(CT_Mirrors Linaro newlib ${CT_NEWLIB_LINARO_VERSION})'
+experimental='yes'
diff --git a/packages/newlib/1.17.0/version.desc b/packages/newlib/1.17.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/newlib/1.17.0/version.desc
+++ b/packages/newlib/1.17.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/newlib/1.18.0/version.desc b/packages/newlib/1.18.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/newlib/1.18.0/version.desc
+++ b/packages/newlib/1.18.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/newlib/1.19.0/version.desc b/packages/newlib/1.19.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/newlib/1.19.0/version.desc
+++ b/packages/newlib/1.19.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/newlib/1.20.0/version.desc b/packages/newlib/1.20.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/newlib/1.20.0/version.desc
+++ b/packages/newlib/1.20.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/newlib/2.0.0/version.desc b/packages/newlib/2.0.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/newlib/2.0.0/version.desc
+++ b/packages/newlib/2.0.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/newlib/2.1.0/version.desc b/packages/newlib/2.1.0/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/newlib/2.1.0/version.desc
+++ b/packages/newlib/2.1.0/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/newlib/2.2.0.20151023/version.desc b/packages/newlib/2.2.0.20151023/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/newlib/2.2.0.20151023/version.desc
+++ b/packages/newlib/2.2.0.20151023/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/newlib/2.3.0.20160226/version.desc b/packages/newlib/2.3.0.20160226/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/newlib/2.3.0.20160226/version.desc
+++ b/packages/newlib/2.3.0.20160226/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/newlib/2.4.0.20161025/version.desc b/packages/newlib/2.4.0.20161025/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/newlib/2.4.0.20161025/version.desc
+++ b/packages/newlib/2.4.0.20161025/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/newlib/package.desc b/packages/newlib/package.desc
index 3abfe27b..56fe432c 100644
--- a/packages/newlib/package.desc
+++ b/packages/newlib/package.desc
@@ -1,3 +1,4 @@
-origin="RedHat"
-repository="git git://sourceware.org/git/newlib-cygwin.git"
-milestones="2.0"
+origin='RedHat'
+repository='git git://sourceware.org/git/newlib-cygwin.git'
+mirrors='ftp://sourceware.org/pub/newlib'
+milestones='2.0 2.1 2.2'
diff --git a/packages/strace/4.10/version.desc b/packages/strace/4.10/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/strace/4.10/version.desc
+++ b/packages/strace/4.10/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/strace/4.11/version.desc b/packages/strace/4.11/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/strace/4.11/version.desc
+++ b/packages/strace/4.11/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/strace/4.12/version.desc b/packages/strace/4.12/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/strace/4.12/version.desc
+++ b/packages/strace/4.12/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/strace/4.13/version.desc b/packages/strace/4.13/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/strace/4.13/version.desc
+++ b/packages/strace/4.13/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/strace/4.14/version.desc b/packages/strace/4.14/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/strace/4.14/version.desc
+++ b/packages/strace/4.14/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/strace/4.5.18/version.desc b/packages/strace/4.5.18/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/strace/4.5.18/version.desc
+++ b/packages/strace/4.5.18/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/strace/4.5.19/version.desc b/packages/strace/4.5.19/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/strace/4.5.19/version.desc
+++ b/packages/strace/4.5.19/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/strace/4.5.20/version.desc b/packages/strace/4.5.20/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/strace/4.5.20/version.desc
+++ b/packages/strace/4.5.20/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/strace/4.6/version.desc b/packages/strace/4.6/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/strace/4.6/version.desc
+++ b/packages/strace/4.6/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/strace/4.7/version.desc b/packages/strace/4.7/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/strace/4.7/version.desc
+++ b/packages/strace/4.7/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/strace/4.8/version.desc b/packages/strace/4.8/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/strace/4.8/version.desc
+++ b/packages/strace/4.8/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/strace/4.9/version.desc b/packages/strace/4.9/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/strace/4.9/version.desc
+++ b/packages/strace/4.9/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/strace/package.desc b/packages/strace/package.desc
index 9960dffd..e260df8e 100644
--- a/packages/strace/package.desc
+++ b/packages/strace/package.desc
@@ -1 +1,2 @@
-repository="git https://git.code.sf.net/p/strace/code"
+repository='git https://git.code.sf.net/p/strace/code'
+mirrors='http://downloads.sourceforge.net/project/strace/strace/${CT_STRACE_VERSION}'
diff --git a/packages/uClibc-ng/1.0.20/version.desc b/packages/uClibc-ng/1.0.20/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/uClibc-ng/1.0.20/version.desc
+++ b/packages/uClibc-ng/1.0.20/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/uClibc-ng/1.0.21/version.desc b/packages/uClibc-ng/1.0.21/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/uClibc-ng/1.0.21/version.desc
+++ b/packages/uClibc-ng/1.0.21/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/uClibc-ng/package.desc b/packages/uClibc-ng/package.desc
index 72cfd1a8..1d514fb7 100644
--- a/packages/uClibc-ng/package.desc
+++ b/packages/uClibc-ng/package.desc
@@ -1,3 +1,4 @@
-origin="uclibc-ng.org"
-repository="git git://uclibc-ng.org/git/uclibc-ng"
-milestones="0.9.33.2 1.0.0 1.0.15"
+origin='uclibc-ng.org'
+repository='git git://uclibc-ng.org/git/uclibc-ng'
+mirrors='http://downloads.uclibc-ng.org/releases/${CT_UCLIBC_NG_VERSION}'
+milestones='0.9.33.2 1.0.0 1.0.15'
diff --git a/packages/uClibc/0.9.33.2/version.desc b/packages/uClibc/0.9.33.2/version.desc
index 026d275e..fcfe3891 100644
--- a/packages/uClibc/0.9.33.2/version.desc
+++ b/packages/uClibc/0.9.33.2/version.desc
@@ -1 +1 @@
-obsolete="yes"
+obsolete='yes'
diff --git a/packages/uClibc/package.desc b/packages/uClibc/package.desc
index ac3a8442..fd2050aa 100644
--- a/packages/uClibc/package.desc
+++ b/packages/uClibc/package.desc
@@ -1,5 +1,6 @@
 # Technically, it is the other way around: uClibc-ng is a fork of uClibc. But
 # uClibc is no longer maintained, so we want people to use uClibc-ng.
-master="uClibc-ng"
-origin="uclibc.org"
-repository="git git://git.busybox.net/uClibc"
+master='uClibc-ng'
+origin='uclibc.org'
+repository='git git://git.busybox.net/uClibc'
+mirrors='http://www.uclibc.org/downloads http://www.uclibc.org/downloads/old-releases'
diff --git a/packages/zlib/package.desc b/packages/zlib/package.desc
index eea24eb0..789f3c7a 100644
--- a/packages/zlib/package.desc
+++ b/packages/zlib/package.desc
@@ -1 +1,2 @@
-repository="git https://github.com/madler/zlib.git"
+repository='git https://github.com/madler/zlib.git'
+mirrors='http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION}'