From be399f1046874daa40b15cbb7d74e715ae3714e6 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Fri, 18 Aug 2017 22:39:26 -0700
Subject: [PATCH] Record tarball formats

Also, missed upgrades of gmp, isl, mingw-w64

Signed-off-by: Alexey Neyman <stilor@att.net>
---
 packages/android-ndk/package.desc                             | 1 +
 packages/autoconf/2.65/version.desc                           | 1 +
 packages/autoconf/package.desc                                | 1 +
 packages/automake/package.desc                                | 1 +
 packages/avr-libc/package.desc                                | 1 +
 packages/binutils-linaro/2.23.2-2013.10-4/version.desc        | 1 +
 packages/binutils-linaro/package.desc                         | 1 +
 packages/binutils/2.23.2/version.desc                         | 1 +
 packages/binutils/2.24/version.desc                           | 1 +
 packages/binutils/2.25.1/version.desc                         | 1 +
 packages/binutils/2.26.1/version.desc                         | 1 +
 packages/binutils/2.27/version.desc                           | 1 +
 packages/binutils/package.desc                                | 1 +
 packages/cloog/package.desc                                   | 1 +
 packages/duma/package.desc                                    | 1 +
 packages/expat/package.desc                                   | 1 +
 packages/gcc-linaro/package.desc                              | 1 +
 packages/gcc/4.8.5/version.desc                               | 1 +
 packages/gcc/4.9.4/version.desc                               | 1 +
 packages/gcc/5.4.0/version.desc                               | 1 +
 packages/gcc/package.desc                                     | 1 +
 packages/gdb-linaro/7.3-2011.12/version.desc                  | 1 +
 packages/gdb-linaro/7.4-2012.06/version.desc                  | 1 +
 packages/gdb-linaro/7.5-2012.12/version.desc                  | 1 +
 packages/gdb-linaro/7.6.1-2013.10/version.desc                | 1 +
 packages/gdb-linaro/7.7-2014.05/version.desc                  | 1 +
 packages/gdb-linaro/7.7.1-2014.06-1/version.desc              | 1 +
 packages/gdb-linaro/package.desc                              | 1 +
 packages/gdb/6.8a/version.desc                                | 1 +
 packages/gdb/7.0.1a/version.desc                              | 1 +
 packages/gdb/7.0a/version.desc                                | 1 +
 packages/gdb/7.1a/version.desc                                | 1 +
 packages/gdb/7.2a/version.desc                                | 1 +
 packages/gdb/7.3.1/version.desc                               | 1 +
 packages/gdb/7.4.1/version.desc                               | 1 +
 packages/gdb/7.5.1/version.desc                               | 1 +
 packages/gdb/7.6.1/version.desc                               | 1 +
 packages/gdb/7.7.1/version.desc                               | 1 +
 packages/gdb/package.desc                                     | 1 +
 packages/gettext/package.desc                                 | 1 +
 packages/glibc-linaro/package.desc                            | 1 +
 packages/glibc-ports/2.12.1/version.desc                      | 1 +
 packages/glibc-ports/2.13/version.desc                        | 1 +
 packages/glibc-ports/package.desc                             | 2 ++
 packages/glibc/package.desc                                   | 1 +
 packages/gmp/4.3.2/version.desc                               | 1 +
 .../110-get-mpn_sub_1-size-argument-right.patch               | 0
 .../gmp/{5.0.2 => 5.0.5}/120-fix-r0-clobbering-issue.patch    | 0
 packages/gmp/5.0.5/version.desc                               | 2 ++
 packages/gmp/package.desc                                     | 3 ++-
 packages/isl/0.11.1/version.desc                              | 1 -
 packages/isl/0.11.2/version.desc                              | 2 ++
 packages/isl/0.12.2/version.desc                              | 1 +
 packages/{gmp/5.0.2 => isl/0.14.1}/version.desc               | 0
 packages/isl/0.14/version.desc                                | 1 -
 packages/isl/package.desc                                     | 1 +
 packages/libelf/package.desc                                  | 1 +
 packages/libiconv/package.desc                                | 1 +
 packages/libtool/package.desc                                 | 1 +
 packages/linux/2.6.32.27/version.desc                         | 1 +
 packages/linux/2.6.33.7/version.desc                          | 1 +
 packages/linux/2.6.34.7/version.desc                          | 1 +
 packages/linux/2.6.35.9/version.desc                          | 1 +
 packages/linux/2.6.36.4/version.desc                          | 1 +
 packages/linux/2.6.37.6/version.desc                          | 1 +
 packages/linux/2.6.38.8/version.desc                          | 1 +
 packages/linux/2.6.39.4/version.desc                          | 1 +
 packages/linux/3.0.101/version.desc                           | 1 +
 packages/linux/3.1.10/version.desc                            | 1 +
 packages/linux/3.10.107/version.desc                          | 1 +
 packages/linux/3.11.10/version.desc                           | 1 +
 packages/linux/3.12.74/version.desc                           | 1 +
 packages/linux/3.13.11/version.desc                           | 1 +
 packages/linux/3.14.79/version.desc                           | 1 +
 packages/linux/3.15.10/version.desc                           | 1 +
 packages/linux/3.16.46/version.desc                           | 1 +
 packages/linux/3.17.8/version.desc                            | 1 +
 packages/linux/3.18.66/version.desc                           | 1 +
 packages/linux/3.19.8/version.desc                            | 1 +
 packages/linux/3.2.93/version.desc                            | 1 +
 packages/linux/3.3.8/version.desc                             | 1 +
 packages/linux/3.4.113/version.desc                           | 1 +
 packages/linux/3.5.7/version.desc                             | 1 +
 packages/linux/3.6.11/version.desc                            | 1 +
 packages/linux/3.7.10/version.desc                            | 1 +
 packages/linux/3.8.13/version.desc                            | 1 +
 packages/linux/3.9.11/version.desc                            | 1 +
 packages/linux/package.desc                                   | 1 +
 packages/ltrace/0.5.3/version.desc                            | 1 +
 packages/ltrace/package.desc                                  | 1 +
 packages/m4/package.desc                                      | 1 +
 packages/make/package.desc                                    | 1 +
 packages/mingw-w64/package.desc                               | 1 +
 .../mingw-w64/{v2.0.9 => v2.0.10}/100-mingw64-malloc.patch    | 0
 packages/mingw-w64/v2.0.10/version.desc                       | 2 ++
 packages/mingw-w64/v2.0.9/version.desc                        | 1 -
 packages/mingw-w64/v3.0.0/version.desc                        | 1 +
 packages/mingw-w64/v3.1.0/version.desc                        | 1 +
 packages/mingw-w64/v3.2.0/version.desc                        | 1 +
 packages/mingw-w64/v3.3.0/version.desc                        | 1 +
 packages/mpc/package.desc                                     | 4 ++++
 packages/mpfr/package.desc                                    | 1 +
 packages/musl/package.desc                                    | 1 +
 packages/ncurses/package.desc                                 | 1 +
 packages/newlib-linaro/2.1.0-2014.09/version.desc             | 1 +
 packages/newlib-linaro/package.desc                           | 1 +
 packages/newlib/package.desc                                  | 1 +
 packages/strace/4.5.20/version.desc                           | 1 +
 packages/strace/package.desc                                  | 1 +
 packages/uClibc-ng/package.desc                               | 1 +
 packages/uClibc/package.desc                                  | 1 +
 packages/zlib/package.desc                                    | 1 +
 scripts/functions                                             | 4 ++++
 113 files changed, 117 insertions(+), 4 deletions(-)
 rename packages/gmp/{5.0.2 => 5.0.5}/110-get-mpn_sub_1-size-argument-right.patch (100%)
 rename packages/gmp/{5.0.2 => 5.0.5}/120-fix-r0-clobbering-issue.patch (100%)
 create mode 100644 packages/gmp/5.0.5/version.desc
 delete mode 100644 packages/isl/0.11.1/version.desc
 create mode 100644 packages/isl/0.11.2/version.desc
 rename packages/{gmp/5.0.2 => isl/0.14.1}/version.desc (100%)
 delete mode 100644 packages/isl/0.14/version.desc
 rename packages/mingw-w64/{v2.0.9 => v2.0.10}/100-mingw64-malloc.patch (100%)
 create mode 100644 packages/mingw-w64/v2.0.10/version.desc
 delete mode 100644 packages/mingw-w64/v2.0.9/version.desc

diff --git a/packages/android-ndk/package.desc b/packages/android-ndk/package.desc
index c51775b1..5be82225 100644
--- a/packages/android-ndk/package.desc
+++ b/packages/android-ndk/package.desc
@@ -1,3 +1,4 @@
 # We don't support building bionic (yet) so no official repository
 mirrors='https://dl.google.com/android/repository'
 archive_filename='@{pkg_name}-@{version}-linux-x86_64'
+archive_formats='.zip'
diff --git a/packages/autoconf/2.65/version.desc b/packages/autoconf/2.65/version.desc
index e69de29b..6d5245de 100644
--- a/packages/autoconf/2.65/version.desc
+++ b/packages/autoconf/2.65/version.desc
@@ -0,0 +1 @@
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/autoconf/package.desc b/packages/autoconf/package.desc
index 29d6351c..af39172a 100644
--- a/packages/autoconf/package.desc
+++ b/packages/autoconf/package.desc
@@ -1,3 +1,4 @@
 repository='git git://git.sv.gnu.org/autoconf'
 bootstrap='autoreconf -vi'
 mirrors='$(CT_Mirrors GNU autoconf)'
+archive_formats='.tar.xz .tar.gz'
diff --git a/packages/automake/package.desc b/packages/automake/package.desc
index 01919684..a624d492 100644
--- a/packages/automake/package.desc
+++ b/packages/automake/package.desc
@@ -1,3 +1,4 @@
 repository='git https://git.savannah.gnu.org/git/automake.git'
 bootstrap='./bootstrap'
 mirrors='$(CT_Mirrors GNU automake)'
+archive_formats='.tar.xz .tar.gz'
diff --git a/packages/avr-libc/package.desc b/packages/avr-libc/package.desc
index 8976862e..9161c74a 100644
--- a/packages/avr-libc/package.desc
+++ b/packages/avr-libc/package.desc
@@ -1,2 +1,3 @@
 repository='svn svn://svn.savannah.nongnu.org/avr-libc/trunk/avr-libc'
 mirrors='http://download.savannah.gnu.org/releases/avr-libc'
+archive_formats='.tar.bz2'
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 fcfe3891..a114052d 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,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2'
diff --git a/packages/binutils-linaro/package.desc b/packages/binutils-linaro/package.desc
index ea5dc66c..eb994a77 100644
--- a/packages/binutils-linaro/package.desc
+++ b/packages/binutils-linaro/package.desc
@@ -3,3 +3,4 @@ repository='git https://git.linaro.org/toolchain/binutils-gdb.git'
 mirrors='$(CT_Mirrors Linaro binutils ${CT_BINUTILS_LINARO_VERSION})'
 origin='Linaro'
 experimental='yes'
+archive_formats='.tar.xz'
diff --git a/packages/binutils/2.23.2/version.desc b/packages/binutils/2.23.2/version.desc
index fcfe3891..f26b5a26 100644
--- a/packages/binutils/2.23.2/version.desc
+++ b/packages/binutils/2.23.2/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/binutils/2.24/version.desc b/packages/binutils/2.24/version.desc
index fcfe3891..f26b5a26 100644
--- a/packages/binutils/2.24/version.desc
+++ b/packages/binutils/2.24/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/binutils/2.25.1/version.desc b/packages/binutils/2.25.1/version.desc
index fcfe3891..f26b5a26 100644
--- a/packages/binutils/2.25.1/version.desc
+++ b/packages/binutils/2.25.1/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/binutils/2.26.1/version.desc b/packages/binutils/2.26.1/version.desc
index e69de29b..d44e333b 100644
--- a/packages/binutils/2.26.1/version.desc
+++ b/packages/binutils/2.26.1/version.desc
@@ -0,0 +1 @@
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/binutils/2.27/version.desc b/packages/binutils/2.27/version.desc
index e69de29b..d44e333b 100644
--- a/packages/binutils/2.27/version.desc
+++ b/packages/binutils/2.27/version.desc
@@ -0,0 +1 @@
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/binutils/package.desc b/packages/binutils/package.desc
index cb987077..962ed589 100644
--- a/packages/binutils/package.desc
+++ b/packages/binutils/package.desc
@@ -2,3 +2,4 @@ repository='git git://sourceware.org/git/binutils-gdb.git'
 mirrors='$(CT_Mirrors GNU binutils) $(CT_Mirrors sourceware binutils/releases)'
 origin='GNU'
 milestones='2.23'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/cloog/package.desc b/packages/cloog/package.desc
index 333a45c6..2a129949 100644
--- a/packages/cloog/package.desc
+++ b/packages/cloog/package.desc
@@ -2,3 +2,4 @@ pkg_label='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 0.18.1 0.18.4'
+archive_formats='.tar.gz'
diff --git a/packages/duma/package.desc b/packages/duma/package.desc
index 0abd534d..13f637f2 100644
--- a/packages/duma/package.desc
+++ b/packages/duma/package.desc
@@ -2,3 +2,4 @@ repository='cvs :pserver:anonymous@duma.cvs.sourceforge.net:/cvsroot/duma duma'
 mirrors='http://downloads.sourceforge.net/project/duma/duma/${CT_DUMA_VERSION//_/.}'
 archive_filename='@{pkg_name}_@{version}'
 archive_dirname='@{pkg_name}_@{version}'
+archive_formats='.tar.gz .zip'
diff --git a/packages/expat/package.desc b/packages/expat/package.desc
index 585ce5e6..6a541b36 100644
--- a/packages/expat/package.desc
+++ b/packages/expat/package.desc
@@ -2,3 +2,4 @@ repository='git https://github.com/libexpat/libexpat.git'
 repository_subdir='expat'
 bootstrap='./buildconf.sh && make -C doc all'
 mirrors='http://downloads.sourceforge.net/project/expat/expat/${CT_EXPAT_VERSION}'
+archive_formats='.tar.bz2'
diff --git a/packages/gcc-linaro/package.desc b/packages/gcc-linaro/package.desc
index 1731843f..fd475c19 100644
--- a/packages/gcc-linaro/package.desc
+++ b/packages/gcc-linaro/package.desc
@@ -3,3 +3,4 @@ repository='git https://git.linaro.org/toolchain/gcc.git'
 mirrors='$(CT_Mirrors Linaro gcc ${CT_GCC_LINARO_VERSION})'
 origin='Linaro'
 experimental='yes'
+archive_formats='.tar.xz'
diff --git a/packages/gcc/4.8.5/version.desc b/packages/gcc/4.8.5/version.desc
index fcfe3891..f26b5a26 100644
--- a/packages/gcc/4.8.5/version.desc
+++ b/packages/gcc/4.8.5/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gcc/4.9.4/version.desc b/packages/gcc/4.9.4/version.desc
index e69de29b..d44e333b 100644
--- a/packages/gcc/4.9.4/version.desc
+++ b/packages/gcc/4.9.4/version.desc
@@ -0,0 +1 @@
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gcc/5.4.0/version.desc b/packages/gcc/5.4.0/version.desc
index e69de29b..d44e333b 100644
--- a/packages/gcc/5.4.0/version.desc
+++ b/packages/gcc/5.4.0/version.desc
@@ -0,0 +1 @@
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gcc/package.desc b/packages/gcc/package.desc
index dc49186e..0bfc71bf 100644
--- a/packages/gcc/package.desc
+++ b/packages/gcc/package.desc
@@ -2,3 +2,4 @@ repository='svn svn://gcc.gnu.org/svn/gcc'
 mirrors='$(CT_Mirrors GNU gcc/gcc-${CT_GCC_VERSION}) $(CT_Mirrors sourceware gcc/releases/gcc-${CT_GCC_VERSION})'
 origin='GNU'
 milestones='4.8 4.9 4.9.2 5 6 7'
+archive_formats='.tar.xz .tar.gz'
diff --git a/packages/gdb-linaro/7.3-2011.12/version.desc b/packages/gdb-linaro/7.3-2011.12/version.desc
index fcfe3891..a114052d 100644
--- a/packages/gdb-linaro/7.3-2011.12/version.desc
+++ b/packages/gdb-linaro/7.3-2011.12/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2'
diff --git a/packages/gdb-linaro/7.4-2012.06/version.desc b/packages/gdb-linaro/7.4-2012.06/version.desc
index fcfe3891..a114052d 100644
--- a/packages/gdb-linaro/7.4-2012.06/version.desc
+++ b/packages/gdb-linaro/7.4-2012.06/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2'
diff --git a/packages/gdb-linaro/7.5-2012.12/version.desc b/packages/gdb-linaro/7.5-2012.12/version.desc
index fcfe3891..a114052d 100644
--- a/packages/gdb-linaro/7.5-2012.12/version.desc
+++ b/packages/gdb-linaro/7.5-2012.12/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2'
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 fcfe3891..a114052d 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,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2'
diff --git a/packages/gdb-linaro/7.7-2014.05/version.desc b/packages/gdb-linaro/7.7-2014.05/version.desc
index fcfe3891..a114052d 100644
--- a/packages/gdb-linaro/7.7-2014.05/version.desc
+++ b/packages/gdb-linaro/7.7-2014.05/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2'
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 fcfe3891..a114052d 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,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2'
diff --git a/packages/gdb-linaro/package.desc b/packages/gdb-linaro/package.desc
index f5ed8fac..bc11a178 100644
--- a/packages/gdb-linaro/package.desc
+++ b/packages/gdb-linaro/package.desc
@@ -3,3 +3,4 @@ repository='git https://git.linaro.org/toolchain/binutils-gdb.git'
 mirrors='$(CT_Mirrors Linaro gdb ${CT_GDB_LINARO_VERSION})'
 origin='Linaro'
 experimental='yes'
+archive_formats='.tar.xz'
diff --git a/packages/gdb/6.8a/version.desc b/packages/gdb/6.8a/version.desc
index fcfe3891..f26b5a26 100644
--- a/packages/gdb/6.8a/version.desc
+++ b/packages/gdb/6.8a/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gdb/7.0.1a/version.desc b/packages/gdb/7.0.1a/version.desc
index fcfe3891..f26b5a26 100644
--- a/packages/gdb/7.0.1a/version.desc
+++ b/packages/gdb/7.0.1a/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gdb/7.0a/version.desc b/packages/gdb/7.0a/version.desc
index fcfe3891..f26b5a26 100644
--- a/packages/gdb/7.0a/version.desc
+++ b/packages/gdb/7.0a/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gdb/7.1a/version.desc b/packages/gdb/7.1a/version.desc
index fcfe3891..f26b5a26 100644
--- a/packages/gdb/7.1a/version.desc
+++ b/packages/gdb/7.1a/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gdb/7.2a/version.desc b/packages/gdb/7.2a/version.desc
index fcfe3891..f26b5a26 100644
--- a/packages/gdb/7.2a/version.desc
+++ b/packages/gdb/7.2a/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gdb/7.3.1/version.desc b/packages/gdb/7.3.1/version.desc
index fcfe3891..f26b5a26 100644
--- a/packages/gdb/7.3.1/version.desc
+++ b/packages/gdb/7.3.1/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gdb/7.4.1/version.desc b/packages/gdb/7.4.1/version.desc
index fcfe3891..f26b5a26 100644
--- a/packages/gdb/7.4.1/version.desc
+++ b/packages/gdb/7.4.1/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gdb/7.5.1/version.desc b/packages/gdb/7.5.1/version.desc
index fcfe3891..f26b5a26 100644
--- a/packages/gdb/7.5.1/version.desc
+++ b/packages/gdb/7.5.1/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gdb/7.6.1/version.desc b/packages/gdb/7.6.1/version.desc
index fcfe3891..f26b5a26 100644
--- a/packages/gdb/7.6.1/version.desc
+++ b/packages/gdb/7.6.1/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gdb/7.7.1/version.desc b/packages/gdb/7.7.1/version.desc
index fcfe3891..f26b5a26 100644
--- a/packages/gdb/7.7.1/version.desc
+++ b/packages/gdb/7.7.1/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/gdb/package.desc b/packages/gdb/package.desc
index e6120f24..0ca1dc6c 100644
--- a/packages/gdb/package.desc
+++ b/packages/gdb/package.desc
@@ -2,3 +2,4 @@ origin='GNU'
 repository='git git://sourceware.org/git/binutils-gdb.git'
 mirrors='$(CT_Mirrors GNU gdb) $(CT_Mirrors sourceware gdb/releases)'
 milestones='7.0 7.2 8.0'
+archive_formats='.tar.xz .tar.gz'
diff --git a/packages/gettext/package.desc b/packages/gettext/package.desc
index 065e790c..ad23b162 100644
--- a/packages/gettext/package.desc
+++ b/packages/gettext/package.desc
@@ -3,3 +3,4 @@ repository='git https://git.savannah.gnu.org/git/gettext.git'
 # a separate package and depend on it in case of devel builds?
 bootstrap='./autogen.sh'
 mirrors='$(CT_Mirrors GNU gettext)'
+archive_formats='.tar.xz .tar.lz .tar.gz'
diff --git a/packages/glibc-linaro/package.desc b/packages/glibc-linaro/package.desc
index 91195f4b..7c455d4d 100644
--- a/packages/glibc-linaro/package.desc
+++ b/packages/glibc-linaro/package.desc
@@ -3,3 +3,4 @@ origin='Linaro'
 repository='git https://git.linaro.org/toolchain/glibc.git'
 mirrors='$(CT_Mirrors Linaro glibc ${CT_GLIBC_LINARO_VERSION})'
 experimental='yes'
+archive_formats='.tar.xz'
diff --git a/packages/glibc-ports/2.12.1/version.desc b/packages/glibc-ports/2.12.1/version.desc
index e69de29b..d44e333b 100644
--- a/packages/glibc-ports/2.12.1/version.desc
+++ b/packages/glibc-ports/2.12.1/version.desc
@@ -0,0 +1 @@
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/glibc-ports/2.13/version.desc b/packages/glibc-ports/2.13/version.desc
index e69de29b..d44e333b 100644
--- a/packages/glibc-ports/2.13/version.desc
+++ b/packages/glibc-ports/2.13/version.desc
@@ -0,0 +1 @@
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/glibc-ports/package.desc b/packages/glibc-ports/package.desc
index 4f7e7ac0..566e10a7 100644
--- a/packages/glibc-ports/package.desc
+++ b/packages/glibc-ports/package.desc
@@ -6,3 +6,5 @@ mirrors='$(CT_Mirrors GNU glibc) $(CT_Mirrors sourceware glibc/releases)'
 
 # Version of this package must be the same as the glibc's
 versionlocked='glibc'
+
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/glibc/package.desc b/packages/glibc/package.desc
index bef0c1d7..8669d666 100644
--- a/packages/glibc/package.desc
+++ b/packages/glibc/package.desc
@@ -2,3 +2,4 @@ origin='GNU'
 repository='git git://sourceware.org/git/glibc.git'
 mirrors='$(CT_Mirrors GNU glibc) $(CT_Mirrors sourceware glibc/releases)'
 milestones='2.17 2.20 2.23 2.24'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/gmp/4.3.2/version.desc b/packages/gmp/4.3.2/version.desc
index fcfe3891..a114052d 100644
--- a/packages/gmp/4.3.2/version.desc
+++ b/packages/gmp/4.3.2/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2'
diff --git a/packages/gmp/5.0.2/110-get-mpn_sub_1-size-argument-right.patch b/packages/gmp/5.0.5/110-get-mpn_sub_1-size-argument-right.patch
similarity index 100%
rename from packages/gmp/5.0.2/110-get-mpn_sub_1-size-argument-right.patch
rename to packages/gmp/5.0.5/110-get-mpn_sub_1-size-argument-right.patch
diff --git a/packages/gmp/5.0.2/120-fix-r0-clobbering-issue.patch b/packages/gmp/5.0.5/120-fix-r0-clobbering-issue.patch
similarity index 100%
rename from packages/gmp/5.0.2/120-fix-r0-clobbering-issue.patch
rename to packages/gmp/5.0.5/120-fix-r0-clobbering-issue.patch
diff --git a/packages/gmp/5.0.5/version.desc b/packages/gmp/5.0.5/version.desc
new file mode 100644
index 00000000..c898e113
--- /dev/null
+++ b/packages/gmp/5.0.5/version.desc
@@ -0,0 +1,2 @@
+obsolete='yes'
+archive_formats='.tar.xz .tar.bz2'
diff --git a/packages/gmp/package.desc b/packages/gmp/package.desc
index eed0d3ca..f7dd3da2 100644
--- a/packages/gmp/package.desc
+++ b/packages/gmp/package.desc
@@ -1,4 +1,5 @@
 repository='hg https://gmplib.org/repo/gmp/'
 bootstrap='./.bootstrap'
-mirrors='https://gmplib.org/download/gmp $(CT_Mirrors GNU gmp)'
+mirrors='https://gmplib.org/download/gmp https:////gmplib.org/download/gmp/archive $(CT_Mirrors GNU gmp)'
 milestones='5.1'
+archive_formats='.tar.xz .tar.lz .tar.bz2'
diff --git a/packages/isl/0.11.1/version.desc b/packages/isl/0.11.1/version.desc
deleted file mode 100644
index fcfe3891..00000000
--- a/packages/isl/0.11.1/version.desc
+++ /dev/null
@@ -1 +0,0 @@
-obsolete='yes'
diff --git a/packages/isl/0.11.2/version.desc b/packages/isl/0.11.2/version.desc
new file mode 100644
index 00000000..f96c4929
--- /dev/null
+++ b/packages/isl/0.11.2/version.desc
@@ -0,0 +1,2 @@
+obsolete='yes'
+archive_formats='.tar.lzma .tar.bz2 .tar.gz'
diff --git a/packages/isl/0.12.2/version.desc b/packages/isl/0.12.2/version.desc
index fcfe3891..f96c4929 100644
--- a/packages/isl/0.12.2/version.desc
+++ b/packages/isl/0.12.2/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.lzma .tar.bz2 .tar.gz'
diff --git a/packages/gmp/5.0.2/version.desc b/packages/isl/0.14.1/version.desc
similarity index 100%
rename from packages/gmp/5.0.2/version.desc
rename to packages/isl/0.14.1/version.desc
diff --git a/packages/isl/0.14/version.desc b/packages/isl/0.14/version.desc
deleted file mode 100644
index fcfe3891..00000000
--- a/packages/isl/0.14/version.desc
+++ /dev/null
@@ -1 +0,0 @@
-obsolete='yes'
diff --git a/packages/isl/package.desc b/packages/isl/package.desc
index 1efde402..727bd303 100644
--- a/packages/isl/package.desc
+++ b/packages/isl/package.desc
@@ -2,3 +2,4 @@ repository='git git://repo.or.cz/isl.git'
 bootstrap='./autogen.sh'
 mirrors='http://isl.gforge.inria.fr'
 milestones='0.12 0.13 0.14 0.15'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/libelf/package.desc b/packages/libelf/package.desc
index 4720cd41..e809220a 100644
--- a/packages/libelf/package.desc
+++ b/packages/libelf/package.desc
@@ -1,3 +1,4 @@
 # FIXME No public repository and no new releases.
 # Consider switching to/adding project elftoolchain?
 mirrors='http://www.mr511.de/software'
+archive_formats='.tar.gz'
diff --git a/packages/libiconv/package.desc b/packages/libiconv/package.desc
index f75054a6..c80182d8 100644
--- a/packages/libiconv/package.desc
+++ b/packages/libiconv/package.desc
@@ -3,3 +3,4 @@ repository='git https://git.savannah.gnu.org/git/libiconv.git'
 # a separate package and depend on it in case of devel builds?
 bootstrap='./autogen.sh'
 mirrors='$(CT_Mirrors GNU libiconv)'
+archive_formats='.tar.gz'
diff --git a/packages/libtool/package.desc b/packages/libtool/package.desc
index 7338f843..ad15cfde 100644
--- a/packages/libtool/package.desc
+++ b/packages/libtool/package.desc
@@ -1,3 +1,4 @@
 repository='git git://git.savannah.gnu.org/libtool.git'
 bootstrap='./bootstrap'
 mirrors='$(CT_Mirrors GNU libtool)'
+archive_formats='.tar.xz .tar.gz'
diff --git a/packages/linux/2.6.32.27/version.desc b/packages/linux/2.6.32.27/version.desc
index 3475dc2b..11994567 100644
--- a/packages/linux/2.6.32.27/version.desc
+++ b/packages/linux/2.6.32.27/version.desc
@@ -1 +1,2 @@
 # Not obsolete: used by CentOS6.x, EOL 11/2020
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/2.6.33.7/version.desc b/packages/linux/2.6.33.7/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/2.6.33.7/version.desc
+++ b/packages/linux/2.6.33.7/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/2.6.34.7/version.desc b/packages/linux/2.6.34.7/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/2.6.34.7/version.desc
+++ b/packages/linux/2.6.34.7/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/2.6.35.9/version.desc b/packages/linux/2.6.35.9/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/2.6.35.9/version.desc
+++ b/packages/linux/2.6.35.9/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/2.6.36.4/version.desc b/packages/linux/2.6.36.4/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/2.6.36.4/version.desc
+++ b/packages/linux/2.6.36.4/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/2.6.37.6/version.desc b/packages/linux/2.6.37.6/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/2.6.37.6/version.desc
+++ b/packages/linux/2.6.37.6/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/2.6.38.8/version.desc b/packages/linux/2.6.38.8/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/2.6.38.8/version.desc
+++ b/packages/linux/2.6.38.8/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/2.6.39.4/version.desc b/packages/linux/2.6.39.4/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/2.6.39.4/version.desc
+++ b/packages/linux/2.6.39.4/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.0.101/version.desc b/packages/linux/3.0.101/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/3.0.101/version.desc
+++ b/packages/linux/3.0.101/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.1.10/version.desc b/packages/linux/3.1.10/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/3.1.10/version.desc
+++ b/packages/linux/3.1.10/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.10.107/version.desc b/packages/linux/3.10.107/version.desc
index 7c0a082a..19c9b2ee 100644
--- a/packages/linux/3.10.107/version.desc
+++ b/packages/linux/3.10.107/version.desc
@@ -1 +1,2 @@
 # Not obsolete: used by CentOS7.x, EOL 06/2024
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.11.10/version.desc b/packages/linux/3.11.10/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/3.11.10/version.desc
+++ b/packages/linux/3.11.10/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.12.74/version.desc b/packages/linux/3.12.74/version.desc
index e69de29b..6d5245de 100644
--- a/packages/linux/3.12.74/version.desc
+++ b/packages/linux/3.12.74/version.desc
@@ -0,0 +1 @@
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.13.11/version.desc b/packages/linux/3.13.11/version.desc
index 89c1908b..64b2fdfe 100644
--- a/packages/linux/3.13.11/version.desc
+++ b/packages/linux/3.13.11/version.desc
@@ -1 +1,2 @@
 # Not obsolete: used by Ubuntu14.04, EOL 04/2019
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.14.79/version.desc b/packages/linux/3.14.79/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/3.14.79/version.desc
+++ b/packages/linux/3.14.79/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.15.10/version.desc b/packages/linux/3.15.10/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/3.15.10/version.desc
+++ b/packages/linux/3.15.10/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.16.46/version.desc b/packages/linux/3.16.46/version.desc
index e69de29b..6d5245de 100644
--- a/packages/linux/3.16.46/version.desc
+++ b/packages/linux/3.16.46/version.desc
@@ -0,0 +1 @@
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.17.8/version.desc b/packages/linux/3.17.8/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/3.17.8/version.desc
+++ b/packages/linux/3.17.8/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.18.66/version.desc b/packages/linux/3.18.66/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/3.18.66/version.desc
+++ b/packages/linux/3.18.66/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.19.8/version.desc b/packages/linux/3.19.8/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/3.19.8/version.desc
+++ b/packages/linux/3.19.8/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.2.93/version.desc b/packages/linux/3.2.93/version.desc
index e69de29b..6d5245de 100644
--- a/packages/linux/3.2.93/version.desc
+++ b/packages/linux/3.2.93/version.desc
@@ -0,0 +1 @@
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.3.8/version.desc b/packages/linux/3.3.8/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/3.3.8/version.desc
+++ b/packages/linux/3.3.8/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.4.113/version.desc b/packages/linux/3.4.113/version.desc
index e69de29b..6d5245de 100644
--- a/packages/linux/3.4.113/version.desc
+++ b/packages/linux/3.4.113/version.desc
@@ -0,0 +1 @@
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.5.7/version.desc b/packages/linux/3.5.7/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/3.5.7/version.desc
+++ b/packages/linux/3.5.7/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.6.11/version.desc b/packages/linux/3.6.11/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/3.6.11/version.desc
+++ b/packages/linux/3.6.11/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.7.10/version.desc b/packages/linux/3.7.10/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/3.7.10/version.desc
+++ b/packages/linux/3.7.10/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.8.13/version.desc b/packages/linux/3.8.13/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/3.8.13/version.desc
+++ b/packages/linux/3.8.13/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.9.11/version.desc b/packages/linux/3.9.11/version.desc
index fcfe3891..40f81bc2 100644
--- a/packages/linux/3.9.11/version.desc
+++ b/packages/linux/3.9.11/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/package.desc b/packages/linux/package.desc
index 4596f4c4..2ea57330 100644
--- a/packages/linux/package.desc
+++ b/packages/linux/package.desc
@@ -2,3 +2,4 @@ repository='git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
 mirrors='$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})'
 relevantpattern='2.*.*|. *.*|.'
 milestones='3.2'
+archive_formats='.tar.xz .tar.gz'
diff --git a/packages/ltrace/0.5.3/version.desc b/packages/ltrace/0.5.3/version.desc
index fcfe3891..17de7cf0 100644
--- a/packages/ltrace/0.5.3/version.desc
+++ b/packages/ltrace/0.5.3/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.gz'
diff --git a/packages/ltrace/package.desc b/packages/ltrace/package.desc
index 475c56b2..df0bdda3 100644
--- a/packages/ltrace/package.desc
+++ b/packages/ltrace/package.desc
@@ -3,3 +3,4 @@ bootstrap='./autogen.sh'
 mirrors='http://ftp.debian.org/debian/pool/main/l/ltrace ftp:://ftp.debian.org/debian/pool/main/l/ltrace'
 archive_filename='@{pkg_name}_@{version}.orig'
 archive_dirname='@{pkg_name}-@{version}'
+archive_formats='.tar.bz2'
diff --git a/packages/m4/package.desc b/packages/m4/package.desc
index 6615cdca..eefb1799 100644
--- a/packages/m4/package.desc
+++ b/packages/m4/package.desc
@@ -1,3 +1,4 @@
 repository='git git://git.sv.gnu.org/m4'
 bootstrap='./bootstrap'
 mirrors='$(CT_Mirrors GNU m4)'
+archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/make/package.desc b/packages/make/package.desc
index 9eb9d078..8cb9ada6 100644
--- a/packages/make/package.desc
+++ b/packages/make/package.desc
@@ -1,3 +1,4 @@
 repository='git https://git.savannah.gnu.org/git/make.git'
 bootstrap='autoreconf -i'
 mirrors='$(CT_Mirrors GNU make)'
+archive_formats='.tar.bz2 .tar.gz'
diff --git a/packages/mingw-w64/package.desc b/packages/mingw-w64/package.desc
index 1b6086cc..12cb4f2b 100644
--- a/packages/mingw-w64/package.desc
+++ b/packages/mingw-w64/package.desc
@@ -1,3 +1,4 @@
 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/'
 milestones='v4'
+archive_formats='.tar.bz2 .zip'
diff --git a/packages/mingw-w64/v2.0.9/100-mingw64-malloc.patch b/packages/mingw-w64/v2.0.10/100-mingw64-malloc.patch
similarity index 100%
rename from packages/mingw-w64/v2.0.9/100-mingw64-malloc.patch
rename to packages/mingw-w64/v2.0.10/100-mingw64-malloc.patch
diff --git a/packages/mingw-w64/v2.0.10/version.desc b/packages/mingw-w64/v2.0.10/version.desc
new file mode 100644
index 00000000..17de7cf0
--- /dev/null
+++ b/packages/mingw-w64/v2.0.10/version.desc
@@ -0,0 +1,2 @@
+obsolete='yes'
+archive_formats='.tar.gz'
diff --git a/packages/mingw-w64/v2.0.9/version.desc b/packages/mingw-w64/v2.0.9/version.desc
deleted file mode 100644
index fcfe3891..00000000
--- a/packages/mingw-w64/v2.0.9/version.desc
+++ /dev/null
@@ -1 +0,0 @@
-obsolete='yes'
diff --git a/packages/mingw-w64/v3.0.0/version.desc b/packages/mingw-w64/v3.0.0/version.desc
index fcfe3891..a114052d 100644
--- a/packages/mingw-w64/v3.0.0/version.desc
+++ b/packages/mingw-w64/v3.0.0/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2'
diff --git a/packages/mingw-w64/v3.1.0/version.desc b/packages/mingw-w64/v3.1.0/version.desc
index fcfe3891..a114052d 100644
--- a/packages/mingw-w64/v3.1.0/version.desc
+++ b/packages/mingw-w64/v3.1.0/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2'
diff --git a/packages/mingw-w64/v3.2.0/version.desc b/packages/mingw-w64/v3.2.0/version.desc
index fcfe3891..a114052d 100644
--- a/packages/mingw-w64/v3.2.0/version.desc
+++ b/packages/mingw-w64/v3.2.0/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2'
diff --git a/packages/mingw-w64/v3.3.0/version.desc b/packages/mingw-w64/v3.3.0/version.desc
index fcfe3891..a114052d 100644
--- a/packages/mingw-w64/v3.3.0/version.desc
+++ b/packages/mingw-w64/v3.3.0/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2'
diff --git a/packages/mpc/package.desc b/packages/mpc/package.desc
index 8eba114a..d7165773 100644
--- a/packages/mpc/package.desc
+++ b/packages/mpc/package.desc
@@ -1,3 +1,7 @@
 repository='git https://scm.gforge.inria.fr/anonscm/git/mpc/mpc.git'
 bootstrap='autoreconf -i'
+
+# TBD older releases (0.x) missing on GNU mirrors, retire them?
 mirrors='http://www.multiprecision.org/mpc/download $(CT_Mirrors GNU mpc)'
+
+archive_formats='.tar.gz'
diff --git a/packages/mpfr/package.desc b/packages/mpfr/package.desc
index afab5e5a..59cb5d4a 100644
--- a/packages/mpfr/package.desc
+++ b/packages/mpfr/package.desc
@@ -2,3 +2,4 @@ repository='svn https://scm.gforge.inria.fr/anonscm/svn/mpfr'
 # TBD: meta-package autoconf-archive to install extra m4's
 bootstrap='wget -O m4/ax_pthread.m4 \\"http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_pthread.m4\\" && ./autogen.sh'
 mirrors='http://www.mpfr.org/mpfr-${CT_MPFR_VERSION} $(CT_Mirrors GNU mpfr)'
+archive_formats='.tar.xz .tar.bz2 .tar.gz .zip'
diff --git a/packages/musl/package.desc b/packages/musl/package.desc
index f1b73dce..3dac0d19 100644
--- a/packages/musl/package.desc
+++ b/packages/musl/package.desc
@@ -1,2 +1,3 @@
 repository='git git://git.musl-libc.org/musl'
 mirrors='http://www.musl-libc.org/releases'
+archive_formats='.tar.gz'
diff --git a/packages/ncurses/package.desc b/packages/ncurses/package.desc
index bb5646d5..0243856e 100644
--- a/packages/ncurses/package.desc
+++ b/packages/ncurses/package.desc
@@ -1,2 +1,3 @@
 # No public repository for ncurses
 mirrors='ftp://invisible-island.net/ncurses $(CT_Mirrors GNU ncurses)'
+archive_formats='.tar.gz'
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 fcfe3891..a114052d 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,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2'
diff --git a/packages/newlib-linaro/package.desc b/packages/newlib-linaro/package.desc
index a11646d2..bc92a5b5 100644
--- a/packages/newlib-linaro/package.desc
+++ b/packages/newlib-linaro/package.desc
@@ -3,3 +3,4 @@ master='newlib'
 repository='git https://git.linaro.org/toolchain/newlib.git'
 mirrors='$(CT_Mirrors Linaro newlib ${CT_NEWLIB_LINARO_VERSION})'
 experimental='yes'
+archive_formats='.tar.xz'
diff --git a/packages/newlib/package.desc b/packages/newlib/package.desc
index 523bd47f..5d09a777 100644
--- a/packages/newlib/package.desc
+++ b/packages/newlib/package.desc
@@ -3,3 +3,4 @@ repository='git git://sourceware.org/git/newlib-cygwin.git'
 mirrors='ftp://sourceware.org/pub/newlib'
 milestones='2.0 2.1 2.2'
 relevantpattern='*.*.*|.'
+archive_formats='.tar.gz'
diff --git a/packages/strace/4.5.20/version.desc b/packages/strace/4.5.20/version.desc
index fcfe3891..a114052d 100644
--- a/packages/strace/4.5.20/version.desc
+++ b/packages/strace/4.5.20/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_formats='.tar.bz2'
diff --git a/packages/strace/package.desc b/packages/strace/package.desc
index 7b035c24..8d5f2c61 100644
--- a/packages/strace/package.desc
+++ b/packages/strace/package.desc
@@ -1,3 +1,4 @@
 repository='git https://git.code.sf.net/p/strace/code'
 bootstrap='./bootstrap'
 mirrors='http://downloads.sourceforge.net/project/strace/strace/${CT_STRACE_VERSION}'
+archive_formats='.tar.xz'
diff --git a/packages/uClibc-ng/package.desc b/packages/uClibc-ng/package.desc
index f03bd804..ee37b57f 100644
--- a/packages/uClibc-ng/package.desc
+++ b/packages/uClibc-ng/package.desc
@@ -2,3 +2,4 @@ master='uClibc'
 origin='uclibc-ng.org'
 repository='git git://uclibc-ng.org/git/uclibc-ng'
 mirrors='http://downloads.uclibc-ng.org/releases/${CT_UCLIBC_NG_VERSION}'
+archive_formats='.tar.xz .tar.lz .tar.bz2 .tar.gz'
diff --git a/packages/uClibc/package.desc b/packages/uClibc/package.desc
index 887e4c26..d7f15df4 100644
--- a/packages/uClibc/package.desc
+++ b/packages/uClibc/package.desc
@@ -5,3 +5,4 @@ origin='uclibc.org'
 repository='git git://git.busybox.net/uClibc'
 mirrors='http://www.uclibc.org/downloads http://www.uclibc.org/downloads/old-releases'
 milestones='0.9.33.2 1.0.0 1.0.15'
+archive_formats='.tar.xz .tar.bz2'
diff --git a/packages/zlib/package.desc b/packages/zlib/package.desc
index 789f3c7a..c80915a8 100644
--- a/packages/zlib/package.desc
+++ b/packages/zlib/package.desc
@@ -1,2 +1,3 @@
 repository='git https://github.com/madler/zlib.git'
 mirrors='http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION}'
+archive_formats='.tar.xz .tar.gz .zip'
diff --git a/scripts/functions b/scripts/functions
index ed8eb677..ba2e0627 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -624,6 +624,7 @@ CT_DoListTarballExt()
 {
     printf ".tar.xz\n"
     printf ".tar.lzma\n"
+    printf ".tar.lz\n"
     printf ".tar.bz2\n"
     printf ".tar.gz\n.tgz\n"
     printf ".tar\n"
@@ -1806,6 +1807,9 @@ CT_Extract()
         *.tar.lzma)
             xz -fdc "${file}" | CT_DoExecLog FILE tar x -v -f - -C "${dir}" ${components}
             ;;
+        *.tar.lz)
+            lzip -fdc "${file}" | CT_DoExecLog FILE tar x -v -f - -C "${dir}" ${components}
+            ;;
         *.tar.bz2)
             bzip2 -dc "${file}" | CT_DoExecLog FILE tar x -v -f - -C "${dir}" ${components}
             ;;