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: Record tarball formats

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

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

diff --git a/packages/android-ndk/package.desc b/packages/android-ndk/package.desc
index c51775b..5be8222 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 e69de29..6d5245d 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 29d6351..af39172 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 0191968..a624d49 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 8976862..9161c74 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 fcfe389..a114052 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 ea5dc66..eb994a7 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 fcfe389..f26b5a2 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 fcfe389..f26b5a2 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 fcfe389..f26b5a2 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 e69de29..d44e333 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 e69de29..d44e333 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 cb98707..962ed58 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 333a45c..2a12994 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 0abd534..13f637f 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 585ce5e..6a541b3 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 1731843..fd475c1 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 fcfe389..f26b5a2 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 e69de29..d44e333 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 e69de29..d44e333 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 dc49186..0bfc71b 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 fcfe389..a114052 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 fcfe389..a114052 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 fcfe389..a114052 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 fcfe389..a114052 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 fcfe389..a114052 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 fcfe389..a114052 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 f5ed8fa..bc11a17 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 fcfe389..f26b5a2 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 fcfe389..f26b5a2 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 fcfe389..f26b5a2 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 fcfe389..f26b5a2 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 fcfe389..f26b5a2 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 fcfe389..f26b5a2 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 fcfe389..f26b5a2 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 fcfe389..f26b5a2 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 fcfe389..f26b5a2 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 fcfe389..f26b5a2 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 e6120f2..0ca1dc6 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 065e790..ad23b16 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 91195f4..7c455d4 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 e69de29..d44e333 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 e69de29..d44e333 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 4f7e7ac..566e10a 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 bef0c1d..8669d66 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 fcfe389..a114052 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.2/110-get-mpn_sub_1-size-argument-right.patch
deleted file mode 100644
index 2e0a1af..0000000
--- a/packages/gmp/5.0.2/110-get-mpn_sub_1-size-argument-right.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1310730221 -7200
-# Node ID 538dfce27f410b910d5e2f011119269e224d16a3
-# Parent  03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366
-(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right.
-
-diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c
---- a/mpn/generic/dcpi1_bdiv_q.c	Thu Jun 16 12:22:24 2011 +0200
-+++ b/mpn/generic/dcpi1_bdiv_q.c	Fri Jul 15 13:43:41 2011 +0200
-@@ -7,7 +7,7 @@
-    SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
-    GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
- 
--Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
-+Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
- 
- This file is part of the GNU MP Library.
- 
-@@ -28,7 +28,6 @@
- #include "gmp-impl.h"
- 
- 
--
- mp_size_t
- mpn_dcpi1_bdiv_q_n_itch (mp_size_t n)
- {
-@@ -130,7 +129,7 @@
-       qn = nn - qn;
-       while (qn > dn)
- 	{
--	  mpn_sub_1 (np + dn, np + dn, qn, cy);
-+	  mpn_sub_1 (np + dn, np + dn, qn - dn, cy);
- 	  cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp);
- 	  qp += dn;
- 	  np += dn;
-
diff --git a/packages/gmp/5.0.2/120-fix-r0-clobbering-issue.patch b/packages/gmp/5.0.2/120-fix-r0-clobbering-issue.patch
deleted file mode 100644
index d12d6b2..0000000
--- a/packages/gmp/5.0.2/120-fix-r0-clobbering-issue.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Removed ChangeLog part
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1342891151 -7200
-# Node ID 829215e83ff1db3cd00e510a737092df691442d5
-# Parent  816c18dbd492050ef8892e91602d9e758abc2988
-Fix r0 clobbering issue with "large" code affecting elf+darwin PIC.
-
-diff -r 816c18dbd492 -r 829215e83ff1 mpn/powerpc32/vmx/mod_34lsub1.asm
---- a/mpn/powerpc32/vmx/mod_34lsub1.asm	Tue Jun 19 15:02:48 2012 +0200
-+++ b/mpn/powerpc32/vmx/mod_34lsub1.asm	Sat Jul 21 19:19:11 2012 +0200
-@@ -1,6 +1,7 @@
- dnl  PowerPC-32 mpn_mod_34lsub1 -- mpn remainder mod 2^24-1.
- 
--dnl  Copyright 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
-+dnl  Copyright 2002, 2003, 2005, 2006, 2007, 2012 Free Software Foundation,
-+dnl  Inc.
- 
- dnl  This file is part of the GNU MP Library.
- 
-@@ -135,15 +136,15 @@
- 
- 	andi.	r7, up, 15
- 	vxor	a0, v0, v0
--	lis	r0, 0xaaaa
-+	lis	r9, 0xaaaa
- 	vxor	a1, v0, v0
--	ori	r0, r0, 0xaaab
-+	ori	r9, r9, 0xaaab
- 	vxor	a2, v0, v0
- 	li	r5, 16
- 	vxor	c0, v0, v0
- 	li	r6, 32
- 	vxor	c1, v0, v0
--	LEAL(	r11, cnsts)
-+	LEAL(	r11, cnsts)		C CAUTION clobbers r0 for elf, darwin
- 	vxor	c2, v0, v0
- 	vxor	z, v0, v0
- 
-@@ -158,7 +159,7 @@
- 	vsldoi	a2, z, a2, 12
- 
- 	addi	n, n, 9
--	mulhwu	r0, n, r0
-+	mulhwu	r0, n, r9
- 	srwi	r0, r0, 3		C r0 = floor(n/12)
- 	mtctr	r0
- 
-@@ -174,7 +175,7 @@
- 	vsldoi	a1, z, a1, 8
- 
- 	addi	n, n, 6
--	mulhwu	r0, n, r0
-+	mulhwu	r0, n, r9
- 	srwi	r0, r0, 3		C r0 = floor(n/12)
- 	mtctr	r0
- 
-@@ -188,7 +189,7 @@
- 	vsldoi	a0, z, a0, 4
- 
- 	addi	n, n, 3
--	mulhwu	r0, n, r0
-+	mulhwu	r0, n, r9
- 	srwi	r0, r0, 3		C r0 = floor(n/12)
- 	mtctr	r0
- 
-@@ -197,7 +198,7 @@
- 	b	L(0)
- 
- L(aligned16):
--	mulhwu	r0, n, r0
-+	mulhwu	r0, n, r9
- 	srwi	r0, r0, 3		C r0 = floor(n/12)
- 	mtctr	r0
- 
-
diff --git a/packages/gmp/5.0.2/version.desc b/packages/gmp/5.0.2/version.desc
deleted file mode 100644
index fcfe389..0000000
--- a/packages/gmp/5.0.2/version.desc
+++ /dev/null
@@ -1 +0,0 @@
-obsolete='yes'
diff --git a/packages/gmp/5.0.5/110-get-mpn_sub_1-size-argument-right.patch b/packages/gmp/5.0.5/110-get-mpn_sub_1-size-argument-right.patch
new file mode 100644
index 0000000..2e0a1af
--- /dev/null
+++ b/packages/gmp/5.0.5/110-get-mpn_sub_1-size-argument-right.patch
@@ -0,0 +1,38 @@
+
+# HG changeset patch
+# User Torbjorn Granlund <tege@gmplib.org>
+# Date 1310730221 -7200
+# Node ID 538dfce27f410b910d5e2f011119269e224d16a3
+# Parent  03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366
+(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right.
+
+diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c
+--- a/mpn/generic/dcpi1_bdiv_q.c	Thu Jun 16 12:22:24 2011 +0200
++++ b/mpn/generic/dcpi1_bdiv_q.c	Fri Jul 15 13:43:41 2011 +0200
+@@ -7,7 +7,7 @@
+    SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
+    GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
+ 
+-Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
++Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
+ 
+ This file is part of the GNU MP Library.
+ 
+@@ -28,7 +28,6 @@
+ #include "gmp-impl.h"
+ 
+ 
+-
+ mp_size_t
+ mpn_dcpi1_bdiv_q_n_itch (mp_size_t n)
+ {
+@@ -130,7 +129,7 @@
+       qn = nn - qn;
+       while (qn > dn)
+ 	{
+-	  mpn_sub_1 (np + dn, np + dn, qn, cy);
++	  mpn_sub_1 (np + dn, np + dn, qn - dn, cy);
+ 	  cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp);
+ 	  qp += dn;
+ 	  np += dn;
+
diff --git a/packages/gmp/5.0.5/120-fix-r0-clobbering-issue.patch b/packages/gmp/5.0.5/120-fix-r0-clobbering-issue.patch
new file mode 100644
index 0000000..d12d6b2
--- /dev/null
+++ b/packages/gmp/5.0.5/120-fix-r0-clobbering-issue.patch
@@ -0,0 +1,77 @@
+Removed ChangeLog part
+
+# HG changeset patch
+# User Torbjorn Granlund <tege@gmplib.org>
+# Date 1342891151 -7200
+# Node ID 829215e83ff1db3cd00e510a737092df691442d5
+# Parent  816c18dbd492050ef8892e91602d9e758abc2988
+Fix r0 clobbering issue with "large" code affecting elf+darwin PIC.
+
+diff -r 816c18dbd492 -r 829215e83ff1 mpn/powerpc32/vmx/mod_34lsub1.asm
+--- a/mpn/powerpc32/vmx/mod_34lsub1.asm	Tue Jun 19 15:02:48 2012 +0200
++++ b/mpn/powerpc32/vmx/mod_34lsub1.asm	Sat Jul 21 19:19:11 2012 +0200
+@@ -1,6 +1,7 @@
+ dnl  PowerPC-32 mpn_mod_34lsub1 -- mpn remainder mod 2^24-1.
+ 
+-dnl  Copyright 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
++dnl  Copyright 2002, 2003, 2005, 2006, 2007, 2012 Free Software Foundation,
++dnl  Inc.
+ 
+ dnl  This file is part of the GNU MP Library.
+ 
+@@ -135,15 +136,15 @@
+ 
+ 	andi.	r7, up, 15
+ 	vxor	a0, v0, v0
+-	lis	r0, 0xaaaa
++	lis	r9, 0xaaaa
+ 	vxor	a1, v0, v0
+-	ori	r0, r0, 0xaaab
++	ori	r9, r9, 0xaaab
+ 	vxor	a2, v0, v0
+ 	li	r5, 16
+ 	vxor	c0, v0, v0
+ 	li	r6, 32
+ 	vxor	c1, v0, v0
+-	LEAL(	r11, cnsts)
++	LEAL(	r11, cnsts)		C CAUTION clobbers r0 for elf, darwin
+ 	vxor	c2, v0, v0
+ 	vxor	z, v0, v0
+ 
+@@ -158,7 +159,7 @@
+ 	vsldoi	a2, z, a2, 12
+ 
+ 	addi	n, n, 9
+-	mulhwu	r0, n, r0
++	mulhwu	r0, n, r9
+ 	srwi	r0, r0, 3		C r0 = floor(n/12)
+ 	mtctr	r0
+ 
+@@ -174,7 +175,7 @@
+ 	vsldoi	a1, z, a1, 8
+ 
+ 	addi	n, n, 6
+-	mulhwu	r0, n, r0
++	mulhwu	r0, n, r9
+ 	srwi	r0, r0, 3		C r0 = floor(n/12)
+ 	mtctr	r0
+ 
+@@ -188,7 +189,7 @@
+ 	vsldoi	a0, z, a0, 4
+ 
+ 	addi	n, n, 3
+-	mulhwu	r0, n, r0
++	mulhwu	r0, n, r9
+ 	srwi	r0, r0, 3		C r0 = floor(n/12)
+ 	mtctr	r0
+ 
+@@ -197,7 +198,7 @@
+ 	b	L(0)
+ 
+ L(aligned16):
+-	mulhwu	r0, n, r0
++	mulhwu	r0, n, r9
+ 	srwi	r0, r0, 3		C r0 = floor(n/12)
+ 	mtctr	r0
+ 
+
diff --git a/packages/gmp/5.0.5/version.desc b/packages/gmp/5.0.5/version.desc
new file mode 100644
index 0000000..c898e11
--- /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 eed0d3c..f7dd3da 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 fcfe389..0000000
--- 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 0000000..f96c492
--- /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 fcfe389..f96c492 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/isl/0.14.1/version.desc b/packages/isl/0.14.1/version.desc
new file mode 100644
index 0000000..fcfe389
--- /dev/null
+++ b/packages/isl/0.14.1/version.desc
@@ -0,0 +1 @@
+obsolete='yes'
diff --git a/packages/isl/0.14/version.desc b/packages/isl/0.14/version.desc
deleted file mode 100644
index fcfe389..0000000
--- 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 1efde40..727bd30 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 4720cd4..e809220 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 f75054a..c80182d 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 7338f84..ad15cfd 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 3475dc2..1199456 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 fcfe389..40f81bc 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 fcfe389..40f81bc 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 fcfe389..40f81bc 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 fcfe389..40f81bc 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 fcfe389..40f81bc 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 fcfe389..40f81bc 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 fcfe389..40f81bc 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 fcfe389..40f81bc 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 fcfe389..40f81bc 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 7c0a082..19c9b2e 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 fcfe389..40f81bc 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 e69de29..6d5245d 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 89c1908..64b2fdf 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 fcfe389..40f81bc 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 fcfe389..40f81bc 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 e69de29..6d5245d 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 fcfe389..40f81bc 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 fcfe389..40f81bc 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 fcfe389..40f81bc 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 e69de29..6d5245d 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 fcfe389..40f81bc 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 e69de29..6d5245d 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 fcfe389..40f81bc 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 fcfe389..40f81bc 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 fcfe389..40f81bc 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 fcfe389..40f81bc 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 fcfe389..40f81bc 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 4596f4c..2ea5733 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 fcfe389..17de7cf 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 475c56b..df0bdda 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 6615cdc..eefb179 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 9eb9d07..8cb9ada 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 1b6086c..12cb4f2 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.10/100-mingw64-malloc.patch b/packages/mingw-w64/v2.0.10/100-mingw64-malloc.patch
new file mode 100644
index 0000000..d9d5a61
--- /dev/null
+++ b/packages/mingw-w64/v2.0.10/100-mingw64-malloc.patch
@@ -0,0 +1,27 @@
+diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h
+--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:20:09.000000000 -0800
++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:25:26.000000000 -0800
+@@ -26,7 +26,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
+ #include <memory.h>
+ #include <stdarg.h>
+ #include <stdint.h>
+diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c
+--- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:20:09.000000000 -0800
++++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:25:49.000000000 -0800
+@@ -21,7 +21,10 @@
+ #include "genidl_cfg.h"
+ #include "genidl_typeinfo.h"
+ #include "genidl_typinfo.h"
++#if defined(HAVE_MALLOC_H)
+ #include <malloc.h>
++#endif
++#include <stdlib.h>
+ #include <string.h>
+ #include <memory.h>
+ 
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 0000000..17de7cf
--- /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/100-mingw64-malloc.patch b/packages/mingw-w64/v2.0.9/100-mingw64-malloc.patch
deleted file mode 100644
index d9d5a61..0000000
--- a/packages/mingw-w64/v2.0.9/100-mingw64-malloc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_cfg.h	2017-03-10 16:25:26.000000000 -0800
-@@ -26,7 +26,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
- #include <memory.h>
- #include <stdarg.h>
- #include <stdint.h>
-diff -urpN mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c
---- mingw-w64-v5.0.1.orig/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:20:09.000000000 -0800
-+++ mingw-w64-v5.0.1/mingw-w64-tools/genidl/src/genidl_typinfo.c	2017-03-10 16:25:49.000000000 -0800
-@@ -21,7 +21,10 @@
- #include "genidl_cfg.h"
- #include "genidl_typeinfo.h"
- #include "genidl_typinfo.h"
-+#if defined(HAVE_MALLOC_H)
- #include <malloc.h>
-+#endif
-+#include <stdlib.h>
- #include <string.h>
- #include <memory.h>
- 
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 fcfe389..0000000
--- 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 fcfe389..a114052 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 fcfe389..a114052 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 fcfe389..a114052 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 fcfe389..a114052 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 8eba114..d716577 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 afab5e5..59cb5d4 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 f1b73dc..3dac0d1 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 bb5646d..0243856 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 fcfe389..a114052 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 a11646d..bc92a5b 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 523bd47..5d09a77 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 fcfe389..a114052 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 7b035c2..8d5f2c6 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 f03bd80..ee37b57 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 887e4c2..d7f15df 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 789f3c7..c80915a 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 ed8eb67..ba2e062 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}
             ;;
-- 
cgit v0.10.2-6-g49f6