625 files changed, 689 insertions, 1676 deletions

diff --git a/TODO b/TODO
index b48e54db..fd91244a 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,10 @@ A (slightly) ordered set of tasks for crosstool-NG. Written in a cryptic languag
 
 -- Alexey Neyman (@stilor)
 
+[ ] updates
+  [ ] linux
+  [ ] mingw-w64
+  [ ] newlib
 [ ] clean up GDB versions - no X.Y if X.Y.1 is present
   [ ] Check other packages, leave only the most recent on each branch
 [ ] arm_neon.h - offer as a companion "library" for the target
diff --git a/config/cc.in b/config/cc.in
index 81f168c9..03bc8d70 100644
--- a/config/cc.in
+++ b/config/cc.in
@@ -135,4 +135,6 @@ config CC_LANG_OTHERS
       Eg. gcc-4.1+ has a toy programming language, treelang. As it is not useful
       in real life, it is not available in the selection above.
 
+source "config/gen/cc.in.2"
+
 endmenu
diff --git a/config/cc/gcc.in b/config/cc/gcc.in
index c0feaef0..cdcda9db 100644
--- a/config/cc/gcc.in
+++ b/config/cc/gcc.in
@@ -15,412 +15,3 @@
 ## help output, and lots of other features.
 
 source "config/versions/gcc.in"
-
-# Only enable gcc's support for plugins if binutils has it as well
-# They are useful only when doing LTO, but it does no harm enabling
-# them even without LTO.
-config CC_GCC_ENABLE_PLUGINS
-    bool
-    depends on BINUTILS_PLUGINS
-    depends on ! STATIC_TOOLCHAIN
-    default y
-
-# If binutils installs gold, enable support for gold in gcc
-config CC_GCC_GOLD
-    bool
-    depends on BINUTILS_GOLD_INSTALLED
-    default y
-
-config CC_GCC_HAS_LIBMPX
-    depends on GCC_5_or_later
-    bool
-
-config CC_LANG_JAVA_USE_ECJ
-    bool
-    default y
-    depends on CC_LANG_JAVA
-
-config CC_GCC_ENABLE_CXX_FLAGS
-    string
-    prompt "Flags to pass to --enable-cxx-flags"
-    default ""
-    help
-      Enter here the value of the gcc's ./configure option --enable-cxx-flags.
-      Leave empty if you don't know better.
-      
-      Note: just pass in the option _value_, that is only the part that goes
-      after the '=' sign.
-
-config CC_GCC_CORE_EXTRA_CONFIG_ARRAY
-    string
-    prompt "Core gcc extra config"
-    default ""
-    depends on CC_CORE_PASS_1_NEEDED || CC_CORE_PASS_2_NEEDED
-    help
-      Extra flags to pass onto ./configure when configuring the core gcc.
-      
-      The core gcc is a stripped down, C-only compiler needed to build
-      the C library. Kinda bootstrap gcc, if you wish.
-      
-      You can enter multiple arguments here, and arguments can contain spaces
-      if they are properly quoted (or escaped, but prefer quotes). Eg.:
-          --with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space
-
-config CC_GCC_EXTRA_CONFIG_ARRAY
-    string
-    prompt "gcc extra config"
-    default ""
-    help
-      Extra flags to pass onto ./configure when configuring gcc.
-      
-      You can enter multiple arguments here, and arguments can contain spaces
-      if they are properly quoted (or escaped, but prefer quotes). Eg.:
-          --with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space
-
-config CC_GCC_MULTILIB_LIST
-    string
-    prompt "List of multilib variants"
-    depends on MULTILIB
-    help
-      Architecture-specific option of expanding or restricting the list of
-      the multilib variants to be built. Refer to GCC installation manual
-      for the format of this option for a particular architecture.
-      Leave empty to use the default list for this architecture.
-
-config STATIC_TOOLCHAIN
-    bool
-    select CC_GCC_STATIC_LIBSTDCXX
-
-config CC_GCC_STATIC_LIBSTDCXX
-    bool
-    prompt "Link libstdc++ statically into the gcc binary"
-    default y
-    depends on CONFIGURE_has_static_link || CANADIAN || CROSS_NATIVE
-    select WANTS_STATIC_LINK if CROSS || NATIVE
-    select WANTS_STATIC_LINK_CXX if CROSS || NATIVE
-    help
-      Newer gcc versions require some c++ libraries. So statically
-      linking libstdc++ increases the likeliness that the gcc binary will
-      run on machines other than the one which it was built on, without
-      having to worry about distributing the matching version of libstdc++
-      along with it.
-
-config CC_GCC_SYSTEM_ZLIB
-    bool
-    prompt "Use system zlib"
-    help
-      Do not use bundled zlib, and use the zlib already available for
-      the host (eg. the system library).
-
-      If zlib is built as a companion library, selecting this option
-      will use it.
-      
-      If you want to build a static toolchain, you will need to also
-      install the static version of zlib for your host.
-      
-      If unsure, say 'n'.
-
-config CC_GCC_CONFIG_TLS
-    tristate
-    prompt "Configure TLS (Thread Local Storage)"
-    default m
-    help
-      Specify that the target supports TLS (Thread Local Storage). Usually
-      configure can correctly determine if TLS is supported. In cases where
-      it guesses incorrectly, TLS can be explicitly enabled or disabled.
-      This can happen if the assembler supports TLS but the C library does
-      not, or if the assumptions made by the configure test are incorrect.
-
-       Option  | TLS use            | Associated ./configure switch
-      ---------+--------------------+--------------------------------
-         Y     | forcibly used      | --enable-tls
-         M     | auto               | (none, ./configure decides)
-         N     | forcibly not used  | --disable-tls
-      
-      If unsure, say 'M'.
-
-#-----------------------------------------------------------------------------
-# Optimisation features
-
-comment "Optimisation features"
-
-# Defined in config/cc/gcc.in
-# For graphite: gcc needs cloog and isl
-# In >= gcc-5.x, cloog is no longer needed, but isl is.
-# Prompt in config/cc/gcc.in.2
-config CC_GCC_USE_GRAPHITE
-    bool "Enable GRAPHITE loop optimisations"
-    default y
-    select CLOOG_NEEDED if !CC_GCC_5_or_later
-    select ISL_NEEDED
-    help
-      Enable the GRAPHITE loop optimsations.
-      
-      On some systems (eg. Cygwin), CLooG and ISL (required to enable
-      GRAPHITE) may not build properly (yet), so you'll have to say 'N'
-      here (or help debug the issues)
-
-      TODO: Is this still true on Cygwin?
-
-# The way LTO works is a bit twisted.
-# See: http://gcc.gnu.org/wiki/LinkTimeOptimization#Requirements
-# Basically:
-#   - if binutils has plugins: LTO is handled by ld/gold by loading
-#     the plugin when linking
-#   - if binutils does not have plugins: LTO is handled by collect2
-# In any case, LTO support does not depend on plugins, but takes
-# advantage of it
-config CC_GCC_USE_LTO
-    bool "Enable LTO"
-    default y
-    depends on ! STATIC_TOOLCHAIN
-    help
-      Enable the Link Time Optimisations.
-
-#-----------------------------------------------------------------------------
-comment "Settings for libraries running on target"
-
-config CC_GCC_ENABLE_TARGET_OPTSPACE
-    bool
-    prompt "Optimize gcc libs for size"
-    default y
-    help
-      Pass --enable-target-optspace to crossgcc's configure.
-      
-      This will compile crossgcc's libs with -Os.
-
-config CC_GCC_LIBMUDFLAP
-    bool
-    prompt "Compile libmudflap"
-    help
-      libmudflap is a pointer-use checking tool, which can detect
-      various mis-usages of pointers in C and (to some extents) C++.
-      
-      You should say 'N' here, as libmduflap generates instrumented
-      code (thus it is a bit bigger and a bit slower) and requires
-      re-compilation and re-link, while it exists better run-time
-      alternatives (eg. DUMA, dmalloc...) that need neither re-
-      compilation nor re-link.
-
-config CC_GCC_LIBGOMP
-    bool
-    prompt "Compile libgomp"
-    depends on !THREADS_NONE
-    help
-      libgomp is "the GNU implementation of the OpenMP Application Programming
-      Interface (API) for multi-platform shared-memory parallel programming in
-      C/C++ and Fortran". See:
-        http://gcc.gnu.org/onlinedocs/libgomp/
-
-      GNU OpenMP support requires threading.
-
-      The default is 'N'. Say 'Y' if you need it, and report success/failure.
-
-config CC_GCC_LIBSSP
-    bool
-    prompt "Compile libssp"
-    help
-      libssp is the run-time Stack-Smashing Protection library.
-      
-      The default is 'N'. Say 'Y' if you need it, and report success/failure.
-
-config CC_GCC_LIBQUADMATH
-    bool
-    prompt "Compile libquadmath"
-    help
-      libquadmath is a library which provides quad-precision mathematical
-      functions on targets supporting the __float128 datatype. See:
-        http://gcc.gnu.org/onlinedocs/libquadmath/
-      
-      The default is 'N'. Say 'Y' if you need it, and report success/failure.
-
-config CC_GCC_LIBSANITIZER
-    bool
-    prompt "Compile libsanitizer"
-    depends on THREADS_NATIVE
-    depends on ! LIBC_uClibc && ! LIBC_musl # Currently lacks required headers (like netrom.h)
-    help
-      libsanitizer is a library which provides run-time sanitising of either
-      or both of:
-        - memory access patterns (out-of-bonds, use-after-free)
-        - racy data accesses (in multi-threaded programs)
-
-      The default is 'N'. Say 'Y' if you need it, and report success/failure.
-
-config CC_GCC_LIBMPX
-    bool
-    default y
-    prompt "Compile libmpx"
-    depends on CC_GCC_HAS_LIBMPX
-    depends on ARCH_x86
-    # MUSL does not define libc types that GCC requires. Mingw lacks certain headers.
-    depends on !LIBC_musl && ! LIBC_mingw
-    help
-      Enable GCC support for Intel Memory Protection Extensions (MPX).
-
-#-----------------------------------------------------------------------------
-
-comment "Misc. obscure options."
-
-config CC_CXA_ATEXIT
-    bool
-    prompt "Use __cxa_atexit"
-    default y
-    depends on ! BARE_METAL || LIBC_PROVIDES_CXA_ATEXIT
-    help
-      If you get the missing symbol "__cxa_atexit" when building C++ programs,
-      you might want to try disabling this option.
-
-config CC_GCC_DISABLE_PCH
-    bool
-    prompt "Do not build PCH"
-    help
-      Say 'y' here to not use Pre-Compiled Headers in the resulting toolchain.
-      at the expense of speed when compiling C++ code.
-      
-      For some configurations (most notably canadian?), PCH are broken, and
-      need to be disabled. Please see:
-        http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40974
-
-config CC_GCC_SJLJ_EXCEPTIONS
-    tristate
-    prompt "Use sjlj for exceptions"
-    depends on ! BARE_METAL
-    default m
-    help
-      'sjlj' is short for setjmp/longjmp.
-      
-      On some architectures, stack unwinding during exception handling
-      works perfectly well without using sjlj, while on some others,
-      use of sjlj is required for proper stack unwinding.
-      
-       Option  | sjlj use           | Associated ./configure switch
-      ---------+--------------------+--------------------------------
-         Y     | forcibly used      | --enable-sjlj-exceptions
-         M     | auto               | (none, ./configure decides)
-         N     | forcibly not used  | --disable-sjlj-exceptions
-      
-      It should be safe to say 'M' or 'N'.
-      
-      It can happen that ./configure is wrong in some cases. Known
-      case is for ARM big endian, where you should say 'N'.
-
-config CC_GCC_LDBL_128
-    tristate
-    prompt "Enable 128-bit long doubles"
-    default m
-    help
-      Saying 'Y' will force gcc to use 128-bit wide long doubles
-      Saying 'N' will force gcc to use 64-bit wide long doubles
-      Saying 'M' will let gcc choose (default is 128-bit for
-                 glibc >= 2.4, 64-bit otherwise)
-      
-      If in doubt, keep the default, ie. 'M'.
-
-config CC_GCC_BUILD_ID
-    bool
-    prompt "Enable build-id"
-    help
-      Tells GCC to pass --build-id option to the linker for all final
-      links (links performed without the -r or --relocatable option),
-      if the linker supports it. If you say 'y' here, but your linker
-      does not support --build-id option, a warning is issued and this
-      option is ignored.
-      
-      The default is off.
-
-choice CC_GCC_LNK_HASH_STYLE_CHOICE
-    bool
-    prompt "linker hash style"
-    depends on BINUTILS_HAS_HASH_STYLE
-
-config CC_GCC_LNK_HASH_STYLE_DEFAULT
-    bool
-    prompt "Default"
-    help
-      Do not specify any value, and use the default value (sysv).
-
-config CC_GCC_LNK_HASH_STYLE_SYSV
-    bool
-    prompt "sysv"
-    help
-      Force use of the SYSV hash style.
-
-config CC_GCC_LNK_HASH_STYLE_GNU
-    bool
-    prompt "gnu"
-    help
-      Force use of the GNU hash style.
-
-config CC_GCC_LNK_HASH_STYLE_BOTH
-    bool
-    prompt "both"
-    help
-      Force use of both hash styles.
-
-endchoice # CC_GCC_LNK_HASH_STYLE_CHOICE
-
-config CC_GCC_LNK_HASH_STYLE
-    string
-    default ""      if CC_GCC_LNK_HASH_STYLE_DEFAULT
-    default "sysv"  if CC_GCC_LNK_HASH_STYLE_SYSV
-    default "gnu"   if CC_GCC_LNK_HASH_STYLE_GNU
-    default "both"  if CC_GCC_LNK_HASH_STYLE_BOTH
-
-choice CC_GCC_DEC_FLOATS_CHOICE
-    bool "Decimal floats"
-    default CC_GCC_DEC_FLOATS_AUTO
-    help
-      Choose what type of decimal floats to support.
-      
-      Note that using decimal floats requires a C library that provides
-      support for fenv (namely, the fenv.h header).  This is the case
-      for (e)glibc, and uClibc on x86/32.  For other C libraries, or
-      uClibc on other archs, this might not be the case, so you should
-      disable support for decimal floats.
-      
-      The default is to let ./configure decide.
-
-config CC_GCC_DEC_FLOAT_AUTO
-    bool "auto"
-    help
-      Let ./configure decide. If you say 'y' here, gcc will default to:
-        - 'bid' for x86 (32- and 64-bit)
-        - 'dpd' for powerpc
-        - 'no' for the other architectures
-
-config CC_GCC_DEC_FLOAT_BID
-    bool "bid"
-    help
-      Use the 'binary integer decimal' format for decimal floats.
-
-config CC_GCC_DEC_FLOAT_DPD
-    bool "dpd"
-    help
-      Use the 'densely packed decimal' for decimal floats.
-
-config CC_GCC_DEC_FLOATS_NO
-    bool "no"
-    help
-      Do not support decimal floats. The default.
-
-endchoice # CC_GCC_DEC_FLOATS_CHOICE
-
-config CC_GCC_DEC_FLOATS
-    string
-    default ""      if CC_GCC_DEC_FLOATS_AUTO
-    default "bid"   if CC_GCC_DEC_FLOATS_BID
-    default "dpd"   if CC_GCC_DEC_FLOATS_DPD
-    default "no"    if CC_GCC_DEC_FLOATS_NO
-
-#-----------------------------------------------------------------------------
-
-config CC_GCC_HAS_ARCH_OPTIONS
-    bool
-
-comment "archictecture-specific options"
-    depends on CC_GCC_HAS_ARCH_OPTIONS
-
-if ARCH_mips
-source "config/cc/gcc.in.mips"
-endif # ARCH_mips
diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2
new file mode 100644
index 00000000..e238076d
--- /dev/null
+++ b/config/cc/gcc.in.2
@@ -0,0 +1,408 @@
+# Only enable gcc's support for plugins if binutils has it as well
+# They are useful only when doing LTO, but it does no harm enabling
+# them even without LTO.
+config CC_GCC_ENABLE_PLUGINS
+    bool
+    depends on BINUTILS_PLUGINS
+    depends on ! STATIC_TOOLCHAIN
+    default y
+
+# If binutils installs gold, enable support for gold in gcc
+config CC_GCC_GOLD
+    bool
+    depends on BINUTILS_GOLD_INSTALLED
+    default y
+
+config CC_GCC_HAS_LIBMPX
+    depends on GCC_5_or_later
+    bool
+
+config CC_LANG_JAVA_USE_ECJ
+    bool
+    default y
+    depends on CC_LANG_JAVA
+
+config CC_GCC_ENABLE_CXX_FLAGS
+    string
+    prompt "Flags to pass to --enable-cxx-flags"
+    default ""
+    help
+      Enter here the value of the gcc's ./configure option --enable-cxx-flags.
+      Leave empty if you don't know better.
+      
+      Note: just pass in the option _value_, that is only the part that goes
+      after the '=' sign.
+
+config CC_GCC_CORE_EXTRA_CONFIG_ARRAY
+    string
+    prompt "Core gcc extra config"
+    default ""
+    depends on CC_CORE_PASS_1_NEEDED || CC_CORE_PASS_2_NEEDED
+    help
+      Extra flags to pass onto ./configure when configuring the core gcc.
+      
+      The core gcc is a stripped down, C-only compiler needed to build
+      the C library. Kinda bootstrap gcc, if you wish.
+      
+      You can enter multiple arguments here, and arguments can contain spaces
+      if they are properly quoted (or escaped, but prefer quotes). Eg.:
+          --with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space
+
+config CC_GCC_EXTRA_CONFIG_ARRAY
+    string
+    prompt "gcc extra config"
+    default ""
+    help
+      Extra flags to pass onto ./configure when configuring gcc.
+      
+      You can enter multiple arguments here, and arguments can contain spaces
+      if they are properly quoted (or escaped, but prefer quotes). Eg.:
+          --with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space
+
+config CC_GCC_MULTILIB_LIST
+    string
+    prompt "List of multilib variants"
+    depends on MULTILIB
+    help
+      Architecture-specific option of expanding or restricting the list of
+      the multilib variants to be built. Refer to GCC installation manual
+      for the format of this option for a particular architecture.
+      Leave empty to use the default list for this architecture.
+
+config STATIC_TOOLCHAIN
+    bool
+    select CC_GCC_STATIC_LIBSTDCXX
+
+config CC_GCC_STATIC_LIBSTDCXX
+    bool
+    prompt "Link libstdc++ statically into the gcc binary"
+    default y
+    depends on CONFIGURE_has_static_link || CANADIAN || CROSS_NATIVE
+    select WANTS_STATIC_LINK if CROSS || NATIVE
+    select WANTS_STATIC_LINK_CXX if CROSS || NATIVE
+    help
+      Newer gcc versions require some c++ libraries. So statically
+      linking libstdc++ increases the likeliness that the gcc binary will
+      run on machines other than the one which it was built on, without
+      having to worry about distributing the matching version of libstdc++
+      along with it.
+
+config CC_GCC_SYSTEM_ZLIB
+    bool
+    prompt "Use system zlib"
+    help
+      Do not use bundled zlib, and use the zlib already available for
+      the host (eg. the system library).
+
+      If zlib is built as a companion library, selecting this option
+      will use it.
+      
+      If you want to build a static toolchain, you will need to also
+      install the static version of zlib for your host.
+      
+      If unsure, say 'n'.
+
+config CC_GCC_CONFIG_TLS
+    tristate
+    prompt "Configure TLS (Thread Local Storage)"
+    default m
+    help
+      Specify that the target supports TLS (Thread Local Storage). Usually
+      configure can correctly determine if TLS is supported. In cases where
+      it guesses incorrectly, TLS can be explicitly enabled or disabled.
+      This can happen if the assembler supports TLS but the C library does
+      not, or if the assumptions made by the configure test are incorrect.
+
+       Option  | TLS use            | Associated ./configure switch
+      ---------+--------------------+--------------------------------
+         Y     | forcibly used      | --enable-tls
+         M     | auto               | (none, ./configure decides)
+         N     | forcibly not used  | --disable-tls
+      
+      If unsure, say 'M'.
+
+#-----------------------------------------------------------------------------
+# Optimisation features
+
+comment "Optimisation features"
+
+# Defined in config/cc/gcc.in
+# For graphite: gcc needs cloog and isl
+# In >= gcc-5.x, cloog is no longer needed, but isl is.
+# Prompt in config/cc/gcc.in.2
+config CC_GCC_USE_GRAPHITE
+    bool "Enable GRAPHITE loop optimisations"
+    default y
+    select CLOOG_NEEDED if !CC_GCC_5_or_later
+    select ISL_NEEDED
+    help
+      Enable the GRAPHITE loop optimsations.
+      
+      On some systems (eg. Cygwin), CLooG and ISL (required to enable
+      GRAPHITE) may not build properly (yet), so you'll have to say 'N'
+      here (or help debug the issues)
+
+      TODO: Is this still true on Cygwin?
+
+# The way LTO works is a bit twisted.
+# See: http://gcc.gnu.org/wiki/LinkTimeOptimization#Requirements
+# Basically:
+#   - if binutils has plugins: LTO is handled by ld/gold by loading
+#     the plugin when linking
+#   - if binutils does not have plugins: LTO is handled by collect2
+# In any case, LTO support does not depend on plugins, but takes
+# advantage of it
+config CC_GCC_USE_LTO
+    bool "Enable LTO"
+    default y
+    depends on ! STATIC_TOOLCHAIN
+    help
+      Enable the Link Time Optimisations.
+
+#-----------------------------------------------------------------------------
+comment "Settings for libraries running on target"
+
+config CC_GCC_ENABLE_TARGET_OPTSPACE
+    bool
+    prompt "Optimize gcc libs for size"
+    default y
+    help
+      Pass --enable-target-optspace to crossgcc's configure.
+      
+      This will compile crossgcc's libs with -Os.
+
+config CC_GCC_LIBMUDFLAP
+    bool
+    prompt "Compile libmudflap"
+    help
+      libmudflap is a pointer-use checking tool, which can detect
+      various mis-usages of pointers in C and (to some extents) C++.
+      
+      You should say 'N' here, as libmduflap generates instrumented
+      code (thus it is a bit bigger and a bit slower) and requires
+      re-compilation and re-link, while it exists better run-time
+      alternatives (eg. DUMA, dmalloc...) that need neither re-
+      compilation nor re-link.
+
+config CC_GCC_LIBGOMP
+    bool
+    prompt "Compile libgomp"
+    depends on !THREADS_NONE
+    help
+      libgomp is "the GNU implementation of the OpenMP Application Programming
+      Interface (API) for multi-platform shared-memory parallel programming in
+      C/C++ and Fortran". See:
+        http://gcc.gnu.org/onlinedocs/libgomp/
+
+      GNU OpenMP support requires threading.
+
+      The default is 'N'. Say 'Y' if you need it, and report success/failure.
+
+config CC_GCC_LIBSSP
+    bool
+    prompt "Compile libssp"
+    help
+      libssp is the run-time Stack-Smashing Protection library.
+      
+      The default is 'N'. Say 'Y' if you need it, and report success/failure.
+
+config CC_GCC_LIBQUADMATH
+    bool
+    prompt "Compile libquadmath"
+    help
+      libquadmath is a library which provides quad-precision mathematical
+      functions on targets supporting the __float128 datatype. See:
+        http://gcc.gnu.org/onlinedocs/libquadmath/
+      
+      The default is 'N'. Say 'Y' if you need it, and report success/failure.
+
+config CC_GCC_LIBSANITIZER
+    bool
+    prompt "Compile libsanitizer"
+    depends on THREADS_NATIVE
+    depends on ! LIBC_uClibc && ! LIBC_musl # Currently lacks required headers (like netrom.h)
+    help
+      libsanitizer is a library which provides run-time sanitising of either
+      or both of:
+        - memory access patterns (out-of-bonds, use-after-free)
+        - racy data accesses (in multi-threaded programs)
+
+      The default is 'N'. Say 'Y' if you need it, and report success/failure.
+
+config CC_GCC_LIBMPX
+    bool
+    default y
+    prompt "Compile libmpx"
+    depends on CC_GCC_HAS_LIBMPX
+    depends on ARCH_x86
+    # MUSL does not define libc types that GCC requires. Mingw lacks certain headers.
+    depends on !LIBC_musl && ! LIBC_mingw
+    help
+      Enable GCC support for Intel Memory Protection Extensions (MPX).
+
+#-----------------------------------------------------------------------------
+
+comment "Misc. obscure options."
+
+config CC_CXA_ATEXIT
+    bool
+    prompt "Use __cxa_atexit"
+    default y
+    depends on ! BARE_METAL || LIBC_PROVIDES_CXA_ATEXIT
+    help
+      If you get the missing symbol "__cxa_atexit" when building C++ programs,
+      you might want to try disabling this option.
+
+config CC_GCC_DISABLE_PCH
+    bool
+    prompt "Do not build PCH"
+    help
+      Say 'y' here to not use Pre-Compiled Headers in the resulting toolchain.
+      at the expense of speed when compiling C++ code.
+      
+      For some configurations (most notably canadian?), PCH are broken, and
+      need to be disabled. Please see:
+        http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40974
+
+config CC_GCC_SJLJ_EXCEPTIONS
+    tristate
+    prompt "Use sjlj for exceptions"
+    depends on ! BARE_METAL
+    default m
+    help
+      'sjlj' is short for setjmp/longjmp.
+      
+      On some architectures, stack unwinding during exception handling
+      works perfectly well without using sjlj, while on some others,
+      use of sjlj is required for proper stack unwinding.
+      
+       Option  | sjlj use           | Associated ./configure switch
+      ---------+--------------------+--------------------------------
+         Y     | forcibly used      | --enable-sjlj-exceptions
+         M     | auto               | (none, ./configure decides)
+         N     | forcibly not used  | --disable-sjlj-exceptions
+      
+      It should be safe to say 'M' or 'N'.
+      
+      It can happen that ./configure is wrong in some cases. Known
+      case is for ARM big endian, where you should say 'N'.
+
+config CC_GCC_LDBL_128
+    tristate
+    prompt "Enable 128-bit long doubles"
+    default m
+    help
+      Saying 'Y' will force gcc to use 128-bit wide long doubles
+      Saying 'N' will force gcc to use 64-bit wide long doubles
+      Saying 'M' will let gcc choose (default is 128-bit for
+                 glibc >= 2.4, 64-bit otherwise)
+      
+      If in doubt, keep the default, ie. 'M'.
+
+config CC_GCC_BUILD_ID
+    bool
+    prompt "Enable build-id"
+    help
+      Tells GCC to pass --build-id option to the linker for all final
+      links (links performed without the -r or --relocatable option),
+      if the linker supports it. If you say 'y' here, but your linker
+      does not support --build-id option, a warning is issued and this
+      option is ignored.
+      
+      The default is off.
+
+choice CC_GCC_LNK_HASH_STYLE_CHOICE
+    bool
+    prompt "linker hash style"
+    depends on BINUTILS_HAS_HASH_STYLE
+
+config CC_GCC_LNK_HASH_STYLE_DEFAULT
+    bool
+    prompt "Default"
+    help
+      Do not specify any value, and use the default value (sysv).
+
+config CC_GCC_LNK_HASH_STYLE_SYSV
+    bool
+    prompt "sysv"
+    help
+      Force use of the SYSV hash style.
+
+config CC_GCC_LNK_HASH_STYLE_GNU
+    bool
+    prompt "gnu"
+    help
+      Force use of the GNU hash style.
+
+config CC_GCC_LNK_HASH_STYLE_BOTH
+    bool
+    prompt "both"
+    help
+      Force use of both hash styles.
+
+endchoice # CC_GCC_LNK_HASH_STYLE_CHOICE
+
+config CC_GCC_LNK_HASH_STYLE
+    string
+    default ""      if CC_GCC_LNK_HASH_STYLE_DEFAULT
+    default "sysv"  if CC_GCC_LNK_HASH_STYLE_SYSV
+    default "gnu"   if CC_GCC_LNK_HASH_STYLE_GNU
+    default "both"  if CC_GCC_LNK_HASH_STYLE_BOTH
+
+choice CC_GCC_DEC_FLOATS_CHOICE
+    bool "Decimal floats"
+    default CC_GCC_DEC_FLOATS_AUTO
+    help
+      Choose what type of decimal floats to support.
+      
+      Note that using decimal floats requires a C library that provides
+      support for fenv (namely, the fenv.h header).  This is the case
+      for (e)glibc, and uClibc on x86/32.  For other C libraries, or
+      uClibc on other archs, this might not be the case, so you should
+      disable support for decimal floats.
+      
+      The default is to let ./configure decide.
+
+config CC_GCC_DEC_FLOAT_AUTO
+    bool "auto"
+    help
+      Let ./configure decide. If you say 'y' here, gcc will default to:
+        - 'bid' for x86 (32- and 64-bit)
+        - 'dpd' for powerpc
+        - 'no' for the other architectures
+
+config CC_GCC_DEC_FLOAT_BID
+    bool "bid"
+    help
+      Use the 'binary integer decimal' format for decimal floats.
+
+config CC_GCC_DEC_FLOAT_DPD
+    bool "dpd"
+    help
+      Use the 'densely packed decimal' for decimal floats.
+
+config CC_GCC_DEC_FLOATS_NO
+    bool "no"
+    help
+      Do not support decimal floats. The default.
+
+endchoice # CC_GCC_DEC_FLOATS_CHOICE
+
+config CC_GCC_DEC_FLOATS
+    string
+    default ""      if CC_GCC_DEC_FLOATS_AUTO
+    default "bid"   if CC_GCC_DEC_FLOATS_BID
+    default "dpd"   if CC_GCC_DEC_FLOATS_DPD
+    default "no"    if CC_GCC_DEC_FLOATS_NO
+
+#-----------------------------------------------------------------------------
+
+config CC_GCC_HAS_ARCH_OPTIONS
+    bool
+
+comment "archictecture-specific options"
+    depends on CC_GCC_HAS_ARCH_OPTIONS
+
+if ARCH_mips
+source "config/cc/gcc.in.mips"
+endif # ARCH_mips
diff --git a/config/kernel.in b/config/kernel.in
index c04f2cb3..2ae7656a 100644
--- a/config/kernel.in
+++ b/config/kernel.in
@@ -4,9 +4,11 @@ menu "Operating System"
 
 # Config option used throughout the config and code to determine wether
 # we have a kernel or not (there might be different bare metal stuff)...
+# FIXME use CT_KERNEL_bare_metal instead
 config BARE_METAL
     bool
 
+# FIXME use CT_KERNEL_windows instead
 config WINDOWS
     bool
 
diff --git a/config/kernel/linux.in b/config/kernel/linux.in
index dc0f5e5d..e1edb489 100644
--- a/config/kernel/linux.in
+++ b/config/kernel/linux.in
@@ -5,290 +5,11 @@
 ##
 ## help Build a toolchain targeting systems running Linux as a kernel.
 
-config KERNEL_LINUX_CUSTOM
-    bool
-    prompt "custom tarball or directory"
-    help
-      The choosen linux version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-if KERNEL_LINUX_CUSTOM
-
-config KERNEL_LINUX_CUSTOM_LOCATION
-    string
-    prompt "Path to custom source, tarball or directory"
-    help
-      Enter the path to the directory or tarball of your source for linux.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component, linux, and the version is set
-      below in the custom version string.
-
-config KERNEL_LINUX_CUSTOM_VERSION
-    string
-    prompt "Custom Linux version"
-    help
-      Enter the version number for your custom linux.
-
-config KERNEL_VERSION
-    string
-    default KERNEL_LINUX_CUSTOM_VERSION
-
-endif # KERNEL_LINUX_CUSTOM
-
-if ! KERNEL_LINUX_CUSTOM
-
 # GLIBC and kernel are special when it comes to obsoletion. Users
 # of crosstool-ng depend on the ability to build new toolchains matching
 # the kernel/libc versions of a particular target system, and LTS releases
 # are still using quite ancient versions. Please do not retire versions
 # (including versions in between) until the EOL dates indicated below.
-choice
-    bool
-    prompt "Linux kernel version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config KERNEL_V_4_11
-    bool
-    prompt "4.11.3"
-
-config KERNEL_V_4_10
-    bool
-    prompt "4.10.17 (EOL)"
-
-config KERNEL_V_4_9
-    bool
-    prompt "4.9.30"
-
-config KERNEL_V_4_8
-    bool
-    prompt "4.8.17 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_4_7
-    bool
-    prompt "4.7.10 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_4_6
-    bool
-    prompt "4.6.7 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_4_5
-    bool
-    prompt "4.5.7 (EOL)"
-    depends on OBSOLETE
-
-# EOL 04/2021 [Ubuntu16.04]
-config KERNEL_V_4_4
-    bool
-    prompt "4.4.70"
-
-config KERNEL_V_4_3
-    bool
-    prompt "4.3.6 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_4_2
-    bool
-    prompt "4.2.8 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_4_1
-    bool
-    prompt "4.1.40"
-
-config KERNEL_V_4_0
-    bool
-    prompt "4.0.9 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_3_19
-    bool
-    prompt "3.19.8 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_3_18
-    bool
-    prompt "3.18.55 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_3_17
-    bool
-    prompt "3.17.8 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_3_16
-    bool
-    prompt "3.16.43"
-
-config KERNEL_V_3_15
-    bool
-    prompt "3.15.10 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_3_14
-    bool
-    prompt "3.14.79 (EOL)"
-    depends on OBSOLETE
-
-# EOL 04/2019 [Ubuntu14.04]
-config KERNEL_V_3_13
-    bool
-    prompt "3.13.11 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_3_12
-    bool
-    prompt "3.12.74"
-
-config KERNEL_V_3_11
-    bool
-    prompt "3.11.10 (EOL)"
-    depends on OBSOLETE
-
-# EOL 06/2024 [CentOS7.x]
-config KERNEL_V_3_10
-    bool
-    prompt "3.10.105"
-
-config KERNEL_V_3_9
-    bool
-    prompt "3.9.11 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_3_8
-    bool
-    prompt "3.8.13 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_3_7
-    bool
-    prompt "3.7.10 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_3_6
-    bool
-    prompt "3.6.11 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_3_5
-    bool
-    prompt "3.5.7 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_3_4
-    bool
-    prompt "3.4.113"
-
-config KERNEL_V_3_3
-    bool
-    prompt "3.3.8 (EOL)"
-    depends on OBSOLETE
-
-# EOL 04/2017 [Ubuntu12.04]
-config KERNEL_V_3_2
-    bool
-    prompt "3.2.88"
-
-config KERNEL_V_3_1
-    bool
-    prompt "3.1.10 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_3_0
-    bool
-    prompt "3.0.101 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_2_6_39
-    bool
-    prompt "2.6.39.4 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_2_6_38
-    bool
-    prompt "2.6.38.8 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_2_6_37
-    bool
-    prompt "2.6.37.6 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_2_6_36
-    bool
-    prompt "2.6.36.4 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_2_6_35
-    bool
-    prompt "2.6.35.9 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_2_6_34
-    bool
-    prompt "2.6.34.7 (EOL)"
-    depends on OBSOLETE
-
-config KERNEL_V_2_6_33
-    bool
-    prompt "2.6.33.7 (EOL)"
-    depends on OBSOLETE
-
-# EOL 11/2020 [CentOS6.x]
-config KERNEL_V_2_6_32
-    bool
-    prompt "2.6.32.27 (EOL)"
-    depends on OBSOLETE
-
-endchoice
-
-config KERNEL_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "4.11.3" if KERNEL_V_4_11
-    default "4.10.17" if KERNEL_V_4_10
-    default "4.9.30" if KERNEL_V_4_9
-    default "4.8.17" if KERNEL_V_4_8
-    default "4.7.10" if KERNEL_V_4_7
-    default "4.6.7" if KERNEL_V_4_6
-    default "4.5.7" if KERNEL_V_4_5
-    default "4.4.70" if KERNEL_V_4_4
-    default "4.3.6" if KERNEL_V_4_3
-    default "4.2.8" if KERNEL_V_4_2
-    default "4.1.40" if KERNEL_V_4_1
-    default "4.0.9" if KERNEL_V_4_0
-    default "3.19.8" if KERNEL_V_3_19
-    default "3.18.55" if KERNEL_V_3_18
-    default "3.17.8" if KERNEL_V_3_17
-    default "3.16.43" if KERNEL_V_3_16
-    default "3.15.10" if KERNEL_V_3_15
-    default "3.14.79" if KERNEL_V_3_14
-    default "3.13.11" if KERNEL_V_3_13
-    default "3.12.74" if KERNEL_V_3_12
-    default "3.11.10" if KERNEL_V_3_11
-    default "3.10.105" if KERNEL_V_3_10
-    default "3.9.11" if KERNEL_V_3_9
-    default "3.8.13" if KERNEL_V_3_8
-    default "3.7.10" if KERNEL_V_3_7
-    default "3.6.11" if KERNEL_V_3_6
-    default "3.5.7" if KERNEL_V_3_5
-    default "3.4.113" if KERNEL_V_3_4
-    default "3.3.8" if KERNEL_V_3_3
-    default "3.2.88" if KERNEL_V_3_2
-    default "3.1.10" if KERNEL_V_3_1
-    default "3.0.101" if KERNEL_V_3_0
-    default "2.6.39.4" if KERNEL_V_2_6_39
-    default "2.6.38.8" if KERNEL_V_2_6_38
-    default "2.6.37.6" if KERNEL_V_2_6_37
-    default "2.6.36.4" if KERNEL_V_2_6_36
-    default "2.6.35.9" if KERNEL_V_2_6_35
-    default "2.6.34.7" if KERNEL_V_2_6_34
-    default "2.6.33.7" if KERNEL_V_2_6_33
-    default "2.6.32.27" if KERNEL_V_2_6_32
+# Such pinned versions are indicated in version.desc files with a comment.
 
-endif # ! KERNEL_LINUX_CUSTOM
+source "config/versions/linux.in"
diff --git a/config/libc/avr-libc.in b/config/libc/avr-libc.in
index 2b8d891d..6abbe01b 100644
--- a/config/libc/avr-libc.in
+++ b/config/libc/avr-libc.in
@@ -9,66 +9,4 @@
 ## help Atmel AVR 8-bit RISC microcontrollers. In addition, the library
 ## help provides the basic startup code needed by most applications.
 
-config LIBC_AVR_LIBC_CUSTOM
-    bool
-    prompt "Custom avr-libc"
-    depends on EXPERIMENTAL
-    help
-      The choosen avr-libc version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-if LIBC_AVR_LIBC_CUSTOM
-
-config LIBC_AVR_LIBC_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom avr-libc source"
-    help
-      Enter the path to the directory or tarball of your source for avr-libc.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component, avr-libc, and the version is set
-      below in the custom version string.
-
-config LIBC_AVR_LIBC_CUSTOM_VERSION
-    string
-    prompt "Custom AVR-Libc version"
-    help
-      Enter the version number for your custom avr-libc.
-
-config LIBC_VERSION
-    string
-    default LIBC_AVR_LIBC_CUSTOM_VERSION
-
-endif # LIBC_AVR_LIBC_CUSTOM
-
-if ! LIBC_AVR_LIBC_CUSTOM
-
-choice
-    bool
-    prompt "avr-libc version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBC_AVR_LIBC_V_2_0_0
-    bool
-    prompt "2.0.0"
-
-config LIBC_AVR_LIBC_V_1_8_1
-    bool
-    prompt "1.8.1"
-
-config LIBC_AVR_LIBC_V_1_8_0
-    bool
-    prompt "1.8.0"
-
-endchoice
-
-config LIBC_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "2.0.0" if LIBC_AVR_LIBC_V_2_0_0
-    default "1.8.1" if LIBC_AVR_LIBC_V_1_8_1
-    default "1.8.0" if LIBC_AVR_LIBC_V_1_8_0
-
-endif # ! LIBC_AVR_LIBC_CUSTOM
+source "config/versions/avr-libc.in"
diff --git a/config/libc/bionic.in b/config/libc/bionic.in
index 9e041300..ab51e6b9 100644
--- a/config/libc/bionic.in
+++ b/config/libc/bionic.in
@@ -11,98 +11,17 @@
 ## help This platform has no TLS (Thread Local Storage) support so that option must be
 ## help disabled in the Compiler options.
 
+source "config/versions/bionic.in"
+
 config THREADS
     default "posix"
 
-config LIBC_BIONIC_CUSTOM
-    bool
-    prompt "Custom bionic"
-    help
-      The chosen bionic-libc version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-if LIBC_BIONIC_CUSTOM
-
-config LIBC_BIONIC_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom bionic source"
-    help
-      Enter the path to the directory or tarball of your source for bionic.
-
-      If the path is a zip archive, it should extract to: <name>-<version>/
-      where the name is android-ndk, and the version is set
-      below in the custom version string.
-
-config LIBC_BIONIC_CUSTOM_VERSION
-    string
-    prompt "Custom BIONIC version"
-    help
-      Enter the version number for your custom bionic.
-
-config LIBC_VERSION
-    string
-    default LIBC_BIONIC_CUSTOM_VERSION
-
-endif # LIBC_BIONIC_CUSTOM
-
-if ! LIBC_BIONIC_CUSTOM
-
-choice
-    bool
-    prompt "bionic version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBC_BIONIC_V_15beta1
-    bool
-    prompt "15beta1"
-
-config LIBC_BIONIC_V_14b
-    bool
-    prompt "14b"
-
-config LIBC_BIONIC_V_13b
-    bool
-    prompt "13b (OBSOLETE)"
-    depends on OBSOLETE
-
-config LIBC_BIONIC_V_12b
-    bool
-    prompt "12b (OBSOLETE)"
-    depends on OBSOLETE
-
-config LIBC_BIONIC_V_11c
-    bool
-    prompt "11c (OBSOLETE)"
-    depends on OBSOLETE
-
-config LIBC_BIONIC_V_10e
-    bool
-    prompt "10e (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-config LIBC_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "r15-beta1" if LIBC_BIONIC_V_15beta1
-    default "r14b" if LIBC_BIONIC_V_14b
-    default "r13b" if LIBC_BIONIC_V_13b
-    default "r12b" if LIBC_BIONIC_V_12b
-    default "r11c" if LIBC_BIONIC_V_11c
-    default "r10e" if LIBC_BIONIC_V_10e
-
-endif # ! LIBC_BIONIC_CUSTOM
-
+# FIXME does API level depend on the bionic version? generate that, too?
 choice 
     bool
     prompt "Android API level"
     help
       The minimum for 64 bit support is 21.
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
 
 config ANDROID_API_24
     bool
@@ -169,8 +88,6 @@ endchoice
 
 config ANDROID_API
     string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
     default "24" if ANDROID_API_24
     default "23" if ANDROID_API_23
     default "22" if ANDROID_API_22
@@ -184,4 +101,3 @@ config ANDROID_API
     default "13" if ANDROID_API_13
     default "12" if ANDROID_API_12
     default "9" if ANDROID_API_9
-
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 9e4ff565..c0c633dd 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -5,218 +5,50 @@
 ## select LIBC_SUPPORT_THREADS_NATIVE
 ## select CC_CORE_PASSES_NEEDED
 ## select GETTEXT_NEEDED
+## select BINUTILS_FORCE_LD_BFD_DEFAULT
 ##
 ## help The de-facto standard for Linux distributions.
 ## help Feature-rich, but large...  Most useful for desktop-like systems.
 
-config THREADS
-    default "nptl"
-
-config LIBC_GLIBC_CUSTOM
-    bool
-    prompt "Custom glibc"
-    depends on EXPERIMENTAL
-    select LIBC_CUSTOM
-    select LIBC_GLIBC_2_20_or_later
-    help
-      The choosen glibc version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-if LIBC_GLIBC_CUSTOM
-
-config LIBC_GLIBC_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom glibc source"
-    help
-      Enter the path to the directory or tarball of your source for glibc.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component, glibc, and the version is set
-      below in the custom version string.
-
-config LIBC_GLIBC_CUSTOM_VERSION
-    string
-    prompt "Custom GLIBC version"
-    help
-      Enter the version number for your custom glibc.
-
-config LIBC_VERSION
-    string
-    default LIBC_GLIBC_CUSTOM_VERSION
-
-endif # LIBC_GLIBC_CUSTOM
-
-if ! LIBC_GLIBC_CUSTOM
-
-config CC_GLIBC_SHOW_LINARO
-    bool
-    prompt "Show Linaro versions"
-    help
-      Linaro is maintaining some advanced/more stable/experimental versions
-      of glibc, especially for the ARM architecture.
-      
-      Those versions have not been blessed by the glibc comunity (nor have they
-      been cursed either!), but they look to be pretty much stable, and even
-      more stable than the upstream versions. YMMV...
-      
-      If you do not know what this Linaro stuff is, then simply say 'n' here,
-      and rest in peace. OTOH, if you know what you are doing, you will be
-      able to use and enjoy :-) the Linaro versions by saying 'y' here.
-      
-      Linaro: http://www.linaro.org/
-
 # GLIBC and kernel are special when it comes to obsoletion. Users
 # of crosstool-ng depend on the ability to build new toolchains matching
 # the kernel/libc versions of a particular target system, and LTS releases
 # are still using quite ancient versions. Please do not retire versions
-# (including versions in between) until the EOL dates indicated below.
-choice
-    bool
-    prompt "glibc version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBC_GLIBC_V_2_25
-    bool
-    prompt "2.25"
-    select LIBC_GLIBC_2_23_or_later
-
-config LIBC_GLIBC_V_2_24
-    bool
-    prompt "2.24"
-    select LIBC_GLIBC_2_23_or_later
-
-# EOL 04/2021 [Ubuntu16.04]
-config LIBC_GLIBC_V_2_23
-    bool
-    prompt "2.23"
-    select LIBC_GLIBC_2_23_or_later
-
-config LIBC_GLIBC_V_2_22
-    bool
-    prompt "2.22 (OBSOLETE)"
-    select LIBC_GLIBC_2_20_or_later
-    depends on OBSOLETE
-
-config LIBC_GLIBC_V_2_21
-    bool
-    prompt "2.21 (OBSOLETE)"
-    select LIBC_GLIBC_2_20_or_later
-    depends on OBSOLETE
-
-config LIBC_GLIBC_LINARO_V_2_20
-    bool
-    prompt "Linaro 2.20-2014.11 (OBSOLETE)"
-    select LIBC_GLIBC_2_20_or_later
-    depends on CC_GLIBC_SHOW_LINARO
-    depends on OBSOLETE
+# (including versions in between) until the EOL dates indicated in version.desc.
+source "config/versions/glibc.in"
 
-config LIBC_GLIBC_V_2_20
-    bool
-    prompt "2.20 (OBSOLETE)"
-    select LIBC_GLIBC_2_20_or_later
-    depends on OBSOLETE
-
-# EOL 04/2019 [Ubuntu14.04]
-config LIBC_GLIBC_V_2_19
-    bool
-    prompt "2.19 (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_GLIBC_2_17_or_later
-
-config LIBC_GLIBC_V_2_18
-    bool
-    prompt "2.18 (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_GLIBC_2_17_or_later
-
-# EOL 06/2024 [CentOS7.x]
-config LIBC_GLIBC_V_2_17
-    bool
-    prompt "2.17 (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_GLIBC_2_17_or_later
-
-config LIBC_GLIBC_V_2_16_0
-    bool
-    prompt "2.16.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-# EOL 04/2017 [Ubuntu12.04]
-config LIBC_GLIBC_V_2_15
-    bool
-    prompt "2.15 (OBSOLETE)"
-    depends on OBSOLETE
-
-config LIBC_GLIBC_V_2_14_1
-    bool
-    prompt "2.14.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config LIBC_GLIBC_V_2_14
-    bool
-    prompt "2.14 (OBSOLETE)"
-    depends on OBSOLETE
-
-config LIBC_GLIBC_V_2_13
-    bool
-    prompt "2.13 (OBSOLETE)"
-    depends on OBSOLETE
-
-# This version did not have glibc-ports addon released
-config LIBC_GLIBC_V_2_12_2
-    bool
-    prompt "2.12.2 (OBSOLETE)"
-    depends on OBSOLETE
-    depends on !LIBC_GLIBC_NEEDS_PORTS
-
-# EOL 11/2020 [CentOS6.x]
-config LIBC_GLIBC_V_2_12_1
-    bool
-    prompt "2.12.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-endchoice
-
-endif # ! LIBC_GLIBC_CUSTOM
-
-# Checked by SPARC build: SPARCv8 is dropped in 2.23.
-config LIBC_GLIBC_2_23_or_later
-    select LIBC_GLIBC_2_20_or_later
-    bool
-
-# DeMark 2.20 as no longer needs to set NPTL as an addon.
-# It is no longer possible to build glibc without pthread!
-config LIBC_GLIBC_2_20_or_later
-    bool
-    select LIBC_GLIBC_2_17_or_later
-
-# DeMark no more ports
-config LIBC_GLIBC_2_17_or_later
-    bool
-
-if ! LIBC_GLIBC_CUSTOM
+config THREADS
+    default "nptl"
 
-config LIBC_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "2.25" if LIBC_GLIBC_V_2_25
-    default "2.24" if LIBC_GLIBC_V_2_24
-    default "2.23" if LIBC_GLIBC_V_2_23
-    default "2.22" if LIBC_GLIBC_V_2_22
-    default "2.21" if LIBC_GLIBC_V_2_21
-    default "linaro-2.20-2014.11" if LIBC_GLIBC_LINARO_V_2_20
-    default "2.20" if LIBC_GLIBC_V_2_20
-    default "2.19" if LIBC_GLIBC_V_2_19
-    default "2.18" if LIBC_GLIBC_V_2_18
-    default "2.17" if LIBC_GLIBC_V_2_17
-    default "2.16.0" if LIBC_GLIBC_V_2_16_0
-    default "2.15" if LIBC_GLIBC_V_2_15
-    default "2.14.1" if LIBC_GLIBC_V_2_14_1
-    default "2.14" if LIBC_GLIBC_V_2_14
-    default "2.13" if LIBC_GLIBC_V_2_13
-    default "2.12.2" if LIBC_GLIBC_V_2_12_2
-    default "2.12.1" if LIBC_GLIBC_V_2_12_1
+# SPARCv8 support retired in 2.23
+config GLIBC_NO_SPARC_V8
+    def_bool y
+    depends on GLIBC_2_23_or_later
+
+# With 2.20, NPTL is in default glibc
+config GLIBC_HAS_NPTL_ADDON
+    def_bool y
+    depends on !GLIBC_2_20_or_later
+
+# With 2.20, all architectures are in main tree
+config GLIBC_HAS_PORTS_ADDON
+    def_bool y
+    depends on !GLIBC_2_20_or_later
+
+# With 2.17 and later, 'ports' addon is shipped in glibc tarball
+config GLIBC_PORTS_EXTERNAL
+    def_bool y
+    depends on !GLIBC_2_17_or_later
+
+# Some architectures require the ports addon. List them one by one here:
+# This list must be carefully in sync with the architectures names
+# we can find in config/arch/*
+config GLIBC_NEEDS_PORTS
+    def_bool y
+    depends on ARCH_alpha || ARCH_arm || ARCH_m68k || ARCH_mips || ARCH_powerpc
+
+# Ports are no longer an add-on starting with 2.20
+config GLIBC_USE_PORTS
+    def_bool y
+    depends on GLIBC_NEEDS_PORTS && GLIBC_HAS_PORTS_ADDON
 
-endif # ! LIBC_GLIBC_CUSTOM
diff --git a/config/libc/glibc.in.2 b/config/libc/glibc.in.2
index 93b7b59b..f1c224cf 100644
--- a/config/libc/glibc.in.2
+++ b/config/libc/glibc.in.2
@@ -1,31 +1,7 @@
 # This file contains the common configuration options
 # that apply to both glibc.
 
-# Some architectures require the ports addon. List them one by one here:
-# This list must be carefully in sync with the architectures names
-# we can find in config/arch/*
-
-# Ports were integrated into the main tarball in 2.17
-config LIBC_GLIBC_PORTS_EXTERNAL
-    def_bool y
-    depends on !LIBC_GLIBC_2_17_or_later
-
-config LIBC_GLIBC_NEEDS_PORTS
-    def_bool y
-    depends on ARCH_alpha || ARCH_arm || ARCH_m68k || ARCH_mips || ARCH_powerpc
-
-# Ports are no longer an add-on starting with 2.20
-config LIBC_GLIBC_USE_PORTS
-    def_bool y
-    depends on LIBC_GLIBC_NEEDS_PORTS && !LIBC_GLIBC_2_20_or_later
-
-# Force using the BFD linker during the toolchain build
-config LIBC_glibc_family
-    bool
-    default y
-    select BINUTILS_FORCE_LD_BFD_DEFAULT
-
-config LIBC_GLIBC_EXTRA_CONFIG_ARRAY
+config GLIBC_EXTRA_CONFIG_ARRAY
     string
     prompt "extra config"
     default ""
@@ -36,7 +12,7 @@ config LIBC_GLIBC_EXTRA_CONFIG_ARRAY
       if they are properly quoted (or escaped, but prefer quotes). Eg.:
           --with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space
 
-config LIBC_GLIBC_CONFIGPARMS
+config GLIBC_CONFIGPARMS
     string
     prompt "Extra config params (READ HELP)"
     default "" if ! ARCH_sh
@@ -51,14 +27,14 @@ config LIBC_GLIBC_CONFIGPARMS
       Note: If you need to pass more than one value, separate them with
             '\n'. Eg.:  var1=val1\nvar2=val2
 
-config LIBC_GLIBC_EXTRA_CFLAGS
+config GLIBC_EXTRA_CFLAGS
     string
     prompt "extra target CFLAGS"
     default ""
     help
       Extra target CFLAGS to use when building.
 
-config LIBC_ENABLE_FORTIFIED_BUILD
+config GLIBC_ENABLE_FORTIFIED_BUILD
     bool
     prompt "Enable fortified build (EXPERIMENTAL)"
     depends on EXPERIMENTAL
@@ -78,13 +54,13 @@ config LIBC_ENABLE_FORTIFIED_BUILD
       here. Otherwise, be still and say 'n' (the default). ;-)
 
 
-config LIBC_DISABLE_VERSIONING
+config GLIBC_DISABLE_VERSIONING
     bool
     prompt "Disable symbols versioning"
     help
       Do not include versioning information in the library objects.
 
-config LIBC_OLDEST_ABI
+config GLIBC_OLDEST_ABI
     string
     prompt "Oldest supported ABI"
     default ""
@@ -96,7 +72,7 @@ config LIBC_OLDEST_ABI
 
       If this option is not set, (e)glibc will choose for you.
 
-config LIBC_GLIBC_FORCE_UNWIND
+config GLIBC_FORCE_UNWIND
     bool
     prompt "Force unwind support (READ HELP!)"
     default y
@@ -112,7 +88,7 @@ config LIBC_GLIBC_FORCE_UNWIND
       of glibc on some architectures
       (seen on s390, s390x and x86_64).
 
-config LIBC_ADDONS_LIST
+config GLIBC_ADDONS_LIST
     string
     prompt "Extra addons"
     default ""
@@ -128,7 +104,7 @@ config LIBC_ADDONS_LIST
 
       Eg.: libidn
 
-config LIBC_LOCALES
+config GLIBC_LOCALES
     bool
     prompt "Build and install locales"
     help
@@ -149,12 +125,12 @@ endif # LIBC_glibc && LIBC_LOCALES
 
 if KERNEL_linux
 
-choice LIBC_GLIBC_SUPPORTED_KERNEL
+choice GLIBC_SUPPORTED_KERNEL
     bool
     prompt "Minimum supported kernel version"
-    default LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS
+    default GLIBC_KERNEL_VERSION_AS_HEADERS
 
-config LIBC_GLIBC_KERNEL_VERSION_NONE
+config GLIBC_KERNEL_VERSION_NONE
     bool
     prompt "Let ./configure decide"
     help
@@ -172,7 +148,7 @@ config LIBC_GLIBC_KERNEL_VERSION_NONE
         powerpc*                Requires Linux 2.4.19
         arm*-*-linux-*gnueabi   Requires Linux 2.6.16
 
-config LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS
+config GLIBC_KERNEL_VERSION_AS_HEADERS
     bool
     prompt "Same as kernel headers (default)"
     help
@@ -195,7 +171,7 @@ config LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS
       chosen kernel headers version (CT_KERNEL_VERSION), you can choose
       "y" here.
 
-config LIBC_GLIBC_KERNEL_VERSION_CHOSEN
+config GLIBC_KERNEL_VERSION_CHOSEN
     bool
     prompt "Specific kernel version"
     help
@@ -213,9 +189,9 @@ config LIBC_GLIBC_KERNEL_VERSION_CHOSEN
 
       Most people can leave this at the default value of "2.6.9".
 
-if LIBC_GLIBC_KERNEL_VERSION_CHOSEN
+if GLIBC_KERNEL_VERSION_CHOSEN
 
-config LIBC_GLIBC_MIN_KERNEL_VERSION
+config GLIBC_MIN_KERNEL_VERSION
     string
     prompt "Minimum kernel version to support"
     default "2.6.9"
@@ -232,14 +208,14 @@ config LIBC_GLIBC_MIN_KERNEL_VERSION
       Note that no sanity check is performed by crosstool-NG to ensure
       that the value you enter here is appropriate for your target.
 
-endif # LIBC_GLIBC_KERNEL_VERSION_CHOSEN
+endif # GLIBC_KERNEL_VERSION_CHOSEN
 
 endchoice
 
-config LIBC_GLIBC_MIN_KERNEL
+config GLIBC_MIN_KERNEL
     string
-    default ""                            if LIBC_GLIBC_KERNEL_VERSION_NONE
-    default KERNEL_VERSION                if LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS
-    default LIBC_GLIBC_MIN_KERNEL_VERSION if LIBC_GLIBC_KERNEL_VERSION_CHOSEN
+    default ""                            if GLIBC_KERNEL_VERSION_NONE
+    default KERNEL_VERSION                if GLIBC_KERNEL_VERSION_AS_HEADERS
+    default GLIBC_MIN_KERNEL_VERSION      if GLIBC_KERNEL_VERSION_CHOSEN
 
 endif # KERNEL_linux
diff --git a/config/libc/mingw-w64.in b/config/libc/mingw-w64.in
new file mode 100644
index 00000000..769c976f
--- /dev/null
+++ b/config/libc/mingw-w64.in
@@ -0,0 +1,39 @@
+# mingw options
+
+## depends on WINDOWS
+##
+## select LIBC_SUPPORT_THREADS_NATIVE
+## select LIBC_SUPPORT_THREADS_POSIX
+## select CC_CORE_PASS_2_NEEDED
+##
+## help The de-facto standard for Mingw distributions.
+
+source "config/versions/mingw-w64.in"
+
+config THREADS
+    default "win32"  if THREADS_NATIVE
+    default "posix"  if THREADS_POSIX
+
+config MINGW_SECURE_API
+    bool "Expose secure API prototypes"
+    default y
+
+config MINGW_DIRECTX
+    bool "Include DirectX development files"
+
+config MINGW_DDK
+    bool "Include DDK development files"
+
+config MINGW_TOOLS
+    bool "Include the companion tools"
+    default y
+    help
+      Build the companion tools with mingw such as widl, gendef,
+      and genpeimg.
+
+config MINGW_TOOL_LIST_ARRAY
+    string "List of mingw-w64 tools to build"
+    default "gendef genidl genlib genpeimg widl"
+    depends on MINGW_TOOLS
+    help
+      List of mingw-w64 tools to build.
diff --git a/config/libc/mingw.in b/config/libc/mingw.in
deleted file mode 100644
index 0ca1823f..00000000
--- a/config/libc/mingw.in
+++ /dev/null
@@ -1,159 +0,0 @@
-# mingw options
-
-## depends on WINDOWS
-##
-## select LIBC_SUPPORT_THREADS_NATIVE
-## select LIBC_SUPPORT_THREADS_POSIX
-## select CC_CORE_PASS_2_NEEDED
-##
-## help The de-facto standard for Mingw distributions.
-
-config THREADS
-    default "win32"  if THREADS_NATIVE
-    default "posix"  if THREADS_POSIX
-
-choice
-    bool
-    prompt "Windows API version"
-
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config WINAPI_V_5_0_2
-    bool
-    prompt "5.0.2"
-
-config WINAPI_V_5_0_1
-    bool
-    prompt "5.0.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_5_0_0
-    bool
-    prompt "5.0.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_4_0_6
-    bool
-    prompt "4.0.6"
-
-config WINAPI_V_4_0_5
-    bool
-    prompt "4.0.5 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_4_0_4
-    bool
-    prompt "4.0.4 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_4_0_2
-    bool
-    prompt "4.0.2 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_4_0_1
-    bool
-    prompt "4.0.1 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_4_0_0
-    bool
-    prompt "4.0.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_3_3_0
-    bool
-    prompt "3.3.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_3_2_0
-    bool
-    prompt "3.2.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_3_1_0
-    bool
-    prompt "3.1.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_3_0_0
-    bool
-    prompt "3.0.0 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_2_0_9
-    bool
-    prompt "2.0.9 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_2_0_8
-    bool
-    prompt "2.0.8 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_2_0_7
-    bool
-    prompt "2.0.7 (OBSOLETE)"
-    depends on OBSOLETE
-
-config WINAPI_V_select
-    bool
-    prompt "Other version"
-
-config WINAPI_V_DEVEL
-    bool
-    prompt "devel"
-    depends on EXPERIMENTAL
-    depends on CONFIGURE_has_git
-
-endchoice
-
-config WINAPI_VERSION
-    string
-    prompt "Windows API version" if WINAPI_V_select
-    default "devel" if WINAPI_V_DEVEL
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "5.0.2" if WINAPI_V_5_0_2
-    default "5.0.1" if WINAPI_V_5_0_1
-    default "5.0.0" if WINAPI_V_5_0_0
-    default "4.0.6" if WINAPI_V_4_0_6
-    default "4.0.5" if WINAPI_V_4_0_5
-    default "4.0.4" if WINAPI_V_4_0_4
-    default "4.0.2" if WINAPI_V_4_0_2
-    default "4.0.1" if WINAPI_V_4_0_1
-    default "4.0.0" if WINAPI_V_4_0_0
-    default "3.3.0" if WINAPI_V_3_3_0
-    default "3.2.0" if WINAPI_V_3_2_0
-    default "3.1.0" if WINAPI_V_3_1_0
-    default "3.0.0" if WINAPI_V_3_0_0
-    default "2.0.9" if WINAPI_V_2_0_9
-    default "2.0.8" if WINAPI_V_2_0_8
-    default "2.0.7" if WINAPI_V_2_0_7
-    help
-      Enter the version number of the Windows API files to use
-
-config MINGW_SECURE_API
-    bool "Expose secure API prototypes"
-    default y
-
-config MINGW_DIRECTX
-    bool "Include DirectX development files"
-
-config MINGW_DDK
-    bool "Include DDK development files"
-
-config MINGW_TOOLS
-    bool "Include the companion tools"
-    default y
-    help
-      Build the companion tools with mingw such as widl, gendef,
-      and genpeimg.
-
-config MINGW_TOOL_LIST_ARRAY
-    string "List of mingw-w64 tools to build"
-    default "gendef genidl genlib genpeimg widl"
-    depends on MINGW_TOOLS
-    help
-      List of mingw-w64 tools to build.
diff --git a/config/libc/musl.in b/config/libc/musl.in
index 5ea166f1..24f522a6 100644
--- a/config/libc/musl.in
+++ b/config/libc/musl.in
@@ -10,66 +10,8 @@
 ## help devices. musl is lightweight, fast, simple, free, and strives to be
 ## help correct in the sense of standards-conformance and safety.
 
+source "config/versions/musl.in"
+
+# FIXME why? it claims "native", why report "musl"?
 config THREADS
     default "musl"
-
-config LIBC_MUSL_CUSTOM
-    bool
-    prompt "Custom musl"
-    depends on EXPERIMENTAL
-    help
-      The choosen musl-libc version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-if LIBC_MUSL_CUSTOM
-
-config LIBC_MUSL_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom musl-libc source"
-    help
-      Enter the path to the directory or tarball of your source for musl.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component, musl, and the version is set
-      below in the custom version string.
-
-config LIBC_MUSL_CUSTOM_VERSION
-    string
-    prompt "Custom MUSL version"
-    help
-      Enter the version number for your custom musl-libc.
-
-config LIBC_VERSION
-    string
-    default LIBC_MUSL_CUSTOM_VERSION
-
-endif # LIBC_MUSL_CUSTOM
-
-if ! LIBC_MUSL_CUSTOM
-
-choice
-    bool
-    prompt "musl version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBC_MUSL_V_1_1_16
-    bool
-    prompt "1.1.16"
-    depends on EXPERIMENTAL
-
-config LIBC_MUSL_V_1_1_15
-    bool
-    prompt "1.1.15 (OBSOLETE)"
-    depends on EXPERIMENTAL && OBSOLETE
-
-endchoice
-
-config LIBC_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "1.1.16" if LIBC_MUSL_V_1_1_16
-    default "1.1.15" if LIBC_MUSL_V_1_1_15
-
-endif # ! LIBC_MUSL_CUSTOM
diff --git a/config/libc/newlib.in b/config/libc/newlib.in
index 68e8b62c..5354fef9 100644
--- a/config/libc/newlib.in
+++ b/config/libc/newlib.in
@@ -12,209 +12,12 @@
 ## help is only available in source form. It can be compiled for a wide
 ## help array of processors, and will usually work on any architecture with
 ## help the addition of a few low-level routines.
-#
-config LIBC_NEWLIB_CUSTOM
-    bool
-    prompt "Custom newlib"
-    depends on EXPERIMENTAL
-    select LIBC_NEWLIB_2_5_or_later
-    help
-      The choosen newlib version shall be not downloaded. Instead use
-      a custom location to get the source.
 
-if LIBC_NEWLIB_CUSTOM
-
-config LIBC_NEWLIB_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom newlib source"
-    help
-      Enter the path to the directory or tarball of your source for newlib.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component, newlib, and the version is set
-      below in the custom version string.
-
-config LIBC_NEWLIB_CUSTOM_VERSION
-    string
-    prompt "Custom NEWLIB version"
-    help
-      Enter the version number for your custom newlib.
-
-config LIBC_VERSION
-    string
-    default LIBC_NEWLIB_CUSTOM_VERSION
-
-endif # LIBC_NEWLIB_CUSTOM
-
-if ! LIBC_NEWLIB_CUSTOM
-
-config CC_NEWLIB_SHOW_LINARO
-    bool
-    prompt "Show Linaro versions"
-    help
-      Linaro is maintaining some advanced/more stable/experimental versions
-      of newlib, especially for the ARM architecture.
-
-      Those versions have not been blessed by the newlib comunity (nor have they
-      been cursed either!), but they look to be pretty much stable, and even
-      more stable than the upstream versions. YMMV...
-
-      If you do not know what this Linaro stuff is, then simply say 'n' here,
-      and rest in peace. OTOH, if you know what you are doing, you will be
-      able to use and enjoy :-) the Linaro versions by saying 'y' here.
-
-      Linaro: http://www.linaro.org/
-
-choice
-    bool
-    prompt "newlib version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-config LIBC_NEWLIB_V_2_5_0
-    bool
-    prompt "2.5.0.20170519"
-    select LIBC_NEWLIB_2_5
-
-config LIBC_NEWLIB_V_2_4_0
-    bool
-    prompt "2.4.0.20161025"
-    select LIBC_NEWLIB_2_4
-
-config LIBC_NEWLIB_V_2_3_0
-    bool
-    prompt "2.3.0.20160226"
-    select LIBC_NEWLIB_2_3
-
-config LIBC_NEWLIB_LINARO_V_2_2_0
-    bool
-    prompt "Linaro 2.2.0-2015.01"
-    depends on CC_NEWLIB_SHOW_LINARO
-    select LIBC_NEWLIB_2_2
-
-config LIBC_NEWLIB_V_2_2_0
-    bool
-    prompt "2.2.0.20151023"
-    select LIBC_NEWLIB_2_2
-
-config LIBC_NEWLIB_LINARO_V_2_1_0
-    bool
-    prompt "Linaro 2.1.0-2014.09"
-    depends on CC_NEWLIB_SHOW_LINARO
-    select LIBC_NEWLIB_2_1
-
-config LIBC_NEWLIB_V_2_1_0
-    bool
-    prompt "2.1.0"
-    select LIBC_NEWLIB_2_1
-
-config LIBC_NEWLIB_V_2_0_0
-    bool
-    prompt "2.0.0"
-    select LIBC_NEWLIB_2_0
-
-config LIBC_NEWLIB_V_1_20_0
-    bool
-    prompt "1.20.0"
-
-config LIBC_NEWLIB_V_1_19_0
-    bool
-    prompt "1.19.0"
-
-config LIBC_NEWLIB_V_1_18_0
-    bool
-    prompt "1.18.0"
-
-config LIBC_NEWLIB_V_1_17_0
-    bool
-    prompt "1.17.0"
-
-endchoice
-
-endif # ! LIBC_NEWLIB_CUSTOM
-
-config LIBC_NEWLIB_2_5
-    bool
-    select LIBC_NEWLIB_2_5_or_later
-
-config LIBC_NEWLIB_2_4
-    bool
-    select LIBC_NEWLIB_2_4_or_later
-
-config LIBC_NEWLIB_2_3
-    bool
-    select LIBC_NEWLIB_2_3_or_later
-
-config LIBC_NEWLIB_2_2
-    bool
-    select LIBC_NEWLIB_2_2_or_later
-
-config LIBC_NEWLIB_2_1
-    bool
-    select LIBC_NEWLIB_2_1_or_later
-
-config LIBC_NEWLIB_2_0
-    bool
-    select LIBC_NEWLIB_2_0_or_later
-
-config LIBC_NEWLIB_2_5_or_later
-    bool
-    select LIBC_NEWLIB_2_4_or_later
-
-config LIBC_NEWLIB_2_4_or_later
-    bool
-    select LIBC_NEWLIB_2_3_or_later
-
-config LIBC_NEWLIB_2_3_or_later
-    bool
-    select LIBC_NEWLIB_2_2_or_later
-
-config LIBC_NEWLIB_2_2_or_later
-    bool
-    select LIBC_NEWLIB_2_1_or_later
-
-config LIBC_NEWLIB_2_1_or_later
-    bool
-    select LIBC_NEWLIB_2_0_or_later
+source "config/versions/newlib.in"
 
 # maybe older versions of newlib will support it too, but this
 # needs to be checked
-config LIBC_NEWLIB_2_0_or_later
-    bool
+config NEWLIB_CXA_ATEXIT
+    def_bool y
+    depends on NEWLIB_2_0_or_later
     select LIBC_PROVIDES_CXA_ATEXIT
-
-if ! LIBC_NEWLIB_CUSTOM
-config LIBC_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "2.5.0.20170519" if LIBC_NEWLIB_V_2_5_0
-    default "2.4.0.20161025" if LIBC_NEWLIB_V_2_4_0
-    default "2.3.0.20160226" if LIBC_NEWLIB_V_2_3_0
-    default "linaro-2.2.0-2015.01" if LIBC_NEWLIB_LINARO_V_2_2_0
-    default "2.2.0.20151023" if LIBC_NEWLIB_V_2_2_0
-    default "linaro-2.1.0-2014.09" if LIBC_NEWLIB_LINARO_V_2_1_0
-    default "2.1.0" if LIBC_NEWLIB_V_2_1_0
-    default "2.0.0" if LIBC_NEWLIB_V_2_0_0
-    default "1.20.0" if LIBC_NEWLIB_V_1_20_0
-    default "1.19.0" if LIBC_NEWLIB_V_1_19_0
-    default "1.18.0" if LIBC_NEWLIB_V_1_18_0
-    default "1.17.0" if LIBC_NEWLIB_V_1_17_0
-    help
-      Enter the tag you want to use.
-      Leave empty to use the 'head' of the repository.
-
-endif # ! LIBC_NEWLIB_CUSTOM
-
-config LIBC_NEWLIB_TARGET_CFLAGS
-    string
-    prompt "Target CFLAGS for newlib"
-    default ""
-    help
-      Used to add specific options when compiling the target libraries
-      (eg. -ffunction-sections -fdata-sections), which can't be defined
-      in global TARGET_CFLAGS, because they shall be not used for the
-      gcc target libraries.
-      Note:  Both TARGET_CFLAGS and LIBC_NEWLIB_TARGET_CFLAGS are used
-             to compile the libraries.
-
-      Leave blank if you don't know better.
diff --git a/config/libc/newlib.in.2 b/config/libc/newlib.in.2
index 96bd22bf..f73128c3 100644
--- a/config/libc/newlib.in.2
+++ b/config/libc/newlib.in.2
@@ -1,5 +1,19 @@
 # newlib second-part options
 
+config LIBC_NEWLIB_TARGET_CFLAGS
+    string
+    prompt "Target CFLAGS for newlib"
+    default ""
+    help
+      Used to add specific options when compiling the target libraries
+      (eg. -ffunction-sections -fdata-sections), which can't be defined
+      in global TARGET_CFLAGS, because they shall be not used for the
+      gcc target libraries.
+      Note:  Both TARGET_CFLAGS and LIBC_NEWLIB_TARGET_CFLAGS are used
+             to compile the libraries.
+
+      Leave blank if you don't know better.
+
 config LIBC_NEWLIB_IO_C99FMT
     bool
     prompt "Enable IOs on C99 formats"
diff --git a/config/libc/uClibc.in b/config/libc/uClibc.in
index a85cf215..8f91aa01 100644
--- a/config/libc/uClibc.in
+++ b/config/libc/uClibc.in
@@ -4,6 +4,7 @@
 ##
 ## select LIBC_SUPPORT_THREADS_LT
 ## select LIBC_SUPPORT_THREADS_NONE
+## select LIBC_SUPPORT_THREADS_NATIVE if UCLIBC_0_9_33_2_or_later
 ## select CC_CORE_PASSES_NEEDED
 ##
 ## help The de-facto standard for embeded linux systems.
@@ -11,6 +12,8 @@
 ## help Highly configurable, thus as feature-rich as you
 ## help need, without compromising for size.
 
+source "config/versions/uClibc-ng.in"
+
 config THREADS
     default "nptl"          if THREADS_NATIVE
     default "linuxthreads"  if THREADS_LT
@@ -20,141 +23,18 @@ comment "'softfp' ABI and uClibc is not entirely tested in crosstool-NG"
 comment "You may experience issues, although it should work just fine"
 endif # ARCH_FLOAT_SOFTFP
 
-config LIBC_UCLIBC_CUSTOM
-    bool
-    prompt "Custom uClibc"
-    depends on EXPERIMENTAL
-    help
-      The choosen uclibc version shall be not downloaded. Instead use
-      a custom location to get the source.
-
-if LIBC_UCLIBC_CUSTOM
-
-choice
-    bool
-    prompt "uClibc Version Name"
-
-config LIBC_UCLIBC_CUSTOM_UCLIBC
-    bool "uClibc (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_UCLIBC_0_9_33_2_or_later
-
-config LIBC_UCLIBC_CUSTOM_UCLIBC_NG
-    bool "uClibc-ng (1.0.15 or later)"
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_CUSTOM_UCLIBC_NG_OLD
-    bool "uClibc-ng (older than 1.0.15)"
-    select LIBC_UCLIBC_NG_1_0_0_or_later
-
-endchoice
-
-config LIBC_UCLIBC_CUSTOM_LOCATION
-    string
-    prompt "Full path to custom uClibc source"
-    help
-      Enter the path to the directory or tarball of your source for uClibc.
-
-      If the path is a tarball, it should extract to: <name>-<version>/
-      where the name is this component will be set by the uClibc Version Name
-      option from above, and the version is set below in the custom version
-      string.
-
-config LIBC_UCLIBC_CUSTOM_VERSION
-    string
-    prompt "Custom uClibc Version"
-    help
-      Enter the version number for your custom uClibc.
-      Version 1.0.18 is only enabled in EXPERIMENTAL builds due to issues
-      with static libraries.
-
-config LIBC_VERSION
-    string
-    default LIBC_UCLIBC_CUSTOM_VERSION
-
-endif # LIBC_UCLIBC_CUSTOM
-
-if ! LIBC_UCLIBC_CUSTOM
-
-choice
-    bool
-    prompt "uClibc version"
-# Don't remove next line
-# CT_INSERT_VERSION_BELOW
-
-config LIBC_UCLIBC_NG_V_1_0_25
-    bool
-    prompt "1.0.25"
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_NG_V_1_0_24
-    bool
-    prompt "1.0.24"
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_NG_V_1_0_23
-    bool
-    prompt "1.0.23"
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_NG_V_1_0_22
-    bool
-    prompt "1.0.22"
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_NG_V_1_0_21
-    bool
-    prompt "1.0.21 (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_NG_V_1_0_20
-    bool
-    prompt "1.0.20 (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_UCLIBC_NG_1_0_15_or_later
-
-config LIBC_UCLIBC_V_0_9_33_2
-    bool
-    prompt "0.9.33.2 (OBSOLETE)"
-    depends on OBSOLETE
-    select LIBC_UCLIBC_0_9_33_2_or_later
-
-endchoice
-
-config LIBC_VERSION
-    string
-# Don't remove next line
-# CT_INSERT_VERSION_STRING_BELOW
-    default "1.0.25" if LIBC_UCLIBC_NG_V_1_0_25
-    default "1.0.24" if LIBC_UCLIBC_NG_V_1_0_24
-    default "1.0.23" if LIBC_UCLIBC_NG_V_1_0_23
-    default "1.0.22" if LIBC_UCLIBC_NG_V_1_0_22
-    default "1.0.21" if LIBC_UCLIBC_NG_V_1_0_21
-    default "1.0.20" if LIBC_UCLIBC_NG_V_1_0_20
-    default "0.9.33.2" if LIBC_UCLIBC_V_0_9_33_2
-
-endif # ! LIBC_UCLIBC_CUSTOM
-
-config LIBC_UCLIBC_NG_1_0_15_or_later
-    bool
-    select LIBC_UCLIBC_NG_1_0_0_or_later
-
-config LIBC_UCLIBC_NG_1_0_0_or_later
-    bool
-    select LIBC_UCLIBC_NG
-    select LIBC_UCLIBC_0_9_33_2_or_later
-
-config LIBC_UCLIBC_0_9_33_2_or_later
-    bool
-    select LIBC_SUPPORT_THREADS_NATIVE
-    select LIBC_UCLIBC_PARALLEL
-
 config LIBC_UCLIBC_PARALLEL
-    bool
+    def_bool y
+    depends on UCLIBC_0_9_33_2_or_later
 
 config LIBC_UCLIBC_NG
-    bool
+    def_bool y
+    depends on UCLIBC_1_0_0_or_later
+
+# uClibc-ng 1.0.15 did away with 2 implementations of linuxthreads
+config UCLIBC_MERGED_LINUXTHREADS
+    def_bool y
+    depends on UCLIBC_1_0_15_or_later
 
 choice
     bool
diff --git a/config/libc/uClibc.in.2 b/config/libc/uClibc.in.2
index 1b348554..7bf8f2aa 100644
--- a/config/libc/uClibc.in.2
+++ b/config/libc/uClibc.in.2
@@ -1,6 +1,6 @@
 # uClibc second-part option
 
-if THREADS_LT && !LIBC_UCLIBC_NG_1_0_15_or_later
+if THREADS_LT && !UCLIBC_MERGED_LINUXTHREADS
 
 choice
     bool
@@ -30,12 +30,11 @@ endchoice
 
 endif # THREADS_LT
 
-# uClibc-ng 1.0.15 did away with 2 implementations of linuxthreads
 config LIBC_UCLIBC_LNXTHRD
     string
     default ""      if THREADS_NONE
     default ""      if THREADS_NATIVE
-    default ""      if LIBC_UCLIBC_NG_1_0_15_or_later
+    default ""      if UCLIBC_MERGED_LINUXTHREADS
     default "old"   if LIBC_UCLIBC_LNXTHRD_OLD
     default "new"   if LIBC_UCLIBC_LNXTHRD_NEW
 
diff --git a/maintainer/gen-versions.sh b/maintainer/gen-versions.sh
index 726251f7..99e97918 100755
--- a/maintainer/gen-versions.sh
+++ b/maintainer/gen-versions.sh
@@ -465,10 +465,6 @@ enter_version()
     local version="${1}"
     local tmp milestone
 
-    # Set defaults
-    info[obsolete]=
-    info[experimental]=
-
     eval `read_version_desc ${info[fork]} ${version}`
     info[ver]=${version}
     info[kcfg]=`kconfigize ${version}`
diff --git a/packages/avr-libc/1.8.0/version.desc b/packages/avr-libc/1.8.0/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/avr-libc/1.8.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/avr-libc/1.8.1/version.desc b/packages/avr-libc/1.8.1/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/avr-libc/1.8.1/version.desc
diff --git a/packages/avr-libc/2.0.0/version.desc b/packages/avr-libc/2.0.0/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/avr-libc/2.0.0/version.desc
diff --git a/packages/avr-libc/package.desc b/packages/avr-libc/package.desc
new file mode 100644
index 00000000..fa9571e3
--- /dev/null
+++ b/packages/avr-libc/package.desc
@@ -0,0 +1 @@
+repository="svn svn://svn.savannah.nongnu.org/avr-libc/trunk/avr-libc"
diff --git a/packages/bionic/10e/version.desc b/packages/bionic/10e/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/bionic/10e/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/bionic/11c/version.desc b/packages/bionic/11c/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/bionic/11c/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/bionic/12b/version.desc b/packages/bionic/12b/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/bionic/12b/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/bionic/13b/version.desc b/packages/bionic/13b/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/bionic/13b/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/bionic/14b/version.desc b/packages/bionic/14b/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/bionic/14b/version.desc
diff --git a/packages/bionic/15-beta2/version.desc b/packages/bionic/15-beta2/version.desc
new file mode 100644
index 00000000..03502fc9
--- /dev/null
+++ b/packages/bionic/15-beta2/version.desc
@@ -0,0 +1 @@
+experimental="yes"
diff --git a/packages/bionic/package.desc b/packages/bionic/package.desc
new file mode 100644
index 00000000..fe2c7727
--- /dev/null
+++ b/packages/bionic/package.desc
@@ -0,0 +1 @@
+# We don't support building bionic (yet) so no official repository
diff --git a/patches/glibc/2.20/100-sparc-nptl.patch b/packages/glibc-linaro/2.20-2014.11/100-sparc-nptl.patch
index 21f03379..21f03379 100644
--- a/patches/glibc/2.20/100-sparc-nptl.patch
+++ b/packages/glibc-linaro/2.20-2014.11/100-sparc-nptl.patch
diff --git a/patches/glibc/2.12.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc-linaro/2.20-2014.11/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..6fd663a2 100644
--- a/patches/glibc/2.12.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc-linaro/2.20-2014.11/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
diff --git a/patches/glibc/2.12.1/102-fix-signed-shift-overlow.patch b/packages/glibc-linaro/2.20-2014.11/102-fix-signed-shift-overlow.patch
index ef49f831..ef49f831 100644
--- a/patches/glibc/2.12.1/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc-linaro/2.20-2014.11/102-fix-signed-shift-overlow.patch
diff --git a/patches/glibc/2.14.1/103-dl-openat64-variadic.patch b/packages/glibc-linaro/2.20-2014.11/103-dl-openat64-variadic.patch
index fe94b96d..fe94b96d 100644
--- a/patches/glibc/2.14.1/103-dl-openat64-variadic.patch
+++ b/packages/glibc-linaro/2.20-2014.11/103-dl-openat64-variadic.patch
diff --git a/patches/glibc/2.19/104-unused-variables.patch b/packages/glibc-linaro/2.20-2014.11/104-unused-variables.patch
index 889c9bbc..889c9bbc 100644
--- a/patches/glibc/2.19/104-unused-variables.patch
+++ b/packages/glibc-linaro/2.20-2014.11/104-unused-variables.patch
diff --git a/patches/glibc/2.12.1/105-misleading-indentation.patch b/packages/glibc-linaro/2.20-2014.11/105-misleading-indentation.patch
index 1dd8d851..1dd8d851 100644
--- a/patches/glibc/2.12.1/105-misleading-indentation.patch
+++ b/packages/glibc-linaro/2.20-2014.11/105-misleading-indentation.patch
diff --git a/patches/glibc/2.18/106-dl-open-array-bounds.patch b/packages/glibc-linaro/2.20-2014.11/106-dl-open-array-bounds.patch
index 08a90765..08a90765 100644
--- a/patches/glibc/2.18/106-dl-open-array-bounds.patch
+++ b/packages/glibc-linaro/2.20-2014.11/106-dl-open-array-bounds.patch
diff --git a/patches/glibc/2.19/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc-linaro/2.20-2014.11/140-Fix-combreloc-test-BSD-grep.patch
index fdc3a606..fdc3a606 100644
--- a/patches/glibc/2.19/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc-linaro/2.20-2014.11/140-Fix-combreloc-test-BSD-grep.patch
diff --git a/patches/glibc/2.12.1/920-fix-rpc_parse-format.patch b/packages/glibc-linaro/2.20-2014.11/920-fix-rpc_parse-format.patch
index 37e58dac..37e58dac 100644
--- a/patches/glibc/2.12.1/920-fix-rpc_parse-format.patch
+++ b/packages/glibc-linaro/2.20-2014.11/920-fix-rpc_parse-format.patch
diff --git a/patches/glibc/2.19/930-explicit-boolean.patch b/packages/glibc-linaro/2.20-2014.11/930-explicit-boolean.patch
index 780fae63..780fae63 100644
--- a/patches/glibc/2.19/930-explicit-boolean.patch
+++ b/packages/glibc-linaro/2.20-2014.11/930-explicit-boolean.patch
diff --git a/patches/glibc/2.12.1/940-nis-bogus-conditional.patch b/packages/glibc-linaro/2.20-2014.11/940-nis-bogus-conditional.patch
index 09b38cf1..09b38cf1 100644
--- a/patches/glibc/2.12.1/940-nis-bogus-conditional.patch
+++ b/packages/glibc-linaro/2.20-2014.11/940-nis-bogus-conditional.patch
diff --git a/packages/glibc-linaro/2.20-2014.11/version.desc b/packages/glibc-linaro/2.20-2014.11/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/glibc-linaro/2.20-2014.11/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/glibc-linaro/package.desc b/packages/glibc-linaro/package.desc
new file mode 100644
index 00000000..c1f1a95f
--- /dev/null
+++ b/packages/glibc-linaro/package.desc
@@ -0,0 +1,4 @@
+master="glibc"
+origin="Linaro"
+repository="git https://git.linaro.org/toolchain/glibc.git"
+experimental="yes"
diff --git a/patches/glibc/2.13/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.12.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..6fd663a2 100644
--- a/patches/glibc/2.13/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc/2.12.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
diff --git a/patches/glibc/2.13/102-fix-signed-shift-overlow.patch b/packages/glibc/2.12.1/102-fix-signed-shift-overlow.patch
index ef49f831..ef49f831 100644
--- a/patches/glibc/2.13/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc/2.12.1/102-fix-signed-shift-overlow.patch
diff --git a/patches/glibc/2.12.1/104-unused-variables.patch b/packages/glibc/2.12.1/104-unused-variables.patch
index e063675a..e063675a 100644
--- a/patches/glibc/2.12.1/104-unused-variables.patch
+++ b/packages/glibc/2.12.1/104-unused-variables.patch
diff --git a/patches/glibc/2.13/105-misleading-indentation.patch b/packages/glibc/2.12.1/105-misleading-indentation.patch
index 1dd8d851..1dd8d851 100644
--- a/patches/glibc/2.13/105-misleading-indentation.patch
+++ b/packages/glibc/2.12.1/105-misleading-indentation.patch
diff --git a/patches/glibc/2.12.1/106-dl-open-array-bounds.patch b/packages/glibc/2.12.1/106-dl-open-array-bounds.patch
index bdb5c19f..bdb5c19f 100644
--- a/patches/glibc/2.12.1/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.12.1/106-dl-open-array-bounds.patch
diff --git a/patches/glibc/2.12.1/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.12.1/140-Fix-combreloc-test-BSD-grep.patch
index 530d4ff1..530d4ff1 100644
--- a/patches/glibc/2.12.1/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.12.1/140-Fix-combreloc-test-BSD-grep.patch
diff --git a/patches/glibc/2.12.1/300-macos-cross-rpcgen.patch b/packages/glibc/2.12.1/300-macos-cross-rpcgen.patch
index e654644c..e654644c 100644
--- a/patches/glibc/2.12.1/300-macos-cross-rpcgen.patch
+++ b/packages/glibc/2.12.1/300-macos-cross-rpcgen.patch
diff --git a/patches/glibc/2.12.1/900-march-i686.patch b/packages/glibc/2.12.1/900-march-i686.patch
index 7f5b1cee..7f5b1cee 100644
--- a/patches/glibc/2.12.1/900-march-i686.patch
+++ b/packages/glibc/2.12.1/900-march-i686.patch
diff --git a/patches/glibc/2.12.1/910-typedef-caddr.patch b/packages/glibc/2.12.1/910-typedef-caddr.patch
index e29e8101..e29e8101 100644
--- a/patches/glibc/2.12.1/910-typedef-caddr.patch
+++ b/packages/glibc/2.12.1/910-typedef-caddr.patch
diff --git a/patches/glibc/2.12.2/920-fix-rpc_parse-format.patch b/packages/glibc/2.12.1/920-fix-rpc_parse-format.patch
index 37e58dac..37e58dac 100644
--- a/patches/glibc/2.12.2/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.12.1/920-fix-rpc_parse-format.patch
diff --git a/patches/glibc/2.12.1/920-make-382.patch b/packages/glibc/2.12.1/920-make-382.patch
index 28be2fed..28be2fed 100644
--- a/patches/glibc/2.12.1/920-make-382.patch
+++ b/packages/glibc/2.12.1/920-make-382.patch
diff --git a/patches/glibc/2.12.2/940-nis-bogus-conditional.patch b/packages/glibc/2.12.1/940-nis-bogus-conditional.patch
index 09b38cf1..09b38cf1 100644
--- a/patches/glibc/2.12.2/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.12.1/940-nis-bogus-conditional.patch
diff --git a/patches/glibc/2.12.1/999-new-tools.patch b/packages/glibc/2.12.1/999-new-tools.patch
index d600b58a..d600b58a 100644
--- a/patches/glibc/2.12.1/999-new-tools.patch
+++ b/packages/glibc/2.12.1/999-new-tools.patch
diff --git a/packages/glibc/2.12.1/version.desc b/packages/glibc/2.12.1/version.desc
new file mode 100644
index 00000000..fb988b5d
--- /dev/null
+++ b/packages/glibc/2.12.1/version.desc
@@ -0,0 +1 @@
+# Not obsolete (CentOS 6, EOL 11/2020)
diff --git a/patches/glibc/2.12.2/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.12.2/140-Fix-combreloc-test-BSD-grep.patch
index 530d4ff1..530d4ff1 100644
--- a/patches/glibc/2.12.2/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.12.2/140-Fix-combreloc-test-BSD-grep.patch
diff --git a/patches/glibc/2.12.2/300-macos-cross-rpcgen.patch b/packages/glibc/2.12.2/300-macos-cross-rpcgen.patch
index e654644c..e654644c 100644
--- a/patches/glibc/2.12.2/300-macos-cross-rpcgen.patch
+++ b/packages/glibc/2.12.2/300-macos-cross-rpcgen.patch
diff --git a/patches/glibc/2.12.2/900-march-i686.patch b/packages/glibc/2.12.2/900-march-i686.patch
index 6030de9e..6030de9e 100644
--- a/patches/glibc/2.12.2/900-march-i686.patch
+++ b/packages/glibc/2.12.2/900-march-i686.patch
diff --git a/patches/glibc/2.12.2/910-typedef-caddr.patch b/packages/glibc/2.12.2/910-typedef-caddr.patch
index 4bc75cbd..4bc75cbd 100644
--- a/patches/glibc/2.12.2/910-typedef-caddr.patch
+++ b/packages/glibc/2.12.2/910-typedef-caddr.patch
diff --git a/patches/glibc/2.13/920-fix-rpc_parse-format.patch b/packages/glibc/2.12.2/920-fix-rpc_parse-format.patch
index 37e58dac..37e58dac 100644
--- a/patches/glibc/2.13/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.12.2/920-fix-rpc_parse-format.patch
diff --git a/patches/glibc/2.13/940-nis-bogus-conditional.patch b/packages/glibc/2.12.2/940-nis-bogus-conditional.patch
index 09b38cf1..09b38cf1 100644
--- a/patches/glibc/2.13/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.12.2/940-nis-bogus-conditional.patch
diff --git a/patches/glibc/2.12.2/999-new-tools.patch b/packages/glibc/2.12.2/999-new-tools.patch
index e2f7b1de..e2f7b1de 100644
--- a/patches/glibc/2.12.2/999-new-tools.patch
+++ b/packages/glibc/2.12.2/999-new-tools.patch
diff --git a/packages/glibc/2.12.2/version.desc b/packages/glibc/2.12.2/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/glibc/2.12.2/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/glibc/2.14.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.13/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..6fd663a2 100644
--- a/patches/glibc/2.14.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc/2.13/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
diff --git a/patches/glibc/2.14.1/102-fix-signed-shift-overlow.patch b/packages/glibc/2.13/102-fix-signed-shift-overlow.patch
index ef49f831..ef49f831 100644
--- a/patches/glibc/2.14.1/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc/2.13/102-fix-signed-shift-overlow.patch
diff --git a/patches/glibc/2.13/104-unused-variables.patch b/packages/glibc/2.13/104-unused-variables.patch
index e063675a..e063675a 100644
--- a/patches/glibc/2.13/104-unused-variables.patch
+++ b/packages/glibc/2.13/104-unused-variables.patch
diff --git a/patches/glibc/2.14.1/105-misleading-indentation.patch b/packages/glibc/2.13/105-misleading-indentation.patch
index 1dd8d851..1dd8d851 100644
--- a/patches/glibc/2.14.1/105-misleading-indentation.patch
+++ b/packages/glibc/2.13/105-misleading-indentation.patch
diff --git a/patches/glibc/2.13/106-dl-open-array-bounds.patch b/packages/glibc/2.13/106-dl-open-array-bounds.patch
index bdb5c19f..bdb5c19f 100644
--- a/patches/glibc/2.13/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.13/106-dl-open-array-bounds.patch
diff --git a/patches/glibc/2.13/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.13/140-Fix-combreloc-test-BSD-grep.patch
index da21d9e6..da21d9e6 100644
--- a/patches/glibc/2.13/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.13/140-Fix-combreloc-test-BSD-grep.patch
diff --git a/patches/glibc/2.13/300-macos-cross-rpcgen.patch b/packages/glibc/2.13/300-macos-cross-rpcgen.patch
index e654644c..e654644c 100644
--- a/patches/glibc/2.13/300-macos-cross-rpcgen.patch
+++ b/packages/glibc/2.13/300-macos-cross-rpcgen.patch
diff --git a/patches/glibc/2.13/900-march-i686.patch b/packages/glibc/2.13/900-march-i686.patch
index 7f5b1cee..7f5b1cee 100644
--- a/patches/glibc/2.13/900-march-i686.patch
+++ b/packages/glibc/2.13/900-march-i686.patch
diff --git a/patches/glibc/2.13/910-typedef-caddr.patch b/packages/glibc/2.13/910-typedef-caddr.patch
index e29e8101..e29e8101 100644
--- a/patches/glibc/2.13/910-typedef-caddr.patch
+++ b/packages/glibc/2.13/910-typedef-caddr.patch
diff --git a/patches/glibc/2.14.1/920-fix-rpc_parse-format.patch b/packages/glibc/2.13/920-fix-rpc_parse-format.patch
index 37e58dac..37e58dac 100644
--- a/patches/glibc/2.14.1/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.13/920-fix-rpc_parse-format.patch
diff --git a/patches/glibc/2.14.1/940-nis-bogus-conditional.patch b/packages/glibc/2.13/940-nis-bogus-conditional.patch
index 09b38cf1..09b38cf1 100644
--- a/patches/glibc/2.14.1/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.13/940-nis-bogus-conditional.patch
diff --git a/patches/glibc/2.13/950-initfini-ppc64.patch b/packages/glibc/2.13/950-initfini-ppc64.patch
index 87f8d236..87f8d236 100644
--- a/patches/glibc/2.13/950-initfini-ppc64.patch
+++ b/packages/glibc/2.13/950-initfini-ppc64.patch
diff --git a/patches/glibc/2.13/999-new-tools.patch b/packages/glibc/2.13/999-new-tools.patch
index d2d498a2..d2d498a2 100644
--- a/patches/glibc/2.13/999-new-tools.patch
+++ b/packages/glibc/2.13/999-new-tools.patch
diff --git a/packages/glibc/2.13/version.desc b/packages/glibc/2.13/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/glibc/2.13/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/glibc/2.14/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.14.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..6fd663a2 100644
--- a/patches/glibc/2.14/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc/2.14.1/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
diff --git a/patches/glibc/2.14/102-fix-signed-shift-overlow.patch b/packages/glibc/2.14.1/102-fix-signed-shift-overlow.patch
index ef49f831..ef49f831 100644
--- a/patches/glibc/2.14/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc/2.14.1/102-fix-signed-shift-overlow.patch
diff --git a/patches/glibc/2.14/103-dl-openat64-variadic.patch b/packages/glibc/2.14.1/103-dl-openat64-variadic.patch
index fe94b96d..fe94b96d 100644
--- a/patches/glibc/2.14/103-dl-openat64-variadic.patch
+++ b/packages/glibc/2.14.1/103-dl-openat64-variadic.patch
diff --git a/patches/glibc/2.14.1/104-unused-variables.patch b/packages/glibc/2.14.1/104-unused-variables.patch
index e063675a..e063675a 100644
--- a/patches/glibc/2.14.1/104-unused-variables.patch
+++ b/packages/glibc/2.14.1/104-unused-variables.patch
diff --git a/patches/glibc/2.14/105-misleading-indentation.patch b/packages/glibc/2.14.1/105-misleading-indentation.patch
index 1dd8d851..1dd8d851 100644
--- a/patches/glibc/2.14/105-misleading-indentation.patch
+++ b/packages/glibc/2.14.1/105-misleading-indentation.patch
diff --git a/patches/glibc/2.14.1/106-dl-open-array-bounds.patch b/packages/glibc/2.14.1/106-dl-open-array-bounds.patch
index bdb5c19f..bdb5c19f 100644
--- a/patches/glibc/2.14.1/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.14.1/106-dl-open-array-bounds.patch
diff --git a/patches/glibc/2.14.1/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.14.1/140-Fix-combreloc-test-BSD-grep.patch
index d720d391..d720d391 100644
--- a/patches/glibc/2.14.1/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.14.1/140-Fix-combreloc-test-BSD-grep.patch
diff --git a/patches/glibc/2.14.1/300-macos-cross-rpcgen.patch b/packages/glibc/2.14.1/300-macos-cross-rpcgen.patch
index e654644c..e654644c 100644
--- a/patches/glibc/2.14.1/300-macos-cross-rpcgen.patch
+++ b/packages/glibc/2.14.1/300-macos-cross-rpcgen.patch
diff --git a/patches/glibc/2.14.1/900-cpuid-include.patch b/packages/glibc/2.14.1/900-cpuid-include.patch
index 0b8db71e..0b8db71e 100644
--- a/patches/glibc/2.14.1/900-cpuid-include.patch
+++ b/packages/glibc/2.14.1/900-cpuid-include.patch
diff --git a/patches/glibc/2.14.1/910-asm-i686.patch b/packages/glibc/2.14.1/910-asm-i686.patch
index b0498876..b0498876 100644
--- a/patches/glibc/2.14.1/910-asm-i686.patch
+++ b/packages/glibc/2.14.1/910-asm-i686.patch
diff --git a/patches/glibc/2.14/920-fix-rpc_parse-format.patch b/packages/glibc/2.14.1/920-fix-rpc_parse-format.patch
index 37e58dac..37e58dac 100644
--- a/patches/glibc/2.14/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.14.1/920-fix-rpc_parse-format.patch
diff --git a/patches/glibc/2.14/940-nis-bogus-conditional.patch b/packages/glibc/2.14.1/940-nis-bogus-conditional.patch
index 09b38cf1..09b38cf1 100644
--- a/patches/glibc/2.14/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.14.1/940-nis-bogus-conditional.patch
diff --git a/patches/glibc/2.14.1/950-initfini-ppc64.patch b/packages/glibc/2.14.1/950-initfini-ppc64.patch
index 87f8d236..87f8d236 100644
--- a/patches/glibc/2.14.1/950-initfini-ppc64.patch
+++ b/packages/glibc/2.14.1/950-initfini-ppc64.patch
diff --git a/patches/glibc/2.14.1/999-new-tools.patch b/packages/glibc/2.14.1/999-new-tools.patch
index f335a54e..f335a54e 100644
--- a/patches/glibc/2.14.1/999-new-tools.patch
+++ b/packages/glibc/2.14.1/999-new-tools.patch
diff --git a/packages/glibc/2.14.1/version.desc b/packages/glibc/2.14.1/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/glibc/2.14.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/glibc/2.15/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.14/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..6fd663a2 100644
--- a/patches/glibc/2.15/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc/2.14/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
diff --git a/patches/glibc/2.15/102-fix-signed-shift-overlow.patch b/packages/glibc/2.14/102-fix-signed-shift-overlow.patch
index ef49f831..ef49f831 100644
--- a/patches/glibc/2.15/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc/2.14/102-fix-signed-shift-overlow.patch
diff --git a/patches/glibc/2.15/103-dl-openat64-variadic.patch b/packages/glibc/2.14/103-dl-openat64-variadic.patch
index fe94b96d..fe94b96d 100644
--- a/patches/glibc/2.15/103-dl-openat64-variadic.patch
+++ b/packages/glibc/2.14/103-dl-openat64-variadic.patch
diff --git a/patches/glibc/2.14/104-unused-variables.patch b/packages/glibc/2.14/104-unused-variables.patch
index e063675a..e063675a 100644
--- a/patches/glibc/2.14/104-unused-variables.patch
+++ b/packages/glibc/2.14/104-unused-variables.patch
diff --git a/patches/glibc/2.15/105-misleading-indentation.patch b/packages/glibc/2.14/105-misleading-indentation.patch
index 1dd8d851..1dd8d851 100644
--- a/patches/glibc/2.15/105-misleading-indentation.patch
+++ b/packages/glibc/2.14/105-misleading-indentation.patch
diff --git a/patches/glibc/2.14/106-dl-open-array-bounds.patch b/packages/glibc/2.14/106-dl-open-array-bounds.patch
index bdb5c19f..bdb5c19f 100644
--- a/patches/glibc/2.14/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.14/106-dl-open-array-bounds.patch
diff --git a/patches/glibc/2.14/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.14/140-Fix-combreloc-test-BSD-grep.patch
index d720d391..d720d391 100644
--- a/patches/glibc/2.14/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.14/140-Fix-combreloc-test-BSD-grep.patch
diff --git a/patches/glibc/2.14/300-macos-cross-rpcgen.patch b/packages/glibc/2.14/300-macos-cross-rpcgen.patch
index e654644c..e654644c 100644
--- a/patches/glibc/2.14/300-macos-cross-rpcgen.patch
+++ b/packages/glibc/2.14/300-macos-cross-rpcgen.patch
diff --git a/patches/glibc/2.14/900-cpuid-include.patch b/packages/glibc/2.14/900-cpuid-include.patch
index 0b8db71e..0b8db71e 100644
--- a/patches/glibc/2.14/900-cpuid-include.patch
+++ b/packages/glibc/2.14/900-cpuid-include.patch
diff --git a/patches/glibc/2.15/920-fix-rpc_parse-format.patch b/packages/glibc/2.14/920-fix-rpc_parse-format.patch
index 37e58dac..37e58dac 100644
--- a/patches/glibc/2.15/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.14/920-fix-rpc_parse-format.patch
diff --git a/patches/glibc/2.15/940-nis-bogus-conditional.patch b/packages/glibc/2.14/940-nis-bogus-conditional.patch
index 09b38cf1..09b38cf1 100644
--- a/patches/glibc/2.15/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.14/940-nis-bogus-conditional.patch
diff --git a/patches/glibc/2.14/950-initfini-ppc64.patch b/packages/glibc/2.14/950-initfini-ppc64.patch
index 87f8d236..87f8d236 100644
--- a/patches/glibc/2.14/950-initfini-ppc64.patch
+++ b/packages/glibc/2.14/950-initfini-ppc64.patch
diff --git a/patches/glibc/2.14/999-new-tools.patch b/packages/glibc/2.14/999-new-tools.patch
index 7d115fdd..7d115fdd 100644
--- a/patches/glibc/2.14/999-new-tools.patch
+++ b/packages/glibc/2.14/999-new-tools.patch
diff --git a/packages/glibc/2.14/version.desc b/packages/glibc/2.14/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/glibc/2.14/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/glibc/2.16.0/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.15/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..6fd663a2 100644
--- a/patches/glibc/2.16.0/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc/2.15/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
diff --git a/patches/glibc/2.16.0/102-fix-signed-shift-overlow.patch b/packages/glibc/2.15/102-fix-signed-shift-overlow.patch
index ef49f831..ef49f831 100644
--- a/patches/glibc/2.16.0/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc/2.15/102-fix-signed-shift-overlow.patch
diff --git a/patches/glibc/2.16.0/103-dl-openat64-variadic.patch b/packages/glibc/2.15/103-dl-openat64-variadic.patch
index fe94b96d..fe94b96d 100644
--- a/patches/glibc/2.16.0/103-dl-openat64-variadic.patch
+++ b/packages/glibc/2.15/103-dl-openat64-variadic.patch
diff --git a/patches/glibc/2.15/104-unused-variables.patch b/packages/glibc/2.15/104-unused-variables.patch
index 63e4a40c..63e4a40c 100644
--- a/patches/glibc/2.15/104-unused-variables.patch
+++ b/packages/glibc/2.15/104-unused-variables.patch
diff --git a/patches/glibc/2.16.0/105-misleading-indentation.patch b/packages/glibc/2.15/105-misleading-indentation.patch
index 1dd8d851..1dd8d851 100644
--- a/patches/glibc/2.16.0/105-misleading-indentation.patch
+++ b/packages/glibc/2.15/105-misleading-indentation.patch
diff --git a/patches/glibc/2.15/106-dl-open-array-bounds.patch b/packages/glibc/2.15/106-dl-open-array-bounds.patch
index bdb5c19f..bdb5c19f 100644
--- a/patches/glibc/2.15/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.15/106-dl-open-array-bounds.patch
diff --git a/patches/glibc/2.15/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.15/140-Fix-combreloc-test-BSD-grep.patch
index c36cdf43..c36cdf43 100644
--- a/patches/glibc/2.15/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.15/140-Fix-combreloc-test-BSD-grep.patch
diff --git a/patches/glibc/2.15/300-macos-cross-rpcgen.patch b/packages/glibc/2.15/300-macos-cross-rpcgen.patch
index e654644c..e654644c 100644
--- a/patches/glibc/2.15/300-macos-cross-rpcgen.patch
+++ b/packages/glibc/2.15/300-macos-cross-rpcgen.patch
diff --git a/patches/glibc/2.15/900-cpuid-include.patch b/packages/glibc/2.15/900-cpuid-include.patch
index 29edf7ba..29edf7ba 100644
--- a/patches/glibc/2.15/900-cpuid-include.patch
+++ b/packages/glibc/2.15/900-cpuid-include.patch
diff --git a/patches/glibc/2.15/910-asm-i686.patch b/packages/glibc/2.15/910-asm-i686.patch
index b0498876..b0498876 100644
--- a/patches/glibc/2.15/910-asm-i686.patch
+++ b/packages/glibc/2.15/910-asm-i686.patch
diff --git a/patches/glibc/2.16.0/920-fix-rpc_parse-format.patch b/packages/glibc/2.15/920-fix-rpc_parse-format.patch
index 37e58dac..37e58dac 100644
--- a/patches/glibc/2.16.0/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.15/920-fix-rpc_parse-format.patch
diff --git a/patches/glibc/2.16.0/940-nis-bogus-conditional.patch b/packages/glibc/2.15/940-nis-bogus-conditional.patch
index 09b38cf1..09b38cf1 100644
--- a/patches/glibc/2.16.0/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.15/940-nis-bogus-conditional.patch
diff --git a/patches/glibc/2.15/990-try-link-static.patch b/packages/glibc/2.15/990-try-link-static.patch
index a0ffadd3..a0ffadd3 100644
--- a/patches/glibc/2.15/990-try-link-static.patch
+++ b/packages/glibc/2.15/990-try-link-static.patch
diff --git a/patches/glibc/2.15/991-builtin_expect.patch b/packages/glibc/2.15/991-builtin_expect.patch
index 8a327fa7..8a327fa7 100644
--- a/patches/glibc/2.15/991-builtin_expect.patch
+++ b/packages/glibc/2.15/991-builtin_expect.patch
diff --git a/patches/glibc/2.15/992-gcc_s-suffix.patch b/packages/glibc/2.15/992-gcc_s-suffix.patch
index 6dbc70f7..6dbc70f7 100644
--- a/patches/glibc/2.15/992-gcc_s-suffix.patch
+++ b/packages/glibc/2.15/992-gcc_s-suffix.patch
diff --git a/patches/glibc/2.15/999-new-tools.patch b/packages/glibc/2.15/999-new-tools.patch
index e0632a3a..e0632a3a 100644
--- a/patches/glibc/2.15/999-new-tools.patch
+++ b/packages/glibc/2.15/999-new-tools.patch
diff --git a/packages/glibc/2.15/version.desc b/packages/glibc/2.15/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/glibc/2.15/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/glibc/2.17/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.16.0/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..6fd663a2 100644
--- a/patches/glibc/2.17/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc/2.16.0/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
diff --git a/patches/glibc/2.17/102-fix-signed-shift-overlow.patch b/packages/glibc/2.16.0/102-fix-signed-shift-overlow.patch
index ef49f831..ef49f831 100644
--- a/patches/glibc/2.17/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc/2.16.0/102-fix-signed-shift-overlow.patch
diff --git a/patches/glibc/2.17/103-dl-openat64-variadic.patch b/packages/glibc/2.16.0/103-dl-openat64-variadic.patch
index fe94b96d..fe94b96d 100644
--- a/patches/glibc/2.17/103-dl-openat64-variadic.patch
+++ b/packages/glibc/2.16.0/103-dl-openat64-variadic.patch
diff --git a/patches/glibc/2.16.0/104-unused-variables.patch b/packages/glibc/2.16.0/104-unused-variables.patch
index 2a85a0c8..2a85a0c8 100644
--- a/patches/glibc/2.16.0/104-unused-variables.patch
+++ b/packages/glibc/2.16.0/104-unused-variables.patch
diff --git a/patches/glibc/2.17/105-misleading-indentation.patch b/packages/glibc/2.16.0/105-misleading-indentation.patch
index 1dd8d851..1dd8d851 100644
--- a/patches/glibc/2.17/105-misleading-indentation.patch
+++ b/packages/glibc/2.16.0/105-misleading-indentation.patch
diff --git a/patches/glibc/2.16.0/106-dl-open-array-bounds.patch b/packages/glibc/2.16.0/106-dl-open-array-bounds.patch
index a8efe9aa..a8efe9aa 100644
--- a/patches/glibc/2.16.0/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.16.0/106-dl-open-array-bounds.patch
diff --git a/patches/glibc/2.16.0/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.16.0/140-Fix-combreloc-test-BSD-grep.patch
index 3c34e01d..3c34e01d 100644
--- a/patches/glibc/2.16.0/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.16.0/140-Fix-combreloc-test-BSD-grep.patch
diff --git a/patches/glibc/2.16.0/300-macos-cross-rpcgen.patch b/packages/glibc/2.16.0/300-macos-cross-rpcgen.patch
index e654644c..e654644c 100644
--- a/patches/glibc/2.16.0/300-macos-cross-rpcgen.patch
+++ b/packages/glibc/2.16.0/300-macos-cross-rpcgen.patch
diff --git a/patches/glibc/2.16.0/500-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch b/packages/glibc/2.16.0/500-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch
index 803ac6f6..803ac6f6 100644
--- a/patches/glibc/2.16.0/500-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch
+++ b/packages/glibc/2.16.0/500-fix-parsing-of-numeric-hosts-in-gethostbyname_r.patch
diff --git a/patches/glibc/2.17/920-fix-rpc_parse-format.patch b/packages/glibc/2.16.0/920-fix-rpc_parse-format.patch
index 37e58dac..37e58dac 100644
--- a/patches/glibc/2.17/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.16.0/920-fix-rpc_parse-format.patch
diff --git a/patches/glibc/2.17/940-nis-bogus-conditional.patch b/packages/glibc/2.16.0/940-nis-bogus-conditional.patch
index 09b38cf1..09b38cf1 100644
--- a/patches/glibc/2.17/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.16.0/940-nis-bogus-conditional.patch
diff --git a/patches/glibc/2.16.0/999-new-tools.patch b/packages/glibc/2.16.0/999-new-tools.patch
index e7533652..e7533652 100644
--- a/patches/glibc/2.16.0/999-new-tools.patch
+++ b/packages/glibc/2.16.0/999-new-tools.patch
diff --git a/packages/glibc/2.16.0/version.desc b/packages/glibc/2.16.0/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/glibc/2.16.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/glibc/2.17/100-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc/2.17/100-Fix-ARM-build-with-GCC-trunk.patch
index 59f95aad..59f95aad 100644
--- a/patches/glibc/2.17/100-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc/2.17/100-Fix-ARM-build-with-GCC-trunk.patch
diff --git a/patches/glibc/2.18/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.17/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..6fd663a2 100644
--- a/patches/glibc/2.18/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc/2.17/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
diff --git a/patches/glibc/2.18/102-fix-signed-shift-overlow.patch b/packages/glibc/2.17/102-fix-signed-shift-overlow.patch
index ef49f831..ef49f831 100644
--- a/patches/glibc/2.18/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc/2.17/102-fix-signed-shift-overlow.patch
diff --git a/patches/glibc/2.18/103-dl-openat64-variadic.patch b/packages/glibc/2.17/103-dl-openat64-variadic.patch
index fe94b96d..fe94b96d 100644
--- a/patches/glibc/2.18/103-dl-openat64-variadic.patch
+++ b/packages/glibc/2.17/103-dl-openat64-variadic.patch
diff --git a/patches/glibc/2.17/104-unused-variables.patch b/packages/glibc/2.17/104-unused-variables.patch
index 80e0ff2e..80e0ff2e 100644
--- a/patches/glibc/2.17/104-unused-variables.patch
+++ b/packages/glibc/2.17/104-unused-variables.patch
diff --git a/patches/glibc/2.18/105-misleading-indentation.patch b/packages/glibc/2.17/105-misleading-indentation.patch
index 1dd8d851..1dd8d851 100644
--- a/patches/glibc/2.18/105-misleading-indentation.patch
+++ b/packages/glibc/2.17/105-misleading-indentation.patch
diff --git a/patches/glibc/2.17/106-dl-open-array-bounds.patch b/packages/glibc/2.17/106-dl-open-array-bounds.patch
index a8efe9aa..a8efe9aa 100644
--- a/patches/glibc/2.17/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.17/106-dl-open-array-bounds.patch
diff --git a/patches/glibc/2.17/120-support-make4.patch b/packages/glibc/2.17/120-support-make4.patch
index ca2bae02..ca2bae02 100644
--- a/patches/glibc/2.17/120-support-make4.patch
+++ b/packages/glibc/2.17/120-support-make4.patch
diff --git a/patches/glibc/2.17/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.17/140-Fix-combreloc-test-BSD-grep.patch
index 3c34e01d..3c34e01d 100644
--- a/patches/glibc/2.17/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.17/140-Fix-combreloc-test-BSD-grep.patch
diff --git a/patches/glibc/2.17/300-macos-cross-rpcgen.patch b/packages/glibc/2.17/300-macos-cross-rpcgen.patch
index e654644c..e654644c 100644
--- a/patches/glibc/2.17/300-macos-cross-rpcgen.patch
+++ b/packages/glibc/2.17/300-macos-cross-rpcgen.patch
diff --git a/patches/glibc/2.18/920-fix-rpc_parse-format.patch b/packages/glibc/2.17/920-fix-rpc_parse-format.patch
index 37e58dac..37e58dac 100644
--- a/patches/glibc/2.18/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.17/920-fix-rpc_parse-format.patch
diff --git a/patches/glibc/2.18/940-nis-bogus-conditional.patch b/packages/glibc/2.17/940-nis-bogus-conditional.patch
index 09b38cf1..09b38cf1 100644
--- a/patches/glibc/2.18/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.17/940-nis-bogus-conditional.patch
diff --git a/packages/glibc/2.17/version.desc b/packages/glibc/2.17/version.desc
new file mode 100644
index 00000000..9ac7dc26
--- /dev/null
+++ b/packages/glibc/2.17/version.desc
@@ -0,0 +1 @@
+# Not obsolete (CentOS 7, EOL 06/2024)
diff --git a/patches/glibc/2.18/100-4f2bcda-ARM-Fix-clone-code-when-built-for-Thumb.patch b/packages/glibc/2.18/100-4f2bcda-ARM-Fix-clone-code-when-built-for-Thumb.patch
index 40e36324..40e36324 100644
--- a/patches/glibc/2.18/100-4f2bcda-ARM-Fix-clone-code-when-built-for-Thumb.patch
+++ b/packages/glibc/2.18/100-4f2bcda-ARM-Fix-clone-code-when-built-for-Thumb.patch
diff --git a/patches/glibc/2.19/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.18/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..6fd663a2 100644
--- a/patches/glibc/2.19/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc/2.18/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
diff --git a/patches/glibc/2.19/102-fix-signed-shift-overlow.patch b/packages/glibc/2.18/102-fix-signed-shift-overlow.patch
index ef49f831..ef49f831 100644
--- a/patches/glibc/2.19/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc/2.18/102-fix-signed-shift-overlow.patch
diff --git a/patches/glibc/2.19/103-dl-openat64-variadic.patch b/packages/glibc/2.18/103-dl-openat64-variadic.patch
index fe94b96d..fe94b96d 100644
--- a/patches/glibc/2.19/103-dl-openat64-variadic.patch
+++ b/packages/glibc/2.18/103-dl-openat64-variadic.patch
diff --git a/patches/glibc/2.18/104-unused-variables.patch b/packages/glibc/2.18/104-unused-variables.patch
index 642edb14..642edb14 100644
--- a/patches/glibc/2.18/104-unused-variables.patch
+++ b/packages/glibc/2.18/104-unused-variables.patch
diff --git a/patches/glibc/2.19/105-misleading-indentation.patch b/packages/glibc/2.18/105-misleading-indentation.patch
index 1dd8d851..1dd8d851 100644
--- a/patches/glibc/2.19/105-misleading-indentation.patch
+++ b/packages/glibc/2.18/105-misleading-indentation.patch
diff --git a/patches/glibc/2.19/106-dl-open-array-bounds.patch b/packages/glibc/2.18/106-dl-open-array-bounds.patch
index 08a90765..08a90765 100644
--- a/patches/glibc/2.19/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.18/106-dl-open-array-bounds.patch
diff --git a/patches/glibc/2.18/110-2770d15-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pthread_cond_signal.patch b/packages/glibc/2.18/110-2770d15-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pthread_cond_signal.patch
index 7ad9fdf7..7ad9fdf7 100644
--- a/patches/glibc/2.18/110-2770d15-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pthread_cond_signal.patch
+++ b/packages/glibc/2.18/110-2770d15-Fix-PI-mutex-check-in-pthread_cond_broadcast-and-pthread_cond_signal.patch
diff --git a/patches/glibc/2.18/120-support-make4.patch b/packages/glibc/2.18/120-support-make4.patch
index ca2bae02..ca2bae02 100644
--- a/patches/glibc/2.18/120-support-make4.patch
+++ b/packages/glibc/2.18/120-support-make4.patch
diff --git a/patches/glibc/2.18/130-arm-unwind.patch b/packages/glibc/2.18/130-arm-unwind.patch
index 69cc07ad..69cc07ad 100644
--- a/patches/glibc/2.18/130-arm-unwind.patch
+++ b/packages/glibc/2.18/130-arm-unwind.patch
diff --git a/patches/glibc/2.18/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.18/140-Fix-combreloc-test-BSD-grep.patch
index 3c34e01d..3c34e01d 100644
--- a/patches/glibc/2.18/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.18/140-Fix-combreloc-test-BSD-grep.patch
diff --git a/patches/glibc/2.18/300-macos-cross-rpcgen.patch b/packages/glibc/2.18/300-macos-cross-rpcgen.patch
index e654644c..e654644c 100644
--- a/patches/glibc/2.18/300-macos-cross-rpcgen.patch
+++ b/packages/glibc/2.18/300-macos-cross-rpcgen.patch
diff --git a/patches/glibc/2.19/920-fix-rpc_parse-format.patch b/packages/glibc/2.18/920-fix-rpc_parse-format.patch
index 37e58dac..37e58dac 100644
--- a/patches/glibc/2.19/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.18/920-fix-rpc_parse-format.patch
diff --git a/patches/glibc/2.19/940-nis-bogus-conditional.patch b/packages/glibc/2.18/940-nis-bogus-conditional.patch
index 09b38cf1..09b38cf1 100644
--- a/patches/glibc/2.19/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.18/940-nis-bogus-conditional.patch
diff --git a/packages/glibc/2.18/version.desc b/packages/glibc/2.18/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/glibc/2.18/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/glibc/2.20/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.19/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..6fd663a2 100644
--- a/patches/glibc/2.20/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc/2.19/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
diff --git a/patches/glibc/2.20/102-fix-signed-shift-overlow.patch b/packages/glibc/2.19/102-fix-signed-shift-overlow.patch
index ef49f831..ef49f831 100644
--- a/patches/glibc/2.20/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc/2.19/102-fix-signed-shift-overlow.patch
diff --git a/patches/glibc/2.20/103-dl-openat64-variadic.patch b/packages/glibc/2.19/103-dl-openat64-variadic.patch
index fe94b96d..fe94b96d 100644
--- a/patches/glibc/2.20/103-dl-openat64-variadic.patch
+++ b/packages/glibc/2.19/103-dl-openat64-variadic.patch
diff --git a/patches/glibc/2.20/104-unused-variables.patch b/packages/glibc/2.19/104-unused-variables.patch
index 889c9bbc..889c9bbc 100644
--- a/patches/glibc/2.20/104-unused-variables.patch
+++ b/packages/glibc/2.19/104-unused-variables.patch
diff --git a/patches/glibc/2.20/105-misleading-indentation.patch b/packages/glibc/2.19/105-misleading-indentation.patch
index 1dd8d851..1dd8d851 100644
--- a/patches/glibc/2.20/105-misleading-indentation.patch
+++ b/packages/glibc/2.19/105-misleading-indentation.patch
diff --git a/patches/glibc/2.20/106-dl-open-array-bounds.patch b/packages/glibc/2.19/106-dl-open-array-bounds.patch
index 08a90765..08a90765 100644
--- a/patches/glibc/2.20/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.19/106-dl-open-array-bounds.patch
diff --git a/patches/glibc/2.19/130-arm-unwind.patch b/packages/glibc/2.19/130-arm-unwind.patch
index 69cc07ad..69cc07ad 100644
--- a/patches/glibc/2.19/130-arm-unwind.patch
+++ b/packages/glibc/2.19/130-arm-unwind.patch
diff --git a/patches/glibc/2.20/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.19/140-Fix-combreloc-test-BSD-grep.patch
index fdc3a606..fdc3a606 100644
--- a/patches/glibc/2.20/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.19/140-Fix-combreloc-test-BSD-grep.patch
diff --git a/patches/glibc/2.19/910-typedef-caddr.patch b/packages/glibc/2.19/910-typedef-caddr.patch
index e29e8101..e29e8101 100644
--- a/patches/glibc/2.19/910-typedef-caddr.patch
+++ b/packages/glibc/2.19/910-typedef-caddr.patch
diff --git a/patches/glibc/2.20/920-fix-rpc_parse-format.patch b/packages/glibc/2.19/920-fix-rpc_parse-format.patch
index 37e58dac..37e58dac 100644
--- a/patches/glibc/2.20/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.19/920-fix-rpc_parse-format.patch
diff --git a/patches/glibc/2.20/930-explicit-boolean.patch b/packages/glibc/2.19/930-explicit-boolean.patch
index 780fae63..780fae63 100644
--- a/patches/glibc/2.20/930-explicit-boolean.patch
+++ b/packages/glibc/2.19/930-explicit-boolean.patch
diff --git a/patches/glibc/2.20/940-nis-bogus-conditional.patch b/packages/glibc/2.19/940-nis-bogus-conditional.patch
index 09b38cf1..09b38cf1 100644
--- a/patches/glibc/2.20/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.19/940-nis-bogus-conditional.patch
diff --git a/packages/glibc/2.19/version.desc b/packages/glibc/2.19/version.desc
new file mode 100644
index 00000000..f261ea86
--- /dev/null
+++ b/packages/glibc/2.19/version.desc
@@ -0,0 +1 @@
+# Not obsolete (Ubuntu 14.04, EOL 04/2019)
diff --git a/patches/glibc/linaro-2.20-2014.11/100-sparc-nptl.patch b/packages/glibc/2.20/100-sparc-nptl.patch
index 21f03379..21f03379 100644
--- a/patches/glibc/linaro-2.20-2014.11/100-sparc-nptl.patch
+++ b/packages/glibc/2.20/100-sparc-nptl.patch
diff --git a/patches/glibc/2.21/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.20/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..6fd663a2 100644
--- a/patches/glibc/2.21/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc/2.20/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
diff --git a/patches/glibc/2.21/102-fix-signed-shift-overlow.patch b/packages/glibc/2.20/102-fix-signed-shift-overlow.patch
index ef49f831..ef49f831 100644
--- a/patches/glibc/2.21/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc/2.20/102-fix-signed-shift-overlow.patch
diff --git a/patches/glibc/2.21/103-dl-openat64-variadic.patch b/packages/glibc/2.20/103-dl-openat64-variadic.patch
index fe94b96d..fe94b96d 100644
--- a/patches/glibc/2.21/103-dl-openat64-variadic.patch
+++ b/packages/glibc/2.20/103-dl-openat64-variadic.patch
diff --git a/patches/glibc/linaro-2.20-2014.11/104-unused-variables.patch b/packages/glibc/2.20/104-unused-variables.patch
index 889c9bbc..889c9bbc 100644
--- a/patches/glibc/linaro-2.20-2014.11/104-unused-variables.patch
+++ b/packages/glibc/2.20/104-unused-variables.patch
diff --git a/patches/glibc/2.21/105-misleading-indentation.patch b/packages/glibc/2.20/105-misleading-indentation.patch
index 1dd8d851..1dd8d851 100644
--- a/patches/glibc/2.21/105-misleading-indentation.patch
+++ b/packages/glibc/2.20/105-misleading-indentation.patch
diff --git a/patches/glibc/2.21/106-dl-open-array-bounds.patch b/packages/glibc/2.20/106-dl-open-array-bounds.patch
index 08a90765..08a90765 100644
--- a/patches/glibc/2.21/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.20/106-dl-open-array-bounds.patch
diff --git a/patches/glibc/2.21/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.20/140-Fix-combreloc-test-BSD-grep.patch
index fdc3a606..fdc3a606 100644
--- a/patches/glibc/2.21/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.20/140-Fix-combreloc-test-BSD-grep.patch
diff --git a/patches/glibc/2.20/910-typedef-caddr.patch b/packages/glibc/2.20/910-typedef-caddr.patch
index fc7979b7..fc7979b7 100644
--- a/patches/glibc/2.20/910-typedef-caddr.patch
+++ b/packages/glibc/2.20/910-typedef-caddr.patch
diff --git a/patches/glibc/2.21/920-fix-rpc_parse-format.patch b/packages/glibc/2.20/920-fix-rpc_parse-format.patch
index 37e58dac..37e58dac 100644
--- a/patches/glibc/2.21/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.20/920-fix-rpc_parse-format.patch
diff --git a/patches/glibc/2.21/930-explicit-boolean.patch b/packages/glibc/2.20/930-explicit-boolean.patch
index 780fae63..780fae63 100644
--- a/patches/glibc/2.21/930-explicit-boolean.patch
+++ b/packages/glibc/2.20/930-explicit-boolean.patch
diff --git a/patches/glibc/2.21/940-nis-bogus-conditional.patch b/packages/glibc/2.20/940-nis-bogus-conditional.patch
index 09b38cf1..09b38cf1 100644
--- a/patches/glibc/2.21/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.20/940-nis-bogus-conditional.patch
diff --git a/packages/glibc/2.20/version.desc b/packages/glibc/2.20/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/glibc/2.20/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/glibc/2.22/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.21/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..6fd663a2 100644
--- a/patches/glibc/2.22/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc/2.21/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
diff --git a/patches/glibc/2.22/102-fix-signed-shift-overlow.patch b/packages/glibc/2.21/102-fix-signed-shift-overlow.patch
index ef49f831..ef49f831 100644
--- a/patches/glibc/2.22/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc/2.21/102-fix-signed-shift-overlow.patch
diff --git a/patches/glibc/linaro-2.20-2014.11/103-dl-openat64-variadic.patch b/packages/glibc/2.21/103-dl-openat64-variadic.patch
index fe94b96d..fe94b96d 100644
--- a/patches/glibc/linaro-2.20-2014.11/103-dl-openat64-variadic.patch
+++ b/packages/glibc/2.21/103-dl-openat64-variadic.patch
diff --git a/patches/glibc/2.21/104-unused-variables.patch b/packages/glibc/2.21/104-unused-variables.patch
index fd4def02..fd4def02 100644
--- a/patches/glibc/2.21/104-unused-variables.patch
+++ b/packages/glibc/2.21/104-unused-variables.patch
diff --git a/patches/glibc/2.22/105-misleading-indentation.patch b/packages/glibc/2.21/105-misleading-indentation.patch
index 1dd8d851..1dd8d851 100644
--- a/patches/glibc/2.22/105-misleading-indentation.patch
+++ b/packages/glibc/2.21/105-misleading-indentation.patch
diff --git a/patches/glibc/linaro-2.20-2014.11/106-dl-open-array-bounds.patch b/packages/glibc/2.21/106-dl-open-array-bounds.patch
index 08a90765..08a90765 100644
--- a/patches/glibc/linaro-2.20-2014.11/106-dl-open-array-bounds.patch
+++ b/packages/glibc/2.21/106-dl-open-array-bounds.patch
diff --git a/patches/glibc/2.22/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.21/140-Fix-combreloc-test-BSD-grep.patch
index fdc3a606..fdc3a606 100644
--- a/patches/glibc/2.22/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.21/140-Fix-combreloc-test-BSD-grep.patch
diff --git a/patches/glibc/2.21/910-typedef-caddr.patch b/packages/glibc/2.21/910-typedef-caddr.patch
index fc7979b7..fc7979b7 100644
--- a/patches/glibc/2.21/910-typedef-caddr.patch
+++ b/packages/glibc/2.21/910-typedef-caddr.patch
diff --git a/patches/glibc/2.22/920-fix-rpc_parse-format.patch b/packages/glibc/2.21/920-fix-rpc_parse-format.patch
index 37e58dac..37e58dac 100644
--- a/patches/glibc/2.22/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.21/920-fix-rpc_parse-format.patch
diff --git a/patches/glibc/2.22/930-explicit-boolean.patch b/packages/glibc/2.21/930-explicit-boolean.patch
index 780fae63..780fae63 100644
--- a/patches/glibc/2.22/930-explicit-boolean.patch
+++ b/packages/glibc/2.21/930-explicit-boolean.patch
diff --git a/patches/glibc/2.22/940-nis-bogus-conditional.patch b/packages/glibc/2.21/940-nis-bogus-conditional.patch
index 09b38cf1..09b38cf1 100644
--- a/patches/glibc/2.22/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.21/940-nis-bogus-conditional.patch
diff --git a/patches/glibc/2.21/950-dlclose-assert.patch b/packages/glibc/2.21/950-dlclose-assert.patch
index 6e2fcff4..6e2fcff4 100644
--- a/patches/glibc/2.21/950-dlclose-assert.patch
+++ b/packages/glibc/2.21/950-dlclose-assert.patch
diff --git a/packages/glibc/2.21/version.desc b/packages/glibc/2.21/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/glibc/2.21/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/glibc/2.22/100-sparc32-sem_open-missing-include.patch b/packages/glibc/2.22/100-sparc32-sem_open-missing-include.patch
index b481046e..b481046e 100644
--- a/patches/glibc/2.22/100-sparc32-sem_open-missing-include.patch
+++ b/packages/glibc/2.22/100-sparc32-sem_open-missing-include.patch
diff --git a/patches/glibc/2.23/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.22/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..6fd663a2 100644
--- a/patches/glibc/2.23/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc/2.22/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
diff --git a/patches/glibc/linaro-2.20-2014.11/102-fix-signed-shift-overlow.patch b/packages/glibc/2.22/102-fix-signed-shift-overlow.patch
index ef49f831..ef49f831 100644
--- a/patches/glibc/linaro-2.20-2014.11/102-fix-signed-shift-overlow.patch
+++ b/packages/glibc/2.22/102-fix-signed-shift-overlow.patch
diff --git a/patches/glibc/2.22/103-dl-openat64-variadic.patch b/packages/glibc/2.22/103-dl-openat64-variadic.patch
index 302088e8..302088e8 100644
--- a/patches/glibc/2.22/103-dl-openat64-variadic.patch
+++ b/packages/glibc/2.22/103-dl-openat64-variadic.patch
diff --git a/patches/glibc/2.22/104-unused-variables.patch b/packages/glibc/2.22/104-unused-variables.patch
index fd4def02..fd4def02 100644
--- a/patches/glibc/2.22/104-unused-variables.patch
+++ b/packages/glibc/2.22/104-unused-variables.patch
diff --git a/patches/glibc/linaro-2.20-2014.11/105-misleading-indentation.patch b/packages/glibc/2.22/105-misleading-indentation.patch
index 1dd8d851..1dd8d851 100644
--- a/patches/glibc/linaro-2.20-2014.11/105-misleading-indentation.patch
+++ b/packages/glibc/2.22/105-misleading-indentation.patch
diff --git a/patches/glibc/2.22/120-cve-2105-7547-getaddrinfo-stack.patch b/packages/glibc/2.22/120-cve-2105-7547-getaddrinfo-stack.patch
index 257c5f25..257c5f25 100644
--- a/patches/glibc/2.22/120-cve-2105-7547-getaddrinfo-stack.patch
+++ b/packages/glibc/2.22/120-cve-2105-7547-getaddrinfo-stack.patch
diff --git a/patches/glibc/2.23/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.22/140-Fix-combreloc-test-BSD-grep.patch
index fdc3a606..fdc3a606 100644
--- a/patches/glibc/2.23/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.22/140-Fix-combreloc-test-BSD-grep.patch
diff --git a/patches/glibc/2.22/910-typedef-caddr.patch b/packages/glibc/2.22/910-typedef-caddr.patch
index fc7979b7..fc7979b7 100644
--- a/patches/glibc/2.22/910-typedef-caddr.patch
+++ b/packages/glibc/2.22/910-typedef-caddr.patch
diff --git a/patches/glibc/2.23/920-fix-rpc_parse-format.patch b/packages/glibc/2.22/920-fix-rpc_parse-format.patch
index 37e58dac..37e58dac 100644
--- a/patches/glibc/2.23/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.22/920-fix-rpc_parse-format.patch
diff --git a/patches/glibc/2.23/930-explicit-boolean.patch b/packages/glibc/2.22/930-explicit-boolean.patch
index 780fae63..780fae63 100644
--- a/patches/glibc/2.23/930-explicit-boolean.patch
+++ b/packages/glibc/2.22/930-explicit-boolean.patch
diff --git a/patches/glibc/2.23/940-nis-bogus-conditional.patch b/packages/glibc/2.22/940-nis-bogus-conditional.patch
index 09b38cf1..09b38cf1 100644
--- a/patches/glibc/2.23/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.22/940-nis-bogus-conditional.patch
diff --git a/packages/glibc/2.22/version.desc b/packages/glibc/2.22/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/glibc/2.22/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/glibc/linaro-2.20-2014.11/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch b/packages/glibc/2.23/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
index 6fd663a2..6fd663a2 100644
--- a/patches/glibc/linaro-2.20-2014.11/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
+++ b/packages/glibc/2.23/101-Suppress-GCC-6-warning-about-ambiguous-else-with-Wpa.patch
diff --git a/patches/glibc/2.23/120-Fix-build-with-enable-static-nss.patch b/packages/glibc/2.23/120-Fix-build-with-enable-static-nss.patch
index 59ab0870..59ab0870 100644
--- a/patches/glibc/2.23/120-Fix-build-with-enable-static-nss.patch
+++ b/packages/glibc/2.23/120-Fix-build-with-enable-static-nss.patch
diff --git a/patches/glibc/2.24/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.23/140-Fix-combreloc-test-BSD-grep.patch
index fdc3a606..fdc3a606 100644
--- a/patches/glibc/2.24/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.23/140-Fix-combreloc-test-BSD-grep.patch
diff --git a/patches/glibc/2.23/910-typedef-caddr.patch b/packages/glibc/2.23/910-typedef-caddr.patch
index fc7979b7..fc7979b7 100644
--- a/patches/glibc/2.23/910-typedef-caddr.patch
+++ b/packages/glibc/2.23/910-typedef-caddr.patch
diff --git a/patches/glibc/2.24/920-fix-rpc_parse-format.patch b/packages/glibc/2.23/920-fix-rpc_parse-format.patch
index 37e58dac..37e58dac 100644
--- a/patches/glibc/2.24/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.23/920-fix-rpc_parse-format.patch
diff --git a/patches/glibc/2.24/930-explicit-boolean.patch b/packages/glibc/2.23/930-explicit-boolean.patch
index 780fae63..780fae63 100644
--- a/patches/glibc/2.24/930-explicit-boolean.patch
+++ b/packages/glibc/2.23/930-explicit-boolean.patch
diff --git a/patches/glibc/2.24/940-nis-bogus-conditional.patch b/packages/glibc/2.23/940-nis-bogus-conditional.patch
index 09b38cf1..09b38cf1 100644
--- a/patches/glibc/2.24/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.23/940-nis-bogus-conditional.patch
diff --git a/packages/glibc/2.23/version.desc b/packages/glibc/2.23/version.desc
new file mode 100644
index 00000000..4bec49fa
--- /dev/null
+++ b/packages/glibc/2.23/version.desc
@@ -0,0 +1 @@
+# Not obsolete (Ubuntu 16.04, EOL 04/21)
diff --git a/patches/glibc/2.24/110-sh-fix-gcc6.patch b/packages/glibc/2.24/110-sh-fix-gcc6.patch
index cacf390d..cacf390d 100644
--- a/patches/glibc/2.24/110-sh-fix-gcc6.patch
+++ b/packages/glibc/2.24/110-sh-fix-gcc6.patch
diff --git a/patches/glibc/2.24/120-Fix-build-with-enable-static-nss.patch b/packages/glibc/2.24/120-Fix-build-with-enable-static-nss.patch
index 59ab0870..59ab0870 100644
--- a/patches/glibc/2.24/120-Fix-build-with-enable-static-nss.patch
+++ b/packages/glibc/2.24/120-Fix-build-with-enable-static-nss.patch
diff --git a/patches/glibc/2.25/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.24/140-Fix-combreloc-test-BSD-grep.patch
index fdc3a606..fdc3a606 100644
--- a/patches/glibc/2.25/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.24/140-Fix-combreloc-test-BSD-grep.patch
diff --git a/patches/glibc/2.24/910-typedef-caddr.patch b/packages/glibc/2.24/910-typedef-caddr.patch
index fc7979b7..fc7979b7 100644
--- a/patches/glibc/2.24/910-typedef-caddr.patch
+++ b/packages/glibc/2.24/910-typedef-caddr.patch
diff --git a/patches/glibc/linaro-2.20-2014.11/920-fix-rpc_parse-format.patch b/packages/glibc/2.24/920-fix-rpc_parse-format.patch
index 37e58dac..37e58dac 100644
--- a/patches/glibc/linaro-2.20-2014.11/920-fix-rpc_parse-format.patch
+++ b/packages/glibc/2.24/920-fix-rpc_parse-format.patch
diff --git a/patches/glibc/linaro-2.20-2014.11/930-explicit-boolean.patch b/packages/glibc/2.24/930-explicit-boolean.patch
index 780fae63..780fae63 100644
--- a/patches/glibc/linaro-2.20-2014.11/930-explicit-boolean.patch
+++ b/packages/glibc/2.24/930-explicit-boolean.patch
diff --git a/patches/glibc/linaro-2.20-2014.11/940-nis-bogus-conditional.patch b/packages/glibc/2.24/940-nis-bogus-conditional.patch
index 09b38cf1..09b38cf1 100644
--- a/patches/glibc/linaro-2.20-2014.11/940-nis-bogus-conditional.patch
+++ b/packages/glibc/2.24/940-nis-bogus-conditional.patch
diff --git a/packages/glibc/2.24/version.desc b/packages/glibc/2.24/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/glibc/2.24/version.desc
diff --git a/patches/glibc/2.25/110-sh-fix-gcc6.patch b/packages/glibc/2.25/110-sh-fix-gcc6.patch
index cacf390d..cacf390d 100644
--- a/patches/glibc/2.25/110-sh-fix-gcc6.patch
+++ b/packages/glibc/2.25/110-sh-fix-gcc6.patch
diff --git a/patches/glibc/2.25/120-Fix-build-with-enable-static-nss.patch b/packages/glibc/2.25/120-Fix-build-with-enable-static-nss.patch
index 59ab0870..59ab0870 100644
--- a/patches/glibc/2.25/120-Fix-build-with-enable-static-nss.patch
+++ b/packages/glibc/2.25/120-Fix-build-with-enable-static-nss.patch
diff --git a/patches/glibc/linaro-2.20-2014.11/140-Fix-combreloc-test-BSD-grep.patch b/packages/glibc/2.25/140-Fix-combreloc-test-BSD-grep.patch
index fdc3a606..fdc3a606 100644
--- a/patches/glibc/linaro-2.20-2014.11/140-Fix-combreloc-test-BSD-grep.patch
+++ b/packages/glibc/2.25/140-Fix-combreloc-test-BSD-grep.patch
diff --git a/patches/glibc/2.25/910-typedef-caddr.patch b/packages/glibc/2.25/910-typedef-caddr.patch
index fc7979b7..fc7979b7 100644
--- a/patches/glibc/2.25/910-typedef-caddr.patch
+++ b/packages/glibc/2.25/910-typedef-caddr.patch
diff --git a/patches/glibc/2.25/960-sh4-trap-divdi3.patch b/packages/glibc/2.25/960-sh4-trap-divdi3.patch
index 99fad46c..99fad46c 100644
--- a/patches/glibc/2.25/960-sh4-trap-divdi3.patch
+++ b/packages/glibc/2.25/960-sh4-trap-divdi3.patch
diff --git a/patches/glibc/2.25/961-sparc-extra-plt-call.patch b/packages/glibc/2.25/961-sparc-extra-plt-call.patch
index 3781cf04..3781cf04 100644
--- a/patches/glibc/2.25/961-sparc-extra-plt-call.patch
+++ b/packages/glibc/2.25/961-sparc-extra-plt-call.patch
diff --git a/packages/glibc/2.25/version.desc b/packages/glibc/2.25/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/glibc/2.25/version.desc
diff --git a/packages/glibc/package.desc b/packages/glibc/package.desc
new file mode 100644
index 00000000..a7fd4990
--- /dev/null
+++ b/packages/glibc/package.desc
@@ -0,0 +1,3 @@
+origin="GNU"
+repository="git git://sourceware.org/git/glibc.git"
+milestones="2.17 2.20 2.23"
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.12.1/140-disable-ldconfig.patch
+++ b/packages/glibc/ports-2.12.1/140-disable-ldconfig.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.12.1/180-resolv-dynamic.patch
+++ b/packages/glibc/ports-2.12.1/180-resolv-dynamic.patch
diff --git a/patches/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/patches/glibc/ports-2.12.1/190-localedef-mmap.patch
+++ b/packages/glibc/ports-2.12.1/190-localedef-mmap.patch
diff --git a/patches/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/patches/glibc/ports-2.12.1/200-fadvise64_64.patch
+++ b/packages/glibc/ports-2.12.1/200-fadvise64_64.patch
diff --git a/patches/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/patches/glibc/ports-2.12.1/220-section-comments.patch
+++ b/packages/glibc/ports-2.12.1/220-section-comments.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.12.1/250-fix-pr631.patch
+++ b/packages/glibc/ports-2.12.1/250-fix-pr631.patch
diff --git a/patches/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/patches/glibc/ports-2.12.1/260-assume-pipe2.patch
+++ b/packages/glibc/ports-2.12.1/260-assume-pipe2.patch
diff --git a/patches/glibc/ports-2.12.1/270-china.patch b/packages/glibc/ports-2.12.1/270-china.patch
index 4cde1cfe..4cde1cfe 100644
--- a/patches/glibc/ports-2.12.1/270-china.patch
+++ b/packages/glibc/ports-2.12.1/270-china.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.12.1/370-fnmatch.patch b/packages/glibc/ports-2.12.1/370-fnmatch.patch
index f345b35c..f345b35c 100644
--- a/patches/glibc/ports-2.12.1/370-fnmatch.patch
+++ b/packages/glibc/ports-2.12.1/370-fnmatch.patch
diff --git a/patches/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/patches/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/patches/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/patches/glibc/ports-2.12.1/400-alpha-xstat.patch
+++ b/packages/glibc/ports-2.12.1/400-alpha-xstat.patch
diff --git a/patches/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/patches/glibc/ports-2.12.1/430-alpha-creat.patch
+++ b/packages/glibc/ports-2.12.1/430-alpha-creat.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.12.1/560-ppc-atomic.patch
+++ b/packages/glibc/ports-2.12.1/560-ppc-atomic.patch
diff --git a/patches/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/patches/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/patches/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/patches/glibc/ports-2.12.1/580-nptl-lowlevellock.patch
+++ b/packages/glibc/ports-2.12.1/580-nptl-lowlevellock.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.12.1/640-alpha-atfcts.patch
+++ b/packages/glibc/ports-2.12.1/640-alpha-atfcts.patch
diff --git a/patches/glibc/ports-2.12.1/650-syslog.patch b/packages/glibc/ports-2.12.1/650-syslog.patch
index c20cafc8..c20cafc8 100644
--- a/patches/glibc/ports-2.12.1/650-syslog.patch
+++ b/packages/glibc/ports-2.12.1/650-syslog.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.13/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc/ports-2.13/100-respect-env-CPPFLAGS.patch
diff --git a/patches/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/patches/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/patches/glibc/ports-2.13/140-disable-ldconfig.patch b/packages/glibc/ports-2.13/140-disable-ldconfig.patch
index 378e1df5..378e1df5 100644
--- a/patches/glibc/ports-2.13/140-disable-ldconfig.patch
+++ b/packages/glibc/ports-2.13/140-disable-ldconfig.patch
diff --git a/patches/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/patches/glibc/ports-2.13/150-queue-header-updates.patch
+++ b/packages/glibc/ports-2.13/150-queue-header-updates.patch
diff --git a/patches/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/patches/glibc/ports-2.13/160-manual-no-perl.patch
+++ b/packages/glibc/ports-2.13/160-manual-no-perl.patch
diff --git a/patches/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/patches/glibc/ports-2.13/170-localedef-fix-trampoline.patch
+++ b/packages/glibc/ports-2.13/170-localedef-fix-trampoline.patch
diff --git a/patches/glibc/ports-2.13/180-resolv-dynamic.patch b/packages/glibc/ports-2.13/180-resolv-dynamic.patch
index e916bce3..e916bce3 100644
--- a/patches/glibc/ports-2.13/180-resolv-dynamic.patch
+++ b/packages/glibc/ports-2.13/180-resolv-dynamic.patch
diff --git a/patches/glibc/ports-2.13/190-localedef-mmap.patch b/packages/glibc/ports-2.13/190-localedef-mmap.patch
index f3914cd1..f3914cd1 100644
--- a/patches/glibc/ports-2.13/190-localedef-mmap.patch
+++ b/packages/glibc/ports-2.13/190-localedef-mmap.patch
diff --git a/patches/glibc/ports-2.13/200-fadvise64_64.patch b/packages/glibc/ports-2.13/200-fadvise64_64.patch
index 71bca381..71bca381 100644
--- a/patches/glibc/ports-2.13/200-fadvise64_64.patch
+++ b/packages/glibc/ports-2.13/200-fadvise64_64.patch
diff --git a/patches/glibc/ports-2.13/220-section-comments.patch b/packages/glibc/ports-2.13/220-section-comments.patch
index d717829e..d717829e 100644
--- a/patches/glibc/ports-2.13/220-section-comments.patch
+++ b/packages/glibc/ports-2.13/220-section-comments.patch
diff --git a/patches/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/patches/glibc/ports-2.13/230-no-inline-gmon.patch
+++ b/packages/glibc/ports-2.13/230-no-inline-gmon.patch
diff --git a/patches/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/patches/glibc/ports-2.13/240-check_native-headers.patch
+++ b/packages/glibc/ports-2.13/240-check_native-headers.patch
diff --git a/patches/glibc/ports-2.13/250-fix-pr631.patch b/packages/glibc/ports-2.13/250-fix-pr631.patch
index a48912e1..a48912e1 100644
--- a/patches/glibc/ports-2.13/250-fix-pr631.patch
+++ b/packages/glibc/ports-2.13/250-fix-pr631.patch
diff --git a/patches/glibc/ports-2.13/260-assume-pipe2.patch b/packages/glibc/ports-2.13/260-assume-pipe2.patch
index 42e8f4ed..42e8f4ed 100644
--- a/patches/glibc/ports-2.13/260-assume-pipe2.patch
+++ b/packages/glibc/ports-2.13/260-assume-pipe2.patch
diff --git a/patches/glibc/ports-2.13/270-china.patch b/packages/glibc/ports-2.13/270-china.patch
index 41d77590..41d77590 100644
--- a/patches/glibc/ports-2.13/270-china.patch
+++ b/packages/glibc/ports-2.13/270-china.patch
diff --git a/patches/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/patches/glibc/ports-2.13/280-new-valencian-locale.patch
+++ b/packages/glibc/ports-2.13/280-new-valencian-locale.patch
diff --git a/patches/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/patches/glibc/ports-2.13/300-nscd-one-fork.patch
+++ b/packages/glibc/ports-2.13/300-nscd-one-fork.patch
diff --git a/patches/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/patches/glibc/ports-2.13/310-hppa-nptl-carlos.patch
+++ b/packages/glibc/ports-2.13/310-hppa-nptl-carlos.patch
diff --git a/patches/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/patches/glibc/ports-2.13/330-m68k-sys-user.patch
+++ b/packages/glibc/ports-2.13/330-m68k-sys-user.patch
diff --git a/patches/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/patches/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/patches/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/patches/glibc/ports-2.13/350-pre20040117-pt_pax.patch
+++ b/packages/glibc/ports-2.13/350-pre20040117-pt_pax.patch
diff --git a/patches/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/patches/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/patches/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/patches/glibc/ports-2.13/380-dont-build-timezone.patch
+++ b/packages/glibc/ports-2.13/380-dont-build-timezone.patch
diff --git a/patches/glibc/ports-2.13/400-alpha-xstat.patch b/packages/glibc/ports-2.13/400-alpha-xstat.patch
index 6e4ab8fe..6e4ab8fe 100644
--- a/patches/glibc/ports-2.13/400-alpha-xstat.patch
+++ b/packages/glibc/ports-2.13/400-alpha-xstat.patch
diff --git a/patches/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/patches/glibc/ports-2.13/410-alpha-SETPIPE-GETPIPE.patch
+++ b/packages/glibc/ports-2.13/410-alpha-SETPIPE-GETPIPE.patch
diff --git a/patches/glibc/ports-2.13/420-alpha-statfs.patch b/packages/glibc/ports-2.13/420-alpha-statfs.patch
index 65c925a5..65c925a5 100644
--- a/patches/glibc/ports-2.13/420-alpha-statfs.patch
+++ b/packages/glibc/ports-2.13/420-alpha-statfs.patch
diff --git a/patches/glibc/ports-2.13/430-alpha-creat.patch b/packages/glibc/ports-2.13/430-alpha-creat.patch
index da6dddad..da6dddad 100644
--- a/patches/glibc/ports-2.13/430-alpha-creat.patch
+++ b/packages/glibc/ports-2.13/430-alpha-creat.patch
diff --git a/patches/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/patches/glibc/ports-2.13/440-alpha-cache-shape.patch
+++ b/packages/glibc/ports-2.13/440-alpha-cache-shape.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.13/470-alpha-feupdateenv.patch b/packages/glibc/ports-2.13/470-alpha-feupdateenv.patch
index 45a7051a..45a7051a 100644
--- a/patches/glibc/ports-2.13/470-alpha-feupdateenv.patch
+++ b/packages/glibc/ports-2.13/470-alpha-feupdateenv.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.13/560-ppc-atomic.patch b/packages/glibc/ports-2.13/560-ppc-atomic.patch
index ee1cb909..ee1cb909 100644
--- a/patches/glibc/ports-2.13/560-ppc-atomic.patch
+++ b/packages/glibc/ports-2.13/560-ppc-atomic.patch
diff --git a/patches/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/patches/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/patches/glibc/ports-2.13/580-nptl-lowlevellock.patch b/packages/glibc/ports-2.13/580-nptl-lowlevellock.patch
index 08518e92..08518e92 100644
--- a/patches/glibc/ports-2.13/580-nptl-lowlevellock.patch
+++ b/packages/glibc/ports-2.13/580-nptl-lowlevellock.patch
diff --git a/patches/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/patches/glibc/ports-2.13/610-fpu-cw-mips.patch
+++ b/packages/glibc/ports-2.13/610-fpu-cw-mips.patch
diff --git a/patches/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/patches/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/patches/glibc/ports-2.13/640-alpha-atfcts.patch b/packages/glibc/ports-2.13/640-alpha-atfcts.patch
index 7a8a94a5..7a8a94a5 100644
--- a/patches/glibc/ports-2.13/640-alpha-atfcts.patch
+++ b/packages/glibc/ports-2.13/640-alpha-atfcts.patch
diff --git a/patches/glibc/ports-2.13/650-syslog.patch b/packages/glibc/ports-2.13/650-syslog.patch
index c20cafc8..c20cafc8 100644
--- a/patches/glibc/ports-2.13/650-syslog.patch
+++ b/packages/glibc/ports-2.13/650-syslog.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.14.1/140-disable-ldconfig.patch
+++ b/packages/glibc/ports-2.14.1/140-disable-ldconfig.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.14.1/180-resolv-dynamic.patch
+++ b/packages/glibc/ports-2.14.1/180-resolv-dynamic.patch
diff --git a/patches/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/patches/glibc/ports-2.14.1/190-localedef-mmap.patch
+++ b/packages/glibc/ports-2.14.1/190-localedef-mmap.patch
diff --git a/patches/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/patches/glibc/ports-2.14.1/200-fadvise64_64.patch
+++ b/packages/glibc/ports-2.14.1/200-fadvise64_64.patch
diff --git a/patches/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/patches/glibc/ports-2.14.1/220-section-comments.patch
+++ b/packages/glibc/ports-2.14.1/220-section-comments.patch
diff --git a/patches/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/patches/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/patches/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/patches/glibc/ports-2.14.1/260-assume-pipe2.patch
+++ b/packages/glibc/ports-2.14.1/260-assume-pipe2.patch
diff --git a/patches/glibc/ports-2.14.1/270-china.patch b/packages/glibc/ports-2.14.1/270-china.patch
index 41d77590..41d77590 100644
--- a/patches/glibc/ports-2.14.1/270-china.patch
+++ b/packages/glibc/ports-2.14.1/270-china.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.14.1/400-alpha-xstat.patch
+++ b/packages/glibc/ports-2.14.1/400-alpha-xstat.patch
diff --git a/patches/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/patches/glibc/ports-2.14.1/430-alpha-creat.patch
+++ b/packages/glibc/ports-2.14.1/430-alpha-creat.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.14.1/560-ppc-atomic.patch
+++ b/packages/glibc/ports-2.14.1/560-ppc-atomic.patch
diff --git a/patches/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/patches/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/patches/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/patches/glibc/ports-2.14.1/580-nptl-lowlevellock.patch
+++ b/packages/glibc/ports-2.14.1/580-nptl-lowlevellock.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.14.1/640-alpha-atfcts.patch
+++ b/packages/glibc/ports-2.14.1/640-alpha-atfcts.patch
diff --git a/patches/glibc/ports-2.14.1/650-syslog.patch b/packages/glibc/ports-2.14.1/650-syslog.patch
index c20cafc8..c20cafc8 100644
--- a/patches/glibc/ports-2.14.1/650-syslog.patch
+++ b/packages/glibc/ports-2.14.1/650-syslog.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.14/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc/ports-2.14/100-respect-env-CPPFLAGS.patch
diff --git a/patches/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/patches/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/patches/glibc/ports-2.14/140-disable-ldconfig.patch b/packages/glibc/ports-2.14/140-disable-ldconfig.patch
index 378e1df5..378e1df5 100644
--- a/patches/glibc/ports-2.14/140-disable-ldconfig.patch
+++ b/packages/glibc/ports-2.14/140-disable-ldconfig.patch
diff --git a/patches/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/patches/glibc/ports-2.14/150-queue-header-updates.patch
+++ b/packages/glibc/ports-2.14/150-queue-header-updates.patch
diff --git a/patches/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/patches/glibc/ports-2.14/160-manual-no-perl.patch
+++ b/packages/glibc/ports-2.14/160-manual-no-perl.patch
diff --git a/patches/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/patches/glibc/ports-2.14/170-localedef-fix-trampoline.patch
+++ b/packages/glibc/ports-2.14/170-localedef-fix-trampoline.patch
diff --git a/patches/glibc/ports-2.14/180-resolv-dynamic.patch b/packages/glibc/ports-2.14/180-resolv-dynamic.patch
index e916bce3..e916bce3 100644
--- a/patches/glibc/ports-2.14/180-resolv-dynamic.patch
+++ b/packages/glibc/ports-2.14/180-resolv-dynamic.patch
diff --git a/patches/glibc/ports-2.14/190-localedef-mmap.patch b/packages/glibc/ports-2.14/190-localedef-mmap.patch
index f3914cd1..f3914cd1 100644
--- a/patches/glibc/ports-2.14/190-localedef-mmap.patch
+++ b/packages/glibc/ports-2.14/190-localedef-mmap.patch
diff --git a/patches/glibc/ports-2.14/200-fadvise64_64.patch b/packages/glibc/ports-2.14/200-fadvise64_64.patch
index 71bca381..71bca381 100644
--- a/patches/glibc/ports-2.14/200-fadvise64_64.patch
+++ b/packages/glibc/ports-2.14/200-fadvise64_64.patch
diff --git a/patches/glibc/ports-2.14/220-section-comments.patch b/packages/glibc/ports-2.14/220-section-comments.patch
index d717829e..d717829e 100644
--- a/patches/glibc/ports-2.14/220-section-comments.patch
+++ b/packages/glibc/ports-2.14/220-section-comments.patch
diff --git a/patches/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/patches/glibc/ports-2.14/230-no-inline-gmon.patch
+++ b/packages/glibc/ports-2.14/230-no-inline-gmon.patch
diff --git a/patches/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/patches/glibc/ports-2.14/240-check_native-headers.patch
+++ b/packages/glibc/ports-2.14/240-check_native-headers.patch
diff --git a/patches/glibc/ports-2.14/260-assume-pipe2.patch b/packages/glibc/ports-2.14/260-assume-pipe2.patch
index 42e8f4ed..42e8f4ed 100644
--- a/patches/glibc/ports-2.14/260-assume-pipe2.patch
+++ b/packages/glibc/ports-2.14/260-assume-pipe2.patch
diff --git a/patches/glibc/ports-2.14/270-china.patch b/packages/glibc/ports-2.14/270-china.patch
index 41d77590..41d77590 100644
--- a/patches/glibc/ports-2.14/270-china.patch
+++ b/packages/glibc/ports-2.14/270-china.patch
diff --git a/patches/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/patches/glibc/ports-2.14/280-new-valencian-locale.patch
+++ b/packages/glibc/ports-2.14/280-new-valencian-locale.patch
diff --git a/patches/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/patches/glibc/ports-2.14/300-nscd-one-fork.patch
+++ b/packages/glibc/ports-2.14/300-nscd-one-fork.patch
diff --git a/patches/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/patches/glibc/ports-2.14/310-hppa-nptl-carlos.patch
+++ b/packages/glibc/ports-2.14/310-hppa-nptl-carlos.patch
diff --git a/patches/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/patches/glibc/ports-2.14/330-m68k-sys-user.patch
+++ b/packages/glibc/ports-2.14/330-m68k-sys-user.patch
diff --git a/patches/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/patches/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/patches/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/patches/glibc/ports-2.14/350-pre20040117-pt_pax.patch
+++ b/packages/glibc/ports-2.14/350-pre20040117-pt_pax.patch
diff --git a/patches/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/patches/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/patches/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/patches/glibc/ports-2.14/380-dont-build-timezone.patch
+++ b/packages/glibc/ports-2.14/380-dont-build-timezone.patch
diff --git a/patches/glibc/ports-2.14/400-alpha-xstat.patch b/packages/glibc/ports-2.14/400-alpha-xstat.patch
index 6e4ab8fe..6e4ab8fe 100644
--- a/patches/glibc/ports-2.14/400-alpha-xstat.patch
+++ b/packages/glibc/ports-2.14/400-alpha-xstat.patch
diff --git a/patches/glibc/ports-2.14/430-alpha-creat.patch b/packages/glibc/ports-2.14/430-alpha-creat.patch
index da6dddad..da6dddad 100644
--- a/patches/glibc/ports-2.14/430-alpha-creat.patch
+++ b/packages/glibc/ports-2.14/430-alpha-creat.patch
diff --git a/patches/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/patches/glibc/ports-2.14/440-alpha-cache-shape.patch
+++ b/packages/glibc/ports-2.14/440-alpha-cache-shape.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.14/560-ppc-atomic.patch b/packages/glibc/ports-2.14/560-ppc-atomic.patch
index ee1cb909..ee1cb909 100644
--- a/patches/glibc/ports-2.14/560-ppc-atomic.patch
+++ b/packages/glibc/ports-2.14/560-ppc-atomic.patch
diff --git a/patches/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/patches/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/patches/glibc/ports-2.14/580-nptl-lowlevellock.patch b/packages/glibc/ports-2.14/580-nptl-lowlevellock.patch
index a2a141c0..a2a141c0 100644
--- a/patches/glibc/ports-2.14/580-nptl-lowlevellock.patch
+++ b/packages/glibc/ports-2.14/580-nptl-lowlevellock.patch
diff --git a/patches/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/patches/glibc/ports-2.14/610-fpu-cw-mips.patch
+++ b/packages/glibc/ports-2.14/610-fpu-cw-mips.patch
diff --git a/patches/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/patches/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/patches/glibc/ports-2.14/640-alpha-atfcts.patch b/packages/glibc/ports-2.14/640-alpha-atfcts.patch
index 7a8a94a5..7a8a94a5 100644
--- a/patches/glibc/ports-2.14/640-alpha-atfcts.patch
+++ b/packages/glibc/ports-2.14/640-alpha-atfcts.patch
diff --git a/patches/glibc/ports-2.14/650-syslog.patch b/packages/glibc/ports-2.14/650-syslog.patch
index c20cafc8..c20cafc8 100644
--- a/patches/glibc/ports-2.14/650-syslog.patch
+++ b/packages/glibc/ports-2.14/650-syslog.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.15/091-libmemusage-link-failure.patch
+++ b/packages/glibc/ports-2.15/091-libmemusage-link-failure.patch
diff --git a/patches/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/patches/glibc/ports-2.15/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc/ports-2.15/100-respect-env-CPPFLAGS.patch
diff --git a/patches/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/patches/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/patches/glibc/ports-2.15/140-disable-ldconfig.patch b/packages/glibc/ports-2.15/140-disable-ldconfig.patch
index 378e1df5..378e1df5 100644
--- a/patches/glibc/ports-2.15/140-disable-ldconfig.patch
+++ b/packages/glibc/ports-2.15/140-disable-ldconfig.patch
diff --git a/patches/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/patches/glibc/ports-2.15/150-queue-header-updates.patch
+++ b/packages/glibc/ports-2.15/150-queue-header-updates.patch
diff --git a/patches/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/patches/glibc/ports-2.15/160-manual-no-perl.patch
+++ b/packages/glibc/ports-2.15/160-manual-no-perl.patch
diff --git a/patches/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/patches/glibc/ports-2.15/170-localedef-fix-trampoline.patch
+++ b/packages/glibc/ports-2.15/170-localedef-fix-trampoline.patch
diff --git a/patches/glibc/ports-2.15/180-resolv-dynamic.patch b/packages/glibc/ports-2.15/180-resolv-dynamic.patch
index e916bce3..e916bce3 100644
--- a/patches/glibc/ports-2.15/180-resolv-dynamic.patch
+++ b/packages/glibc/ports-2.15/180-resolv-dynamic.patch
diff --git a/patches/glibc/ports-2.15/200-fadvise64_64.patch b/packages/glibc/ports-2.15/200-fadvise64_64.patch
index 71bca381..71bca381 100644
--- a/patches/glibc/ports-2.15/200-fadvise64_64.patch
+++ b/packages/glibc/ports-2.15/200-fadvise64_64.patch
diff --git a/patches/glibc/ports-2.15/220-section-comments.patch b/packages/glibc/ports-2.15/220-section-comments.patch
index d717829e..d717829e 100644
--- a/patches/glibc/ports-2.15/220-section-comments.patch
+++ b/packages/glibc/ports-2.15/220-section-comments.patch
diff --git a/patches/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/patches/glibc/ports-2.15/230-no-inline-gmon.patch
+++ b/packages/glibc/ports-2.15/230-no-inline-gmon.patch
diff --git a/patches/glibc/ports-2.15/260-assume-pipe2.patch b/packages/glibc/ports-2.15/260-assume-pipe2.patch
index 42e8f4ed..42e8f4ed 100644
--- a/patches/glibc/ports-2.15/260-assume-pipe2.patch
+++ b/packages/glibc/ports-2.15/260-assume-pipe2.patch
diff --git a/patches/glibc/ports-2.15/270-china.patch b/packages/glibc/ports-2.15/270-china.patch
index 41d77590..41d77590 100644
--- a/patches/glibc/ports-2.15/270-china.patch
+++ b/packages/glibc/ports-2.15/270-china.patch
diff --git a/patches/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/patches/glibc/ports-2.15/280-new-valencian-locale.patch
+++ b/packages/glibc/ports-2.15/280-new-valencian-locale.patch
diff --git a/patches/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/patches/glibc/ports-2.15/300-nscd-one-fork.patch
+++ b/packages/glibc/ports-2.15/300-nscd-one-fork.patch
diff --git a/patches/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/patches/glibc/ports-2.15/310-hppa-nptl-carlos.patch
+++ b/packages/glibc/ports-2.15/310-hppa-nptl-carlos.patch
diff --git a/patches/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/patches/glibc/ports-2.15/330-m68k-sys-user.patch
+++ b/packages/glibc/ports-2.15/330-m68k-sys-user.patch
diff --git a/patches/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/patches/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/patches/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/patches/glibc/ports-2.15/350-pre20040117-pt_pax.patch
+++ b/packages/glibc/ports-2.15/350-pre20040117-pt_pax.patch
diff --git a/patches/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/patches/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/patches/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/patches/glibc/ports-2.15/380-dont-build-timezone.patch
+++ b/packages/glibc/ports-2.15/380-dont-build-timezone.patch
diff --git a/patches/glibc/ports-2.15/400-alpha-xstat.patch b/packages/glibc/ports-2.15/400-alpha-xstat.patch
index 6e4ab8fe..6e4ab8fe 100644
--- a/patches/glibc/ports-2.15/400-alpha-xstat.patch
+++ b/packages/glibc/ports-2.15/400-alpha-xstat.patch
diff --git a/patches/glibc/ports-2.15/430-alpha-creat.patch b/packages/glibc/ports-2.15/430-alpha-creat.patch
index da6dddad..da6dddad 100644
--- a/patches/glibc/ports-2.15/430-alpha-creat.patch
+++ b/packages/glibc/ports-2.15/430-alpha-creat.patch
diff --git a/patches/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/patches/glibc/ports-2.15/440-alpha-cache-shape.patch
+++ b/packages/glibc/ports-2.15/440-alpha-cache-shape.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.15/560-ppc-atomic.patch b/packages/glibc/ports-2.15/560-ppc-atomic.patch
index ee1cb909..ee1cb909 100644
--- a/patches/glibc/ports-2.15/560-ppc-atomic.patch
+++ b/packages/glibc/ports-2.15/560-ppc-atomic.patch
diff --git a/patches/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/patches/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/patches/glibc/ports-2.15/580-nptl-lowlevellock.patch b/packages/glibc/ports-2.15/580-nptl-lowlevellock.patch
index a39e4638..a39e4638 100644
--- a/patches/glibc/ports-2.15/580-nptl-lowlevellock.patch
+++ b/packages/glibc/ports-2.15/580-nptl-lowlevellock.patch
diff --git a/patches/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/patches/glibc/ports-2.15/610-fpu-cw-mips.patch
+++ b/packages/glibc/ports-2.15/610-fpu-cw-mips.patch
diff --git a/patches/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/patches/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/patches/glibc/ports-2.15/640-alpha-atfcts.patch b/packages/glibc/ports-2.15/640-alpha-atfcts.patch
index 7a8a94a5..7a8a94a5 100644
--- a/patches/glibc/ports-2.15/640-alpha-atfcts.patch
+++ b/packages/glibc/ports-2.15/640-alpha-atfcts.patch
diff --git a/patches/glibc/ports-2.15/650-syslog.patch b/packages/glibc/ports-2.15/650-syslog.patch
index c20cafc8..c20cafc8 100644
--- a/patches/glibc/ports-2.15/650-syslog.patch
+++ b/packages/glibc/ports-2.15/650-syslog.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.16.0/140-disable-ldconfig.patch
+++ b/packages/glibc/ports-2.16.0/140-disable-ldconfig.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.16.0/180-resolv-dynamic.patch
+++ b/packages/glibc/ports-2.16.0/180-resolv-dynamic.patch
diff --git a/patches/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/patches/glibc/ports-2.16.0/200-fadvise64_64.patch
+++ b/packages/glibc/ports-2.16.0/200-fadvise64_64.patch
diff --git a/patches/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/patches/glibc/ports-2.16.0/260-assume-pipe2.patch
+++ b/packages/glibc/ports-2.16.0/260-assume-pipe2.patch
diff --git a/patches/glibc/ports-2.16.0/270-china.patch b/packages/glibc/ports-2.16.0/270-china.patch
index 41d77590..41d77590 100644
--- a/patches/glibc/ports-2.16.0/270-china.patch
+++ b/packages/glibc/ports-2.16.0/270-china.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.16.0/400-alpha-xstat.patch
+++ b/packages/glibc/ports-2.16.0/400-alpha-xstat.patch
diff --git a/patches/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/patches/glibc/ports-2.16.0/430-alpha-creat.patch
+++ b/packages/glibc/ports-2.16.0/430-alpha-creat.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.16.0/560-ppc-atomic.patch
+++ b/packages/glibc/ports-2.16.0/560-ppc-atomic.patch
diff --git a/patches/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/patches/glibc/ports-2.16.0/580-nptl-lowlevellock.patch
+++ b/packages/glibc/ports-2.16.0/580-nptl-lowlevellock.patch
diff --git a/patches/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/patches/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/patches/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/patches/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/patches/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/patches/glibc/ports-2.16.0/640-alpha-atfcts.patch
+++ b/packages/glibc/ports-2.16.0/640-alpha-atfcts.patch
diff --git a/patches/glibc/ports-2.16.0/650-syslog.patch b/packages/glibc/ports-2.16.0/650-syslog.patch
index c20cafc8..c20cafc8 100644
--- a/patches/glibc/ports-2.16.0/650-syslog.patch
+++ b/packages/glibc/ports-2.16.0/650-syslog.patch
diff --git a/patches/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/patches/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/patches/linux/2.6.32.27/100-unifdef-strclpy.patch b/packages/linux/2.6.32.27/100-unifdef-strclpy.patch
index 072fac6f..072fac6f 100644
--- a/patches/linux/2.6.32.27/100-unifdef-strclpy.patch
+++ b/packages/linux/2.6.32.27/100-unifdef-strclpy.patch
diff --git a/packages/linux/2.6.32.27/version.desc b/packages/linux/2.6.32.27/version.desc
new file mode 100644
index 00000000..3475dc2b
--- /dev/null
+++ b/packages/linux/2.6.32.27/version.desc
@@ -0,0 +1 @@
+# Not obsolete: used by CentOS6.x, EOL 11/2020
diff --git a/packages/linux/2.6.33.7/version.desc b/packages/linux/2.6.33.7/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/2.6.33.7/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/2.6.34.7/version.desc b/packages/linux/2.6.34.7/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/2.6.34.7/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/2.6.35.9/version.desc b/packages/linux/2.6.35.9/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/2.6.35.9/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/2.6.36.4/version.desc b/packages/linux/2.6.36.4/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/2.6.36.4/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/2.6.37.6/version.desc b/packages/linux/2.6.37.6/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/2.6.37.6/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/2.6.38.8/version.desc b/packages/linux/2.6.38.8/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/2.6.38.8/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/2.6.39.4/version.desc b/packages/linux/2.6.39.4/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/2.6.39.4/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/3.0.101/version.desc b/packages/linux/3.0.101/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/3.0.101/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/3.1.10/version.desc b/packages/linux/3.1.10/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/3.1.10/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/3.10.105/version.desc b/packages/linux/3.10.105/version.desc
new file mode 100644
index 00000000..7c0a082a
--- /dev/null
+++ b/packages/linux/3.10.105/version.desc
@@ -0,0 +1 @@
+# Not obsolete: used by CentOS7.x, EOL 06/2024
diff --git a/packages/linux/3.11.10/version.desc b/packages/linux/3.11.10/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/3.11.10/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/3.12.72/version.desc b/packages/linux/3.12.72/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/linux/3.12.72/version.desc
diff --git a/packages/linux/3.13.11/version.desc b/packages/linux/3.13.11/version.desc
new file mode 100644
index 00000000..89c1908b
--- /dev/null
+++ b/packages/linux/3.13.11/version.desc
@@ -0,0 +1 @@
+# Not obsolete: used by Ubuntu14.04, EOL 04/2019
diff --git a/packages/linux/3.14.79/version.desc b/packages/linux/3.14.79/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/3.14.79/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/3.15.10/version.desc b/packages/linux/3.15.10/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/3.15.10/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/3.16.42/version.desc b/packages/linux/3.16.42/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/linux/3.16.42/version.desc
diff --git a/packages/linux/3.17.8/version.desc b/packages/linux/3.17.8/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/3.17.8/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/3.18.48/version.desc b/packages/linux/3.18.48/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/3.18.48/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/3.19.8/version.desc b/packages/linux/3.19.8/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/3.19.8/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/3.2.87/version.desc b/packages/linux/3.2.87/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/linux/3.2.87/version.desc
diff --git a/packages/linux/3.3.8/version.desc b/packages/linux/3.3.8/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/3.3.8/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/3.4.113/version.desc b/packages/linux/3.4.113/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/linux/3.4.113/version.desc
diff --git a/packages/linux/3.5.7/version.desc b/packages/linux/3.5.7/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/3.5.7/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/3.6.11/version.desc b/packages/linux/3.6.11/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/3.6.11/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/3.7.10/version.desc b/packages/linux/3.7.10/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/3.7.10/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/3.8.13/version.desc b/packages/linux/3.8.13/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/3.8.13/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/3.9.11/version.desc b/packages/linux/3.9.11/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/3.9.11/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/4.0.9/version.desc b/packages/linux/4.0.9/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/4.0.9/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/4.1.39/version.desc b/packages/linux/4.1.39/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/linux/4.1.39/version.desc
diff --git a/packages/linux/4.10.8/version.desc b/packages/linux/4.10.8/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/4.10.8/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/4.2.8/version.desc b/packages/linux/4.2.8/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/4.2.8/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/4.3.6/version.desc b/packages/linux/4.3.6/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/4.3.6/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/4.4.59/version.desc b/packages/linux/4.4.59/version.desc
new file mode 100644
index 00000000..7d5188ff
--- /dev/null
+++ b/packages/linux/4.4.59/version.desc
@@ -0,0 +1 @@
+# Not obsolete: used by Ubuntu16.04, EOL 04/2021
diff --git a/packages/linux/4.5.7/version.desc b/packages/linux/4.5.7/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/4.5.7/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/4.6.7/version.desc b/packages/linux/4.6.7/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/4.6.7/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/4.7.10/version.desc b/packages/linux/4.7.10/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/4.7.10/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/4.8.17/version.desc b/packages/linux/4.8.17/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/linux/4.8.17/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/linux/4.9.20/version.desc b/packages/linux/4.9.20/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/linux/4.9.20/version.desc
diff --git a/packages/linux/package.desc b/packages/linux/package.desc
new file mode 100644
index 00000000..2e5f7a30
--- /dev/null
+++ b/packages/linux/package.desc
@@ -0,0 +1 @@
+repository="git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
diff --git a/packages/mingw-w64/package.desc b/packages/mingw-w64/package.desc
new file mode 100644
index 00000000..7bae1f7d
--- /dev/null
+++ b/packages/mingw-w64/package.desc
@@ -0,0 +1 @@
+repository="git https://git.code.sf.net/p/mingw-w64/mingw-w64"
diff --git a/patches/mingw-w64/v2.0.7/100-mingw64-malloc.patch b/packages/mingw-w64/v2.0.7/100-mingw64-malloc.patch
index d9d5a61f..d9d5a61f 100644
--- a/patches/mingw-w64/v2.0.7/100-mingw64-malloc.patch
+++ b/packages/mingw-w64/v2.0.7/100-mingw64-malloc.patch
diff --git a/packages/mingw-w64/v2.0.7/version.desc b/packages/mingw-w64/v2.0.7/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/mingw-w64/v2.0.7/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mingw-w64/v2.0.8/100-mingw64-malloc.patch b/packages/mingw-w64/v2.0.8/100-mingw64-malloc.patch
index d9d5a61f..d9d5a61f 100644
--- a/patches/mingw-w64/v2.0.8/100-mingw64-malloc.patch
+++ b/packages/mingw-w64/v2.0.8/100-mingw64-malloc.patch
diff --git a/packages/mingw-w64/v2.0.8/version.desc b/packages/mingw-w64/v2.0.8/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/mingw-w64/v2.0.8/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mingw-w64/v2.0.9/100-mingw64-malloc.patch b/packages/mingw-w64/v2.0.9/100-mingw64-malloc.patch
index d9d5a61f..d9d5a61f 100644
--- a/patches/mingw-w64/v2.0.9/100-mingw64-malloc.patch
+++ b/packages/mingw-w64/v2.0.9/100-mingw64-malloc.patch
diff --git a/packages/mingw-w64/v2.0.9/version.desc b/packages/mingw-w64/v2.0.9/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/mingw-w64/v2.0.9/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mingw-w64/v3.0.0/100-mingw64-malloc.patch b/packages/mingw-w64/v3.0.0/100-mingw64-malloc.patch
index d9d5a61f..d9d5a61f 100644
--- a/patches/mingw-w64/v3.0.0/100-mingw64-malloc.patch
+++ b/packages/mingw-w64/v3.0.0/100-mingw64-malloc.patch
diff --git a/packages/mingw-w64/v3.0.0/version.desc b/packages/mingw-w64/v3.0.0/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/mingw-w64/v3.0.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mingw-w64/v3.1.0/100-mingw64-malloc.patch b/packages/mingw-w64/v3.1.0/100-mingw64-malloc.patch
index d9d5a61f..d9d5a61f 100644
--- a/patches/mingw-w64/v3.1.0/100-mingw64-malloc.patch
+++ b/packages/mingw-w64/v3.1.0/100-mingw64-malloc.patch
diff --git a/packages/mingw-w64/v3.1.0/version.desc b/packages/mingw-w64/v3.1.0/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/mingw-w64/v3.1.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mingw-w64/v3.2.0/100-mingw64-malloc.patch b/packages/mingw-w64/v3.2.0/100-mingw64-malloc.patch
index d9d5a61f..d9d5a61f 100644
--- a/patches/mingw-w64/v3.2.0/100-mingw64-malloc.patch
+++ b/packages/mingw-w64/v3.2.0/100-mingw64-malloc.patch
diff --git a/packages/mingw-w64/v3.2.0/version.desc b/packages/mingw-w64/v3.2.0/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/mingw-w64/v3.2.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mingw-w64/v3.3.0/100-mingw64-malloc.patch b/packages/mingw-w64/v3.3.0/100-mingw64-malloc.patch
index d9d5a61f..d9d5a61f 100644
--- a/patches/mingw-w64/v3.3.0/100-mingw64-malloc.patch
+++ b/packages/mingw-w64/v3.3.0/100-mingw64-malloc.patch
diff --git a/packages/mingw-w64/v3.3.0/version.desc b/packages/mingw-w64/v3.3.0/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/mingw-w64/v3.3.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mingw-w64/v4.0.0/100-mingw64-malloc.patch b/packages/mingw-w64/v4.0.0/100-mingw64-malloc.patch
index d9d5a61f..d9d5a61f 100644
--- a/patches/mingw-w64/v4.0.0/100-mingw64-malloc.patch
+++ b/packages/mingw-w64/v4.0.0/100-mingw64-malloc.patch
diff --git a/packages/mingw-w64/v4.0.0/version.desc b/packages/mingw-w64/v4.0.0/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/mingw-w64/v4.0.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mingw-w64/v4.0.1/100-mingw64-malloc.patch b/packages/mingw-w64/v4.0.1/100-mingw64-malloc.patch
index d9d5a61f..d9d5a61f 100644
--- a/patches/mingw-w64/v4.0.1/100-mingw64-malloc.patch
+++ b/packages/mingw-w64/v4.0.1/100-mingw64-malloc.patch
diff --git a/packages/mingw-w64/v4.0.1/version.desc b/packages/mingw-w64/v4.0.1/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/mingw-w64/v4.0.1/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mingw-w64/v4.0.2/100-mingw64-malloc.patch b/packages/mingw-w64/v4.0.2/100-mingw64-malloc.patch
index d9d5a61f..d9d5a61f 100644
--- a/patches/mingw-w64/v4.0.2/100-mingw64-malloc.patch
+++ b/packages/mingw-w64/v4.0.2/100-mingw64-malloc.patch
diff --git a/packages/mingw-w64/v4.0.2/version.desc b/packages/mingw-w64/v4.0.2/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/mingw-w64/v4.0.2/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mingw-w64/v4.0.4/100-mingw64-malloc.patch b/packages/mingw-w64/v4.0.4/100-mingw64-malloc.patch
index d9d5a61f..d9d5a61f 100644
--- a/patches/mingw-w64/v4.0.4/100-mingw64-malloc.patch
+++ b/packages/mingw-w64/v4.0.4/100-mingw64-malloc.patch
diff --git a/packages/mingw-w64/v4.0.4/version.desc b/packages/mingw-w64/v4.0.4/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/mingw-w64/v4.0.4/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mingw-w64/v4.0.5/100-mingw64-malloc.patch b/packages/mingw-w64/v4.0.5/100-mingw64-malloc.patch
index d9d5a61f..d9d5a61f 100644
--- a/patches/mingw-w64/v4.0.5/100-mingw64-malloc.patch
+++ b/packages/mingw-w64/v4.0.5/100-mingw64-malloc.patch
diff --git a/packages/mingw-w64/v4.0.5/version.desc b/packages/mingw-w64/v4.0.5/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/mingw-w64/v4.0.5/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mingw-w64/v4.0.6/100-mingw64-malloc.patch b/packages/mingw-w64/v4.0.6/100-mingw64-malloc.patch
index d9d5a61f..d9d5a61f 100644
--- a/patches/mingw-w64/v4.0.6/100-mingw64-malloc.patch
+++ b/packages/mingw-w64/v4.0.6/100-mingw64-malloc.patch
diff --git a/packages/mingw-w64/v4.0.6/version.desc b/packages/mingw-w64/v4.0.6/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/mingw-w64/v4.0.6/version.desc
diff --git a/patches/mingw-w64/v5.0.0/100-mingw64-malloc.patch b/packages/mingw-w64/v5.0.0/100-mingw64-malloc.patch
index 3d05b63b..3d05b63b 100644
--- a/patches/mingw-w64/v5.0.0/100-mingw64-malloc.patch
+++ b/packages/mingw-w64/v5.0.0/100-mingw64-malloc.patch
diff --git a/packages/mingw-w64/v5.0.0/version.desc b/packages/mingw-w64/v5.0.0/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/mingw-w64/v5.0.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/mingw-w64/v5.0.1/100-mingw64-malloc.patch b/packages/mingw-w64/v5.0.1/100-mingw64-malloc.patch
index 3d05b63b..3d05b63b 100644
--- a/patches/mingw-w64/v5.0.1/100-mingw64-malloc.patch
+++ b/packages/mingw-w64/v5.0.1/100-mingw64-malloc.patch
diff --git a/packages/mingw-w64/v5.0.1/version.desc b/packages/mingw-w64/v5.0.1/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/mingw-w64/v5.0.1/version.desc
diff --git a/patches/mingw-w64/v5.0.2/100-mingw64-malloc.patch b/packages/mingw-w64/v5.0.2/100-mingw64-malloc.patch
index 3d05b63b..3d05b63b 100644
--- a/patches/mingw-w64/v5.0.2/100-mingw64-malloc.patch
+++ b/packages/mingw-w64/v5.0.2/100-mingw64-malloc.patch
diff --git a/packages/mingw-w64/v5.0.2/version.desc b/packages/mingw-w64/v5.0.2/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/mingw-w64/v5.0.2/version.desc
diff --git a/packages/musl/1.1.15/version.desc b/packages/musl/1.1.15/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/musl/1.1.15/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/musl/1.1.16/version.desc b/packages/musl/1.1.16/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/musl/1.1.16/version.desc
diff --git a/packages/musl/package.desc b/packages/musl/package.desc
new file mode 100644
index 00000000..23870dd8
--- /dev/null
+++ b/packages/musl/package.desc
@@ -0,0 +1 @@
+repository="git git://git.musl-libc.org/musl"
diff --git a/patches/newlib/1.20.0/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib-linaro/2.1.0-2014.09/100-fix-unaligned-access-memcpy-m68k.patch
index 1d0b49be..1d0b49be 100644
--- a/patches/newlib/1.20.0/100-fix-unaligned-access-memcpy-m68k.patch
+++ b/packages/newlib-linaro/2.1.0-2014.09/100-fix-unaligned-access-memcpy-m68k.patch
diff --git a/patches/newlib/linaro-2.1.0-2014.09/110-fix-eabihf.patch b/packages/newlib-linaro/2.1.0-2014.09/110-fix-eabihf.patch
index 21a31492..21a31492 100644
--- a/patches/newlib/linaro-2.1.0-2014.09/110-fix-eabihf.patch
+++ b/packages/newlib-linaro/2.1.0-2014.09/110-fix-eabihf.patch
diff --git a/patches/newlib/linaro-2.1.0-2014.09/200-fix-mt-cflags.patch b/packages/newlib-linaro/2.1.0-2014.09/200-fix-mt-cflags.patch
index f64c170d..f64c170d 100644
--- a/patches/newlib/linaro-2.1.0-2014.09/200-fix-mt-cflags.patch
+++ b/packages/newlib-linaro/2.1.0-2014.09/200-fix-mt-cflags.patch
diff --git a/packages/newlib-linaro/2.1.0-2014.09/version.desc b/packages/newlib-linaro/2.1.0-2014.09/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/newlib-linaro/2.1.0-2014.09/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/newlib/2.0.0/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib-linaro/2.2.0-2015.01/100-fix-unaligned-access-memcpy-m68k.patch
index 1d0b49be..1d0b49be 100644
--- a/patches/newlib/2.0.0/100-fix-unaligned-access-memcpy-m68k.patch
+++ b/packages/newlib-linaro/2.2.0-2015.01/100-fix-unaligned-access-memcpy-m68k.patch
diff --git a/patches/newlib/linaro-2.2.0-2015.01/110-fix-eabihf.patch b/packages/newlib-linaro/2.2.0-2015.01/110-fix-eabihf.patch
index 1fa21cc3..1fa21cc3 100644
--- a/patches/newlib/linaro-2.2.0-2015.01/110-fix-eabihf.patch
+++ b/packages/newlib-linaro/2.2.0-2015.01/110-fix-eabihf.patch
diff --git a/patches/newlib/linaro-2.2.0-2015.01/200-fix-mt-cflags.patch b/packages/newlib-linaro/2.2.0-2015.01/200-fix-mt-cflags.patch
index 68e935ba..68e935ba 100644
--- a/patches/newlib/linaro-2.2.0-2015.01/200-fix-mt-cflags.patch
+++ b/packages/newlib-linaro/2.2.0-2015.01/200-fix-mt-cflags.patch
diff --git a/packages/newlib-linaro/2.2.0-2015.01/version.desc b/packages/newlib-linaro/2.2.0-2015.01/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/newlib-linaro/2.2.0-2015.01/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/newlib-linaro/package.desc b/packages/newlib-linaro/package.desc
new file mode 100644
index 00000000..d1bc373c
--- /dev/null
+++ b/packages/newlib-linaro/package.desc
@@ -0,0 +1,4 @@
+origin="Linaro"
+master="newlib"
+repository="git https://git.linaro.org/toolchain/newlib.git"
+experimental="yes"
diff --git a/patches/newlib/1.17.0/110-fix-eabihf.patch b/packages/newlib/1.17.0/110-fix-eabihf.patch
index d896ad01..d896ad01 100644
--- a/patches/newlib/1.17.0/110-fix-eabihf.patch
+++ b/packages/newlib/1.17.0/110-fix-eabihf.patch
diff --git a/patches/newlib/1.17.0/200-fix-mt-cflags.patch b/packages/newlib/1.17.0/200-fix-mt-cflags.patch
index f97ba150..f97ba150 100644
--- a/patches/newlib/1.17.0/200-fix-mt-cflags.patch
+++ b/packages/newlib/1.17.0/200-fix-mt-cflags.patch
diff --git a/patches/newlib/1.17.0/999-fix-arm-build.patch b/packages/newlib/1.17.0/999-fix-arm-build.patch
index 154a92f5..154a92f5 100644
--- a/patches/newlib/1.17.0/999-fix-arm-build.patch
+++ b/packages/newlib/1.17.0/999-fix-arm-build.patch
diff --git a/packages/newlib/1.17.0/version.desc b/packages/newlib/1.17.0/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/newlib/1.17.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/newlib/1.18.0/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/1.18.0/100-fix-unaligned-access-memcpy-m68k.patch
index 6214ee59..6214ee59 100644
--- a/patches/newlib/1.18.0/100-fix-unaligned-access-memcpy-m68k.patch
+++ b/packages/newlib/1.18.0/100-fix-unaligned-access-memcpy-m68k.patch
diff --git a/patches/newlib/1.18.0/110-fix-eabihf.patch b/packages/newlib/1.18.0/110-fix-eabihf.patch
index c2868b93..c2868b93 100644
--- a/patches/newlib/1.18.0/110-fix-eabihf.patch
+++ b/packages/newlib/1.18.0/110-fix-eabihf.patch
diff --git a/patches/newlib/1.18.0/200-fix-mt-cflags.patch b/packages/newlib/1.18.0/200-fix-mt-cflags.patch
index 718e0c98..718e0c98 100644
--- a/patches/newlib/1.18.0/200-fix-mt-cflags.patch
+++ b/packages/newlib/1.18.0/200-fix-mt-cflags.patch
diff --git a/packages/newlib/1.18.0/version.desc b/packages/newlib/1.18.0/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/newlib/1.18.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/newlib/1.19.0/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/1.19.0/100-fix-unaligned-access-memcpy-m68k.patch
index 191363a6..191363a6 100644
--- a/patches/newlib/1.19.0/100-fix-unaligned-access-memcpy-m68k.patch
+++ b/packages/newlib/1.19.0/100-fix-unaligned-access-memcpy-m68k.patch
diff --git a/patches/newlib/1.19.0/110-fix-eabihf.patch b/packages/newlib/1.19.0/110-fix-eabihf.patch
index 69ddff34..69ddff34 100644
--- a/patches/newlib/1.19.0/110-fix-eabihf.patch
+++ b/packages/newlib/1.19.0/110-fix-eabihf.patch
diff --git a/patches/newlib/1.19.0/200-fix-mt-cflags.patch b/packages/newlib/1.19.0/200-fix-mt-cflags.patch
index 9158e907..9158e907 100644
--- a/patches/newlib/1.19.0/200-fix-mt-cflags.patch
+++ b/packages/newlib/1.19.0/200-fix-mt-cflags.patch
diff --git a/packages/newlib/1.19.0/version.desc b/packages/newlib/1.19.0/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/newlib/1.19.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/newlib/2.1.0/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/1.20.0/100-fix-unaligned-access-memcpy-m68k.patch
index 1d0b49be..1d0b49be 100644
--- a/patches/newlib/2.1.0/100-fix-unaligned-access-memcpy-m68k.patch
+++ b/packages/newlib/1.20.0/100-fix-unaligned-access-memcpy-m68k.patch
diff --git a/patches/newlib/1.20.0/110-fix-eabihf.patch b/packages/newlib/1.20.0/110-fix-eabihf.patch
index 8e30823b..8e30823b 100644
--- a/patches/newlib/1.20.0/110-fix-eabihf.patch
+++ b/packages/newlib/1.20.0/110-fix-eabihf.patch
diff --git a/patches/newlib/1.20.0/200-fix-mt-cflags.patch b/packages/newlib/1.20.0/200-fix-mt-cflags.patch
index b470af7d..b470af7d 100644
--- a/patches/newlib/1.20.0/200-fix-mt-cflags.patch
+++ b/packages/newlib/1.20.0/200-fix-mt-cflags.patch
diff --git a/packages/newlib/1.20.0/version.desc b/packages/newlib/1.20.0/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/newlib/1.20.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/newlib/2.2.0.20151023/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/2.0.0/100-fix-unaligned-access-memcpy-m68k.patch
index 1d0b49be..1d0b49be 100644
--- a/patches/newlib/2.2.0.20151023/100-fix-unaligned-access-memcpy-m68k.patch
+++ b/packages/newlib/2.0.0/100-fix-unaligned-access-memcpy-m68k.patch
diff --git a/patches/newlib/2.0.0/110-fix-eabihf.patch b/packages/newlib/2.0.0/110-fix-eabihf.patch
index 5bb24059..5bb24059 100644
--- a/patches/newlib/2.0.0/110-fix-eabihf.patch
+++ b/packages/newlib/2.0.0/110-fix-eabihf.patch
diff --git a/patches/newlib/2.0.0/200-fix-mt-cflags.patch b/packages/newlib/2.0.0/200-fix-mt-cflags.patch
index d2b0529d..d2b0529d 100644
--- a/patches/newlib/2.0.0/200-fix-mt-cflags.patch
+++ b/packages/newlib/2.0.0/200-fix-mt-cflags.patch
diff --git a/packages/newlib/2.0.0/version.desc b/packages/newlib/2.0.0/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/newlib/2.0.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/newlib/2.3.0.20160226/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/2.1.0/100-fix-unaligned-access-memcpy-m68k.patch
index 1d0b49be..1d0b49be 100644
--- a/patches/newlib/2.3.0.20160226/100-fix-unaligned-access-memcpy-m68k.patch
+++ b/packages/newlib/2.1.0/100-fix-unaligned-access-memcpy-m68k.patch
diff --git a/patches/newlib/2.1.0/110-fix-eabihf.patch b/packages/newlib/2.1.0/110-fix-eabihf.patch
index 5f91a23f..5f91a23f 100644
--- a/patches/newlib/2.1.0/110-fix-eabihf.patch
+++ b/packages/newlib/2.1.0/110-fix-eabihf.patch
diff --git a/patches/newlib/2.1.0/200-fix-mt-cflags.patch b/packages/newlib/2.1.0/200-fix-mt-cflags.patch
index 57839eda..57839eda 100644
--- a/patches/newlib/2.1.0/200-fix-mt-cflags.patch
+++ b/packages/newlib/2.1.0/200-fix-mt-cflags.patch
diff --git a/packages/newlib/2.1.0/version.desc b/packages/newlib/2.1.0/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/newlib/2.1.0/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/newlib/2.4.0.20161025/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/2.2.0.20151023/100-fix-unaligned-access-memcpy-m68k.patch
index 1d0b49be..1d0b49be 100644
--- a/patches/newlib/2.4.0.20161025/100-fix-unaligned-access-memcpy-m68k.patch
+++ b/packages/newlib/2.2.0.20151023/100-fix-unaligned-access-memcpy-m68k.patch
diff --git a/patches/newlib/2.2.0.20151023/110-fix-eabihf.patch b/packages/newlib/2.2.0.20151023/110-fix-eabihf.patch
index 2d5a3ff9..2d5a3ff9 100644
--- a/patches/newlib/2.2.0.20151023/110-fix-eabihf.patch
+++ b/packages/newlib/2.2.0.20151023/110-fix-eabihf.patch
diff --git a/patches/newlib/2.2.0.20151023/200-fix-mt-cflags.patch b/packages/newlib/2.2.0.20151023/200-fix-mt-cflags.patch
index e1d8c026..e1d8c026 100644
--- a/patches/newlib/2.2.0.20151023/200-fix-mt-cflags.patch
+++ b/packages/newlib/2.2.0.20151023/200-fix-mt-cflags.patch
diff --git a/packages/newlib/2.2.0.20151023/version.desc b/packages/newlib/2.2.0.20151023/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/newlib/2.2.0.20151023/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/newlib/2.5.0.20170519/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/2.3.0.20160226/100-fix-unaligned-access-memcpy-m68k.patch
index 1d0b49be..1d0b49be 100644
--- a/patches/newlib/2.5.0.20170519/100-fix-unaligned-access-memcpy-m68k.patch
+++ b/packages/newlib/2.3.0.20160226/100-fix-unaligned-access-memcpy-m68k.patch
diff --git a/patches/newlib/2.3.0.20160226/110-fix-eabihf.patch b/packages/newlib/2.3.0.20160226/110-fix-eabihf.patch
index 37d8842d..37d8842d 100644
--- a/patches/newlib/2.3.0.20160226/110-fix-eabihf.patch
+++ b/packages/newlib/2.3.0.20160226/110-fix-eabihf.patch
diff --git a/patches/newlib/2.3.0.20160226/200-fix-mt-cflags.patch b/packages/newlib/2.3.0.20160226/200-fix-mt-cflags.patch
index 8c080e47..8c080e47 100644
--- a/patches/newlib/2.3.0.20160226/200-fix-mt-cflags.patch
+++ b/packages/newlib/2.3.0.20160226/200-fix-mt-cflags.patch
diff --git a/packages/newlib/2.3.0.20160226/version.desc b/packages/newlib/2.3.0.20160226/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/newlib/2.3.0.20160226/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/newlib/linaro-2.1.0-2014.09/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/2.4.0.20161025/100-fix-unaligned-access-memcpy-m68k.patch
index 1d0b49be..1d0b49be 100644
--- a/patches/newlib/linaro-2.1.0-2014.09/100-fix-unaligned-access-memcpy-m68k.patch
+++ b/packages/newlib/2.4.0.20161025/100-fix-unaligned-access-memcpy-m68k.patch
diff --git a/patches/newlib/2.4.0.20161025/110-fix-eabihf.patch b/packages/newlib/2.4.0.20161025/110-fix-eabihf.patch
index 65122f17..65122f17 100644
--- a/patches/newlib/2.4.0.20161025/110-fix-eabihf.patch
+++ b/packages/newlib/2.4.0.20161025/110-fix-eabihf.patch
diff --git a/patches/newlib/2.4.0.20161025/200-fix-mt-cflags.patch b/packages/newlib/2.4.0.20161025/200-fix-mt-cflags.patch
index dcf68262..dcf68262 100644
--- a/patches/newlib/2.4.0.20161025/200-fix-mt-cflags.patch
+++ b/packages/newlib/2.4.0.20161025/200-fix-mt-cflags.patch
diff --git a/packages/newlib/2.4.0.20161025/version.desc b/packages/newlib/2.4.0.20161025/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/newlib/2.4.0.20161025/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/newlib/linaro-2.2.0-2015.01/100-fix-unaligned-access-memcpy-m68k.patch b/packages/newlib/2.5.0.20170519/100-fix-unaligned-access-memcpy-m68k.patch
index 1d0b49be..1d0b49be 100644
--- a/patches/newlib/linaro-2.2.0-2015.01/100-fix-unaligned-access-memcpy-m68k.patch
+++ b/packages/newlib/2.5.0.20170519/100-fix-unaligned-access-memcpy-m68k.patch
diff --git a/patches/newlib/2.5.0.20170519/200-fix-mt-cflags.patch b/packages/newlib/2.5.0.20170519/200-fix-mt-cflags.patch
index cc155510..cc155510 100644
--- a/patches/newlib/2.5.0.20170519/200-fix-mt-cflags.patch
+++ b/packages/newlib/2.5.0.20170519/200-fix-mt-cflags.patch
diff --git a/packages/newlib/2.5.0.20170519/version.desc b/packages/newlib/2.5.0.20170519/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/newlib/2.5.0.20170519/version.desc
diff --git a/packages/newlib/package.desc b/packages/newlib/package.desc
new file mode 100644
index 00000000..3abfe27b
--- /dev/null
+++ b/packages/newlib/package.desc
@@ -0,0 +1,3 @@
+origin="RedHat"
+repository="git git://sourceware.org/git/newlib-cygwin.git"
+milestones="2.0"
diff --git a/patches/uClibc-ng/1.0.20/100-xtensa-static-link.patch b/packages/uClibc-ng/1.0.20/100-xtensa-static-link.patch
index 3f8a5182..3f8a5182 100644
--- a/patches/uClibc-ng/1.0.20/100-xtensa-static-link.patch
+++ b/packages/uClibc-ng/1.0.20/100-xtensa-static-link.patch
diff --git a/patches/uClibc-ng/1.0.20/110-has-lfs.patch b/packages/uClibc-ng/1.0.20/110-has-lfs.patch
index c5b90de8..c5b90de8 100644
--- a/patches/uClibc-ng/1.0.20/110-has-lfs.patch
+++ b/packages/uClibc-ng/1.0.20/110-has-lfs.patch
diff --git a/patches/uClibc-ng/1.0.20/500-no-install-D.patch b/packages/uClibc-ng/1.0.20/500-no-install-D.patch
index 83d3ff61..83d3ff61 100644
--- a/patches/uClibc-ng/1.0.20/500-no-install-D.patch
+++ b/packages/uClibc-ng/1.0.20/500-no-install-D.patch
diff --git a/patches/uClibc-ng/1.0.20/600-prefer-multilib.patch b/packages/uClibc-ng/1.0.20/600-prefer-multilib.patch
index 4338f9fd..4338f9fd 100644
--- a/patches/uClibc-ng/1.0.20/600-prefer-multilib.patch
+++ b/packages/uClibc-ng/1.0.20/600-prefer-multilib.patch
diff --git a/patches/uClibc-ng/1.0.20/700-features.h-c11.patch b/packages/uClibc-ng/1.0.20/700-features.h-c11.patch
index cb1d2a8e..cb1d2a8e 100644
--- a/patches/uClibc-ng/1.0.20/700-features.h-c11.patch
+++ b/packages/uClibc-ng/1.0.20/700-features.h-c11.patch
diff --git a/packages/uClibc-ng/1.0.20/version.desc b/packages/uClibc-ng/1.0.20/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/uClibc-ng/1.0.20/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/uClibc-ng/1.0.21/110-has-lfs.patch b/packages/uClibc-ng/1.0.21/110-has-lfs.patch
index c5b90de8..c5b90de8 100644
--- a/patches/uClibc-ng/1.0.21/110-has-lfs.patch
+++ b/packages/uClibc-ng/1.0.21/110-has-lfs.patch
diff --git a/patches/uClibc-ng/1.0.21/120-module.patch b/packages/uClibc-ng/1.0.21/120-module.patch
index 2e8a989b..2e8a989b 100644
--- a/patches/uClibc-ng/1.0.21/120-module.patch
+++ b/packages/uClibc-ng/1.0.21/120-module.patch
diff --git a/patches/uClibc-ng/1.0.21/500-no-install-D.patch b/packages/uClibc-ng/1.0.21/500-no-install-D.patch
index 83d3ff61..83d3ff61 100644
--- a/patches/uClibc-ng/1.0.21/500-no-install-D.patch
+++ b/packages/uClibc-ng/1.0.21/500-no-install-D.patch
diff --git a/patches/uClibc-ng/1.0.21/600-prefer-multilib.patch b/packages/uClibc-ng/1.0.21/600-prefer-multilib.patch
index 4338f9fd..4338f9fd 100644
--- a/patches/uClibc-ng/1.0.21/600-prefer-multilib.patch
+++ b/packages/uClibc-ng/1.0.21/600-prefer-multilib.patch
diff --git a/patches/uClibc-ng/1.0.21/700-features.h-c11.patch b/packages/uClibc-ng/1.0.21/700-features.h-c11.patch
index cb1d2a8e..cb1d2a8e 100644
--- a/patches/uClibc-ng/1.0.21/700-features.h-c11.patch
+++ b/packages/uClibc-ng/1.0.21/700-features.h-c11.patch
diff --git a/packages/uClibc-ng/1.0.21/version.desc b/packages/uClibc-ng/1.0.21/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/uClibc-ng/1.0.21/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/patches/uClibc-ng/1.0.22/500-no-install-D.patch b/packages/uClibc-ng/1.0.22/500-no-install-D.patch
index 83d3ff61..83d3ff61 100644
--- a/patches/uClibc-ng/1.0.22/500-no-install-D.patch
+++ b/packages/uClibc-ng/1.0.22/500-no-install-D.patch
diff --git a/patches/uClibc-ng/1.0.22/600-prefer-multilib.patch b/packages/uClibc-ng/1.0.22/600-prefer-multilib.patch
index 4338f9fd..4338f9fd 100644
--- a/patches/uClibc-ng/1.0.22/600-prefer-multilib.patch
+++ b/packages/uClibc-ng/1.0.22/600-prefer-multilib.patch
diff --git a/patches/uClibc-ng/1.0.22/700-features.h-c11.patch b/packages/uClibc-ng/1.0.22/700-features.h-c11.patch
index cb1d2a8e..cb1d2a8e 100644
--- a/patches/uClibc-ng/1.0.22/700-features.h-c11.patch
+++ b/packages/uClibc-ng/1.0.22/700-features.h-c11.patch
diff --git a/packages/uClibc-ng/1.0.22/version.desc b/packages/uClibc-ng/1.0.22/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/uClibc-ng/1.0.22/version.desc
diff --git a/patches/uClibc-ng/1.0.23/700-features.h-c11.patch b/packages/uClibc-ng/1.0.23/700-features.h-c11.patch
index cb1d2a8e..cb1d2a8e 100644
--- a/patches/uClibc-ng/1.0.23/700-features.h-c11.patch
+++ b/packages/uClibc-ng/1.0.23/700-features.h-c11.patch
diff --git a/packages/uClibc-ng/1.0.23/version.desc b/packages/uClibc-ng/1.0.23/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/uClibc-ng/1.0.23/version.desc
diff --git a/patches/uClibc-ng/1.0.24/700-features.h-c11.patch b/packages/uClibc-ng/1.0.24/700-features.h-c11.patch
index cb1d2a8e..cb1d2a8e 100644
--- a/patches/uClibc-ng/1.0.24/700-features.h-c11.patch
+++ b/packages/uClibc-ng/1.0.24/700-features.h-c11.patch
diff --git a/packages/uClibc-ng/1.0.24/version.desc b/packages/uClibc-ng/1.0.24/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/uClibc-ng/1.0.24/version.desc
diff --git a/packages/uClibc-ng/1.0.25/version.desc b/packages/uClibc-ng/1.0.25/version.desc
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/packages/uClibc-ng/1.0.25/version.desc
diff --git a/packages/uClibc-ng/package.desc b/packages/uClibc-ng/package.desc
new file mode 100644
index 00000000..72cfd1a8
--- /dev/null
+++ b/packages/uClibc-ng/package.desc
@@ -0,0 +1,3 @@
+origin="uclibc-ng.org"
+repository="git git://uclibc-ng.org/git/uclibc-ng"
+milestones="0.9.33.2 1.0.0 1.0.15"
diff --git a/patches/uClibc/0.9.33.2/100-m68k-ice.patch b/packages/uClibc/0.9.33.2/100-m68k-ice.patch
index 410f8d60..410f8d60 100644
--- a/patches/uClibc/0.9.33.2/100-m68k-ice.patch
+++ b/packages/uClibc/0.9.33.2/100-m68k-ice.patch
diff --git a/patches/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch b/packages/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch
index 0381ba80..0381ba80 100644
--- a/patches/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch
+++ b/packages/uClibc/0.9.33.2/200-fix-kernel-3.4plus-build.patch
diff --git a/patches/uClibc/0.9.33.2/300-fix-darwin-build.patch b/packages/uClibc/0.9.33.2/300-fix-darwin-build.patch
index 884307d3..884307d3 100644
--- a/patches/uClibc/0.9.33.2/300-fix-darwin-build.patch
+++ b/packages/uClibc/0.9.33.2/300-fix-darwin-build.patch
diff --git a/patches/uClibc/0.9.33.2/400-arm-unwind.patch b/packages/uClibc/0.9.33.2/400-arm-unwind.patch
index d31844c0..d31844c0 100644
--- a/patches/uClibc/0.9.33.2/400-arm-unwind.patch
+++ b/packages/uClibc/0.9.33.2/400-arm-unwind.patch
diff --git a/patches/uClibc/0.9.33.2/500-no-install-D.patch b/packages/uClibc/0.9.33.2/500-no-install-D.patch
index f8c2cc1a..f8c2cc1a 100644
--- a/patches/uClibc/0.9.33.2/500-no-install-D.patch
+++ b/packages/uClibc/0.9.33.2/500-no-install-D.patch
diff --git a/patches/uClibc/0.9.33.2/600-prefer-multilib.patch b/packages/uClibc/0.9.33.2/600-prefer-multilib.patch
index 677c5998..677c5998 100644
--- a/patches/uClibc/0.9.33.2/600-prefer-multilib.patch
+++ b/packages/uClibc/0.9.33.2/600-prefer-multilib.patch
diff --git a/patches/uClibc/0.9.33.2/998-dlopen-static.patch b/packages/uClibc/0.9.33.2/998-dlopen-static.patch
index 9d2fa553..9d2fa553 100644
--- a/patches/uClibc/0.9.33.2/998-dlopen-static.patch
+++ b/packages/uClibc/0.9.33.2/998-dlopen-static.patch
diff --git a/patches/uClibc/0.9.33.2/999-make-olddefconfig.patch b/packages/uClibc/0.9.33.2/999-make-olddefconfig.patch
index 8bc87ec1..8bc87ec1 100644
--- a/patches/uClibc/0.9.33.2/999-make-olddefconfig.patch
+++ b/packages/uClibc/0.9.33.2/999-make-olddefconfig.patch
diff --git a/packages/uClibc/0.9.33.2/version.desc b/packages/uClibc/0.9.33.2/version.desc
new file mode 100644
index 00000000..026d275e
--- /dev/null
+++ b/packages/uClibc/0.9.33.2/version.desc
@@ -0,0 +1 @@
+obsolete="yes"
diff --git a/packages/uClibc/package.desc b/packages/uClibc/package.desc
new file mode 100644
index 00000000..ac3a8442
--- /dev/null
+++ b/packages/uClibc/package.desc
@@ -0,0 +1,5 @@
+# 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"
diff --git a/scripts/build/arch/sparc.sh b/scripts/build/arch/sparc.sh
index b5f8140d..7433c4d4 100644
--- a/scripts/build/arch/sparc.sh
+++ b/scripts/build/arch/sparc.sh
@@ -60,7 +60,7 @@ CT_DoArchGlibcAdjustTuple() {
         # earlier (corresponding pthread barrier code is missing). Until this
         # support is reintroduced, configure as sparcv9.
         sparc-*)
-            if [ "${CT_LIBC_GLIBC_2_23_or_later}" = y ]; then
+            if [ "${CT_GLIBC_NO_SPARC_V8}" = y ]; then
                 CT_DoLog WARN "GLIBC 2.23 and newer only support SPARCv9"
                 target_=${target_/#sparc-/sparcv9-}
             fi
diff --git a/scripts/build/libc/bionic.sh b/scripts/build/libc/bionic.sh
index fcdc57f1..4ce5d8f8 100644
--- a/scripts/build/libc/bionic.sh
+++ b/scripts/build/libc/bionic.sh
@@ -28,9 +28,9 @@ do_libc() {
     local arch="${CT_ARCH}"
     if [ "${CT_ARCH_64}" = "y" ]; then
         if [ "${CT_ARCH}" = "x86" ]; then
-	    arch="${arch}_"
-	fi
-	arch="${arch}64"
+            arch="${arch}_"
+        fi
+        arch="${arch}64"
     fi
     CT_DoStep INFO "Installing C library binaries"
     CT_DoExecLog ALL cp -r "${CT_SRC_DIR}/android-ndk-${CT_LIBC_VERSION}/platforms/android-${CT_ANDROID_API}/arch-${arch}/usr" "${CT_SYSROOT_DIR}"
diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh
index 3eac3ba7..e8f04458 100644
--- a/scripts/build/libc/glibc.sh
+++ b/scripts/build/libc/glibc.sh
@@ -10,9 +10,9 @@ do_libc_get() {
     addons_list=($(do_libc_add_ons_list " "))
 
     # Main source
-    if [ "${CT_LIBC_GLIBC_CUSTOM}" = "y" ]; then
-        CT_GetCustom "glibc" "${CT_LIBC_GLIBC_CUSTOM_VERSION}" \
-            "${CT_LIBC_GLIBC_CUSTOM_LOCATION}"
+    if [ "${CT_GLIBC_CUSTOM}" = "y" ]; then
+        CT_GetCustom "glibc" "${CT_GLIBC_CUSTOM_VERSION}" \
+            "${CT_GLIBC_CUSTOM_LOCATION}"
     else
         case "${CT_LIBC_VERSION}" in
             linaro-*)
@@ -34,7 +34,7 @@ do_libc_get() {
             nptl)   continue;;
         esac
 
-        case "${addon}:${CT_LIBC_GLIBC_PORTS_EXTERNAL}" in
+        case "${addon}:${CT_GLIBC_PORTS_EXTERNAL}" in
             ports:y)    ;;
             ports:*)    continue;;
         esac
@@ -209,7 +209,7 @@ do_libc_backend_once() {
 
     # Add some default glibc config options if not given by user.
     # We don't need to be conditional on whether the user did set different
-    # values, as they CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY is passed after
+    # values, as they CT_GLIBC_EXTRA_CONFIG_ARRAY is passed after
     # extra_config
 
     extra_config+=("$(do_libc_min_kernel_config)")
@@ -218,7 +218,7 @@ do_libc_backend_once() {
         nptl)           extra_config+=("--with-__thread" "--with-tls");;
         linuxthreads)   extra_config+=("--with-__thread" "--without-tls" "--without-nptl");;
         none)           extra_config+=("--without-__thread" "--without-nptl")
-                        case "${CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY[*]}" in
+                        case "${CT_GLIBC_EXTRA_CONFIG_ARRAY[*]}" in
                             *-tls*) ;;
                             *) extra_config+=("--without-tls");;
                         esac
@@ -230,12 +230,12 @@ do_libc_backend_once() {
         *) extra_config+=("--disable-shared");;
     esac
 
-    if [ "${CT_LIBC_DISABLE_VERSIONING}" = "y" ]; then
+    if [ "${CT_GLIBC_DISABLE_VERSIONING}" = "y" ]; then
         extra_config+=("--disable-versioning")
     fi
 
-    if [ "${CT_LIBC_OLDEST_ABI}" != "" ]; then
-        extra_config+=("--enable-oldest-abi=${CT_LIBC_OLDEST_ABI}")
+    if [ "${CT_GLIBC_OLDEST_ABI}" != "" ]; then
+        extra_config+=("--enable-oldest-abi=${CT_GLIBC_OLDEST_ABI}")
     fi
 
     case "$(do_libc_add_ons_list ,)" in
@@ -251,25 +251,25 @@ do_libc_backend_once() {
     # Hide host C++ binary from configure
     echo "ac_cv_prog_ac_ct_CXX=${CT_TARGET}-g++" >>config.cache
 
-    if [ "${CT_LIBC_GLIBC_FORCE_UNWIND}" = "y" ]; then
+    if [ "${CT_GLIBC_FORCE_UNWIND}" = "y" ]; then
         echo "libc_cv_forced_unwind=yes" >>config.cache
         echo "libc_cv_c_cleanup=yes" >>config.cache
     fi
 
     # Pre-seed the configparms file with values from the config option
-    printf "%s\n" "${CT_LIBC_GLIBC_CONFIGPARMS}" > configparms
+    printf "%s\n" "${CT_GLIBC_CONFIGPARMS}" > configparms
 
     # glibc can't be built without -O2 (reference needed!)
     glibc_cflags+=" -O2"
 
-    case "${CT_LIBC_ENABLE_FORTIFIED_BUILD}" in
+    case "${CT_GLIBC_ENABLE_FORTIFIED_BUILD}" in
         y)  ;;
         *)  glibc_cflags+=" -U_FORTIFY_SOURCE";;
     esac
 
     # In the order of increasing precedence. Flags common to compiler and linker.
     glibc_cflags+=" ${CT_TARGET_CFLAGS}"
-    glibc_cflags+=" ${CT_LIBC_GLIBC_EXTRA_CFLAGS}"
+    glibc_cflags+=" ${CT_GLIBC_EXTRA_CFLAGS}"
     glibc_cflags+=" ${multi_flags}"
 
     # Analyze the resulting options for any extra configure switches to throw in.
@@ -336,7 +336,7 @@ do_libc_backend_once() {
         --without-gd                                                \
         --with-headers="${CT_HEADERS_DIR}"                          \
         "${extra_config[@]}"                                        \
-        "${CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY[@]}"
+        "${CT_GLIBC_EXTRA_CONFIG_ARRAY[@]}"
 
     # build hacks
     case "${CT_ARCH},${CT_ARCH_CPU}" in
@@ -475,7 +475,7 @@ do_libc_backend_once() {
                                     ${CT_PREFIX_DIR}/share/doc
         fi
 
-        if [ "${CT_LIBC_LOCALES}" = "y" -a "${multi_index}" = "${multi_count}" ]; then
+        if [ "${CT_GLIBC_LOCALES}" = "y" -a "${multi_index}" = "${multi_count}" ]; then
             do_libc_locales
         fi
     fi # libc_mode = final
@@ -486,16 +486,16 @@ do_libc_backend_once() {
 # Build up the addons list, separated with $1
 do_libc_add_ons_list() {
     local sep="$1"
-    local addons_list="$( echo "${CT_LIBC_ADDONS_LIST}"            \
+    local addons_list="$( echo "${CT_GLIBC_ADDONS_LIST}"            \
                           |sed -r -e "s/[[:space:],]/${sep}/g;" \
                         )"
-    if [ "${CT_LIBC_GLIBC_2_20_or_later}" != "y" ]; then
+    if [ "${GLIBC_HAS_NPTL_ADDON}" = "y" ]; then
         case "${CT_THREADS}" in
             none)   ;;
             *)      addons_list="${addons_list}${sep}${CT_THREADS}";;
         esac
     fi
-    [ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && addons_list="${addons_list}${sep}ports"
+    [ "${CT_GLIBC_USE_PORTS}" = "y" ] && addons_list="${addons_list}${sep}ports"
     # Remove duplicate, leading and trailing separators
     echo "${addons_list}" |sed -r -e "s/${sep}+/${sep}/g; s/^${sep}//; s/${sep}\$//;"
 }
@@ -504,9 +504,9 @@ do_libc_add_ons_list() {
 do_libc_min_kernel_config() {
     local min_kernel_config
 
-    case "${CT_LIBC_GLIBC_EXTRA_CONFIG_ARRAY[*]}" in
+    case "${CT_GLIBC_EXTRA_CONFIG_ARRAY[*]}" in
         *--enable-kernel*) ;;
-        *)  if [ "${CT_LIBC_GLIBC_KERNEL_VERSION_AS_HEADERS}" = "y" ]; then
+        *)  if [ "${CT_GLIBC_KERNEL_VERSION_AS_HEADERS}" = "y" ]; then
                 # We can't rely on the kernel version from the configuration,
                 # because it might not be available if the user uses pre-installed
                 # headers. On the other hand, both method will have the kernel
@@ -523,9 +523,9 @@ do_libc_min_kernel_config() {
                 patchlevel=$(((version_code>>8)&0xFF))
                 sublevel=$((version_code&0xFF))
                 min_kernel_config="${version}.${patchlevel}.${sublevel}"
-            elif [ "${CT_LIBC_GLIBC_KERNEL_VERSION_CHOSEN}" = "y" ]; then
+            elif [ "${CT_GLIBC_KERNEL_VERSION_CHOSEN}" = "y" ]; then
                 # Trim the fourth part of the linux version, keeping only the first three numbers
-                min_kernel_config="$( echo "${CT_LIBC_GLIBC_MIN_KERNEL_VERSION}"               \
+                min_kernel_config="$( echo "${CT_GLIBC_MIN_KERNEL_VERSION}"               \
                                       |sed -r -e 's/^([^.]+\.[^.]+\.[^.]+)(|\.[^.]+)$/\1/;' \
                                     )"
             fi
@@ -567,7 +567,7 @@ do_libc_locales() {
     CT_DoLog DEBUG "Extra config args passed: '${extra_config[*]}'"
 
     glibc_cflags="-O2 -fno-stack-protector"
-    case "${CT_LIBC_ENABLE_FORTIFIED_BUILD}" in
+    case "${CT_GLIBC_ENABLE_FORTIFIED_BUILD}" in
         y)  ;;
         *)  glibc_cflags+=" -U_FORTIFY_SOURCE";;
     esac