Merge pull request #810 from stilor/fix-patching-ports

Fix patching ports

279 files changed, 1341 insertions, 656 deletions

diff --git a/.gitignore b/.gitignore
index 138b741..225009c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,11 +13,13 @@ config/configure.in
 config/gen/
 config/versions/
 .config
+maintainer/package-versions
 
 # Temporaries
 .*.swp
 build.log
 .config.old
+temp.*
 
 # This is the place where toolchains are built
 .build/
diff --git a/TODO b/TODO
index e75103c..0653f76 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,12 @@ A (slightly) ordered set of tasks for crosstool-NG. Written in a cryptic languag
 
 -- Alexey Neyman (@stilor)
 
+[ ] test-packages.sh
+  [ ] FTP URLs always succeed in verification (wget bug) - how to work around?
+  [ ] new function - refresh/renumber patches
+[ ] templates (bootstrap)
+  [ ] #!foreach xxx if-changed yyy to avoid unnecessary 'default' lines
+  [ ] relevant pattern for Linaro releases - tie to the major version
 [ ] new packages
   [ ] config.guess
   [ ] gnulib
diff --git a/bootstrap b/bootstrap
index d01a7de..45fad9c 100755
--- a/bootstrap
+++ b/bootstrap
@@ -77,18 +77,21 @@ find_end()
 set_iter()
 {
     local name="${1}"
+    local -a temp
 
     if [ "${info[iter_${name}]+set}" = "set" ]; then
         error "Iterator over '${name}' is already set up"
     fi
     shift
     debug "Setting iterator over '${name}' to '$*'"
+    temp=("$@")
     info[iter_${name}]="$*"
+    info[#${name}]=${#temp[@]}
 }
 
 run_if()
 {
-    local cond="${1}"
+    local cond="$*"
     local endline
 
     find_end "if"
@@ -122,8 +125,9 @@ do_foreach()
         for k in "${!info[@]}"; do
             saveinfo["${k}"]=${info["${k}"]}
         done
-        eval "enter_${var} ${v}"
-        eval "$@"
+        if eval "enter_${var} ${v}"; then
+            eval "$@"
+        fi
         info=()
         for k in "${!saveinfo[@]}"; do
             info["${k}"]=${saveinfo["${k}"]}
@@ -133,24 +137,53 @@ do_foreach()
 
 run_foreach()
 {
-    local var="${1}"
     local endline
+    local var="${1}"
+    shift
 
     if [ "${info[iter_${var}]+set}" != "set" ]; then
         error "line ${l}: iterator over '${var}' is not defined"
     fi
     find_end "foreach"
     debug "Loop over '${var}', lines ${l}..${endline}"
-    do_foreach ${var} run_lines $[l + 1] $[endline - 1]
+    do_foreach ${var} run_lines_if $[l + 1] $[endline - 1] "$*"
     lnext=$[endline + 1]
     debug "Continue at line ${lnext}"
 }
 
+run_lines_if()
+{
+    local start="${1}"
+    local end="${2}"
+    shift 2
+    local cond="$*"
+    local a prev
+
+    for a in ${cond}; do
+        if [ -n "${prev}" ]; then
+            case "${prev}" in
+                if-differs)
+                    if [ "${info[${a}]}" = "${saveinfo[${a}]}" ]; then
+                        return
+                    fi
+                    ;;
+                *)
+                    error "line ${l}: unknown condition '${prev}' for loop"
+                    ;;
+            esac
+            prev=
+        else
+            prev=${a}
+        fi
+    done
+    run_lines "${start}" "${end}"
+}
+
 run_lines()
 {
     local start="${1}"
     local end="${2}"
-    local l lnext s s1 v
+    local l lnext s s1 v vp pp p val
 
     debug "Running lines ${start}..${end}"
     l=${start}
@@ -166,8 +199,34 @@ run_lines()
                 *@@*@@*)
                     v="${s#*@@}"
                     v="${v%%@@*}"
+                    # $v now includes variable name + any postprocessing
+                    vp="${v%%[|?]*}"
+                    pp="${v#${vp}}"
+                    # $vp is name of the variable proper, $pp is any postprocessing
+                    if [ "${info[${vp}]+set}" != "set" ]; then
+                        error "line ${l}: reference to undefined variable '${vp}'"
+                    fi
                     if [ "${info[${v}]+set}" != "set" ]; then
-                        error "line ${l}: reference to undefined variable '${v}'"
+                        # We know the base variable, need to cache postprocessed value
+                        val="${info[${vp}]}"
+                        # Apply postprocessing(s)
+                        while [ -n "${pp}" ]; do
+                            case "${pp}" in
+                                "|"*)
+                                    # Kconfigize
+                                    pp="${pp#|}"
+                                    val=${val//[^0-9A-Za-z_]/_}
+                                    val=${val^^}
+                                    ;;
+                                "?"*)
+                                    pp="${pp#?}"
+                                    p="${pp%%[|?]*}"
+                                    pp="${pp#${p}}"
+                                    val="${val:+${p}}"
+                                    ;;
+                            esac
+                        done
+                        info[${v}]="${val}"
                     fi
                     s1="${s1}${s%%@@*}\${info[${v}]}"
                     s="${s#*@@*@@}"
@@ -186,10 +245,10 @@ run_lines()
         debug "Evaluate: ${s}"
         case "${s}" in
             "#!if "*)
-                run_if "${s#* }"
+                run_if ${s#* }
                 ;;
             "#!foreach "*)
-                run_foreach "${s#* }"
+                run_foreach ${s#* }
                 ;;
             "#!//"*)
                 # Comment, do nothing
@@ -221,15 +280,14 @@ run_template()
 
 ########################################
 
-# Convert the argument to a Kconfig-style macro
-kconfigize()
+# Leave only relevant portion of the string
+relevantize()
 {
-    local v="${1}"
     local p pb pa vx
+    local v="${1}"
     shift
 
-    # If optional patterns are provided, find the first match
-    # and contract to the matching portion.
+    # Find the first match and contract to the matching portion.
     for p in "$@"; do
         pb=${p%|*}
         pa=${p#*|}
@@ -239,9 +297,7 @@ kconfigize()
             break
         fi
     done
-
-    v=${v//[^0-9A-Za-z_]/_}
-    echo "${v^^}"
+    echo "${v}"
 }
 
 # Helper for cmp_versions: compare an upstream/debian portion of
@@ -484,11 +540,11 @@ enter_fork()
     info[mirrors]=
     info[archive_filename]='@{pkg_name}-@{version}'
     info[archive_dirname]='@{pkg_name}-@{version}'
+    info[versionlocked]=
+    info[origin]=
 
     eval `read_package_desc ${fork}`
 
-    info[pfx]=`kconfigize ${fork}`
-    info[originpfx]=`kconfigize ${info[origin]}`
     if [ -r "packages/${info[origin]}.help" ]; then
         info[originhelp]=`sed 's/^/      /' "packages/${info[origin]}.help"`
     else
@@ -499,7 +555,6 @@ enter_fork()
         info[vcs]=${info[repository]%% *}
         info[repository_url]=${info[repository]#* }
     fi
-    info[versionlocked]=`kconfigize "${info[versionlocked]}"`
 
     versions=`cd packages/${fork} && \
         for f in */version.desc; do [ -r "${f}" ] && echo "${f%/version.desc}"; done`
@@ -525,16 +580,11 @@ enter_fork()
 
 enter_version()
 {
-    local -A ver_postfix=( \
-        [,yes,,]=" (OBSOLETE)" \
-        [,,yes,]=" (EXPERIMENTAL)" \
-        [,yes,yes,]=" (OBSOLETE,EXPERIMENTAL)" )
     local version="${1}"
 
     eval `read_version_desc ${info[fork]} ${version}`
     info[ver]=${version}
-    info[kcfg]=`kconfigize ${version} ${info[relevantpattern]}`
-    info[ver_postfix]=${ver_postfix[,${info[obsolete]},${info[experimental]},]}
+    info[ver_sel]=`relevantize ${version} ${info[relevantpattern]}`
 }
 
 enter_milestone()
@@ -543,7 +593,6 @@ enter_milestone()
     local cmp
 
     info[ms]=${ms}
-    info[ms_kcfg]=`kconfigize ${ms}`
     if [ -n "${info[ver]}" ]; then
         info[version_cmp_milestone]=`cmp_versions ${info[ver]} ${info[ms]}`
     fi
@@ -570,22 +619,23 @@ gen_packages()
     msg "Master packages: ${pkg_masters[@]}"
 
     # Now for each master, create its kconfig file with version
-    # definitions.
+    # definitions. As a byproduct, generate a list of all package
+    # versions for maintenance purposes.
+    exec 3>"maintainer/package-versions"
     for p in "${pkg_masters[@]}"; do
         msg "Generating '${config_versions_dir}/${p}.in'"
         exec >"${config_versions_dir}/${p}.in"
         # Base definitions for the whole config file
         info=( \
             [master]=${p} \
-            [masterpfx]=`kconfigize ${p}` \
             [nforks]=${pkg_nforks[${p}]} \
-            [all_milestones]=${pkg_milestones[${p}]} \
             [relevantpattern]=${pkg_relevantpattern[${p}]} \
             )
         set_iter fork ${pkg_forks[${p}]}
         set_iter milestone ${pkg_milestones[${p}]}
 
         run_template "maintainer/kconfig-versions.template"
+        run_template "maintainer/package-versions.template" >&3
     done
 }
 
@@ -612,7 +662,6 @@ enter_choice()
     local l
 
     info[choice]="${choice}"
-    info[kcfg_choice]=`kconfigize "${choice}"`
 
     # Not local, we need these arrays be set in enter_dependency/enter_help
     deplines=( )
@@ -650,7 +699,6 @@ gen_selection()
     msg "Generating ${dir}.in"
     exec >"${config_gen_dir}/${dir}.in"
     info=( \
-        [prefix]=`kconfigize ${dir}` \
         [dir]=${dir} \
         [label]="${label}" \
         )
diff --git a/maintainer/kconfig-choice.template b/maintainer/kconfig-choice.template
index 12ea12c..b2ca217 100644
--- a/maintainer/kconfig-choice.template
+++ b/maintainer/kconfig-choice.template
@@ -2,11 +2,11 @@
 # DO NOT EDIT! This file is automatically generated.
 #
 
-choice GEN_CHOICE_@@prefix@@
+choice GEN_CHOICE_@@dir|@@
     bool "@@label@@"
 
 #!foreach choice
-config @@prefix@@_@@kcfg_choice@@
+config @@dir|@@_@@choice|@@
     bool "@@choice@@"
 #!foreach dependency
     @@depline@@
@@ -19,14 +19,14 @@ config @@prefix@@_@@kcfg_choice@@
 #!end-foreach
 endchoice
 
-config @@prefix@@
+config @@dir|@@
     string
 #!foreach choice
-    default "@@choice@@" if @@prefix@@_@@kcfg_choice@@
+    default "@@choice@@" if @@dir|@@_@@choice|@@
 #!end-foreach
 
 #!foreach choice
-if @@prefix@@_@@kcfg_choice@@
+if @@dir|@@_@@choice|@@
 source "config/@@dir@@/@@choice@@.in"
 endif
 #!end-foreach
diff --git a/maintainer/kconfig-menu.template b/maintainer/kconfig-menu.template
index 12b9f2b..1a7daa5 100644
--- a/maintainer/kconfig-menu.template
+++ b/maintainer/kconfig-menu.template
@@ -3,7 +3,7 @@
 #
 
 #!foreach choice
-menuconfig @@prefix@@_@@kcfg_choice@@
+menuconfig @@dir|@@_@@choice|@@
     bool "@@choice@@"
 #!foreach dependency
     @@depline@@
@@ -13,7 +13,7 @@ menuconfig @@prefix@@_@@kcfg_choice@@
       @@helpline@@
 #!end-foreach
 
-if @@prefix@@_@@kcfg_choice@@
+if @@dir|@@_@@choice|@@
 source "config/@@dir@@/@@choice@@.in"
 endif
 
diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template
index 4692a25..0e0ceb0 100644
--- a/maintainer/kconfig-versions.template
+++ b/maintainer/kconfig-versions.template
@@ -3,7 +3,7 @@
 #
 
 # The component directory name
-config @@masterpfx@@_DIR_NAME
+config @@master|@@_DIR_NAME
     string
     default "@@master@@"
 
@@ -13,7 +13,7 @@ choice
     bool "Show @@master@@ versions from"
 
 #!foreach fork
-config @@masterpfx@@_USE_@@originpfx@@
+config @@master|@@_USE_@@origin|@@
     bool "@@origin@@"
 #!if [ -n "@@only_obsolete@@" ]
     depends on OBSOLETE
@@ -27,20 +27,20 @@ config @@masterpfx@@_USE_@@originpfx@@
 #!end-foreach
 endchoice
 
-config @@masterpfx@@_USE
+config @@master|@@_USE
     string
 #!foreach fork
-    default "@@pfx@@" if @@masterpfx@@_USE_@@originpfx@@
+    default "@@fork|@@" if @@master|@@_USE_@@origin|@@
 #!end-foreach
 
 #!end-if
 
 #!foreach fork
 #!if [ "@@nforks@@" -ge 2 ]
-if @@masterpfx@@_USE_@@originpfx@@
+if @@master|@@_USE_@@origin|@@
 #!end-if
 
-config @@pfx@@_PKG_NAME
+config @@fork|@@_PKG_NAME
     string
     default "@@pkg_name@@"
 
@@ -51,16 +51,16 @@ config @@pfx@@_PKG_NAME
 choice
     bool "Source of @@pkg_label@@"
 
-#!if [ -n "@@all_versions@@" ]
-config @@pfx@@_SRC_RELEASE
+#!if [ "@@#version@@" -gt 0 ]
+config @@fork|@@_SRC_RELEASE
     bool "Released tarball"
     help
       Download a released tarball.
 
 #!end-if
-config @@pfx@@_SRC_DEVEL
+config @@fork|@@_SRC_DEVEL
     bool "Vendor/custom repository"
-#!if [ -n "@@all_versions@@" ]
+#!if [ "@@#version@@" -gt 0 ]
     depends on EXPERIMENTAL
 #!end-if
     help
@@ -69,39 +69,39 @@ config @@pfx@@_SRC_DEVEL
       Default is the vendor repository at @@repository_url@@
 #!end-if
 
-if @@pfx@@_SRC_DEVEL
+if @@fork|@@_SRC_DEVEL
 
 choice
     bool "VCS type"
 #!if [ -n "@@repository@@" ]
-    default @@pfx@@_DEVEL_VCS_@@vcs@@
+    default @@fork|@@_DEVEL_VCS_@@vcs@@
 #!end-if
     help
       Version control system from which the sources will be checked out.
       The default value points to the development repository for @@pkg_label@@.
 
-config @@pfx@@_DEVEL_VCS_git
+config @@fork|@@_DEVEL_VCS_git
     bool "Git"
 
-config @@pfx@@_DEVEL_VCS_svn
+config @@fork|@@_DEVEL_VCS_svn
     bool "Subversion"
 
-config @@pfx@@_DEVEL_VCS_hg
+config @@fork|@@_DEVEL_VCS_hg
     bool "Mercurial"
 
-config @@pfx@@_DEVEL_VCS_cvs
+config @@fork|@@_DEVEL_VCS_cvs
     bool "CVS"
 
 endchoice
 
-config @@pfx@@_DEVEL_VCS
+config @@fork|@@_DEVEL_VCS
     string
-    default "git" if @@pfx@@_DEVEL_VCS_git
-    default "svn" if @@pfx@@_DEVEL_VCS_svn
-    default "hg" if @@pfx@@_DEVEL_VCS_hg
-    default "cvs" if @@pfx@@_DEVEL_VCS_cvs
+    default "git" if @@fork|@@_DEVEL_VCS_git
+    default "svn" if @@fork|@@_DEVEL_VCS_svn
+    default "hg" if @@fork|@@_DEVEL_VCS_hg
+    default "cvs" if @@fork|@@_DEVEL_VCS_cvs
 
-config @@pfx@@_DEVEL_URL
+config @@fork|@@_DEVEL_URL
     string "Repository URL"
 #!if [ -n "@@repository@@" ]
     default "@@repository_url@@"
@@ -112,7 +112,7 @@ config @@pfx@@_DEVEL_URL
       For CVS, enter both the value of CVS root and the module name, separated
       by a space.
 
-config @@pfx@@_DEVEL_BRANCH
+config @@fork|@@_DEVEL_BRANCH
     string "Branch/tag to check out"
     default "@@repository_branch@@"
     help
@@ -122,7 +122,7 @@ config @@pfx@@_DEVEL_BRANCH
       stable branches. You likely need to change the repository URL, rather than
       enter anything here.
 
-config @@pfx@@_DEVEL_REVISION
+config @@fork|@@_DEVEL_REVISION
     string "Revision/changeset"
     default "@@repository_cset@@"
     help
@@ -131,7 +131,7 @@ config @@pfx@@_DEVEL_REVISION
       CVS: enter the date in "YYYY/MM/DD HH:MM:SS" format (UTC) to check out certain date.
       Subversion: enter the revision.
 
-config @@pfx@@_DEVEL_SUBDIR
+config @@fork|@@_DEVEL_SUBDIR
     string "Subdirectory in the repository"
     default "@@repository_subdir@@"
     help
@@ -139,7 +139,7 @@ config @@pfx@@_DEVEL_SUBDIR
       repository, but rather from some subdirectory. If it is the case,
       specify this subdirectory here.
 
-config @@pfx@@_DEVEL_BOOTSTRAP
+config @@fork|@@_DEVEL_BOOTSTRAP
     string "Bootstrap command"
     default "@@bootstrap@@"
     help
@@ -150,15 +150,15 @@ config @@pfx@@_DEVEL_BOOTSTRAP
 
 endif
 
-config @@pfx@@_SRC_CUSTOM
+config @@fork|@@_SRC_CUSTOM
     bool "Custom location"
     depends on EXPERIMENTAL
     help
       Custom directory or tarball.
 
-if @@pfx@@_SRC_CUSTOM
+if @@fork|@@_SRC_CUSTOM
 
-config @@pfx@@_CUSTOM_LOCATION
+config @@fork|@@_CUSTOM_LOCATION
     string "Custom source location"
     help
       Path to the directory or tarball with the sources.
@@ -174,7 +174,7 @@ endchoice
 #!// where we need to identify a range of releases on a branch, for example,
 #!// "all FOO releases after 4.9.1 but before 4.9.3".
 #!//
-#!if [ -n "@@all_versions@@" -a -z "@@versionlocked@@" ]
+#!if [ "@@#version@@" -gt 0 -a -z "@@versionlocked@@" ]
 choice
     bool "Version of @@pkg_label@@"
     help
@@ -184,18 +184,18 @@ choice
       Based on this version, crosstool-NG may apply some version-specific
       quirks while building @@pkg_label@@.
 
-config @@pfx@@_VERY_NEW
+config @@fork|@@_VERY_NEW
     bool "newer than anything below"
     depends on EXPERIMENTAL
-    depends on @@pfx@@_SRC_DEVEL || @@pfx@@_SRC_CUSTOM
+    depends on @@fork|@@_SRC_DEVEL || @@fork|@@_SRC_CUSTOM
 #!foreach milestone
-    select @@masterpfx@@_@@ms_kcfg@@_or_later
-    depends on !@@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_older
+    select @@master|@@_@@ms|@@_or_later
+    depends on !@@master|@@_REQUIRE_@@ms|@@_or_older
 #!end-foreach
 
 #!foreach version
-config @@pfx@@_V_@@kcfg@@
-    bool "@@ver@@@@ver_postfix@@"
+config @@fork|@@_V_@@ver_sel|@@
+    bool "@@ver@@@@obsolete? (OBSOLETE)@@@@experimental? (EXPERIMENTAL)@@"
 #!if [ "@@obsolete@@" = "yes" ]
     depends on OBSOLETE
 #!end-if
@@ -204,26 +204,26 @@ config @@pfx@@_V_@@kcfg@@
 #!end-if
 #!foreach milestone
 #!if [ "@@version_cmp_milestone@@" -ge 0 ]
-    select @@masterpfx@@_@@ms_kcfg@@_or_later
+    select @@master|@@_@@ms|@@_or_later
 #!end-if
 #!if [ "@@version_cmp_milestone@@" -le 0 ]
-    select @@masterpfx@@_@@ms_kcfg@@_or_older
+    select @@master|@@_@@ms|@@_or_older
 #!end-if
 #!if [ "@@version_cmp_milestone@@" -gt 0 ]
-    depends on !@@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_older
+    depends on !@@master|@@_REQUIRE_@@ms|@@_or_older
 #!end-if
 #!if [ "@@version_cmp_milestone@@" -lt 0 ]
-    depends on !@@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_later
+    depends on !@@master|@@_REQUIRE_@@ms|@@_or_later
 #!end-if
 #!end-foreach
 
 #!end-foreach
-config @@pfx@@_VERY_OLD
+config @@fork|@@_VERY_OLD
     bool "older than anything above"
     depends on OBSOLETE && EXPERIMENTAL
-    depends on @@pfx@@_SRC_DEVEL || @@pfx@@_SRC_CUSTOM
+    depends on @@fork|@@_SRC_DEVEL || @@fork|@@_SRC_CUSTOM
 #!foreach milestone
-    depends on !@@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_later
+    depends on !@@master|@@_REQUIRE_@@ms|@@_or_later
 #!end-foreach
 
 endchoice
@@ -231,37 +231,46 @@ endchoice
 
 #!if [ -n "@@versionlocked@@" ]
 #!foreach version
-config @@pfx@@_V_@@kcfg@@
+config @@fork|@@_V_@@ver_sel|@@
     def_bool y
-    depends on @@versionlocked@@_V_@@kcfg@@
+    depends on @@versionlocked|@@_V_@@ver_sel|@@
 
 #!end-foreach
 #!end-if
 
-config @@pfx@@_VERSION
+config @@fork|@@_VERSION
     string
 #!foreach version
-    default "@@ver@@" if @@pfx@@_V_@@kcfg@@
+    default "@@ver@@" if @@fork|@@_V_@@ver_sel|@@
 #!end-foreach
     default "unknown"
 
-#!if [ -n "@@all_versions@@" ]
-config @@pfx@@_MIRRORS
+#!if [ "@@#version@@" -gt 0 ]
+config @@fork|@@_MIRRORS
     string
+#!foreach version if-differs mirrors
+    default "@@mirrors@@" if @@fork|@@_V_@@ver_sel|@@
+#!end-foreach
     default "@@mirrors@@"
 
-config @@pfx@@_ARCHIVE_FILENAME
+config @@fork|@@_ARCHIVE_FILENAME
     string
+#!foreach version if-differs archive_filename
+    default "@@archive_filename@@" if @@fork|@@_V_@@ver_sel|@@
+#!end-foreach
     default "@@archive_filename@@"
 
-config @@pfx@@_ARCHIVE_DIRNAME
+config @@fork|@@_ARCHIVE_DIRNAME
     string
+#!foreach version if-differs archive_dirname
+    default "@@archive_dirname@@" if @@fork|@@_V_@@ver_sel|@@
+#!end-foreach
     default "@@archive_dirname@@"
 
-config @@pfx@@_ARCHIVE_FORMATS
+config @@fork|@@_ARCHIVE_FORMATS
     string
-#!foreach version
-    default "@@archive_formats@@" if @@pfx@@_V_@@kcfg@@
+#!foreach version if-differs archive_formats
+    default "@@archive_formats@@" if @@fork|@@_V_@@ver_sel|@@
 #!end-foreach
     default "@@archive_formats@@"
 
@@ -275,18 +284,18 @@ endif
 
 #!foreach milestone
 #!// Milestones selected by a chosen version of this package
-config @@masterpfx@@_@@ms_kcfg@@_or_later
+config @@master|@@_@@ms|@@_or_later
     bool
 
-config @@masterpfx@@_@@ms_kcfg@@_or_older
+config @@master|@@_@@ms|@@_or_older
     bool
 
 #!// Milestone requirements selected by other packages that restrict
 #!// the choices in this package
-config @@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_later
+config @@master|@@_REQUIRE_@@ms|@@_or_later
     bool
 
-config @@masterpfx@@_REQUIRE_@@ms_kcfg@@_or_older
+config @@master|@@_REQUIRE_@@ms|@@_or_older
     bool
 
 #!end-foreach
diff --git a/maintainer/package-versions.template b/maintainer/package-versions.template
new file mode 100644
index 0000000..61f938f
--- /dev/null
+++ b/maintainer/package-versions.template
@@ -0,0 +1,13 @@
+#!foreach fork
+#!foreach version
+run_pkgversion \
+    master=@@master@@ \
+    masterpfx=@@master|@@ \
+    originpfx=@@origin|@@ \
+    pkg_name=@@pkg_name@@ \
+    pfx=@@fork|@@ \
+    versionlocked=@@versionlocked|@@ \
+    ver=@@ver@@ \
+    kcfg=@@ver_sel|@@
+#!end-foreach
+#!end-foreach
diff --git a/maintainer/test-packages.sh b/maintainer/test-packages.sh
new file mode 100755
index 0000000..26caaf8
--- /dev/null
+++ b/maintainer/test-packages.sh
@@ -0,0 +1,194 @@
+#!/bin/bash
+
+selected=
+
+usage()
+{
+    cat <<EOF
+$0 -- Test packages in crosstool-NG
+
+Verifies that the release tarballs can be downloaded for the packages
+available in crosstoo-NG and check that the patches apply cleanly.
+Requires crosstool-NG to be configured and built prior to running.
+
+Options:
+    --help, -?
+        Display this help message.
+
+    --download, -d
+        Download all packages to the default directory (\$HOME/src).
+
+    --apply-patches, -a
+        Implies -d. Unpack and apply the bundled patches.
+
+    --verify-urls, -u
+        Check *all* the download URLs for accessibility, without
+        actually downloading anything.
+
+    --select MASK, -s MASK
+        Specify the package to operate upon. MASK can be either package
+        name ("-s foo"), or package name + version ("-s foo-1.1").
+
+EOF
+}
+
+while [ -n "${1}" ]; do
+    case "${1}" in
+    --download|-d)
+        download_pkgs=y
+        ;;
+    --verify-urls|-u)
+        verify_urls=y
+        ;;
+    --apply-patches|-a)
+        apply_patches=y
+        download_pkgs=y
+        ;;
+    --select|-s)
+        shift
+        [ -n "${1}" ] || { echo "argument required for --select" >&2; exit 1; }
+        selected="${1}"
+        ;;
+    --help|-?)
+        usage
+        exit 0
+        ;;
+    *)
+        echo "Unknown option ${1}" >&2
+        exit 1
+        ;;
+    esac
+    shift
+done
+
+CT_LIB_DIR=`pwd`
+CT_TOP_DIR=`pwd`
+CT_TARBALLS_DIR=`pwd`/temp.tarballs
+CT_COMMON_SRC_DIR=`pwd`/temp.src
+CT_SRC_DIR=`pwd`/temp.src
+CT_LOG_LEVEL_MAX=EXTRA
+mkdir -p ${CT_TARBALLS_DIR}
+
+# Does not matter, just to make the scripts load
+CT_ARCH=arm
+CT_KERNEL=bare-metal
+CT_BINUTILS=binutils
+CT_LIBC=none
+CT_CC=gcc
+
+. paths.sh
+. scripts/functions
+
+rm -f build.log
+CT_LogEnable
+
+check_pkg_urls()
+{
+    local e m mh url
+
+    for e in ${archive_formats}; do
+        local -A mirror_status=( )
+
+        CT_DoStep EXTRA "Looking for ${archive_filename}${e}"
+        for m in ${mirrors}; do
+            url="${m}/${archive_filename}${e}"
+            case "${url}" in
+            # WGET always returns success for FTP URLs in spider mode :(
+            ftp://*) CT_DoLog DEBUG "Skipping '${url}': FTP not supported"; continue;;
+            esac
+            mh="${url#*://}"
+            mh="${mh%%[:/]*}"
+            if [ -n "${mirror_status[${mh}]}" ]; then
+                CT_DoLog DEBUG "Skipping '${url}': already found on this host at '${mirror_status[${mh}]}'"
+                continue
+            fi
+            if CT_DoExecLog ALL wget --spider "${url}"; then
+                mirror_status[${mh}]="${url}"
+            else
+                mirror_status[${mh}]=
+            fi
+        done
+        for mh in "${!mirror_status[@]}"; do
+            if [ -n "${mirror_status[${mh}]}" ]; then
+                CT_DoLog EXTRA "OK   ${mh} [${archive_filename}${e}]"
+            else
+                CT_DoLog ERROR "FAIL ${mh} [${archive_filename}${e}]"
+            fi
+        done
+        CT_EndStep
+    done
+}
+
+run_pkgversion()
+{
+    while [ -n "${1}" ]; do
+        eval "local ${1}"
+        shift
+    done
+
+    if [ -n "${selected}" ]; then
+        case "${selected}" in
+        ${pkg_name}|${pkg_name}-${ver})
+            ;;
+        *)
+            return
+            ;;
+        esac
+    fi
+
+    CT_DoStep INFO "Handling ${pkg_name}-${ver}"
+
+    # Create a temporary configuration head file
+    cat >temp.in <<EOF
+config OBSOLETE
+    def_bool y
+
+config EXPERIMENTAL
+    def_bool y
+
+config CONFIGURE_has_wget
+    def_bool y
+
+config CONFIGURE_has_curl
+    def_bool y
+
+config ${versionlocked}_V_${kcfg}
+    def_bool y
+
+source "config/global/paths.in"
+source "config/global/download.in"
+source "config/global/extract.in"
+source "config/versions/${master}.in"
+EOF
+
+    cat >temp.defconfig <<EOF
+CT_${masterpfx}_USE_${originpfx}=y
+CT_${pfx}_SRC_RELEASE=y
+CT_${pfx}_V_${kcfg}=y
+CT_SAVE_TARBALLS=y
+EOF
+
+    ./kconfig/conf --defconfig=temp.defconfig temp.in >/dev/null
+
+    CT_LoadConfig
+    rm -f .config .config.old temp.defconfig temp.in
+    if [ -n "${verify_urls}" ]; then
+        CT_DoLog EXTRA "Verifying URLs for ${pkg_name}-${ver}"
+        CT_PackageRun "${masterpfx}" check_pkg_urls
+    fi
+    if [ -n "${download_pkgs}" ]; then
+        CT_DoLog EXTRA "Downloading ${pkg_name}-${ver}"
+        CT_Fetch "${masterpfx}"
+    fi
+    if [ -n "${apply_patches}" ]; then
+        rm -rf ${CT_COMMON_SRC_DIR}
+        mkdir -p ${CT_COMMON_SRC_DIR}
+        CT_ExtractPatch "${masterpfx}"
+    fi
+
+    CT_EndStep
+}
+
+. maintainer/package-versions
+
+rm -rf ${CT_TARBALLS_DIR} ${CT_COMMON_SRC_DIR}
diff --git a/packages/binutils/2.28/120-sh-conf.patch b/packages/binutils/2.28.1/120-sh-conf.patch
index c12a023..c12a023 100644
--- a/packages/binutils/2.28/120-sh-conf.patch
+++ b/packages/binutils/2.28.1/120-sh-conf.patch
diff --git a/packages/binutils/2.28/300-001_ld_makefile_patch.patch b/packages/binutils/2.28.1/300-001_ld_makefile_patch.patch
index 2a1320c..2a1320c 100644
--- a/packages/binutils/2.28/300-001_ld_makefile_patch.patch
+++ b/packages/binutils/2.28.1/300-001_ld_makefile_patch.patch
diff --git a/packages/binutils/2.28/300-012_check_ldrunpath_length.patch b/packages/binutils/2.28.1/300-012_check_ldrunpath_length.patch
index f1f31af..f1f31af 100644
--- a/packages/binutils/2.28/300-012_check_ldrunpath_length.patch
+++ b/packages/binutils/2.28.1/300-012_check_ldrunpath_length.patch
diff --git a/packages/binutils/2.28/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/packages/binutils/2.28.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
index 2956385..2956385 100644
--- a/packages/binutils/2.28/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
+++ b/packages/binutils/2.28.1/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
diff --git a/packages/binutils/2.28/330-Dont-link-to-libfl-as-its-unnecessary.patch b/packages/binutils/2.28.1/330-Dont-link-to-libfl-as-its-unnecessary.patch
index c52af05..c52af05 100644
--- a/packages/binutils/2.28/330-Dont-link-to-libfl-as-its-unnecessary.patch
+++ b/packages/binutils/2.28.1/330-Dont-link-to-libfl-as-its-unnecessary.patch
diff --git a/packages/binutils/2.28/340-Darwin-gold-binary-cc-include-string-not-cstring.patch b/packages/binutils/2.28.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
index e4f235b..e4f235b 100644
--- a/packages/binutils/2.28/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
+++ b/packages/binutils/2.28.1/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
diff --git a/packages/binutils/2.28/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/packages/binutils/2.28.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
index 6168b31..6168b31 100644
--- a/packages/binutils/2.28/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
+++ b/packages/binutils/2.28.1/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
diff --git a/packages/binutils/2.28/500-sysroot.patch b/packages/binutils/2.28.1/500-sysroot.patch
index 4cb9bc7..4cb9bc7 100644
--- a/packages/binutils/2.28/500-sysroot.patch
+++ b/packages/binutils/2.28.1/500-sysroot.patch
diff --git a/packages/binutils/2.28/600-poison-system-directories.patch b/packages/binutils/2.28.1/600-poison-system-directories.patch
index ff235e3..ff235e3 100644
--- a/packages/binutils/2.28/600-poison-system-directories.patch
+++ b/packages/binutils/2.28.1/600-poison-system-directories.patch
diff --git a/packages/binutils/2.28/version.desc b/packages/binutils/2.28.1/version.desc
index e69de29..e69de29 100644
--- a/packages/binutils/2.28/version.desc
+++ b/packages/binutils/2.28.1/version.desc
diff --git a/packages/binutils/2.28/700-Fix-library-paths-on-PowerPC.patch b/packages/binutils/2.28/700-Fix-library-paths-on-PowerPC.patch
deleted file mode 100644
index cea92f3..0000000
--- a/packages/binutils/2.28/700-Fix-library-paths-on-PowerPC.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 1b967f3cb0682dd05128ef13495c2dca2a04dc4e Mon Sep 17 00:00:00 2001
-From: Alexey Neyman <stilor@att.net>
-Date: Sat, 11 Mar 2017 17:27:09 -0800
-Subject: [PATCH] Fix library paths on PowerPC
-
-First, need to match against just the CPU name, not the whole triplet.
-Otherwise, the test picks up "*le-*" pattern from x86_64-apple-darwin
-triplet.
-
-Second, it should be testing for $target, not $host. Host may be
-little endian by default, and the sysroot directory layout shouldn't
-depend on whether it is built on LE or BE machine.
-
-Signed-off-by: Alexey Neyman <stilor@att.net>
----
- ld/emulparams/elf32ppccommon.sh | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/ld/emulparams/elf32ppccommon.sh b/ld/emulparams/elf32ppccommon.sh
-index 1f54ef8..d00cf68 100644
---- a/ld/emulparams/elf32ppccommon.sh
-+++ b/ld/emulparams/elf32ppccommon.sh
-@@ -44,11 +44,11 @@ fi
- 
- # Look for 64 bit target libraries in /lib64, /usr/lib64 etc., first.
- # Similarly, look for 32 bit libraries in /lib32, /usr/lib32 etc.
--case "$host":"$EMULATION_NAME" in
--  *le-*:*64lppc*) LIBPATH_SUFFIX=64 ;;
--  *le-*:*32lppc*) LIBPATH_SUFFIX=32 ;;
--  *le-*:*64*) LIBPATH_SUFFIX=64be ;;
--  *le-*:*32*) LIBPATH_SUFFIX=32be ;;
-+case `echo "$target" | sed -e 's/-.*//'`:"$EMULATION_NAME" in
-+  *le:*64lppc*) LIBPATH_SUFFIX=64 ;;
-+  *le:*32lppc*) LIBPATH_SUFFIX=32 ;;
-+  *le:*64*) LIBPATH_SUFFIX=64be ;;
-+  *le:*32*) LIBPATH_SUFFIX=32be ;;
-   *:*64lppc*) LIBPATH_SUFFIX=64le ;;
-   *:*32lppc*) LIBPATH_SUFFIX=32le ;;
-   *:*64*) LIBPATH_SUFFIX=64 ;;
--- 
-2.9.3
-
diff --git a/packages/binutils/2.29/120-sh-conf.patch b/packages/binutils/2.29/120-sh-conf.patch
new file mode 100644
index 0000000..65fbcb0
--- /dev/null
+++ b/packages/binutils/2.29/120-sh-conf.patch
@@ -0,0 +1,33 @@
+r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines
+
+Likewise, binutils has no idea about any of these new targets either, so we 
+fix that up too.. now we're able to actually build a real toolchain for 
+sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more 
+inept targets than that one, really. Go look, I promise).
+
+diff --git a/configure b/configure
+index 87677bc..2d916f1 100755
+--- a/configure
++++ b/configure
+@@ -3812,7 +3812,7 @@ case "${target}" in
+   or1k*-*-*)
+     noconfigdirs="$noconfigdirs gdb"
+     ;;
+-  sh-*-*)
++  sh*-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
+diff --git a/configure.ac b/configure.ac
+index 8fe0eca..b10a99f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1140,7 +1140,7 @@ case "${target}" in
+   or1k*-*-*)
+     noconfigdirs="$noconfigdirs gdb"
+     ;;
+-  sh-*-*)
++  sh*-*-*)
+     case "${target}" in
+       sh*-*-elf)
+          ;;
diff --git a/packages/binutils/2.29/300-001_ld_makefile_patch.patch b/packages/binutils/2.29/300-001_ld_makefile_patch.patch
new file mode 100644
index 0000000..2a1320c
--- /dev/null
+++ b/packages/binutils/2.29/300-001_ld_makefile_patch.patch
@@ -0,0 +1,26 @@
+diff --git a/ld/Makefile.am b/ld/Makefile.am
+index 9575f1f..84df0bf 100644
+--- a/ld/Makefile.am
++++ b/ld/Makefile.am
+@@ -54,7 +54,7 @@ endif
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ 
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+diff --git a/ld/Makefile.in b/ld/Makefile.in
+index 9f56ca1..272860f 100644
+--- a/ld/Makefile.in
++++ b/ld/Makefile.in
+@@ -388,7 +388,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
diff --git a/packages/binutils/2.29/300-012_check_ldrunpath_length.patch b/packages/binutils/2.29/300-012_check_ldrunpath_length.patch
new file mode 100644
index 0000000..c1d5a97
--- /dev/null
+++ b/packages/binutils/2.29/300-012_check_ldrunpath_length.patch
@@ -0,0 +1,22 @@
+diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
+index 137446f..bb8391a 100644
+--- a/ld/emultempl/elf32.em
++++ b/ld/emultempl/elf32.em
+@@ -1195,6 +1195,8 @@ fragment <<EOF
+ 	      && command_line.rpath == NULL)
+ 	    {
+ 	      path = (const char *) getenv ("LD_RUN_PATH");
++	      if ((path) && (strlen (path) == 0))
++	      	path = NULL;
+ 	      if (path
+ 		  && gld${EMULATION_NAME}_search_needed (path, &n, force))
+ 		break;
+@@ -1458,6 +1460,8 @@ gld${EMULATION_NAME}_before_allocation (void)
+   rpath = command_line.rpath;
+   if (rpath == NULL)
+     rpath = (const char *) getenv ("LD_RUN_PATH");
++  if ((rpath) && (*rpath == '\0'))
++  	rpath = NULL;
+ 
+   for (abfd = link_info.input_bfds; abfd; abfd = abfd->link.next)
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)
diff --git a/packages/binutils/2.29/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch b/packages/binutils/2.29/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
new file mode 100644
index 0000000..2956385
--- /dev/null
+++ b/packages/binutils/2.29/320-MinGW-w64-winpthreads-doesnt-have-pthread_mutexattr_settype.patch
@@ -0,0 +1,11 @@
+--- binutils-2.27/gold/gold-threads.cc.orig	2016-12-26 16:44:23.691075600 +1100
++++ binutils-2.27/gold/gold-threads.cc	2016-12-26 16:46:21.071855200 +1100
+@@ -101,7 +101,7 @@
+   int err = pthread_mutexattr_init(&attr);
+   if (err != 0)
+     gold_fatal(_("pthead_mutexattr_init failed: %s"), strerror(err));
+-#ifdef PTHREAD_MUTEX_ADAPTIVE_NP
++#if defined(PTHREAD_MUTEX_ADAPTIVE_NP) && !defined(_WIN32)
+   err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ADAPTIVE_NP);
+   if (err != 0)
+     gold_fatal(_("pthread_mutexattr_settype failed: %s"), strerror(err));
diff --git a/packages/binutils/2.29/330-Dont-link-to-libfl-as-its-unnecessary.patch b/packages/binutils/2.29/330-Dont-link-to-libfl-as-its-unnecessary.patch
new file mode 100644
index 0000000..4eaa700
--- /dev/null
+++ b/packages/binutils/2.29/330-Dont-link-to-libfl-as-its-unnecessary.patch
@@ -0,0 +1,108 @@
+diff --git a/binutils/configure b/binutils/configure
+index 6e1f21e..78bf4ae 100755
+--- a/binutils/configure
++++ b/binutils/configure
+@@ -12106,6 +12106,7 @@
+ done
+ test -n "$YACC" || YACC="yacc"
+ 
++save_LIBS=$LIBS
+ for ac_prog in flex lex
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -12267,6 +12268,8 @@
+ if test "$LEX" = :; then
+   LEX=${am_missing_run}flex
+ fi
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr ca"
+ # If we haven't got the data from the intl directory,
+diff --git a/binutils/configure.ac b/binutils/configure.ac
+index defe781..8fd236a 100644
+--- a/binutils/configure.ac
++++ b/binutils/configure.ac
+@@ -87,7 +87,10 @@
+ fi
+ 
+ AC_PROG_YACC
++save_LIBS=$LIBS
+ AM_PROG_LEX
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ ALL_LINGUAS="bg da es fi fr id it ja ro ru rw sk sv tr uk vi zh_CN zh_TW hr ca"
+ ZW_GNU_GETTEXT_SISTER_DIR
+diff --git a/gas/configure b/gas/configure
+index f959e95..9bb4043 100755
+--- a/gas/configure
++++ b/gas/configure
+@@ -12819,6 +12819,7 @@ fi
+ done
+ test -n "$YACC" || YACC="yacc"
+ 
++save_LIBS=$LIBS
+ for ac_prog in flex lex
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -12980,6 +12981,8 @@ esac
+ if test "$LEX" = :; then
+   LEX=${am_missing_run}flex
+ fi
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN sv"
+ # If we haven't got the data from the intl directory,
+diff --git a/gas/configure.ac b/gas/configure.ac
+index 07f825d..c552b7e 100644
+--- a/gas/configure.ac
++++ b/gas/configure.ac
+@@ -734,7 +734,10 @@ AC_DEFINE_UNQUOTED(TARGET_VENDOR,	"${target_vendor}", [Target vendor.])
+ AC_DEFINE_UNQUOTED(TARGET_OS,		"${target_os}",    [Target OS.])
+ 
+ AC_PROG_YACC
++save_LIBS=$LIBS
+ AM_PROG_LEX
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ ALL_LINGUAS="fr tr es rw id ru fi ja zh_CN sv"
+ ZW_GNU_GETTEXT_SISTER_DIR
+diff --git a/ld/configure b/ld/configure
+index a446283..1a6bf81 100755
+--- a/ld/configure
++++ b/ld/configure
+@@ -16087,6 +16087,7 @@ fi
+ done
+ test -n "$YACC" || YACC="yacc"
+ 
++save_LIBS=$LIBS
+ for ac_prog in flex lex
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+@@ -16248,6 +16249,8 @@ esac
+ if test "$LEX" = :; then
+   LEX=${am_missing_run}flex
+ fi
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
+diff --git a/ld/configure.ac b/ld/configure.ac
+index 188172d..45eec53 100644
+--- a/ld/configure.ac
++++ b/ld/configure.ac
+@@ -186,7 +186,10 @@ AM_PO_SUBDIRS
+ AC_EXEEXT
+ 
+ AC_PROG_YACC
++save_LIBS=$LIBS
+ AM_PROG_LEX
++LIBS=$save_LIBS
++LEXLIB=
+ 
+ AM_MAINTAINER_MODE
+ AM_CONDITIONAL(GENINSRC_NEVER, false)
diff --git a/packages/binutils/2.29/340-Darwin-gold-binary-cc-include-string-not-cstring.patch b/packages/binutils/2.29/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
new file mode 100644
index 0000000..e4f235b
--- /dev/null
+++ b/packages/binutils/2.29/340-Darwin-gold-binary-cc-include-string-not-cstring.patch
@@ -0,0 +1,13 @@
+diff --git a/gold/binary.cc b/gold/binary.cc
+index 52df81a..03a8f20 100644
+--- a/gold/binary.cc
++++ b/gold/binary.cc
+@@ -23,7 +23,7 @@
+ #include "gold.h"
+ 
+ #include <cerrno>
+-#include <cstring>
++#include <string>
+ 
+ #include "elfcpp.h"
+ #include "stringpool.h"
diff --git a/packages/binutils/2.29/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch b/packages/binutils/2.29/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
new file mode 100644
index 0000000..6168b31
--- /dev/null
+++ b/packages/binutils/2.29/350-Darwin-Two-fixes-from-Android-NDK-PTHREAD_ONCE_INIT-wcsncasecmp.patch
@@ -0,0 +1,77 @@
+From c39479f4ab4d372b518957871e1f205a03e7c3d6 Mon Sep 17 00:00:00 2001
+From: Andrew Hsieh <andrewhsieh@google.com>
+Date: Wed, 18 Mar 2015 10:57:24 +0800
+Subject: [PATCH] Fix darwin build
+
+1. In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4
+   doesn't support ended initializer list
+2. wcsncasecmp doesn't exist in MacSDK10.6.x
+
+Change-Id: I69204a72f853f5263dffedc448379d75ed4eca2e
+---
+ binutils-2.25/bfd/peXXigen.c       | 22 ++++++++++++++++++++++
+ binutils-2.25/gold/gold-threads.cc | 15 ++++++++++++---
+ 2 files changed, 34 insertions(+), 3 deletions(-)
+
+diff --git binutils-2.25.orig/bfd/peXXigen.c binutils-2.25/bfd/peXXigen.c
+index 13e39e4..7a98306 100644
+--- binutils-2.25.orig/bfd/peXXigen.c
++++ binutils-2.25/bfd/peXXigen.c
+@@ -3522,6 +3522,28 @@ u16_mbtouc (wchar_t * puc, const unsigned short * s, unsigned int n)
+ }
+ #endif /* HAVE_WCHAR_H and not Cygwin/Mingw */
+ 
++#if defined __APPLE__ && __DARWIN_C_LEVEL < 200809L
++/* wcsncasecmp isn't always defined in Mac SDK */
++static int
++wcsncasecmp(const wchar_t *s1, const wchar_t *s2, size_t n)
++{
++  wchar_t c1, c2;
++
++  if (n == 0)
++    return (0);
++  for (; *s1; s1++, s2++)
++  {
++    c1 = towlower(*s1);
++    c2 = towlower(*s2);
++    if (c1 != c2)
++      return ((int)c1 - c2);
++    if (--n == 0)
++      return (0);
++  }
++  return (-*s2);
++}
++#endif
++
+ /* Perform a comparison of two entries.  */
+ static signed int
+ rsrc_cmp (bfd_boolean is_name, rsrc_entry * a, rsrc_entry * b)
+diff --git binutils-2.25.orig/gold/gold-threads.cc binutils-2.25/gold/gold-threads.cc
+index ff5a8ac..45140e0 100644
+--- binutils-2.25.orig/gold/gold-threads.cc
++++ binutils-2.25/gold/gold-threads.cc
+@@ -284,9 +284,18 @@ Condvar::~Condvar()
+ class Once_initialize
+ {
+  public:
+-  Once_initialize()
+-    : once_(PTHREAD_ONCE_INIT)
+-  { }
++   Once_initialize()
++#if !defined(__APPLE__)
++     : once_(PTHREAD_ONCE_INIT)
++   { }
++#else
++// In Drawin PTHREAD_ONCE_INIT is {0x30B1BCBA, {0}} and the GCC < 4.4 doesn't support
++// extended initializer list as above */
++   {
++     pthread_once_t once_2 = PTHREAD_ONCE_INIT;
++     once_ = once_2; 
++   }
++#endif
+ 
+   // Return a pointer to the pthread_once_t variable.
+   pthread_once_t*
+-- 
+2.1.3
+
diff --git a/packages/binutils/2.29/500-sysroot.patch b/packages/binutils/2.29/500-sysroot.patch
new file mode 100644
index 0000000..4cb9bc7
--- /dev/null
+++ b/packages/binutils/2.29/500-sysroot.patch
@@ -0,0 +1,37 @@
+Signed-off-by: Sven Rebhan <odinshorse@googlemail.com>
+
+Always try to prepend the sysroot prefix to absolute filenames first.
+
+http://bugs.gentoo.org/275666
+http://sourceware.org/bugzilla/show_bug.cgi?id=10340
+
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -336,18 +336,25 @@
+      directory first.  */
+   if (!entry->flags.maybe_archive)
+     {
+-      if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename))
++      /* For absolute pathnames, try to always open the file in the
++	 sysroot first. If this fails, try to open the file at the
++	 given location.  */
++      entry->flags.sysrooted = is_sysrooted_pathname (entry->filename);
++      if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)
++	  && ld_sysroot)
+ 	{
+ 	  char *name = concat (ld_sysroot, entry->filename,
+ 			       (const char *) NULL);
+ 	  if (ldfile_try_open_bfd (name, entry))
+ 	    {
+ 	      entry->filename = name;
++	      entry->flags.sysrooted = TRUE;
+ 	      return TRUE;
+ 	    }
+ 	  free (name);
+ 	}
+-      else if (ldfile_try_open_bfd (entry->filename, entry))
++
++      if (ldfile_try_open_bfd (entry->filename, entry))
+ 	return TRUE;
+ 
+       if (IS_ABSOLUTE_PATH (entry->filename))
diff --git a/packages/binutils/2.29/600-poison-system-directories.patch b/packages/binutils/2.29/600-poison-system-directories.patch
new file mode 100644
index 0000000..a0a4a30
--- /dev/null
+++ b/packages/binutils/2.29/600-poison-system-directories.patch
@@ -0,0 +1,285 @@
+Patch adapted to binutils 2.23.2 and extended to use
+BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni.
+
+[Gustavo: adapt to binutils 2.25]
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
+
+Upstream-Status: Inappropriate [distribution: codesourcery]
+
+Patch originally created by Mark Hatle, forward-ported to
+binutils 2.21 by Scott Garman.
+
+purpose:  warn for uses of system directories when cross linking
+
+Code Merged from Sourcery G++ binutils 2.19 - 4.4-277
+
+2008-07-02  Joseph Myers  <joseph@codesourcery.com>
+
+    ld/
+    * ld.h (args_type): Add error_poison_system_directories.
+    * ld.texinfo (--error-poison-system-directories): Document.
+    * ldfile.c (ldfile_add_library_path): Check
+    command_line.error_poison_system_directories.
+    * ldmain.c (main): Initialize
+    command_line.error_poison_system_directories.
+    * lexsup.c (enum option_values): Add
+    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES.
+    (ld_options): Add --error-poison-system-directories.
+    (parse_args): Handle new option.
+
+2007-06-13  Joseph Myers  <joseph@codesourcery.com>
+
+    ld/
+    * config.in: Regenerate.
+    * ld.h (args_type): Add poison_system_directories.
+    * ld.texinfo (--no-poison-system-directories): Document.
+    * ldfile.c (ldfile_add_library_path): Check
+    command_line.poison_system_directories.
+    * ldmain.c (main): Initialize
+    command_line.poison_system_directories.
+    * lexsup.c (enum option_values): Add
+    OPTION_NO_POISON_SYSTEM_DIRECTORIES.
+    (ld_options): Add --no-poison-system-directories.
+    (parse_args): Handle new option.
+
+2007-04-20  Joseph Myers  <joseph@codesourcery.com>
+
+    Merge from Sourcery G++ binutils 2.17:
+
+    2007-03-20  Joseph Myers  <joseph@codesourcery.com>
+    Based on patch by Mark Hatle <mark.hatle@windriver.com>.
+    ld/
+    * configure.ac (--enable-poison-system-directories): New option.
+    * configure, config.in: Regenerate.
+    * ldfile.c (ldfile_add_library_path): If
+    ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib,
+    /usr/lib, /usr/local/lib or /usr/X11R6/lib.
+
+Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
+Signed-off-by: Scott Garman <scott.a.garman@intel.com>
+
+diff --git a/ld/config.in b/ld/config.in
+index 276fb77..35c58eb 100644
+--- a/ld/config.in
++++ b/ld/config.in
+@@ -17,6 +17,9 @@
+    language is requested. */
+ #undef ENABLE_NLS
+ 
++/* Define to warn for use of native system library directories */
++#undef ENABLE_POISON_SYSTEM_DIRECTORIES
++
+ /* Additional extension a shared object might have. */
+ #undef EXTRA_SHLIB_EXTENSION
+ 
+diff --git a/ld/configure b/ld/configure
+index a446283..d1f9504 100755
+--- a/ld/configure
++++ b/ld/configure
+@@ -788,6 +788,7 @@ with_lib_path
+ enable_targets
+ enable_64_bit_bfd
+ with_sysroot
++enable_poison_system_directories
+ enable_gold
+ enable_got
+ enable_compressed_debug_sections
+@@ -1445,6 +1446,8 @@ Optional Features:
+   --disable-largefile     omit support for large files
+   --enable-targets        alternative target configurations
+   --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)
++  --enable-poison-system-directories
++                          warn for use of native system library directories
+   --enable-gold[=ARG]     build gold [ARG={default,yes,no}]
+   --enable-got=<type>     GOT handling scheme (target, single, negative,
+                           multigot)
+@@ -15498,7 +15501,18 @@ else
+ fi
+ 
+ 
++# Check whether --enable-poison-system-directories was given.
++if test "${enable_poison_system_directories+set}" = set; then :
++  enableval=$enable_poison_system_directories;
++else
++  enable_poison_system_directories=no
++fi
++
++if test "x${enable_poison_system_directories}" = "xyes"; then
+ 
++$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h
++
++fi
+ 
+ # Check whether --enable-got was given.
+ if test "${enable_got+set}" = set; then :
+diff --git a/ld/configure.ac b/ld/configure.ac
+index 188172d..2cd8443 100644
+--- a/ld/configure.ac
++++ b/ld/configure.ac
+@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot)
+ AC_SUBST(TARGET_SYSTEM_ROOT)
+ AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE)
+ 
++AC_ARG_ENABLE([poison-system-directories],
++         AS_HELP_STRING([--enable-poison-system-directories],
++                [warn for use of native system library directories]),,
++         [enable_poison_system_directories=no])
++if test "x${enable_poison_system_directories}" = "xyes"; then
++  AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES],
++       [1],
++       [Define to warn for use of native system library directories])
++fi
++
+ dnl Use --enable-gold to decide if this linker should be the default.
+ dnl "install_as_default" is set to false if gold is the default linker.
+ dnl "installed_linker" is the installed BFD linker name.
+diff --git a/ld/ld.h b/ld/ld.h
+index d84ec4e..3476b26 100644
+--- a/ld/ld.h
++++ b/ld/ld.h
+@@ -169,6 +169,14 @@ typedef struct {
+   /* If set, display the target memory usage (per memory region).  */
+   bfd_boolean print_memory_usage;
+ 
++  /* If TRUE (the default) warn for uses of system directories when
++     cross linking.  */
++  bfd_boolean poison_system_directories;
++
++  /* If TRUE (default FALSE) give an error for uses of system
++     directories when cross linking instead of a warning.  */
++  bfd_boolean error_poison_system_directories;
++
+   /* Should we force section groups to be resolved?  Controlled with
+      --force-group-allocation on the command line or FORCE_GROUP_ALLOCATION
+      in the linker script.  */
+diff --git a/ld/ld.texinfo b/ld/ld.texinfo
+index 1dd7492..fb1438e 100644
+--- a/ld/ld.texinfo
++++ b/ld/ld.texinfo
+@@ -2357,6 +2357,18 @@ string identifying the original linked file does not change.
+ 
+ Passing @code{none} for @var{style} disables the setting from any
+ @code{--build-id} options earlier on the command line.
++
++@kindex --no-poison-system-directories
++@item --no-poison-system-directories
++Do not warn for @option{-L} options using system directories such as
++@file{/usr/lib} when cross linking.  This option is intended for use
++in chroot environments when such directories contain the correct
++libraries for the target system rather than the host.
++
++@kindex --error-poison-system-directories
++@item --error-poison-system-directories
++Give an error instead of a warning for @option{-L} options using
++system directories when cross linking.
+ @end table
+ 
+ @c man end
+diff --git a/ld/ldfile.c b/ld/ldfile.c
+index 96f9ecc..af231c0 100644
+--- a/ld/ldfile.c
++++ b/ld/ldfile.c
+@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline)
+     new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL);
+   else
+     new_dirs->name = xstrdup (name);
++
++#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES
++  if (command_line.poison_system_directories
++  && ((!strncmp (name, "/lib", 4))
++      || (!strncmp (name, "/usr/lib", 8))
++      || (!strncmp (name, "/usr/local/lib", 14))
++      || (!strncmp (name, "/usr/X11R6/lib", 14))))
++   {
++     if (command_line.error_poison_system_directories)
++       einfo (_("%X%P: error: library search path \"%s\" is unsafe for "
++            "cross-compilation\n"), name);
++     else
++       einfo (_("%P: warning: library search path \"%s\" is unsafe for "
++            "cross-compilation\n"), name);
++   }
++#endif
++
+ }
+ 
+ /* Try to open a BFD for a lang_input_statement.  */
+diff --git a/ld/ldlex.h b/ld/ldlex.h
+index 6f11e7b..0ca3110 100644
+--- a/ld/ldlex.h
++++ b/ld/ldlex.h
+@@ -144,6 +144,8 @@ enum option_values
+   OPTION_REQUIRE_DEFINED_SYMBOL,
+   OPTION_ORPHAN_HANDLING,
+   OPTION_FORCE_GROUP_ALLOCATION,
++  OPTION_NO_POISON_SYSTEM_DIRECTORIES,
++  OPTION_ERROR_POISON_SYSTEM_DIRECTORIES,
+ };
+ 
+ /* The initial parser states.  */
+diff --git a/ld/ldmain.c b/ld/ldmain.c
+index bb0b9cc..a23c56c 100644
+--- a/ld/ldmain.c
++++ b/ld/ldmain.c
+@@ -257,6 +257,8 @@ main (int argc, char **argv)
+   command_line.warn_mismatch = TRUE;
+   command_line.warn_search_mismatch = TRUE;
+   command_line.check_section_addresses = -1;
++  command_line.poison_system_directories = TRUE;
++  command_line.error_poison_system_directories = FALSE;
+ 
+   /* We initialize DEMANGLING based on the environment variable
+      COLLECT_NO_DEMANGLE.  The gcc collect2 program will demangle the
+diff --git a/ld/lexsup.c b/ld/lexsup.c
+index 4cad209..be7d584 100644
+--- a/ld/lexsup.c
++++ b/ld/lexsup.c
+@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] =
+   { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING},
+     '\0', N_("=MODE"), N_("Control how orphan sections are handled."),
+     TWO_DASHES },
++  { {"no-poison-system-directories", no_argument, NULL,
++    OPTION_NO_POISON_SYSTEM_DIRECTORIES},
++    '\0', NULL, N_("Do not warn for -L options using system directories"),
++    TWO_DASHES },
++  { {"error-poison-system-directories", no_argument, NULL,
++    OPTION_ERROR_POISON_SYSTEM_DIRECTORIES},
++    '\0', NULL, N_("Give an error for -L options using system directories"),
++    TWO_DASHES },
+ };
+ 
+ #define OPTION_COUNT ARRAY_SIZE (ld_options)
+@@ -542,6 +550,7 @@ parse_args (unsigned argc, char **argv)
+   int ingroup = 0;
+   char *default_dirlist = NULL;
+   char *shortopts;
++  char *BR_paranoid_env;
+   struct option *longopts;
+   struct option *really_longopts;
+   int last_optind;
+@@ -1516,6 +1525,14 @@ parse_args (unsigned argc, char **argv)
+           }
+           break;
+ 
++	case OPTION_NO_POISON_SYSTEM_DIRECTORIES:
++	  command_line.poison_system_directories = FALSE;
++	  break;
++
++	case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES:
++	  command_line.error_poison_system_directories = TRUE;
++	  break;
++
+ 	case OPTION_PUSH_STATE:
+ 	  input_flags.pushed = xmemdup (&input_flags,
+ 					sizeof (input_flags),
+@@ -1559,6 +1576,10 @@ parse_args (unsigned argc, char **argv)
+       command_line.soname = NULL;
+     }
+ 
++  BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH");
++  if (BR_paranoid_env && strlen(BR_paranoid_env) > 0)
++    command_line.error_poison_system_directories = TRUE;
++
+   while (ingroup)
+     {
+       lang_leave_group ();
diff --git a/packages/binutils/2.29/version.desc b/packages/binutils/2.29/version.desc
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/packages/binutils/2.29/version.desc
diff --git a/packages/gcc-linaro/6.3-2017.05/1100-ubsan-fix-check-empty-string.patch b/packages/gcc-linaro/6.3-2017.05/1100-ubsan-fix-check-empty-string.patch
deleted file mode 100644
index c012719..0000000
--- a/packages/gcc-linaro/6.3-2017.05/1100-ubsan-fix-check-empty-string.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8db2cf6353c13f2a84cbe49b689654897906c499 Mon Sep 17 00:00:00 2001
-From: kyukhin <kyukhin@138bc75d-0d04-0410-961f-82ee72b054a4>
-Date: Sat, 3 Sep 2016 10:57:05 +0000
-Subject: [PATCH] gcc/ 	* ubsan.c (ubsan_use_new_style_p): Fix check for empty
- string.
-
-git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239971 138bc75d-0d04-0410-961f-82ee72b054a4
-
-Upstream-Status: Backport
-Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
-
----
- gcc/ubsan.c   | 2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-Index: gcc-6.3.0/gcc/ubsan.c
-===================================================================
---- gcc-6.3.0.orig/gcc/ubsan.c
-+++ gcc-6.3.0/gcc/ubsan.c
-@@ -1471,7 +1471,7 @@ ubsan_use_new_style_p (location_t loc)
- 
-   expanded_location xloc = expand_location (loc);
-   if (xloc.file == NULL || strncmp (xloc.file, "\1", 2) == 0
--      || xloc.file == '\0' || xloc.file[0] == '\xff'
-+      || xloc.file[0] == '\0' || xloc.file[0] == '\xff'
-       || xloc.file[1] == '\xff')
-     return false;
- 
diff --git a/packages/gdb/6.8a/version.desc b/packages/gdb/6.8a/version.desc
index f26b5a2..f3953c8 100644
--- a/packages/gdb/6.8a/version.desc
+++ b/packages/gdb/6.8a/version.desc
@@ -1,2 +1,3 @@
 obsolete='yes'
 archive_formats='.tar.bz2 .tar.gz'
+archive_dirname='gdb-6.8'
diff --git a/packages/gdb/7.0.1a/version.desc b/packages/gdb/7.0.1a/version.desc
index f26b5a2..f98f67c 100644
--- a/packages/gdb/7.0.1a/version.desc
+++ b/packages/gdb/7.0.1a/version.desc
@@ -1,2 +1,3 @@
 obsolete='yes'
 archive_formats='.tar.bz2 .tar.gz'
+archive_dirname='gdb-7.0.1'
diff --git a/packages/gdb/7.0a/version.desc b/packages/gdb/7.0a/version.desc
index f26b5a2..10d8a67 100644
--- a/packages/gdb/7.0a/version.desc
+++ b/packages/gdb/7.0a/version.desc
@@ -1,2 +1,3 @@
 obsolete='yes'
 archive_formats='.tar.bz2 .tar.gz'
+archive_dirname='gdb-7.0'
diff --git a/packages/gdb/7.1a/version.desc b/packages/gdb/7.1a/version.desc
index f26b5a2..009fd5d 100644
--- a/packages/gdb/7.1a/version.desc
+++ b/packages/gdb/7.1a/version.desc
@@ -1,2 +1,3 @@
 obsolete='yes'
 archive_formats='.tar.bz2 .tar.gz'
+archive_dirname='gdb-7.1'
diff --git a/packages/gdb/7.2a/version.desc b/packages/gdb/7.2a/version.desc
index f26b5a2..094d937 100644
--- a/packages/gdb/7.2a/version.desc
+++ b/packages/gdb/7.2a/version.desc
@@ -1,2 +1,3 @@
 obsolete='yes'
 archive_formats='.tar.bz2 .tar.gz'
+archive_dirname='gdb-7.2'
diff --git a/packages/glibc-ports/2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch
index 1a632fe..259b285 100644
--- a/packages/glibc-ports/2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.12.1/090-Fix-ARM-build-with-GCC-trunk.patch
@@ -20,8 +20,8 @@ Tested that this fixes the build for ARM.
  sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
  sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
  3 files changed, 11 insertions(+), 2 deletions(-)
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
+--- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
++++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
 
@@ -35,8 +35,8 @@ Tested that this fixes the build for ARM.
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
 diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
 index bff3e2b..1f1eb71 100644
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
+--- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
++++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
@@ -47,8 +47,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
     struct _Unwind_Context *);
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
 
@@ -59,8 +59,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
diff --git a/packages/glibc-ports/2.12.1/330-m68k-sys-user.patch b/packages/glibc-ports/2.12.1/330-m68k-sys-user.patch
index b441691..c3a9c67 100644
--- a/packages/glibc-ports/2.12.1/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.12.1/330-m68k-sys-user.patch
@@ -1,8 +1,8 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+diff -durN glibc-ports-2.12.1.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys/user.h
+--- glibc-ports-2.12.1.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
@@ -94,4 +94,3 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/m68k/sys
  /* Copyright (C) 2008 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
  
-diff -durN glibc-2.12.1.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.12.1/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
diff --git a/packages/glibc-ports/2.12.1/440-alpha-cache-shape.patch b/packages/glibc-ports/2.12.1/440-alpha-cache-shape.patch
index ea85e99..879f8db 100644
--- a/packages/glibc-ports/2.12.1/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.12.1/440-alpha-cache-shape.patch
@@ -5,9 +5,9 @@ duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
 is both shared/static, there is no point in hooking dl-support anymore, so we
 can punt it.
 
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
+diff -durN glibc-ports-2.12.1.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c
+--- glibc-ports-2.12.1.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
 @@ -1,2 +1,1 @@
 -#include "dl-auxv.h"
  #include <elf/dl-support.c>
diff --git a/packages/glibc-ports/2.12.1/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.12.1/460-alpha-fix-gcc-4.1-warnings.patch
index 6438267..65781b4 100644
--- a/packages/glibc-ports/2.12.1/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.12.1/460-alpha-fix-gcc-4.1-warnings.patch
@@ -16,9 +16,9 @@ I cannot really think of anything better than
  ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
+diff -durN glibc-ports-2.12.1.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c
+--- glibc-ports-2.12.1.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
 @@ -178,13 +178,13 @@
  static inline void
  stb_mb(unsigned char val, unsigned long addr)
@@ -53,4 +53,3 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/alpha/io
    return r;
  }
  
-diff -durN glibc-2.12.1.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.12.1/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
diff --git a/packages/glibc-ports/2.12.1/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.12.1/530-alpha-fix-rtld-fPIC.patch
index 621a6f3..20b2e32 100644
--- a/packages/glibc-ports/2.12.1/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.12.1/530-alpha-fix-rtld-fPIC.patch
@@ -5,9 +5,9 @@
  ports/sysdeps/alpha/Makefile |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/alpha/Makefile glibc-2.12.1/glibc-ports-2.12.1/sysdeps/alpha/Makefile
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
+diff -durN glibc-ports-2.12.1.orig/sysdeps/alpha/Makefile glibc-ports-2.12.1/sysdeps/alpha/Makefile
+--- glibc-ports-2.12.1.orig/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.12.1/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
 @@ -35,7 +35,8 @@
  
  ifeq ($(subdir),elf)
@@ -18,4 +18,3 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/alpha/Makefile glibc-2.1
  endif
  
  # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.12.1.orig/ports/sysdeps/alpha/Makefile glibc-2.12.1/ports/sysdeps/alpha/Makefile
diff --git a/packages/glibc-ports/2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index fc42a92..7878ab4 100644
--- a/packages/glibc-ports/2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.12.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
@@ -1,9 +1,9 @@
 http://yann.poupet.free.fr/ep93xx/
 Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
 
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/bits/endian.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/bits/endian.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/bits/endian.h glibc-ports-2.12.1/sysdeps/arm/bits/endian.h
+--- glibc-ports-2.12.1.orig/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.12.1/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
 @@ -12,7 +12,7 @@
  /* FPA floating point units are always big-endian, irrespective of the
     CPU endianness.  VFP floating point units use the same endianness
@@ -13,9 +13,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/bits/endian.h glibc-
  #define __FLOAT_WORD_ORDER __BYTE_ORDER
  #else
  #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/__longjmp.S glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S
+--- glibc-ports-2.12.1.orig/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
 @@ -30,7 +30,33 @@
  	movs	r0, r1		/* get the return value in place */
  	moveq	r0, #1		/* can't let setjmp() return zero! */
@@ -50,9 +50,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/__longjmp.S glib
  
  	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
  END (__longjmp)
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/bits/fenv.h glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h
+--- glibc-ports-2.12.1.orig/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
 @@ -20,6 +20,45 @@
  # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
  #endif
@@ -108,9 +108,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/fenv.h glib
  /* Type representing exception flags. */
  typedef unsigned long int fexcept_t;
  
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/bits/setjmp.h glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h
+--- glibc-ports-2.12.1.orig/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
 @@ -28,7 +28,11 @@
  #ifndef _ASM
  /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
@@ -123,9 +123,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/bits/setjmp.h gl
 +#endif
  
  #endif
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/fegetround.c glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c
+--- glibc-ports-2.12.1.orig/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
 @@ -18,9 +18,21 @@
     02111-1307 USA.  */
  
@@ -148,9 +148,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fegetround.c gli
 +
 +#endif
  }
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/fesetround.c glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c
+--- glibc-ports-2.12.1.orig/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
 @@ -18,12 +18,28 @@
     02111-1307 USA.  */
  
@@ -180,9 +180,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fesetround.c gli
  }
  
  libm_hidden_def (fesetround)
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/fpu_control.h glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h
+--- glibc-ports-2.12.1.orig/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
 @@ -1,5 +1,6 @@
  /* FPU control word definitions.  ARM version.
 -   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
@@ -278,9 +278,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/fpu_control.h gl
 +#endif
 +
  #endif /* _FPU_CONTROL_H */
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h
+--- glibc-ports-2.12.1.orig/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
 @@ -17,4 +17,8 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -290,9 +290,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/jmpbuf-offsets.h
 +#else
  #define __JMP_BUF_SP		20
 +#endif
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/fpu/setjmp.S glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S
+--- glibc-ports-2.12.1.orig/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
 @@ -24,11 +24,41 @@
  
  ENTRY (__sigsetjmp)
@@ -335,9 +335,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/fpu/setjmp.S glibc-2
  
  	/* Make a tail call to __sigjmp_save; it takes the same args.  */
  	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/gccframe.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/gccframe.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/gccframe.h glibc-ports-2.12.1/sysdeps/arm/gccframe.h
+--- glibc-ports-2.12.1.orig/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.12.1/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
 @@ -17,6 +17,10 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,9 +349,9 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/gccframe.h glibc-2.1
 +#endif
  
  #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.12.1.orig/sysdeps/arm/gmp-mparam.h glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h
+--- glibc-ports-2.12.1.orig/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
 @@ -29,7 +29,7 @@
  #if defined(__ARMEB__)
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
@@ -361,14 +361,3 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/arm/gmp-mparam.h glibc-2
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
  # define IEEE_DOUBLE_BIG_ENDIAN 0
  #else
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/bits/endian.h glibc-2.12.1/ports/sysdeps/arm/bits/endian.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/__longjmp.S glibc-2.12.1/ports/sysdeps/arm/fpu/__longjmp.S
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/bits/fenv.h glibc-2.12.1/ports/sysdeps/arm/fpu/bits/fenv.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/bits/setjmp.h glibc-2.12.1/ports/sysdeps/arm/fpu/bits/setjmp.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/fegetround.c glibc-2.12.1/ports/sysdeps/arm/fpu/fegetround.c
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/fesetround.c glibc-2.12.1/ports/sysdeps/arm/fpu/fesetround.c
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/fpu_control.h glibc-2.12.1/ports/sysdeps/arm/fpu/fpu_control.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.12.1/ports/sysdeps/arm/fpu/jmpbuf-offsets.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/fpu/setjmp.S glibc-2.12.1/ports/sysdeps/arm/fpu/setjmp.S
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/gccframe.h glibc-2.12.1/ports/sysdeps/arm/gccframe.h
-diff -durN glibc-2.12.1.orig/ports/sysdeps/arm/gmp-mparam.h glibc-2.12.1/ports/sysdeps/arm/gmp-mparam.h
diff --git a/packages/glibc-ports/2.12.1/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.12.1/580-nptl-lowlevellock.patch
index c243a76..4d1a51a 100644
--- a/packages/glibc-ports/2.12.1/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.12.1/580-nptl-lowlevellock.patch
@@ -9,9 +9,9 @@ In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
 
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
+diff -durN glibc-ports-2.12.1.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+--- glibc-ports-2.12.1.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
 @@ -25,6 +25,7 @@
  #include <atomic.h>
  #include <sysdep.h>
@@ -20,4 +20,3 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/unix/sysv/linux/arm/nptl
  
  #define FUTEX_WAIT		0
  #define FUTEX_WAKE		1
-diff -durN glibc-2.12.1.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.12.1/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
diff --git a/packages/glibc-ports/2.12.1/610-fpu-cw-mips.patch b/packages/glibc-ports/2.12.1/610-fpu-cw-mips.patch
index 7d990de..deab419 100644
--- a/packages/glibc-ports/2.12.1/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.12.1/610-fpu-cw-mips.patch
@@ -1,8 +1,8 @@
 http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
 
-diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/mips/fpu_control.h glibc-2.12.1/glibc-ports-2.12.1/sysdeps/mips/fpu_control.h
---- glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.12.1/glibc-ports-2.12.1/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
+diff -durN glibc-ports-2.12.1.orig/sysdeps/mips/fpu_control.h glibc-ports-2.12.1/sysdeps/mips/fpu_control.h
+--- glibc-ports-2.12.1.orig/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.12.1/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
 @@ -86,7 +86,7 @@
  #define _FPU_RC_UP      0x2
  #define _FPU_RC_DOWN    0x3
@@ -12,4 +12,3 @@ diff -durN glibc-2.12.1.orig/glibc-ports-2.12.1/sysdeps/mips/fpu_control.h glibc
  
  
  /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.12.1.orig/ports/sysdeps/mips/fpu_control.h glibc-2.12.1/ports/sysdeps/mips/fpu_control.h
diff --git a/packages/glibc-ports/2.12.1/670-support-hard-float-eabi.patch b/packages/glibc-ports/2.12.1/670-support-hard-float-eabi.patch
index 3f2bc0f..af5dd39 100644
--- a/packages/glibc-ports/2.12.1/670-support-hard-float-eabi.patch
+++ b/packages/glibc-ports/2.12.1/670-support-hard-float-eabi.patch
@@ -1,6 +1,6 @@
-diff -ur glibc-2.12.1/ports/sysdeps/arm/preconfigure glibc-2.12.1-patched/ports/sysdeps/arm/preconfigure
---- glibc-2.12.1/ports/sysdeps/arm/preconfigure	2017-03-07 15:33:56.410265000 -0700
-+++ glibc-2.12.1-patched/ports/sysdeps/arm/preconfigure	2017-03-07 15:34:42.016840000 -0700
+diff -ur glibc-2.12.1/sysdeps/arm/preconfigure glibc-2.12.1-patched/sysdeps/arm/preconfigure
+--- glibc-2.12.1/sysdeps/arm/preconfigure	2017-03-07 15:33:56.410265000 -0700
++++ glibc-2.12.1-patched/sysdeps/arm/preconfigure	2017-03-07 15:34:42.016840000 -0700
 @@ -2,7 +2,7 @@
  arm*)
  	base_machine=arm
@@ -10,9 +10,9 @@ diff -ur glibc-2.12.1/ports/sysdeps/arm/preconfigure glibc-2.12.1-patched/ports/
  		machine=arm/eabi/$machine
  		;;
  	*)
-diff -ur glibc-2.12.1/ports/sysdeps/arm/shlib-versions glibc-2.12.1-patched/ports/sysdeps/arm/shlib-versions
---- glibc-2.12.1/ports/sysdeps/arm/shlib-versions	2017-03-07 15:33:56.439267000 -0700
-+++ glibc-2.12.1-patched/ports/sysdeps/arm/shlib-versions	2017-03-07 15:34:42.018837000 -0700
+diff -ur glibc-2.12.1/sysdeps/arm/shlib-versions glibc-2.12.1-patched/sysdeps/arm/shlib-versions
+--- glibc-2.12.1/sysdeps/arm/shlib-versions	2017-03-07 15:33:56.439267000 -0700
++++ glibc-2.12.1-patched/sysdeps/arm/shlib-versions	2017-03-07 15:34:42.018837000 -0700
 @@ -1,4 +1,4 @@
 -arm.*-.*-linux-gnueabi	DEFAULT			GLIBC_2.4
 +arm.*-.*-linux-gnueabi.*	DEFAULT			GLIBC_2.4
diff --git a/packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch
index 1a632fe..259b285 100644
--- a/packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.13/090-Fix-ARM-build-with-GCC-trunk.patch
@@ -20,8 +20,8 @@ Tested that this fixes the build for ARM.
  sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
  sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
  3 files changed, 11 insertions(+), 2 deletions(-)
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
+--- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
++++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
 
@@ -35,8 +35,8 @@ Tested that this fixes the build for ARM.
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
 diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
 index bff3e2b..1f1eb71 100644
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
+--- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
++++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
@@ -47,8 +47,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
     struct _Unwind_Context *);
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
 
@@ -59,8 +59,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
diff --git a/packages/glibc-ports/2.13/330-m68k-sys-user.patch b/packages/glibc-ports/2.13/330-m68k-sys-user.patch
index 191e0c6..a2b4528 100644
--- a/packages/glibc-ports/2.13/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.13/330-m68k-sys-user.patch
@@ -1,8 +1,8 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+diff -durN glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h
+--- glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
@@ -94,4 +94,3 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/m68k/sys/use
  /* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
  
-diff -durN glibc-2.13.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.13/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
diff --git a/packages/glibc-ports/2.13/410-alpha-SETPIPE-GETPIPE.patch b/packages/glibc-ports/2.13/410-alpha-SETPIPE-GETPIPE.patch
index fd55537..580c16d 100644
--- a/packages/glibc-ports/2.13/410-alpha-SETPIPE-GETPIPE.patch
+++ b/packages/glibc-ports/2.13/410-alpha-SETPIPE-GETPIPE.patch
@@ -3,10 +3,10 @@
 	* sysdeps/unix/sysv/linux/alpha/bits/fcntl.h (F_SETPIPE_SZ,
 	F_GETPIPE_SZ): Define.
 
-diff --git glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
+diff --git glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
 index 860e9ac..e5e726b 100644
---- glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
+--- glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
++++ glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/fcntl.h
 @@ -97,6 +97,8 @@
  # define F_SETLEASE	1024	/* Set a lease.	 */
  # define F_GETLEASE	1025	/* Enquire what lease is active.  */
diff --git a/packages/glibc-ports/2.13/420-alpha-statfs.patch b/packages/glibc-ports/2.13/420-alpha-statfs.patch
index 65c925a..accb5af 100644
--- a/packages/glibc-ports/2.13/420-alpha-statfs.patch
+++ b/packages/glibc-ports/2.13/420-alpha-statfs.patch
@@ -3,10 +3,10 @@
 	* sysdeps/unix/sysv/linux/mips/bits/statfs.h (struct statfs,
 	struct statfs64): Add f_flags field.
 
-diff --git glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
+diff --git glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
 index d838e6b..157591d 100644
---- glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
+--- glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
++++ glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/bits/statfs.h
 @@ -42,7 +42,8 @@ struct statfs
      __fsid_t f_fsid;
      int f_namelen;
diff --git a/packages/glibc-ports/2.13/440-alpha-cache-shape.patch b/packages/glibc-ports/2.13/440-alpha-cache-shape.patch
index 62ade7b..602c80d 100644
--- a/packages/glibc-ports/2.13/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.13/440-alpha-cache-shape.patch
@@ -5,9 +5,9 @@ duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
 is both shared/static, there is no point in hooking dl-support anymore, so we
 can punt it.
 
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
+diff -durN glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/dl-support.c
+--- glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
 @@ -1,2 +1,1 @@
 -#include "dl-auxv.h"
  #include <elf/dl-support.c>
diff --git a/packages/glibc-ports/2.13/450-alpha-DEFAULT_STACK_PERMS.patch b/packages/glibc-ports/2.13/450-alpha-DEFAULT_STACK_PERMS.patch
index ac3ea9a..0d85ce5 100644
--- a/packages/glibc-ports/2.13/450-alpha-DEFAULT_STACK_PERMS.patch
+++ b/packages/glibc-ports/2.13/450-alpha-DEFAULT_STACK_PERMS.patch
@@ -2,10 +2,10 @@
 
 	* sysdeps/alpha/stackinfo.h: Define DEFAULT_STACK_PERMS with PF_X.
 
-diff --git glibc-2.13/glibc-ports-2.13/sysdeps/alpha/stackinfo.h glibc-2.13/glibc-ports-2.13/sysdeps/alpha/stackinfo.h
+diff --git glibc-ports-2.13/sysdeps/alpha/stackinfo.h glibc-ports-2.13/sysdeps/alpha/stackinfo.h
 index 0a281bd..d9dbc35 100644
---- glibc-2.13/glibc-ports-2.13/sysdeps/alpha/stackinfo.h
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/alpha/stackinfo.h
+--- glibc-ports-2.13/sysdeps/alpha/stackinfo.h
++++ glibc-ports-2.13/sysdeps/alpha/stackinfo.h
 @@ -22,7 +22,13 @@
  #ifndef _STACKINFO_H
  #define _STACKINFO_H	1
diff --git a/packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch
index 313e0e0..d23ecf9 100644
--- a/packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.13/460-alpha-fix-gcc-4.1-warnings.patch
@@ -16,9 +16,9 @@ I cannot really think of anything better than
  ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
+diff -durN glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c
+--- glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
 @@ -178,13 +178,13 @@
  static inline void
  stb_mb(unsigned char val, unsigned long addr)
@@ -53,4 +53,3 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/alpha/ioperm
    return r;
  }
  
-diff -durN glibc-2.13.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.13/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
diff --git a/packages/glibc-ports/2.13/470-alpha-feupdateenv.patch b/packages/glibc-ports/2.13/470-alpha-feupdateenv.patch
index 45a7051..ea1e056 100644
--- a/packages/glibc-ports/2.13/470-alpha-feupdateenv.patch
+++ b/packages/glibc-ports/2.13/470-alpha-feupdateenv.patch
@@ -4,20 +4,20 @@
 	libm_hidden_def.
 	* sysdeps/alpha/fpu/ftestexcept.c (fetestexcept): Likewise.
 
-diff --git glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c
+diff --git glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c
 index c798070..9abbf11 100644
---- glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c
+--- glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c
++++ glibc-ports-2.13/sysdeps/alpha/fpu/feupdateenv.c
 @@ -46,4 +46,5 @@ strong_alias (__feupdateenv, __old_feupdateenv)
  compat_symbol (libm, __old_feupdateenv, feupdateenv, GLIBC_2_1);
  #endif
  
 +libm_hidden_ver (__feupdateenv, feupdateenv)
  versioned_symbol (libm, __feupdateenv, feupdateenv, GLIBC_2_2);
-diff --git glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c
+diff --git glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c
 index a4b3081..34d8113 100644
---- glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c
+--- glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c
++++ glibc-ports-2.13/sysdeps/alpha/fpu/ftestexcept.c
 @@ -30,3 +30,4 @@ fetestexcept (int excepts)
  
    return tmp & excepts & SWCR_STATUS_MASK;
diff --git a/packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch
index b2ae9b5..38562b6 100644
--- a/packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.13/530-alpha-fix-rtld-fPIC.patch
@@ -5,9 +5,9 @@
  ports/sysdeps/alpha/Makefile |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/alpha/Makefile glibc-2.13/glibc-ports-2.13/sysdeps/alpha/Makefile
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
+diff -durN glibc-ports-2.13.orig/sysdeps/alpha/Makefile glibc-ports-2.13/sysdeps/alpha/Makefile
+--- glibc-ports-2.13.orig/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.13/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
 @@ -35,7 +35,8 @@
  
  ifeq ($(subdir),elf)
@@ -18,4 +18,3 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/alpha/Makefile glibc-2.13/gl
  endif
  
  # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.13.orig/ports/sysdeps/alpha/Makefile glibc-2.13/ports/sysdeps/alpha/Makefile
diff --git a/packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index 4f4dbec..b7d54ac 100644
--- a/packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.13/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
@@ -1,9 +1,9 @@
 http://yann.poupet.free.fr/ep93xx/
 Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
 
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/bits/endian.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/bits/endian.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.13.orig/sysdeps/arm/bits/endian.h glibc-ports-2.13/sysdeps/arm/bits/endian.h
+--- glibc-ports-2.13.orig/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.13/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
 @@ -12,7 +12,7 @@
  /* FPA floating point units are always big-endian, irrespective of the
     CPU endianness.  VFP floating point units use the same endianness
@@ -13,9 +13,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/bits/endian.h glibc-2.13
  #define __FLOAT_WORD_ORDER __BYTE_ORDER
  #else
  #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/__longjmp.S glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S
+--- glibc-ports-2.13.orig/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
 @@ -30,7 +30,33 @@
  	movs	r0, r1		/* get the return value in place */
  	moveq	r0, #1		/* can't let setjmp() return zero! */
@@ -50,9 +50,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/__longjmp.S glibc-2.
  
  	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
  END (__longjmp)
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/bits/fenv.h glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h
+--- glibc-ports-2.13.orig/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
 @@ -20,6 +20,45 @@
  # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
  #endif
@@ -108,9 +108,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/bits/fenv.h glibc-2.
  /* Type representing exception flags. */
  typedef unsigned long int fexcept_t;
  
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/bits/setjmp.h glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h
+--- glibc-ports-2.13.orig/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
 @@ -28,7 +28,11 @@
  #ifndef _ASM
  /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
@@ -123,9 +123,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/bits/setjmp.h glibc-
 +#endif
  
  #endif
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/fegetround.c glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c
+--- glibc-ports-2.13.orig/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
 @@ -18,9 +18,21 @@
     02111-1307 USA.  */
  
@@ -148,9 +148,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fegetround.c glibc-2
 +
 +#endif
  }
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/fesetround.c glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c
+--- glibc-ports-2.13.orig/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
 @@ -18,12 +18,28 @@
     02111-1307 USA.  */
  
@@ -180,9 +180,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fesetround.c glibc-2
  }
  
  libm_hidden_def (fesetround)
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/fpu_control.h glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h
+--- glibc-ports-2.13.orig/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
 @@ -1,5 +1,6 @@
  /* FPU control word definitions.  ARM version.
 -   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
@@ -278,9 +278,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/fpu_control.h glibc-
 +#endif
 +
  #endif /* _FPU_CONTROL_H */
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h
+--- glibc-ports-2.13.orig/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
 @@ -17,4 +17,8 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -290,9 +290,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/jmpbuf-offsets.h gli
 +#else
  #define __JMP_BUF_SP		20
 +#endif
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.13.orig/sysdeps/arm/fpu/setjmp.S glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S
+--- glibc-ports-2.13.orig/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
 @@ -24,11 +24,41 @@
  
  ENTRY (__sigsetjmp)
@@ -335,9 +335,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/fpu/setjmp.S glibc-2.13/
  
  	/* Make a tail call to __sigjmp_save; it takes the same args.  */
  	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/gccframe.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/gccframe.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.13.orig/sysdeps/arm/gccframe.h glibc-ports-2.13/sysdeps/arm/gccframe.h
+--- glibc-ports-2.13.orig/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.13/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
 @@ -17,6 +17,10 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,9 +349,9 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/gccframe.h glibc-2.13/gl
 +#endif
  
  #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/gmp-mparam.h glibc-2.13/glibc-ports-2.13/sysdeps/arm/gmp-mparam.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.13.orig/sysdeps/arm/gmp-mparam.h glibc-ports-2.13/sysdeps/arm/gmp-mparam.h
+--- glibc-ports-2.13.orig/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.13/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
 @@ -29,7 +29,7 @@
  #if defined(__ARMEB__)
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
@@ -361,14 +361,3 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/arm/gmp-mparam.h glibc-2.13/
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
  # define IEEE_DOUBLE_BIG_ENDIAN 0
  #else
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/bits/endian.h glibc-2.13/ports/sysdeps/arm/bits/endian.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/__longjmp.S glibc-2.13/ports/sysdeps/arm/fpu/__longjmp.S
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/bits/fenv.h glibc-2.13/ports/sysdeps/arm/fpu/bits/fenv.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/bits/setjmp.h glibc-2.13/ports/sysdeps/arm/fpu/bits/setjmp.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/fegetround.c glibc-2.13/ports/sysdeps/arm/fpu/fegetround.c
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/fesetround.c glibc-2.13/ports/sysdeps/arm/fpu/fesetround.c
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/fpu_control.h glibc-2.13/ports/sysdeps/arm/fpu/fpu_control.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.13/ports/sysdeps/arm/fpu/jmpbuf-offsets.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/fpu/setjmp.S glibc-2.13/ports/sysdeps/arm/fpu/setjmp.S
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/gccframe.h glibc-2.13/ports/sysdeps/arm/gccframe.h
-diff -durN glibc-2.13.orig/ports/sysdeps/arm/gmp-mparam.h glibc-2.13/ports/sysdeps/arm/gmp-mparam.h
diff --git a/packages/glibc-ports/2.13/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.13/580-nptl-lowlevellock.patch
index 08518e9..9f3fb76 100644
--- a/packages/glibc-ports/2.13/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.13/580-nptl-lowlevellock.patch
@@ -9,9 +9,9 @@ In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
 
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
+diff -durN glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+--- glibc-ports-2.13.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
 @@ -25,6 +25,7 @@
  #include <atomic.h>
  #include <sysdep.h>
@@ -20,4 +20,3 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/unix/sysv/linux/arm/nptl/low
  
  #define FUTEX_WAIT		0
  #define FUTEX_WAKE		1
-diff -durN glibc-2.13.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.13/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
diff --git a/packages/glibc-ports/2.13/610-fpu-cw-mips.patch b/packages/glibc-ports/2.13/610-fpu-cw-mips.patch
index cd2b4d9..c6345b3 100644
--- a/packages/glibc-ports/2.13/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.13/610-fpu-cw-mips.patch
@@ -1,8 +1,8 @@
 http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
 
-diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/mips/fpu_control.h glibc-2.13/glibc-ports-2.13/sysdeps/mips/fpu_control.h
---- glibc-2.13.orig/glibc-ports-2.13/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.13/glibc-ports-2.13/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
+diff -durN glibc-ports-2.13.orig/sysdeps/mips/fpu_control.h glibc-ports-2.13/sysdeps/mips/fpu_control.h
+--- glibc-ports-2.13.orig/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.13/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
 @@ -86,7 +86,7 @@
  #define _FPU_RC_UP      0x2
  #define _FPU_RC_DOWN    0x3
@@ -12,4 +12,3 @@ diff -durN glibc-2.13.orig/glibc-ports-2.13/sysdeps/mips/fpu_control.h glibc-2.1
  
  
  /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.13.orig/ports/sysdeps/mips/fpu_control.h glibc-2.13/ports/sysdeps/mips/fpu_control.h
diff --git a/packages/glibc-ports/2.13/670-support-hard-float-eabi.patch b/packages/glibc-ports/2.13/670-support-hard-float-eabi.patch
index 589f11e..ec00405 100644
--- a/packages/glibc-ports/2.13/670-support-hard-float-eabi.patch
+++ b/packages/glibc-ports/2.13/670-support-hard-float-eabi.patch
@@ -1,6 +1,6 @@
-diff -ur glibc-2.13/ports/sysdeps/arm/preconfigure glibc-2.13-patched/ports/sysdeps/arm/preconfigure
---- glibc-2.13/ports/sysdeps/arm/preconfigure	2011-01-25 14:00:16.000000000 -0700
-+++ glibc-2.13-patched/ports/sysdeps/arm/preconfigure	2017-03-07 15:36:50.310454000 -0700
+diff -ur glibc-2.13/sysdeps/arm/preconfigure glibc-2.13-patched/sysdeps/arm/preconfigure
+--- glibc-2.13/sysdeps/arm/preconfigure	2011-01-25 14:00:16.000000000 -0700
++++ glibc-2.13-patched/sysdeps/arm/preconfigure	2017-03-07 15:36:50.310454000 -0700
 @@ -2,7 +2,7 @@
  arm*)
  	base_machine=arm
@@ -10,9 +10,9 @@ diff -ur glibc-2.13/ports/sysdeps/arm/preconfigure glibc-2.13-patched/ports/sysd
  		machine=arm/eabi/$machine
  		if [ "${CFLAGS+set}" != "set" ]; then
  		  CFLAGS="-g -O2"
-diff -ur glibc-2.13/ports/sysdeps/arm/shlib-versions glibc-2.13-patched/ports/sysdeps/arm/shlib-versions
---- glibc-2.13/ports/sysdeps/arm/shlib-versions	2011-01-25 14:00:16.000000000 -0700
-+++ glibc-2.13-patched/ports/sysdeps/arm/shlib-versions	2017-03-07 15:36:50.312457000 -0700
+diff -ur glibc-2.13/sysdeps/arm/shlib-versions glibc-2.13-patched/sysdeps/arm/shlib-versions
+--- glibc-2.13/sysdeps/arm/shlib-versions	2011-01-25 14:00:16.000000000 -0700
++++ glibc-2.13-patched/sysdeps/arm/shlib-versions	2017-03-07 15:36:50.312457000 -0700
 @@ -1,4 +1,4 @@
 -arm.*-.*-linux-gnueabi	DEFAULT			GLIBC_2.4
 +arm.*-.*-linux-gnueabi.*	DEFAULT			GLIBC_2.4
diff --git a/packages/glibc-ports/2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch
index 1a632fe..259b285 100644
--- a/packages/glibc-ports/2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.14.1/090-Fix-ARM-build-with-GCC-trunk.patch
@@ -20,8 +20,8 @@ Tested that this fixes the build for ARM.
  sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
  sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
  3 files changed, 11 insertions(+), 2 deletions(-)
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
+--- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
++++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
 
@@ -35,8 +35,8 @@ Tested that this fixes the build for ARM.
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
 diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
 index bff3e2b..1f1eb71 100644
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
+--- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
++++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
@@ -47,8 +47,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
     struct _Unwind_Context *);
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
 
@@ -59,8 +59,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
diff --git a/packages/glibc-ports/2.14.1/330-m68k-sys-user.patch b/packages/glibc-ports/2.14.1/330-m68k-sys-user.patch
index 8fbe2e5..6476b5c 100644
--- a/packages/glibc-ports/2.14.1/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.14.1/330-m68k-sys-user.patch
@@ -1,8 +1,8 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+diff -durN glibc-ports-2.14.1.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys/user.h
+--- glibc-ports-2.14.1.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
@@ -94,4 +94,3 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/m68k/sys
  /* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
  
-diff -durN glibc-2.14.1.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.14.1/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
diff --git a/packages/glibc-ports/2.14.1/440-alpha-cache-shape.patch b/packages/glibc-ports/2.14.1/440-alpha-cache-shape.patch
index 8ca0bd6..989bfd7 100644
--- a/packages/glibc-ports/2.14.1/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.14.1/440-alpha-cache-shape.patch
@@ -5,9 +5,9 @@ duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
 is both shared/static, there is no point in hooking dl-support anymore, so we
 can punt it.
 
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
+diff -durN glibc-ports-2.14.1.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/dl-support.c
+--- glibc-ports-2.14.1.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
 @@ -1,2 +1,1 @@
 -#include "dl-auxv.h"
  #include <elf/dl-support.c>
diff --git a/packages/glibc-ports/2.14.1/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.14.1/460-alpha-fix-gcc-4.1-warnings.patch
index c3e59f4..2ed4118 100644
--- a/packages/glibc-ports/2.14.1/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.14.1/460-alpha-fix-gcc-4.1-warnings.patch
@@ -16,9 +16,9 @@ I cannot really think of anything better than
  ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
+diff -durN glibc-ports-2.14.1.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/ioperm.c
+--- glibc-ports-2.14.1.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
 @@ -178,13 +178,13 @@
  static inline void
  stb_mb(unsigned char val, unsigned long addr)
@@ -53,4 +53,3 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/alpha/io
    return r;
  }
  
-diff -durN glibc-2.14.1.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.14.1/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
diff --git a/packages/glibc-ports/2.14.1/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.14.1/530-alpha-fix-rtld-fPIC.patch
index 2691a99..56bc532 100644
--- a/packages/glibc-ports/2.14.1/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.14.1/530-alpha-fix-rtld-fPIC.patch
@@ -5,9 +5,9 @@
  ports/sysdeps/alpha/Makefile |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/alpha/Makefile glibc-2.14.1/glibc-ports-2.14.1/sysdeps/alpha/Makefile
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
+diff -durN glibc-ports-2.14.1.orig/sysdeps/alpha/Makefile glibc-ports-2.14.1/sysdeps/alpha/Makefile
+--- glibc-ports-2.14.1.orig/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14.1/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
 @@ -35,7 +35,8 @@
  
  ifeq ($(subdir),elf)
@@ -18,4 +18,3 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/alpha/Makefile glibc-2.1
  endif
  
  # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.14.1.orig/ports/sysdeps/alpha/Makefile glibc-2.14.1/ports/sysdeps/alpha/Makefile
diff --git a/packages/glibc-ports/2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index 5e45682..80032ed 100644
--- a/packages/glibc-ports/2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.14.1/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
@@ -1,9 +1,9 @@
 http://yann.poupet.free.fr/ep93xx/
 Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
 
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/bits/endian.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/bits/endian.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/bits/endian.h glibc-ports-2.14.1/sysdeps/arm/bits/endian.h
+--- glibc-ports-2.14.1.orig/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14.1/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
 @@ -12,7 +12,7 @@
  /* FPA floating point units are always big-endian, irrespective of the
     CPU endianness.  VFP floating point units use the same endianness
@@ -13,9 +13,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/bits/endian.h glibc-
  #define __FLOAT_WORD_ORDER __BYTE_ORDER
  #else
  #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/__longjmp.S glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S
+--- glibc-ports-2.14.1.orig/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
 @@ -30,7 +30,33 @@
  	movs	r0, r1		/* get the return value in place */
  	moveq	r0, #1		/* can't let setjmp() return zero! */
@@ -50,9 +50,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/__longjmp.S glib
  
  	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
  END (__longjmp)
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/bits/fenv.h glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h
+--- glibc-ports-2.14.1.orig/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
 @@ -20,6 +20,45 @@
  # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
  #endif
@@ -108,9 +108,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/fenv.h glib
  /* Type representing exception flags. */
  typedef unsigned long int fexcept_t;
  
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/bits/setjmp.h glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h
+--- glibc-ports-2.14.1.orig/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
 @@ -28,7 +28,11 @@
  #ifndef _ASM
  /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
@@ -123,9 +123,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/bits/setjmp.h gl
 +#endif
  
  #endif
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/fegetround.c glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c
+--- glibc-ports-2.14.1.orig/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
 @@ -18,9 +18,21 @@
     02111-1307 USA.  */
  
@@ -148,9 +148,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fegetround.c gli
 +
 +#endif
  }
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/fesetround.c glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c
+--- glibc-ports-2.14.1.orig/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
 @@ -18,12 +18,28 @@
     02111-1307 USA.  */
  
@@ -180,9 +180,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fesetround.c gli
  }
  
  libm_hidden_def (fesetround)
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/fpu_control.h glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h
+--- glibc-ports-2.14.1.orig/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
 @@ -1,5 +1,6 @@
  /* FPU control word definitions.  ARM version.
 -   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
@@ -278,9 +278,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/fpu_control.h gl
 +#endif
 +
  #endif /* _FPU_CONTROL_H */
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h
+--- glibc-ports-2.14.1.orig/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
 @@ -17,4 +17,8 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -290,9 +290,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/jmpbuf-offsets.h
 +#else
  #define __JMP_BUF_SP		20
 +#endif
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/fpu/setjmp.S glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S
+--- glibc-ports-2.14.1.orig/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
 @@ -24,11 +24,41 @@
  
  ENTRY (__sigsetjmp)
@@ -335,9 +335,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/fpu/setjmp.S glibc-2
  
  	/* Make a tail call to __sigjmp_save; it takes the same args.  */
  	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/gccframe.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/gccframe.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/gccframe.h glibc-ports-2.14.1/sysdeps/arm/gccframe.h
+--- glibc-ports-2.14.1.orig/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14.1/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
 @@ -17,6 +17,10 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,9 +349,9 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/gccframe.h glibc-2.1
 +#endif
  
  #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.1.orig/sysdeps/arm/gmp-mparam.h glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h
+--- glibc-ports-2.14.1.orig/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
 @@ -29,7 +29,7 @@
  #if defined(__ARMEB__)
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
@@ -361,14 +361,3 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/arm/gmp-mparam.h glibc-2
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
  # define IEEE_DOUBLE_BIG_ENDIAN 0
  #else
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/bits/endian.h glibc-2.14.1/ports/sysdeps/arm/bits/endian.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/__longjmp.S glibc-2.14.1/ports/sysdeps/arm/fpu/__longjmp.S
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/bits/fenv.h glibc-2.14.1/ports/sysdeps/arm/fpu/bits/fenv.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/bits/setjmp.h glibc-2.14.1/ports/sysdeps/arm/fpu/bits/setjmp.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/fegetround.c glibc-2.14.1/ports/sysdeps/arm/fpu/fegetround.c
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/fesetround.c glibc-2.14.1/ports/sysdeps/arm/fpu/fesetround.c
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/fpu_control.h glibc-2.14.1/ports/sysdeps/arm/fpu/fpu_control.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.14.1/ports/sysdeps/arm/fpu/jmpbuf-offsets.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/fpu/setjmp.S glibc-2.14.1/ports/sysdeps/arm/fpu/setjmp.S
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/gccframe.h glibc-2.14.1/ports/sysdeps/arm/gccframe.h
-diff -durN glibc-2.14.1.orig/ports/sysdeps/arm/gmp-mparam.h glibc-2.14.1/ports/sysdeps/arm/gmp-mparam.h
diff --git a/packages/glibc-ports/2.14.1/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.14.1/580-nptl-lowlevellock.patch
index 6bf5250..62b74d8 100644
--- a/packages/glibc-ports/2.14.1/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.14.1/580-nptl-lowlevellock.patch
@@ -9,9 +9,9 @@ In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
 
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
+diff -durN glibc-ports-2.14.1.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+--- glibc-ports-2.14.1.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
 @@ -25,6 +25,7 @@
  #include <atomic.h>
  #include <sysdep.h>
@@ -20,4 +20,3 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/unix/sysv/linux/arm/nptl
  
  #define FUTEX_WAIT		0
  #define FUTEX_WAKE		1
-diff -durN glibc-2.14.1.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.14.1/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
diff --git a/packages/glibc-ports/2.14.1/610-fpu-cw-mips.patch b/packages/glibc-ports/2.14.1/610-fpu-cw-mips.patch
index e53ac78..4b8365a 100644
--- a/packages/glibc-ports/2.14.1/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.14.1/610-fpu-cw-mips.patch
@@ -1,8 +1,8 @@
 http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
 
-diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/mips/fpu_control.h glibc-2.14.1/glibc-ports-2.14.1/sysdeps/mips/fpu_control.h
---- glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14.1/glibc-ports-2.14.1/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
+diff -durN glibc-ports-2.14.1.orig/sysdeps/mips/fpu_control.h glibc-ports-2.14.1/sysdeps/mips/fpu_control.h
+--- glibc-ports-2.14.1.orig/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14.1/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
 @@ -86,7 +86,7 @@
  #define _FPU_RC_UP      0x2
  #define _FPU_RC_DOWN    0x3
@@ -12,4 +12,3 @@ diff -durN glibc-2.14.1.orig/glibc-ports-2.14.1/sysdeps/mips/fpu_control.h glibc
  
  
  /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.14.1.orig/ports/sysdeps/mips/fpu_control.h glibc-2.14.1/ports/sysdeps/mips/fpu_control.h
diff --git a/packages/glibc-ports/2.14/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.14/090-Fix-ARM-build-with-GCC-trunk.patch
index 1a632fe..259b285 100644
--- a/packages/glibc-ports/2.14/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.14/090-Fix-ARM-build-with-GCC-trunk.patch
@@ -20,8 +20,8 @@ Tested that this fixes the build for ARM.
  sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
  sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
  3 files changed, 11 insertions(+), 2 deletions(-)
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
+--- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
++++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
 
@@ -35,8 +35,8 @@ Tested that this fixes the build for ARM.
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
 diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
 index bff3e2b..1f1eb71 100644
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
+--- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
++++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
@@ -47,8 +47,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
     struct _Unwind_Context *);
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
 
@@ -59,8 +59,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
diff --git a/packages/glibc-ports/2.14/330-m68k-sys-user.patch b/packages/glibc-ports/2.14/330-m68k-sys-user.patch
index 28bcb11..fbc96d9 100644
--- a/packages/glibc-ports/2.14/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.14/330-m68k-sys-user.patch
@@ -1,8 +1,8 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/user.h
+--- glibc-ports-2.14.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
@@ -94,4 +94,3 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/m68k/sys/use
  /* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
  
-diff -durN glibc-2.14.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.14/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
diff --git a/packages/glibc-ports/2.14/440-alpha-cache-shape.patch b/packages/glibc-ports/2.14/440-alpha-cache-shape.patch
index def0181..0c24a0d 100644
--- a/packages/glibc-ports/2.14/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.14/440-alpha-cache-shape.patch
@@ -5,9 +5,9 @@ duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
 is both shared/static, there is no point in hooking dl-support anymore, so we
 can punt it.
 
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/dl-support.c
+--- glibc-ports-2.14.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
 @@ -1,2 +1,1 @@
 -#include "dl-auxv.h"
  #include <elf/dl-support.c>
diff --git a/packages/glibc-ports/2.14/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.14/460-alpha-fix-gcc-4.1-warnings.patch
index 1569ce4..c757f44 100644
--- a/packages/glibc-ports/2.14/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.14/460-alpha-fix-gcc-4.1-warnings.patch
@@ -16,9 +16,9 @@ I cannot really think of anything better than
  ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/ioperm.c
+--- glibc-ports-2.14.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
 @@ -178,13 +178,13 @@
  static inline void
  stb_mb(unsigned char val, unsigned long addr)
@@ -53,4 +53,3 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/alpha/ioperm
    return r;
  }
  
-diff -durN glibc-2.14.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.14/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
diff --git a/packages/glibc-ports/2.14/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.14/530-alpha-fix-rtld-fPIC.patch
index 3560e2a..6f8eb31 100644
--- a/packages/glibc-ports/2.14/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.14/530-alpha-fix-rtld-fPIC.patch
@@ -5,9 +5,9 @@
  ports/sysdeps/alpha/Makefile |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/alpha/Makefile glibc-2.14/glibc-ports-2.14/sysdeps/alpha/Makefile
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/alpha/Makefile glibc-ports-2.14/sysdeps/alpha/Makefile
+--- glibc-ports-2.14.orig/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
 @@ -35,7 +35,8 @@
  
  ifeq ($(subdir),elf)
@@ -18,4 +18,3 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/alpha/Makefile glibc-2.14/gl
  endif
  
  # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.14.orig/ports/sysdeps/alpha/Makefile glibc-2.14/ports/sysdeps/alpha/Makefile
diff --git a/packages/glibc-ports/2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index b297ff0..8cd9539 100644
--- a/packages/glibc-ports/2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.14/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
@@ -1,9 +1,9 @@
 http://yann.poupet.free.fr/ep93xx/
 Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
 
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/bits/endian.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/bits/endian.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/bits/endian.h glibc-ports-2.14/sysdeps/arm/bits/endian.h
+--- glibc-ports-2.14.orig/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
 @@ -12,7 +12,7 @@
  /* FPA floating point units are always big-endian, irrespective of the
     CPU endianness.  VFP floating point units use the same endianness
@@ -13,9 +13,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/bits/endian.h glibc-2.14
  #define __FLOAT_WORD_ORDER __BYTE_ORDER
  #else
  #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/fpu/__longjmp.S glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S
+--- glibc-ports-2.14.orig/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
 @@ -30,7 +30,33 @@
  	movs	r0, r1		/* get the return value in place */
  	moveq	r0, #1		/* can't let setjmp() return zero! */
@@ -50,9 +50,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/__longjmp.S glibc-2.
  
  	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
  END (__longjmp)
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/fpu/bits/fenv.h glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h
+--- glibc-ports-2.14.orig/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
 @@ -20,6 +20,45 @@
  # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
  #endif
@@ -108,9 +108,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/bits/fenv.h glibc-2.
  /* Type representing exception flags. */
  typedef unsigned long int fexcept_t;
  
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/fpu/bits/setjmp.h glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h
+--- glibc-ports-2.14.orig/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
 @@ -28,7 +28,11 @@
  #ifndef _ASM
  /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
@@ -123,9 +123,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/bits/setjmp.h glibc-
 +#endif
  
  #endif
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/fpu/fegetround.c glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c
+--- glibc-ports-2.14.orig/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
 @@ -18,9 +18,21 @@
     02111-1307 USA.  */
  
@@ -148,9 +148,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fegetround.c glibc-2
 +
 +#endif
  }
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/fpu/fesetround.c glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c
+--- glibc-ports-2.14.orig/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
 @@ -18,12 +18,28 @@
     02111-1307 USA.  */
  
@@ -180,9 +180,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fesetround.c glibc-2
  }
  
  libm_hidden_def (fesetround)
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/fpu/fpu_control.h glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h
+--- glibc-ports-2.14.orig/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
 @@ -1,5 +1,6 @@
  /* FPU control word definitions.  ARM version.
 -   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
@@ -278,9 +278,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/fpu_control.h glibc-
 +#endif
 +
  #endif /* _FPU_CONTROL_H */
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h
+--- glibc-ports-2.14.orig/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
 @@ -17,4 +17,8 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -290,9 +290,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/jmpbuf-offsets.h gli
 +#else
  #define __JMP_BUF_SP		20
 +#endif
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/fpu/setjmp.S glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S
+--- glibc-ports-2.14.orig/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
 @@ -24,11 +24,41 @@
  
  ENTRY (__sigsetjmp)
@@ -335,9 +335,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/fpu/setjmp.S glibc-2.14/
  
  	/* Make a tail call to __sigjmp_save; it takes the same args.  */
  	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/gccframe.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/gccframe.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/gccframe.h glibc-ports-2.14/sysdeps/arm/gccframe.h
+--- glibc-ports-2.14.orig/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
 @@ -17,6 +17,10 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,9 +349,9 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/gccframe.h glibc-2.14/gl
 +#endif
  
  #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/gmp-mparam.h glibc-2.14/glibc-ports-2.14/sysdeps/arm/gmp-mparam.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/arm/gmp-mparam.h glibc-ports-2.14/sysdeps/arm/gmp-mparam.h
+--- glibc-ports-2.14.orig/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
 @@ -29,7 +29,7 @@
  #if defined(__ARMEB__)
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
@@ -361,14 +361,3 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/arm/gmp-mparam.h glibc-2.14/
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
  # define IEEE_DOUBLE_BIG_ENDIAN 0
  #else
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/bits/endian.h glibc-2.14/ports/sysdeps/arm/bits/endian.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/__longjmp.S glibc-2.14/ports/sysdeps/arm/fpu/__longjmp.S
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/bits/fenv.h glibc-2.14/ports/sysdeps/arm/fpu/bits/fenv.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/bits/setjmp.h glibc-2.14/ports/sysdeps/arm/fpu/bits/setjmp.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/fegetround.c glibc-2.14/ports/sysdeps/arm/fpu/fegetround.c
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/fesetround.c glibc-2.14/ports/sysdeps/arm/fpu/fesetround.c
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/fpu_control.h glibc-2.14/ports/sysdeps/arm/fpu/fpu_control.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.14/ports/sysdeps/arm/fpu/jmpbuf-offsets.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/fpu/setjmp.S glibc-2.14/ports/sysdeps/arm/fpu/setjmp.S
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/gccframe.h glibc-2.14/ports/sysdeps/arm/gccframe.h
-diff -durN glibc-2.14.orig/ports/sysdeps/arm/gmp-mparam.h glibc-2.14/ports/sysdeps/arm/gmp-mparam.h
diff --git a/packages/glibc-ports/2.14/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.14/580-nptl-lowlevellock.patch
index a2a141c..103727a 100644
--- a/packages/glibc-ports/2.14/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.14/580-nptl-lowlevellock.patch
@@ -9,9 +9,9 @@ In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
 
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+--- glibc-ports-2.14.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
 @@ -25,6 +25,7 @@
  #include <atomic.h>
  #include <sysdep.h>
@@ -20,4 +20,3 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/unix/sysv/linux/arm/nptl/low
  
  #define FUTEX_WAIT		0
  #define FUTEX_WAKE		1
-diff -durN glibc-2.14.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.14/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
diff --git a/packages/glibc-ports/2.14/610-fpu-cw-mips.patch b/packages/glibc-ports/2.14/610-fpu-cw-mips.patch
index c624565..549fc5b 100644
--- a/packages/glibc-ports/2.14/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.14/610-fpu-cw-mips.patch
@@ -1,8 +1,8 @@
 http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
 
-diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/mips/fpu_control.h glibc-2.14/glibc-ports-2.14/sysdeps/mips/fpu_control.h
---- glibc-2.14.orig/glibc-ports-2.14/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.14/glibc-ports-2.14/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
+diff -durN glibc-ports-2.14.orig/sysdeps/mips/fpu_control.h glibc-ports-2.14/sysdeps/mips/fpu_control.h
+--- glibc-ports-2.14.orig/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.14/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
 @@ -86,7 +86,7 @@
  #define _FPU_RC_UP      0x2
  #define _FPU_RC_DOWN    0x3
@@ -12,4 +12,3 @@ diff -durN glibc-2.14.orig/glibc-ports-2.14/sysdeps/mips/fpu_control.h glibc-2.1
  
  
  /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.14.orig/ports/sysdeps/mips/fpu_control.h glibc-2.14/ports/sysdeps/mips/fpu_control.h
diff --git a/packages/glibc-ports/2.15/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.15/090-Fix-ARM-build-with-GCC-trunk.patch
index 1a632fe..259b285 100644
--- a/packages/glibc-ports/2.15/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.15/090-Fix-ARM-build-with-GCC-trunk.patch
@@ -20,8 +20,8 @@ Tested that this fixes the build for ARM.
  sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c | 3 ++-
  sysdeps/unix/sysv/linux/arm/unwind-resume.c       | 3 ++-
  3 files changed, 11 insertions(+), 2 deletions(-)
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
+--- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
++++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
 
@@ -35,8 +35,8 @@ Tested that this fixes the build for ARM.
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
 diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
 index bff3e2b..1f1eb71 100644
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
+--- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
++++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
@@ -47,8 +47,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (int, _Unwind_Action, _Unwind_Exception_Class, struct _Unwind_Exception *,
     struct _Unwind_Context *);
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-forcedunwind.c
 @@ -23,7 +23,8 @@
  #include <pthreadP.h>
 
@@ -59,8 +59,8 @@ index bff3e2b..1f1eb71 100644
  static _Unwind_Reason_Code (*libgcc_s_personality)
    (_Unwind_State, struct _Unwind_Exception *, struct _Unwind_Context *);
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
---- a/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
+--- a/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
++++ b/sysdeps/unix/sysv/linux/arm/eabi/nptl/unwind-resume.c
 @@ -21,7 +21,8 @@
  #include <stdio.h>
  #include <unwind.h>
diff --git a/packages/glibc-ports/2.15/091-libmemusage-link-failure.patch b/packages/glibc-ports/2.15/091-libmemusage-link-failure.patch
index 9f9887c..23d8813 100644
--- a/packages/glibc-ports/2.15/091-libmemusage-link-failure.patch
+++ b/packages/glibc-ports/2.15/091-libmemusage-link-failure.patch
@@ -4,10 +4,10 @@ Date:   Fri Jan 6 20:14:44 2012 +0000
 
     Add ARM dependency of libmemusage.so on libc_nonshared.a.
 
-diff --git a/ports/sysdeps/arm/Makefile b/ports/sysdeps/arm/Makefile
+diff --git a/sysdeps/arm/Makefile b/sysdeps/arm/Makefile
 index 5651161..1a88430 100644
---- a/ports/sysdeps/arm/Makefile
-+++ b/ports/sysdeps/arm/Makefile
+--- a/sysdeps/arm/Makefile
++++ b/sysdeps/arm/Makefile
 @@ -7,3 +7,8 @@ endif
  ifeq ($(subdir),csu)
  gen-as-const-headers += tlsdesc.sym
diff --git a/packages/glibc-ports/2.15/330-m68k-sys-user.patch b/packages/glibc-ports/2.15/330-m68k-sys-user.patch
index faee18f..388bc62 100644
--- a/packages/glibc-ports/2.15/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.15/330-m68k-sys-user.patch
@@ -1,8 +1,8 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+diff -durN glibc-ports-2.15.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/user.h
+--- glibc-ports-2.15.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
@@ -94,4 +94,3 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/m68k/sys/use
  /* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
  
-diff -durN glibc-2.15.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.15/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
diff --git a/packages/glibc-ports/2.15/440-alpha-cache-shape.patch b/packages/glibc-ports/2.15/440-alpha-cache-shape.patch
index b3158da..a9c9db0 100644
--- a/packages/glibc-ports/2.15/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.15/440-alpha-cache-shape.patch
@@ -5,9 +5,9 @@ duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
 is both shared/static, there is no point in hooking dl-support anymore, so we
 can punt it.
 
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
+diff -durN glibc-ports-2.15.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/dl-support.c
+--- glibc-ports-2.15.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
 @@ -1,2 +1,1 @@
 -#include "dl-auxv.h"
  #include <elf/dl-support.c>
diff --git a/packages/glibc-ports/2.15/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.15/460-alpha-fix-gcc-4.1-warnings.patch
index a54d823..05a197e 100644
--- a/packages/glibc-ports/2.15/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.15/460-alpha-fix-gcc-4.1-warnings.patch
@@ -16,9 +16,9 @@ I cannot really think of anything better than
  ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
+diff -durN glibc-ports-2.15.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm.c
+--- glibc-ports-2.15.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
 @@ -178,13 +178,13 @@
  static inline void
  stb_mb(unsigned char val, unsigned long addr)
@@ -53,4 +53,3 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/alpha/ioperm
    return r;
  }
  
-diff -durN glibc-2.15.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.15/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
diff --git a/packages/glibc-ports/2.15/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.15/530-alpha-fix-rtld-fPIC.patch
index 800a789..8f9ce0d 100644
--- a/packages/glibc-ports/2.15/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.15/530-alpha-fix-rtld-fPIC.patch
@@ -5,9 +5,9 @@
  ports/sysdeps/alpha/Makefile |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/alpha/Makefile glibc-2.15/glibc-ports-2.15/sysdeps/alpha/Makefile
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
+diff -durN glibc-ports-2.15.orig/sysdeps/alpha/Makefile glibc-ports-2.15/sysdeps/alpha/Makefile
+--- glibc-ports-2.15.orig/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.15/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
 @@ -35,7 +35,8 @@
  
  ifeq ($(subdir),elf)
@@ -18,4 +18,3 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/alpha/Makefile glibc-2.15/gl
  endif
  
  # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.15.orig/ports/sysdeps/alpha/Makefile glibc-2.15/ports/sysdeps/alpha/Makefile
diff --git a/packages/glibc-ports/2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch b/packages/glibc-ports/2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
index 8a05574..427fb03 100644
--- a/packages/glibc-ports/2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
+++ b/packages/glibc-ports/2.15/570-arm-cirrus-ep93xx-maverick-crunch-fpu.patch
@@ -1,9 +1,9 @@
 http://yann.poupet.free.fr/ep93xx/
 Add support for the Maverick Crunch FPU on Cirrus EP93XX processor series
 
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/bits/endian.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/bits/endian.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.15.orig/sysdeps/arm/bits/endian.h glibc-ports-2.15/sysdeps/arm/bits/endian.h
+--- glibc-ports-2.15.orig/sysdeps/arm/bits/endian.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.15/sysdeps/arm/bits/endian.h	2009-11-13 00:51:22.000000000 +0100
 @@ -12,7 +12,7 @@
  /* FPA floating point units are always big-endian, irrespective of the
     CPU endianness.  VFP floating point units use the same endianness
@@ -13,9 +13,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/bits/endian.h glibc-2.15
  #define __FLOAT_WORD_ORDER __BYTE_ORDER
  #else
  #define __FLOAT_WORD_ORDER __BIG_ENDIAN
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/__longjmp.S glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S
+--- glibc-ports-2.15.orig/sysdeps/arm/fpu/__longjmp.S	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S	2009-11-13 00:51:22.000000000 +0100
 @@ -30,7 +30,33 @@
  	movs	r0, r1		/* get the return value in place */
  	moveq	r0, #1		/* can't let setjmp() return zero! */
@@ -50,9 +50,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/__longjmp.S glibc-2.
  
  	LOADREGS(ia, ip, {v1-v6, sl, fp, sp, pc})
  END (__longjmp)
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/bits/fenv.h glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h
+--- glibc-ports-2.15.orig/sysdeps/arm/fpu/bits/fenv.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h	2009-11-13 00:51:22.000000000 +0100
 @@ -20,6 +20,45 @@
  # error "Never use <bits/fenv.h> directly; include <fenv.h> instead."
  #endif
@@ -108,9 +108,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/bits/fenv.h glibc-2.
  /* Type representing exception flags. */
  typedef unsigned long int fexcept_t;
  
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/bits/setjmp.h glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h
+--- glibc-ports-2.15.orig/sysdeps/arm/fpu/bits/setjmp.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h	2009-11-13 00:51:22.000000000 +0100
 @@ -28,7 +28,11 @@
  #ifndef _ASM
  /* Jump buffer contains v1-v6, sl, fp, sp and pc.  Other registers are not
@@ -123,9 +123,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/bits/setjmp.h glibc-
 +#endif
  
  #endif
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/fegetround.c glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c
+--- glibc-ports-2.15.orig/sysdeps/arm/fpu/fegetround.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c	2009-11-13 00:51:22.000000000 +0100
 @@ -18,9 +18,21 @@
     02111-1307 USA.  */
  
@@ -148,9 +148,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fegetround.c glibc-2
 +
 +#endif
  }
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/fesetround.c glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c
+--- glibc-ports-2.15.orig/sysdeps/arm/fpu/fesetround.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c	2009-11-13 00:51:22.000000000 +0100
 @@ -18,12 +18,28 @@
     02111-1307 USA.  */
  
@@ -180,9 +180,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fesetround.c glibc-2
  }
  
  libm_hidden_def (fesetround)
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/fpu_control.h glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h
+--- glibc-ports-2.15.orig/sysdeps/arm/fpu/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h	2009-11-13 00:51:22.000000000 +0100
 @@ -1,5 +1,6 @@
  /* FPU control word definitions.  ARM version.
 -   Copyright (C) 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
@@ -278,9 +278,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/fpu_control.h glibc-
 +#endif
 +
  #endif /* _FPU_CONTROL_H */
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h
+--- glibc-ports-2.15.orig/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h	2009-11-13 00:51:22.000000000 +0100
 @@ -17,4 +17,8 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -290,9 +290,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/jmpbuf-offsets.h gli
 +#else
  #define __JMP_BUF_SP		20
 +#endif
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.15.orig/sysdeps/arm/fpu/setjmp.S glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S
+--- glibc-ports-2.15.orig/sysdeps/arm/fpu/setjmp.S	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S	2009-11-13 00:51:22.000000000 +0100
 @@ -24,11 +24,41 @@
  
  ENTRY (__sigsetjmp)
@@ -335,9 +335,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/fpu/setjmp.S glibc-2.15/
  
  	/* Make a tail call to __sigjmp_save; it takes the same args.  */
  	B	PLTJMP(C_SYMBOL_NAME(__sigjmp_save))
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/gccframe.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/gccframe.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.15.orig/sysdeps/arm/gccframe.h glibc-ports-2.15/sysdeps/arm/gccframe.h
+--- glibc-ports-2.15.orig/sysdeps/arm/gccframe.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.15/sysdeps/arm/gccframe.h	2009-11-13 00:51:22.000000000 +0100
 @@ -17,6 +17,10 @@
     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
     02111-1307 USA.  */
@@ -349,9 +349,9 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/gccframe.h glibc-2.15/gl
 +#endif
  
  #include <sysdeps/generic/gccframe.h>
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/gmp-mparam.h glibc-2.15/glibc-ports-2.15/sysdeps/arm/gmp-mparam.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
+diff -durN glibc-ports-2.15.orig/sysdeps/arm/gmp-mparam.h glibc-ports-2.15/sysdeps/arm/gmp-mparam.h
+--- glibc-ports-2.15.orig/sysdeps/arm/gmp-mparam.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.15/sysdeps/arm/gmp-mparam.h	2009-11-13 00:51:22.000000000 +0100
 @@ -29,7 +29,7 @@
  #if defined(__ARMEB__)
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
@@ -361,14 +361,3 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/arm/gmp-mparam.h glibc-2.15/
  # define IEEE_DOUBLE_MIXED_ENDIAN 0
  # define IEEE_DOUBLE_BIG_ENDIAN 0
  #else
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/bits/endian.h glibc-2.15/ports/sysdeps/arm/bits/endian.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/__longjmp.S glibc-2.15/ports/sysdeps/arm/fpu/__longjmp.S
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/bits/fenv.h glibc-2.15/ports/sysdeps/arm/fpu/bits/fenv.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/bits/setjmp.h glibc-2.15/ports/sysdeps/arm/fpu/bits/setjmp.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/fegetround.c glibc-2.15/ports/sysdeps/arm/fpu/fegetround.c
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/fesetround.c glibc-2.15/ports/sysdeps/arm/fpu/fesetround.c
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/fpu_control.h glibc-2.15/ports/sysdeps/arm/fpu/fpu_control.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/jmpbuf-offsets.h glibc-2.15/ports/sysdeps/arm/fpu/jmpbuf-offsets.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/fpu/setjmp.S glibc-2.15/ports/sysdeps/arm/fpu/setjmp.S
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/gccframe.h glibc-2.15/ports/sysdeps/arm/gccframe.h
-diff -durN glibc-2.15.orig/ports/sysdeps/arm/gmp-mparam.h glibc-2.15/ports/sysdeps/arm/gmp-mparam.h
diff --git a/packages/glibc-ports/2.15/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.15/580-nptl-lowlevellock.patch
index a39e463..8a841be 100644
--- a/packages/glibc-ports/2.15/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.15/580-nptl-lowlevellock.patch
@@ -9,9 +9,9 @@ In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
 
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
+diff -durN glibc-ports-2.15.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+--- glibc-ports-2.15.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
 @@ -25,6 +25,7 @@
  #include <atomic.h>
  #include <sysdep.h>
@@ -20,4 +20,3 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/unix/sysv/linux/arm/nptl/low
  
  #define FUTEX_WAIT		0
  #define FUTEX_WAKE		1
-diff -durN glibc-2.15.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.15/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
diff --git a/packages/glibc-ports/2.15/610-fpu-cw-mips.patch b/packages/glibc-ports/2.15/610-fpu-cw-mips.patch
index 8692a1f..388e4d6 100644
--- a/packages/glibc-ports/2.15/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.15/610-fpu-cw-mips.patch
@@ -1,8 +1,8 @@
 http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
 
-diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/mips/fpu_control.h glibc-2.15/glibc-ports-2.15/sysdeps/mips/fpu_control.h
---- glibc-2.15.orig/glibc-ports-2.15/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.15/glibc-ports-2.15/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
+diff -durN glibc-ports-2.15.orig/sysdeps/mips/fpu_control.h glibc-ports-2.15/sysdeps/mips/fpu_control.h
+--- glibc-ports-2.15.orig/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.15/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
 @@ -86,7 +86,7 @@
  #define _FPU_RC_UP      0x2
  #define _FPU_RC_DOWN    0x3
@@ -12,4 +12,3 @@ diff -durN glibc-2.15.orig/glibc-ports-2.15/sysdeps/mips/fpu_control.h glibc-2.1
  
  
  /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.15.orig/ports/sysdeps/mips/fpu_control.h glibc-2.15/ports/sysdeps/mips/fpu_control.h
diff --git a/packages/glibc-ports/2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch b/packages/glibc-ports/2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch
index 59f95aa..1f08ba1 100644
--- a/packages/glibc-ports/2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch
+++ b/packages/glibc-ports/2.16.0/090-Fix-ARM-build-with-GCC-trunk.patch
@@ -23,8 +23,8 @@ Tested that this fixes the build for ARM.
 
 diff --git a/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c b/sysdeps/unix/sysv/linux/arm/unwind-forcedunwind.c
 index 6ccd9b4..660d148 100644
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
+--- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
++++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-forcedunwind.c
 @@ -22,7 +22,8 @@
  #include <pthreadP.h>
  
@@ -37,8 +37,8 @@ index 6ccd9b4..660d148 100644
  static _Unwind_Reason_Code (*libgcc_s_forcedunwind)
 diff --git a/sysdeps/unix/sysv/linux/arm/unwind-resume.c b/sysdeps/unix/sysv/linux/arm/unwind-resume.c
 index bff3e2b..1f1eb71 100644
---- a/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
-+++ b/ports/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
+--- a/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
++++ b/sysdeps/unix/sysv/linux/arm/nptl/unwind-resume.c
 @@ -20,7 +20,8 @@
  #include <stdio.h>
  #include <unwind.h>
diff --git a/packages/glibc-ports/2.16.0/330-m68k-sys-user.patch b/packages/glibc-ports/2.16.0/330-m68k-sys-user.patch
index f113996..932d917 100644
--- a/packages/glibc-ports/2.16.0/330-m68k-sys-user.patch
+++ b/packages/glibc-ports/2.16.0/330-m68k-sys-user.patch
@@ -1,8 +1,8 @@
 copied from kernel as it is sanitized now
 
-diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
+diff -durN glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-ports-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h
+--- glibc-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-2.16.0/sysdeps/unix/sysv/linux/m68k/sys/user.h	2009-11-13 00:50:31.000000000 +0100
 @@ -1,3 +1,90 @@
 +#ifndef _SYS_USER_H
 +#define _SYS_USER_H
@@ -94,4 +94,3 @@ diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/m68k/sys
  /* Copyright (C) 2008, 2010 Free Software Foundation, Inc.
     This file is part of the GNU C Library.
  
-diff -durN glibc-2.16.0.orig/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h glibc-2.16.0/ports/sysdeps/unix/sysv/linux/m68k/sys/user.h
diff --git a/packages/glibc-ports/2.16.0/440-alpha-cache-shape.patch b/packages/glibc-ports/2.16.0/440-alpha-cache-shape.patch
index 5b1a298..7612872 100644
--- a/packages/glibc-ports/2.16.0/440-alpha-cache-shape.patch
+++ b/packages/glibc-ports/2.16.0/440-alpha-cache-shape.patch
@@ -5,9 +5,9 @@ duplication for static builds with dl-sysdep and dl-support.  since dl-sysdep
 is both shared/static, there is no point in hooking dl-support anymore, so we
 can punt it.
 
-diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
+diff -durN glibc-2.16.0.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c glibc-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c
+--- glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/dl-support.c	2009-11-13 00:50:53.000000000 +0100
 @@ -1,2 +1,1 @@
 -#include "dl-auxv.h"
  #include <elf/dl-support.c>
diff --git a/packages/glibc-ports/2.16.0/460-alpha-fix-gcc-4.1-warnings.patch b/packages/glibc-ports/2.16.0/460-alpha-fix-gcc-4.1-warnings.patch
index f2ff04f..96f1646 100644
--- a/packages/glibc-ports/2.16.0/460-alpha-fix-gcc-4.1-warnings.patch
+++ b/packages/glibc-ports/2.16.0/460-alpha-fix-gcc-4.1-warnings.patch
@@ -16,9 +16,9 @@ I cannot really think of anything better than
  ports/sysdeps/unix/sysv/linux/alpha/ioperm.c |    8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)
 
-diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
+diff -durN glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c
+--- glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/ioperm.c	2009-11-13 00:50:57.000000000 +0100
 @@ -178,13 +178,13 @@
  static inline void
  stb_mb(unsigned char val, unsigned long addr)
@@ -53,4 +53,3 @@ diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/alpha/io
    return r;
  }
  
-diff -durN glibc-2.16.0.orig/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c glibc-2.16.0/ports/sysdeps/unix/sysv/linux/alpha/ioperm.c
diff --git a/packages/glibc-ports/2.16.0/530-alpha-fix-rtld-fPIC.patch b/packages/glibc-ports/2.16.0/530-alpha-fix-rtld-fPIC.patch
index 42faaa5..db9c890 100644
--- a/packages/glibc-ports/2.16.0/530-alpha-fix-rtld-fPIC.patch
+++ b/packages/glibc-ports/2.16.0/530-alpha-fix-rtld-fPIC.patch
@@ -5,9 +5,9 @@
  ports/sysdeps/alpha/Makefile |    3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/alpha/Makefile glibc-2.16.0/glibc-ports-2.16.0/sysdeps/alpha/Makefile
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
+diff -durN glibc-ports-2.16.0.orig/sysdeps/alpha/Makefile glibc-ports-2.16.0/sysdeps/alpha/Makefile
+--- glibc-ports-2.16.0.orig/sysdeps/alpha/Makefile	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.16.0/sysdeps/alpha/Makefile	2009-11-13 00:51:13.000000000 +0100
 @@ -35,7 +35,8 @@
  
  ifeq ($(subdir),elf)
@@ -18,4 +18,3 @@ diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/alpha/Makefile glibc-2.1
  endif
  
  # Build everything with full IEEE math support, and with dynamic rounding;
-diff -durN glibc-2.16.0.orig/ports/sysdeps/alpha/Makefile glibc-2.16.0/ports/sysdeps/alpha/Makefile
diff --git a/packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch b/packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch
index 185331c..a1c6c7a 100644
--- a/packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch
+++ b/packages/glibc-ports/2.16.0/580-nptl-lowlevellock.patch
@@ -9,9 +9,9 @@ In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: for each function it appears in.)
 ../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:31: error: 'header' undeclared (first use in this function)
 
-diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
+diff -durN glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+--- glibc-ports-2.16.0.orig/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h	2009-11-13 00:51:23.000000000 +0100
 @@ -25,6 +25,7 @@
  #include <atomic.h>
  #include <sysdep.h>
@@ -20,4 +20,3 @@ diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/unix/sysv/linux/arm/nptl
  
  #define FUTEX_WAIT		0
  #define FUTEX_WAKE		1
-diff -durN glibc-2.16.0.orig/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h glibc-2.16.0/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
diff --git a/packages/glibc-ports/2.16.0/610-fpu-cw-mips.patch b/packages/glibc-ports/2.16.0/610-fpu-cw-mips.patch
index 0c0daf3..ef42c8f 100644
--- a/packages/glibc-ports/2.16.0/610-fpu-cw-mips.patch
+++ b/packages/glibc-ports/2.16.0/610-fpu-cw-mips.patch
@@ -1,8 +1,8 @@
 http://sourceware.org/ml/libc-alpha/2002-10/msg00392.html
 
-diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/mips/fpu_control.h glibc-2.16.0/glibc-ports-2.16.0/sysdeps/mips/fpu_control.h
---- glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
-+++ glibc-2.16.0/glibc-ports-2.16.0/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
+diff -durN glibc-ports-2.16.0.orig/sysdeps/mips/fpu_control.h glibc-ports-2.16.0/sysdeps/mips/fpu_control.h
+--- glibc-ports-2.16.0.orig/sysdeps/mips/fpu_control.h	2009-05-16 10:36:20.000000000 +0200
++++ glibc-ports-2.16.0/sysdeps/mips/fpu_control.h	2009-11-13 00:51:31.000000000 +0100
 @@ -86,7 +86,7 @@
  #define _FPU_RC_UP      0x2
  #define _FPU_RC_DOWN    0x3
@@ -12,4 +12,3 @@ diff -durN glibc-2.16.0.orig/glibc-ports-2.16.0/sysdeps/mips/fpu_control.h glibc
  
  
  /* The fdlibm code requires strict IEEE double precision arithmetic,
-diff -durN glibc-2.16.0.orig/ports/sysdeps/mips/fpu_control.h glibc-2.16.0/ports/sysdeps/mips/fpu_control.h
diff --git a/packages/glibc-ports/package.desc b/packages/glibc-ports/package.desc
index 566e10a..f273120 100644
--- a/packages/glibc-ports/package.desc
+++ b/packages/glibc-ports/package.desc
@@ -2,7 +2,7 @@
 # the ports were an external add-on, it used a separate repository
 # and separate tarballs.
 repository='git git://sourceware.org/git/glibc-ports.git'
-mirrors='$(CT_Mirrors GNU glibc) $(CT_Mirrors sourceware glibc/releases)'
+mirrors='$(CT_Mirrors GNU glibc)'
 
 # Version of this package must be the same as the glibc's
 versionlocked='glibc'
diff --git a/packages/glibc-ports/2.12.1/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.12.1/100-respect-env-CPPFLAGS.patch
index ed022be..ed022be 100644
--- a/packages/glibc-ports/2.12.1/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc/2.12.1/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc-ports/2.12.1/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.12.1/120-i386-x86_64-revert-clone-cfi.patch
index 95f5ace..95f5ace 100644
--- a/packages/glibc-ports/2.12.1/120-i386-x86_64-revert-clone-cfi.patch
+++ b/packages/glibc/2.12.1/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc-ports/2.12.1/140-disable-ldconfig.patch b/packages/glibc/2.12.1/140-disable-ldconfig.patch
index 43330b8..43330b8 100644
--- a/packages/glibc-ports/2.12.1/140-disable-ldconfig.patch
+++ b/packages/glibc/2.12.1/140-disable-ldconfig.patch
diff --git a/packages/glibc-ports/2.12.1/150-queue-header-updates.patch b/packages/glibc/2.12.1/150-queue-header-updates.patch
index fe625e1..fe625e1 100644
--- a/packages/glibc-ports/2.12.1/150-queue-header-updates.patch
+++ b/packages/glibc/2.12.1/150-queue-header-updates.patch
diff --git a/packages/glibc-ports/2.12.1/160-manual-no-perl.patch b/packages/glibc/2.12.1/160-manual-no-perl.patch
index 2eb5414..2eb5414 100644
--- a/packages/glibc-ports/2.12.1/160-manual-no-perl.patch
+++ b/packages/glibc/2.12.1/160-manual-no-perl.patch
diff --git a/packages/glibc-ports/2.12.1/170-localedef-fix-trampoline.patch b/packages/glibc/2.12.1/170-localedef-fix-trampoline.patch
index fb0881d..fb0881d 100644
--- a/packages/glibc-ports/2.12.1/170-localedef-fix-trampoline.patch
+++ b/packages/glibc/2.12.1/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc-ports/2.12.1/180-resolv-dynamic.patch b/packages/glibc/2.12.1/180-resolv-dynamic.patch
index 8f74a53..8f74a53 100644
--- a/packages/glibc-ports/2.12.1/180-resolv-dynamic.patch
+++ b/packages/glibc/2.12.1/180-resolv-dynamic.patch
diff --git a/packages/glibc-ports/2.12.1/190-localedef-mmap.patch b/packages/glibc/2.12.1/190-localedef-mmap.patch
index b24ed80..b24ed80 100644
--- a/packages/glibc-ports/2.12.1/190-localedef-mmap.patch
+++ b/packages/glibc/2.12.1/190-localedef-mmap.patch
diff --git a/packages/glibc-ports/2.12.1/200-fadvise64_64.patch b/packages/glibc/2.12.1/200-fadvise64_64.patch
index a9f10cd..a9f10cd 100644
--- a/packages/glibc-ports/2.12.1/200-fadvise64_64.patch
+++ b/packages/glibc/2.12.1/200-fadvise64_64.patch
diff --git a/packages/glibc-ports/2.12.1/220-section-comments.patch b/packages/glibc/2.12.1/220-section-comments.patch
index 4d35535..4d35535 100644
--- a/packages/glibc-ports/2.12.1/220-section-comments.patch
+++ b/packages/glibc/2.12.1/220-section-comments.patch
diff --git a/packages/glibc-ports/2.12.1/230-no-inline-gmon.patch b/packages/glibc/2.12.1/230-no-inline-gmon.patch
index 594fb79..594fb79 100644
--- a/packages/glibc-ports/2.12.1/230-no-inline-gmon.patch
+++ b/packages/glibc/2.12.1/230-no-inline-gmon.patch
diff --git a/packages/glibc-ports/2.12.1/240-check_native-headers.patch b/packages/glibc/2.12.1/240-check_native-headers.patch
index de0cb5b..de0cb5b 100644
--- a/packages/glibc-ports/2.12.1/240-check_native-headers.patch
+++ b/packages/glibc/2.12.1/240-check_native-headers.patch
diff --git a/packages/glibc-ports/2.12.1/250-fix-pr631.patch b/packages/glibc/2.12.1/250-fix-pr631.patch
index af5b347..af5b347 100644
--- a/packages/glibc-ports/2.12.1/250-fix-pr631.patch
+++ b/packages/glibc/2.12.1/250-fix-pr631.patch
diff --git a/packages/glibc-ports/2.12.1/260-assume-pipe2.patch b/packages/glibc/2.12.1/260-assume-pipe2.patch
index b84f882..b84f882 100644
--- a/packages/glibc-ports/2.12.1/260-assume-pipe2.patch
+++ b/packages/glibc/2.12.1/260-assume-pipe2.patch
diff --git a/packages/glibc-ports/2.12.1/270-china.patch b/packages/glibc/2.12.1/270-china.patch
index 4cde1cf..4cde1cf 100644
--- a/packages/glibc-ports/2.12.1/270-china.patch
+++ b/packages/glibc/2.12.1/270-china.patch
diff --git a/packages/glibc-ports/2.12.1/280-new-valencian-locale.patch b/packages/glibc/2.12.1/280-new-valencian-locale.patch
index 6b46b44..6b46b44 100644
--- a/packages/glibc-ports/2.12.1/280-new-valencian-locale.patch
+++ b/packages/glibc/2.12.1/280-new-valencian-locale.patch
diff --git a/packages/glibc-ports/2.12.1/300-nscd-one-fork.patch b/packages/glibc/2.12.1/300-nscd-one-fork.patch
index 27eae51..27eae51 100644
--- a/packages/glibc-ports/2.12.1/300-nscd-one-fork.patch
+++ b/packages/glibc/2.12.1/300-nscd-one-fork.patch
diff --git a/packages/glibc-ports/2.12.1/310-hppa-nptl-carlos.patch b/packages/glibc/2.12.1/310-hppa-nptl-carlos.patch
index 947bb58..947bb58 100644
--- a/packages/glibc-ports/2.12.1/310-hppa-nptl-carlos.patch
+++ b/packages/glibc/2.12.1/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc-ports/2.12.1/340-dl_execstack-PaX-support.patch b/packages/glibc/2.12.1/340-dl_execstack-PaX-support.patch
index afdb39c..afdb39c 100644
--- a/packages/glibc-ports/2.12.1/340-dl_execstack-PaX-support.patch
+++ b/packages/glibc/2.12.1/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc-ports/2.12.1/350-pre20040117-pt_pax.patch b/packages/glibc/2.12.1/350-pre20040117-pt_pax.patch
index 3f03169..3f03169 100644
--- a/packages/glibc-ports/2.12.1/350-pre20040117-pt_pax.patch
+++ b/packages/glibc/2.12.1/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc-ports/2.12.1/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.12.1/360-tests-sandbox-libdl-paths.patch
index a847cdb..a847cdb 100644
--- a/packages/glibc-ports/2.12.1/360-tests-sandbox-libdl-paths.patch
+++ b/packages/glibc/2.12.1/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc-ports/2.12.1/370-fnmatch.patch b/packages/glibc/2.12.1/370-fnmatch.patch
index f345b35..f345b35 100644
--- a/packages/glibc-ports/2.12.1/370-fnmatch.patch
+++ b/packages/glibc/2.12.1/370-fnmatch.patch
diff --git a/packages/glibc-ports/2.12.1/380-dont-build-timezone.patch b/packages/glibc/2.12.1/380-dont-build-timezone.patch
index 0a30436..0a30436 100644
--- a/packages/glibc-ports/2.12.1/380-dont-build-timezone.patch
+++ b/packages/glibc/2.12.1/380-dont-build-timezone.patch
diff --git a/packages/glibc-ports/2.12.1/400-alpha-xstat.patch b/packages/glibc/2.12.1/400-alpha-xstat.patch
index 97bea98..97bea98 100644
--- a/packages/glibc-ports/2.12.1/400-alpha-xstat.patch
+++ b/packages/glibc/2.12.1/400-alpha-xstat.patch
diff --git a/packages/glibc-ports/2.12.1/430-alpha-creat.patch b/packages/glibc/2.12.1/430-alpha-creat.patch
index bfb72d0..bfb72d0 100644
--- a/packages/glibc-ports/2.12.1/430-alpha-creat.patch
+++ b/packages/glibc/2.12.1/430-alpha-creat.patch
diff --git a/packages/glibc-ports/2.12.1/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.12.1/490-alpha_alpha-add-fdatasync-support.patch
index 9d35ebd..9d35ebd 100644
--- a/packages/glibc-ports/2.12.1/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc/2.12.1/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc-ports/2.12.1/560-ppc-atomic.patch b/packages/glibc/2.12.1/560-ppc-atomic.patch
index 679ef18..679ef18 100644
--- a/packages/glibc-ports/2.12.1/560-ppc-atomic.patch
+++ b/packages/glibc/2.12.1/560-ppc-atomic.patch
diff --git a/packages/glibc-ports/2.12.1/630-mips_shn_undef-hack.patch b/packages/glibc/2.12.1/630-mips_shn_undef-hack.patch
index f6a5eb6..f6a5eb6 100644
--- a/packages/glibc-ports/2.12.1/630-mips_shn_undef-hack.patch
+++ b/packages/glibc/2.12.1/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc-ports/2.12.1/640-alpha-atfcts.patch b/packages/glibc/2.12.1/640-alpha-atfcts.patch
index 90a9d0d..90a9d0d 100644
--- a/packages/glibc-ports/2.12.1/640-alpha-atfcts.patch
+++ b/packages/glibc/2.12.1/640-alpha-atfcts.patch
diff --git a/packages/glibc-ports/2.16.0/650-syslog.patch b/packages/glibc/2.12.1/650-syslog.patch
index c20cafc..c20cafc 100644
--- a/packages/glibc-ports/2.16.0/650-syslog.patch
+++ b/packages/glibc/2.12.1/650-syslog.patch
diff --git a/packages/glibc-ports/2.16.0/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.12.1/660-debug-readlink_chk-readklinkat_chk.patch
index a5a7052..a5a7052 100644
--- a/packages/glibc-ports/2.16.0/660-debug-readlink_chk-readklinkat_chk.patch
+++ b/packages/glibc/2.12.1/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/glibc-ports/2.15/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.13/100-respect-env-CPPFLAGS.patch
index 3798cb2..3798cb2 100644
--- a/packages/glibc-ports/2.15/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc/2.13/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc-ports/2.16.0/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.13/120-i386-x86_64-revert-clone-cfi.patch
index c7f6182..c7f6182 100644
--- a/packages/glibc-ports/2.16.0/120-i386-x86_64-revert-clone-cfi.patch
+++ b/packages/glibc/2.13/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc-ports/2.16.0/140-disable-ldconfig.patch b/packages/glibc/2.13/140-disable-ldconfig.patch
index 378e1df..378e1df 100644
--- a/packages/glibc-ports/2.16.0/140-disable-ldconfig.patch
+++ b/packages/glibc/2.13/140-disable-ldconfig.patch
diff --git a/packages/glibc-ports/2.16.0/150-queue-header-updates.patch b/packages/glibc/2.13/150-queue-header-updates.patch
index 7cbe70e..7cbe70e 100644
--- a/packages/glibc-ports/2.16.0/150-queue-header-updates.patch
+++ b/packages/glibc/2.13/150-queue-header-updates.patch
diff --git a/packages/glibc-ports/2.15/160-manual-no-perl.patch b/packages/glibc/2.13/160-manual-no-perl.patch
index 5e2b807..5e2b807 100644
--- a/packages/glibc-ports/2.15/160-manual-no-perl.patch
+++ b/packages/glibc/2.13/160-manual-no-perl.patch
diff --git a/packages/glibc-ports/2.16.0/170-localedef-fix-trampoline.patch b/packages/glibc/2.13/170-localedef-fix-trampoline.patch
index 3cc6559..3cc6559 100644
--- a/packages/glibc-ports/2.16.0/170-localedef-fix-trampoline.patch
+++ b/packages/glibc/2.13/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc-ports/2.16.0/180-resolv-dynamic.patch b/packages/glibc/2.13/180-resolv-dynamic.patch
index e916bce..e916bce 100644
--- a/packages/glibc-ports/2.16.0/180-resolv-dynamic.patch
+++ b/packages/glibc/2.13/180-resolv-dynamic.patch
diff --git a/packages/glibc-ports/2.14/190-localedef-mmap.patch b/packages/glibc/2.13/190-localedef-mmap.patch
index f3914cd..f3914cd 100644
--- a/packages/glibc-ports/2.14/190-localedef-mmap.patch
+++ b/packages/glibc/2.13/190-localedef-mmap.patch
diff --git a/packages/glibc-ports/2.16.0/200-fadvise64_64.patch b/packages/glibc/2.13/200-fadvise64_64.patch
index 71bca38..71bca38 100644
--- a/packages/glibc-ports/2.16.0/200-fadvise64_64.patch
+++ b/packages/glibc/2.13/200-fadvise64_64.patch
diff --git a/packages/glibc-ports/2.15/220-section-comments.patch b/packages/glibc/2.13/220-section-comments.patch
index d717829..d717829 100644
--- a/packages/glibc-ports/2.15/220-section-comments.patch
+++ b/packages/glibc/2.13/220-section-comments.patch
diff --git a/packages/glibc-ports/2.15/230-no-inline-gmon.patch b/packages/glibc/2.13/230-no-inline-gmon.patch
index fa33c2b..fa33c2b 100644
--- a/packages/glibc-ports/2.15/230-no-inline-gmon.patch
+++ b/packages/glibc/2.13/230-no-inline-gmon.patch
diff --git a/packages/glibc-ports/2.14/240-check_native-headers.patch b/packages/glibc/2.13/240-check_native-headers.patch
index c936f71..c936f71 100644
--- a/packages/glibc-ports/2.14/240-check_native-headers.patch
+++ b/packages/glibc/2.13/240-check_native-headers.patch
diff --git a/packages/glibc-ports/2.13/250-fix-pr631.patch b/packages/glibc/2.13/250-fix-pr631.patch
index a48912e..a48912e 100644
--- a/packages/glibc-ports/2.13/250-fix-pr631.patch
+++ b/packages/glibc/2.13/250-fix-pr631.patch
diff --git a/packages/glibc-ports/2.15/260-assume-pipe2.patch b/packages/glibc/2.13/260-assume-pipe2.patch
index 42e8f4e..42e8f4e 100644
--- a/packages/glibc-ports/2.15/260-assume-pipe2.patch
+++ b/packages/glibc/2.13/260-assume-pipe2.patch
diff --git a/packages/glibc-ports/2.16.0/270-china.patch b/packages/glibc/2.13/270-china.patch
index 41d7759..41d7759 100644
--- a/packages/glibc-ports/2.16.0/270-china.patch
+++ b/packages/glibc/2.13/270-china.patch
diff --git a/packages/glibc-ports/2.16.0/280-new-valencian-locale.patch b/packages/glibc/2.13/280-new-valencian-locale.patch
index 4cdd108..4cdd108 100644
--- a/packages/glibc-ports/2.16.0/280-new-valencian-locale.patch
+++ b/packages/glibc/2.13/280-new-valencian-locale.patch
diff --git a/packages/glibc-ports/2.15/300-nscd-one-fork.patch b/packages/glibc/2.13/300-nscd-one-fork.patch
index adc9b3f..adc9b3f 100644
--- a/packages/glibc-ports/2.15/300-nscd-one-fork.patch
+++ b/packages/glibc/2.13/300-nscd-one-fork.patch
diff --git a/packages/glibc-ports/2.15/310-hppa-nptl-carlos.patch b/packages/glibc/2.13/310-hppa-nptl-carlos.patch
index 4c028b2..4c028b2 100644
--- a/packages/glibc-ports/2.15/310-hppa-nptl-carlos.patch
+++ b/packages/glibc/2.13/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc-ports/2.16.0/340-dl_execstack-PaX-support.patch b/packages/glibc/2.13/340-dl_execstack-PaX-support.patch
index 2402af0..2402af0 100644
--- a/packages/glibc-ports/2.16.0/340-dl_execstack-PaX-support.patch
+++ b/packages/glibc/2.13/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc-ports/2.16.0/350-pre20040117-pt_pax.patch b/packages/glibc/2.13/350-pre20040117-pt_pax.patch
index f8f6b83..f8f6b83 100644
--- a/packages/glibc-ports/2.16.0/350-pre20040117-pt_pax.patch
+++ b/packages/glibc/2.13/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc-ports/2.16.0/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.13/360-tests-sandbox-libdl-paths.patch
index 9f78c52..9f78c52 100644
--- a/packages/glibc-ports/2.16.0/360-tests-sandbox-libdl-paths.patch
+++ b/packages/glibc/2.13/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc-ports/2.16.0/380-dont-build-timezone.patch b/packages/glibc/2.13/380-dont-build-timezone.patch
index 11c358e..11c358e 100644
--- a/packages/glibc-ports/2.16.0/380-dont-build-timezone.patch
+++ b/packages/glibc/2.13/380-dont-build-timezone.patch
diff --git a/packages/glibc-ports/2.16.0/400-alpha-xstat.patch b/packages/glibc/2.13/400-alpha-xstat.patch
index 6e4ab8f..6e4ab8f 100644
--- a/packages/glibc-ports/2.16.0/400-alpha-xstat.patch
+++ b/packages/glibc/2.13/400-alpha-xstat.patch
diff --git a/packages/glibc-ports/2.16.0/430-alpha-creat.patch b/packages/glibc/2.13/430-alpha-creat.patch
index da6ddda..da6ddda 100644
--- a/packages/glibc-ports/2.16.0/430-alpha-creat.patch
+++ b/packages/glibc/2.13/430-alpha-creat.patch
diff --git a/packages/glibc-ports/2.14/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.13/490-alpha_alpha-add-fdatasync-support.patch
index 372f34c..372f34c 100644
--- a/packages/glibc-ports/2.14/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc/2.13/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc-ports/2.16.0/560-ppc-atomic.patch b/packages/glibc/2.13/560-ppc-atomic.patch
index ee1cb90..ee1cb90 100644
--- a/packages/glibc-ports/2.16.0/560-ppc-atomic.patch
+++ b/packages/glibc/2.13/560-ppc-atomic.patch
diff --git a/packages/glibc-ports/2.16.0/630-mips_shn_undef-hack.patch b/packages/glibc/2.13/630-mips_shn_undef-hack.patch
index 791d76c..791d76c 100644
--- a/packages/glibc-ports/2.16.0/630-mips_shn_undef-hack.patch
+++ b/packages/glibc/2.13/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc-ports/2.16.0/640-alpha-atfcts.patch b/packages/glibc/2.13/640-alpha-atfcts.patch
index 7a8a94a..7a8a94a 100644
--- a/packages/glibc-ports/2.16.0/640-alpha-atfcts.patch
+++ b/packages/glibc/2.13/640-alpha-atfcts.patch
diff --git a/packages/glibc-ports/2.15/650-syslog.patch b/packages/glibc/2.13/650-syslog.patch
index c20cafc..c20cafc 100644
--- a/packages/glibc-ports/2.15/650-syslog.patch
+++ b/packages/glibc/2.13/650-syslog.patch
diff --git a/packages/glibc-ports/2.15/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.13/660-debug-readlink_chk-readklinkat_chk.patch
index a5a7052..a5a7052 100644
--- a/packages/glibc-ports/2.15/660-debug-readlink_chk-readklinkat_chk.patch
+++ b/packages/glibc/2.13/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/glibc-ports/2.14/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.14.1/100-respect-env-CPPFLAGS.patch
index 3798cb2..3798cb2 100644
--- a/packages/glibc-ports/2.14/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc/2.14.1/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc-ports/2.15/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.14.1/120-i386-x86_64-revert-clone-cfi.patch
index c7f6182..c7f6182 100644
--- a/packages/glibc-ports/2.15/120-i386-x86_64-revert-clone-cfi.patch
+++ b/packages/glibc/2.14.1/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc-ports/2.15/140-disable-ldconfig.patch b/packages/glibc/2.14.1/140-disable-ldconfig.patch
index 378e1df..378e1df 100644
--- a/packages/glibc-ports/2.15/140-disable-ldconfig.patch
+++ b/packages/glibc/2.14.1/140-disable-ldconfig.patch
diff --git a/packages/glibc-ports/2.15/150-queue-header-updates.patch b/packages/glibc/2.14.1/150-queue-header-updates.patch
index 7cbe70e..7cbe70e 100644
--- a/packages/glibc-ports/2.15/150-queue-header-updates.patch
+++ b/packages/glibc/2.14.1/150-queue-header-updates.patch
diff --git a/packages/glibc-ports/2.14/160-manual-no-perl.patch b/packages/glibc/2.14.1/160-manual-no-perl.patch
index 5e2b807..5e2b807 100644
--- a/packages/glibc-ports/2.14/160-manual-no-perl.patch
+++ b/packages/glibc/2.14.1/160-manual-no-perl.patch
diff --git a/packages/glibc-ports/2.15/170-localedef-fix-trampoline.patch b/packages/glibc/2.14.1/170-localedef-fix-trampoline.patch
index 3cc6559..3cc6559 100644
--- a/packages/glibc-ports/2.15/170-localedef-fix-trampoline.patch
+++ b/packages/glibc/2.14.1/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc-ports/2.15/180-resolv-dynamic.patch b/packages/glibc/2.14.1/180-resolv-dynamic.patch
index e916bce..e916bce 100644
--- a/packages/glibc-ports/2.15/180-resolv-dynamic.patch
+++ b/packages/glibc/2.14.1/180-resolv-dynamic.patch
diff --git a/packages/glibc-ports/2.14.1/190-localedef-mmap.patch b/packages/glibc/2.14.1/190-localedef-mmap.patch
index f3914cd..f3914cd 100644
--- a/packages/glibc-ports/2.14.1/190-localedef-mmap.patch
+++ b/packages/glibc/2.14.1/190-localedef-mmap.patch
diff --git a/packages/glibc-ports/2.15/200-fadvise64_64.patch b/packages/glibc/2.14.1/200-fadvise64_64.patch
index 71bca38..71bca38 100644
--- a/packages/glibc-ports/2.15/200-fadvise64_64.patch
+++ b/packages/glibc/2.14.1/200-fadvise64_64.patch
diff --git a/packages/glibc-ports/2.14/220-section-comments.patch b/packages/glibc/2.14.1/220-section-comments.patch
index d717829..d717829 100644
--- a/packages/glibc-ports/2.14/220-section-comments.patch
+++ b/packages/glibc/2.14.1/220-section-comments.patch
diff --git a/packages/glibc-ports/2.14/230-no-inline-gmon.patch b/packages/glibc/2.14.1/230-no-inline-gmon.patch
index fa33c2b..fa33c2b 100644
--- a/packages/glibc-ports/2.14/230-no-inline-gmon.patch
+++ b/packages/glibc/2.14.1/230-no-inline-gmon.patch
diff --git a/packages/glibc-ports/2.14/260-assume-pipe2.patch b/packages/glibc/2.14.1/260-assume-pipe2.patch
index 42e8f4e..42e8f4e 100644
--- a/packages/glibc-ports/2.14/260-assume-pipe2.patch
+++ b/packages/glibc/2.14.1/260-assume-pipe2.patch
diff --git a/packages/glibc-ports/2.15/270-china.patch b/packages/glibc/2.14.1/270-china.patch
index 41d7759..41d7759 100644
--- a/packages/glibc-ports/2.15/270-china.patch
+++ b/packages/glibc/2.14.1/270-china.patch
diff --git a/packages/glibc-ports/2.15/280-new-valencian-locale.patch b/packages/glibc/2.14.1/280-new-valencian-locale.patch
index 4cdd108..4cdd108 100644
--- a/packages/glibc-ports/2.15/280-new-valencian-locale.patch
+++ b/packages/glibc/2.14.1/280-new-valencian-locale.patch
diff --git a/packages/glibc-ports/2.14/300-nscd-one-fork.patch b/packages/glibc/2.14.1/300-nscd-one-fork.patch
index adc9b3f..adc9b3f 100644
--- a/packages/glibc-ports/2.14/300-nscd-one-fork.patch
+++ b/packages/glibc/2.14.1/300-nscd-one-fork.patch
diff --git a/packages/glibc-ports/2.14/310-hppa-nptl-carlos.patch b/packages/glibc/2.14.1/310-hppa-nptl-carlos.patch
index 4c028b2..4c028b2 100644
--- a/packages/glibc-ports/2.14/310-hppa-nptl-carlos.patch
+++ b/packages/glibc/2.14.1/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc-ports/2.15/340-dl_execstack-PaX-support.patch b/packages/glibc/2.14.1/340-dl_execstack-PaX-support.patch
index 2402af0..2402af0 100644
--- a/packages/glibc-ports/2.15/340-dl_execstack-PaX-support.patch
+++ b/packages/glibc/2.14.1/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc-ports/2.15/350-pre20040117-pt_pax.patch b/packages/glibc/2.14.1/350-pre20040117-pt_pax.patch
index f8f6b83..f8f6b83 100644
--- a/packages/glibc-ports/2.15/350-pre20040117-pt_pax.patch
+++ b/packages/glibc/2.14.1/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc-ports/2.15/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.14.1/360-tests-sandbox-libdl-paths.patch
index 9f78c52..9f78c52 100644
--- a/packages/glibc-ports/2.15/360-tests-sandbox-libdl-paths.patch
+++ b/packages/glibc/2.14.1/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc-ports/2.15/380-dont-build-timezone.patch b/packages/glibc/2.14.1/380-dont-build-timezone.patch
index 11c358e..11c358e 100644
--- a/packages/glibc-ports/2.15/380-dont-build-timezone.patch
+++ b/packages/glibc/2.14.1/380-dont-build-timezone.patch
diff --git a/packages/glibc-ports/2.15/400-alpha-xstat.patch b/packages/glibc/2.14.1/400-alpha-xstat.patch
index 6e4ab8f..6e4ab8f 100644
--- a/packages/glibc-ports/2.15/400-alpha-xstat.patch
+++ b/packages/glibc/2.14.1/400-alpha-xstat.patch
diff --git a/packages/glibc-ports/2.15/430-alpha-creat.patch b/packages/glibc/2.14.1/430-alpha-creat.patch
index da6ddda..da6ddda 100644
--- a/packages/glibc-ports/2.15/430-alpha-creat.patch
+++ b/packages/glibc/2.14.1/430-alpha-creat.patch
diff --git a/packages/glibc-ports/2.14.1/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.14.1/490-alpha_alpha-add-fdatasync-support.patch
index 372f34c..372f34c 100644
--- a/packages/glibc-ports/2.14.1/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc/2.14.1/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc-ports/2.15/560-ppc-atomic.patch b/packages/glibc/2.14.1/560-ppc-atomic.patch
index ee1cb90..ee1cb90 100644
--- a/packages/glibc-ports/2.15/560-ppc-atomic.patch
+++ b/packages/glibc/2.14.1/560-ppc-atomic.patch
diff --git a/packages/glibc-ports/2.15/630-mips_shn_undef-hack.patch b/packages/glibc/2.14.1/630-mips_shn_undef-hack.patch
index 791d76c..791d76c 100644
--- a/packages/glibc-ports/2.15/630-mips_shn_undef-hack.patch
+++ b/packages/glibc/2.14.1/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc-ports/2.15/640-alpha-atfcts.patch b/packages/glibc/2.14.1/640-alpha-atfcts.patch
index 7a8a94a..7a8a94a 100644
--- a/packages/glibc-ports/2.15/640-alpha-atfcts.patch
+++ b/packages/glibc/2.14.1/640-alpha-atfcts.patch
diff --git a/packages/glibc-ports/2.14/650-syslog.patch b/packages/glibc/2.14.1/650-syslog.patch
index c20cafc..c20cafc 100644
--- a/packages/glibc-ports/2.14/650-syslog.patch
+++ b/packages/glibc/2.14.1/650-syslog.patch
diff --git a/packages/glibc-ports/2.14/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch
index a5a7052..a5a7052 100644
--- a/packages/glibc-ports/2.14/660-debug-readlink_chk-readklinkat_chk.patch
+++ b/packages/glibc/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/glibc-ports/2.14.1/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.14/100-respect-env-CPPFLAGS.patch
index 3798cb2..3798cb2 100644
--- a/packages/glibc-ports/2.14.1/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc/2.14/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc-ports/2.14/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.14/120-i386-x86_64-revert-clone-cfi.patch
index c7f6182..c7f6182 100644
--- a/packages/glibc-ports/2.14/120-i386-x86_64-revert-clone-cfi.patch
+++ b/packages/glibc/2.14/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc-ports/2.14/140-disable-ldconfig.patch b/packages/glibc/2.14/140-disable-ldconfig.patch
index 378e1df..378e1df 100644
--- a/packages/glibc-ports/2.14/140-disable-ldconfig.patch
+++ b/packages/glibc/2.14/140-disable-ldconfig.patch
diff --git a/packages/glibc-ports/2.14/150-queue-header-updates.patch b/packages/glibc/2.14/150-queue-header-updates.patch
index 7cbe70e..7cbe70e 100644
--- a/packages/glibc-ports/2.14/150-queue-header-updates.patch
+++ b/packages/glibc/2.14/150-queue-header-updates.patch
diff --git a/packages/glibc-ports/2.14.1/160-manual-no-perl.patch b/packages/glibc/2.14/160-manual-no-perl.patch
index 5e2b807..5e2b807 100644
--- a/packages/glibc-ports/2.14.1/160-manual-no-perl.patch
+++ b/packages/glibc/2.14/160-manual-no-perl.patch
diff --git a/packages/glibc-ports/2.14/170-localedef-fix-trampoline.patch b/packages/glibc/2.14/170-localedef-fix-trampoline.patch
index 3cc6559..3cc6559 100644
--- a/packages/glibc-ports/2.14/170-localedef-fix-trampoline.patch
+++ b/packages/glibc/2.14/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc-ports/2.14/180-resolv-dynamic.patch b/packages/glibc/2.14/180-resolv-dynamic.patch
index e916bce..e916bce 100644
--- a/packages/glibc-ports/2.14/180-resolv-dynamic.patch
+++ b/packages/glibc/2.14/180-resolv-dynamic.patch
diff --git a/packages/glibc-ports/2.13/190-localedef-mmap.patch b/packages/glibc/2.14/190-localedef-mmap.patch
index f3914cd..f3914cd 100644
--- a/packages/glibc-ports/2.13/190-localedef-mmap.patch
+++ b/packages/glibc/2.14/190-localedef-mmap.patch
diff --git a/packages/glibc-ports/2.14/200-fadvise64_64.patch b/packages/glibc/2.14/200-fadvise64_64.patch
index 71bca38..71bca38 100644
--- a/packages/glibc-ports/2.14/200-fadvise64_64.patch
+++ b/packages/glibc/2.14/200-fadvise64_64.patch
diff --git a/packages/glibc-ports/2.14.1/220-section-comments.patch b/packages/glibc/2.14/220-section-comments.patch
index d717829..d717829 100644
--- a/packages/glibc-ports/2.14.1/220-section-comments.patch
+++ b/packages/glibc/2.14/220-section-comments.patch
diff --git a/packages/glibc-ports/2.14.1/230-no-inline-gmon.patch b/packages/glibc/2.14/230-no-inline-gmon.patch
index fa33c2b..fa33c2b 100644
--- a/packages/glibc-ports/2.14.1/230-no-inline-gmon.patch
+++ b/packages/glibc/2.14/230-no-inline-gmon.patch
diff --git a/packages/glibc-ports/2.13/240-check_native-headers.patch b/packages/glibc/2.14/240-check_native-headers.patch
index c936f71..c936f71 100644
--- a/packages/glibc-ports/2.13/240-check_native-headers.patch
+++ b/packages/glibc/2.14/240-check_native-headers.patch
diff --git a/packages/glibc-ports/2.14.1/260-assume-pipe2.patch b/packages/glibc/2.14/260-assume-pipe2.patch
index 42e8f4e..42e8f4e 100644
--- a/packages/glibc-ports/2.14.1/260-assume-pipe2.patch
+++ b/packages/glibc/2.14/260-assume-pipe2.patch
diff --git a/packages/glibc-ports/2.14/270-china.patch b/packages/glibc/2.14/270-china.patch
index 41d7759..41d7759 100644
--- a/packages/glibc-ports/2.14/270-china.patch
+++ b/packages/glibc/2.14/270-china.patch
diff --git a/packages/glibc-ports/2.14/280-new-valencian-locale.patch b/packages/glibc/2.14/280-new-valencian-locale.patch
index 4cdd108..4cdd108 100644
--- a/packages/glibc-ports/2.14/280-new-valencian-locale.patch
+++ b/packages/glibc/2.14/280-new-valencian-locale.patch
diff --git a/packages/glibc-ports/2.14.1/300-nscd-one-fork.patch b/packages/glibc/2.14/300-nscd-one-fork.patch
index adc9b3f..adc9b3f 100644
--- a/packages/glibc-ports/2.14.1/300-nscd-one-fork.patch
+++ b/packages/glibc/2.14/300-nscd-one-fork.patch
diff --git a/packages/glibc-ports/2.14.1/310-hppa-nptl-carlos.patch b/packages/glibc/2.14/310-hppa-nptl-carlos.patch
index 4c028b2..4c028b2 100644
--- a/packages/glibc-ports/2.14.1/310-hppa-nptl-carlos.patch
+++ b/packages/glibc/2.14/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc-ports/2.14/340-dl_execstack-PaX-support.patch b/packages/glibc/2.14/340-dl_execstack-PaX-support.patch
index 2402af0..2402af0 100644
--- a/packages/glibc-ports/2.14/340-dl_execstack-PaX-support.patch
+++ b/packages/glibc/2.14/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc-ports/2.14/350-pre20040117-pt_pax.patch b/packages/glibc/2.14/350-pre20040117-pt_pax.patch
index f8f6b83..f8f6b83 100644
--- a/packages/glibc-ports/2.14/350-pre20040117-pt_pax.patch
+++ b/packages/glibc/2.14/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc-ports/2.14/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.14/360-tests-sandbox-libdl-paths.patch
index 9f78c52..9f78c52 100644
--- a/packages/glibc-ports/2.14/360-tests-sandbox-libdl-paths.patch
+++ b/packages/glibc/2.14/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc-ports/2.14/380-dont-build-timezone.patch b/packages/glibc/2.14/380-dont-build-timezone.patch
index 11c358e..11c358e 100644
--- a/packages/glibc-ports/2.14/380-dont-build-timezone.patch
+++ b/packages/glibc/2.14/380-dont-build-timezone.patch
diff --git a/packages/glibc-ports/2.14/400-alpha-xstat.patch b/packages/glibc/2.14/400-alpha-xstat.patch
index 6e4ab8f..6e4ab8f 100644
--- a/packages/glibc-ports/2.14/400-alpha-xstat.patch
+++ b/packages/glibc/2.14/400-alpha-xstat.patch
diff --git a/packages/glibc-ports/2.14/430-alpha-creat.patch b/packages/glibc/2.14/430-alpha-creat.patch
index da6ddda..da6ddda 100644
--- a/packages/glibc-ports/2.14/430-alpha-creat.patch
+++ b/packages/glibc/2.14/430-alpha-creat.patch
diff --git a/packages/glibc-ports/2.13/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.14/490-alpha_alpha-add-fdatasync-support.patch
index 372f34c..372f34c 100644
--- a/packages/glibc-ports/2.13/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc/2.14/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc-ports/2.14/560-ppc-atomic.patch b/packages/glibc/2.14/560-ppc-atomic.patch
index ee1cb90..ee1cb90 100644
--- a/packages/glibc-ports/2.14/560-ppc-atomic.patch
+++ b/packages/glibc/2.14/560-ppc-atomic.patch
diff --git a/packages/glibc-ports/2.14/630-mips_shn_undef-hack.patch b/packages/glibc/2.14/630-mips_shn_undef-hack.patch
index 791d76c..791d76c 100644
--- a/packages/glibc-ports/2.14/630-mips_shn_undef-hack.patch
+++ b/packages/glibc/2.14/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc-ports/2.14/640-alpha-atfcts.patch b/packages/glibc/2.14/640-alpha-atfcts.patch
index 7a8a94a..7a8a94a 100644
--- a/packages/glibc-ports/2.14/640-alpha-atfcts.patch
+++ b/packages/glibc/2.14/640-alpha-atfcts.patch
diff --git a/packages/glibc-ports/2.14.1/650-syslog.patch b/packages/glibc/2.14/650-syslog.patch
index c20cafc..c20cafc 100644
--- a/packages/glibc-ports/2.14.1/650-syslog.patch
+++ b/packages/glibc/2.14/650-syslog.patch
diff --git a/packages/glibc-ports/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.14/660-debug-readlink_chk-readklinkat_chk.patch
index a5a7052..a5a7052 100644
--- a/packages/glibc-ports/2.14.1/660-debug-readlink_chk-readklinkat_chk.patch
+++ b/packages/glibc/2.14/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/glibc-ports/2.13/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.15/100-respect-env-CPPFLAGS.patch
index 3798cb2..3798cb2 100644
--- a/packages/glibc-ports/2.13/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc/2.15/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc-ports/2.14.1/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.15/120-i386-x86_64-revert-clone-cfi.patch
index c7f6182..c7f6182 100644
--- a/packages/glibc-ports/2.14.1/120-i386-x86_64-revert-clone-cfi.patch
+++ b/packages/glibc/2.15/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc-ports/2.14.1/140-disable-ldconfig.patch b/packages/glibc/2.15/140-disable-ldconfig.patch
index 378e1df..378e1df 100644
--- a/packages/glibc-ports/2.14.1/140-disable-ldconfig.patch
+++ b/packages/glibc/2.15/140-disable-ldconfig.patch
diff --git a/packages/glibc-ports/2.14.1/150-queue-header-updates.patch b/packages/glibc/2.15/150-queue-header-updates.patch
index 7cbe70e..7cbe70e 100644
--- a/packages/glibc-ports/2.14.1/150-queue-header-updates.patch
+++ b/packages/glibc/2.15/150-queue-header-updates.patch
diff --git a/packages/glibc-ports/2.13/160-manual-no-perl.patch b/packages/glibc/2.15/160-manual-no-perl.patch
index 5e2b807..5e2b807 100644
--- a/packages/glibc-ports/2.13/160-manual-no-perl.patch
+++ b/packages/glibc/2.15/160-manual-no-perl.patch
diff --git a/packages/glibc-ports/2.14.1/170-localedef-fix-trampoline.patch b/packages/glibc/2.15/170-localedef-fix-trampoline.patch
index 3cc6559..3cc6559 100644
--- a/packages/glibc-ports/2.14.1/170-localedef-fix-trampoline.patch
+++ b/packages/glibc/2.15/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc-ports/2.14.1/180-resolv-dynamic.patch b/packages/glibc/2.15/180-resolv-dynamic.patch
index e916bce..e916bce 100644
--- a/packages/glibc-ports/2.14.1/180-resolv-dynamic.patch
+++ b/packages/glibc/2.15/180-resolv-dynamic.patch
diff --git a/packages/glibc-ports/2.14.1/200-fadvise64_64.patch b/packages/glibc/2.15/200-fadvise64_64.patch
index 71bca38..71bca38 100644
--- a/packages/glibc-ports/2.14.1/200-fadvise64_64.patch
+++ b/packages/glibc/2.15/200-fadvise64_64.patch
diff --git a/packages/glibc-ports/2.13/220-section-comments.patch b/packages/glibc/2.15/220-section-comments.patch
index d717829..d717829 100644
--- a/packages/glibc-ports/2.13/220-section-comments.patch
+++ b/packages/glibc/2.15/220-section-comments.patch
diff --git a/packages/glibc-ports/2.13/230-no-inline-gmon.patch b/packages/glibc/2.15/230-no-inline-gmon.patch
index fa33c2b..fa33c2b 100644
--- a/packages/glibc-ports/2.13/230-no-inline-gmon.patch
+++ b/packages/glibc/2.15/230-no-inline-gmon.patch
diff --git a/packages/glibc-ports/2.13/260-assume-pipe2.patch b/packages/glibc/2.15/260-assume-pipe2.patch
index 42e8f4e..42e8f4e 100644
--- a/packages/glibc-ports/2.13/260-assume-pipe2.patch
+++ b/packages/glibc/2.15/260-assume-pipe2.patch
diff --git a/packages/glibc-ports/2.14.1/270-china.patch b/packages/glibc/2.15/270-china.patch
index 41d7759..41d7759 100644
--- a/packages/glibc-ports/2.14.1/270-china.patch
+++ b/packages/glibc/2.15/270-china.patch
diff --git a/packages/glibc-ports/2.14.1/280-new-valencian-locale.patch b/packages/glibc/2.15/280-new-valencian-locale.patch
index 4cdd108..4cdd108 100644
--- a/packages/glibc-ports/2.14.1/280-new-valencian-locale.patch
+++ b/packages/glibc/2.15/280-new-valencian-locale.patch
diff --git a/packages/glibc-ports/2.13/300-nscd-one-fork.patch b/packages/glibc/2.15/300-nscd-one-fork.patch
index adc9b3f..adc9b3f 100644
--- a/packages/glibc-ports/2.13/300-nscd-one-fork.patch
+++ b/packages/glibc/2.15/300-nscd-one-fork.patch
diff --git a/packages/glibc-ports/2.13/310-hppa-nptl-carlos.patch b/packages/glibc/2.15/310-hppa-nptl-carlos.patch
index 4c028b2..4c028b2 100644
--- a/packages/glibc-ports/2.13/310-hppa-nptl-carlos.patch
+++ b/packages/glibc/2.15/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc-ports/2.14.1/340-dl_execstack-PaX-support.patch b/packages/glibc/2.15/340-dl_execstack-PaX-support.patch
index 2402af0..2402af0 100644
--- a/packages/glibc-ports/2.14.1/340-dl_execstack-PaX-support.patch
+++ b/packages/glibc/2.15/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc-ports/2.14.1/350-pre20040117-pt_pax.patch b/packages/glibc/2.15/350-pre20040117-pt_pax.patch
index f8f6b83..f8f6b83 100644
--- a/packages/glibc-ports/2.14.1/350-pre20040117-pt_pax.patch
+++ b/packages/glibc/2.15/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc-ports/2.14.1/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.15/360-tests-sandbox-libdl-paths.patch
index 9f78c52..9f78c52 100644
--- a/packages/glibc-ports/2.14.1/360-tests-sandbox-libdl-paths.patch
+++ b/packages/glibc/2.15/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc-ports/2.14.1/380-dont-build-timezone.patch b/packages/glibc/2.15/380-dont-build-timezone.patch
index 11c358e..11c358e 100644
--- a/packages/glibc-ports/2.14.1/380-dont-build-timezone.patch
+++ b/packages/glibc/2.15/380-dont-build-timezone.patch
diff --git a/packages/glibc-ports/2.14.1/400-alpha-xstat.patch b/packages/glibc/2.15/400-alpha-xstat.patch
index 6e4ab8f..6e4ab8f 100644
--- a/packages/glibc-ports/2.14.1/400-alpha-xstat.patch
+++ b/packages/glibc/2.15/400-alpha-xstat.patch
diff --git a/packages/glibc-ports/2.14.1/430-alpha-creat.patch b/packages/glibc/2.15/430-alpha-creat.patch
index da6ddda..da6ddda 100644
--- a/packages/glibc-ports/2.14.1/430-alpha-creat.patch
+++ b/packages/glibc/2.15/430-alpha-creat.patch
diff --git a/packages/glibc-ports/2.16.0/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.15/490-alpha_alpha-add-fdatasync-support.patch
index acf250d..acf250d 100644
--- a/packages/glibc-ports/2.16.0/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc/2.15/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc-ports/2.14.1/560-ppc-atomic.patch b/packages/glibc/2.15/560-ppc-atomic.patch
index ee1cb90..ee1cb90 100644
--- a/packages/glibc-ports/2.14.1/560-ppc-atomic.patch
+++ b/packages/glibc/2.15/560-ppc-atomic.patch
diff --git a/packages/glibc-ports/2.14.1/630-mips_shn_undef-hack.patch b/packages/glibc/2.15/630-mips_shn_undef-hack.patch
index 791d76c..791d76c 100644
--- a/packages/glibc-ports/2.14.1/630-mips_shn_undef-hack.patch
+++ b/packages/glibc/2.15/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc-ports/2.14.1/640-alpha-atfcts.patch b/packages/glibc/2.15/640-alpha-atfcts.patch
index 7a8a94a..7a8a94a 100644
--- a/packages/glibc-ports/2.14.1/640-alpha-atfcts.patch
+++ b/packages/glibc/2.15/640-alpha-atfcts.patch
diff --git a/packages/glibc-ports/2.13/650-syslog.patch b/packages/glibc/2.15/650-syslog.patch
index c20cafc..c20cafc 100644
--- a/packages/glibc-ports/2.13/650-syslog.patch
+++ b/packages/glibc/2.15/650-syslog.patch
diff --git a/packages/glibc-ports/2.13/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.15/660-debug-readlink_chk-readklinkat_chk.patch
index a5a7052..a5a7052 100644
--- a/packages/glibc-ports/2.13/660-debug-readlink_chk-readklinkat_chk.patch
+++ b/packages/glibc/2.15/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/glibc-ports/2.16.0/100-respect-env-CPPFLAGS.patch b/packages/glibc/2.16.0/100-respect-env-CPPFLAGS.patch
index dce491c..dce491c 100644
--- a/packages/glibc-ports/2.16.0/100-respect-env-CPPFLAGS.patch
+++ b/packages/glibc/2.16.0/100-respect-env-CPPFLAGS.patch
diff --git a/packages/glibc-ports/2.13/120-i386-x86_64-revert-clone-cfi.patch b/packages/glibc/2.16.0/120-i386-x86_64-revert-clone-cfi.patch
index c7f6182..c7f6182 100644
--- a/packages/glibc-ports/2.13/120-i386-x86_64-revert-clone-cfi.patch
+++ b/packages/glibc/2.16.0/120-i386-x86_64-revert-clone-cfi.patch
diff --git a/packages/glibc-ports/2.13/140-disable-ldconfig.patch b/packages/glibc/2.16.0/140-disable-ldconfig.patch
index 378e1df..378e1df 100644
--- a/packages/glibc-ports/2.13/140-disable-ldconfig.patch
+++ b/packages/glibc/2.16.0/140-disable-ldconfig.patch
diff --git a/packages/glibc-ports/2.13/150-queue-header-updates.patch b/packages/glibc/2.16.0/150-queue-header-updates.patch
index 7cbe70e..7cbe70e 100644
--- a/packages/glibc-ports/2.13/150-queue-header-updates.patch
+++ b/packages/glibc/2.16.0/150-queue-header-updates.patch
diff --git a/packages/glibc-ports/2.13/170-localedef-fix-trampoline.patch b/packages/glibc/2.16.0/170-localedef-fix-trampoline.patch
index 3cc6559..3cc6559 100644
--- a/packages/glibc-ports/2.13/170-localedef-fix-trampoline.patch
+++ b/packages/glibc/2.16.0/170-localedef-fix-trampoline.patch
diff --git a/packages/glibc-ports/2.13/180-resolv-dynamic.patch b/packages/glibc/2.16.0/180-resolv-dynamic.patch
index e916bce..e916bce 100644
--- a/packages/glibc-ports/2.13/180-resolv-dynamic.patch
+++ b/packages/glibc/2.16.0/180-resolv-dynamic.patch
diff --git a/packages/glibc-ports/2.13/200-fadvise64_64.patch b/packages/glibc/2.16.0/200-fadvise64_64.patch
index 71bca38..71bca38 100644
--- a/packages/glibc-ports/2.13/200-fadvise64_64.patch
+++ b/packages/glibc/2.16.0/200-fadvise64_64.patch
diff --git a/packages/glibc-ports/2.16.0/260-assume-pipe2.patch b/packages/glibc/2.16.0/260-assume-pipe2.patch
index 54f0382..54f0382 100644
--- a/packages/glibc-ports/2.16.0/260-assume-pipe2.patch
+++ b/packages/glibc/2.16.0/260-assume-pipe2.patch
diff --git a/packages/glibc-ports/2.13/270-china.patch b/packages/glibc/2.16.0/270-china.patch
index 41d7759..41d7759 100644
--- a/packages/glibc-ports/2.13/270-china.patch
+++ b/packages/glibc/2.16.0/270-china.patch
diff --git a/packages/glibc-ports/2.13/280-new-valencian-locale.patch b/packages/glibc/2.16.0/280-new-valencian-locale.patch
index 4cdd108..4cdd108 100644
--- a/packages/glibc-ports/2.13/280-new-valencian-locale.patch
+++ b/packages/glibc/2.16.0/280-new-valencian-locale.patch
diff --git a/packages/glibc-ports/2.16.0/300-nscd-one-fork.patch b/packages/glibc/2.16.0/300-nscd-one-fork.patch
index 13b2861..13b2861 100644
--- a/packages/glibc-ports/2.16.0/300-nscd-one-fork.patch
+++ b/packages/glibc/2.16.0/300-nscd-one-fork.patch
diff --git a/packages/glibc-ports/2.16.0/310-hppa-nptl-carlos.patch b/packages/glibc/2.16.0/310-hppa-nptl-carlos.patch
index 11e8a65..11e8a65 100644
--- a/packages/glibc-ports/2.16.0/310-hppa-nptl-carlos.patch
+++ b/packages/glibc/2.16.0/310-hppa-nptl-carlos.patch
diff --git a/packages/glibc-ports/2.13/340-dl_execstack-PaX-support.patch b/packages/glibc/2.16.0/340-dl_execstack-PaX-support.patch
index 2402af0..2402af0 100644
--- a/packages/glibc-ports/2.13/340-dl_execstack-PaX-support.patch
+++ b/packages/glibc/2.16.0/340-dl_execstack-PaX-support.patch
diff --git a/packages/glibc-ports/2.13/350-pre20040117-pt_pax.patch b/packages/glibc/2.16.0/350-pre20040117-pt_pax.patch
index f8f6b83..f8f6b83 100644
--- a/packages/glibc-ports/2.13/350-pre20040117-pt_pax.patch
+++ b/packages/glibc/2.16.0/350-pre20040117-pt_pax.patch
diff --git a/packages/glibc-ports/2.13/360-tests-sandbox-libdl-paths.patch b/packages/glibc/2.16.0/360-tests-sandbox-libdl-paths.patch
index 9f78c52..9f78c52 100644
--- a/packages/glibc-ports/2.13/360-tests-sandbox-libdl-paths.patch
+++ b/packages/glibc/2.16.0/360-tests-sandbox-libdl-paths.patch
diff --git a/packages/glibc-ports/2.13/380-dont-build-timezone.patch b/packages/glibc/2.16.0/380-dont-build-timezone.patch
index 11c358e..11c358e 100644
--- a/packages/glibc-ports/2.13/380-dont-build-timezone.patch
+++ b/packages/glibc/2.16.0/380-dont-build-timezone.patch
diff --git a/packages/glibc-ports/2.13/400-alpha-xstat.patch b/packages/glibc/2.16.0/400-alpha-xstat.patch
index 6e4ab8f..6e4ab8f 100644
--- a/packages/glibc-ports/2.13/400-alpha-xstat.patch
+++ b/packages/glibc/2.16.0/400-alpha-xstat.patch
diff --git a/packages/glibc-ports/2.13/430-alpha-creat.patch b/packages/glibc/2.16.0/430-alpha-creat.patch
index da6ddda..da6ddda 100644
--- a/packages/glibc-ports/2.13/430-alpha-creat.patch
+++ b/packages/glibc/2.16.0/430-alpha-creat.patch
diff --git a/packages/glibc-ports/2.15/490-alpha_alpha-add-fdatasync-support.patch b/packages/glibc/2.16.0/490-alpha_alpha-add-fdatasync-support.patch
index acf250d..acf250d 100644
--- a/packages/glibc-ports/2.15/490-alpha_alpha-add-fdatasync-support.patch
+++ b/packages/glibc/2.16.0/490-alpha_alpha-add-fdatasync-support.patch
diff --git a/packages/glibc-ports/2.13/560-ppc-atomic.patch b/packages/glibc/2.16.0/560-ppc-atomic.patch
index ee1cb90..ee1cb90 100644
--- a/packages/glibc-ports/2.13/560-ppc-atomic.patch
+++ b/packages/glibc/2.16.0/560-ppc-atomic.patch
diff --git a/packages/glibc-ports/2.13/630-mips_shn_undef-hack.patch b/packages/glibc/2.16.0/630-mips_shn_undef-hack.patch
index 791d76c..791d76c 100644
--- a/packages/glibc-ports/2.13/630-mips_shn_undef-hack.patch
+++ b/packages/glibc/2.16.0/630-mips_shn_undef-hack.patch
diff --git a/packages/glibc-ports/2.13/640-alpha-atfcts.patch b/packages/glibc/2.16.0/640-alpha-atfcts.patch
index 7a8a94a..7a8a94a 100644
--- a/packages/glibc-ports/2.13/640-alpha-atfcts.patch
+++ b/packages/glibc/2.16.0/640-alpha-atfcts.patch
diff --git a/packages/glibc-ports/2.12.1/650-syslog.patch b/packages/glibc/2.16.0/650-syslog.patch
index c20cafc..c20cafc 100644
--- a/packages/glibc-ports/2.12.1/650-syslog.patch
+++ b/packages/glibc/2.16.0/650-syslog.patch
diff --git a/packages/glibc-ports/2.12.1/660-debug-readlink_chk-readklinkat_chk.patch b/packages/glibc/2.16.0/660-debug-readlink_chk-readklinkat_chk.patch
index a5a7052..a5a7052 100644
--- a/packages/glibc-ports/2.12.1/660-debug-readlink_chk-readklinkat_chk.patch
+++ b/packages/glibc/2.16.0/660-debug-readlink_chk-readklinkat_chk.patch
diff --git a/packages/glibc/package.desc b/packages/glibc/package.desc
index 8669d66..f94055a 100644
--- a/packages/glibc/package.desc
+++ b/packages/glibc/package.desc
@@ -1,5 +1,5 @@
 origin='GNU'
 repository='git git://sourceware.org/git/glibc.git'
-mirrors='$(CT_Mirrors GNU glibc) $(CT_Mirrors sourceware glibc/releases)'
+mirrors='$(CT_Mirrors GNU glibc)'
 milestones='2.17 2.20 2.23 2.24'
 archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/gmp/5.0.5/110-get-mpn_sub_1-size-argument-right.patch b/packages/gmp/5.0.5/110-get-mpn_sub_1-size-argument-right.patch
deleted file mode 100644
index 2e0a1af..0000000
--- a/packages/gmp/5.0.5/110-get-mpn_sub_1-size-argument-right.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-
-# HG changeset patch
-# User Torbjorn Granlund <tege@gmplib.org>
-# Date 1310730221 -7200
-# Node ID 538dfce27f410b910d5e2f011119269e224d16a3
-# Parent  03ed209dd7efd4f4fff0ce297bb3a8f7e7ba2366
-(mpn_dcpi1_bdiv_q): Get mpn_sub_1 size argument right.
-
-diff -r 03ed209dd7ef -r 538dfce27f41 mpn/generic/dcpi1_bdiv_q.c
---- a/mpn/generic/dcpi1_bdiv_q.c	Thu Jun 16 12:22:24 2011 +0200
-+++ b/mpn/generic/dcpi1_bdiv_q.c	Fri Jul 15 13:43:41 2011 +0200
-@@ -7,7 +7,7 @@
-    SAFE TO REACH THEM THROUGH DOCUMENTED INTERFACES.  IN FACT, IT IS ALMOST
-    GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GMP RELEASE.
- 
--Copyright 2006, 2007, 2009, 2010 Free Software Foundation, Inc.
-+Copyright 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
- 
- This file is part of the GNU MP Library.
- 
-@@ -28,7 +28,6 @@
- #include "gmp-impl.h"
- 
- 
--
- mp_size_t
- mpn_dcpi1_bdiv_q_n_itch (mp_size_t n)
- {
-@@ -130,7 +129,7 @@
-       qn = nn - qn;
-       while (qn > dn)
- 	{
--	  mpn_sub_1 (np + dn, np + dn, qn, cy);
-+	  mpn_sub_1 (np + dn, np + dn, qn - dn, cy);
- 	  cy = mpn_dcpi1_bdiv_qr_n (qp, np, dp, dn, dinv, tp);
- 	  qp += dn;
- 	  np += dn;
-
diff --git a/packages/gmp/6.0.0a/version.desc b/packages/gmp/6.0.0a/version.desc
index fcfe389..71fe2fa 100644
--- a/packages/gmp/6.0.0a/version.desc
+++ b/packages/gmp/6.0.0a/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+archive_dirname='gmp-6.0.0'
diff --git a/packages/linux/3.10.107/version.desc b/packages/linux/3.10.107/version.desc
index 19c9b2e..7c0a082 100644
--- a/packages/linux/3.10.107/version.desc
+++ b/packages/linux/3.10.107/version.desc
@@ -1,2 +1 @@
 # Not obsolete: used by CentOS7.x, EOL 06/2024
-archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.12.74/version.desc b/packages/linux/3.12.74/version.desc
index 6d5245d..e69de29 100644
--- a/packages/linux/3.12.74/version.desc
+++ b/packages/linux/3.12.74/version.desc
@@ -1 +0,0 @@
-archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.13.11/version.desc b/packages/linux/3.13.11/version.desc
index 64b2fdf..89c1908 100644
--- a/packages/linux/3.13.11/version.desc
+++ b/packages/linux/3.13.11/version.desc
@@ -1,2 +1 @@
 # Not obsolete: used by Ubuntu14.04, EOL 04/2019
-archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.14.79/version.desc b/packages/linux/3.14.79/version.desc
index 40f81bc..fcfe389 100644
--- a/packages/linux/3.14.79/version.desc
+++ b/packages/linux/3.14.79/version.desc
@@ -1,2 +1 @@
 obsolete='yes'
-archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.15.10/version.desc b/packages/linux/3.15.10/version.desc
index 40f81bc..fcfe389 100644
--- a/packages/linux/3.15.10/version.desc
+++ b/packages/linux/3.15.10/version.desc
@@ -1,2 +1 @@
 obsolete='yes'
-archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.16.46/version.desc b/packages/linux/3.16.46/version.desc
index 6d5245d..e69de29 100644
--- a/packages/linux/3.16.46/version.desc
+++ b/packages/linux/3.16.46/version.desc
@@ -1 +0,0 @@
-archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.17.8/version.desc b/packages/linux/3.17.8/version.desc
index 40f81bc..fcfe389 100644
--- a/packages/linux/3.17.8/version.desc
+++ b/packages/linux/3.17.8/version.desc
@@ -1,2 +1 @@
 obsolete='yes'
-archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.18.66/version.desc b/packages/linux/3.18.66/version.desc
index 40f81bc..fcfe389 100644
--- a/packages/linux/3.18.66/version.desc
+++ b/packages/linux/3.18.66/version.desc
@@ -1,2 +1 @@
 obsolete='yes'
-archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.19.8/version.desc b/packages/linux/3.19.8/version.desc
index 40f81bc..fcfe389 100644
--- a/packages/linux/3.19.8/version.desc
+++ b/packages/linux/3.19.8/version.desc
@@ -1,2 +1 @@
 obsolete='yes'
-archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.2.91/version.desc b/packages/linux/3.2.91/version.desc
index 6d5245d..e69de29 100644
--- a/packages/linux/3.2.91/version.desc
+++ b/packages/linux/3.2.91/version.desc
@@ -1 +0,0 @@
-archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/linux/3.4.113/version.desc b/packages/linux/3.4.113/version.desc
index 6d5245d..e69de29 100644
--- a/packages/linux/3.4.113/version.desc
+++ b/packages/linux/3.4.113/version.desc
@@ -1 +0,0 @@
-archive_formats='.tar.xz .tar.bz2 .tar.gz'
diff --git a/packages/mpc/0.7/version.desc b/packages/mpc/0.7/version.desc
index fcfe389..a529846 100644
--- a/packages/mpc/0.7/version.desc
+++ b/packages/mpc/0.7/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+mirrors='http://www.multiprecision.org/mpc/download'
diff --git a/packages/mpc/0.8.2/version.desc b/packages/mpc/0.8.2/version.desc
index fcfe389..a529846 100644
--- a/packages/mpc/0.8.2/version.desc
+++ b/packages/mpc/0.8.2/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+mirrors='http://www.multiprecision.org/mpc/download'
diff --git a/packages/mpc/0.9/version.desc b/packages/mpc/0.9/version.desc
index fcfe389..a529846 100644
--- a/packages/mpc/0.9/version.desc
+++ b/packages/mpc/0.9/version.desc
@@ -1 +1,2 @@
 obsolete='yes'
+mirrors='http://www.multiprecision.org/mpc/download'
diff --git a/packages/mpc/package.desc b/packages/mpc/package.desc
index d716577..04c2ac2 100644
--- a/packages/mpc/package.desc
+++ b/packages/mpc/package.desc
@@ -1,7 +1,6 @@
 repository='git https://scm.gforge.inria.fr/anonscm/git/mpc/mpc.git'
 bootstrap='autoreconf -i'
 
-# TBD older releases (0.x) missing on GNU mirrors, retire them?
 mirrors='http://www.multiprecision.org/mpc/download $(CT_Mirrors GNU mpc)'
 
 archive_formats='.tar.gz'
diff --git a/packages/zlib/package.desc b/packages/zlib/package.desc
index c80915a..1f7c64c 100644
--- a/packages/zlib/package.desc
+++ b/packages/zlib/package.desc
@@ -1,3 +1,3 @@
 repository='git https://github.com/madler/zlib.git'
 mirrors='http://downloads.sourceforge.net/project/libpng/zlib/${CT_ZLIB_VERSION}'
-archive_formats='.tar.xz .tar.gz .zip'
+archive_formats='.tar.xz .tar.gz'
diff --git a/scripts/functions b/scripts/functions
index 26ff88a..1be7af4 100644
--- a/scripts/functions
+++ b/scripts/functions
@@ -2019,8 +2019,5 @@ CT_DoGetPkgVersion()
 # Get the version of the package (main or fork)
 CT_GetPkgVersion()
 {
-    local pkg="${1}"
-    shift
-
-    CT_PackageRun "${pkg}" CT_DoGetPkgVersion
+    CT_PackageRun "${1}" CT_DoGetPkgVersion
 }