From crux at crux.nu  Tue Jan  2 09:58:22 2018
From: crux at crux.nu (crux at crux.nu)
Date: Tue,  2 Jan 2018 09:58:22 +0000 (UTC)
Subject: [crux-commits] ports/contrib (3.3): pkgconf: update to 1.3.90
Message-ID: <20180102095822.BB31E1801A6@crux.nu>

commit ca2c260c7954282b292ef3767fcf5b9e59122576
Author: Svyatoslav Mishyn <svyatoslav.mishyn at gmail.com>
Date:   Tue Jan 2 11:50:43 2018 +0200

    pkgconf: update to 1.3.90

diff --git a/pkgconf/.footprint b/pkgconf/.footprint
index d27fc950..7f83e0a9 100644
--- a/pkgconf/.footprint
+++ b/pkgconf/.footprint
@@ -7,6 +7,7 @@ drwxr-xr-x	root/root	usr/include/pkgconf/
 drwxr-xr-x	root/root	usr/include/pkgconf/libpkgconf/
 -rw-r--r--	root/root	usr/include/pkgconf/libpkgconf/bsdstubs.h
 -rw-r--r--	root/root	usr/include/pkgconf/libpkgconf/iter.h
+-rw-r--r--	root/root	usr/include/pkgconf/libpkgconf/libpkgconf-api.h
 -rw-r--r--	root/root	usr/include/pkgconf/libpkgconf/libpkgconf.h
 -rw-r--r--	root/root	usr/include/pkgconf/libpkgconf/stdinc.h
 drwxr-xr-x	root/root	usr/lib/
@@ -23,3 +24,7 @@ drwxr-xr-x	root/root	usr/share/aclocal/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/pkgconf.1.gz
+drwxr-xr-x	root/root	usr/share/man/man5/
+-rw-r--r--	root/root	usr/share/man/man5/pc.5.gz
+drwxr-xr-x	root/root	usr/share/man/man7/
+-rw-r--r--	root/root	usr/share/man/man7/pkg.m4.7.gz
diff --git a/pkgconf/.md5sum b/pkgconf/.md5sum
index ce3ec996..55282f19 100644
--- a/pkgconf/.md5sum
+++ b/pkgconf/.md5sum
@@ -1 +1 @@
-9d7a2fef60ca9f957d7541f0727238fe  pkgconf-1.3.12.tar.xz
+d15186f3a688391a8c3a555f128e4db6  pkgconf-1.3.90.tar.xz
diff --git a/pkgconf/.signature b/pkgconf/.signature
index db62643c..c5b27c72 100644
--- a/pkgconf/.signature
+++ b/pkgconf/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF30iBJp8Kfaa79tgVwtTwiA91FaZmzmmD5cUBOeiUVlk61IexrfVzlYBoV9wzqsBFFMpD3Mdjyadgn/wzKBzo8QQ=
-SHA256 (Pkgfile) = cc42d439db29e682c7cf7250128774c6a10ca9be173783f0af02b371ed2d874c
-SHA256 (.footprint) = baaf57da3561f057eb157cae848ca9061e3cacb7439c0b3fc137842edf7dcd5c
-SHA256 (pkgconf-1.3.12.tar.xz) = 9fa878a21fec186af095a2f47e8f249fcf4645ed969aba4cdd7ed9031fe7ae30
+RWSagIOpLGJF35OCzdWJz/KPwh0wcB18Ff6qouVm1CWE+EtYkLoTOXVOIHl5u4cWEArE7z2s9g6BnEbmb4c3Ai0CgA2BOySZugo=
+SHA256 (Pkgfile) = 345edf67a0d9e72563ac64665f0f1f0c8b53088c71d3d540760540bc627fdb36
+SHA256 (.footprint) = 92fcfe2585356aab92e0dc30140579f1caa66f479eadbfe0ecd50e949000065a
+SHA256 (pkgconf-1.3.90.tar.xz) = 112db7f957816901b5fe448715c0a9e38f171d4794c44075b0734a0e7fcfba36
diff --git a/pkgconf/Pkgfile b/pkgconf/Pkgfile
index e8bf2fe6..0d0f2c2f 100644
--- a/pkgconf/Pkgfile
+++ b/pkgconf/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  Svyatoslav Mishyn, svyatoslav dot mishyn at gmail dot com
 
 name=pkgconf
-version=1.3.12
+version=1.3.90
 release=1
 source=(https://distfiles.dereferenced.org/$name/$name-$version.tar.xz)
 

From crux at crux.nu  Tue Jan  2 10:03:07 2018
From: crux at crux.nu (crux at crux.nu)
Date: Tue,  2 Jan 2018 10:03:07 +0000 (UTC)
Subject: [crux-commits] ports/core (3.3): e2fsprogs: update to 1.43.8
Message-ID: <20180102100307.F30591802CF@crux.nu>

commit e5e8987630a433c8818885ef63b0873ef14df267
Author: Juergen Daubert <jue at jue.li>
Date:   Tue Jan 2 11:02:58 2018 +0100

    e2fsprogs: update to 1.43.8

diff --git a/e2fsprogs/.md5sum b/e2fsprogs/.md5sum
index 4f25d108..5901b0af 100644
--- a/e2fsprogs/.md5sum
+++ b/e2fsprogs/.md5sum
@@ -1 +1 @@
-543bf56513092e06daaae4ead609b338  e2fsprogs-1.43.7.tar.xz
+3f11aeeeac90c0843174fa3b9d99b875  e2fsprogs-1.43.8.tar.xz
diff --git a/e2fsprogs/.signature b/e2fsprogs/.signature
index f2cf7332..110f1511 100644
--- a/e2fsprogs/.signature
+++ b/e2fsprogs/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqq16MqDDN0r6PV0P6lHubRZ/+1C+19LoHPtAEUzwy9Q8x58KztCp6+EFGTInUEWXFAM+udMHxmuoowrAO6Xl7gc=
-SHA256 (Pkgfile) = 0fd57bee34ae6f0a24557cf1df977b68d39f5c8237ce2ff268f10486e0a405e9
+RWRJc1FUaeVeqkwzKNZUi0DLmGvAL3bPQ/CkNOF/8uyFs3NlWRih3WcrDJ/IBpyJixTwh6SEBrQO2AdZKuNdnQqOi1iB2g5uags=
+SHA256 (Pkgfile) = 0e9f5a965701ecfdff9b9e96a42a1399de9cab518c7255f3d6aa291105e0ec14
 SHA256 (.footprint) = c3909330e1effca64b972a43e7dae1ea3b978219e89d64202f567af9bb4e3ab1
-SHA256 (e2fsprogs-1.43.7.tar.xz) = 2a6367289047d68d9ba6a46cf89ab9a1efd0556cde02a51ebaf414ff51edded9
+SHA256 (e2fsprogs-1.43.8.tar.xz) = c0841d5fe724d49132158850f3975e886fccfcef642878dca2425a1b5d30b12a
diff --git a/e2fsprogs/Pkgfile b/e2fsprogs/Pkgfile
index 2ff3f9c0..26689d07 100644
--- a/e2fsprogs/Pkgfile
+++ b/e2fsprogs/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  util-linux
 
 name=e2fsprogs
-version=1.43.7
+version=1.43.8
 release=1
 source=(https://www.kernel.org/pub/linux/kernel/people/tytso/$name/v$version/$name-$version.tar.xz)
 

From crux at crux.nu  Tue Jan  2 10:03:08 2018
From: crux at crux.nu (crux at crux.nu)
Date: Tue,  2 Jan 2018 10:03:08 +0000 (UTC)
Subject: [crux-commits] ports/core (3.3): dhcpcd: update to 7.0.0
Message-ID: <20180102100308.01D1B1802D8@crux.nu>

commit a46737a594b9f0f42fc9f3bd863c5e05be19d966
Author: Juergen Daubert <jue at jue.li>
Date:   Tue Jan 2 11:02:32 2018 +0100

    dhcpcd: update to 7.0.0

diff --git a/dhcpcd/.md5sum b/dhcpcd/.md5sum
index b9969c56..b7f6cc34 100644
--- a/dhcpcd/.md5sum
+++ b/dhcpcd/.md5sum
@@ -1 +1 @@
-2465624b62c1154f0e89dc69c42c849b  dhcpcd-6.11.5.tar.xz
+3b476f61490a8890ac90523400110328  dhcpcd-7.0.0.tar.xz
diff --git a/dhcpcd/.signature b/dhcpcd/.signature
index 94ca5f33..87166537 100644
--- a/dhcpcd/.signature
+++ b/dhcpcd/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqkqx6UukOJl8IP1HKwNCqwJt4TZaZzYk3mQmB8VmEno/8w86oYfkxdbNCAaW/O7xajZj7Ni0wLktvcBOXtK6qAs=
-SHA256 (Pkgfile) = e3a3017c733267797c867f6a0a69dda7ecf76978d43e6cd943c9c9179d5571e5
+RWRJc1FUaeVeqjTShSTUlP3UpR+oFDCRuIkZqUipXVz9xDgYd+K3peNH90NFtdsIiZvQkx1UmpvRbDTZ92EoYqPnm3RYjxPz+wE=
+SHA256 (Pkgfile) = f90c1b8ced06994113495bbf2ab6f483c7abca495abe0aedd682c141186a4866
 SHA256 (.footprint) = d9a7aee62c42089e2d24224ba37e4d88502f402e0f94ea92d0a19492ff7afd76
-SHA256 (dhcpcd-6.11.5.tar.xz) = 6f9674dc7e27e936cc787175404a6171618675ecfb6903ab9887b1b66a87d69e
+SHA256 (dhcpcd-7.0.0.tar.xz) = ab61caedcbbf5aff608f22792f7a89baad0c9f84749b01b7526ca54a9ee620d5
diff --git a/dhcpcd/Pkgfile b/dhcpcd/Pkgfile
index a518b632..ca1178e1 100644
--- a/dhcpcd/Pkgfile
+++ b/dhcpcd/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  eudev
 
 name=dhcpcd
-version=6.11.5
+version=7.0.0
 release=1
 source=(http://roy.marples.name/downloads/dhcpcd/$name-$version.tar.xz)
 
@@ -15,7 +15,6 @@ build () {
                 --libexecdir=/lib/dhcpcd \
                 --dbdir=/var/lib/dhcpcd \
                 --sysconfdir=/etc/dhcpcd \
-                --os=linux \
                 --with-hooks=
 
     make

From crux at crux.nu  Tue Jan  2 10:04:48 2018
From: crux at crux.nu (crux at crux.nu)
Date: Tue,  2 Jan 2018 10:04:48 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): imagemagick: update to 7.0.7-18
Message-ID: <20180102100448.82213180237@crux.nu>

commit e3a1a388c07d8811be02a326ec654848dd702156
Author: Juergen Daubert <jue at jue.li>
Date:   Tue Jan 2 11:04:32 2018 +0100

    imagemagick: update to 7.0.7-18

diff --git a/imagemagick/.md5sum b/imagemagick/.md5sum
index dd08c0f80..68b074963 100644
--- a/imagemagick/.md5sum
+++ b/imagemagick/.md5sum
@@ -1 +1 @@
-11b334216d8716207b9b45e1de3c8575  ImageMagick-7.0.7-15.tar.xz
+65d22fdbec9d2a885240f5721d3d68fe  ImageMagick-7.0.7-18.tar.xz
diff --git a/imagemagick/.signature b/imagemagick/.signature
index 4efc9e572..daa1fb36b 100644
--- a/imagemagick/.signature
+++ b/imagemagick/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/aZPW+9GXnoSeEpwrz+se0jNjSJuxPeyGiL/5f93rjjhYxCgGJk2wzv2KZ+zj6DINfqBneNtHIkFR5KCp+NgPws=
-SHA256 (Pkgfile) = c82b03e8485507349af85589c80ca69eb034cb9f6014093bc74f38218cb8f3fc
+RWSE3ohX2g5d/bxmcfp0Bqa54TknskVqzXRKhSRwdO2yV8hMe5GPfEygmgnS2uJVS1gz6Q/biQu/SnqxGN3HJUvoXQane3qwZA4=
+SHA256 (Pkgfile) = 2adb71f6d43ae23bba569d88deafca5819e83a0f547b966df927050a6d42f9eb
 SHA256 (.footprint) = 784579f07f6eaa54e5c0afc6c19a0110f2f4a27d29a97c8a01bd9ee2f7a0ea48
-SHA256 (ImageMagick-7.0.7-15.tar.xz) = 9809be6bab0c5258721a5c5bbe8bccf61357b506024f8514d94e9efcd575a69d
+SHA256 (ImageMagick-7.0.7-18.tar.xz) = d4987d7dc394c302916c1f1471e58932cda99706d7595d3a2467e501d971e136
diff --git a/imagemagick/Pkgfile b/imagemagick/Pkgfile
index 969688b18..f02b91103 100644
--- a/imagemagick/Pkgfile
+++ b/imagemagick/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:  util-linux lcms2 pango xorg-libxt
 
 name=imagemagick
-version=7.0.7-15
+version=7.0.7-18
 release=1
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-$version.tar.xz)
 

From crux at crux.nu  Tue Jan  2 10:04:48 2018
From: crux at crux.nu (crux at crux.nu)
Date: Tue,  2 Jan 2018 10:04:48 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): whois: update to 5.2.20
Message-ID: <20180102100448.857FF1802CF@crux.nu>

commit 96f52f71270cfd371bd1dc401a1aded5cae88c35
Author: Juergen Daubert <jue at jue.li>
Date:   Tue Jan 2 11:04:10 2018 +0100

    whois: update to 5.2.20

diff --git a/whois/.md5sum b/whois/.md5sum
index 3df91d871..d4c453609 100644
--- a/whois/.md5sum
+++ b/whois/.md5sum
@@ -1 +1 @@
-ca75f511c9bcf78b294dac09324222f0  whois_5.2.19.tar.xz
+fb2ef193fb8a1f7c29271ee15e14c752  whois_5.2.20.tar.xz
diff --git a/whois/.signature b/whois/.signature
index f31d7b507..d5979337f 100644
--- a/whois/.signature
+++ b/whois/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/UE/WmK7XaezaMmO82psiZ7dQEY7W/OGvdXBwG1ffYC9hzNuD8XuXFwhuU8AiLC4enNTaCPY9pvtLdxWirdGIgI=
-SHA256 (Pkgfile) = 60399bd43bd6b280b9ba6f969c4d51b685f859a6731345f9578c2bf839b5c4ce
+RWSE3ohX2g5d/VJ6SCkLlrzTPm5VNgjPk035uL3sG50yc1wmgPlJqRoe9CJ3eJnmYr28X53AawbuQPoldY+sL0Ilh5bWMJyTvQQ=
+SHA256 (Pkgfile) = f2747bf1303815a6b38aa456a9f585d139220401438eb0a1f8fb26a15c01ed70
 SHA256 (.footprint) = 088320b1f1f562656da70993b637917de5d36c71004a3136af89c7ca093cf871
-SHA256 (whois_5.2.19.tar.xz) = 6c39a274fd73b87c0ce1e34dfbd1842a0b2ca7a00c97d4202d639ec010e1262c
+SHA256 (whois_5.2.20.tar.xz) = 6848ab671750ab3782fe4ab2a47910fe4e25aa93894e4d0f3f67b5fcee06c009
diff --git a/whois/Pkgfile b/whois/Pkgfile
index 0585d6e5a..b1a706c55 100644
--- a/whois/Pkgfile
+++ b/whois/Pkgfile
@@ -4,7 +4,7 @@
 # Packager:    Olle Gustafsson, ogg at linux dot se
 
 name=whois
-version=5.2.19
+version=5.2.20
 release=1
 source=(http://ftp.debian.org/debian/pool/main/w/$name/$name\_$version.tar.xz)
 

From crux at crux.nu  Tue Jan  2 10:04:48 2018
From: crux at crux.nu (crux at crux.nu)
Date: Tue,  2 Jan 2018 10:04:48 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): geeqie: update to 1.4
Message-ID: <20180102100448.89F0C1802DA@crux.nu>

commit d9c791c8d359ed4dccb4e82df17ec4049b604438
Author: Juergen Daubert <jue at jue.li>
Date:   Tue Jan 2 11:03:49 2018 +0100

    geeqie: update to 1.4

diff --git a/geeqie/.footprint b/geeqie/.footprint
index bbaa4b44b..386cbcaa5 100644
--- a/geeqie/.footprint
+++ b/geeqie/.footprint
@@ -7,6 +7,7 @@ drwxr-xr-x	root/root	usr/lib/geeqie/
 -rwxr-xr-x	root/root	usr/lib/geeqie/geeqie-rotate
 -rwxr-xr-x	root/root	usr/lib/geeqie/geeqie-symlink
 -rwxr-xr-x	root/root	usr/lib/geeqie/geeqie-ufraw
+-rwxr-xr-x	root/root	usr/lib/geeqie/geocode-parameters.awk
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/geeqie.desktop
diff --git a/geeqie/.md5sum b/geeqie/.md5sum
index 287ebb651..5d85592e8 100644
--- a/geeqie/.md5sum
+++ b/geeqie/.md5sum
@@ -1 +1 @@
-0339ad62946cae7009ec76ec21572065  geeqie-1.3.tar.xz
+52a4d387093e02182201b1cc02d99cc9  geeqie-1.4.tar.xz
diff --git a/geeqie/.signature b/geeqie/.signature
index 03278c04d..50d9089a1 100644
--- a/geeqie/.signature
+++ b/geeqie/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/fm4GBfE+Fdr/c7PMICQNRBThC0Tj1+ZjT+uqzRs0fhk+5BvaB/3aQvReLmerkRhwxSKGni1R4IqybPg2C0GZgw=
-SHA256 (Pkgfile) = 6a6d189c486ad12fe420658a573b18f6e6c7778f4cf08dcbf04a3d16dbc366a4
-SHA256 (.footprint) = 225ca418c1fcb1c0be9770d474999b04493b4a1d8ab4814ab545d8444ad51364
-SHA256 (geeqie-1.3.tar.xz) = 4b6f566dd1a8badac68c4353c7dd0f4de17f8627b85a7a70d5eb1ae3b540ec3f
+RWSE3ohX2g5d/UU/QZ6Z5O5Gh1Rvbk5mKmCYH4YZfOWb2muahfb79Jb8v0TKEQpqjaafwmYzOzNGMoL+0KLFQA2jM36OgpV00wk=
+SHA256 (Pkgfile) = 762c35188fee4bc5e6d91dd0e1ce373d1baa99fe236dad4ad46b3505765b5235
+SHA256 (.footprint) = 93037ff3c570489c268b6e87047108517ccf0d781e1ca21aa4f04faacbd63d50
+SHA256 (geeqie-1.4.tar.xz) = 5c583a165573ec37874c278f9dc57e73df356b30e09a9ccac3179dd5d97e3e32
diff --git a/geeqie/Pkgfile b/geeqie/Pkgfile
index 7bc4acf17..5aaf7d407 100644
--- a/geeqie/Pkgfile
+++ b/geeqie/Pkgfile
@@ -4,24 +4,25 @@
 # Depends on:  gtk
 
 name=geeqie
-version=1.3
-release=2
+version=1.4
+release=1
 source=(http://geeqie.org/$name-$version.tar.xz)
 
 build() {
     cd $name-$version
 
-    ./autogen.sh
+    sed -e '/HAVE_MARKDOWN/,/endif/d' -e '/^.PHONY:/,$d' -i Makefile.am
 
+    export LINGUAS=" "
     export CFLAGS="$CFLAGS $(pkg-config --cflags gtk+-2.0)"
     export LDFLAGS="$LDFLAGS $(pkg-config --libs gtk+-2.0)"
     export CXXFLAGS="$CXXFLAGS $CFLAGS"
 
+    ./autogen.sh
     ./configure --prefix=/usr --disable-gtk3
 
     make
     make DESTDIR=$PKG install
 
     sed -ri '/\[.+\]=/d' $PKG/usr/share/{geeqie/,}applications/*.desktop
-    rm -r $PKG/usr/share/{doc,locale}
 }

From crux at crux.nu  Tue Jan  2 10:24:05 2018
From: crux at crux.nu (crux at crux.nu)
Date: Tue,  2 Jan 2018 10:24:05 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): imagemagick: update to 7.0.7-19
Message-ID: <20180102102405.AC95D180086@crux.nu>

commit 3be824cb6166ea88a1a9445e523f60f26666831a
Author: Juergen Daubert <jue at jue.li>
Date:   Tue Jan 2 11:23:58 2018 +0100

    imagemagick: update to 7.0.7-19

diff --git a/imagemagick/.md5sum b/imagemagick/.md5sum
index 68b074963..51b35563e 100644
--- a/imagemagick/.md5sum
+++ b/imagemagick/.md5sum
@@ -1 +1 @@
-65d22fdbec9d2a885240f5721d3d68fe  ImageMagick-7.0.7-18.tar.xz
+65d747f5e01d2a854d5c743bb65fce69  ImageMagick-7.0.7-19.tar.xz
diff --git a/imagemagick/.signature b/imagemagick/.signature
index daa1fb36b..0106efd12 100644
--- a/imagemagick/.signature
+++ b/imagemagick/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/bxmcfp0Bqa54TknskVqzXRKhSRwdO2yV8hMe5GPfEygmgnS2uJVS1gz6Q/biQu/SnqxGN3HJUvoXQane3qwZA4=
-SHA256 (Pkgfile) = 2adb71f6d43ae23bba569d88deafca5819e83a0f547b966df927050a6d42f9eb
+RWSE3ohX2g5d/c2F1eOduDa9/AgNiwKbIGshv/jxzvlUJuY/TH+uOQNgSmYdqz1GBUHz2vDLYXs9Z8c3YBN+tWXKaRyFFO6X/Q4=
+SHA256 (Pkgfile) = ce8cd61252e12ac557e91d15fa810fe62aadf1a1614f323702f2fdb37640a729
 SHA256 (.footprint) = 784579f07f6eaa54e5c0afc6c19a0110f2f4a27d29a97c8a01bd9ee2f7a0ea48
-SHA256 (ImageMagick-7.0.7-18.tar.xz) = d4987d7dc394c302916c1f1471e58932cda99706d7595d3a2467e501d971e136
+SHA256 (ImageMagick-7.0.7-19.tar.xz) = 5f1156824c37e5dde6ec37c5b1c51d9806f6d0e97aeaeb1e6907d7aba15951d9
diff --git a/imagemagick/Pkgfile b/imagemagick/Pkgfile
index f02b91103..f480dc281 100644
--- a/imagemagick/Pkgfile
+++ b/imagemagick/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:  util-linux lcms2 pango xorg-libxt
 
 name=imagemagick
-version=7.0.7-18
+version=7.0.7-19
 release=1
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-$version.tar.xz)
 

From crux at crux.nu  Tue Jan  2 12:32:10 2018
From: crux at crux.nu (crux at crux.nu)
Date: Tue,  2 Jan 2018 12:32:10 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): newsboat: update to 2.10.2
Message-ID: <20180102123210.6434A180247@crux.nu>

commit 84da90321fad3a53fa5fb849d85dd4fe05d42ada
Author: Juergen Daubert <jue at jue.li>
Date:   Tue Jan 2 13:31:11 2018 +0100

    newsboat: update to 2.10.2

diff --git a/newsboat/.md5sum b/newsboat/.md5sum
index 21bb23bfb..9f057d215 100644
--- a/newsboat/.md5sum
+++ b/newsboat/.md5sum
@@ -1,3 +1,3 @@
-383cc0aae71061d87af9885743e69509  newsboat-2.10.1.tar.xz
-a908749483892145483fbb9ee19c5ea1  newsboat.1.gz
-688ff1d701b2f0efb053953cb4fe8957  podboat.1.gz
+122b4fa3b861b4acbd6cc48939c7650d  newsboat-2.10.2.tar.xz
+e7aa274d390fea3d56c0cf4da5fac1e9  newsboat.1.gz
+521bb36d781e072d46737dd236bd2019  podboat.1.gz
diff --git a/newsboat/.signature b/newsboat/.signature
index 4c7ede266..543f3179f 100644
--- a/newsboat/.signature
+++ b/newsboat/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Veik/3+vT6XGPEihNm1Rx0OEdvatQFD1LeglN/GiaXyu0d2XImeAheMqTbW4QGlS9a54xJcQpCqopvOedHoSwQ=
-SHA256 (Pkgfile) = 544f9c66818dd85a35556081fc6eb41acfae586937191e188549181eeb39141c
+RWSE3ohX2g5d/UXSICbMtdNyfcNm0YKmzk8sBuG3We0FEly40Am6A0gY5qsbzQff/XGQEVn2o7T0M482TiGNQucrTkQYtjdsBwM=
+SHA256 (Pkgfile) = 0e59550f75e4ef5c4664e962901e1841a6ae8b08fb2f34d7849c512096c812e9
 SHA256 (.footprint) = 06b39e043d56a32e79bc658c4ff55db7bd7766762838a1983998f9dd2a93bb3c
-SHA256 (newsboat-2.10.1.tar.xz) = 44d698284246ad82e32fa7cb7f07086fa1ef8406baab09d33321e1252f9cf8f5
-SHA256 (newsboat.1.gz) = 0267b1569455af31da8827316c200412243b3b4e2fab5ddbaf55c2625475bef0
-SHA256 (podboat.1.gz) = 5633e91fc77e8a3edc516b1cacc3c678d52cf2f4919558137aeeec5fcb1141d5
+SHA256 (newsboat-2.10.2.tar.xz) = fda6b44f5c3a23ce46c85b40a6f4f0257c024d79bb8de325aa2cd73d43ef96f4
+SHA256 (newsboat.1.gz) = fa2e1e0152f03516523ec7aa9a22d31a71ee1524180c1b25ff3711e4ed82cd6d
+SHA256 (podboat.1.gz) = 5a4a9c6cacb4deec7252dc150f5b99c10d638402a4da61d2848ef9a3e39855f4
diff --git a/newsboat/Pkgfile b/newsboat/Pkgfile
index 4ed2d6738..ecd4071f6 100644
--- a/newsboat/Pkgfile
+++ b/newsboat/Pkgfile
@@ -4,17 +4,21 @@
 # Depends on:  curl libxml2 sqlite3 stfl json-c
 
 name=newsboat
-version=2.10.1
+version=2.10.2
 release=1
 source=(https://newsboat.org/releases/$version/$name-$version.tar.xz
         newsboat.1.gz podboat.1.gz)
 
 build () {
     cd $name-$version
+
+    sed -e "s/-Werror//" -i Makefile
+
     export prefix=/usr
-    sed -i "s/-Werror//" Makefile
     ./config.sh
-    make DESTDIR=$PKG install
+    make newsboat podboat
+
+    install -d $PKG/usr/{bin,share/man/man1}
+    install -m 0755 newsboat podboat $PKG/usr/bin
     install -m 0644 $SRC/*.1.gz $PKG/usr/share/man/man1
-    rm -r $PKG/usr/share/{doc,locale}
 }
diff --git a/newsboat/newsboat.1.gz b/newsboat/newsboat.1.gz
index 8c2ea6627..418381ef0 100755
Binary files a/newsboat/newsboat.1.gz and b/newsboat/newsboat.1.gz differ
diff --git a/newsboat/podboat.1.gz b/newsboat/podboat.1.gz
index 75e0c5359..f25e1d6c9 100755
Binary files a/newsboat/podboat.1.gz and b/newsboat/podboat.1.gz differ

From crux at crux.nu  Wed Jan  3 17:26:09 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed,  3 Jan 2018 17:26:09 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): syslinux: adopted
Message-ID: <20180103172609.DC2B31801C5@crux.nu>

commit af67a7738df06bed06fc3641c4990e1fe1b0daba
Author: Matt Housh <jaeger at crux.ninja>
Date:   Wed Jan 3 11:26:04 2018 -0600

    syslinux: adopted

diff --git a/syslinux/.signature b/syslinux/.signature
index 437737364..c62177ccf 100644
--- a/syslinux/.signature
+++ b/syslinux/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/eZiXuumgNX3eSMchgQCw/NE4TS14sEEzNbMlfTTuBs1nX2Mk+YTfkkWSeXIrCN7zSvCam/QYQrvf6ecKzzWkQE=
-SHA256 (Pkgfile) = 0edd4145510c54f23e987c8497f89aa24ec188aba505a62b9d6db338b272eedf
+RWSE3ohX2g5d/W7yXX5lajHDAHjQZ7lKQwfBzJUR6C1JxvbLY+jOeYsUc4DbOTr8D2ClQdz2TQqIMZbNDFp/+wqbCcw8sv+ghwc=
+SHA256 (Pkgfile) = 4dd9ca986d37176881a3513a78e65782dbed8bf9913e5e5d6cb847a3d0ff8c3a
 SHA256 (.footprint) = 02274dae76db126c9a295d568a7463e86b354cff57a152a164af0a05b95876c8
 SHA256 (syslinux-6.03.tar.xz) = 26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e
 SHA256 (syslinux-Makefile.patch) = 433b9311b8aba30f868902d67bb5c7ba68e1fd9faf71bd6e23b1dcb646ac7e7c
diff --git a/syslinux/Pkgfile b/syslinux/Pkgfile
index fc767628f..1ea255fd5 100644
--- a/syslinux/Pkgfile
+++ b/syslinux/Pkgfile
@@ -1,7 +1,6 @@
 # Description: Collection of boot loaders for the Linux operating system
 # URL: http://syslinux.zytor.com/
-# Maintainer: Jose V Beneyto, sepen at crux dot nu
-# Packager: Jose V Beneyto, sepen at crux dot nu
+# Maintainer: Matt Housh, jaeger at crux dot ninja
 # Depends on: mtools perl python
 
 name=syslinux

From crux at crux.nu  Wed Jan  3 17:26:09 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed,  3 Jan 2018 17:26:09 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): startup-notification: adopted
Message-ID: <20180103172609.DF8831802BA@crux.nu>

commit f7fb558a4a0543c047fdd8ec8856d8d75e06b7e5
Author: Matt Housh <jaeger at crux.ninja>
Date:   Wed Jan 3 11:25:36 2018 -0600

    startup-notification: adopted

diff --git a/startup-notification/.signature b/startup-notification/.signature
index 66ad921bc..af84df517 100644
--- a/startup-notification/.signature
+++ b/startup-notification/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/d4eITQb6j+Gg1BlMwPyZfbdj1Dymb8zc7CP3n8lRADTgoADEuQv24Ow+G9pMsCEUzx47yrYQUMogsxAj63dGgc=
-SHA256 (Pkgfile) = 8c169f3dbd5226ae4f998e9b1afdc7a606c0434904722c864a9f3432dddeb848
+RWSE3ohX2g5d/f3zQeIlSWD65YBNV7bfTwd55AFmpN3sSM5Wi3qp61CknUZ2byt4rpMEpBlNAJnx4y1hH7RaqVxS41ytgCUb+wM=
+SHA256 (Pkgfile) = ebaebce0d5125ffcdd197ca81c37502ea436b055bcee35137a0ac771002fe06d
 SHA256 (.footprint) = 37c20dd6d3bc2db4a4619e7f0b01d8ea91767ba6a1a5a3e1085f47bf074efd03
 SHA256 (startup-notification-0.12.tar.gz) = 3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a
diff --git a/startup-notification/Pkgfile b/startup-notification/Pkgfile
index 571c6d0dc..de53c22f7 100644
--- a/startup-notification/Pkgfile
+++ b/startup-notification/Pkgfile
@@ -1,8 +1,7 @@
 # Description: Startup notification library.
 # URL: http://freedesktop.org/wiki/Software/startup-notification
-# Maintainer: Jose V Beneyto, sepen at crux dot nu
-# Packager: Simone Rota, sip at crux dot nu
-# Depends on: xorg-libxt, xorg-xcb-util
+# Maintainer: Matt Housh, jaeger at crux dot ninja
+# Depends on: xorg-libxt xorg-xcb-util
 
 name=startup-notification
 version=0.12

From crux at crux.nu  Wed Jan  3 17:26:09 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed,  3 Jan 2018 17:26:09 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): p5-xml-parser: adopted
Message-ID: <20180103172609.E37201802C2@crux.nu>

commit 321d81a979f99b605c8213c88cf8f73db8e4ec1d
Author: Matt Housh <jaeger at crux.ninja>
Date:   Wed Jan 3 11:25:04 2018 -0600

    p5-xml-parser: adopted

diff --git a/p5-xml-parser/.signature b/p5-xml-parser/.signature
index 4e7c86d07..4319e14dd 100644
--- a/p5-xml-parser/.signature
+++ b/p5-xml-parser/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/ZnQQ/cNpVoOP8zpJCP+WJcAXcLYfCDSbAlxpVXlvcRz8+no4d5B7ILu2xcC1QYph5KdTTHVn6ZuE2We0x0jNAM=
-SHA256 (Pkgfile) = 6697f288bd44f9b3cd861711a9b1767093f467b611f9d843666f1e1dd4209a16
+RWSE3ohX2g5d/YcNloHVlqLi4cpB+k+8PxFTBqwSIM0sjr+JbE6ez6LyakHMa9X2NeCoDv7cdrRmasoaF6yRVzroBNu6ofMWLg4=
+SHA256 (Pkgfile) = 4ad95fceb07274be38ae1722eae07eec39f5a5114b048450591df3cbaec317df
 SHA256 (.footprint) = d23ed83e5f8eb1b9f1865e8de6634ffde0275d3c59a81bf94b9f575c32843e00
 SHA256 (XML-Parser-2.44.tar.gz) = 1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216
diff --git a/p5-xml-parser/Pkgfile b/p5-xml-parser/Pkgfile
index 8729f5761..0594de9e4 100644
--- a/p5-xml-parser/Pkgfile
+++ b/p5-xml-parser/Pkgfile
@@ -1,7 +1,6 @@
 # Description: XML::Parser
 # URL: http://search.cpan.org/dist/XML-Parser/
-# Maintainer: Jose V Beneyto, sepen at crux dot nu
-# Packager: Matt Housh, jaeger at morpheus dot net
+# Maintainer: Matt Housh, jaeger at crux dot ninja
 # Depends on: expat perl
 
 name=p5-xml-parser

From crux at crux.nu  Wed Jan  3 17:26:09 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed,  3 Jan 2018 17:26:09 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): mtools: adopted
Message-ID: <20180103172609.E6ADB1802C4@crux.nu>

commit 294c946818a60d8a7a74d0a5fca0c69516ddfc1a
Author: Matt Housh <jaeger at crux.ninja>
Date:   Wed Jan 3 11:24:34 2018 -0600

    mtools: adopted

diff --git a/mtools/.signature b/mtools/.signature
index 46e2d3b70..beda4d40e 100644
--- a/mtools/.signature
+++ b/mtools/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/bLlOpTyPtQwt/29DfWdTGWdnlVGt1K7+VBGmBlsVygT4jwwXVtSI6WATaECmcOn7FD44nrz7V0mRtF2s3lAlwE=
-SHA256 (Pkgfile) = e761ec8be32db1eaf62f655d5950f97acf1b5ebcaf32e4ebf36026ffa3b79d02
+RWSE3ohX2g5d/TLwVjMGC0Lm9+3akENLnYMLXdSfQ4LmyQIv+V4qYvgLY9kxSYXSCRJ2TgEdA2+XHQPAyeRksSB2JGI3nOCs/w8=
+SHA256 (Pkgfile) = a89852f9fd4212f8f7653ece84a33a331fe6e92ec88136d0447e7f7c7abdbcb2
 SHA256 (.footprint) = 44daf4a030fc21b41b127e6463340a35cad796fd9fe8b3ae22eeeead1e2938a5
 SHA256 (mtools-4.0.18.tar.bz2) = 59e9cf80885399c4f229e5d87e49c0c2bfeec044e1386d59fcd0b0aead6b2f85
diff --git a/mtools/Pkgfile b/mtools/Pkgfile
index c995e0a09..415fbf1b6 100644
--- a/mtools/Pkgfile
+++ b/mtools/Pkgfile
@@ -1,8 +1,6 @@
 # Description: Utilities to access MS-DOS disks without mounting them
 # URL: http://mtools.linux.lu/
-# Maintainer: Jose V Beneyto, sepen at crux dot nu
-# Packager: Jose V Beneyto, sepen at crux dot nu
-# Depends on:
+# Maintainer: Matt Housh, jaeger at crux dot ninja
 
 name=mtools
 version=4.0.18

From crux at crux.nu  Wed Jan  3 17:26:09 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed,  3 Jan 2018 17:26:09 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): gl-select: adopted
Message-ID: <20180103172609.E9A3F1802CF@crux.nu>

commit 82404b9befed9114ad2ce5c0e13cb3a46d798bcd
Author: Matt Housh <jaeger at crux.ninja>
Date:   Wed Jan 3 11:23:53 2018 -0600

    gl-select: adopted

diff --git a/gl-select/.signature b/gl-select/.signature
index a5fe319b2..4e855b646 100644
--- a/gl-select/.signature
+++ b/gl-select/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Y1UkC9aozZJombFjxgNPt0QTAHCg1lwn+rNMc37/hEAUISdetIbJich+P0s+K+dN/0KutIen/UOed6kxAiIvgo=
-SHA256 (Pkgfile) = 02db4733c7b3c91e8289f7bb10ff8a2edee78b920689872a6b0fc7c647fd1d91
+RWSE3ohX2g5d/SdMGaGdB7GncJeB1jPADv2y05RM1wZBi4xfs+rXz2tPq9IGUZe0TFtoPbLzZu3MR75A6JsLYQiGS65aYwX3NAc=
+SHA256 (Pkgfile) = b386a54ec44bc53d0c734396aa18769d8e4898a00b97f914d431c2d2d121c393
 SHA256 (.footprint) = 92dddd0da07f7ce880208f2bd1cd2e67109454d82a0d2fc298a9e856cfc6ef12
 SHA256 (gl-select) = 2354b01578d52209a8cf374ac5c00216b8f17f59469a1fbc105cbcfb5792761b
diff --git a/gl-select/Pkgfile b/gl-select/Pkgfile
index 9914ab558..ad8f66077 100644
--- a/gl-select/Pkgfile
+++ b/gl-select/Pkgfile
@@ -1,7 +1,6 @@
 # Description: A selector for gl/glx libraries and extensions
-# URL: http://crux.nu/gitweb/?p=ports/opt.git;a=tree;f=gl-select 
-# Maintainer: Jose V Beneyto, sepen at crux dot nu
-# Packager: Matt Housh, jaeger at morpheus dot net
+# URL: http://crux.nu/gitweb/?p=ports/opt.git;a=tree;f=gl-select
+# Maintainer: Matt Housh, jaeger at crux dot ninja
 # Depends on: xorg-server
 
 name=gl-select

From crux at crux.nu  Wed Jan  3 17:26:09 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed,  3 Jan 2018 17:26:09 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): dosfstools: adopted,
 updated to version 4.1
Message-ID: <20180103172609.ED3E61802D5@crux.nu>

commit 7245688706f200ea8e442f5d80db6f65429a176c
Author: Matt Housh <jaeger at crux.ninja>
Date:   Wed Jan 3 11:22:56 2018 -0600

    dosfstools: adopted, updated to version 4.1

diff --git a/dosfstools/.md5sum b/dosfstools/.md5sum
index 878a2f595..8d8b9308d 100644
--- a/dosfstools/.md5sum
+++ b/dosfstools/.md5sum
@@ -1 +1 @@
-20f8388b99702f276c973d228c7cff45  dosfstools-4.0.tar.xz
+07a1050db1a898e9a2e03b0c4569c4bd  dosfstools-4.1.tar.xz
diff --git a/dosfstools/.signature b/dosfstools/.signature
index 3d0aff165..a588bb2e9 100644
--- a/dosfstools/.signature
+++ b/dosfstools/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/YJz5dv+uAorH+9oOWYnLTcqs2batJtH6VFfcemZ0vjK61stdrdAS34N1/tVBEOAPhgGkBY+rjwLty9oHBlwtQM=
-SHA256 (Pkgfile) = 4bffdef6ca4f9a9743bd6da267ebbfddfeb9a88ecd218e66290e199a3638c4fe
+RWSE3ohX2g5d/bEWIKEQFABVkyt8LC91QAwDROt1/FjnOjQY1XSipKj5WZw4cpMSOfHvJxLe4JE+pq3MOWXCkgPNHpDQVFOAOw0=
+SHA256 (Pkgfile) = 882f2ff83b792540c61f277264c6686408d00d1cf373928d6569c403cf481bd8
 SHA256 (.footprint) = e85dfee42a906d7130f48419d62f2257299128785e8b1a81e26cebf183d91aad
-SHA256 (dosfstools-4.0.tar.xz) = 9037738953559d1efe04fc5408b6846216cc0138f7f9d32de80b6ec3c35e7daf
+SHA256 (dosfstools-4.1.tar.xz) = e6b2aca70ccc3fe3687365009dd94a2e18e82b688ed4e260e04b7412471cc173
diff --git a/dosfstools/Pkgfile b/dosfstools/Pkgfile
index f2be37419..e37a917a3 100644
--- a/dosfstools/Pkgfile
+++ b/dosfstools/Pkgfile
@@ -1,11 +1,9 @@
 # Description: tools for creating and checking DOS filesystems in linux
 # URL: https://github.com/dosfstools/dosfstools
-# Maintainer: Jose V Beneyto, sepen at crux dot nu
-# Packager: Ryan B. Lynch, rlynch at strozllc dot com
-# Depends on:
+# Maintainer: Matt Housh, jaeger at crux dot ninja
 
 name=dosfstools
-version=4.0
+version=4.1
 release=1
 source=(https://github.com/dosfstools/dosfstools/releases/download/v$version/$name-$version.tar.xz)
 

From crux at crux.nu  Wed Jan  3 17:26:09 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed,  3 Jan 2018 17:26:09 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): desktop-file-utils: adopted,
 updated to version 0.23
Message-ID: <20180103172609.F01331802D7@crux.nu>

commit 9a5e368764112e7294f1b949eb65f57dfaa5ea4b
Author: Matt Housh <jaeger at crux.ninja>
Date:   Wed Jan 3 11:21:59 2018 -0600

    desktop-file-utils: adopted, updated to version 0.23

diff --git a/desktop-file-utils/.md5sum b/desktop-file-utils/.md5sum
index 0575df7a8..b3b4a1f73 100644
--- a/desktop-file-utils/.md5sum
+++ b/desktop-file-utils/.md5sum
@@ -1 +1 @@
-c6b9f9aac1ea143091178c23437e6cd0  desktop-file-utils-0.22.tar.xz
+599133d51cc9a41bfec186414906b6f1  desktop-file-utils-0.23.tar.xz
diff --git a/desktop-file-utils/.signature b/desktop-file-utils/.signature
index 3dd852c0b..05b64f4d7 100644
--- a/desktop-file-utils/.signature
+++ b/desktop-file-utils/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/byyy1IWs2J9+HRvXwPjJppR4J8lRIkPpufAx5EySKv5WQQ7P00CSAt/+JtCMQG2RLwt6d+oZWQOZC32p/7XQAs=
-SHA256 (Pkgfile) = c6f00111c384f4dba2e5ba4a5157e8639717bd575fa49295f540095fc6fc7a17
+RWSE3ohX2g5d/aqUpvFcw2cLGtsTPNeVDsDwez6tIR2SWnosbBHBw6NlscataQmpFzDj5DR3yBOz3Treqn6UwQjO4lAssE/AwAk=
+SHA256 (Pkgfile) = ff878afd67b72c5cda266f0ac18188f8627eea00397a043b0a3dcf86388b17e0
 SHA256 (.footprint) = d8eb7f9394d2d08b4128b556f95472380942eaf689923d886131349f1d195ee6
-SHA256 (desktop-file-utils-0.22.tar.xz) = 843532672692f98e9b2d6ae6cc8658da562dfde1606c7f33d9d227a344de56c5
+SHA256 (desktop-file-utils-0.23.tar.xz) = 6c094031bdec46c9f621708f919084e1cb5294e2c5b1e4c883b3e70cb8903385
diff --git a/desktop-file-utils/Pkgfile b/desktop-file-utils/Pkgfile
index d8cd6aeee..a0f85ed18 100644
--- a/desktop-file-utils/Pkgfile
+++ b/desktop-file-utils/Pkgfile
@@ -1,19 +1,18 @@
 # Description: Command-line utilities for working with desktop entries
 # URL: http://www.freedesktop.org/software/desktop-file-utils/
-# Maintainer: Jose V Beneyto, sepen at crux dot nu
-# Packager: Matt Housh, jaeger at morpheus dot net
+# Maintainer: Matt Housh, jaeger at crux dot ninja
 # Depends on: glib pkg-config
 
 name=desktop-file-utils
-version=0.22
-release=2
+version=0.23
+release=1
 source=(http://freedesktop.org/software/$name/releases/$name-$version.tar.xz)
 
 build() {
 	cd $name-$version
 
 	./configure --prefix=/usr
-	
+
 	make
 	make DESTDIR=$PKG install
 }

From crux at crux.nu  Thu Jan  4 12:56:41 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu,  4 Jan 2018 12:56:41 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): flash-player-plugin: update to
 28.0.0.126
Message-ID: <20180104125641.43EFA180247@crux.nu>

commit 9d3fdf94ddfd99632393692dfe8ae0e92402cdb9
Author: Juergen Daubert <jue at jue.li>
Date:   Thu Jan 4 13:56:18 2018 +0100

    flash-player-plugin: update to 28.0.0.126

diff --git a/flash-player-plugin/.md5sum b/flash-player-plugin/.md5sum
index 2a128362a..78fd1fba9 100644
--- a/flash-player-plugin/.md5sum
+++ b/flash-player-plugin/.md5sum
@@ -1 +1 @@
-3d11370a07914be7a9794e08daa1082a  flash-player-npapi-27.0.0.187-release.x86_64.rpm
+018c1144a31b5fce961c10e13a1c7167  flash-player-npapi-28.0.0.126-release.x86_64.rpm
diff --git a/flash-player-plugin/.signature b/flash-player-plugin/.signature
index fbf90aa65..fad682843 100644
--- a/flash-player-plugin/.signature
+++ b/flash-player-plugin/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/VGE2GBaK6vSrnnPPoNpmC4xRUmA1oEU+HYp/BgKd30uBInH6POd6XqzBOf7Fn+xxtzZkxed0FuD2Nuw+crDbww=
-SHA256 (Pkgfile) = fb5f5612bd030022d51b3bab754c52ceeb75844369360b340768b0a6a98ae482
+RWSE3ohX2g5d/bP4GT/AFZcdWbxrDgeoG2QJSWmIh14//cm4LyxWMuuJy6Oqw5VU+h5El+gtObVM6g566Du7iTieT5ciafcLrAk=
+SHA256 (Pkgfile) = a45eab3b0f2c9a542dc1dc8ab038fbd894701c60aed1fb599036064ec9928d57
 SHA256 (.footprint) = 9bc6ecbc9ca40c49f8ac0db0024a96e10a49e188ae0402544f6b70ab32e7277f
-SHA256 (flash-player-npapi-27.0.0.187-release.x86_64.rpm) = 46f24961505dd402e3c63e45c4595355c0b06bd48dcbc46b8306c58aede960ed
+SHA256 (flash-player-npapi-28.0.0.126-release.x86_64.rpm) = 013f069dd268bda9ad0eaf1165d9b512d81e2c91584dfe0fdfcffe0b31d8d014
diff --git a/flash-player-plugin/Pkgfile b/flash-player-plugin/Pkgfile
index b10b317d7..ed930c78a 100644
--- a/flash-player-plugin/Pkgfile
+++ b/flash-player-plugin/Pkgfile
@@ -4,7 +4,7 @@
 # Packager: Matt Housh, jaeger at crux dot nu
 
 name=flash-player-plugin
-version=27.0.0.187
+version=28.0.0.126
 release=1
 source=(https://fpdownload.adobe.com/pub/flashplayer/pdc/$version/flash-player-npapi-$version-release.x86_64.rpm)
 

From crux at crux.nu  Thu Jan  4 12:56:41 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu,  4 Jan 2018 12:56:41 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): nano: update to 2.9.2
Message-ID: <20180104125641.472711802CA@crux.nu>

commit 34654c477953e831e7bf4ddacefb42ccca0f8ae4
Author: Juergen Daubert <jue at jue.li>
Date:   Thu Jan 4 13:55:51 2018 +0100

    nano: update to 2.9.2

diff --git a/nano/.md5sum b/nano/.md5sum
index 5ebeb42d2..7a07acfe2 100644
--- a/nano/.md5sum
+++ b/nano/.md5sum
@@ -1 +1 @@
-ecb29612c30996d0d1139b47d3a413ba  nano-2.9.1.tar.xz
+545b7b75c1a9c99f77bf3d938653617b  nano-2.9.2.tar.xz
diff --git a/nano/.signature b/nano/.signature
index a5769ca88..08ba4ddf6 100644
--- a/nano/.signature
+++ b/nano/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/X7QSSqwSynwVGVlEbvnuOxAgw/1gtNDJsy2RghaWNnY8o6d8kO7VARcCLX0WEBDdPziJ5nfinu6tEWJQhJ0SA0=
-SHA256 (Pkgfile) = ed320f40ae688ad80e4392599b9a0e9b38808c91a81dea748c58fe6123e96e92
+RWSE3ohX2g5d/XVLVvrXauLlJ9HDKsqcX01BoX9zEEBiZdqEEocZ28mC40da3q0Ct8FUzw+Rquyohu+q+SSpML9S2F4vcBNm4w4=
+SHA256 (Pkgfile) = 6923255091e1bdf76d05b4bddd559f1149bff1514d3e178cc521b9d0e1f7de35
 SHA256 (.footprint) = 6e65065e8bbaadfad31d89a3ec1820c7408848209b67edc34c5d1643df89ac1e
-SHA256 (nano-2.9.1.tar.xz) = 6316d52d0d26af3e79a13dcb4db1c7a4aeac61b37fd9381e801a4189a2ecba7c
+SHA256 (nano-2.9.2.tar.xz) = 4eccb7451b5729ce8abae8f9a5679f32e41ae58df73ea86b850ec45b10a83d55
diff --git a/nano/Pkgfile b/nano/Pkgfile
index 34023231b..b56b16f15 100644
--- a/nano/Pkgfile
+++ b/nano/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:  file ncurses
 
 name=nano
-version=2.9.1
+version=2.9.2
 release=1
 source=(http://www.nano-editor.org/dist/v${version%.*}/$name-$version.tar.xz)
 

From crux at crux.nu  Thu Jan  4 12:56:41 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu,  4 Jan 2018 12:56:41 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): samba: update to 4.7.4
Message-ID: <20180104125641.4CB3F1802D8@crux.nu>

commit 66ef344812fb7b1e4d357af48a3f8195fe46080e
Author: Juergen Daubert <jue at jue.li>
Date:   Thu Jan 4 13:54:49 2018 +0100

    samba: update to 4.7.4

diff --git a/samba/.footprint b/samba/.footprint
index 28cb868b9..0070cdf15 100644
--- a/samba/.footprint
+++ b/samba/.footprint
@@ -285,8 +285,8 @@ lrwxrwxrwx	root/root	usr/lib/samba/libkrb5-samba4.so.26 -> libkrb5-samba4.so.26.
 -rwxr-xr-x	root/root	usr/lib/samba/libkrb5-samba4.so.26.0.0
 -rwxr-xr-x	root/root	usr/lib/samba/libkrb5samba-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/libldb-cmdline-samba4.so
-lrwxrwxrwx	root/root	usr/lib/samba/libldb.so.1 -> libldb.so.1.2.2
--rwxr-xr-x	root/root	usr/lib/samba/libldb.so.1.2.2
+lrwxrwxrwx	root/root	usr/lib/samba/libldb.so.1 -> libldb.so.1.2.3
+-rwxr-xr-x	root/root	usr/lib/samba/libldb.so.1.2.3
 -rwxr-xr-x	root/root	usr/lib/samba/libldbsamba-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/liblibcli-lsa3-samba4.so
 -rwxr-xr-x	root/root	usr/lib/samba/liblibcli-netlogon3-samba4.so
diff --git a/samba/.md5sum b/samba/.md5sum
index 4827789b2..2c2282437 100644
--- a/samba/.md5sum
+++ b/samba/.md5sum
@@ -1,2 +1,3 @@
+163d01ae33948fc1e2e384b28f4c6cdc  kerberos_keytab.c.patch
 1869ebd29f3e277b405e3e4cd9423ccf  samba
-5da8a195094c44a60eb7eb7cf96d6a49  samba-4.7.3.tar.gz
+427e7feb988603c51f01c97803305fed  samba-4.7.4.tar.gz
diff --git a/samba/.signature b/samba/.signature
index a8c4d06c5..168d76cdc 100644
--- a/samba/.signature
+++ b/samba/.signature
@@ -1,6 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/YaXBL1DdgjuyXMS5JEijxKoqLnBiKe/hHYaSXKKchtN7aS/ihxn0ABrMXaGSuncUBr47X6k9aKJPrQpzB9q2gQ=
-SHA256 (Pkgfile) = 66a57ee4026a8b5b94eb6177f602f3c826081e4a8e045814e8765a719af39201
-SHA256 (.footprint) = 84edbc95dd9f518680c3fcb409338459d9c8783d9660d280b9297423c9e07bab
-SHA256 (samba-4.7.3.tar.gz) = 06e4152ca1cb803f005e92eb6baedb6cc874998b44ee37c2a7819e77a55bfd2c
+RWSE3ohX2g5d/cEwkm/Q9JrS6jlOZGohQHeQhbdBj3WWCk7oQLG4q5FnGLv1eh4ooUYx48CxtzM/jfa8o7wCsCnR66EiVq9SBwk=
+SHA256 (Pkgfile) = 70061a94673d0296e79a49b5c0ca854512976a32e7f41ab50d94b544df1c8a6d
+SHA256 (.footprint) = 3021111df1970c6210fbef3eab58f15d222c1f2c3affaae8122b958dc144ad5e
+SHA256 (samba-4.7.4.tar.gz) = fb12d0c4452f85b67b78bbeabd4c762d8feb8ff83e39d044d285120c2c488247
+SHA256 (kerberos_keytab.c.patch) = 39cb889128d1e6ee07af4c75da765957893e7d1f151376308b3005cb85266a75
 SHA256 (samba) = 75bccea892422b5aebe8d2f9ce9b9c42ddc3cbdeccfd16f3161c07c1eb3feff0
diff --git a/samba/Pkgfile b/samba/Pkgfile
index dde45693d..c009553dc 100644
--- a/samba/Pkgfile
+++ b/samba/Pkgfile
@@ -4,14 +4,17 @@
 # Depends on:  e2fsprogs libarchive tdb tevent libcap libaio popt
 
 name=samba
-version=4.7.3
+version=4.7.4
 release=1
 source=(https://www.samba.org/samba/ftp/stable/$name-$version.tar.gz \
-        samba)
+        kerberos_keytab.c.patch samba)
 
 build () {
     cd $name-$version
 
+    # revert patch because it breaks build without ads
+    patch -p1 -R -i $SRC/kerberos_keytab.c.patch
+
     ./configure --enable-fhs \
                 --prefix=/usr \
                 --libexecdir=/usr/lib \
diff --git a/samba/kerberos_keytab.c.patch b/samba/kerberos_keytab.c.patch
new file mode 100644
index 000000000..8c15f6eaf
--- /dev/null
+++ b/samba/kerberos_keytab.c.patch
@@ -0,0 +1,19 @@
+X-Git-Url: https://git.samba.org/samba.git/?p=samba.git;a=blobdiff_plain;f=source3%2Flibads%2Fkerberos_keytab.c;h=ffd100c5636b273b0a76e059dc76f1d93133f290;hp=ff12ec04af689b3f27de563138045824a64ca0f4;hb=aba1e9199ddb18c229bf0def46a7caf333d2d618;hpb=73d3e642f8c71177bc8f42afb6724a7f93ef5472
+
+diff --git a/source3/libads/kerberos_keytab.c b/source3/libads/kerberos_keytab.c
+index ff12ec0..ffd100c 100644
+--- a/source3/libads/kerberos_keytab.c
++++ b/source3/libads/kerberos_keytab.c
+@@ -639,7 +639,11 @@ int ads_keytab_list(const char *keytab_name)
+ 		return ret;
+ 	}
+ 
+-	ret = smb_krb5_kt_open(context, keytab_name, False, &keytab);
++	if (keytab_name == NULL) {
++		ret = ads_keytab_open(context, &keytab);
++	} else {
++		ret = smb_krb5_kt_open(context, keytab_name, False, &keytab);
++	}
+ 	if (ret) {
+ 		DEBUG(1, ("smb_krb5_kt_open failed (%s)\n",
+ 			  error_message(ret)));

From crux at crux.nu  Thu Jan  4 12:57:50 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu,  4 Jan 2018 12:57:50 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): neon: fix source URL
Message-ID: <20180104125750.7507B1802BA@crux.nu>

commit cae686c625f1ef78f2a6e33fbb5cccd13a54f08d
Author: Juergen Daubert <jue at jue.li>
Date:   Thu Jan 4 13:57:34 2018 +0100

    neon: fix source URL

diff --git a/neon/.signature b/neon/.signature
index b4f916a92..17122e63c 100644
--- a/neon/.signature
+++ b/neon/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/QhJVGX4AhkmiPk8HixUVyDk7l7QZu5GrjA7X/T7r+ntHnBDryzoiGjchkMyvX33H0PSsdg43h3AUcTY9MtUUAg=
-SHA256 (Pkgfile) = 631be31c2f129a095b0904630ca777796aad4d46a75abb6c6ec8e1533096d2f1
+RWSE3ohX2g5d/X3eLTm6hL2q9vNdB4ykNhm6JYuCXUs7NXqjJGCOYB9LjnXg6dqR0HrgUc75BItLHXau3LlQAjdy39t6PYuhXAU=
+SHA256 (Pkgfile) = c73e61970e40dd63f90814dd4882f234369bd75449d685dadc3ee839568a0d84
 SHA256 (.footprint) = 0e704b2e655fd5ff05ba76801bcc2917b60a4c00f3cb75ba8c5afcb0e81bb419
 SHA256 (neon-0.30.2.tar.gz) = db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
diff --git a/neon/Pkgfile b/neon/Pkgfile
index 80dd053a5..36b070f0e 100644
--- a/neon/Pkgfile
+++ b/neon/Pkgfile
@@ -7,7 +7,8 @@
 name=neon
 version=0.30.2
 release=2
-source=(http://www.webdav.org/$name/$name-$version.tar.gz)
+#source=(http://www.webdav.org/$name/$name-$version.tar.gz)
+source=(http://crux.s3.amazonaws.com/dist/$name-$version.tar.gz)
 
 build() {
     cd $name-$version

From crux at crux.nu  Thu Jan  4 21:31:43 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu,  4 Jan 2018 21:31:43 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): firefox: updated to 52.5.3esr
Message-ID: <20180104213143.B9F0518008D@crux.nu>

commit d1a641fb0d28b6f2f6532bdd895164f955b968ed
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Thu Jan 4 22:31:32 2018 +0100

    firefox: updated to 52.5.3esr

diff --git a/firefox/.md5sum b/firefox/.md5sum
index 2776a1c7e..3180f29d3 100644
--- a/firefox/.md5sum
+++ b/firefox/.md5sum
@@ -1,3 +1,3 @@
-63de50f3df8b6ba4f11e086a9efb5f48  firefox-52.5.2esr.source.tar.xz
+83cb993309bb62021b9772bf1f71571f  firefox-52.5.3esr.source.tar.xz
 afe61c7760e835bd12d5dfd40af4ec84  firefox-install-dir.patch
 cf6971669f70b440cb6ff8df8b2722ae  firefox.desktop
diff --git a/firefox/.signature b/firefox/.signature
index a1ef381f3..75517de23 100644
--- a/firefox/.signature
+++ b/firefox/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/SXajgdiDrLA7YGZ8RUECjS4rOlIL6Z2Wljquaqu7+BrwV+gC3b30dW7lrU6e/rIXsBI9+6Zs+8hQQGoaV2JXQo=
-SHA256 (Pkgfile) = 13e26faa88671efdd08f263ccf3adf7bc5c580e2cb77cf64bfd14c32e34d3fb4
+RWSE3ohX2g5d/YXwNbbYPDyr1Yvjd+Jn9MIS+sxIekUYX/eh5Xpz+VDTl4iXhQpfVGWGkW2wQsy0A2b16bFg6nOytBqWg8zSHws=
+SHA256 (Pkgfile) = ff4b5e69dbfea855a5d93675cda67cfd9e8890487a06ef20a5228e6a1f85b348
 SHA256 (.footprint) = 26e76f616728d1a3c25afd69d24ccf6a467b310ba11b00f050a67858b3add59e
-SHA256 (firefox-52.5.2esr.source.tar.xz) = 7b27825a7446f98e59296f4a46328c65913ffd50d839e0b4359b71ec7250ca4f
+SHA256 (firefox-52.5.3esr.source.tar.xz) = e42fba89277aceafc11475c237067e027b78193d8e7b07519a75ea0036b49c55
 SHA256 (firefox-install-dir.patch) = 32c0102521b7296627ba457575c742746400680c3aecd18be8b1b382dccdc0ce
 SHA256 (firefox.desktop) = 8ba3439f3dfc5cab883641969c93d8d15f8f20d7188d9568346b2edad52d6f91
diff --git a/firefox/Pkgfile b/firefox/Pkgfile
index 7dd9062d6..3d0a0c1da 100644
--- a/firefox/Pkgfile
+++ b/firefox/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: nss, autoconf-2.13, unzip, zip, libidl, gtk, gtk3, alsa-lib, xorg-libxt, yasm
  
 name=firefox
-version=52.5.2esr
+version=52.5.3esr
 release=1
 source=(https://ftp.mozilla.org/pub/firefox/releases/$version/source/firefox-$version.source.tar.xz
 	firefox-install-dir.patch firefox.desktop)

From crux at crux.nu  Fri Jan  5 11:55:33 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri,  5 Jan 2018 11:55:33 +0000 (UTC)
Subject: [crux-commits] ports/core (3.3): iproute2: don't link against libelf
Message-ID: <20180105115533.0F3631801BE@crux.nu>

commit 78d8ea148283db26c209a536b3987f3a25b11189
Author: Juergen Daubert <jue at jue.li>
Date:   Fri Jan 5 12:54:49 2018 +0100

    iproute2: don't link against libelf

diff --git a/iproute2/.signature b/iproute2/.signature
index 60918f8c..4f49af7c 100644
--- a/iproute2/.signature
+++ b/iproute2/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqss3WWJQglVFyNsZ8HUFZVKTSeJ7iU12hfKw+8yBX4JPCYBcr4ymEAKebVhG0drGjGNdpW+/Gne63MmF7yN+3Aw=
-SHA256 (Pkgfile) = 88e963a187a8e03de80d274d8a53e74587b704cb9039385f37f54a03db1f4f18
+RWRJc1FUaeVeqo1+rL63QDPIwra9Ky40mDoJodMPazcF3qomVE++zSr4rB/6wGZNyscq+JspAZwwr5rOg7waI83fSgxDqjw15gI=
+SHA256 (Pkgfile) = 9e0a3fe6c51cb9f6d27066a191f328f3529d442591ce3b1282e18940f8d5deb6
 SHA256 (.footprint) = b558acee208c8b86b091f6e8934409791e3d336bed2bf18868ccba04990531af
 SHA256 (iproute2-4.14.1.tar.xz) = d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067
 SHA256 (lo.iproute2) = ce94fcf414aa11927a66a221af14180f125f4efbf985dd4db9a1b43dad9cbcc7
diff --git a/iproute2/Pkgfile b/iproute2/Pkgfile
index 9783cbc8..ba52f0f4 100644
--- a/iproute2/Pkgfile
+++ b/iproute2/Pkgfile
@@ -5,15 +5,18 @@
 
 name=iproute2
 version=4.14.1
-release=1
+release=2
 source=(https://www.kernel.org/pub/linux/utils/net/$name/$name-$version.tar.xz \
         lo.iproute2 net.iproute2)
 
 build() {
     cd $name-$version
 
+    # don't link against libelf
+    sed -e '/^check_elf$/d' -i configure
+
     ./configure
-    make -j1 HAVE_ELF="n" CCOPTS="$CFLAGS"
+    make -j1 CCOPTS="$CFLAGS"
     make -j1 MANDIR=/usr/share/man DESTDIR=$PKG install
 
     rm -r $PKG/usr/share/doc

From crux at crux.nu  Fri Jan  5 12:13:27 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri,  5 Jan 2018 12:13:27 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): mod_php: update to 5.6.33
Message-ID: <20180105121327.A7F13180229@crux.nu>

commit fed1181b24db0e916d802799bb6a7fd2a390c681
Author: Juergen Daubert <jue at jue.li>
Date:   Fri Jan 5 13:12:14 2018 +0100

    mod_php: update to 5.6.33

diff --git a/mod_php/.md5sum b/mod_php/.md5sum
index e435256b2..8d427149c 100644
--- a/mod_php/.md5sum
+++ b/mod_php/.md5sum
@@ -1 +1 @@
-660cd5bc0f16eaad655b7815c757aadc  php-5.6.32.tar.xz
+ca5d8f4b2b8c19519e495ecfed625ffa  php-5.6.33.tar.xz
diff --git a/mod_php/.signature b/mod_php/.signature
index 53143ee88..01f050ad3 100644
--- a/mod_php/.signature
+++ b/mod_php/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/cpjoTL64s1XGvCHUJBjzYwfNvPQeuC8M1tvN3u/6S7OEaJagMTp5yxdcn0foIMN5835SVV6QwO/g0w4bC7O8QY=
-SHA256 (Pkgfile) = afb44852c01b2d2b0f1825e2bcc2def3295e6f05b39d8f3e87d59d95b93b966f
+RWSE3ohX2g5d/ZPUFkc0JovTFgUyElWzXGwKi0lQElC+jkDkeBfq5WYRRAdsJVkNnVz4GM1R7Pui4h+oqZC+aidGZuIZe9HVwQ4=
+SHA256 (Pkgfile) = 290189806d4473289b17c9ba0600e720e91830d9ab5f119e7785cd53143c355a
 SHA256 (.footprint) = c964ecc21b4b699f0bd50a1ce6c2ef4dbd57291b2c11a0b2eab93ae056f2a1e4
-SHA256 (php-5.6.32.tar.xz) = 8c2b4f721c7475fb9eabda2495209e91ea933082e6f34299d11cba88cd76e64b
+SHA256 (php-5.6.33.tar.xz) = 9004995fdf55f111cd9020e8b8aff975df3d8d4191776c601a46988c375f3553
diff --git a/mod_php/Pkgfile b/mod_php/Pkgfile
index 87dbe7fec..a82564afc 100644
--- a/mod_php/Pkgfile
+++ b/mod_php/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  apache
 
 name=mod_php
-version=5.6.32
+version=5.6.33
 release=1
 source=(http://php.net/distributions/php-$version.tar.xz)
 

From crux at crux.nu  Fri Jan  5 12:13:27 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri,  5 Jan 2018 12:13:27 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): php-sqlite3: update to 5.6.33
Message-ID: <20180105121327.AB2BD1802D5@crux.nu>

commit 5c9d2479154fe1bfffcd60d218f329517d0edec3
Author: Juergen Daubert <jue at jue.li>
Date:   Fri Jan 5 13:11:56 2018 +0100

    php-sqlite3: update to 5.6.33

diff --git a/php-sqlite3/.md5sum b/php-sqlite3/.md5sum
index e435256b2..8d427149c 100644
--- a/php-sqlite3/.md5sum
+++ b/php-sqlite3/.md5sum
@@ -1 +1 @@
-660cd5bc0f16eaad655b7815c757aadc  php-5.6.32.tar.xz
+ca5d8f4b2b8c19519e495ecfed625ffa  php-5.6.33.tar.xz
diff --git a/php-sqlite3/.signature b/php-sqlite3/.signature
index e2b72c317..6d846812c 100644
--- a/php-sqlite3/.signature
+++ b/php-sqlite3/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/fjklGqmHcLQXiNdgJkFov7yrZbmz+KXUyl2y2AYo6Pilw+Vn8Diks+bHiak9PsGtUzI5wNg5Cbpc76Cg5jVdw0=
-SHA256 (Pkgfile) = d3fca4f60498db3c457c07f3a8bba5d94eb422d32ec92550d6780b0a508eb726
+RWSE3ohX2g5d/RukDUi/CIrgd0Liz74ltmr4xDwt7DBtnaEmhvD+ueWcDBqgJ9Ym0gH52U2OPmuHx9/4J5jFwVioNALVoo8xCAA=
+SHA256 (Pkgfile) = 74761ccc865a725799f89d53187bf8085709907c3cf9595f6ffdb45870571cdd
 SHA256 (.footprint) = e626528b1bc2b3ce187cc979172f24c489075e0bc584aeb1d082b2f7197d6e49
-SHA256 (php-5.6.32.tar.xz) = 8c2b4f721c7475fb9eabda2495209e91ea933082e6f34299d11cba88cd76e64b
+SHA256 (php-5.6.33.tar.xz) = 9004995fdf55f111cd9020e8b8aff975df3d8d4191776c601a46988c375f3553
diff --git a/php-sqlite3/Pkgfile b/php-sqlite3/Pkgfile
index 6bb05d1d3..88da8c920 100644
--- a/php-sqlite3/Pkgfile
+++ b/php-sqlite3/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  sqlite3
 
 name=php-sqlite3
-version=5.6.32
+version=5.6.33
 release=1
 source=(http://php.net/distributions/php-$version.tar.xz)
 

From crux at crux.nu  Fri Jan  5 12:13:27 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri,  5 Jan 2018 12:13:27 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): php-sockets: update to 5.6.33
Message-ID: <20180105121327.AE2D01802DA@crux.nu>

commit 1cc444e5db4e60298f125e03d1ab80613c59ca7c
Author: Juergen Daubert <jue at jue.li>
Date:   Fri Jan 5 13:11:40 2018 +0100

    php-sockets: update to 5.6.33

diff --git a/php-sockets/.md5sum b/php-sockets/.md5sum
index e435256b2..8d427149c 100644
--- a/php-sockets/.md5sum
+++ b/php-sockets/.md5sum
@@ -1 +1 @@
-660cd5bc0f16eaad655b7815c757aadc  php-5.6.32.tar.xz
+ca5d8f4b2b8c19519e495ecfed625ffa  php-5.6.33.tar.xz
diff --git a/php-sockets/.signature b/php-sockets/.signature
index 3cc4be005..67536d329 100644
--- a/php-sockets/.signature
+++ b/php-sockets/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/SDDDjW9I/tDIf/2mb1ys1nVMwUlAjM9440jaIwLv3zstX9aproV8cwkGu0dMTXI2D8IuRCvO/2DPfU4lXv6aQc=
-SHA256 (Pkgfile) = 9879a413836a2a0f135a35c183d833077c0e0bd6c660f6e6c9cbede9cc02a2f0
+RWSE3ohX2g5d/eLZtQupdEYpVdOhLgJd3+76KbJ7n0D7mEHwauseaAamK4qn4cICQ85j33u4F0VkYRwjxLiQbSaVsnQbmc6AigI=
+SHA256 (Pkgfile) = c109bcd40ec5e3a053fe6a9fa1faef75860da85aa83cee8b7723d310661fc806
 SHA256 (.footprint) = 1a0e33807dcda8d11408be8b6356860cac8daea5a94d4e9a87e535fbf778f04e
-SHA256 (php-5.6.32.tar.xz) = 8c2b4f721c7475fb9eabda2495209e91ea933082e6f34299d11cba88cd76e64b
+SHA256 (php-5.6.33.tar.xz) = 9004995fdf55f111cd9020e8b8aff975df3d8d4191776c601a46988c375f3553
diff --git a/php-sockets/Pkgfile b/php-sockets/Pkgfile
index 7771f0625..1203fe3d1 100644
--- a/php-sockets/Pkgfile
+++ b/php-sockets/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: 
 
 name=php-sockets
-version=5.6.32
+version=5.6.33
 release=1
 source=(http://www.php.net/distributions/php-$version.tar.xz)
 

From crux at crux.nu  Fri Jan  5 12:13:27 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri,  5 Jan 2018 12:13:27 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): php-mysql: update to 5.6.33
Message-ID: <20180105121327.B16C91802DE@crux.nu>

commit be6c43092525fe0a03fd15cf47d652d1fd51cea3
Author: Juergen Daubert <jue at jue.li>
Date:   Fri Jan 5 13:11:29 2018 +0100

    php-mysql: update to 5.6.33

diff --git a/php-mysql/.md5sum b/php-mysql/.md5sum
index e435256b2..8d427149c 100644
--- a/php-mysql/.md5sum
+++ b/php-mysql/.md5sum
@@ -1 +1 @@
-660cd5bc0f16eaad655b7815c757aadc  php-5.6.32.tar.xz
+ca5d8f4b2b8c19519e495ecfed625ffa  php-5.6.33.tar.xz
diff --git a/php-mysql/.signature b/php-mysql/.signature
index 88f542c50..7cb3b18af 100644
--- a/php-mysql/.signature
+++ b/php-mysql/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/acZ2fHXRALpCA7kLhMvPHqS3/J7FjcmEsvK63L/+ISOS19pv3GYvGSKealMsbYxF0wiZkEUP9A/wVFyB/ZBDQw=
-SHA256 (Pkgfile) = da5adde362e50ab28ba23b59fca7445d4f4d9d5aae98a8424c54e89558db47c5
+RWSE3ohX2g5d/WjxGpcb+EA5nGHbrYTLa7dKPsrxJS/RByyfNOSgoEipGKBZzQbWdwvh3EpYWwaZd9Xzl2sY/zPe8L9kkRRJAQo=
+SHA256 (Pkgfile) = a12fb1ebdb740ba151a63171bdabb6f266ae9c49126f8abb6591035a76f5f3ed
 SHA256 (.footprint) = 4dd3e707e3020b35147ba1ebdf629cbeaa4da75c01c769261626a1d91e0e5f0e
-SHA256 (php-5.6.32.tar.xz) = 8c2b4f721c7475fb9eabda2495209e91ea933082e6f34299d11cba88cd76e64b
+SHA256 (php-5.6.33.tar.xz) = 9004995fdf55f111cd9020e8b8aff975df3d8d4191776c601a46988c375f3553
diff --git a/php-mysql/Pkgfile b/php-mysql/Pkgfile
index c57132ac9..9c867315f 100644
--- a/php-mysql/Pkgfile
+++ b/php-mysql/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  mysql
 
 name=php-mysql
-version=5.6.32
+version=5.6.33
 release=1
 source=(http://php.net/distributions/php-$version.tar.xz)
 

From crux at crux.nu  Fri Jan  5 12:13:27 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri,  5 Jan 2018 12:13:27 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): php-gettext: update to 5.6.33
Message-ID: <20180105121327.B5771180305@crux.nu>

commit b5f641456094b466db9b3d80a7bbe0dc4ad41758
Author: Juergen Daubert <jue at jue.li>
Date:   Fri Jan 5 13:11:16 2018 +0100

    php-gettext: update to 5.6.33

diff --git a/php-gettext/.md5sum b/php-gettext/.md5sum
index e435256b2..8d427149c 100644
--- a/php-gettext/.md5sum
+++ b/php-gettext/.md5sum
@@ -1 +1 @@
-660cd5bc0f16eaad655b7815c757aadc  php-5.6.32.tar.xz
+ca5d8f4b2b8c19519e495ecfed625ffa  php-5.6.33.tar.xz
diff --git a/php-gettext/.signature b/php-gettext/.signature
index a1bc410ce..c7b5df6af 100644
--- a/php-gettext/.signature
+++ b/php-gettext/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/c+W3nJfCqqxvBVMDov2NTjYkNUvCcigtEDsZm2lX9augGQ04yo8q/dfym4DkfEfpqOmZdNBXfTdibSqquqEOw4=
-SHA256 (Pkgfile) = b9e96bb45d293e0d1ccfe7b8ba4ba9e16ab442d28442564cbf988aefce270d02
+RWSE3ohX2g5d/UtTJovUQKp7vP/1BugsH0u1pLR4C+ds0dgH8oe+jr3Biof4JlMY+7UgUlZMwrKQtBLoE2jwGfuY1B1PlBClDgc=
+SHA256 (Pkgfile) = 7c8f5fa5f1e2f6af143108890e01bbec80a0b5161c946e8c2ee7ff524b158e2d
 SHA256 (.footprint) = f2188408bdd37cf12c2eb9ef545b934e6a10d8faf52d3b961cd6c7649bdfaf9a
-SHA256 (php-5.6.32.tar.xz) = 8c2b4f721c7475fb9eabda2495209e91ea933082e6f34299d11cba88cd76e64b
+SHA256 (php-5.6.33.tar.xz) = 9004995fdf55f111cd9020e8b8aff975df3d8d4191776c601a46988c375f3553
diff --git a/php-gettext/Pkgfile b/php-gettext/Pkgfile
index ec8179ab4..3d63cb5de 100644
--- a/php-gettext/Pkgfile
+++ b/php-gettext/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:
 
 name=php-gettext
-version=5.6.32
+version=5.6.33
 release=1
 source=(http://www.php.net/distributions/php-$version.tar.xz)
 

From crux at crux.nu  Fri Jan  5 12:13:27 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri,  5 Jan 2018 12:13:27 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): php-gd: update to 5.6.33
Message-ID: <20180105121327.B84D618030A@crux.nu>

commit 6dbe28edfbb98af3b2d7f464f92203f273f4be2c
Author: Juergen Daubert <jue at jue.li>
Date:   Fri Jan 5 13:11:06 2018 +0100

    php-gd: update to 5.6.33

diff --git a/php-gd/.md5sum b/php-gd/.md5sum
index e435256b2..8d427149c 100644
--- a/php-gd/.md5sum
+++ b/php-gd/.md5sum
@@ -1 +1 @@
-660cd5bc0f16eaad655b7815c757aadc  php-5.6.32.tar.xz
+ca5d8f4b2b8c19519e495ecfed625ffa  php-5.6.33.tar.xz
diff --git a/php-gd/.signature b/php-gd/.signature
index a9ed5a310..aa27f1f58 100644
--- a/php-gd/.signature
+++ b/php-gd/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/eD6ErAtSiNCBylP6sFvp9pV7WViaCSArMgagUCF+WNyXOyAykmLppGP/gyI11y8FaiRfYMneZU9gUZZTweHCw4=
-SHA256 (Pkgfile) = 370ff1a870f5cf6ef789a4086db9a5178806ef5067254cb9981b1f1629cabeb5
+RWSE3ohX2g5d/apW8nOzisd/uD1cnZHzoYAO7kLbs8DZAqUyTQ2SPMiElMTcSLlBElXyMeKkFQYHHOknp8eZbCWrcO5dfqR++g4=
+SHA256 (Pkgfile) = 87ab0ec7e927f81b7f4bf7f890ffc5c809f62440b5f1a0ce1e9a1770f9df69a4
 SHA256 (.footprint) = 09e41333252c613bbc54155a95e91919aedf35e3fe90607f941528ac9f1a39bb
-SHA256 (php-5.6.32.tar.xz) = 8c2b4f721c7475fb9eabda2495209e91ea933082e6f34299d11cba88cd76e64b
+SHA256 (php-5.6.33.tar.xz) = 9004995fdf55f111cd9020e8b8aff975df3d8d4191776c601a46988c375f3553
diff --git a/php-gd/Pkgfile b/php-gd/Pkgfile
index 3c529a9a3..85c36878f 100644
--- a/php-gd/Pkgfile
+++ b/php-gd/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:  libgd
 
 name=php-gd
-version=5.6.32
+version=5.6.33
 release=1
 source=(http://www.php.net/distributions/php-$version.tar.xz)
 

From crux at crux.nu  Fri Jan  5 12:13:27 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri,  5 Jan 2018 12:13:27 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): php-ftp: update to 5.6.33
Message-ID: <20180105121327.BB6B418030B@crux.nu>

commit 26151bb7fdcfc2fe85ebd5204f7621d18fa739e8
Author: Juergen Daubert <jue at jue.li>
Date:   Fri Jan 5 13:10:51 2018 +0100

    php-ftp: update to 5.6.33

diff --git a/php-ftp/.md5sum b/php-ftp/.md5sum
index e435256b2..8d427149c 100644
--- a/php-ftp/.md5sum
+++ b/php-ftp/.md5sum
@@ -1 +1 @@
-660cd5bc0f16eaad655b7815c757aadc  php-5.6.32.tar.xz
+ca5d8f4b2b8c19519e495ecfed625ffa  php-5.6.33.tar.xz
diff --git a/php-ftp/.signature b/php-ftp/.signature
index 989546e4c..a56eea8d0 100644
--- a/php-ftp/.signature
+++ b/php-ftp/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/VGkjrSd7Q27kinlt/6ymsv6AUviEDVHrmcQb8ICQswhTPZJwGkbiBe/Wim4W0BRlYJ2j9HfrUTrOCjveaGzagg=
-SHA256 (Pkgfile) = ef6b26df116e8dfb1eb47679214007174ce091ae98286d8c5315e30b32b17bab
+RWSE3ohX2g5d/TDgMU/aRJVxgJGZqz0ldntgI+i7u7r2UezhKtbNPcDYXsy4NbmVAOiqKiV2KdoyI3sXtNOT9rZ0rf+WXhkcOQ8=
+SHA256 (Pkgfile) = dc083141d577ae0910ed2a6cc57f0f7dab6e9b2cb5abeeea86dbe8f182b72925
 SHA256 (.footprint) = 4b6e9e791f10bb007a541c6a4cfe6a189d549592939bdf3e04c5bd0f25a4bfa0
-SHA256 (php-5.6.32.tar.xz) = 8c2b4f721c7475fb9eabda2495209e91ea933082e6f34299d11cba88cd76e64b
+SHA256 (php-5.6.33.tar.xz) = 9004995fdf55f111cd9020e8b8aff975df3d8d4191776c601a46988c375f3553
diff --git a/php-ftp/Pkgfile b/php-ftp/Pkgfile
index 1bfffb434..1e400e367 100644
--- a/php-ftp/Pkgfile
+++ b/php-ftp/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:
 
 name=php-ftp
-version=5.6.32
+version=5.6.33
 release=1
 source=(http://www.php.net/distributions/php-$version.tar.xz)
 

From crux at crux.nu  Fri Jan  5 12:13:27 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri,  5 Jan 2018 12:13:27 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): php-fpm: update to 5.6.33
Message-ID: <20180105121327.BEE65180314@crux.nu>

commit 1f76eada5b5dcd43896267f9a1586102dbf6f748
Author: Juergen Daubert <jue at jue.li>
Date:   Fri Jan 5 13:10:41 2018 +0100

    php-fpm: update to 5.6.33

diff --git a/php-fpm/.md5sum b/php-fpm/.md5sum
index 54e159af6..43b08f8a5 100644
--- a/php-fpm/.md5sum
+++ b/php-fpm/.md5sum
@@ -1,2 +1,2 @@
-660cd5bc0f16eaad655b7815c757aadc  php-5.6.32.tar.xz
+ca5d8f4b2b8c19519e495ecfed625ffa  php-5.6.33.tar.xz
 954d95b7f645f3435815195aeeac6949  php-fpm
diff --git a/php-fpm/.signature b/php-fpm/.signature
index 572f3e6b1..cf7d5af71 100644
--- a/php-fpm/.signature
+++ b/php-fpm/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/UphGKH9ENr14S9jDgFmyxixrXDncgmlxvSsyYZUFw0hD/+CXoe1EFrgtAwObPgSPG5NqtivoCIFhGA3K+0MxAo=
-SHA256 (Pkgfile) = fec42c8ae64250b59d7191a5673ce4ef638a46eb0879415a38b4c6095d5d815e
+RWSE3ohX2g5d/a7mSyCDimIACyc3/TpySuPP4ZcnYf5+FJYL+KYwEC/WXcIDf0Kg3hJjlma2tHKzJpIjJ77q+OwVvIW/KWgY7AA=
+SHA256 (Pkgfile) = 4af9db42e3a50e57ecb1bbf4b7bd8429225b78d228e5b51c12d0690894d45b28
 SHA256 (.footprint) = 5b8ceed2150bdbf3d6cc01b0ef712a5c917367f58dd3181377af29ad11283be4
-SHA256 (php-5.6.32.tar.xz) = 8c2b4f721c7475fb9eabda2495209e91ea933082e6f34299d11cba88cd76e64b
+SHA256 (php-5.6.33.tar.xz) = 9004995fdf55f111cd9020e8b8aff975df3d8d4191776c601a46988c375f3553
 SHA256 (php-fpm) = a1fde2295e819a33d492cfdeca8d4e0e8de08b8d051c95c4758ba01da38354b7
diff --git a/php-fpm/Pkgfile b/php-fpm/Pkgfile
index 49b3137fe..2a2851402 100644
--- a/php-fpm/Pkgfile
+++ b/php-fpm/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  libpcre libxml2
 
 name=php-fpm
-version=5.6.32
+version=5.6.33
 release=1
 source=(http://php.net/distributions/php-$version.tar.xz
         php-fpm)

From crux at crux.nu  Fri Jan  5 12:13:27 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri,  5 Jan 2018 12:13:27 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): php-fcgi: update to 5.6.33
Message-ID: <20180105121327.C2250180315@crux.nu>

commit 15d0d9813877b4154b176626949722b7fe05253e
Author: Juergen Daubert <jue at jue.li>
Date:   Fri Jan 5 13:10:29 2018 +0100

    php-fcgi: update to 5.6.33

diff --git a/php-fcgi/.md5sum b/php-fcgi/.md5sum
index 91355fd2c..4d242ae92 100644
--- a/php-fcgi/.md5sum
+++ b/php-fcgi/.md5sum
@@ -1,2 +1,2 @@
-660cd5bc0f16eaad655b7815c757aadc  php-5.6.32.tar.xz
+ca5d8f4b2b8c19519e495ecfed625ffa  php-5.6.33.tar.xz
 cdaab91680ba17cbf31b21d1b64dcd6a  php-fcgi
diff --git a/php-fcgi/.signature b/php-fcgi/.signature
index 8fbaeb117..a03707a52 100644
--- a/php-fcgi/.signature
+++ b/php-fcgi/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/TSdhTPaX6p2T1RAB9YhWyEriYT5prt/dp/8QsraOmDPxFKGwyKtm9yii+sjKfecDzE8jYC2mwMnYZWRt3VVZA0=
-SHA256 (Pkgfile) = 29040fdde43474fe1a9ac0bc6ec8338f12570b6ccdce97b07fd7278620ece281
+RWSE3ohX2g5d/R0IRzv804VFk1rFNmBYrbT4tnAq6T6RUWoLfAXiY+ROZaI8DyNPqjV7R2Vd+smgY8Hm/BIftSPWq5Y76kQXlQs=
+SHA256 (Pkgfile) = de17e473f3d95f79a81d64307cfd51cc2bd6b83c64f14a73cf3be5c4688ef609
 SHA256 (.footprint) = 073d817f449e60b58f4c904bd4ef54ddad9bd0ab946ee178956622bf76d5501b
-SHA256 (php-5.6.32.tar.xz) = 8c2b4f721c7475fb9eabda2495209e91ea933082e6f34299d11cba88cd76e64b
+SHA256 (php-5.6.33.tar.xz) = 9004995fdf55f111cd9020e8b8aff975df3d8d4191776c601a46988c375f3553
 SHA256 (php-fcgi) = 058feaf2d8ad8ed61a4191512eb2151b8ed87fd92ce469ee8bab1812c0cb6471
diff --git a/php-fcgi/Pkgfile b/php-fcgi/Pkgfile
index 96cd58311..f1f9a745a 100644
--- a/php-fcgi/Pkgfile
+++ b/php-fcgi/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  libpcre libxml2
 
 name=php-fcgi
-version=5.6.32
+version=5.6.33
 release=1
 source=(http://php.net/distributions/php-$version.tar.xz
         php-fcgi)

From crux at crux.nu  Fri Jan  5 12:13:27 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri,  5 Jan 2018 12:13:27 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): [notify] php: update to 5.6.33
 (security fixes)
Message-ID: <20180105121327.C5B51180316@crux.nu>

commit d76927f3e0ce0b1bc1cd0e273997a8e5bdf8ebc2
Author: Juergen Daubert <jue at jue.li>
Date:   Fri Jan 5 13:10:00 2018 +0100

    [notify] php: update to 5.6.33 (security fixes)

diff --git a/php/.md5sum b/php/.md5sum
index e435256b2..8d427149c 100644
--- a/php/.md5sum
+++ b/php/.md5sum
@@ -1 +1 @@
-660cd5bc0f16eaad655b7815c757aadc  php-5.6.32.tar.xz
+ca5d8f4b2b8c19519e495ecfed625ffa  php-5.6.33.tar.xz
diff --git a/php/.signature b/php/.signature
index 615fa020d..37b0c03ba 100644
--- a/php/.signature
+++ b/php/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/QySuogNVhVfihuRHr5CoDYWacohr25biMFhSQnJaN5tNd/OYlcgq3JFbxUOf9VyaVwH7BFyIKQNPCfeBApcAAg=
-SHA256 (Pkgfile) = ce35c7231d12cb2e0b5ed2d971216dac8a8c06a2e44244c3722b5ac6c30f61ff
+RWSE3ohX2g5d/eIueJTTRNuDkMAVWA+V/LHERMd59QtPQDGfa3Oq/khknkrprkUUKxKfgWdhEIjUXVfIl1ShH2N+gZUZwuD7kgI=
+SHA256 (Pkgfile) = da8ee59f68dbb1bc266abd0521024784572633f98215336a7f3c08b95cb422b3
 SHA256 (.footprint) = 65e725950334ab8815dc34d555a1a963d49b0af8df57aabe4efba07854a69adc
-SHA256 (php-5.6.32.tar.xz) = 8c2b4f721c7475fb9eabda2495209e91ea933082e6f34299d11cba88cd76e64b
+SHA256 (php-5.6.33.tar.xz) = 9004995fdf55f111cd9020e8b8aff975df3d8d4191776c601a46988c375f3553
diff --git a/php/Pkgfile b/php/Pkgfile
index 4fb4fcba0..4783ed2d7 100644
--- a/php/Pkgfile
+++ b/php/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  libpcre libxml2 curl db gdbm
 
 name=php
-version=5.6.32
+version=5.6.33
 release=1
 source=(http://php.net/distributions/php-$version.tar.xz)
 

From crux at crux.nu  Fri Jan  5 20:58:32 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri,  5 Jan 2018 20:58:32 +0000 (UTC)
Subject: [crux-commits] ports/core (3.3): hdparm: updated to 9.53
Message-ID: <20180105205832.28CF718029B@crux.nu>

commit 765c28ae11c45d69f374ef82b6f6015b84c64aab
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Fri Jan 5 21:58:29 2018 +0100

    hdparm: updated to 9.53

diff --git a/hdparm/.md5sum b/hdparm/.md5sum
index 7f5fb8fd..8f1a16b4 100644
--- a/hdparm/.md5sum
+++ b/hdparm/.md5sum
@@ -1 +1 @@
-410539d0bf3cc247181594581edbfb53  hdparm-9.52.tar.gz
+1e54b52e0c8cb79389d4d47eacba411d  hdparm-9.53.tar.gz
diff --git a/hdparm/.signature b/hdparm/.signature
index 604d0338..b732b3d2 100644
--- a/hdparm/.signature
+++ b/hdparm/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqrHHy8kqYfOQJ6d6Dq+AQ+V2u+mhULZjUgyJfmjYBgpHQwJ+He9bCOVY0/OgOavUVImjK5ozlP9IG9quM4kErAY=
-SHA256 (Pkgfile) = d84d696f688b252542b48e2277958eddeaede497ba370ffc96b4074ceba5a699
+RWRJc1FUaeVeqh9KQGgCtQU2dZ0QZs+B88R0r/LHnbULJ52NsYa45a5txkSJ3vYPG9ugHVIX/I/9gUXo0nICjTk0SSyw3ucFIQM=
+SHA256 (Pkgfile) = b0f88a0eeafdc100aaf1f9e66c86a63bb22d39225499515d74fb3ee8c9d8c839
 SHA256 (.footprint) = 0de8c2735445fb40a795101e5a69a7f9ec2c3c016e119ec4adb365bbfe76dee6
-SHA256 (hdparm-9.52.tar.gz) = c3429cd423e271fa565bf584598fd751dd2e773bb7199a592b06b5a61cec4fb6
+SHA256 (hdparm-9.53.tar.gz) = 2673f591df6916c6a1faec07069a7eb1cb8ee307615a615d808192fb0c0265e5
diff --git a/hdparm/Pkgfile b/hdparm/Pkgfile
index c906e343..f10a01e0 100644
--- a/hdparm/Pkgfile
+++ b/hdparm/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=hdparm
-version=9.52
+version=9.53
 release=1
 source=(http://downloads.sourceforge.net/project/$name/$name/$name-$version.tar.gz)
 

From crux at crux.nu  Fri Jan  5 22:21:17 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri,  5 Jan 2018 22:21:17 +0000 (UTC)
Subject: [crux-commits] ports/core (3.4): binutils: updated to 2.29.1
Message-ID: <20180105222117.C150018027F@crux.nu>

commit d167e81764f8aac77c647340eeb15181f807e9c2
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Fri Jan 5 23:21:14 2018 +0100

    binutils: updated to 2.29.1

diff --git a/binutils/.footprint b/binutils/.footprint
index c6b8e226..055559f8 100644
--- a/binutils/.footprint
+++ b/binutils/.footprint
@@ -124,15 +124,15 @@ drwxr-xr-x	root/root	usr/lib/ldscripts/
 -rw-r--r--	root/root	usr/lib/ldscripts/i386linux.xn
 -rw-r--r--	root/root	usr/lib/ldscripts/i386linux.xr
 -rw-r--r--	root/root	usr/lib/ldscripts/i386linux.xu
--rwxr-xr-x	root/root	usr/lib/libbfd-2.27.so
+-rwxr-xr-x	root/root	usr/lib/libbfd-2.29.1.so
 -rw-r--r--	root/root	usr/lib/libbfd.a
 -rwxr-xr-x	root/root	usr/lib/libbfd.la
-lrwxrwxrwx	root/root	usr/lib/libbfd.so -> libbfd-2.27.so
+lrwxrwxrwx	root/root	usr/lib/libbfd.so -> libbfd-2.29.1.so
 -rw-r--r--	root/root	usr/lib/libiberty.a
--rwxr-xr-x	root/root	usr/lib/libopcodes-2.27.so
+-rwxr-xr-x	root/root	usr/lib/libopcodes-2.29.1.so
 -rw-r--r--	root/root	usr/lib/libopcodes.a
 -rwxr-xr-x	root/root	usr/lib/libopcodes.la
-lrwxrwxrwx	root/root	usr/lib/libopcodes.so -> libopcodes-2.27.so
+lrwxrwxrwx	root/root	usr/lib/libopcodes.so -> libopcodes-2.29.1.so
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
diff --git a/binutils/.md5sum b/binutils/.md5sum
deleted file mode 100644
index 6976a1c9..00000000
--- a/binutils/.md5sum
+++ /dev/null
@@ -1 +0,0 @@
-2869c9bf3e60ee97c74ac2a6bf4e9d68  binutils-2.27.tar.bz2
diff --git a/binutils/.signature b/binutils/.signature
index ce3e1403..2e38b4ca 100644
--- a/binutils/.signature
+++ b/binutils/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqrni1tW2tRnLpxIRUjBnB7n/F+1cIc/JtQtLBTS6ADQmWRvRGgrdVrMh9QCAdyUNSlkx4VzEnTXn1Rz8oRTcrgY=
-SHA256 (Pkgfile) = df16221d71039a7f5c5c98b53c24e8a8de0fa3c8c8cf349caea5406ac8acf5ec
-SHA256 (.footprint) = c107f4169c1e0ed4094f53a4d14ea58c27068f1ea505fcfb3fa76ee3c808849d
-SHA256 (binutils-2.27.tar.bz2) = 369737ce51587f92466041a97ab7d2358c6d9e1b6490b3940eb09fb0a9a6ac88
+RWRJc1FUaeVeqtffGMlZNPfNnwgnRRF9y7w18E1jRMgSr3gfIMRr2GkKIZ8XY2JuPJZl6sWd8z4mzbzOgbpEe6s3FaT6p8lyzQE=
+SHA256 (Pkgfile) = 999f9e65db76da852e1767aba061ba03afc9cf698f746ab58079d816c7ce0d25
+SHA256 (.footprint) = bded68031f96f980b7d3ac49ab1417011e7c6665744f3cee738932b0b93b9e0a
+SHA256 (binutils-2.29.1.tar.xz) = e7010a46969f9d3e53b650a518663f98a5dde3c3ae21b7d71e5e6803bc36b577
diff --git a/binutils/Pkgfile b/binutils/Pkgfile
index abe3d09d..6253c3d1 100644
--- a/binutils/Pkgfile
+++ b/binutils/Pkgfile
@@ -4,9 +4,9 @@
 # Depends on:  zlib flex
 
 name=binutils
-version=2.27
+version=2.29.1
 release=1
-source=(http://ftpmirror.gnu.org/gnu/$name/$name-$version.tar.bz2)
+source=(http://ftpmirror.gnu.org/gnu/$name/$name-$version.tar.xz)
 
 build() {
     sed -i '/^SUBDIRS/s/doc//' $name-$version/bfd/Makefile.in 

From crux at crux.nu  Sat Jan  6 16:02:47 2018
From: crux at crux.nu (crux at crux.nu)
Date: Sat,  6 Jan 2018 16:02:47 +0000 (UTC)
Subject: [crux-commits] ports/core (3.4): gdbm: update to 1.14.1
Message-ID: <20180106160247.78FC918030E@crux.nu>

commit e296d2ddcab14cc8488f7df7b998368df7ec594b
Author: Juergen Daubert <jue at jue.li>
Date:   Sat Jan 6 17:02:21 2018 +0100

    gdbm: update to 1.14.1

diff --git a/gdbm/.footprint b/gdbm/.footprint
index 93277bd2..eb66faed 100644
--- a/gdbm/.footprint
+++ b/gdbm/.footprint
@@ -10,9 +10,9 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libgdbm.a
 -rwxr-xr-x	root/root	usr/lib/libgdbm.la
-lrwxrwxrwx	root/root	usr/lib/libgdbm.so -> libgdbm.so.4.0.0
-lrwxrwxrwx	root/root	usr/lib/libgdbm.so.4 -> libgdbm.so.4.0.0
--rwxr-xr-x	root/root	usr/lib/libgdbm.so.4.0.0
+lrwxrwxrwx	root/root	usr/lib/libgdbm.so -> libgdbm.so.5.0.0
+lrwxrwxrwx	root/root	usr/lib/libgdbm.so.5 -> libgdbm.so.5.0.0
+-rwxr-xr-x	root/root	usr/lib/libgdbm.so.5.0.0
 -rw-r--r--	root/root	usr/lib/libgdbm_compat.a
 -rwxr-xr-x	root/root	usr/lib/libgdbm_compat.la
 lrwxrwxrwx	root/root	usr/lib/libgdbm_compat.so -> libgdbm_compat.so.4.0.0
diff --git a/gdbm/.md5sum b/gdbm/.md5sum
index 92d60919..c370fe28 100644
--- a/gdbm/.md5sum
+++ b/gdbm/.md5sum
@@ -1 +1 @@
-8929dcda2a8de3fd2367bdbf66769376  gdbm-1.13.tar.gz
+c2ddcb3897efa0f57484af2bd4f4f848  gdbm-1.14.1.tar.gz
diff --git a/gdbm/.signature b/gdbm/.signature
index 276e57a7..f16305a6 100644
--- a/gdbm/.signature
+++ b/gdbm/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqiUS48vICMvaQ6+lZ8eiodfxwYjSj0Th5Aukbp6lY9DVasjeT4A3ImgsC5U/xlooBO4AAHVM4qZDwylzaS30kg0=
-SHA256 (Pkgfile) = 70b3a8eb70f3fe9d8eb3f6d5468ac4c17760e8bcf67475290727a35c4c7ebdf3
-SHA256 (.footprint) = 6862979cea3f3c9cb79a92eba9ae6b53b74a70176f776ff3f902213342eadcc0
-SHA256 (gdbm-1.13.tar.gz) = 9d252cbd7d793f7b12bcceaddda98d257c14f4d1890d851c386c37207000a253
+RWRJc1FUaeVeqmqn1Jb7usoW5+a8KiuH9V1u6Mc/Z07V//cc1gOR4GUCZdgFD8sjI4m12CPcOCqQ/RZIZ5HfAxSPMQsG5YJepwo=
+SHA256 (Pkgfile) = eda82a9422bd65d52f784bf04d82ee44c55e9e9ea2cd68012237389bfcda1778
+SHA256 (.footprint) = 45394a006497937e4465cd34e4aece4b3d956b91c6851445dcc9d7761b8ccb6b
+SHA256 (gdbm-1.14.1.tar.gz) = cdceff00ffe014495bed3aed71c7910aa88bf29379f795abc0f46d4ee5f8bc5f
diff --git a/gdbm/Pkgfile b/gdbm/Pkgfile
index 544be0cf..90de73f6 100644
--- a/gdbm/Pkgfile
+++ b/gdbm/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  readline
 
 name=gdbm
-version=1.13
+version=1.14.1
 release=1
 source=(http://ftpmirror.gnu.org/gnu/$name/$name-$version.tar.gz)
 

From crux at crux.nu  Sat Jan  6 16:06:17 2018
From: crux at crux.nu (crux at crux.nu)
Date: Sat,  6 Jan 2018 16:06:17 +0000 (UTC)
Subject: [crux-commits] ports/core (3.4): libmpfr: update to 4.0.0
Message-ID: <20180106160617.8ED101802F6@crux.nu>

commit a7dac995b371c5c0952b278222b7405a6a9e92eb
Author: Juergen Daubert <jue at jue.li>
Date:   Sat Jan 6 17:05:57 2018 +0100

    libmpfr: update to 4.0.0

diff --git a/libmpfr/.footprint b/libmpfr/.footprint
index cc28bf60..03f16b82 100644
--- a/libmpfr/.footprint
+++ b/libmpfr/.footprint
@@ -5,6 +5,8 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libmpfr.a
 -rwxr-xr-x	root/root	usr/lib/libmpfr.la
-lrwxrwxrwx	root/root	usr/lib/libmpfr.so -> libmpfr.so.4.1.6
-lrwxrwxrwx	root/root	usr/lib/libmpfr.so.4 -> libmpfr.so.4.1.6
--rwxr-xr-x	root/root	usr/lib/libmpfr.so.4.1.6
+lrwxrwxrwx	root/root	usr/lib/libmpfr.so -> libmpfr.so.6.0.0
+lrwxrwxrwx	root/root	usr/lib/libmpfr.so.6 -> libmpfr.so.6.0.0
+-rwxr-xr-x	root/root	usr/lib/libmpfr.so.6.0.0
+drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/mpfr.pc
diff --git a/libmpfr/.md5sum b/libmpfr/.md5sum
index 9801325f..153d5b47 100644
--- a/libmpfr/.md5sum
+++ b/libmpfr/.md5sum
@@ -1,2 +1 @@
-3a8b6b0f052331392f8ca84b0c6d36a8  libmpfr-3.1.6-p2.patch.gz
-51bfdbf81553966c8d43808122cc81b3  mpfr-3.1.6.tar.xz
+94c67b3cfbee10605a5e59d0ed9161db  mpfr-4.0.0.tar.xz
diff --git a/libmpfr/.signature b/libmpfr/.signature
index 93c28d87..2a10843f 100644
--- a/libmpfr/.signature
+++ b/libmpfr/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqm15iXbmyEpUQyQPRiL00vbUPExAHDwkjKMj6t9YG7QcwdYZWHP4+WIVIPa3xRlNO8xIVLgvRqxNoEn9Mun/oQ8=
-SHA256 (Pkgfile) = 183f3834d43d1f104265d655943b0ad885c609aab5295a28ca9d6c04a1ed72d5
-SHA256 (.footprint) = 1f3ff2d7bddf1fa16f5fd474d02565210d676735c39ebaa542b889b17a0acba0
-SHA256 (mpfr-3.1.6.tar.xz) = 7a62ac1a04408614fccdc506e4844b10cf0ad2c2b1677097f8f35d3a1344a950
-SHA256 (libmpfr-3.1.6-p2.patch.gz) = 2cb917b88a7d31bb07a66f3fe8dd2efd6a34f20973552ee1220b388039267925
+RWRJc1FUaeVeqhRMcfCxS96dlQ+i+XndeofbaFLKNsYXjZ+7DmsetDWDtxk1e1Lzjczs8MR7+VG5gtqKNNd/WwiJDc2QAGORZAY=
+SHA256 (Pkgfile) = 19393735b1a3a47283bce5ace039b76b4677f64b4c459e297919e2fe24d976a7
+SHA256 (.footprint) = d4bb471c673770943e579d5a9a6f71ab4cb349c9e05c7cd51bb6312472e27d51
+SHA256 (mpfr-4.0.0.tar.xz) = fbe2cd1418b321f5c899ce4f0f0f4e73f5ecc7d02145b0e1fd096f5c3afb8a1d
diff --git a/libmpfr/Pkgfile b/libmpfr/Pkgfile
index 8b194654..9ce9a9a4 100644
--- a/libmpfr/Pkgfile
+++ b/libmpfr/Pkgfile
@@ -4,14 +4,12 @@
 # Depends on:  libgmp
 
 name=libmpfr
-version=3.1.6-p2
+version=4.0.0
 release=1
-source=(http://www.mpfr.org/mpfr-${version%-*}/mpfr-${version%-*}.tar.xz
-        $name-$version.patch.gz)
+source=(http://www.mpfr.org/mpfr-${version%-*}/mpfr-${version%-*}.tar.xz)
 
 build() {
     cd mpfr-${version%-*}
-    gunzip -c $SRC/$name-$version.patch.gz | patch -p1
     ./configure --prefix=/usr
     make
     make DESTDIR=$PKG install
diff --git a/libmpfr/libmpfr-3.1.6-p2.patch.gz b/libmpfr/libmpfr-3.1.6-p2.patch.gz
deleted file mode 100644
index 7387ca77..00000000
Binary files a/libmpfr/libmpfr-3.1.6-p2.patch.gz and /dev/null differ

From crux at crux.nu  Sat Jan  6 16:14:27 2018
From: crux at crux.nu (crux at crux.nu)
Date: Sat,  6 Jan 2018 16:14:27 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): [notify] irssi: updated to 1.0.6.
 Fix for CVE-2018-5206, 
Message-ID: <20180106161427.34EA518030E@crux.nu>

commit eb8c9192cbeeffdadabb47ebbedeb619cdab8e14
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Sat Jan 6 17:13:42 2018 +0100

    [notify] irssi: updated to 1.0.6. Fix for CVE-2018-5206,
    
    CVE-2018-5205, CVE-2018-5208 and CVE-2018-5207. Advisory:
    https://irssi.org/security/irssi_sa_2018_01.txt

diff --git a/irssi/.md5sum b/irssi/.md5sum
index 1eab4fb48..ff18e093d 100644
--- a/irssi/.md5sum
+++ b/irssi/.md5sum
@@ -1 +1 @@
-21357ac5e9970fa0c79ca971a9a01270  irssi-1.0.5.tar.xz
+b7e842c50254b780311cd02e97a3e9b5  irssi-1.0.6.tar.xz
diff --git a/irssi/.signature b/irssi/.signature
index b9751bb67..a6cea6bc5 100644
--- a/irssi/.signature
+++ b/irssi/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/fVTqRM46ov1wGceWoljv5b7BE/x2gA+nqmYGzhhjLAKOTrb+8FKsP/5Sr5Snwkv+luLVBGOs5+3x3P+2kU4xg0=
-SHA256 (Pkgfile) = 57be1ee0f2f1c0f6b30af170f609f18c8ba2a7e889a227ee456fa5604f8259a3
+RWSE3ohX2g5d/ZJ/+ZfG6sK/fOvN+lxnuiZv/kGhUyHF+2cy3pMxOTpjXnntyma4AqbDbuH9HFEpTP0s90ATrzr4kjzZnRp9zQ4=
+SHA256 (Pkgfile) = 11bfb0cd12bf412ec3ff434aa5c3e63d630f569af663ea46938fe86a55248f3f
 SHA256 (.footprint) = f199f0d812fef6ae7789ed0d4333fb3a4e34a8c37c762ee8cc31387c13b6b187
-SHA256 (irssi-1.0.5.tar.xz) = c2556427e12eb06cabfed40839ac6f57eb8b1aa6365fab6dfcd331b7a04bb914
+SHA256 (irssi-1.0.6.tar.xz) = 029e884f3ebf337f7266d8ed4e1a035ca56d9f85015d74c868b488f279de8585
diff --git a/irssi/Pkgfile b/irssi/Pkgfile
index 66a2cafcf..c53947630 100644
--- a/irssi/Pkgfile
+++ b/irssi/Pkgfile
@@ -1,11 +1,10 @@
 # Description: Terminal based IRC client for UNIX systems
 # URL: http://www.irssi.org/
 # Maintainer:  Thomas Penteker, tek at serverop dot de
-# Packager: Daniel K. Gebhart, dkg at con-fuse dot org
 # Depends on: glib
 
 name=irssi
-version=1.0.5
+version=1.0.6
 release=1
 source=(https://github.com/irssi-import/irssi/releases/download/$version/$name-$version.tar.xz)
 

From crux at crux.nu  Sat Jan  6 21:02:10 2018
From: crux at crux.nu (crux at crux.nu)
Date: Sat,  6 Jan 2018 21:02:10 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): btrfs-progs: updated to 4.14.1
Message-ID: <20180106210210.C810518007B@crux.nu>

commit 0d73968943c57659c1e6e6df2b006c386c961056
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Sat Jan 6 22:01:59 2018 +0100

    btrfs-progs: updated to 4.14.1

diff --git a/btrfs-progs/.md5sum b/btrfs-progs/.md5sum
index a7e79abf1..0583bb478 100644
--- a/btrfs-progs/.md5sum
+++ b/btrfs-progs/.md5sum
@@ -1 +1 @@
-7881c3d87a9a838f316941f8ed71968d  btrfs-progs-v4.14.tar.xz
+fa1618a0ee07e88d39c4e4e39775ed35  btrfs-progs-v4.14.1.tar.xz
diff --git a/btrfs-progs/.signature b/btrfs-progs/.signature
index 0f848dac3..6bf389195 100644
--- a/btrfs-progs/.signature
+++ b/btrfs-progs/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/d+p0gQZzk74+/GFIEFbHXpOBR4OMRf+bw0EnT/cB+zLoM1z4DScTmV/x370zcx4DIHdzAlagMt+KQrgzK9b1wk=
-SHA256 (Pkgfile) = f0577e16c74721d5637a6cb74cb57d4787177a29de7b1d6431d66c996ab7fa1d
+RWSE3ohX2g5d/Q7wgzrsi19uEXc6VEoZaU50F6OtwzzBryDNGwN+ROe08nyndAMhkqZWwBcY7sdX+FLyry9q8Zof/dDGzjA4RA8=
+SHA256 (Pkgfile) = 1f65344dbb80a8e80864ba3166b0f9e7013b71a6a4a452ebef1467ad00ce6d8d
 SHA256 (.footprint) = a29435b0a075edf510a96e949e3a0d21138e6af59f76ac28307f4435b35da84d
-SHA256 (btrfs-progs-v4.14.tar.xz) = 09095cbc3bc2b6aa9d09c93146fb4d7437c51d2572f6918b74fe990fcdcb91af
+SHA256 (btrfs-progs-v4.14.1.tar.xz) = 90c5b3a73d0a5194754bb148d362b4d2b0755527324c4e9d9fa0b4c15bb354dd
diff --git a/btrfs-progs/Pkgfile b/btrfs-progs/Pkgfile
index 209c0bcd7..f14b42e83 100644
--- a/btrfs-progs/Pkgfile
+++ b/btrfs-progs/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  e2fsprogs lzo zstd
 
 name=btrfs-progs
-version=4.14
+version=4.14.1
 release=1
 source=(https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v$version.tar.xz)
 

From crux at crux.nu  Sat Jan  6 22:43:54 2018
From: crux at crux.nu (crux at crux.nu)
Date: Sat,  6 Jan 2018 22:43:54 +0000 (UTC)
Subject: [crux-commits] ports/contrib (3.3): postgresql: 10.0 -> 10.1
Message-ID: <20180106224354.C8E97180086@crux.nu>

commit 0c2beb4164ed761da88c046039a9450364f7198f
Author: Thomas Penteker <tek at serverop.de>
Date:   Sat Jan 6 23:43:52 2018 +0100

    postgresql: 10.0 -> 10.1

diff --git a/postgresql/.footprint b/postgresql/.footprint
index d41d9cc6..c073a5b3 100644
--- a/postgresql/.footprint
+++ b/postgresql/.footprint
@@ -1523,7 +1523,6 @@ drwxr-xr-x	root/root	usr/share/postgresql/timezone/Brazil/
 drwxr-xr-x	root/root	usr/share/postgresql/timezone/Canada/
 -rw-r--r--	root/root	usr/share/postgresql/timezone/Canada/Atlantic
 -rw-r--r--	root/root	usr/share/postgresql/timezone/Canada/Central
--rw-r--r--	root/root	usr/share/postgresql/timezone/Canada/East-Saskatchewan
 -rw-r--r--	root/root	usr/share/postgresql/timezone/Canada/Eastern
 -rw-r--r--	root/root	usr/share/postgresql/timezone/Canada/Mountain
 -rw-r--r--	root/root	usr/share/postgresql/timezone/Canada/Newfoundland
diff --git a/postgresql/.md5sum b/postgresql/.md5sum
index f0f1596b..28da6934 100644
--- a/postgresql/.md5sum
+++ b/postgresql/.md5sum
@@ -1,2 +1,2 @@
 7186c94fbcf7bf99f1f315122ebb233a  postgresql
-cc582bda3eda3763926e1de404709026  postgresql-10.0.tar.bz2
+0a92328d9970bfb85dcecd011817238a  postgresql-10.1.tar.bz2
diff --git a/postgresql/.signature b/postgresql/.signature
index 72018dc2..b7bc73a9 100644
--- a/postgresql/.signature
+++ b/postgresql/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF37Uc5vPOsnQf/3cuBbnw9PzlOqWWYk8RN3EkEx0esrfE0zhh87uLJUmN1pKMaKjNcR2tuRKChrvCkvGRd/1SqQM=
-SHA256 (Pkgfile) = 562ad9fb1829ae929034791b16c36029ac108c9743c880800c6fa03059ba4875
-SHA256 (.footprint) = 8381c605d57ab235e8f2bba019afde6cb84971c6201278cd7a2b27132690d4d1
-SHA256 (postgresql-10.0.tar.bz2) = 712f5592e27b81c5b454df96b258c14d94b6b03836831e015c65d6deeae57fd1
+RWSagIOpLGJF338n/c0TgUQj7WQUDe1D1rdDr4J9/IQZGDjso3dYXvdTdZDTilvXhPLbb9GK8xlCCOOWYIBmtP/2X3HT5uIqzw8=
+SHA256 (Pkgfile) = acec93420268812ac5f293af7d4a8b3221b2b25c00319c836e8fdea7230685ef
+SHA256 (.footprint) = 16c1cecdf730d217edbe254f7365dd8c1505a624498b3729dcf54accfc33d708
+SHA256 (postgresql-10.1.tar.bz2) = 3ccb4e25fe7a7ea6308dea103cac202963e6b746697366d72ec2900449a5e713
 SHA256 (postgresql) = 2c5ed04d159081774b2518c67b4bd95671154828a5bca23b68c7c7a05ec40078
diff --git a/postgresql/Pkgfile b/postgresql/Pkgfile
index ce7dfd46..40a091b2 100644
--- a/postgresql/Pkgfile
+++ b/postgresql/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:  openssl
 
 name=postgresql
-version=10.0
+version=10.1
 release=1
 source=(https://ftp.postgresql.org/pub/source/v$version/postgresql-$version.tar.bz2 postgresql)
 

From crux at crux.nu  Sun Jan  7 11:07:15 2018
From: crux at crux.nu (crux at crux.nu)
Date: Sun,  7 Jan 2018 11:07:15 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): imagemagick: update to 7.0.7-21
Message-ID: <20180107110715.2B5B518030B@crux.nu>

commit 4acd6397eb07bd59acbd4cf44f785685541a1033
Author: Juergen Daubert <jue at jue.li>
Date:   Sun Jan 7 12:07:03 2018 +0100

    imagemagick: update to 7.0.7-21

diff --git a/imagemagick/.md5sum b/imagemagick/.md5sum
index 51b35563e..2cae87bb2 100644
--- a/imagemagick/.md5sum
+++ b/imagemagick/.md5sum
@@ -1 +1 @@
-65d747f5e01d2a854d5c743bb65fce69  ImageMagick-7.0.7-19.tar.xz
+13972f5bfd91bb697dc680c05ac53334  ImageMagick-7.0.7-21.tar.xz
diff --git a/imagemagick/.signature b/imagemagick/.signature
index 0106efd12..c58535f63 100644
--- a/imagemagick/.signature
+++ b/imagemagick/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/c2F1eOduDa9/AgNiwKbIGshv/jxzvlUJuY/TH+uOQNgSmYdqz1GBUHz2vDLYXs9Z8c3YBN+tWXKaRyFFO6X/Q4=
-SHA256 (Pkgfile) = ce8cd61252e12ac557e91d15fa810fe62aadf1a1614f323702f2fdb37640a729
+RWSE3ohX2g5d/UO6HHkRzcxBMiGQfJ/F9jWXa6VRL+VuvUp7urZzfszEFIsE528CY1FAPYY6UEslgP9NY1Qgkip95w6hOzNJZA8=
+SHA256 (Pkgfile) = 6f5372e94bfa3afefba46aef550a690cc4dfc790d025a7697e7afa23f1729fce
 SHA256 (.footprint) = 784579f07f6eaa54e5c0afc6c19a0110f2f4a27d29a97c8a01bd9ee2f7a0ea48
-SHA256 (ImageMagick-7.0.7-19.tar.xz) = 5f1156824c37e5dde6ec37c5b1c51d9806f6d0e97aeaeb1e6907d7aba15951d9
+SHA256 (ImageMagick-7.0.7-21.tar.xz) = 3b2783a845279f76a4250f2c3caf04af22766e2d5f084bde589ebd73de6a0019
diff --git a/imagemagick/Pkgfile b/imagemagick/Pkgfile
index f480dc281..488063b46 100644
--- a/imagemagick/Pkgfile
+++ b/imagemagick/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:  util-linux lcms2 pango xorg-libxt
 
 name=imagemagick
-version=7.0.7-19
+version=7.0.7-21
 release=1
 source=(ftp://ftp.imagemagick.org/pub/ImageMagick/releases/ImageMagick-$version.tar.xz)
 

From crux at crux.nu  Sun Jan  7 12:20:05 2018
From: crux at crux.nu (crux at crux.nu)
Date: Sun,  7 Jan 2018 12:20:05 +0000 (UTC)
Subject: [crux-commits] ports/core (3.4): libmpc: fix build with libmpfr
 4.0.0
Message-ID: <20180107122005.B83AB1802DE@crux.nu>

commit bb19fefcc9a04dcd28eeed2b0d24174c52249e40
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Sun Jan 7 13:19:44 2018 +0100

    libmpc: fix build with libmpfr 4.0.0

diff --git a/libmpc/.md5sum b/libmpc/.md5sum
index 7b100cb5..b78ea964 100644
--- a/libmpc/.md5sum
+++ b/libmpc/.md5sum
@@ -1 +1,2 @@
+3b8c9f6bff574f6b1165d47b76960c2a  mpc-1.0.3-mpfr-4.0.0.patch
 d6a1d5f8ddea3abd2cc3e98f58352d26  mpc-1.0.3.tar.gz
diff --git a/libmpc/.signature b/libmpc/.signature
index 5da909be..029dec2d 100644
--- a/libmpc/.signature
+++ b/libmpc/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqpP4ddzDGjayXXRA3YIoXL85LL1k6LX20agqpWaHKZQn664f+VNYUDj3H0HUDwSLtS0Y/f7H8awTO2WsnYqRjQ8=
-SHA256 (Pkgfile) = 0ecb0452871363ab19087dbcb437b42c769e87abf2e1b6f8343ad61212743a16
+RWRJc1FUaeVeqqgvkevQSRQMYVtNX6dpLdrf4TjD9gBp72mzUFjo9tbVkgo7uSkqGYvrTtRYvsKyQU4enVRY77Rw0/SR1xHfcQ4=
+SHA256 (Pkgfile) = d89b4a0ea564051ed9f467ebfde850e68f1c93340020e07da6c3a6bcb12c811a
 SHA256 (.footprint) = bc2f39ff2b064835b962350b9c0e2dbb7ba6d3c01e6db7bb9a3b0fc971f220c7
 SHA256 (mpc-1.0.3.tar.gz) = 617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3
+SHA256 (mpc-1.0.3-mpfr-4.0.0.patch) = 1f9d66212054ecc8c42ba4f7bcdaaf49c7872a2fa46df62b2650375011e59dbf
diff --git a/libmpc/Pkgfile b/libmpc/Pkgfile
index f884b3f5..65cc9c39 100644
--- a/libmpc/Pkgfile
+++ b/libmpc/Pkgfile
@@ -5,11 +5,13 @@
 
 name=libmpc
 version=1.0.3
-release=1
-source=(http://www.multiprecision.org/mpc/download/mpc-$version.tar.gz)
+release=2
+source=(http://www.multiprecision.org/mpc/download/mpc-$version.tar.gz \
+	mpc-1.0.3-mpfr-4.0.0.patch)
 
 build() {
     cd mpc-$version
+    patch -p1 -i $SRC/mpc-1.0.3-mpfr-4.0.0.patch
     ./configure --prefix=/usr
     make
     make DESTDIR=$PKG install
diff --git a/libmpc/mpc-1.0.3-mpfr-4.0.0.patch b/libmpc/mpc-1.0.3-mpfr-4.0.0.patch
new file mode 100644
index 00000000..7f9f7e2b
--- /dev/null
+++ b/libmpc/mpc-1.0.3-mpfr-4.0.0.patch
@@ -0,0 +1,85 @@
+https://bugs.gentoo.org/642300
+
+From 36a84f43f326de14db888ba07936cc9621c23f19 Mon Sep 17 00:00:00 2001
+From: Paul Zimmermann <Paul.Zimmermann at inria.fr>
+Date: Sun, 10 Jan 2016 23:19:37 +0100
+Subject: [PATCH] use mpfr_fmma and mpfr_fmms if provided by mpfr
+
+---
+ configure.ac | 16 ++++++++++++++++
+ src/mul.c    | 15 ++++++++++++---
+ 2 files changed, 28 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b6fa199..bdb21ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -165,6 +165,22 @@ AC_LINK_IFELSE(
+         AC_MSG_ERROR([libmpfr not found or uses a different ABI (including static vs shared).])
+         ])
+ 
++AC_MSG_CHECKING(for mpfr_fmma)
++LIBS="-lmpfr $LIBS"
++AC_LINK_IFELSE(
++        [AC_LANG_PROGRAM(
++                [[#include "mpfr.h"]],
++                [[mpfr_t x; mpfr_fmma (x, x, x, x, x, 0);]]
++        )],
++        [
++	AC_MSG_RESULT(yes)
++	AC_DEFINE(HAVE_MPFR_FMMA, 1, [mpfr_fmma is present])
++	],
++        [
++        AC_MSG_RESULT(no)
++	AC_DEFINE(HAVE_MPFR_FMMA, 0, [mpfr_fmma	is not present])
++        ])
++
+ # Check for a recent GMP
+ # We only guarantee that with a *functional* and recent enough GMP version,
+ # MPC will compile; we do not guarantee that GMP will compile.
+diff --git a/src/mul.c b/src/mul.c
+index 3c9c0a7..8c4afe4 100644
+--- a/src/mul.c
++++ b/src/mul.c
+@@ -175,8 +175,9 @@ mul_imag (mpc_ptr z, mpc_srcptr x, mpc_srcptr y, mpc_rnd_t rnd)
+ #define MPFR_EXP(x)       ((x)->_mpfr_exp)
+ #define MPFR_LIMB_SIZE(x) ((MPFR_PREC (x) - 1) / GMP_NUMB_BITS + 1)
+ 
++#if HAVE_MPFR_FMMA == 0
+ static int
+-mpfr_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c,
++mpc_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c,
+            mpfr_srcptr d, int sign, mpfr_rnd_t rnd)
+ {
+    /* Computes z = ab+cd if sign >= 0, or z = ab-cd if sign < 0.
+@@ -359,6 +360,7 @@ mpfr_fmma (mpfr_ptr z, mpfr_srcptr a, mpfr_srcptr b, mpfr_srcptr c,
+    return inex;
+ }
++#endif
+ 
+ 
+ int
+ mpc_mul_naive (mpc_ptr z, mpc_srcptr x, mpc_srcptr y, mpc_rnd_t rnd)
+@@ -375,10 +377,17 @@ mpc_mul_naive (mpc_ptr z, mpc_srcptr x, mpc_srcptr y, mpc_rnd_t rnd)
+    else
+       rop [0] = z [0];
+ 
+-   inex = MPC_INEX (mpfr_fmma (mpc_realref (rop), mpc_realref (x), mpc_realref (y), mpc_imagref (x),
+-                               mpc_imagref (y), -1, MPC_RND_RE (rnd)),
++#if HAVE_MPFR_FMMA
++   inex = MPC_INEX (mpfr_fmms (mpc_realref (rop), mpc_realref (x), mpc_realref (y), mpc_imagref (x),
++                               mpc_imagref (y), MPC_RND_RE (rnd)),
+                     mpfr_fmma (mpc_imagref (rop), mpc_realref (x), mpc_imagref (y), mpc_imagref (x),
++                               mpc_realref (y), MPC_RND_IM (rnd)));
++#else
++   inex = MPC_INEX (mpc_fmma (mpc_realref (rop), mpc_realref (x), mpc_realref (y), mpc_imagref (x),
++                               mpc_imagref (y), -1, MPC_RND_RE (rnd)),
++                    mpc_fmma (mpc_imagref (rop), mpc_realref (x), mpc_imagref (y), mpc_imagref (x),
+                                mpc_realref (y), +1, MPC_RND_IM (rnd)));
++#endif
+ 
+    mpc_set (z, rop, MPC_RNDNN);
+    if (overlap)
+-- 
+2.15.1
+

From crux at crux.nu  Sun Jan  7 21:06:47 2018
From: crux at crux.nu (crux at crux.nu)
Date: Sun,  7 Jan 2018 21:06:47 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): chromium: fixed a missing $PKG
 destination, retabbed
Message-ID: <20180107210647.0BC1118030B@crux.nu>

commit bb59db6f379f42bd1699de1c4bcd645c1740febb
Author: Matt Housh <jaeger at crux.ninja>
Date:   Sun Jan 7 15:00:40 2018 -0600

    chromium: fixed a missing $PKG destination, retabbed
    
    If chromium was previously installed the update will need to be forced
    as the following files were installed but not tracked by the package
    database:
    
    /usr/share/icons/hicolor/16x16/apps/chromium.png
    /usr/share/icons/hicolor/32x32/apps/chromium.png

diff --git a/chromium/.footprint b/chromium/.footprint
index e1e4da0b5..46709aa55 100644
--- a/chromium/.footprint
+++ b/chromium/.footprint
@@ -272,6 +272,9 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/chromium.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/chromium.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/chromium.png
@@ -281,6 +284,9 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/24x24/apps/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/256x256/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/256x256/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/256x256/apps/chromium.png
+drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/
+drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/chromium.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/chromium.png
diff --git a/chromium/.signature b/chromium/.signature
index 03e042969..d5d09d5ff 100644
--- a/chromium/.signature
+++ b/chromium/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/ZHjbkSlwkkc8jW6yRFPUENs6WOqBsSAUUebNDS9wngNajv6SV3vJcD1gehMpL2AHQrkU+fEmxImG/SXd0W2XQo=
-SHA256 (Pkgfile) = 7f780d9b5c1cf0d02fb6447c18e39e46c02619bbd8e46635850ad0de145a7636
-SHA256 (.footprint) = 2b57eade7d1a318c8a6993c87aa7f9359fdc36fbf74906498b712e73c5bf1ce2
+RWSE3ohX2g5d/WrHyDzQa9T2MiA/XxUCvWyReknChqOVcJlyJA7SVWBHpNx+9WXhFRaHEvO9/QTY80/BZk6b0lpTL5lmIeJzOgc=
+SHA256 (Pkgfile) = 35e12c8bce397c625881d2623ba1fa882b131be773cb67094e52e7f21b69498a
+SHA256 (.footprint) = 7886836592cc13787d9f1ea173d9e22c7e0e12e1ebe65632311279c86ced91b0
 SHA256 (chromium-63.0.3239.108.tar.xz) = 47d80798194da78bdd519b7ce012425b13cf89d6eb287e22a34342a245c31a2b
 SHA256 (last-commit-position.patch) = d3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e
 SHA256 (chromium.sh) = 7b182d0ae1e9ef841f8cd0b403a304babd548bf60b5e3808b2144bebdbb7c154
diff --git a/chromium/Pkgfile b/chromium/Pkgfile
index 0ead8cae2..95bdd7a15 100644
--- a/chromium/Pkgfile
+++ b/chromium/Pkgfile
@@ -13,108 +13,108 @@ source=(https://commondatastorage.googleapis.com/$name-browser-official/$name-$v
 	chromium-webrtc-r0.patch)
 
 build() {
-  cd $name-$version
+	cd $name-$version
 
-  if [ -n "$(pkginfo -i | grep '^ccache ')" ]; then
-    # Avoid falling back to preprocessor mode when sources contain time macros
-    export CCACHE_SLOPPINESS=time_macros
-  fi
+	if [ -n "$(pkginfo -i | grep '^ccache ')" ]; then
+		# Avoid falling back to preprocessor mode when sources contain time macros
+		export CCACHE_SLOPPINESS=time_macros
+	fi
 
-  export CFLAGS="$CFLAGS $(pkg-config --cflags nspr)"
-  export LDFLAGS="$LDFLAGS $(pkg-config --libs nspr)"
+	export CFLAGS="$CFLAGS $(pkg-config --cflags nspr)"
+	export LDFLAGS="$LDFLAGS $(pkg-config --libs nspr)"
 
-  # we don't use git sources
-  patch -p1 -i $SRC/last-commit-position.patch
+	# we don't use git sources
+	patch -p1 -i $SRC/last-commit-position.patch
 
-  # https://chromium-review.googlesource.com/c/chromium/src/+/71257
-  patch -p1 -i $SRC/chromium-exclude_unwind_tables.patch
+	# https://chromium-review.googlesource.com/c/chromium/src/+/71257
+	patch -p1 -i $SRC/chromium-exclude_unwind_tables.patch
 
-  # Fixes from Gentoo
-  patch -p1 -i $SRC/chromium-clang-r1.patch
-  patch -p1 -i $SRC/chromium-webrtc-r0.patch
+	# Fixes from Gentoo
+	patch -p1 -i $SRC/chromium-clang-r1.patch
+	patch -p1 -i $SRC/chromium-webrtc-r0.patch
 
-  mkdir -p third_party/node/linux/node-linux-x64/bin
-  ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
+	mkdir -p third_party/node/linux/node-linux-x64/bin
+	ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
 
 #  for LIB in ffmpeg flac harfbuzz-ng libjpeg \
-#    libjpeg_turbo libpng libwebp libxslt yasm; do
-#    find -type f -path "*third_party/$LIB/*"   \
-#      \! -path "*third_party/$LIB/chromium/*"  \
-#      \! -path "*third_party/$LIB/google/*"    \
-#      \! -path "*base/third_party/icu/*"       \
-#      \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
-#      -delete
+#		 libjpeg_turbo libpng libwebp libxslt yasm; do
+#		 find -type f -path "*third_party/$LIB/*"		\
+#			 \! -path "*third_party/$LIB/chromium/*"	\
+#			 \! -path "*third_party/$LIB/google/*"		\
+#			 \! -path "*base/third_party/icu/*"				\
+#			 \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \
+#			 -delete
 #  done
 
 #  /usr/bin/python2 build/linux/unbundle/replace_gn_files.py \
-#    --system-libraries ffmpeg flac harfbuzz-ng libjpeg libxml libevent \
-#                       libpng libwebp libxslt opus yasm freetype
+#		 --system-libraries ffmpeg flac harfbuzz-ng libjpeg libxml libevent \
+#												libpng libwebp libxslt opus yasm freetype
 #  /usr/bin/python2 third_party/libaddressinput/chromium/tools/update-strings.py
 
-  _gn_args=(
-    'blink_gc_plugin=false'
-    'clang_use_chrome_plugins=false'
-    'enable_hangout_services_extension=true'
-    'enable_nacl=false'
-    'enable_swiftshader=false'
-    'fatal_linker_warnings=false'
-    'ffmpeg_branding="Chrome"'
-    'is_clang=false'
-    'is_debug=false'
-    'linux_use_bundled_binutils=false'
-    'use_custom_libcxx=false'
-    'proprietary_codecs=true'
-    'remove_webcore_debug_symbols=true'
-    'symbol_level=0'
-    'treat_warnings_as_errors=false'
-    'use_allocator="none"'
-    'use_cups=false'
-    'use_gconf=false'
-    'use_gnome_keyring=false'
-    'use_gold=false'
-    'use_gtk3=true'
-    'use_kerberos=false'
-    'use_pulseaudio=false'
-    'use_sysroot=false'
-  )
-
-  /usr/bin/python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args="${_gn_args[*]}"
-  out/Release/gn gen out/Release --args="${_gn_args[*]}" --script-executable=/usr/bin/python2
-
-  ninja -j ${JOBS-1} -C out/Release chrome chrome_sandbox
-
-  install -m 0755 -D out/Release/chrome $PKG/usr/lib/$name/$name
-  install -m 4755 -o root -g root -D out/Release/chrome_sandbox $PKG/usr/lib/$name/chrome-sandbox
-  install -m 0644 -D out/Release/*.pak $PKG/usr/lib/$name
-  install -d $PKG/usr/lib/$name/locales
-  install -m 0644 out/Release/locales/en-US.pak $PKG/usr/lib/$name/locales
-  cp -a out/Release/resources $PKG/usr/lib/$name
-
-  install -m 0644 -D chrome/installer/linux/common/desktop.template $PKG/usr/share/applications/$name.desktop
-  install -m 0644 -D chrome/app/resources/manpage.1.in $PKG/usr/share/man/man1/$name.1
-
-  sed -i \
-    -e "s/@@MENUNAME@@/Chromium/g" \
-    -e "s/@@PACKAGE@@/chromium/g" \
-    -e "s/@@USR_BIN_SYMLINK_NAME@@/chromium/g" \
-    $PKG/usr/share/applications/$name.desktop \
-    $PKG/usr/share/man/man1/$name.1
-
-  # fix v8 natives
-  cp -a out/Release/{natives,snapshot}_blob.bin $PKG/usr/lib/$name
-
-  for size in 16 32; do
-    install -m 0644 -D chrome/app/theme/default_100_percent/$name/product_logo_${size}.png \
-    /usr/share/icons/hicolor/${size}x${size}/apps/$name.png
-  done
-
-  for size in 22 24 48 64 128 256; do
-      install -m 0644 -D chrome/app/theme/$name/product_logo_${size}.png \
-      $PKG/usr/share/icons/hicolor/${size}x${size}/apps/$name.png
-  done
-
-  # fix icu installation
-  install -m 0644 -D out/Release/icudtl.dat $PKG/usr/lib/$name/icudtl.dat
-
-  install -m 0755 -D $SRC/$name.sh $PKG/usr/bin/$name
+	_gn_args=(
+		'blink_gc_plugin=false'
+		'clang_use_chrome_plugins=false'
+		'enable_hangout_services_extension=true'
+		'enable_nacl=false'
+		'enable_swiftshader=false'
+		'fatal_linker_warnings=false'
+		'ffmpeg_branding="Chrome"'
+		'is_clang=false'
+		'is_debug=false'
+		'linux_use_bundled_binutils=false'
+		'use_custom_libcxx=false'
+		'proprietary_codecs=true'
+		'remove_webcore_debug_symbols=true'
+		'symbol_level=0'
+		'treat_warnings_as_errors=false'
+		'use_allocator="none"'
+		'use_cups=false'
+		'use_gconf=false'
+		'use_gnome_keyring=false'
+		'use_gold=false'
+		'use_gtk3=true'
+		'use_kerberos=false'
+		'use_pulseaudio=false'
+		'use_sysroot=false'
+	)
+
+	/usr/bin/python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args="${_gn_args[*]}"
+	out/Release/gn gen out/Release --args="${_gn_args[*]}" --script-executable=/usr/bin/python2
+
+	ninja -j ${JOBS-1} -C out/Release chrome chrome_sandbox
+
+	install -m 0755 -D out/Release/chrome $PKG/usr/lib/$name/$name
+	install -m 4755 -o root -g root -D out/Release/chrome_sandbox $PKG/usr/lib/$name/chrome-sandbox
+	install -m 0644 -D out/Release/*.pak $PKG/usr/lib/$name
+	install -d $PKG/usr/lib/$name/locales
+	install -m 0644 out/Release/locales/en-US.pak $PKG/usr/lib/$name/locales
+	cp -a out/Release/resources $PKG/usr/lib/$name
+
+	install -m 0644 -D chrome/installer/linux/common/desktop.template $PKG/usr/share/applications/$name.desktop
+	install -m 0644 -D chrome/app/resources/manpage.1.in $PKG/usr/share/man/man1/$name.1
+
+	sed -i \
+		-e "s/@@MENUNAME@@/Chromium/g" \
+		-e "s/@@PACKAGE@@/chromium/g" \
+		-e "s/@@USR_BIN_SYMLINK_NAME@@/chromium/g" \
+		$PKG/usr/share/applications/$name.desktop \
+		$PKG/usr/share/man/man1/$name.1
+
+	# fix v8 natives
+	cp -a out/Release/{natives,snapshot}_blob.bin $PKG/usr/lib/$name
+
+	for size in 16 32; do
+		install -m 0644 -D chrome/app/theme/default_100_percent/$name/product_logo_${size}.png \
+		$PKG/usr/share/icons/hicolor/${size}x${size}/apps/$name.png
+	done
+
+	for size in 22 24 48 64 128 256; do
+			install -m 0644 -D chrome/app/theme/$name/product_logo_${size}.png \
+			$PKG/usr/share/icons/hicolor/${size}x${size}/apps/$name.png
+	done
+
+	# fix icu installation
+	install -m 0644 -D out/Release/icudtl.dat $PKG/usr/lib/$name/icudtl.dat
+
+	install -m 0755 -D $SRC/$name.sh $PKG/usr/bin/$name
 }

From crux at crux.nu  Mon Jan  8 20:50:35 2018
From: crux at crux.nu (crux at crux.nu)
Date: Mon,  8 Jan 2018 20:50:35 +0000 (UTC)
Subject: [crux-commits] ports/core (3.3): gzip: updated to 1.9
Message-ID: <20180108205035.F07FE180093@crux.nu>

commit de97146cbc0c244d93e85262f4696ab35c43c923
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Mon Jan 8 19:50:22 2018 +0100

    gzip: updated to 1.9

diff --git a/gzip/.md5sum b/gzip/.md5sum
index b5f412db..32fdca45 100644
--- a/gzip/.md5sum
+++ b/gzip/.md5sum
@@ -1 +1 @@
-f7caabb65cddc1a4165b398009bd05b9  gzip-1.8.tar.xz
+9492c6ccb2239ff679a5475a7bb543ed  gzip-1.9.tar.xz
diff --git a/gzip/.signature b/gzip/.signature
index a85aa0c2..0aa9b22d 100644
--- a/gzip/.signature
+++ b/gzip/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqrQOZ/eP5lJfnUqLk5Ma0XLCnoAj3zCJ/Kdishp2tyVtjdSMtRmsFWnKW18Q+dX6/NctusS7KfIEz5USFGaEOwo=
-SHA256 (Pkgfile) = dd9564506b18ecc6f3a608545701bbdc2fc3085050175f00343cf5ae7804686b
+RWRJc1FUaeVeqk4Eum024Z7uo8Y6UpolZz5/v9+pFjYReC9Rf9FbiZcBfCRoi31rL9+PGkXpM+dP1dlz7tzKgJH+pZLd9wCULg0=
+SHA256 (Pkgfile) = d43b6b18c25eca9ee3e63c35a16cbb6a5a850e8f6db7a23afd7310897154b0b6
 SHA256 (.footprint) = 3a992d09f502e9c7dedc0dc8aef10b908ca3914d823c6ce0c542ac5a780e47c6
-SHA256 (gzip-1.8.tar.xz) = ff1767ec444f71e5daf8972f6f8bf68cfcca1d2f76c248eb18e8741fc91dbbd3
+SHA256 (gzip-1.9.tar.xz) = ae506144fc198bd8f81f1f4ad19ce63d5a2d65e42333255977cf1dcf1479089a
diff --git a/gzip/Pkgfile b/gzip/Pkgfile
index 35f543c7..6d6aa58e 100644
--- a/gzip/Pkgfile
+++ b/gzip/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=gzip
-version=1.8
+version=1.9
 release=1
 source=(http://ftpmirror.gnu.org/gnu/$name/$name-$version.tar.xz)
 

From crux at crux.nu  Tue Jan  9 17:09:13 2018
From: crux at crux.nu (crux at crux.nu)
Date: Tue,  9 Jan 2018 17:09:13 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): nvidia: updated to version 384.111
Message-ID: <20180109170913.CD96A180237@crux.nu>

commit a34874f95baae5f0ffbed649bdf1bcd303029499
Author: Matt Housh <jaeger at crux.ninja>
Date:   Tue Jan 9 11:08:06 2018 -0600

    nvidia: updated to version 384.111

diff --git a/nvidia/.footprint b/nvidia/.footprint
index c450fa390..be83fe5f5 100644
--- a/nvidia/.footprint
+++ b/nvidia/.footprint
@@ -21,42 +21,42 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/nvidia-smi
 -rwxr-xr-x	root/root	usr/bin/nvidia-xconfig
 drwxr-xr-x	root/root	usr/lib/
--rwxr-xr-x	root/root	usr/lib/libGL.so.384.98
-lrwxrwxrwx	root/root	usr/lib/libGL_so_1_2_nvidia -> libGL.so.384.98
+-rwxr-xr-x	root/root	usr/lib/libGL.so.384.111
+lrwxrwxrwx	root/root	usr/lib/libGL_so_1_2_nvidia -> libGL.so.384.111
 lrwxrwxrwx	root/root	usr/lib/libOpenCL.so -> libOpenCL.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libOpenCL.so.1.0.0
--rwxr-xr-x	root/root	usr/lib/libcuda.so.384.98
-lrwxrwxrwx	root/root	usr/lib/libnvcuvid.so -> libnvcuvid.so.384.98
-lrwxrwxrwx	root/root	usr/lib/libnvcuvid.so.1 -> libnvcuvid.so.384.98
--rwxr-xr-x	root/root	usr/lib/libnvcuvid.so.384.98
--rwxr-xr-x	root/root	usr/lib/libnvidia-cfg.so.384.98
--rwxr-xr-x	root/root	usr/lib/libnvidia-compiler.so.384.98
--rwxr-xr-x	root/root	usr/lib/libnvidia-encode.so.384.98
--rwxr-xr-x	root/root	usr/lib/libnvidia-fatbinaryloader.so.384.98
--rwxr-xr-x	root/root	usr/lib/libnvidia-fbc.so.384.98
--rwxr-xr-x	root/root	usr/lib/libnvidia-glcore.so.384.98
--rwxr-xr-x	root/root	usr/lib/libnvidia-gtk2.so.384.98
--rwxr-xr-x	root/root	usr/lib/libnvidia-gtk3.so.384.98
--rwxr-xr-x	root/root	usr/lib/libnvidia-ifr.so.384.98
-lrwxrwxrwx	root/root	usr/lib/libnvidia-ml.so -> libnvidia-ml.so.384.98
-lrwxrwxrwx	root/root	usr/lib/libnvidia-ml.so.1 -> libnvidia-ml.so.384.98
--rwxr-xr-x	root/root	usr/lib/libnvidia-ml.so.384.98
--rwxr-xr-x	root/root	usr/lib/libnvidia-opencl.so.384.98
--rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.384.98
+-rwxr-xr-x	root/root	usr/lib/libcuda.so.384.111
+lrwxrwxrwx	root/root	usr/lib/libnvcuvid.so -> libnvcuvid.so.384.111
+lrwxrwxrwx	root/root	usr/lib/libnvcuvid.so.1 -> libnvcuvid.so.384.111
+-rwxr-xr-x	root/root	usr/lib/libnvcuvid.so.384.111
+-rwxr-xr-x	root/root	usr/lib/libnvidia-cfg.so.384.111
+-rwxr-xr-x	root/root	usr/lib/libnvidia-compiler.so.384.111
+-rwxr-xr-x	root/root	usr/lib/libnvidia-encode.so.384.111
+-rwxr-xr-x	root/root	usr/lib/libnvidia-fatbinaryloader.so.384.111
+-rwxr-xr-x	root/root	usr/lib/libnvidia-fbc.so.384.111
+-rwxr-xr-x	root/root	usr/lib/libnvidia-glcore.so.384.111
+-rwxr-xr-x	root/root	usr/lib/libnvidia-gtk2.so.384.111
+-rwxr-xr-x	root/root	usr/lib/libnvidia-gtk3.so.384.111
+-rwxr-xr-x	root/root	usr/lib/libnvidia-ifr.so.384.111
+lrwxrwxrwx	root/root	usr/lib/libnvidia-ml.so -> libnvidia-ml.so.384.111
+lrwxrwxrwx	root/root	usr/lib/libnvidia-ml.so.1 -> libnvidia-ml.so.384.111
+-rwxr-xr-x	root/root	usr/lib/libnvidia-ml.so.384.111
+-rwxr-xr-x	root/root	usr/lib/libnvidia-opencl.so.384.111
+-rwxr-xr-x	root/root	usr/lib/libnvidia-tls.so.384.111
 drwxr-xr-x	root/root	usr/lib/tls/
--rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.384.98
+-rwxr-xr-x	root/root	usr/lib/tls/libnvidia-tls.so.384.111
 drwxr-xr-x	root/root	usr/lib/vdpau/
-lrwxrwxrwx	root/root	usr/lib/vdpau/libvdpau_nvidia.so -> libvdpau_nvidia.so.384.98
-lrwxrwxrwx	root/root	usr/lib/vdpau/libvdpau_nvidia.so.1 -> libvdpau_nvidia.so.384.98
--rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_nvidia.so.384.98
+lrwxrwxrwx	root/root	usr/lib/vdpau/libvdpau_nvidia.so -> libvdpau_nvidia.so.384.111
+lrwxrwxrwx	root/root	usr/lib/vdpau/libvdpau_nvidia.so.1 -> libvdpau_nvidia.so.384.111
+-rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_nvidia.so.384.111
 drwxr-xr-x	root/root	usr/lib/xorg/
 drwxr-xr-x	root/root	usr/lib/xorg/modules/
 drwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/
 -rwxr-xr-x	root/root	usr/lib/xorg/modules/drivers/nvidia_drv.so
 drwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/
--rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.so.384.98
-lrwxrwxrwx	root/root	usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.384.98
--rwxr-xr-x	root/root	usr/lib/xorg/modules/libnvidia-wfb.so.384.98
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/extensions/libglx.so.384.111
+lrwxrwxrwx	root/root	usr/lib/xorg/modules/extensions/libglx_so_nvidia -> libglx.so.384.111
+-rwxr-xr-x	root/root	usr/lib/xorg/modules/libnvidia-wfb.so.384.111
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 -rw-r--r--	root/root	usr/share/applications/nvidia-settings.desktop
@@ -67,6 +67,6 @@ drwxr-xr-x	root/root	usr/share/man/man1/
 -rw-r--r--	root/root	usr/share/man/man1/nvidia-smi.1.gz
 -rw-r--r--	root/root	usr/share/man/man1/nvidia-xconfig.1.gz
 drwxr-xr-x	root/root	usr/share/nvidia/
--rw-r--r--	root/root	usr/share/nvidia/nvidia-application-profiles-384.98-key-documentation
+-rw-r--r--	root/root	usr/share/nvidia/nvidia-application-profiles-384.111-key-documentation
 drwxr-xr-x	root/root	usr/share/pixmaps/
 -rw-r--r--	root/root	usr/share/pixmaps/nvidia-settings.png
diff --git a/nvidia/.md5sum b/nvidia/.md5sum
index a1861469e..9131d982a 100644
--- a/nvidia/.md5sum
+++ b/nvidia/.md5sum
@@ -1,2 +1,2 @@
 4511024cc556d0c6e7c467b6789524e2  90-nvidia-uvm.rules
-b5ca88e11f1858318e2b81d33033418e  NVIDIA-Linux-x86_64-384.98-no-compat32.run
+0adbe05230ca59ab817c83089f00a7b0  NVIDIA-Linux-x86_64-384.111-no-compat32.run
diff --git a/nvidia/.signature b/nvidia/.signature
index e2e7969f3..009748388 100644
--- a/nvidia/.signature
+++ b/nvidia/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/WLxP+ChLqID3im8txP07RjqdkWvmH7qiGNO5XK/Qm6Q5SD9al0I/Z88JafdWbGRcZiWd1TsQB/GPMsbQ80IuwM=
-SHA256 (Pkgfile) = 5db83a963f54bdc0669a3d276dbf26cdcf51f8e3d764b862189ca310bf973c46
-SHA256 (.footprint) = 2ff7bc95ba3e37df089989c827386eced8344a1ffe0711c2cebc1801a6dc1c54
-SHA256 (NVIDIA-Linux-x86_64-384.98-no-compat32.run) = 169909c756ce01abcb676d704638003f3b782173a8ea82f2de798e40212780f5
+RWSE3ohX2g5d/dHj4Pn8GGhMbInU8Ggm7D6TXqov+Z/uo+1zgKX6yuPWZN+jJCnLFDYXC09pLhp15P/8cfyIFUqSfyda2WoiPAc=
+SHA256 (Pkgfile) = 9b46f548375863a22da435f4e5ea4acf62dec4b9fb2f02aa3b67ea5cc507f56b
+SHA256 (.footprint) = 15b9008286b8159a23667155884f4650627330a982975bb571bde9f0ba549b4f
+SHA256 (NVIDIA-Linux-x86_64-384.111-no-compat32.run) = 56b8c993c697aa37fe9ab1b6764304b82c86d5c745cd98dd8492be27f596ead7
 SHA256 (90-nvidia-uvm.rules) = c35c61cebf5bf9a112ac06539bdc670a388afa4b50a7f8223a114fbeafedb140
diff --git a/nvidia/Pkgfile b/nvidia/Pkgfile
index 69ee5de5f..6955447e3 100644
--- a/nvidia/Pkgfile
+++ b/nvidia/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: gtk gl-select
 
 name=nvidia
-version=384.98
+version=384.111
 release=1
 source=(http://us.download.nvidia.com/XFree86/Linux-x86_64/$version/NVIDIA-Linux-x86_64-$version-no-compat32.run \
     90-nvidia-uvm.rules)

From crux at crux.nu  Tue Jan  9 17:09:17 2018
From: crux at crux.nu (crux at crux.nu)
Date: Tue,  9 Jan 2018 17:09:17 +0000 (UTC)
Subject: [crux-commits] ports/compat-32 (3.3): nvidia-32: updated to version
 384.111
Message-ID: <20180109170917.C2C09180237@crux.nu>

commit 20d2da95df4e23021ff457b0700ca01da255f7fc
Author: Matt Housh <jaeger at crux.ninja>
Date:   Tue Jan 9 11:08:44 2018 -0600

    nvidia-32: updated to version 384.111

diff --git a/nvidia-32/.footprint b/nvidia-32/.footprint
index b4136dd..223a8f5 100644
--- a/nvidia-32/.footprint
+++ b/nvidia-32/.footprint
@@ -1,28 +1,28 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
--rwxr-xr-x	root/root	usr/lib32/libGL.so.384.98
-lrwxrwxrwx	root/root	usr/lib32/libGL_so_1_2_nvidia -> libGL.so.384.98
+-rwxr-xr-x	root/root	usr/lib32/libGL.so.384.111
+lrwxrwxrwx	root/root	usr/lib32/libGL_so_1_2_nvidia -> libGL.so.384.111
 lrwxrwxrwx	root/root	usr/lib32/libOpenCL.so -> libOpenCL.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib32/libOpenCL.so.1.0.0
--rwxr-xr-x	root/root	usr/lib32/libcuda.so.384.98
-lrwxrwxrwx	root/root	usr/lib32/libnvcuvid.so -> libnvcuvid.so.384.98
-lrwxrwxrwx	root/root	usr/lib32/libnvcuvid.so.1 -> libnvcuvid.so.384.98
--rwxr-xr-x	root/root	usr/lib32/libnvcuvid.so.384.98
--rwxr-xr-x	root/root	usr/lib32/libnvidia-cfg.so.384.98
--rwxr-xr-x	root/root	usr/lib32/libnvidia-compiler.so.384.98
--rwxr-xr-x	root/root	usr/lib32/libnvidia-encode.so.384.98
--rwxr-xr-x	root/root	usr/lib32/libnvidia-fatbinaryloader.so.384.98
--rwxr-xr-x	root/root	usr/lib32/libnvidia-fbc.so.384.98
--rwxr-xr-x	root/root	usr/lib32/libnvidia-glcore.so.384.98
--rwxr-xr-x	root/root	usr/lib32/libnvidia-ifr.so.384.98
-lrwxrwxrwx	root/root	usr/lib32/libnvidia-ml.so -> libnvidia-ml.so.384.98
-lrwxrwxrwx	root/root	usr/lib32/libnvidia-ml.so.1 -> libnvidia-ml.so.384.98
--rwxr-xr-x	root/root	usr/lib32/libnvidia-ml.so.384.98
--rwxr-xr-x	root/root	usr/lib32/libnvidia-opencl.so.384.98
--rwxr-xr-x	root/root	usr/lib32/libnvidia-tls.so.384.98
+-rwxr-xr-x	root/root	usr/lib32/libcuda.so.384.111
+lrwxrwxrwx	root/root	usr/lib32/libnvcuvid.so -> libnvcuvid.so.384.111
+lrwxrwxrwx	root/root	usr/lib32/libnvcuvid.so.1 -> libnvcuvid.so.384.111
+-rwxr-xr-x	root/root	usr/lib32/libnvcuvid.so.384.111
+-rwxr-xr-x	root/root	usr/lib32/libnvidia-cfg.so.384.111
+-rwxr-xr-x	root/root	usr/lib32/libnvidia-compiler.so.384.111
+-rwxr-xr-x	root/root	usr/lib32/libnvidia-encode.so.384.111
+-rwxr-xr-x	root/root	usr/lib32/libnvidia-fatbinaryloader.so.384.111
+-rwxr-xr-x	root/root	usr/lib32/libnvidia-fbc.so.384.111
+-rwxr-xr-x	root/root	usr/lib32/libnvidia-glcore.so.384.111
+-rwxr-xr-x	root/root	usr/lib32/libnvidia-ifr.so.384.111
+lrwxrwxrwx	root/root	usr/lib32/libnvidia-ml.so -> libnvidia-ml.so.384.111
+lrwxrwxrwx	root/root	usr/lib32/libnvidia-ml.so.1 -> libnvidia-ml.so.384.111
+-rwxr-xr-x	root/root	usr/lib32/libnvidia-ml.so.384.111
+-rwxr-xr-x	root/root	usr/lib32/libnvidia-opencl.so.384.111
+-rwxr-xr-x	root/root	usr/lib32/libnvidia-tls.so.384.111
 drwxr-xr-x	root/root	usr/lib32/tls/
--rwxr-xr-x	root/root	usr/lib32/tls/libnvidia-tls.so.384.98
+-rwxr-xr-x	root/root	usr/lib32/tls/libnvidia-tls.so.384.111
 drwxr-xr-x	root/root	usr/lib32/vdpau/
-lrwxrwxrwx	root/root	usr/lib32/vdpau/libvdpau_nvidia.so -> libvdpau_nvidia.so.384.98
-lrwxrwxrwx	root/root	usr/lib32/vdpau/libvdpau_nvidia.so.1 -> libvdpau_nvidia.so.384.98
--rwxr-xr-x	root/root	usr/lib32/vdpau/libvdpau_nvidia.so.384.98
+lrwxrwxrwx	root/root	usr/lib32/vdpau/libvdpau_nvidia.so -> libvdpau_nvidia.so.384.111
+lrwxrwxrwx	root/root	usr/lib32/vdpau/libvdpau_nvidia.so.1 -> libvdpau_nvidia.so.384.111
+-rwxr-xr-x	root/root	usr/lib32/vdpau/libvdpau_nvidia.so.384.111
diff --git a/nvidia-32/.md5sum b/nvidia-32/.md5sum
index 511cd09..a1800db 100644
--- a/nvidia-32/.md5sum
+++ b/nvidia-32/.md5sum
@@ -1 +1 @@
-d3d57e2a94a65425737d738a72ddd427  NVIDIA-Linux-x86-384.98.run
+2d2d5e12b3d677b9e8864320150e2499  NVIDIA-Linux-x86-384.111.run
diff --git a/nvidia-32/.signature b/nvidia-32/.signature
index 49730ef..91309a2 100644
--- a/nvidia-32/.signature
+++ b/nvidia-32/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXSYitlhGjna4yT/3H9i1dpXDN63EOKHrqO4/9NROc9NM9usYV/IvPs5y3HhtOZ6F0I5iaXBDeJlqU2snoUehKQ0=
-SHA256 (Pkgfile) = 1266ad4639fcb06b77be69d7c38501e46e7a9a901f91aa4804bd72b028aefce8
-SHA256 (.footprint) = 7ab38d7ec3d49393c9d90c1cbe68c997d4dde0f5c88f2adb1d2d6abe665cef0f
-SHA256 (NVIDIA-Linux-x86-384.98.run) = 93e38818b8fc5d0fc34f05449c15808e774de389545475a9536ffb6555b3bb57
+RWSwxGo/zH7eXaCwlz9gjBJuPK5W9KhvAa+XgMdmqC5koTz7SFbM9vrDLvW6r7TQ7WaUljZMcdcuJRtDT+hCUt2JOuwhnbeiRwo=
+SHA256 (Pkgfile) = e5261c83f85af1fe74f0faf6f757bd0829ef826c48dffb946dad7e563bd458b1
+SHA256 (.footprint) = d9a8ad44ca9a35a1f23568ab653f7507a0a7869a7dada7ecc0513e8a5e35e982
+SHA256 (NVIDIA-Linux-x86-384.111.run) = 89fff5466abd0ad212bedd9587cc86d617b70ad23aaebad424e0ae63e1f1948f
diff --git a/nvidia-32/Pkgfile b/nvidia-32/Pkgfile
index d7d65f8..4d720f2 100644
--- a/nvidia-32/Pkgfile
+++ b/nvidia-32/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: nvidia xorg-libxvmc-32
 
 name=nvidia-32
-version=384.98
+version=384.111
 release=1
 source=(http://us.download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version.run)
 

From crux at crux.nu  Tue Jan  9 21:09:03 2018
From: crux at crux.nu (crux at crux.nu)
Date: Tue,  9 Jan 2018 21:09:03 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): glib: updated to 2.54.3
Message-ID: <20180109210903.3528D18029E@crux.nu>

commit 0595c132d5f9711b5edc48bff0862fedafb0049c
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Tue Jan 9 22:08:22 2018 +0100

    glib: updated to 2.54.3

diff --git a/glib/.footprint b/glib/.footprint
index 46e43729f..c5c85a3da 100644
--- a/glib/.footprint
+++ b/glib/.footprint
@@ -292,25 +292,25 @@ drwxr-xr-x	root/root	usr/lib/glib-2.0/
 drwxr-xr-x	root/root	usr/lib/glib-2.0/include/
 -rw-r--r--	root/root	usr/lib/glib-2.0/include/glibconfig.h
 -rwxr-xr-x	root/root	usr/lib/libgio-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgio-2.0.so -> libgio-2.0.so.0.5400.2
-lrwxrwxrwx	root/root	usr/lib/libgio-2.0.so.0 -> libgio-2.0.so.0.5400.2
--rwxr-xr-x	root/root	usr/lib/libgio-2.0.so.0.5400.2
+lrwxrwxrwx	root/root	usr/lib/libgio-2.0.so -> libgio-2.0.so.0.5400.3
+lrwxrwxrwx	root/root	usr/lib/libgio-2.0.so.0 -> libgio-2.0.so.0.5400.3
+-rwxr-xr-x	root/root	usr/lib/libgio-2.0.so.0.5400.3
 -rwxr-xr-x	root/root	usr/lib/libglib-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libglib-2.0.so -> libglib-2.0.so.0.5400.2
-lrwxrwxrwx	root/root	usr/lib/libglib-2.0.so.0 -> libglib-2.0.so.0.5400.2
--rwxr-xr-x	root/root	usr/lib/libglib-2.0.so.0.5400.2
+lrwxrwxrwx	root/root	usr/lib/libglib-2.0.so -> libglib-2.0.so.0.5400.3
+lrwxrwxrwx	root/root	usr/lib/libglib-2.0.so.0 -> libglib-2.0.so.0.5400.3
+-rwxr-xr-x	root/root	usr/lib/libglib-2.0.so.0.5400.3
 -rwxr-xr-x	root/root	usr/lib/libgmodule-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgmodule-2.0.so -> libgmodule-2.0.so.0.5400.2
-lrwxrwxrwx	root/root	usr/lib/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.5400.2
--rwxr-xr-x	root/root	usr/lib/libgmodule-2.0.so.0.5400.2
+lrwxrwxrwx	root/root	usr/lib/libgmodule-2.0.so -> libgmodule-2.0.so.0.5400.3
+lrwxrwxrwx	root/root	usr/lib/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.5400.3
+-rwxr-xr-x	root/root	usr/lib/libgmodule-2.0.so.0.5400.3
 -rwxr-xr-x	root/root	usr/lib/libgobject-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgobject-2.0.so -> libgobject-2.0.so.0.5400.2
-lrwxrwxrwx	root/root	usr/lib/libgobject-2.0.so.0 -> libgobject-2.0.so.0.5400.2
--rwxr-xr-x	root/root	usr/lib/libgobject-2.0.so.0.5400.2
+lrwxrwxrwx	root/root	usr/lib/libgobject-2.0.so -> libgobject-2.0.so.0.5400.3
+lrwxrwxrwx	root/root	usr/lib/libgobject-2.0.so.0 -> libgobject-2.0.so.0.5400.3
+-rwxr-xr-x	root/root	usr/lib/libgobject-2.0.so.0.5400.3
 -rwxr-xr-x	root/root	usr/lib/libgthread-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgthread-2.0.so -> libgthread-2.0.so.0.5400.2
-lrwxrwxrwx	root/root	usr/lib/libgthread-2.0.so.0 -> libgthread-2.0.so.0.5400.2
--rwxr-xr-x	root/root	usr/lib/libgthread-2.0.so.0.5400.2
+lrwxrwxrwx	root/root	usr/lib/libgthread-2.0.so -> libgthread-2.0.so.0.5400.3
+lrwxrwxrwx	root/root	usr/lib/libgthread-2.0.so.0 -> libgthread-2.0.so.0.5400.3
+-rwxr-xr-x	root/root	usr/lib/libgthread-2.0.so.0.5400.3
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gio-2.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gio-unix-2.0.pc
@@ -329,8 +329,8 @@ drwxr-xr-x	root/root	usr/share/gdb/
 drwxr-xr-x	root/root	usr/share/gdb/auto-load/
 drwxr-xr-x	root/root	usr/share/gdb/auto-load/usr/
 drwxr-xr-x	root/root	usr/share/gdb/auto-load/usr/lib/
--rwxr-xr-x	root/root	usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.5400.2-gdb.py
--rwxr-xr-x	root/root	usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.5400.2-gdb.py
+-rwxr-xr-x	root/root	usr/share/gdb/auto-load/usr/lib/libglib-2.0.so.0.5400.3-gdb.py
+-rwxr-xr-x	root/root	usr/share/gdb/auto-load/usr/lib/libgobject-2.0.so.0.5400.3-gdb.py
 drwxr-xr-x	root/root	usr/share/gettext/
 drwxr-xr-x	root/root	usr/share/gettext/its/
 -rw-r--r--	root/root	usr/share/gettext/its/gschema.its
diff --git a/glib/.md5sum b/glib/.md5sum
index 9dbacbaed..c8d29cc61 100644
--- a/glib/.md5sum
+++ b/glib/.md5sum
@@ -1,2 +1,2 @@
-50f83e08f080f99b1e2f0ad2b760fb81  glib-2.54.2.tar.xz
+16e886ad677bf07b7d48eb8188bcf759  glib-2.54.3.tar.xz
 3df1b49e24d47881951b0752bce7de70  gschemas.compiled
diff --git a/glib/.signature b/glib/.signature
index ebaf8ecd5..383b45cd6 100644
--- a/glib/.signature
+++ b/glib/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/SU4vZ4NoE1fKQFeFEDDHSIOw6avNZTQQaxJvtOFvFBrhXkJaHK2VaulM+XuoO+CjOgTuCYNK46RtGQt7yTDfw8=
-SHA256 (Pkgfile) = b8cca7878c39653a1b504eaa994a98f367ca2e45ac5cb479e6e81538fa13fb18
-SHA256 (.footprint) = db0b124913a1ddaed2d97c4a76b56dd135611022c8f167c6e45a78f660424318
-SHA256 (glib-2.54.2.tar.xz) = bb89e5c5aad33169a8c7f28b45671c7899c12f74caf707737f784d7102758e6c
+RWSE3ohX2g5d/emQuu+uxZaJYdQlHtr9uoRre3Z/PpzRUYIwSPj603yR12THAxVGBuUVzJhDIGVfWsTFI8lI8aO+zpRmn+cIYww=
+SHA256 (Pkgfile) = 55f75fba68e44d21b132c7d920033d8d01cdfa30372f5a092d44908cd8f56b47
+SHA256 (.footprint) = 670b6481973325f0c1e9f763c3f1b511462dd8dc97af3d1066d69cdc75455263
+SHA256 (glib-2.54.3.tar.xz) = 963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8
 SHA256 (gschemas.compiled) = 076765095eade578349d68e367d43cbf3b1f691989ac6b32cc3337999c34633c
diff --git a/glib/Pkgfile b/glib/Pkgfile
index f54a4cb88..536fce274 100644
--- a/glib/Pkgfile
+++ b/glib/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  libpcre libffi python
 
 name=glib
-version=2.54.2
+version=2.54.3
 release=1
 source=(http://download.gnome.org/sources/$name/${version:0:4}/$name-$version.tar.xz \
 	gschemas.compiled)

From crux at crux.nu  Tue Jan  9 21:09:03 2018
From: crux at crux.nu (crux at crux.nu)
Date: Tue,  9 Jan 2018 21:09:03 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): gtk: updated to 2.24.32
Message-ID: <20180109210903.38D2F1802DE@crux.nu>

commit d180da135639fdb8ca612fcdbe44e5e58a94bd25
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Tue Jan 9 22:08:05 2018 +0100

    gtk: updated to 2.24.32

diff --git a/gtk/.footprint b/gtk/.footprint
index f32915508..e6d295de6 100644
--- a/gtk/.footprint
+++ b/gtk/.footprint
@@ -325,13 +325,13 @@ lrwxrwxrwx	root/root	usr/lib/libgailutil.so -> libgailutil.so.18.0.1
 lrwxrwxrwx	root/root	usr/lib/libgailutil.so.18 -> libgailutil.so.18.0.1
 -rwxr-xr-x	root/root	usr/lib/libgailutil.so.18.0.1
 -rw-r--r--	root/root	usr/lib/libgdk-x11-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.2400.31
-lrwxrwxrwx	root/root	usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.2400.31
--rwxr-xr-x	root/root	usr/lib/libgdk-x11-2.0.so.0.2400.31
+lrwxrwxrwx	root/root	usr/lib/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.2400.32
+lrwxrwxrwx	root/root	usr/lib/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.2400.32
+-rwxr-xr-x	root/root	usr/lib/libgdk-x11-2.0.so.0.2400.32
 -rw-r--r--	root/root	usr/lib/libgtk-x11-2.0.la
-lrwxrwxrwx	root/root	usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.2400.31
-lrwxrwxrwx	root/root	usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.2400.31
--rwxr-xr-x	root/root	usr/lib/libgtk-x11-2.0.so.0.2400.31
+lrwxrwxrwx	root/root	usr/lib/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.2400.32
+lrwxrwxrwx	root/root	usr/lib/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.2400.32
+-rwxr-xr-x	root/root	usr/lib/libgtk-x11-2.0.so.0.2400.32
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gail.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/gdk-2.0.pc
diff --git a/gtk/.md5sum b/gtk/.md5sum
index 94938512e..4b123ae6b 100644
--- a/gtk/.md5sum
+++ b/gtk/.md5sum
@@ -1,3 +1,3 @@
-526a1008586094a2cbb4592fd3f9ee10  gtk+-2.24.31.tar.xz
+d5742aa42275203a499b59b4c382a784  gtk+-2.24.32.tar.xz
 943d209df9d2cbdde16263b7bbfd4c10  gtk-register.sh
 981cbb7e87666badc4798ceaf62c7f72  gtk.immodules
diff --git a/gtk/.signature b/gtk/.signature
index fe5531852..d5698d10c 100644
--- a/gtk/.signature
+++ b/gtk/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/Uvl0/v17k80a0rugoIcFlauloG1U1ADiQDHFyoVQET6SntnUvo8Ps62Thdt7Xp4GtfXolsX9VYgcJUdfllhBAg=
-SHA256 (Pkgfile) = 6f37f34367fdabe4bbd670bfc9b87dbe8a405e42d76e4b2df04828822dfcab81
-SHA256 (.footprint) = 4c4ada8225cdac065ece7971a972bd0b0d70bb85dc1473112194a2fa69c19c57
-SHA256 (gtk+-2.24.31.tar.xz) = 68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658
+RWSE3ohX2g5d/cpOLHhakeTnNfHHsnV8N6c2Ydwnqbd0nsoW1XEbnm4eaEg0aWLh/yzZ5nQf/C6i0lrM5SruxtHkemoq6FnhaQw=
+SHA256 (Pkgfile) = 9e745701d91c3a6dccff078126944b626aaa1ac00687d4056dc220d8f384943f
+SHA256 (.footprint) = 8eb997a460e45c05eadc45f39387b8c2dd439e415292520a71b15137f052b476
+SHA256 (gtk+-2.24.32.tar.xz) = b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
 SHA256 (gtk.immodules) = 728ffab4734db8f3304fb9dd6531fd20acd6c7078b8eec6a3d1e4fd4bd247b0b
 SHA256 (gtk-register.sh) = d773b64a65410dfe5d9b3ac4eab163473fc28994973ea2bad692b36a988e11ad
diff --git a/gtk/Pkgfile b/gtk/Pkgfile
index 62588e8df..5730151a3 100644
--- a/gtk/Pkgfile
+++ b/gtk/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: atk, hicolor-icon-theme, gdk-pixbuf, pango, xorg-libxcursor, xorg-libxinerama, xorg-libxrandr, xorg-libxcomposite
 
 name=gtk
-version=2.24.31
+version=2.24.32
 release=1
 source=(http://download.gnome.org/sources/gtk+/2.24/${name}+-$version.tar.xz \
 	gtk.immodules gtk-register.sh)

From crux at crux.nu  Tue Jan  9 21:09:03 2018
From: crux at crux.nu (crux at crux.nu)
Date: Tue,  9 Jan 2018 21:09:03 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): freetype: updated to 2.9
Message-ID: <20180109210903.3C5461802E4@crux.nu>

commit afbf58d27651f4bf59d5b422dca2c70e7f63b0c0
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Tue Jan 9 21:48:04 2018 +0100

    freetype: updated to 2.9

diff --git a/freetype/.footprint b/freetype/.footprint
index 723f5030b..c7d7f1395 100644
--- a/freetype/.footprint
+++ b/freetype/.footprint
@@ -12,15 +12,14 @@ drwxr-xr-x	root/root	usr/include/freetype2/freetype/config/
 -rw-r--r--	root/root	usr/include/freetype2/freetype/config/ftstdlib.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/freetype.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftadvanc.h
--rw-r--r--	root/root	usr/include/freetype2/freetype/ftautoh.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftbbox.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftbdf.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftbitmap.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftbzip2.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftcache.h
--rw-r--r--	root/root	usr/include/freetype2/freetype/ftcffdrv.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftchapters.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftcid.h
+-rw-r--r--	root/root	usr/include/freetype2/freetype/ftdriver.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/fterrdef.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/fterrors.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftfntfmt.h
@@ -39,7 +38,7 @@ drwxr-xr-x	root/root	usr/include/freetype2/freetype/config/
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftmoderr.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftotval.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftoutln.h
--rw-r--r--	root/root	usr/include/freetype2/freetype/ftpcfdrv.h
+-rw-r--r--	root/root	usr/include/freetype2/freetype/ftparams.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftpfr.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftrender.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftsizes.h
@@ -48,21 +47,19 @@ drwxr-xr-x	root/root	usr/include/freetype2/freetype/config/
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftsynth.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftsystem.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/fttrigon.h
--rw-r--r--	root/root	usr/include/freetype2/freetype/ftttdrv.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/fttypes.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ftwinfnt.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/t1tables.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/ttnameid.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/tttables.h
 -rw-r--r--	root/root	usr/include/freetype2/freetype/tttags.h
--rw-r--r--	root/root	usr/include/freetype2/freetype/ttunpat.h
 -rw-r--r--	root/root	usr/include/freetype2/ft2build.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libfreetype.a
 -rwxr-xr-x	root/root	usr/lib/libfreetype.la
-lrwxrwxrwx	root/root	usr/lib/libfreetype.so -> libfreetype.so.6.15.0
-lrwxrwxrwx	root/root	usr/lib/libfreetype.so.6 -> libfreetype.so.6.15.0
--rwxr-xr-x	root/root	usr/lib/libfreetype.so.6.15.0
+lrwxrwxrwx	root/root	usr/lib/libfreetype.so -> libfreetype.so.6.16.0
+lrwxrwxrwx	root/root	usr/lib/libfreetype.so.6 -> libfreetype.so.6.16.0
+-rwxr-xr-x	root/root	usr/lib/libfreetype.so.6.16.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/freetype2.pc
 drwxr-xr-x	root/root	usr/share/
diff --git a/freetype/.md5sum b/freetype/.md5sum
index 5e4e1fd51..fa72720c8 100644
--- a/freetype/.md5sum
+++ b/freetype/.md5sum
@@ -1 +1 @@
-bf0a210b6fe781228fa0e4a80691a521  freetype-2.8.1.tar.bz2
+513c403c110016fdc7e537216a642b1d  freetype-2.9.tar.bz2
diff --git a/freetype/.signature b/freetype/.signature
index 8f48a0387..2fc716aaf 100644
--- a/freetype/.signature
+++ b/freetype/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/f85IRjJWmkCVSC+XxfHVWEXvhBSjdPsw9fE8uR/NIDNhfugYjxc5DzO7+7j0RY2gTX8zyZX6ZPfhJQatHZZeQ0=
-SHA256 (Pkgfile) = d6b1a5490f7dcf3a73053bba3e8c4889e8ea8a592e5026622d391217346453d8
-SHA256 (.footprint) = 3ce29e3b246aca093a05a8191cd3067a0f08c698aaa52c6872d3c67272cdbb4d
-SHA256 (freetype-2.8.1.tar.bz2) = e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78
+RWSE3ohX2g5d/b3hktn/BdjVFwD7jMn+sCVzaOtFrZoYKUWgqykgAdC+gjMeIkur0n3uwI8r8/tLp9uKdMHIx7dDrlbaYLLHtAY=
+SHA256 (Pkgfile) = eeed712b06d696c513b8603e19eba9cd17a1f64643c470928b44a2489ba7610f
+SHA256 (.footprint) = 93edabc23c1ccc2ebab56022b8f17c21537885fc55c9fe24be8e1c260fe99efd
+SHA256 (freetype-2.9.tar.bz2) = e6ffba3c8cef93f557d1f767d7bc3dee860ac7a3aaff588a521e081bc36f4c8a
diff --git a/freetype/Pkgfile b/freetype/Pkgfile
index 9959576ad..56559a7b6 100644
--- a/freetype/Pkgfile
+++ b/freetype/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: libpng
 
 name=freetype
-version=2.8.1
+version=2.9
 release=1
 source=(http://download.savannah.gnu.org/releases/$name/$name-$version.tar.bz2)
 

From crux at crux.nu  Wed Jan 10 12:51:27 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed, 10 Jan 2018 12:51:27 +0000 (UTC)
Subject: [crux-commits] ports/contrib (3.3): monit: adopted
Message-ID: <20180110125127.371E718029E@crux.nu>

commit cd7f7a3c9d7746f5b6d9abcdbdc351195d2499ed
Author: Juergen Daubert <jue at jue.li>
Date:   Wed Jan 10 13:50:39 2018 +0100

    monit: adopted

diff --git a/monit/Pkgfile b/monit/Pkgfile
index b39a26d5..5783254e 100644
--- a/monit/Pkgfile
+++ b/monit/Pkgfile
@@ -1,8 +1,7 @@
 # Description: Utility for monitoring daemons running on a Unix system
-# URL: http://www.tildeslash.com/monit/
-# Maintainer: Jose V Beneyto, sepen at crux dot nu
-# Packager: Jose V Beneyto, sepen at crux dot nu
-# Depends on: openssl 
+# URL:         http://www.tildeslash.com/monit/
+# Maintainer:  Juergen Daubert, jue at crux dot nu
+# Depends on:  openssl 
 
 name=monit
 version=5.25.1

From crux at crux.nu  Wed Jan 10 12:51:27 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed, 10 Jan 2018 12:51:27 +0000 (UTC)
Subject: [crux-commits] ports/contrib (3.3): at: fix source URL,
 update to 3.1.20, set UNMAINTAINED (FS#1553)
Message-ID: <20180110125127.3A7DC1802AA@crux.nu>

commit f029f8c2b69876924f210bfc12af92b21ce52f5c
Author: Juergen Daubert <jue at jue.li>
Date:   Wed Jan 10 13:48:31 2018 +0100

    at: fix source URL, update to 3.1.20, set UNMAINTAINED (FS#1553)

diff --git a/at/.footprint b/at/.footprint
index 2741151e..b73bc8d0 100644
--- a/at/.footprint
+++ b/at/.footprint
@@ -8,21 +8,22 @@ drwxr-xr-x	root/root	usr/bin/
 lrwxrwxrwx	root/root	usr/bin/atq -> at
 lrwxrwxrwx	root/root	usr/bin/atrm -> at
 -rwxr-xr-x	root/root	usr/bin/batch
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/at.1.gz
-lrwxrwxrwx	root/root	usr/man/man1/atq.1.gz -> at.1.gz
-lrwxrwxrwx	root/root	usr/man/man1/atrm.1.gz -> at.1.gz
-lrwxrwxrwx	root/root	usr/man/man1/batch.1.gz -> at.1.gz
-drwxr-xr-x	root/root	usr/man/man5/
--rw-r--r--	root/root	usr/man/man5/at_allow.5.gz
-lrwxrwxrwx	root/root	usr/man/man5/at_deny.5.gz -> at_allow.5.gz
-drwxr-xr-x	root/root	usr/man/man8/
--rw-r--r--	root/root	usr/man/man8/atd.8.gz
--rw-r--r--	root/root	usr/man/man8/atrun.8.gz
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/atd
 -rwxr-xr-x	root/root	usr/sbin/atrun
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/at.1.gz
+lrwxrwxrwx	root/root	usr/share/man/man1/atq.1.gz -> at.1.gz
+lrwxrwxrwx	root/root	usr/share/man/man1/atrm.1.gz -> at.1.gz
+lrwxrwxrwx	root/root	usr/share/man/man1/batch.1.gz -> at.1.gz
+drwxr-xr-x	root/root	usr/share/man/man5/
+-rw-r--r--	root/root	usr/share/man/man5/at.allow.5.gz
+lrwxrwxrwx	root/root	usr/share/man/man5/at.deny.5.gz -> at.allow.5.gz
+drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/atd.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/atrun.8.gz
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/spool/
 drwxr-xr-x	root/root	var/spool/cron/
diff --git a/at/.md5sum b/at/.md5sum
index 8b76489f..3c1b299a 100644
--- a/at/.md5sum
+++ b/at/.md5sum
@@ -1,2 +1,2 @@
-1e67991776148fb319fd77a2e599a765  at_3.1.12.orig.tar.gz
+e7bd7b785b2cbb17e133d6bdc0fb099e  at_3.1.20.orig.tar.gz
 03ce3ce2cf2cf9b5b4a93b495641c44e  atd
diff --git a/at/.signature b/at/.signature
index cf65191c..ede6892a 100644
--- a/at/.signature
+++ b/at/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF338++cM5bpOkxjGcedL08nePc7dVCfkwp9xrly3oo56/YhfsxCIgvq6mK8isSVSKIACMX3t2rDnLaNjlGhtXMQs=
-SHA256 (Pkgfile) = f0f878e105f7407de6b084821281780042e8fd3d858f3bd5590051134584eafb
-SHA256 (.footprint) = 336fd297e4472910cfe31f9006ffa8086833051a0be1d09d7246cc21f6ea8554
-SHA256 (at_3.1.12.orig.tar.gz) = 7c55c6ab4fbe8add9e68f31b2b0ebf3fe805c9a4e7cfb2623a3d8a4789cc18f3
+RWSagIOpLGJF33618y1NCYV31IF+KN0SfEKDpJ9VDzq8a2LYHjfuatmqixr7M1f5wbbZ7g1bU0JniOfiMwnPd5SRVhC5OtgU3g8=
+SHA256 (Pkgfile) = ab1559149b7d6dfd586cf373188fad008135ef9c3c02a4f9b45fe150e1bd80fa
+SHA256 (.footprint) = 60feeb0ada64af8cf2577b02f5735b8ea2786da8ccd3ae9e67aa5e6103730bb5
+SHA256 (at_3.1.20.orig.tar.gz) = 0871923cab73050b98ace020664eb2ddc1e669e4166b5abb64d864d02fcefab9
 SHA256 (atd) = 832b65588cde8e9f13afb314c6546186d554bb459d04d98e9e4d5a95a6f10b01
diff --git a/at/Pkgfile b/at/Pkgfile
index c53d8e16..d27670c5 100644
--- a/at/Pkgfile
+++ b/at/Pkgfile
@@ -1,21 +1,21 @@
 # Description: at, batch - queue, examine or delete jobs for later execution
 # URL: http://ftp.debian.org/debian/pool/main/a/at/
-# Maintainer: Jose V Beneyto, sepen at crux dot nu
-# Packager: Jose V Beneyto, sepen at crux dot nu
+# Maintainer: UNMAINTAINED
 # Depends on: exim
 
 name=at
-version=3.1.12
+version=3.1.20
 release=1
-source=(ftp://ftp.debian.org/debian/pool/main/a/$name/${name}_$version.orig.tar.gz \
+source=(http://ftp.debian.org/debian/pool/main/a/$name/${name}_$version.orig.tar.gz \
         atd)
 
 build() {
   cd $name-$version
   export SENDMAIL=/usr/sbin/sendmail
-  ./configure --prefix=/usr \
-              --mandir=/usr/man
+  autoreconf
+  CONFIG_SHELL=/bin/bash ./configure --prefix=/usr
+  make -j1
   make IROOT=$PKG install
-  rm -rf $PKG/usr/doc
+  rm -r $PKG/usr/doc
   install -D -m 0755 $SRC/atd $PKG/etc/rc.d/atd
 }

From crux at crux.nu  Wed Jan 10 12:51:27 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed, 10 Jan 2018 12:51:27 +0000 (UTC)
Subject: [crux-commits] ports/contrib (3.3): pmwiki: update to 2.2.106
Message-ID: <20180110125127.3E75B1802B4@crux.nu>

commit 9847f4c59fa5dc830cf8532a1565b6b569861c2e
Author: Juergen Daubert <jue at jue.li>
Date:   Wed Jan 10 13:29:19 2018 +0100

    pmwiki: update to 2.2.106

diff --git a/pmwiki/.md5sum b/pmwiki/.md5sum
index 76959dbd..29980b82 100644
--- a/pmwiki/.md5sum
+++ b/pmwiki/.md5sum
@@ -1 +1 @@
-45206561f0d87332f6900c5b3af307e1  pmwiki-2.2.105.tgz
+f59d17c56b671ef0ac7e0bf78a63f40b  pmwiki-2.2.106.tgz
diff --git a/pmwiki/.signature b/pmwiki/.signature
index 90903e35..90f51f7a 100644
--- a/pmwiki/.signature
+++ b/pmwiki/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3zuZ7T+78rL2sMfhRpmgLPtVInoj1v5c3LKNZFQN4GCDhqVVKIEHPZWJiX77WYtoo07fqU6PS+oiS3/z9kzCjwg=
-SHA256 (Pkgfile) = 6ae15c417973b3ced154376e0107e133c2a6c975c13c35549b016511cb5a41d2
+RWSagIOpLGJF31sU19NgiCbq+DEuQfVJT8eKYOB+SjD5/Ozo9xy8WD4V2ajhHcS5niI3ojMR5MvyxgkmpXS0NjUVu4CrkylttAI=
+SHA256 (Pkgfile) = 7fd07aed181f6755ae71035cc06d804d04896d956597583bf9b4a9e31a132977
 SHA256 (.footprint) = a56864eb4a2967c75494ad7d4aafae8ada724886d4d70e46ea8253321a6310ce
-SHA256 (pmwiki-2.2.105.tgz) = af25f929fd09e5314931c8ab2c980e1ff4645dc9b95bf1efa79fff45835203e5
+SHA256 (pmwiki-2.2.106.tgz) = 1d9e35cfa316ced3254f7f4fc7e679ab54ddd45ef85764cef9faed130608c698
diff --git a/pmwiki/Pkgfile b/pmwiki/Pkgfile
index 1edac8c6..8f3977e8 100644
--- a/pmwiki/Pkgfile
+++ b/pmwiki/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  php-fpm
 
 name=pmwiki
-version=2.2.105
+version=2.2.106
 release=1
 source=(http://www.pmwiki.org/pub/$name/$name-$version.tgz)
 

From crux at crux.nu  Wed Jan 10 13:46:19 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed, 10 Jan 2018 13:46:19 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): dialog: update to 1.3-20171209,
 new maintainer
Message-ID: <20180110134619.EA8971802CD@crux.nu>

commit 0af2593e6d23b80487d9e2b4e39e8546df3113ac
Author: Juergen Daubert <jue at jue.li>
Date:   Wed Jan 10 14:45:42 2018 +0100

    dialog: update to 1.3-20171209, new maintainer

diff --git a/dialog/.md5sum b/dialog/.md5sum
index 3d69b91d4..1bad3ea49 100644
--- a/dialog/.md5sum
+++ b/dialog/.md5sum
@@ -1 +1 @@
-a39ec183517bc1feaff017d067300b8c  dialog-1.3-20160828.tgz
+f66f28beca900b54f5fc90fdcce93508  dialog-1.3-20171209.tgz
diff --git a/dialog/.signature b/dialog/.signature
index e44df9c61..e5e1c6eed 100644
--- a/dialog/.signature
+++ b/dialog/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/RuNh157437JbsScmLuM963Fj7qstU7i3UhyPW+sGCr4QjV0OzSMoSl3k8jBx9B4vFSGYdt/QAY5dL0fI3qu3wY=
-SHA256 (Pkgfile) = 6426cd2815bc7de3256df5071b9da99ba293dcd460282ffd82f516903855066b
+RWSE3ohX2g5d/arxl1WY/p2bXLvn/IR5vHCJw/PXT6xkZRpk/M4whd5aqRMuyEMFxKMs8NqvpxW7VNJ/Wqzv0VcClykBHjyn4wg=
+SHA256 (Pkgfile) = f55ecd833c12ef11af589076620606367eba11c1eb3eec5527b6a0825a9f48d4
 SHA256 (.footprint) = f0120269ef1cd244a1f1e263249bb22e28cad98b4dcae44048d538b9fa3d71e8
-SHA256 (dialog-1.3-20160828.tgz) = 453095abaec288bfbc1ca9faced917e17742cff1ea45ec46210071ac153562f9
+SHA256 (dialog-1.3-20171209.tgz) = 20139442119e2eff5c35236e8e5e313c901539008d9cccf8c8ab3851b41267e6
diff --git a/dialog/Pkgfile b/dialog/Pkgfile
index a9e68a1fa..ff0909041 100644
--- a/dialog/Pkgfile
+++ b/dialog/Pkgfile
@@ -1,20 +1,18 @@
 # Description: A tool to display dialog boxes from shell scripts
-# URL: http://invisible-island.net/dialog/
-# Maintainer: Jose V Beneyto, sepen at crux dot nu
-# Packager: Simone Rota, sip at crux dot nu
-# Depends on: ncurses
+# URL:         http://invisible-island.net/dialog/
+# Maintainer:  CRUX System Team, core-ports at crux dot nu
+# Depends on:  ncurses
 
 name=dialog
-version=1.3-20160828
+version=1.3-20171209
 release=1
-source=(ftp://dickey.his.com/$name/$name-$version.tgz)
+source=(ftp://ftp.invisible-island.net/$name/$name-$version.tgz)
 
 build () {
-  cd $name-$version
+    cd $name-$version
 
-  ./configure --prefix=/usr \
-              --with-ncursesw
+    ./configure --prefix=/usr --with-ncursesw
 
-  make
-  make DESTDIR=$PKG install
+    make
+    make DESTDIR=$PKG install
 }

From crux at crux.nu  Wed Jan 10 15:30:16 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed, 10 Jan 2018 15:30:16 +0000 (UTC)
Subject: [crux-commits] ports/contrib (3.3): pv: updated to version 1.6.6
Message-ID: <20180110153016.DCF25180237@crux.nu>

commit e2a7fc432b586fd8fc7e7399310f8e6d6d5903e5
Author: Matt Housh <jaeger at crux.ninja>
Date:   Wed Jan 10 09:30:02 2018 -0600

    pv: updated to version 1.6.6

diff --git a/pv/.md5sum b/pv/.md5sum
index bf12d181..3fc8a94e 100644
--- a/pv/.md5sum
+++ b/pv/.md5sum
@@ -1 +1 @@
-e163d8963c595b2032666724bc509bcc  pv-1.6.0.tar.bz2
+ff3564fddcc2b9bd4a9c1d143aba4b4c  pv-1.6.6.tar.bz2
diff --git a/pv/.signature b/pv/.signature
index 0c885252..3046df53 100644
--- a/pv/.signature
+++ b/pv/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF341iM0EzwtLdXEfWYkWTVJttkuP7SeuP6/tL68IXXKps80zDROu5IEBmaxu85nk5LJrvx5MWNnJ/vGpi38KMjgw=
-SHA256 (Pkgfile) = f3be9f5da3e451837146e182b955dceb394c9606904e5f024efd2f004d4497a2
+RWSagIOpLGJF33YexQZTJVaD3P/Usq9EVd6SA+YOnfqGABPR6FwmcXYm/5LL1PEANbmtk06Rk03KD9MpaBxrxihL7KqNA3Dfgww=
+SHA256 (Pkgfile) = a03bdaf37ee15c02a993e11c2a9a411f7520bbd62a933bafda10d9a194b19773
 SHA256 (.footprint) = 6b12a404c2ad697635abbfe537668fcb6a299f5f4b02b691cfee00ae3970fdfe
-SHA256 (pv-1.6.0.tar.bz2) = 0ece824e0da27b384d11d1de371f20cafac465e038041adab57fcf4b5036ef8d
+SHA256 (pv-1.6.6.tar.bz2) = 608ef935f7a377e1439c181c4fc188d247da10d51a19ef79bcdee5043b0973f1
diff --git a/pv/Pkgfile b/pv/Pkgfile
index f37a8fe6..d4b761cd 100644
--- a/pv/Pkgfile
+++ b/pv/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer: Matt Housh, jaeger at crux dot ninja
 
 name=pv
-version=1.6.0
+version=1.6.6
 release=1
 source=(http://www.ivarch.com/programs/sources/$name-$version.tar.bz2)
 

From crux at crux.nu  Wed Jan 10 22:29:43 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed, 10 Jan 2018 22:29:43 +0000 (UTC)
Subject: [crux-commits] ports/contrib (3.3): [notify] openexr: updated to
 version 2.2.1
Message-ID: <20180110222943.5503C180297@crux.nu>

commit 2ef42011328fcd050360518bab13765695693c28
Author: Matt Housh <jaeger at crux.ninja>
Date:   Wed Jan 10 16:28:26 2018 -0600

    [notify] openexr: updated to version 2.2.1
    
    From openexr.com:
    
    This maintenance release addresses the reported OpenEXR security vulnerabilities, specifically CVE-2017-9110, CVE-2017-9111, CVE-2017-9112, CVE-2017-9113, CVE-2017-9114, CVE-2017-9115, CVE-2017-9116.

diff --git a/openexr/.footprint b/openexr/.footprint
index 3a18a224..9669409c 100644
--- a/openexr/.footprint
+++ b/openexr/.footprint
@@ -97,14 +97,14 @@ drwxr-xr-x	root/root	usr/include/OpenEXR/
 -rw-r--r--	root/root	usr/include/OpenEXR/ImfXdr.h
 -rw-r--r--	root/root	usr/include/OpenEXR/OpenEXRConfig.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libIlmImf-2_2.so.22 -> libIlmImf-2_2.so.22.0.0
--rwxr-xr-x	root/root	usr/lib/libIlmImf-2_2.so.22.0.0
+lrwxrwxrwx	root/root	usr/lib/libIlmImf-2_2.so.23 -> libIlmImf-2_2.so.23.0.0
+-rwxr-xr-x	root/root	usr/lib/libIlmImf-2_2.so.23.0.0
 -rwxr-xr-x	root/root	usr/lib/libIlmImf.la
-lrwxrwxrwx	root/root	usr/lib/libIlmImf.so -> libIlmImf-2_2.so.22.0.0
-lrwxrwxrwx	root/root	usr/lib/libIlmImfUtil-2_2.so.22 -> libIlmImfUtil-2_2.so.22.0.0
--rwxr-xr-x	root/root	usr/lib/libIlmImfUtil-2_2.so.22.0.0
+lrwxrwxrwx	root/root	usr/lib/libIlmImf.so -> libIlmImf-2_2.so.23.0.0
+lrwxrwxrwx	root/root	usr/lib/libIlmImfUtil-2_2.so.23 -> libIlmImfUtil-2_2.so.23.0.0
+-rwxr-xr-x	root/root	usr/lib/libIlmImfUtil-2_2.so.23.0.0
 -rwxr-xr-x	root/root	usr/lib/libIlmImfUtil.la
-lrwxrwxrwx	root/root	usr/lib/libIlmImfUtil.so -> libIlmImfUtil-2_2.so.22.0.0
+lrwxrwxrwx	root/root	usr/lib/libIlmImfUtil.so -> libIlmImfUtil-2_2.so.23.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/OpenEXR.pc
 drwxr-xr-x	root/root	usr/share/
diff --git a/openexr/.md5sum b/openexr/.md5sum
index 16a3cbbb..aaba82f1 100644
--- a/openexr/.md5sum
+++ b/openexr/.md5sum
@@ -1 +1 @@
-b64e931c82aa3790329c21418373db4e  openexr-2.2.0.tar.gz
+421815c32989e1b98fc4798ee754c433  openexr-2.2.1.tar.gz
diff --git a/openexr/.signature b/openexr/.signature
index 5f5936c1..2937fc27 100644
--- a/openexr/.signature
+++ b/openexr/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF38iMaz4f425JdY3leWPPypnAYXz8P8U36ij3Ie/dy/GihPaE9KM7Q9U+Y6TUTBhF9/NdxDfsvbblh8UpyRq6/Q4=
-SHA256 (Pkgfile) = b2702efc25f77ac12fe178f85c13b132acaaf66bccc3eee367903e601c340e45
-SHA256 (.footprint) = 6f02f0c4f5913d3b993d36be029848e361cfa7a0b387b8fbf60a8278cb50c9d8
-SHA256 (openexr-2.2.0.tar.gz) = 36a012f6c43213f840ce29a8b182700f6cf6b214bea0d5735594136b44914231
+RWSagIOpLGJF37m4yWkwqppg17OwAppcZ575r6OPQfzByqGbq7hkivleNxLiNJEoIvUdI+XH+vH1wBmyP2C9O1hkxz4V1Zan7g0=
+SHA256 (Pkgfile) = 307d8d0c7b760d7fc496fd46dd27fd4c78ab6099f7ee05d60cdfb6b50d3d2c33
+SHA256 (.footprint) = 94579c2be9f2f3c0fdc59037a14d5bfd04378da6c21d38d13ae0414b0a8bd1cc
+SHA256 (openexr-2.2.1.tar.gz) = 8f9a5af6131583404261931d9a5c83de0a425cb4b8b25ddab2b169fbf113aecd
diff --git a/openexr/Pkgfile b/openexr/Pkgfile
index 1d3f0748..f344fbf9 100644
--- a/openexr/Pkgfile
+++ b/openexr/Pkgfile
@@ -1,11 +1,10 @@
 # Description: A high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications.
 # URL: http://www.openexr.com/
-# Maintainer: Matt Housh, jaeger at morpheus dot net
-# Packager: Jose V Beneyto, sepen at users dot sourceforge dot net
+# Maintainer: Matt Housh, jaeger at crux dot ninja
 # Depends on: ilmbase
 
 name=openexr
-version=2.2.0
+version=2.2.1
 release=1
 source=(http://download.savannah.nongnu.org/releases/$name/$name-$version.tar.gz)
 

From crux at crux.nu  Wed Jan 10 22:29:43 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed, 10 Jan 2018 22:29:43 +0000 (UTC)
Subject: [crux-commits] ports/contrib (3.3): ilmbase: updated to version
 2.2.1
Message-ID: <20180110222943.587DA1802C2@crux.nu>

commit 04ef7d27900d624ae67125b7fb016aa21b7701be
Author: Matt Housh <jaeger at crux.ninja>
Date:   Wed Jan 10 16:28:00 2018 -0600

    ilmbase: updated to version 2.2.1

diff --git a/ilmbase/.footprint b/ilmbase/.footprint
index 60300bc1..242c7c45 100644
--- a/ilmbase/.footprint
+++ b/ilmbase/.footprint
@@ -60,24 +60,24 @@ drwxr-xr-x	root/root	usr/include/OpenEXR/
 -rw-r--r--	root/root	usr/include/OpenEXR/halfLimits.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libHalf.la
-lrwxrwxrwx	root/root	usr/lib/libHalf.so -> libHalf.so.12.0.0
-lrwxrwxrwx	root/root	usr/lib/libHalf.so.12 -> libHalf.so.12.0.0
--rwxr-xr-x	root/root	usr/lib/libHalf.so.12.0.0
-lrwxrwxrwx	root/root	usr/lib/libIex-2_2.so.12 -> libIex-2_2.so.12.0.0
--rwxr-xr-x	root/root	usr/lib/libIex-2_2.so.12.0.0
+lrwxrwxrwx	root/root	usr/lib/libHalf.so -> libHalf.so.23.0.0
+lrwxrwxrwx	root/root	usr/lib/libHalf.so.23 -> libHalf.so.23.0.0
+-rwxr-xr-x	root/root	usr/lib/libHalf.so.23.0.0
+lrwxrwxrwx	root/root	usr/lib/libIex-2_2.so.23 -> libIex-2_2.so.23.0.0
+-rwxr-xr-x	root/root	usr/lib/libIex-2_2.so.23.0.0
 -rwxr-xr-x	root/root	usr/lib/libIex.la
-lrwxrwxrwx	root/root	usr/lib/libIex.so -> libIex-2_2.so.12.0.0
-lrwxrwxrwx	root/root	usr/lib/libIexMath-2_2.so.12 -> libIexMath-2_2.so.12.0.0
--rwxr-xr-x	root/root	usr/lib/libIexMath-2_2.so.12.0.0
+lrwxrwxrwx	root/root	usr/lib/libIex.so -> libIex-2_2.so.23.0.0
+lrwxrwxrwx	root/root	usr/lib/libIexMath-2_2.so.23 -> libIexMath-2_2.so.23.0.0
+-rwxr-xr-x	root/root	usr/lib/libIexMath-2_2.so.23.0.0
 -rwxr-xr-x	root/root	usr/lib/libIexMath.la
-lrwxrwxrwx	root/root	usr/lib/libIexMath.so -> libIexMath-2_2.so.12.0.0
-lrwxrwxrwx	root/root	usr/lib/libIlmThread-2_2.so.12 -> libIlmThread-2_2.so.12.0.0
--rwxr-xr-x	root/root	usr/lib/libIlmThread-2_2.so.12.0.0
+lrwxrwxrwx	root/root	usr/lib/libIexMath.so -> libIexMath-2_2.so.23.0.0
+lrwxrwxrwx	root/root	usr/lib/libIlmThread-2_2.so.23 -> libIlmThread-2_2.so.23.0.0
+-rwxr-xr-x	root/root	usr/lib/libIlmThread-2_2.so.23.0.0
 -rwxr-xr-x	root/root	usr/lib/libIlmThread.la
-lrwxrwxrwx	root/root	usr/lib/libIlmThread.so -> libIlmThread-2_2.so.12.0.0
-lrwxrwxrwx	root/root	usr/lib/libImath-2_2.so.12 -> libImath-2_2.so.12.0.0
--rwxr-xr-x	root/root	usr/lib/libImath-2_2.so.12.0.0
+lrwxrwxrwx	root/root	usr/lib/libIlmThread.so -> libIlmThread-2_2.so.23.0.0
+lrwxrwxrwx	root/root	usr/lib/libImath-2_2.so.23 -> libImath-2_2.so.23.0.0
+-rwxr-xr-x	root/root	usr/lib/libImath-2_2.so.23.0.0
 -rwxr-xr-x	root/root	usr/lib/libImath.la
-lrwxrwxrwx	root/root	usr/lib/libImath.so -> libImath-2_2.so.12.0.0
+lrwxrwxrwx	root/root	usr/lib/libImath.so -> libImath-2_2.so.23.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/IlmBase.pc
diff --git a/ilmbase/.md5sum b/ilmbase/.md5sum
index a63a0df4..3fad22c2 100644
--- a/ilmbase/.md5sum
+++ b/ilmbase/.md5sum
@@ -1 +1 @@
-b540db502c5fa42078249f43d18a4652  ilmbase-2.2.0.tar.gz
+7b86128b04f0541b6bb33633e299cb44  ilmbase-2.2.1.tar.gz
diff --git a/ilmbase/.signature b/ilmbase/.signature
index 9a19920f..0a1d3fb3 100644
--- a/ilmbase/.signature
+++ b/ilmbase/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3yw8fjLpD7rKouVqPlKuXds/DnzahqV4LDQT/mGqKop3ZpVylysnOm1kr7jAhA+u3VPZNmUUAIn+UkdP3WeFTwM=
-SHA256 (Pkgfile) = ca51bd3c983859d0be5c43ca010ef7005fbf2a501a6553f8dbca5de4bfaba2bb
-SHA256 (.footprint) = 2665f55fabed98000d880fffb5f256da321e5a5680556c6b458ab731cb312853
-SHA256 (ilmbase-2.2.0.tar.gz) = ecf815b60695555c1fbc73679e84c7c9902f4e8faa6e8000d2f905b8b86cedc7
+RWSagIOpLGJF38dPCVwPrye2x03aRHYZLlyzHi2WbrWRlREdIDyFFWN4DL8CXB/kSKUI3sTQwZ60NMxqHQFIkB5Q8zBU8h5vtgw=
+SHA256 (Pkgfile) = 745a8d3581aa46d045ff73d8ca06fe98011bcf9565ccecd0bc5a1103ca80f58c
+SHA256 (.footprint) = 1983cabd8d2913953b12739a759448f08dd7c3a7f87da029e2ac51939b9a48ff
+SHA256 (ilmbase-2.2.1.tar.gz) = cac206e63be68136ef556c2b555df659f45098c159ce24804e9d5e9e0286609e
diff --git a/ilmbase/Pkgfile b/ilmbase/Pkgfile
index 1f4f2bbd..edb3134b 100644
--- a/ilmbase/Pkgfile
+++ b/ilmbase/Pkgfile
@@ -1,10 +1,9 @@
 # Description: Support libraries used by OpenEXR
 # URL: http://www.openexr.com/
-# Maintainer: Matt Housh, jaeger at morpheus dot net
-# Packager: Danny Rawlins, crux at romster dot me
+# Maintainer: Matt Housh, jaeger at crux dot ninja
 
 name=ilmbase
-version=2.2.0
+version=2.2.1
 release=1
 source=(http://download.savannah.nongnu.org/releases/openexr/$name-$version.tar.gz)
 

From crux at crux.nu  Thu Jan 11 10:50:04 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu, 11 Jan 2018 10:50:04 +0000 (UTC)
Subject: [crux-commits] ports/core (3.3): kmod: update to 25
Message-ID: <20180111105004.0FDDC1801AB@crux.nu>

commit 000ae7aaf49734c795d1eec61c9a92adda308f73
Author: Juergen Daubert <jue at jue.li>
Date:   Thu Jan 11 11:49:59 2018 +0100

    kmod: update to 25

diff --git a/kmod/.footprint b/kmod/.footprint
index 0c42c05a..15f68926 100644
--- a/kmod/.footprint
+++ b/kmod/.footprint
@@ -4,8 +4,8 @@ drwxr-xr-x	root/root	etc/
 drwxr-xr-x	root/root	etc/depmod.d/
 drwxr-xr-x	root/root	etc/modprobe.d/
 drwxr-xr-x	root/root	lib/
-lrwxrwxrwx	root/root	lib/libkmod.so.2 -> libkmod.so.2.3.2
--rwxr-xr-x	root/root	lib/libkmod.so.2.3.2
+lrwxrwxrwx	root/root	lib/libkmod.so.2 -> libkmod.so.2.3.3
+-rwxr-xr-x	root/root	lib/libkmod.so.2.3.3
 drwxr-xr-x	root/root	sbin/
 lrwxrwxrwx	root/root	sbin/depmod -> kmod
 lrwxrwxrwx	root/root	sbin/insmod -> kmod
@@ -19,7 +19,7 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/libkmod.h
 drwxr-xr-x	root/root	usr/lib/
 -rwxr-xr-x	root/root	usr/lib/libkmod.la
-lrwxrwxrwx	root/root	usr/lib/libkmod.so -> ../../lib/libkmod.so.2.3.2
+lrwxrwxrwx	root/root	usr/lib/libkmod.so -> ../../lib/libkmod.so.2.3.3
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libkmod.pc
 drwxr-xr-x	root/root	usr/share/
diff --git a/kmod/.md5sum b/kmod/.md5sum
index 1f4d409d..51b8c097 100644
--- a/kmod/.md5sum
+++ b/kmod/.md5sum
@@ -1 +1 @@
-08297dfb6f2b3f625f928ca3278528af  kmod-24.tar.xz
+34f325cab568f842fdde4f8b2182f220  kmod-25.tar.xz
diff --git a/kmod/.signature b/kmod/.signature
index cfb8241d..ecf049bd 100644
--- a/kmod/.signature
+++ b/kmod/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqvheyMxR+ICPwWhKt6HDNoyfbZlfLjPooxYr4Bat4vWNPq+BrePQcLrVhRdiIpwMYeQ6i3IdkXKqmW4jACRrfQ8=
-SHA256 (Pkgfile) = 1ae66e86dcdff3003fc98d88df729ffeb24055a7e0531c6b356690a082c84cf7
-SHA256 (.footprint) = 882ecc992e46a7078ed33a8162687b7ce2af1815df00b1dce14c84d896397d74
-SHA256 (kmod-24.tar.xz) = 610b8d1df172acc39a4fdf1eaa47a57b04873c82f32152e7a62e29b6ff9cb397
+RWRJc1FUaeVeqo2wa+aYt/jztOtaeapZCn6d9uJ06c/DXBRAPFLLd4LlecR3n8swYc1Y1PIJRM9TI5fsUOJpgvBpRchuCj/FHAM=
+SHA256 (Pkgfile) = 67d595357def2eaae2b6284f556296c4bb8636e4f33137a0f4765bdb28533523
+SHA256 (.footprint) = 9c7978afad90b90a4eda6e15412f253d30b8e8246f5e2af216a65595f55db126
+SHA256 (kmod-25.tar.xz) = 7165e6496656159dcb909a91ed708a0fe273a4b128b4b1dc997ccb5189eef1cd
diff --git a/kmod/Pkgfile b/kmod/Pkgfile
index 520baadf..911ae374 100644
--- a/kmod/Pkgfile
+++ b/kmod/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=kmod
-version=24
+version=25
 release=1
 source=(https://www.kernel.org/pub/linux/utils/kernel/$name/$name-$version.tar.xz)
 

From crux at crux.nu  Thu Jan 11 10:50:44 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu, 11 Jan 2018 10:50:44 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): flash-player-plugin: update to
 28.0.0.137
Message-ID: <20180111105044.2E7BD1801AB@crux.nu>

commit 89b09ca9477880a167cb35b1015df3f440ea1aba
Author: Juergen Daubert <jue at jue.li>
Date:   Thu Jan 11 11:50:38 2018 +0100

    flash-player-plugin: update to 28.0.0.137

diff --git a/flash-player-plugin/.md5sum b/flash-player-plugin/.md5sum
index 78fd1fba9..32b33d406 100644
--- a/flash-player-plugin/.md5sum
+++ b/flash-player-plugin/.md5sum
@@ -1 +1 @@
-018c1144a31b5fce961c10e13a1c7167  flash-player-npapi-28.0.0.126-release.x86_64.rpm
+959e3af5fcab274e070136e107bbbafb  flash-player-npapi-28.0.0.137-release.x86_64.rpm
diff --git a/flash-player-plugin/.signature b/flash-player-plugin/.signature
index fad682843..0d303e054 100644
--- a/flash-player-plugin/.signature
+++ b/flash-player-plugin/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/bP4GT/AFZcdWbxrDgeoG2QJSWmIh14//cm4LyxWMuuJy6Oqw5VU+h5El+gtObVM6g566Du7iTieT5ciafcLrAk=
-SHA256 (Pkgfile) = a45eab3b0f2c9a542dc1dc8ab038fbd894701c60aed1fb599036064ec9928d57
+RWSE3ohX2g5d/RWIuRpZZLVc90p8fxy5FM55QhgnTzEbb5QYezPLwg10Md5BTZyPalV9R/NjpFSdJP7pXu5EzbxoDWHpSgiZRw4=
+SHA256 (Pkgfile) = a9286d6e6c2e42dc7908daf56d6596d5b3e366aac91fd2384b4aa9be8e251596
 SHA256 (.footprint) = 9bc6ecbc9ca40c49f8ac0db0024a96e10a49e188ae0402544f6b70ab32e7277f
-SHA256 (flash-player-npapi-28.0.0.126-release.x86_64.rpm) = 013f069dd268bda9ad0eaf1165d9b512d81e2c91584dfe0fdfcffe0b31d8d014
+SHA256 (flash-player-npapi-28.0.0.137-release.x86_64.rpm) = 986049a767e95d66367c2a7a5a93236ac98dda78f2f6280ebabbf92dbdac6dec
diff --git a/flash-player-plugin/Pkgfile b/flash-player-plugin/Pkgfile
index ed930c78a..e14181109 100644
--- a/flash-player-plugin/Pkgfile
+++ b/flash-player-plugin/Pkgfile
@@ -4,7 +4,7 @@
 # Packager: Matt Housh, jaeger at crux dot nu
 
 name=flash-player-plugin
-version=28.0.0.126
+version=28.0.0.137
 release=1
 source=(https://fpdownload.adobe.com/pub/flashplayer/pdc/$version/flash-player-npapi-$version-release.x86_64.rpm)
 

From crux at crux.nu  Fri Jan 12 16:17:28 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri, 12 Jan 2018 16:17:28 +0000 (UTC)
Subject: [crux-commits] ports/xorg (3.3): mesa3d: update to 17.3.2
Message-ID: <20180112161728.C55281802AD@crux.nu>

commit 00b9b5dd0085a086bc9998383fe3ea65301b8fad
Author: Juergen Daubert <jue at jue.li>
Date:   Fri Jan 12 17:16:57 2018 +0100

    mesa3d: update to 17.3.2

diff --git a/mesa3d/.footprint b/mesa3d/.footprint
index 93049cb..d7eca68 100644
--- a/mesa3d/.footprint
+++ b/mesa3d/.footprint
@@ -37,8 +37,6 @@ drwxr-xr-x	root/root	usr/include/GLES3/
 drwxr-xr-x	root/root	usr/include/KHR/
 -rw-r--r--	root/root	usr/include/KHR/khrplatform.h
 -rw-r--r--	root/root	usr/include/gbm.h
-drwxr-xr-x	root/root	usr/include/vulkan/
--rw-r--r--	root/root	usr/include/vulkan/vulkan_intel.h
 -rw-r--r--	root/root	usr/include/xa_composite.h
 -rw-r--r--	root/root	usr/include/xa_context.h
 -rw-r--r--	root/root	usr/include/xa_tracker.h
@@ -92,10 +90,6 @@ lrwxrwxrwx	root/root	usr/lib/libgbm.so.1 -> libgbm.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib/libglapi.so -> libglapi.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libglapi.so.0 -> libglapi.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libglapi.so.0.0.0
--rwxr-xr-x	root/root	usr/lib/libvulkan_intel.la
--rwxr-xr-x	root/root	usr/lib/libvulkan_intel.so
--rwxr-xr-x	root/root	usr/lib/libvulkan_radeon.la
--rwxr-xr-x	root/root	usr/lib/libvulkan_radeon.so
 -rwxr-xr-x	root/root	usr/lib/libxatracker.la
 lrwxrwxrwx	root/root	usr/lib/libxatracker.so -> libxatracker.so.2.3.0
 lrwxrwxrwx	root/root	usr/lib/libxatracker.so.2 -> libxatracker.so.2.3.0
@@ -126,8 +120,3 @@ lrwxrwxrwx	root/root	usr/lib/vdpau/libvdpau_radeonsi.so -> libvdpau_radeonsi.so.
 lrwxrwxrwx	root/root	usr/lib/vdpau/libvdpau_radeonsi.so.1 -> libvdpau_radeonsi.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib/vdpau/libvdpau_radeonsi.so.1.0 -> libvdpau_radeonsi.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_radeonsi.so.1.0.0
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/vulkan/
-drwxr-xr-x	root/root	usr/share/vulkan/icd.d/
--rw-r--r--	root/root	usr/share/vulkan/icd.d/intel_icd.x86_64.json
--rw-r--r--	root/root	usr/share/vulkan/icd.d/radeon_icd.x86_64.json
diff --git a/mesa3d/.md5sum b/mesa3d/.md5sum
index 529d117..6e46343 100644
--- a/mesa3d/.md5sum
+++ b/mesa3d/.md5sum
@@ -1 +1 @@
-b90ef86280242b670a58fda988bef27c  mesa-17.2.8.tar.xz
+5c59b779925f504ffd0f13c7dcd29ac6  mesa-17.3.2.tar.xz
diff --git a/mesa3d/.signature b/mesa3d/.signature
index f6cc3aa..a5ceaee 100644
--- a/mesa3d/.signature
+++ b/mesa3d/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndKcBpdA+XgvSfs/a4xEJzyom1CmbZjy0lwaSBtP/0CcA0b5jYAycnpUi9pBf7pCtnoZVGfi3h7EX4K2ggBi9Rwo=
-SHA256 (Pkgfile) = 6eb1ad39ce833bcc2f99087b13a22249fc81db7d488c31590326d51a702f8906
-SHA256 (.footprint) = 4ece9b6ea6f54fd29a47c920761938bd4f61b2cdf8cd5f1b4841574f3aed78eb
-SHA256 (mesa-17.2.8.tar.xz) = 6e940345cceaadfd805d701ed2b956589fa77fe8c39991da30ed51ea6b9d095f
+RWTSGWF5Q7TndHTpEM0VfVlLrO9eRMKNJLBlY/fRWHC9Wj58kYl+wf9u7HwMW1KT6GGyq1HfiPRo5CQAVEtp0HNcteA4bs+PhwU=
+SHA256 (Pkgfile) = 28975cfc980eeebe1213124428252cf1e8395c71323dad784d46105583b854e1
+SHA256 (.footprint) = 8f3bb2b8170d0532bb6b3fdc81f7c9bcc69740efa1550d04df4f65b2b70c7bab
+SHA256 (mesa-17.3.2.tar.xz) = e2844a13f2d6f8f24bee65804a51c42d8dc6ae9c36cff7ee61d0940e796d64c6
diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile
index bf04d41..eee0975 100644
--- a/mesa3d/Pkgfile
+++ b/mesa3d/Pkgfile
@@ -4,14 +4,15 @@
 # Depends on: elfutils libdrm libvdpau llvm xorg-dri3proto xorg-glproto xorg-libxdamage xorg-libxshmfence xorg-libxvmc xorg-presentproto xorg-libxxf86vm
 
 name=mesa3d
-version=17.2.8
+version=17.3.2
 release=1
 source=(ftp://ftp.freedesktop.org/pub/mesa/mesa-$version.tar.xz)
 
 build() {
 	cd mesa-$version
 
-	CONFIG_SHELL=/bin/bash \
+	export LDFLAGS="$LDFLAGS -lLLVM"
+
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -28,7 +29,7 @@ build() {
 		--disable-dependency-tracking \
 		--with-platforms=x11,drm \
 		--with-gallium-drivers=r300,r600,svga,swrast,radeonsi,nouveau  \
-		--with-vulkan-drivers=intel,radeon
+		#--with-vulkan-drivers=intel,radeon
 
 	make
 	make DESTDIR=$PKG install

From crux at crux.nu  Fri Jan 12 21:29:17 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri, 12 Jan 2018 21:29:17 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): sysstat: updated to 11.6.2
Message-ID: <20180112212917.D134B18023F@crux.nu>

commit 4e5077c3c256050faa5136863c6d06e79a047be5
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Fri Jan 12 22:29:08 2018 +0100

    sysstat: updated to 11.6.2

diff --git a/sysstat/.md5sum b/sysstat/.md5sum
index 901ce6f3c..e3017a3f9 100644
--- a/sysstat/.md5sum
+++ b/sysstat/.md5sum
@@ -1 +1 @@
-d7f08225a0c19c30e4502875658ac1e1  sysstat-11.4.7.tar.xz
+97acc71df74711f12933a19acb6b0d37  sysstat-11.6.2.tar.xz
diff --git a/sysstat/.signature b/sysstat/.signature
index 330f2af77..14dd3c54b 100644
--- a/sysstat/.signature
+++ b/sysstat/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/RLfyKaaZwtu24KqxKP+f2MzY+bppyRl9GMK3MZZsw86UAzkOV1cBgPG1tIkSTuMvtcUSRb2Ro45SlZmSbnzMwI=
-SHA256 (Pkgfile) = 78430861838397de998b0c6ac7903fd9c89cf524f876ffc82c2efbd6e2051218
+RWSE3ohX2g5d/RchYxjjQ6KT68g/eCu/8TKFudFOi9/ykazgqhT2Sw1Q2o9cVDbRSO73SMI51KDvbul4ydNnx1z1GA19uaa/OA0=
+SHA256 (Pkgfile) = f4f0999a70ca43ac554b18c2f0ef29b9944c618cb83fd2ca07dcbb3e1224de6d
 SHA256 (.footprint) = 40fa0a104999c90b74335e617aebe00964d7575c850421c8b732d300684808fc
-SHA256 (sysstat-11.4.7.tar.xz) = 1c53a3daf18b41c8f4af157b312a84fcdcec7d708bd4cc2d8646f52fb0e4c470
+SHA256 (sysstat-11.6.2.tar.xz) = 8b6e1e6af269263ea528d2737ac19f26d4842b663352d38125bc40244a8dfef6
diff --git a/sysstat/Pkgfile b/sysstat/Pkgfile
index 6995e84ad..29aad3aa6 100644
--- a/sysstat/Pkgfile
+++ b/sysstat/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:
 
 name=sysstat
-version=11.4.7
+version=11.6.2
 release=1
 source=(http://perso.orange.fr/sebastien.godard/$name-$version.tar.xz)
 

From crux at crux.nu  Sat Jan 13 13:44:29 2018
From: crux at crux.nu (crux at crux.nu)
Date: Sat, 13 Jan 2018 13:44:29 +0000 (UTC)
Subject: [crux-commits] ports/core (3.3): ca-certificates: update to 20180112
Message-ID: <20180113134429.766FC1802B9@crux.nu>

commit f9a1ce22c0b60cc9d51150f950c0f7545e2c76c0
Author: Juergen Daubert <jue at jue.li>
Date:   Sat Jan 13 14:44:08 2018 +0100

    ca-certificates: update to 20180112

diff --git a/ca-certificates/.md5sum b/ca-certificates/.md5sum
index eb82ffba..5d854e35 100644
--- a/ca-certificates/.md5sum
+++ b/ca-certificates/.md5sum
@@ -1 +1 @@
-830432d6024c6ef5edd4567b349f9e55  cacert.pem
+e6486206c7ae66e10a362c0460c4a0b4  cacert.pem
diff --git a/ca-certificates/.signature b/ca-certificates/.signature
index 1923d47f..47926fd4 100644
--- a/ca-certificates/.signature
+++ b/ca-certificates/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqgMzgBek4i5L9AzMe/ezEr36PsS7yPyxWOMmATILVzq6NOOL6HH7wrujVPqzxTUXR44TpWE84dPnDDgtFlRcLwg=
-SHA256 (Pkgfile) = d3d7145ff9502f52c20bc9bfd62e6a35ce69cdbbc0343e6ee642e10c24855b76
+RWRJc1FUaeVeqtt6PRienXkonW2ZcvGfF14QfNPZVfhR9jJ4fU/hRDZLKYmss0jxYeDD5OZT66AinTi33mM6IkA/qA7ERgVJ1AI=
+SHA256 (Pkgfile) = 22a39cfc670ab5602706e37f7a5b25f48de65e027fb7de2797dd8118ebb41c9a
 SHA256 (.footprint) = 92930b2d9b1d5da08760f16fa80c1ff0c13e811e50cb4414f98265cef748bf40
-SHA256 (cacert.pem) = 14bf5b2bf62f58203526211e5041a188c3b080b1e24ec741bd5c589a66638e43
+SHA256 (cacert.pem) = 0bde85e168e5b7b7a84e85a6833f9f3e4f37a44d88e9097d4aad66aac0d64876
diff --git a/ca-certificates/Pkgfile b/ca-certificates/Pkgfile
index 3909bf66..5505b67b 100644
--- a/ca-certificates/Pkgfile
+++ b/ca-certificates/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=ca-certificates
-version=20170918
+version=20180112
 release=1
 source=(cacert.pem)
 
diff --git a/ca-certificates/cacert.pem b/ca-certificates/cacert.pem
index e983784f..95ace311 100644
--- a/ca-certificates/cacert.pem
+++ b/ca-certificates/cacert.pem
@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Mon Sep 18 11:07:41 2017 GMT
+## Certificate data from Mozilla as of: Fri Jan 12 10:09:35 2018 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,7 +14,7 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.27.
-## SHA256: 2b2dbe5244e0047e088c597998883a913f6c5fffd1cb5c0fe5a368c8466cb2ec
+## SHA256: a3ac15b98179dd2f3c5de076d10b1d53048754372f7207c2f327510cdd78fbd8
 ##
 
 
@@ -689,47 +689,6 @@ KVtHCN2MQWplBqjlIapBtJUhlbl90TSrE9atvNziPTnNvT51cKEYWQPJIrSPnNVeKtelttQKbfi3
 QBFGmh95DmK/D5fs4C8fF5Q=
 -----END CERTIFICATE-----
 
-StartCom Certification Authority
-================================
------BEGIN CERTIFICATE-----
-MIIHyTCCBbGgAwIBAgIBATANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
-U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
-ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
-NjM2WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
-LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
-U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
-o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
-Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
-eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
-2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
-6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
-osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
-untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
-UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
-37uMdBNSSwIDAQABo4ICUjCCAk4wDAYDVR0TBAUwAwEB/zALBgNVHQ8EBAMCAa4wHQYDVR0OBBYE
-FE4L7xqkQFulF2mHMMo0aEPQQa7yMGQGA1UdHwRdMFswLKAqoCiGJmh0dHA6Ly9jZXJ0LnN0YXJ0
-Y29tLm9yZy9zZnNjYS1jcmwuY3JsMCugKaAnhiVodHRwOi8vY3JsLnN0YXJ0Y29tLm9yZy9zZnNj
-YS1jcmwuY3JsMIIBXQYDVR0gBIIBVDCCAVAwggFMBgsrBgEEAYG1NwEBATCCATswLwYIKwYBBQUH
-AgEWI2h0dHA6Ly9jZXJ0LnN0YXJ0Y29tLm9yZy9wb2xpY3kucGRmMDUGCCsGAQUFBwIBFilodHRw
-Oi8vY2VydC5zdGFydGNvbS5vcmcvaW50ZXJtZWRpYXRlLnBkZjCB0AYIKwYBBQUHAgIwgcMwJxYg
-U3RhcnQgQ29tbWVyY2lhbCAoU3RhcnRDb20pIEx0ZC4wAwIBARqBl0xpbWl0ZWQgTGlhYmlsaXR5
-LCByZWFkIHRoZSBzZWN0aW9uICpMZWdhbCBMaW1pdGF0aW9ucyogb2YgdGhlIFN0YXJ0Q29tIENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5IFBvbGljeSBhdmFpbGFibGUgYXQgaHR0cDovL2NlcnQuc3Rh
-cnRjb20ub3JnL3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilT
-dGFydENvbSBGcmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQUFAAOC
-AgEAFmyZ9GYMNPXQhV59CuzaEE44HF7fpiUFS5Eyweg78T3dRAlbB0mKKctmArexmvclmAk8jhvh
-3TaHK0u7aNM5Zj2gJsfyOZEdUauCe37Vzlrk4gNXcGmXCPleWKYK34wGmkUWFjgKXlf2Ysd6AgXm
-vB618p70qSmD+LIU424oh0TDkBreOKk8rENNZEXO3SipXPJzewT4F+irsfMuXGRuczE6Eri8sxHk
-fY+BUZo7jYn0TZNmezwD7dOaHZrzZVD1oNB1ny+v8OqCQ5j4aZyJecRDjkZy42Q2Eq/3JR44iZB3
-fsNrarnDy0RLrHiQi+fHLB5LEUTINFInzQpdn4XBidUaePKVEFMy3YCEZnXZtWgo+2EuvoSoOMCZ
-EoalHmdkrQYuL6lwhceWD3yJZfWOQ1QOq92lgDmUYMA0yZZwLKMS9R9Ie70cfmu3nZD0Ijuu+Pwq
-yvqCUqDvr0tVk+vBtfAii6w0TiYiBKGHLHVKt+V9E9e4DGTANtLJL4YSjCMJwRuCO3NJo2pXh5Tl
-1njFmUNj403gdy3hZZlyaQQaRwnmDwFWJPsfvw55qVguucQJAX6Vum0ABj6y6koQOdjQK/W/7HW/
-lwLFCRsI3FU34oH7N4RDYiDK51ZLZer+bMEkkyShNOsF/5oirpt9P/FlUQqmMGqz9IgcgA38coro
-g14=
------END CERTIFICATE-----
-
 Taiwan GRCA
 ===========
 -----BEGIN CERTIFICATE-----
@@ -1389,34 +1348,6 @@ sP6SHhYKGvzZ8/gntsm+HbRsZJB/9OTEW9c3rkIO3aQab3yIVMUWbuF6aC74Or8NpDyJO3inTmOD
 BCEIZ43ygknQW/2xzQ+DhNQ+IIX3Sj0rnP0qCglN6oH4EZw=
 -----END CERTIFICATE-----
 
-T\xc3\x9c\x42\xC4\xB0TAK UEKAE K\xC3\xB6k Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 - S\xC3\xBCr\xC3\xBCm 3
-=============================================================================================================================
------BEGIN CERTIFICATE-----
-MIIFFzCCA/+gAwIBAgIBETANBgkqhkiG9w0BAQUFADCCASsxCzAJBgNVBAYTAlRSMRgwFgYDVQQH
-DA9HZWJ6ZSAtIEtvY2FlbGkxRzBFBgNVBAoMPlTDvHJraXllIEJpbGltc2VsIHZlIFRla25vbG9q
-aWsgQXJhxZ90xLFybWEgS3VydW11IC0gVMOcQsSwVEFLMUgwRgYDVQQLDD9VbHVzYWwgRWxla3Ry
-b25payB2ZSBLcmlwdG9sb2ppIEFyYcWfdMSxcm1hIEVuc3RpdMO8c8O8IC0gVUVLQUUxIzAhBgNV
-BAsMGkthbXUgU2VydGlmaWthc3lvbiBNZXJrZXppMUowSAYDVQQDDEFUw5xCxLBUQUsgVUVLQUUg
-S8O2ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsSAtIFPDvHLDvG0gMzAeFw0wNzA4
-MjQxMTM3MDdaFw0xNzA4MjExMTM3MDdaMIIBKzELMAkGA1UEBhMCVFIxGDAWBgNVBAcMD0dlYnpl
-IC0gS29jYWVsaTFHMEUGA1UECgw+VMO8cmtpeWUgQmlsaW1zZWwgdmUgVGVrbm9sb2ppayBBcmHF
-n3TEsXJtYSBLdXJ1bXUgLSBUw5xCxLBUQUsxSDBGBgNVBAsMP1VsdXNhbCBFbGVrdHJvbmlrIHZl
-IEtyaXB0b2xvamkgQXJhxZ90xLFybWEgRW5zdGl0w7xzw7wgLSBVRUtBRTEjMCEGA1UECwwaS2Ft
-dSBTZXJ0aWZpa2FzeW9uIE1lcmtlemkxSjBIBgNVBAMMQVTDnELEsFRBSyBVRUtBRSBLw7ZrIFNl
-cnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIC0gU8O8csO8bSAzMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAim1L/xCIOsP2fpTo6iBkcK4hgb46ezzb8R1Sf1n68yJMlaCQvEhO
-Eav7t7WNeoMojCZG2E6VQIdhn8WebYGHV2yKO7Rm6sxA/OOqbLLLAdsyv9Lrhc+hDVXDWzhXcLh1
-xnnRFDDtG1hba+818qEhTsXOfJlfbLm4IpNQp81McGq+agV/E5wrHur+R84EpW+sky58K5+eeROR
-6Oqeyjh1jmKwlZMq5d/pXpduIF9fhHpEORlAHLpVK/swsoHvhOPc7Jg4OQOFCKlUAwUp8MmPi+oL
-hmUZEdPpCSPeaJMDyTYcIW7OjGbxmTDY17PDHfiBLqi9ggtm/oLL4eAagsNAgQIDAQABo0IwQDAd
-BgNVHQ4EFgQUvYiHyY/2pAoLquvF/pEjnatKijIwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQF
-MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAB18+kmPNOm3JpIWmgV050vQbTlswyb2zrgxvMTfvCr4
-N5EY3ATIZJkrGG2AA1nJrvhY0D7twyOfaTyGOBye79oneNGEN3GKPEs5z35FBtYt2IpNeBLWrcLT
-y9LQQfMmNkqblWwM7uXRQydmwYj3erMgbOqwaSvHIOgMA8RBBZniP+Rr+KCGgceExh/VS4ESshYh
-LBOhgLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5noN+J1q2M
-dqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUsyZyQ2uypQjyttgI=
------END CERTIFICATE-----
-
 certSIGN ROOT CA
 ================
 -----BEGIN CERTIFICATE-----
@@ -1664,37 +1595,6 @@ y8hSyn+B/tlr0/cR7SXf+Of5pPpyl4RTDaXQMhhRdlkUbA/r7F+AjHVDg8OFmP9Mni0N5HeDk061
 lgeLKBObjBmNQSdJQO7e5iNEOdyhIta6A/I=
 -----END CERTIFICATE-----
 
-ACEDICOM Root
-=============
------BEGIN CERTIFICATE-----
-MIIFtTCCA52gAwIBAgIIYY3HhjsBggUwDQYJKoZIhvcNAQEFBQAwRDEWMBQGA1UEAwwNQUNFRElD
-T00gUm9vdDEMMAoGA1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMB4XDTA4
-MDQxODE2MjQyMloXDTI4MDQxMzE2MjQyMlowRDEWMBQGA1UEAwwNQUNFRElDT00gUm9vdDEMMAoG
-A1UECwwDUEtJMQ8wDQYDVQQKDAZFRElDT00xCzAJBgNVBAYTAkVTMIICIjANBgkqhkiG9w0BAQEF
-AAOCAg8AMIICCgKCAgEA/5KV4WgGdrQsyFhIyv2AVClVYyT/kGWbEHV7w2rbYgIB8hiGtXxaOLHk
-WLn709gtn70yN78sFW2+tfQh0hOR2QetAQXW8713zl9CgQr5auODAKgrLlUTY4HKRxx7XBZXehuD
-YAQ6PmXDzQHe3qTWDLqO3tkE7hdWIpuPY/1NFgu3e3eM+SW10W2ZEi5PGrjm6gSSrj0RuVFCPYew
-MYWveVqc/udOXpJPQ/yrOq2lEiZmueIM15jO1FillUAKt0SdE3QrwqXrIhWYENiLxQSfHY9g5QYb
-m8+5eaA9oiM/Qj9r+hwDezCNzmzAv+YbX79nuIQZ1RXve8uQNjFiybwCq0Zfm/4aaJQ0PZCOrfbk
-HQl/Sog4P75n/TSW9R28MHTLOO7VbKvU/PQAtwBbhTIWdjPp2KOZnQUAqhbm84F9b32qhm2tFXTT
-xKJxqvQUfecyuB+81fFOvW8XAjnXDpVCOscAPukmYxHqC9FK/xidstd7LzrZlvvoHpKuE1XI2Sf2
-3EgbsCTBheN3nZqk8wwRHQ3ItBTutYJXCb8gWH8vIiPYcMt5bMlL8qkqyPyHK9caUPgn6C9D4zq9
-2Fdx/c6mUlv53U3t5fZvie27k5x2IXXwkkwp9y+cAS7+UEaeZAwUswdbxcJzbPEHXEUkFDWug/Fq
-TYl6+rPYLWbwNof1K1MCAwEAAaOBqjCBpzAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFKaz
-4SsrSbbXc6GqlPUB53NlTKxQMA4GA1UdDwEB/wQEAwIBhjAdBgNVHQ4EFgQUprPhKytJttdzoaqU
-9QHnc2VMrFAwRAYDVR0gBD0wOzA5BgRVHSAAMDEwLwYIKwYBBQUHAgEWI2h0dHA6Ly9hY2VkaWNv
-bS5lZGljb21ncm91cC5jb20vZG9jMA0GCSqGSIb3DQEBBQUAA4ICAQDOLAtSUWImfQwng4/F9tqg
-aHtPkl7qpHMyEVNEskTLnewPeUKzEKbHDZ3Ltvo/Onzqv4hTGzz3gvoFNTPhNahXwOf9jU8/kzJP
-eGYDdwdY6ZXIfj7QeQCM8htRM5u8lOk6e25SLTKeI6RF+7YuE7CLGLHdztUdp0J/Vb77W7tH1Pwk
-zQSulgUV1qzOMPPKC8W64iLgpq0i5ALudBF/TP94HTXa5gI06xgSYXcGCRZj6hitoocf8seACQl1
-ThCojz2GuHURwCRiipZ7SkXp7FnFvmuD5uHorLUwHv4FB4D54SMNUI8FmP8sX+g7tq3PgbUhh8oI
-KiMnMCArz+2UW6yyetLHKKGKC5tNSixthT8Jcjxn4tncB7rrZXtaAWPWkFtPF2Y9fwsZo5NjEFIq
-nxQWWOLcpfShFosOkYuByptZ+thrkQdlVV9SH686+5DdaaVbnG0OLLb6zqylfDJKZ0DcMDQj3dcE
-I2bw/FWAp/tmGYI1Z2JwOV5vx+qQQEQIHriy1tvuWacNGHk0vFQYXlPKNFHtRQrmjseCNj6nOGOp
-MCwXEGCSn1WHElkQwg9naRHMTh5+Spqtr0CodaxWkHS4oJyleW/c6RrIaQXpuvoDs3zk4E7Czp3o
-tkYNbn5XOmeUwssfnHdKZ05phkOTOPu220+DkdRgfks+KzgHVZhepA==
------END CERTIFICATE-----
-
 Microsec e-Szigno Root CA 2009
 ==============================
 -----BEGIN CERTIFICATE-----
@@ -2055,37 +1955,6 @@ Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI
 03YnnZotBqbJ7DnSq9ufmgsnAjUpsUCV5/nonFWIGUbWtzT1fs45mtk48VH3Tyw=
 -----END CERTIFICATE-----
 
-Certinomis - Autorit?? Racine
-============================
------BEGIN CERTIFICATE-----
-MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjETMBEGA1UEChMK
-Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAkBgNVBAMMHUNlcnRpbm9taXMg
-LSBBdXRvcml0w6kgUmFjaW5lMB4XDTA4MDkxNzA4Mjg1OVoXDTI4MDkxNzA4Mjg1OVowYzELMAkG
-A1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMxFzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMSYw
-JAYDVQQDDB1DZXJ0aW5vbWlzIC0gQXV0b3JpdMOpIFJhY2luZTCCAiIwDQYJKoZIhvcNAQEBBQAD
-ggIPADCCAgoCggIBAJ2Fn4bT46/HsmtuM+Cet0I0VZ35gb5j2CN2DpdUzZlMGvE5x4jYF1AMnmHa
-wE5V3udauHpOd4cN5bjr+p5eex7Ezyh0x5P1FMYiKAT5kcOrJ3NqDi5N8y4oH3DfVS9O7cdxbwly
-Lu3VMpfQ8Vh30WC8Tl7bmoT2R2FFK/ZQpn9qcSdIhDWerP5pqZ56XjUl+rSnSTV3lqc2W+HN3yNw
-2F1MpQiD8aYkOBOo7C+ooWfHpi2GR+6K/OybDnT0K0kCe5B1jPyZOQE51kqJ5Z52qz6WKDgmi92N
-jMD2AR5vpTESOH2VwnHu7XSu5DaiQ3XV8QCb4uTXzEIDS3h65X27uK4uIJPT5GHfceF2Z5c/tt9q
-c1pkIuVC28+BA5PY9OMQ4HL2AHCs8MF6DwV/zzRpRbWT5BnbUhYjBYkOjUjkJW+zeL9i9Qf6lSTC
-lrLooyPCXQP8w9PlfMl1I9f09bze5N/NgL+RiH2nE7Q5uiy6vdFrzPOlKO1Enn1So2+WLhl+HPNb
-xxaOu2B9d2ZHVIIAEWBsMsGoOBvrbpgT1u449fCfDu/+MYHB0iSVL1N6aaLwD4ZFjliCK0wi1F6g
-530mJ0jfJUaNSih8hp75mxpZuWW/Bd22Ql095gBIgl4g9xGC3srYn+Y3RyYe63j3YcNBZFgCQfna
-4NH4+ej9Uji29YnfAgMBAAGjWzBZMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-A1UdDgQWBBQNjLZh2kS40RR9w759XkjwzspqsDAXBgNVHSAEEDAOMAwGCiqBegFWAgIAAQEwDQYJ
-KoZIhvcNAQEFBQADggIBACQ+YAZ+He86PtvqrxyaLAEL9MW12Ukx9F1BjYkMTv9sov3/4gbIOZ/x
-WqndIlgVqIrTseYyCYIDbNc/CMf4uboAbbnW/FIyXaR/pDGUu7ZMOH8oMDX/nyNTt7buFHAAQCva
-R6s0fl6nVjBhK4tDrP22iCj1a7Y+YEq6QpA0Z43q619FVDsXrIvkxmUP7tCMXWY5zjKn2BCXwH40
-nJ+U8/aGH88bc62UeYdocMMzpXDn2NU4lG9jeeu/Cg4I58UvD0KgKxRA/yHgBcUn4YQRE7rWhh1B
-CxMjidPJC+iKunqjo3M3NYB9Ergzd0A4wPpeMNLytqOx1qKVl4GbUu1pTP+A5FPbVFsDbVRfsbjv
-JL1vnxHDx2TCDyhihWZeGnuyt++uNckZM6i4J9szVb9o4XVIRFb7zdNIu0eJOqxp9YDG5ERQL1TE
-qkPFMTFYvZbF6nVsmnWxTfj3l/+WFvKXTej28xH5On2KOG4Ey+HTRRWqpdEdnV1j6CTmNhTih60b
-WfVEm/vXd3wfAXBioSAaosUaKPQhA+4u2cGA6rnZgtZbdsLLO7XSAPCjDuGtbkD326C00EauFddE
-wk01+dIL8hf2rGbVJLJP0RyZwG71fet0BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/
-vgt2Fl43N+bYdJeimUV5
------END CERTIFICATE-----
-
 TWCA Root Certification Authority
 =================================
 -----BEGIN CERTIFICATE-----
@@ -2234,75 +2103,6 @@ l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
 iB6XzCGcKQENZetX2fNXlrtIzYE=
 -----END CERTIFICATE-----
 
-StartCom Certification Authority
-================================
------BEGIN CERTIFICATE-----
-MIIHhzCCBW+gAwIBAgIBLTANBgkqhkiG9w0BAQsFADB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
-U3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmlu
-ZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMDYwOTE3MTk0
-NjM3WhcNMzYwOTE3MTk0NjM2WjB9MQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRk
-LjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzEpMCcGA1UEAxMg
-U3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQDBiNsJvGxGfHiflXu1M5DycmLWwTYgIiRezul38kMKogZkpMyONvg45iPwbm2xPN1y
-o4UcodM9tDMr0y+v/uqwQVlntsQGfQqedIXWeUyAN3rfOQVSWff0G0ZDpNKFhdLDcfN1YjS6LIp/
-Ho/u7TTQEceWzVI9ujPW3U3eCztKS5/CJi/6tRYccjV3yjxd5srhJosaNnZcAdt0FCX+7bWgiA/d
-eMotHweXMAEtcnn6RtYTKqi5pquDSR3l8u/d5AGOGAqPY1MWhWKpDhk6zLVmpsJrdAfkK+F2PrRt
-2PZE4XNiHzvEvqBTViVsUQn3qqvKv3b9bZvzndu/PWa8DFaqr5hIlTpL36dYUNk4dalb6kMMAv+Z
-6+hsTXBbKWWc3apdzK8BMewM69KN6Oqce+Zu9ydmDBpI125C4z/eIT574Q1w+2OqqGwaVLRcJXrJ
-osmLFqa7LH4XXgVNWG4SHQHuEhANxjJ/GP/89PrNbpHoNkm+Gkhpi8KWTRoSsmkXwQqQ1vp5Iki/
-untp+HDH+no32NgN0nZPV/+Qt+OR0t3vwmC3Zzrd/qqc8NSLf3Iizsafl7b4r4qgEKjZ+xjGtrVc
-UjyJthkqcwEKDwOzEmDyei+B26Nu/yYwl/WL3YlXtq09s68rxbd2AvCl1iuahhQqcvbjM4xdCUsT
-37uMdBNSSwIDAQABo4ICEDCCAgwwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYD
-VR0OBBYEFE4L7xqkQFulF2mHMMo0aEPQQa7yMB8GA1UdIwQYMBaAFE4L7xqkQFulF2mHMMo0aEPQ
-Qa7yMIIBWgYDVR0gBIIBUTCCAU0wggFJBgsrBgEEAYG1NwEBATCCATgwLgYIKwYBBQUHAgEWImh0
-dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwNAYIKwYBBQUHAgEWKGh0dHA6Ly93d3cu
-c3RhcnRzc2wuY29tL2ludGVybWVkaWF0ZS5wZGYwgc8GCCsGAQUFBwICMIHCMCcWIFN0YXJ0IENv
-bW1lcmNpYWwgKFN0YXJ0Q29tKSBMdGQuMAMCAQEagZZMaW1pdGVkIExpYWJpbGl0eSwgcmVhZCB0
-aGUgc2VjdGlvbiAqTGVnYWwgTGltaXRhdGlvbnMqIG9mIHRoZSBTdGFydENvbSBDZXJ0aWZpY2F0
-aW9uIEF1dGhvcml0eSBQb2xpY3kgYXZhaWxhYmxlIGF0IGh0dHA6Ly93d3cuc3RhcnRzc2wuY29t
-L3BvbGljeS5wZGYwEQYJYIZIAYb4QgEBBAQDAgAHMDgGCWCGSAGG+EIBDQQrFilTdGFydENvbSBG
-cmVlIFNTTCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTANBgkqhkiG9w0BAQsFAAOCAgEAjo/n3JR5
-fPGFf59Jb2vKXfuM/gTFwWLRfUKKvFO3lANmMD+x5wqnUCBVJX92ehQN6wQOQOY+2IirByeDqXWm
-N3PH/UvSTa0XQMhGvjt/UfzDtgUx3M2FIk5xt/JxXrAaxrqTi3iSSoX4eA+D/i+tLPfkpLst0OcN
-Org+zvZ49q5HJMqjNTbOx8aHmNrs++myziebiMMEofYLWWivydsQD032ZGNcpRJvkrKTlMeIFw6T
-tn5ii5B/q06f/ON1FE8qMt9bDeD1e5MNq6HPh+GlBEXoPBKlCcWw0bdT82AUuoVpaiF8H3VhFyAX
-e2w7QSlc4axa0c2Mm+tgHRns9+Ww2vl5GKVFP0lDV9LdJNUso/2RjSe15esUBppMeyG7Oq0wBhjA
-2MFrLH9ZXF2RsXAiV+uKa0hK1Q8p7MZAwC+ITGgBF3f0JBlPvfrhsiAhS90a2Cl9qrjeVOwhVYBs
-HvUwyKMQ5bLmKhQxw4UtjJixhlpPiVktucf3HMiKf8CdBUrmQk9io20ppB+Fq9vlgcitKj1MXVuE
-JnHEhV5xJMqlG2zYYdMa4FTbzrqpMrUi9nNBCV24F10OD5mQ1kfabwo6YigUZ4LZ8dCAWZvLMdib
-D4x3TrVoivJs9iQOLWxwxXPR3hTQcY+203sC9uO41Alua551hDnmfyWl8kgAwKQB2j8=
------END CERTIFICATE-----
-
-StartCom Certification Authority G2
-===================================
------BEGIN CERTIFICATE-----
-MIIFYzCCA0ugAwIBAgIBOzANBgkqhkiG9w0BAQsFADBTMQswCQYDVQQGEwJJTDEWMBQGA1UEChMN
-U3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkg
-RzIwHhcNMTAwMTAxMDEwMDAxWhcNMzkxMjMxMjM1OTAxWjBTMQswCQYDVQQGEwJJTDEWMBQGA1UE
-ChMNU3RhcnRDb20gTHRkLjEsMCoGA1UEAxMjU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3Jp
-dHkgRzIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC2iTZbB7cgNr2Cu+EWIAOVeq8O
-o1XJJZlKxdBWQYeQTSFgpBSHO839sj60ZwNq7eEPS8CRhXBF4EKe3ikj1AENoBB5uNsDvfOpL9HG
-4A/LnooUCri99lZi8cVytjIl2bLzvWXFDSxu1ZJvGIsAQRSCb0AgJnooD/Uefyf3lLE3PbfHkffi
-Aez9lInhzG7TNtYKGXmu1zSCZf98Qru23QumNK9LYP5/Q0kGi4xDuFby2X8hQxfqp0iVAXV16iul
-Q5XqFYSdCI0mblWbq9zSOdIxHWDirMxWRST1HFSr7obdljKF+ExP6JV2tgXdNiNnvP8V4so75qbs
-O+wmETRIjfaAKxojAuuKHDp2KntWFhxyKrOq42ClAJ8Em+JvHhRYW6Vsi1g8w7pOOlz34ZYrPu8H
-vKTlXcxNnw3h3Kq74W4a7I/htkxNeXJdFzULHdfBR9qWJODQcqhaX2YtENwvKhOuJv4KHBnM0D4L
-nMgJLvlblnpHnOl68wVQdJVznjAJ85eCXuaPOQgeWeU1FEIT/wCc976qUM/iUUjXuG+v+E5+M5iS
-FGI6dWPPe/regjupuznixL0sAA7IF6wT700ljtizkC+p2il9Ha90OrInwMEePnWjFqmveiJdnxMa
-z6eg6+OGCtP95paV1yPIN93EfKo2rJgaErHgTuixO/XWb/Ew1wIDAQABo0IwQDAPBgNVHRMBAf8E
-BTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUS8W0QGutHLOlHGVuRjaJhwUMDrYwDQYJ
-KoZIhvcNAQELBQADggIBAHNXPyzVlTJ+N9uWkusZXn5T50HsEbZH77Xe7XRcxfGOSeD8bpkTzZ+K
-2s06Ctg6Wgk/XzTQLwPSZh0avZyQN8gMjgdalEVGKua+etqhqaRpEpKwfTbURIfXUfEpY9Z1zRbk
-J4kd+MIySP3bmdCPX1R0zKxnNBFi2QwKN4fRoxdIjtIXHfbX/dtl6/2o1PXWT6RbdejF0mCy2wl+
-JYt7ulKSnj7oxXehPOBKc2thz4bcQ///If4jXSRK9dNtD2IEBVeC2m6kMyV5Sy5UGYvMLD0w6dEG
-/+gyRr61M3Z3qAFdlsHB1b6uJcDJHgoJIIihDsnzb02CVAAgp9KP5DlUFy6NHrgbuxu9mk47EDTc
-nIhT76IxW1hPkWLIwpqazRVdOKnWvvgTtZ8SafJQYqz7Fzf07rh1Z2AQ+4NQ+US1dZxAF7L+/Xld
-blhYXzD8AK6vM8EOTmy6p6ahfzLbOOCxchcKK5HsamMm7YnUeMx0HgX4a/6ManY5Ka5lIxKVCCIc
-l85bBu4M4ru8H0ST9tg4RQUh7eStqxK2A6RCLi3ECToDZ2mEmuFZkIoohdVddLHRDiBYmxOlsGOm
-7XtH/UVVMKTumtTm4ofvmMkyghEpIrwACjFeLQ/Ajulrso8uBtjRkcfGEvRM/TAXw8HaOFvjqerm
-obp573PYtlNXLfbQ4ddI
------END CERTIFICATE-----
-
 Buypass Class 2 Root CA
 =======================
 -----BEGIN CERTIFICATE-----
@@ -2409,31 +2209,6 @@ uSlNDUmJEYcyW+ZLBMjkXOZ0c5RdFpgTlf7727FE5TpwrDdr5rMzcijJs1eg9gIWiAYLtqZLICjU
 dcGWxZ0=
 -----END CERTIFICATE-----
 
-TURKTRUST Certificate Services Provider Root 2007
-=================================================
------BEGIN CERTIFICATE-----
-MIIEPTCCAyWgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBvzE/MD0GA1UEAww2VMOcUktUUlVTVCBF
-bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMQswCQYDVQQGEwJUUjEP
-MA0GA1UEBwwGQW5rYXJhMV4wXAYDVQQKDFVUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUg
-QmlsacWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLiAoYykgQXJhbMSxayAyMDA3MB4X
-DTA3MTIyNTE4MzcxOVoXDTE3MTIyMjE4MzcxOVowgb8xPzA9BgNVBAMMNlTDnFJLVFJVU1QgRWxl
-a3Ryb25payBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTELMAkGA1UEBhMCVFIxDzAN
-BgNVBAcMBkFua2FyYTFeMFwGA1UECgxVVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp
-bGnFn2ltIEfDvHZlbmxpxJ9pIEhpem1ldGxlcmkgQS7Fni4gKGMpIEFyYWzEsWsgMjAwNzCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKu3PgqMyKVYFeaK7yc9SrToJdPNM8Ig3BnuiD9N
-YvDdE3ePYakqtdTyuTFYKTsvP2qcb3N2Je40IIDu6rfwxArNK4aUyeNgsURSsloptJGXg9i3phQv
-KUmi8wUG+7RP2qFsmmaf8EMJyupyj+sA1zU511YXRxcw9L6/P8JorzZAwan0qafoEGsIiveGHtya
-KhUG9qPw9ODHFNRRf8+0222vR5YXm3dx2KdxnSQM9pQ/hTEST7ruToK4uT6PIzdezKKqdfcYbwnT
-rqdUKDT74eA7YH2gvnmJhsifLfkKS8RQouf9eRbHegsYz85M733WB2+Y8a+xwXrXgTW4qhe04MsC
-AwEAAaNCMEAwHQYDVR0OBBYEFCnFkKslrxHkYb+j/4hhkeYO/pyBMA4GA1UdDwEB/wQEAwIBBjAP
-BgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAQDdr4Ouwo0RSVgrESLFF6QSU2TJ/s
-Px+EnWVUXKgWAkD6bho3hO9ynYYKVZ1WKKxmLNA6VpM0ByWtCLCPyA8JWcqdmBzlVPi5RX9ql2+I
-aE1KBiY3iAIOtsbWcpnOa3faYjGkVh+uX4132l32iPwa2Z61gfAyuOOI0JzzaqC5mxRZNTZPz/OO
-Xl0XrRWV2N2y1RVuAE6zS89mlOTgzbUF2mNXi+WzqtvALhyQRNsaXRik7r4EW5nVcV9VZWRi1aKb
-BFmGyGJ353yCRWo9F7/snXUMrqNvWtMvmDb08PUZqxFdyKbjKlhqQgnDvZImZjINXQhVdP+MmNAK
-poRq0Tl9
------END CERTIFICATE-----
-
 D-TRUST Root Class 3 CA 2 2009
 ==============================
 -----BEGIN CERTIFICATE-----
@@ -2483,54 +2258,6 @@ NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
 w9y4AyHqnxbxLFS1
 -----END CERTIFICATE-----
 
-PSCProcert
-==========
------BEGIN CERTIFICATE-----
-MIIJhjCCB26gAwIBAgIBCzANBgkqhkiG9w0BAQsFADCCAR4xPjA8BgNVBAMTNUF1dG9yaWRhZCBk
-ZSBDZXJ0aWZpY2FjaW9uIFJhaXogZGVsIEVzdGFkbyBWZW5lem9sYW5vMQswCQYDVQQGEwJWRTEQ
-MA4GA1UEBxMHQ2FyYWNhczEZMBcGA1UECBMQRGlzdHJpdG8gQ2FwaXRhbDE2MDQGA1UEChMtU2lz
-dGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMUMwQQYDVQQLEzpTdXBl
-cmludGVuZGVuY2lhIGRlIFNlcnZpY2lvcyBkZSBDZXJ0aWZpY2FjaW9uIEVsZWN0cm9uaWNhMSUw
-IwYJKoZIhvcNAQkBFhZhY3JhaXpAc3VzY2VydGUuZ29iLnZlMB4XDTEwMTIyODE2NTEwMFoXDTIw
-MTIyNTIzNTk1OVowgdExJjAkBgkqhkiG9w0BCQEWF2NvbnRhY3RvQHByb2NlcnQubmV0LnZlMQ8w
-DQYDVQQHEwZDaGFjYW8xEDAOBgNVBAgTB01pcmFuZGExKjAoBgNVBAsTIVByb3ZlZWRvciBkZSBD
-ZXJ0aWZpY2Fkb3MgUFJPQ0VSVDE2MDQGA1UEChMtU2lzdGVtYSBOYWNpb25hbCBkZSBDZXJ0aWZp
-Y2FjaW9uIEVsZWN0cm9uaWNhMQswCQYDVQQGEwJWRTETMBEGA1UEAxMKUFNDUHJvY2VydDCCAiIw
-DQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANW39KOUM6FGqVVhSQ2oh3NekS1wwQYalNo97BVC
-wfWMrmoX8Yqt/ICV6oNEolt6Vc5Pp6XVurgfoCfAUFM+jbnADrgV3NZs+J74BCXfgI8Qhd19L3uA
-3VcAZCP4bsm+lU/hdezgfl6VzbHvvnpC2Mks0+saGiKLt38GieU89RLAu9MLmV+QfI4tL3czkkoh
-RqipCKzx9hEC2ZUWno0vluYC3XXCFCpa1sl9JcLB/KpnheLsvtF8PPqv1W7/U0HU9TI4seJfxPmO
-EO8GqQKJ/+MMbpfg353bIdD0PghpbNjU5Db4g7ayNo+c7zo3Fn2/omnXO1ty0K+qP1xmk6wKImG2
-0qCZyFSTXai20b1dCl53lKItwIKOvMoDKjSuc/HUtQy9vmebVOvh+qBa7Dh+PsHMosdEMXXqP+UH
-0quhJZb25uSgXTcYOWEAM11G1ADEtMo88aKjPvM6/2kwLkDd9p+cJsmWN63nOaK/6mnbVSKVUyqU
-td+tFjiBdWbjxywbk5yqjKPK2Ww8F22c3HxT4CAnQzb5EuE8XL1mv6JpIzi4mWCZDlZTOpx+FIyw
-Bm/xhnaQr/2v/pDGj59/i5IjnOcVdo/Vi5QTcmn7K2FjiO/mpF7moxdqWEfLcU8UC17IAggmosvp
-r2uKGcfLFFb14dq12fy/czja+eevbqQ34gcnAgMBAAGjggMXMIIDEzASBgNVHRMBAf8ECDAGAQH/
-AgEBMDcGA1UdEgQwMC6CD3N1c2NlcnRlLmdvYi52ZaAbBgVghl4CAqASDBBSSUYtRy0yMDAwNDAz
-Ni0wMB0GA1UdDgQWBBRBDxk4qpl/Qguk1yeYVKIXTC1RVDCCAVAGA1UdIwSCAUcwggFDgBStuyId
-xuDSAaj9dlBSk+2YwU2u06GCASakggEiMIIBHjE+MDwGA1UEAxM1QXV0b3JpZGFkIGRlIENlcnRp
-ZmljYWNpb24gUmFpeiBkZWwgRXN0YWRvIFZlbmV6b2xhbm8xCzAJBgNVBAYTAlZFMRAwDgYDVQQH
-EwdDYXJhY2FzMRkwFwYDVQQIExBEaXN0cml0byBDYXBpdGFsMTYwNAYDVQQKEy1TaXN0ZW1hIE5h
-Y2lvbmFsIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExQzBBBgNVBAsTOlN1cGVyaW50ZW5k
-ZW5jaWEgZGUgU2VydmljaW9zIGRlIENlcnRpZmljYWNpb24gRWxlY3Ryb25pY2ExJTAjBgkqhkiG
-9w0BCQEWFmFjcmFpekBzdXNjZXJ0ZS5nb2IudmWCAQowDgYDVR0PAQH/BAQDAgEGME0GA1UdEQRG
-MESCDnByb2NlcnQubmV0LnZloBUGBWCGXgIBoAwMClBTQy0wMDAwMDKgGwYFYIZeAgKgEgwQUklG
-LUotMzE2MzUzNzMtNzB2BgNVHR8EbzBtMEagRKBChkBodHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52
-ZS9sY3IvQ0VSVElGSUNBRE8tUkFJWi1TSEEzODRDUkxERVIuY3JsMCOgIaAfhh1sZGFwOi8vYWNy
-YWl6LnN1c2NlcnRlLmdvYi52ZTA3BggrBgEFBQcBAQQrMCkwJwYIKwYBBQUHMAGGG2h0dHA6Ly9v
-Y3NwLnN1c2NlcnRlLmdvYi52ZTBBBgNVHSAEOjA4MDYGBmCGXgMBAjAsMCoGCCsGAQUFBwIBFh5o
-dHRwOi8vd3d3LnN1c2NlcnRlLmdvYi52ZS9kcGMwDQYJKoZIhvcNAQELBQADggIBACtZ6yKZu4Sq
-T96QxtGGcSOeSwORR3C7wJJg7ODU523G0+1ng3dS1fLld6c2suNUvtm7CpsR72H0xpkzmfWvADmN
-g7+mvTV+LFwxNG9s2/NkAZiqlCxB3RWGymspThbASfzXg0gTB1GEMVKIu4YXx2sviiCtxQuPcD4q
-uxtxj7mkoP3YldmvWb8lK5jpY5MvYB7Eqvh39YtsL+1+LrVPQA3uvFd359m21D+VJzog1eWuq2w1
-n8GhHVnchIHuTQfiSLaeS5UtQbHh6N5+LwUeaO6/u5BlOsju6rEYNxxik6SgMexxbJHmpHmJWhSn
-FFAFTKQAVzAswbVhltw+HoSvOULP5dAssSS830DD7X9jSr3hTxJkhpXzsOfIt+FTvZLm8wyWuevo
-5pLtp4EJFAv8lXrPj9Y0TzYS3F7RNHXGRoAvlQSMx4bEqCaJqD8Zm4G7UaRKhqsLEQ+xrmNTbSjq
-3TNWOByyrYDT13K9mmyZY+gAu0F2BbdbmRiKw7gSXFbPVgx96OLP7bx0R/vu0xdOIk9W/1DzLuY5
-poLWccret9W6aAjtmcz9opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3Y
-eMLEYC/HYvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km
------END CERTIFICATE-----
-
 Swisscom Root CA 2
 ==================
 -----BEGIN CERTIFICATE-----
@@ -2996,66 +2723,6 @@ G48BtieVU+i2iW1bvGjUI+iLUaJW+fCmgKDWHrO8Dw9TdSmq6hN35N6MgSGtBxBHEa2HPQfRdbzP
 82Z+
 -----END CERTIFICATE-----
 
-WoSign
-======
------BEGIN CERTIFICATE-----
-MIIFdjCCA16gAwIBAgIQXmjWEXGUY1BWAGjzPsnFkTANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQG
-EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxKjAoBgNVBAMTIUNlcnRpZmljYXRpb24g
-QXV0aG9yaXR5IG9mIFdvU2lnbjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgwMTAwMDFaMFUxCzAJ
-BgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEqMCgGA1UEAxMhQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgb2YgV29TaWduMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA
-vcqNrLiRFVaXe2tcesLea9mhsMMQI/qnobLMMfo+2aYpbxY94Gv4uEBf2zmoAHqLoE1UfcIiePyO
-CbiohdfMlZdLdNiefvAA5A6JrkkoRBoQmTIPJYhTpA2zDxIIFgsDcSccf+Hb0v1naMQFXQoOXXDX
-2JegvFNBmpGN9J42Znp+VsGQX+axaCA2pIwkLCxHC1l2ZjC1vt7tj/id07sBMOby8w7gLJKA84X5
-KIq0VC6a7fd2/BVoFutKbOsuEo/Uz/4Mx1wdC34FMr5esAkqQtXJTpCzWQ27en7N1QhatH/YHGkR
-+ScPewavVIMYe+HdVHpRaG53/Ma/UkpmRqGyZxq7o093oL5d//xWC0Nyd5DKnvnyOfUNqfTq1+ez
-EC8wQjchzDBwyYaYD8xYTYO7feUapTeNtqwylwA6Y3EkHp43xP901DfA4v6IRmAR3Qg/UDaruHqk
-lWJqbrDKaiFaafPz+x1wOZXzp26mgYmhiMU7ccqjUu6Du/2gd/Tkb+dC221KmYo0SLwX3OSACCK2
-8jHAPwQ+658geda4BmRkAjHXqc1S+4RFaQkAKtxVi8QGRkvASh0JWzko/amrzgD5LkhLJuYwTKVY
-yrREgk/nkR4zw7CT/xH8gdLKH3Ep3XZPkiWvHYG3Dy+MwwbMLyejSuQOmbp8HkUff6oZRZb9/D0C
-AwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFOFmzw7R
-8bNLtwYgFP6HEtX2/vs+MA0GCSqGSIb3DQEBBQUAA4ICAQCoy3JAsnbBfnv8rWTjMnvMPLZdRtP1
-LOJwXcgu2AZ9mNELIaCJWSQBnfmvCX0KI4I01fx8cpm5o9dU9OpScA7F9dY74ToJMuYhOZO9sxXq
-T2r09Ys/L3yNWC7F4TmgPsc9SnOeQHrAK2GpZ8nzJLmzbVUsWh2eJXLOC62qx1ViC777Y7NhRCOj
-y+EaDveaBk3e1CNOIZZbOVtXHS9dCF4Jef98l7VNg64N1uajeeAz0JmWAjCnPv/So0M/BVoG6kQC
-2nz4SNAzqfkHx5Xh9T71XXG68pWpdIhhWeO/yloTunK0jF02h+mmxTwTv97QRCbut+wucPrXnbes
-5cVAWubXbHssw1abR80LzvobtCHXt2a49CUwi1wNuepnsvRtrtWhnk/Yn+knArAdBtaP4/tIEp9/
-EaEQPkxROpaw0RPxx9gmrjrKkcRpnd8BKWRRb2jaFOwIQZeQjdCygPLPwj2/kWjFgGcexGATVdVh
-mVd8upUPYUk6ynW8yQqTP2cOEvIo4jEbwFcW3wh8GcF+Dx+FHgo2fFt+J7x6v+Db9NpSvd4MVHAx
-kUOVyLzwPt0JfjBkUO1/AaQzZ01oT74V77D2AhGiGxMlOtzCWfHjXEa7ZywCRuoeSKbmW9m1vFGi
-kpbbqsY3Iqb+zCB0oy2pLmvLwIIRIbWTee5Ehr7XHuQe+w==
------END CERTIFICATE-----
-
-WoSign China
-============
------BEGIN CERTIFICATE-----
-MIIFWDCCA0CgAwIBAgIQUHBrzdgT/BtOOzNy0hFIjTANBgkqhkiG9w0BAQsFADBGMQswCQYDVQQG
-EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMMEkNBIOayg+mAmuagueiv
-geS5pjAeFw0wOTA4MDgwMTAwMDFaFw0zOTA4MDgwMTAwMDFaMEYxCzAJBgNVBAYTAkNOMRowGAYD
-VQQKExFXb1NpZ24gQ0EgTGltaXRlZDEbMBkGA1UEAwwSQ0Eg5rKD6YCa5qC56K+B5LmmMIICIjAN
-BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0EkhHiX8h8EqwqzbdoYGTufQdDTc7WU1/FDWiD+k
-8H/rD195L4mx/bxjWDeTmzj4t1up+thxx7S8gJeNbEvxUNUqKaqoGXqW5pWOdO2XCld19AXbbQs5
-uQF/qvbW2mzmBeCkTVL829B0txGMe41P/4eDrv8FAxNXUDf+jJZSEExfv5RxadmWPgxDT74wwJ85
-dE8GRV2j1lY5aAfMh09Qd5Nx2UQIsYo06Yms25tO4dnkUkWMLhQfkWsZHWgpLFbE4h4TV2TwYeO5
-Ed+w4VegG63XX9Gv2ystP9Bojg/qnw+LNVgbExz03jWhCl3W6t8Sb8D7aQdGctyB9gQjF+BNdeFy
-b7Ao65vh4YOhn0pdr8yb+gIgthhid5E7o9Vlrdx8kHccREGkSovrlXLp9glk3Kgtn3R46MGiCWOc
-76DbT52VqyBPt7D3h1ymoOQ3OMdc4zUPLK2jgKLsLl3Az+2LBcLmc272idX10kaO6m1jGx6KyX2m
-+Jzr5dVjhU1zZmkR/sgO9MHHZklTfuQZa/HpelmjbX7FF+Ynxu8b22/8DU0GAbQOXDBGVWCvOGU6
-yke6rCzMRh+yRpY/8+0mBe53oWprfi1tWFxK1I5nuPHa1UaKJ/kR8slC/k7e3x9cxKSGhxYzoacX
-GKUN5AXlK8IrC6KVkLn9YDxOiT7nnO4fuwECAwEAAaNCMEAwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFOBNv9ybQV0T6GTwp+kVpOGBwboxMA0GCSqGSIb3DQEBCwUA
-A4ICAQBqinA4WbbaixjIvirTthnVZil6Xc1bL3McJk6jfW+rtylNpumlEYOnOXOvEESS5iVdT2H6
-yAa+Tkvv/vMx/sZ8cApBWNromUuWyXi8mHwCKe0JgOYKOoICKuLJL8hWGSbueBwj/feTZU7n85iY
-r83d2Z5AiDEoOqsuC7CsDCT6eiaY8xJhEPRdF/d+4niXVOKM6Cm6jBAyvd0zaziGfjk9DgNyp115
-j0WKWa5bIW4xRtVZjc8VX90xJc/bYNaBRHIpAlf2ltTW/+op2znFuCyKGo3Oy+dCMYYFaA6eFN0A
-kLppRQjbbpCBhqcqBT/mhDn4t/lXX0ykeVoQDF7Va/81XwVRHmyjdanPUIPTfPRm94KNPQx96N97
-qA4bLJyuQHCH2u2nFoJavjVsIE4iYdm8UXrNemHcSxH5/mc0zy4EZmFcV5cjjPOGG0jfKq+nwf/Y
-jj4Du9gqsPoUJbJRa4ZDhS4HIxaAjUz7tGM7zMN07RujHv41D198HRaG9Q7DlfEvr10lO1Hm13ZB
-ONFLAzkopR6RctR9q5czxNM+4Gm2KHmgCY0c0f9BckgG/Jou5yD5m6Leie2uPAmvylezkolwQOQv
-T8Jwg0DXJCxr5wkf09XHwQj02w47HAcLQxGEIYbpgNR12KvxAmLBsX5VYc8T1yaw15zLKYs4SgsO
-kI26oQ==
------END CERTIFICATE-----
-
 COMODO RSA Certification Authority
 ==================================
 -----BEGIN CERTIFICATE-----
@@ -3460,42 +3127,6 @@ HZeeevJuQHHfaPFlTc58Bd9TZaml8LGXBHAVRgOY1NK/VLSgWH1Sb9pWJmLU2NuJMW8c8CLC02Ic
 Nc1MaRVUGpCY3useX8p3x8uOPUNpnJpY0CQ73xtAln41rYHHTnG6iBM=
 -----END CERTIFICATE-----
 
-Certification Authority of WoSign G2
-====================================
------BEGIN CERTIFICATE-----
-MIIDfDCCAmSgAwIBAgIQayXaioidfLwPBbOxemFFRDANBgkqhkiG9w0BAQsFADBYMQswCQYDVQQG
-EwJDTjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxLTArBgNVBAMTJENlcnRpZmljYXRpb24g
-QXV0aG9yaXR5IG9mIFdvU2lnbiBHMjAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4NThaMFgx
-CzAJBgNVBAYTAkNOMRowGAYDVQQKExFXb1NpZ24gQ0EgTGltaXRlZDEtMCsGA1UEAxMkQ2VydGlm
-aWNhdGlvbiBBdXRob3JpdHkgb2YgV29TaWduIEcyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvsXEoCKASU+/2YcRxlPhuw+9YH+v9oIOH9ywjj2X4FA8jzrvZjtFB5sg+OPXJYY1kBai
-XW8wGQiHC38Gsp1ij96vkqVg1CuAmlI/9ZqD6TRay9nVYlzmDuDfBpgOgHzKtB0TiGsOqCR3A9Du
-W/PKaZE1OVbFbeP3PU9ekzgkyhjpJMuSA93MHD0JcOQg5PGurLtzaaNjOg9FD6FKmsLRY6zLEPg9
-5k4ot+vElbGs/V6r+kHLXZ1L3PR8du9nfwB6jdKgGlxNIuG12t12s9R23164i5jIFFTMaxeSt+BK
-v0mUYQs4kI9dJGwlezt52eJ+na2fmKEG/HgUYFf47oB3sQIDAQABo0IwQDAOBgNVHQ8BAf8EBAMC
-AQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU+mCp62XF3RYUCE4MD42b4Pdkr2cwDQYJKoZI
-hvcNAQELBQADggEBAFfDejaCnI2Y4qtAqkePx6db7XznPWZaOzG73/MWM5H8fHulwqZm46qwtyeY
-P0nXYGdnPzZPSsvxFPpahygc7Y9BMsaV+X3avXtbwrAh449G3CE4Q3RM+zD4F3LBMvzIkRfEzFg3
-TgvMWvchNSiDbGAtROtSjFA9tWwS1/oJu2yySrHFieT801LYYRf+epSEj3m2M1m6D8QL4nCgS3gu
-+sif/a+RZQp4OBXllxcU3fngLDT4ONCEIgDAFFEYKwLcMFrw6AF8NTojrwjkr6qOKEJJLvD1mTS+
-7Q9LGOHSJDy7XUe3IfKN0QqZjuNuPq1w4I+5ysxugTH2e5x6eeRncRg=
------END CERTIFICATE-----
-
-CA WoSign ECC Root
-==================
------BEGIN CERTIFICATE-----
-MIICCTCCAY+gAwIBAgIQaEpYcIBr8I8C+vbe6LCQkDAKBggqhkjOPQQDAzBGMQswCQYDVQQGEwJD
-TjEaMBgGA1UEChMRV29TaWduIENBIExpbWl0ZWQxGzAZBgNVBAMTEkNBIFdvU2lnbiBFQ0MgUm9v
-dDAeFw0xNDExMDgwMDU4NThaFw00NDExMDgwMDU4NThaMEYxCzAJBgNVBAYTAkNOMRowGAYDVQQK
-ExFXb1NpZ24gQ0EgTGltaXRlZDEbMBkGA1UEAxMSQ0EgV29TaWduIEVDQyBSb290MHYwEAYHKoZI
-zj0CAQYFK4EEACIDYgAE4f2OuEMkq5Z7hcK6C62N4DrjJLnSsb6IOsq/Srj57ywvr1FQPEd1bPiU
-t5v8KB7FVMxjnRZLU8HnIKvNrCXSf4/CwVqCXjCLelTOA7WRf6qU0NGKSMyCBSah1VES1ns2o0Iw
-QDAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUqv3VWqP2h4syhf3R
-MluARZPzA7gwCgYIKoZIzj0EAwMDaAAwZQIxAOSkhLCB1T2wdKyUpOgOPQB0TKGXa/kNUTyh2Tv0
-Daupn75OcsqF1NnstTJFGG+rrQIwfcf3aWMvoeGY7xMQ0Xk/0f7qO3/eVvSQsRUR2LIiFdAvwyYu
-a/GRspBl9JrmkO5K
------END CERTIFICATE-----
-
 SZAFIR ROOT CA2
 ===============
 -----BEGIN CERTIFICATE-----
@@ -4015,3 +3646,212 @@ lNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4lzwDGrpDxpa5RXI4s6ehlj2R
 e37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0j
 q5Rm+K37DwhuJi1/FwcJsoz7UMCflo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM=
 -----END CERTIFICATE-----
+
+GDCA TrustAUTH R5 ROOT
+======================
+-----BEGIN CERTIFICATE-----
+MIIFiDCCA3CgAwIBAgIIfQmX/vBH6nowDQYJKoZIhvcNAQELBQAwYjELMAkGA1UEBhMCQ04xMjAw
+BgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZIENPLixMVEQuMR8wHQYDVQQD
+DBZHRENBIFRydXN0QVVUSCBSNSBST09UMB4XDTE0MTEyNjA1MTMxNVoXDTQwMTIzMTE1NTk1OVow
+YjELMAkGA1UEBhMCQ04xMjAwBgNVBAoMKUdVQU5HIERPTkcgQ0VSVElGSUNBVEUgQVVUSE9SSVRZ
+IENPLixMVEQuMR8wHQYDVQQDDBZHRENBIFRydXN0QVVUSCBSNSBST09UMIICIjANBgkqhkiG9w0B
+AQEFAAOCAg8AMIICCgKCAgEA2aMW8Mh0dHeb7zMNOwZ+Vfy1YI92hhJCfVZmPoiC7XJjDp6L3TQs
+AlFRwxn9WVSEyfFrs0yw6ehGXTjGoqcuEVe6ghWinI9tsJlKCvLriXBjTnnEt1u9ol2x8kECK62p
+OqPseQrsXzrj/e+APK00mxqriCZ7VqKChh/rNYmDf1+uKU49tm7srsHwJ5uu4/Ts765/94Y9cnrr
+pftZTqfrlYwiOXnhLQiPzLyRuEH3FMEjqcOtmkVEs7LXLM3GKeJQEK5cy4KOFxg2fZfmiJqwTTQJ
+9Cy5WmYqsBebnh52nUpmMUHfP/vFBu8btn4aRjb3ZGM74zkYI+dndRTVdVeSN72+ahsmUPI2JgaQ
+xXABZG12ZuGR224HwGGALrIuL4xwp9E7PLOR5G62xDtw8mySlwnNR30YwPO7ng/Wi64HtloPzgsM
+R6flPri9fcebNaBhlzpBdRfMK5Z3KpIhHtmVdiBnaM8Nvd/WHwlqmuLMc3GkL30SgLdTMEZeS1SZ
+D2fJpcjyIMGC7J0R38IC+xo70e0gmu9lZJIQDSri3nDxGGeCjGHeuLzRL5z7D9Ar7Rt2ueQ5Vfj4
+oR24qoAATILnsn8JuLwwoC8N9VKejveSswoAHQBUlwbgsQfZxw9cZX08bVlX5O2ljelAU58VS6Bx
+9hoh49pwBiFYFIeFd3mqgnkCAwEAAaNCMEAwHQYDVR0OBBYEFOLJQJ9NzuiaoXzPDj9lxSmIahlR
+MA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQDRSVfg
+p8xoWLoBDysZzY2wYUWsEe1jUGn4H3++Fo/9nesLqjJHdtJnJO29fDMylyrHBYZmDRd9FBUb1Ov9
+H5r2XpdptxolpAqzkT9fNqyL7FeoPueBihhXOYV0GkLH6VsTX4/5COmSdI31R9KrO9b7eGZONn35
+6ZLpBN79SWP8bfsUcZNnL0dKt7n/HipzcEYwv1ryL3ml4Y0M2fmyYzeMN2WFcGpcWwlyua1jPLHd
++PwyvzeG5LuOmCd+uh8W4XAR8gPfJWIyJyYYMoSf/wA6E7qaTfRPuBRwIrHKK5DOKcFw9C+df/KQ
+HtZa37dG/OaG+svgIHZ6uqbL9XzeYqWxi+7egmaKTjowHz+Ay60nugxe19CxVsp3cbK1daFQqUBD
+F8Io2c9Si1vIY9RCPqAzekYu9wogRlR+ak8x8YF+QnQ4ZXMn7sZ8uI7XpTrXmKGcjBBV09tL7ECQ
+8s1uV9JiDnxXk7Gnbc2dg7sq5+W2O3FYrf3RRbxake5TFW/TRQl1brqQXR4EzzffHqhmsYzmIGrv
+/EhOdJhCrylvLmrH+33RZjEizIYAfmaDDEL0vTSSwxrqT8p+ck0LcIymSLumoRT2+1hEmRSuqguT
+aaApJUqlyyvdimYHFngVV3Eb7PVHhPOeMTd61X8kreS8/f3MboPoDKi3QWwH3b08hpcv0g==
+-----END CERTIFICATE-----
+
+TrustCor RootCert CA-1
+======================
+-----BEGIN CERTIFICATE-----
+MIIEMDCCAxigAwIBAgIJANqb7HHzA7AZMA0GCSqGSIb3DQEBCwUAMIGkMQswCQYDVQQGEwJQQTEP
+MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
+U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0IENBLTEwHhcNMTYwMjA0MTIzMjE2WhcNMjkx
+MjMxMTcyMzE2WjCBpDELMAkGA1UEBhMCUEExDzANBgNVBAgMBlBhbmFtYTEUMBIGA1UEBwwLUGFu
+YW1hIENpdHkxJDAiBgNVBAoMG1RydXN0Q29yIFN5c3RlbXMgUy4gZGUgUi5MLjEnMCUGA1UECwwe
+VHJ1c3RDb3IgQ2VydGlmaWNhdGUgQXV0aG9yaXR5MR8wHQYDVQQDDBZUcnVzdENvciBSb290Q2Vy
+dCBDQS0xMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv463leLCJhJrMxnHQFgKq1mq
+jQCj/IDHUHuO1CAmujIS2CNUSSUQIpidRtLByZ5OGy4sDjjzGiVoHKZaBeYei0i/mJZ0PmnK6bV4
+pQa81QBeCQryJ3pS/C3Vseq0iWEk8xoT26nPUu0MJLq5nux+AHT6k61sKZKuUbS701e/s/OojZz0
+JEsq1pme9J7+wH5COucLlVPat2gOkEz7cD+PSiyU8ybdY2mplNgQTsVHCJCZGxdNuWxu72CVEY4h
+gLW9oHPY0LJ3xEXqWib7ZnZ2+AYfYW0PVcWDtxBWcgYHpfOxGgMFZA6dWorWhnAbJN7+KIor0Gqw
+/Hqi3LJ5DotlDwIDAQABo2MwYTAdBgNVHQ4EFgQU7mtJPHo/DeOxCbeKyKsZn3MzUOcwHwYDVR0j
+BBgwFoAU7mtJPHo/DeOxCbeKyKsZn3MzUOcwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMC
+AYYwDQYJKoZIhvcNAQELBQADggEBACUY1JGPE+6PHh0RU9otRCkZoB5rMZ5NDp6tPVxBb5UrJKF5
+mDo4Nvu7Zp5I/5CQ7z3UuJu0h3U/IJvOcs+hVcFNZKIZBqEHMwwLKeXx6quj7LUKdJDHfXLy11yf
+ke+Ri7fc7Waiz45mO7yfOgLgJ90WmMCV1Aqk5IGadZQ1nJBfiDcGrVmVCrDRZ9MZyonnMlo2HD6C
+qFqTvsbQZJG2z9m2GM/bftJlo6bEjhcxwft+dtvTheNYsnd6djtsL1Ac59v2Z3kf9YKVmgenFK+P
+3CghZwnS1k1aHBkcjndcw5QkPTJrS37UeJSDvjdNzl/HHk484IkzlQsPpTLWPFp5LBk=
+-----END CERTIFICATE-----
+
+TrustCor RootCert CA-2
+======================
+-----BEGIN CERTIFICATE-----
+MIIGLzCCBBegAwIBAgIIJaHfyjPLWQIwDQYJKoZIhvcNAQELBQAwgaQxCzAJBgNVBAYTAlBBMQ8w
+DQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5MSQwIgYDVQQKDBtUcnVzdENvciBT
+eXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29yIENlcnRpZmljYXRlIEF1dGhvcml0
+eTEfMB0GA1UEAwwWVHJ1c3RDb3IgUm9vdENlcnQgQ0EtMjAeFw0xNjAyMDQxMjMyMjNaFw0zNDEy
+MzExNzI2MzlaMIGkMQswCQYDVQQGEwJQQTEPMA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5h
+bWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3IgU3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5U
+cnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkxHzAdBgNVBAMMFlRydXN0Q29yIFJvb3RDZXJ0
+IENBLTIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCnIG7CKqJiJJWQdsg4foDSq8Gb
+ZQWU9MEKENUCrO2fk8eHyLAnK0IMPQo+QVqedd2NyuCb7GgypGmSaIwLgQ5WoD4a3SwlFIIvl9Nk
+RvRUqdw6VC0xK5mC8tkq1+9xALgxpL56JAfDQiDyitSSBBtlVkxs1Pu2YVpHI7TYabS3OtB0PAx1
+oYxOdqHp2yqlO/rOsP9+aij9JxzIsekp8VduZLTQwRVtDr4uDkbIXvRR/u8OYzo7cbrPb1nKDOOb
+XUm4TOJXsZiKQlecdu/vvdFoqNL0Cbt3Nb4lggjEFixEIFapRBF37120Hapeaz6LMvYHL1cEksr1
+/p3C6eizjkxLAjHZ5DxIgif3GIJ2SDpxsROhOdUuxTTCHWKF3wP+TfSvPd9cW436cOGlfifHhi5q
+jxLGhF5DUVCcGZt45vz27Ud+ez1m7xMTiF88oWP7+ayHNZ/zgp6kPwqcMWmLmaSISo5uZk3vFsQP
+eSghYA2FFn3XVDjxklb9tTNMg9zXEJ9L/cb4Qr26fHMC4P99zVvh1Kxhe1fVSntb1IVYJ12/+Ctg
+rKAmrhQhJ8Z3mjOAPF5GP/fDsaOGM8boXg25NSyqRsGFAnWAoOsk+xWq5Gd/bnc/9ASKL3x74xdh
+8N0JqSDIvgmk0H5Ew7IwSjiqqewYmgeCK9u4nBit2uBGF6zPXQIDAQABo2MwYTAdBgNVHQ4EFgQU
+2f4hQG6UnrybPZx9mCAZ5YwwYrIwHwYDVR0jBBgwFoAU2f4hQG6UnrybPZx9mCAZ5YwwYrIwDwYD
+VR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAYYwDQYJKoZIhvcNAQELBQADggIBAJ5Fngw7tu/h
+Osh80QA9z+LqBrWyOrsGS2h60COXdKcs8AjYeVrXWoSK2BKaG9l9XE1wxaX5q+WjiYndAfrs3fnp
+kpfbsEZC89NiqpX+MWcUaViQCqoL7jcjx1BRtPV+nuN79+TMQjItSQzL/0kMmx40/W5ulop5A7Zv
+2wnL/V9lFDfhOPXzYRZY5LVtDQsEGz9QLX+zx3oaFoBg+Iof6Rsqxvm6ARppv9JYx1RXCI/hOWB3
+S6xZhBqI8d3LT3jX5+EzLfzuQfogsL7L9ziUwOHQhQ+77Sxzq+3+knYaZH9bDTMJBzN7Bj8RpFxw
+PIXAz+OQqIN3+tvmxYxoZxBnpVIt8MSZj3+/0WvitUfW2dCFmU2Umw9Lje4AWkcdEQOsQRivh7dv
+DDqPys/cA8GiCcjl/YBeyGBCARsaU1q7N6a3vLqE6R5sGtRk2tRD/pOLS/IseRYQ1JMLiI+h2IYU
+RpFHmygk71dSTlxCnKr3Sewn6EAes6aJInKc9Q0ztFijMDvd1GpUk74aTfOTlPf8hAs/hCBcNANE
+xdqtvArBAs8e5ZTZ845b2EzwnexhF7sUMlQMAimTHpKG9n/v55IFDlndmQguLvqcAFLTxWYp5KeX
+RKQOKIETNcX2b2TmQcTVL8w0RSXPQQCWPUouwpaYT05KnJe32x+SMsj/D1Fu1uwJ
+-----END CERTIFICATE-----
+
+TrustCor ECA-1
+==============
+-----BEGIN CERTIFICATE-----
+MIIEIDCCAwigAwIBAgIJAISCLF8cYtBAMA0GCSqGSIb3DQEBCwUAMIGcMQswCQYDVQQGEwJQQTEP
+MA0GA1UECAwGUGFuYW1hMRQwEgYDVQQHDAtQYW5hbWEgQ2l0eTEkMCIGA1UECgwbVHJ1c3RDb3Ig
+U3lzdGVtcyBTLiBkZSBSLkwuMScwJQYDVQQLDB5UcnVzdENvciBDZXJ0aWZpY2F0ZSBBdXRob3Jp
+dHkxFzAVBgNVBAMMDlRydXN0Q29yIEVDQS0xMB4XDTE2MDIwNDEyMzIzM1oXDTI5MTIzMTE3Mjgw
+N1owgZwxCzAJBgNVBAYTAlBBMQ8wDQYDVQQIDAZQYW5hbWExFDASBgNVBAcMC1BhbmFtYSBDaXR5
+MSQwIgYDVQQKDBtUcnVzdENvciBTeXN0ZW1zIFMuIGRlIFIuTC4xJzAlBgNVBAsMHlRydXN0Q29y
+IENlcnRpZmljYXRlIEF1dGhvcml0eTEXMBUGA1UEAwwOVHJ1c3RDb3IgRUNBLTEwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDPj+ARtZ+odnbb3w9U73NjKYKtR8aja+3+XzP4Q1HpGjOR
+MRegdMTUpwHmspI+ap3tDvl0mEDTPwOABoJA6LHip1GnHYMma6ve+heRK9jGrB6xnhkB1Zem6g23
+xFUfJ3zSCNV2HykVh0A53ThFEXXQmqc04L/NyFIduUd+Dbi7xgz2c1cWWn5DkR9VOsZtRASqnKmc
+p0yJF4OuowReUoCLHhIlERnXDH19MURB6tuvsBzvgdAsxZohmz3tQjtQJvLsznFhBmIhVE5/wZ0+
+fyCMgMsq2JdiyIMzkX2woloPV+g7zPIlstR8L+xNxqE6FXrntl019fZISjZFZtS6mFjBAgMBAAGj
+YzBhMB0GA1UdDgQWBBREnkj1zG1I1KBLf/5ZJC+Dl5mahjAfBgNVHSMEGDAWgBREnkj1zG1I1KBL
+f/5ZJC+Dl5mahjAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQsF
+AAOCAQEABT41XBVwm8nHc2FvcivUwo/yQ10CzsSUuZQRg2dd4mdsdXa/uwyqNsatR5Nj3B5+1t4u
+/ukZMjgDfxT2AHMsWbEhBuH7rBiVDKP/mZb3Kyeb1STMHd3BOuCYRLDE5D53sXOpZCz2HAF8P11F
+hcCF5yWPldwX8zyfGm6wyuMdKulMY/okYWLW2n62HGz1Ah3UKt1VkOsqEUc8Ll50soIipX1TH0Xs
+J5F95yIW6MBoNtjG8U+ARDL54dHRHareqKucBK+tIA5kmE2la8BIWJZpTdwHjFGTot+fDz2LYLSC
+jaoITmJF4PkL0uDgPFveXHEnJcLmA4GLEFPjx1WitJ/X5g==
+-----END CERTIFICATE-----
+
+SSL.com Root Certification Authority RSA
+========================================
+-----BEGIN CERTIFICATE-----
+MIIF3TCCA8WgAwIBAgIIeyyb0xaAMpkwDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxDjAM
+BgNVBAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24x
+MTAvBgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBSU0EwHhcNMTYw
+MjEyMTczOTM5WhcNNDEwMjEyMTczOTM5WjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NM
+LmNvbSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IFJTQTCCAiIwDQYJKoZIhvcNAQEBBQAD
+ggIPADCCAgoCggIBAPkP3aMrfcvQKv7sZ4Wm5y4bunfh4/WvpOz6Sl2RxFdHaxh3a3by/ZPkPQ/C
+Fp4LZsNWlJ4Xg4XOVu/yFv0AYvUiCVToZRdOQbngT0aXqhvIuG5iXmmxX9sqAn78bMrzQdjt0Oj8
+P2FI7bADFB0QDksZ4LtO7IZl/zbzXmcCC52GVWH9ejjt/uIZALdvoVBidXQ8oPrIJZK0bnoix/ge
+oeOy3ZExqysdBP+lSgQ36YWkMyv94tZVNHwZpEpox7Ko07fKoZOI68GXvIz5HdkihCR0xwQ9aqkp
+k8zruFvh/l8lqjRYyMEjVJ0bmBHDOJx+PYZspQ9AhnwC9FwCTyjLrnGfDzrIM/4RJTXq/LrFYD3Z
+fBjVsqnTdXgDciLKOsMf7yzlLqn6niy2UUb9rwPW6mBo6oUWNmuF6R7As93EJNyAKoFBbZQ+yODJ
+gUEAnl6/f8UImKIYLEJAs/lvOCdLToD0PYFH4Ih86hzOtXVcUS4cK38acijnALXRdMbX5J+tB5O2
+UzU1/Dfkw/ZdFr4hc96SCvigY2q8lpJqPvi8ZVWb3vUNiSYE/CUapiVpy8JtynziWV+XrOvvLsi8
+1xtZPCvM8hnIk2snYxnP/Okm+Mpxm3+T/jRnhE6Z6/yzeAkzcLpmpnbtG3PrGqUNxCITIJRWCk4s
+bE6x/c+cCbqiM+2HAgMBAAGjYzBhMB0GA1UdDgQWBBTdBAkHovV6fVJTEpKV7jiAJQ2mWTAPBgNV
+HRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFN0ECQei9Xp9UlMSkpXuOIAlDaZZMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAIBgRlCn7Jp0cHh5wYfGVcpNxJK1ok1iOMq8bs3AD/CUr
+dIWQPXhq9LmLpZc7tRiRux6n+UBbkflVma8eEdBcHadm47GUBwwyOabqG7B52B2ccETjit3E+ZUf
+ijhDPwGFpUenPUayvOUiaPd7nNgsPgohyC0zrL/FgZkxdMF1ccW+sfAjRfSda/wZY52jvATGGAsl
+u1OJD7OAUN5F7kR/q5R4ZJjT9ijdh9hwZXT7DrkT66cPYakylszeu+1jTBi7qUD3oFRuIIhxdRjq
+erQ0cuAjJ3dctpDqhiVAq+8zD8ufgr6iIPv2tS0a5sKFsXQP+8hlAqRSAUfdSSLBv9jra6x+3uxj
+MxW3IwiPxg+NQVrdjsW5j+VFP3jbutIbQLH+cU0/4IGiul607BXgk90IH37hVZkLId6Tngr75qNJ
+vTYw/ud3sqB1l7UtgYgXZSD32pAAn8lSzDLKNXz1PQ/YK9f1JmzJBjSWFupwWRoyeXkLtoh/D1JI
+Pb9s2KJELtFOt3JY04kTlf5Eq/jXixtunLwsoFvVagCvXzfh1foQC5ichucmj87w7G6KVwuA406y
+wKBjYZC6VWg3dGq2ktufoYYitmUnDuy2n0Jg5GfCtdpBC8TTi2EbvPofkSvXRAdeuims2cXp71NI
+WuuA8ShYIc2wBlX7Jz9TkHCpBB5XJ7k=
+-----END CERTIFICATE-----
+
+SSL.com Root Certification Authority ECC
+========================================
+-----BEGIN CERTIFICATE-----
+MIICjTCCAhSgAwIBAgIIdebfy8FoW6gwCgYIKoZIzj0EAwIwfDELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xMTAv
+BgNVBAMMKFNTTC5jb20gUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYwMjEy
+MTgxNDAzWhcNNDEwMjEyMTgxNDAzWjB8MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMxEDAO
+BgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjExMC8GA1UEAwwoU1NMLmNv
+bSBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuBBAAiA2IA
+BEVuqVDEpiM2nl8ojRfLliJkP9x6jh3MCLOicSS6jkm5BBtHllirLZXI7Z4INcgn64mMU1jrYor+
+8FsPazFSY0E7ic3s7LaNGdM0B9y7xgZ/wkWV7Mt/qCPgCemB+vNH06NjMGEwHQYDVR0OBBYEFILR
+hXMw5zUE044CkvvlpNHEIejNMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUgtGFczDnNQTT
+jgKS++Wk0cQh6M0wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2cAMGQCMG/n61kRpGDPYbCW
+e+0F+S8Tkdzt5fxQaxFGRrMcIQBiu77D5+jNB5n5DQtdcj7EqgIwH7y6C+IwJPt8bYBVCpk+gA0z
+5Wajs6O7pdWLjwkspl1+4vAHCGht0nxpbl/f5Wpl
+-----END CERTIFICATE-----
+
+SSL.com EV Root Certification Authority RSA R2
+==============================================
+-----BEGIN CERTIFICATE-----
+MIIF6zCCA9OgAwIBAgIIVrYpzTS8ePYwDQYJKoZIhvcNAQELBQAwgYIxCzAJBgNVBAYTAlVTMQ4w
+DAYDVQQIDAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9u
+MTcwNQYDVQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIy
+MB4XDTE3MDUzMTE4MTQzN1oXDTQyMDUzMDE4MTQzN1owgYIxCzAJBgNVBAYTAlVTMQ4wDAYDVQQI
+DAVUZXhhczEQMA4GA1UEBwwHSG91c3RvbjEYMBYGA1UECgwPU1NMIENvcnBvcmF0aW9uMTcwNQYD
+VQQDDC5TU0wuY29tIEVWIFJvb3QgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkgUlNBIFIyMIICIjAN
+BgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAjzZlQOHWTcDXtOlG2mvqM0fNTPl9fb69LT3w23jh
+hqXZuglXaO1XPqDQCEGD5yhBJB/jchXQARr7XnAjssufOePPxU7Gkm0mxnu7s9onnQqG6YE3Bf7w
+cXHswxzpY6IXFJ3vG2fThVUCAtZJycxa4bH3bzKfydQ7iEGonL3Lq9ttewkfokxykNorCPzPPFTO
+Zw+oz12WGQvE43LrrdF9HSfvkusQv1vrO6/PgN3B0pYEW3p+pKk8OHakYo6gOV7qd89dAFmPZiw+
+B6KjBSYRaZfqhbcPlgtLyEDhULouisv3D5oi53+aNxPN8k0TayHRwMwi8qFG9kRpnMphNQcAb9Zh
+CBHqurj26bNg5U257J8UZslXWNvNh2n4ioYSA0e/ZhN2rHd9NCSFg83XqpyQGp8hLH94t2S42Oim
+9HizVcuE0jLEeK6jj2HdzghTreyI/BXkmg3mnxp3zkyPuBQVPWKchjgGAGYS5Fl2WlPAApiiECto
+RHuOec4zSnaqW4EWG7WK2NAAe15itAnWhmMOpgWVSbooi4iTsjQc2KRVbrcc0N6ZVTsj9CLg+Slm
+JuwgUHfbSguPvuUCYHBBXtSuUDkiFCbLsjtzdFVHB3mBOagwE0TlBIqulhMlQg+5U8Sb/M3kHN48
++qvWBkofZ6aYMBzdLNvcGJVXZsb/XItW9XcCAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAfBgNV
+HSMEGDAWgBT5YLvU49U09rj1BoAlp3PbRmmonjAdBgNVHQ4EFgQU+WC71OPVNPa49QaAJadz20Zp
+qJ4wDgYDVR0PAQH/BAQDAgGGMA0GCSqGSIb3DQEBCwUAA4ICAQBWs47LCp1Jjr+kxJG7ZhcFUZh1
+++VQLHqe8RT6q9OKPv+RKY9ji9i0qVQBDb6Thi/5Sm3HXvVX+cpVHBK+Rw82xd9qt9t1wkclf7nx
+Y/hoLVUE0fKNsKTPvDxeH3jnpaAgcLAExbf3cqfeIg29MyVGjGSSJuM+LmOW2puMPfgYCdcDzH2G
+guDKBAdRUNf/ktUM79qGn5nX67evaOI5JpS6aLe/g9Pqemc9YmeuJeVy6OLk7K4S9ksrPJ/psEDz
+OFSz/bdoyNrGj1E8svuR3Bznm53htw1yj+KkxKl4+esUrMZDBcJlOSgYAsOCsp0FvmXtll9ldDz7
+CTUue5wT/RsPXcdtgTpWD8w74a8CLyKsRspGPKAcTNZEtF4uXBVmCeEmKf7GUmG6sXP/wwyc5Wxq
+lD8UykAWlYTzWamsX0xhk23RO8yilQwipmdnRC652dKKQbNmC1r7fSOl8hqw/96bg5Qu0T/fkreR
+rwU7ZcegbLHNYhLDkBvjJc40vG93drEQw/cFGsDWr3RiSBd3kmmQYRzelYB0VI8YHMPzA9C/pEN1
+hlMYegouCRw2n5H9gooiS9EOUCXdywMMF8mDAAhONU2Ki+3wApRmLER/y5UnlhetCTCstnEXbosX
+9hwJ1C07mKVx01QT2WDz9UtmT/rx7iASjbSsV7FFY6GsdqnC+w==
+-----END CERTIFICATE-----
+
+SSL.com EV Root Certification Authority ECC
+===========================================
+-----BEGIN CERTIFICATE-----
+MIIClDCCAhqgAwIBAgIILCmcWxbtBZUwCgYIKoZIzj0EAwIwfzELMAkGA1UEBhMCVVMxDjAMBgNV
+BAgMBVRleGFzMRAwDgYDVQQHDAdIb3VzdG9uMRgwFgYDVQQKDA9TU0wgQ29ycG9yYXRpb24xNDAy
+BgNVBAMMK1NTTC5jb20gRVYgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSBFQ0MwHhcNMTYw
+MjEyMTgxNTIzWhcNNDEwMjEyMTgxNTIzWjB/MQswCQYDVQQGEwJVUzEOMAwGA1UECAwFVGV4YXMx
+EDAOBgNVBAcMB0hvdXN0b24xGDAWBgNVBAoMD1NTTCBDb3Jwb3JhdGlvbjE0MDIGA1UEAwwrU1NM
+LmNvbSBFViBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IEVDQzB2MBAGByqGSM49AgEGBSuB
+BAAiA2IABKoSR5CYG/vvw0AHgyBO8TCCogbR8pKGYfL2IWjKAMTH6kMAVIbc/R/fALhBYlzccBYy
+3h+Z1MzFB8gIH2EWB1E9fVwHU+M1OIzfzZ/ZLg1KthkuWnBaBu2+8KGwytAJKaNjMGEwHQYDVR0O
+BBYEFFvKXuXe0oGqzagtZFG22XKbl+ZPMA8GA1UdEwEB/wQFMAMBAf8wHwYDVR0jBBgwFoAUW8pe
+5d7SgarNqC1kUbbZcpuX5k8wDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMCA2gAMGUCMQCK5kCJ
+N+vp1RPZytRrJPOwPYdGWBrssd9v+1a6cGvHOMzosYxPD/fxZ3YOg9AeUY8CMD32IygmTMZgh5Mm
+m7I1HrrW9zzRHM76JTymGoEVW/MSD2zuZYrJh6j5B+BimoxcSg==
+-----END CERTIFICATE-----

From crux at crux.nu  Sat Jan 13 13:44:36 2018
From: crux at crux.nu (crux at crux.nu)
Date: Sat, 13 Jan 2018 13:44:36 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): tevent: update to 0.9.35
Message-ID: <20180113134436.AA9261802B9@crux.nu>

commit 5f38d2144678a3c7b4056cef8a244b69600de7d1
Author: Juergen Daubert <jue at jue.li>
Date:   Sat Jan 13 14:41:33 2018 +0100

    tevent: update to 0.9.35

diff --git a/tevent/.footprint b/tevent/.footprint
index ddbf589c8..3a4332f9c 100644
--- a/tevent/.footprint
+++ b/tevent/.footprint
@@ -2,9 +2,9 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/tevent.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libtevent.so -> libtevent.so.0.9.34
-lrwxrwxrwx	root/root	usr/lib/libtevent.so.0 -> libtevent.so.0.9.34
--rwxr-xr-x	root/root	usr/lib/libtevent.so.0.9.34
+lrwxrwxrwx	root/root	usr/lib/libtevent.so -> libtevent.so.0.9.35
+lrwxrwxrwx	root/root	usr/lib/libtevent.so.0 -> libtevent.so.0.9.35
+-rwxr-xr-x	root/root	usr/lib/libtevent.so.0.9.35
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/tevent.pc
 drwxr-xr-x	root/root	usr/lib/python2.7/
diff --git a/tevent/.md5sum b/tevent/.md5sum
index 55cca8586..32a70f5b3 100644
--- a/tevent/.md5sum
+++ b/tevent/.md5sum
@@ -1 +1 @@
-8df1ae19fd991b82abe66889da0651b0  tevent-0.9.34.tar.gz
+7895bdf2c11f7cc9c60a9c42cc8fa662  tevent-0.9.35.tar.gz
diff --git a/tevent/.signature b/tevent/.signature
index 988207a02..13f6fc790 100644
--- a/tevent/.signature
+++ b/tevent/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/btTrREqEphuEdP9EArJFwEyNvfo/RWH0kmTDRse+0QyP766Y9EP1W+jIBsqZhTN/7ZB2dRjRVw27WWq6gajMwM=
-SHA256 (Pkgfile) = f02fe53c1afc4a5bbf0aefba572d761c0c5f5cb9e8635b49fd9380587cfffaf2
-SHA256 (.footprint) = b5c36377a8b3f94f04cfe07f5ddbedacd4ebd9b31cf0409e7aeb8eb658627c38
-SHA256 (tevent-0.9.34.tar.gz) = 73213ef8b27f4a0164e375140a177a751e06fe190a90f3178e24f206b4747b8a
+RWSE3ohX2g5d/Zi/bxFTiR0mL/qCYhpThkcem39ajwzF1rycLsH+VcXo50aJTmgYgMT1+8NaBTOGjByaunp155cCB3Aq9HO6jAE=
+SHA256 (Pkgfile) = 0c190703bef159ac7634e0319ab291fc71e9fbe6fcda61d7030d452fec22d7c7
+SHA256 (.footprint) = b49127f44b61bd7f1cad91c87daa7053d382f3da73d31a75816174cd50ca4db0
+SHA256 (tevent-0.9.35.tar.gz) = 25a3a9d264eb3af9a688c38512f248fc1640fd86d663d3346dbfa18feb5c16e9
diff --git a/tevent/Pkgfile b/tevent/Pkgfile
index 6d2ef1d88..a24a2db5b 100644
--- a/tevent/Pkgfile
+++ b/tevent/Pkgfile
@@ -5,7 +5,7 @@
 # Optional:	python
 
 name=tevent
-version=0.9.34
+version=0.9.35
 release=1
 source=(https://www.samba.org/ftp/$name/$name-$version.tar.gz)
 

From crux at crux.nu  Sat Jan 13 13:44:36 2018
From: crux at crux.nu (crux at crux.nu)
Date: Sat, 13 Jan 2018 13:44:36 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): talloc: update to 2.1.11
Message-ID: <20180113134436.ADF66180302@crux.nu>

commit 9e4e1464c64530dd295be44cde94a25be6e67e58
Author: Juergen Daubert <jue at jue.li>
Date:   Sat Jan 13 14:41:13 2018 +0100

    talloc: update to 2.1.11

diff --git a/talloc/.footprint b/talloc/.footprint
index cdae4aef6..b336b990d 100644
--- a/talloc/.footprint
+++ b/talloc/.footprint
@@ -3,14 +3,14 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/pytalloc.h
 -rw-r--r--	root/root	usr/include/talloc.h
 drwxr-xr-x	root/root	usr/lib/
-lrwxrwxrwx	root/root	usr/lib/libpytalloc-util.so -> libpytalloc-util.so.2.1.10
-lrwxrwxrwx	root/root	usr/lib/libpytalloc-util.so.2 -> libpytalloc-util.so.2.1.10
--rwxr-xr-x	root/root	usr/lib/libpytalloc-util.so.2.1.10
--rwxr-xr-x	root/root	usr/lib/libtalloc-compat1-2.1.10.so
-lrwxrwxrwx	root/root	usr/lib/libtalloc.so -> libtalloc.so.2.1.10
-lrwxrwxrwx	root/root	usr/lib/libtalloc.so.1 -> libtalloc-compat1-2.1.10.so
-lrwxrwxrwx	root/root	usr/lib/libtalloc.so.2 -> libtalloc.so.2.1.10
--rwxr-xr-x	root/root	usr/lib/libtalloc.so.2.1.10
+lrwxrwxrwx	root/root	usr/lib/libpytalloc-util.so -> libpytalloc-util.so.2.1.11
+lrwxrwxrwx	root/root	usr/lib/libpytalloc-util.so.2 -> libpytalloc-util.so.2.1.11
+-rwxr-xr-x	root/root	usr/lib/libpytalloc-util.so.2.1.11
+-rwxr-xr-x	root/root	usr/lib/libtalloc-compat1-2.1.11.so
+lrwxrwxrwx	root/root	usr/lib/libtalloc.so -> libtalloc.so.2.1.11
+lrwxrwxrwx	root/root	usr/lib/libtalloc.so.1 -> libtalloc-compat1-2.1.11.so
+lrwxrwxrwx	root/root	usr/lib/libtalloc.so.2 -> libtalloc.so.2.1.11
+-rwxr-xr-x	root/root	usr/lib/libtalloc.so.2.1.11
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/pytalloc-util.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/talloc.pc
diff --git a/talloc/.md5sum b/talloc/.md5sum
index 462478286..be490a10c 100644
--- a/talloc/.md5sum
+++ b/talloc/.md5sum
@@ -1,2 +1,2 @@
-48b8822a76797bb143e3e38ed738c320  talloc-2.1.10.tar.gz
+452596f904ca2b10322bdaabf147a721  talloc-2.1.11.tar.gz
 365edd7d92b98bb9790ed0eeb3c4d2b3  talloc-man-pages.tar.xz
diff --git a/talloc/.signature b/talloc/.signature
index 8021a88be..0b141bb9d 100644
--- a/talloc/.signature
+++ b/talloc/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/dPaWhNRiFNF78v2V8OUlbtZNk8uZ2cVmbTpm2bz9+g/whGhLALaN1tktHhIC7pB/G+1kD9GflGmteU7gSsmtgs=
-SHA256 (Pkgfile) = 9fe78ae913032633ba38affa9091f4682c610850a8b852355195a4dc5470cea6
-SHA256 (.footprint) = 8a17eadfc175a81d7cbb3b0fc4d6add24c459b7f446d59d35f20b11990f66a21
-SHA256 (talloc-2.1.10.tar.gz) = c985e94bebd6ec2f6af3d95dcc3fcb192a2ddb7781a021d70ee899e26221f619
+RWSE3ohX2g5d/U0iNFn5kVIqEZf3BqledlEeQaxYdYkaSGDB1Q2UwCXu7mlv8fbxqHODYLb8XEy4Vaaykf2B+GNVDW1GVu7yqw8=
+SHA256 (Pkgfile) = d663c24264faf2665259c13db78f7c31c551a2503ed48b10f6f33a107a98a09d
+SHA256 (.footprint) = ea9404ef2f4dcc161b119816cccec9fbd1abb1606a9ca8b3868376eb17abb3fe
+SHA256 (talloc-2.1.11.tar.gz) = 639eb35556a0af999123c4d883e79be05ff9f00ab4f9e4ac2e5775f9c5eeeed3
 SHA256 (talloc-man-pages.tar.xz) = ccaa229413cb28235c9e0bf819119c171730e4782fa176ff87605bdb88a7925a
diff --git a/talloc/Pkgfile b/talloc/Pkgfile
index 95685b7f4..c573947d2 100644
--- a/talloc/Pkgfile
+++ b/talloc/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on:	python
 
 name=talloc
-version=2.1.10
+version=2.1.11
 release=1
 source=(https://samba.org/ftp/$name/$name-$version.tar.gz
         $name-man-pages.tar.xz)

From crux at crux.nu  Sun Jan 14 13:33:14 2018
From: crux at crux.nu (crux at crux.nu)
Date: Sun, 14 Jan 2018 13:33:14 +0000 (UTC)
Subject: [crux-commits] ports/core (3.3): libmpc: update to 1.1.0
Message-ID: <20180114133314.2805D18023F@crux.nu>

commit cc18b9195921ce64e1717b0f1146935a0cd54519
Author: Juergen Daubert <jue at jue.li>
Date:   Sun Jan 14 14:33:02 2018 +0100

    libmpc: update to 1.1.0

diff --git a/libmpc/.footprint b/libmpc/.footprint
index 188dbf61..e9becefd 100644
--- a/libmpc/.footprint
+++ b/libmpc/.footprint
@@ -4,6 +4,6 @@ drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libmpc.a
 -rwxr-xr-x	root/root	usr/lib/libmpc.la
-lrwxrwxrwx	root/root	usr/lib/libmpc.so -> libmpc.so.3.0.0
-lrwxrwxrwx	root/root	usr/lib/libmpc.so.3 -> libmpc.so.3.0.0
--rwxr-xr-x	root/root	usr/lib/libmpc.so.3.0.0
+lrwxrwxrwx	root/root	usr/lib/libmpc.so -> libmpc.so.3.1.0
+lrwxrwxrwx	root/root	usr/lib/libmpc.so.3 -> libmpc.so.3.1.0
+-rwxr-xr-x	root/root	usr/lib/libmpc.so.3.1.0
diff --git a/libmpc/.md5sum b/libmpc/.md5sum
index 7b100cb5..6be61f38 100644
--- a/libmpc/.md5sum
+++ b/libmpc/.md5sum
@@ -1 +1 @@
-d6a1d5f8ddea3abd2cc3e98f58352d26  mpc-1.0.3.tar.gz
+4125404e41e482ec68282a2e687f6c73  mpc-1.1.0.tar.gz
diff --git a/libmpc/.signature b/libmpc/.signature
index 5da909be..8f05592b 100644
--- a/libmpc/.signature
+++ b/libmpc/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqpP4ddzDGjayXXRA3YIoXL85LL1k6LX20agqpWaHKZQn664f+VNYUDj3H0HUDwSLtS0Y/f7H8awTO2WsnYqRjQ8=
-SHA256 (Pkgfile) = 0ecb0452871363ab19087dbcb437b42c769e87abf2e1b6f8343ad61212743a16
-SHA256 (.footprint) = bc2f39ff2b064835b962350b9c0e2dbb7ba6d3c01e6db7bb9a3b0fc971f220c7
-SHA256 (mpc-1.0.3.tar.gz) = 617decc6ea09889fb08ede330917a00b16809b8db88c29c31bfbb49cbf88ecc3
+RWRJc1FUaeVeqim9b5mAvdEqVOIHGA0efuL/Rz8qjwUhZBQCNWNhsAJ7a0ml37Ch/seEwGqrT4BNeAbxij0BQM1spKFn1YAj/Qw=
+SHA256 (Pkgfile) = 01184a4fd9b710fcb368cc48bd34cdb40bc904d1806775fe8d8eb93fc71bb295
+SHA256 (.footprint) = e4f0125c02570d63e6e4cc4bf874953eaba3664fea30a4cd66650304a55ca5cc
+SHA256 (mpc-1.1.0.tar.gz) = 6985c538143c1208dcb1ac42cedad6ff52e267b47e5f970183a3e75125b43c2e
diff --git a/libmpc/Pkgfile b/libmpc/Pkgfile
index f884b3f5..f5081301 100644
--- a/libmpc/Pkgfile
+++ b/libmpc/Pkgfile
@@ -4,9 +4,9 @@
 # Depends on:  libmpfr
 
 name=libmpc
-version=1.0.3
+version=1.1.0
 release=1
-source=(http://www.multiprecision.org/mpc/download/mpc-$version.tar.gz)
+source=(https://ftp.gnu.org/gnu/mpc/mpc-$version.tar.gz)
 
 build() {
     cd mpc-$version

From crux at crux.nu  Sun Jan 14 13:33:57 2018
From: crux at crux.nu (crux at crux.nu)
Date: Sun, 14 Jan 2018 13:33:57 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): librsvg: update to 2.40.19
Message-ID: <20180114133357.D0F6B1802C7@crux.nu>

commit 06629b306107eda3115789628bdb985f7776e957
Author: Juergen Daubert <jue at jue.li>
Date:   Sun Jan 14 14:33:49 2018 +0100

    librsvg: update to 2.40.19

diff --git a/librsvg/.footprint b/librsvg/.footprint
index 89d6534b4..5d2f2d7a5 100644
--- a/librsvg/.footprint
+++ b/librsvg/.footprint
@@ -18,9 +18,9 @@ drwxr-xr-x	root/root	usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/
 drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/Rsvg-2.0.typelib
 -rwxr-xr-x	root/root	usr/lib/librsvg-2.la
-lrwxrwxrwx	root/root	usr/lib/librsvg-2.so -> librsvg-2.so.2.40.18
-lrwxrwxrwx	root/root	usr/lib/librsvg-2.so.2 -> librsvg-2.so.2.40.18
--rwxr-xr-x	root/root	usr/lib/librsvg-2.so.2.40.18
+lrwxrwxrwx	root/root	usr/lib/librsvg-2.so -> librsvg-2.so.2.40.19
+lrwxrwxrwx	root/root	usr/lib/librsvg-2.so.2 -> librsvg-2.so.2.40.19
+-rwxr-xr-x	root/root	usr/lib/librsvg-2.so.2.40.19
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/librsvg-2.0.pc
 drwxr-xr-x	root/root	usr/share/
diff --git a/librsvg/.md5sum b/librsvg/.md5sum
index 37dcbb1d1..8e041a326 100644
--- a/librsvg/.md5sum
+++ b/librsvg/.md5sum
@@ -1 +1 @@
-eaa5c8a8bbe2600ab5194c0d3b1b621b  librsvg-2.40.18.tar.xz
+934eff469b34c732fb91ddb9afd40638  librsvg-2.40.19.tar.xz
diff --git a/librsvg/.signature b/librsvg/.signature
index 3798ea686..e55c6996e 100644
--- a/librsvg/.signature
+++ b/librsvg/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/WO/pOIMVfc9ArgCM1xpqFn3aMoKvKoi6q7KSm4SBGTVVzCYKXwcCCeUE3DcP4/F98ZpgdtKXVs0ozGNfBsvDAk=
-SHA256 (Pkgfile) = 9ec92be07798149470fa95af42437078368f7dd1a0986cffec1301752ec4e608
-SHA256 (.footprint) = 39fa85d62a7b70a35b01eedc1602c23d1122ff4d5d166ef0016c4bfb2d0dbfde
-SHA256 (librsvg-2.40.18.tar.xz) = bfc8c488c89c1e7212c478beb95c41b44701636125a3e6dab41187f1485b564c
+RWSE3ohX2g5d/aUiGw62Y4NhfCDveyJgl88vmeHD5zyxnMWx2/tL+vYjajs/npKQIA7cHK9stg7g6NGsH82G3Xots6tTd6Vj7AM=
+SHA256 (Pkgfile) = 1f9a44f57f85a3815765657697218d1f3a7854b17dee122b6b1f36852b4cc3db
+SHA256 (.footprint) = a3d5f6034910bf1a2a58075067c6fdda00573d4832dfc4d9161f13370254033b
+SHA256 (librsvg-2.40.19.tar.xz) = 612b4d8b8609036f5d899be3fe70d9866b5f6ac5c971154c1c0ef7242216c1f7
diff --git a/librsvg/Pkgfile b/librsvg/Pkgfile
index c488afe7d..4160953a6 100644
--- a/librsvg/Pkgfile
+++ b/librsvg/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: gtk3 libcroco
 
 name=librsvg
-version=2.40.18
+version=2.40.19
 release=1
 source=(ftp://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.xz)
 

From crux at crux.nu  Sun Jan 14 17:25:58 2018
From: crux at crux.nu (crux at crux.nu)
Date: Sun, 14 Jan 2018 17:25:58 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): librsvg: update to 2.40.20
Message-ID: <20180114172558.355801802AD@crux.nu>

commit f5ae456eb6656f02377af7028a7be21f1df80396
Author: Juergen Daubert <jue at jue.li>
Date:   Sun Jan 14 18:24:25 2018 +0100

    librsvg: update to 2.40.20

diff --git a/librsvg/.footprint b/librsvg/.footprint
index 5d2f2d7a5..f13ae112b 100644
--- a/librsvg/.footprint
+++ b/librsvg/.footprint
@@ -18,9 +18,9 @@ drwxr-xr-x	root/root	usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/
 drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rw-r--r--	root/root	usr/lib/girepository-1.0/Rsvg-2.0.typelib
 -rwxr-xr-x	root/root	usr/lib/librsvg-2.la
-lrwxrwxrwx	root/root	usr/lib/librsvg-2.so -> librsvg-2.so.2.40.19
-lrwxrwxrwx	root/root	usr/lib/librsvg-2.so.2 -> librsvg-2.so.2.40.19
--rwxr-xr-x	root/root	usr/lib/librsvg-2.so.2.40.19
+lrwxrwxrwx	root/root	usr/lib/librsvg-2.so -> librsvg-2.so.2.40.20
+lrwxrwxrwx	root/root	usr/lib/librsvg-2.so.2 -> librsvg-2.so.2.40.20
+-rwxr-xr-x	root/root	usr/lib/librsvg-2.so.2.40.20
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/librsvg-2.0.pc
 drwxr-xr-x	root/root	usr/share/
diff --git a/librsvg/.md5sum b/librsvg/.md5sum
index 8e041a326..bf8f7f352 100644
--- a/librsvg/.md5sum
+++ b/librsvg/.md5sum
@@ -1 +1 @@
-934eff469b34c732fb91ddb9afd40638  librsvg-2.40.19.tar.xz
+4949d313b0c5d9161a5c259104af5568  librsvg-2.40.20.tar.xz
diff --git a/librsvg/.signature b/librsvg/.signature
index e55c6996e..606f481bf 100644
--- a/librsvg/.signature
+++ b/librsvg/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/aUiGw62Y4NhfCDveyJgl88vmeHD5zyxnMWx2/tL+vYjajs/npKQIA7cHK9stg7g6NGsH82G3Xots6tTd6Vj7AM=
-SHA256 (Pkgfile) = 1f9a44f57f85a3815765657697218d1f3a7854b17dee122b6b1f36852b4cc3db
-SHA256 (.footprint) = a3d5f6034910bf1a2a58075067c6fdda00573d4832dfc4d9161f13370254033b
-SHA256 (librsvg-2.40.19.tar.xz) = 612b4d8b8609036f5d899be3fe70d9866b5f6ac5c971154c1c0ef7242216c1f7
+RWSE3ohX2g5d/RkLBu09HvXAwZrUa6JH2ldVLNwzom+10JSd2pH8wuyeAXHzvWJutzD/MtKwxgb8/RDGWCwV5jNYVcaTsB9Yvgw=
+SHA256 (Pkgfile) = 532f327595a0b36d0be8973fc560370723e36c09dbe1b369e62b33e505619ff4
+SHA256 (.footprint) = cc7a2ab0dfd60a9e75615ae1c636fabf8057c4bc483ea47047122bad6852c713
+SHA256 (librsvg-2.40.20.tar.xz) = cff4dd3c3b78bfe99d8fcfad3b8ba1eee3289a0823c0e118d78106be6b84c92b
diff --git a/librsvg/Pkgfile b/librsvg/Pkgfile
index 4160953a6..9862457b1 100644
--- a/librsvg/Pkgfile
+++ b/librsvg/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: gtk3 libcroco
 
 name=librsvg
-version=2.40.19
+version=2.40.20
 release=1
 source=(ftp://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.xz)
 

From crux at crux.nu  Mon Jan 15 11:25:05 2018
From: crux at crux.nu (crux at crux.nu)
Date: Mon, 15 Jan 2018 11:25:05 +0000 (UTC)
Subject: [crux-commits] ports/contrib (3.3): cppcheck: update to 1.82
Message-ID: <20180115112505.E58B518008F@crux.nu>

commit 3e72fcb5da02fdae4f0fc2fb030618504037468e
Author: Svyatoslav Mishyn <svyatoslav.mishyn at gmail.com>
Date:   Mon Jan 15 13:24:41 2018 +0200

    cppcheck: update to 1.82

diff --git a/cppcheck/.footprint b/cppcheck/.footprint
index 1b4f7761..1dc469b4 100644
--- a/cppcheck/.footprint
+++ b/cppcheck/.footprint
@@ -5,6 +5,7 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/cppcheck-htmlreport
 -rwxr-xr-x	root/root	usr/bin/cppcheckdata.py
 -rwxr-xr-x	root/root	usr/bin/findcasts.py
+-rwxr-xr-x	root/root	usr/bin/misra.py
 -rwxr-xr-x	root/root	usr/bin/naming.py
 -rwxr-xr-x	root/root	usr/bin/threadsafety.py
 -rwxr-xr-x	root/root	usr/bin/y2038.py
@@ -14,6 +15,8 @@ drwxr-xr-x	root/root	usr/share/cppcheck/cfg/
 -rw-r--r--	root/root	usr/share/cppcheck/cfg/avr.cfg
 -rw-r--r--	root/root	usr/share/cppcheck/cfg/bsd.cfg
 -rw-r--r--	root/root	usr/share/cppcheck/cfg/cppcheck-cfg.rng
+-rw-r--r--	root/root	usr/share/cppcheck/cfg/cppcheck-lib.cfg
+-rw-r--r--	root/root	usr/share/cppcheck/cfg/embedded_sql.cfg
 -rw-r--r--	root/root	usr/share/cppcheck/cfg/gnu.cfg
 -rw-r--r--	root/root	usr/share/cppcheck/cfg/gtk.cfg
 -rw-r--r--	root/root	usr/share/cppcheck/cfg/microsoft_sal.cfg
diff --git a/cppcheck/.md5sum b/cppcheck/.md5sum
index 412fa06f..bd95dd22 100644
--- a/cppcheck/.md5sum
+++ b/cppcheck/.md5sum
@@ -1 +1 @@
-186ceb32d102362df83f9008f8a1499c  cppcheck-1.81.tar.gz
+80f7b8a0612f39efd18344d84e8a45e0  cppcheck-1.82.tar.gz
diff --git a/cppcheck/.signature b/cppcheck/.signature
index dd6f8cbc..b1c90ee8 100644
--- a/cppcheck/.signature
+++ b/cppcheck/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3+AtRz0JCJH9itYQTWXt0rdEKugTvE7uwinlHK4ilmni5Pco0gIvciv/HlmCjLpIHcSJDIalxPpUk6XIjAHwZAI=
-SHA256 (Pkgfile) = b168090f5c3bcd3c557c80395cf28f09c221df5de98c08af14331b53cc1bc5da
-SHA256 (.footprint) = 26468d7ddbc7a99ba4ac7e59379c5ac947018bf2b7249ef63b5398f43337fef2
-SHA256 (cppcheck-1.81.tar.gz) = 12396eee334b22bf3aa3d629d483f27f287125348b97586dfd4da87b26ae2a56
+RWSagIOpLGJF34mpAE4gRiLwkgMfS7qlkQ1e+tYt434wrtvcPEz92iSLLXDFl/otmGohDgIcwAgxutV/3BaB/r6WL6k7faUx9gU=
+SHA256 (Pkgfile) = 6806ae281b5f52180c6b628733cfdf165acdd8d8fc6f8cb38192907dea24aac8
+SHA256 (.footprint) = a1ed8827e7ddbaf05a7a44202da38090ac7b8cd753f1d6cb4bf1a3e932b64308
+SHA256 (cppcheck-1.82.tar.gz) = 524444a678e63dee247fd8d2fe3194317c07f2aa65de31a41aa2eb0553bbdc7f
diff --git a/cppcheck/Pkgfile b/cppcheck/Pkgfile
index bbc3356d..b42b2270 100644
--- a/cppcheck/Pkgfile
+++ b/cppcheck/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  libpcre python docbook-xsl
 
 name=cppcheck
-version=1.81
+version=1.82
 release=1
 source=(https://github.com/danmar/$name/archive/$version/$name-$version.tar.gz)
 

From crux at crux.nu  Mon Jan 15 11:25:05 2018
From: crux at crux.nu (crux at crux.nu)
Date: Mon, 15 Jan 2018 11:25:05 +0000 (UTC)
Subject: [crux-commits] ports/contrib (3.3): mksh: update to R56c
Message-ID: <20180115112505.E8CC71802C7@crux.nu>

commit a8312eafc6387119e44865d1a933a6c910d564c6
Author: Svyatoslav Mishyn <svyatoslav.mishyn at gmail.com>
Date:   Mon Jan 15 13:21:48 2018 +0200

    mksh: update to R56c

diff --git a/mksh/.md5sum b/mksh/.md5sum
index 0be74c91..550ecae1 100644
--- a/mksh/.md5sum
+++ b/mksh/.md5sum
@@ -1 +1 @@
-6b65b3798f5f6a057fa541fc08cc2be9  mksh-R56b.tgz
+4799a9ac6d55871d79ba66713d928663  mksh-R56c.tgz
diff --git a/mksh/.signature b/mksh/.signature
index ed80c2f4..f027466f 100644
--- a/mksh/.signature
+++ b/mksh/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF3zXcWmlBE0ZDuvokfo+6GAt9TeZcCO2kzOo9U9gpOLDH5V3uPwuasLm03mKsXulRaR8AliLfKG5OwQgevmL41Qw=
-SHA256 (Pkgfile) = eed3d52a5781b521beaa0b952b52f1b1810428c0964c7d58d47bdbe0f02e8ee7
+RWSagIOpLGJF3+GlBCbtV+GoUhw6XsvSHA9t2F1TJKLqouhGPTjTSJbLTyei7sZmBQacv+vJSGegx7tBT5lQniwwiUWpZLMUkQ8=
+SHA256 (Pkgfile) = e64c422fdd24d5dc5484c4e01323bdbd62f60b04dd10bfa6b761cb6b92b8b3a1
 SHA256 (.footprint) = dab27860e5f8aaaca226ea0379540970ffeb7e4f3653f9c3dbc02443e6fc45e2
-SHA256 (mksh-R56b.tgz) = 40ec744eec256583e4e18907cde22af57c980286f535df47326fed07e48c9a7f
+SHA256 (mksh-R56c.tgz) = dd86ebc421215a7b44095dc13b056921ba81e61b9f6f4cdab08ca135d02afb77
diff --git a/mksh/Pkgfile b/mksh/Pkgfile
index fc5f7abb..ded263cc 100644
--- a/mksh/Pkgfile
+++ b/mksh/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  Svyatoslav Mishyn, svyatoslav dot mishyn at gmail dot com
 
 name=mksh
-version=R56b
+version=R56c
 release=1
 source=(https://www.mirbsd.org/MirOS/dist/mir/$name/$name-$version.tgz)
 

From crux at crux.nu  Mon Jan 15 11:25:05 2018
From: crux at crux.nu (crux at crux.nu)
Date: Mon, 15 Jan 2018 11:25:05 +0000 (UTC)
Subject: [crux-commits] ports/contrib (3.3): pkgconf: update to 1.4.0
Message-ID: <20180115112505.EC3881802C9@crux.nu>

commit bd9ce5951ffa6866770684c22bdd222bf3b7a1d3
Author: Svyatoslav Mishyn <svyatoslav.mishyn at gmail.com>
Date:   Mon Jan 15 13:20:03 2018 +0200

    pkgconf: update to 1.4.0

diff --git a/pkgconf/.footprint b/pkgconf/.footprint
index 7f83e0a9..547abad4 100644
--- a/pkgconf/.footprint
+++ b/pkgconf/.footprint
@@ -13,9 +13,9 @@ drwxr-xr-x	root/root	usr/include/pkgconf/libpkgconf/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libpkgconf.a
 -rwxr-xr-x	root/root	usr/lib/libpkgconf.la
-lrwxrwxrwx	root/root	usr/lib/libpkgconf.so -> libpkgconf.so.2.0.0
-lrwxrwxrwx	root/root	usr/lib/libpkgconf.so.2 -> libpkgconf.so.2.0.0
--rwxr-xr-x	root/root	usr/lib/libpkgconf.so.2.0.0
+lrwxrwxrwx	root/root	usr/lib/libpkgconf.so -> libpkgconf.so.3.0.0
+lrwxrwxrwx	root/root	usr/lib/libpkgconf.so.3 -> libpkgconf.so.3.0.0
+-rwxr-xr-x	root/root	usr/lib/libpkgconf.so.3.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libpkgconf.pc
 drwxr-xr-x	root/root	usr/share/
diff --git a/pkgconf/.md5sum b/pkgconf/.md5sum
index 55282f19..debe7681 100644
--- a/pkgconf/.md5sum
+++ b/pkgconf/.md5sum
@@ -1 +1 @@
-d15186f3a688391a8c3a555f128e4db6  pkgconf-1.3.90.tar.xz
+c509c0dad5a70aa4bc3210557b7eafce  pkgconf-1.4.0.tar.xz
diff --git a/pkgconf/.signature b/pkgconf/.signature
index c5b27c72..0c597759 100644
--- a/pkgconf/.signature
+++ b/pkgconf/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF35OCzdWJz/KPwh0wcB18Ff6qouVm1CWE+EtYkLoTOXVOIHl5u4cWEArE7z2s9g6BnEbmb4c3Ai0CgA2BOySZugo=
-SHA256 (Pkgfile) = 345edf67a0d9e72563ac64665f0f1f0c8b53088c71d3d540760540bc627fdb36
-SHA256 (.footprint) = 92fcfe2585356aab92e0dc30140579f1caa66f479eadbfe0ecd50e949000065a
-SHA256 (pkgconf-1.3.90.tar.xz) = 112db7f957816901b5fe448715c0a9e38f171d4794c44075b0734a0e7fcfba36
+RWSagIOpLGJF39fB0xZkrYOFM0SOcS4UvWUY9PYc8oOErzAD7QHFnemnf3J4U6E1fg2jK2fFJHrigglHU8GONX2KkuYp+ZNIRQ4=
+SHA256 (Pkgfile) = be31f3719f2afe852d09e0e688767e534cbce51d0d3390fa089245eebe5b2c33
+SHA256 (.footprint) = 7057ffb8499a0e3a339f1c368bba82b58f5ad0ccc13a7a43d17f1f7a8f23757b
+SHA256 (pkgconf-1.4.0.tar.xz) = 1d112ff35dad516ffbfbdb013df3a035140618fe7632ec44ffa894a9c713301b
diff --git a/pkgconf/Pkgfile b/pkgconf/Pkgfile
index 0d0f2c2f..8d2b8cc3 100644
--- a/pkgconf/Pkgfile
+++ b/pkgconf/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  Svyatoslav Mishyn, svyatoslav dot mishyn at gmail dot com
 
 name=pkgconf
-version=1.3.90
+version=1.4.0
 release=1
 source=(https://distfiles.dereferenced.org/$name/$name-$version.tar.xz)
 

From crux at crux.nu  Mon Jan 15 12:18:54 2018
From: crux at crux.nu (crux at crux.nu)
Date: Mon, 15 Jan 2018 12:18:54 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): qpdf: update to 7.1.0
Message-ID: <20180115121854.0C07018008D@crux.nu>

commit 13acc56286f391233573564e43961ff16869b972
Author: Juergen Daubert <jue at jue.li>
Date:   Mon Jan 15 13:17:55 2018 +0100

    qpdf: update to 7.1.0

diff --git a/qpdf/.footprint b/qpdf/.footprint
index f78d6d370..4cb13aea6 100644
--- a/qpdf/.footprint
+++ b/qpdf/.footprint
@@ -37,9 +37,9 @@ drwxr-xr-x	root/root	usr/include/qpdf/
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libqpdf.a
 -rwxr-xr-x	root/root	usr/lib/libqpdf.la
-lrwxrwxrwx	root/root	usr/lib/libqpdf.so -> libqpdf.so.18.1.0
-lrwxrwxrwx	root/root	usr/lib/libqpdf.so.18 -> libqpdf.so.18.1.0
--rwxr-xr-x	root/root	usr/lib/libqpdf.so.18.1.0
+lrwxrwxrwx	root/root	usr/lib/libqpdf.so -> libqpdf.so.18.2.0
+lrwxrwxrwx	root/root	usr/lib/libqpdf.so.18 -> libqpdf.so.18.2.0
+-rwxr-xr-x	root/root	usr/lib/libqpdf.so.18.2.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libqpdf.pc
 drwxr-xr-x	root/root	usr/share/
diff --git a/qpdf/.md5sum b/qpdf/.md5sum
index 0080db264..de7fcf05d 100644
--- a/qpdf/.md5sum
+++ b/qpdf/.md5sum
@@ -1 +1 @@
-c3ff408f69b3a6b2b3b4c8b373b2600c  qpdf-7.0.0.tar.gz
+8c99dd6a55bbea2c0f7bceab8562631d  qpdf-7.1.0.tar.gz
diff --git a/qpdf/.signature b/qpdf/.signature
index 2823db81c..e4b9b67b2 100644
--- a/qpdf/.signature
+++ b/qpdf/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/b2r8YrA9ABua+RftcWMwrGjbqG/vG+R3jV/z4nME2trhu6iA5O24KCQAFy4GhGhUYssqdDuwtVPf+XnqovhfgY=
-SHA256 (Pkgfile) = 7a488f4ee243f5f45fa2d8277b6f1ccf41bd61269099b130906c4725b0e8a3d8
-SHA256 (.footprint) = f0b4062eff41f36629fff06cbbb36b8c6c4182a849cd54e619cd457c246242a7
-SHA256 (qpdf-7.0.0.tar.gz) = fed08de14caad0fe5efd148d9eca886d812588b2cbb35d13e61993ee8eb8c65f
+RWSE3ohX2g5d/d9NzutHWUmkCfPnZ1XFuzd3VmXbejEOEyG8DuMHb1/VKjs1GqdSXFh/uHedHgj+7jJUQg+p7euOS3Sz2UxReQY=
+SHA256 (Pkgfile) = f80c40053b412f9d7d5ad542dffe4617aca0a2e2df2e30924491ddb1c0df2979
+SHA256 (.footprint) = b23aa9546ebc510339ebd35eeedd528bfcf43598746e362766226aed6d7fb48d
+SHA256 (qpdf-7.1.0.tar.gz) = 27054bfb83a4f4f70053c6d4c2de5e18ddf60c9a8edbce219ac1bdcf03f16a2e
diff --git a/qpdf/Pkgfile b/qpdf/Pkgfile
index 16aaa6d8b..5c54067e9 100644
--- a/qpdf/Pkgfile
+++ b/qpdf/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  zlib libjpeg-turbo
 
 name=qpdf
-version=7.0.0
+version=7.1.0
 release=1
 source=(http://downloads.sourceforge.net/project/$name/$name/$version/$name-$version.tar.gz)
 

From crux at crux.nu  Tue Jan 16 16:56:42 2018
From: crux at crux.nu (crux at crux.nu)
Date: Tue, 16 Jan 2018 16:56:42 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): [notify] libidn: Secutiry fix for
 CVE-2017-14062. closes FS#1554
Message-ID: <20180116165642.D18AD180299@crux.nu>

commit c9ed075b254032302e36eefe14eeac7565cb51e4
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Tue Jan 16 17:55:52 2018 +0100

    [notify] libidn: Secutiry fix for CVE-2017-14062. closes FS#1554

diff --git a/libidn/.md5sum b/libidn/.md5sum
index 7f3221526..7313e94c9 100644
--- a/libidn/.md5sum
+++ b/libidn/.md5sum
@@ -1 +1,2 @@
+cd02b28cd6b74d7e55055651003dfcf4  CVE-2017-14062.patch
 a9aa7e003665de9c82bd3f9fc6ccf308  libidn-1.33.tar.gz
diff --git a/libidn/.md5sum.orig b/libidn/.md5sum.orig
new file mode 100644
index 000000000..9132f3c89
--- /dev/null
+++ b/libidn/.md5sum.orig
@@ -0,0 +1,2 @@
+e4b03c6bcff3e11ea54adc6540fb7d07  CVE-2017-14062.patch
+a9aa7e003665de9c82bd3f9fc6ccf308  libidn-1.33.tar.gz
diff --git a/libidn/.signature b/libidn/.signature
index a748a76f1..50c0763ef 100644
--- a/libidn/.signature
+++ b/libidn/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/av7D78bcxVpHFwVnVvsVbntH7q1tpLUcuW3hTn3rajwbAMu7aCDa5jJTJKeUZ+bNVmNaMcQS9s0TZJeQDMU5As=
-SHA256 (Pkgfile) = e83f48874e414a81a255ce4ad151bd737bc12e30af115f0894a14ff272205ecd
+RWSE3ohX2g5d/XzfkvpoUogWAcNTzXOg8hIykW9+oa298BOCD/60VV/zBtCGx/1AC/ulsdgOM4qV46JvoWtWNKviPjm7dkAPdA4=
+SHA256 (Pkgfile) = 3b2004727e755c55320c76255d6b8b1c2260c08244832e8cc4b9c59e3fbc004b
 SHA256 (.footprint) = 8b7ff628d35d714b967f076a8e848cc7c6963129dc2ef9064b13e64e4a9ecf1d
 SHA256 (libidn-1.33.tar.gz) = 44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19
+SHA256 (CVE-2017-14062.patch) = 9dd36fddcfe60b8feb958bab4538054134187a52c98c15ec43362b63eaf69ac4
diff --git a/libidn/CVE-2017-14062.patch b/libidn/CVE-2017-14062.patch
new file mode 100644
index 000000000..2a2c2b7ee
--- /dev/null
+++ b/libidn/CVE-2017-14062.patch
@@ -0,0 +1,29 @@
+--- a/lib/punycode.c	2016-01-14 21:42:33.000000000 +0800
++++ b/lib/punycode.c	2018-01-12 11:36:58.027226633 +0800
+@@ -88,11 +88,11 @@ enum
+ /* point (for use in representing integers) in the range 0 to */
+ /* base-1, or base if cp does not represent a value.          */
+ 
+-static punycode_uint
+-decode_digit (punycode_uint cp)
++static unsigned
++decode_digit (int cp)
+ {
+-  return cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 :
+-    cp - 97 < 26 ? cp - 97 : base;
++  return (unsigned) (cp - 48 < 10 ? cp - 22 : cp - 65 < 26 ? cp - 65 :
++    cp - 97 < 26 ? cp - 97 : base);
+ }
+ 
+ /* encode_digit(d,flag) returns the basic code point whose value      */
+--- a/tests/tst_idna.c	2016-01-14 21:42:33.000000000 +0800
++++ b/tests/tst_idna.c	2018-01-12 11:36:58.027226633 +0800
+@@ -211,7 +211,7 @@ static const struct idna idna[] = {
+     'x', 'n', '-', '-', 'f', 'o', 0x3067},
+    IDNA_ACE_PREFIX "too long too long too long too long too long too "
+    "long too long too long too long too long ", 0,
+-   IDNA_CONTAINS_ACE_PREFIX, IDNA_PUNYCODE_ERROR}
++   IDNA_CONTAINS_ACE_PREFIX, IDNA_INVALID_LENGTH}
+ };
+ 
+ void
diff --git a/libidn/Pkgfile b/libidn/Pkgfile
index 25ee04769..f6bef3a9b 100644
--- a/libidn/Pkgfile
+++ b/libidn/Pkgfile
@@ -5,12 +5,17 @@
 
 name=libidn
 version=1.33
-release=1
-source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz)
+release=2
+source=(http://ftp.gnu.org/gnu/$name/$name-$version.tar.gz
+        CVE-2017-14062.patch)
 
 build() {
 	cd $name-$version
 
+	patch -p1 -i $SRC/CVE-2017-14062.patch
+	sed -i '/^SUBDIRS/s/doc//' Makefile.am
+
+	autoreconf
 	./configure \
 		--prefix=/usr \
 		--disable-nls \
@@ -18,5 +23,9 @@ build() {
 
 	make
 	make DESTDIR=$PKG install
-	rm -r $PKG/usr/share/info
+
+	install -d $PKG/usr/share/man/man{1,3}
+	install -m 0644 doc/*.1 $PKG/usr/share/man/man1
+	install -m 0644 doc/man/*.3 $PKG/usr/share/man/man3
+
 }

From crux at crux.nu  Tue Jan 16 23:56:11 2018
From: crux at crux.nu (crux at crux.nu)
Date: Tue, 16 Jan 2018 23:56:11 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): libidn: cleanup
Message-ID: <20180116235611.B19C81801AB@crux.nu>

commit eca9f6e63756f24d33910b8a07e96ed63fb5c83d
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Wed Jan 17 00:56:08 2018 +0100

    libidn: cleanup

diff --git a/libidn/.md5sum.orig b/libidn/.md5sum.orig
deleted file mode 100644
index 9132f3c89..000000000
--- a/libidn/.md5sum.orig
+++ /dev/null
@@ -1,2 +0,0 @@
-e4b03c6bcff3e11ea54adc6540fb7d07  CVE-2017-14062.patch
-a9aa7e003665de9c82bd3f9fc6ccf308  libidn-1.33.tar.gz

From crux at crux.nu  Wed Jan 17 13:26:18 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed, 17 Jan 2018 13:26:18 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): transmission-gtk: security fix for
 CVE-2018-5702
Message-ID: <20180117132618.77DDD180230@crux.nu>

commit a1363476176971d852a1041f33c0c2f045aa6889
Author: Juergen Daubert <jue at jue.li>
Date:   Wed Jan 17 14:25:46 2018 +0100

    transmission-gtk: security fix for CVE-2018-5702

diff --git a/transmission-gtk/.md5sum b/transmission-gtk/.md5sum
index abd556831..35b9598b9 100644
--- a/transmission-gtk/.md5sum
+++ b/transmission-gtk/.md5sum
@@ -1 +1,2 @@
+7d60fa6b8ec69d27503c4f61922b3aba  CVE-2018-5702.patch
 3fce404a436e3cd7fde80fb6ed61c264  transmission-2.92.tar.xz
diff --git a/transmission-gtk/.signature b/transmission-gtk/.signature
index 09efb1025..b6c2022ef 100644
--- a/transmission-gtk/.signature
+++ b/transmission-gtk/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/f7WZaehP4DZbcBPXvifH8QRH2ewTiB60bjQD0dYO8lKiLyt5sMwebSsU6+dz0u8vokzrZ4sg+5oy+cfk5PfKQs=
-SHA256 (Pkgfile) = 860bfcd8e9e4d7d1ea665e927620f777360805cf0ee4a4e1a1843c316a139527
+RWSE3ohX2g5d/eeCGcvDY0PrAIetaAuahiu0bSZPYI1/qqRzvLPraFcZ+1Nfw2gKwWgkPOBF2N9HT2mqABISDceAaD012LzaoAg=
+SHA256 (Pkgfile) = ad8bc82246eff91bdd0518c2ac5d0d06e8b48f19c5412b5fb6cb7d90b03bb7b5
 SHA256 (.footprint) = 4a1315e013b8d882bbcb6d165b7ab03f5f55c9e0cd035bab12d13ab3199a1b07
 SHA256 (transmission-2.92.tar.xz) = 3a8d045c306ad9acb7bf81126939b9594553a388482efa0ec1bfb67b22acd35f
+SHA256 (CVE-2018-5702.patch) = eae7fc4b93b4be760c4d3277ff75b39573cc9e0e4eb851d12269ea004f46c54a
diff --git a/transmission-gtk/CVE-2018-5702.patch b/transmission-gtk/CVE-2018-5702.patch
new file mode 100644
index 000000000..a3a0cf160
--- /dev/null
+++ b/transmission-gtk/CVE-2018-5702.patch
@@ -0,0 +1,302 @@
+Fix a weakness that allows remote code execution via the Transmission
+RPC server using DNS rebinding:
+
+https://bugs.chromium.org/p/project-zero/issues/detail?id=1447
+
+Patch adapted from Tavis Ormandy's patch on the Transmission master
+branch to the Transmission 2.92 release by Leo Famulari
+<leo at famulari.name>:
+
+https://github.com/transmission/transmission/pull/468/commits
+
+From fe2d3c6e75088f3d9b6040ce06da3d530358bc2f Mon Sep 17 00:00:00 2001
+From: Tavis Ormandy <taviso at google.com>
+Date: Thu, 11 Jan 2018 10:00:41 -0800
+Subject: [PATCH] mitigate dns rebinding attacks against daemon
+
+---
+ libtransmission/quark.c        |   2 + 
+ libtransmission/quark.h        |   2 + 
+ libtransmission/rpc-server.c   | 116 +++++++++++++++++++++++++++++++++++++----
+ libtransmission/rpc-server.h   |   4 ++
+ libtransmission/session.c      |   2 + 
+ libtransmission/transmission.h |   1 + 
+ libtransmission/web.c          |   3 ++
+ 7 files changed, 121 insertions(+), 9 deletions(-)
+
+diff --git a/libtransmission/quark.c b/libtransmission/quark.c
+index 30cc2bca4..b4fd7aabd 100644
+--- a/libtransmission/quark.c
++++ b/libtransmission/quark.c
+@@ -289,6 +289,8 @@ static const struct tr_key_struct my_static[] =
+   { "rpc-authentication-required", 27 },
+   { "rpc-bind-address", 16 },
+   { "rpc-enabled", 11 },
++  { "rpc-host-whitelist", 18 },
++  { "rpc-host-whitelist-enabled", 26 },
+   { "rpc-password", 12 },
+   { "rpc-port", 8 },
+   { "rpc-url", 7 },
+diff --git a/libtransmission/quark.h b/libtransmission/quark.h
+index 7f5212733..17464be8f 100644
+--- a/libtransmission/quark.h
++++ b/libtransmission/quark.h
+@@ -291,6 +291,8 @@ enum
+   TR_KEY_rpc_authentication_required,
+   TR_KEY_rpc_bind_address,
+   TR_KEY_rpc_enabled,
++  TR_KEY_rpc_host_whitelist,
++  TR_KEY_rpc_host_whitelist_enabled,
+   TR_KEY_rpc_password,
+   TR_KEY_rpc_port,
+   TR_KEY_rpc_url,
+diff --git a/libtransmission/rpc-server.c b/libtransmission/rpc-server.c
+index a3485f3fa..292cd5fce 100644
+--- a/libtransmission/rpc-server.c
++++ b/libtransmission/rpc-server.c
+@@ -52,6 +52,7 @@ struct tr_rpc_server
+     bool               isEnabled;
+     bool               isPasswordEnabled;
+     bool               isWhitelistEnabled;
++    bool               isHostWhitelistEnabled;
+     tr_port            port;
+     char             * url;
+     struct in_addr     bindAddress;
+@@ -63,6 +64,7 @@ struct tr_rpc_server
+     char             * password;
+     char             * whitelistStr;
+     tr_list          * whitelist;
++    tr_list          * hostWhitelist;
+ 
+     char             * sessionId;
+     time_t             sessionIdExpiresAt;
+@@ -588,6 +590,49 @@ isAddressAllowed (const tr_rpc_server * server, const char * address)
+   return false;
+ }
+ 
++static bool isHostnameAllowed(tr_rpc_server const* server, struct evhttp_request* req)
++{
++    /* If password auth is enabled, any hostname is permitted. */
++    if (server->isPasswordEnabled)
++    {
++        return true;
++    }
++
++    char const* const host = evhttp_find_header(req->input_headers, "Host");
++
++    // If whitelist is disabled, no restrictions.
++    if (!server->isHostWhitelistEnabled)
++        return true;
++
++    /* No host header, invalid request. */
++    if (host == NULL)
++    {
++        return false;
++    }
++
++    /* Host header might include the port. */
++    char* const hostname = tr_strndup(host, strcspn(host, ":"));
++
++    /* localhost or ipaddress is always acceptable. */
++    if (strcmp(hostname, "localhost") == 0 || strcmp(hostname, "localhost.") == 0 || tr_addressIsIP(hostname))
++    {
++        tr_free(hostname);
++        return true;
++    }
++
++    /* Otherwise, hostname must be whitelisted. */
++    for (tr_list* l = server->hostWhitelist; l != NULL; l = l->next) {
++        if (tr_wildmat(hostname, l->data))
++        {
++            tr_free(hostname);
++            return true;
++        }
++    }
++
++    tr_free(hostname);
++    return false;
++}
++
+ static bool
+ test_session_id (struct tr_rpc_server * server, struct evhttp_request * req)
+ {
+@@ -663,6 +708,23 @@ handle_request (struct evhttp_request * req, void * arg)
+           handle_upload (req, server);
+         }
+ #ifdef REQUIRE_SESSION_ID
++        else if (!isHostnameAllowed(server, req))
++        {
++            char* tmp = tr_strdup_printf(
++                "<p>Transmission received your request, but the hostname was unrecognized.</p>"
++                "<p>To fix this, choose one of the following options:"
++                "<ul>"
++                "<li>Enable password authentication, then any hostname is allowed.</li>"
++                "<li>Add the hostname you want to use to the whitelist in settings.</li>"
++                "</ul></p>"
++                "<p>If you're editing settings.json, see the 'rpc-host-whitelist' and 'rpc-host-whitelist-enabled' entries.</p>"
++                "<p>This requirement has been added to help prevent "
++                "<a href=\"https://en.wikipedia.org/wiki/DNS_rebinding\">DNS Rebinding</a> "
++                "attacks.</p>");
++            send_simple_response(req, 421, tmp);
++            tr_free(tmp);
++        }
++
+       else if (!test_session_id (server, req))
+         {
+           const char * sessionId = get_current_session_id (server);
+@@ -674,7 +736,7 @@ handle_request (struct evhttp_request * req, void * arg)
+             "<li> When you get this 409 error message, resend your request with the updated header"
+             "</ol></p>"
+             "<p>This requirement has been added to help prevent "
+-            "<a href=\"http://en.wikipedia.org/wiki/Cross-site_request_forgery\">CSRF</a> "
++            "<a href=\"https://en.wikipedia.org/wiki/Cross-site_request_forgery\">CSRF</a> "
+             "attacks.</p>"
+             "<p><code>%s: %s</code></p>",
+             TR_RPC_SESSION_ID_HEADER, sessionId);
+@@ -875,19 +937,14 @@ tr_rpcGetUrl (const tr_rpc_server * server)
+   return server->url ? server->url : "";
+ }
+ 
+-void
+-tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr)
++static void
++tr_rpcSetList (char const* whitelistStr, tr_list** list)
+ {
+   void * tmp;
+   const char * walk;
+ 
+-  /* keep the string */
+-  tmp = server->whitelistStr;
+-  server->whitelistStr = tr_strdup (whitelistStr);
+-  tr_free (tmp);
+-
+   /* clear out the old whitelist entries */
+-  while ((tmp = tr_list_pop_front (&server->whitelist)))
++  while ((tmp = tr_list_pop_front (list)) != NULL)
+     tr_free (tmp);
+ 
+   /* build the new whitelist entries */
+@@ -896,7 +953,7 @@ tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr)
+       const char * delimiters = " ,;";
+       const size_t len = strcspn (walk, delimiters);
+       char * token = tr_strndup (walk, len);
+-      tr_list_append (&server->whitelist, token);
++      tr_list_append (list, token);
+       if (strcspn (token, "+-") < len)
+         tr_logAddNamedInfo (MY_NAME, "Adding address to whitelist: %s (And it has a '+' or '-'!  Are you using an old ACL by mistake?)", token);
+       else
+@@ -909,6 +966,21 @@ tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr)
+     }
+ }
+ 
++void tr_rpcSetHostWhitelist(tr_rpc_server* server, char const* whitelistStr)
++{
++    tr_rpcSetList(whitelistStr, &server->hostWhitelist);
++}
++
++void tr_rpcSetWhitelist(tr_rpc_server* server, char const* whitelistStr)
++{
++    /* keep the string */
++    char* const tmp = server->whitelistStr;
++    server->whitelistStr = tr_strdup(whitelistStr);
++    tr_free(tmp);
++
++    tr_rpcSetList(whitelistStr, &server->whitelist);
++}
++
+ const char*
+ tr_rpcGetWhitelist (const tr_rpc_server * server)
+ {
+@@ -930,6 +1002,11 @@ tr_rpcGetWhitelistEnabled (const tr_rpc_server * server)
+   return server->isWhitelistEnabled;
+ }
+ 
++void tr_rpcSetHostWhitelistEnabled(tr_rpc_server* server, bool isEnabled)
++{
++    server->isHostWhitelistEnabled = isEnabled;
++}
++
+ /****
+ *****  PASSWORD
+ ****/
+@@ -1063,6 +1140,28 @@ tr_rpcInit (tr_session  * session, tr_variant * settings)
+   else
+     tr_rpcSetWhitelistEnabled (s, boolVal);
+ 
++  key = TR_KEY_rpc_host_whitelist_enabled;
++
++  if (!tr_variantDictFindBool(settings, key, &boolVal))
++  {
++      missing_settings_key(key);
++  }
++  else
++  {
++      tr_rpcSetHostWhitelistEnabled(s, boolVal);
++  }
++
++  key = TR_KEY_rpc_host_whitelist;
++
++  if (!tr_variantDictFindStr(settings, key, &str, NULL) && str != NULL)
++  {
++      missing_settings_key(key);
++  }
++  else
++  {
++      tr_rpcSetHostWhitelist(s, str);
++  }
++
+   key = TR_KEY_rpc_authentication_required;
+   if (!tr_variantDictFindBool (settings, key, &boolVal))
+     missing_settings_key (key);
+diff --git a/libtransmission/rpc-server.h b/libtransmission/rpc-server.h
+index e0302c5ea..8c9e6b24e 100644
+--- a/libtransmission/rpc-server.h
++++ b/libtransmission/rpc-server.h
+@@ -49,6 +49,10 @@ void            tr_rpcSetWhitelist (tr_rpc_server * server,
+ 
+ const char*     tr_rpcGetWhitelist (const tr_rpc_server * server);
+ 
++void tr_rpcSetHostWhitelistEnabled(tr_rpc_server* server, bool isEnabled);
++
++void tr_rpcSetHostWhitelist(tr_rpc_server* server, char const* whitelist);
++
+ void            tr_rpcSetPassword (tr_rpc_server * server,
+                                    const char *    password);
+ 
+diff --git a/libtransmission/session.c b/libtransmission/session.c
+index 844cadba8..58b717913 100644
+--- a/libtransmission/session.c
++++ b/libtransmission/session.c
+@@ -359,6 +359,8 @@ tr_sessionGetDefaultSettings (tr_variant * d)
+   tr_variantDictAddStr  (d, TR_KEY_rpc_username,                    "");
+   tr_variantDictAddStr  (d, TR_KEY_rpc_whitelist,                   TR_DEFAULT_RPC_WHITELIST);
+   tr_variantDictAddBool (d, TR_KEY_rpc_whitelist_enabled,           true);
++  tr_variantDictAddStr(d, TR_KEY_rpc_host_whitelist, TR_DEFAULT_RPC_HOST_WHITELIST);
++  tr_variantDictAddBool(d, TR_KEY_rpc_host_whitelist_enabled, true);
+   tr_variantDictAddInt  (d, TR_KEY_rpc_port,                        atoi (TR_DEFAULT_RPC_PORT_STR));
+   tr_variantDictAddStr  (d, TR_KEY_rpc_url,                         TR_DEFAULT_RPC_URL_STR);
+   tr_variantDictAddBool (d, TR_KEY_scrape_paused_torrents_enabled,  true);
+diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
+index 4f76adfd6..e213a8f4e 100644
+--- a/libtransmission/transmission.h
++++ b/libtransmission/transmission.h
+@@ -123,6 +123,7 @@ const char* tr_getDefaultDownloadDir (void);
+ #define TR_DEFAULT_BIND_ADDRESS_IPV4        "0.0.0.0"
+ #define TR_DEFAULT_BIND_ADDRESS_IPV6             "::"
+ #define TR_DEFAULT_RPC_WHITELIST          "127.0.0.1"
++#define TR_DEFAULT_RPC_HOST_WHITELIST              ""
+ #define TR_DEFAULT_RPC_PORT_STR                "9091"
+ #define TR_DEFAULT_RPC_URL_STR       "/transmission/"
+ #define TR_DEFAULT_PEER_PORT_STR              "51413"
+diff --git a/libtransmission/web.c b/libtransmission/web.c
+index ee495e9fc..c7f062730 100644
+--- a/libtransmission/web.c
++++ b/libtransmission/web.c
+@@ -594,6 +594,7 @@ tr_webGetResponseStr (long code)
+       case 415: return "Unsupported Media Type";
+       case 416: return "Requested Range Not Satisfiable";
+       case 417: return "Expectation Failed";
++      case 421: return "Misdirected Request";
+       case 500: return "Internal Server Error";
+       case 501: return "Not Implemented";
+       case 502: return "Bad Gateway";
diff --git a/transmission-gtk/Pkgfile b/transmission-gtk/Pkgfile
index db2948cbf..9a278f13a 100644
--- a/transmission-gtk/Pkgfile
+++ b/transmission-gtk/Pkgfile
@@ -5,12 +5,17 @@
 
 name=transmission-gtk
 version=2.92
-release=1
-source=(https://github.com/transmission/transmission-releases/raw/master/transmission-$version.tar.xz)
+release=2
+source=(https://github.com/transmission/transmission-releases/raw/master/transmission-$version.tar.xz
+        CVE-2018-5702.patch)
 
 build() {
     cd transmission-$version
 
+    patch -p1 -i $SRC/CVE-2018-5702.patch
+
+    export LINGUAS=" "
+
     ./configure --prefix=/usr \
                 --with-gtk \
                 --disable-cli \
@@ -20,5 +25,5 @@ build() {
 
     sed -ri '/\[.+\]=/d' $PKG/usr/share/applications/transmission-gtk.desktop
     rm $PKG/usr/{bin,share/man/man1}/transmission-{create,edit,show}*
-    rm -r $PKG/usr/share/{locale,transmission}
+    rm -r $PKG/usr/share/transmission
 }

From crux at crux.nu  Wed Jan 17 13:26:18 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed, 17 Jan 2018 13:26:18 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): [notify] transmisson: security fix
 for CVE-2018-5702, closes FS#1557
Message-ID: <20180117132618.7E7DF1802D5@crux.nu>

commit 0a5c69a14c7be9045a8eb57e1ac1a369eba4dd34
Author: Juergen Daubert <jue at jue.li>
Date:   Wed Jan 17 14:22:54 2018 +0100

    [notify] transmisson: security fix for CVE-2018-5702, closes FS#1557
    
    see
    - https://github.com/transmission/transmission/pull/468
    - https://www.cvedetails.com/cve/CVE-2018-5702/

diff --git a/transmission/.md5sum b/transmission/.md5sum
index abd556831..35b9598b9 100644
--- a/transmission/.md5sum
+++ b/transmission/.md5sum
@@ -1 +1,2 @@
+7d60fa6b8ec69d27503c4f61922b3aba  CVE-2018-5702.patch
 3fce404a436e3cd7fde80fb6ed61c264  transmission-2.92.tar.xz
diff --git a/transmission/.signature b/transmission/.signature
index 6ee834ff1..56b77e940 100644
--- a/transmission/.signature
+++ b/transmission/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/c8mQL0Y04sEkYmLR4URgp97+a8nqLLvaqrU9BkXRSPlzo3cKLD07HO3rms0QmqNrmmxBpqD6/fEZRaSYX9TVAs=
-SHA256 (Pkgfile) = 726d88f3c22e6e4407d53a552407ac176373ccd416a7fc5f8146038c16dfbce2
+RWSE3ohX2g5d/T7ZPrdrfFR6Tg7QKJwzvE8lyuVRtomlS4r7krZfhj9X0JDKsxaE/nmwWKV1PCqax72aVFr9zn8OqCFNR2EJqgU=
+SHA256 (Pkgfile) = 9e160f363f1dd403c633094632c2b99d94fd25c0f8abbb60129e0941064407e9
 SHA256 (.footprint) = e366ff7971b7fce0a0e6b44521fecdeb5b7baa20d56f25250ae8edc3ac88b1bf
 SHA256 (transmission-2.92.tar.xz) = 3a8d045c306ad9acb7bf81126939b9594553a388482efa0ec1bfb67b22acd35f
+SHA256 (CVE-2018-5702.patch) = eae7fc4b93b4be760c4d3277ff75b39573cc9e0e4eb851d12269ea004f46c54a
diff --git a/transmission/CVE-2018-5702.patch b/transmission/CVE-2018-5702.patch
new file mode 100644
index 000000000..a3a0cf160
--- /dev/null
+++ b/transmission/CVE-2018-5702.patch
@@ -0,0 +1,302 @@
+Fix a weakness that allows remote code execution via the Transmission
+RPC server using DNS rebinding:
+
+https://bugs.chromium.org/p/project-zero/issues/detail?id=1447
+
+Patch adapted from Tavis Ormandy's patch on the Transmission master
+branch to the Transmission 2.92 release by Leo Famulari
+<leo at famulari.name>:
+
+https://github.com/transmission/transmission/pull/468/commits
+
+From fe2d3c6e75088f3d9b6040ce06da3d530358bc2f Mon Sep 17 00:00:00 2001
+From: Tavis Ormandy <taviso at google.com>
+Date: Thu, 11 Jan 2018 10:00:41 -0800
+Subject: [PATCH] mitigate dns rebinding attacks against daemon
+
+---
+ libtransmission/quark.c        |   2 + 
+ libtransmission/quark.h        |   2 + 
+ libtransmission/rpc-server.c   | 116 +++++++++++++++++++++++++++++++++++++----
+ libtransmission/rpc-server.h   |   4 ++
+ libtransmission/session.c      |   2 + 
+ libtransmission/transmission.h |   1 + 
+ libtransmission/web.c          |   3 ++
+ 7 files changed, 121 insertions(+), 9 deletions(-)
+
+diff --git a/libtransmission/quark.c b/libtransmission/quark.c
+index 30cc2bca4..b4fd7aabd 100644
+--- a/libtransmission/quark.c
++++ b/libtransmission/quark.c
+@@ -289,6 +289,8 @@ static const struct tr_key_struct my_static[] =
+   { "rpc-authentication-required", 27 },
+   { "rpc-bind-address", 16 },
+   { "rpc-enabled", 11 },
++  { "rpc-host-whitelist", 18 },
++  { "rpc-host-whitelist-enabled", 26 },
+   { "rpc-password", 12 },
+   { "rpc-port", 8 },
+   { "rpc-url", 7 },
+diff --git a/libtransmission/quark.h b/libtransmission/quark.h
+index 7f5212733..17464be8f 100644
+--- a/libtransmission/quark.h
++++ b/libtransmission/quark.h
+@@ -291,6 +291,8 @@ enum
+   TR_KEY_rpc_authentication_required,
+   TR_KEY_rpc_bind_address,
+   TR_KEY_rpc_enabled,
++  TR_KEY_rpc_host_whitelist,
++  TR_KEY_rpc_host_whitelist_enabled,
+   TR_KEY_rpc_password,
+   TR_KEY_rpc_port,
+   TR_KEY_rpc_url,
+diff --git a/libtransmission/rpc-server.c b/libtransmission/rpc-server.c
+index a3485f3fa..292cd5fce 100644
+--- a/libtransmission/rpc-server.c
++++ b/libtransmission/rpc-server.c
+@@ -52,6 +52,7 @@ struct tr_rpc_server
+     bool               isEnabled;
+     bool               isPasswordEnabled;
+     bool               isWhitelistEnabled;
++    bool               isHostWhitelistEnabled;
+     tr_port            port;
+     char             * url;
+     struct in_addr     bindAddress;
+@@ -63,6 +64,7 @@ struct tr_rpc_server
+     char             * password;
+     char             * whitelistStr;
+     tr_list          * whitelist;
++    tr_list          * hostWhitelist;
+ 
+     char             * sessionId;
+     time_t             sessionIdExpiresAt;
+@@ -588,6 +590,49 @@ isAddressAllowed (const tr_rpc_server * server, const char * address)
+   return false;
+ }
+ 
++static bool isHostnameAllowed(tr_rpc_server const* server, struct evhttp_request* req)
++{
++    /* If password auth is enabled, any hostname is permitted. */
++    if (server->isPasswordEnabled)
++    {
++        return true;
++    }
++
++    char const* const host = evhttp_find_header(req->input_headers, "Host");
++
++    // If whitelist is disabled, no restrictions.
++    if (!server->isHostWhitelistEnabled)
++        return true;
++
++    /* No host header, invalid request. */
++    if (host == NULL)
++    {
++        return false;
++    }
++
++    /* Host header might include the port. */
++    char* const hostname = tr_strndup(host, strcspn(host, ":"));
++
++    /* localhost or ipaddress is always acceptable. */
++    if (strcmp(hostname, "localhost") == 0 || strcmp(hostname, "localhost.") == 0 || tr_addressIsIP(hostname))
++    {
++        tr_free(hostname);
++        return true;
++    }
++
++    /* Otherwise, hostname must be whitelisted. */
++    for (tr_list* l = server->hostWhitelist; l != NULL; l = l->next) {
++        if (tr_wildmat(hostname, l->data))
++        {
++            tr_free(hostname);
++            return true;
++        }
++    }
++
++    tr_free(hostname);
++    return false;
++}
++
+ static bool
+ test_session_id (struct tr_rpc_server * server, struct evhttp_request * req)
+ {
+@@ -663,6 +708,23 @@ handle_request (struct evhttp_request * req, void * arg)
+           handle_upload (req, server);
+         }
+ #ifdef REQUIRE_SESSION_ID
++        else if (!isHostnameAllowed(server, req))
++        {
++            char* tmp = tr_strdup_printf(
++                "<p>Transmission received your request, but the hostname was unrecognized.</p>"
++                "<p>To fix this, choose one of the following options:"
++                "<ul>"
++                "<li>Enable password authentication, then any hostname is allowed.</li>"
++                "<li>Add the hostname you want to use to the whitelist in settings.</li>"
++                "</ul></p>"
++                "<p>If you're editing settings.json, see the 'rpc-host-whitelist' and 'rpc-host-whitelist-enabled' entries.</p>"
++                "<p>This requirement has been added to help prevent "
++                "<a href=\"https://en.wikipedia.org/wiki/DNS_rebinding\">DNS Rebinding</a> "
++                "attacks.</p>");
++            send_simple_response(req, 421, tmp);
++            tr_free(tmp);
++        }
++
+       else if (!test_session_id (server, req))
+         {
+           const char * sessionId = get_current_session_id (server);
+@@ -674,7 +736,7 @@ handle_request (struct evhttp_request * req, void * arg)
+             "<li> When you get this 409 error message, resend your request with the updated header"
+             "</ol></p>"
+             "<p>This requirement has been added to help prevent "
+-            "<a href=\"http://en.wikipedia.org/wiki/Cross-site_request_forgery\">CSRF</a> "
++            "<a href=\"https://en.wikipedia.org/wiki/Cross-site_request_forgery\">CSRF</a> "
+             "attacks.</p>"
+             "<p><code>%s: %s</code></p>",
+             TR_RPC_SESSION_ID_HEADER, sessionId);
+@@ -875,19 +937,14 @@ tr_rpcGetUrl (const tr_rpc_server * server)
+   return server->url ? server->url : "";
+ }
+ 
+-void
+-tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr)
++static void
++tr_rpcSetList (char const* whitelistStr, tr_list** list)
+ {
+   void * tmp;
+   const char * walk;
+ 
+-  /* keep the string */
+-  tmp = server->whitelistStr;
+-  server->whitelistStr = tr_strdup (whitelistStr);
+-  tr_free (tmp);
+-
+   /* clear out the old whitelist entries */
+-  while ((tmp = tr_list_pop_front (&server->whitelist)))
++  while ((tmp = tr_list_pop_front (list)) != NULL)
+     tr_free (tmp);
+ 
+   /* build the new whitelist entries */
+@@ -896,7 +953,7 @@ tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr)
+       const char * delimiters = " ,;";
+       const size_t len = strcspn (walk, delimiters);
+       char * token = tr_strndup (walk, len);
+-      tr_list_append (&server->whitelist, token);
++      tr_list_append (list, token);
+       if (strcspn (token, "+-") < len)
+         tr_logAddNamedInfo (MY_NAME, "Adding address to whitelist: %s (And it has a '+' or '-'!  Are you using an old ACL by mistake?)", token);
+       else
+@@ -909,6 +966,21 @@ tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr)
+     }
+ }
+ 
++void tr_rpcSetHostWhitelist(tr_rpc_server* server, char const* whitelistStr)
++{
++    tr_rpcSetList(whitelistStr, &server->hostWhitelist);
++}
++
++void tr_rpcSetWhitelist(tr_rpc_server* server, char const* whitelistStr)
++{
++    /* keep the string */
++    char* const tmp = server->whitelistStr;
++    server->whitelistStr = tr_strdup(whitelistStr);
++    tr_free(tmp);
++
++    tr_rpcSetList(whitelistStr, &server->whitelist);
++}
++
+ const char*
+ tr_rpcGetWhitelist (const tr_rpc_server * server)
+ {
+@@ -930,6 +1002,11 @@ tr_rpcGetWhitelistEnabled (const tr_rpc_server * server)
+   return server->isWhitelistEnabled;
+ }
+ 
++void tr_rpcSetHostWhitelistEnabled(tr_rpc_server* server, bool isEnabled)
++{
++    server->isHostWhitelistEnabled = isEnabled;
++}
++
+ /****
+ *****  PASSWORD
+ ****/
+@@ -1063,6 +1140,28 @@ tr_rpcInit (tr_session  * session, tr_variant * settings)
+   else
+     tr_rpcSetWhitelistEnabled (s, boolVal);
+ 
++  key = TR_KEY_rpc_host_whitelist_enabled;
++
++  if (!tr_variantDictFindBool(settings, key, &boolVal))
++  {
++      missing_settings_key(key);
++  }
++  else
++  {
++      tr_rpcSetHostWhitelistEnabled(s, boolVal);
++  }
++
++  key = TR_KEY_rpc_host_whitelist;
++
++  if (!tr_variantDictFindStr(settings, key, &str, NULL) && str != NULL)
++  {
++      missing_settings_key(key);
++  }
++  else
++  {
++      tr_rpcSetHostWhitelist(s, str);
++  }
++
+   key = TR_KEY_rpc_authentication_required;
+   if (!tr_variantDictFindBool (settings, key, &boolVal))
+     missing_settings_key (key);
+diff --git a/libtransmission/rpc-server.h b/libtransmission/rpc-server.h
+index e0302c5ea..8c9e6b24e 100644
+--- a/libtransmission/rpc-server.h
++++ b/libtransmission/rpc-server.h
+@@ -49,6 +49,10 @@ void            tr_rpcSetWhitelist (tr_rpc_server * server,
+ 
+ const char*     tr_rpcGetWhitelist (const tr_rpc_server * server);
+ 
++void tr_rpcSetHostWhitelistEnabled(tr_rpc_server* server, bool isEnabled);
++
++void tr_rpcSetHostWhitelist(tr_rpc_server* server, char const* whitelist);
++
+ void            tr_rpcSetPassword (tr_rpc_server * server,
+                                    const char *    password);
+ 
+diff --git a/libtransmission/session.c b/libtransmission/session.c
+index 844cadba8..58b717913 100644
+--- a/libtransmission/session.c
++++ b/libtransmission/session.c
+@@ -359,6 +359,8 @@ tr_sessionGetDefaultSettings (tr_variant * d)
+   tr_variantDictAddStr  (d, TR_KEY_rpc_username,                    "");
+   tr_variantDictAddStr  (d, TR_KEY_rpc_whitelist,                   TR_DEFAULT_RPC_WHITELIST);
+   tr_variantDictAddBool (d, TR_KEY_rpc_whitelist_enabled,           true);
++  tr_variantDictAddStr(d, TR_KEY_rpc_host_whitelist, TR_DEFAULT_RPC_HOST_WHITELIST);
++  tr_variantDictAddBool(d, TR_KEY_rpc_host_whitelist_enabled, true);
+   tr_variantDictAddInt  (d, TR_KEY_rpc_port,                        atoi (TR_DEFAULT_RPC_PORT_STR));
+   tr_variantDictAddStr  (d, TR_KEY_rpc_url,                         TR_DEFAULT_RPC_URL_STR);
+   tr_variantDictAddBool (d, TR_KEY_scrape_paused_torrents_enabled,  true);
+diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
+index 4f76adfd6..e213a8f4e 100644
+--- a/libtransmission/transmission.h
++++ b/libtransmission/transmission.h
+@@ -123,6 +123,7 @@ const char* tr_getDefaultDownloadDir (void);
+ #define TR_DEFAULT_BIND_ADDRESS_IPV4        "0.0.0.0"
+ #define TR_DEFAULT_BIND_ADDRESS_IPV6             "::"
+ #define TR_DEFAULT_RPC_WHITELIST          "127.0.0.1"
++#define TR_DEFAULT_RPC_HOST_WHITELIST              ""
+ #define TR_DEFAULT_RPC_PORT_STR                "9091"
+ #define TR_DEFAULT_RPC_URL_STR       "/transmission/"
+ #define TR_DEFAULT_PEER_PORT_STR              "51413"
+diff --git a/libtransmission/web.c b/libtransmission/web.c
+index ee495e9fc..c7f062730 100644
+--- a/libtransmission/web.c
++++ b/libtransmission/web.c
+@@ -594,6 +594,7 @@ tr_webGetResponseStr (long code)
+       case 415: return "Unsupported Media Type";
+       case 416: return "Requested Range Not Satisfiable";
+       case 417: return "Expectation Failed";
++      case 421: return "Misdirected Request";
+       case 500: return "Internal Server Error";
+       case 501: return "Not Implemented";
+       case 502: return "Bad Gateway";
diff --git a/transmission/Pkgfile b/transmission/Pkgfile
index 27279f963..5b6566ded 100644
--- a/transmission/Pkgfile
+++ b/transmission/Pkgfile
@@ -5,12 +5,15 @@
 
 name=transmission
 version=2.92
-release=1
-source=(https://github.com/transmission/transmission-releases/raw/master/transmission-$version.tar.xz)
+release=2
+source=(https://github.com/transmission/transmission-releases/raw/master/transmission-$version.tar.xz
+        CVE-2018-5702.patch)
 
 build() {
     cd $name-$version
 
+    patch -p1 -i $SRC/CVE-2018-5702.patch
+
     ./configure --prefix=/usr \
                 --disable-nls \
                 --enable-cli \

From crux at crux.nu  Wed Jan 17 13:26:18 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed, 17 Jan 2018 13:26:18 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): cups-filters: update to 1.19.0
Message-ID: <20180117132618.81D191802D8@crux.nu>

commit c681f1f5dc6acfa5ed4aee8d012af898836bfc5b
Author: Juergen Daubert <jue at jue.li>
Date:   Wed Jan 17 14:13:09 2018 +0100

    cups-filters: update to 1.19.0

diff --git a/cups-filters/.md5sum b/cups-filters/.md5sum
index fd5e5d4b9..665d7870a 100644
--- a/cups-filters/.md5sum
+++ b/cups-filters/.md5sum
@@ -1,2 +1,2 @@
 7540a6989be0042429f41770b1cdf215  cups-browsed
-02f2af4cbad90f060b0d83fa971c43b9  cups-filters-1.18.0.tar.xz
+3571e4d6e06d3f943943615fe2dcf31b  cups-filters-1.19.0.tar.xz
diff --git a/cups-filters/.signature b/cups-filters/.signature
index c41bb86a9..f465b7e5f 100644
--- a/cups-filters/.signature
+++ b/cups-filters/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/ZKw4SdRHk+6QBP7JJ8Vol+b9BR34fINFU+4nzB2MsDJu8vhDRH9G7m02ukaNZTy2V60+zuSQG1LkfoAWyqLPgI=
-SHA256 (Pkgfile) = 92446bf6f33d4116dd109f98527ad249d1520d1c604590bff46cccaa84db6563
+RWSE3ohX2g5d/Uaof41lkd6C+F0/9jV+SuQPfykuizrQUypVQbzE/tlc8iWzutG1J4G5ayT9gJN4PC6jowXZfKCTjC9RRt21uQ4=
+SHA256 (Pkgfile) = 88257db8e7bb8422a880a662245e4963c7853806c17a178d6dbef7bb7ed04a38
 SHA256 (.footprint) = 32c7827b0a711a571ef4e2b7eb7812ed42a3b8f8e590cdbe949fa60a5b3978d5
-SHA256 (cups-filters-1.18.0.tar.xz) = 57a6d982085031aeacafcb463fa95861943c2dda6ce395fcd85dec3d14f4a2b8
+SHA256 (cups-filters-1.19.0.tar.xz) = 629705414869b0b0f45bdadea5c4ea803d55605442e09cce22c91cfb308d6b56
 SHA256 (cups-browsed) = 4c4900ee88d488078da20a5cabc949921382fa69bc28bb2a7f89fa5ae01afb5b
diff --git a/cups-filters/Pkgfile b/cups-filters/Pkgfile
index 48bcb6b88..70cc01d41 100644
--- a/cups-filters/Pkgfile
+++ b/cups-filters/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  ghostscript poppler qpdf mupdf
 
 name=cups-filters
-version=1.18.0
+version=1.19.0
 release=1
 source=(https://www.openprinting.org/download/$name/$name-$version.tar.xz
         cups-browsed)
@@ -18,7 +18,6 @@ build () {
                 --disable-avahi \
                 --disable-dbus \
                 --disable-braille \
-                --disable-pclm \
                 --without-rcdir \
                 --with-browseremoteprotocols=cups 
 

From crux at crux.nu  Wed Jan 17 13:26:18 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed, 17 Jan 2018 13:26:18 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): jdk: update to 1.8.0_162
Message-ID: <20180117132618.864961802DA@crux.nu>

commit f6e80bbe743c1fdc0d1d90a36451ff132b13fad7
Author: Juergen Daubert <jue at jue.li>
Date:   Wed Jan 17 14:12:43 2018 +0100

    jdk: update to 1.8.0_162

diff --git a/jdk/.footprint b/jdk/.footprint
index c677ec671..d9e0451dc 100644
--- a/jdk/.footprint
+++ b/jdk/.footprint
@@ -68,24 +68,14 @@ drwxr-xr-x	root/root	usr/lib/jdk/db/
 -rw-r--r--	root/root	usr/lib/jdk/db/RELEASE-NOTES.html
 drwxr-xr-x	root/root	usr/lib/jdk/db/bin/
 -rwxr-xr-x	root/root	usr/lib/jdk/db/bin/NetworkServerControl
--rwxr-xr-x	root/root	usr/lib/jdk/db/bin/NetworkServerControl.bat
 -rwxr-xr-x	root/root	usr/lib/jdk/db/bin/dblook
--rwxr-xr-x	root/root	usr/lib/jdk/db/bin/dblook.bat
--rwxr-xr-x	root/root	usr/lib/jdk/db/bin/derby_common.bat
 -rwxr-xr-x	root/root	usr/lib/jdk/db/bin/ij
--rwxr-xr-x	root/root	usr/lib/jdk/db/bin/ij.bat
 -rwxr-xr-x	root/root	usr/lib/jdk/db/bin/setEmbeddedCP
--rwxr-xr-x	root/root	usr/lib/jdk/db/bin/setEmbeddedCP.bat
 -rwxr-xr-x	root/root	usr/lib/jdk/db/bin/setNetworkClientCP
--rwxr-xr-x	root/root	usr/lib/jdk/db/bin/setNetworkClientCP.bat
 -rwxr-xr-x	root/root	usr/lib/jdk/db/bin/setNetworkServerCP
--rwxr-xr-x	root/root	usr/lib/jdk/db/bin/setNetworkServerCP.bat
 -rwxr-xr-x	root/root	usr/lib/jdk/db/bin/startNetworkServer
--rwxr-xr-x	root/root	usr/lib/jdk/db/bin/startNetworkServer.bat
 -rwxr-xr-x	root/root	usr/lib/jdk/db/bin/stopNetworkServer
--rwxr-xr-x	root/root	usr/lib/jdk/db/bin/stopNetworkServer.bat
 -rwxr-xr-x	root/root	usr/lib/jdk/db/bin/sysinfo
--rwxr-xr-x	root/root	usr/lib/jdk/db/bin/sysinfo.bat
 drwxr-xr-x	root/root	usr/lib/jdk/db/lib/
 -rw-r--r--	root/root	usr/lib/jdk/db/lib/derby.jar
 -rw-r--r--	root/root	usr/lib/jdk/db/lib/derby.war
@@ -130,7 +120,9 @@ drwxr-xr-x	root/root	usr/lib/jdk/jre/lib/amd64/jli/
 -rwxr-xr-x	root/root	usr/lib/jdk/jre/lib/amd64/libavplugin-54.so
 -rwxr-xr-x	root/root	usr/lib/jdk/jre/lib/amd64/libavplugin-55.so
 -rwxr-xr-x	root/root	usr/lib/jdk/jre/lib/amd64/libavplugin-56.so
+-rwxr-xr-x	root/root	usr/lib/jdk/jre/lib/amd64/libavplugin-57.so
 -rwxr-xr-x	root/root	usr/lib/jdk/jre/lib/amd64/libavplugin-ffmpeg-56.so
+-rwxr-xr-x	root/root	usr/lib/jdk/jre/lib/amd64/libavplugin-ffmpeg-57.so
 -rwxr-xr-x	root/root	usr/lib/jdk/jre/lib/amd64/libawt.so
 -rwxr-xr-x	root/root	usr/lib/jdk/jre/lib/amd64/libawt_headless.so
 -rwxr-xr-x	root/root	usr/lib/jdk/jre/lib/amd64/libawt_xawt.so
diff --git a/jdk/.md5sum b/jdk/.md5sum
index abd40c0ad..795a99ee0 100644
--- a/jdk/.md5sum
+++ b/jdk/.md5sum
@@ -1 +1 @@
-20dddd28ced3179685a5f58d3fcbecd8  jdk-8u152-linux-x64.tar.gz
+781e3779f0c134fb548bde8b8e715e90  jdk-8u162-linux-x64.tar.gz
diff --git a/jdk/.signature b/jdk/.signature
index 1c1c88680..fa7b0f392 100644
--- a/jdk/.signature
+++ b/jdk/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/fjPJMZoFoW7ywBBGpQJHFwBY8yn80XLsrgqCOhxpMpUikVY9im2ClBACKE6EfXCfoAiVVpQv87mMx6EXNgaqw4=
-SHA256 (Pkgfile) = be0069b3cf8fd90570fe593f7668a36f82fe07b1cca7c671b4993132de308012
-SHA256 (.footprint) = b5bbef95a07c59bce054331d7f4d9004e156293d44b03d97adf0b71943802893
-SHA256 (jdk-8u152-linux-x64.tar.gz) = 218b3b340c3f6d05d940b817d0270dfe0cfd657a636bad074dcabe0c111961bf
+RWSE3ohX2g5d/YpPaY9j6IpNeqxkTBRodKwvntqyT4x9Da2PGb1tvaRW0lf7dbRbSgHC4C1sjBa1Knlf1BV7N/s+6YltRoRi1ws=
+SHA256 (Pkgfile) = 239f191dd471ecc74a911ba452b391a5c7880d39230e572d4419478b70c51c09
+SHA256 (.footprint) = 11c6840cee97b9f2c105a25bfcf44a6f232d401c13eeff3972683e02772993ce
+SHA256 (jdk-8u162-linux-x64.tar.gz) = 68ec82d47fd9c2b8eb84225b6db398a72008285fafc98631b1ff8d2229680257
diff --git a/jdk/Pkgfile b/jdk/Pkgfile
index b1577a162..1f66a5286 100644
--- a/jdk/Pkgfile
+++ b/jdk/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer: CRUX System Team, core-ports at crux dot nu
 
 name=jdk
-version=1.8.0_152
+version=1.8.0_162
 release=1
 source=(file:///$name-8u${version##*_}-linux-x64.tar.gz)
 

From crux at crux.nu  Wed Jan 17 13:26:18 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed, 17 Jan 2018 13:26:18 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): jre: update to 1.8.0_162
Message-ID: <20180117132618.89892180309@crux.nu>

commit adcfaae94d537cd9e49a64c62b0374e72976dd36
Author: Juergen Daubert <jue at jue.li>
Date:   Wed Jan 17 14:11:47 2018 +0100

    jre: update to 1.8.0_162

diff --git a/jre/.md5sum b/jre/.md5sum
index dfa8d46d5..8f048cfba 100644
--- a/jre/.md5sum
+++ b/jre/.md5sum
@@ -1 +1 @@
-32c9a36d3869b13db18e8bd5bfc14dcb  jre-8u152-linux-x64.tar.gz
+f013f8c00d7bfe1e5f0b6b94fb660ea7  jre-8u162-linux-x64.tar.gz
diff --git a/jre/.signature b/jre/.signature
index 5cfe27a67..b2eeaf847 100644
--- a/jre/.signature
+++ b/jre/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/fKeTYzRY3fyAiNTjXmYIaZaeONj4hFHFoeiwNGJDT6bhJMumfIBSfVrVg3wk2UaogQKze76lkuE1Y0Sj+w+xws=
-SHA256 (Pkgfile) = 20b80ef7d132b6260330b31ab2ad7f4eaf4cf4b8f9adf6b117ce947fdef6614c
+RWSE3ohX2g5d/X96bASUQ+wneU3LJUhnB8huFjuLB2zY2Si+GbJQX3kk9sGWfb8Ps8giYFs6qqzK/MfnDu7SwM52rqieRVjxgwM=
+SHA256 (Pkgfile) = 05f26c880bdcb1173b3af625c392f8cf292b546797fc5ed35f9e46dfd62e0e0d
 SHA256 (.footprint) = d53169d2c96638760f9f3348baf15873a87cf1b7b36017b277aaa73ac1881c7c
-SHA256 (jre-8u152-linux-x64.tar.gz) = ed04ffbf8050a69b15f02c51a2cae8e0de9362e7f6fe8995b1c39c613fc20ede
+SHA256 (jre-8u162-linux-x64.tar.gz) = dfa25ebd1f90bf74ad7ba2dacb0e08d884594e733c9a522b58256778031341a4
diff --git a/jre/Pkgfile b/jre/Pkgfile
index 87444231a..fead0c3e8 100644
--- a/jre/Pkgfile
+++ b/jre/Pkgfile
@@ -4,7 +4,7 @@
 # Packager:    Simone Rota, sip at crux dot nu
 
 name=jre
-version=1.8.0_152
+version=1.8.0_162
 release=1
 source=(file:///$name-8u${version#*_}-linux-x64.tar.gz)
 

From crux at crux.nu  Wed Jan 17 13:26:25 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed, 17 Jan 2018 13:26:25 +0000 (UTC)
Subject: [crux-commits] ports/core (3.3): sudo: update to 1.8.22
Message-ID: <20180117132626.000C3180309@crux.nu>

commit 0851daaa17fd7a78102cde56c981488d6333900a
Author: Juergen Daubert <jue at jue.li>
Date:   Wed Jan 17 14:11:07 2018 +0100

    sudo: update to 1.8.22

diff --git a/sudo/.footprint b/sudo/.footprint
index 9673170a..f03c8053 100644
--- a/sudo/.footprint
+++ b/sudo/.footprint
@@ -30,6 +30,7 @@ drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man5/
 -rw-r--r--	root/root	usr/share/man/man5/sudo.conf.5.gz
 -rw-r--r--	root/root	usr/share/man/man5/sudoers.5.gz
+-rw-r--r--	root/root	usr/share/man/man5/sudoers_timestamp.5.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
 -rw-r--r--	root/root	usr/share/man/man8/sudo.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/sudo_plugin.8.gz
diff --git a/sudo/.md5sum b/sudo/.md5sum
index c1dbdc3f..5364546b 100644
--- a/sudo/.md5sum
+++ b/sudo/.md5sum
@@ -1 +1 @@
-cd3993d910c713ae72e94beebd230b22  sudo-1.8.21p2.tar.gz
+24abdea48db4c5abcd410167c801cc8c  sudo-1.8.22.tar.gz
diff --git a/sudo/.signature b/sudo/.signature
index 01a76b38..1cc0c5b7 100644
--- a/sudo/.signature
+++ b/sudo/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqiOprJLGxC66NmAENoXNr1ilCRQquLv+1nI8+WT35iWYva1qMJWopzDJ3q5Yt/n1HGWZaeekWFfe96WGfXsPzwE=
-SHA256 (Pkgfile) = fe9b70ce8d896e4bfc2c9e696ba76a9a38d84a680532cc2df572e0ff8efde94d
-SHA256 (.footprint) = 3ee5df8661994970c00a0d7f58b133b9a0c4ae93572ce2b5a40f1199fd639955
-SHA256 (sudo-1.8.21p2.tar.gz) = 74c5746cd33a814e2431c39faf0d76f7f8a697379bd073862e3b156cf0d76368
+RWRJc1FUaeVeqoJItXfsnxHccYe6mqPUSsoQzcGZ0USYjzkH8PIMNrsT2905dAxPjNOdCO6VY+1utZ7qDPoHUcn5z67+AqnyOQ4=
+SHA256 (Pkgfile) = 06dd6adc5b09c73f95f69909e2704a30b27da97a6d6a85b464e7fccc45da6f27
+SHA256 (.footprint) = 559564852fa188cb5de235db0c4c1b3d58299a224bbaf77664a2e0939e19ddbd
+SHA256 (sudo-1.8.22.tar.gz) = 7256cb27c20883b14360eddbd17f98922073d104b214cf65aeacf1d9c9b9fd02
diff --git a/sudo/Pkgfile b/sudo/Pkgfile
index 20b30c44..15e85730 100644
--- a/sudo/Pkgfile
+++ b/sudo/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  zlib
 
 name=sudo
-version=1.8.21p2
+version=1.8.22
 release=1
 source=(http://www.sudo.ws/$name/dist/$name-$version.tar.gz)
 

From crux at crux.nu  Wed Jan 17 13:26:26 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed, 17 Jan 2018 13:26:26 +0000 (UTC)
Subject: [crux-commits] ports/core (3.3): [notify] rsync: update to
 3.1.3pre1, closes FS#1558
Message-ID: <20180117132626.035EB180311@crux.nu>

commit 845fdf2bb18f120b6839b34e8c125b68fc338b2c
Author: Juergen Daubert <jue at jue.li>
Date:   Wed Jan 17 14:04:04 2018 +0100

    [notify] rsync: update to 3.1.3pre1, closes FS#1558
    
    includes security fixes for CVE-2017-{16548,17433,17434}, see
    - https://download.samba.org/pub/rsync/src-previews/rsync-3.1.3pre1-NEWS
    - https://www.cvedetails.com/vulnerability-list/vendor_id-102/product_id-13782/year-2017/Samba-Rsync.html

diff --git a/rsync/.md5sum b/rsync/.md5sum
index e648e66d..5453a749 100644
--- a/rsync/.md5sum
+++ b/rsync/.md5sum
@@ -1,4 +1,4 @@
-0f758d7e000c0f7f7d3792610fad70cb  rsync-3.1.2.tar.gz
+e116473719712d312d4db7e877e7b0df  rsync-3.1.3pre1.tar.gz
 bd6cc8e2c83d5e845af20a30e105fb5f  rsync.driver
 d20f1ca0fb415a6788808c75170d951a  rsyncd
 b4e95fa8c8f3ae13cfdf616abd6a3960  rsyncd.conf
diff --git a/rsync/.signature b/rsync/.signature
index 9a6dadda..1d425afe 100644
--- a/rsync/.signature
+++ b/rsync/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqo/eo6PI41PWGO6F7OSVUW71UxJF1cg80Q3xrm+6G8dxClUtLeyfZE0ZtoZcpmT05tkxQ4dHyWB35EkrTc6JyQY=
-SHA256 (Pkgfile) = 14f7d621c44d11d246a7b2f77ec238bcdd687c16e78952a9b87c321392f0b47d
+RWRJc1FUaeVeqi9UpxXd1+wORN1GuNbXWnl+3vYO9uZ2WKA9BnptI6VivnqBcG8qfIG65hXXRJuDJkoI7sEyU0yzcj56B6RWXQ8=
+SHA256 (Pkgfile) = de1cbfee92e8a29d34d0afeb9b30ccf03625e21bc08f059c331536624aa4efad
 SHA256 (.footprint) = 66208e83d257797b507df7559291a4059dba7f26019d5832ef535e6f3bd4c71a
-SHA256 (rsync-3.1.2.tar.gz) = ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2
+SHA256 (rsync-3.1.3pre1.tar.gz) = 6337962632006f9e8664d759cd2bbe5958e4e20a12a72a05c9dbcad0b955faf5
 SHA256 (rsyncd.conf) = 095447801d8ba0101809c18acfb5a492c65323bed9ef5dd3739b3af5e9f7c56d
 SHA256 (rsyncd) = e8dc013ff31ee7b1f249fcfbde579ec76fe3103f61d26d098d45290727060c85
 SHA256 (rsync.driver) = 5e0f94a972cf7e47f153ccd0ac454ec2bd3056a834b69e82d3f3984d44308ef7
diff --git a/rsync/Pkgfile b/rsync/Pkgfile
index ec410a0d..0dee14ff 100644
--- a/rsync/Pkgfile
+++ b/rsync/Pkgfile
@@ -4,9 +4,9 @@
 # Depends on:  acl
 
 name=rsync
-version=3.1.2
+version=3.1.3pre1
 release=1
-source=(https://rsync.samba.org/ftp/$name/src/$name-$version.tar.gz \
+source=(https://download.samba.org/pub/rsync/src-previews/$name-$version.tar.gz \
         rsyncd.conf rsyncd rsync.driver)
 
 build () {

From crux at crux.nu  Wed Jan 17 18:06:05 2018
From: crux at crux.nu (crux at crux.nu)
Date: Wed, 17 Jan 2018 18:06:05 +0000 (UTC)
Subject: [crux-commits] ports/core (3.3): ca-certificates: updated to
 20180117
Message-ID: <20180117180605.0AAB218031E@crux.nu>

commit 57f342ac7c7ef8c74d3953577a7349306a3a9df4
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Wed Jan 17 19:06:00 2018 +0100

    ca-certificates: updated to 20180117

diff --git a/ca-certificates/.md5sum b/ca-certificates/.md5sum
index 5d854e35..c02ce27e 100644
--- a/ca-certificates/.md5sum
+++ b/ca-certificates/.md5sum
@@ -1 +1 @@
-e6486206c7ae66e10a362c0460c4a0b4  cacert.pem
+df0df092f7590ce0cc636986f1ae084b  cacert.pem
diff --git a/ca-certificates/.signature b/ca-certificates/.signature
index 47926fd4..ab1b6de5 100644
--- a/ca-certificates/.signature
+++ b/ca-certificates/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqtt6PRienXkonW2ZcvGfF14QfNPZVfhR9jJ4fU/hRDZLKYmss0jxYeDD5OZT66AinTi33mM6IkA/qA7ERgVJ1AI=
-SHA256 (Pkgfile) = 22a39cfc670ab5602706e37f7a5b25f48de65e027fb7de2797dd8118ebb41c9a
+RWRJc1FUaeVeqhgy3sWE94KIvjWSnHrqloeXIgOkAffwdHG+jtOc5mxg6dDCxeWy605eOi5aSawtpmGNw52nYak6VDB9LhS1pAw=
+SHA256 (Pkgfile) = 3a95a887c9d331c8966efc05f53634ab37efb099c6b685f980ef9dd616a70c75
 SHA256 (.footprint) = 92930b2d9b1d5da08760f16fa80c1ff0c13e811e50cb4414f98265cef748bf40
-SHA256 (cacert.pem) = 0bde85e168e5b7b7a84e85a6833f9f3e4f37a44d88e9097d4aad66aac0d64876
+SHA256 (cacert.pem) = defe310a0184a12e4b1b3d147f1d77395dd7a09e3428373d019bef5d542ceba3
diff --git a/ca-certificates/Pkgfile b/ca-certificates/Pkgfile
index 5505b67b..1e2972d2 100644
--- a/ca-certificates/Pkgfile
+++ b/ca-certificates/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=ca-certificates
-version=20180112
+version=20180117
 release=1
 source=(cacert.pem)
 
diff --git a/ca-certificates/cacert.pem b/ca-certificates/cacert.pem
index 95ace311..6e88a2cf 100644
--- a/ca-certificates/cacert.pem
+++ b/ca-certificates/cacert.pem
@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Fri Jan 12 10:09:35 2018 GMT
+## Certificate data from Mozilla as of: Wed Jan 17 04:12:05 2018 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -61,54 +61,6 @@ BgkqhkiG9w0BAQUFAAOCAQEAmYFThxxol4aR7OBKuEQLq4GsJ0/WwbgcQ3izDJr86iw8bmEbTUsp
 TBj0/VLZjmmx6BEP3ojY+x1J96relc8geMJgEtslQIxq/H5COEBkEveegeGTLg==
 -----END CERTIFICATE-----
 
-Verisign Class 1 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGjCCAwICEQCLW3VWhFSFCwDPrzhIzrGkMA0GCSqGSIb3DQEBBQUAMIHKMQswCQYDVQQGEwJV
-UzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRydXN0IE5ldHdv
-cmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhvcml6ZWQgdXNl
-IG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDEgUHVibGljIFByaW1hcnkgQ2VydGlmaWNh
-dGlvbiBBdXRob3JpdHkgLSBHMzAeFw05OTEwMDEwMDAwMDBaFw0zNjA3MTYyMzU5NTlaMIHKMQsw
-CQYDVQQGEwJVUzEXMBUGA1UEChMOVmVyaVNpZ24sIEluYy4xHzAdBgNVBAsTFlZlcmlTaWduIFRy
-dXN0IE5ldHdvcmsxOjA4BgNVBAsTMShjKSAxOTk5IFZlcmlTaWduLCBJbmMuIC0gRm9yIGF1dGhv
-cml6ZWQgdXNlIG9ubHkxRTBDBgNVBAMTPFZlcmlTaWduIENsYXNzIDEgUHVibGljIFByaW1hcnkg
-Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkgLSBHMzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-ggEBAN2E1Lm0+afY8wR4nN493GwTFtl63SRRZsDHJlkNrAYIwpTRMx/wgzUfbhvI3qpuFU5UJ+/E
-bRrsC+MO8ESlV8dAWB6jRx9x7GD2bZTIGDnt/kIYVt/kTEkQeE4BdjVjEjbdZrwBBDajVWjVojYJ
-rKshJlQGrT/KFOCsyq0GHZXi+J3x4GD/wn91K0zM2v6HmSHquv4+VNfSWXjbPG7PoBMAGrgnoeS+
-Z5bKoMWznN3JdZ7rMJpfo83ZrngZPyPpXNspva1VyBtUjGP26KbqxzcSXKMpHgLZ2x87tNcPVkeB
-FQRKr4Mn0cVYiMHd9qqnoxjaaKptEVHhv2Vrn5Z20T0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEA
-q2aN17O6x5q25lXQBfGfMY1aqtmqRiYPce2lrVNWYgFHKkTp/j90CxObufRNG7LRX7K20ohcs5/N
-y9Sn2WCVhDr4wTcdYcrnsMXlkdpUpqwxga6X3s0IrLjAl4B/bnKk52kTlWUfxJM8/XmPBNQ+T+r3
-ns7NZ3xPZQL/kYVUc8f/NveGLezQXk//EZ9yBta4GvFMDSZl4kSAHsef493oCtrspSCAaWihT37h
-a88HQfqDjrw43bAuEbFrskLMmrz5SCJ5ShkPshw+IHTZasO+8ih4E1Z5T21Q6huwtVexN2ZYI/Pc
-D98Kh8TvhgXVOBRgmaNL3gaWcSzy27YfpO8/7g==
------END CERTIFICATE-----
-
-Verisign Class 2 Public Primary Certification Authority - G3
-============================================================
------BEGIN CERTIFICATE-----
-MIIEGTCCAwECEGFwy0mMX5hFKeewptlQW3owDQYJKoZIhvcNAQEFBQAwgcoxCzAJBgNVBAYTAlVT
-MRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1c3QgTmV0d29y
-azE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9yaXplZCB1c2Ug
-b25seTFFMEMGA1UEAxM8VmVyaVNpZ24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBDZXJ0aWZpY2F0
-aW9uIEF1dGhvcml0eSAtIEczMB4XDTk5MTAwMTAwMDAwMFoXDTM2MDcxNjIzNTk1OVowgcoxCzAJ
-BgNVBAYTAlVTMRcwFQYDVQQKEw5WZXJpU2lnbiwgSW5jLjEfMB0GA1UECxMWVmVyaVNpZ24gVHJ1
-c3QgTmV0d29yazE6MDgGA1UECxMxKGMpIDE5OTkgVmVyaVNpZ24sIEluYy4gLSBGb3IgYXV0aG9y
-aXplZCB1c2Ugb25seTFFMEMGA1UEAxM8VmVyaVNpZ24gQ2xhc3MgMiBQdWJsaWMgUHJpbWFyeSBD
-ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eSAtIEczMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArwoNwtUs22e5LeWUJ92lvuCwTY+zYVY81nzD9M0+hsuiiOLh2KRpxbXiv8GmR1BeRjmL1Za6
-tW8UvxDOJxOeBUebMXoT2B/Z0wI3i60sR/COgQanDTAM6/c8DyAd3HJG7qUCyFvDyVZpTMUYwZF7
-C9UTAJu878NIPkZgIIUq1ZC2zYugzDLdt/1AVbJQHFauzI13TccgTacxdu9okoqQHgiBVrKtaaNS
-0MscxCM9H5n+TOgWY47GCI72MfbS+uV23bUckqNJzc0BzWjNqWm6o+sdDZykIKbBoMXRRkwXbdKs
-Zj+WjOCE1Db/IlnF+RFgqF8EffIa9iVCYQ/ESrg+iQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA0
-JhU8wI1NQ0kdvekhktdmnLfexbjQ5F1fdiLAJvmEOjr5jLX77GDx6M4EsMjdpwOPMPOY36TmpDHf
-0xwLRtxyID+u7gU8pDM/CzmscHhzS5kr3zDCVLCoO1Wh/hYozUK9dG6A2ydEp85EXdQbkJgNHkKU
-sQAsBNB0owIFImNjzYO1+8FtYmtpdf1dcEG59b98377BMnMiIYtYgXsVkXq642RIsH/7NiXaldDx
-JBQX3RiAa0YjOVT1jmIJBB2UkKab5iXiQkWquJCtvgiPqQtCGJTPcjnhsUPgKM+351psE2tJs//j
-GHyJizNdrDPXp/naOlXJWBD5qu9ats9LS98q
------END CERTIFICATE-----
-
 Verisign Class 3 Public Primary Certification Authority - G3
 ============================================================
 -----BEGIN CERTIFICATE-----
@@ -178,30 +130,6 @@ Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H
 RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp
 -----END CERTIFICATE-----
 
-AddTrust Low-Value Services Root
-================================
------BEGIN CERTIFICATE-----
-MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML
-QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRU
-cnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMwMTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQsw
-CQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBO
-ZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ulCDtbKRY6
-54eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6ntGO0/7Gcrjyvd7ZWxbWr
-oulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyldI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1
-Zmne3yzxbrww2ywkEtvrNTVokMsAsJchPXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJui
-GMx1I4S+6+JNM3GOGvDC+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8w
-HQYDVR0OBBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8EBTAD
-AQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBlMQswCQYDVQQGEwJT
-RTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEw
-HwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxt
-ZBsfzQ3duQH6lmM0MkhHma6X7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0Ph
-iVYrqW9yTkkz43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY
-eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJlpz/+0WatC7xr
-mYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOAWiFeIc9TVPC6b4nbqKqVz4vj
-ccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk=
------END CERTIFICATE-----
-
 AddTrust External Root
 ======================
 -----BEGIN CERTIFICATE-----
@@ -355,25 +283,6 @@ YQa7FkKMcPcw++DbZqMAAb3mLNqRX6BGi01qnD093QVG/na/oAo85ADmJ7f/hC3euiInlhBx6yLt
 398znM/jra6O1I7mT1GvFpLgXPYHDw==
 -----END CERTIFICATE-----
 
-Certum Root CA
-==============
------BEGIN CERTIFICATE-----
-MIIDDDCCAfSgAwIBAgIDAQAgMA0GCSqGSIb3DQEBBQUAMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQK
-ExJVbml6ZXRvIFNwLiB6IG8uby4xEjAQBgNVBAMTCUNlcnR1bSBDQTAeFw0wMjA2MTExMDQ2Mzla
-Fw0yNzA2MTExMDQ2MzlaMD4xCzAJBgNVBAYTAlBMMRswGQYDVQQKExJVbml6ZXRvIFNwLiB6IG8u
-by4xEjAQBgNVBAMTCUNlcnR1bSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM6x
-wS7TT3zNJc4YPk/EjG+AanPIW1H4m9LcuwBcsaD8dQPugfCI7iNS6eYVM42sLQnFdvkrOYCJ5JdL
-kKWoePhzQ3ukYbDYWMzhbGZ+nPMJXlVjhNWo7/OxLjBos8Q82KxujZlakE403Daaj4GIULdtlkIJ
-89eVgw1BS7Bqa/j8D35in2fE7SZfECYPCE/wpFcozo+47UX2bu4lXapuOb7kky/ZR6By6/qmW6/K
-Uz/iDsaWVhFu9+lmqSbYf5VT7QqFiLpPKaVCjF62/IUgAKpoC6EahQGcxEZjgoi2IrHu/qpGWX7P
-NSzVttpd90gzFFS269lvzs2I1qsb2pY7HVkCAwEAAaMTMBEwDwYDVR0TAQH/BAUwAwEB/zANBgkq
-hkiG9w0BAQUFAAOCAQEAuI3O7+cUus/usESSbLQ5PqKEbq24IXfS1HeCh+YgQYHu4vgRt2PRFze+
-GXYkHAQaTOs9qmdvLdTN/mUxcMUbpgIKumB7bVjCmkn+YzILa+M6wKyrO7Do0wlRjBCDxjTgxSvg
-GrZgFCdsMneMvLJymM/NzD+5yCRCFNZX/OYmQ6kd5YCQzgNUKD73P9P4Te1qCjqTE5s7FCMTY5w/
-0YcneeVMUeMBrYVdGjux1XMQpNPyvG5k9VpWkKjHDkx0Dy5xO/fIR/RpbxXyEV6DHpx8Uq79AtoS
-qFlnGNu8cN2bsWntgM6JQEhqDjXKKWYVIZQs6GAqm4VKQPNriiTsBhYscw==
------END CERTIFICATE-----
-
 Comodo AAA Services root
 ========================
 -----BEGIN CERTIFICATE-----
@@ -537,32 +446,6 @@ EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
 llpwrN9M
 -----END CERTIFICATE-----
 
-UTN USERFirst Email Root CA
-===========================
------BEGIN CERTIFICATE-----
-MIIEojCCA4qgAwIBAgIQRL4Mi1AAJLQR0zYlJWfJiTANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
-BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl
-IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xNjA0
-BgNVBAMTLVVUTi1VU0VSRmlyc3QtQ2xpZW50IEF1dGhlbnRpY2F0aW9uIGFuZCBFbWFpbDAeFw05
-OTA3MDkxNzI4NTBaFw0xOTA3MDkxNzM2NThaMIGuMQswCQYDVQQGEwJVUzELMAkGA1UECBMCVVQx
-FzAVBgNVBAcTDlNhbHQgTGFrZSBDaXR5MR4wHAYDVQQKExVUaGUgVVNFUlRSVVNUIE5ldHdvcmsx
-ITAfBgNVBAsTGGh0dHA6Ly93d3cudXNlcnRydXN0LmNvbTE2MDQGA1UEAxMtVVROLVVTRVJGaXJz
-dC1DbGllbnQgQXV0aGVudGljYXRpb24gYW5kIEVtYWlsMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAsjmFpPJ9q0E7YkY3rs3BYHW8OWX5ShpHornMSMxqmNVNNRm5pELlzkniii8efNIx
-B8dOtINknS4p1aJkxIW9hVE1eaROaJB7HHqkkqgX8pgV8pPMyaQylbsMTzC9mKALi+VuG6JG+ni8
-om+rWV6lL8/K2m2qL+usobNqqrcuZzWLeeEeaYji5kbNoKXqvgvOdjp6Dpvq/NonWz1zHyLmSGHG
-TPNpsaguG7bUMSAsvIKKjqQOpdeJQ/wWWq8dcdcRWdq6hw2v+vPhwvCkxWeM1tZUOt4KpLoDd7Nl
-yP0e03RiqhjKaJMeoYV+9Udly/hNVyh00jT/MLbu9mIwFIws6wIDAQABo4G5MIG2MAsGA1UdDwQE
-AwIBxjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSJgmd9xJ0mcABLtFBIfN49rgRufTBYBgNV
-HR8EUTBPME2gS6BJhkdodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVVROLVVTRVJGaXJzdC1DbGll
-bnRBdXRoZW50aWNhdGlvbmFuZEVtYWlsLmNybDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUH
-AwQwDQYJKoZIhvcNAQEFBQADggEBALFtYV2mGn98q0rkMPxTbyUkxsrt4jFcKw7u7mFVbwQ+zzne
-xRtJlOTrIEy05p5QLnLZjfWqo7NK2lYcYJeA3IKirUq9iiv/Cwm0xtcgBEXkzYABurorbs6q15L+
-5K/r9CYdFip/bDCVNy8zEqx/3cfREYxRmLLQo5HQrfafnoOTHh1CuEava2bwm3/q4wMC5QJRwarV
-NZ1yQAOJujEdxRBoUp7fooXFXAimeOZTT7Hot9MUnpOmw2TjrH5xzbyf6QMbzPvprDHBr3wVdAKZ
-w7JHpsIyYdfHb0gkUSeh1YdV8nuPmD0Wnu51tvjQjvLzxq4oW6fw8zYX/MMF08oDSlQ=
------END CERTIFICATE-----
-
 Camerfirma Chambers of Commerce Root
 ====================================
 -----BEGIN CERTIFICATE-----
@@ -851,37 +734,6 @@ vFcj4jjSm2jzVhKIT0J8uDHEtdvkyCE06UgRNe76x5JXxZ805Mf29w4LTJxoeHtxMcfrHuBnQfO3
 oKfN5XozNmr6mis=
 -----END CERTIFICATE-----
 
-SwissSign Platinum CA - G2
-==========================
------BEGIN CERTIFICATE-----
-MIIFwTCCA6mgAwIBAgIITrIAZwwDXU8wDQYJKoZIhvcNAQEFBQAwSTELMAkGA1UEBhMCQ0gxFTAT
-BgNVBAoTDFN3aXNzU2lnbiBBRzEjMCEGA1UEAxMaU3dpc3NTaWduIFBsYXRpbnVtIENBIC0gRzIw
-HhcNMDYxMDI1MDgzNjAwWhcNMzYxMDI1MDgzNjAwWjBJMQswCQYDVQQGEwJDSDEVMBMGA1UEChMM
-U3dpc3NTaWduIEFHMSMwIQYDVQQDExpTd2lzc1NpZ24gUGxhdGludW0gQ0EgLSBHMjCCAiIwDQYJ
-KoZIhvcNAQEBBQADggIPADCCAgoCggIBAMrfogLi2vj8Bxax3mCq3pZcZB/HL37PZ/pEQtZ2Y5Wu
-669yIIpFR4ZieIbWIDkm9K6j/SPnpZy1IiEZtzeTIsBQnIJ71NUERFzLtMKfkr4k2HtnIuJpX+UF
-eNSH2XFwMyVTtIc7KZAoNppVRDBopIOXfw0enHb/FZ1glwCNioUD7IC+6ixuEFGSzH7VozPY1kne
-WCqv9hbrS3uQMpe5up1Y8fhXSQQeol0GcN1x2/ndi5objM89o03Oy3z2u5yg+gnOI2Ky6Q0f4nIo
-j5+saCB9bzuohTEJfwvH6GXp43gOCWcwizSC+13gzJ2BbWLuCB4ELE6b7P6pT1/9aXjvCR+htL/6
-8++QHkwFix7qepF6w9fl+zC8bBsQWJj3Gl/QKTIDE0ZNYWqFTFJ0LwYfexHihJfGmfNtf9dng34T
-aNhxKFrYzt3oEBSa/m0jh26OWnA81Y0JAKeqvLAxN23IhBQeW71FYyBrS3SMvds6DsHPWhaPpZjy
-domyExI7C3d3rLvlPClKknLKYRorXkzig3R3+jVIeoVNjZpTxN94ypeRSCtFKwH3HBqi7Ri6Cr2D
-+m+8jVeTO9TUps4e8aCxzqv9KyiaTxvXw3LbpMS/XUz13XuWae5ogObnmLo2t/5u7Su9IPhlGdpV
-CX4l3P5hYnL5fhgC72O00Puv5TtjjGePAgMBAAGjgawwgakwDgYDVR0PAQH/BAQDAgEGMA8GA1Ud
-EwEB/wQFMAMBAf8wHQYDVR0OBBYEFFCvzAeHFUdvOMW0ZdHelarp35zMMB8GA1UdIwQYMBaAFFCv
-zAeHFUdvOMW0ZdHelarp35zMMEYGA1UdIAQ/MD0wOwYJYIV0AVkBAQEBMC4wLAYIKwYBBQUHAgEW
-IGh0dHA6Ly9yZXBvc2l0b3J5LnN3aXNzc2lnbi5jb20vMA0GCSqGSIb3DQEBBQUAA4ICAQAIhab1
-Fgz8RBrBY+D5VUYI/HAcQiiWjrfFwUF1TglxeeVtlspLpYhg0DB0uMoI3LQwnkAHFmtllXcBrqS3
-NQuB2nEVqXQXOHtYyvkv+8Bldo1bAbl93oI9ZLi+FHSjClTTLJUYFzX1UWs/j6KWYTl4a0vlpqD4
-U99REJNi54Av4tHgvI42Rncz7Lj7jposiU0xEQ8mngS7twSNC/K5/FqdOxa3L8iYq/6KUFkuozv8
-KV2LwUvJ4ooTHbG/u0IdUt1O2BReEMYxB+9xJ/cbOQncguqLs5WGXv312l0xpuAxtpTmREl0xRbl
-9x8DYSjFyMsSoEJL+WuICI20MhjzdZ/EfwBPBZWcoxcCw7NTm6ogOSkrZvqdr16zktK1puEa+S1B
-aYEUtLS17Yk9zvupnTVCRLEcFHOBzyoBNZox1S2PbYTfgE1X4z/FhHXaicYwu+uPyyIIoK6q8QNs
-OktNCaUOcsZWayFCTiMlFGiudgp8DAdwZPmaL/YFOSbGDI8Zf0NebvRbFS/bYV3mZy8/CJT5YLSY
-Mdp08YSTcU1f+2BY0fvEwW2JorsgH51xkcsymxM9Pn2SUjWskpSi0xjCfMfqr3YFFt1nJ8J+HAci
-IfNAChs0B0QTwoRqjt8ZWr9/6x3iGjjRXK9HkmuAtTClyY3YqzGBH9/CZjfTk6mFhnll0g==
------END CERTIFICATE-----
-
 SwissSign Gold CA - G2
 ======================
 -----BEGIN CERTIFICATE-----
@@ -1190,67 +1042,6 @@ PBS1xp81HlDQwY9qcEQCYsuuHWhBp6pX6FOqB9IG9tUUBguRA3UsbHK1YZWaDYu5Def131TN3ubY
 WyH8EZE0vkHve52Xdf+XlcCWWC/qu0bXu+TZLg==
 -----END CERTIFICATE-----
 
-AC Ra\xC3\xADz Certic\xC3\xA1mara S.A.
-======================================
------BEGIN CERTIFICATE-----
-MIIGZjCCBE6gAwIBAgIPB35Sk3vgFeNX8GmMy+wMMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNVBAYT
-AkNPMUcwRQYDVQQKDD5Tb2NpZWRhZCBDYW1lcmFsIGRlIENlcnRpZmljYWNpw7NuIERpZ2l0YWwg
-LSBDZXJ0aWPDoW1hcmEgUy5BLjEjMCEGA1UEAwwaQUMgUmHDrXogQ2VydGljw6FtYXJhIFMuQS4w
-HhcNMDYxMTI3MjA0NjI5WhcNMzAwNDAyMjE0MjAyWjB7MQswCQYDVQQGEwJDTzFHMEUGA1UECgw+
-U29jaWVkYWQgQ2FtZXJhbCBkZSBDZXJ0aWZpY2FjacOzbiBEaWdpdGFsIC0gQ2VydGljw6FtYXJh
-IFMuQS4xIzAhBgNVBAMMGkFDIFJhw616IENlcnRpY8OhbWFyYSBTLkEuMIICIjANBgkqhkiG9w0B
-AQEFAAOCAg8AMIICCgKCAgEAq2uJo1PMSCMI+8PPUZYILrgIem08kBeGqentLhM0R7LQcNzJPNCN
-yu5LF6vQhbCnIwTLqKL85XXbQMpiiY9QngE9JlsYhBzLfDe3fezTf3MZsGqy2IiKLUV0qPezuMDU
-2s0iiXRNWhU5cxh0T7XrmafBHoi0wpOQY5fzp6cSsgkiBzPZkc0OnB8OIMfuuzONj8LSWKdf/WU3
-4ojC2I+GdV75LaeHM/J4Ny+LvB2GNzmxlPLYvEqcgxhaBvzz1NS6jBUJJfD5to0EfhcSM2tXSExP
-2yYe68yQ54v5aHxwD6Mq0Do43zeX4lvegGHTgNiRg0JaTASJaBE8rF9ogEHMYELODVoqDA+bMMCm
-8Ibbq0nXl21Ii/kDwFJnmxL3wvIumGVC2daa49AZMQyth9VXAnow6IYm+48jilSH5L887uvDdUhf
-HjlvgWJsxS3EF1QZtzeNnDeRyPYL1epjb4OsOMLzP96a++EjYfDIJss2yKHzMI+ko6Kh3VOz3vCa
-Mh+DkXkwwakfU5tTohVTP92dsxA7SH2JD/ztA/X7JWR1DhcZDY8AFmd5ekD8LVkH2ZD6mq093ICK
-5lw1omdMEWux+IBkAC1vImHFrEsm5VoQgpukg3s0956JkSCXjrdCx2bD0Omk1vUgjcTDlaxECp1b
-czwmPS9KvqfJpxAe+59QafMCAwEAAaOB5jCB4zAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB/wQE
-AwIBBjAdBgNVHQ4EFgQU0QnQ6dfOeXRU+Tows/RtLAMDG2gwgaAGA1UdIASBmDCBlTCBkgYEVR0g
-ADCBiTArBggrBgEFBQcCARYfaHR0cDovL3d3dy5jZXJ0aWNhbWFyYS5jb20vZHBjLzBaBggrBgEF
-BQcCAjBOGkxMaW1pdGFjaW9uZXMgZGUgZ2FyYW507WFzIGRlIGVzdGUgY2VydGlmaWNhZG8gc2Ug
-cHVlZGVuIGVuY29udHJhciBlbiBsYSBEUEMuMA0GCSqGSIb3DQEBBQUAA4ICAQBclLW4RZFNjmEf
-AygPU3zmpFmps4p6xbD/CHwso3EcIRNnoZUSQDWDg4902zNc8El2CoFS3UnUmjIz75uny3XlesuX
-EpBcunvFm9+7OSPI/5jOCk0iAUgHforA1SBClETvv3eiiWdIG0ADBaGJ7M9i4z0ldma/Jre7Ir5v
-/zlXdLp6yQGVwZVR6Kss+LGGIOk/yzVb0hfpKv6DExdA7ohiZVvVO2Dpezy4ydV/NgIlqmjCMRW3
-MGXrfx1IebHPOeJCgBbT9ZMj/EyXyVo3bHwi2ErN0o42gzmRkBDI8ck1fj+404HGIGQatlDCIaR4
-3NAvO2STdPCWkPHv+wlaNECW8DYSwaN0jJN+Qd53i+yG2dIPPy3RzECiiWZIHiCznCNZc6lEc7wk
-eZBWN7PGKX6jD/EpOe9+XCgycDWs2rjIdWb8m0w5R44bb5tNAlQiM+9hup4phO9OSzNHdpdqy35f
-/RWmnkJDW2ZaiogN9xa5P1FlK2Zqi9E4UqLWRhH6/JocdJ6PlwsCT2TG9WjTSy3/pDceiz+/RL5h
-RqGEPQgnTIEgd4kI6mdAXmwIUV80WoyWaM3X94nCHNMyAK9Sy9NgWyo6R35rMDOhYil/SrnhLecU
-Iw4OGEfhefwVVdCx/CVxY3UzHCMrr1zZ7Ud3YA47Dx7SwNxkBYn8eNZcLCZDqQ==
------END CERTIFICATE-----
-
-TC TrustCenter Class 3 CA II
-============================
------BEGIN CERTIFICATE-----
-MIIEqjCCA5KgAwIBAgIOSkcAAQAC5aBd1j8AUb8wDQYJKoZIhvcNAQEFBQAwdjELMAkGA1UEBhMC
-REUxHDAaBgNVBAoTE1RDIFRydXN0Q2VudGVyIEdtYkgxIjAgBgNVBAsTGVRDIFRydXN0Q2VudGVy
-IENsYXNzIDMgQ0ExJTAjBgNVBAMTHFRDIFRydXN0Q2VudGVyIENsYXNzIDMgQ0EgSUkwHhcNMDYw
-MTEyMTQ0MTU3WhcNMjUxMjMxMjI1OTU5WjB2MQswCQYDVQQGEwJERTEcMBoGA1UEChMTVEMgVHJ1
-c3RDZW50ZXIgR21iSDEiMCAGA1UECxMZVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQTElMCMGA1UE
-AxMcVEMgVHJ1c3RDZW50ZXIgQ2xhc3MgMyBDQSBJSTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBALTgu1G7OVyLBMVMeRwjhjEQY0NVJz/GRcekPewJDRoeIMJWHt4bNwcwIi9v8Qbxq63W
-yKthoy9DxLCyLfzDlml7forkzMA5EpBCYMnMNWju2l+QVl/NHE1bWEnrDgFPZPosPIlY2C8u4rBo
-6SI7dYnWRBpl8huXJh0obazovVkdKyT21oQDZogkAHhg8fir/gKya/si+zXmFtGt9i4S5Po1auUZ
-uV3bOx4a+9P/FRQI2AlqukWdFHlgfa9Aigdzs5OW03Q0jTo3Kd5c7PXuLjHCINy+8U9/I1LZW+Jk
-2ZyqBwi1Rb3R0DHBq1SfqdLDYmAD8bs5SpJKPQq5ncWg/jcCAwEAAaOCATQwggEwMA8GA1UdEwEB
-/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBTUovyfs8PYA9NXXAek0CSnwPIA1DCB
-7QYDVR0fBIHlMIHiMIHfoIHcoIHZhjVodHRwOi8vd3d3LnRydXN0Y2VudGVyLmRlL2NybC92Mi90
-Y19jbGFzc18zX2NhX0lJLmNybIaBn2xkYXA6Ly93d3cudHJ1c3RjZW50ZXIuZGUvQ049VEMlMjBU
-cnVzdENlbnRlciUyMENsYXNzJTIwMyUyMENBJTIwSUksTz1UQyUyMFRydXN0Q2VudGVyJTIwR21i
-SCxPVT1yb290Y2VydHMsREM9dHJ1c3RjZW50ZXIsREM9ZGU/Y2VydGlmaWNhdGVSZXZvY2F0aW9u
-TGlzdD9iYXNlPzANBgkqhkiG9w0BAQUFAAOCAQEANmDkcPcGIEPZIxpC8vijsrlNirTzwppVMXzE
-O2eatN9NDoqTSheLG43KieHPOh6sHfGcMrSOWXaiQYUlN6AT0PV8TtXqluJucsG7Kv5sbviRmEb8
-yRtXW+rIGjs/sFGYPAfaLFkB2otE6OF0/ado3VS6g0bsyEa1+K+XwDsJHI/OcpY9M1ZwvJbL2NV9
-IJqDnxrcOfHFcqMRA/07QlIp2+gB95tejNaNhk4Z+rwcvsUhpYeeeC422wlxo3I0+GzjBgnyXlal
-092Y+tTmBvTwtiBjS+opvaqCZh77gaqnN60TGOaSw4HBM7uIHqHn4rS9MWwOUT1v+5ZWgOI2F9Hc
-5A==
------END CERTIFICATE-----
-
 Deutsche Telekom Root CA 2
 ==========================
 -----BEGIN CERTIFICATE-----
@@ -1273,28 +1064,6 @@ dyd1Lx+4ivn+xbrYNuSD7Odlt79jWvNGr4GUN9RBjNYj1h7P9WgbRGOiWrqnNVmh5XAFmw4jV5mU
 Cm26OWMohpLzGITY+9HPBVZkVw==
 -----END CERTIFICATE-----
 
-ComSign CA
-==========
------BEGIN CERTIFICATE-----
-MIIDkzCCAnugAwIBAgIQFBOWgxRVjOp7Y+X8NId3RDANBgkqhkiG9w0BAQUFADA0MRMwEQYDVQQD
-EwpDb21TaWduIENBMRAwDgYDVQQKEwdDb21TaWduMQswCQYDVQQGEwJJTDAeFw0wNDAzMjQxMTMy
-MThaFw0yOTAzMTkxNTAyMThaMDQxEzARBgNVBAMTCkNvbVNpZ24gQ0ExEDAOBgNVBAoTB0NvbVNp
-Z24xCzAJBgNVBAYTAklMMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8ORUaSvTx49q
-ROR+WCf4C9DklBKK8Rs4OC8fMZwG1Cyn3gsqrhqg455qv588x26i+YtkbDqthVVRVKU4VbirgwTy
-P2Q298CNQ0NqZtH3FyrV7zb6MBBC11PN+fozc0yz6YQgitZBJzXkOPqUm7h65HkfM/sb2CEJKHxN
-GGleZIp6GZPKfuzzcuc3B1hZKKxC+cX/zT/npfo4sdAMx9lSGlPWgcxCejVb7Us6eva1jsz/D3zk
-YDaHL63woSV9/9JLEYhwVKZBqGdTUkJe5DSe5L6j7KpiXd3DTKaCQeQzC6zJMw9kglcq/QytNuEM
-rkvF7zuZ2SOzW120V+x0cAwqTwIDAQABo4GgMIGdMAwGA1UdEwQFMAMBAf8wPQYDVR0fBDYwNDAy
-oDCgLoYsaHR0cDovL2ZlZGlyLmNvbXNpZ24uY28uaWwvY3JsL0NvbVNpZ25DQS5jcmwwDgYDVR0P
-AQH/BAQDAgGGMB8GA1UdIwQYMBaAFEsBmz5WGmU2dst7l6qSBe4y5ygxMB0GA1UdDgQWBBRLAZs+
-VhplNnbLe5eqkgXuMucoMTANBgkqhkiG9w0BAQUFAAOCAQEA0Nmlfv4pYEWdfoPPbrxHbvUanlR2
-QnG0PFg/LUAlQvaBnPGJEMgOqnhPOAlXsDzACPw1jvFIUY0McXS6hMTXcpuEfDhOZAYnKuGntewI
-mbQKDdSFc8gS4TXt8QUxHXOZDOuWyt3T5oWq8Ir7dcHyCTxlZWTzTNity4hp8+SDtwy9F1qWF8pb
-/627HOkthIDYIb6FUtnUdLlphbpN7Sgy6/lhSuTENh4Z3G+EER+V9YMoGKgzkkMn3V0TBEVPh9VG
-zT2ouvDzuFYkRes3x+F2T3I5GN9+dHLHcy056mDmrRGiVod7w2ia/viMcKjfZTL0pECMocJEAw6U
-AGegcQCCSA==
------END CERTIFICATE-----
-
 Cybertrust Global Root
 ======================
 -----BEGIN CERTIFICATE-----
@@ -2258,38 +2027,6 @@ NCa1CInXCGNjOCd1HjPqbqjdn5lPdE2BiYBL3ZqXKVwvvoFBuYz/6n1gBp7N1z3TLqMVvKjmJuVv
 w9y4AyHqnxbxLFS1
 -----END CERTIFICATE-----
 
-Swisscom Root CA 2
-==================
------BEGIN CERTIFICATE-----
-MIIF2TCCA8GgAwIBAgIQHp4o6Ejy5e/DfEoeWhhntjANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQG
-EwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2VydGlmaWNhdGUgU2Vy
-dmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3QgQ0EgMjAeFw0xMTA2MjQwODM4MTRaFw0zMTA2
-MjUwNzM4MTRaMGQxCzAJBgNVBAYTAmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGln
-aXRhbCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAyMIIC
-IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlUJOhJ1R5tMJ6HJaI2nbeHCOFvErjw0DzpPM
-LgAIe6szjPTpQOYXTKueuEcUMncy3SgM3hhLX3af+Dk7/E6J2HzFZ++r0rk0X2s682Q2zsKwzxNo
-ysjL67XiPS4h3+os1OD5cJZM/2pYmLcX5BtS5X4HAB1f2uY+lQS3aYg5oUFgJWFLlTloYhyxCwWJ
-wDaCFCE/rtuh/bxvHGCGtlOUSbkrRsVPACu/obvLP+DHVxxX6NZp+MEkUp2IVd3Chy50I9AU/SpH
-Wrumnf2U5NGKpV+GY3aFy6//SSj8gO1MedK75MDvAe5QQQg1I3ArqRa0jG6F6bYRzzHdUyYb3y1a
-SgJA/MTAtukxGggo5WDDH8SQjhBiYEQN7Aq+VRhxLKX0srwVYv8c474d2h5Xszx+zYIdkeNL6yxS
-NLCK/RJOlrDrcH+eOfdmQrGrrFLadkBXeyq96G4DsguAhYidDMfCd7Camlf0uPoTXGiTOmekl9Ab
-mbeGMktg2M7v0Ax/lZ9vh0+Hio5fCHyqW/xavqGRn1V9TrALacywlKinh/LTSlDcX3KwFnUey7QY
-Ypqwpzmqm59m2I2mbJYV4+by+PGDYmy7Velhk6M99bFXi08jsJvllGov34zflVEpYKELKeRcVVi3
-qPyZ7iVNTA6z00yPhOgpD/0QVAKFyPnlw4vP5w8CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYw
-HQYDVR0hBBYwFDASBgdghXQBUwIBBgdghXQBUwIBMBIGA1UdEwEB/wQIMAYBAf8CAQcwHQYDVR0O
-BBYEFE0mICKJS9PVpAqhb97iEoHF8TwuMB8GA1UdIwQYMBaAFE0mICKJS9PVpAqhb97iEoHF8Twu
-MA0GCSqGSIb3DQEBCwUAA4ICAQAyCrKkG8t9voJXiblqf/P0wS4RfbgZPnm3qKhyN2abGu2sEzsO
-v2LwnN+ee6FTSA5BesogpxcbtnjsQJHzQq0Qw1zv/2BZf82Fo4s9SBwlAjxnffUy6S8w5X2lejjQ
-82YqZh6NM4OKb3xuqFp1mrjX2lhIREeoTPpMSQpKwhI3qEAMw8jh0FcNlzKVxzqfl9NX+Ave5XLz
-o9v/tdhZsnPdTSpxsrpJ9csc1fV5yJmz/MFMdOO0vSk3FQQoHt5FRnDsr7p4DooqzgB53MBfGWcs
-a0vvaGgLQ+OswWIJ76bdZWGgr4RVSJFSHMYlkSrQwSIjYVmvRRGFHQEkNI/Ps/8XciATwoCqISxx
-OQ7Qj1zB09GOInJGTB2Wrk9xseEFKZZZ9LuedT3PDTcNYtsmjGOpI99nBjx8Oto0QuFmtEYE3saW
-mA9LSHokMnWRn6z3aOkquVVlzl1h0ydw2Df+n7mvoC5Wt6NlUe07qxS/TFED6F+KBZvuim6c779o
-+sjaC+NCydAXFJy3SuCvkychVSa1ZC+N8f+mQAWFBVzKBxlcCxMoTFh/wqXvRdpg065lYZ1Tg3TC
-rvJcwhbtkj6EPnNgiLx29CzP0H1907he0ZESEOnN3col49XtmS++dYFLJPlFRpTJKSFTnCZFqhMX
-5OfNeOI5wSsSnqaeG8XmDtkx2Q==
------END CERTIFICATE-----
-
 CA Disig Root R1
 ================
 -----BEGIN CERTIFICATE-----
@@ -2953,29 +2690,6 @@ ZHTetBXZ9FRUGi8c15dxVJCO2SCdUyt/q4/i6jC8UDfv8Ue1fXwsBOxonbRJRBD0ckscZOf85muQ
 3Wl9af0AVqW3rLatt8o+Ae+c
 -----END CERTIFICATE-----
 
-S-TRUST Universal Root CA
-=========================
------BEGIN CERTIFICATE-----
-MIID2DCCAsCgAwIBAgIQYFbFSyNAW2TU7SXa2dYeHjANBgkqhkiG9w0BAQsFADCBhTELMAkGA1UE
-BhMCREUxKTAnBgNVBAoTIERldXRzY2hlciBTcGFya2Fzc2VuIFZlcmxhZyBHbWJIMScwJQYDVQQL
-Ex5TLVRSVVNUIENlcnRpZmljYXRpb24gU2VydmljZXMxIjAgBgNVBAMTGVMtVFJVU1QgVW5pdmVy
-c2FsIFJvb3QgQ0EwHhcNMTMxMDIyMDAwMDAwWhcNMzgxMDIxMjM1OTU5WjCBhTELMAkGA1UEBhMC
-REUxKTAnBgNVBAoTIERldXRzY2hlciBTcGFya2Fzc2VuIFZlcmxhZyBHbWJIMScwJQYDVQQLEx5T
-LVRSVVNUIENlcnRpZmljYXRpb24gU2VydmljZXMxIjAgBgNVBAMTGVMtVFJVU1QgVW5pdmVyc2Fs
-IFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCo4wvfETeFgpq1bGZ8YT/A
-RxodRuOwVWTluII5KAd+F//0m4rwkYHqOD8heGxI7GsvotOKcrKn19nqf7TASWswJYmM67fVQGGY
-4tw8IJLNZUpynxqOjPolFb/zIYMoDYuvWRGCQ1ybTSVRf1gYY2A7s7WKi1hjN0hIkETCQN1d90Np
-KZhcEmVeq5CSS2bf1XUSU1QYpt6K1rtXAzlZmRgFDPn9FcaQZEYXgtfCSkE9/QC+V3IYlHcbU1qJ
-AfYzcg6TOtzoHv0FBda8c+CI3KtP7LUYhk95hA5IKmYq3TLIeGXIC51YAQVx7YH1aBduyw20S9ih
-7K446xxYL6FlAzQvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgEGMB0G
-A1UdDgQWBBSafdfr639UmEUptCCrbQuWIxmkwjANBgkqhkiG9w0BAQsFAAOCAQEATpYS2353XpIn
-niEXGIJ22D+8pQkEZoiJrdtVszNqxmXEj03zMjbceQSWqXcy0Zf1GGuMuu3OEdBEx5LxtESO7YhS
-SJ7V/Vn4ox5R+wFS5V/let2qJE8ii912RvaloA812MoPmLkwXSBvwoEevb3A/hXTOCoJk5gnG5N7
-0Cs0XmilFU/RUsOgyqCDRR319bdZc11ZAY+qwkcvFHHVKeMQtUeTJcwjKdq3ctiR1OwbSIoi5MEq
-9zpok59FGW5Dt8z+uJGaYRo2aWNkkijzb2GShROfyQcsi1fc65551cLeCNVUsldOKjKNoeI60RAg
-Ijl9NEVvcTvDHfz/sk+o4vYwHg==
------END CERTIFICATE-----
-
 Entrust Root Certification Authority - G2
 =========================================
 -----BEGIN CERTIFICATE-----
@@ -3518,110 +3232,6 @@ TxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKrezrnK+T+Tb/mjuuqlPpmt
 iyBMz2TWuJdGsE7RKlY6oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr
 -----END CERTIFICATE-----
 
-Symantec Class 1 Public Primary Certification Authority - G6
-============================================================
------BEGIN CERTIFICATE-----
-MIID9jCCAt6gAwIBAgIQJDJ18h0v0gkz97RqytDzmDANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UE
-BhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBU
-cnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAxIFB1YmxpYyBQcmltYXJ5IENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzYwHhcNMTExMDE4MDAwMDAwWhcNMzcxMjAxMjM1OTU5
-WjCBlDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQL
-ExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAxIFB1Ymxp
-YyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzYwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDHOddJZKmZgiJM6kXZBxbje/SD6Jlz+muxNuCad6BAwoGNAcfMjL2Pffd5
-43pMA03Z+/2HOCgs3ZqLVAjbZ/sbjP4oki++t7JIp4Gh2F6Iw8w5QEFa0dzl2hCfL9oBTf0uRnz5
-LicKaTfukaMbasxEvxvHw9QRslBglwm9LiL1QYRmn81ApqkAgMEflZKf3vNI79sdd2H8f9/ulqRy
-0LY+/3gnr8uSFWkI22MQ4uaXrG7crPaizh5HmbmJtxLmodTNWRFnw2+F2EJOKL5ZVVkElauPN4C/
-DfD8HzpkMViBeNfiNfYgPym4jxZuPkjctUwH4fIa6n4KedaovetdhitNAgMBAAGjQjBAMA4GA1Ud
-DwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQzQejIORIVk0jyljIuWvXalF9T
-YDANBgkqhkiG9w0BAQsFAAOCAQEAFeNzV7EXtl9JaUSm9l56Z6zS3nVJq/4lVcc6yUQVEG6/MWvL
-2QeTfxyFYwDjMhLgzMv7OWyP4lPiPEAz2aSMR+atWPuJr+PehilWNCxFuBL6RIluLRQlKCQBZdbq
-UqwFblYSCT3QdPTXvQbKqDqNVkL6jXI+dPEDct+HG14OelWWLDi3mIXNTTNEyZSPWjEwN0ujOhKz
-5zbRIWhLLTjmU64cJVYIVgNnhJ3Gw84kYsdMNs+wBkS39V8C3dlU6S+QTnrIToNADJqXPDe/v+z2
-8LSFdyjBC8hnghAXOKK3Buqbvzr46SMHv3TgmDgVVXjucgBcGaP00jPg/73RVDkpDw==
------END CERTIFICATE-----
-
-Symantec Class 2 Public Primary Certification Authority - G6
-============================================================
------BEGIN CERTIFICATE-----
-MIID9jCCAt6gAwIBAgIQZIKe/DcedF38l/+XyLH/QTANBgkqhkiG9w0BAQsFADCBlDELMAkGA1UE
-BhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBU
-cnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAyIFB1YmxpYyBQcmltYXJ5IENl
-cnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzYwHhcNMTExMDE4MDAwMDAwWhcNMzcxMjAxMjM1OTU5
-WjCBlDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQL
-ExZTeW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAyIFB1Ymxp
-YyBQcmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzYwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDNzOkFyGOFyz9AYxe9GPo15gRnV2WYKaRPyVyPDzTS+NqoE2KquB5QZ3iw
-FkygOakVeq7t0qLA8JA3KRgmXOgNPLZsST/B4NzZS7YUGQum05bh1gnjGSYc+R9lS/kaQxwAg9bQ
-qkmi1NvmYji6UBRDbfkx+FYW2TgCkc/rbN27OU6Z4TBnRfHU8I3D3/7yOAchfQBeVkSz5GC9kSuc
-q1sEcg+yKNlyqwUgQiWpWwNqIBDMMfAr2jUs0Pual07wgksr2F82owstr2MNHSV/oW5cYqGNKD6h
-/Bwg+AEvulWaEbAZ0shQeWsOagXXqgQ2sqPy4V93p3ec5R7c6d9qwWVdAgMBAAGjQjBAMA4GA1Ud
-DwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSHjCCVyJhK0daABkqQNETfHE2/
-sDANBgkqhkiG9w0BAQsFAAOCAQEAgY6ypWaWtyGltu9vI1pf24HFQqV4wWn99DzX+VxrcHIa/FqX
-TQCAiIiCisNxDY7FiZss7Y0L0nJU9X3UXENX6fOupQIR9nYrgVfdfdp0MP1UR/bgFm6mtApI5ud1
-Bw8pGTnOefS2bMVfmdUfS/rfbSw8DVSAcPCIC4DPxmiiuB1w2XaM/O6lyc+tHc+ZJVdaYkXLFmu9
-Sc2lo4xpeSWuuExsi0BmSxY/zwIa3eFsawdhanYVKZl/G92IgMG/tY9zxaaWI4SmKIYkM2oBLldz
-JbZev4/mHWGoQClnHYebHX+bn5nNMdZUvmK7OaxoEkiRIKXLsd3+b/xa5IJVWa8xqQ==
------END CERTIFICATE-----
-
-Symantec Class 1 Public Primary Certification Authority - G4
-============================================================
------BEGIN CERTIFICATE-----
-MIICqDCCAi2gAwIBAgIQIW4zpcvTiKRvKQe0JzzE2DAKBggqhkjOPQQDAzCBlDELMAkGA1UEBhMC
-VVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBUcnVz
-dCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAxIFB1YmxpYyBQcmltYXJ5IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMTExMDA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCB
-lDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZT
-eW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAxIFB1YmxpYyBQ
-cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNi
-AATXZrUb266zYO5G6ohjdTsqlG3zXxL24w+etgoUU0hSyNw6s8tIICYSTvqJhNTfkeQpfSgB2dsY
-Q2mhH7XThhbcx39nI9/fMTGDAzVwsUu3yBe7UcvclBfb6gk7dhLeqrWjQjBAMA4GA1UdDwEB/wQE
-AwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRlwI0l9Qy6l3eQP54u4Fr1ztXh5DAKBggq
-hkjOPQQDAwNpADBmAjEApa7jRlP4mDbjIvouKEkN7jB+M/PsP3FezFWJeJmssv3cHFwzjim5axfI
-EWi13IMHAjEAnMhE2mnCNsNUGRCFAtqdR+9B52wmnQk9922Q0QVEL7C8g5No8gxFSTm/mQQc0xCg
------END CERTIFICATE-----
-
-Symantec Class 2 Public Primary Certification Authority - G4
-============================================================
------BEGIN CERTIFICATE-----
-MIICqDCCAi2gAwIBAgIQNBdlEkA7t1aALYDLeVWmHjAKBggqhkjOPQQDAzCBlDELMAkGA1UEBhMC
-VVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZTeW1hbnRlYyBUcnVz
-dCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAyIFB1YmxpYyBQcmltYXJ5IENlcnRp
-ZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwHhcNMTExMDA1MDAwMDAwWhcNMzgwMTE4MjM1OTU5WjCB
-lDELMAkGA1UEBhMCVVMxHTAbBgNVBAoTFFN5bWFudGVjIENvcnBvcmF0aW9uMR8wHQYDVQQLExZT
-eW1hbnRlYyBUcnVzdCBOZXR3b3JrMUUwQwYDVQQDEzxTeW1hbnRlYyBDbGFzcyAyIFB1YmxpYyBQ
-cmltYXJ5IENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzQwdjAQBgcqhkjOPQIBBgUrgQQAIgNi
-AATR2UqOTA2ESlG6fO/TzPo6mrWnYxM9AeBJPvrBR8mSszrX/m+c95o6D/UOCgrDP8jnEhSO1dVt
-mCyzcTIK6yq99tdqIAtnRZzSsr9TImYJXdsR8/EFM1ij4rjPfM2Cm72jQjBAMA4GA1UdDwEB/wQE
-AwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBQ9MvM6qQyQhPmijGkGYVQvh3L+BTAKBggq
-hkjOPQQDAwNpADBmAjEAyKapr0F/tckRQhZoaUxcuCcYtpjxwH+QbYfTjEYX8D5P/OqwCMR6S7wI
-L8fip29lAjEA1lnehs5fDspU1cbQFQ78i5Ry1I4AWFPPfrFLDeVQhuuea9//KabYR9mglhjb8kWz
------END CERTIFICATE-----
-
-D-TRUST Root CA 3 2013
-======================
------BEGIN CERTIFICATE-----
-MIIEDjCCAvagAwIBAgIDD92sMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNVBAYTAkRFMRUwEwYDVQQK
-DAxELVRydXN0IEdtYkgxHzAdBgNVBAMMFkQtVFJVU1QgUm9vdCBDQSAzIDIwMTMwHhcNMTMwOTIw
-MDgyNTUxWhcNMjgwOTIwMDgyNTUxWjBFMQswCQYDVQQGEwJERTEVMBMGA1UECgwMRC1UcnVzdCBH
-bWJIMR8wHQYDVQQDDBZELVRSVVNUIFJvb3QgQ0EgMyAyMDEzMIIBIjANBgkqhkiG9w0BAQEFAAOC
-AQ8AMIIBCgKCAQEAxHtCkoIf7O1UmI4SwMoJ35NuOpNcG+QQd55OaYhs9uFp8vabomGxvQcgdJhl
-8YwmCM2oNcqANtFjbehEeoLDbF7eu+g20sRoNoyfMr2EIuDcwu4QRjltr5M5rofmw7wJySxrZ1vZ
-m3Z1TAvgu8XXvD558l++0ZBX+a72Zl8xv9Ntj6e6SvMjZbu376Ml1wrqWLbviPr6ebJSWNXwrIyh
-UXQplapRO5AyA58ccnSQ3j3tYdLl4/1kR+W5t0qp9x+uloYErC/jpIF3t1oW/9gPP/a3eMykr/pb
-PBJbqFKJcu+I89VEgYaVI5973bzZNO98lDyqwEHC451QGsDkGSL8swIDAQABo4IBBTCCAQEwDwYD
-VR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUP5DIfccVb/Mkj6nDL0uiDyGyL+cwDgYDVR0PAQH/BAQD
-AgEGMIG+BgNVHR8EgbYwgbMwdKByoHCGbmxkYXA6Ly9kaXJlY3RvcnkuZC10cnVzdC5uZXQvQ049
-RC1UUlVTVCUyMFJvb3QlMjBDQSUyMDMlMjAyMDEzLE89RC1UcnVzdCUyMEdtYkgsQz1ERT9jZXJ0
-aWZpY2F0ZXJldm9jYXRpb25saXN0MDugOaA3hjVodHRwOi8vY3JsLmQtdHJ1c3QubmV0L2NybC9k
-LXRydXN0X3Jvb3RfY2FfM18yMDEzLmNybDANBgkqhkiG9w0BAQsFAAOCAQEADlkOWOR0SCNEzzQh
-tZwUGq2aS7eziG1cqRdw8CqfjXv5e4X6xznoEAiwNStfzwLS05zICx7uBVSuN5MECX1sj8J0vPgc
-lL4xAUAt8yQgt4RVLFzI9XRKEBmLo8ftNdYJSNMOwLo5qLBGArDbxohZwr78e7Erz35ih1WWzAFv
-m2chlTWL+BD8cRu3SzdppjvW7IvuwbDzJcmPkn2h6sPKRL8mpXSSnON065102ctNh9j8tGlsi6BD
-B2B4l+nZk3zCRrybN1Kj7Yo8E6l7U0tJmhEFLAtuVqwfLoJs4GlntQ5tLdnkwBXxP/oYcuEVbSdb
-LTAoK59ImmQrme/ydUlfXA==
------END CERTIFICATE-----
-
 TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1
 =============================================
 -----BEGIN CERTIFICATE-----

From crux at crux.nu  Thu Jan 18 10:50:12 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu, 18 Jan 2018 10:50:12 +0000 (UTC)
Subject: [crux-commits] ports/compat-32 (3.3): mesa3d-32: 17.2.8 -> 17.3.2
Message-ID: <20180118105012.EC23C18030B@crux.nu>

commit 6dd6e127df9f4755e41d851781b495f75b07fbc5
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Thu Jan 18 21:50:05 2018 +1100

    mesa3d-32: 17.2.8 -> 17.3.2

diff --git a/mesa3d-32/.footprint b/mesa3d-32/.footprint
index e604c1f..59cae2b 100644
--- a/mesa3d-32/.footprint
+++ b/mesa3d-32/.footprint
@@ -49,10 +49,6 @@ lrwxrwxrwx	root/root	usr/lib32/libgbm.so.1 -> libgbm.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib32/libglapi.so -> libglapi.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib32/libglapi.so.0 -> libglapi.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib32/libglapi.so.0.0.0
--rwxr-xr-x	root/root	usr/lib32/libvulkan_intel.la
--rwxr-xr-x	root/root	usr/lib32/libvulkan_intel.so
--rwxr-xr-x	root/root	usr/lib32/libvulkan_radeon.la
--rwxr-xr-x	root/root	usr/lib32/libvulkan_radeon.so
 -rwxr-xr-x	root/root	usr/lib32/libxatracker.la
 lrwxrwxrwx	root/root	usr/lib32/libxatracker.so -> libxatracker.so.2.3.0
 lrwxrwxrwx	root/root	usr/lib32/libxatracker.so.2 -> libxatracker.so.2.3.0
@@ -83,8 +79,3 @@ lrwxrwxrwx	root/root	usr/lib32/vdpau/libvdpau_radeonsi.so -> libvdpau_radeonsi.s
 lrwxrwxrwx	root/root	usr/lib32/vdpau/libvdpau_radeonsi.so.1 -> libvdpau_radeonsi.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib32/vdpau/libvdpau_radeonsi.so.1.0 -> libvdpau_radeonsi.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib32/vdpau/libvdpau_radeonsi.so.1.0.0
-drwxr-xr-x	root/root	usr/share/
-drwxr-xr-x	root/root	usr/share/vulkan/
-drwxr-xr-x	root/root	usr/share/vulkan/icd.d/
--rw-r--r--	root/root	usr/share/vulkan/icd.d/intel_icd.i686.json
--rw-r--r--	root/root	usr/share/vulkan/icd.d/radeon_icd.i686.json
diff --git a/mesa3d-32/.md5sum b/mesa3d-32/.md5sum
index 529d117..6e46343 100644
--- a/mesa3d-32/.md5sum
+++ b/mesa3d-32/.md5sum
@@ -1 +1 @@
-b90ef86280242b670a58fda988bef27c  mesa-17.2.8.tar.xz
+5c59b779925f504ffd0f13c7dcd29ac6  mesa-17.3.2.tar.xz
diff --git a/mesa3d-32/.signature b/mesa3d-32/.signature
index 1401989..38452ca 100644
--- a/mesa3d-32/.signature
+++ b/mesa3d-32/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXWVoXiIZkbAhmTrR/vtJG93SdGREIUCx8mQNNraXa1ne8a6d3pCf1KR/DhPrsuSo9RHwX4dyRlSmFbpR79uM6w0=
-SHA256 (Pkgfile) = 4f18862d75c2148c1e6d436c2106d1fb4735efb587ca2d6cdaadf8614f997bfb
-SHA256 (.footprint) = 3525a461ea3ed78222f72398df19de29ca02852fd7c5abacc9f76057eb4d50bb
-SHA256 (mesa-17.2.8.tar.xz) = 6e940345cceaadfd805d701ed2b956589fa77fe8c39991da30ed51ea6b9d095f
+RWSwxGo/zH7eXdubiQphDqvucPdu7QC+vBvwbahgeq2WbuTLfTAKGwPGsRpIPayuDOiLgi1FWdOZJMA4jAdPm2gBhbbCNR54zAI=
+SHA256 (Pkgfile) = f1e467856716105c99a4c55220d6051c250f210df4c0b38974046b679a006f75
+SHA256 (.footprint) = 7d1170dbd3c5f54f9b29de3a60e76a32fa87035612796025cfb9ab6d44ba3103
+SHA256 (mesa-17.3.2.tar.xz) = e2844a13f2d6f8f24bee65804a51c42d8dc6ae9c36cff7ee61d0940e796d64c6
diff --git a/mesa3d-32/Pkgfile b/mesa3d-32/Pkgfile
index be4e849..c4a8ff1 100644
--- a/mesa3d-32/Pkgfile
+++ b/mesa3d-32/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: elfutils-32 eudev-32 expat-32 libdrm-32 libvdpau-32 llvm-32 mesa3d xorg-dri3proto-32 xorg-glproto-32 xorg-libxdamage-32 xorg-libxshmfence-32 xorg-libxvmc-32 xorg-presentproto-32
 
 name=mesa3d-32
-version=17.2.8
+version=17.3.2
 release=1
 source=(ftp://ftp.freedesktop.org/pub/mesa/mesa-$version.tar.xz)
 
@@ -16,12 +16,15 @@ build() {
 		sed -i -e 's|llvm-config|llvm-config-32|g' $f
 	done
 
+	export LDFLAGS="$LDFLAGS -lLLVM"
+
 	autoreconf --force --install --symlink
 
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--libdir=/usr/lib32 \
+		--host=i686-pc-linux-gnu \
 		--enable-llvm \
 		--enable-gbm \
 		--enable-gles1 \
@@ -35,8 +38,7 @@ build() {
 		--disable-dependency-tracking \
 		--with-platforms=x11,drm \
 		--with-gallium-drivers=r300,r600,svga,swrast,radeonsi,nouveau \
-		--with-vulkan-drivers=intel,radeon \
-		--host=i686-pc-linux-gnu
+		#--with-vulkan-drivers=intel,radeon
 
 	make
 	make DESTDIR=$PKG install

From crux at crux.nu  Thu Jan 18 10:50:12 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu, 18 Jan 2018 10:50:12 +0000 (UTC)
Subject: [crux-commits] ports/compat-32 (3.3): talloc-32: 2.1.10 -> 2.1.11
Message-ID: <20180118105012.EFA8318030E@crux.nu>

commit c7350baf7fdcc7b6661b4224a6d3ca6835560d74
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Thu Jan 18 21:33:13 2018 +1100

    talloc-32: 2.1.10 -> 2.1.11

diff --git a/talloc-32/.footprint b/talloc-32/.footprint
index 37dc67b..ea916e5 100644
--- a/talloc-32/.footprint
+++ b/talloc-32/.footprint
@@ -1,13 +1,13 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
-lrwxrwxrwx	root/root	usr/lib32/libpytalloc-util.so -> libpytalloc-util.so.2.1.10
-lrwxrwxrwx	root/root	usr/lib32/libpytalloc-util.so.2 -> libpytalloc-util.so.2.1.10
--rwxr-xr-x	root/root	usr/lib32/libpytalloc-util.so.2.1.10
--rwxr-xr-x	root/root	usr/lib32/libtalloc-compat1-2.1.10.so
-lrwxrwxrwx	root/root	usr/lib32/libtalloc.so -> libtalloc.so.2.1.10
-lrwxrwxrwx	root/root	usr/lib32/libtalloc.so.1 -> libtalloc-compat1-2.1.10.so
-lrwxrwxrwx	root/root	usr/lib32/libtalloc.so.2 -> libtalloc.so.2.1.10
--rwxr-xr-x	root/root	usr/lib32/libtalloc.so.2.1.10
+lrwxrwxrwx	root/root	usr/lib32/libpytalloc-util.so -> libpytalloc-util.so.2.1.11
+lrwxrwxrwx	root/root	usr/lib32/libpytalloc-util.so.2 -> libpytalloc-util.so.2.1.11
+-rwxr-xr-x	root/root	usr/lib32/libpytalloc-util.so.2.1.11
+-rwxr-xr-x	root/root	usr/lib32/libtalloc-compat1-2.1.11.so
+lrwxrwxrwx	root/root	usr/lib32/libtalloc.so -> libtalloc.so.2.1.11
+lrwxrwxrwx	root/root	usr/lib32/libtalloc.so.1 -> libtalloc-compat1-2.1.11.so
+lrwxrwxrwx	root/root	usr/lib32/libtalloc.so.2 -> libtalloc.so.2.1.11
+-rwxr-xr-x	root/root	usr/lib32/libtalloc.so.2.1.11
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/pytalloc-util.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/talloc.pc
diff --git a/talloc-32/.md5sum b/talloc-32/.md5sum
index 53b19a4..fe3805d 100644
--- a/talloc-32/.md5sum
+++ b/talloc-32/.md5sum
@@ -1 +1 @@
-48b8822a76797bb143e3e38ed738c320  talloc-2.1.10.tar.gz
+452596f904ca2b10322bdaabf147a721  talloc-2.1.11.tar.gz
diff --git a/talloc-32/.signature b/talloc-32/.signature
index b879282..2c5ad36 100644
--- a/talloc-32/.signature
+++ b/talloc-32/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXeEePSot8TxCXv6IJBbnKl9VuNQqayyaD9D0bMWaHho4ZS3vIqV32u0/Ml78xxT281CqWq3pWsiQNPG5a3HBvg0=
-SHA256 (Pkgfile) = a3fd7306518121770b60cddfa66b179b05c99687c29bfd1026664bffcbcb2c78
-SHA256 (.footprint) = fa27861ea1a46d01fe409680e696890889faa8bbfda1d22467943358f6365a23
-SHA256 (talloc-2.1.10.tar.gz) = c985e94bebd6ec2f6af3d95dcc3fcb192a2ddb7781a021d70ee899e26221f619
+RWSwxGo/zH7eXWEsm4NMuEcx8uMtGpGjFzvFncIyPoPsVQ12DSBeeT3DvwRe88G0K5gTmlpu53WlODIaxrsaAEQSXPLDTw5dTAU=
+SHA256 (Pkgfile) = 85907fa4bfa065c099b61ccd23f4875c6941735b89941bb39ada018d70374ea5
+SHA256 (.footprint) = b2a94ba0261fecc0c91b0dcf23b4e9d98ef326d4871966f6be4702d9c0026068
+SHA256 (talloc-2.1.11.tar.gz) = 639eb35556a0af999123c4d883e79be05ff9f00ab4f9e4ac2e5775f9c5eeeed3
diff --git a/talloc-32/Pkgfile b/talloc-32/Pkgfile
index caf7848..f2396e9 100644
--- a/talloc-32/Pkgfile
+++ b/talloc-32/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: python-32 talloc
 
 name=talloc-32
-version=2.1.10
+version=2.1.11
 release=1
 source=(https://samba.org/ftp/${name%-*}/${name%-*}-$version.tar.gz)
 

From crux at crux.nu  Thu Jan 18 10:50:12 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu, 18 Jan 2018 10:50:12 +0000 (UTC)
Subject: [crux-commits] ports/compat-32 (3.3): libgcrypt-32: 1.8.1 -> 1.8.2
Message-ID: <20180118105012.F3684180315@crux.nu>

commit 53b27b7493df5b145b67f37d841f264406ded95e
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Thu Jan 18 21:33:07 2018 +1100

    libgcrypt-32: 1.8.1 -> 1.8.2

diff --git a/libgcrypt-32/.footprint b/libgcrypt-32/.footprint
index 912e01b..38e8803 100644
--- a/libgcrypt-32/.footprint
+++ b/libgcrypt-32/.footprint
@@ -2,6 +2,6 @@ drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
 -rw-r--r--	root/root	usr/lib32/libgcrypt.a
 -rwxr-xr-x	root/root	usr/lib32/libgcrypt.la
-lrwxrwxrwx	root/root	usr/lib32/libgcrypt.so -> libgcrypt.so.20.2.1
-lrwxrwxrwx	root/root	usr/lib32/libgcrypt.so.20 -> libgcrypt.so.20.2.1
--rwxr-xr-x	root/root	usr/lib32/libgcrypt.so.20.2.1
+lrwxrwxrwx	root/root	usr/lib32/libgcrypt.so -> libgcrypt.so.20.2.2
+lrwxrwxrwx	root/root	usr/lib32/libgcrypt.so.20 -> libgcrypt.so.20.2.2
+-rwxr-xr-x	root/root	usr/lib32/libgcrypt.so.20.2.2
diff --git a/libgcrypt-32/.md5sum b/libgcrypt-32/.md5sum
index ce6f91c..1d30e3e 100644
--- a/libgcrypt-32/.md5sum
+++ b/libgcrypt-32/.md5sum
@@ -1 +1 @@
-b21817f9d850064d2177285f1073ec55  libgcrypt-1.8.1.tar.bz2
+cfb0b5c79eab07686b6898160a407139  libgcrypt-1.8.2.tar.bz2
diff --git a/libgcrypt-32/.signature b/libgcrypt-32/.signature
index dde6fdb..5efa1ee 100644
--- a/libgcrypt-32/.signature
+++ b/libgcrypt-32/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXT4eQQ+dn8vLutwZoxYCBqjPk6GBdfwa/QHnwvD25DbaLcnSQRdJXMCV1KQgXkUPNQrq+6fZhLzIN5DSV6uByQg=
-SHA256 (Pkgfile) = 3bd1878e8fdc1315a9a6384abe027b4a9a67b1aa5c94a108ef6032b47656b894
-SHA256 (.footprint) = d4408e8aca18362bf98aee874608ebc7bcdda23a38fb42606cd8a948fcb86e62
-SHA256 (libgcrypt-1.8.1.tar.bz2) = 7a2875f8b1ae0301732e878c0cca2c9664ff09ef71408f085c50e332656a78b3
+RWSwxGo/zH7eXTSNcsJm6pSUxvyTAVvTjc+/6XnNZ/spMnh7vX/qBGvOq5O4NTk8kKn/emnKfgJpUZnAh/WVm1Nlu/fEgKcjVAg=
+SHA256 (Pkgfile) = d9964315198d47376c21d58a2f92734ce75d92653437ccdee8fb601875463b8f
+SHA256 (.footprint) = 14d158df089eb136acacae689d0b48ca3ff27b46582cb3e48cbe29fa0bfade00
+SHA256 (libgcrypt-1.8.2.tar.bz2) = c8064cae7558144b13ef0eb87093412380efa16c4ee30ad12ecb54886a524c07
diff --git a/libgcrypt-32/Pkgfile b/libgcrypt-32/Pkgfile
index 9f2ab6e..59143d2 100644
--- a/libgcrypt-32/Pkgfile
+++ b/libgcrypt-32/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: libgcrypt libgpg-error-32
 
 name=libgcrypt-32
-version=1.8.1
+version=1.8.2
 release=1
 source=(https://www.gnupg.org/ftp/gcrypt/${name%-*}/${name%-*}-$version.tar.bz2)
 

From crux at crux.nu  Thu Jan 18 10:50:13 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu, 18 Jan 2018 10:50:13 +0000 (UTC)
Subject: [crux-commits] ports/compat-32 (3.3): kmod-32: 24 -> 25
Message-ID: <20180118105013.0404A180316@crux.nu>

commit 2de0295e98d55df2d2a321e87869e9aa013d1fb2
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Thu Jan 18 21:32:58 2018 +1100

    kmod-32: 24 -> 25

diff --git a/kmod-32/.footprint b/kmod-32/.footprint
index 0011397..8e953f9 100644
--- a/kmod-32/.footprint
+++ b/kmod-32/.footprint
@@ -1,9 +1,9 @@
 drwxr-xr-x	root/root	lib32/
-lrwxrwxrwx	root/root	lib32/libkmod.so.2 -> libkmod.so.2.3.2
--rwxr-xr-x	root/root	lib32/libkmod.so.2.3.2
+lrwxrwxrwx	root/root	lib32/libkmod.so.2 -> libkmod.so.2.3.3
+-rwxr-xr-x	root/root	lib32/libkmod.so.2.3.3
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
 -rwxr-xr-x	root/root	usr/lib32/libkmod.la
-lrwxrwxrwx	root/root	usr/lib32/libkmod.so -> ../../lib32/libkmod.so.2.3.2
+lrwxrwxrwx	root/root	usr/lib32/libkmod.so -> ../../lib32/libkmod.so.2.3.3
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/libkmod.pc
diff --git a/kmod-32/.md5sum b/kmod-32/.md5sum
index 1f4d409..51b8c09 100644
--- a/kmod-32/.md5sum
+++ b/kmod-32/.md5sum
@@ -1 +1 @@
-08297dfb6f2b3f625f928ca3278528af  kmod-24.tar.xz
+34f325cab568f842fdde4f8b2182f220  kmod-25.tar.xz
diff --git a/kmod-32/.signature b/kmod-32/.signature
index 56372cd..49456f6 100644
--- a/kmod-32/.signature
+++ b/kmod-32/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXfctuazaCp0coRLgIEbj21rBjIT4m5On7TPBJKvdcjlmYSLTDjqBMx1s8FrgQkLAsGhSs9bTJ1WW4YrgIZvycwk=
-SHA256 (Pkgfile) = a0ac2bac4cb485663c447768bfc9fbaf34e299ba36b1dee44094067613d7f004
-SHA256 (.footprint) = 03e4d7964c709496621fa8affba36eb212850d65a86aaa8c824068d54c39ad10
-SHA256 (kmod-24.tar.xz) = 610b8d1df172acc39a4fdf1eaa47a57b04873c82f32152e7a62e29b6ff9cb397
+RWSwxGo/zH7eXTmK8/KILM508VBWYTZ10P7p8NjjRlbcaH0sjclIXthdLB6kUj6/Z9XkQhxwzo67b9EfjbCVXQfbVct+rATMTAk=
+SHA256 (Pkgfile) = ad4fdfc9269c4d57a0f9aab26b19297b55b1d19e1f04d45e782bb9e1aefb2a1d
+SHA256 (.footprint) = abe0d2baa54cc08061de806c9ff84ab793aebd5ec8c55ef6235fd941255ea879
+SHA256 (kmod-25.tar.xz) = 7165e6496656159dcb909a91ed708a0fe273a4b128b4b1dc997ccb5189eef1cd
diff --git a/kmod-32/Pkgfile b/kmod-32/Pkgfile
index 5b14fb8..c50e05b 100644
--- a/kmod-32/Pkgfile
+++ b/kmod-32/Pkgfile
@@ -4,7 +4,7 @@
 # Sepends on: kmod
 
 name=kmod-32
-version=24
+version=25
 release=1
 source=(https://www.kernel.org/pub/linux/utils/kernel/${name%-*}/${name%-*}-$version.tar.xz)
 

From crux at crux.nu  Thu Jan 18 10:50:13 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu, 18 Jan 2018 10:50:13 +0000 (UTC)
Subject: [crux-commits] ports/compat-32 (3.3): gtk-32: 2.24.31 -> 2.24.32
Message-ID: <20180118105013.071E018031E@crux.nu>

commit 734394810f1f673da125353d2c8e8ff228129828
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Thu Jan 18 21:32:51 2018 +1100

    gtk-32: 2.24.31 -> 2.24.32

diff --git a/gtk-32/.footprint b/gtk-32/.footprint
index 48c4320..2f9ae13 100644
--- a/gtk-32/.footprint
+++ b/gtk-32/.footprint
@@ -47,13 +47,13 @@ lrwxrwxrwx	root/root	usr/lib32/libgailutil.so -> libgailutil.so.18.0.1
 lrwxrwxrwx	root/root	usr/lib32/libgailutil.so.18 -> libgailutil.so.18.0.1
 -rwxr-xr-x	root/root	usr/lib32/libgailutil.so.18.0.1
 -rw-r--r--	root/root	usr/lib32/libgdk-x11-2.0.la
-lrwxrwxrwx	root/root	usr/lib32/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.2400.31
-lrwxrwxrwx	root/root	usr/lib32/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.2400.31
--rwxr-xr-x	root/root	usr/lib32/libgdk-x11-2.0.so.0.2400.31
+lrwxrwxrwx	root/root	usr/lib32/libgdk-x11-2.0.so -> libgdk-x11-2.0.so.0.2400.32
+lrwxrwxrwx	root/root	usr/lib32/libgdk-x11-2.0.so.0 -> libgdk-x11-2.0.so.0.2400.32
+-rwxr-xr-x	root/root	usr/lib32/libgdk-x11-2.0.so.0.2400.32
 -rw-r--r--	root/root	usr/lib32/libgtk-x11-2.0.la
-lrwxrwxrwx	root/root	usr/lib32/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.2400.31
-lrwxrwxrwx	root/root	usr/lib32/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.2400.31
--rwxr-xr-x	root/root	usr/lib32/libgtk-x11-2.0.so.0.2400.31
+lrwxrwxrwx	root/root	usr/lib32/libgtk-x11-2.0.so -> libgtk-x11-2.0.so.0.2400.32
+lrwxrwxrwx	root/root	usr/lib32/libgtk-x11-2.0.so.0 -> libgtk-x11-2.0.so.0.2400.32
+-rwxr-xr-x	root/root	usr/lib32/libgtk-x11-2.0.so.0.2400.32
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/gail.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/gdk-2.0.pc
diff --git a/gtk-32/.md5sum b/gtk-32/.md5sum
index 80b8cce..08eb7a5 100644
--- a/gtk-32/.md5sum
+++ b/gtk-32/.md5sum
@@ -1 +1 @@
-526a1008586094a2cbb4592fd3f9ee10  gtk+-2.24.31.tar.xz
+d5742aa42275203a499b59b4c382a784  gtk+-2.24.32.tar.xz
diff --git a/gtk-32/.signature b/gtk-32/.signature
index e937e3f..1a8dd5a 100644
--- a/gtk-32/.signature
+++ b/gtk-32/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXX3n6CC2QD6ox1JwBuWmtfAyhDWaEM3uR2MRdlpHYKWSYtkrNhp79LgSIYWGmG4EDEOhVijcf7rWOra0OVC0Lgw=
-SHA256 (Pkgfile) = d137d82f1ac6d8c3742fe59bdd3051f4a4f6bb8ede2c817fcf2bb22d9ff95a45
-SHA256 (.footprint) = 432d833c1749d8122d93c269718266034ea96128f5fdbaa14445178f80578284
-SHA256 (gtk+-2.24.31.tar.xz) = 68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658
+RWSwxGo/zH7eXf631uhX/gso5EncaG21AABjhiNCIjzxMI9IYkwgDIY95WpgdmEn9hb01fB+jHwsqrhhypHTCOTFm57VGZJyaQs=
+SHA256 (Pkgfile) = 69a6ae2b96acf972e690e968a41b184d36ce26584dc5b34975d4a1fc757b3316
+SHA256 (.footprint) = 8c21cbdd3363018d36c32e4f69fd888e79f807d9f28831d825624182470a0d00
+SHA256 (gtk+-2.24.32.tar.xz) = b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e
diff --git a/gtk-32/Pkgfile b/gtk-32/Pkgfile
index 0d34b86..11d8367 100644
--- a/gtk-32/Pkgfile
+++ b/gtk-32/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: atk-32 gdk-pixbuf-32 gtk pango-32 xorg-libxcomposite-32 xorg-libxcursor-32 xorg-libxinerama-32 xorg-libxrandr-32
 
 name=gtk-32
-version=2.24.31
+version=2.24.32
 release=1
 source=(http://download.gnome.org/sources/gtk+/${version%.*}/gtk+-$version.tar.xz)
 

From crux at crux.nu  Thu Jan 18 10:50:13 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu, 18 Jan 2018 10:50:13 +0000 (UTC)
Subject: [crux-commits] ports/compat-32 (3.3): glib-32: 2.54.2 -> 2.54.3
Message-ID: <20180118105013.0A383180983@crux.nu>

commit 03ce3f597d8bf2d5bb301f7708af6858b87c11a6
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Thu Jan 18 21:32:41 2018 +1100

    glib-32: 2.54.2 -> 2.54.3

diff --git a/glib-32/.footprint b/glib-32/.footprint
index 48bd6ae..fc0e6d4 100644
--- a/glib-32/.footprint
+++ b/glib-32/.footprint
@@ -1,31 +1,31 @@
 drwxr-xr-x	root/root	lib32/
 drwxr-xr-x	root/root	lib32/gio/
 drwxr-xr-x	root/root	lib32/gio/modules/
-lrwxrwxrwx	root/root	lib32/libgio-2.0.so.0 -> libgio-2.0.so.0.5400.2
--rwxr-xr-x	root/root	lib32/libgio-2.0.so.0.5400.2
-lrwxrwxrwx	root/root	lib32/libglib-2.0.so.0 -> libglib-2.0.so.0.5400.2
--rwxr-xr-x	root/root	lib32/libglib-2.0.so.0.5400.2
-lrwxrwxrwx	root/root	lib32/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.5400.2
--rwxr-xr-x	root/root	lib32/libgmodule-2.0.so.0.5400.2
-lrwxrwxrwx	root/root	lib32/libgobject-2.0.so.0 -> libgobject-2.0.so.0.5400.2
--rwxr-xr-x	root/root	lib32/libgobject-2.0.so.0.5400.2
-lrwxrwxrwx	root/root	lib32/libgthread-2.0.so.0 -> libgthread-2.0.so.0.5400.2
--rwxr-xr-x	root/root	lib32/libgthread-2.0.so.0.5400.2
+lrwxrwxrwx	root/root	lib32/libgio-2.0.so.0 -> libgio-2.0.so.0.5400.3
+-rwxr-xr-x	root/root	lib32/libgio-2.0.so.0.5400.3
+lrwxrwxrwx	root/root	lib32/libglib-2.0.so.0 -> libglib-2.0.so.0.5400.3
+-rwxr-xr-x	root/root	lib32/libglib-2.0.so.0.5400.3
+lrwxrwxrwx	root/root	lib32/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.5400.3
+-rwxr-xr-x	root/root	lib32/libgmodule-2.0.so.0.5400.3
+lrwxrwxrwx	root/root	lib32/libgobject-2.0.so.0 -> libgobject-2.0.so.0.5400.3
+-rwxr-xr-x	root/root	lib32/libgobject-2.0.so.0.5400.3
+lrwxrwxrwx	root/root	lib32/libgthread-2.0.so.0 -> libgthread-2.0.so.0.5400.3
+-rwxr-xr-x	root/root	lib32/libgthread-2.0.so.0.5400.3
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/lib32/
 drwxr-xr-x	root/root	usr/lib32/glib-2.0/
 drwxr-xr-x	root/root	usr/lib32/glib-2.0/include/
 -rw-r--r--	root/root	usr/lib32/glib-2.0/include/glibconfig.h
 -rwxr-xr-x	root/root	usr/lib32/libgio-2.0.la
-lrwxrwxrwx	root/root	usr/lib32/libgio-2.0.so -> ../../lib32/libgio-2.0.so.0.5400.2
+lrwxrwxrwx	root/root	usr/lib32/libgio-2.0.so -> ../../lib32/libgio-2.0.so.0.5400.3
 -rwxr-xr-x	root/root	usr/lib32/libglib-2.0.la
-lrwxrwxrwx	root/root	usr/lib32/libglib-2.0.so -> ../../lib32/libglib-2.0.so.0.5400.2
+lrwxrwxrwx	root/root	usr/lib32/libglib-2.0.so -> ../../lib32/libglib-2.0.so.0.5400.3
 -rwxr-xr-x	root/root	usr/lib32/libgmodule-2.0.la
-lrwxrwxrwx	root/root	usr/lib32/libgmodule-2.0.so -> ../../lib32/libgmodule-2.0.so.0.5400.2
+lrwxrwxrwx	root/root	usr/lib32/libgmodule-2.0.so -> ../../lib32/libgmodule-2.0.so.0.5400.3
 -rwxr-xr-x	root/root	usr/lib32/libgobject-2.0.la
-lrwxrwxrwx	root/root	usr/lib32/libgobject-2.0.so -> ../../lib32/libgobject-2.0.so.0.5400.2
+lrwxrwxrwx	root/root	usr/lib32/libgobject-2.0.so -> ../../lib32/libgobject-2.0.so.0.5400.3
 -rwxr-xr-x	root/root	usr/lib32/libgthread-2.0.la
-lrwxrwxrwx	root/root	usr/lib32/libgthread-2.0.so -> ../../lib32/libgthread-2.0.so.0.5400.2
+lrwxrwxrwx	root/root	usr/lib32/libgthread-2.0.so -> ../../lib32/libgthread-2.0.so.0.5400.3
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/gio-2.0.pc
 -rw-r--r--	root/root	usr/lib32/pkgconfig/gio-unix-2.0.pc
diff --git a/glib-32/.md5sum b/glib-32/.md5sum
index fccf54c..ef554cb 100644
--- a/glib-32/.md5sum
+++ b/glib-32/.md5sum
@@ -1 +1 @@
-50f83e08f080f99b1e2f0ad2b760fb81  glib-2.54.2.tar.xz
+16e886ad677bf07b7d48eb8188bcf759  glib-2.54.3.tar.xz
diff --git a/glib-32/.signature b/glib-32/.signature
index fafb46c..6ecf033 100644
--- a/glib-32/.signature
+++ b/glib-32/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXb2+rtu7cc+yw+tcdHy9x1/mDplwKnmNAL/8Ib0+LFKs2HyhfeAl5dxdO6FbWg9qllBmADHU/rRJP463OngBAQ4=
-SHA256 (Pkgfile) = de8b53275b6587d9724ca7e6cc1e797f404c019947c80d9faf4f19fd6336b00a
-SHA256 (.footprint) = 5927bd152065c88811c65154d3a3c2c9b0804bb93a92e58c71549ec127f9ff2d
-SHA256 (glib-2.54.2.tar.xz) = bb89e5c5aad33169a8c7f28b45671c7899c12f74caf707737f784d7102758e6c
+RWSwxGo/zH7eXRDIk9r+pk/E/3DSFNE0tneT5OEwR5jrPk/7c8Co/TeUycepJvzB1zjlDiNl3G4205pzEvj6/nSOkChqlt3P8AY=
+SHA256 (Pkgfile) = f053e3009801c13ac275af88da85b2b39d5360e4c052b016a1eca95cd81f8996
+SHA256 (.footprint) = fb34595c8357c427da72cf51c3db3d3e7f2e9e0db4c7b3357050517b4f67455c
+SHA256 (glib-2.54.3.tar.xz) = 963fdc6685dc3da8e5381dfb9f15ca4b5709b28be84d9d05a9bb8e446abac0a8
diff --git a/glib-32/Pkgfile b/glib-32/Pkgfile
index 52749d6..242161e 100644
--- a/glib-32/Pkgfile
+++ b/glib-32/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: libffi-32 libpcre-32 python-32 util-linux-32 glib
 
 name=glib-32
-version=2.54.2
+version=2.54.3
 release=1
 source=(https://download.gnome.org/sources/glib/${version:0:4}/${name%-*}-$version.tar.xz)
 

From crux at crux.nu  Thu Jan 18 10:50:13 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu, 18 Jan 2018 10:50:13 +0000 (UTC)
Subject: [crux-commits] ports/compat-32 (3.3): freetype-32: 2.8.1 -> 2.9
Message-ID: <20180118105013.0D5E6182632@crux.nu>

commit aa7eb788a2897a27159d4d872badff3789904da3
Author: Danny Rawlins <monster.romster at gmail.com>
Date:   Thu Jan 18 21:32:34 2018 +1100

    freetype-32: 2.8.1 -> 2.9

diff --git a/freetype-32/.footprint b/freetype-32/.footprint
index 5a3a10b..f24d2df 100644
--- a/freetype-32/.footprint
+++ b/freetype-32/.footprint
@@ -4,8 +4,8 @@ drwxr-xr-x	root/root	usr/bin/
 drwxr-xr-x	root/root	usr/lib32/
 -rw-r--r--	root/root	usr/lib32/libfreetype.a
 -rwxr-xr-x	root/root	usr/lib32/libfreetype.la
-lrwxrwxrwx	root/root	usr/lib32/libfreetype.so -> libfreetype.so.6.15.0
-lrwxrwxrwx	root/root	usr/lib32/libfreetype.so.6 -> libfreetype.so.6.15.0
--rwxr-xr-x	root/root	usr/lib32/libfreetype.so.6.15.0
+lrwxrwxrwx	root/root	usr/lib32/libfreetype.so -> libfreetype.so.6.16.0
+lrwxrwxrwx	root/root	usr/lib32/libfreetype.so.6 -> libfreetype.so.6.16.0
+-rwxr-xr-x	root/root	usr/lib32/libfreetype.so.6.16.0
 drwxr-xr-x	root/root	usr/lib32/pkgconfig/
 -rw-r--r--	root/root	usr/lib32/pkgconfig/freetype2.pc
diff --git a/freetype-32/.md5sum b/freetype-32/.md5sum
index 5e4e1fd..fa72720 100644
--- a/freetype-32/.md5sum
+++ b/freetype-32/.md5sum
@@ -1 +1 @@
-bf0a210b6fe781228fa0e4a80691a521  freetype-2.8.1.tar.bz2
+513c403c110016fdc7e537216a642b1d  freetype-2.9.tar.bz2
diff --git a/freetype-32/.signature b/freetype-32/.signature
index 9583a74..ea03d51 100644
--- a/freetype-32/.signature
+++ b/freetype-32/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/compat-32.pub
-RWSwxGo/zH7eXYFX4I3JwW29FuWujoiQ1dy9Vj0glG5b3Agcrxz5NjqMf4zFVg4JDsxzhQgJ5L/dUNpwgxKGmbh1mGFzVeeX2wI=
-SHA256 (Pkgfile) = 37daa8c09195980ac6a9a6650dda8081f55419d0a1340512bbad2b85ce6975df
-SHA256 (.footprint) = 78b7a52bfc206c93002c49a6024ed2e41bb18313b7a52c465a973b047613ed48
-SHA256 (freetype-2.8.1.tar.bz2) = e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78
+RWSwxGo/zH7eXcwHdRDYUey8+3rEWZyoyT6Ky7dXI9/l9k9eR2n8QpjwoKIc1hhq+eaOgAWCAyYMcVlssvLU26B9nnPX96+LewA=
+SHA256 (Pkgfile) = 99dcac87feac6abf5565081e3ea61294ba0cd411cc1375b0e360fb63defb3bc7
+SHA256 (.footprint) = be67e1458b18a743133776b50806a885e4354ee67b6f9861e787a5e8bdc6aafe
+SHA256 (freetype-2.9.tar.bz2) = e6ffba3c8cef93f557d1f767d7bc3dee860ac7a3aaff588a521e081bc36f4c8a
diff --git a/freetype-32/Pkgfile b/freetype-32/Pkgfile
index 42f353e..068b8b8 100644
--- a/freetype-32/Pkgfile
+++ b/freetype-32/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: freetype libpng-32
 
 name=freetype-32
-version=2.8.1
+version=2.9
 release=1
 source=(https://download.savannah.gnu.org/releases/${name%-*}/${name%-*}-$version.tar.bz2)
 

From crux at crux.nu  Thu Jan 18 18:33:48 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu, 18 Jan 2018 18:33:48 +0000 (UTC)
Subject: [crux-commits] ports/core (3.3): tzdata: update to 2018b
Message-ID: <20180118183348.D323918008F@crux.nu>

commit 652155bf064a0edb0198165c8ffb5677d29e3af1
Author: Juergen Daubert <jue at jue.li>
Date:   Thu Jan 18 19:33:27 2018 +0100

    tzdata: update to 2018b

diff --git a/tzdata/.footprint b/tzdata/.footprint
index 1d4814a8..de1c5808 100644
--- a/tzdata/.footprint
+++ b/tzdata/.footprint
@@ -1,10 +1,10 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/tzselect
+-rwxr-xr-x	root/root	usr/bin/zdump
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libtz.a
 drwxr-xr-x	root/root	usr/sbin/
--rwxr-xr-x	root/root	usr/sbin/zdump
 -rwxr-xr-x	root/root	usr/sbin/zic
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
@@ -618,7 +618,6 @@ drwxr-xr-x	root/root	usr/share/zoneinfo-leaps/US/
 -rw-r--r--	root/root	usr/share/zoneinfo-leaps/US/Michigan
 -rw-r--r--	root/root	usr/share/zoneinfo-leaps/US/Mountain
 -rw-r--r--	root/root	usr/share/zoneinfo-leaps/US/Pacific
--rw-r--r--	root/root	usr/share/zoneinfo-leaps/US/Pacific-New
 -rw-r--r--	root/root	usr/share/zoneinfo-leaps/US/Samoa
 -rw-r--r--	root/root	usr/share/zoneinfo-leaps/UTC
 -rw-r--r--	root/root	usr/share/zoneinfo-leaps/Universal
@@ -1233,7 +1232,6 @@ drwxr-xr-x	root/root	usr/share/zoneinfo/US/
 -rw-r--r--	root/root	usr/share/zoneinfo/US/Michigan
 -rw-r--r--	root/root	usr/share/zoneinfo/US/Mountain
 -rw-r--r--	root/root	usr/share/zoneinfo/US/Pacific
--rw-r--r--	root/root	usr/share/zoneinfo/US/Pacific-New
 -rw-r--r--	root/root	usr/share/zoneinfo/US/Samoa
 -rw-r--r--	root/root	usr/share/zoneinfo/UTC
 -rw-r--r--	root/root	usr/share/zoneinfo/Universal
@@ -1242,7 +1240,6 @@ drwxr-xr-x	root/root	usr/share/zoneinfo/US/
 -rw-r--r--	root/root	usr/share/zoneinfo/Zulu
 -rw-r--r--	root/root	usr/share/zoneinfo/iso3166.tab
 -rw-r--r--	root/root	usr/share/zoneinfo/leapseconds
--rw-r--r--	root/root	usr/share/zoneinfo/localtime
 -rw-r--r--	root/root	usr/share/zoneinfo/posixrules
 -rw-r--r--	root/root	usr/share/zoneinfo/tzdata.zi
 -rw-r--r--	root/root	usr/share/zoneinfo/zone.tab
diff --git a/tzdata/.md5sum b/tzdata/.md5sum
index fb59d334..b98e2a25 100644
--- a/tzdata/.md5sum
+++ b/tzdata/.md5sum
@@ -1,2 +1 @@
-2fe6986231db5182c61d565021a0cd7b  tzcode2017c.tar.gz
-1e751e7e08f8b68530674f04619d894d  tzdata2017c.tar.gz
+e602273e3103e80a44f89555fade9c4c  tzdb-2018b.tar.lz
diff --git a/tzdata/.signature b/tzdata/.signature
index 2ca9fe2c..c2037fec 100644
--- a/tzdata/.signature
+++ b/tzdata/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeql5dQNme6wQpt/cHK5Jig2EJb1UkLcs/UTCX6vOSG55ONC3dqpqKaa+BaizWGz6wWHtyRjSMwhDqcMWRn6zS8go=
-SHA256 (Pkgfile) = 10706387f38934bd11c9c387b1b684ade75e872c4c4a1e5e05e279a5b1280f75
-SHA256 (.footprint) = 5dbcc6f162091ef626e4cce30b58e7814df2ec032d68ba63649796166acb9041
-SHA256 (tzdata2017c.tar.gz) = d6543f92a929826318e2f44ff3a7611ce5f565a43e10250b42599d0ba4cbd90b
-SHA256 (tzcode2017c.tar.gz) = 81e8b4bc23e60906640c266bbff3789661e22f0fa29fe61b96ec7c2816c079b7
+RWRJc1FUaeVeqvFHvPOZLmaIfVe6nGUOGdTjPlb79kLDYEjClIsyM8pXcG9q+le3qXEt8Cc5WR43CpNVJkDRKlEjME3WGlkrzg0=
+SHA256 (Pkgfile) = ae73aac7bc38f4f2e06223e3c83a7cc28882f8814608f348a7d3fa6967be46ab
+SHA256 (.footprint) = e67070821dab31530ca47dd0072385f94d88a25f7b26a55c2183f0d35e30bbdb
+SHA256 (tzdb-2018b.tar.lz) = c66d5433092bc82af63dd1e8e96e4b941f5f9c4b474d3dae30a2da333197af77
diff --git a/tzdata/Pkgfile b/tzdata/Pkgfile
index e4c436a5..0c983ae4 100644
--- a/tzdata/Pkgfile
+++ b/tzdata/Pkgfile
@@ -3,25 +3,20 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu 
 
 name=tzdata
-version=2017c
+version=2018b
 release=1
-source=(http://www.iana.org/time-zones/repository/releases/$name$version.tar.gz
-        http://www.iana.org/time-zones/repository/releases/tzcode$version.tar.gz)
+source=(https://data.iana.org/time-zones/releases/tzdb-$version.tar.lz)
 
 build() {
+    cd tzdb-$version
 
-    make -j1 install \
-        CFLAGS="$CFLAGS" \
-        DESTDIR=$PKG \
-        TOPDIR=/usr \
-        TZDIR=/usr/share/zoneinfo \
-        ETCDIR=/usr/sbin \
-        MANDIR=/usr/share/man 
+    make CFLAGS="$CFLAGS"
+    make DESTDIR=$PKG install
 
     # provided by man-pages
     rm -r $PKG/usr/share/man/man{5,8}
 
-    # move tzselect to /usr/bin
-    install -d $PKG/usr/bin
-    mv $PKG/usr/{sbin/tzselect,bin}
+    # conflict with glibc
+    rm $PKG/etc/localtime
+    rmdir $PKG/etc
 }

From crux at crux.nu  Thu Jan 18 21:11:20 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu, 18 Jan 2018 21:11:20 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): nss: updated to 3.35
Message-ID: <20180118211120.39E6D1802C9@crux.nu>

commit 77d335f7bdbb36f02749a721e90271a5d5a1041f
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Thu Jan 18 19:48:46 2018 +0100

    nss: updated to 3.35

diff --git a/nss/.md5sum b/nss/.md5sum
index 60a13ac92..34d9e66fd 100644
--- a/nss/.md5sum
+++ b/nss/.md5sum
@@ -1,4 +1,4 @@
-5922468bb1c54e4c8067f153fcf467e5  nss-3.34.1.tar.gz
+9467ec9e65c5aeb3254a50250490f5f7  nss-3.35.tar.gz
 17226659298a9d9bb3f323186d220f6f  nss-config.in
 bf2ff51cef976ccd0a4832835eec8195  nss-softokn.pc.in
 9ad2a26c137208ff292061143c7cc227  nss-util.pc.in
diff --git a/nss/.signature b/nss/.signature
index e9d7a8c61..31af8fce2 100644
--- a/nss/.signature
+++ b/nss/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/X0VkaZ4cZKU39H2l800tQZyLjhD69ndapwq3JuSTWWDGO/Q+gTaI/DRYl21ikICiJG6s/4q+gQNxO+JjVg6yQk=
-SHA256 (Pkgfile) = 5c7af84dbaed20894ee54fcad4bc47d37ce82a3a7307942c634ef82440a46a11
+RWSE3ohX2g5d/cBL89luVMp0fRmcjoa4m/ZBqwzx2eB2H9a4fsyE9MjHaMPVxgclzLFCi+HgVh+Pg1kCyxDKJjOBxUmDq/GHhwQ=
+SHA256 (Pkgfile) = 0dae045713dbfd5cb5edcc679326c60b46cf78af546956674a135e955831c2b0
 SHA256 (.footprint) = b8b92e5a40d81f6b6d18df34abcf87e90cc48f337151f560ceb23c2728a7703a
-SHA256 (nss-3.34.1.tar.gz) = a3c15d367caf784f33d96dbafbdffc16a8e42fb8c8aedfce97bf92a9f918dda0
+SHA256 (nss-3.35.tar.gz) = f4127de09bede39f5fd0f789d33c3504c5d261e69ea03022d46b319b3e32f6fa
 SHA256 (nss-config.in) = 08dbc1202186308e86125b5c5e7e2d0e1bd1bd5ed65eab011b9af210f656aff5
 SHA256 (nss.pc.in) = 135fbde6866e422b7a436e18d5b8e0defbb67dde6b8e1dc9e84de14b5c645626
 SHA256 (nss-util.pc.in) = a8b264050fd3b372c58e3eec81b2dc3b369567d0a5f4d085830cd77220e2ac2a
diff --git a/nss/Pkgfile b/nss/Pkgfile
index 39b1ac567..dda14fe2a 100644
--- a/nss/Pkgfile
+++ b/nss/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  nspr sqlite3
 
 name=nss
-version=3.34.1
+version=3.35
 release=1
 source=(http://ftp.mozilla.org/pub/security/nss/releases/NSS_${version//./_}_RTM/src/$name-$version.tar.gz \
         nss-config.in nss.pc.in nss-util.pc.in nss-softokn.pc.in)

From crux at crux.nu  Thu Jan 18 21:11:20 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu, 18 Jan 2018 21:11:20 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): nspr: updated to 4.18
Message-ID: <20180118211120.3D65118263B@crux.nu>

commit 10b1c4ec790d126706be3715ecd0e95306ad4b44
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Thu Jan 18 19:47:15 2018 +0100

    nspr: updated to 4.18

diff --git a/nspr/.md5sum b/nspr/.md5sum
index 08334b97c..15099c7a0 100644
--- a/nspr/.md5sum
+++ b/nspr/.md5sum
@@ -1,2 +1,2 @@
-0534d9ac45dca251655b9b240670eab4  nspr-4.17.tar.gz
+2a558f9aeb109bfb16d78bdc42033a1e  nspr-4.18.tar.gz
 2083f33e11dfe15feb7bf9bca0f6c44b  nspr.pc.in
diff --git a/nspr/.signature b/nspr/.signature
index bfc563d04..26e55f1e8 100644
--- a/nspr/.signature
+++ b/nspr/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/dUZOi3p4y1dnrQHKEYaJDjZkDbhGrR7C6T+9LDsw5ssFvpjOLtMXjHQmp23iugyjPOGS1PSGfttVHpk+qhGHQ0=
-SHA256 (Pkgfile) = b6444b7136bbae0cd870aa4e270410012ef8874c42ca9ed8334689a9b18fde92
+RWSE3ohX2g5d/XAzdAHZdRGH5XYqMquYXD3SmQa4VK6qWE/rGIW3YZkngZJrrIyXQUeSSKqqlK+H07/zxaq2wVxkdHaI23ZiGQE=
+SHA256 (Pkgfile) = 0ded4cf497b0a176df494a5791ddb812f8b7bd18e846dd17cd3588cdfc4c7a27
 SHA256 (.footprint) = ca5a9f3ef9c25bbb9276ddaf58e30935286f63deee679e7268d602e09f9934af
-SHA256 (nspr-4.17.tar.gz) = 590a0aea29412ae22d7728038c21ef2ab42646e48172a47d2e4bb782846d1095
+SHA256 (nspr-4.18.tar.gz) = b89657c09bf88707d06ac238b8930d3ae08de68cb3edccfdc2e3dc97f9c8fb34
 SHA256 (nspr.pc.in) = 57a655d034221760ce10278d2050bbe040b1db55be3db6e3a30f04a570877b71
diff --git a/nspr/Pkgfile b/nspr/Pkgfile
index d6ea494d9..86ea0723f 100644
--- a/nspr/Pkgfile
+++ b/nspr/Pkgfile
@@ -3,7 +3,7 @@
 # Maintainer:  Fredrik Rinnestam, fredrik at rinnestam dot se
 
 name=nspr
-version=4.17
+version=4.18
 release=1
 source=(https://ftp.mozilla.org/pub/nspr/releases/v$version/src/$name-$version.tar.gz
         $name.pc.in)

From crux at crux.nu  Thu Jan 18 21:54:35 2018
From: crux at crux.nu (crux at crux.nu)
Date: Thu, 18 Jan 2018 21:54:35 +0000 (UTC)
Subject: [crux-commits] ports/contrib (3.3): net-snmp: force single thread
 build
Message-ID: <20180118215435.84348180297@crux.nu>

commit 1674fffdadc5dca76d594cad49d83bb5c2f26419
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Thu Jan 18 22:54:22 2018 +0100

    net-snmp: force single thread build

diff --git a/net-snmp/.signature b/net-snmp/.signature
index 62d536c7..5c2ddb24 100644
--- a/net-snmp/.signature
+++ b/net-snmp/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/contrib.pub
-RWSagIOpLGJF30yVBB21cI7q4Uuz/ymYb0u95iNQY0LzFqK4nAHoo8MfKQHNyuxcgg6KP83+7tGVwUUIajFtRrmx9/OCsxzHTQ8=
-SHA256 (Pkgfile) = 6c2faa592ac7d4b2b78a38728bb44ee1d76981f6d4984b7a7f1e61c1e9f85945
+RWSagIOpLGJF32Zho/UyinbScWY8yuoUMXGJXBPFiQYJSByEeJFvk8IaMq6t7CGAVP3/sP7tEb2udJe3cjfDtjEKaSQlmlDPGAA=
+SHA256 (Pkgfile) = ecf9b8008b80c92e2b3fae29d7f54690b19dc454e988b33408d39d819549afc8
 SHA256 (.footprint) = 2d2151d495c0cefd7ba68f015153e8e75fba53dd10165903220b0fe2c68e27c3
 SHA256 (net-snmp-5.7.3.tar.gz) = 12ef89613c7707dc96d13335f153c1921efc9d61d3708ef09f3fc4a7014fb4f0
 SHA256 (snmpd) = 2f8945dd66668cccd4ad884bbc1f425dfb5ace1261a5c410182222c928f54a34
diff --git a/net-snmp/Pkgfile b/net-snmp/Pkgfile
index 666bf6a7..96809a39 100644
--- a/net-snmp/Pkgfile
+++ b/net-snmp/Pkgfile
@@ -5,7 +5,7 @@
 
 name=net-snmp
 version=5.7.3
-release=3
+release=4
 source=(http://download.sourceforge.net/$name/$name-$version.tar.gz \
 	snmpd snmpd.conf \
 	0001-Remove-U64-typedef.patch \
@@ -32,7 +32,7 @@ build() {
 				--with-logfile=/var/log/snmp/snmpd.log \
 				--with-persistent-directory=/var/lib/snmp \
 				--with-ldflags="-lsensors"
-	make
+	make -j1
 	make install INSTALL_PREFIX=$PKG DESTDIR=$PKG
 
 	# Clean up perl stuff: clean common junks first, ...

From crux at crux.nu  Fri Jan 19 11:42:02 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri, 19 Jan 2018 11:42:02 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): [notify] unbound: update to 1.6.8
Message-ID: <20180119114202.F159A180327@crux.nu>

commit 28b12e42fb6d64bd8deb0002003b76bb128852c9
Author: Juergen Daubert <jue at jue.li>
Date:   Fri Jan 19 12:40:08 2018 +0100

    [notify] unbound: update to 1.6.8
    
    security fix for CVE-2017-15105, see
    https://unbound.net/downloads/CVE-2017-15105.txt

diff --git a/unbound/.md5sum b/unbound/.md5sum
index c1dfc2ffc..81782f819 100644
--- a/unbound/.md5sum
+++ b/unbound/.md5sum
@@ -1,2 +1,2 @@
 5bf1cabac23d0c2d89d2696039064d0a  unbound
-67ed382add11134d689f5e88f8efc43e  unbound-1.6.7.tar.gz
+c9d26cef224b10705229d5072142636c  unbound-1.6.8.tar.gz
diff --git a/unbound/.signature b/unbound/.signature
index ae21710ed..fae3f5364 100644
--- a/unbound/.signature
+++ b/unbound/.signature
@@ -1,6 +1,6 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/bBm3JiOVd9y3gHmgLtBnUz6A9FK/n7sFJGuz5OTkKFPjhXNhdRjZ89GJwQVxrYUS3HhDX9PpBzEfyzwIZHHlg8=
-SHA256 (Pkgfile) = c0a662347b4c8f9b50dacaa3ac896edd24c00f162545fb69238b199ffb0429cd
+RWSE3ohX2g5d/eBfnyfVQUU30ehlBBf3FMNZMbgad87LosLrhf8IXu2y4aU2OqLXxCoVUfyoi8wTaqyB1SJRknnZV4f8y07BcQA=
+SHA256 (Pkgfile) = ee02ef3c3457ffbae75d41e3723e4fd130be9246dc1458c2b03e87fa8c91156c
 SHA256 (.footprint) = 55dae6262dda05e002b80b843c0e57553a93a9e770d86630d104c04e3efaced7
-SHA256 (unbound-1.6.7.tar.gz) = 4e7bd43d827004c6d51bef73adf941798e4588bdb40de5e79d89034d69751c9f
+SHA256 (unbound-1.6.8.tar.gz) = e3b428e33f56a45417107448418865fe08d58e0e7fea199b855515f60884dd49
 SHA256 (unbound) = 54c94f1813c00c7faac51bde904b879b73d043e87c49cf8aff63de565368a095
diff --git a/unbound/Pkgfile b/unbound/Pkgfile
index fe1307ede..7b25c8b91 100644
--- a/unbound/Pkgfile
+++ b/unbound/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  openssl expat
 
 name=unbound
-version=1.6.7
+version=1.6.8
 release=1
 source=(https://unbound.net/downloads/$name-$version.tar.gz
         unbound)

From crux at crux.nu  Fri Jan 19 11:43:10 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri, 19 Jan 2018 11:43:10 +0000 (UTC)
Subject: [crux-commits] ports/opt (3.3): mysql: update to 5.6.39
Message-ID: <20180119114310.5BB4018262E@crux.nu>

commit a80252fc421a502ac470f7c3835feeb2d44d6773
Author: Juergen Daubert <jue at jue.li>
Date:   Fri Jan 19 12:43:04 2018 +0100

    mysql: update to 5.6.39

diff --git a/mysql/.md5sum b/mysql/.md5sum
index e1d617e28..bd0f4329c 100644
--- a/mysql/.md5sum
+++ b/mysql/.md5sum
@@ -1,3 +1,3 @@
 1622e62c80d128f1951a12c0125d3fb5  my.cnf
-b2dd2976bc95365f4c3896cbf0c96627  mysql-5.6.38.tar.gz
+abcee03992647d508ac5c2568c6cc802  mysql-5.6.39.tar.gz
 4f3967b521f810a0a9d7daa9c81bc85d  mysqld
diff --git a/mysql/.signature b/mysql/.signature
index 95c0b53b2..0f1844646 100644
--- a/mysql/.signature
+++ b/mysql/.signature
@@ -1,7 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/a4ZjV3KVUIQ0rugA++T4YL7M7hrxZctKvgxf6k2y/Yn87IcoSs9DdfeFlX45nRddrylZjzMKo/rMYBl7QG7SQw=
-SHA256 (Pkgfile) = 5356080848d8f0dc049b0c05ab2b1ff309de62967870092d86070d94bb038948
+RWSE3ohX2g5d/ZKOYgJRgRvQmzt6ot7EuCUokaXuv+fMPsMDnAf4rRsdB40Ymcxh3bWJl4THE2963nIIJiwJo9mMTwnicLHdQwI=
+SHA256 (Pkgfile) = fa988a124398f6d5bc8dad3ad3f65005ce2a7e9036afc56e0801deb24435357c
 SHA256 (.footprint) = c7c7acd4f5a8fa9bc63673bb481bcded0bd8dee704a4684ae4cfe94c7270d17a
-SHA256 (mysql-5.6.38.tar.gz) = 18f249752f6c64af6e39c5b99c89ee1c86d6eb7fac853707603453cf584c54f3
+SHA256 (mysql-5.6.39.tar.gz) = ab1814b03af77bf88dc381eff558ed2e73e19e8e5a4170a78ba3370cd5da434d
 SHA256 (my.cnf) = 3802bb02f34adbfbd0cc6175f27f4646d66b38c1df4f9b6c1ff6e64e03ea717b
 SHA256 (mysqld) = e7bb2854c7ed9bec5a7dc74bde5db316cbdd31f190b81b21d9ac9b5aaf513157
diff --git a/mysql/Pkgfile b/mysql/Pkgfile
index 17de063fb..43d94274c 100644
--- a/mysql/Pkgfile
+++ b/mysql/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on:  cmake libaio
 
 name=mysql
-version=5.6.38
+version=5.6.39
 release=1
 source=(http://mirror.switch.ch/mirror/mysql/Downloads/MySQL-5.6/$name-$version.tar.gz \
         my.cnf mysqld)

From crux at crux.nu  Fri Jan 19 11:59:54 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri, 19 Jan 2018 11:59:54 +0000 (UTC)
Subject: [crux-commits] ports/xorg (3.3): mesa3d: update to 17.3.3
Message-ID: <20180119115954.D9A081802B9@crux.nu>

commit 8ee282ce82db0a74f65ec2f3bfdf3e86863fdf19
Author: Juergen Daubert <jue at jue.li>
Date:   Fri Jan 19 12:59:48 2018 +0100

    mesa3d: update to 17.3.3

diff --git a/mesa3d/.footprint b/mesa3d/.footprint
index d7eca68..93049cb 100644
--- a/mesa3d/.footprint
+++ b/mesa3d/.footprint
@@ -37,6 +37,8 @@ drwxr-xr-x	root/root	usr/include/GLES3/
 drwxr-xr-x	root/root	usr/include/KHR/
 -rw-r--r--	root/root	usr/include/KHR/khrplatform.h
 -rw-r--r--	root/root	usr/include/gbm.h
+drwxr-xr-x	root/root	usr/include/vulkan/
+-rw-r--r--	root/root	usr/include/vulkan/vulkan_intel.h
 -rw-r--r--	root/root	usr/include/xa_composite.h
 -rw-r--r--	root/root	usr/include/xa_context.h
 -rw-r--r--	root/root	usr/include/xa_tracker.h
@@ -90,6 +92,10 @@ lrwxrwxrwx	root/root	usr/lib/libgbm.so.1 -> libgbm.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib/libglapi.so -> libglapi.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libglapi.so.0 -> libglapi.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libglapi.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib/libvulkan_intel.la
+-rwxr-xr-x	root/root	usr/lib/libvulkan_intel.so
+-rwxr-xr-x	root/root	usr/lib/libvulkan_radeon.la
+-rwxr-xr-x	root/root	usr/lib/libvulkan_radeon.so
 -rwxr-xr-x	root/root	usr/lib/libxatracker.la
 lrwxrwxrwx	root/root	usr/lib/libxatracker.so -> libxatracker.so.2.3.0
 lrwxrwxrwx	root/root	usr/lib/libxatracker.so.2 -> libxatracker.so.2.3.0
@@ -120,3 +126,8 @@ lrwxrwxrwx	root/root	usr/lib/vdpau/libvdpau_radeonsi.so -> libvdpau_radeonsi.so.
 lrwxrwxrwx	root/root	usr/lib/vdpau/libvdpau_radeonsi.so.1 -> libvdpau_radeonsi.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib/vdpau/libvdpau_radeonsi.so.1.0 -> libvdpau_radeonsi.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/vdpau/libvdpau_radeonsi.so.1.0.0
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/vulkan/
+drwxr-xr-x	root/root	usr/share/vulkan/icd.d/
+-rw-r--r--	root/root	usr/share/vulkan/icd.d/intel_icd.x86_64.json
+-rw-r--r--	root/root	usr/share/vulkan/icd.d/radeon_icd.x86_64.json
diff --git a/mesa3d/.md5sum b/mesa3d/.md5sum
index 6e46343..14d8021 100644
--- a/mesa3d/.md5sum
+++ b/mesa3d/.md5sum
@@ -1 +1 @@
-5c59b779925f504ffd0f13c7dcd29ac6  mesa-17.3.2.tar.xz
+139b5f608b371c0d4395596162f88791  mesa-17.3.3.tar.xz
diff --git a/mesa3d/.signature b/mesa3d/.signature
index a5ceaee..2a269e3 100644
--- a/mesa3d/.signature
+++ b/mesa3d/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndHTpEM0VfVlLrO9eRMKNJLBlY/fRWHC9Wj58kYl+wf9u7HwMW1KT6GGyq1HfiPRo5CQAVEtp0HNcteA4bs+PhwU=
-SHA256 (Pkgfile) = 28975cfc980eeebe1213124428252cf1e8395c71323dad784d46105583b854e1
-SHA256 (.footprint) = 8f3bb2b8170d0532bb6b3fdc81f7c9bcc69740efa1550d04df4f65b2b70c7bab
-SHA256 (mesa-17.3.2.tar.xz) = e2844a13f2d6f8f24bee65804a51c42d8dc6ae9c36cff7ee61d0940e796d64c6
+RWTSGWF5Q7TndN0NhLpTUi0Nx9h9QIPhKc67OAGx7EknWOVKvqpcLjLVjQuhNCeCQWPJPgTeA4FkYOBgVbTLynrUv4+6serP+ws=
+SHA256 (Pkgfile) = df80be5d75fef63e0c77f4a3dfb35a3a012f562dbf34da4ec7c6eb4ce7cae005
+SHA256 (.footprint) = 4ece9b6ea6f54fd29a47c920761938bd4f61b2cdf8cd5f1b4841574f3aed78eb
+SHA256 (mesa-17.3.3.tar.xz) = 41bac5de0ef6adc1f41a1ec0f80c19e361298ce02fa81b5f9ba4fdca33a9379b
diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile
index eee0975..523dc94 100644
--- a/mesa3d/Pkgfile
+++ b/mesa3d/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: elfutils libdrm libvdpau llvm xorg-dri3proto xorg-glproto xorg-libxdamage xorg-libxshmfence xorg-libxvmc xorg-presentproto xorg-libxxf86vm
 
 name=mesa3d
-version=17.3.2
+version=17.3.3
 release=1
 source=(ftp://ftp.freedesktop.org/pub/mesa/mesa-$version.tar.xz)
 
@@ -29,7 +29,7 @@ build() {
 		--disable-dependency-tracking \
 		--with-platforms=x11,drm \
 		--with-gallium-drivers=r300,r600,svga,swrast,radeonsi,nouveau  \
-		#--with-vulkan-drivers=intel,radeon
+		--with-vulkan-drivers=intel,radeon
 
 	make
 	make DESTDIR=$PKG install

From crux at crux.nu  Fri Jan 19 14:13:29 2018
From: crux at crux.nu (crux at crux.nu)
Date: Fri, 19 Jan 2018 14:13:29 +0000 (UTC)
Subject: [crux-commits] ports/core (3.4): glibc-32: 2.26-7. Fix for
 CVE-2018-1000001
Message-ID: <20180119141329.22031182636@crux.nu>

commit e609bd06bf2cba72894fedf955ea5bd561b66151
Author: Fredrik Rinnestam <fredrik at crux.nu>
Date:   Fri Jan 19 15:13:06 2018 +0100

    glibc-32: 2.26-7. Fix for CVE-2018-1000001

diff --git a/glibc-32/.signature b/glibc-32/.signature
index 86bf0c1c..6f69a8a4 100644
--- a/glibc-32/.signature
+++ b/glibc-32/.signature
@@ -1,8 +1,8 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqiWFUCcaruHDiLFe6M32aJKrJUyJvOBVpvy3J2s/HblLzl/Mk7pTUbTlIde3Pn+pk0ceB6AcfQu2kf7aLbkLLg8=
-SHA256 (Pkgfile) = d1df5a0e1780ebbbca231291a411f14ed9f5536501e48aab72388e53f221c46a
+RWRJc1FUaeVeqqky9X0DwdEyVa8aYWmYcgp+Dd6j5ys/CSWuWWt1UQP0CTW97VYUmzx5mS8GGBjZUsTHlI0qmBk/17qrxE7HSww=
+SHA256 (Pkgfile) = 0228c290f67a753a8d8f6853cd9755aafc1ad2e68f35f1ac7b9fc3cebe30cb17
 SHA256 (.footprint) = d8373022b083aa83f74e13eab15f0b785d08adee0efe44dd762aef5ee286c258
 SHA256 (glibc-2.26.tar.xz) = e54e0a934cd2bc94429be79da5e9385898d2306b9eaf3c92d5a77af96190f6bd
 SHA256 (kernel-headers-4.9.5.tar.xz) = 5783ad8f668ee71561fae370fbcdc477aaa6df249bd85635b87a8c204aeb4aa9
-SHA256 (glibc-2.25-updates.patch) = 5fa8a520c4afdfb9aff8f75e9039800ef0fa713e6ec8e2a6c946c1528075150b
+SHA256 (glibc-2.26-7.patch) = 249d6fea97cd31d070d29820cef81683998a189743527a1bb58ae3a9af03a311
 SHA256 (lib32.conf) = 2f174d2bcefe1c29327690514f34d6970fffdd54398320ca23a11b5f1e3c9b2d
diff --git a/glibc-32/Pkgfile b/glibc-32/Pkgfile
index d82bbf2d..d5027ad7 100644
--- a/glibc-32/Pkgfile
+++ b/glibc-32/Pkgfile
@@ -4,10 +4,10 @@
 
 name=glibc-32
 version=2.26
-release=1
+release=7
 source=(http://ftp.gnu.org/gnu/glibc/glibc-$version.tar.xz \
 	http://crux.nu/files/distfiles/kernel-headers-4.9.5.tar.xz \
-	glibc-2.25-updates.patch lib32.conf) 
+	glibc-2.26-$release.patch lib32.conf) 
 
 build() {
 	mkdir build
@@ -17,7 +17,7 @@ build() {
 	export CC="${CC:-gcc} -m32"
 	export CFLAGS="$CFLAGS -Wno-error=parentheses"
 
-	#patch -p1 -d $SRC/glibc-${version:0:4} -i $SRC/glibc-2.25-updates.patch
+	patch -p1 -d $SRC/glibc-${version:0:4} -i $SRC/glibc-2.26-$release.patch
 
 	../glibc-${version:0:4}/configure --prefix=/usr \
 		--libdir=/usr/lib32 \
diff --git a/glibc-32/glibc-2.26-7.patch b/glibc-32/glibc-2.26-7.patch
new file mode 100644
index 00000000..f808ddc9
--- /dev/null
+++ b/glibc-32/glibc-2.26-7.patch
@@ -0,0 +1,26899 @@
+diff --git a/ChangeLog b/ChangeLog
+index 8dbfc7eaff..73777b3b86 100644
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,1195 @@
++2018-01-16  Florian Weimer  <fweimer at redhat.com>
++
++	* nptl/Makefile [$(have-cxx-thread_local)] (tests-unsupported):
++	Move tst-thread-exit-clobber ...
++	[$(CXX)] (tests-unsupported): ... to here.
++
++2018-01-16  Florian Weimer  <fweimer at redhat.com>
++
++	* nptl/Makefile (CFLAGS-tst-minstack-throw.o): Compile in C++11
++	mode with GNU extensions.
++
++2018-01-15  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #22636]
++	* nptl/tst-minstack-throw.cc: New file.
++	* nptl/Makefile (tests): Add tst-minstack-throw.
++	(LDLIBS-tst-minstack-throw): Link with libstdc++.
++	[!CXX] (tests-unsupported): Add tst-minstack-throw.
++
++2018-01-11  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #22636]
++	* nptl/Makefile (tests): Add tst-minstack-cancel, tst-minstack-exit.
++	* nptl/tst-minstack-cancel.c, nptl/tst-minstack-exit.c: New files.
++
++2018-01-10  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #22636]
++	* sysdeps/nptl/unwind-forcedunwind.c (pthread_cancel_init): Open
++	libgcc.so with RTLD_NOW, to avoid lazy binding during unwind.
++
++2018-01-08  Szabolcs Nagy  <szabolcs.nagy at arm.com>
++
++	[BZ #22637]
++	* nptl/descr.h (stackblock, stackblock_size): Update comments.
++	* nptl/allocatestack.c (allocate_stack): Add guardsize to stacksize.
++	* nptl/nptl-init.c (__pthread_get_minstack): Remove guardsize from
++	stacksize.
++	* nptl/pthread_getattr_np.c (pthread_getattr_np): Likewise.
++
++2018-01-08  Florian Weimer  <fweimer at redhat.com>
++
++	* nptl/tst-thread-exit-clobber.cc: New file.
++	* nptl/Makefile (CFLAGS-tst-thread-exit-clobber.o): Compile in
++	C++11 mode.
++	(LDLIBS-tst-thread-exit-clobber): Link with libstdc++.
++	(tests): Add tst-thread-exit-clobber.
++	[!CXX] (tests-unsupported): Add tst-thread-exit-clobber.
++
++2018-01-12  Dmitry V. Levin  <ldv at altlinux.org>
++
++	[BZ #22679]
++	CVE-2018-1000001
++	* sysdeps/unix/sysv/linux/getcwd.c (__getcwd): Fall back to
++	generic_getcwd if the path returned by getcwd syscall is not absolute.
++	* io/tst-getcwd-abspath.c: New test.
++	* io/Makefile (tests): Add tst-getcwd-abspath.
++
++2017-12-19  Adhemerval Zanella  <adhemerval.zanella at linaro.org>
++	    James Clarke <jrtc27 at jrtc27.com>
++
++	[BZ #22603]
++	* sysdeps/ia64/memchr.S (__memchr): Avoid overflow in pointer
++	addition.
++
++2018-01-08  Dmitry V. Levin  <ldv at altlinux.org>
++
++	* sysdeps/unix/sysv/linux/tst-ttyname.c (do_in_chroot_1): Skip the
++	test instead of failing in case of ENOENT returned by posix_openpt.
++
++2017-12-29  Aurelien Jarno  <aurelien at aurel32.net>
++
++	[BZ #22611]
++	* malloc/tst-realloc.c (do_test): Remove the test checking that errno
++	is unchanged on success.
++
++2017-12-30  Aurelien Jarno  <aurelien at aurel32.net>
++	    Dmitry V. Levin  <ldv at altlinux.org>
++
++	[BZ #22625]
++	CVE-2017-16997
++	* elf/dl-load.c (fillin_rpath): Check for empty tokens before dynamic
++	string token expansion. Check for NULL pointer or empty string possibly
++	returned by expand_dynamic_string_token.
++	(decompose_rpath): Check for empty path after dynamic string
++	token expansion.
++
++2017-12-18  Dmitry V. Levin  <ldv at altlinux.org>
++
++	[BZ #22627]
++	* elf/dl-load.c (_dl_init_paths): Remove _dl_dst_substitute preparatory
++	code and invocation.
++
++2017-11-18  Florian Weimer  <fweimer at redhat.com>
++
++	* sysdeps/unix/sysv/linux/tst-ttyname.c
++	(become_root_in_mount_ns): Remove.
++	(do_in_chroot_1): Call support_enter_mount_namespace.
++	(do_in_chroot_2): Likewise.
++	(do_test): Call support_become_root early.
++
++2017-11-15  Luke Shumaker  <lukeshu at parabola.nu>
++
++	[BZ #22145]
++	* sysdeps/unix/sysv/linux/tst-ttyname.c: New file.
++	* sysdeps/unix/sysv/linux/Makefile: Add tst-ttyname to tests.
++
++2017-11-15  Luke Shumaker  <lukeshu at parabola.nu>
++
++	[BZ #22145]
++	* sysdeps/unix/sysv/linux/ttyname.c (ttyname):
++	Defer is_pty check until end of the function.
++	* sysdeps/unix/sysv/linux/ttyname_r.c (__ttyname_r): Likewise.
++
++2017-11-15  Luke Shumaker  <lukeshu at parabola.nu>
++
++	[BZ #22145]
++	* sysdeps/unix/sysv/linux/ttyname.h (is_mytty): New function.
++	* sysdeps/unix/sysv/linux/ttyname.c (getttyname): Call is_mytty.
++	(ttyname): Likewise.
++	* sysdeps/unix/sysv/linux/ttyname_r.c (getttyname_r): Likewise.
++	(__ttyname_r): Likewise.
++
++2017-11-15  Luke Shumaker  <lukeshu at parabola.nu>
++
++	* sysdeps/unix/sysv/linux/ttyname.h (is_pty): Change return type from
++	int to bool.
++
++2017-11-15  Luke Shumaker  <lukeshu at parabola.nu>
++
++	* sysdeps/unix/sysv/linux/ttyname.h (is_pty): Update doc reference.
++
++2017-11-15  Luke Shumaker  <lukeshu at parabola.nu>
++
++	* manual/terminal.texi (Is It a Terminal):
++	Mention ENODEV for ttyname and ttyname_r.
++
++2017-12-14  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #22607]
++	CVE-2017-1000409
++	* elf/dl-load.c (_dl_init_paths): Compute number of components in
++	the expanded path string.
++
++2017-12-14  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #22606]
++	CVE-2017-1000408
++	* elf/dl-load.c (system_dirs): Update comment.
++	(nsystem_dirs_len): Use array_length.
++	(_dl_init_paths): Use nsystem_dirs_len to compute the array size.
++
++2017-11-02  Florian Weimer  <fweimer at redhat.com>
++
++	Add array_length and array_end macros.
++	* include/array_length.h: New file.
++
++2017-10-27  H.J. Lu  <hongjiu.lu at intel.com>
++
++	* sysdeps/i386/fpu/libm-test-ulps: Regenerated for GCC 7 with
++	"-O2 -march=i586".
++
++2017-12-13  Adhemerval Zanella  <adhemerval.zanella at linaro.org>
++
++	* sysdeps/ia64/fpu/libm-test-ulps: Update.
++
++2017-12-12  Adhemerval Zanella  <adhemerval.zanella at linaro.org>
++
++	[BZ #21672]
++	* nptl/allocatestack.c [_STACK_GROWS_DOWN] (setup_stack_prot):
++	Set to use !NEED_SEPARATE_REGISTER_STACK as well.
++	(advise_stack_range): New function.
++	* nptl/pthread_create.c (START_THREAD_DEFN): Move logic to mark
++	stack non required to advise_stack_range at allocatestack.c
++
++2017-12-12  Adhemerval Zanella  <adhemerval.zanella at linaro.org>
++	    Sergei Trofimovich  <slyfox at inbox.ru>
++
++	[BZ #21908]
++	* sysdeps/unix/sysv/linux/m68k/mmap_internal.h (MMAP2_PAGE_SHIFT):
++	Rename to MMAP2_PAGE_UNIT.
++	* sysdeps/unix/sysv/linux/ia64/mmap_internal.h: New file.
++	* sysdeps/unix/sysv/linux/mmap.c: Include mmap_internal iff
++	__OFF_T_MATCHES_OFF64_T is not defined.
++	* sysdeps/unix/sysv/linux/mmap_internal.h (page_unit): Declare as
++	uint64_t.
++	(MMAP2_PAGE_UNIT) [MMAP2_PAGE_UNIT == -1]: Redefine to page_unit.
++	(page_unit) [MMAP2_PAGE_UNIT != -1]: Remove definition.
++
++2017-12-12  James Clarke <jrtc27 at jrtc27.com>
++
++	* sysdeps/unix/sysv/linux/ia64/ipc_priv.h: New file defining
++	__IPC_64 to 0 to avoid IPC_64 being set.
++
++2017-10-15  H.J. Lu  <hongjiu.lu at intel.com>
++
++	[BZ #22052]
++	* malloc/hooks.c (realloc_check): Use DIAG_IGNORE_NEEDS_COMMENT
++	to silence -O3 -Wall warning with GCC 7.
++
++2017-11-30  Arjun Shankar  <arjun at redhat.com>
++
++	[BZ #22375]
++	CVE-2017-17426
++	* malloc/malloc.c (__libc_malloc): Use checked_request2size
++	instead of request2size.
++
++2017-11-02  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #22332]
++	* posix/tst-glob-tilde.c (do_noescape): New variable.
++	(one_test): Process it.
++	(do_test): Set do_noescape.  Add unescaping test case.
++
++2017-10-22  Paul Eggert <eggert at cs.ucla.edu>
++
++	[BZ #22332]
++	* posix/glob.c (__glob): Fix buffer overflow during GLOB_TILDE
++	unescaping.
++
++2017-10-23  Wilco Dijkstra  <wdijkstr at arm.com>
++
++	* malloc/malloc.c (_int_malloc): Add SINGLE_THREAD_P path.
++
++2017-10-23  Wilco Dijkstra  <wdijkstr at arm.com>
++
++	* malloc/malloc.c (__libc_malloc): Add SINGLE_THREAD_P path.
++	(__libc_realloc): Likewise.
++	(_mid_memalign): Likewise.
++	(__libc_calloc): Likewise.
++
++2017-10-20  Wilco Dijkstra  <wdijkstr at arm.com>
++
++	* malloc/malloc.c (sysdep-cancel.h): Add include.
++
++2017-10-20  Wilco Dijkstra  <wdijkstr at arm.com>
++
++	* malloc/malloc.c (_int_free): Add SINGLE_THREAD_P fast paths.
++
++2017-10-19  Wilco Dijkstra  <wdijkstr at arm.com>
++
++	* malloc/malloc.c (_int_free): Fix deadlock bug in consistency check.
++
++2017-08-31  Florian Weimer  <fweimer at redhat.com>
++
++	* malloc/malloc.c (_int_free): Remove locked variable and related
++	asserts.
++
++2017-08-31  Florian Weimer  <fweimer at redhat.com>
++
++	* malloc/malloc.c (top_check): Change return type to void.  Remove
++	internal_function.
++	* malloc/hooks.c (top_check): Likewise.
++	(malloc_check, realloc_check, memalign_check): Adjust.
++
++2017-08-30  Florian Weimer  <fweimer at redhat.com>
++
++	* malloc/malloc.c (ARENA_CORRUPTION_BIT, arena_is_corrupt)
++	(set_arena_corrupt): Remove definitions.
++	(mtrim): Do not check for corrupt arena.
++	* malloc/arena.c (arena_lock, reused_arena, arena_get_retry):
++	Likewise.
++
++2017-08-30  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #21754]
++	* malloc/arena.c (TUNABLE_CALLBACK set_mallopt_check): Do not set
++	check_action.
++	(ptmalloc_init): Do not set or use check_action.
++	* malloc/hooks.c (malloc_check_get_size, realloc_check): Adjust
++	call to malloc_printerr.  Remove return statement.
++	(free_check): Likewise.  Remove arena unlock.
++	(top_check): Update comment.  Adjust call to malloc_printerr.
++	Remove heap repair code.
++	* malloc/malloc.c (unlink): Adjust calls to malloc_printerr.
++	(DEFAULT_CHECK_ACTION, check_action): Remove definitions.
++	(sysmalloc): Adjust call to malloc_printerr.
++	(munmap_chunk, __libc_realloc): Likewise.  Remove return
++	statement.
++	(_int_malloc, int_realloc): Likewise.  Remove errstr variable.
++	Remove errout label and corresponding gotos.
++	(_int_free): Likewise.  Remove arena unlock.
++	(do_set_mallopt_check): Do not set check_action.
++	(malloc_printerr): Adjust parameter list.  Do not mark arena as
++	corrupt.
++	* manual/memory.texi (Malloc Tunable Parameters): Remove TODO
++	comment.
++	* manual/probes.texi (Memory Allocation Probes): Remove
++	memory_mallopt_check_action.
++
++2017-08-30  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #21754]
++	* malloc/malloc.c (malloc_printerr): Always terminate the process,
++	without printing a backtrace.  Do not leak any information in the
++	error message.
++	* manual/memory.texi (Heap Consistency Checking): Update.
++	* manual/tunables.texi (Memory Allocation Tunables): Likewise.
++
++2017-11-17  Tulio Magno Quites Machado Filho  <tuliom at linux.vnet.ibm.com>
++
++	* sysdeps/powerpc/bits/hwcap.h (PPC_FEATURE2_HTM_NO_SUSPEND): New
++	macro.
++
++2017-08-09  Andreas Schwab  <schwab at suse.de>
++
++	* nptl/Makefile (tests) [$(build-shared) = yes]: Add
++	tst-compat-forwarder.
++	(modules-names): Add tst-compat-forwarder-mod.
++	($(objpfx)tst-compat-forwarder): Depend on
++	$(objpfx)tst-compat-forwarder-mod.so.
++	* nptl/tst-compat-forwarder.c: New file.
++	* nptl/tst-compat-forwarder-mod.c: New file.
++
++2017-08-09  Andreas Schwab  <schwab at suse.de>
++
++	* sysdeps/unix/sysv/linux/s390/pt-longjmp.c: Update reference to
++	renamed alias.
++
++2017-08-08  Andreas Schwab  <schwab at suse.de>
++
++	[BZ #21041]
++	* nptl/pt-longjmp.c (longjmp, siglongjmp): Don't use IFUNC resolver.
++	* nptl/pt-system.c (system): Likewise.
++
++2017-11-21  Rajalakshmi Srinivasaraghavan  <raji at linux.vnet.ibm.com>
++
++	* sysdeps/powerpc/powerpc64/power7/memcpy.S: Replace
++	lxvd2x/stxvd2x with lvx/stvx.
++	* sysdeps/powerpc/powerpc64/power7/memmove.S: Likewise.
++
++2017-10-04  Florian Weimer  <fweimer at redhat.com>
++
++	* scripts/check-local-headers.sh: Ignore nspr4 header file
++	directory in addition to nspr.
++
++2017-10-04  Guido Trentalancia  <guido at trentalancia.net>
++
++	[BZ #17956]
++	* configure.ac (--enable-nss-crypt): Use NSPR include directory.
++	* configure: Regenerate.
++	* crypt/Makefile (nss-cpp-flags): New variable.
++	(CPPFLAGS-sha256-crypt.c, CPPFLAGS-sha512-crypt.c)
++	(CPPFLAGS-md5-crypt.c): Use it.
++	* scripts/check-local-headers.sh: Ignore nspr header file
++	directory.
++
++2017-10-18  Wilco Dijkstra  <wdijkstr at arm.com>
++
++	* malloc/malloc.c (malloc_state): Use int for have_fastchunks since
++	not all targets support atomics on bool.
++
++2017-10-17  Wilco Dijkstra  <wdijkstr at arm.com>
++
++	* malloc/malloc.c (FASTCHUNKS_BIT): Remove.
++	(have_fastchunks): Remove.
++	(clear_fastchunks): Remove.
++	(set_fastchunks): Remove.
++	(malloc_state): Add have_fastchunks.
++	(malloc_init_state): Use have_fastchunks.
++	(do_check_malloc_state): Remove incorrect invariant checks.
++	(_int_malloc): Use have_fastchunks.
++	(_int_free): Likewise.
++	(malloc_consolidate): Likewise.
++
++2017-10-17  Wilco Dijkstra  <wdijkstr at arm.com>
++
++	* malloc/malloc.c (tcache_put): Inline.
++	(tcache_get): Inline.
++
++2017-10-13  James Clarke  <jrtc27 at jrtc27.com>
++
++	* sysdeps/powerpc/powerpc32/dl-machine.h (elf_machine_rela):
++	Assign sym_map to be map for local symbols, as TLS relocations
++	use sym_map to determine whether the symbol is defined and to
++	extract the TLS information.
++	* sysdeps/sparc/sparc32/dl-machine.h (elf_machine_rela): Likewise.
++	* sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Likewise.
++
++2017-08-23  H.J. Lu  <hongjiu.lu at intel.com>
++
++	* sysdeps/x86_64/fpu/libm-test-ulps: Regenerated.
++
++2017-11-07  Adhemerval Zanella  <adhemerval.zanella at linaro.org>
++
++	[BZ #22298]
++	* nptl/allocatestack.c (allocate_stack): Check if
++	__PTHREAD_MUTEX_HAVE_PREV is non-zero, instead if
++	__PTHREAD_MUTEX_HAVE_PREV is defined.
++	* nptl/descr.h (pthread): Likewise.
++	* nptl/nptl-init.c (__pthread_initialize_minimal_internal):
++	Likewise.
++	* nptl/pthread_create.c (START_THREAD_DEFN): Likewise.
++	* sysdeps/nptl/fork.c (__libc_fork): Likewise.
++	* sysdeps/nptl/pthread.h (PTHREAD_MUTEX_INITIALIZER): Likewise.
++	* sysdeps/nptl/bits/thread-shared-types.h
++	(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION): New
++	defines.
++	(__pthread_internal_list): Check __PTHREAD_MUTEX_USE_UNION instead
++	of __WORDSIZE for internal layout.
++	(__pthread_mutex_s): Check __PTHREAD_MUTEX_NUSERS_AFTER_KIND instead
++	of __WORDSIZE for internal __nusers layout and __PTHREAD_MUTEX_USE_UNION
++	instead of __WORDSIZE whether to use an union for __spins and __list
++	fields.
++	(__PTHREAD_MUTEX_HAVE_PREV): Define also for __PTHREAD_MUTEX_USE_UNION
++	case.
++	* sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h
++	(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION): New
++	defines.
++	* sysdeps/alpha/nptl/bits/pthreadtypes-arch.h
++	(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
++	Likewise.
++	* sysdeps/arm/nptl/bits/pthreadtypes-arch.h
++	(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
++	Likewise.
++	* sysdeps/hppa/nptl/bits/pthreadtypes-arch.h
++	(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
++	Likewise.
++	* sysdeps/ia64/nptl/bits/pthreadtypes-arch.h
++	(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
++	Likewise.
++	* sysdeps/m68k/nptl/bits/pthreadtypes-arch.h
++	(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
++	Likewise.
++	* sysdeps/microblaze/nptl/bits/pthreadtypes-arch.h
++	(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
++	Likewise.
++	* sysdeps/mips/nptl/bits/pthreadtypes-arch.h
++	(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
++	Likewise.
++	* sysdeps/nios2/nptl/bits/pthreadtypes-arch.h
++	(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
++	Likewise.
++	* sysdeps/powerpc/nptl/bits/pthreadtypes-arch.h
++	(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
++	Likewise.
++	* sysdeps/s390/nptl/bits/pthreadtypes-arch.h
++	(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
++	Likewise.
++	* sysdeps/sh/nptl/bits/pthreadtypes-arch.h
++	(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
++	Likewise.
++	* sysdeps/sparc/nptl/bits/pthreadtypes-arch.h
++	(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
++	Likewise.
++	* sysdeps/tile/nptl/bits/pthreadtypes-arch.h
++	(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
++	Likewise.
++	* sysdeps/x86/nptl/bits/pthreadtypes-arch.h
++	(__PTHREAD_MUTEX_NUSERS_AFTER_KIND, __PTHREAD_MUTEX_USE_UNION):
++	Likewise.
++
++	* nptl/pthreadP.h (ASSERT_PTHREAD_STRING,
++	ASSERT_PTHREAD_INTERNAL_OFFSET): New macro.
++	* nptl/pthread_mutex_init.c (__pthread_mutex_init): Add build time
++	checks for internal pthread_mutex_t offsets.
++	* sysdeps/aarch64/nptl/pthread-offsets.h
++	(__PTHREAD_MUTEX_NUSERS_OFFSET, __PTHREAD_MUTEX_KIND_OFFSET,
++	__PTHREAD_MUTEX_SPINS_OFFSET, __PTHREAD_MUTEX_ELISION_OFFSET,
++	__PTHREAD_MUTEX_LIST_OFFSET): New macro.
++	* sysdeps/alpha/nptl/pthread-offsets.h: Likewise.
++	* sysdeps/arm/nptl/pthread-offsets.h: Likewise.
++	* sysdeps/hppa/nptl/pthread-offsets.h: Likewise.
++	* sysdeps/i386/nptl/pthread-offsets.h: Likewise.
++	* sysdeps/ia64/nptl/pthread-offsets.h: Likewise.
++	* sysdeps/m68k/nptl/pthread-offsets.h: Likewise.
++	* sysdeps/microblaze/nptl/pthread-offsets.h: Likewise.
++	* sysdeps/mips/nptl/pthread-offsets.h: Likewise.
++	* sysdeps/nios2/nptl/pthread-offsets.h: Likewise.
++	* sysdeps/powerpc/nptl/pthread-offsets.h: Likewise.
++	* sysdeps/s390/nptl/pthread-offsets.h: Likewise.
++	* sysdeps/sh/nptl/pthread-offsets.h: Likewise.
++	* sysdeps/sparc/nptl/pthread-offsets.h: Likewise.
++	* sysdeps/tile/nptl/pthread-offsets.h: Likewise.
++	* sysdeps/x86_64/nptl/pthread-offsets.h: Likewise.
++
++	* sysdeps/unix/sysv/linux/spawni.c (__spawnix): Use 0 instead of
++	WNOHANG in waitpid call.
++
++	[BZ #22273]
++	* sysdeps/unix/sysv/linux/spawni.c (__spawnix): Handle the case where
++	the auxiliary process is terminated by a signal before calling _exit
++	or execve.
++
++2017-09-13  Adhemerval Zanella  <adhemerval.zanella at linaro.org>
++
++	* sysdeps/unix/sysv/linux/s390/s390-32/oldglob.c: New file.
++	* sysdeps/unix/sysv/linux/alpha/Makefile
++	[$(subdir) = csu] (sysdep_routines): Remove rule.
++
++2017-09-08  Adhemerval Zanella  <adhemerval.zanella at linaro.org>
++
++	* sysdeps/unix/sysv/linux/arm/glob64.c: Remove file.
++	* sysdeps/unix/sysv/linux/i386/glob64.c: Likewise.
++	* sysdeps/unix/sysv/linux/m68k/glob64.c: Likewise.
++	* sysdeps/unix/sysv/linux/mips/mips64/n64/glob64.c: Likewise.
++	* sysdeps/unix/sysv/linux/mips/mips64/n64/globfree64.c: Likewise.
++	* sysdeps/unix/sysv/linux/powerpc/powerpc32/glob64.c: Likewise.
++	* sysdeps/unix/sysv/linux/sparc/sparc32/glob64.c: Likewise.
++	* sysdeps/unix/sysv/linux/wordsize-64/glob64.c: Likewise.
++	* sysdeps/unix/sysv/linux/wordsize-64/globfree64.c: Likewise.
++	* sysdeps/unix/sysv/linux/x86_64/x32/glob.c: Likewise.
++	* sysdeps/unix/sysv/linux/x86_64/x32/globfree.c: Likewise.
++	* sysdeps/wordsize-64/glob.c: Likewise.
++	* sysdeps/wordsize-64/glob64.c: Likewise.
++	* sysdeps/wordsize-64/globfree.c: Likewise.
++	* sysdeps/wordsize-64/globfree64.c: Likewise.
++	* sysdeps/unix/sysv/linux/glob.c: New file.
++	* sysdeps/unix/sysv/linux/glob64.c: Likewise.
++	* sysdeps/unix/sysv/linux/globfree.c: Likewise.
++	* sysdeps/unix/sysv/linux/globfree64.c: Likewise.
++	* sysdeps/unix/sysv/linux/s390/s390-32/glob64.c: Likewise.
++	* sysdeps/unix/sysv/linux/oldglob.c [SHLIB_COMPAT]: Also
++	adds !GLOB_NO_OLD_VERSION as an extra condition.
++	* sysdeps/unix/sysv/linux/i386/alphasort64.c: Include olddirent.h
++	using relative path instead of absolute one.
++	* sysdeps/unix/sysv/linux/i386/getdents64.c: Likewise.
++	* sysdeps/unix/sysv/linux/i386/readdir64.c: Likewise.
++	* sysdeps/unix/sysv/linux/i386/readdir64_r.c: Likewise.
++	* sysdeps/unix/sysv/linux/i386/versionsort64.c: Likewise.
++	* sysdeps/unix/sysv/linux/i386/olddirent.h: Move to ...
++	* sysdeps/unix/sysv/linux//olddirent.h: ... here.
++
++2017-10-26  Valery Reznic <valery_reznic at yahoo.com>
++	    H.J. Lu  <hongjiu.lu at intel.com>
++
++	[BZ #22299]
++	* sysdeps/x86/cpu-features.c (init_cpu_features): Don't set
++	GLRO(dl_platform) to NULL.
++	* sysdeps/x86_64/Makefile (tests): Add tst-platform-1.
++	(modules-names): Add tst-platformmod-1 and
++	x86_64/tst-platformmod-2.
++	(CFLAGS-tst-platform-1.c): New.
++	(CFLAGS-tst-platformmod-1.c): Likewise.
++	(CFLAGS-tst-platformmod-2.c): Likewise.
++	(LDFLAGS-tst-platformmod-2.so): Likewise.
++	($(objpfx)tst-platform-1): Likewise.
++	($(objpfx)tst-platform-1.out): Likewise.
++	(tst-platform-1-ENV): Likewise.
++	($(objpfx)x86_64/tst-platformmod-2.os): Likewise.
++	* sysdeps/x86_64/tst-platform-1.c: New file.
++	* sysdeps/x86_64/tst-platformmod-1.c: Likewise.
++	* sysdeps/x86_64/tst-platformmod-2.c: Likewise.
++
++2017-10-23  Alexey Makhalov  <amakhalov at vmware.com>
++
++	* elf/dl-tunables.c (do_tunable_update_val): Range checking fix.
++	* scripts/gen-tunables.awk: Set unspecified minval and/or maxval
++	values to correct default value for given type.
++
++2017-10-19  Joseph Myers  <joseph at codesourcery.com>
++
++	[BZ #22322]
++	* sysdeps/mips/bits/long-double.h: Move to ....
++	* sysdeps/mips/ieee754/bits/long-double.h: ... here.
++
++2017-10-17  Romain Naour  <romain.naour at gmail.com>  (tiny change)
++
++	[BZ #22296]
++	* math/math.h: Let signbit use the builtin in C++ mode with gcc
++	< 6.x
++
++2017-10-22  H.J. Lu  <hongjiu.lu at intel.com>
++
++	[BZ #21265]
++	* sysdeps/x86/cpu-features-offsets.sym (XSAVE_STATE_SIZE_OFFSET):
++	New.
++	* sysdeps/x86/cpu-features.c: Include <libc-pointer-arith.h>.
++	(get_common_indeces): Set xsave_state_size, xsave_state_full_size
++	and bit_arch_XSAVEC_Usable if needed.
++	(init_cpu_features): Remove bit_arch_Use_dl_runtime_resolve_slow
++	and bit_arch_Use_dl_runtime_resolve_opt.
++	* sysdeps/x86/cpu-features.h (bit_arch_Use_dl_runtime_resolve_opt):
++	Removed.
++	(bit_arch_Use_dl_runtime_resolve_slow): Likewise.
++	(bit_arch_Prefer_No_AVX512): Updated.
++	(bit_arch_MathVec_Prefer_No_AVX512): Likewise.
++	(bit_arch_XSAVEC_Usable): New.
++	(STATE_SAVE_OFFSET): Likewise.
++	(STATE_SAVE_MASK): Likewise.
++	[__ASSEMBLER__]: Include <cpu-features-offsets.h>.
++	(cpu_features): Add xsave_state_size and xsave_state_full_size.
++	(index_arch_Use_dl_runtime_resolve_opt): Removed.
++	(index_arch_Use_dl_runtime_resolve_slow): Likewise.
++	(index_arch_XSAVEC_Usable): New.
++	* sysdeps/x86/cpu-tunables.c (TUNABLE_CALLBACK (set_hwcaps)):
++	Support XSAVEC_Usable.  Remove Use_dl_runtime_resolve_slow.
++	* sysdeps/x86_64/Makefile (tst-x86_64-1-ENV): New if tunables
++	is enabled.
++	* sysdeps/x86_64/dl-machine.h (elf_machine_runtime_setup):
++	Replace _dl_runtime_resolve_sse, _dl_runtime_resolve_avx,
++	_dl_runtime_resolve_avx_slow, _dl_runtime_resolve_avx_opt,
++	_dl_runtime_resolve_avx512 and _dl_runtime_resolve_avx512_opt
++	with _dl_runtime_resolve_fxsave, _dl_runtime_resolve_xsave and
++	_dl_runtime_resolve_xsavec.
++	* sysdeps/x86_64/dl-trampoline.S (DL_RUNTIME_UNALIGNED_VEC_SIZE):
++	Removed.
++	(DL_RUNTIME_RESOLVE_REALIGN_STACK): Check STATE_SAVE_ALIGNMENT
++	instead of VEC_SIZE.
++	(REGISTER_SAVE_BND0): Removed.
++	(REGISTER_SAVE_BND1): Likewise.
++	(REGISTER_SAVE_BND3): Likewise.
++	(REGISTER_SAVE_RAX): Always defined to 0.
++	(VMOV): Removed.
++	(_dl_runtime_resolve_avx): Likewise.
++	(_dl_runtime_resolve_avx_slow): Likewise.
++	(_dl_runtime_resolve_avx_opt): Likewise.
++	(_dl_runtime_resolve_avx512): Likewise.
++	(_dl_runtime_resolve_avx512_opt): Likewise.
++	(_dl_runtime_resolve_sse): Likewise.
++	(_dl_runtime_resolve_sse_vex): Likewise.
++	(USE_FXSAVE): New.
++	(_dl_runtime_resolve_fxsave): Likewise.
++	(USE_XSAVE): Likewise.
++	(_dl_runtime_resolve_xsave): Likewise.
++	(USE_XSAVEC): Likewise.
++	(_dl_runtime_resolve_xsavec): Likewise.
++	* sysdeps/x86_64/dl-trampoline.h (_dl_runtime_resolve_avx512):
++	Removed.
++	(_dl_runtime_resolve_avx512_opt): Likewise.
++	(_dl_runtime_resolve_avx): Likewise.
++	(_dl_runtime_resolve_avx_opt): Likewise.
++	(_dl_runtime_resolve_sse): Likewise.
++	(_dl_runtime_resolve_sse_vex): Likewise.
++	(_dl_runtime_resolve_fxsave): New.
++	(_dl_runtime_resolve_xsave): Likewise.
++	(_dl_runtime_resolve_xsavec): Likewise.
++
++2017-10-22  H.J. Lu  <hongjiu.lu at intel.com>
++
++	[BZ #22093]
++	* sysdeps/x86/cpu-features.c (init_cpu_features): Initialize
++	GLRO(dl_hwcap) to HWCAP_X86_64 for x86-64.
++	* sysdeps/x86/dl-hwcap.h (HWCAP_COUNT): Updated.
++	(HWCAP_IMPORTANT): Likewise.
++	(HWCAP_X86_64): New enum.
++	(HWCAP_X86_AVX512_1): Updated.
++	* sysdeps/x86/dl-procinfo.c (_dl_x86_hwcap_flags): Add "x86_64".
++	* sysdeps/x86_64/Makefile (tests): Add tst-x86_64-1.
++	(modules-names): Add x86_64/tst-x86_64mod-1.
++	(LDFLAGS-tst-x86_64mod-1.so): New.
++	($(objpfx)tst-x86_64-1): Likewise.
++	($(objpfx)x86_64/tst-x86_64mod-1.os): Likewise.
++	(tst-x86_64-1-clean): Likewise.
++	* sysdeps/x86_64/tst-x86_64-1.c: New file.
++	* sysdeps/x86_64/tst-x86_64mod-1.c: Likewise.
++
++2017-10-21  Florian Weimer  <fweimer at redhat.com>
++
++	* posix/Makefile (tests): Add tst-glob-tilde.
++	(tests-special): Add tst-glob-tilde-mem.out
++	(tst-glob-tilde-ENV): Set MALLOC_TRACE.
++	(tst-glob-tilde-mem.out): Add mtrace check.
++	* posix/tst-glob-tilde.c: New file.
++
++2017-10-20  Paul Eggert <eggert at cs.ucla.edu>
++
++	[BZ #22320]
++	CVE-2017-15670
++	* posix/glob.c (__glob): Fix one-byte overflow.
++
++2017-09-08  Adhemerval Zanella  <adhemerval.zanella at linaro.org>
++
++	[BZ #1062]
++	[BZ #22325]
++	CVE-2017-15671
++	* posix/Makefile (routines): Add globfree, globfree64, and
++	glob_pattern_p.
++	* posix/flexmember.h: New file.
++	* posix/glob_internal.h: Likewise.
++	* posix/glob_pattern_p.c: Likewise.
++	* posix/globfree.c: Likewise.
++	* posix/globfree64.c: Likewise.
++	* sysdeps/gnu/globfree64.c: Likewise.
++	* sysdeps/unix/sysv/linux/alpha/globfree.c: Likewise.
++	* sysdeps/unix/sysv/linux/mips/mips64/n64/globfree64.c: Likewise.
++	* sysdeps/unix/sysv/linux/oldglob.c: Likewise.
++	* sysdeps/unix/sysv/linux/wordsize-64/globfree64.c: Likewise.
++	* sysdeps/unix/sysv/linux/x86_64/x32/globfree.c: Likewise.
++	* sysdeps/wordsize-64/globfree.c: Likewise.
++	* sysdeps/wordsize-64/globfree64.c: Likewise.
++	* posix/glob.c (HAVE_CONFIG_H): Use !_LIBC instead.
++	[NDEBUG): Remove comments.
++	(GLOB_ONLY_P, _AMIGA, VMS): Remove define.
++	(dirent_type): New type.  Use uint_fast8_t not
++	uint8_t, as C99 does not require uint8_t.
++	(DT_UNKNOWN, DT_DIR, DT_LNK): New macros.
++	(struct readdir_result): Use dirent_type.  Do not define skip_entry
++	unless it is needed; this saves a byte on platforms lacking d_ino.
++	(readdir_result_type, readdir_result_skip_entry):
++	New functions, replacing ...
++	(readdir_result_might_be_symlink, readdir_result_might_be_dir):
++	 these functions, which were removed.  This makes the callers
++	easier to read.  All callers changed.
++	(D_INO_TO_RESULT): Now empty if there is no d_ino.
++	(size_add_wrapv, glob_use_alloca): New static functions.
++	(glob, glob_in_dir): Check for size_t overflow in several places,
++	and fix some size_t checks that were not quite right.
++	Remove old code using SHELL since Bash no longer
++	uses this.
++	(glob, prefix_array): Separate MS code better.
++	(glob_in_dir): Remove old Amiga and VMS code.
++	(globfree, __glob_pattern_type, __glob_pattern_p): Move to
++	separate files.
++	(glob_in_dir): Do not rely on undefined behavior in accessing
++	struct members beyond their bounds.  Use a flexible array member
++	instead
++	(link_stat): Rename from link_exists2_p and return -1/0 instead of
++	0/1.  Caller changed.
++	(glob): Fix memory leaks.
++	* posix/glob64 (globfree64): Move to separate file.
++	* sysdeps/gnu/glob64.c (NO_GLOB_PATTERN_P): Remove define.
++	(globfree64): Remove hidden alias.
++	* sysdeps/unix/sysv/linux/Makefile (sysdeps_routines): Add
++	oldglob.
++	* sysdeps/unix/sysv/linux/alpha/glob.c (__new_globfree): Move to
++	separate file.
++	* sysdeps/unix/sysv/linux/i386/glob64.c (NO_GLOB_PATTERN_P): Remove
++	define.
++	Move compat code to separate file.
++	* sysdeps/wordsize-64/glob.c (globfree): Move definitions to
++	separate file.
++
++2017-08-20  H.J. Lu  <hongjiu.lu at intel.com>
++
++	[BZ #18822]
++	* sysdeps/unix/sysv/linux/i386/glob64.c (__old_glob64): Add
++	libc_hidden_proto and libc_hidden_def.
++
++2017-10-20  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #22321]
++	sysconf: Fix missing definition of UIO_MAXIOV on Linux.
++	* sysdeps/posix/sysconf.c: Include <sys/uio.h>.
++	* sysdeps/unix/sysv/linux/Makefile (tests): Add tst-sysconf-iov_max.
++	(tst-sysconf-iov_max): Link with tst-sysconf-iov_max-uapi.o.
++	* sysdeps/unix/sysv/linux/tst-sysconf-iov_max.c: New file.
++	* sysdeps/unix/sysv/linux/tst-sysconf-iov_max-uapi.c: Likewise.
++
++2017-10-11  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #22078]
++	Avoid large NSS buffers with many addresses, aliases.
++	* nss/nss_files/files-hosts.c (gethostbyname3_multi): Rewrite
++	using dynarrays and struct alloc_buffer.
++	* nss/Makefile (tests): Add tst-nss-files-hosts-multi.
++	(tst-nss-files-hosts-multi): Link with -ldl.
++	* nss/tst-nss-files-hosts-multi.c: New file.
++
++2017-10-11  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #18023]
++	* nss/nss_files/files-hosts.c (gethostbyname3_multi): Use struct
++	scratch_buffer.  Eliminate gotos.
++
++2017-10-10  Florian Weimer  <fweimer at redhat.com>
++
++	* nss/nss_files/files-hosts.c (gethostbyname3_multi): New
++	function.
++	(_nss_files_gethostbyname3_r): Call it.
++
++2017-09-21  Gabriel F. T. Gomes  <gabriel at inconstante.eti.br>
++
++	* sysdeps/ieee754/ldbl-128/e_lgammal_r.c (__ieee754_lgammal_r):
++	Remove conditionals on LDBL_MANT_DIG.
++	* sysdeps/ieee754/ldbl-128ibm/e_lgammal_r.c
++	(__ieee754_lgammal_r): Likewise.
++
++2017-09-21  Gabriel F. T. Gomes  <gabriel at inconstante.eti.br>
++
++	* sysdeps/ieee754/ldbl-128ibm/e_expl.c: Remove definitions of
++	_Float128 and L().
++	* sysdeps/ieee754/ldbl-128ibm/e_j0l.c: Remove definitions of
++	_Float128 and L(). Replace _Float128 with long double and L(x)
++	with xL, throughout the file.
++	* sysdeps/ieee754/ldbl-128ibm/e_j1l.c: Likewise.
++	* sysdeps/ieee754/ldbl-128ibm/e_lgammal_r.c: Likewise.
++	* sysdeps/ieee754/ldbl-128ibm/s_cbrtl.c: Likewise.
++	* sysdeps/ieee754/ldbl-128ibm/t_expl.h: Likewise.
++
++2017-09-21  Gabriel F. T. Gomes  <gabriel at inconstante.eti.br>
++
++	* sysdeps/ieee754/ldbl-128ibm/e_expl.c: Include tables from
++	sysdeps/ieee754/ldbl-128ibm.
++	* sysdeps/ieee754/ldbl-128ibm/e_j0l.c: Copy contents from the
++	equivalent implementation in sysdeps/ieee754/ldbl-128/ instead
++	of including it.  Keep _Float128 and L() intact.  These will be
++	reviewed by a separate patch.
++	* sysdeps/ieee754/ldbl-128ibm/e_j1l.c: Likewise.
++	* sysdeps/ieee754/ldbl-128ibm/e_lgammal_r.c: Likewise.
++	* sysdeps/ieee754/ldbl-128ibm/s_cbrtl.c: Likewise.
++	* sysdeps/ieee754/ldbl-128ibm/t_expl.h: Likewise.
++
++2017-09-21  Gabriel F. T. Gomes  <gabriel at inconstante.eti.br>
++
++	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_finite.c
++	(__finitef128): Define to __redirect___finitef128.
++	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_isinf.c
++	(__isinff128): Define to __redirect___isinff128.
++	* sysdeps/powerpc/powerpc64/fpu/multiarch/s_isnan.c
++	(__isnanf128): Define to __redirect___isnanf128.
++
++2017-09-21  Gabriel F. T. Gomes  <gabriel at inconstante.eti.br>
++
++	* sysdeps/powerpc/powerpc64le/Makefile
++	(CFLAGS-tst-strtod-nan-locale.c): New variable.
++	(CFLAGS-tst-wcstod-nan-locale.c): New variable.
++
++2017-10-10  Steve Ellcey  <sellcey at cavium.com>
++
++	* sysdeps/unix/sysv/linux/aarch64/cpu-features.c (get_midr_from_mcpu):
++	Use strcmp instead of tunable_is_name.
++
++2017-10-10  Siddhesh Poyarekar  <siddhesh at sourceware.org>
++
++	* sysdeps/aarch64/multiarch/Makefile (sysdep_routines): Add
++	memmove_falkor.
++	* sysdeps/aarch64/multiarch/ifunc-impl-list.c
++	(__libc_ifunc_impl_list): Likewise.
++	* sysdeps/aarch64/multiarch/memmove.c: Likewise.
++	* sysdeps/aarch64/multiarch/memmove_falkor.S: New file.
++
++	* benchtests/bench-memmove-walk.c: New file.
++	* benchtests/Makefile (string-benchset): Add it.
++
++	* benchtests/bench-memset-walk.c: New file.
++	* benchtests/Makefile (string-benchset): Add it.
++
++	* benchtests/bench-memcpy-walk.c: New file.
++	* benchtests/Makefile (string-benchset): Add it.
++
++	* po/sv.po: Update translations.
++	* po/fr.po: Likewise.
++
++	* sysdeps/aarch64/multiarch/memcpy_falkor.S: Fix code style in
++	comments.
++
++	* manual/tunables.texi (Tunable glibc.tune.cpu): Add falkor.
++	* sysdeps/aarch64/multiarch/Makefile (sysdep_routines): Add
++	memcpy_falkor.
++	* sysdeps/aarch64/multiarch/ifunc-impl-list.c (MAX_IFUNC):
++	Bump.
++	(__libc_ifunc_impl_list): Add __memcpy_falkor.
++	* sysdeps/aarch64/multiarch/memcpy.c: Likewise.
++	* sysdeps/aarch64/multiarch/memcpy_falkor.S: New file.
++	* sysdeps/unix/sysv/linux/aarch64/cpu-features.c (cpu_list):
++	Add falkor.
++	* sysdeps/unix/sysv/linux/aarch64/cpu-features.h (IS_FALKOR):
++	New macro.
++
++2017-10-06  Carlos O'Donell  <carlos at redhat.com>
++
++	[BZ #22111]
++	* malloc/malloc.c (tcache_shutting_down): Use bool type.
++	(tcache_thread_freeres): Set tcache_shutting_down before
++	freeing the tcache.
++	* malloc/Makefile (tests): Add tst-malloc-tcache-leak.
++	* malloc/tst-malloc-tcache-leak.c: New file.
++
++2017-10-04  H.J. Lu  <hongjiu.lu at intel.com>
++
++	* math/test-math-iscanonical.cc (error): Replace bool with int.
++	(do_test): Return errors != 0.
++
++2017-10-03  Gabriel F. T. Gomes  <gabriel at inconstante.eti.br>
++
++	[BZ #22235]
++	* math/math.h: Trivial fix for unbalanced parentheses in comment.
++	* math/Makefile [CXX] (tests): Add test-math-iscanonical.cc.
++	(CFLAGS-test-math-iscanonical.cc): New variable.
++	* math/test-math-iscanonical.cc: New file.
++	* sysdeps/ieee754/ldbl-96/bits/iscanonical.h (iscanonical):
++	Provide a C++ implementation based on function overloading,
++	rather than using __MATH_TG, which uses C-only builtins.
++	* sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h (iscanonical):
++	Likewise.
++	* sysdeps/powerpc/powerpc64le/Makefile
++	(CFLAGS-test-math-iscanonical.cc): New variable.
++
++2017-08-22  Joseph Myers  <joseph at codesourcery.com>
++
++	[BZ #21987]
++	* sysdeps/unix/sysv/linux/sparc/bits/long-double.h: Remove file
++	and copy to ...
++	* sysdeps/unix/sysv/linux/sparc/sparc32/bits/long-double.h:
++	... here.
++	* sysdeps/unix/sysv/linux/sparc/sparc64/bits/long-double.h:
++	... and here.
++
++2017-09-28  Joseph Myers  <joseph at codesourcery.com>
++
++	[BZ #22225]
++	* sysdeps/ieee754/dbl-64/s_nearbyint.c (__nearbyint): Use
++	math_opt_barrier on argument when doing arithmetic on it.
++	* sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c (__nearbyint):
++	Likewise.  Use math_force_eval not math_opt_barrier after
++	arithmetic.
++	* sysdeps/ieee754/flt-32/s_nearbyintf.c (__nearbyintf): Use
++	math_opt_barrier on argument when doing arithmetic on it.
++	* sysdeps/ieee754/ldbl-128/s_nearbyintl.c (__nearbyintl):
++	Likewise.
++
++2017-09-22  Gabriel F. T. Gomes  <gabriel at inconstante.eti.br>
++
++	[BZ #22146]
++	math/math.h: Let fpclassify use the builtin in C++ mode, even
++	when optimazing for size.
++
++2017-08-22  Gabriel F. T. Gomes  <gftg at linux.vnet.ibm.com>
++
++	* include/libc-symbols.h: [!defined HAVE_GCC_IFUNC] (__ifunc):
++	Change the return type of the ifunc resolver to match the return
++	type of the target function.
++
++2017-08-22  Martin Sebor  <msebor at redhat.com>
++
++	* include/libc-symbols.h (__ifunc_resolver): Declare resolver
++	to return a pointer to the same type as the target function.
++
++2017-08-03  Alan Modra  <amodra at gmail.com>
++
++	* sysdeps/powerpc/mod-tlsopt-powerpc.c: Extract from
++	tst-tlsopt-powerpc.c with function name change and no test harness.
++	* sysdeps/powerpc/tst-tlsopt-powerpc.c: Remove body of test.
++	Call tls_get_addr_opt_test.
++	* sysdeps/powerpc/Makefile (LDFLAGS-tst-tlsopt-powerpc): Don't define.
++	(modules-names): Add mod-tlsopt-powerpc.
++	(mod-tlsopt-powerpc.so-no-z-defs): Define.
++	(tst-tlsopt-powerpc): Depend on .so.
++	* sysdeps/powerpc/powerpc64/tls-macros.h (__TLS_GET_ADDR): Don't
++	define.  Expand use in TLS_GD and TLS_LD.
++
++2017-09-11  H.J. Lu  <hongjiu.lu at intel.com>
++
++	[BZ #21982]
++	* string/stratcliff.c (do_test): Declare size, nchars, inner,
++	middle and outer with size_t instead of int.  Repleace %d and
++	%Zd with %zu in printf.  Update "MAX (0, nchars - 128)" and
++	"MAX (outer, nchars - 64)" to support unsigned outer and
++	nchars.  Also exit loop when outer == 0.
++
++2017-09-08  Markus Trippelsdorf  <markus at trippelsdorf.de>
++
++	* sysdeps/x86_64/fpu/libm-test-ulps: Update for AMD Ryzen.
++
++2017-09-07  H.J. Lu  <hongjiu.lu at intel.com>
++
++	* resolv/tst-resolv-qtypes.c (domain): Changed to
++	"const char domain[] =".
++
++2017-08-31  H.J. Lu  <hongjiu.lu at intel.com>
++
++	[BZ #22051]
++	* Makerules (build-module-helper-objlist): Filter out
++	$(elf-objpfx)sofini.os.
++	(build-shlib-objlist): Append $(elf-objpfx)sofini.os if it is
++	needed.
++
++2017-08-30  Florian Weimer  <fweimer at redhat.com>
++
++	* malloc/dynarray_emplace_enlarge.c
++	(__libc_dynarray_emplace_enlarge): Set errno on overflow.
++	* malloc/dynarray_resize.c (__libc_dynarray_resize): Likewise.
++	* malloc/tst-dynarray.c (test_long_overflow): New function.
++	(do_test): Call it.
++
++2017-09-06  Florian Weimer  <fweimer at redhat.com>
++
++	* malloc/dynarray_emplace_enlarge.c
++	(__libc_dynarray_emplace_enlarge): Add missing else.
++
++2017-09-06  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #22096]
++	* resolv/resolv_conf.c (__resolv_conf_attach): Do not free conf in
++	case of failure to obtain the global conf object.
++
++2017-09-06  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #22095]
++	* resolv/res_init.c (res_vinit_1): Avoid memory leak in case of
++	dynarray allocation failure.
++
++2017-09-06  Florian Weimer  <fweimer at redhat.com>
++
++	Remove dead PTR IPv4-to-IPv6 mapping code from nss_dns.
++	* resolv/nss_dns/dns-host.c (getanswer_r): Remove dead code.
++	* resolv/tst-res_use_inet6.c (response_ptr_v4, response_ptr_v6):
++	New functions.
++	(response): Call them.  Add 'p', '6' flag processing.
++	(test_reverse): New function.
++	(test_get2_any): Call it.
++	(test_no_inet6): Add 'p' test.
++	(test_inet6): Likewise.
++
++2017-09-06  Florian Weimer  <fweimer at redhat.com>
++
++	Enhance tst-res_use_inet6 to test IPv4-to-IPv6 address mapping.
++	* resolv/tst-res_use_inet6.c (response): Process flags embedded in
++	the QNAME.
++	(test_gai): Adjust query names.  Add additional tests.
++	(test_get2_any, test_get2_no_inet6, test_get2_inet6): Split from
++	test_get2.  Adjust query names.  Add additional tests.
++	(test_no_inet6): New function, extracted from threadfunc.
++	(threadfunc): Call test_get2_any, test_get2_inet6, test_no_inet6.
++	Add additional tests.
++
++2017-09-01  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #21915]
++	[BZ #21922]
++	* sysdeps/posix/getaddrinfo.c (gethosts): Look at NSS function
++	result to determine success or failure, not the errno value.
++	* nss/Makefile (tests): Add tst-nss-files-hosts-erange.
++	(tst-nss-files-hosts-erange): Link with -ldl.
++	* nss/tst-nss-files-hosts-erange.c: New file.
++	* nss/tst-resolv-basic.c (response): Handle nodata.example.
++	(do_test): Add NO_DATA tests.
++	* resolv/tst-resolv-basic.c (test_nodata_nxdomain): New function.
++	(do_test): Call it.
++
++2017-09-01  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #21922]
++	* sysdeps/posix/getaddrinfo.c (gaih_inet): Report EAI_NODATA error
++	coming from gethostbyname2_r.
++
++2017-09-01  Florian Weimer  <fweimer at redhat.com>
++
++	* sysdeps/posix/getaddrinfo.c (gaih_inet): Only use h_errno if
++	status indicates it is set.
++
++2017-09-01  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #20532]
++	* sysdeps/posix/getaddrinfo.c (gaih_inet): Make reporting of NSS
++	function lookup failures more reliable.
++
++2017-09-01  Florian Weimer  <fweimer at redhat.com>
++
++	* sysdeps/posix/getaddrinfo.c (gethosts): Use h_errno directly.
++	(getcanonname): Likewise.
++	(gaih_inet): Likewise.
++
++2017-09-01  Florian Weimer  <fweimer at redhat.com>
++
++	* sysdeps/posix/getaddrinfo.c (gethosts): Use errno directly.
++	(getcanonname): Likewise.
++	(gaih_inet): Likewise.
++
++2017-08-08  Florian Weimer  <fweimer at redhat.com>
++
++	* sysdeps/posix/getaddrinfo.c (gaih_inet): Remove unreachable
++	return statement.
++
++2017-08-22  Joseph Myers  <joseph at codesourcery.com>
++
++	* assert/Makefile [$(have-cxx-thread_local)]: Move conditional
++	variable definitions above inclusion of ../Rules.
++
++2017-08-28  Gabriel F. T. Gomes  <gftg at linux.vnet.ibm.com>
++
++	[BZ #21930]
++	* math/math.h [defined __cplusplus && defined __SUPPORT_SNAN__]
++	(iszero): New C++ implementation that does not use
++	fpclassify/__MATH_TG/__builtin_types_compatible_p, when
++	signaling nans are enabled, since __builtin_types_compatible_p
++	is a C-only feature.
++	* math/test-math-iszero.cc: When __HAVE_DISTINCT_FLOAT128 is
++	defined, include ieee754_float128.h for access to the union and
++	member ieee854_float128.ieee.
++	[__HAVE_DISTINCT_FLOAT128] (do_test): Call check_float128.
++	[__HAVE_DISTINCT_FLOAT128] (check_float128): New function.
++	* sysdeps/powerpc/powerpc64le/Makefile [subdir == math]
++	(CXXFLAGS-test-math-iszero.cc): Add -mfloat128 to the build
++	options of test-math-zero on powerpc64le.
++
++2017-08-24  Gabriel F. T. Gomes  <gftg at linux.vnet.ibm.com>
++
++	* math/math.h [defined __cplusplus] (issignaling): In the long
++	double case, call __issignalingl only if __NO_LONG_DOUBLE_MATH
++	is not defined.  Call __issignaling, otherwise.
++
++2017-08-22  Gabriel F. T. Gomes  <gftg at linux.vnet.ibm.com>
++
++	* math/math.h [defined __cplusplus] (issignaling): Provide a C++
++	definition for issignaling that does not rely on __MATH_TG,
++	since __MATH_TG uses __builtin_types_compatible_p, which is only
++	available in C mode.
++	(CFLAGS-test-math-issignaling.cc): New variable.
++	* math/Makefile [CXX] (tests): Add test-math-issignaling.
++	* math/test-math-issignaling.cc: New test for C++ implementation
++	of type-generic issignaling.
++	* sysdeps/powerpc/powerpc64le/Makefile [subdir == math]
++	(CXXFLAGS-test-math-issignaling.cc): Add -mfloat128 to the build
++	options of test-math-issignaling on powerpc64le.
++
++2017-08-16  Andreas Schwab  <schwab at suse.de>
++
++	[BZ #16750]
++	CVE-2009-5064
++	* elf/ldd.bash.in: Never run file directly.
++
++2017-08-10  Florian Weimer  <fweimer at redhat.com>
++
++	* inet/net-internal.h (__inet6_scopeid_pton): Remove
++	attribute_hidden, internal_function.
++	* inet/inet6_scopeid_pton.c (__inet6_scopeid_pton): Remove
++	internal_function.
++
++2017-08-21  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #21972]
++	* assert/assert.h (assert): Use static_cast (bool) for C++.
++	Use the ternary operator in the warning branch for GNU C.
++	* assert/Makefile (tests): Add tst-assert-c++, tst-assert-g++.
++	(CFLAGS-tst-assert-c++.o): Compile in C++11 mode.
++	(CFLAGS-tst-assert-g++.o): Compile in GnU C++11 mode.
++	(LDLIBS-tst-assert-c++, LDLIBS-tst-assert-g++): Link with libstdc++.
++	* assert/tst-assert-c++.cc, assert/tst-assert-g++.cc: New files.
++
++2017-08-18  Gabriel F. T. Gomes  <gftg at linux.vnet.ibm.com>
++
++	* misc/sys/cdefs.h (__HAVE_GENERIC_SELECTION): Define to 0, if
++	in C++ mode.
++
++2017-08-18  Gabriel F. T. Gomes  <gftg at linux.vnet.ibm.com>
++
++	[BZ #21930]
++	* math/math.h (isinf): Check if in C or C++ mode before using
++	__builtin_types_compatible_p, since this is a C mode feature.
++
++2017-08-10  Gabriel F. T. Gomes  <gftg at linux.vnet.ibm.com>
++
++	[BZ #21941]
++	* sysdeps/powerpc/fpu/math_private.h (__ieee754_sqrtf128): Since
++	xssqrtqp requires operands to be in Vector Registers
++	(Altivec/VMX), replace the register constraint 'wq' with 'v'.
++	* sysdeps/powerpc/powerpc64le/power9/fpu/e_sqrtf128.c
++	(__ieee754_sqrtf128): Likewise.
++
++2017-08-11  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #21242]
++	* assert/assert.h [__GNUC__ && !__STRICT_ANSI__] (assert):
++	Suppress pedantic warning resulting from statement expression.
++	(__ASSERT_FUNCTION): Add missing __extension__.
++
++2017-08-10  Florian Weimer  <fweimer at redhat.com>
++
++	* malloc/malloc.c (get_max_fast): Reimplement as an inline
++	function which calls __builtin_unreachable.
++
++2017-08-09  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #21932]
++	* nss/getXXbyYY_r.c (REENTRANT_NAME): Call __resolv_context_put
++	before early return.
++
++2017-08-09  Adhemerval Zanella  <adhemerval.zanella at linaro.org>
++
++	[BZ #21780]
++	* sysdeps/posix/preadv2.c (preadv2): Use ENOTSUP instead of
++	EOPNOTSUPP.
++	* sysdeps/posix/preadv64v2.c (preadv64v2): Likewise.
++	* sysdeps/posix/pwritev2.c (pwritev2): Likewise.
++	* sysdeps/posix/pwritev64v2.c (pwritev64v2): Likewise.
++	* sysdeps/unix/sysv/linux/preadv2.c (preadv2): Likewise.
++	* sysdeps/unix/sysv/linux/preadv64v2.c (preadv64v2): Likewise.
++	* sysdeps/unix/sysv/linux/pwritev2.c (pwritev2): Likewise.
++	* sysdeps/unix/sysv/linux/pwritev64v2.c (pwritev64v2): Likewise.
++
++2017-08-06  H.J. Lu  <hongjiu.lu at intel.com>
++
++	[BZ #21871]
++	* sysdeps/x86/cpu-features.c (init_cpu_features): Set
++	bit_arch_Use_dl_runtime_resolve_opt only with AVX512F.
++
++2017-08-03  Aurelien Jarno  <aurelien at aurel32.net>
++
++	* stdlib/getentropy.c (getentropy): Change return type to int.
++
++2017-08-03  Aurelien Jarno  <aurelien at aurel32.net>
++
++	* sysdeps/i386/i686/fpu/multiarch/libm-test-ulps: Regenerated.
++
++2017-08-03  Florian Weimer  <fweimer at redhat.com>
++
++	[BZ #21885]
++	* sysdeps/posix/getaddrinfo.c (gethosts): Release resolver context
++	on memory allocation failure.
++
+ 2017-08-02  Siddhesh Poyarekar  <siddhesh at sourceware.org>
+ 
+ 	* version.h (RELEASE): Set to "stable"
+diff --git a/Makerules b/Makerules
+index 9bb707c168..828a445f24 100644
+--- a/Makerules
++++ b/Makerules
+@@ -686,14 +686,17 @@ $(build-module-helper) -o $@ $(shlib-lds-flags) \
+ $(call after-link,$@)
+ endef
+ 
++# sofini.os must be placed last since it terminates .eh_frame section.
+ build-module-helper-objlist = \
+ 	$(patsubst %_pic.a,$(whole-archive) %_pic.a $(no-whole-archive),\
+ 		   $(filter-out %.lds $(map-file) $(+preinit) $(+postinit) \
++				$(elf-objpfx)sofini.os \
+ 				$(link-libc-deps),$^))
+ 
+ build-module-objlist = $(build-module-helper-objlist) $(LDLIBS-$(@F:%.so=%).so)
+ build-shlib-objlist = $(build-module-helper-objlist) \
+-		      $(LDLIBS-$(@F:lib%.so=%).so)
++		      $(LDLIBS-$(@F:lib%.so=%).so) \
++		      $(filter $(elf-objpfx)sofini.os,$^)
+ 
+ # Don't try to use -lc when making libc.so itself.
+ # Also omits crti.o and crtn.o, which we do not want
+diff --git a/NEWS b/NEWS
+index 8295f20c0a..afa170f86e 100644
+--- a/NEWS
++++ b/NEWS
+@@ -5,6 +5,107 @@ See the end for copying conditions.
+ Please send GNU C library bug reports via <http://sourceware.org/bugzilla/>
+ using `glibc' in the "product" field.
+ 
++Version 2.26.1
++
++Major new features:
++
++* In order to support faster and safer process termination the malloc API
++  family of functions will no longer print a failure address and stack
++  backtrace after detecting heap corruption.  The goal is to minimize the
++  amount of work done after corruption is detected and to avoid potential
++  security issues in continued process execution.  Reducing shutdown time
++  leads to lower overall process restart latency, so there is benefit both
++  from a security and performance perspective.
++
++Security related changes:
++
++  CVE-2009-5064: The ldd script would sometimes run the program under
++  examination directly, without preventing code execution through the
++  dynamic linker.  (The glibc project disputes that this is a security
++  vulnerability; only trusted binaries must be examined using the ldd
++  script.)
++
++  CVE-2017-15670: The glob function, when invoked with GLOB_TILDE,
++  suffered from a one-byte overflow during ~ operator processing (either
++  on the stack or the heap, depending on the length of the user name).
++  Reported by Tim R??hsen.
++
++  CVE-2017-15671: The glob function, when invoked with GLOB_TILDE,
++  would sometimes fail to free memory allocated during ~ operator
++  processing, leading to a memory leak and, potentially, to a denial
++  of service.
++
++  CVE-2017-15804: The glob function, when invoked with GLOB_TILDE and
++  without GLOB_NOESCAPE, could write past the end of a buffer while
++  unescaping user names.  Reported by Tim R??hsen.
++
++  CVE-2017-17426: The malloc function, when called with an object size near
++  the value SIZE_MAX, would return a pointer to a buffer which is too small,
++  instead of NULL.  This was a regression introduced with the new malloc
++  thread cache in glibc 2.26.  Reported by Iain Buclaw.
++
++  CVE-2017-1000408: Incorrect array size computation in _dl_init_paths leads
++  to the allocation of too much memory.  (This is not a security bug per se,
++  it is mentioned here only because of the CVE assignment.)  Reported by
++  Qualys.
++
++  CVE-2017-1000409: Buffer overflow in _dl_init_paths due to miscomputation
++  of the number of search path components.  (This is not a security
++  vulnerability per se because no trust boundary is crossed if the fix for
++  CVE-2017-1000366 has been applied, but it is mentioned here only because
++  of the CVE assignment.)  Reported by Qualys.
++
++  CVE-2017-16997: Incorrect handling of RPATH or RUNPATH containing $ORIGIN
++  for AT_SECURE or SUID binaries could be used to load libraries from the
++  current directory.
++
++  CVE-2018-1000001: Buffer underflow in realpath function when getcwd function
++  succeeds without returning an absolute path due to unexpected behaviour
++  of the Linux kernel getcwd syscall.  Reported by halfdog.
++
++The following bugs are resolved with this release:
++
++  [16750] ldd: Never run file directly.
++  [17956] crypt: Use NSPR header files in addition to NSS header files
++  [20532] getaddrinfo: More robust handling of dlopen failures
++  [21242] assert: Suppress pedantic warning caused by statement expression
++  [21265] x86-64: Use fxsave/xsave/xsavec in _dl_runtime_resolve
++  [21780] posix: Set p{read,write}v2 to return ENOTSUP
++  [21871] x86-64: Use _dl_runtime_resolve_opt only with AVX512F
++  [21885] getaddrinfo: Release resolver context on error in gethosts
++  [21915] getaddrinfo: incorrect result handling for NSS service modules
++  [21922] getaddrinfo with AF_INET(6) returns EAI_NONAME, not EAI_NODATA
++  [21930] Do not use __builtin_types_compatible_p in C++ mode
++  [21932] Unpaired __resolv_context_get in generic get*_r implementation
++  [21941] powerpc: Restrict xssqrtqp operands to Vector Registers
++  [21972] assert macro requires operator== (int) for its argument type
++  [21982] string: stratcliff.c: error: assuming signed overflow does not
++    occur with -O3
++  [21987] Fix sparc32 bits/long-double.h
++  [22051] libc: zero terminator in the middle of glibc's .eh_frame
++  [22052] malloc failed to compile with GCC 7 and -O3
++  [22078] nss_files performance issue in hosts multi mode
++  [22093] x86: Add x86_64 to x86-64 HWCAP
++  [22095] resolv: Fix memory leak with OOM during resolv.conf parsing
++  [22096] resolv: __resolv_conf_attach must not free passed conf object
++  [22111] malloc: per thread cache is not returned when thread exits
++  [22145] ttyname gives up too early in the face of namespaces
++  [22146] Let fpclassify use the builtin when optimizing for size in C++ mode
++  [22225] math: nearbyint arithmetic moved before feholdexcept
++  [22235] Add C++ versions of iscanonical for ldbl-96 and ldbl-128ibm
++  [22296] Let signbit use the builtin in C++ mode with gcc < 6.x
++  [22299] x86-64: Don't set GLRO(dl_platform) to NULL
++  [22320] glob: Fix one-byte overflow (CVE-2017-15670)
++  [22321] sysconf: Fix missing definition of UIO_MAXIOV on Linux
++  [22322] libc: [mips64] wrong bits/long-double.h installed
++  [22325] glibc: Memory leak in glob with GLOB_TILDE (CVE-2017-15671)
++  [22375] malloc returns pointer from tcache instead of NULL (CVE-2017-17426)
++  [22636] PTHREAD_STACK_MIN is too small on x86-64
++  [22627] $ORIGIN in $LD_LIBRARY_PATH is substituted twice
++  [22637] nptl: Fix stack guard size accounting
++  [22679] getcwd(3) can succeed without returning an absolute path
++    (CVE-2018-1000001)
++
+ Version 2.26
+ 
+ Major new features:
+diff --git a/assert/Makefile b/assert/Makefile
+index 1c3be9b01f..222ab516f0 100644
+--- a/assert/Makefile
++++ b/assert/Makefile
+@@ -25,6 +25,15 @@ include ../Makeconfig
+ headers	:= assert.h
+ 
+ routines := assert assert-perr __assert
+-tests := test-assert test-assert-perr
++tests := test-assert test-assert-perr tst-assert-c++ tst-assert-g++
++
++ifeq ($(have-cxx-thread_local),yes)
++CFLAGS-tst-assert-c++.o = -std=c++11
++LDLIBS-tst-assert-c++ = -lstdc++
++CFLAGS-tst-assert-g++.o = -std=gnu++11
++LDLIBS-tst-assert-g++ = -lstdc++
++else
++tests-unsupported += tst-assert-c++ tst-assert-g++
++endif
+ 
+ include ../Rules
+diff --git a/assert/assert.h b/assert/assert.h
+index 22f019537c..640c95c063 100644
+--- a/assert/assert.h
++++ b/assert/assert.h
+@@ -85,19 +85,29 @@ __END_DECLS
+ /* When possible, define assert so that it does not add extra
+    parentheses around EXPR.  Otherwise, those added parentheses would
+    suppress warnings we'd expect to be detected by gcc's -Wparentheses.  */
+-# if !defined __GNUC__ || defined __STRICT_ANSI__
++# if defined __cplusplus
++#  define assert(expr)							\
++     (static_cast <bool> (expr)						\
++      ? void (0)							\
++      : __assert_fail (#expr, __FILE__, __LINE__, __ASSERT_FUNCTION))
++# elif !defined __GNUC__ || defined __STRICT_ANSI__
+ #  define assert(expr)							\
+     ((expr)								\
+      ? __ASSERT_VOID_CAST (0)						\
+      : __assert_fail (#expr, __FILE__, __LINE__, __ASSERT_FUNCTION))
+ # else
++/* The first occurrence of EXPR is not evaluated due to the sizeof,
++   but will trigger any pedantic warnings masked by the __extension__
++   for the second occurrence.  The ternary operator is required to
++   support function pointers and bit fields in this context, and to
++   suppress the evaluation of variable length arrays.  */
+ #  define assert(expr)							\
+-    ({									\
++  ((void) sizeof ((expr) ? 1 : 0), __extension__ ({			\
+       if (expr)								\
+         ; /* empty */							\
+       else								\
+         __assert_fail (#expr, __FILE__, __LINE__, __ASSERT_FUNCTION);	\
+-    })
++    }))
+ # endif
+ 
+ # ifdef	__USE_GNU
+@@ -113,7 +123,7 @@ __END_DECLS
+    C9x has a similar variable called __func__, but prefer the GCC one since
+    it demangles C++ function names.  */
+ # if defined __cplusplus ? __GNUC_PREREQ (2, 6) : __GNUC_PREREQ (2, 4)
+-#   define __ASSERT_FUNCTION	__PRETTY_FUNCTION__
++#   define __ASSERT_FUNCTION	__extension__ __PRETTY_FUNCTION__
+ # else
+ #  if defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L
+ #   define __ASSERT_FUNCTION	__func__
+diff --git a/assert/tst-assert-c++.cc b/assert/tst-assert-c++.cc
+new file mode 100644
+index 0000000000..12a5e690cb
+--- /dev/null
++++ b/assert/tst-assert-c++.cc
+@@ -0,0 +1,78 @@
++/* Tests for interactions between C++ and assert.
++   Copyright (C) 2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <assert.h>
++
++/* The C++ standard requires that if the assert argument is a constant
++   subexpression, then the assert itself is one, too.  */
++constexpr int
++check_constexpr ()
++{
++  return (assert (true), 1);
++}
++
++/* Objects of this class can be contextually converted to bool, but
++   cannot be compared to int.  */
++struct no_int
++{
++  no_int () = default;
++  no_int (const no_int &) = delete;
++
++  explicit operator bool () const
++  {
++    return true;
++  }
++
++  bool operator! () const; /* No definition.  */
++  template <class T> bool operator== (T) const; /* No definition.  */
++  template <class T> bool operator!= (T) const; /* No definition.  */
++};
++
++/* This class tests that operator== is not used by assert.  */
++struct bool_and_int
++{
++  bool_and_int () = default;
++  bool_and_int (const no_int &) = delete;
++
++  explicit operator bool () const
++  {
++    return true;
++  }
++
++  bool operator! () const; /* No definition.  */
++  template <class T> bool operator== (T) const; /* No definition.  */
++  template <class T> bool operator!= (T) const; /* No definition.  */
++};
++
++static int
++do_test ()
++{
++  {
++    no_int value;
++    assert (value);
++  }
++
++  {
++    bool_and_int value;
++    assert (value);
++  }
++
++  return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/assert/tst-assert-g++.cc b/assert/tst-assert-g++.cc
+new file mode 100644
+index 0000000000..8c06402825
+--- /dev/null
++++ b/assert/tst-assert-g++.cc
+@@ -0,0 +1,19 @@
++/* Tests for interactions between C++ and assert.  GNU C++11 version.
++   Copyright (C) 2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <tst-assert-c++.cc>
+diff --git a/configure b/configure
+index d8e1c50e11..47d8c75248 100755
+--- a/configure
++++ b/configure
+@@ -3547,8 +3547,12 @@ if test x$nss_crypt = xyes; then
+   if test $? -ne 0; then
+     as_fn_error $? "cannot find include directory with nss-config" "$LINENO" 5
+   fi
++  nspr_includes=-I$(nspr-config --includedir 2>/dev/null)
++  if test $? -ne 0; then
++    as_fn_error $? "cannot find include directory with nspr-config" "$LINENO" 5
++  fi
+   old_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS $nss_includes"
++  CFLAGS="$CFLAGS $nss_includes $nspr_includes"
+ 
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+diff --git a/configure.ac b/configure.ac
+index 77456aa8d9..e8a1ab3562 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -330,8 +330,12 @@ if test x$nss_crypt = xyes; then
+   if test $? -ne 0; then
+     AC_MSG_ERROR([cannot find include directory with nss-config])
+   fi
++  nspr_includes=-I$(nspr-config --includedir 2>/dev/null)
++  if test $? -ne 0; then
++    AC_MSG_ERROR([cannot find include directory with nspr-config])
++  fi
+   old_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS $nss_includes"
++  CFLAGS="$CFLAGS $nss_includes $nspr_includes"
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([typedef int PRBool;
+ #include <hasht.h>
+ #include <nsslowhash.h>
+diff --git a/crypt/Makefile b/crypt/Makefile
+index 0280fba8a7..8bbbf2a121 100644
+--- a/crypt/Makefile
++++ b/crypt/Makefile
+@@ -37,9 +37,11 @@ routines += $(libcrypt-routines)
+ endif
+ 
+ ifeq ($(nss-crypt),yes)
+-CPPFLAGS-sha256-crypt.c = -DUSE_NSS -I$(shell nss-config --includedir)
+-CPPFLAGS-sha512-crypt.c = -DUSE_NSS -I$(shell nss-config --includedir)
+-CPPFLAGS-md5-crypt.c = -DUSE_NSS -I$(shell nss-config --includedir)
++nss-cpp-flags := -DUSE_NSS \
++  -I$(shell nss-config --includedir) -I$(shell nspr-config --includedir)
++CPPFLAGS-sha256-crypt.c = $(nss-cpp-flags)
++CPPFLAGS-sha512-crypt.c = $(nss-cpp-flags)
++CPPFLAGS-md5-crypt.c = $(nss-cpp-flags)
+ LDLIBS-crypt.so = -lfreebl3
+ else
+ libcrypt-routines += md5 sha256 sha512
+diff --git a/elf/dl-load.c b/elf/dl-load.c
+index c1b6d4ba0f..7397c1882c 100644
+--- a/elf/dl-load.c
++++ b/elf/dl-load.c
+@@ -37,6 +37,7 @@
+ #include <sysdep.h>
+ #include <stap-probe.h>
+ #include <libc-pointer-arith.h>
++#include <array_length.h>
+ 
+ #include <dl-dst.h>
+ #include <dl-load.h>
+@@ -103,7 +104,9 @@ static size_t ncapstr attribute_relro;
+ static size_t max_capstrlen attribute_relro;
+ 
+ 
+-/* Get the generated information about the trusted directories.  */
++/* Get the generated information about the trusted directories.  Use
++   an array of concatenated strings to avoid relocations.  See
++   gen-trusted-dirs.awk.  */
+ #include "trusted-dirs.h"
+ 
+ static const char system_dirs[] = SYSTEM_DIRS;
+@@ -111,9 +114,7 @@ static const size_t system_dirs_len[] =
+ {
+   SYSTEM_DIRS_LEN
+ };
+-#define nsystem_dirs_len \
+-  (sizeof (system_dirs_len) / sizeof (system_dirs_len[0]))
+-
++#define nsystem_dirs_len array_length (system_dirs_len)
+ 
+ static bool
+ is_trusted_path (const char *path, size_t len)
+@@ -433,31 +434,40 @@ fillin_rpath (char *rpath, struct r_search_path_elem **result, const char *sep,
+ {
+   char *cp;
+   size_t nelems = 0;
+-  char *to_free;
+ 
+   while ((cp = __strsep (&rpath, sep)) != NULL)
+     {
+       struct r_search_path_elem *dirp;
++      char *to_free = NULL;
++      size_t len = 0;
+ 
+-      to_free = cp = expand_dynamic_string_token (l, cp, 1);
++      /* `strsep' can pass an empty string.  */
++      if (*cp != '\0')
++	{
++	  to_free = cp = expand_dynamic_string_token (l, cp, 1);
+ 
+-      size_t len = strlen (cp);
++	  /* expand_dynamic_string_token can return NULL in case of empty
++	     path or memory allocation failure.  */
++	  if (cp == NULL)
++	    continue;
+ 
+-      /* `strsep' can pass an empty string.  This has to be
+-	 interpreted as `use the current directory'. */
+-      if (len == 0)
+-	{
+-	  static const char curwd[] = "./";
+-	  cp = (char *) curwd;
+-	}
++	  /* Compute the length after dynamic string token expansion and
++	     ignore empty paths.  */
++	  len = strlen (cp);
++	  if (len == 0)
++	    {
++	      free (to_free);
++	      continue;
++	    }
+ 
+-      /* Remove trailing slashes (except for "/").  */
+-      while (len > 1 && cp[len - 1] == '/')
+-	--len;
++	  /* Remove trailing slashes (except for "/").  */
++	  while (len > 1 && cp[len - 1] == '/')
++	    --len;
+ 
+-      /* Now add one if there is none so far.  */
+-      if (len > 0 && cp[len - 1] != '/')
+-	cp[len++] = '/';
++	  /* Now add one if there is none so far.  */
++	  if (len > 0 && cp[len - 1] != '/')
++	    cp[len++] = '/';
++	}
+ 
+       /* Make sure we don't use untrusted directories if we run SUID.  */
+       if (__glibc_unlikely (check_trusted) && !is_trusted_path (cp, len))
+@@ -621,6 +631,14 @@ decompose_rpath (struct r_search_path_struct *sps,
+      necessary.  */
+   free (copy);
+ 
++  /* There is no path after expansion.  */
++  if (result[0] == NULL)
++    {
++      free (result);
++      sps->dirs = (struct r_search_path_elem **) -1;
++      return false;
++    }
++
+   sps->dirs = result;
+   /* The caller will change this value if we haven't used a real malloc.  */
+   sps->malloced = 1;
+@@ -688,9 +706,8 @@ _dl_init_paths (const char *llp)
+ 		 + ncapstr * sizeof (enum r_dir_status))
+ 		/ sizeof (struct r_search_path_elem));
+ 
+-  rtld_search_dirs.dirs[0] = (struct r_search_path_elem *)
+-    malloc ((sizeof (system_dirs) / sizeof (system_dirs[0]))
+-	    * round_size * sizeof (struct r_search_path_elem));
++  rtld_search_dirs.dirs[0] = malloc (nsystem_dirs_len * round_size
++				     * sizeof (*rtld_search_dirs.dirs[0]));
+   if (rtld_search_dirs.dirs[0] == NULL)
+     {
+       errstring = N_("cannot create cache for search path");
+@@ -776,37 +793,14 @@ _dl_init_paths (const char *llp)
+ 
+   if (llp != NULL && *llp != '\0')
+     {
+-      size_t nllp;
+-      const char *cp = llp;
+-      char *llp_tmp;
+-
+-#ifdef SHARED
+-      /* Expand DSTs.  */
+-      size_t cnt = DL_DST_COUNT (llp, 1);
+-      if (__glibc_likely (cnt == 0))
+-	llp_tmp = strdupa (llp);
+-      else
+-	{
+-	  /* Determine the length of the substituted string.  */
+-	  size_t total = DL_DST_REQUIRED (l, llp, strlen (llp), cnt);
+-
+-	  /* Allocate the necessary memory.  */
+-	  llp_tmp = (char *) alloca (total + 1);
+-	  llp_tmp = _dl_dst_substitute (l, llp, llp_tmp, 1);
+-	}
+-#else
+-      llp_tmp = strdupa (llp);
+-#endif
++      char *llp_tmp = strdupa (llp);
+ 
+       /* Decompose the LD_LIBRARY_PATH contents.  First determine how many
+ 	 elements it has.  */
+-      nllp = 1;
+-      while (*cp)
+-	{
+-	  if (*cp == ':' || *cp == ';')
+-	    ++nllp;
+-	  ++cp;
+-	}
++      size_t nllp = 1;
++      for (const char *cp = llp_tmp; *cp != '\0'; ++cp)
++	if (*cp == ':' || *cp == ';')
++	  ++nllp;
+ 
+       env_path_list.dirs = (struct r_search_path_elem **)
+ 	malloc ((nllp + 1) * sizeof (struct r_search_path_elem *));
+diff --git a/elf/dl-tunables.c b/elf/dl-tunables.c
+index 231fb8ca93..d9975ef2d0 100644
+--- a/elf/dl-tunables.c
++++ b/elf/dl-tunables.c
+@@ -88,18 +88,11 @@ get_next_env (char **envp, char **name, size_t *namelen, char **val,
+   return NULL;
+ }
+ 
+-#define TUNABLE_SET_VAL_IF_VALID_RANGE(__cur, __val, __type, __default_min, \
+-				       __default_max)			      \
++#define TUNABLE_SET_VAL_IF_VALID_RANGE(__cur, __val, __type)		      \
+ ({									      \
+   __type min = (__cur)->type.min;					      \
+   __type max = (__cur)->type.max;					      \
+ 									      \
+-  if (min == max)							      \
+-    {									      \
+-      min = __default_min;						      \
+-      max = __default_max;						      \
+-    }									      \
+-									      \
+   if ((__type) (__val) >= min && (__type) (val) <= max)			      \
+     {									      \
+       (__cur)->val.numval = val;					      \
+@@ -119,17 +112,17 @@ do_tunable_update_val (tunable_t *cur, const void *valp)
+     {
+     case TUNABLE_TYPE_INT_32:
+ 	{
+-	  TUNABLE_SET_VAL_IF_VALID_RANGE (cur, val, int64_t, INT32_MIN, INT32_MAX);
++	  TUNABLE_SET_VAL_IF_VALID_RANGE (cur, val, int64_t);
+ 	  break;
+ 	}
+     case TUNABLE_TYPE_UINT_64:
+ 	{
+-	  TUNABLE_SET_VAL_IF_VALID_RANGE (cur, val, uint64_t, 0, UINT64_MAX);
++	  TUNABLE_SET_VAL_IF_VALID_RANGE (cur, val, uint64_t);
+ 	  break;
+ 	}
+     case TUNABLE_TYPE_SIZE_T:
+ 	{
+-	  TUNABLE_SET_VAL_IF_VALID_RANGE (cur, val, uint64_t, 0, SIZE_MAX);
++	  TUNABLE_SET_VAL_IF_VALID_RANGE (cur, val, uint64_t);
+ 	  break;
+ 	}
+     case TUNABLE_TYPE_STRING:
+diff --git a/elf/ldd.bash.in b/elf/ldd.bash.in
+index 7dd1fccf24..686785e235 100644
+--- a/elf/ldd.bash.in
++++ b/elf/ldd.bash.in
+@@ -164,18 +164,6 @@ warning: you do not have execution permission for" "\`$file'" >&2
+       fi
+     done
+     case $ret in
+-    0)
+-      # If the program exits with exit code 5, it means the process has been
+-      # invoked with __libc_enable_secure.  Fall back to running it through
+-      # the dynamic linker.
+-      try_trace "$file"
+-      rc=$?
+-      if [ $rc = 5 ]; then
+-	try_trace "$RTLD" "$file"
+-	rc=$?
+-      fi
+-      [ $rc = 0 ] || result=1
+-      ;;
+     1)
+       # This can be a non-ELF binary or no binary at all.
+       nonelf "$file" || {
+@@ -183,7 +171,7 @@ warning: you do not have execution permission for" "\`$file'" >&2
+ 	result=1
+       }
+       ;;
+-    2)
++    0|2)
+       try_trace "$RTLD" "$file" || result=1
+       ;;
+     *)
+diff --git a/include/array_length.h b/include/array_length.h
+new file mode 100644
+index 0000000000..cb4a8b2a56
+--- /dev/null
++++ b/include/array_length.h
+@@ -0,0 +1,36 @@
++/* The array_length and array_end macros.
++   Copyright (C) 2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef _ARRAY_LENGTH_H
++#define _ARRAY_LENGTH_H
++
++/* array_length (VAR) is the number of elements in the array VAR.  VAR
++   must evaluate to an array, not a pointer.  */
++#define array_length(var)                                               \
++  __extension__ ({                                                      \
++    _Static_assert (!__builtin_types_compatible_p                       \
++                    (__typeof (var), __typeof (&(var)[0])),             \
++                    "argument must be an array");                       \
++    sizeof (var) / sizeof ((var)[0]);                                   \
++  })
++
++/* array_end (VAR) is a pointer one past the end of the array VAR.
++   VAR must evaluate to an array, not a pointer.  */
++#define array_end(var) (&(var)[array_length (var)])
++
++#endif /* _ARRAY_LENGTH_H */
+diff --git a/include/libc-symbols.h b/include/libc-symbols.h
+index 3310e3a678..5bf57703a9 100644
+--- a/include/libc-symbols.h
++++ b/include/libc-symbols.h
+@@ -782,7 +782,8 @@ for linking")
+ 
+ /* Helper / base  macros for indirect function symbols.  */
+ #define __ifunc_resolver(type_name, name, expr, arg, init, classifier)	\
+-  classifier inhibit_stack_protector void *name##_ifunc (arg)					\
++  classifier inhibit_stack_protector					\
++  __typeof (type_name) *name##_ifunc (arg)				\
+   {									\
+     init ();								\
+     __typeof (type_name) *res = expr;					\
+@@ -809,7 +810,7 @@ for linking")
+ 
+ # define __ifunc(type_name, name, expr, arg, init)			\
+   extern __typeof (type_name) name;					\
+-  void *name##_ifunc (arg) __asm__ (#name);				\
++  __typeof (type_name) *name##_ifunc (arg) __asm__ (#name);		\
+   __ifunc_resolver (type_name, name, expr, arg, init,)			\
+  __asm__ (".type " #name ", %gnu_indirect_function");
+ 
+diff --git a/inet/inet6_scopeid_pton.c b/inet/inet6_scopeid_pton.c
+index e09b1cb34d..cc8803fa10 100644
+--- a/inet/inet6_scopeid_pton.c
++++ b/inet/inet6_scopeid_pton.c
+@@ -28,7 +28,7 @@
+ 
+ /* Parse SOURCE as a scope ID for ADDRESS.  Return 0 on success and -1
+    on error.  */
+-internal_function int
++int
+ __inet6_scopeid_pton (const struct in6_addr *address, const char *scope,
+                       uint32_t *result)
+ {
+diff --git a/inet/net-internal.h b/inet/net-internal.h
+index 2b2632c7ba..b2135893e8 100644
+--- a/inet/net-internal.h
++++ b/inet/net-internal.h
+@@ -25,8 +25,7 @@
+ #include <sys/time.h>
+ 
+ int __inet6_scopeid_pton (const struct in6_addr *address,
+-                          const char *scope, uint32_t *result)
+-  internal_function attribute_hidden;
++                          const char *scope, uint32_t *result);
+ libc_hidden_proto (__inet6_scopeid_pton)
+ 
+ 
+diff --git a/io/Makefile b/io/Makefile
+index 2f26bf56db..f0bdc838bb 100644
+--- a/io/Makefile
++++ b/io/Makefile
+@@ -70,7 +70,7 @@ tests		:= test-utime test-stat test-stat2 test-lfs tst-getcwd \
+ 		   tst-symlinkat tst-linkat tst-readlinkat tst-mkdirat \
+ 		   tst-mknodat tst-mkfifoat tst-ttyname_r bug-ftw5 \
+ 		   tst-posix_fallocate tst-posix_fallocate64 \
+-		   tst-fts tst-fts-lfs tst-open-tmpfile
++		   tst-fts tst-fts-lfs tst-open-tmpfile tst-getcwd-abspath
+ 
+ ifeq ($(run-built-tests),yes)
+ tests-special += $(objpfx)ftwtest.out
+diff --git a/io/tst-getcwd-abspath.c b/io/tst-getcwd-abspath.c
+new file mode 100644
+index 0000000000..3a3636f2ed
+--- /dev/null
++++ b/io/tst-getcwd-abspath.c
+@@ -0,0 +1,66 @@
++/* BZ #22679 getcwd(3) should not succeed without returning an absolute path.
++
++   Copyright (C) 2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <https://www.gnu.org/licenses/>.  */
++
++#include <errno.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <support/check.h>
++#include <support/namespace.h>
++#include <support/support.h>
++#include <support/temp_file.h>
++#include <support/test-driver.h>
++#include <support/xunistd.h>
++#include <unistd.h>
++
++static char *chroot_dir;
++
++/* The actual test.  Run it in a subprocess, so that the test harness
++   can remove the temporary directory in --direct mode.  */
++static void
++getcwd_callback (void *closure)
++{
++  xchroot (chroot_dir);
++
++  errno = 0;
++  char *cwd = getcwd (NULL, 0);
++  TEST_COMPARE (errno, ENOENT);
++  TEST_VERIFY (cwd == NULL);
++
++  errno = 0;
++  cwd = realpath (".", NULL);
++  TEST_COMPARE (errno, ENOENT);
++  TEST_VERIFY (cwd == NULL);
++
++  _exit (0);
++}
++
++static int
++do_test (void)
++{
++  support_become_root ();
++  if (!support_can_chroot ())
++    return EXIT_UNSUPPORTED;
++
++  chroot_dir = support_create_temp_directory ("tst-getcwd-abspath-");
++  support_isolate_in_subprocess (getcwd_callback, NULL);
++
++  return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/malloc/Makefile b/malloc/Makefile
+index 3fa395b949..9e23db9343 100644
+--- a/malloc/Makefile
++++ b/malloc/Makefile
+@@ -34,6 +34,7 @@ tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \
+ 	 tst-interpose-nothread \
+ 	 tst-interpose-thread \
+ 	 tst-alloc_buffer \
++	 tst-malloc-tcache-leak \
+ 
+ tests-static := \
+ 	 tst-interpose-static-nothread \
+@@ -242,3 +243,5 @@ tst-dynarray-fail-ENV = MALLOC_TRACE=$(objpfx)tst-dynarray-fail.mtrace
+ $(objpfx)tst-dynarray-fail-mem.out: $(objpfx)tst-dynarray-fail.out
+ 	$(common-objpfx)malloc/mtrace $(objpfx)tst-dynarray-fail.mtrace > $@; \
+ 	$(evaluate-test)
++
++$(objpfx)tst-malloc-tcache-leak: $(shared-thread-library)
+diff --git a/malloc/arena.c b/malloc/arena.c
+index dc14fae152..afd423240a 100644
+--- a/malloc/arena.c
++++ b/malloc/arena.c
+@@ -116,7 +116,7 @@ int __malloc_initialized = -1;
+   } while (0)
+ 
+ #define arena_lock(ptr, size) do {					      \
+-      if (ptr && !arena_is_corrupt (ptr))				      \
++      if (ptr)								      \
+         __libc_lock_lock (ptr->mutex);					      \
+       else								      \
+         ptr = arena_get2 ((size), NULL);				      \
+@@ -215,8 +215,7 @@ void
+ TUNABLE_CALLBACK (set_mallopt_check) (tunable_val_t *valp)
+ {
+   int32_t value = (int32_t) valp->numval;
+-  do_set_mallopt_check (value);
+-  if (check_action != 0)
++  if (value != 0)
+     __malloc_check_init ();
+ }
+ 
+@@ -397,12 +396,8 @@ ptmalloc_init (void)
+             }
+         }
+     }
+-  if (s && s[0])
+-    {
+-      __libc_mallopt (M_CHECK_ACTION, (int) (s[0] - '0'));
+-      if (check_action != 0)
+-        __malloc_check_init ();
+-    }
++  if (s && s[0] != '\0' && s[0] != '0')
++    __malloc_check_init ();
+ #endif
+ 
+ #if HAVE_MALLOC_INIT_HOOK
+@@ -837,7 +832,7 @@ reused_arena (mstate avoid_arena)
+   result = next_to_use;
+   do
+     {
+-      if (!arena_is_corrupt (result) && !__libc_lock_trylock (result->mutex))
++      if (!__libc_lock_trylock (result->mutex))
+         goto out;
+ 
+       /* FIXME: This is a data race, see _int_new_arena.  */
+@@ -850,18 +845,6 @@ reused_arena (mstate avoid_arena)
+   if (result == avoid_arena)
+     result = result->next;
+ 
+-  /* Make sure that the arena we get is not corrupted.  */
+-  mstate begin = result;
+-  while (arena_is_corrupt (result) || result == avoid_arena)
+-    {
+-      result = result->next;
+-      if (result == begin)
+-	/* We looped around the arena list.  We could not find any
+-	   arena that was either not corrupted or not the one we
+-	   wanted to avoid.  */
+-	return NULL;
+-    }
+-
+   /* No arena available without contention.  Wait for the next in line.  */
+   LIBC_PROBE (memory_arena_reuse_wait, 3, &result->mutex, result, avoid_arena);
+   __libc_lock_lock (result->mutex);
+@@ -958,10 +941,6 @@ arena_get_retry (mstate ar_ptr, size_t bytes)
+   if (ar_ptr != &main_arena)
+     {
+       __libc_lock_unlock (ar_ptr->mutex);
+-      /* Don't touch the main arena if it is corrupt.  */
+-      if (arena_is_corrupt (&main_arena))
+-	return NULL;
+-
+       ar_ptr = &main_arena;
+       __libc_lock_lock (ar_ptr->mutex);
+     }
+diff --git a/malloc/dynarray_emplace_enlarge.c b/malloc/dynarray_emplace_enlarge.c
+index dfc70017ce..a15245f4cb 100644
+--- a/malloc/dynarray_emplace_enlarge.c
++++ b/malloc/dynarray_emplace_enlarge.c
+@@ -17,6 +17,7 @@
+    <http://www.gnu.org/licenses/>.  */
+ 
+ #include <dynarray.h>
++#include <errno.h>
+ #include <malloc-internal.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -32,7 +33,7 @@ __libc_dynarray_emplace_enlarge (struct dynarray_header *list,
+          size.  */
+       if (element_size < 4)
+         new_allocated = 16;
+-      if (element_size < 8)
++      else if (element_size < 8)
+         new_allocated = 8;
+       else
+         new_allocated = 4;
+@@ -43,8 +44,11 @@ __libc_dynarray_emplace_enlarge (struct dynarray_header *list,
+     {
+       new_allocated = list->allocated + list->allocated / 2 + 1;
+       if (new_allocated <= list->allocated)
+-        /* Overflow.  */
+-        return false;
++        {
++          /* Overflow.  */
++          __set_errno (ENOMEM);
++          return false;
++        }
+     }
+ 
+   size_t new_size;
+diff --git a/malloc/dynarray_resize.c b/malloc/dynarray_resize.c
+index e6dc9fbc68..63c981bf61 100644
+--- a/malloc/dynarray_resize.c
++++ b/malloc/dynarray_resize.c
+@@ -17,6 +17,7 @@
+    <http://www.gnu.org/licenses/>.  */
+ 
+ #include <dynarray.h>
++#include <errno.h>
+ #include <malloc-internal.h>
+ #include <stdlib.h>
+ #include <string.h>
+@@ -38,7 +39,11 @@ __libc_dynarray_resize (struct dynarray_header *list, size_t size,
+ 
+   size_t new_size_bytes;
+   if (check_mul_overflow_size_t (size, element_size, &new_size_bytes))
+-    return false;
++    {
++      /* Overflow.  */
++      __set_errno (ENOMEM);
++      return false;
++    }
+   void *new_array;
+   if (list->array == scratch)
+     {
+diff --git a/malloc/hooks.c b/malloc/hooks.c
+index 1d80be20d2..2c6cebc889 100644
+--- a/malloc/hooks.c
++++ b/malloc/hooks.c
+@@ -121,12 +121,7 @@ malloc_check_get_size (mchunkptr p)
+        size -= c)
+     {
+       if (c <= 0 || size < (c + 2 * SIZE_SZ))
+-        {
+-          malloc_printerr (check_action, "malloc_check_get_size: memory corruption",
+-                           chunk2mem (p),
+-			   chunk_is_mmapped (p) ? NULL : arena_for_chunk (p));
+-          return 0;
+-        }
++	malloc_printerr ("malloc_check_get_size: memory corruption");
+     }
+ 
+   /* chunk2mem size.  */
+@@ -232,17 +227,11 @@ mem2chunk_check (void *mem, unsigned char **magic_p)
+   return p;
+ }
+ 
+-/* Check for corruption of the top chunk, and try to recover if
+-   necessary. */
+-
+-static int
+-internal_function
++/* Check for corruption of the top chunk.  */
++static void
+ top_check (void)
+ {
+   mchunkptr t = top (&main_arena);
+-  char *brk, *new_brk;
+-  INTERNAL_SIZE_T front_misalign, sbrk_size;
+-  unsigned long pagesz = GLRO (dl_pagesize);
+ 
+   if (t == initial_top (&main_arena) ||
+       (!chunk_is_mmapped (t) &&
+@@ -250,34 +239,9 @@ top_check (void)
+        prev_inuse (t) &&
+        (!contiguous (&main_arena) ||
+         (char *) t + chunksize (t) == mp_.sbrk_base + main_arena.system_mem)))
+-    return 0;
+-
+-  malloc_printerr (check_action, "malloc: top chunk is corrupt", t,
+-		   &main_arena);
+-
+-  /* Try to set up a new top chunk. */
+-  brk = MORECORE (0);
+-  front_misalign = (unsigned long) chunk2mem (brk) & MALLOC_ALIGN_MASK;
+-  if (front_misalign > 0)
+-    front_misalign = MALLOC_ALIGNMENT - front_misalign;
+-  sbrk_size = front_misalign + mp_.top_pad + MINSIZE;
+-  sbrk_size += pagesz - ((unsigned long) (brk + sbrk_size) & (pagesz - 1));
+-  new_brk = (char *) (MORECORE (sbrk_size));
+-  if (new_brk == (char *) (MORECORE_FAILURE))
+-    {
+-      __set_errno (ENOMEM);
+-      return -1;
+-    }
+-  /* Call the `morecore' hook if necessary.  */
+-  void (*hook) (void) = atomic_forced_read (__after_morecore_hook);
+-  if (hook)
+-    (*hook)();
+-  main_arena.system_mem = (new_brk - mp_.sbrk_base) + sbrk_size;
+-
+-  top (&main_arena) = (mchunkptr) (brk + front_misalign);
+-  set_head (top (&main_arena), (sbrk_size - front_misalign) | PREV_INUSE);
++    return;
+ 
+-  return 0;
++  malloc_printerr ("malloc: top chunk is corrupt");
+ }
+ 
+ static void *
+@@ -292,7 +256,8 @@ malloc_check (size_t sz, const void *caller)
+     }
+ 
+   __libc_lock_lock (main_arena.mutex);
+-  victim = (top_check () >= 0) ? _int_malloc (&main_arena, sz + 1) : NULL;
++  top_check ();
++  victim = _int_malloc (&main_arena, sz + 1);
+   __libc_lock_unlock (main_arena.mutex);
+   return mem2mem_check (victim, sz);
+ }
+@@ -308,13 +273,7 @@ free_check (void *mem, const void *caller)
+   __libc_lock_lock (main_arena.mutex);
+   p = mem2chunk_check (mem, NULL);
+   if (!p)
+-    {
+-      __libc_lock_unlock (main_arena.mutex);
+-
+-      malloc_printerr (check_action, "free(): invalid pointer", mem,
+-		       &main_arena);
+-      return;
+-    }
++    malloc_printerr ("free(): invalid pointer");
+   if (chunk_is_mmapped (p))
+     {
+       __libc_lock_unlock (main_arena.mutex);
+@@ -349,11 +308,7 @@ realloc_check (void *oldmem, size_t bytes, const void *caller)
+   const mchunkptr oldp = mem2chunk_check (oldmem, &magic_p);
+   __libc_lock_unlock (main_arena.mutex);
+   if (!oldp)
+-    {
+-      malloc_printerr (check_action, "realloc(): invalid pointer", oldmem,
+-		       &main_arena);
+-      return malloc_check (bytes, NULL);
+-    }
++    malloc_printerr ("realloc(): invalid pointer");
+   const INTERNAL_SIZE_T oldsize = chunksize (oldp);
+ 
+   checked_request2size (bytes + 1, nb);
+@@ -374,8 +329,8 @@ realloc_check (void *oldmem, size_t bytes, const void *caller)
+         else
+           {
+             /* Must alloc, copy, free. */
+-            if (top_check () >= 0)
+-              newmem = _int_malloc (&main_arena, bytes + 1);
++	    top_check ();
++	    newmem = _int_malloc (&main_arena, bytes + 1);
+             if (newmem)
+               {
+                 memcpy (newmem, oldmem, oldsize - 2 * SIZE_SZ);
+@@ -386,19 +341,24 @@ realloc_check (void *oldmem, size_t bytes, const void *caller)
+     }
+   else
+     {
+-      if (top_check () >= 0)
+-        {
+-          INTERNAL_SIZE_T nb;
+-          checked_request2size (bytes + 1, nb);
+-          newmem = _int_realloc (&main_arena, oldp, oldsize, nb);
+-        }
++      top_check ();
++      INTERNAL_SIZE_T nb;
++      checked_request2size (bytes + 1, nb);
++      newmem = _int_realloc (&main_arena, oldp, oldsize, nb);
+     }
+ 
++  DIAG_PUSH_NEEDS_COMMENT;
++#if __GNUC_PREREQ (7, 0)
++  /* GCC 7 warns about magic_p may be used uninitialized.  But we never
++     reach here if magic_p is uninitialized.  */
++  DIAG_IGNORE_NEEDS_COMMENT (7, "-Wmaybe-uninitialized");
++#endif
+   /* mem2chunk_check changed the magic byte in the old chunk.
+      If newmem is NULL, then the old chunk will still be used though,
+      so we need to invert that change here.  */
+   if (newmem == NULL)
+     *magic_p ^= 0xFF;
++  DIAG_POP_NEEDS_COMMENT;
+ 
+   __libc_lock_unlock (main_arena.mutex);
+ 
+@@ -441,8 +401,8 @@ memalign_check (size_t alignment, size_t bytes, const void *caller)
+     }
+ 
+   __libc_lock_lock (main_arena.mutex);
+-  mem = (top_check () >= 0) ? _int_memalign (&main_arena, alignment, bytes + 1) :
+-        NULL;
++  top_check ();
++  mem = _int_memalign (&main_arena, alignment, bytes + 1);
+   __libc_lock_unlock (main_arena.mutex);
+   return mem2mem_check (mem, bytes);
+ }
+diff --git a/malloc/malloc.c b/malloc/malloc.c
+index 54e406bcb6..6a52c288de 100644
+--- a/malloc/malloc.c
++++ b/malloc/malloc.c
+@@ -243,6 +243,9 @@
+ 
+ #include <malloc/malloc-internal.h>
+ 
++/* For SINGLE_THREAD_P.  */
++#include <sysdep-cancel.h>
++
+ /*
+   Debugging:
+ 
+@@ -1019,10 +1022,10 @@ static void*  _int_realloc(mstate, mchunkptr, INTERNAL_SIZE_T,
+ static void*  _int_memalign(mstate, size_t, size_t);
+ static void*  _mid_memalign(size_t, size_t, void *);
+ 
+-static void malloc_printerr(int action, const char *str, void *ptr, mstate av);
++static void malloc_printerr(const char *str) __attribute__ ((noreturn));
+ 
+ static void* internal_function mem2mem_check(void *p, size_t sz);
+-static int internal_function top_check(void);
++static void top_check (void);
+ static void internal_function munmap_chunk(mchunkptr p);
+ #if HAVE_MREMAP
+ static mchunkptr internal_function mremap_chunk(mchunkptr p, size_t new_size);
+@@ -1403,11 +1406,11 @@ typedef struct malloc_chunk *mbinptr;
+ /* Take a chunk off a bin list */
+ #define unlink(AV, P, BK, FD) {                                            \
+     if (__builtin_expect (chunksize(P) != prev_size (next_chunk(P)), 0))      \
+-      malloc_printerr (check_action, "corrupted size vs. prev_size", P, AV);  \
++      malloc_printerr ("corrupted size vs. prev_size");			      \
+     FD = P->fd;								      \
+     BK = P->bk;								      \
+     if (__builtin_expect (FD->bk != P || BK->fd != P, 0))		      \
+-      malloc_printerr (check_action, "corrupted double-linked list", P, AV);  \
++      malloc_printerr ("corrupted double-linked list");			      \
+     else {								      \
+         FD->bk = BK;							      \
+         BK->fd = FD;							      \
+@@ -1415,9 +1418,7 @@ typedef struct malloc_chunk *mbinptr;
+             && __builtin_expect (P->fd_nextsize != NULL, 0)) {		      \
+ 	    if (__builtin_expect (P->fd_nextsize->bk_nextsize != P, 0)	      \
+ 		|| __builtin_expect (P->bk_nextsize->fd_nextsize != P, 0))    \
+-	      malloc_printerr (check_action,				      \
+-			       "corrupted double-linked list (not small)",    \
+-			       P, AV);					      \
++	      malloc_printerr ("corrupted double-linked list (not small)");   \
+             if (FD->fd_nextsize == NULL) {				      \
+                 if (P->fd_nextsize == P)				      \
+                   FD->fd_nextsize = FD->bk_nextsize = FD;		      \
+@@ -1612,27 +1613,6 @@ typedef struct malloc_chunk *mfastbinptr;
+ 
+ #define FASTBIN_CONSOLIDATION_THRESHOLD  (65536UL)
+ 
+-/*
+-   Since the lowest 2 bits in max_fast don't matter in size comparisons,
+-   they are used as flags.
+- */
+-
+-/*
+-   FASTCHUNKS_BIT held in max_fast indicates that there are probably
+-   some fastbin chunks. It is set true on entering a chunk into any
+-   fastbin, and cleared only in malloc_consolidate.
+-
+-   The truth value is inverted so that have_fastchunks will be true
+-   upon startup (since statics are zero-filled), simplifying
+-   initialization checks.
+- */
+-
+-#define FASTCHUNKS_BIT        (1U)
+-
+-#define have_fastchunks(M)     (((M)->flags & FASTCHUNKS_BIT) == 0)
+-#define clear_fastchunks(M)    catomic_or (&(M)->flags, FASTCHUNKS_BIT)
+-#define set_fastchunks(M)      catomic_and (&(M)->flags, ~FASTCHUNKS_BIT)
+-
+ /*
+    NONCONTIGUOUS_BIT indicates that MORECORE does not return contiguous
+    regions.  Otherwise, contiguity is exploited in merging together,
+@@ -1649,14 +1629,8 @@ typedef struct malloc_chunk *mfastbinptr;
+ #define set_noncontiguous(M)   ((M)->flags |= NONCONTIGUOUS_BIT)
+ #define set_contiguous(M)      ((M)->flags &= ~NONCONTIGUOUS_BIT)
+ 
+-/* ARENA_CORRUPTION_BIT is set if a memory corruption was detected on the
+-   arena.  Such an arena is no longer used to allocate chunks.  Chunks
+-   allocated in that arena before detecting corruption are not freed.  */
+-
+-#define ARENA_CORRUPTION_BIT (4U)
+-
+-#define arena_is_corrupt(A)	(((A)->flags & ARENA_CORRUPTION_BIT))
+-#define set_arena_corrupt(A)	((A)->flags |= ARENA_CORRUPTION_BIT)
++/* Maximum size of memory handled in fastbins.  */
++static INTERNAL_SIZE_T global_max_fast;
+ 
+ /*
+    Set value of max_fast.
+@@ -1668,13 +1642,36 @@ typedef struct malloc_chunk *mfastbinptr;
+ #define set_max_fast(s) \
+   global_max_fast = (((s) == 0)						      \
+                      ? SMALLBIN_WIDTH : ((s + SIZE_SZ) & ~MALLOC_ALIGN_MASK))
+-#define get_max_fast() global_max_fast
+ 
++static inline INTERNAL_SIZE_T
++get_max_fast (void)
++{
++  /* Tell the GCC optimizers that global_max_fast is never larger
++     than MAX_FAST_SIZE.  This avoids out-of-bounds array accesses in
++     _int_malloc after constant propagation of the size parameter.
++     (The code never executes because malloc preserves the
++     global_max_fast invariant, but the optimizers may not recognize
++     this.)  */
++  if (global_max_fast > MAX_FAST_SIZE)
++    __builtin_unreachable ();
++  return global_max_fast;
++}
+ 
+ /*
+    ----------- Internal state representation and initialization -----------
+  */
+ 
++/*
++   have_fastchunks indicates that there are probably some fastbin chunks.
++   It is set true on entering a chunk into any fastbin, and cleared early in
++   malloc_consolidate.  The value is approximate since it may be set when there
++   are no fastbin chunks, or it may be clear even if there are fastbin chunks
++   available.  Given it's sole purpose is to reduce number of redundant calls to
++   malloc_consolidate, it does not affect correctness.  As a result we can safely
++   use relaxed atomic accesses.
++ */
++
++
+ struct malloc_state
+ {
+   /* Serialize access.  */
+@@ -1683,6 +1680,10 @@ struct malloc_state
+   /* Flags (formerly in max_fast).  */
+   int flags;
+ 
++  /* Set if the fastbin chunks contain recently inserted free blocks.  */
++  /* Note this is a bool but not all targets support atomics on booleans.  */
++  int have_fastchunks;
++
+   /* Fastbins */
+   mfastbinptr fastbinsY[NFASTBINS];
+ 
+@@ -1797,9 +1798,6 @@ static struct malloc_par mp_ =
+ #endif
+ };
+ 
+-/* Maximum size of memory handled in fastbins.  */
+-static INTERNAL_SIZE_T global_max_fast;
+-
+ /*
+    Initialize a malloc_state struct.
+ 
+@@ -1829,7 +1827,7 @@ malloc_init_state (mstate av)
+   set_noncontiguous (av);
+   if (av == &main_arena)
+     set_max_fast (DEFAULT_MXFAST);
+-  av->flags |= FASTCHUNKS_BIT;
++  atomic_store_relaxed (&av->have_fastchunks, false);
+ 
+   av->top = initial_top (av);
+ }
+@@ -1880,15 +1878,6 @@ void *weak_variable (*__memalign_hook)
+ void weak_variable (*__after_morecore_hook) (void) = NULL;
+ 
+ 
+-/* ---------------- Error behavior ------------------------------------ */
+-
+-#ifndef DEFAULT_CHECK_ACTION
+-# define DEFAULT_CHECK_ACTION 3
+-#endif
+-
+-static int check_action = DEFAULT_CHECK_ACTION;
+-
+-
+ /* ------------------ Testing support ----------------------------------*/
+ 
+ static int perturb_byte;
+@@ -2194,11 +2183,6 @@ do_check_malloc_state (mstate av)
+         }
+     }
+ 
+-  if (total != 0)
+-    assert (have_fastchunks (av));
+-  else if (!have_fastchunks (av))
+-    assert (total == 0);
+-
+   /* check normal bins */
+   for (i = 1; i < NBINS; ++i)
+     {
+@@ -2566,11 +2550,8 @@ sysmalloc (INTERNAL_SIZE_T nb, mstate av)
+             set_head (old_top, (size + old_size) | PREV_INUSE);
+ 
+           else if (contiguous (av) && old_size && brk < old_end)
+-            {
+-              /* Oops!  Someone else killed our space..  Can't touch anything.  */
+-              malloc_printerr (3, "break adjusted to free malloc space", brk,
+-			       av);
+-            }
++	    /* Oops!  Someone else killed our space..  Can't touch anything.  */
++	    malloc_printerr ("break adjusted to free malloc space");
+ 
+           /*
+              Otherwise, make adjustments:
+@@ -2861,11 +2842,7 @@ munmap_chunk (mchunkptr p)
+      (in the moment at least) so we combine the two values into one before
+      the bit test.  */
+   if (__builtin_expect (((block | total_size) & (GLRO (dl_pagesize) - 1)) != 0, 0))
+-    {
+-      malloc_printerr (check_action, "munmap_chunk(): invalid pointer",
+-                       chunk2mem (p), NULL);
+-      return;
+-    }
++    malloc_printerr ("munmap_chunk(): invalid pointer");
+ 
+   atomic_decrement (&mp_.n_mmaps);
+   atomic_add (&mp_.mmapped_mem, -total_size);
+@@ -2940,12 +2917,12 @@ typedef struct tcache_perthread_struct
+   tcache_entry *entries[TCACHE_MAX_BINS];
+ } tcache_perthread_struct;
+ 
+-static __thread char tcache_shutting_down = 0;
++static __thread bool tcache_shutting_down = false;
+ static __thread tcache_perthread_struct *tcache = NULL;
+ 
+ /* Caller must ensure that we know tc_idx is valid and there's room
+    for more chunks.  */
+-static void
++static __always_inline void
+ tcache_put (mchunkptr chunk, size_t tc_idx)
+ {
+   tcache_entry *e = (tcache_entry *) chunk2mem (chunk);
+@@ -2957,7 +2934,7 @@ tcache_put (mchunkptr chunk, size_t tc_idx)
+ 
+ /* Caller must ensure that we know tc_idx is valid and there's
+    available chunks to remove.  */
+-static void *
++static __always_inline void *
+ tcache_get (size_t tc_idx)
+ {
+   tcache_entry *e = tcache->entries[tc_idx];
+@@ -2977,8 +2954,12 @@ tcache_thread_freeres (void)
+   if (!tcache)
+     return;
+ 
++  /* Disable the tcache and prevent it from being reinitialized.  */
+   tcache = NULL;
++  tcache_shutting_down = true;
+ 
++  /* Free all of the entries and the tcache itself back to the arena
++     heap for coalescing.  */
+   for (i = 0; i < TCACHE_MAX_BINS; ++i)
+     {
+       while (tcache_tmp->entries[i])
+@@ -2990,8 +2971,6 @@ tcache_thread_freeres (void)
+     }
+ 
+   __libc_free (tcache_tmp);
+-
+-  tcache_shutting_down = 1;
+ }
+ text_set_element (__libc_thread_subfreeres, tcache_thread_freeres);
+ 
+@@ -3050,7 +3029,8 @@ __libc_malloc (size_t bytes)
+     return (*hook)(bytes, RETURN_ADDRESS (0));
+ #if USE_TCACHE
+   /* int_free also calls request2size, be careful to not pad twice.  */
+-  size_t tbytes = request2size (bytes);
++  size_t tbytes;
++  checked_request2size (bytes, tbytes);
+   size_t tc_idx = csize2tidx (tbytes);
+ 
+   MAYBE_INIT_TCACHE ();
+@@ -3066,6 +3046,14 @@ __libc_malloc (size_t bytes)
+   DIAG_POP_NEEDS_COMMENT;
+ #endif
+ 
++  if (SINGLE_THREAD_P)
++    {
++      victim = _int_malloc (&main_arena, bytes);
++      assert (!victim || chunk_is_mmapped (mem2chunk (victim)) ||
++	      &main_arena == arena_for_chunk (mem2chunk (victim)));
++      return victim;
++    }
++
+   arena_get (ar_ptr, bytes);
+ 
+   victim = _int_malloc (ar_ptr, bytes);
+@@ -3177,11 +3165,7 @@ __libc_realloc (void *oldmem, size_t bytes)
+   if ((__builtin_expect ((uintptr_t) oldp > (uintptr_t) -oldsize, 0)
+        || __builtin_expect (misaligned_chunk (oldp), 0))
+       && !DUMPED_MAIN_ARENA_CHUNK (oldp))
+-    {
+-      malloc_printerr (check_action, "realloc(): invalid pointer", oldmem,
+-		       ar_ptr);
+-      return NULL;
+-    }
++      malloc_printerr ("realloc(): invalid pointer");
+ 
+   checked_request2size (bytes, nb);
+ 
+@@ -3226,6 +3210,15 @@ __libc_realloc (void *oldmem, size_t bytes)
+       return newmem;
+     }
+ 
++  if (SINGLE_THREAD_P)
++    {
++      newp = _int_realloc (ar_ptr, oldp, oldsize, nb);
++      assert (!newp || chunk_is_mmapped (mem2chunk (newp)) ||
++	      ar_ptr == arena_for_chunk (mem2chunk (newp)));
++
++      return newp;
++    }
++
+   __libc_lock_lock (ar_ptr->mutex);
+ 
+   newp = _int_realloc (ar_ptr, oldp, oldsize, nb);
+@@ -3301,6 +3294,15 @@ _mid_memalign (size_t alignment, size_t bytes, void *address)
+       alignment = a;
+     }
+ 
++  if (SINGLE_THREAD_P)
++    {
++      p = _int_memalign (&main_arena, alignment, bytes);
++      assert (!p || chunk_is_mmapped (mem2chunk (p)) ||
++	      &main_arena == arena_for_chunk (mem2chunk (p)));
++
++      return p;
++    }
++
+   arena_get (ar_ptr, bytes + alignment + MINSIZE);
+ 
+   p = _int_memalign (ar_ptr, alignment, bytes);
+@@ -3393,7 +3395,11 @@ __libc_calloc (size_t n, size_t elem_size)
+ 
+   MAYBE_INIT_TCACHE ();
+ 
+-  arena_get (av, sz);
++  if (SINGLE_THREAD_P)
++    av = &main_arena;
++  else
++    arena_get (av, sz);
++
+   if (av)
+     {
+       /* Check if we hand out the top chunk, in which case there may be no
+@@ -3423,19 +3429,21 @@ __libc_calloc (size_t n, size_t elem_size)
+     }
+   mem = _int_malloc (av, sz);
+ 
+-
+   assert (!mem || chunk_is_mmapped (mem2chunk (mem)) ||
+           av == arena_for_chunk (mem2chunk (mem)));
+ 
+-  if (mem == 0 && av != NULL)
++  if (!SINGLE_THREAD_P)
+     {
+-      LIBC_PROBE (memory_calloc_retry, 1, sz);
+-      av = arena_get_retry (av, sz);
+-      mem = _int_malloc (av, sz);
+-    }
++      if (mem == 0 && av != NULL)
++	{
++	  LIBC_PROBE (memory_calloc_retry, 1, sz);
++	  av = arena_get_retry (av, sz);
++	  mem = _int_malloc (av, sz);
++	}
+ 
+-  if (av != NULL)
+-    __libc_lock_unlock (av->mutex);
++      if (av != NULL)
++	__libc_lock_unlock (av->mutex);
++    }
+ 
+   /* Allocation failed even after a retry.  */
+   if (mem == 0)
+@@ -3527,8 +3535,6 @@ _int_malloc (mstate av, size_t bytes)
+   size_t tcache_unsorted_count;	    /* count of unsorted chunks processed */
+ #endif
+ 
+-  const char *errstr = NULL;
+-
+   /*
+      Convert request size to internal form by adding SIZE_SZ bytes
+      overhead plus possibly more to obtain necessary alignment and/or
+@@ -3570,42 +3576,50 @@ _int_malloc (mstate av, size_t bytes)
+     {
+       idx = fastbin_index (nb);
+       mfastbinptr *fb = &fastbin (av, idx);
+-      mchunkptr pp = *fb;
+-      REMOVE_FB (fb, victim, pp);
+-      if (victim != 0)
+-        {
+-          if (__builtin_expect (fastbin_index (chunksize (victim)) != idx, 0))
+-            {
+-              errstr = "malloc(): memory corruption (fast)";
+-            errout:
+-              malloc_printerr (check_action, errstr, chunk2mem (victim), av);
+-              return NULL;
+-            }
+-          check_remalloced_chunk (av, victim, nb);
+-#if USE_TCACHE
+-	  /* While we're here, if we see other chunks of the same size,
+-	     stash them in the tcache.  */
+-	  size_t tc_idx = csize2tidx (nb);
+-	  if (tcache && tc_idx < mp_.tcache_bins)
+-	    {
+-	      mchunkptr tc_victim;
++      mchunkptr pp;
++      victim = *fb;
+ 
+-	      /* While bin not empty and tcache not full, copy chunks over.  */
+-	      while (tcache->counts[tc_idx] < mp_.tcache_count
+-		     && (pp = *fb) != NULL)
++      if (victim != NULL)
++	{
++	  if (SINGLE_THREAD_P)
++	    *fb = victim->fd;
++	  else
++	    REMOVE_FB (fb, pp, victim);
++	  if (__glibc_likely (victim != NULL))
++	    {
++	      size_t victim_idx = fastbin_index (chunksize (victim));
++	      if (__builtin_expect (victim_idx != idx, 0))
++		malloc_printerr ("malloc(): memory corruption (fast)");
++	      check_remalloced_chunk (av, victim, nb);
++#if USE_TCACHE
++	      /* While we're here, if we see other chunks of the same size,
++		 stash them in the tcache.  */
++	      size_t tc_idx = csize2tidx (nb);
++	      if (tcache && tc_idx < mp_.tcache_bins)
+ 		{
+-		  REMOVE_FB (fb, tc_victim, pp);
+-		  if (tc_victim != 0)
++		  mchunkptr tc_victim;
++
++		  /* While bin not empty and tcache not full, copy chunks.  */
++		  while (tcache->counts[tc_idx] < mp_.tcache_count
++			 && (tc_victim = *fb) != NULL)
+ 		    {
++		      if (SINGLE_THREAD_P)
++			*fb = tc_victim->fd;
++		      else
++			{
++			  REMOVE_FB (fb, pp, tc_victim);
++			  if (__glibc_unlikely (tc_victim == NULL))
++			    break;
++			}
+ 		      tcache_put (tc_victim, tc_idx);
+-	            }
++		    }
+ 		}
+-	    }
+ #endif
+-          void *p = chunk2mem (victim);
+-          alloc_perturb (p, bytes);
+-          return p;
+-        }
++	      void *p = chunk2mem (victim);
++	      alloc_perturb (p, bytes);
++	      return p;
++	    }
++	}
+     }
+ 
+   /*
+@@ -3628,11 +3642,9 @@ _int_malloc (mstate av, size_t bytes)
+           else
+             {
+               bck = victim->bk;
+-	if (__glibc_unlikely (bck->fd != victim))
+-                {
+-                  errstr = "malloc(): smallbin double linked list corrupted";
+-                  goto errout;
+-                }
++	      if (__glibc_unlikely (bck->fd != victim))
++		malloc_printerr
++		  ("malloc(): smallbin double linked list corrupted");
+               set_inuse_bit_at_offset (victim, nb);
+               bin->bk = bck;
+               bck->fd = bin;
+@@ -3687,7 +3699,7 @@ _int_malloc (mstate av, size_t bytes)
+   else
+     {
+       idx = largebin_index (nb);
+-      if (have_fastchunks (av))
++      if (atomic_load_relaxed (&av->have_fastchunks))
+         malloc_consolidate (av);
+     }
+ 
+@@ -3723,8 +3735,7 @@ _int_malloc (mstate av, size_t bytes)
+           if (__builtin_expect (chunksize_nomask (victim) <= 2 * SIZE_SZ, 0)
+               || __builtin_expect (chunksize_nomask (victim)
+ 				   > av->system_mem, 0))
+-            malloc_printerr (check_action, "malloc(): memory corruption",
+-                             chunk2mem (victim), av);
++            malloc_printerr ("malloc(): memory corruption");
+           size = chunksize (victim);
+ 
+           /*
+@@ -3929,11 +3940,8 @@ _int_malloc (mstate av, size_t bytes)
+                      have to perform a complete insert here.  */
+                   bck = unsorted_chunks (av);
+                   fwd = bck->fd;
+-	  if (__glibc_unlikely (fwd->bk != bck))
+-                    {
+-                      errstr = "malloc(): corrupted unsorted chunks";
+-                      goto errout;
+-                    }
++		  if (__glibc_unlikely (fwd->bk != bck))
++		    malloc_printerr ("malloc(): corrupted unsorted chunks");
+                   remainder->bk = bck;
+                   remainder->fd = fwd;
+                   bck->fd = remainder;
+@@ -4036,11 +4044,8 @@ _int_malloc (mstate av, size_t bytes)
+                      have to perform a complete insert here.  */
+                   bck = unsorted_chunks (av);
+                   fwd = bck->fd;
+-	  if (__glibc_unlikely (fwd->bk != bck))
+-                    {
+-                      errstr = "malloc(): corrupted unsorted chunks 2";
+-                      goto errout;
+-                    }
++		  if (__glibc_unlikely (fwd->bk != bck))
++		    malloc_printerr ("malloc(): corrupted unsorted chunks 2");
+                   remainder->bk = bck;
+                   remainder->fd = fwd;
+                   bck->fd = remainder;
+@@ -4102,7 +4107,7 @@ _int_malloc (mstate av, size_t bytes)
+ 
+       /* When we are using atomic ops to free fast chunks we can get
+          here for all block sizes.  */
+-      else if (have_fastchunks (av))
++      else if (atomic_load_relaxed (&av->have_fastchunks))
+         {
+           malloc_consolidate (av);
+           /* restore original bin index */
+@@ -4141,9 +4146,6 @@ _int_free (mstate av, mchunkptr p, int have_lock)
+   mchunkptr bck;               /* misc temp for linking */
+   mchunkptr fwd;               /* misc temp for linking */
+ 
+-  const char *errstr = NULL;
+-  int locked = 0;
+-
+   size = chunksize (p);
+ 
+   /* Little security check which won't hurt performance: the
+@@ -4152,21 +4154,11 @@ _int_free (mstate av, mchunkptr p, int have_lock)
+      here by accident or by "design" from some intruder.  */
+   if (__builtin_expect ((uintptr_t) p > (uintptr_t) -size, 0)
+       || __builtin_expect (misaligned_chunk (p), 0))
+-    {
+-      errstr = "free(): invalid pointer";
+-    errout:
+-      if (!have_lock && locked)
+-        __libc_lock_unlock (av->mutex);
+-      malloc_printerr (check_action, errstr, chunk2mem (p), av);
+-      return;
+-    }
++    malloc_printerr ("free(): invalid pointer");
+   /* We know that each chunk is at least MINSIZE bytes in size or a
+      multiple of MALLOC_ALIGNMENT.  */
+   if (__glibc_unlikely (size < MINSIZE || !aligned_OK (size)))
+-    {
+-      errstr = "free(): invalid size";
+-      goto errout;
+-    }
++    malloc_printerr ("free(): invalid size");
+ 
+   check_inuse_chunk(av, p);
+ 
+@@ -4205,60 +4197,59 @@ _int_free (mstate av, mchunkptr p, int have_lock)
+ 	|| __builtin_expect (chunksize (chunk_at_offset (p, size))
+ 			     >= av->system_mem, 0))
+       {
++	bool fail = true;
+ 	/* We might not have a lock at this point and concurrent modifications
+-	   of system_mem might have let to a false positive.  Redo the test
+-	   after getting the lock.  */
+-	if (have_lock
+-	    || ({ assert (locked == 0);
+-		  __libc_lock_lock (av->mutex);
+-		  locked = 1;
+-		  chunksize_nomask (chunk_at_offset (p, size)) <= 2 * SIZE_SZ
+-		    || chunksize (chunk_at_offset (p, size)) >= av->system_mem;
+-	      }))
+-	  {
+-	    errstr = "free(): invalid next size (fast)";
+-	    goto errout;
+-	  }
+-	if (! have_lock)
++	   of system_mem might result in a false positive.  Redo the test after
++	   getting the lock.  */
++	if (!have_lock)
+ 	  {
++	    __libc_lock_lock (av->mutex);
++	    fail = (chunksize_nomask (chunk_at_offset (p, size)) <= 2 * SIZE_SZ
++		    || chunksize (chunk_at_offset (p, size)) >= av->system_mem);
+ 	    __libc_lock_unlock (av->mutex);
+-	    locked = 0;
+ 	  }
++
++	if (fail)
++	  malloc_printerr ("free(): invalid next size (fast)");
+       }
+ 
+     free_perturb (chunk2mem(p), size - 2 * SIZE_SZ);
+ 
+-    set_fastchunks(av);
++    atomic_store_relaxed (&av->have_fastchunks, true);
+     unsigned int idx = fastbin_index(size);
+     fb = &fastbin (av, idx);
+ 
+     /* Atomically link P to its fastbin: P->FD = *FB; *FB = P;  */
+     mchunkptr old = *fb, old2;
+-    unsigned int old_idx = ~0u;
+-    do
+-      {
+-	/* Check that the top of the bin is not the record we are going to add
+-	   (i.e., double free).  */
+-	if (__builtin_expect (old == p, 0))
+-	  {
+-	    errstr = "double free or corruption (fasttop)";
+-	    goto errout;
+-	  }
+-	/* Check that size of fastbin chunk at the top is the same as
+-	   size of the chunk that we are adding.  We can dereference OLD
+-	   only if we have the lock, otherwise it might have already been
+-	   deallocated.  See use of OLD_IDX below for the actual check.  */
+-	if (have_lock && old != NULL)
+-	  old_idx = fastbin_index(chunksize(old));
+-	p->fd = old2 = old;
+-      }
+-    while ((old = catomic_compare_and_exchange_val_rel (fb, p, old2)) != old2);
+ 
+-    if (have_lock && old != NULL && __builtin_expect (old_idx != idx, 0))
++    if (SINGLE_THREAD_P)
+       {
+-	errstr = "invalid fastbin entry (free)";
+-	goto errout;
++	/* Check that the top of the bin is not the record we are going to
++	   add (i.e., double free).  */
++	if (__builtin_expect (old == p, 0))
++	  malloc_printerr ("double free or corruption (fasttop)");
++	p->fd = old;
++	*fb = p;
+       }
++    else
++      do
++	{
++	  /* Check that the top of the bin is not the record we are going to
++	     add (i.e., double free).  */
++	  if (__builtin_expect (old == p, 0))
++	    malloc_printerr ("double free or corruption (fasttop)");
++	  p->fd = old2 = old;
++	}
++      while ((old = catomic_compare_and_exchange_val_rel (fb, p, old2))
++	     != old2);
++
++    /* Check that size of fastbin chunk at the top is the same as
++       size of the chunk that we are adding.  We can dereference OLD
++       only if we have the lock, otherwise it might have already been
++       allocated again.  */
++    if (have_lock && old != NULL
++	&& __builtin_expect (fastbin_index (chunksize (old)) != idx, 0))
++      malloc_printerr ("invalid fastbin entry (free)");
+   }
+ 
+   /*
+@@ -4266,42 +4257,33 @@ _int_free (mstate av, mchunkptr p, int have_lock)
+   */
+ 
+   else if (!chunk_is_mmapped(p)) {
+-    if (! have_lock) {
++
++    /* If we're single-threaded, don't lock the arena.  */
++    if (SINGLE_THREAD_P)
++      have_lock = true;
++
++    if (!have_lock)
+       __libc_lock_lock (av->mutex);
+-      locked = 1;
+-    }
+ 
+     nextchunk = chunk_at_offset(p, size);
+ 
+     /* Lightweight tests: check whether the block is already the
+        top block.  */
+     if (__glibc_unlikely (p == av->top))
+-      {
+-	errstr = "double free or corruption (top)";
+-	goto errout;
+-      }
++      malloc_printerr ("double free or corruption (top)");
+     /* Or whether the next chunk is beyond the boundaries of the arena.  */
+     if (__builtin_expect (contiguous (av)
+ 			  && (char *) nextchunk
+ 			  >= ((char *) av->top + chunksize(av->top)), 0))
+-      {
+-	errstr = "double free or corruption (out)";
+-	goto errout;
+-      }
++	malloc_printerr ("double free or corruption (out)");
+     /* Or whether the block is actually not marked used.  */
+     if (__glibc_unlikely (!prev_inuse(nextchunk)))
+-      {
+-	errstr = "double free or corruption (!prev)";
+-	goto errout;
+-      }
++      malloc_printerr ("double free or corruption (!prev)");
+ 
+     nextsize = chunksize(nextchunk);
+     if (__builtin_expect (chunksize_nomask (nextchunk) <= 2 * SIZE_SZ, 0)
+ 	|| __builtin_expect (nextsize >= av->system_mem, 0))
+-      {
+-	errstr = "free(): invalid next size (normal)";
+-	goto errout;
+-      }
++      malloc_printerr ("free(): invalid next size (normal)");
+ 
+     free_perturb (chunk2mem(p), size - 2 * SIZE_SZ);
+ 
+@@ -4333,10 +4315,7 @@ _int_free (mstate av, mchunkptr p, int have_lock)
+       bck = unsorted_chunks(av);
+       fwd = bck->fd;
+       if (__glibc_unlikely (fwd->bk != bck))
+-	{
+-	  errstr = "free(): corrupted unsorted chunks";
+-	  goto errout;
+-	}
++	malloc_printerr ("free(): corrupted unsorted chunks");
+       p->fd = fwd;
+       p->bk = bck;
+       if (!in_smallbin_range(size))
+@@ -4379,7 +4358,7 @@ _int_free (mstate av, mchunkptr p, int have_lock)
+     */
+ 
+     if ((unsigned long)(size) >= FASTBIN_CONSOLIDATION_THRESHOLD) {
+-      if (have_fastchunks(av))
++      if (atomic_load_relaxed (&av->have_fastchunks))
+ 	malloc_consolidate(av);
+ 
+       if (av == &main_arena) {
+@@ -4398,10 +4377,8 @@ _int_free (mstate av, mchunkptr p, int have_lock)
+       }
+     }
+ 
+-    if (! have_lock) {
+-      assert (locked);
++    if (!have_lock)
+       __libc_lock_unlock (av->mutex);
+-    }
+   }
+   /*
+     If the chunk was allocated via mmap, release via munmap().
+@@ -4450,7 +4427,7 @@ static void malloc_consolidate(mstate av)
+   */
+ 
+   if (get_max_fast () != 0) {
+-    clear_fastchunks(av);
++    atomic_store_relaxed (&av->have_fastchunks, false);
+ 
+     unsorted_bin = unsorted_chunks(av);
+ 
+@@ -4549,17 +4526,10 @@ _int_realloc(mstate av, mchunkptr oldp, INTERNAL_SIZE_T oldsize,
+   INTERNAL_SIZE_T* s;               /* copy source */
+   INTERNAL_SIZE_T* d;               /* copy destination */
+ 
+-  const char *errstr = NULL;
+-
+   /* oldmem size */
+   if (__builtin_expect (chunksize_nomask (oldp) <= 2 * SIZE_SZ, 0)
+       || __builtin_expect (oldsize >= av->system_mem, 0))
+-    {
+-      errstr = "realloc(): invalid old size";
+-    errout:
+-      malloc_printerr (check_action, errstr, chunk2mem (oldp), av);
+-      return NULL;
+-    }
++    malloc_printerr ("realloc(): invalid old size");
+ 
+   check_inuse_chunk (av, oldp);
+ 
+@@ -4570,10 +4540,7 @@ _int_realloc(mstate av, mchunkptr oldp, INTERNAL_SIZE_T oldsize,
+   INTERNAL_SIZE_T nextsize = chunksize (next);
+   if (__builtin_expect (chunksize_nomask (next) <= 2 * SIZE_SZ, 0)
+       || __builtin_expect (nextsize >= av->system_mem, 0))
+-    {
+-      errstr = "realloc(): invalid next size";
+-      goto errout;
+-    }
++    malloc_printerr ("realloc(): invalid next size");
+ 
+   if ((unsigned long) (oldsize) >= (unsigned long) (nb))
+     {
+@@ -4798,10 +4765,6 @@ _int_memalign (mstate av, size_t alignment, size_t bytes)
+ static int
+ mtrim (mstate av, size_t pad)
+ {
+-  /* Don't touch corrupt arenas.  */
+-  if (arena_is_corrupt (av))
+-    return 0;
+-
+   /* Ensure initialization/consolidation */
+   malloc_consolidate (av);
+ 
+@@ -5113,8 +5076,6 @@ static inline int
+ __always_inline
+ do_set_mallopt_check (int32_t value)
+ {
+-  LIBC_PROBE (memory_mallopt_check_action, 2, value, check_action);
+-  check_action = value;
+   return 1;
+ }
+ 
+@@ -5388,32 +5349,10 @@ libc_hidden_def (__libc_mallopt)
+ extern char **__libc_argv attribute_hidden;
+ 
+ static void
+-malloc_printerr (int action, const char *str, void *ptr, mstate ar_ptr)
++malloc_printerr (const char *str)
+ {
+-  /* Avoid using this arena in future.  We do not attempt to synchronize this
+-     with anything else because we minimally want to ensure that __libc_message
+-     gets its resources safely without stumbling on the current corruption.  */
+-  if (ar_ptr)
+-    set_arena_corrupt (ar_ptr);
+-
+-  if ((action & 5) == 5)
+-    __libc_message ((action & 2) ? (do_abort | do_backtrace) : do_message,
+-		    "%s\n", str);
+-  else if (action & 1)
+-    {
+-      char buf[2 * sizeof (uintptr_t) + 1];
+-
+-      buf[sizeof (buf) - 1] = '\0';
+-      char *cp = _itoa_word ((uintptr_t) ptr, &buf[sizeof (buf) - 1], 16, 0);
+-      while (cp > buf)
+-        *--cp = '0';
+-
+-      __libc_message ((action & 2) ? (do_abort | do_backtrace) : do_message,
+-		      "*** Error in `%s': %s: 0x%s ***\n",
+-                      __libc_argv[0] ? : "<unknown>", str, cp);
+-    }
+-  else if (action & 2)
+-    abort ();
++  __libc_message (do_abort, "%s\n", str);
++  __builtin_unreachable ();
+ }
+ 
+ /* We need a wrapper function for one of the additions of POSIX.  */
+diff --git a/malloc/tst-dynarray.c b/malloc/tst-dynarray.c
+index 2206d75e31..d11f7bb8a3 100644
+--- a/malloc/tst-dynarray.c
++++ b/malloc/tst-dynarray.c
+@@ -18,6 +18,9 @@
+ 
+ #include "tst-dynarray-shared.h"
+ 
++#include <errno.h>
++#include <stdint.h>
++
+ #define DYNARRAY_STRUCT dynarray_long
+ #define DYNARRAY_ELEMENT long
+ #define DYNARRAY_PREFIX dynarray_long_
+@@ -463,6 +466,31 @@ test_long_init (void)
+   }
+ }
+ 
++/* Test overflow in resize.  */
++static void
++test_long_overflow (void)
++{
++  {
++    struct dynarray_long dyn;
++    dynarray_long_init (&dyn);
++    errno = EINVAL;
++    TEST_VERIFY (!dynarray_long_resize
++                 (&dyn, (SIZE_MAX / sizeof (long)) + 1));
++    TEST_VERIFY (errno == ENOMEM);
++    TEST_VERIFY (dynarray_long_has_failed (&dyn));
++  }
++
++  {
++    struct dynarray_long_noscratch dyn;
++    dynarray_long_noscratch_init (&dyn);
++    errno = EINVAL;
++    TEST_VERIFY (!dynarray_long_noscratch_resize
++                 (&dyn, (SIZE_MAX / sizeof (long)) + 1));
++    TEST_VERIFY (errno == ENOMEM);
++    TEST_VERIFY (dynarray_long_noscratch_has_failed (&dyn));
++  }
++}
++
+ /* Test NUL-terminated string construction with the add function and
+    the simple finalize function.  */
+ static void
+@@ -538,6 +566,7 @@ do_test (void)
+   test_int ();
+   test_str ();
+   test_long_init ();
++  test_long_overflow ();
+   test_zstr ();
+   return 0;
+ }
+diff --git a/malloc/tst-malloc-tcache-leak.c b/malloc/tst-malloc-tcache-leak.c
+new file mode 100644
+index 0000000000..22c679b65b
+--- /dev/null
++++ b/malloc/tst-malloc-tcache-leak.c
+@@ -0,0 +1,112 @@
++/* Bug 22111: Test that threads do not leak their per thread cache.
++   Copyright (C) 2015-2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++/* The point of this test is to start and exit a large number of
++   threads, while at the same time looking to see if the used
++   memory grows with each round of threads run.  If the memory
++   grows above some linear bound we declare the test failed and
++   that the malloc implementation is leaking memory with each
++   thread.  This is a good indicator that the thread local cache
++   is leaking chunks.  */
++
++#include <stdio.h>
++#include <stdlib.h>
++#include <malloc.h>
++#include <pthread.h>
++#include <assert.h>
++
++#include <support/check.h>
++#include <support/support.h>
++#include <support/xthread.h>
++
++void *
++worker (void *data)
++{
++  void *ret;
++  /* Allocate an arbitrary amount of memory that is known to fit into
++     the thread local cache (tcache).  If we have at least 64 bins
++     (default e.g. TCACHE_MAX_BINS) we should be able to allocate 32
++     bytes and force malloc to fill the tcache.  We are assuming tcahce
++     init happens at the first small alloc, but it might in the future
++     be deferred to some other point.  Therefore to future proof this
++     test we include a full alloc/free/alloc cycle for the thread.  We
++     need a compiler barrier to avoid the removal of the useless
++     alloc/free.  We send some memory back to main to have the memory
++     freed after the thread dies, as just another check that the chunks
++     that were previously in the tcache are still OK to free after
++     thread death.  */
++  ret = xmalloc (32);
++  __asm__ volatile ("" ::: "memory");
++  free (ret);
++  return (void *) xmalloc (32);
++}
++
++static int
++do_test (void)
++{
++  pthread_t *thread;
++  struct mallinfo info_before, info_after;
++  void *retval;
++
++  /* This is an arbitrary choice. We choose a total of THREADS
++     threads created and joined.  This gives us enough iterations to
++     show a leak.  */
++  int threads = 100000;
++
++  /* Avoid there being 0 malloc'd data at this point by allocating the
++     pthread_t required to run the test.  */
++  thread = (pthread_t *) xcalloc (1, sizeof (pthread_t));
++
++  info_before = mallinfo ();
++
++  assert (info_before.uordblks != 0);
++
++  printf ("INFO: %d (bytes) are in use before starting threads.\n",
++          info_before.uordblks);
++
++  for (int loop = 0; loop < threads; loop++)
++    {
++      *thread = xpthread_create (NULL, worker, NULL);
++      retval = xpthread_join (*thread);
++      free (retval);
++    }
++
++  info_after = mallinfo ();
++  printf ("INFO: %d (bytes) are in use after all threads joined.\n",
++          info_after.uordblks);
++
++  /* We need to compare the memory in use before and the memory in use
++     after starting and joining THREADS threads.  We almost always grow
++     memory slightly, but not much. Consider that if even 1-byte leaked
++     per thread we'd have THREADS bytes of additional memory, and in
++     general the in-use at the start of main is quite low.  We will
++     always leak a full malloc chunk, and never just 1-byte, therefore
++     anything above "+ threads" from the start (constant offset) is a
++     leak.  Obviously this assumes no thread-related malloc'd internal
++     libc data structures persist beyond the thread death, and any that
++     did would limit the number of times you could call pthread_create,
++     which is a QoI we'd want to detect and fix.  */
++  if (info_after.uordblks > (info_before.uordblks + threads))
++    FAIL_EXIT1 ("Memory usage after threads is too high.\n");
++
++  /* Did not detect excessive memory usage.  */
++  free (thread);
++  exit (0);
++}
++
++#include <support/test-driver.c>
+diff --git a/malloc/tst-realloc.c b/malloc/tst-realloc.c
+index 31a58bd026..d942c6e536 100644
+--- a/malloc/tst-realloc.c
++++ b/malloc/tst-realloc.c
+@@ -66,10 +66,6 @@ do_test (void)
+   if (p == NULL)
+     merror ("realloc (NULL, 10) failed.");
+ 
+-  /* errno should be clear on success (POSIX).  */
+-  if (p != NULL && save != 0)
+-    merror ("errno is set but should not be");
+-
+   free (p);
+ 
+   p = calloc (20, 1);
+diff --git a/manual/memory.texi b/manual/memory.texi
+index 82f473806c..51a5f4e83c 100644
+--- a/manual/memory.texi
++++ b/manual/memory.texi
+@@ -1104,7 +1104,6 @@ When calling @code{mallopt}, the @var{param} argument specifies the
+ parameter to be set, and @var{value} the new value to be set.  Possible
+ choices for @var{param}, as defined in @file{malloc.h}, are:
+ 
+- at comment TODO: @item M_CHECK_ACTION
+ @vtable @code
+ @item M_MMAP_MAX
+ The maximum number of chunks to allocate with @code{mmap}.  Setting this
+@@ -1309,17 +1308,15 @@ The block was already freed.
+ 
+ Another possibility to check for and guard against bugs in the use of
+ @code{malloc}, @code{realloc} and @code{free} is to set the environment
+-variable @code{MALLOC_CHECK_}.  When @code{MALLOC_CHECK_} is set, a
+-special (less efficient) implementation is used which is designed to be
+-tolerant against simple errors, such as double calls of @code{free} with
+-the same argument, or overruns of a single byte (off-by-one bugs).  Not
+-all such errors can be protected against, however, and memory leaks can
+-result.  If @code{MALLOC_CHECK_} is set to @code{0}, any detected heap
+-corruption is silently ignored; if set to @code{1}, a diagnostic is
+-printed on @code{stderr}; if set to @code{2}, @code{abort} is called
+-immediately.  This can be useful because otherwise a crash may happen
+-much later, and the true cause for the problem is then very hard to
+-track down.
++variable @code{MALLOC_CHECK_}.  When @code{MALLOC_CHECK_} is set to a
++non-zero value, a special (less efficient) implementation is used which
++is designed to be tolerant against simple errors, such as double calls
++of @code{free} with the same argument, or overruns of a single byte
++(off-by-one bugs).  Not all such errors can be protected against,
++however, and memory leaks can result.
++
++Any detected heap corruption results in immediate termination of the
++process.
+ 
+ There is one problem with @code{MALLOC_CHECK_}: in SUID or SGID binaries
+ it could possibly be exploited since diverging from the normal programs
+diff --git a/manual/probes.texi b/manual/probes.texi
+index 96acaed206..8ab67562d7 100644
+--- a/manual/probes.texi
++++ b/manual/probes.texi
+@@ -195,13 +195,6 @@ this @code{malloc} parameter, and @var{$arg3} is nonzero if dynamic
+ threshold adjustment was already disabled.
+ @end deftp
+ 
+- at deftp Probe memory_mallopt_check_action (int @var{$arg1}, int @var{$arg2})
+-This probe is triggered shortly after the @code{memory_mallopt} probe,
+-when the parameter to be changed is @code{M_CHECK_ACTION}.  Argument
+- at var{$arg1} is the requested value, and @var{$arg2} is the previous
+-value of this @code{malloc} parameter.
+- at end deftp
+-
+ @deftp Probe memory_mallopt_perturb (int @var{$arg1}, int @var{$arg2})
+ This probe is triggered shortly after the @code{memory_mallopt} probe,
+ when the parameter to be changed is @code{M_PERTURB}.  Argument
+diff --git a/manual/terminal.texi b/manual/terminal.texi
+index 4fef5045b8..4aace48b14 100644
+--- a/manual/terminal.texi
++++ b/manual/terminal.texi
+@@ -109,6 +109,11 @@ The @var{filedes} is not associated with a terminal.
+ @item ERANGE
+ The buffer length @var{len} is too small to store the string to be
+ returned.
++
++ at item ENODEV
++The @var{filedes} is associated with a terminal device that is a slave
++pseudo-terminal, but the file name associated with that device could
++not be determined.  This is a GNU extension.
+ @end table
+ @end deftypefun
+ 
+diff --git a/manual/tunables.texi b/manual/tunables.texi
+index 4c658bf3df..b09e3fe791 100644
+--- a/manual/tunables.texi
++++ b/manual/tunables.texi
+@@ -71,27 +71,13 @@ following tunables in the @code{malloc} namespace:
+ This tunable supersedes the @env{MALLOC_CHECK_} environment variable and is
+ identical in features.
+ 
+-Setting this tunable enables a special (less efficient) memory allocator for
+-the malloc family of functions that is designed to be tolerant against simple
+-errors such as double calls of free with the same argument, or overruns of a
+-single byte (off-by-one bugs). Not all such errors can be protected against,
+-however, and memory leaks can result.  The following list describes the values
+-that this tunable can take and the effect they have on malloc functionality:
+-
+- at itemize @bullet
+- at item @code{0} Ignore all errors.  The default allocator continues to be in
+-use, but all errors are silently ignored.
+- at item @code{1} Report errors.  The alternate allocator is selected and heap
+-corruption, if detected, is reported as diagnostic messages to @code{stderr}
+-and the program continues execution.
+- at item @code{2} Abort on errors.  The alternate allocator is selected and if
+-heap corruption is detected, the program is ended immediately by calling
+- at code{abort}.
+- at item @code{3} Fully enabled.  The alternate allocator is selected and is fully
+-functional.  That is, if heap corruption is detected, a verbose diagnostic
+-message is printed to @code{stderr} and the program is ended by calling
+- at code{abort}.
+- at end itemize
++Setting this tunable to a non-zero value enables a special (less
++efficient) memory allocator for the malloc family of functions that is
++designed to be tolerant against simple errors such as double calls of
++free with the same argument, or overruns of a single byte (off-by-one
++bugs). Not all such errors can be protected against, however, and memory
++leaks can result.  Any detected heap corruption results in immediate
++termination of the process.
+ 
+ Like @env{MALLOC_CHECK_}, @code{glibc.malloc.check} has a problem in that it
+ diverges from normal program behavior by writing to @code{stderr}, which could
+@@ -267,7 +253,7 @@ This tunable is specific to i386 and x86-64.
+ @deftp Tunable glibc.tune.cpu
+ The @code{glibc.tune.cpu=xxx} tunable allows the user to tell @theglibc{} to
+ assume that the CPU is @code{xxx} where xxx may have one of these values:
+- at code{generic}, @code{thunderxt88}.
++ at code{generic}, @code{falkor}, @code{thunderxt88}.
+ 
+ This tunable is specific to aarch64.
+ @end deftp
+diff --git a/math/Makefile b/math/Makefile
+index e09b0c0545..2c17c68eda 100644
+--- a/math/Makefile
++++ b/math/Makefile
+@@ -203,7 +203,8 @@ tests-static = test-fpucw-static test-fpucw-ieee-static \
+ 	       test-signgam-ullong-static test-signgam-ullong-init-static
+ 
+ ifneq (,$(CXX))
+-tests += test-math-isinff test-math-iszero
++tests += test-math-isinff test-math-iszero test-math-issignaling \
++	 test-math-iscanonical
+ endif
+ 
+ ifneq (no,$(PERL))
+@@ -350,6 +351,8 @@ CFLAGS-test-signgam-ullong-init-static.c = -std=c99
+ 
+ CFLAGS-test-math-isinff.cc = -std=gnu++11
+ CFLAGS-test-math-iszero.cc = -std=gnu++11
++CFLAGS-test-math-issignaling.cc = -std=gnu++11
++CFLAGS-test-math-iscanonical.cc = -std=gnu++11
+ 
+ CFLAGS-test-iszero-excess-precision.c = -fexcess-precision=standard
+ CFLAGS-test-iseqsig-excess-precision.c = -fexcess-precision=standard
+diff --git a/math/math.h b/math/math.h
+index e21708045a..ba26624835 100644
+--- a/math/math.h
++++ b/math/math.h
+@@ -402,7 +402,13 @@ enum
+ 
+ /* Return number of classification appropriate for X.  */
+ # if __GNUC_PREREQ (4,4) && !defined __SUPPORT_SNAN__			      \
+-     && !defined __OPTIMIZE_SIZE__
++     && (!defined __OPTIMIZE_SIZE__ || defined __cplusplus)
++     /* The check for __cplusplus allows the use of the builtin, even
++	when optimization for size is on.  This is provided for
++	libstdc++, only to let its configure test work when it is built
++	with -Os.  No further use of this definition of fpclassify is
++	expected in C++ mode, since libstdc++ provides its own version
++	of fpclassify in cmath (which undefines fpclassify).  */
+ #  define fpclassify(x) __builtin_fpclassify (FP_NAN, FP_INFINITE,	      \
+      FP_NORMAL, FP_SUBNORMAL, FP_ZERO, x)
+ # else
+@@ -412,6 +418,15 @@ enum
+ /* Return nonzero value if sign of X is negative.  */
+ # if __GNUC_PREREQ (6,0)
+ #  define signbit(x) __builtin_signbit (x)
++# elif defined __cplusplus
++  /* In C++ mode, __MATH_TG cannot be used, because it relies on
++     __builtin_types_compatible_p, which is a C-only builtin.
++     The check for __cplusplus allows the use of the builtin instead of
++     __MATH_TG. This is provided for libstdc++, only to let its configure
++     test work. No further use of this definition of signbit is expected
++     in C++ mode, since libstdc++ provides its own version of signbit
++     in cmath (which undefines signbit). */
++#  define signbit(x) __builtin_signbitl (x)
+ # elif __GNUC_PREREQ (4,0)
+ #  define signbit(x) __MATH_TG ((x), __builtin_signbit, (x))
+ # else
+@@ -442,8 +457,12 @@ enum
+ 
+ /* Return nonzero value if X is positive or negative infinity.  */
+ # if __HAVE_DISTINCT_FLOAT128 && !__GNUC_PREREQ (7,0) \
+-     && !defined __SUPPORT_SNAN__
+-   /* __builtin_isinf_sign is broken for float128 only before GCC 7.0.  */
++     && !defined __SUPPORT_SNAN__ && !defined __cplusplus
++   /* Since __builtin_isinf_sign is broken for float128 before GCC 7.0,
++      use the helper function, __isinff128, with older compilers.  This is
++      only provided for C mode, because in C++ mode, GCC has no support
++      for __builtin_types_compatible_p (and when in C++ mode, this macro is
++      not used anyway, because libstdc++ headers undefine it).  */
+ #  define isinf(x) \
+     (__builtin_types_compatible_p (__typeof (x), _Float128) \
+      ? __isinff128 (x) : __builtin_isinf_sign (x))
+@@ -470,7 +489,32 @@ enum
+ # include <bits/iscanonical.h>
+ 
+ /* Return nonzero value if X is a signaling NaN.  */
+-# define issignaling(x) __MATH_TG ((x), __issignaling, (x))
++# ifndef __cplusplus
++#  define issignaling(x) __MATH_TG ((x), __issignaling, (x))
++# else
++   /* In C++ mode, __MATH_TG cannot be used, because it relies on
++      __builtin_types_compatible_p, which is a C-only builtin.  On the
++      other hand, overloading provides the means to distinguish between
++      the floating-point types.  The overloading resolution will match
++      the correct parameter (regardless of type qualifiers (i.e.: const
++      and volatile)).  */
++extern "C++" {
++inline int issignaling (float __val) { return __issignalingf (__val); }
++inline int issignaling (double __val) { return __issignaling (__val); }
++inline int
++issignaling (long double __val)
++{
++#  ifdef __NO_LONG_DOUBLE_MATH
++  return __issignaling (__val);
++#  else
++  return __issignalingl (__val);
++#  endif
++}
++#  if __HAVE_DISTINCT_FLOAT128
++inline int issignaling (_Float128 __val) { return __issignalingf128 (__val); }
++#  endif
++} /* extern C++ */
++# endif
+ 
+ /* Return nonzero value if X is subnormal.  */
+ # define issubnormal(x) (fpclassify (x) == FP_SUBNORMAL)
+@@ -484,15 +528,40 @@ enum
+ #  endif
+ # else	/* __cplusplus */
+ extern "C++" {
++#  ifdef __SUPPORT_SNAN__
++inline int
++iszero (float __val)
++{
++  return __fpclassifyf (__val) == FP_ZERO;
++}
++inline int
++iszero (double __val)
++{
++  return __fpclassify (__val) == FP_ZERO;
++}
++inline int
++iszero (long double __val)
++{
++#   ifdef __NO_LONG_DOUBLE_MATH
++  return __fpclassify (__val) == FP_ZERO;
++#   else
++  return __fpclassifyl (__val) == FP_ZERO;
++#   endif
++}
++#   if __HAVE_DISTINCT_FLOAT128
++inline int
++iszero (_Float128 __val)
++{
++  return __fpclassifyf128 (__val) == FP_ZERO;
++}
++#   endif
++#  else
+ template <class __T> inline bool
+ iszero (__T __val)
+ {
+-#  ifdef __SUPPORT_SNAN__
+-  return fpclassify (__val) == FP_ZERO;
+-#  else
+   return __val == 0;
+-#  endif
+ }
++#  endif
+ } /* extern C++ */
+ # endif	/* __cplusplus */
+ #endif /* Use IEC_60559_BFP_EXT.  */
+diff --git a/math/test-math-iscanonical.cc b/math/test-math-iscanonical.cc
+new file mode 100644
+index 0000000000..4cfb1c5055
+--- /dev/null
++++ b/math/test-math-iscanonical.cc
+@@ -0,0 +1,48 @@
++/* Test for the C++ implementation of iscanonical.
++   Copyright (C) 2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#define _GNU_SOURCE 1
++#include <math.h>
++#include <stdio.h>
++
++static int errors;
++
++template <class T>
++static void
++check_type ()
++{
++  T val = 0;
++
++  /* Check if iscanonical is available in C++ mode (bug 22235).  */
++  if (iscanonical (val) == 0)
++    errors++;
++}
++
++static int
++do_test (void)
++{
++  check_type<float> ();
++  check_type<double> ();
++  check_type<long double> ();
++#if __HAVE_DISTINCT_FLOAT128
++  check_type<_Float128> ();
++#endif
++  return errors != 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/math/test-math-issignaling.cc b/math/test-math-issignaling.cc
+new file mode 100644
+index 0000000000..22ae9e1bca
+--- /dev/null
++++ b/math/test-math-issignaling.cc
+@@ -0,0 +1,113 @@
++/* Test for the C++ implementation of issignaling.
++   Copyright (C) 2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#define _GNU_SOURCE 1
++#include <math.h>
++#include <stdio.h>
++
++#include <limits>
++
++/* There is no signaling_NaN for _Float128 in std::numeric_limits.
++   Include ieee754_float128.h and use the bitfields in the union
++   ieee854_float128.ieee_nan to build a signaling NaN.  */
++#if __HAVE_DISTINCT_FLOAT128
++# include <ieee754_float128.h>
++#endif
++
++static bool errors;
++
++static void
++check (int actual, int expected, const char *actual_expr, int line)
++{
++  if (actual != expected)
++    {
++      errors = true;
++      printf ("%s:%d: error: %s\n", __FILE__, line, actual_expr);
++      printf ("%s:%d:   expected: %d\n", __FILE__, line, expected);
++      printf ("%s:%d:   actual: %d\n", __FILE__, line, actual);
++    }
++}
++
++#define CHECK(actual, expected) \
++  check ((actual), (expected), #actual, __LINE__)
++
++template <class T>
++static void
++check_type ()
++{
++  typedef std::numeric_limits<T> limits;
++  CHECK (issignaling (T{0}), 0);
++  if (limits::has_infinity)
++    {
++      CHECK (issignaling (limits::infinity ()), 0);
++      CHECK (issignaling (-limits::infinity ()), 0);
++    }
++  if (limits::has_quiet_NaN)
++    CHECK (issignaling (limits::quiet_NaN ()), 0);
++  if (limits::has_signaling_NaN)
++    CHECK (issignaling (limits::signaling_NaN ()), 1);
++}
++
++#if __HAVE_DISTINCT_FLOAT128
++static void
++check_float128 ()
++{
++  ieee854_float128 q;
++
++  q.d = 0;
++  CHECK (issignaling (q.d), 0);
++
++  /* Infinity.  */
++  q.ieee.negative = 0;
++  q.ieee.exponent = 0x7FFF;
++  q.ieee.mantissa0 = 0x0000;
++  q.ieee.mantissa1 = 0x00000000;
++  q.ieee.mantissa2 = 0x00000000;
++  q.ieee.mantissa3 = 0x00000000;
++  CHECK (issignaling (q.d), 0);
++
++  /* Quiet NaN.  */
++  q.ieee_nan.quiet_nan = 1;
++  q.ieee_nan.mantissa0 = 0x0000;
++  CHECK (issignaling (q.d), 0);
++
++  /* Still a quiet NaN.  */
++  q.ieee_nan.quiet_nan = 1;
++  q.ieee_nan.mantissa0 = 0x4000;
++  CHECK (issignaling (q.d), 0);
++
++  /* Signaling NaN.  */
++  q.ieee_nan.quiet_nan = 0;
++  q.ieee_nan.mantissa0 = 0x4000;
++  CHECK (issignaling (q.d), 1);
++}
++#endif
++
++static int
++do_test (void)
++{
++  check_type<float> ();
++  check_type<double> ();
++  check_type<long double> ();
++#if __HAVE_DISTINCT_FLOAT128
++  check_float128 ();
++#endif
++  return errors;
++}
++
++#include <support/test-driver.c>
+diff --git a/math/test-math-iszero.cc b/math/test-math-iszero.cc
+index 027e972654..5c07261626 100644
+--- a/math/test-math-iszero.cc
++++ b/math/test-math-iszero.cc
+@@ -22,6 +22,13 @@
+ 
+ #include <limits>
+ 
++/* Support for _Float128 in std::numeric_limits is limited.
++   Include ieee754_float128.h and use the bitfields in the union
++   ieee854_float128.ieee_nan to build corner-case inputs.  */
++#if __HAVE_DISTINCT_FLOAT128
++# include <ieee754_float128.h>
++#endif
++
+ static bool errors;
+ 
+ static void
+@@ -72,12 +79,84 @@ check_type ()
+          std::numeric_limits<T>::has_denorm == std::denorm_absent);
+ }
+ 
++#if __HAVE_DISTINCT_FLOAT128
++static void
++check_float128 ()
++{
++  ieee854_float128 q;
++
++  q.d = 0.0Q;
++  CHECK (iszero (q.d), 1);
++  q.d = -0.0Q;
++  CHECK (iszero (q.d), 1);
++  q.d = 1.0Q;
++  CHECK (iszero (q.d), 0);
++  q.d = -1.0Q;
++  CHECK (iszero (q.d), 0);
++
++  /* Normal min.  */
++  q.ieee.negative = 0;
++  q.ieee.exponent = 0x0001;
++  q.ieee.mantissa0 = 0x0000;
++  q.ieee.mantissa1 = 0x00000000;
++  q.ieee.mantissa2 = 0x00000000;
++  q.ieee.mantissa3 = 0x00000000;
++  CHECK (iszero (q.d), 0);
++  q.ieee.negative = 1;
++  CHECK (iszero (q.d), 0);
++
++  /* Normal max.  */
++  q.ieee.negative = 0;
++  q.ieee.exponent = 0x7FFE;
++  q.ieee.mantissa0 = 0xFFFF;
++  q.ieee.mantissa1 = 0xFFFFFFFF;
++  q.ieee.mantissa2 = 0xFFFFFFFF;
++  q.ieee.mantissa3 = 0xFFFFFFFF;
++  CHECK (iszero (q.d), 0);
++  q.ieee.negative = 1;
++  CHECK (iszero (q.d), 0);
++
++  /* Infinity.  */
++  q.ieee.negative = 0;
++  q.ieee.exponent = 0x7FFF;
++  q.ieee.mantissa0 = 0x0000;
++  q.ieee.mantissa1 = 0x00000000;
++  q.ieee.mantissa2 = 0x00000000;
++  q.ieee.mantissa3 = 0x00000000;
++  CHECK (iszero (q.d), 0);
++
++  /* Quiet NaN.  */
++  q.ieee_nan.quiet_nan = 1;
++  q.ieee_nan.mantissa0 = 0x0000;
++  CHECK (iszero (q.d), 0);
++
++  /* Signaling NaN.  */
++  q.ieee_nan.quiet_nan = 0;
++  q.ieee_nan.mantissa0 = 0x4000;
++  CHECK (iszero (q.d), 0);
++
++  /* Denormal min.  */
++  q.ieee.negative = 0;
++  q.ieee.exponent = 0x0000;
++  q.ieee.mantissa0 = 0x0000;
++  q.ieee.mantissa1 = 0x00000000;
++  q.ieee.mantissa2 = 0x00000000;
++  q.ieee.mantissa3 = 0x00000001;
++  CHECK (iszero (q.d), 0);
++  q.ieee.negative = 1;
++  CHECK (iszero (q.d), 0);
++}
++#endif
++
+ static int
+ do_test (void)
+ {
+   check_type<float> ();
+   check_type<double> ();
+   check_type<long double> ();
++#if __HAVE_DISTINCT_FLOAT128
++  check_float128 ();
++#endif
+   return errors;
+ }
+ 
+diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
+index 06523bfe9c..0c808216a4 100644
+--- a/misc/sys/cdefs.h
++++ b/misc/sys/cdefs.h
+@@ -464,17 +464,18 @@
+ # define __glibc_macro_warning(msg)
+ #endif
+ 
+-/* Support for generic selection (ISO C11) is available in GCC since
+-   version 4.9.  Previous versions do not provide generic selection,
+-   even though they might set __STDC_VERSION__ to 201112L, when in
+-   -std=c11 mode.  Thus, we must check for !defined __GNUC__ when
+-   testing __STDC_VERSION__ for generic selection support.
++/* Generic selection (ISO C11) is a C-only feature, available in GCC
++   since version 4.9.  Previous versions do not provide generic
++   selection, even though they might set __STDC_VERSION__ to 201112L,
++   when in -std=c11 mode.  Thus, we must check for !defined __GNUC__
++   when testing __STDC_VERSION__ for generic selection support.
+    On the other hand, Clang also defines __GNUC__, so a clang-specific
+    check is required to enable the use of generic selection.  */
+-#if __GNUC_PREREQ (4, 9) \
+-    || __glibc_clang_has_extension (c_generic_selections) \
+-    || (!defined __GNUC__ && defined __STDC_VERSION__ \
+-	&& __STDC_VERSION__ >= 201112L)
++#if !defined __cplusplus \
++    && (__GNUC_PREREQ (4, 9) \
++	|| __glibc_clang_has_extension (c_generic_selections) \
++	|| (!defined __GNUC__ && defined __STDC_VERSION__ \
++	    && __STDC_VERSION__ >= 201112L))
+ # define __HAVE_GENERIC_SELECTION 1
+ #else
+ # define __HAVE_GENERIC_SELECTION 0
+diff --git a/nptl/Makefile b/nptl/Makefile
+index 5cb1bb2c3d..0b01e18106 100644
+--- a/nptl/Makefile
++++ b/nptl/Makefile
+@@ -227,6 +227,10 @@ CFLAGS-pt-system.c = -fexceptions
+ LDLIBS-tst-once5 = -lstdc++
+ CFLAGS-tst-thread_local1.o = -std=gnu++11
+ LDLIBS-tst-thread_local1 = -lstdc++
++CFLAGS-tst-thread-exit-clobber.o = -std=gnu++11
++LDLIBS-tst-thread-exit-clobber = -lstdc++
++CFLAGS-tst-minstack-throw.o = -std=gnu++11
++LDLIBS-tst-minstack-throw = -lstdc++
+ 
+ tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \
+ 	tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 tst-mutex5 tst-mutex6 \
+@@ -302,7 +306,9 @@ tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \
+ 			    c89 gnu89 c99 gnu99 c11 gnu11) \
+ 	tst-bad-schedattr \
+ 	tst-thread_local1 tst-mutex-errorcheck tst-robust10 \
+-	tst-robust-fork tst-create-detached tst-memstream
++	tst-robust-fork tst-create-detached tst-memstream \
++	tst-thread-exit-clobber tst-minstack-cancel tst-minstack-exit \
++	tst-minstack-throw
+ 
+ tests-internal := tst-typesizes \
+ 		  tst-rwlock19 tst-rwlock20 \
+@@ -367,7 +373,7 @@ tests += tst-cancelx2 tst-cancelx3 tst-cancelx4 tst-cancelx5 \
+ 	 tst-cleanupx0 tst-cleanupx1 tst-cleanupx2 tst-cleanupx3 tst-cleanupx4 \
+ 	 tst-oncex3 tst-oncex4
+ ifeq ($(build-shared),yes)
+-tests += tst-atfork2 tst-tls4 tst-_res1 tst-fini1
++tests += tst-atfork2 tst-tls4 tst-_res1 tst-fini1 tst-compat-forwarder
+ tests-internal += tst-tls3 tst-tls3-malloc tst-tls5 tst-stackguard1
+ tests-nolibpthread += tst-fini1
+ ifeq ($(have-z-execstack),yes)
+@@ -379,7 +385,7 @@ modules-names = tst-atfork2mod tst-tls3mod tst-tls4moda tst-tls4modb \
+ 		tst-tls5mod tst-tls5moda tst-tls5modb tst-tls5modc \
+ 		tst-tls5modd tst-tls5mode tst-tls5modf tst-stack4mod \
+ 		tst-_res1mod1 tst-_res1mod2 tst-execstack-mod tst-fini1mod \
+-		tst-join7mod
++		tst-join7mod tst-compat-forwarder-mod
+ extra-test-objs += $(addsuffix .os,$(strip $(modules-names))) \
+ 		   tst-cleanup4aux.o tst-cleanupx4aux.o
+ test-extras += tst-cleanup4aux tst-cleanupx4aux
+@@ -453,7 +459,8 @@ endif
+ 
+ ifeq (,$(CXX))
+ # These tests require a C++ compiler and runtime.
+-tests-unsupported += tst-cancel24 tst-cancel24-static tst-once5
++tests-unsupported += tst-cancel24 tst-cancel24-static tst-once5 \
++  tst-thread-exit-clobber tst-minstack-throw
+ endif
+ # These tests require a C++ compiler and runtime with thread_local support.
+ ifneq ($(have-cxx-thread_local),yes)
+@@ -718,6 +725,8 @@ $(objpfx)tst-oddstacklimit.out: $(objpfx)tst-oddstacklimit $(objpfx)tst-basic1
+ 	$(evaluate-test)
+ endif
+ 
++$(objpfx)tst-compat-forwarder: $(objpfx)tst-compat-forwarder-mod.so
++
+ # The tests here better do not run in parallel
+ ifneq ($(filter %tests,$(MAKECMDGOALS)),)
+ .NOTPARALLEL:
+diff --git a/nptl/allocatestack.c b/nptl/allocatestack.c
+index ce2e24af95..e351ce9d99 100644
+--- a/nptl/allocatestack.c
++++ b/nptl/allocatestack.c
+@@ -356,7 +356,7 @@ setup_stack_prot (char *mem, size_t size, char *guard, size_t guardsize,
+ 		  const int prot)
+ {
+   char *guardend = guard + guardsize;
+-#if _STACK_GROWS_DOWN
++#if _STACK_GROWS_DOWN && !defined(NEED_SEPARATE_REGISTER_STACK)
+   /* As defined at guard_position, for architectures with downward stack
+      the guard page is always at start of the allocated area.  */
+   if (__mprotect (guardend, size - guardsize, prot) != 0)
+@@ -372,6 +372,33 @@ setup_stack_prot (char *mem, size_t size, char *guard, size_t guardsize,
+   return 0;
+ }
+ 
++/* Mark the memory of the stack as usable to the kernel.  It frees everything
++   except for the space used for the TCB itself.  */
++static inline void
++__always_inline
++advise_stack_range (void *mem, size_t size, uintptr_t pd, size_t guardsize)
++{
++  uintptr_t sp = (uintptr_t) CURRENT_STACK_FRAME;
++  size_t pagesize_m1 = __getpagesize () - 1;
++#if _STACK_GROWS_DOWN && !defined(NEED_SEPARATE_REGISTER_STACK)
++  size_t freesize = (sp - (uintptr_t) mem) & ~pagesize_m1;
++  assert (freesize < size);
++  if (freesize > PTHREAD_STACK_MIN)
++    __madvise (mem, freesize - PTHREAD_STACK_MIN, MADV_DONTNEED);
++#else
++  /* Page aligned start of memory to free (higher than or equal
++     to current sp plus the minimum stack size).  */
++  uintptr_t freeblock = (sp + PTHREAD_STACK_MIN + pagesize_m1) & ~pagesize_m1;
++  uintptr_t free_end = (pd - guardsize) & ~pagesize_m1;
++  if (free_end > freeblock)
++    {
++      size_t freesize = free_end - freeblock;
++      assert (freesize < size);
++      __madvise ((void*) freeblock, freesize, MADV_DONTNEED);
++    }
++#endif
++}
++
+ /* Returns a usable stack for a new thread either by allocating a
+    new stack or reusing a cached stack of sufficient size.
+    ATTR must be non-NULL and point to a valid pthread_attr.
+@@ -506,6 +533,10 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
+       /* Make sure the size of the stack is enough for the guard and
+ 	 eventually the thread descriptor.  */
+       guardsize = (attr->guardsize + pagesize_m1) & ~pagesize_m1;
++      if (guardsize < attr->guardsize || size + guardsize < guardsize)
++	/* Arithmetic overflow.  */
++	return EINVAL;
++      size += guardsize;
+       if (__builtin_expect (size < ((guardsize + __static_tls_size
+ 				     + MINIMAL_REST_STACK + pagesize_m1)
+ 				    & ~pagesize_m1),
+@@ -727,7 +758,7 @@ allocate_stack (const struct pthread_attr *attr, struct pthread **pdp,
+ 				  - offsetof (pthread_mutex_t,
+ 					      __data.__list.__next));
+   pd->robust_head.list_op_pending = NULL;
+-#ifdef __PTHREAD_MUTEX_HAVE_PREV
++#if __PTHREAD_MUTEX_HAVE_PREV
+   pd->robust_prev = &pd->robust_head;
+ #endif
+   pd->robust_head.list = &pd->robust_head;
+diff --git a/nptl/descr.h b/nptl/descr.h
+index c5ad0c8dba..82dab056e2 100644
+--- a/nptl/descr.h
++++ b/nptl/descr.h
+@@ -169,7 +169,7 @@ struct pthread
+   pid_t pid_ununsed;
+ 
+   /* List of robust mutexes the thread is holding.  */
+-#ifdef __PTHREAD_MUTEX_HAVE_PREV
++#if __PTHREAD_MUTEX_HAVE_PREV
+   void *robust_prev;
+   struct robust_list_head robust_head;
+ 
+@@ -380,9 +380,9 @@ struct pthread
+   /* Machine-specific unwind info.  */
+   struct _Unwind_Exception exc;
+ 
+-  /* If nonzero pointer to area allocated for the stack and its
+-     size.  */
++  /* If nonzero, pointer to the area allocated for the stack and guard. */
+   void *stackblock;
++  /* Size of the stackblock area including the guard.  */
+   size_t stackblock_size;
+   /* Size of the included guard area.  */
+   size_t guardsize;
+diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c
+index 29216077a2..e5c0bdfbeb 100644
+--- a/nptl/nptl-init.c
++++ b/nptl/nptl-init.c
+@@ -297,7 +297,7 @@ __pthread_initialize_minimal_internal (void)
+ 
+   /* Initialize the robust mutex data.  */
+   {
+-#ifdef __PTHREAD_MUTEX_HAVE_PREV
++#if __PTHREAD_MUTEX_HAVE_PREV
+     pd->robust_prev = &pd->robust_head;
+ #endif
+     pd->robust_head.list = &pd->robust_head;
+@@ -473,8 +473,5 @@ strong_alias (__pthread_initialize_minimal_internal,
+ size_t
+ __pthread_get_minstack (const pthread_attr_t *attr)
+ {
+-  struct pthread_attr *iattr = (struct pthread_attr *) attr;
+-
+-  return (GLRO(dl_pagesize) + __static_tls_size + PTHREAD_STACK_MIN
+-	  + iattr->guardsize);
++  return GLRO(dl_pagesize) + __static_tls_size + PTHREAD_STACK_MIN;
+ }
+diff --git a/nptl/pt-longjmp.c b/nptl/pt-longjmp.c
+index 2ef757e687..8f3c6b3a09 100644
+--- a/nptl/pt-longjmp.c
++++ b/nptl/pt-longjmp.c
+@@ -25,21 +25,14 @@
+    symbol in libpthread, but the historical ABI requires it.  For static
+    linking, there is no need to provide anything here--the libc version
+    will be linked in.  For shared library ABI compatibility, there must be
+-   longjmp and siglongjmp symbols in libpthread.so; so we define them using
+-   IFUNC to redirect to the libc function.  */
++   longjmp and siglongjmp symbols in libpthread.so.
+ 
+-#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)
+-
+-# if HAVE_IFUNC
+-
+-#  undef INIT_ARCH
+-#  define INIT_ARCH()
+-#  define DEFINE_LONGJMP(name) libc_ifunc (name, &__libc_longjmp)
+-
+-extern __typeof(longjmp) longjmp_ifunc;
+-extern __typeof(siglongjmp) siglongjmp_ifunc;
++   With an IFUNC resolver, it would be possible to avoid the indirection,
++   but the IFUNC resolver might run before the __libc_longjmp symbol has
++   been relocated, in which case the IFUNC resolver would not be able to
++   provide the correct address.  */
+ 
+-# else  /* !HAVE_IFUNC */
++#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)
+ 
+ static void __attribute__ ((noreturn, used))
+ longjmp_compat (jmp_buf env, int val)
+@@ -47,14 +40,10 @@ longjmp_compat (jmp_buf env, int val)
+   __libc_longjmp (env, val);
+ }
+ 
+-# define DEFINE_LONGJMP(name) strong_alias (longjmp_compat, name)
+-
+-# endif  /* HAVE_IFUNC */
+-
+-DEFINE_LONGJMP (longjmp_ifunc)
+-compat_symbol (libpthread, longjmp_ifunc, longjmp, GLIBC_2_0);
++strong_alias (longjmp_compat, longjmp_alias)
++compat_symbol (libpthread, longjmp_alias, longjmp, GLIBC_2_0);
+ 
+-strong_alias (longjmp_ifunc, siglongjmp_ifunc)
+-compat_symbol (libpthread, siglongjmp_ifunc, siglongjmp, GLIBC_2_0);
++strong_alias (longjmp_alias, siglongjmp_alias)
++compat_symbol (libpthread, siglongjmp_alias, siglongjmp, GLIBC_2_0);
+ 
+ #endif
+diff --git a/nptl/pt-system.c b/nptl/pt-system.c
+index f8ca6ba0d9..b30ddf2b39 100644
+--- a/nptl/pt-system.c
++++ b/nptl/pt-system.c
+@@ -25,29 +25,21 @@
+    libpthread, but the historical ABI requires it.  For static linking,
+    there is no need to provide anything here--the libc version will be
+    linked in.  For shared library ABI compatibility, there must be a
+-   'system' symbol in libpthread.so; so we define it using IFUNC to
+-   redirect to the libc function.  */
++   'system' symbol in libpthread.so.
+ 
+-#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)
+-
+-# if HAVE_IFUNC
+-
+-extern __typeof(system) system_ifunc;
+-#  undef INIT_ARCH
+-#  define INIT_ARCH()
+-libc_ifunc (system_ifunc, &__libc_system)
++   With an IFUNC resolver, it would be possible to avoid the indirection,
++   but the IFUNC resolver might run before the __libc_system symbol has
++   been relocated, in which case the IFUNC resolver would not be able to
++   provide the correct address.  */
+ 
+-# else  /* !HAVE_IFUNC */
++#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_22)
+ 
+ static int __attribute__ ((used))
+ system_compat (const char *line)
+ {
+   return __libc_system (line);
+ }
+-strong_alias (system_compat, system_ifunc)
+-
+-# endif  /* HAVE_IFUNC */
+-
+-compat_symbol (libpthread, system_ifunc, system, GLIBC_2_0);
++strong_alias (system_compat, system_alias)
++compat_symbol (libpthread, system_alias, system, GLIBC_2_0);
+ 
+ #endif
+diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
+index 6e7d6ff09e..c5ae04692e 100644
+--- a/nptl/pthreadP.h
++++ b/nptl/pthreadP.h
+@@ -647,4 +647,10 @@ check_stacksize_attr (size_t st)
+   return EINVAL;
+ }
+ 
++#define ASSERT_PTHREAD_STRING(x) __STRING (x)
++#define ASSERT_PTHREAD_INTERNAL_OFFSET(type, member, offset)		\
++  _Static_assert (offsetof (type, member) == offset,			\
++		  "offset of " #member " field of " #type " != "	\
++		  ASSERT_PTHREAD_STRING (offset))
++
+ #endif	/* pthreadP.h */
+diff --git a/nptl/pthread_create.c b/nptl/pthread_create.c
+index 2f8ada34d6..791587218b 100644
+--- a/nptl/pthread_create.c
++++ b/nptl/pthread_create.c
+@@ -520,7 +520,7 @@ START_THREAD_DEFN
+ 
+ #ifndef __ASSUME_SET_ROBUST_LIST
+   /* If this thread has any robust mutexes locked, handle them now.  */
+-# ifdef __PTHREAD_MUTEX_HAVE_PREV
++# if __PTHREAD_MUTEX_HAVE_PREV
+   void *robust = pd->robust_head.list;
+ # else
+   __pthread_slist_t *robust = pd->robust_list.__next;
+@@ -538,7 +538,7 @@ START_THREAD_DEFN
+ 					 __list.__next));
+ 	  robust = *((void **) robust);
+ 
+-# ifdef __PTHREAD_MUTEX_HAVE_PREV
++# if __PTHREAD_MUTEX_HAVE_PREV
+ 	  this->__list.__prev = NULL;
+ # endif
+ 	  this->__list.__next = NULL;
+@@ -551,31 +551,8 @@ START_THREAD_DEFN
+     }
+ #endif
+ 
+-  /* Mark the memory of the stack as usable to the kernel.  We free
+-     everything except for the space used for the TCB itself.  */
+-  size_t pagesize_m1 = __getpagesize () - 1;
+-#ifdef _STACK_GROWS_DOWN
+-  char *sp = CURRENT_STACK_FRAME;
+-  size_t freesize = (sp - (char *) pd->stackblock) & ~pagesize_m1;
+-  assert (freesize < pd->stackblock_size);
+-  if (freesize > PTHREAD_STACK_MIN)
+-    __madvise (pd->stackblock, freesize - PTHREAD_STACK_MIN, MADV_DONTNEED);
+-#else
+-  /* Page aligned start of memory to free (higher than or equal
+-     to current sp plus the minimum stack size).  */
+-  void *freeblock = (void*)((size_t)(CURRENT_STACK_FRAME
+-				     + PTHREAD_STACK_MIN
+-				     + pagesize_m1)
+-				    & ~pagesize_m1);
+-  char *free_end = (char *) (((uintptr_t) pd - pd->guardsize) & ~pagesize_m1);
+-  /* Is there any space to free?  */
+-  if (free_end > (char *)freeblock)
+-    {
+-      size_t freesize = (size_t)(free_end - (char *)freeblock);
+-      assert (freesize < pd->stackblock_size);
+-      __madvise (freeblock, freesize, MADV_DONTNEED);
+-    }
+-#endif
++  advise_stack_range (pd->stackblock, pd->stackblock_size, (uintptr_t) pd,
++		      pd->guardsize);
+ 
+   /* If the thread is detached free the TCB.  */
+   if (IS_DETACHED (pd))
+diff --git a/nptl/pthread_getattr_np.c b/nptl/pthread_getattr_np.c
+index 06093b3d92..210a3f8a1f 100644
+--- a/nptl/pthread_getattr_np.c
++++ b/nptl/pthread_getattr_np.c
+@@ -57,9 +57,12 @@ pthread_getattr_np (pthread_t thread_id, pthread_attr_t *attr)
+   /* The sizes are subject to alignment.  */
+   if (__glibc_likely (thread->stackblock != NULL))
+     {
+-      iattr->stacksize = thread->stackblock_size;
++      /* The stack size reported to the user should not include the
++	 guard size.  */
++      iattr->stacksize = thread->stackblock_size - thread->guardsize;
+ #if _STACK_GROWS_DOWN
+-      iattr->stackaddr = (char *) thread->stackblock + iattr->stacksize;
++      iattr->stackaddr = (char *) thread->stackblock
++			 + thread->stackblock_size;
+ #else
+       iattr->stackaddr = (char *) thread->stackblock;
+ #endif
+diff --git a/nptl/pthread_mutex_init.c b/nptl/pthread_mutex_init.c
+index 6f2fc808ff..e1f911bf29 100644
+--- a/nptl/pthread_mutex_init.c
++++ b/nptl/pthread_mutex_init.c
+@@ -23,6 +23,7 @@
+ #include <kernel-features.h>
+ #include "pthreadP.h"
+ #include <atomic.h>
++#include <pthread-offsets.h>
+ 
+ #include <stap-probe.h>
+ 
+@@ -58,6 +59,18 @@ __pthread_mutex_init (pthread_mutex_t *mutex,
+   const struct pthread_mutexattr *imutexattr;
+ 
+   assert (sizeof (pthread_mutex_t) <= __SIZEOF_PTHREAD_MUTEX_T);
++  ASSERT_PTHREAD_INTERNAL_OFFSET (pthread_mutex_t, __data.__nusers,
++				  __PTHREAD_MUTEX_NUSERS_OFFSET);
++  ASSERT_PTHREAD_INTERNAL_OFFSET (pthread_mutex_t, __data.__kind,
++				  __PTHREAD_MUTEX_KIND_OFFSET);
++  ASSERT_PTHREAD_INTERNAL_OFFSET (pthread_mutex_t, __data.__spins,
++				  __PTHREAD_MUTEX_SPINS_OFFSET);
++#if __PTHREAD_MUTEX_LOCK_ELISION
++  ASSERT_PTHREAD_INTERNAL_OFFSET (pthread_mutex_t, __data.__elision,
++				  __PTHREAD_MUTEX_ELISION_OFFSET);
++#endif
++  ASSERT_PTHREAD_INTERNAL_OFFSET (pthread_mutex_t, __data.__list,
++				  __PTHREAD_MUTEX_LIST_OFFSET);
+ 
+   imutexattr = ((const struct pthread_mutexattr *) mutexattr
+ 		?: &default_mutexattr);
+diff --git a/nptl/tst-compat-forwarder-mod.c b/nptl/tst-compat-forwarder-mod.c
+new file mode 100644
+index 0000000000..823bfa22de
+--- /dev/null
++++ b/nptl/tst-compat-forwarder-mod.c
+@@ -0,0 +1,28 @@
++/* Copyright (C) 2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++/* Call the function system through a statically initialized pointer.  */
++
++#include <stdlib.h>
++
++int (*system_function) (const char *) = system;
++
++void
++call_system (void)
++{
++  system_function (NULL);
++}
+diff --git a/nptl/tst-compat-forwarder.c b/nptl/tst-compat-forwarder.c
+new file mode 100644
+index 0000000000..f96806b7fe
+--- /dev/null
++++ b/nptl/tst-compat-forwarder.c
+@@ -0,0 +1,35 @@
++/* Copyright (C) 2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++/* Test that the compat forwaders in libpthread work correctly.  */
++
++#include <support/test-driver.h>
++
++extern void call_system (void);
++
++int
++do_test (void)
++{
++  /* Calling the system function from a shared library that is not linked
++     against libpthread, when the main program is linked against
++     libpthread, should not crash.  */
++  call_system ();
++
++  return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/nptl/tst-minstack-cancel.c b/nptl/tst-minstack-cancel.c
+new file mode 100644
+index 0000000000..a306320e88
+--- /dev/null
++++ b/nptl/tst-minstack-cancel.c
+@@ -0,0 +1,48 @@
++/* Test cancellation with a minimal stack size.
++   Copyright (C) 2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++/* Note: This test is similar to tst-minstack-exit, but is separate to
++   avoid spurious test passes due to warm-up effects.  */
++
++#include <limits.h>
++#include <unistd.h>
++#include <support/check.h>
++#include <support/xthread.h>
++
++static void *
++threadfunc (void *closure)
++{
++  while (1)
++    pause ();
++  return NULL;
++}
++
++static int
++do_test (void)
++{
++  pthread_attr_t attr;
++  xpthread_attr_init (&attr);
++  xpthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN);
++  pthread_t thr = xpthread_create (&attr, threadfunc, NULL);
++  xpthread_cancel (thr);
++  TEST_VERIFY (xpthread_join (thr) == PTHREAD_CANCELED);
++  xpthread_attr_destroy (&attr);
++  return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/nptl/tst-minstack-exit.c b/nptl/tst-minstack-exit.c
+new file mode 100644
+index 0000000000..9c7e9a4dfe
+--- /dev/null
++++ b/nptl/tst-minstack-exit.c
+@@ -0,0 +1,46 @@
++/* Test that pthread_exit works with the minimum stack size.
++   Copyright (C) 2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++/* Note: This test is similar to tst-minstack-cancel, but is separate
++   to avoid spurious test passes due to warm-up effects.  */
++
++#include <limits.h>
++#include <unistd.h>
++#include <support/check.h>
++#include <support/xthread.h>
++
++static void *
++threadfunc (void *closure)
++{
++  pthread_exit (threadfunc);
++  return NULL;
++}
++
++static int
++do_test (void)
++{
++  pthread_attr_t attr;
++  xpthread_attr_init (&attr);
++  xpthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN);
++  pthread_t thr = xpthread_create (&attr, threadfunc, NULL);
++  TEST_VERIFY (xpthread_join (thr) == threadfunc);
++  xpthread_attr_destroy (&attr);
++  return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/nptl/tst-minstack-throw.cc b/nptl/tst-minstack-throw.cc
+new file mode 100644
+index 0000000000..b0a897b0c6
+--- /dev/null
++++ b/nptl/tst-minstack-throw.cc
+@@ -0,0 +1,87 @@
++/* Test that throwing C++ exceptions works with the minimum stack size.
++   Copyright (C) 2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <stdexcept>
++
++#include <limits.h>
++#include <string.h>
++#include <support/check.h>
++#include <support/xthread.h>
++
++/* Throw a std::runtime_exception.  */
++__attribute__ ((noinline, noclone, weak))
++void
++do_throw_exception ()
++{
++  throw std::runtime_error ("test exception");
++}
++
++/* Class with a destructor, to trigger unwind handling.  */
++struct class_with_destructor
++{
++  class_with_destructor ();
++  ~class_with_destructor ();
++};
++
++__attribute__ ((noinline, noclone, weak))
++class_with_destructor::class_with_destructor ()
++{
++}
++
++__attribute__ ((noinline, noclone, weak))
++class_with_destructor::~class_with_destructor ()
++{
++}
++
++__attribute__ ((noinline, noclone, weak))
++void
++function_with_destructed_object ()
++{
++  class_with_destructor obj;
++  do_throw_exception ();
++}
++
++static void *
++threadfunc (void *closure)
++{
++  try
++    {
++      function_with_destructed_object ();
++      FAIL_EXIT1 ("no exception thrown");
++    }
++  catch (std::exception &e)
++    {
++      TEST_COMPARE (strcmp (e.what (), "test exception"), 0);
++      return reinterpret_cast<void *> (threadfunc);
++    }
++  FAIL_EXIT1 ("no exception caught");
++}
++
++static int
++do_test (void)
++{
++  pthread_attr_t attr;
++  xpthread_attr_init (&attr);
++  xpthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN);
++  pthread_t thr = xpthread_create (&attr, threadfunc, NULL);
++  TEST_VERIFY (xpthread_join (thr) == threadfunc);
++  xpthread_attr_destroy (&attr);
++  return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/nptl/tst-thread-exit-clobber.cc b/nptl/tst-thread-exit-clobber.cc
+new file mode 100644
+index 0000000000..b9be25a65b
+--- /dev/null
++++ b/nptl/tst-thread-exit-clobber.cc
+@@ -0,0 +1,243 @@
++/* Test that pthread_exit does not clobber callee-saved registers.
++   Copyright (C) 2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <stdio.h>
++#include <support/check.h>
++#include <support/xthread.h>
++
++/* This test attempts to check that callee-saved registers are
++   restored to their original values when destructors are run after
++   pthread_exit is called.  GCC PR 83641 causes this test to fail.
++
++   The constants have been chosen randomly and are magic values which
++   are used to detect whether registers have been clobbered.  The idea
++   is that these values are hidden behind a compiler barrier and only
++   present in .rodata initially, so that it is less likely that they
++   are in a register by accident.
++
++   The checker class can be stored in registers, and the magic values
++   are directly loaded into these registers.  The checker destructor
++   is eventually invoked by pthread_exit and calls one of the
++   check_magic functions to verify that the class contents (that is,
++   register value) is correct.
++
++   These tests are performed both for unsigned int and double values,
++   to cover different calling conventions.  */
++
++template <class T>
++struct values
++{
++  T v0;
++  T v1;
++  T v2;
++  T v3;
++  T v4;
++};
++
++static const values<unsigned int> magic_values =
++  {
++    0x57f7fc72,
++    0xe582daba,
++    0x5f6ac994,
++    0x35efddb7,
++    0x1fbf5a74,
++  };
++
++static const values<double> magic_values_double =
++  {
++    0.6764041905675465,
++    0.9533336788140494,
++    0.6091161359041452,
++    0.7668653957125336,
++    0.010374520235509666,
++  };
++
++/* Special index value which tells check_magic that no check should be
++   performed.  */
++enum { no_check = -1 };
++
++/* Check that VALUE is the magic value for INDEX, behind a compiler
++   barrier.  */
++__attribute__ ((noinline, noclone, weak))
++void
++check_magic (int index, unsigned int value)
++{
++  switch (index)
++    {
++    case 0:
++      TEST_COMPARE (value, magic_values.v0);
++      break;
++    case 1:
++      TEST_COMPARE (value, magic_values.v1);
++      break;
++    case 2:
++      TEST_COMPARE (value, magic_values.v2);
++      break;
++    case 3:
++      TEST_COMPARE (value, magic_values.v3);
++      break;
++    case 4:
++      TEST_COMPARE (value, magic_values.v4);
++      break;
++    case no_check:
++      break;
++    default:
++      FAIL_EXIT1 ("invalid magic value index %d", index);
++    }
++}
++
++/* Check that VALUE is the magic value for INDEX, behind a compiler
++   barrier.  Double variant.  */
++__attribute__ ((noinline, noclone, weak))
++void
++check_magic (int index, double value)
++{
++  switch (index)
++    {
++    case 0:
++      TEST_VERIFY (value == magic_values_double.v0);
++      break;
++    case 1:
++      TEST_VERIFY (value == magic_values_double.v1);
++      break;
++    case 2:
++      TEST_VERIFY (value == magic_values_double.v2);
++      break;
++    case 3:
++      TEST_VERIFY (value == magic_values_double.v3);
++      break;
++    case 4:
++      TEST_VERIFY (value == magic_values_double.v4);
++      break;
++    case no_check:
++      break;
++    default:
++      FAIL_EXIT1 ("invalid magic value index %d", index);
++    }
++}
++
++/* Store a magic value and check, via the destructor, that it has the
++   expected value.  */
++template <class T, int I>
++struct checker
++{
++  T value;
++
++  checker (T v)
++    : value (v)
++  {
++  }
++
++  ~checker ()
++  {
++    check_magic (I, value);
++  }
++};
++
++/* The functions call_pthread_exit_0, call_pthread_exit_1,
++   call_pthread_exit are used to call pthread_exit indirectly, with
++   the intent of clobbering the register values.  */
++
++__attribute__ ((noinline, noclone, weak))
++void
++call_pthread_exit_0 (const values<unsigned int> *pvalues)
++{
++  checker<unsigned int, no_check> c0 (pvalues->v0);
++  checker<unsigned int, no_check> c1 (pvalues->v1);
++  checker<unsigned int, no_check> c2 (pvalues->v2);
++  checker<unsigned int, no_check> c3 (pvalues->v3);
++  checker<unsigned int, no_check> c4 (pvalues->v4);
++
++  pthread_exit (NULL);
++}
++
++__attribute__ ((noinline, noclone, weak))
++void
++call_pthread_exit_1 (const values<double> *pvalues)
++{
++  checker<double, no_check> c0 (pvalues->v0);
++  checker<double, no_check> c1 (pvalues->v1);
++  checker<double, no_check> c2 (pvalues->v2);
++  checker<double, no_check> c3 (pvalues->v3);
++  checker<double, no_check> c4 (pvalues->v4);
++
++  values<unsigned int> other_values = { 0, };
++  call_pthread_exit_0 (&other_values);
++}
++
++__attribute__ ((noinline, noclone, weak))
++void
++call_pthread_exit ()
++{
++  values<double> other_values = { 0, };
++  call_pthread_exit_1 (&other_values);
++}
++
++/* Create on-stack objects and check that their values are restored by
++   pthread_exit.  If Nested is true, call pthread_exit indirectly via
++   call_pthread_exit.  */
++template <class T, bool Nested>
++__attribute__ ((noinline, noclone, weak))
++void *
++threadfunc (void *closure)
++{
++  const values<T> *pvalues = static_cast<const values<T> *> (closure);
++
++  checker<T, 0> c0 (pvalues->v0);
++  checker<T, 1> c1 (pvalues->v1);
++  checker<T, 2> c2 (pvalues->v2);
++  checker<T, 3> c3 (pvalues->v3);
++  checker<T, 4> c4 (pvalues->v4);
++
++  if (Nested)
++    call_pthread_exit ();
++  else
++    pthread_exit (NULL);
++
++  /* This should not be reached.  */
++  return const_cast<char *> ("");
++}
++
++static int
++do_test ()
++{
++  puts ("info: unsigned int, direct pthread_exit call");
++  pthread_t thr
++    = xpthread_create (NULL, &threadfunc<unsigned int, false>,
++                       const_cast<values<unsigned int> *> (&magic_values));
++  TEST_VERIFY (xpthread_join (thr) == NULL);
++
++  puts ("info: double, direct pthread_exit call");
++  thr = xpthread_create (NULL, &threadfunc<double, false>,
++                         const_cast<values<double> *> (&magic_values_double));
++  TEST_VERIFY (xpthread_join (thr) == NULL);
++
++  puts ("info: unsigned int, indirect pthread_exit call");
++  thr = xpthread_create (NULL, &threadfunc<unsigned int, true>,
++                       const_cast<values<unsigned int> *> (&magic_values));
++  TEST_VERIFY (xpthread_join (thr) == NULL);
++
++  puts ("info: double, indirect pthread_exit call");
++  thr = xpthread_create (NULL, &threadfunc<double, true>,
++                         const_cast<values<double> *> (&magic_values_double));
++  TEST_VERIFY (xpthread_join (thr) == NULL);
++
++  return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/nss/Makefile b/nss/Makefile
+index d9f6d41181..8efb2a56fa 100644
+--- a/nss/Makefile
++++ b/nss/Makefile
+@@ -58,6 +58,12 @@ tests			= test-netdb test-digits-dots tst-nss-getpwent bug17079 \
+ 			  tst-nss-test5
+ xtests			= bug-erange
+ 
++# Tests which need libdl
++ifeq (yes,$(build-shared))
++tests += tst-nss-files-hosts-erange
++tests += tst-nss-files-hosts-multi
++endif
++
+ # If we have a thread library then we can test cancellation against
+ # some routines like getpwuid_r.
+ ifeq (yes,$(have-thread-library))
+@@ -154,3 +160,6 @@ $(patsubst %,$(objpfx)%.out,$(tests)) : \
+ ifeq (yes,$(have-thread-library))
+ $(objpfx)tst-cancel-getpwuid_r: $(shared-thread-library)
+ endif
++
++$(objpfx)tst-nss-files-hosts-erange: $(libdl)
++$(objpfx)tst-nss-files-hosts-multi: $(libdl)
+diff --git a/nss/getXXbyYY_r.c b/nss/getXXbyYY_r.c
+index 6c547ea1ca..bce80e05dd 100644
+--- a/nss/getXXbyYY_r.c
++++ b/nss/getXXbyYY_r.c
+@@ -234,6 +234,9 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
+ 				      H_ERRNO_VAR_P))
+     {
+     case -1:
++# ifdef NEED__RES
++      __resolv_context_put (res_ctx);
++# endif
+       return errno;
+     case 1:
+ #ifdef NEED_H_ERRNO
+@@ -253,7 +256,12 @@ INTERNAL (REENTRANT_NAME) (ADD_PARAMS, LOOKUP_TYPE *resbuf, char *buffer,
+       nscd_status = NSCD_NAME (ADD_VARIABLES, resbuf, buffer, buflen, result
+ 			       H_ERRNO_VAR);
+       if (nscd_status >= 0)
+-	return nscd_status;
++	{
++# ifdef NEED__RES
++	  __resolv_context_put (res_ctx);
++# endif
++	  return nscd_status;
++	}
+     }
+ #endif
+ 
+diff --git a/nss/nss_files/files-hosts.c b/nss/nss_files/files-hosts.c
+index bccb6a5780..6f7cc4d94b 100644
+--- a/nss/nss_files/files-hosts.c
++++ b/nss/nss_files/files-hosts.c
+@@ -22,6 +22,8 @@
+ #include <arpa/nameser.h>
+ #include <netdb.h>
+ #include <resolv/resolv-internal.h>
++#include <scratch_buffer.h>
++#include <alloc_buffer.h>
+ 
+ 
+ /* Get implementation for some internal functions.  */
+@@ -115,228 +117,250 @@ DB_LOOKUP (hostbyaddr, ,,,
+ 	   }, const void *addr, socklen_t len, int af)
+ #undef EXTRA_ARGS_VALUE
+ 
+-enum nss_status
+-_nss_files_gethostbyname3_r (const char *name, int af, struct hostent *result,
+-			     char *buffer, size_t buflen, int *errnop,
+-			     int *herrnop, int32_t *ttlp, char **canonp)
+-{
+-  FILE *stream = NULL;
+-  uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct hostent_data);
+-  buffer += pad;
+-  buflen = buflen > pad ? buflen - pad : 0;
++/* Type of the address and alias arrays.  */
++#define DYNARRAY_STRUCT array
++#define DYNARRAY_ELEMENT char *
++#define DYNARRAY_PREFIX array_
++#include <malloc/dynarray-skeleton.c>
+ 
+-  /* Open file.  */
+-  enum nss_status status = internal_setent (&stream);
++static enum nss_status
++gethostbyname3_multi (FILE * stream, const char *name, int af,
++		      struct hostent *result, char *buffer, size_t buflen,
++		      int *errnop, int *herrnop, int flags)
++{
++  assert (af == AF_INET || af == AF_INET6);
++
++  /* We have to get all host entries from the file.  */
++  struct scratch_buffer tmp_buffer;
++  scratch_buffer_init (&tmp_buffer);
++  struct hostent tmp_result_buf;
++  struct array addresses;
++  array_init (&addresses);
++  struct array aliases;
++  array_init (&aliases);
++  enum nss_status status;
++
++  /* Preserve the addresses and aliases encountered so far.  */
++  for (size_t i = 0; result->h_addr_list[i] != NULL; ++i)
++    array_add (&addresses, result->h_addr_list[i]);
++  for (size_t i = 0; result->h_aliases[i] != NULL; ++i)
++    array_add (&aliases, result->h_aliases[i]);
++
++  /* The output buffer re-uses now-unused space at the end of the
++     buffer, starting with the aliases array.  It comes last in the
++     data produced by internal_getent.  (The alias names themselves
++     are still located in the line read in internal_getent, which is
++     stored at the beginning of the buffer.)  */
++  struct alloc_buffer outbuf;
++  {
++    char *bufferend = (char *) result->h_aliases;
++    outbuf = alloc_buffer_create (bufferend, buffer + buflen - bufferend);
++  }
+ 
+-  if (status == NSS_STATUS_SUCCESS)
++  while (true)
+     {
+-      /* XXX Is using _res to determine whether we want to convert IPv4
+-         addresses to IPv6 addresses really the right thing to do?  */
+-      int flags = (res_use_inet6 () ? AI_V4MAPPED : 0);
+-
+-      while ((status = internal_getent (stream, result, buffer, buflen, errnop,
+-					herrnop, af, flags))
+-	     == NSS_STATUS_SUCCESS)
++      status = internal_getent (stream, &tmp_result_buf, tmp_buffer.data,
++				tmp_buffer.length, errnop, herrnop, af,
++				flags);
++      /* Enlarge the buffer if necessary.  */
++      if (status == NSS_STATUS_TRYAGAIN && *herrnop == NETDB_INTERNAL
++	  && *errnop == ERANGE)
+ 	{
+-	  LOOKUP_NAME_CASE (h_name, h_aliases)
++	  if (!scratch_buffer_grow (&tmp_buffer))
++	    {
++	      *errnop = ENOMEM;
++	      /* *herrnop and status already have the right value.  */
++	      break;
++	    }
++	  /* Loop around and retry with a larger buffer.  */
+ 	}
+-
+-      if (status == NSS_STATUS_SUCCESS
+-	  && _res_hconf.flags & HCONF_FLAG_MULTI)
++      else if (status == NSS_STATUS_SUCCESS)
+ 	{
+-	  /* We have to get all host entries from the file.  */
+-	  size_t tmp_buflen = MIN (buflen, 4096);
+-	  char tmp_buffer_stack[tmp_buflen]
+-	    __attribute__ ((__aligned__ (__alignof__ (struct hostent_data))));
+-	  char *tmp_buffer = tmp_buffer_stack;
+-	  struct hostent tmp_result_buf;
+-	  int naddrs = 1;
+-	  int naliases = 0;
+-	  char *bufferend;
+-	  bool tmp_buffer_malloced = false;
+-
+-	  while (result->h_aliases[naliases] != NULL)
+-	    ++naliases;
+-
+-	  bufferend = (char *) &result->h_aliases[naliases + 1];
+-
+-	again:
+-	  while ((status = internal_getent (stream, &tmp_result_buf, tmp_buffer,
+-					    tmp_buflen, errnop, herrnop, af,
+-					    flags))
+-		 == NSS_STATUS_SUCCESS)
++	  /* A line was read.  Check that it matches the search
++	     criteria.  */
++
++	  int matches = 1;
++	  struct hostent *old_result = result;
++	  result = &tmp_result_buf;
++	  /* The following piece is a bit clumsy but we want to use
++	     the `LOOKUP_NAME_CASE' value.  The optimizer should do
++	     its job.  */
++	  do
+ 	    {
+-	      int matches = 1;
+-	      struct hostent *old_result = result;
+-	      result = &tmp_result_buf;
+-	      /* The following piece is a bit clumsy but we want to use the
+-		 `LOOKUP_NAME_CASE' value.  The optimizer should do its
+-		 job.  */
+-	      do
+-		{
+-		  LOOKUP_NAME_CASE (h_name, h_aliases)
+-		  result = old_result;
+-		}
+-	      while ((matches = 0));
++	      LOOKUP_NAME_CASE (h_name, h_aliases)
++		result = old_result;
++	    }
++	  while ((matches = 0));
+ 
+-	      if (matches)
++	  /* If the line matches, we need to copy the addresses and
++	     aliases, so that we can reuse tmp_buffer for the next
++	     line.  */
++	  if (matches)
++	    {
++	      /* Record the addresses.  */
++	      for (size_t i = 0; tmp_result_buf.h_addr_list[i] != NULL; ++i)
+ 		{
+-		  /* We could be very clever and try to recycle a few bytes
+-		     in the buffer instead of generating new arrays.  But
+-		     we are not doing this here since it's more work than
+-		     it's worth.  Simply let the user provide a bit bigger
+-		     buffer.  */
+-		  char **new_h_addr_list;
+-		  char **new_h_aliases;
+-		  int newaliases = 0;
+-		  size_t newstrlen = 0;
+-		  int cnt;
+-
+-		  /* Count the new aliases and the length of the strings.  */
+-		  while (tmp_result_buf.h_aliases[newaliases] != NULL)
++		  /* Allocate the target space in the output buffer,
++		     depending on the address family.  */
++		  void *target;
++		  if (af == AF_INET)
+ 		    {
+-		      char *cp = tmp_result_buf.h_aliases[newaliases];
+-		      ++newaliases;
+-		      newstrlen += strlen (cp) + 1;
++		      assert (tmp_result_buf.h_length == 4);
++		      target = alloc_buffer_alloc (&outbuf, struct in_addr);
+ 		    }
+-		  /* If the real name is different add it also to the
+-		     aliases.  This means that there is a duplication
+-		     in the alias list but this is really the user's
+-		     problem.  */
+-		  if (strcmp (old_result->h_name,
+-			      tmp_result_buf.h_name) != 0)
++		  else if (af == AF_INET6)
+ 		    {
+-		      ++newaliases;
+-		      newstrlen += strlen (tmp_result_buf.h_name) + 1;
++		      assert (tmp_result_buf.h_length == 16);
++		      target = alloc_buffer_alloc (&outbuf, struct in6_addr);
+ 		    }
++		  else
++		    __builtin_unreachable ();
+ 
+-		  /* Make sure bufferend is aligned.  */
+-		  assert ((bufferend - (char *) 0) % sizeof (char *) == 0);
+-
+-		  /* Now we can check whether the buffer is large enough.
+-		     16 is the maximal size of the IP address.  */
+-		  if (bufferend + 16 + (naddrs + 2) * sizeof (char *)
+-		      + roundup (newstrlen, sizeof (char *))
+-		      + (naliases + newaliases + 1) * sizeof (char *)
+-		      >= buffer + buflen)
++		  if (target == NULL)
+ 		    {
++		      /* Request a larger output buffer.  */
+ 		      *errnop = ERANGE;
+ 		      *herrnop = NETDB_INTERNAL;
+ 		      status = NSS_STATUS_TRYAGAIN;
+-		      goto out;
++		      break;
+ 		    }
++		  memcpy (target, tmp_result_buf.h_addr_list[i],
++			  tmp_result_buf.h_length);
++		  array_add (&addresses, target);
++		}
+ 
+-		  new_h_addr_list =
+-		    (char **) (bufferend
+-			       + roundup (newstrlen, sizeof (char *))
+-			       + 16);
+-		  new_h_aliases =
+-		    (char **) ((char *) new_h_addr_list
+-			       + (naddrs + 2) * sizeof (char *));
++	      /* Record the aliases.  */
++	      for (size_t i = 0; tmp_result_buf.h_aliases[i] != NULL; ++i)
++		{
++		  char *alias = tmp_result_buf.h_aliases[i];
++		  array_add (&aliases,
++			     alloc_buffer_copy_string (&outbuf, alias));
++		}
+ 
+-		  /* Copy the old data in the new arrays.  */
+-		  for (cnt = 0; cnt < naddrs; ++cnt)
+-		    new_h_addr_list[cnt] = old_result->h_addr_list[cnt];
++	      /* If the real name is different add, it also to the
++		 aliases.  This means that there is a duplication in
++		 the alias list but this is really the user's
++		 problem.  */
++	      {
++		char *new_name = tmp_result_buf.h_name;
++		if (strcmp (old_result->h_name, new_name) != 0)
++		  array_add (&aliases,
++			     alloc_buffer_copy_string (&outbuf, new_name));
++	      }
++
++	      /* Report memory allocation failures during the
++		 expansion of the temporary arrays.  */
++	      if (array_has_failed (&addresses) || array_has_failed (&aliases))
++		{
++		  *errnop = ENOMEM;
++		  *herrnop = NETDB_INTERNAL;
++		  status = NSS_STATUS_UNAVAIL;
++		  break;
++		}
+ 
+-		  for (cnt = 0; cnt < naliases; ++cnt)
+-		    new_h_aliases[cnt] = old_result->h_aliases[cnt];
++	      /* Request a larger output buffer if we ran out of room.  */
++	      if (alloc_buffer_has_failed (&outbuf))
++		{
++		  *errnop = ERANGE;
++		  *herrnop = NETDB_INTERNAL;
++		  status = NSS_STATUS_TRYAGAIN;
++		  break;
++		}
+ 
+-		  /* Store the new strings.  */
+-		  cnt = 0;
+-		  while (tmp_result_buf.h_aliases[cnt] != NULL)
+-		    {
+-		      new_h_aliases[naliases++] = bufferend;
+-		      bufferend = (__stpcpy (bufferend,
+-					     tmp_result_buf.h_aliases[cnt])
+-				   + 1);
+-		      ++cnt;
+-		    }
++	      result = old_result;
++	    } /* If match was found.  */
+ 
+-		  if (cnt < newaliases)
+-		    {
+-		      new_h_aliases[naliases++] = bufferend;
+-		      bufferend = __stpcpy (bufferend,
+-					    tmp_result_buf.h_name) + 1;
+-		    }
++	  /* If no match is found, loop around and fetch another
++	     line.  */
+ 
+-		  /* Final NULL pointer.  */
+-		  new_h_aliases[naliases] = NULL;
++	} /* status == NSS_STATUS_SUCCESS.  */
++      else
++	/* internal_getent returned an error.  */
++	break;
++    } /* while (true) */
+ 
+-		  /* Round up the buffer end address.  */
+-		  bufferend += (sizeof (char *)
+-				- ((bufferend - (char *) 0)
+-				   % sizeof (char *))) % sizeof (char *);
++  /* Propagate the NSS_STATUS_TRYAGAIN error to the caller.  It means
++     that we may not have loaded the complete result.
++     NSS_STATUS_NOTFOUND, however, means that we reached the end of
++     the file successfully.  */
++  if (status != NSS_STATUS_TRYAGAIN)
++    status = NSS_STATUS_SUCCESS;
+ 
+-		  /* Now the new address.  */
+-		  new_h_addr_list[naddrs++] =
+-		    memcpy (bufferend, tmp_result_buf.h_addr,
+-			    tmp_result_buf.h_length);
++  if (status == NSS_STATUS_SUCCESS)
++    {
++      /* Copy the address and alias arrays into the output buffer and
++	 add NULL terminators.  The pointed-to elements were directly
++	 written into the output buffer above and do not need to be
++	 copied again.  */
++      size_t addresses_count = array_size (&addresses);
++      size_t aliases_count = array_size (&aliases);
++      char **out_addresses = alloc_buffer_alloc_array
++	(&outbuf, char *, addresses_count + 1);
++      char **out_aliases = alloc_buffer_alloc_array
++	(&outbuf, char *, aliases_count + 1);
++      if (out_addresses == NULL || out_aliases == NULL)
++	{
++	  /* The output buffer is not large enough.  */
++	  *errnop = ERANGE;
++	  *herrnop = NETDB_INTERNAL;
++	  status = NSS_STATUS_TRYAGAIN;
++	  /* Fall through to function exit.  */
++	}
++      else
++	{
++	  /* Everything is allocated in place.  Make the copies and
++	     adjust the array pointers.  */
++	  memcpy (out_addresses, array_begin (&addresses),
++		  addresses_count * sizeof (char *));
++	  out_addresses[addresses_count] = NULL;
++	  memcpy (out_aliases, array_begin (&aliases),
++		  aliases_count * sizeof (char *));
++	  out_aliases[aliases_count] = NULL;
++
++	  result->h_addr_list = out_addresses;
++	  result->h_aliases = out_aliases;
+ 
+-		  /* Also here a final NULL pointer.  */
+-		  new_h_addr_list[naddrs] = NULL;
++	  status = NSS_STATUS_SUCCESS;
++	}
++    }
+ 
+-		  /* Store the new array pointers.  */
+-		  old_result->h_aliases = new_h_aliases;
+-		  old_result->h_addr_list = new_h_addr_list;
++  scratch_buffer_free (&tmp_buffer);
++  array_free (&addresses);
++  array_free (&aliases);
++  return status;
++}
+ 
+-		  /* Compute the new buffer end.  */
+-		  bufferend = (char *) &new_h_aliases[naliases + 1];
+-		  assert (bufferend <= buffer + buflen);
++enum nss_status
++_nss_files_gethostbyname3_r (const char *name, int af, struct hostent *result,
++			     char *buffer, size_t buflen, int *errnop,
++			     int *herrnop, int32_t *ttlp, char **canonp)
++{
++  FILE *stream = NULL;
++  uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct hostent_data);
++  buffer += pad;
++  buflen = buflen > pad ? buflen - pad : 0;
+ 
+-		  result = old_result;
+-		}
+-	    }
++  /* Open file.  */
++  enum nss_status status = internal_setent (&stream);
+ 
+-	  if (status == NSS_STATUS_TRYAGAIN)
+-	    {
+-	      size_t newsize = 2 * tmp_buflen;
+-	      if (tmp_buffer_malloced)
+-		{
+-		  char *newp = realloc (tmp_buffer, newsize);
+-		  if (newp != NULL)
+-		    {
+-		      assert ((((uintptr_t) newp)
+-			       & (__alignof__ (struct hostent_data) - 1))
+-			      == 0);
+-		      tmp_buffer = newp;
+-		      tmp_buflen = newsize;
+-		      goto again;
+-		    }
+-		}
+-	      else if (!__libc_use_alloca (buflen + newsize))
+-		{
+-		  tmp_buffer = malloc (newsize);
+-		  if (tmp_buffer != NULL)
+-		    {
+-		      assert ((((uintptr_t) tmp_buffer)
+-			       & (__alignof__ (struct hostent_data) - 1))
+-			      == 0);
+-		      tmp_buffer_malloced = true;
+-		      tmp_buflen = newsize;
+-		      goto again;
+-		    }
+-		}
+-	      else
+-		{
+-		  tmp_buffer
+-		    = extend_alloca (tmp_buffer, tmp_buflen,
+-				     newsize
+-				     + __alignof__ (struct hostent_data));
+-		  tmp_buffer = (char *) (((uintptr_t) tmp_buffer
+-					  + __alignof__ (struct hostent_data)
+-					  - 1)
+-					 & ~(__alignof__ (struct hostent_data)
+-					     - 1));
+-		  goto again;
+-		}
+-	    }
+-	  else
+-	    status = NSS_STATUS_SUCCESS;
+-	out:
+-	  if (tmp_buffer_malloced)
+-	    free (tmp_buffer);
++  if (status == NSS_STATUS_SUCCESS)
++    {
++      /* XXX Is using _res to determine whether we want to convert IPv4
++         addresses to IPv6 addresses really the right thing to do?  */
++      int flags = (res_use_inet6 () ? AI_V4MAPPED : 0);
++
++      while ((status = internal_getent (stream, result, buffer, buflen, errnop,
++					herrnop, af, flags))
++	     == NSS_STATUS_SUCCESS)
++	{
++	  LOOKUP_NAME_CASE (h_name, h_aliases)
+ 	}
+ 
++      if (status == NSS_STATUS_SUCCESS
++	  && _res_hconf.flags & HCONF_FLAG_MULTI)
++	status = gethostbyname3_multi
++	  (stream, name, af, result, buffer, buflen, errnop, herrnop, flags);
++
+       internal_endent (&stream);
+     }
+ 
+diff --git a/nss/tst-nss-files-hosts-erange.c b/nss/tst-nss-files-hosts-erange.c
+new file mode 100644
+index 0000000000..beb7aa9fa0
+--- /dev/null
++++ b/nss/tst-nss-files-hosts-erange.c
+@@ -0,0 +1,109 @@
++/* Parse /etc/hosts in multi mode with a trailing long line (bug 21915).
++   Copyright (C) 2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++
++#include <dlfcn.h>
++#include <errno.h>
++#include <gnu/lib-names.h>
++#include <netdb.h>
++#include <nss.h>
++#include <support/check.h>
++#include <support/check_nss.h>
++#include <support/namespace.h>
++#include <support/test-driver.h>
++#include <support/xunistd.h>
++
++struct support_chroot *chroot_env;
++
++#define X10 "XXXXXXXXXX"
++#define X100 X10 X10 X10 X10 X10 X10 X10 X10 X10 X10
++#define X1000 X100 X100 X100 X100 X100 X100 X100 X100 X100 X100
++
++static void
++prepare (int argc, char **argv)
++{
++  chroot_env = support_chroot_create
++    ((struct support_chroot_configuration)
++     {
++       .resolv_conf = "",
++       .hosts =
++         "127.0.0.1   localhost localhost.localdomain\n"
++         "::1         localhost localhost.localdomain\n"
++         "192.0.2.1   example.com\n"
++         "#" X1000 X100 "\n",
++       .host_conf = "multi on\n",
++     });
++}
++
++static int
++do_test (void)
++{
++  support_become_root ();
++  if (!support_can_chroot ())
++    return EXIT_UNSUPPORTED;
++
++  __nss_configure_lookup ("hosts", "files");
++  if (dlopen (LIBNSS_FILES_SO, RTLD_LAZY) == NULL)
++    FAIL_EXIT1 ("could not load " LIBNSS_DNS_SO ": %s", dlerror ());
++
++  xchroot (chroot_env->path_chroot);
++
++  errno = ERANGE;
++  h_errno = NETDB_INTERNAL;
++  check_hostent ("gethostbyname example.com",
++                 gethostbyname ("example.com"),
++                 "name: example.com\n"
++                 "address: 192.0.2.1\n");
++  errno = ERANGE;
++  h_errno = NETDB_INTERNAL;
++  check_hostent ("gethostbyname2 AF_INET example.com",
++                 gethostbyname2 ("example.com", AF_INET),
++                 "name: example.com\n"
++                 "address: 192.0.2.1\n");
++  {
++    struct addrinfo hints =
++      {
++        .ai_family = AF_UNSPEC,
++        .ai_socktype = SOCK_STREAM,
++        .ai_protocol = IPPROTO_TCP,
++      };
++    errno = ERANGE;
++    h_errno = NETDB_INTERNAL;
++    struct addrinfo *ai;
++    int ret = getaddrinfo ("example.com", "80", &hints, &ai);
++    check_addrinfo ("example.com AF_UNSPEC", ai, ret,
++                    "address: STREAM/TCP 192.0.2.1 80\n");
++    if (ret == 0)
++      freeaddrinfo (ai);
++
++    hints.ai_family = AF_INET;
++    errno = ERANGE;
++    h_errno = NETDB_INTERNAL;
++    ret = getaddrinfo ("example.com", "80", &hints, &ai);
++    check_addrinfo ("example.com AF_INET", ai, ret,
++                    "address: STREAM/TCP 192.0.2.1 80\n");
++    if (ret == 0)
++      freeaddrinfo (ai);
++  }
++
++  support_chroot_free (chroot_env);
++  return 0;
++}
++
++#define PREPARE prepare
++#include <support/test-driver.c>
+diff --git a/nss/tst-nss-files-hosts-multi.c b/nss/tst-nss-files-hosts-multi.c
+new file mode 100644
+index 0000000000..195a19be4f
+--- /dev/null
++++ b/nss/tst-nss-files-hosts-multi.c
+@@ -0,0 +1,331 @@
++/* Parse /etc/hosts in multi mode with many addresses/aliases.
++   Copyright (C) 2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <dlfcn.h>
++#include <errno.h>
++#include <gnu/lib-names.h>
++#include <netdb.h>
++#include <nss.h>
++#include <stdbool.h>
++#include <stdlib.h>
++#include <string.h>
++#include <support/check.h>
++#include <support/check_nss.h>
++#include <support/namespace.h>
++#include <support/support.h>
++#include <support/test-driver.h>
++#include <support/test-driver.h>
++#include <support/xmemstream.h>
++#include <support/xstdio.h>
++#include <support/xunistd.h>
++#include <sys/resource.h>
++
++struct support_chroot *chroot_env;
++
++static void
++prepare (int argc, char **argv)
++{
++  chroot_env = support_chroot_create
++    ((struct support_chroot_configuration)
++     {
++       .resolv_conf = "",
++       .hosts = "",             /* See write_hosts below.  */
++       .host_conf = "multi on\n",
++     });
++}
++
++/* Create the /etc/hosts file from outside the chroot.  */
++static void
++write_hosts (int count)
++{
++  TEST_VERIFY (count > 0 && count <= 65535);
++  FILE *fp = xfopen (chroot_env->path_hosts, "w");
++  fputs ("127.0.0.1   localhost localhost.localdomain\n"
++         "::1         localhost localhost.localdomain\n",
++         fp);
++  for (int i = 0; i < count; ++i)
++    {
++      fprintf (fp, "10.4.%d.%d www4.example.com\n",
++               (i / 256) & 0xff, i & 0xff);
++      fprintf (fp, "10.46.%d.%d www.example.com\n",
++               (i / 256) & 0xff, i & 0xff);
++      fprintf (fp, "192.0.2.1 alias.example.com v4-%d.example.com\n", i);
++      fprintf (fp, "2001:db8::6:%x www6.example.com\n", i);
++      fprintf (fp, "2001:db8::46:%x www.example.com\n", i);
++      fprintf (fp, "2001:db8::1 alias.example.com v6-%d.example.com\n", i);
++    }
++  xfclose (fp);
++}
++
++/* Parameters of a single test.  */
++struct test_params
++{
++  const char *name;             /* Name to query.  */
++  const char *marker;           /* Address marker for the name.  */
++  int count;                    /* Number of addresses/aliases.  */
++  int family;                   /* AF_INET, AF_INET_6 or AF_UNSPEC.  */
++  bool canonname;               /* True if AI_CANONNAME should be enabled.  */
++};
++
++/* Expected result of gethostbyname/gethostbyname2.  */
++static char *
++expected_ghbn (const struct test_params *params)
++{
++  TEST_VERIFY (params->family == AF_INET || params->family == AF_INET6);
++
++  struct xmemstream expected;
++  xopen_memstream (&expected);
++  if (strcmp (params->name, "alias.example.com") == 0)
++    {
++      fprintf (expected.out, "name: %s\n", params->name);
++      char af;
++      if (params->family == AF_INET)
++        af = '4';
++      else
++        af = '6';
++      for (int i = 0; i < params->count; ++i)
++        fprintf (expected.out, "alias: v%c-%d.example.com\n", af, i);
++
++      for (int i = 0; i < params->count; ++i)
++        if (params->family == AF_INET)
++          fputs ("address: 192.0.2.1\n", expected.out);
++        else
++          fputs ("address: 2001:db8::1\n", expected.out);
++    }
++  else /* www/www4/www6 name.  */
++    {
++      bool do_ipv4 = params->family == AF_INET
++        && strncmp (params->name, "www6", 4) != 0;
++      bool do_ipv6 = params->family == AF_INET6
++        && strncmp (params->name, "www4", 4) != 0;
++      if (do_ipv4 || do_ipv6)
++        {
++          fprintf (expected.out, "name: %s\n", params->name);
++          if (do_ipv4)
++            for (int i = 0; i < params->count; ++i)
++              fprintf (expected.out, "address: 10.%s.%d.%d\n",
++                       params->marker, i / 256, i % 256);
++          if (do_ipv6)
++            for (int i = 0; i < params->count; ++i)
++              fprintf (expected.out, "address: 2001:db8::%s:%x\n",
++                       params->marker, i);
++        }
++      else
++        fputs ("error: HOST_NOT_FOUND\n", expected.out);
++    }
++  xfclose_memstream (&expected);
++  return expected.buffer;
++}
++
++/* Expected result of getaddrinfo.  */
++static char *
++expected_gai (const struct test_params *params)
++{
++  bool do_ipv4 = false;
++  bool do_ipv6 = false;
++  if (params->family == AF_UNSPEC)
++    do_ipv4 = do_ipv6 = true;
++  else if (params->family == AF_INET)
++    do_ipv4 = true;
++  else if (params->family == AF_INET6)
++    do_ipv6 = true;
++
++  struct xmemstream expected;
++  xopen_memstream (&expected);
++  if (strcmp (params->name, "alias.example.com") == 0)
++    {
++      if (params->canonname)
++        fprintf (expected.out,
++                 "flags: AI_CANONNAME\n"
++                 "canonname: %s\n",
++                 params->name);
++
++      if (do_ipv4)
++        for (int i = 0; i < params->count; ++i)
++          fputs ("address: STREAM/TCP 192.0.2.1 80\n", expected.out);
++      if (do_ipv6)
++        for (int i = 0; i < params->count; ++i)
++          fputs ("address: STREAM/TCP 2001:db8::1 80\n", expected.out);
++    }
++  else /* www/www4/www6 name.  */
++    {
++      if (strncmp (params->name, "www4", 4) == 0)
++        do_ipv6 = false;
++      else if (strncmp (params->name, "www6", 4) == 0)
++        do_ipv4 = false;
++      /* Otherwise, we have www as the name, so we do both.  */
++
++      if (do_ipv4 || do_ipv6)
++        {
++          if (params->canonname)
++            fprintf (expected.out,
++                     "flags: AI_CANONNAME\n"
++                     "canonname: %s\n",
++                     params->name);
++
++          if (do_ipv4)
++            for (int i = 0; i < params->count; ++i)
++              fprintf (expected.out, "address: STREAM/TCP 10.%s.%d.%d 80\n",
++                       params->marker, i / 256, i % 256);
++          if (do_ipv6)
++            for (int i = 0; i < params->count; ++i)
++              fprintf (expected.out,
++                       "address: STREAM/TCP 2001:db8::%s:%x 80\n",
++                       params->marker, i);
++        }
++      else
++        fputs ("error: Name or service not known\n", expected.out);
++    }
++  xfclose_memstream (&expected);
++  return expected.buffer;
++}
++
++static void
++run_gbhn_gai (struct test_params *params)
++{
++  char *ctx = xasprintf ("name=%s marker=%s count=%d family=%d",
++                         params->name, params->marker, params->count,
++                         params->family);
++  if (test_verbose > 0)
++    printf ("info: %s\n", ctx);
++
++  /* Check gethostbyname, gethostbyname2.  */
++  if (params->family == AF_INET)
++    {
++      char *expected = expected_ghbn (params);
++      check_hostent (ctx, gethostbyname (params->name), expected);
++      free (expected);
++    }
++  if (params->family != AF_UNSPEC)
++    {
++      char *expected = expected_ghbn (params);
++      check_hostent (ctx, gethostbyname2 (params->name, params->family),
++                     expected);
++      free (expected);
++    }
++
++  /* Check getaddrinfo.  */
++  for (int do_canonical = 0; do_canonical < 2; ++do_canonical)
++    {
++      params->canonname = do_canonical;
++      char *expected = expected_gai (params);
++      struct addrinfo hints =
++        {
++          .ai_family = params->family,
++          .ai_socktype = SOCK_STREAM,
++          .ai_protocol = IPPROTO_TCP,
++        };
++      if (do_canonical)
++        hints.ai_flags |= AI_CANONNAME;
++      struct addrinfo *ai;
++      int ret = getaddrinfo (params->name, "80", &hints, &ai);
++      check_addrinfo (ctx, ai, ret, expected);
++      if (ret == 0)
++        freeaddrinfo (ai);
++      free (expected);
++    }
++
++  free (ctx);
++}
++
++/* Callback for the subprocess which runs the test in a chroot.  */
++static void
++subprocess (void *closure)
++{
++  struct test_params *params = closure;
++
++  xchroot (chroot_env->path_chroot);
++
++  static const int families[] = { AF_INET, AF_INET6, AF_UNSPEC, -1 };
++  static const char *const names[] =
++    {
++      "www.example.com", "www4.example.com", "www6.example.com",
++      "alias.example.com",
++      NULL
++    };
++  static const char *const names_marker[] = { "46", "4", "6", "" };
++
++  for (int family_idx = 0; families[family_idx] >= 0; ++family_idx)
++    {
++      params->family = families[family_idx];
++      for (int names_idx = 0; names[names_idx] != NULL; ++names_idx)
++        {
++          params->name = names[names_idx];
++          params->marker = names_marker[names_idx];
++          run_gbhn_gai (params);
++        }
++    }
++}
++
++/* Run the test for a specific number of addresses/aliases.  */
++static void
++run_test (int count)
++{
++  write_hosts (count);
++
++  struct test_params params =
++    {
++      .count = count,
++    };
++
++  support_isolate_in_subprocess (subprocess, &params);
++}
++
++static int
++do_test (void)
++{
++  support_become_root ();
++  if (!support_can_chroot ())
++    return EXIT_UNSUPPORTED;
++
++  /* This test should not use gigabytes of memory.   */
++  {
++    struct rlimit limit;
++    if (getrlimit (RLIMIT_AS, &limit) != 0)
++      {
++        printf ("getrlimit (RLIMIT_AS) failed: %m\n");
++        return 1;
++      }
++    long target = 200 * 1024 * 1024;
++    if (limit.rlim_cur == RLIM_INFINITY || limit.rlim_cur > target)
++      {
++        limit.rlim_cur = target;
++        if (setrlimit (RLIMIT_AS, &limit) != 0)
++          {
++            printf ("setrlimit (RLIMIT_AS) failed: %m\n");
++            return 1;
++          }
++      }
++  }
++
++  __nss_configure_lookup ("hosts", "files");
++  if (dlopen (LIBNSS_FILES_SO, RTLD_LAZY) == NULL)
++    FAIL_EXIT1 ("could not load " LIBNSS_DNS_SO ": %s", dlerror ());
++
++  /* Run the tests with a few different address/alias counts.  */
++  for (int count = 1; count <= 111; ++count)
++    run_test (count);
++  run_test (1111);
++  run_test (22222);
++
++  support_chroot_free (chroot_env);
++  return 0;
++}
++
++#define PREPARE prepare
++#include <support/test-driver.c>
+diff --git a/po/fr.po b/po/fr.po
+index 5a79695125..6764655d25 100644
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -5920,7 +5920,7 @@ msgstr "Le fichier existe"
+ #. TRANS also when you rename a file with @code{rename} (@pxref{Renaming Files}).
+ #: sysdeps/gnu/errlist.c:211
+ msgid "Invalid cross-device link"
+-msgstr "Lien crois?? de p??riph??que invalide"
++msgstr "Lien physique inter-p??riph??rique invalide"
+ 
+ #. TRANS The wrong type of device was given to a function that expects a
+ #. TRANS particular sort of device.
+diff --git a/po/sv.po b/po/sv.po
+index 0ebfec5b7f..d10bfad482 100644
+--- a/po/sv.po
++++ b/po/sv.po
+@@ -5,12 +5,12 @@
+ # Jan Dj??rv <jan.h.d at swipnet.se>, 1996, 1998, 2001, 2002, 2003, 2006, 2007, 2008, 2009, 2011, 2012, 2013, 2014, 2015.
+ # G??ran Uddeborg <goeran at uddeborg.se>, 2016, 2017.
+ #
+-# $Revision: 1.7 $
++# $Revision: 1.10 $
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: libc 2.25-pre1\n"
+-"POT-Creation-Date: 2017-01-11 17:27+0530\n"
+-"PO-Revision-Date: 2017-05-30 12:14+0200\n"
++"Project-Id-Version: libc 2.25.90\n"
++"POT-Creation-Date: 2017-07-25 12:32+0530\n"
++"PO-Revision-Date: 2017-08-20 18:21+0200\n"
+ "Last-Translator: G??ran Uddeborg <goeran at uddeborg.se>\n"
+ "Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
+ "Language: sv\n"
+@@ -478,19 +478,19 @@ msgstr "FEL I DYNAMISK L??NKARE!!!"
+ msgid "error while loading shared libraries"
+ msgstr "fel n??r delade bibliotek laddades"
+ 
+-#: elf/dl-fptr.c:88 sysdeps/hppa/dl-fptr.c:94
++#: elf/dl-fptr.c:88 sysdeps/hppa/dl-fptr.c:95
+ msgid "cannot map pages for fdesc table"
+ msgstr "kan inte minnesmappa sidor f??r fdesc-tabell"
+ 
+-#: elf/dl-fptr.c:192 sysdeps/hppa/dl-fptr.c:207
++#: elf/dl-fptr.c:192 sysdeps/hppa/dl-fptr.c:213
+ msgid "cannot map pages for fptr table"
+ msgstr "kan inte minnesmappa sidor f??r fptr-tabell"
+ 
+-#: elf/dl-fptr.c:221 sysdeps/hppa/dl-fptr.c:236
++#: elf/dl-fptr.c:221 sysdeps/hppa/dl-fptr.c:242
+ msgid "internal error: symidx out of range of fptr table"
+ msgstr "internt fel: symidx ??r utanf??r intervallet f??r fptr-tabellen"
+ 
+-#: elf/dl-hwcaps.c:184 elf/dl-hwcaps.c:196
++#: elf/dl-hwcaps.c:191 elf/dl-hwcaps.c:203
+ msgid "cannot create capability list"
+ msgstr "kan inte skapa egenskapslista"
+ 
+@@ -670,20 +670,20 @@ msgstr "ogiltig m??lnamnrymd f??r dlmopen()"
+ msgid "cannot allocate memory in static TLS block"
+ msgstr "kan inte allokera minne i statiskt TLS-block"
+ 
+-#: elf/dl-reloc.c:212
++#: elf/dl-reloc.c:206
+ msgid "cannot make segment writable for relocation"
+ msgstr "kan inte g??ra segment skrivbart f??r relokering"
+ 
+-#: elf/dl-reloc.c:283
++#: elf/dl-reloc.c:277
+ #, c-format
+ msgid "%s: out of memory to store relocation results for %s\n"
+ msgstr "%s: slut p?? minne f??r att lagra relokeringsresultat f??r %s\n"
+ 
+-#: elf/dl-reloc.c:299
++#: elf/dl-reloc.c:293
+ msgid "cannot restore segment prot after reloc"
+ msgstr "kan inte ??terst??lla segmentr??ttigheter efter relokering"
+ 
+-#: elf/dl-reloc.c:330
++#: elf/dl-reloc.c:324
+ msgid "cannot apply additional memory protection after relocation"
+ msgstr "kan inte applicera extra minnesskydd efter relokering"
+ 
+@@ -959,14 +959,14 @@ msgstr "F??rs??k med \"ldd --help\" f??r mer information."
+ msgid "missing file arguments"
+ msgstr "filargument saknas"
+ 
+-#. TRANS No such file or directory.  This is a ``file doesn't exist'' error
++#. TRANS This is a ``file doesn't exist'' error
+ #. TRANS for ordinary files that are referenced in contexts where they are
+ #. TRANS expected to already exist.
+ #: elf/ldd.bash.in:147 sysdeps/gnu/errlist.c:37
+ msgid "No such file or directory"
+ msgstr "Filen eller katalogen finns inte"
+ 
+-#: elf/ldd.bash.in:150 inet/rcmd.c:475
++#: elf/ldd.bash.in:150 inet/rcmd.c:480
+ msgid "not regular file"
+ msgstr "inte en normal fil"
+ 
+@@ -1540,68 +1540,68 @@ msgstr "vid ins??ttning i s??ktr??d"
+ msgid "cannot generate output file"
+ msgstr "kan inte generera utfil"
+ 
+-#: inet/rcmd.c:155
++#: inet/rcmd.c:157
+ msgid "rcmd: Cannot allocate memory\n"
+ msgstr "rcmd: Kan inte allokera minne\n"
+ 
+-#: inet/rcmd.c:170
++#: inet/rcmd.c:174
+ msgid "rcmd: socket: All ports in use\n"
+ msgstr "rcmd: uttag (socket): Alla portar anv??nds\n"
+ 
+-#: inet/rcmd.c:198
++#: inet/rcmd.c:202
+ #, c-format
+ msgid "connect to address %s: "
+ msgstr "anslut till adress %s: "
+ 
+-#: inet/rcmd.c:211
++#: inet/rcmd.c:215
+ #, c-format
+ msgid "Trying %s...\n"
+ msgstr "Provar %s...\n"
+ 
+-#: inet/rcmd.c:247
++#: inet/rcmd.c:251
+ #, c-format
+ msgid "rcmd: write (setting up stderr): %m\n"
+ msgstr "rcmd: write: (s??tter upp standard fel): %m\n"
+ 
+-#: inet/rcmd.c:263
++#: inet/rcmd.c:267
+ #, c-format
+ msgid "rcmd: poll (setting up stderr): %m\n"
+ msgstr "rcmd: poll (s??tter upp standard fel): %m\n"
+ 
+-#: inet/rcmd.c:266
++#: inet/rcmd.c:270
+ msgid "poll: protocol failure in circuit setup\n"
+ msgstr "poll: protokollfel i f??rbindelseupps??ttning\n"
+ 
+-#: inet/rcmd.c:298
++#: inet/rcmd.c:302
+ msgid "socket: protocol failure in circuit setup\n"
+ msgstr "uttag (socket): protokollfel i f??rbindelseupps??ttning\n"
+ 
+-#: inet/rcmd.c:322
++#: inet/rcmd.c:326
+ #, c-format
+ msgid "rcmd: %s: short read"
+ msgstr "rcmd: %s: l??sning gav f??r lite data"
+ 
+-#: inet/rcmd.c:473
++#: inet/rcmd.c:478
+ msgid "lstat failed"
+ msgstr "misslyckades ta status (lstat)"
+ 
+-#: inet/rcmd.c:480
++#: inet/rcmd.c:485
+ msgid "cannot open"
+ msgstr "kan inte ??ppna"
+ 
+-#: inet/rcmd.c:482
++#: inet/rcmd.c:487
+ msgid "fstat failed"
+ msgstr "misslyckades ta status (fstat)"
+ 
+-#: inet/rcmd.c:484
++#: inet/rcmd.c:489
+ msgid "bad owner"
+ msgstr "felaktig ??gare"
+ 
+-#: inet/rcmd.c:486
++#: inet/rcmd.c:491
+ msgid "writeable by other than owner"
+ msgstr "skrivbar f??r andra ??n ??garen"
+ 
+-#: inet/rcmd.c:488
++#: inet/rcmd.c:493
+ msgid "hard linked somewhere"
+ msgstr "h??rdl??nkad n??gonstans"
+ 
+@@ -3143,7 +3143,7 @@ msgstr "Ok??nt systemfel"
+ msgid "unable to free arguments"
+ msgstr "kan inte avallokera argument"
+ 
+-#: nis/nis_error.h:1 nis/ypclnt.c:817 nis/ypclnt.c:905 posix/regcomp.c:137
++#: nis/nis_error.h:1 nis/ypclnt.c:824 nis/ypclnt.c:913 posix/regcomp.c:137
+ #: sysdeps/gnu/errlist.c:21
+ msgid "Success"
+ msgstr "Lyckat"
+@@ -3184,8 +3184,8 @@ msgstr "Generiskt systemfel"
+ msgid "First/next chain broken"
+ msgstr "F??rsta/N??sta-kedja bruten"
+ 
+-#. TRANS Permission denied; the file permissions do not allow the attempted operation.
+-#: nis/nis_error.h:11 nis/ypclnt.c:862 sysdeps/gnu/errlist.c:158
++#. TRANS The file permissions do not allow the attempted operation.
++#: nis/nis_error.h:11 nis/ypclnt.c:869 sysdeps/gnu/errlist.c:158
+ msgid "Permission denied"
+ msgstr "??tkomst nekas"
+ 
+@@ -3337,128 +3337,128 @@ msgstr "Kan inte skapa process hos server"
+ msgid "Master server busy, full dump rescheduled."
+ msgstr "Huvudserver ??r upptagen, full dump ??ter schemalagd."
+ 
+-#: nis/nis_local_names.c:121
++#: nis/nis_local_names.c:122
+ #, c-format
+ msgid "LOCAL entry for UID %d in directory %s not unique\n"
+ msgstr "LOCAL-post f??r UID %d i katalog %s ??r inte unik\n"
+ 
+-#: nis/nis_print.c:51
++#: nis/nis_print.c:52
+ msgid "UNKNOWN"
+ msgstr "OK??ND"
+ 
+-#: nis/nis_print.c:109
++#: nis/nis_print.c:110
+ msgid "BOGUS OBJECT\n"
+ msgstr "SKENOBJEKT\n"
+ 
+-#: nis/nis_print.c:112
++#: nis/nis_print.c:113
+ msgid "NO OBJECT\n"
+ msgstr "INGET OBJEKT\n"
+ 
+-#: nis/nis_print.c:115
++#: nis/nis_print.c:116
+ msgid "DIRECTORY\n"
+ msgstr "KATALOG\n"
+ 
+-#: nis/nis_print.c:118
++#: nis/nis_print.c:119
+ msgid "GROUP\n"
+ msgstr "GRUPP\n"
+ 
+-#: nis/nis_print.c:121
++#: nis/nis_print.c:122
+ msgid "TABLE\n"
+ msgstr "TABELL\n"
+ 
+-#: nis/nis_print.c:124
++#: nis/nis_print.c:125
+ msgid "ENTRY\n"
+ msgstr "POST\n"
+ 
+-#: nis/nis_print.c:127
++#: nis/nis_print.c:128
+ msgid "LINK\n"
+ msgstr "L??NK\n"
+ 
+-#: nis/nis_print.c:130
++#: nis/nis_print.c:131
+ msgid "PRIVATE\n"
+ msgstr "PRIVAT\n"
+ 
+-#: nis/nis_print.c:133
++#: nis/nis_print.c:134
+ msgid "(Unknown object)\n"
+ msgstr "(Ok??nt objekt)\n"
+ 
+-#: nis/nis_print.c:167
++#: nis/nis_print.c:168
+ #, c-format
+ msgid "Name : `%s'\n"
+ msgstr "Namn: \"%s\"\n"
+ 
+-#: nis/nis_print.c:168
++#: nis/nis_print.c:169
+ #, c-format
+ msgid "Type : %s\n"
+ msgstr "Typ: %s\n"
+ 
+-#: nis/nis_print.c:173
++#: nis/nis_print.c:174
+ msgid "Master Server :\n"
+ msgstr "Huvudserver:\n"
+ 
+-#: nis/nis_print.c:175
++#: nis/nis_print.c:176
+ msgid "Replicate :\n"
+ msgstr "Replikera:\n"
+ 
+-#: nis/nis_print.c:176
++#: nis/nis_print.c:177
+ #, c-format
+ msgid "\tName       : %s\n"
+ msgstr "\tNamn       : %s\n"
+ 
+-#: nis/nis_print.c:177
++#: nis/nis_print.c:178
+ msgid "\tPublic Key : "
+ msgstr "\tPublik nyckel: "
+ 
+-#: nis/nis_print.c:181
++#: nis/nis_print.c:182
+ msgid "None.\n"
+ msgstr "Ingen.\n"
+ 
+-#: nis/nis_print.c:184
++#: nis/nis_print.c:185
+ #, c-format
+ msgid "Diffie-Hellmann (%d bits)\n"
+ msgstr "Diffie-Hellmann (%d bitar)\n"
+ 
+-#: nis/nis_print.c:189
++#: nis/nis_print.c:190
+ #, c-format
+ msgid "RSA (%d bits)\n"
+ msgstr "RSA (%d bitar)\n"
+ 
+-#: nis/nis_print.c:192
++#: nis/nis_print.c:193
+ msgid "Kerberos.\n"
+ msgstr "Kerberos.\n"
+ 
+-#: nis/nis_print.c:195
++#: nis/nis_print.c:196
+ #, c-format
+ msgid "Unknown (type = %d, bits = %d)\n"
+ msgstr "Ok??nd (typ = %d, bitar = %d)\n"
+ 
+-#: nis/nis_print.c:206
++#: nis/nis_print.c:207
+ #, c-format
+ msgid "\tUniversal addresses (%u)\n"
+ msgstr "\tUniversella adresser (%u)\n"
+ 
+-#: nis/nis_print.c:228
++#: nis/nis_print.c:229
+ msgid "Time to live : "
+ msgstr "Livsl??ngd: "
+ 
+-#: nis/nis_print.c:230
++#: nis/nis_print.c:231
+ msgid "Default Access rights :\n"
+ msgstr "Standard ??tkomstr??ttigheter:\n"
+ 
+-#: nis/nis_print.c:239
++#: nis/nis_print.c:240
+ #, c-format
+ msgid "\tType         : %s\n"
+ msgstr "\tTyp          : %s\n"
+ 
+-#: nis/nis_print.c:240
++#: nis/nis_print.c:241
+ msgid "\tAccess rights: "
+ msgstr "\tR??ttigheter  : "
+ 
+-#: nis/nis_print.c:254
++#: nis/nis_print.c:255
+ msgid "Group Flags :"
+ msgstr "Gruppflaggor: "
+ 
+-#: nis/nis_print.c:257
++#: nis/nis_print.c:258
+ msgid ""
+ "\n"
+ "Group Members :\n"
+@@ -3466,95 +3466,95 @@ msgstr ""
+ "\n"
+ "Gruppmedlemmar:\n"
+ 
+-#: nis/nis_print.c:269
++#: nis/nis_print.c:270
+ #, c-format
+ msgid "Table Type          : %s\n"
+ msgstr "Tabelltyp           : %s\n"
+ 
+-#: nis/nis_print.c:270
++#: nis/nis_print.c:271
+ #, c-format
+ msgid "Number of Columns   : %d\n"
+ msgstr "Antal kolumner      : %d\n"
+ 
+-#: nis/nis_print.c:271
++#: nis/nis_print.c:272
+ #, c-format
+ msgid "Character Separator : %c\n"
+ msgstr "Teckenseparator     : %c\n"
+ 
+-#: nis/nis_print.c:272
++#: nis/nis_print.c:273
+ #, c-format
+ msgid "Search Path         : %s\n"
+ msgstr "S??kv??g              : %s\n"
+ 
+-#: nis/nis_print.c:273
++#: nis/nis_print.c:274
+ msgid "Columns             :\n"
+ msgstr "Kolumner            :\n"
+ 
+-#: nis/nis_print.c:276
++#: nis/nis_print.c:277
+ #, c-format
+ msgid "\t[%d]\tName          : %s\n"
+ msgstr "\t[%d]\tNamn          : %s\n"
+ 
+-#: nis/nis_print.c:278
++#: nis/nis_print.c:279
+ msgid "\t\tAttributes    : "
+ msgstr "\t\tAttribut      : "
+ 
+-#: nis/nis_print.c:280
++#: nis/nis_print.c:281
+ msgid "\t\tAccess Rights : "
+ msgstr "\t\tR??ttigheter   : "
+ 
+-#: nis/nis_print.c:290
++#: nis/nis_print.c:291
+ msgid "Linked Object Type : "
+ msgstr "L??nkad objekttyp   : "
+ 
+-#: nis/nis_print.c:292
++#: nis/nis_print.c:293
+ #, c-format
+ msgid "Linked to : %s\n"
+ msgstr "L??nkad till: %s\n"
+ 
+-#: nis/nis_print.c:302
++#: nis/nis_print.c:303
+ #, c-format
+ msgid "\tEntry data of type %s\n"
+ msgstr "\tPostdata av typ %s\n"
+ 
+-#: nis/nis_print.c:305
++#: nis/nis_print.c:306
+ #, c-format
+ msgid "\t[%u] - [%u bytes] "
+ msgstr "\t[%u] - [%u byte] "
+ 
+-#: nis/nis_print.c:308
++#: nis/nis_print.c:309
+ msgid "Encrypted data\n"
+ msgstr "Krypterat data\n"
+ 
+-#: nis/nis_print.c:310
++#: nis/nis_print.c:311
+ msgid "Binary data\n"
+ msgstr "Bin??rdata\n"
+ 
+-#: nis/nis_print.c:326
++#: nis/nis_print.c:327
+ #, c-format
+ msgid "Object Name   : %s\n"
+ msgstr "Objektnamn    : %s\n"
+ 
+-#: nis/nis_print.c:327
++#: nis/nis_print.c:328
+ #, c-format
+ msgid "Directory     : %s\n"
+ msgstr "Katalog       : %s\n"
+ 
+-#: nis/nis_print.c:328
++#: nis/nis_print.c:329
+ #, c-format
+ msgid "Owner         : %s\n"
+ msgstr "??gare         : %s\n"
+ 
+-#: nis/nis_print.c:329
++#: nis/nis_print.c:330
+ #, c-format
+ msgid "Group         : %s\n"
+ msgstr "Grupp         : %s\n"
+ 
+-#: nis/nis_print.c:330
++#: nis/nis_print.c:331
+ msgid "Access Rights : "
+ msgstr "R??ttigheter   : "
+ 
+-#: nis/nis_print.c:332
++#: nis/nis_print.c:333
+ #, c-format
+ msgid ""
+ "\n"
+@@ -3563,90 +3563,90 @@ msgstr ""
+ "\n"
+ "Livsl??ngd     : "
+ 
+-#: nis/nis_print.c:335
++#: nis/nis_print.c:336
+ #, c-format
+ msgid "Creation Time : %s"
+ msgstr "Skapad        : %s"
+ 
+-#: nis/nis_print.c:337
++#: nis/nis_print.c:338
+ #, c-format
+ msgid "Mod. Time     : %s"
+ msgstr "??ndr. tid     : %s"
+ 
+-#: nis/nis_print.c:338
++#: nis/nis_print.c:339
+ msgid "Object Type   : "
+ msgstr "Objekttyp     : "
+ 
+-#: nis/nis_print.c:358
++#: nis/nis_print.c:359
+ #, c-format
+ msgid "    Data Length = %u\n"
+ msgstr "    Datal??ngd = %u\n"
+ 
+-#: nis/nis_print.c:372
++#: nis/nis_print.c:373
+ #, c-format
+ msgid "Status            : %s\n"
+ msgstr "Status            : %s\n"
+ 
+-#: nis/nis_print.c:373
++#: nis/nis_print.c:374
+ #, c-format
+ msgid "Number of objects : %u\n"
+ msgstr "Antal objekt      : %u\n"
+ 
+-#: nis/nis_print.c:377
++#: nis/nis_print.c:378
+ #, c-format
+ msgid "Object #%d:\n"
+ msgstr "Objekt nr %d:\n"
+ 
+-#: nis/nis_print_group_entry.c:116
++#: nis/nis_print_group_entry.c:117
+ #, c-format
+ msgid "Group entry for \"%s.%s\" group:\n"
+ msgstr "Gruppost f??r \"%s.%s\" grupp:\n"
+ 
+-#: nis/nis_print_group_entry.c:124
++#: nis/nis_print_group_entry.c:125
+ msgid "    Explicit members:\n"
+ msgstr "    Explicita medlemmar:\n"
+ 
+-#: nis/nis_print_group_entry.c:129
++#: nis/nis_print_group_entry.c:130
+ msgid "    No explicit members\n"
+ msgstr "    Inga explicita medlemmar\n"
+ 
+-#: nis/nis_print_group_entry.c:132
++#: nis/nis_print_group_entry.c:133
+ msgid "    Implicit members:\n"
+ msgstr "    Implicita medlemmar:\n"
+ 
+-#: nis/nis_print_group_entry.c:137
++#: nis/nis_print_group_entry.c:138
+ msgid "    No implicit members\n"
+ msgstr "    Inga implicita medlemmar\n"
+ 
+-#: nis/nis_print_group_entry.c:140
++#: nis/nis_print_group_entry.c:141
+ msgid "    Recursive members:\n"
+ msgstr "    Rekursiva medlemmar:\n"
+ 
+-#: nis/nis_print_group_entry.c:145
++#: nis/nis_print_group_entry.c:146
+ msgid "    No recursive members\n"
+ msgstr "    Inga rekursiva medlemmar\n"
+ 
+-#: nis/nis_print_group_entry.c:148
++#: nis/nis_print_group_entry.c:149
+ msgid "    Explicit nonmembers:\n"
+ msgstr "    Explicita icke-medlemmar:\n"
+ 
+-#: nis/nis_print_group_entry.c:153
++#: nis/nis_print_group_entry.c:154
+ msgid "    No explicit nonmembers\n"
+ msgstr "    Inga explicita icke-medlemmar\n"
+ 
+-#: nis/nis_print_group_entry.c:156
++#: nis/nis_print_group_entry.c:157
+ msgid "    Implicit nonmembers:\n"
+ msgstr "    Implicita icke-medlemmar:\n"
+ 
+-#: nis/nis_print_group_entry.c:161
++#: nis/nis_print_group_entry.c:162
+ msgid "    No implicit nonmembers\n"
+ msgstr "    Inga implicita icke-medlemmar\n"
+ 
+-#: nis/nis_print_group_entry.c:164
++#: nis/nis_print_group_entry.c:165
+ msgid "    Recursive nonmembers:\n"
+ msgstr "    Rekursiva icke-medlemmar:\n"
+ 
+-#: nis/nis_print_group_entry.c:169
++#: nis/nis_print_group_entry.c:170
+ msgid "    No recursive nonmembers\n"
+ msgstr "    Inga rekursiva icke-medlemmar\n"
+ 
+@@ -3688,100 +3688,100 @@ msgstr "netname2user: LOCAL-post f??r %s i katalog %s ??r inte unik"
+ msgid "netname2user: should not have uid 0"
+ msgstr "netname2user: borde inte ha uid 0"
+ 
+-#: nis/ypclnt.c:820
++#: nis/ypclnt.c:827
+ msgid "Request arguments bad"
+ msgstr "Argument f??r f??rfr??gan felaktiga"
+ 
+-#: nis/ypclnt.c:823
++#: nis/ypclnt.c:830
+ msgid "RPC failure on NIS operation"
+ msgstr "RPC-fel vid NIS-operation"
+ 
+-#: nis/ypclnt.c:826
++#: nis/ypclnt.c:833
+ msgid "Can't bind to server which serves this domain"
+ msgstr "Kan inte ansluta till servern som betj??nar denna dom??n"
+ 
+-#: nis/ypclnt.c:829
++#: nis/ypclnt.c:836
+ msgid "No such map in server's domain"
+ msgstr "Ingen s??dan tabell i serverns dom??n"
+ 
+-#: nis/ypclnt.c:832
++#: nis/ypclnt.c:839
+ msgid "No such key in map"
+ msgstr "Ingen s??dan nyckel i tabellen"
+ 
+-#: nis/ypclnt.c:835
++#: nis/ypclnt.c:842
+ msgid "Internal NIS error"
+ msgstr "Internt NIS-fel"
+ 
+-#: nis/ypclnt.c:838
++#: nis/ypclnt.c:845
+ msgid "Local resource allocation failure"
+ msgstr "Allokeringsfel f??r lokal resurs"
+ 
+-#: nis/ypclnt.c:841
++#: nis/ypclnt.c:848
+ msgid "No more records in map database"
+ msgstr "Inga fler poster i tabelldatabasen"
+ 
+-#: nis/ypclnt.c:844
++#: nis/ypclnt.c:851
+ msgid "Can't communicate with portmapper"
+ msgstr "Kan inte kommunicera med portmapper"
+ 
+-#: nis/ypclnt.c:847
++#: nis/ypclnt.c:854
+ msgid "Can't communicate with ypbind"
+ msgstr "Kan inte kommunicera med ypbind"
+ 
+-#: nis/ypclnt.c:850
++#: nis/ypclnt.c:857
+ msgid "Can't communicate with ypserv"
+ msgstr "Kan inte kommunicera med ypserv"
+ 
+-#: nis/ypclnt.c:853
++#: nis/ypclnt.c:860
+ msgid "Local domain name not set"
+ msgstr "Lokalt dom??nnamn inte satt"
+ 
+-#: nis/ypclnt.c:856
++#: nis/ypclnt.c:863
+ msgid "NIS map database is bad"
+ msgstr "NIS tabelldatabas ??r felaktig"
+ 
+-#: nis/ypclnt.c:859
++#: nis/ypclnt.c:866
+ msgid "NIS client/server version mismatch - can't supply service"
+ msgstr "NIS versionsskillnad klient/server - kan inte betj??na"
+ 
+-#: nis/ypclnt.c:865
++#: nis/ypclnt.c:872
+ msgid "Database is busy"
+ msgstr "Databasen ??r upptagen"
+ 
+-#: nis/ypclnt.c:868
++#: nis/ypclnt.c:875
+ msgid "Unknown NIS error code"
+ msgstr "Ok??nd NIS-felkod"
+ 
+-#: nis/ypclnt.c:908
++#: nis/ypclnt.c:916
+ msgid "Internal ypbind error"
+ msgstr "Internt ypbind-fel"
+ 
+-#: nis/ypclnt.c:911
++#: nis/ypclnt.c:919
+ msgid "Domain not bound"
+ msgstr "Dom??n inte bunden"
+ 
+-#: nis/ypclnt.c:914
++#: nis/ypclnt.c:922
+ msgid "System resource allocation failure"
+ msgstr "Allokeringsfel f??r systemresurs"
+ 
+-#: nis/ypclnt.c:917
++#: nis/ypclnt.c:925
+ msgid "Unknown ypbind error"
+ msgstr "Ok??nt ypbind-fel"
+ 
+-#: nis/ypclnt.c:958
++#: nis/ypclnt.c:966
+ msgid "yp_update: cannot convert host to netname\n"
+ msgstr "yp_update: kan inte omvandla v??rd till n??tnamn\n"
+ 
+-#: nis/ypclnt.c:976
++#: nis/ypclnt.c:984
+ msgid "yp_update: cannot get server address\n"
+ msgstr "yp_update: kan inte h??mta serveradress\n"
+ 
+-#: nscd/aicache.c:84 nscd/hstcache.c:485
++#: nscd/aicache.c:85 nscd/hstcache.c:485
+ #, c-format
+ msgid "Haven't found \"%s\" in hosts cache!"
+ msgstr "Hittar inte \"%s\" i v??rdcache!"
+ 
+-#: nscd/aicache.c:86 nscd/hstcache.c:487
++#: nscd/aicache.c:87 nscd/hstcache.c:487
+ #, c-format
+ msgid "Reloading \"%s\" in hosts cache!"
+ msgstr "Omladdar \"%s\" i v??rdcache!"
+@@ -3815,269 +3815,264 @@ msgstr "besk??r %s cache; tid %ld"
+ msgid "considering %s entry \"%s\", timeout %<PRIu64>"
+ msgstr "??verv??ger %s-post \"%s\", tidsgr??ns %<PRIu64>"
+ 
+-#: nscd/connections.c:548
++#: nscd/connections.c:537
+ #, c-format
+ msgid "invalid persistent database file \"%s\": %s"
+ msgstr "ogiltig persistent databasfil \"%s\": %s"
+ 
+-#: nscd/connections.c:556
++#: nscd/connections.c:545
+ msgid "uninitialized header"
+ msgstr "oinitierat huvud"
+ 
+-#: nscd/connections.c:561
++#: nscd/connections.c:550
+ msgid "header size does not match"
+ msgstr "huvudstorlek st??mmer inte"
+ 
+-#: nscd/connections.c:571
++#: nscd/connections.c:560
+ msgid "file size does not match"
+ msgstr "filstorlek st??mmer inte"
+ 
+-#: nscd/connections.c:588
++#: nscd/connections.c:577
+ msgid "verification failed"
+ msgstr "verifikation misslyckades"
+ 
+-#: nscd/connections.c:602
++#: nscd/connections.c:591
+ #, c-format
+ msgid "suggested size of table for database %s larger than the persistent database's table"
+ msgstr "f??reslagen storlek p?? tabellen f??r databas %s ??r st??rre ??n den persistenta databasens tabell"
+ 
+-#: nscd/connections.c:613 nscd/connections.c:697
++#: nscd/connections.c:602 nscd/connections.c:686
+ #, c-format
+ msgid "cannot create read-only descriptor for \"%s\"; no mmap"
+ msgstr "kan inte skapa l??sbar filidentifierare f??r \"%s\", ingen mmap"
+ 
+-#: nscd/connections.c:629
++#: nscd/connections.c:618
+ #, c-format
+ msgid "cannot access '%s'"
+ msgstr "kan inte komma ??t \"%s\""
+ 
+-#: nscd/connections.c:677
++#: nscd/connections.c:666
+ #, c-format
+ msgid "database for %s corrupted or simultaneously used; remove %s manually if necessary and restart"
+ msgstr "databas f??r %s korrupt eller anv??nd av flera samtidigt; ta bort %s manuellt om det beh??vs och starta om"
+ 
+-#: nscd/connections.c:683
++#: nscd/connections.c:672
+ #, c-format
+ msgid "cannot create %s; no persistent database used"
+ msgstr "kan inte skapa %s; ingen persistent databas anv??nds"
+ 
+-#: nscd/connections.c:686
++#: nscd/connections.c:675
+ #, c-format
+ msgid "cannot create %s; no sharing possible"
+ msgstr "kan inte skapa %s; ingen delning m??jlig"
+ 
+-#: nscd/connections.c:757
++#: nscd/connections.c:746
+ #, c-format
+ msgid "cannot write to database file %s: %s"
+ msgstr "kan inte skriva till databasfil %s: %s"
+ 
+-#: nscd/connections.c:796
+-#, c-format
+-msgid "cannot set socket to close on exec: %s; disabling paranoia mode"
+-msgstr "kan inte s??tta uttag (socket) att st??ngas vid programstart: %s; kopplar ur paranoial??ge"
+-
+-#: nscd/connections.c:831
++#: nscd/connections.c:802
+ #, c-format
+ msgid "cannot open socket: %s"
+ msgstr "kan inte ??ppna uttag (socket): %s"
+ 
+-#: nscd/connections.c:850
++#: nscd/connections.c:821
+ #, c-format
+ msgid "cannot enable socket to accept connections: %s"
+ msgstr "kan inte f?? uttag (socket) att acceptera f??rbindelser: %s"
+ 
+-#: nscd/connections.c:907
++#: nscd/connections.c:878
+ #, c-format
+ msgid "disabled inotify-based monitoring for file `%s': %s"
+ msgstr "avaktiverade inotify-baserad ??vervakning f??r filen ???%s???: %s"
+ 
+-#: nscd/connections.c:911
++#: nscd/connections.c:882
+ #, c-format
+ msgid "monitoring file `%s` (%d)"
+ msgstr "??vervakar filen ???%s??? (%d)"
+ 
+-#: nscd/connections.c:924
++#: nscd/connections.c:895
+ #, c-format
+ msgid "disabled inotify-based monitoring for directory `%s': %s"
+ msgstr "avaktiverade inotify-baserad ??vervakning av katalogen ???%s???: %s"
+ 
+-#: nscd/connections.c:928
++#: nscd/connections.c:899
+ #, c-format
+ msgid "monitoring directory `%s` (%d)"
+ msgstr "??vervakar katalogen ???%s??? (%d)"
+ 
+-#: nscd/connections.c:956
++#: nscd/connections.c:927
+ #, c-format
+ msgid "monitoring file %s for database %s"
+ msgstr "??vervakar filen %s f??r databas %s"
+ 
+-#: nscd/connections.c:966
++#: nscd/connections.c:937
+ #, c-format
+ msgid "stat failed for file `%s'; will try again later: %s"
+ msgstr "stat misslyckades f??r filen ???%s???; kommer f??rs??ka igen senare: %s"
+ 
+-#: nscd/connections.c:1085
++#: nscd/connections.c:1056
+ #, c-format
+ msgid "provide access to FD %d, for %s"
+ msgstr "ge ??tkomst till FD %d, f??r %s"
+ 
+-#: nscd/connections.c:1097
++#: nscd/connections.c:1068
+ #, c-format
+ msgid "cannot handle old request version %d; current version is %d"
+ msgstr "kan inte hantera ??ldre f??rfr??gansversion %d, nuvarande version ??r %d"
+ 
+-#: nscd/connections.c:1119
++#: nscd/connections.c:1090
+ #, c-format
+ msgid "request from %ld not handled due to missing permission"
+ msgstr "beg??ran fr??n %ld inte hanterad f??r att r??ttigheter saknas"
+ 
+-#: nscd/connections.c:1124
++#: nscd/connections.c:1095
+ #, c-format
+ msgid "request from '%s' [%ld] not handled due to missing permission"
+ msgstr "beg??ran fr??n \"%s\" [%ld] inte hanterad f??r att r??ttigheter saknas"
+ 
+-#: nscd/connections.c:1129
++#: nscd/connections.c:1100
+ msgid "request not handled due to missing permission"
+ msgstr "beg??ran inte hanterad f??r att r??ttigheter saknas"
+ 
+-#: nscd/connections.c:1167 nscd/connections.c:1220
++#: nscd/connections.c:1138 nscd/connections.c:1191
+ #, c-format
+ msgid "cannot write result: %s"
+ msgstr "kan inte skriva resultat: %s"
+ 
+-#: nscd/connections.c:1311
++#: nscd/connections.c:1282
+ #, c-format
+ msgid "error getting caller's id: %s"
+ msgstr "kunde inte h??mta anropandes identitet: %s"
+ 
+-#: nscd/connections.c:1371
++#: nscd/connections.c:1342
+ #, c-format
+ msgid "cannot open /proc/self/cmdline: %s; disabling paranoia mode"
+ msgstr "kan inte ??ppna /proc/slef/cmdline: %s, kopplar ur paranoial??ge"
+ 
+-#: nscd/connections.c:1385
++#: nscd/connections.c:1356
+ #, c-format
+ msgid "cannot read /proc/self/cmdline: %s; disabling paranoia mode"
+ msgstr "kan inte l??sa /proc/self/cmdline: %s, kopplar ur paranoial??ge"
+ 
+-#: nscd/connections.c:1425
++#: nscd/connections.c:1396
+ #, c-format
+ msgid "cannot change to old UID: %s; disabling paranoia mode"
+ msgstr "kan inte byta till f??reg??ende UID: %s; kopplar ur paranoial??ge"
+ 
+-#: nscd/connections.c:1435
++#: nscd/connections.c:1406
+ #, c-format
+ msgid "cannot change to old GID: %s; disabling paranoia mode"
+ msgstr "kan inte byta till f??reg??ende GID: %s; kopplar ur paranoial??ge"
+ 
+-#: nscd/connections.c:1448
++#: nscd/connections.c:1419
+ #, c-format
+ msgid "cannot change to old working directory: %s; disabling paranoia mode"
+ msgstr "kan inte byta till f??reg??ende arbetskatalog: %s; kopplar ur paranoial??ge"
+ 
+-#: nscd/connections.c:1494
++#: nscd/connections.c:1465
+ #, c-format
+ msgid "re-exec failed: %s; disabling paranoia mode"
+ msgstr "??terstart misslyckades: %s; kopplar ur paranoial??ge"
+ 
+-#: nscd/connections.c:1503
++#: nscd/connections.c:1474
+ #, c-format
+ msgid "cannot change current working directory to \"/\": %s"
+ msgstr "kan inte byta aktuell katalog till \"/\": %s"
+ 
+-#: nscd/connections.c:1696
++#: nscd/connections.c:1657
+ #, c-format
+ msgid "short read while reading request: %s"
+ msgstr "fattas data vid l??sning av beg??ran: %s"
+ 
+-#: nscd/connections.c:1729
++#: nscd/connections.c:1690
+ #, c-format
+ msgid "key length in request too long: %d"
+ msgstr "nyckell??ngd i beg??ran f??r l??ng: %d"
+ 
+-#: nscd/connections.c:1742
++#: nscd/connections.c:1703
+ #, c-format
+ msgid "short read while reading request key: %s"
+ msgstr "fattas data vid l??sning av beg??ransnyckel: %s"
+ 
+-#: nscd/connections.c:1752
++#: nscd/connections.c:1713
+ #, c-format
+ msgid "handle_request: request received (Version = %d) from PID %ld"
+ msgstr "handle_request: beg??ran mottagen (Version = %d) fr??n PID %ld"
+ 
+-#: nscd/connections.c:1757
++#: nscd/connections.c:1718
+ #, c-format
+ msgid "handle_request: request received (Version = %d)"
+ msgstr "handle_request: beg??ran mottagen (Version = %d)"
+ 
+-#: nscd/connections.c:1897
++#: nscd/connections.c:1858
+ #, c-format
+ msgid "ignored inotify event for `%s` (file exists)"
+ msgstr "ignorerade inotify-h??ndelse f??r ???%s??? (filen finns)"
+ 
+-#: nscd/connections.c:1902
++#: nscd/connections.c:1863
+ #, c-format
+ msgid "monitored file `%s` was %s, removing watch"
+ msgstr "den ??vervakade filen ???%s??? var %s, tar bort vakten"
+ 
+-#: nscd/connections.c:1910 nscd/connections.c:1952
++#: nscd/connections.c:1871 nscd/connections.c:1913
+ #, c-format
+ msgid "failed to remove file watch `%s`: %s"
+ msgstr "misslyckades att ta bort filvakt ???%s???: %s"
+ 
+-#: nscd/connections.c:1925
++#: nscd/connections.c:1886
+ #, c-format
+ msgid "monitored file `%s` was written to"
+ msgstr "den ??vervakade filen ???%s??? skrevs till"
+ 
+-#: nscd/connections.c:1949
++#: nscd/connections.c:1910
+ #, c-format
+ msgid "monitored parent directory `%s` was %s, removing watch on `%s`"
+ msgstr "den ??vervakade f??r??ldrakatalogen ???%s??? var %s, tar bort vakten av ???%s???"
+ 
+-#: nscd/connections.c:1975
++#: nscd/connections.c:1936
+ #, c-format
+ msgid "monitored file `%s` was %s, adding watch"
+ msgstr "den ??vervakade filen ???%s??? var %s, l??gger till vakt"
+ 
+-#: nscd/connections.c:1987
++#: nscd/connections.c:1948
+ #, c-format
+ msgid "failed to add file watch `%s`: %s"
+ msgstr "misslyckades med att l??gga till filvakt ???%s???: %s"
+ 
+-#: nscd/connections.c:2181 nscd/connections.c:2362
++#: nscd/connections.c:2126 nscd/connections.c:2291
+ #, c-format
+ msgid "disabled inotify-based monitoring after read error %d"
+ msgstr "avaktiverade inotify-baserad ??vervakning efter l??sfel %d"
+ 
+-#: nscd/connections.c:2477
++#: nscd/connections.c:2406
+ msgid "could not initialize conditional variable"
+ msgstr "kan inte initiera villkorsvariabel"
+ 
+-#: nscd/connections.c:2485
++#: nscd/connections.c:2414
+ msgid "could not start clean-up thread; terminating"
+ msgstr "kunde inte starta st??dtr??d; avslutar"
+ 
+-#: nscd/connections.c:2499
++#: nscd/connections.c:2428
+ msgid "could not start any worker thread; terminating"
+ msgstr "kunde inte starta n??gon arbetstr??d; avslutar"
+ 
+-#: nscd/connections.c:2554 nscd/connections.c:2556 nscd/connections.c:2572
+-#: nscd/connections.c:2582 nscd/connections.c:2600 nscd/connections.c:2611
+-#: nscd/connections.c:2621
++#: nscd/connections.c:2483 nscd/connections.c:2485 nscd/connections.c:2501
++#: nscd/connections.c:2511 nscd/connections.c:2529 nscd/connections.c:2540
++#: nscd/connections.c:2550
+ #, c-format
+ msgid "Failed to run nscd as user '%s'"
+ msgstr "Misslyckades att k??ra nscd som anv??ndare \"%s\""
+ 
+-#: nscd/connections.c:2574
++#: nscd/connections.c:2503
+ msgid "initial getgrouplist failed"
+ msgstr "f??rsta getgrouplist misslyckades"
+ 
+-#: nscd/connections.c:2583
++#: nscd/connections.c:2512
+ msgid "getgrouplist failed"
+ msgstr "getgrouplist misslyckades"
+ 
+-#: nscd/connections.c:2601
++#: nscd/connections.c:2530
+ msgid "setgroups failed"
+ msgstr "setgroups misslyckades"
+ 
+@@ -4760,62 +4755,41 @@ msgstr "odefinierad"
+ msgid "Unrecognized variable `%s'"
+ msgstr "Ok??nd variabel \"%s\""
+ 
+-#: posix/getopt.c:592 posix/getopt.c:621
++#: posix/getopt.c:277
+ #, c-format
+-msgid "%s: option '%s' is ambiguous; possibilities:"
+-msgstr "%s: flaggan \"%s\" ??r tvetydig; alternativ:"
++msgid "%s: option '%s%s' is ambiguous\n"
++msgstr "%s: flaggan ???%s%s??? ??r tvetydig\n"
+ 
+-#: posix/getopt.c:662 posix/getopt.c:666
++#: posix/getopt.c:283
+ #, c-format
+-msgid "%s: option '--%s' doesn't allow an argument\n"
+-msgstr "%s: flaggan \"--%s\" tar inget argument\n"
++msgid "%s: option '%s%s' is ambiguous; possibilities:"
++msgstr "%s: flaggan ???%s%s??? ??r tvetydig; alternativ:"
+ 
+-#: posix/getopt.c:675 posix/getopt.c:680
++#: posix/getopt.c:318
+ #, c-format
+-msgid "%s: option '%c%s' doesn't allow an argument\n"
+-msgstr "%s: flaggan \"%c%s\" tar inget argument\n"
++msgid "%s: unrecognized option '%s%s'\n"
++msgstr "%s: ok??nd flagga ???%s%s???\n"
+ 
+-#: posix/getopt.c:723 posix/getopt.c:742
++#: posix/getopt.c:344
+ #, c-format
+-msgid "%s: option '--%s' requires an argument\n"
+-msgstr "%s: flaggan \"--%s\" kr??ver ett argument\n"
++msgid "%s: option '%s%s' doesn't allow an argument\n"
++msgstr "%s: flaggan ???%s%s??? tar inget argument\n"
+ 
+-#: posix/getopt.c:780 posix/getopt.c:783
++#: posix/getopt.c:359
+ #, c-format
+-msgid "%s: unrecognized option '--%s'\n"
+-msgstr "%s: ok??nd flagga \"--%s\"\n"
++msgid "%s: option '%s%s' requires an argument\n"
++msgstr "%s: flaggan ???%s%s??? kr??ver ett argument\n"
+ 
+-#: posix/getopt.c:791 posix/getopt.c:794
+-#, c-format
+-msgid "%s: unrecognized option '%c%s'\n"
+-msgstr "%s: ok??nd flagga \"%c%s\"\n"
+-
+-#: posix/getopt.c:843 posix/getopt.c:846
++#: posix/getopt.c:620
+ #, c-format
+ msgid "%s: invalid option -- '%c'\n"
+ msgstr "%s: ogiltig flagga -- \"%c\"\n"
+ 
+-#: posix/getopt.c:899 posix/getopt.c:916 posix/getopt.c:1126
+-#: posix/getopt.c:1144
++#: posix/getopt.c:635 posix/getopt.c:681
+ #, c-format
+ msgid "%s: option requires an argument -- '%c'\n"
+ msgstr "%s: flaggan kr??ver ett argument -- \"%c\"\n"
+ 
+-#: posix/getopt.c:972 posix/getopt.c:988
+-#, c-format
+-msgid "%s: option '-W %s' is ambiguous\n"
+-msgstr "%s: flaggan \"-W %s\" ??r tvetydig\n"
+-
+-#: posix/getopt.c:1012 posix/getopt.c:1030
+-#, c-format
+-msgid "%s: option '-W %s' doesn't allow an argument\n"
+-msgstr "%s: flaggan \"-W %s\" tar inget argument\n"
+-
+-#: posix/getopt.c:1051 posix/getopt.c:1069
+-#, c-format
+-msgid "%s: option '-W %s' requires an argument\n"
+-msgstr "%s: flaggan \"-W %s\" kr??ver ett argument\n"
+-
+ #: posix/regcomp.c:140
+ msgid "No match"
+ msgstr "Ingen tr??ff"
+@@ -4884,7 +4858,7 @@ msgstr "Obalanserade ) eller \\)"
+ msgid "No previous regular expression"
+ msgstr "Inget f??reg??ende regulj??rt uttryck"
+ 
+-#: posix/wordexp.c:1852
++#: posix/wordexp.c:1822
+ msgid "parameter null or not set"
+ msgstr "parameter ??r tom eller inte satt"
+ 
+@@ -5069,7 +5043,7 @@ msgstr "Buffertplats f??r utdata tillg??ngligt"
+ msgid "Input message available"
+ msgstr "Inkommande meddelande tillg??ngligt"
+ 
+-#: stdio-common/psiginfo-data.h:46 timezone/zdump.c:541 timezone/zic.c:483
++#: stdio-common/psiginfo-data.h:46 timezone/zdump.c:381 timezone/zic.c:520
+ msgid "I/O error"
+ msgstr "I/O-fel"
+ 
+@@ -5149,170 +5123,170 @@ msgstr "Realtidssignal %d"
+ msgid "Unknown signal %d"
+ msgstr "Ok??nd signal %d"
+ 
+-#: sunrpc/auth_unix.c:111 sunrpc/clnt_tcp.c:123 sunrpc/clnt_udp.c:135
+-#: sunrpc/clnt_unix.c:124 sunrpc/svc_tcp.c:188 sunrpc/svc_tcp.c:233
+-#: sunrpc/svc_udp.c:160 sunrpc/svc_unix.c:188 sunrpc/svc_unix.c:229
+-#: sunrpc/xdr.c:627 sunrpc/xdr.c:787 sunrpc/xdr_array.c:101
+-#: sunrpc/xdr_rec.c:152 sunrpc/xdr_ref.c:78
++#: sunrpc/auth_unix.c:112 sunrpc/clnt_tcp.c:124 sunrpc/clnt_udp.c:139
++#: sunrpc/clnt_unix.c:125 sunrpc/svc_tcp.c:189 sunrpc/svc_tcp.c:234
++#: sunrpc/svc_udp.c:161 sunrpc/svc_unix.c:189 sunrpc/svc_unix.c:230
++#: sunrpc/xdr.c:628 sunrpc/xdr.c:788 sunrpc/xdr_array.c:102
++#: sunrpc/xdr_rec.c:153 sunrpc/xdr_ref.c:79
+ msgid "out of memory\n"
+ msgstr "minnet slut\n"
+ 
+-#: sunrpc/auth_unix.c:349
++#: sunrpc/auth_unix.c:350
+ msgid "auth_unix.c: Fatal marshalling problem"
+ msgstr "auth_unix.c: Fatalt kodningsproblem"
+ 
+-#: sunrpc/clnt_perr.c:95 sunrpc/clnt_perr.c:111
++#: sunrpc/clnt_perr.c:96 sunrpc/clnt_perr.c:112
+ #, c-format
+ msgid "%s: %s; low version = %lu, high version = %lu"
+ msgstr "%s: %s; undre version = %lu, ??vre version = %lu"
+ 
+-#: sunrpc/clnt_perr.c:102
++#: sunrpc/clnt_perr.c:103
+ #, c-format
+ msgid "%s: %s; why = %s\n"
+ msgstr "%s: %s; varf??r = %s\n"
+ 
+-#: sunrpc/clnt_perr.c:104
++#: sunrpc/clnt_perr.c:105
+ #, c-format
+ msgid "%s: %s; why = (unknown authentication error - %d)\n"
+ msgstr "%s: %s; varf??r = (ok??nt fel vid ??kthetskontroll - %d)\n"
+ 
+-#: sunrpc/clnt_perr.c:153
++#: sunrpc/clnt_perr.c:154
+ msgid "RPC: Success"
+ msgstr "RPC: Lyckat"
+ 
+-#: sunrpc/clnt_perr.c:156
++#: sunrpc/clnt_perr.c:157
+ msgid "RPC: Can't encode arguments"
+ msgstr "RPC: Kan inte koda argumentet"
+ 
+-#: sunrpc/clnt_perr.c:160
++#: sunrpc/clnt_perr.c:161
+ msgid "RPC: Can't decode result"
+ msgstr "RPC: Kan inte avkoda resultatet"
+ 
+-#: sunrpc/clnt_perr.c:164
++#: sunrpc/clnt_perr.c:165
+ msgid "RPC: Unable to send"
+ msgstr "RPC: Kan inte skicka"
+ 
+-#: sunrpc/clnt_perr.c:168
++#: sunrpc/clnt_perr.c:169
+ msgid "RPC: Unable to receive"
+ msgstr "RPC: Kan inte ta emot"
+ 
+-#: sunrpc/clnt_perr.c:172
++#: sunrpc/clnt_perr.c:173
+ msgid "RPC: Timed out"
+ msgstr "RPC: Tiden l??pte ut"
+ 
+-#: sunrpc/clnt_perr.c:176
++#: sunrpc/clnt_perr.c:177
+ msgid "RPC: Incompatible versions of RPC"
+ msgstr "RPC: Inkompatibla versioner av RPC"
+ 
+-#: sunrpc/clnt_perr.c:180
++#: sunrpc/clnt_perr.c:181
+ msgid "RPC: Authentication error"
+ msgstr "RPC: Fel vid ??kthetskontroll"
+ 
+-#: sunrpc/clnt_perr.c:184
++#: sunrpc/clnt_perr.c:185
+ msgid "RPC: Program unavailable"
+ msgstr "RPC: Programmet otillg??ngligt"
+ 
+-#: sunrpc/clnt_perr.c:188
++#: sunrpc/clnt_perr.c:189
+ msgid "RPC: Program/version mismatch"
+ msgstr "RPC: Program/version-inkompatibilitet"
+ 
+-#: sunrpc/clnt_perr.c:192
++#: sunrpc/clnt_perr.c:193
+ msgid "RPC: Procedure unavailable"
+ msgstr "RPC: Procedur inte tillg??nglig"
+ 
+-#: sunrpc/clnt_perr.c:196
++#: sunrpc/clnt_perr.c:197
+ msgid "RPC: Server can't decode arguments"
+ msgstr "RPC: Server kan inte avkoda argumenten"
+ 
+-#: sunrpc/clnt_perr.c:200
++#: sunrpc/clnt_perr.c:201
+ msgid "RPC: Remote system error"
+ msgstr "RPC: Fj??rrsystemsfel"
+ 
+-#: sunrpc/clnt_perr.c:204
++#: sunrpc/clnt_perr.c:205
+ msgid "RPC: Unknown host"
+ msgstr "RPC: Ok??nd v??rdmaskin"
+ 
+-#: sunrpc/clnt_perr.c:208
++#: sunrpc/clnt_perr.c:209
+ msgid "RPC: Unknown protocol"
+ msgstr "RPC: Ok??nt protokoll"
+ 
+-#: sunrpc/clnt_perr.c:212
++#: sunrpc/clnt_perr.c:213
+ msgid "RPC: Port mapper failure"
+ msgstr "RPC: Fel i port??vers??ttare"
+ 
+-#: sunrpc/clnt_perr.c:216
++#: sunrpc/clnt_perr.c:217
+ msgid "RPC: Program not registered"
+ msgstr "RPC: Programmet inte registrerat"
+ 
+-#: sunrpc/clnt_perr.c:220
++#: sunrpc/clnt_perr.c:221
+ msgid "RPC: Failed (unspecified error)"
+ msgstr "RPC: Misslyckades (ospecificerat fel)"
+ 
+-#: sunrpc/clnt_perr.c:261
++#: sunrpc/clnt_perr.c:262
+ msgid "RPC: (unknown error code)"
+ msgstr "RPC: (ok??nd felkod)"
+ 
+-#: sunrpc/clnt_perr.c:333
++#: sunrpc/clnt_perr.c:334
+ msgid "Authentication OK"
+ msgstr "??kthetskontroll OK"
+ 
+-#: sunrpc/clnt_perr.c:336
++#: sunrpc/clnt_perr.c:337
+ msgid "Invalid client credential"
+ msgstr "Ogiltiga klientreferenser"
+ 
+-#: sunrpc/clnt_perr.c:340
++#: sunrpc/clnt_perr.c:341
+ msgid "Server rejected credential"
+ msgstr "Server f??rkastade kreditiv"
+ 
+-#: sunrpc/clnt_perr.c:344
++#: sunrpc/clnt_perr.c:345
+ msgid "Invalid client verifier"
+ msgstr "Ogiltig klientverifierare"
+ 
+-#: sunrpc/clnt_perr.c:348
++#: sunrpc/clnt_perr.c:349
+ msgid "Server rejected verifier"
+ msgstr "Server f??rkastade verifierare"
+ 
+-#: sunrpc/clnt_perr.c:352
++#: sunrpc/clnt_perr.c:353
+ msgid "Client credential too weak"
+ msgstr "Klientens referenser ??r f??r svaga"
+ 
+-#: sunrpc/clnt_perr.c:356
++#: sunrpc/clnt_perr.c:357
+ msgid "Invalid server verifier"
+ msgstr "Ogiltig serververifierare"
+ 
+-#: sunrpc/clnt_perr.c:360
++#: sunrpc/clnt_perr.c:361
+ msgid "Failed (unspecified error)"
+ msgstr "Misslyckades (ospecificerat fel)"
+ 
+-#: sunrpc/clnt_raw.c:115
++#: sunrpc/clnt_raw.c:116
+ msgid "clnt_raw.c: fatal header serialization error"
+ msgstr "clnt_raw.c: fatalt fel vid serialisering"
+ 
+-#: sunrpc/pm_getmaps.c:77
++#: sunrpc/pm_getmaps.c:78
+ msgid "pmap_getmaps.c: rpc problem"
+ msgstr "pmap_getmaps.c rpc problem"
+ 
+-#: sunrpc/pmap_clnt.c:127
++#: sunrpc/pmap_clnt.c:128
+ msgid "Cannot register service"
+ msgstr "Kan inte registrera tj??nst"
+ 
+-#: sunrpc/pmap_rmt.c:244
++#: sunrpc/pmap_rmt.c:245
+ msgid "Cannot create socket for broadcast rpc"
+ msgstr "Kan inte skapa uttag (socket) f??r uts??ndnings-rpc"
+ 
+-#: sunrpc/pmap_rmt.c:251
++#: sunrpc/pmap_rmt.c:252
+ msgid "Cannot set socket option SO_BROADCAST"
+ msgstr "Kan inte s??tta uttagsflaggan (socket option) SO_BROADCAST"
+ 
+-#: sunrpc/pmap_rmt.c:303
++#: sunrpc/pmap_rmt.c:304
+ msgid "Cannot send broadcast packet"
+ msgstr "Kan inte skicka uts??ndningspaket"
+ 
+-#: sunrpc/pmap_rmt.c:328
++#: sunrpc/pmap_rmt.c:329
+ msgid "Broadcast poll problem"
+ msgstr "Problem med poll vid uts??ndning"
+ 
+-#: sunrpc/pmap_rmt.c:341
++#: sunrpc/pmap_rmt.c:342
+ msgid "Cannot receive reply to broadcast"
+ msgstr "Kan inte ta emot svar p?? uts??ndning"
+ 
+@@ -5595,11 +5569,11 @@ msgstr "tom teckenstr??ng"
+ msgid "preprocessor error"
+ msgstr "preprocessorfel"
+ 
+-#: sunrpc/svc_run.c:71
++#: sunrpc/svc_run.c:72
+ msgid "svc_run: - out of memory"
+ msgstr "svc_run: - minnet slut"
+ 
+-#: sunrpc/svc_run.c:91
++#: sunrpc/svc_run.c:92
+ msgid "svc_run: - poll failed"
+ msgstr "svc_run: - poll misslyckades"
+ 
+@@ -5631,204 +5605,204 @@ msgstr "problem att svara till prog %d\n"
+ msgid "never registered prog %d\n"
+ msgstr "aldrig registrerat prog %d\n"
+ 
+-#: sunrpc/svc_tcp.c:164
++#: sunrpc/svc_tcp.c:165
+ msgid "svc_tcp.c - tcp socket creation problem"
+ msgstr "svc_tcp.c - problem att skapa tcp-uttag (socket)"
+ 
+-#: sunrpc/svc_tcp.c:179
++#: sunrpc/svc_tcp.c:180
+ msgid "svc_tcp.c - cannot getsockname or listen"
+ msgstr "svc_tcp.c - kan inte anropa getsockname eller listen"
+ 
+-#: sunrpc/svc_udp.c:135
++#: sunrpc/svc_udp.c:136
+ msgid "svcudp_create: socket creation problem"
+ msgstr "svcudp_create: problem att skapa uttag (socket)"
+ 
+-#: sunrpc/svc_udp.c:149
++#: sunrpc/svc_udp.c:150
+ msgid "svcudp_create - cannot getsockname"
+ msgstr "svcudp_create - kan inte anropa getsockname"
+ 
+-#: sunrpc/svc_udp.c:181
++#: sunrpc/svc_udp.c:182
+ msgid "svcudp_create: xp_pad is too small for IP_PKTINFO\n"
+ msgstr "svcudp_create: xp_pad ??r f??r liten f??r IP_PKTINFO\n"
+ 
+-#: sunrpc/svc_udp.c:480
++#: sunrpc/svc_udp.c:481
+ msgid "enablecache: cache already enabled"
+ msgstr "enablecache: cache redan p??slagen"
+ 
+-#: sunrpc/svc_udp.c:486
++#: sunrpc/svc_udp.c:487
+ msgid "enablecache: could not allocate cache"
+ msgstr "enablecache: kunde inte allokera cache"
+ 
+-#: sunrpc/svc_udp.c:495
++#: sunrpc/svc_udp.c:496
+ msgid "enablecache: could not allocate cache data"
+ msgstr "enablecache: kunde inte allokera cache-data"
+ 
+-#: sunrpc/svc_udp.c:503
++#: sunrpc/svc_udp.c:504
+ msgid "enablecache: could not allocate cache fifo"
+ msgstr "enablecache: kunde inte allokera cache-fifo"
+ 
+-#: sunrpc/svc_udp.c:539
++#: sunrpc/svc_udp.c:540
+ msgid "cache_set: victim not found"
+ msgstr "cache_set: offer hittades inte"
+ 
+-#: sunrpc/svc_udp.c:550
++#: sunrpc/svc_udp.c:551
+ msgid "cache_set: victim alloc failed"
+ msgstr "cache_set: offerallokering misslyckades"
+ 
+-#: sunrpc/svc_udp.c:557
++#: sunrpc/svc_udp.c:558
+ msgid "cache_set: could not allocate new rpc_buffer"
+ msgstr "cache_set: kunde inte allokera ny rpc-buffert"
+ 
+-#: sunrpc/svc_unix.c:162
++#: sunrpc/svc_unix.c:163
+ msgid "svc_unix.c - AF_UNIX socket creation problem"
+ msgstr "svc_unix.c - problem att skapa AF_UNIX uttag (socket)"
+ 
+-#: sunrpc/svc_unix.c:178
++#: sunrpc/svc_unix.c:179
+ msgid "svc_unix.c - cannot getsockname or listen"
+ msgstr "svc_unix.c - kan inte anropa getsockname eller listen"
+ 
+-#: sysdeps/generic/siglist.h:28
++#: sysdeps/generic/siglist.h:29
+ msgid "Hangup"
+ msgstr "Avringd"
+ 
+-#: sysdeps/generic/siglist.h:29
++#: sysdeps/generic/siglist.h:30
+ msgid "Interrupt"
+ msgstr "Avbruten (SIGINT)"
+ 
+-#: sysdeps/generic/siglist.h:30
++#: sysdeps/generic/siglist.h:31
+ msgid "Quit"
+ msgstr "L??mnad"
+ 
+-#: sysdeps/generic/siglist.h:31
++#: sysdeps/generic/siglist.h:32
+ msgid "Illegal instruction"
+ msgstr "Otill??ten instruktion"
+ 
+-#: sysdeps/generic/siglist.h:32
++#: sysdeps/generic/siglist.h:33
+ msgid "Trace/breakpoint trap"
+ msgstr "Sp??rningsf??lla"
+ 
+-#: sysdeps/generic/siglist.h:33
++#: sysdeps/generic/siglist.h:34
+ msgid "Aborted"
+ msgstr "Avbruten (SIGABRT)"
+ 
+-#: sysdeps/generic/siglist.h:34
++#: sysdeps/generic/siglist.h:35
+ msgid "Floating point exception"
+ msgstr "Flyttalsfel"
+ 
+-#: sysdeps/generic/siglist.h:35
++#: sysdeps/generic/siglist.h:36
+ msgid "Killed"
+ msgstr "D??dad"
+ 
+-#: sysdeps/generic/siglist.h:36
++#: sysdeps/generic/siglist.h:37
+ msgid "Bus error"
+ msgstr "Bussfel"
+ 
+-#: sysdeps/generic/siglist.h:37
++#: sysdeps/generic/siglist.h:38
++msgid "Bad system call"
++msgstr "Felaktigt systemanrop"
++
++#: sysdeps/generic/siglist.h:39
+ msgid "Segmentation fault"
+ msgstr "Segmenteringsfel"
+ 
+-#. TRANS Broken pipe; there is no process reading from the other end of a pipe.
++#. TRANS There is no process reading from the other end of a pipe.
+ #. TRANS Every library function that returns this error code also generates a
+ #. TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled
+ #. TRANS or blocked.  Thus, your program will never actually see @code{EPIPE}
+ #. TRANS unless it has handled or blocked @code{SIGPIPE}.
+-#: sysdeps/generic/siglist.h:38 sysdeps/gnu/errlist.c:360
++#: sysdeps/generic/siglist.h:40 sysdeps/gnu/errlist.c:360
+ msgid "Broken pipe"
+ msgstr "Brutet r??r"
+ 
+-#: sysdeps/generic/siglist.h:39
++#: sysdeps/generic/siglist.h:41
+ msgid "Alarm clock"
+ msgstr "Alarmklocka"
+ 
+-#: sysdeps/generic/siglist.h:40
++#: sysdeps/generic/siglist.h:42
+ msgid "Terminated"
+ msgstr "Avslutad"
+ 
+-#: sysdeps/generic/siglist.h:41
++#: sysdeps/generic/siglist.h:43
+ msgid "Urgent I/O condition"
+ msgstr "Akut I/O-tillst??nd"
+ 
+-#: sysdeps/generic/siglist.h:42
++#: sysdeps/generic/siglist.h:44
+ msgid "Stopped (signal)"
+ msgstr "Stoppad (signal)"
+ 
+-#: sysdeps/generic/siglist.h:43
++#: sysdeps/generic/siglist.h:45
+ msgid "Stopped"
+ msgstr "Stoppad"
+ 
+-#: sysdeps/generic/siglist.h:44
++#: sysdeps/generic/siglist.h:46
+ msgid "Continued"
+ msgstr "??terupptagen"
+ 
+-#: sysdeps/generic/siglist.h:45
++#: sysdeps/generic/siglist.h:47
+ msgid "Child exited"
+ msgstr "Barnprocess avslutad"
+ 
+-#: sysdeps/generic/siglist.h:46
++#: sysdeps/generic/siglist.h:48
+ msgid "Stopped (tty input)"
+ msgstr "Stoppad (terminall??sning)"
+ 
+-#: sysdeps/generic/siglist.h:47
++#: sysdeps/generic/siglist.h:49
+ msgid "Stopped (tty output)"
+ msgstr "Stoppad (terminalskrivning)"
+ 
+-#: sysdeps/generic/siglist.h:48
++#: sysdeps/generic/siglist.h:50
+ msgid "I/O possible"
+ msgstr "I/O m??jligt"
+ 
+-#: sysdeps/generic/siglist.h:49
++#: sysdeps/generic/siglist.h:51
+ msgid "CPU time limit exceeded"
+ msgstr "Begr??nsning av CPU-tid ??verskriden"
+ 
+-#: sysdeps/generic/siglist.h:50
++#: sysdeps/generic/siglist.h:52
+ msgid "File size limit exceeded"
+ msgstr "Begr??nsning av filstorlek ??verskriden"
+ 
+-#: sysdeps/generic/siglist.h:51
++#: sysdeps/generic/siglist.h:53
+ msgid "Virtual timer expired"
+ msgstr "Alarmklocka - virtuell tid"
+ 
+-#: sysdeps/generic/siglist.h:52
++#: sysdeps/generic/siglist.h:54
+ msgid "Profiling timer expired"
+ msgstr "Profileringsklocka"
+ 
+-#: sysdeps/generic/siglist.h:53
++#: sysdeps/generic/siglist.h:55
+ msgid "User defined signal 1"
+ msgstr "Anv??ndarsignal 1"
+ 
+-#: sysdeps/generic/siglist.h:54
++#: sysdeps/generic/siglist.h:56
+ msgid "User defined signal 2"
+ msgstr "Anv??ndarsignal 2"
+ 
+-#: sysdeps/generic/siglist.h:58
+-msgid "EMT trap"
+-msgstr "Emulatorf??lla"
++#: sysdeps/generic/siglist.h:57
++msgid "Window changed"
++msgstr "??ndrat f??nster"
+ 
+ #: sysdeps/generic/siglist.h:61
+-msgid "Bad system call"
+-msgstr "Felaktigt systemanrop"
++msgid "EMT trap"
++msgstr "Emulatorf??lla"
+ 
+ #: sysdeps/generic/siglist.h:64
+ msgid "Stack fault"
+ msgstr "Stackfel"
+ 
+ #: sysdeps/generic/siglist.h:67
+-msgid "Information request"
+-msgstr "Informationsbeg??ran"
+-
+-#: sysdeps/generic/siglist.h:69
+ msgid "Power failure"
+ msgstr "Str??mavbrott"
+ 
+-#: sysdeps/generic/siglist.h:72
++#: sysdeps/generic/siglist.h:70
++msgid "Information request"
++msgstr "Informationsbeg??ran"
++
++#: sysdeps/generic/siglist.h:73
+ msgid "Resource lost"
+ msgstr "F??rlorad resurs"
+ 
+-#: sysdeps/generic/siglist.h:75
+-msgid "Window changed"
+-msgstr "??ndrat f??nster"
+-
+-#. TRANS Operation not permitted; only the owner of the file (or other resource)
++#. TRANS Only the owner of the file (or other resource)
+ #. TRANS or processes with special privileges can perform the operation.
+ #: sysdeps/gnu/errlist.c:26
+ msgid "Operation not permitted"
+@@ -5839,7 +5813,7 @@ msgstr "Operationen inte till??ten"
+ msgid "No such process"
+ msgstr "Processen finns inte"
+ 
+-#. TRANS Interrupted function call; an asynchronous signal occurred and prevented
++#. TRANS An asynchronous signal occurred and prevented
+ #. TRANS completion of the call.  When this happens, you should try the call
+ #. TRANS again.
+ #. TRANS
+@@ -5850,12 +5824,12 @@ msgstr "Processen finns inte"
+ msgid "Interrupted system call"
+ msgstr "Avbrutet systemanrop"
+ 
+-#. TRANS Input/output error; usually used for physical read or write errors.
++#. TRANS Usually used for physical read or write errors.
+ #: sysdeps/gnu/errlist.c:70
+ msgid "Input/output error"
+ msgstr "In/ut-fel"
+ 
+-#. TRANS No such device or address.  The system tried to use the device
++#. TRANS The system tried to use the device
+ #. TRANS represented by a file you specified, and it couldn't find the device.
+ #. TRANS This can mean that the device file was installed incorrectly, or that
+ #. TRANS the physical device is missing or not correctly attached to the
+@@ -5864,7 +5838,7 @@ msgstr "In/ut-fel"
+ msgid "No such device or address"
+ msgstr "Enheten eller adressen finns inte"
+ 
+-#. TRANS Argument list too long; used when the arguments passed to a new program
++#. TRANS Used when the arguments passed to a new program
+ #. TRANS being executed with one of the @code{exec} functions (@pxref{Executing a
+ #. TRANS File}) occupy too much memory space.  This condition never arises on
+ #. TRANS @gnuhurdsystems{}.
+@@ -5878,21 +5852,21 @@ msgstr "Argumentlistan f??r l??ng"
+ msgid "Exec format error"
+ msgstr "Formatfel p?? k??rbar fil"
+ 
+-#. TRANS Bad file descriptor; for example, I/O on a descriptor that has been
++#. TRANS For example, I/O on a descriptor that has been
+ #. TRANS closed or reading from a descriptor open only for writing (or vice
+ #. TRANS versa).
+ #: sysdeps/gnu/errlist.c:116
+ msgid "Bad file descriptor"
+ msgstr "Felaktig filidentifierare"
+ 
+-#. TRANS There are no child processes.  This error happens on operations that are
++#. TRANS This error happens on operations that are
+ #. TRANS supposed to manipulate child processes, when there aren't any processes
+ #. TRANS to manipulate.
+ #: sysdeps/gnu/errlist.c:127
+ msgid "No child processes"
+ msgstr "Inga barnprocesser"
+ 
+-#. TRANS Deadlock avoided; allocating a system resource would have resulted in a
++#. TRANS Allocating a system resource would have resulted in a
+ #. TRANS deadlock situation.  The system does not guarantee that it will notice
+ #. TRANS all such situations.  This error means you got lucky and the system
+ #. TRANS noticed; it might just hang.  @xref{File Locks}, for an example.
+@@ -5900,13 +5874,13 @@ msgstr "Inga barnprocesser"
+ msgid "Resource deadlock avoided"
+ msgstr "Resursd??dl??ge undveks"
+ 
+-#. TRANS No memory available.  The system cannot allocate more virtual memory
++#. TRANS The system cannot allocate more virtual memory
+ #. TRANS because its capacity is full.
+ #: sysdeps/gnu/errlist.c:149
+ msgid "Cannot allocate memory"
+ msgstr "Kan inte allokera minne"
+ 
+-#. TRANS Bad address; an invalid pointer was detected.
++#. TRANS An invalid pointer was detected.
+ #. TRANS On @gnuhurdsystems{}, this error never happens; you get a signal instead.
+ #: sysdeps/gnu/errlist.c:168
+ msgid "Bad address"
+@@ -5919,14 +5893,14 @@ msgstr "Felaktig adress"
+ msgid "Block device required"
+ msgstr "Blockenhet kr??vs"
+ 
+-#. TRANS Resource busy; a system resource that can't be shared is already in use.
++#. TRANS A system resource that can't be shared is already in use.
+ #. TRANS For example, if you try to delete a file that is the root of a currently
+ #. TRANS mounted filesystem, you get this error.
+ #: sysdeps/gnu/errlist.c:190
+ msgid "Device or resource busy"
+ msgstr "Enhet eller resurs upptagen"
+ 
+-#. TRANS File exists; an existing file was specified in a context where it only
++#. TRANS An existing file was specified in a context where it only
+ #. TRANS makes sense to specify a new file.
+ #: sysdeps/gnu/errlist.c:200
+ msgid "File exists"
+@@ -5950,13 +5924,13 @@ msgstr "Enheten finns inte"
+ msgid "Not a directory"
+ msgstr "Inte en katalog"
+ 
+-#. TRANS File is a directory; you cannot open a directory for writing,
++#. TRANS You cannot open a directory for writing,
+ #. TRANS or create or remove hard links to it.
+ #: sysdeps/gnu/errlist.c:240
+ msgid "Is a directory"
+ msgstr "??r en katalog"
+ 
+-#. TRANS Invalid argument.  This is used to indicate various kinds of problems
++#. TRANS This is used to indicate various kinds of problems
+ #. TRANS with passing the wrong argument to a library function.
+ #: sysdeps/gnu/errlist.c:250
+ msgid "Invalid argument"
+@@ -5995,12 +5969,12 @@ msgstr "Ol??mplig ioctl f??r enheten"
+ msgid "Text file busy"
+ msgstr "Kodfil upptagen"
+ 
+-#. TRANS File too big; the size of a file would be larger than allowed by the system.
++#. TRANS The size of a file would be larger than allowed by the system.
+ #: sysdeps/gnu/errlist.c:308
+ msgid "File too large"
+ msgstr "F??r stor fil"
+ 
+-#. TRANS No space left on device; write operation on a file failed because the
++#. TRANS Write operation on a file failed because the
+ #. TRANS disk is full.
+ #: sysdeps/gnu/errlist.c:318
+ msgid "No space left on device"
+@@ -6016,26 +5990,26 @@ msgstr "Otill??ten s??kning"
+ msgid "Read-only file system"
+ msgstr "Skrivskyddat filsystem"
+ 
+-#. TRANS Too many links; the link count of a single file would become too large.
++#. TRANS The link count of a single file would become too large.
+ #. TRANS @code{rename} can cause this error if the file being renamed already has
+ #. TRANS as many links as it can take (@pxref{Renaming Files}).
+ #: sysdeps/gnu/errlist.c:347
+ msgid "Too many links"
+ msgstr "F??r m??nga l??nkar"
+ 
+-#. TRANS Domain error; used by mathematical functions when an argument value does
++#. TRANS Used by mathematical functions when an argument value does
+ #. TRANS not fall into the domain over which the function is defined.
+ #: sysdeps/gnu/errlist.c:370
+ msgid "Numerical argument out of domain"
+ msgstr "Numeriskt argument ??r utanf??r omr??det"
+ 
+-#. TRANS Range error; used by mathematical functions when the result value is
++#. TRANS Used by mathematical functions when the result value is
+ #. TRANS not representable because of overflow or underflow.
+ #: sysdeps/gnu/errlist.c:380
+ msgid "Numerical result out of range"
+ msgstr "Numeriskt resultat ??r utanf??r giltigt intervall"
+ 
+-#. TRANS Resource temporarily unavailable; the call might work if you try again
++#. TRANS The call might work if you try again
+ #. TRANS later.  The macro @code{EWOULDBLOCK} is another name for @code{EAGAIN};
+ #. TRANS they are always the same in @theglibc{}.
+ #. TRANS
+@@ -6223,76 +6197,75 @@ msgstr "Destinationsadress kr??vs"
+ msgid "Cannot send after transport endpoint shutdown"
+ msgstr "Kan inte skicka efter att transportslutpunkten st??ngts"
+ 
+-#. TRANS ???
+-#: sysdeps/gnu/errlist.c:677
++#: sysdeps/gnu/errlist.c:676
+ msgid "Too many references: cannot splice"
+ msgstr "F??r m??nga referenser: kan inte skarva"
+ 
+ #. TRANS A socket operation with a specified timeout received no response during
+ #. TRANS the timeout period.
+-#: sysdeps/gnu/errlist.c:687
++#: sysdeps/gnu/errlist.c:686
+ msgid "Connection timed out"
+ msgstr "F??rbindelsens tidsgr??ns l??pte ut"
+ 
+ #. TRANS A remote host refused to allow the network connection (typically because
+ #. TRANS it is not running the requested service).
+-#: sysdeps/gnu/errlist.c:697
++#: sysdeps/gnu/errlist.c:696
+ msgid "Connection refused"
+ msgstr "F??rbindelsen f??rv??grad"
+ 
+ #. TRANS Too many levels of symbolic links were encountered in looking up a file name.
+ #. TRANS This often indicates a cycle of symbolic links.
+-#: sysdeps/gnu/errlist.c:707
++#: sysdeps/gnu/errlist.c:706
+ msgid "Too many levels of symbolic links"
+ msgstr "F??r m??nga niv??er av symboliska l??nkar"
+ 
+ #. TRANS Filename too long (longer than @code{PATH_MAX}; @pxref{Limits for
+ #. TRANS Files}) or host name too long (in @code{gethostname} or
+ #. TRANS @code{sethostname}; @pxref{Host Identification}).
+-#: sysdeps/gnu/errlist.c:718
++#: sysdeps/gnu/errlist.c:717
+ msgid "File name too long"
+ msgstr "F??r l??ngt filnamn"
+ 
+ #. TRANS The remote host for a requested network connection is down.
+-#: sysdeps/gnu/errlist.c:727
++#: sysdeps/gnu/errlist.c:726
+ msgid "Host is down"
+ msgstr "V??rddator ??r nere"
+ 
+ #. TRANS The remote host for a requested network connection is not reachable.
+-#: sysdeps/gnu/errlist.c:736
++#: sysdeps/gnu/errlist.c:735
+ msgid "No route to host"
+ msgstr "Ingen v??g till v??rd"
+ 
+ #. TRANS Directory not empty, where an empty directory was expected.  Typically,
+ #. TRANS this error occurs when you are trying to delete a directory.
+-#: sysdeps/gnu/errlist.c:746
++#: sysdeps/gnu/errlist.c:745
+ msgid "Directory not empty"
+ msgstr "Katalog inte tom"
+ 
+ #. TRANS This means that the per-user limit on new process would be exceeded by
+ #. TRANS an attempted @code{fork}.  @xref{Limits on Resources}, for details on
+ #. TRANS the @code{RLIMIT_NPROC} limit.
+-#: sysdeps/gnu/errlist.c:757
++#: sysdeps/gnu/errlist.c:756
+ msgid "Too many processes"
+ msgstr "F??r m??nga processer"
+ 
+ #. TRANS The file quota system is confused because there are too many users.
+ #. TRANS @c This can probably happen in a GNU system when using NFS.
+-#: sysdeps/gnu/errlist.c:767
++#: sysdeps/gnu/errlist.c:766
+ msgid "Too many users"
+ msgstr "F??r m??nga anv??ndare"
+ 
+ #. TRANS The user's disk quota was exceeded.
+-#: sysdeps/gnu/errlist.c:776
++#: sysdeps/gnu/errlist.c:775
+ msgid "Disk quota exceeded"
+ msgstr "Diskkvot ??verskriden"
+ 
+-#. TRANS Stale file handle.  This indicates an internal confusion in the
++#. TRANS This indicates an internal confusion in the
+ #. TRANS file system which is due to file system rearrangements on the server host
+ #. TRANS for NFS file systems or corruption in other file systems.
+ #. TRANS Repairing this condition usually requires unmounting, possibly repairing
+ #. TRANS and remounting the file system.
+-#: sysdeps/gnu/errlist.c:789
++#: sysdeps/gnu/errlist.c:788
+ msgid "Stale file handle"
+ msgstr "F??rlegat filhandtag"
+ 
+@@ -6300,72 +6273,65 @@ msgstr "F??rlegat filhandtag"
+ #. TRANS already specifies an NFS-mounted file.
+ #. TRANS (This is an error on some operating systems, but we expect it to work
+ #. TRANS properly on @gnuhurdsystems{}, making this error code impossible.)
+-#: sysdeps/gnu/errlist.c:801
++#: sysdeps/gnu/errlist.c:800
+ msgid "Object is remote"
+ msgstr "??r ett fj??rrobjekt"
+ 
+-#. TRANS ???
+-#: sysdeps/gnu/errlist.c:810
++#: sysdeps/gnu/errlist.c:808
+ msgid "RPC struct is bad"
+ msgstr "RPC-strukturen ??r felaktig"
+ 
+-#. TRANS ???
+-#: sysdeps/gnu/errlist.c:819
++#: sysdeps/gnu/errlist.c:816
+ msgid "RPC version wrong"
+ msgstr "RPC-versionen ??r felaktig"
+ 
+-#. TRANS ???
+-#: sysdeps/gnu/errlist.c:828
++#: sysdeps/gnu/errlist.c:824
+ msgid "RPC program not available"
+ msgstr "RPC-programmet inte tillg??ngligt"
+ 
+-#. TRANS ???
+-#: sysdeps/gnu/errlist.c:837
++#: sysdeps/gnu/errlist.c:832
+ msgid "RPC program version wrong"
+ msgstr "RPC-programversionen ??r felaktig"
+ 
+-#. TRANS ???
+-#: sysdeps/gnu/errlist.c:846
++#: sysdeps/gnu/errlist.c:840
+ msgid "RPC bad procedure for program"
+ msgstr "Felaktig RPC-procedur f??r programmet"
+ 
+-#. TRANS No locks available.  This is used by the file locking facilities; see
++#. TRANS This is used by the file locking facilities; see
+ #. TRANS @ref{File Locks}.  This error is never generated by @gnuhurdsystems{}, but
+ #. TRANS it can result from an operation to an NFS server running another
+ #. TRANS operating system.
+-#: sysdeps/gnu/errlist.c:858
++#: sysdeps/gnu/errlist.c:852
+ msgid "No locks available"
+ msgstr "Inga l??s tillg??ngliga"
+ 
+-#. TRANS Inappropriate file type or format.  The file was the wrong type for the
++#. TRANS The file was the wrong type for the
+ #. TRANS operation, or a data file had the wrong format.
+ #. TRANS
+ #. TRANS On some systems @code{chmod} returns this error if you try to set the
+ #. TRANS sticky bit on a non-directory file; @pxref{Setting Permissions}.
+-#: sysdeps/gnu/errlist.c:871
++#: sysdeps/gnu/errlist.c:865
+ msgid "Inappropriate file type or format"
+ msgstr "Filtyp eller format ol??mplig"
+ 
+-#. TRANS ???
+-#: sysdeps/gnu/errlist.c:880
++#: sysdeps/gnu/errlist.c:873
+ msgid "Authentication error"
+ msgstr "Autentiseringsfel"
+ 
+-#. TRANS ???
+-#: sysdeps/gnu/errlist.c:889
++#: sysdeps/gnu/errlist.c:881
+ msgid "Need authenticator"
+ msgstr "Beh??ver autentiserare"
+ 
+-#. TRANS Function not implemented.  This indicates that the function called is
++#. TRANS This indicates that the function called is
+ #. TRANS not implemented at all, either in the C library itself or in the
+ #. TRANS operating system.  When you get this error, you can be sure that this
+ #. TRANS particular function will always fail with @code{ENOSYS} unless you
+ #. TRANS install a new version of the C library or the operating system.
+-#: sysdeps/gnu/errlist.c:902
++#: sysdeps/gnu/errlist.c:894
+ msgid "Function not implemented"
+ msgstr "Funktion inte implementerad"
+ 
+-#. TRANS Not supported.  A function returns this error when certain parameter
++#. TRANS A function returns this error when certain parameter
+ #. TRANS values are valid, but the functionality they request is not available.
+ #. TRANS This can mean that the function does not implement a particular command
+ #. TRANS or option value or flag bit at all.  For functions that operate on some
+@@ -6377,13 +6343,13 @@ msgstr "Funktion inte implementerad"
+ #. TRANS
+ #. TRANS If the entire function is not available at all in the implementation,
+ #. TRANS it returns @code{ENOSYS} instead.
+-#: sysdeps/gnu/errlist.c:922
++#: sysdeps/gnu/errlist.c:914
+ msgid "Not supported"
+ msgstr "St??ds ej"
+ 
+ #. TRANS While decoding a multibyte character the function came along an invalid
+ #. TRANS or an incomplete sequence of bytes or the given wide character is invalid.
+-#: sysdeps/gnu/errlist.c:932
++#: sysdeps/gnu/errlist.c:924
+ msgid "Invalid or incomplete multibyte or wide character"
+ msgstr "Ogiltigt eller ofullst??ndigt flerbyte- eller brett tecken"
+ 
+@@ -6393,276 +6359,276 @@ msgstr "Ogiltigt eller ofullst??ndigt flerbyte- eller brett tecken"
+ #. TRANS error because functions such as @code{read} and @code{write} translate
+ #. TRANS it into a @code{SIGTTIN} or @code{SIGTTOU} signal.  @xref{Job Control},
+ #. TRANS for information on process groups and these signals.
+-#: sysdeps/gnu/errlist.c:946
++#: sysdeps/gnu/errlist.c:938
+ msgid "Inappropriate operation for background process"
+ msgstr "Operation f??r bakgrundsprocess ol??mplig"
+ 
+ #. TRANS On @gnuhurdsystems{}, opening a file returns this error when the file is
+ #. TRANS translated by a program and the translator program dies while starting
+ #. TRANS up, before it has connected to the file.
+-#: sysdeps/gnu/errlist.c:957
++#: sysdeps/gnu/errlist.c:949
+ msgid "Translator died"
+ msgstr "??vers??ttaren dog"
+ 
+ #. TRANS The experienced user will know what is wrong.
+ #. TRANS @c This error code is a joke.  Its perror text is part of the joke.
+ #. TRANS @c Don't change it.
+-#: sysdeps/gnu/errlist.c:968
++#: sysdeps/gnu/errlist.c:960
+ msgid "?"
+ msgstr "?"
+ 
+ #. TRANS You did @strong{what}?
+-#: sysdeps/gnu/errlist.c:977
++#: sysdeps/gnu/errlist.c:969
+ msgid "You really blew it this time"
+ msgstr "Du strulade till det den h??r g??ngen"
+ 
+ #. TRANS Go home and have a glass of warm, dairy-fresh milk.
+-#: sysdeps/gnu/errlist.c:986
++#: sysdeps/gnu/errlist.c:978
+ msgid "Computer bought the farm"
+ msgstr "Datorn packade ihop"
+ 
+ #. TRANS This error code has no purpose.
+-#: sysdeps/gnu/errlist.c:995
++#: sysdeps/gnu/errlist.c:987
+ msgid "Gratuitous error"
+ msgstr "Omotiverat fel"
+ 
+-#: sysdeps/gnu/errlist.c:1003
++#: sysdeps/gnu/errlist.c:995
+ msgid "Bad message"
+ msgstr "Felaktigt meddelande"
+ 
+-#: sysdeps/gnu/errlist.c:1011
++#: sysdeps/gnu/errlist.c:1003
+ msgid "Identifier removed"
+ msgstr "Identifierare borttagen"
+ 
+-#: sysdeps/gnu/errlist.c:1019
++#: sysdeps/gnu/errlist.c:1011
+ msgid "Multihop attempted"
+ msgstr "Flerhopp f??rs??ktes"
+ 
+-#: sysdeps/gnu/errlist.c:1027
++#: sysdeps/gnu/errlist.c:1019
+ msgid "No data available"
+ msgstr "Inga data tillg??ngliga"
+ 
+-#: sysdeps/gnu/errlist.c:1035
++#: sysdeps/gnu/errlist.c:1027
+ msgid "Link has been severed"
+ msgstr "L??nken har brutits"
+ 
+-#: sysdeps/gnu/errlist.c:1043
++#: sysdeps/gnu/errlist.c:1035
+ msgid "No message of desired type"
+ msgstr "Inget meddelande av ??nskad typ"
+ 
+-#: sysdeps/gnu/errlist.c:1051
++#: sysdeps/gnu/errlist.c:1043
+ msgid "Out of streams resources"
+ msgstr "Stream-resurserna ??r slut"
+ 
+-#: sysdeps/gnu/errlist.c:1059
++#: sysdeps/gnu/errlist.c:1051
+ msgid "Device not a stream"
+ msgstr "Enheten ??r inte en stream"
+ 
+-#: sysdeps/gnu/errlist.c:1067
++#: sysdeps/gnu/errlist.c:1059
+ msgid "Value too large for defined data type"
+ msgstr "V??rdet f??r stort f??r definierad datatyp"
+ 
+-#: sysdeps/gnu/errlist.c:1075
++#: sysdeps/gnu/errlist.c:1067
+ msgid "Protocol error"
+ msgstr "Protokollfel"
+ 
+-#: sysdeps/gnu/errlist.c:1083
++#: sysdeps/gnu/errlist.c:1075
+ msgid "Timer expired"
+ msgstr "Klockan ringde"
+ 
+-#. TRANS Operation canceled; an asynchronous operation was canceled before it
++#. TRANS An asynchronous operation was canceled before it
+ #. TRANS completed.  @xref{Asynchronous I/O}.  When you call @code{aio_cancel},
+ #. TRANS the normal result is for the operations affected to complete with this
+ #. TRANS error; @pxref{Cancel AIO Operations}.
+-#: sysdeps/gnu/errlist.c:1095
++#: sysdeps/gnu/errlist.c:1087
+ msgid "Operation canceled"
+ msgstr "Operationen avbruten"
+ 
+-#: sysdeps/gnu/errlist.c:1103
++#: sysdeps/gnu/errlist.c:1095
+ msgid "Interrupted system call should be restarted"
+ msgstr "Avbrutet systemanrop borde omstartas"
+ 
+-#: sysdeps/gnu/errlist.c:1111
++#: sysdeps/gnu/errlist.c:1103
+ msgid "Channel number out of range"
+ msgstr "Kanalnummer utanf??r giltigt intervall"
+ 
+-#: sysdeps/gnu/errlist.c:1119
++#: sysdeps/gnu/errlist.c:1111
+ msgid "Level 2 not synchronized"
+ msgstr "Niv?? 2 inte synkroniserad"
+ 
+-#: sysdeps/gnu/errlist.c:1127
++#: sysdeps/gnu/errlist.c:1119
+ msgid "Level 3 halted"
+ msgstr "Niv?? 3 stannad"
+ 
+-#: sysdeps/gnu/errlist.c:1135
++#: sysdeps/gnu/errlist.c:1127
+ msgid "Level 3 reset"
+ msgstr "Niv?? 3 omstartad"
+ 
+-#: sysdeps/gnu/errlist.c:1143
++#: sysdeps/gnu/errlist.c:1135
+ msgid "Link number out of range"
+ msgstr "L??nkantal utanf??r giltigt intervall"
+ 
+-#: sysdeps/gnu/errlist.c:1151
++#: sysdeps/gnu/errlist.c:1143
+ msgid "Protocol driver not attached"
+ msgstr "Styrprogram f??r protokoll inte anslutet"
+ 
+-#: sysdeps/gnu/errlist.c:1159
++#: sysdeps/gnu/errlist.c:1151
+ msgid "No CSI structure available"
+ msgstr "Inga CSI-strukturer tillg??ngliga"
+ 
+-#: sysdeps/gnu/errlist.c:1167
++#: sysdeps/gnu/errlist.c:1159
+ msgid "Level 2 halted"
+ msgstr "Niv?? 2 stannad"
+ 
+-#: sysdeps/gnu/errlist.c:1175
++#: sysdeps/gnu/errlist.c:1167
+ msgid "Invalid exchange"
+ msgstr "Ogiltig v??xel"
+ 
+-#: sysdeps/gnu/errlist.c:1183
++#: sysdeps/gnu/errlist.c:1175
+ msgid "Invalid request descriptor"
+-msgstr "Ogiltig beg??randeidendiferare"
++msgstr "Ogiltig beg??randeidentifierare"
+ 
+-#: sysdeps/gnu/errlist.c:1191
++#: sysdeps/gnu/errlist.c:1183
+ msgid "Exchange full"
+ msgstr "V??xeln full"
+ 
+-#: sysdeps/gnu/errlist.c:1199
++#: sysdeps/gnu/errlist.c:1191
+ msgid "No anode"
+ msgstr "Ingen anod"
+ 
+-#: sysdeps/gnu/errlist.c:1207
++#: sysdeps/gnu/errlist.c:1199
+ msgid "Invalid request code"
+ msgstr "Ogiltig beg??randekod"
+ 
+-#: sysdeps/gnu/errlist.c:1215
++#: sysdeps/gnu/errlist.c:1207
+ msgid "Invalid slot"
+ msgstr "Ogiltig plats"
+ 
+-#: sysdeps/gnu/errlist.c:1223
++#: sysdeps/gnu/errlist.c:1215
+ msgid "File locking deadlock error"
+ msgstr "Fill??sning gav d??dl??ge"
+ 
+-#: sysdeps/gnu/errlist.c:1231
++#: sysdeps/gnu/errlist.c:1223
+ msgid "Bad font file format"
+ msgstr "Felaktigt format p?? typsnittsfil"
+ 
+-#: sysdeps/gnu/errlist.c:1239
++#: sysdeps/gnu/errlist.c:1231
+ msgid "Machine is not on the network"
+ msgstr "Maskinen finns inte p?? n??tverket"
+ 
+-#: sysdeps/gnu/errlist.c:1247
++#: sysdeps/gnu/errlist.c:1239
+ msgid "Package not installed"
+ msgstr "Paketet ??r inte installerat"
+ 
+-#: sysdeps/gnu/errlist.c:1255
++#: sysdeps/gnu/errlist.c:1247
+ msgid "Advertise error"
+ msgstr "Annonseringsfel"
+ 
+-#: sysdeps/gnu/errlist.c:1263
++#: sysdeps/gnu/errlist.c:1255
+ msgid "Srmount error"
+ msgstr "Srmount-fel"
+ 
+-#: sysdeps/gnu/errlist.c:1271
++#: sysdeps/gnu/errlist.c:1263
+ msgid "Communication error on send"
+ msgstr "Kommunikationsfel vid s??ndning"
+ 
+-#: sysdeps/gnu/errlist.c:1279
++#: sysdeps/gnu/errlist.c:1271
+ msgid "RFS specific error"
+ msgstr "RFS-specifikt fel"
+ 
+-#: sysdeps/gnu/errlist.c:1287
++#: sysdeps/gnu/errlist.c:1279
+ msgid "Name not unique on network"
+ msgstr "Namnet inte unikt i n??tverket"
+ 
+-#: sysdeps/gnu/errlist.c:1295
++#: sysdeps/gnu/errlist.c:1287
+ msgid "File descriptor in bad state"
+ msgstr "Filidentifierare i felaktigt tillst??nd"
+ 
+-#: sysdeps/gnu/errlist.c:1303
++#: sysdeps/gnu/errlist.c:1295
+ msgid "Remote address changed"
+ msgstr "Fj??rradress ??ndrades"
+ 
+-#: sysdeps/gnu/errlist.c:1311
++#: sysdeps/gnu/errlist.c:1303
+ msgid "Can not access a needed shared library"
+ msgstr "Kan inte komma ??t ett n??dv??ndigt delat bibliotek"
+ 
+-#: sysdeps/gnu/errlist.c:1319
++#: sysdeps/gnu/errlist.c:1311
+ msgid "Accessing a corrupted shared library"
+ msgstr "??ppnar ett korrupt delat bibliotek"
+ 
+-#: sysdeps/gnu/errlist.c:1327
++#: sysdeps/gnu/errlist.c:1319
+ msgid ".lib section in a.out corrupted"
+ msgstr ".lib-sektion i a.out korrupt"
+ 
+-#: sysdeps/gnu/errlist.c:1335
++#: sysdeps/gnu/errlist.c:1327
+ msgid "Attempting to link in too many shared libraries"
+ msgstr "F??rs??ker att l??nka in f??r m??nga delade bibliotek"
+ 
+-#: sysdeps/gnu/errlist.c:1343
++#: sysdeps/gnu/errlist.c:1335
+ msgid "Cannot exec a shared library directly"
+ msgstr "Kan inte k??ra ett delat bibliotek direkt"
+ 
+-#: sysdeps/gnu/errlist.c:1351
++#: sysdeps/gnu/errlist.c:1343
+ msgid "Streams pipe error"
+ msgstr "Streams-r??rfel"
+ 
+-#: sysdeps/gnu/errlist.c:1359
++#: sysdeps/gnu/errlist.c:1351
+ msgid "Structure needs cleaning"
+ msgstr "Strukturen beh??ver st??das"
+ 
+-#: sysdeps/gnu/errlist.c:1367
++#: sysdeps/gnu/errlist.c:1359
+ msgid "Not a XENIX named type file"
+ msgstr "Inte en XENIX-namngiven fil"
+ 
+-#: sysdeps/gnu/errlist.c:1375
++#: sysdeps/gnu/errlist.c:1367
+ msgid "No XENIX semaphores available"
+ msgstr "Inga XENIX-semaforer tillg??ngliga"
+ 
+-#: sysdeps/gnu/errlist.c:1383
++#: sysdeps/gnu/errlist.c:1375
+ msgid "Is a named type file"
+ msgstr "??r av typ namnfil"
+ 
+-#: sysdeps/gnu/errlist.c:1391
++#: sysdeps/gnu/errlist.c:1383
+ msgid "Remote I/O error"
+ msgstr "I/O-fel p?? fj??rrmaskin"
+ 
+-#: sysdeps/gnu/errlist.c:1399
++#: sysdeps/gnu/errlist.c:1391
+ msgid "No medium found"
+ msgstr "Inget medium funnet"
+ 
+-#: sysdeps/gnu/errlist.c:1407
++#: sysdeps/gnu/errlist.c:1399
+ msgid "Wrong medium type"
+ msgstr "Fel medietyp"
+ 
+-#: sysdeps/gnu/errlist.c:1415
++#: sysdeps/gnu/errlist.c:1407
+ msgid "Required key not available"
+ msgstr "Obligatorisk nyckel inte tillg??nglig"
+ 
+-#: sysdeps/gnu/errlist.c:1423
++#: sysdeps/gnu/errlist.c:1415
+ msgid "Key has expired"
+ msgstr "Nyckeln har g??tt ut"
+ 
+-#: sysdeps/gnu/errlist.c:1431
++#: sysdeps/gnu/errlist.c:1423
+ msgid "Key has been revoked"
+ msgstr "Nyckeln har ??terkallats"
+ 
+-#: sysdeps/gnu/errlist.c:1439
++#: sysdeps/gnu/errlist.c:1431
+ msgid "Key was rejected by service"
+ msgstr "Nyckeln accepterades inte av tj??nsten"
+ 
+-#: sysdeps/gnu/errlist.c:1447
++#: sysdeps/gnu/errlist.c:1439
+ msgid "Owner died"
+ msgstr "??garen dog"
+ 
+-#: sysdeps/gnu/errlist.c:1455
++#: sysdeps/gnu/errlist.c:1447
+ msgid "State not recoverable"
+ msgstr "Det g??r inte att ??terh??mta fr??n tillst??ndet"
+ 
+-#: sysdeps/gnu/errlist.c:1463
++#: sysdeps/gnu/errlist.c:1455
+ msgid "Operation not possible due to RF-kill"
+ msgstr "Operationen inte m??jlig p.g.a. RF-kill"
+ 
+-#: sysdeps/gnu/errlist.c:1471
++#: sysdeps/gnu/errlist.c:1463
+ msgid "Memory page has hardware error"
+ msgstr "Minnessida har h??rdvarufel"
+ 
+@@ -6767,73 +6733,90 @@ msgstr "kan inte ??ppna \"%s\""
+ msgid "cannot read header from `%s'"
+ msgstr "kan inte l??sa huvud fr??n \"%s\""
+ 
+-#: timezone/zdump.c:494
++#: timezone/zdump.c:338
+ msgid "has fewer than 3 characters"
+ msgstr "har f??rre ??n 3 tecken"
+ 
+-#: timezone/zdump.c:496
++#: timezone/zdump.c:340
+ msgid "has more than 6 characters"
+ msgstr "har fler ??n 6 tecken"
+ 
+-#: timezone/zdump.c:498
++#: timezone/zdump.c:342
+ msgid "has characters other than ASCII alphanumerics, '-' or '+'"
+ msgstr "har andra tecken ??n ASCII alfanumeriska, ???-??? eller ???+???"
+ 
+-#: timezone/zdump.c:503
++#: timezone/zdump.c:347
+ #, c-format
+ msgid "%s: warning: zone \"%s\" abbreviation \"%s\" %s\n"
+ msgstr "%s: varning: zon \"%s\" f??rkortning \"%s\": %s\n"
+ 
+-#: timezone/zdump.c:553
++#: timezone/zdump.c:393
+ #, c-format
+ msgid ""
+-"%s: usage: %s [--version] [--help] [-{vV}] [-{ct} [lo,]hi] zonename ...\n"
++"%s: usage: %s OPTIONS ZONENAME ...\n"
++"Options include:\n"
++"  -c [L,]U   Start at year L (default -500), end before year U (default 2500)\n"
++"  -t [L,]U   Start at time L, end before time U (in seconds since 1970)\n"
++"  -i         List transitions briefly (format is experimental)\n"
++"  -v         List transitions verbosely\n"
++"  -V         List transitions a bit less verbosely\n"
++"  --help     Output this help\n"
++"  --version  Output version info\n"
+ "\n"
+ "Report bugs to %s.\n"
+ msgstr ""
+-"%s: anv??ndning: %s [ --version ] [ --help ] [ -{vV} ] [ -{ct} [start,]slut] zonnamn ...\n"
++"%s: anv??ndning: %s FLAGGOR ZONNAMN ???\n"
++"Flaggorna inkluderar:\n"
++"  -c [L,]??   Starta vid ??r L (standard -500), och sluta f??re ??r ?? (standard 2500)\n"
++"  -t [L,]??   Starta vid tid L, och sluta f??re tid ?? (i sekunder sedan 1970)\n"
++"  -i         Lista ??verg??ngar kort (formatet ??r experimentellt)\n"
++"  -v         Lista ??verg??ngar utf??rligt\n"
++"  -V         Lista ??verg??ngar lite mindre utf??rligt\n"
++"  --help     Skriv ut denna hj??lp\n"
++"  --version  Skriv ut versionsinformation\n"
++"\n"
+ "Rapportera fel till %s.\n"
+ "Rapportera fel eller synpunkter p?? ??vers??ttningen till <tp-sv at listor.tp-sv.se>.\n"
+ 
+-#: timezone/zdump.c:635
++#: timezone/zdump.c:479
+ #, c-format
+ msgid "%s: wild -c argument %s\n"
+ msgstr "%s: argument \"%s\" till flaggan -c har fel format\n"
+ 
+-#: timezone/zdump.c:668
++#: timezone/zdump.c:512
+ #, c-format
+ msgid "%s: wild -t argument %s\n"
+ msgstr "%s: argument \"%s\" till flaggan -t har fel format\n"
+ 
+-#: timezone/zic.c:361
++#: timezone/zic.c:398
+ #, c-format
+ msgid "%s: Memory exhausted: %s\n"
+ msgstr "%s: Minnet slut: %s\n"
+ 
+-#: timezone/zic.c:369
++#: timezone/zic.c:406
+ msgid "size overflow"
+ msgstr "f??r stor storlek"
+ 
+-#: timezone/zic.c:416
+-msgid "int overflow"
+-msgstr "f??r stort heltal"
++#: timezone/zic.c:454
++msgid "integer overflow"
++msgstr "heltalsspill"
+ 
+-#: timezone/zic.c:451
++#: timezone/zic.c:488
+ #, c-format
+-msgid "\"%s\", line %d: "
+-msgstr "\"%s\", rad %d: "
++msgid "\"%s\", line %<PRIdMAX>: "
++msgstr "???%s???, rad %<PRIdMAX>: "
+ 
+-#: timezone/zic.c:454
++#: timezone/zic.c:491
+ #, c-format
+-msgid " (rule from \"%s\", line %d)"
+-msgstr " (regel fr??n \"%s\", rad %d)"
++msgid " (rule from \"%s\", line %<PRIdMAX>)"
++msgstr " (regel fr??n ???%s???, rad %<PRIdMAX>)"
+ 
+-#: timezone/zic.c:473
++#: timezone/zic.c:510
+ #, c-format
+ msgid "warning: "
+ msgstr "varning: "
+ 
+-#: timezone/zic.c:498
++#: timezone/zic.c:535
+ #, c-format
+ msgid ""
+ "%s: usage is %s [ --version ] [ --help ] [ -v ] \\\n"
+@@ -6849,361 +6832,382 @@ msgstr ""
+ "Rapportera fel till %s.\n"
+ "Rapportera fel eller synpunkter p?? ??vers??ttningen till <tp-sv at listor.tp-sv.se>.\n"
+ 
+-#: timezone/zic.c:534
++#: timezone/zic.c:558
++#, c-format
++msgid "%s: Can't chdir to %s: %s\n"
++msgstr "%s: Kan inte byta katalog till %s: %s\n"
++
++#: timezone/zic.c:590
+ msgid "wild compilation-time specification of zic_t"
+ msgstr "definitionen av zic_t vid kompilering ??r orimlig"
+ 
+-#: timezone/zic.c:554
++#: timezone/zic.c:610
+ #, c-format
+ msgid "%s: More than one -d option specified\n"
+ msgstr "%s: Flaggan -d given mer ??n en g??ng\n"
+ 
+-#: timezone/zic.c:564
++#: timezone/zic.c:620
+ #, c-format
+ msgid "%s: More than one -l option specified\n"
+ msgstr "%s: Flaggan -l given mer ??n en g??ng\n"
+ 
+-#: timezone/zic.c:574
++#: timezone/zic.c:630
+ #, c-format
+ msgid "%s: More than one -p option specified\n"
+ msgstr "%s: Flaggan -p given mer ??n en g??ng\n"
+ 
+-#: timezone/zic.c:584
++#: timezone/zic.c:640
+ #, c-format
+ msgid "%s: More than one -y option specified\n"
+ msgstr "%s: Flaggan -y given mer ??n en g??ng\n"
+ 
+-#: timezone/zic.c:594
++#: timezone/zic.c:650
+ #, c-format
+ msgid "%s: More than one -L option specified\n"
+ msgstr "%s: Flaggan -L given mer ??n en g??ng\n"
+ 
+-#: timezone/zic.c:603
++#: timezone/zic.c:659
+ msgid "-s ignored"
+ msgstr "-s ignoreras"
+ 
+-#: timezone/zic.c:641
++#: timezone/zic.c:698
+ msgid "link to link"
+ msgstr "l??nk till l??nk"
+ 
+-#: timezone/zic.c:644 timezone/zic.c:648
++#: timezone/zic.c:701 timezone/zic.c:705
+ msgid "command line"
+ msgstr "kommandorad"
+ 
+-#: timezone/zic.c:664
++#: timezone/zic.c:721
+ msgid "empty file name"
+ msgstr "tomt filnamn"
+ 
+-#: timezone/zic.c:667
++#: timezone/zic.c:724
+ #, c-format
+ msgid "file name '%s' begins with '/'"
+ msgstr "filnamnet ???%s??? b??rjar med ???/???"
+ 
+-#: timezone/zic.c:676
++#: timezone/zic.c:734
+ #, c-format
+ msgid "file name '%s' contains '%.*s' component"
+ msgstr "filnamnet ???%s??? inneh??ller en komponent ???%.*s???"
+ 
+-#: timezone/zic.c:682
++#: timezone/zic.c:740
+ #, c-format
+ msgid "file name '%s' component contains leading '-'"
+ msgstr "en komponent i filnamnet ???%s??? inneh??ller en inledande ???-???"
+ 
+-#: timezone/zic.c:685
++#: timezone/zic.c:743
+ #, c-format
+ msgid "file name '%s' contains overlength component '%.*s...'"
+ msgstr "filnamnet ???%s??? inneh??ller en f??r l??ng komponent ???%.*s??????"
+ 
+-#: timezone/zic.c:713
++#: timezone/zic.c:771
+ #, c-format
+ msgid "file name '%s' contains byte '%c'"
+ msgstr "filnamnet ???%s??? inneh??ller en byte ???%c???"
+ 
+-#: timezone/zic.c:714
++#: timezone/zic.c:772
+ #, c-format
+ msgid "file name '%s' contains byte '\\%o'"
+ msgstr "filnamnet ???%s??? inneh??ller en byte ???\\%o???"
+ 
+-#: timezone/zic.c:757
++#: timezone/zic.c:842
++#, c-format
++msgid "%s: link from %s/%s failed: %s\n"
++msgstr "%s: l??nk fr??n %s/%s misslyckades: %s\n"
++
++#: timezone/zic.c:852 timezone/zic.c:1815
++#, c-format
++msgid "%s: Can't remove %s/%s: %s\n"
++msgstr "%s: Kan inte ta bort %s/%s: %s\n"
++
++#: timezone/zic.c:874
+ #, c-format
+-msgid "%s: link from %s failed: %s"
+-msgstr "%s: l??nk fr??n %s misslyckades: %s"
++msgid "symbolic link used because hard link failed: %s"
++msgstr "symbolisk l??nk anv??nd eftersom en h??rd l??nk misslyckades: %s"
+ 
+-#: timezone/zic.c:792
+-msgid "hard link failed, symbolic link used"
+-msgstr "h??rd l??nk misslyckades, anv??nder symbolisk l??nk"
++#: timezone/zic.c:882
++#, c-format
++msgid "%s: Can't read %s/%s: %s\n"
++msgstr "%s: Kan inte l??sa %s/%s: %s\n"
+ 
+-#: timezone/zic.c:802
++#: timezone/zic.c:889 timezone/zic.c:1828
+ #, c-format
+-msgid "%s: Can't read %s: %s\n"
+-msgstr "%s: Kan inte l??sa %s: %s\n"
++msgid "%s: Can't create %s/%s: %s\n"
++msgstr "%s: Kan inte skapa %s/%s: %s\n"
+ 
+-#: timezone/zic.c:810 timezone/zic.c:1701
++#: timezone/zic.c:898
+ #, c-format
+-msgid "%s: Can't create %s: %s\n"
+-msgstr "%s: Kan inte skapa %s: %s\n"
++msgid "copy used because hard link failed: %s"
++msgstr "kopiering anv??nd eftersom en h??rd l??nk misslyckades: %s"
+ 
+-#: timezone/zic.c:818
+-msgid "link failed, copy used"
+-msgstr "l??nka misslyckades, kopia skapad"
++#: timezone/zic.c:901
++#, c-format
++msgid "copy used because symbolic link failed: %s"
++msgstr "kopiering anv??nd eftersom en symbolisk l??nk misslyckades: %s"
+ 
+-#: timezone/zic.c:913 timezone/zic.c:915
++#: timezone/zic.c:1013 timezone/zic.c:1015
+ msgid "same rule name in multiple files"
+ msgstr "samma regelnamn i flera filer"
+ 
+-#: timezone/zic.c:956
++#: timezone/zic.c:1056
+ msgid "unruly zone"
+ msgstr "besv??rlig zon"
+ 
+-#: timezone/zic.c:963
++#: timezone/zic.c:1063
+ #, c-format
+ msgid "%s in ruleless zone"
+ msgstr "%s i zon utan regler"
+ 
+-#: timezone/zic.c:983
++#: timezone/zic.c:1083
+ msgid "standard input"
+ msgstr "standard in"
+ 
+-#: timezone/zic.c:988
++#: timezone/zic.c:1088
+ #, c-format
+ msgid "%s: Can't open %s: %s\n"
+ msgstr "%s: Kan inte ??ppna %s: %s\n"
+ 
+-#: timezone/zic.c:999
++#: timezone/zic.c:1099
+ msgid "line too long"
+ msgstr "f??r l??ng rad"
+ 
+-#: timezone/zic.c:1019
++#: timezone/zic.c:1119
+ msgid "input line of unknown type"
+ msgstr "inrad av ok??nd typ"
+ 
+-#: timezone/zic.c:1034
++#: timezone/zic.c:1134
+ #, c-format
+ msgid "%s: Leap line in non leap seconds file %s"
+ msgstr "%s: \"Leap\"-rad i fil %s som inte ??r skottsekundsfil"
+ 
+-#: timezone/zic.c:1042 timezone/zic.c:1447 timezone/zic.c:1469
++#: timezone/zic.c:1142 timezone/zic.c:1547 timezone/zic.c:1569
+ #, c-format
+ msgid "%s: panic: Invalid l_value %d\n"
+ msgstr "%s: panik: Ogiltigt l_value %d\n"
+ 
+-#: timezone/zic.c:1051
++#: timezone/zic.c:1151
+ msgid "expected continuation line not found"
+ msgstr "f??rv??ntad forts??ttningsrad inte funnen"
+ 
+-#: timezone/zic.c:1093 timezone/zic.c:2826
++#: timezone/zic.c:1193 timezone/zic.c:2976
+ msgid "time overflow"
+ msgstr "f??r stort tidsv??rde"
+ 
+-#: timezone/zic.c:1098
++#: timezone/zic.c:1198
+ msgid "values over 24 hours not handled by pre-2007 versions of zic"
+ msgstr "v??rden st??rre ??n 24 timmar hanteras inte av zic-versioner f??re 2007"
+ 
+-#: timezone/zic.c:1109
++#: timezone/zic.c:1209
+ msgid "wrong number of fields on Rule line"
+ msgstr "fel antal f??lt p?? \"Rule\"-rad"
+ 
+-#: timezone/zic.c:1113
++#: timezone/zic.c:1213
+ msgid "nameless rule"
+ msgstr "namnl??s regel"
+ 
+-#: timezone/zic.c:1118
++#: timezone/zic.c:1218
+ msgid "invalid saved time"
+ msgstr "ogiltig sparad tid"
+ 
+-#: timezone/zic.c:1135
++#: timezone/zic.c:1235
+ msgid "wrong number of fields on Zone line"
+ msgstr "fel antal f??lt p?? \"Zone\"-rad"
+ 
+-#: timezone/zic.c:1140
++#: timezone/zic.c:1240
+ #, c-format
+ msgid "\"Zone %s\" line and -l option are mutually exclusive"
+ msgstr "\"Zone %s\"-rad och flaggan -l ??r ??msesidigt uteslutande"
+ 
+-#: timezone/zic.c:1146
++#: timezone/zic.c:1246
+ #, c-format
+ msgid "\"Zone %s\" line and -p option are mutually exclusive"
+ msgstr "\"Zone %s\"-rad och flaggan -p ??r ??msesidigt uteslutande"
+ 
+-#: timezone/zic.c:1154
++#: timezone/zic.c:1253
+ #, c-format
+-msgid "duplicate zone name %s (file \"%s\", line %d)"
+-msgstr "dubblerat zonnamn %s (fil \"%s\", rad %d)"
++msgid "duplicate zone name %s (file \"%s\", line %<PRIdMAX>)"
++msgstr "dubblerat zonnamn %s (filen ???%s???, rad %<PRIdMAX>)"
+ 
+-#: timezone/zic.c:1167
++#: timezone/zic.c:1267
+ msgid "wrong number of fields on Zone continuation line"
+ msgstr "fel antal f??lt p?? \"Zone\"-forts??ttningsrad"
+ 
+-#: timezone/zic.c:1207
++#: timezone/zic.c:1307
+ msgid "invalid UT offset"
+ msgstr "ogiltigt UT-till??gg"
+ 
+-#: timezone/zic.c:1211
++#: timezone/zic.c:1311
+ msgid "invalid abbreviation format"
+ msgstr "ogiltigt f??rkortningsformat"
+ 
+-#: timezone/zic.c:1220
++#: timezone/zic.c:1320
+ #, c-format
+ msgid "format '%s' not handled by pre-2015 versions of zic"
+ msgstr "formatet ???%s??? hanteras inte av versioner av zic f??re 2015"
+ 
+-#: timezone/zic.c:1247
++#: timezone/zic.c:1347
+ msgid "Zone continuation line end time is not after end time of previous line"
+ msgstr "Zon-forts??ttningsradens sluttid ??r inte efter sluttiden p?? f??reg??ende rad"
+ 
+-#: timezone/zic.c:1274
++#: timezone/zic.c:1374
+ msgid "wrong number of fields on Leap line"
+ msgstr "fel antal f??lt p?? \"Leap\"-rad"
+ 
+-#: timezone/zic.c:1283
++#: timezone/zic.c:1383
+ msgid "invalid leaping year"
+ msgstr "ogiltigt skott??r"
+ 
+-#: timezone/zic.c:1303 timezone/zic.c:1401
++#: timezone/zic.c:1403 timezone/zic.c:1501
+ msgid "invalid month name"
+ msgstr "ogiltigt m??nadsnamn"
+ 
+-#: timezone/zic.c:1316 timezone/zic.c:1514 timezone/zic.c:1528
++#: timezone/zic.c:1416 timezone/zic.c:1614 timezone/zic.c:1628
+ msgid "invalid day of month"
+ msgstr "ogiltig dag i m??naden"
+ 
+-#: timezone/zic.c:1321
++#: timezone/zic.c:1421
+ msgid "time too small"
+ msgstr "tid f??r kort"
+ 
+-#: timezone/zic.c:1325
++#: timezone/zic.c:1425
+ msgid "time too large"
+ msgstr "tid f??r l??ng"
+ 
+-#: timezone/zic.c:1329 timezone/zic.c:1430
++#: timezone/zic.c:1429 timezone/zic.c:1530
+ msgid "invalid time of day"
+ msgstr "ogiltig tid p?? dagen"
+ 
+-#: timezone/zic.c:1348
++#: timezone/zic.c:1448
+ msgid "illegal CORRECTION field on Leap line"
+ msgstr "otill??tet \"CORRECTION\"-f??lt p?? \"Leap\"-rad"
+ 
+-#: timezone/zic.c:1353
++#: timezone/zic.c:1453
+ msgid "illegal Rolling/Stationary field on Leap line"
+ msgstr "otill??tet \"Rolling/Stationary\"-f??lt p?? \"Leap\"-rad"
+ 
+-#: timezone/zic.c:1359
++#: timezone/zic.c:1459
+ msgid "leap second precedes Big Bang"
+ msgstr "skottsekund f??reg??r Big Bang"
+ 
+-#: timezone/zic.c:1372
++#: timezone/zic.c:1472
+ msgid "wrong number of fields on Link line"
+ msgstr "fel antal f??lt p?? \"Link\"-rad"
+ 
+-#: timezone/zic.c:1376
++#: timezone/zic.c:1476
+ msgid "blank FROM field on Link line"
+ msgstr "tomt \"FROM\"-f??lt p?? \"Link\"-rad"
+ 
+-#: timezone/zic.c:1451
++#: timezone/zic.c:1551
+ msgid "invalid starting year"
+ msgstr "ogiltigt start??r"
+ 
+-#: timezone/zic.c:1473
++#: timezone/zic.c:1573
+ msgid "invalid ending year"
+ msgstr "ogiltigt slut??r"
+ 
+-#: timezone/zic.c:1477
++#: timezone/zic.c:1577
+ msgid "starting year greater than ending year"
+ msgstr "start??r ??r st??rre ??n slut??r"
+ 
+-#: timezone/zic.c:1484
++#: timezone/zic.c:1584
+ msgid "typed single year"
+ msgstr "satte typ p?? endast ett ??r"
+ 
+-#: timezone/zic.c:1519
++#: timezone/zic.c:1619
+ msgid "invalid weekday name"
+ msgstr "ogiltigt veckodagsnamn"
+ 
+-#: timezone/zic.c:1638
++#: timezone/zic.c:1743
++#, c-format
++msgid "reference clients mishandle more than %d transition times"
++msgstr "referensklienter hanterar fler ??n %d ??verg??ngstider felaktigt"
++
++#: timezone/zic.c:1747
+ msgid "pre-2014 clients may mishandle more than 1200 transition times"
+ msgstr "klienter fr??n f??re 2014 kan hantera fler ??n 1200 ??verg??ngstider felaktigt"
+ 
+-#: timezone/zic.c:1691
+-#, c-format
+-msgid "%s: Can't remove %s: %s\n"
+-msgstr "%s: Kan inte ta bort %s: %s\n"
++#: timezone/zic.c:1858
++msgid "too many transition times"
++msgstr "f??r m??nga ??verg??ngstider"
+ 
+-#: timezone/zic.c:1918
++#: timezone/zic.c:2047
+ #, c-format
+ msgid "%%z UTC offset magnitude exceeds 99:59:59"
+ msgstr "%%z storleken p?? avst??ndet fr??n UTC ??verstiger 99.59.59"
+ 
+-#: timezone/zic.c:2291
++#: timezone/zic.c:2424
+ msgid "no POSIX environment variable for zone"
+ msgstr "ingen POSIX-milj??variabel f??r zon"
+ 
+-#: timezone/zic.c:2297
++#: timezone/zic.c:2430
+ #, c-format
+ msgid "%s: pre-%d clients may mishandle distant timestamps"
+ msgstr "%s: klienter f??re %d kan hantera avl??gsna tidsst??mplar felaktigt"
+ 
+-#: timezone/zic.c:2428
++#: timezone/zic.c:2566
+ msgid "two rules for same instant"
+ msgstr "tv?? regler f??r samma tillf??lle"
+ 
+-#: timezone/zic.c:2485
++#: timezone/zic.c:2627
+ msgid "can't determine time zone abbreviation to use just after until time"
+ msgstr "kan inte avg??ra tidszonsf??rkortning att anv??nda just efter \"until\"-tid"
+ 
+-#: timezone/zic.c:2531 timezone/zic.c:2593
++#: timezone/zic.c:2725
+ msgid "too many local time types"
+ msgstr "f??r m??nga lokala tidstyper"
+ 
+-#: timezone/zic.c:2597
++#: timezone/zic.c:2729
+ msgid "UT offset out of range"
+ msgstr "UT-offset utanf??r giltigt intervall"
+ 
+-#: timezone/zic.c:2621
++#: timezone/zic.c:2753
+ msgid "too many leap seconds"
+ msgstr "f??r m??nga skottsekunder"
+ 
+-#: timezone/zic.c:2627
++#: timezone/zic.c:2759
+ msgid "repeated leap second moment"
+ msgstr "upprepat skottsekundstillf??lle"
+ 
+-#: timezone/zic.c:2677
++#: timezone/zic.c:2830
+ msgid "Wild result from command execution"
+ msgstr "Vilt resultat fr??n kommandok??rning"
+ 
+-#: timezone/zic.c:2678
++#: timezone/zic.c:2831
+ #, c-format
+ msgid "%s: command was '%s', result was %d\n"
+ msgstr "%s: kommandot var \"%s\", resultatet blev %d\n"
+ 
+-#: timezone/zic.c:2810
++#: timezone/zic.c:2961
+ msgid "Odd number of quotation marks"
+ msgstr "Oj??mnt antal citationstecken"
+ 
+-#: timezone/zic.c:2896
++#: timezone/zic.c:3046
+ msgid "use of 2/29 in non leap-year"
+ msgstr "anv??nder 29/2 i icke-skott??r"
+ 
+-#: timezone/zic.c:2931
++#: timezone/zic.c:3081
+ msgid "rule goes past start/end of month; will not work with pre-2004 versions of zic"
+ msgstr "regeln g??r utanf??r start/slut p?? m??nad; fungerar inte med versioner av zic f??re 2004"
+ 
+-#: timezone/zic.c:2958
++#: timezone/zic.c:3108
+ msgid "time zone abbreviation has fewer than 3 characters"
+ msgstr "tidszonsf??rkortning har f??rre ??n 3 tecken"
+ 
+-#: timezone/zic.c:2960
++#: timezone/zic.c:3110
+ msgid "time zone abbreviation has too many characters"
+ msgstr "tidszonsf??rkortning har f??r m??nga tecken"
+ 
+-#: timezone/zic.c:2962
++#: timezone/zic.c:3112
+ msgid "time zone abbreviation differs from POSIX standard"
+ msgstr "tidszonsf??rkortning skiljer sig fr??n POSIX-standarden"
+ 
+-#: timezone/zic.c:2968
++#: timezone/zic.c:3118
+ msgid "too many, or too long, time zone abbreviations"
+ msgstr "f??r m??nga eller f??r l??nga tidszonsf??rkortningar"
+ 
+-#: timezone/zic.c:3004
++#: timezone/zic.c:3161
+ #, c-format
+ msgid "%s: Can't create directory %s: %s"
+ msgstr "%s: Kan inte skapa katalog %s: %s"
+diff --git a/posix/Makefile b/posix/Makefile
+index 33abcaed7a..d35b7921b1 100644
+--- a/posix/Makefile
++++ b/posix/Makefile
+@@ -45,7 +45,7 @@ routines :=								      \
+ 	getpgid setpgid getpgrp bsd-getpgrp setpgrp getsid setsid	      \
+ 	getresuid getresgid setresuid setresgid				      \
+ 	pathconf sysconf fpathconf					      \
+-	glob glob64 fnmatch regex					      \
++	glob glob64 globfree globfree64 glob_pattern_p fnmatch regex	      \
+ 	confstr								      \
+ 	getopt getopt1 							      \
+ 	sched_setp sched_getp sched_sets sched_gets sched_yield sched_primax  \
+@@ -93,7 +93,7 @@ tests		:= test-errno tstgetopt testfnm runtests runptests \
+ 		   tst-fnmatch3 bug-regex36 tst-getaddrinfo5 \
+ 		   tst-posix_spawn-fd tst-posix_spawn-setsid \
+ 		   tst-posix_fadvise tst-posix_fadvise64 \
+-		   tst-sysconf-empty-chroot
++		   tst-sysconf-empty-chroot tst-glob-tilde
+ tests-internal	:= bug-regex5 bug-regex20 bug-regex33 \
+ 		   tst-rfc3484 tst-rfc3484-2 tst-rfc3484-3
+ xtests		:= bug-ga2
+@@ -141,7 +141,8 @@ tests-special += $(objpfx)bug-regex2-mem.out $(objpfx)bug-regex14-mem.out \
+ 		 $(objpfx)tst-rxspencer-no-utf8-mem.out $(objpfx)tst-pcre-mem.out \
+ 		 $(objpfx)tst-boost-mem.out $(objpfx)tst-getconf.out \
+ 		 $(objpfx)bug-glob2-mem.out $(objpfx)tst-vfork3-mem.out \
+-		 $(objpfx)tst-fnmatch-mem.out $(objpfx)bug-regex36-mem.out
++		 $(objpfx)tst-fnmatch-mem.out $(objpfx)bug-regex36-mem.out \
++		 $(objpfx)tst-glob-tilde-mem.out
+ xtests-special += $(objpfx)bug-ga2-mem.out
+ endif
+ 
+@@ -350,6 +351,12 @@ $(objpfx)bug-glob2-mem.out: $(objpfx)bug-glob2.out
+ 	$(common-objpfx)malloc/mtrace $(objpfx)bug-glob2.mtrace > $@; \
+ 	$(evaluate-test)
+ 
++tst-glob-tilde-ENV = MALLOC_TRACE=$(objpfx)tst-glob-tilde.mtrace
++
++$(objpfx)tst-glob-tilde-mem.out: $(objpfx)tst-glob-tilde.out
++	$(common-objpfx)malloc/mtrace $(objpfx)tst-glob-tilde.mtrace > $@; \
++	$(evaluate-test)
++
+ $(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
+ 			    $(objpfx)getconf.speclist FORCE
+ 	$(addprefix $(..)./scripts/mkinstalldirs ,\
+diff --git a/posix/flexmember.h b/posix/flexmember.h
+new file mode 100644
+index 0000000000..107c1f09e9
+--- /dev/null
++++ b/posix/flexmember.h
+@@ -0,0 +1,45 @@
++/* Sizes of structs with flexible array members.
++
++   Copyright 2016-2017 Free Software Foundation, Inc.
++
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.
++
++   Written by Paul Eggert.  */
++
++#include <stddef.h>
++
++/* Nonzero multiple of alignment of TYPE, suitable for FLEXSIZEOF below.
++   On older platforms without _Alignof, use a pessimistic bound that is
++   safe in practice even if FLEXIBLE_ARRAY_MEMBER is 1.
++   On newer platforms, use _Alignof to get a tighter bound.  */
++
++#if !defined __STDC_VERSION__ || __STDC_VERSION__ < 201112
++# define FLEXALIGNOF(type) (sizeof (type) & ~ (sizeof (type) - 1))
++#else
++# define FLEXALIGNOF(type) _Alignof (type)
++#endif
++
++/* Upper bound on the size of a struct of type TYPE with a flexible
++   array member named MEMBER that is followed by N bytes of other data.
++   This is not simply sizeof (TYPE) + N, since it may require
++   alignment on unusually picky C11 platforms, and
++   FLEXIBLE_ARRAY_MEMBER may be 1 on pre-C11 platforms.
++   Yield a value less than N if and only if arithmetic overflow occurs.  */
++
++#define FLEXSIZEOF(type, member, n) \
++   ((offsetof (type, member) + FLEXALIGNOF (type) - 1 + (n)) \
++    & ~ (FLEXALIGNOF (type) - 1))
+diff --git a/posix/glob.c b/posix/glob.c
+index c653809118..b2273ea7bc 100644
+--- a/posix/glob.c
++++ b/posix/glob.c
+@@ -15,7 +15,7 @@
+    License along with the GNU C Library; if not, see
+    <http://www.gnu.org/licenses/>.  */
+ 
+-#ifdef	HAVE_CONFIG_H
++#ifndef _LIBC
+ # include <config.h>
+ #endif
+ 
+@@ -27,29 +27,15 @@
+ #include <stdbool.h>
+ #include <stddef.h>
+ #include <stdint.h>
+-
+-/* Outcomment the following line for production quality code.  */
+-/* #define NDEBUG 1 */
+ #include <assert.h>
++#include <unistd.h>
+ 
+-#include <stdio.h>		/* Needed on stupid SunOS for assert.  */
+-
+-#if !defined _LIBC || !defined GLOB_ONLY_P
+-#if defined HAVE_UNISTD_H || defined _LIBC
+-# include <unistd.h>
+-# ifndef POSIX
+-#  ifdef _POSIX_VERSION
+-#   define POSIX
+-#  endif
+-# endif
++#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
++# define WINDOWS32
+ #endif
+ 
+-#include <pwd.h>
+-
+-#if defined HAVE_STDINT_H || defined _LIBC
+-# include <stdint.h>
+-#elif !defined UINTPTR_MAX
+-# define UINTPTR_MAX (~((size_t) 0))
++#ifndef WINDOWS32
++# include <pwd.h>
+ #endif
+ 
+ #include <errno.h>
+@@ -57,24 +43,7 @@
+ # define __set_errno(val) errno = (val)
+ #endif
+ 
+-#if defined HAVE_DIRENT_H || defined __GNU_LIBRARY__
+-# include <dirent.h>
+-#else
+-# define dirent direct
+-# ifdef HAVE_SYS_NDIR_H
+-#  include <sys/ndir.h>
+-# endif
+-# ifdef HAVE_SYS_DIR_H
+-#  include <sys/dir.h>
+-# endif
+-# ifdef HAVE_NDIR_H
+-#  include <ndir.h>
+-# endif
+-# ifdef HAVE_VMSDIR_H
+-#  include "vmsdir.h"
+-# endif /* HAVE_VMSDIR_H */
+-#endif
+-
++#include <dirent.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <alloca.h>
+@@ -87,27 +56,29 @@
+ # define opendir(name) __opendir (name)
+ # define readdir(str) __readdir64 (str)
+ # define getpwnam_r(name, bufp, buf, len, res) \
+-   __getpwnam_r (name, bufp, buf, len, res)
++    __getpwnam_r (name, bufp, buf, len, res)
+ # ifndef __stat64
+ #  define __stat64(fname, buf) __xstat64 (_STAT_VER, fname, buf)
+ # endif
+ # define struct_stat64		struct stat64
++# define FLEXIBLE_ARRAY_MEMBER
+ #else /* !_LIBC */
+-# include "getlogin_r.h"
+-# include "mempcpy.h"
+-# include "stat-macros.h"
+-# include "strdup.h"
+-# define __stat64(fname, buf)	stat (fname, buf)
+-# define struct_stat64		struct stat
+-# define __stat(fname, buf)	stat (fname, buf)
+-# define __alloca		alloca
+-# define __readdir		readdir
+-# define __readdir64		readdir64
+-# define __glob_pattern_p	glob_pattern_p
++# define __getlogin_r(buf, len) getlogin_r (buf, len)
++# define __stat64(fname, buf)   stat (fname, buf)
++# define __fxstatat64(_, d, f, st, flag) fstatat (d, f, st, flag)
++# define struct_stat64          struct stat
++# ifndef __MVS__
++#  define __alloca              alloca
++# endif
++# define __readdir              readdir
++# define COMPILE_GLOB64
+ #endif /* _LIBC */
+ 
+ #include <fnmatch.h>
+ 
++#include <flexmember.h>
++#include <glob_internal.h>
++
+ #ifdef _SC_GETPW_R_SIZE_MAX
+ # define GETPW_R_SIZE_MAX()	sysconf (_SC_GETPW_R_SIZE_MAX)
+ #else
+@@ -121,61 +92,59 @@
+ 
+ static const char *next_brace_sub (const char *begin, int flags) __THROWNL;
+ 
++typedef uint_fast8_t dirent_type;
++
++#if !defined _LIBC && !defined HAVE_STRUCT_DIRENT_D_TYPE
++/* Any distinct values will do here.
++   Undef any existing macros out of the way.  */
++# undef DT_UNKNOWN
++# undef DT_DIR
++# undef DT_LNK
++# define DT_UNKNOWN 0
++# define DT_DIR 1
++# define DT_LNK 2
++#endif
++
+ /* A representation of a directory entry which does not depend on the
+    layout of struct dirent, or the size of ino_t.  */
+ struct readdir_result
+ {
+   const char *name;
+-# if defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE
+-  uint8_t type;
+-# endif
++#if defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE
++  dirent_type type;
++#endif
++#if defined _LIBC || defined D_INO_IN_DIRENT
+   bool skip_entry;
++#endif
+ };
+ 
+-# if defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE
+-/* Initializer based on the d_type member of struct dirent.  */
+-#  define D_TYPE_TO_RESULT(source) (source)->d_type,
+-
+-/* True if the directory entry D might be a symbolic link.  */
+-static bool
+-readdir_result_might_be_symlink (struct readdir_result d)
+-{
+-  return d.type == DT_UNKNOWN || d.type == DT_LNK;
+-}
+-
+-/* True if the directory entry D might be a directory.  */
+-static bool
+-readdir_result_might_be_dir (struct readdir_result d)
+-{
+-  return d.type == DT_DIR || readdir_result_might_be_symlink (d);
+-}
+-# else /* defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE */
+-#  define D_TYPE_TO_RESULT(source)
+-
+-/* If we do not have type information, symbolic links and directories
+-   are always a possibility.  */
+-
+-static bool
+-readdir_result_might_be_symlink (struct readdir_result d)
++/* Initialize and return type member of struct readdir_result.  */
++static dirent_type
++readdir_result_type (struct readdir_result d)
+ {
+-  return true;
++#if defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE
++# define D_TYPE_TO_RESULT(source) (source)->d_type,
++  return d.type;
++#else
++# define D_TYPE_TO_RESULT(source)
++  return DT_UNKNOWN;
++#endif
+ }
+ 
++/* Initialize and return skip_entry member of struct readdir_result.  */
+ static bool
+-readdir_result_might_be_dir (struct readdir_result d)
++readdir_result_skip_entry (struct readdir_result d)
+ {
+-  return true;
+-}
+-
+-# endif /* defined _DIRENT_HAVE_D_TYPE || defined HAVE_STRUCT_DIRENT_D_TYPE */
+-
+-# if (defined POSIX || defined WINDOWS32) && !defined __GNU_LIBRARY__
+ /* Initializer for skip_entry.  POSIX does not require that the d_ino
+    field be present, and some systems do not provide it. */
+-#  define D_INO_TO_RESULT(source) false,
+-# else
+-#  define D_INO_TO_RESULT(source) (source)->d_ino == 0,
+-# endif
++#if defined _LIBC || defined D_INO_IN_DIRENT
++# define D_INO_TO_RESULT(source) (source)->d_ino == 0,
++  return d.skip_entry;
++#else
++# define D_INO_TO_RESULT(source)
++  return false;
++#endif
++}
+ 
+ /* Construct an initializer for a struct readdir_result object from a
+    struct dirent *.  No copy of the name is made.  */
+@@ -186,8 +155,6 @@ readdir_result_might_be_dir (struct readdir_result d)
+     D_INO_TO_RESULT (source)		   \
+   }
+ 
+-#endif /* !defined _LIBC || !defined GLOB_ONLY_P */
+-
+ /* Call gl_readdir on STREAM.  This macro can be overridden to reduce
+    type safety if an old interface version needs to be supported.  */
+ #ifndef GL_READDIR
+@@ -225,18 +192,55 @@ convert_dirent64 (const struct dirent64 *source)
+ }
+ #endif
+ 
++#ifndef _LIBC
++/* The results of opendir() in this file are not used with dirfd and fchdir,
++   and we do not leak fds to any single-threaded code that could use stdio,
++   therefore save some unnecessary recursion in fchdir.c and opendir_safer.c.
++   FIXME - if the kernel ever adds support for multi-thread safety for
++   avoiding standard fds, then we should use opendir_safer.  */
++# ifdef GNULIB_defined_opendir
++#  undef opendir
++# endif
++# ifdef GNULIB_defined_closedir
++#  undef closedir
++# endif
+ 
+-#ifndef attribute_hidden
+-# define attribute_hidden
++/* Just use malloc.  */
++# define __libc_use_alloca(n) false
++# define alloca_account(len, avar) ((void) (len), (void) (avar), (void *) 0)
++# define extend_alloca_account(buf, len, newlen, avar) \
++    ((void) (buf), (void) (len), (void) (newlen), (void) (avar), (void *) 0)
+ #endif
+ 
++/* Set *R = A + B.  Return true if the answer is mathematically
++   incorrect due to overflow; in this case, *R is the low order
++   bits of the correct answer.  */
++
++static bool
++size_add_wrapv (size_t a, size_t b, size_t *r)
++{
++#if 5 <= __GNUC__ && !defined __ICC
++  return __builtin_add_overflow (a, b, r);
++#else
++  *r = a + b;
++  return *r < a;
++#endif
++}
++
++static bool
++glob_use_alloca (size_t alloca_used, size_t len)
++{
++  size_t size;
++  return (!size_add_wrapv (alloca_used, len, &size)
++          && __libc_use_alloca (size));
++}
++
+ static int glob_in_dir (const char *pattern, const char *directory,
+ 			int flags, int (*errfunc) (const char *, int),
+ 			glob_t *pglob, size_t alloca_used);
+ extern int __glob_pattern_type (const char *pattern, int quote)
+     attribute_hidden;
+ 
+-#if !defined _LIBC || !defined GLOB_ONLY_P
+ static int prefix_array (const char *prefix, char **array, size_t n) __THROWNL;
+ static int collated_compare (const void *, const void *) __THROWNL;
+ 
+@@ -265,16 +269,15 @@ next_brace_sub (const char *cp, int flags)
+   return *cp != '\0' ? cp : NULL;
+ }
+ 
+-#endif /* !defined _LIBC || !defined GLOB_ONLY_P */
+ 
+ /* Do glob searching for PATTERN, placing results in PGLOB.
+    The bits defined above may be set in FLAGS.
+    If a directory cannot be opened or read and ERRFUNC is not nil,
+    it is called with the pathname that caused the error, and the
+-   `errno' value from the failing call; if it returns non-zero
+-   `glob' returns GLOB_ABORTED; if it returns zero, the error is ignored.
++   'errno' value from the failing call; if it returns non-zero
++   'glob' returns GLOB_ABORTED; if it returns zero, the error is ignored.
+    If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
+-   Otherwise, `glob' returns zero.  */
++   Otherwise, 'glob' returns zero.  */
+ int
+ #ifdef GLOB_ATTRIBUTE
+ GLOB_ATTRIBUTE
+@@ -292,9 +295,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+   int malloc_dirname = 0;
+   glob_t dirs;
+   int retval = 0;
+-#ifdef _LIBC
+   size_t alloca_used = 0;
+-#endif
+ 
+   if (pattern == NULL || pglob == NULL || (flags & ~__GLOB_FLAGS) != 0)
+     {
+@@ -308,7 +309,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+     flags |= GLOB_ONLYDIR;
+ 
+   if (!(flags & GLOB_DOOFFS))
+-    /* Have to do this so `globfree' knows where to start freeing.  It
++    /* Have to do this so 'globfree' knows where to start freeing.  It
+        also makes all the code that uses gl_offs simpler. */
+     pglob->gl_offs = 0;
+ 
+@@ -372,14 +373,12 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	  size_t rest_len;
+ 	  char *onealt;
+ 	  size_t pattern_len = strlen (pattern) - 1;
+-#ifdef _LIBC
+-	  int alloca_onealt = __libc_use_alloca (alloca_used + pattern_len);
++	  int alloca_onealt = glob_use_alloca (alloca_used, pattern_len);
+ 	  if (alloca_onealt)
+ 	    onealt = alloca_account (pattern_len, alloca_used);
+ 	  else
+-#endif
+ 	    {
+-	      onealt = (char *) malloc (pattern_len);
++	      onealt = malloc (pattern_len);
+ 	      if (onealt == NULL)
+ 		return GLOB_NOSPACE;
+ 	    }
+@@ -392,11 +391,9 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	  next = next_brace_sub (begin + 1, flags);
+ 	  if (next == NULL)
+ 	    {
+-	      /* It is an illegal expression.  */
++	      /* It is an invalid expression.  */
+ 	    illegal_brace:
+-#ifdef _LIBC
+ 	      if (__glibc_unlikely (!alloca_onealt))
+-#endif
+ 		free (onealt);
+ 	      flags &= ~GLOB_BRACE;
+ 	      goto no_brace;
+@@ -437,9 +434,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	      /* If we got an error, return it.  */
+ 	      if (result && result != GLOB_NOMATCH)
+ 		{
+-#ifdef _LIBC
+ 		  if (__glibc_unlikely (!alloca_onealt))
+-#endif
+ 		    free (onealt);
+ 		  if (!(flags & GLOB_APPEND))
+ 		    {
+@@ -458,9 +453,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	      assert (next != NULL);
+ 	    }
+ 
+-#ifdef _LIBC
+ 	  if (__glibc_unlikely (!alloca_onealt))
+-#endif
+ 	    free (onealt);
+ 
+ 	  if (pglob->gl_pathc != firstc)
+@@ -476,14 +469,16 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 
+   /* Find the filename.  */
+   filename = strrchr (pattern, '/');
++
+ #if defined __MSDOS__ || defined WINDOWS32
+-  /* The case of "d:pattern".  Since `:' is not allowed in
++  /* The case of "d:pattern".  Since ':' is not allowed in
+      file names, we can safely assume that wherever it
+      happens in pattern, it signals the filename part.  This
+      is so we could some day support patterns like "[a-z]:foo".  */
+   if (filename == NULL)
+     filename = strchr (pattern, ':');
+ #endif /* __MSDOS__ || WINDOWS32 */
++
+   dirname_modified = 0;
+   if (filename == NULL)
+     {
+@@ -508,11 +503,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	    }
+ 
+ 	  filename = pattern;
+-#ifdef _AMIGA
+-	  dirname = (char *) "";
+-#else
+ 	  dirname = (char *) ".";
+-#endif
+ 	  dirlen = 0;
+ 	}
+     }
+@@ -536,22 +527,21 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	  char *drive_spec;
+ 
+ 	  ++dirlen;
+-	  drive_spec = (char *) __alloca (dirlen + 1);
++	  drive_spec = __alloca (dirlen + 1);
+ 	  *((char *) mempcpy (drive_spec, pattern, dirlen)) = '\0';
+ 	  /* For now, disallow wildcards in the drive spec, to
+ 	     prevent infinite recursion in glob.  */
+ 	  if (__glob_pattern_p (drive_spec, !(flags & GLOB_NOESCAPE)))
+ 	    return GLOB_NOMATCH;
+-	  /* If this is "d:pattern", we need to copy `:' to DIRNAME
++	  /* If this is "d:pattern", we need to copy ':' to DIRNAME
+ 	     as well.  If it's "d:/pattern", don't remove the slash
+ 	     from "d:/", since "d:" and "d:/" are not the same.*/
+ 	}
+ #endif
+-#ifdef _LIBC
+-      if (__libc_use_alloca (alloca_used + dirlen + 1))
++
++      if (glob_use_alloca (alloca_used, dirlen + 1))
+ 	newp = alloca_account (dirlen + 1, alloca_used);
+       else
+-#endif
+ 	{
+ 	  newp = malloc (dirlen + 1);
+ 	  if (newp == NULL)
+@@ -562,14 +552,17 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+       dirname = newp;
+       ++filename;
+ 
+-      if (filename[0] == '\0'
+ #if defined __MSDOS__ || defined WINDOWS32
+-	  && dirname[dirlen - 1] != ':'
+-	  && (dirlen < 3 || dirname[dirlen - 2] != ':'
+-	      || dirname[dirlen - 1] != '/')
++      bool drive_root = (dirlen > 1
++                         && (dirname[dirlen - 1] == ':'
++                             || (dirlen > 2 && dirname[dirlen - 2] == ':'
++                                 && dirname[dirlen - 1] == '/')));
++#else
++      bool drive_root = false;
+ #endif
+-	  && dirlen > 1)
+-	/* "pattern/".  Expand "pattern", appending slashes.  */
++
++      if (filename[0] == '\0' && dirlen > 1 && !drive_root)
++        /* "pattern/".  Expand "pattern", appending slashes.  */
+ 	{
+ 	  int orig_flags = flags;
+ 	  if (!(flags & GLOB_NOESCAPE) && dirname[dirlen - 1] == '\\')
+@@ -602,7 +595,6 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	}
+     }
+ 
+-#ifndef VMS
+   if ((flags & (GLOB_TILDE|GLOB_TILDE_CHECK)) && dirname[0] == '~')
+     {
+       if (dirname[1] == '\0' || dirname[1] == '/'
+@@ -612,100 +604,127 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	  /* Look up home directory.  */
+ 	  char *home_dir = getenv ("HOME");
+ 	  int malloc_home_dir = 0;
+-# ifdef _AMIGA
+-	  if (home_dir == NULL || home_dir[0] == '\0')
+-	    home_dir = "SYS:";
+-# else
+-#  ifdef WINDOWS32
+-	  if (home_dir == NULL || home_dir[0] == '\0')
+-	    home_dir = "c:/users/default"; /* poor default */
+-#  else
+ 	  if (home_dir == NULL || home_dir[0] == '\0')
+ 	    {
++#ifdef WINDOWS32
++	      /* Windows NT defines HOMEDRIVE and HOMEPATH.  But give
++		 preference to HOME, because the user can change HOME.  */
++	      const char *home_drive = getenv ("HOMEDRIVE");
++	      const char *home_path = getenv ("HOMEPATH");
++
++	      if (home_drive != NULL && home_path != NULL)
++		{
++		  size_t home_drive_len = strlen (home_drive);
++		  size_t home_path_len = strlen (home_path);
++		  char *mem = alloca (home_drive_len + home_path_len + 1);
++
++		  memcpy (mem, home_drive, home_drive_len);
++		  memcpy (mem + home_drive_len, home_path, home_path_len + 1);
++		  home_dir = mem;
++		}
++	      else
++		home_dir = "c:/users/default"; /* poor default */
++#else
+ 	      int success;
+ 	      char *name;
++	      int malloc_name = 0;
+ 	      size_t buflen = GET_LOGIN_NAME_MAX () + 1;
+ 
+ 	      if (buflen == 0)
+-		/* `sysconf' does not support _SC_LOGIN_NAME_MAX.  Try
++		/* 'sysconf' does not support _SC_LOGIN_NAME_MAX.  Try
+ 		   a moderate value.  */
+ 		buflen = 20;
+-	      name = alloca_account (buflen, alloca_used);
++	      if (glob_use_alloca (alloca_used, buflen))
++		name = alloca_account (buflen, alloca_used);
++	      else
++		{
++		  name = malloc (buflen);
++		  if (name == NULL)
++		    {
++		      retval = GLOB_NOSPACE;
++		      goto out;
++		    }
++		  malloc_name = 1;
++		}
+ 
+ 	      success = __getlogin_r (name, buflen) == 0;
+ 	      if (success)
+ 		{
+ 		  struct passwd *p;
+-#   if defined HAVE_GETPWNAM_R || defined _LIBC
+-		  long int pwbuflen = GETPW_R_SIZE_MAX ();
++		  char *malloc_pwtmpbuf = NULL;
+ 		  char *pwtmpbuf;
++# if defined HAVE_GETPWNAM_R || defined _LIBC
++		  long int pwbuflenmax = GETPW_R_SIZE_MAX ();
++		  size_t pwbuflen = pwbuflenmax;
+ 		  struct passwd pwbuf;
+-		  int malloc_pwtmpbuf = 0;
+ 		  int save = errno;
+ 
+-#    ifndef _LIBC
+-		  if (pwbuflen == -1)
+-		    /* `sysconf' does not support _SC_GETPW_R_SIZE_MAX.
++#  ifndef _LIBC
++		  if (! (0 < pwbuflenmax && pwbuflenmax <= SIZE_MAX))
++		    /* 'sysconf' does not support _SC_GETPW_R_SIZE_MAX.
+ 		       Try a moderate value.  */
+ 		    pwbuflen = 1024;
+-#    endif
+-		  if (__libc_use_alloca (alloca_used + pwbuflen))
++#  endif
++		  if (glob_use_alloca (alloca_used, pwbuflen))
+ 		    pwtmpbuf = alloca_account (pwbuflen, alloca_used);
+ 		  else
+ 		    {
+ 		      pwtmpbuf = malloc (pwbuflen);
+ 		      if (pwtmpbuf == NULL)
+ 			{
++			  if (__glibc_unlikely (malloc_name))
++			    free (name);
+ 			  retval = GLOB_NOSPACE;
+ 			  goto out;
+ 			}
+-		      malloc_pwtmpbuf = 1;
++		      malloc_pwtmpbuf = pwtmpbuf;
+ 		    }
+ 
+ 		  while (getpwnam_r (name, &pwbuf, pwtmpbuf, pwbuflen, &p)
+ 			 != 0)
+ 		    {
++		      size_t newlen;
++		      bool v;
+ 		      if (errno != ERANGE)
+ 			{
+ 			  p = NULL;
+ 			  break;
+ 			}
+-
+-		      if (!malloc_pwtmpbuf
+-			  && __libc_use_alloca (alloca_used
+-						+ 2 * pwbuflen))
++		      v = size_add_wrapv (pwbuflen, pwbuflen, &newlen);
++		      if (!v && malloc_pwtmpbuf == NULL
++			  && glob_use_alloca (alloca_used, newlen))
+ 			pwtmpbuf = extend_alloca_account (pwtmpbuf, pwbuflen,
+-							  2 * pwbuflen,
+-							  alloca_used);
++							  newlen, alloca_used);
+ 		      else
+ 			{
+-			  char *newp = realloc (malloc_pwtmpbuf
+-						? pwtmpbuf : NULL,
+-						2 * pwbuflen);
++			  char *newp = (v ? NULL
++					: realloc (malloc_pwtmpbuf, newlen));
+ 			  if (newp == NULL)
+ 			    {
+-			      if (__glibc_unlikely (malloc_pwtmpbuf))
+-				free (pwtmpbuf);
++			      free (malloc_pwtmpbuf);
++			      if (__glibc_unlikely (malloc_name))
++				free (name);
+ 			      retval = GLOB_NOSPACE;
+ 			      goto out;
+ 			    }
+-			  pwtmpbuf = newp;
+-			  pwbuflen = 2 * pwbuflen;
+-			  malloc_pwtmpbuf = 1;
++			  malloc_pwtmpbuf = pwtmpbuf = newp;
+ 			}
++		      pwbuflen = newlen;
+ 		      __set_errno (save);
+ 		    }
+-#   else
++# else
+ 		  p = getpwnam (name);
+-#   endif
++# endif
++		  if (__glibc_unlikely (malloc_name))
++		    free (name);
+ 		  if (p != NULL)
+ 		    {
+-		      if (!malloc_pwtmpbuf)
++		      if (malloc_pwtmpbuf == NULL)
+ 			home_dir = p->pw_dir;
+ 		      else
+ 			{
+ 			  size_t home_dir_len = strlen (p->pw_dir) + 1;
+-			  if (__libc_use_alloca (alloca_used + home_dir_len))
++			  if (glob_use_alloca (alloca_used, home_dir_len))
+ 			    home_dir = alloca_account (home_dir_len,
+ 						       alloca_used);
+ 			  else
+@@ -720,26 +739,32 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 			      malloc_home_dir = 1;
+ 			    }
+ 			  memcpy (home_dir, p->pw_dir, home_dir_len);
+-
+-			  free (pwtmpbuf);
+ 			}
+ 		    }
++		  free (malloc_pwtmpbuf);
+ 		}
++	      else
++		{
++		  if (__glibc_unlikely (malloc_name))
++		    free (name);
++		}
++#endif /* WINDOWS32 */
+ 	    }
+ 	  if (home_dir == NULL || home_dir[0] == '\0')
+ 	    {
++	      if (__glibc_unlikely (malloc_home_dir))
++		free (home_dir);
+ 	      if (flags & GLOB_TILDE_CHECK)
+ 		{
+-		  if (__glibc_unlikely (malloc_home_dir))
+-		    free (home_dir);
+ 		  retval = GLOB_NOMATCH;
+ 		  goto out;
+ 		}
+ 	      else
+-		home_dir = (char *) "~"; /* No luck.  */
++		{
++		  home_dir = (char *) "~"; /* No luck.  */
++		  malloc_home_dir = 0;
++		}
+ 	    }
+-#  endif /* WINDOWS32 */
+-# endif
+ 	  /* Now construct the full directory.  */
+ 	  if (dirname[1] == '\0')
+ 	    {
+@@ -754,8 +779,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	    {
+ 	      char *newp;
+ 	      size_t home_len = strlen (home_dir);
+-	      int use_alloca = __libc_use_alloca (alloca_used
+-						  + home_len + dirlen);
++	      int use_alloca = glob_use_alloca (alloca_used, home_len + dirlen);
+ 	      if (use_alloca)
+ 		newp = alloca_account (home_len + dirlen, alloca_used);
+ 	      else
+@@ -779,12 +803,15 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	      dirname = newp;
+ 	      dirlen += home_len - 1;
+ 	      malloc_dirname = !use_alloca;
++
++	      if (__glibc_unlikely (malloc_home_dir))
++		free (home_dir);
+ 	    }
+ 	  dirname_modified = 1;
+ 	}
+-# if !defined _AMIGA && !defined WINDOWS32
+       else
+ 	{
++#ifndef WINDOWS32
+ 	  char *end_name = strchr (dirname, '/');
+ 	  char *user_name;
+ 	  int malloc_user_name = 0;
+@@ -806,7 +833,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	  else
+ 	    {
+ 	      char *newp;
+-	      if (__libc_use_alloca (alloca_used + (end_name - dirname)))
++	      if (glob_use_alloca (alloca_used, end_name - dirname))
+ 		newp = alloca_account (end_name - dirname, alloca_used);
+ 	      else
+ 		{
+@@ -823,11 +850,11 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 		  char *p = mempcpy (newp, dirname + 1,
+ 				     unescape - dirname - 1);
+ 		  char *q = unescape;
+-		  while (*q != '\0')
++		  while (q != end_name)
+ 		    {
+ 		      if (*q == '\\')
+ 			{
+-			  if (q[1] == '\0')
++			  if (q + 1 == end_name)
+ 			    {
+ 			      /* "~fo\\o\\" unescape to user_name "foo\\",
+ 				 but "~fo\\o\\/" unescape to user_name
+@@ -843,7 +870,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 		  *p = '\0';
+ 		}
+ 	      else
+-		*((char *) mempcpy (newp, dirname + 1, end_name - dirname))
++		*((char *) mempcpy (newp, dirname + 1, end_name - dirname - 1))
+ 		  = '\0';
+ 	      user_name = newp;
+ 	    }
+@@ -851,20 +878,21 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	  /* Look up specific user's home directory.  */
+ 	  {
+ 	    struct passwd *p;
++	    char *malloc_pwtmpbuf = NULL;
+ #  if defined HAVE_GETPWNAM_R || defined _LIBC
+-	    long int buflen = GETPW_R_SIZE_MAX ();
++	    long int buflenmax = GETPW_R_SIZE_MAX ();
++	    size_t buflen = buflenmax;
+ 	    char *pwtmpbuf;
+-	    int malloc_pwtmpbuf = 0;
+ 	    struct passwd pwbuf;
+ 	    int save = errno;
+ 
+ #   ifndef _LIBC
+-	    if (buflen == -1)
+-	      /* `sysconf' does not support _SC_GETPW_R_SIZE_MAX.  Try a
++	    if (! (0 <= buflenmax && buflenmax <= SIZE_MAX))
++	      /* Perhaps 'sysconf' does not support _SC_GETPW_R_SIZE_MAX.  Try a
+ 		 moderate value.  */
+ 	      buflen = 1024;
+ #   endif
+-	    if (__libc_use_alloca (alloca_used + buflen))
++	    if (glob_use_alloca (alloca_used, buflen))
+ 	      pwtmpbuf = alloca_account (buflen, alloca_used);
+ 	    else
+ 	      {
+@@ -877,32 +905,32 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 		    retval = GLOB_NOSPACE;
+ 		    goto out;
+ 		  }
+-		malloc_pwtmpbuf = 1;
++		malloc_pwtmpbuf = pwtmpbuf;
+ 	      }
+ 
+ 	    while (getpwnam_r (user_name, &pwbuf, pwtmpbuf, buflen, &p) != 0)
+ 	      {
++		size_t newlen;
++		bool v;
+ 		if (errno != ERANGE)
+ 		  {
+ 		    p = NULL;
+ 		    break;
+ 		  }
+-		if (!malloc_pwtmpbuf
+-		    && __libc_use_alloca (alloca_used + 2 * buflen))
++		v = size_add_wrapv (buflen, buflen, &newlen);
++		if (!v && malloc_pwtmpbuf == NULL
++		    && glob_use_alloca (alloca_used, newlen))
+ 		  pwtmpbuf = extend_alloca_account (pwtmpbuf, buflen,
+-						    2 * buflen, alloca_used);
++						    newlen, alloca_used);
+ 		else
+ 		  {
+-		    char *newp = realloc (malloc_pwtmpbuf ? pwtmpbuf : NULL,
+-					  2 * buflen);
++		    char *newp = v ? NULL : realloc (malloc_pwtmpbuf, newlen);
+ 		    if (newp == NULL)
+ 		      {
+-			if (__glibc_unlikely (malloc_pwtmpbuf))
+-			  free (pwtmpbuf);
++			free (malloc_pwtmpbuf);
+ 			goto nomem_getpw;
+ 		      }
+-		    pwtmpbuf = newp;
+-		    malloc_pwtmpbuf = 1;
++		    malloc_pwtmpbuf = pwtmpbuf = newp;
+ 		  }
+ 		__set_errno (save);
+ 	      }
+@@ -923,7 +951,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 		  free (dirname);
+ 		malloc_dirname = 0;
+ 
+-		if (__libc_use_alloca (alloca_used + home_len + rest_len + 1))
++		if (glob_use_alloca (alloca_used, home_len + rest_len + 1))
+ 		  dirname = alloca_account (home_len + rest_len + 1,
+ 					    alloca_used);
+ 		else
+@@ -931,8 +959,7 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 		    dirname = malloc (home_len + rest_len + 1);
+ 		    if (dirname == NULL)
+ 		      {
+-			if (__glibc_unlikely (malloc_pwtmpbuf))
+-			  free (pwtmpbuf);
++			free (malloc_pwtmpbuf);
+ 			retval = GLOB_NOSPACE;
+ 			goto out;
+ 		      }
+@@ -944,24 +971,24 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 		dirlen = home_len + rest_len;
+ 		dirname_modified = 1;
+ 
+-		if (__glibc_unlikely (malloc_pwtmpbuf))
+-		  free (pwtmpbuf);
++		free (malloc_pwtmpbuf);
+ 	      }
+ 	    else
+ 	      {
+-		if (__glibc_unlikely (malloc_pwtmpbuf))
+-		  free (pwtmpbuf);
++		free (malloc_pwtmpbuf);
+ 
+ 		if (flags & GLOB_TILDE_CHECK)
+-		  /* We have to regard it as an error if we cannot find the
+-		     home directory.  */
+-		  return GLOB_NOMATCH;
++		  {
++		    /* We have to regard it as an error if we cannot find the
++		       home directory.  */
++		    retval = GLOB_NOMATCH;
++		    goto out;
++		  }
+ 	      }
+ 	  }
++#endif /* !WINDOWS32 */
+ 	}
+-# endif	/* Not Amiga && not WINDOWS32.  */
+     }
+-#endif	/* Not VMS.  */
+ 
+   /* Now test whether we looked for "~" or "~NAME".  In this case we
+      can give the answer now.  */
+@@ -980,19 +1007,18 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	  size_t newcount = pglob->gl_pathc + pglob->gl_offs;
+ 	  char **new_gl_pathv;
+ 
+-	  if (newcount > UINTPTR_MAX - (1 + 1)
+-	      || newcount + 1 + 1 > ~((size_t) 0) / sizeof (char *))
++	  if (newcount > SIZE_MAX / sizeof (char *) - 2)
+ 	    {
+ 	    nospace:
+ 	      free (pglob->gl_pathv);
+ 	      pglob->gl_pathv = NULL;
+ 	      pglob->gl_pathc = 0;
+-	      return GLOB_NOSPACE;
++	      retval = GLOB_NOSPACE;
++	      goto out;
+ 	    }
+ 
+-	  new_gl_pathv
+-	    = (char **) realloc (pglob->gl_pathv,
+-				 (newcount + 1 + 1) * sizeof (char *));
++	  new_gl_pathv = realloc (pglob->gl_pathv,
++				  (newcount + 2) * sizeof (char *));
+ 	  if (new_gl_pathv == NULL)
+ 	    goto nospace;
+ 	  pglob->gl_pathv = new_gl_pathv;
+@@ -1006,12 +1032,19 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	      p = mempcpy (pglob->gl_pathv[newcount], dirname, dirlen);
+ 	      p[0] = '/';
+ 	      p[1] = '\0';
++	      if (__glibc_unlikely (malloc_dirname))
++		free (dirname);
+ 	    }
+ 	  else
+ 	    {
+-	      pglob->gl_pathv[newcount] = strdup (dirname);
+-	      if (pglob->gl_pathv[newcount] == NULL)
+-		goto nospace;
++	      if (__glibc_unlikely (malloc_dirname))
++		pglob->gl_pathv[newcount] = dirname;
++	      else
++		{
++		  pglob->gl_pathv[newcount] = strdup (dirname);
++		  if (pglob->gl_pathv[newcount] == NULL)
++		    goto nospace;
++		}
+ 	    }
+ 	  pglob->gl_pathv[++newcount] = NULL;
+ 	  ++pglob->gl_pathc;
+@@ -1021,7 +1054,8 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	}
+ 
+       /* Not found.  */
+-      return GLOB_NOMATCH;
++      retval = GLOB_NOMATCH;
++      goto out;
+     }
+ 
+   meta = __glob_pattern_type (dirname, !(flags & GLOB_NOESCAPE));
+@@ -1067,7 +1101,10 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+       if (status != 0)
+ 	{
+ 	  if ((flags & GLOB_NOCHECK) == 0 || status != GLOB_NOMATCH)
+-	    return status;
++	    {
++	      retval = status;
++	      goto out;
++	    }
+ 	  goto no_matches;
+ 	}
+ 
+@@ -1078,19 +1115,6 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	{
+ 	  size_t old_pathc;
+ 
+-#ifdef	SHELL
+-	  {
+-	    /* Make globbing interruptible in the bash shell. */
+-	    extern int interrupt_state;
+-
+-	    if (interrupt_state)
+-	      {
+-		globfree (&dirs);
+-		return GLOB_ABORTED;
+-	      }
+-	  }
+-#endif /* SHELL.  */
+-
+ 	  old_pathc = pglob->gl_pathc;
+ 	  status = glob_in_dir (filename, dirs.gl_pathv[i],
+ 				((flags | GLOB_APPEND)
+@@ -1105,7 +1129,8 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	      globfree (&dirs);
+ 	      globfree (pglob);
+ 	      pglob->gl_pathc = 0;
+-	      return status;
++	      retval = status;
++	      goto out;
+ 	    }
+ 
+ 	  /* Stick the directory on the front of each name.  */
+@@ -1116,13 +1141,14 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	      globfree (&dirs);
+ 	      globfree (pglob);
+ 	      pglob->gl_pathc = 0;
+-	      return GLOB_NOSPACE;
++	      retval = GLOB_NOSPACE;
++	      goto out;
+ 	    }
+ 	}
+ 
+       flags |= GLOB_MAGCHAR;
+ 
+-      /* We have ignored the GLOB_NOCHECK flag in the `glob_in_dir' calls.
++      /* We have ignored the GLOB_NOCHECK flag in the 'glob_in_dir' calls.
+ 	 But if we have not found any matching entry and the GLOB_NOCHECK
+ 	 flag was set we must return the input pattern itself.  */
+       if (pglob->gl_pathc + pglob->gl_offs == oldcount)
+@@ -1134,28 +1160,28 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	      size_t newcount = pglob->gl_pathc + pglob->gl_offs;
+ 	      char **new_gl_pathv;
+ 
+-	      if (newcount > UINTPTR_MAX - 2
+-		  || newcount + 2 > ~((size_t) 0) / sizeof (char *))
++	      if (newcount > SIZE_MAX / sizeof (char *) - 2)
+ 		{
+ 		nospace2:
+ 		  globfree (&dirs);
+-		  return GLOB_NOSPACE;
++		  retval = GLOB_NOSPACE;
++		  goto out;
+ 		}
+ 
+-	      new_gl_pathv = (char **) realloc (pglob->gl_pathv,
+-						(newcount + 2)
+-						* sizeof (char *));
++	      new_gl_pathv = realloc (pglob->gl_pathv,
++				      (newcount + 2) * sizeof (char *));
+ 	      if (new_gl_pathv == NULL)
+ 		goto nospace2;
+ 	      pglob->gl_pathv = new_gl_pathv;
+ 
+-	      pglob->gl_pathv[newcount] = __strdup (pattern);
++	      pglob->gl_pathv[newcount] = strdup (pattern);
+ 	      if (pglob->gl_pathv[newcount] == NULL)
+ 		{
+ 		  globfree (&dirs);
+ 		  globfree (pglob);
+ 		  pglob->gl_pathc = 0;
+-		  return GLOB_NOSPACE;
++		  retval = GLOB_NOSPACE;
++		  goto out;
+ 		}
+ 
+ 	      ++pglob->gl_pathc;
+@@ -1167,7 +1193,8 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	  else
+ 	    {
+ 	      globfree (&dirs);
+-	      return GLOB_NOMATCH;
++	      retval = GLOB_NOMATCH;
++	      goto out;
+ 	    }
+ 	}
+ 
+@@ -1213,7 +1240,8 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	      flags = orig_flags;
+ 	      goto no_matches;
+ 	    }
+-	  return status;
++	  retval = status;
++	  goto out;
+ 	}
+ 
+       if (dirlen > 0)
+@@ -1225,7 +1253,8 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	    {
+ 	      globfree (pglob);
+ 	      pglob->gl_pathc = 0;
+-	      return GLOB_NOSPACE;
++	      retval = GLOB_NOSPACE;
++	      goto out;
+ 	    }
+ 	}
+     }
+@@ -1250,7 +1279,8 @@ glob (const char *pattern, int flags, int (*errfunc) (const char *, int),
+ 	      {
+ 		globfree (pglob);
+ 		pglob->gl_pathc = 0;
+-		return GLOB_NOSPACE;
++		retval = GLOB_NOSPACE;
++		goto out;
+ 	      }
+ 	    strcpy (&new[len - 2], "/");
+ 	    pglob->gl_pathv[i] = new;
+@@ -1276,32 +1306,12 @@ libc_hidden_def (glob)
+ #endif
+ 
+ 
+-#if !defined _LIBC || !defined GLOB_ONLY_P
+-
+-/* Free storage allocated in PGLOB by a previous `glob' call.  */
+-void
+-globfree (glob_t *pglob)
+-{
+-  if (pglob->gl_pathv != NULL)
+-    {
+-      size_t i;
+-      for (i = 0; i < pglob->gl_pathc; ++i)
+-	free (pglob->gl_pathv[pglob->gl_offs + i]);
+-      free (pglob->gl_pathv);
+-      pglob->gl_pathv = NULL;
+-    }
+-}
+-#if defined _LIBC && !defined globfree
+-libc_hidden_def (globfree)
+-#endif
+-
+-
+ /* Do a collated comparison of A and B.  */
+ static int
+ collated_compare (const void *a, const void *b)
+ {
+-  const char *const s1 = *(const char *const * const) a;
+-  const char *const s2 = *(const char *const * const) b;
++  char *const *ps1 = a; char *s1 = *ps1;
++  char *const *ps2 = b; char *s2 = *ps2;
+ 
+   if (s1 == s2)
+     return 0;
+@@ -1322,28 +1332,24 @@ prefix_array (const char *dirname, char **array, size_t n)
+ {
+   size_t i;
+   size_t dirlen = strlen (dirname);
+-#if defined __MSDOS__ || defined WINDOWS32
+-  int sep_char = '/';
+-# define DIRSEP_CHAR sep_char
+-#else
+-# define DIRSEP_CHAR '/'
+-#endif
++  char dirsep_char = '/';
+ 
+   if (dirlen == 1 && dirname[0] == '/')
+     /* DIRNAME is just "/", so normal prepending would get us "//foo".
+        We want "/foo" instead, so don't prepend any chars from DIRNAME.  */
+     dirlen = 0;
++
+ #if defined __MSDOS__ || defined WINDOWS32
+-  else if (dirlen > 1)
++  if (dirlen > 1)
+     {
+       if (dirname[dirlen - 1] == '/' && dirname[dirlen - 2] == ':')
+ 	/* DIRNAME is "d:/".  Don't prepend the slash from DIRNAME.  */
+ 	--dirlen;
+       else if (dirname[dirlen - 1] == ':')
+ 	{
+-	  /* DIRNAME is "d:".  Use `:' instead of `/'.  */
++	  /* DIRNAME is "d:".  Use ':' instead of '/'.  */
+ 	  --dirlen;
+-	  sep_char = ':';
++	  dirsep_char = ':';
+ 	}
+     }
+ #endif
+@@ -1351,7 +1357,7 @@ prefix_array (const char *dirname, char **array, size_t n)
+   for (i = 0; i < n; ++i)
+     {
+       size_t eltlen = strlen (array[i]) + 1;
+-      char *new = (char *) malloc (dirlen + 1 + eltlen);
++      char *new = malloc (dirlen + 1 + eltlen);
+       if (new == NULL)
+ 	{
+ 	  while (i > 0)
+@@ -1361,7 +1367,7 @@ prefix_array (const char *dirname, char **array, size_t n)
+ 
+       {
+ 	char *endp = mempcpy (new, dirname, dirlen);
+-	*endp++ = DIRSEP_CHAR;
++	*endp++ = dirsep_char;
+ 	mempcpy (endp, array[i], eltlen);
+       }
+       free (array[i]);
+@@ -1371,103 +1377,57 @@ prefix_array (const char *dirname, char **array, size_t n)
+   return 0;
+ }
+ 
+-
+-/* We must not compile this function twice.  */
+-#if !defined _LIBC || !defined NO_GLOB_PATTERN_P
+-int
+-__glob_pattern_type (const char *pattern, int quote)
+-{
+-  const char *p;
+-  int ret = 0;
+-
+-  for (p = pattern; *p != '\0'; ++p)
+-    switch (*p)
+-      {
+-      case '?':
+-      case '*':
+-	return 1;
+-
+-      case '\\':
+-	if (quote)
+-	  {
+-	    if (p[1] != '\0')
+-	      ++p;
+-	    ret |= 2;
+-	  }
+-	break;
+-
+-      case '[':
+-	ret |= 4;
+-	break;
+-
+-      case ']':
+-	if (ret & 4)
+-	  return 1;
+-	break;
+-      }
+-
+-  return ret;
+-}
+-
+-/* Return nonzero if PATTERN contains any metacharacters.
+-   Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
+-int
+-__glob_pattern_p (const char *pattern, int quote)
+-{
+-  return __glob_pattern_type (pattern, quote) == 1;
+-}
+-# ifdef _LIBC
+-weak_alias (__glob_pattern_p, glob_pattern_p)
+-# endif
+-#endif
+-
+-#endif /* !GLOB_ONLY_P */
+-
+-
+ /* We put this in a separate function mainly to allow the memory
+    allocated with alloca to be recycled.  */
+-#if !defined _LIBC || !defined GLOB_ONLY_P
+ static int
+ __attribute_noinline__
+-link_exists2_p (const char *dir, size_t dirlen, const char *fname,
+-	       glob_t *pglob
+-# ifndef _LIBC
+-		, int flags
++link_stat (const char *dir, size_t dirlen, const char *fname,
++	   glob_t *pglob
++# if !defined _LIBC && !HAVE_FSTATAT
++	   , int flags
+ # endif
+-		)
++	   )
+ {
+   size_t fnamelen = strlen (fname);
+-  char *fullname = (char *) __alloca (dirlen + 1 + fnamelen + 1);
++  char *fullname = __alloca (dirlen + 1 + fnamelen + 1);
+   struct stat st;
+-# ifndef _LIBC
+-  struct_stat64 st64;
+-# endif
+ 
+   mempcpy (mempcpy (mempcpy (fullname, dir, dirlen), "/", 1),
+ 	   fname, fnamelen + 1);
+ 
+-# ifdef _LIBC
+-  return (*pglob->gl_stat) (fullname, &st) == 0;
+-# else
+-  return ((__builtin_expect (flags & GLOB_ALTDIRFUNC, 0)
+-	   ? (*pglob->gl_stat) (fullname, &st)
+-	   : __stat64 (fullname, &st64)) == 0);
++# if !defined _LIBC && !HAVE_FSTATAT
++  if (__builtin_expect ((flags & GLOB_ALTDIRFUNC) == 0, 1))
++    {
++      struct_stat64 st64;
++      return __stat64 (fullname, &st64);
++    }
+ # endif
++  return (*pglob->gl_stat) (fullname, &st);
+ }
+-# ifdef _LIBC
+-#  define link_exists_p(dfd, dirname, dirnamelen, fname, pglob, flags) \
+-  (__builtin_expect (flags & GLOB_ALTDIRFUNC, 0)			      \
+-   ? link_exists2_p (dirname, dirnamelen, fname, pglob)			      \
+-   : ({ struct stat64 st64;						      \
+-       __fxstatat64 (_STAT_VER, dfd, fname, &st64, 0) == 0; }))
++
++/* Return true if DIR/FNAME exists.  */
++static int
++link_exists_p (int dfd, const char *dir, size_t dirlen, const char *fname,
++	       glob_t *pglob, int flags)
++{
++  int status;
++# if defined _LIBC || HAVE_FSTATAT
++  if (__builtin_expect (flags & GLOB_ALTDIRFUNC, 0))
++    status = link_stat (dir, dirlen, fname, pglob);
++  else
++    {
++      /* dfd cannot be -1 here, because dirfd never returns -1 on
++	 glibc, or on hosts that have fstatat.  */
++      struct_stat64 st64;
++      status = __fxstatat64 (_STAT_VER, dfd, fname, &st64, 0);
++    }
+ # else
+-#  define link_exists_p(dfd, dirname, dirnamelen, fname, pglob, flags) \
+-  link_exists2_p (dirname, dirnamelen, fname, pglob, flags)
++  status = link_stat (dir, dirlen, fname, pglob, flags);
+ # endif
+-#endif
+-
++  return status == 0 || errno == EOVERFLOW;
++}
+ 
+-/* Like `glob', but PATTERN is a final pathname component,
++/* Like 'glob', but PATTERN is a final pathname component,
+    and matches are searched for in DIRECTORY.
+    The GLOB_NOSORT bit in FLAGS is ignored.  No sorting is ever done.
+    The GLOB_APPEND flag is assumed to be set (always appends).  */
+@@ -1478,25 +1438,25 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
+ {
+   size_t dirlen = strlen (directory);
+   void *stream = NULL;
+-  struct globnames
+-    {
+-      struct globnames *next;
+-      size_t count;
+-      char *name[64];
+-    };
+-#define INITIAL_COUNT sizeof (init_names.name) / sizeof (init_names.name[0])
+-  struct globnames init_names;
+-  struct globnames *names = &init_names;
+-  struct globnames *names_alloca = &init_names;
++# define GLOBNAMES_MEMBERS(nnames) \
++    struct globnames *next; size_t count; char *name[nnames];
++  struct globnames { GLOBNAMES_MEMBERS (FLEXIBLE_ARRAY_MEMBER) };
++  struct { GLOBNAMES_MEMBERS (64) } init_names_buf;
++  struct globnames *init_names = (struct globnames *) &init_names_buf;
++  struct globnames *names = init_names;
++  struct globnames *names_alloca = init_names;
+   size_t nfound = 0;
+   size_t cur = 0;
+   int meta;
+   int save;
++  int result;
+ 
+-  alloca_used += sizeof (init_names);
++  alloca_used += sizeof init_names_buf;
+ 
+-  init_names.next = NULL;
+-  init_names.count = INITIAL_COUNT;
++  init_names->next = NULL;
++  init_names->count = ((sizeof init_names_buf
++                        - offsetof (struct globnames, name))
++                       / sizeof init_names->name[0]);
+ 
+   meta = __glob_pattern_type (pattern, !(flags & GLOB_NOESCAPE));
+   if (meta == 0 && (flags & (GLOB_NOCHECK|GLOB_NOMAGIC)))
+@@ -1516,14 +1476,16 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
+ 	struct_stat64 st64;
+       } ust;
+       size_t patlen = strlen (pattern);
+-      int alloca_fullname = __libc_use_alloca (alloca_used
+-					       + dirlen + 1 + patlen + 1);
++      size_t fullsize;
++      bool alloca_fullname
++        = (! size_add_wrapv (dirlen + 1, patlen + 1, &fullsize)
++           && glob_use_alloca (alloca_used, fullsize));
+       char *fullname;
+       if (alloca_fullname)
+-	fullname = alloca_account (dirlen + 1 + patlen + 1, alloca_used);
++        fullname = alloca_account (fullsize, alloca_used);
+       else
+ 	{
+-	  fullname = malloc (dirlen + 1 + patlen + 1);
++	  fullname = malloc (fullsize);
+ 	  if (fullname == NULL)
+ 	    return GLOB_NOSPACE;
+ 	}
+@@ -1531,9 +1493,11 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
+       mempcpy (mempcpy (mempcpy (fullname, directory, dirlen),
+ 			"/", 1),
+ 	       pattern, patlen + 1);
+-      if ((__builtin_expect (flags & GLOB_ALTDIRFUNC, 0)
++      if (((__builtin_expect (flags & GLOB_ALTDIRFUNC, 0)
+ 	   ? (*pglob->gl_stat) (fullname, &ust.st)
+-	   : __stat64 (fullname, &ust.st64)) == 0)
++	    : __stat64 (fullname, &ust.st64))
++	   == 0)
++	  || errno == EOVERFLOW)
+ 	/* We found this file to be existing.  Now tell the rest
+ 	   of the function to copy this name into the result.  */
+ 	flags |= GLOB_NOCHECK;
+@@ -1555,16 +1519,10 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
+ 	}
+       else
+ 	{
+-#ifdef _LIBC
+ 	  int dfd = (__builtin_expect (flags & GLOB_ALTDIRFUNC, 0)
+ 		     ? -1 : dirfd ((DIR *) stream));
+-#endif
+ 	  int fnm_flags = ((!(flags & GLOB_PERIOD) ? FNM_PERIOD : 0)
+-			   | ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0)
+-#if defined _AMIGA || defined VMS
+-			   | FNM_CASEFOLD
+-#endif
+-			   );
++			   | ((flags & GLOB_NOESCAPE) ? FNM_NOESCAPE : 0));
+ 	  flags |= GLOB_MAGCHAR;
+ 
+ 	  while (1)
+@@ -1584,19 +1542,24 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
+ 	      }
+ 	      if (d.name == NULL)
+ 		break;
+-	      if (d.skip_entry)
++	      if (readdir_result_skip_entry (d))
+ 		continue;
+ 
+ 	      /* If we shall match only directories use the information
+ 		 provided by the dirent call if possible.  */
+-	      if ((flags & GLOB_ONLYDIR) && !readdir_result_might_be_dir (d))
+-		continue;
++	      if (flags & GLOB_ONLYDIR)
++		switch (readdir_result_type (d))
++		  {
++		  case DT_DIR: case DT_LNK: case DT_UNKNOWN: break;
++		  default: continue;
++		  }
+ 
+ 	      if (fnmatch (pattern, d.name, fnm_flags) == 0)
+ 		{
+ 		  /* If the file we found is a symlink we have to
+ 		     make sure the target file exists.  */
+-		  if (!readdir_result_might_be_symlink (d)
++		  dirent_type type = readdir_result_type (d);
++		  if (! (type == DT_LNK || type == DT_UNKNOWN)
+ 		      || link_exists_p (dfd, directory, dirlen, d.name,
+ 					pglob, flags))
+ 		    {
+@@ -1604,10 +1567,13 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
+ 			{
+ 			  struct globnames *newnames;
+ 			  size_t count = names->count * 2;
+-			  size_t size = (sizeof (struct globnames)
+-					 + ((count - INITIAL_COUNT)
+-					    * sizeof (char *)));
+-			  if (__libc_use_alloca (alloca_used + size))
++			  size_t nameoff = offsetof (struct globnames, name);
++			  size_t size = FLEXSIZEOF (struct globnames, name,
++						    count * sizeof (char *));
++			  if ((SIZE_MAX - nameoff) / 2 / sizeof (char *)
++			      < names->count)
++			    goto memory_error;
++			  if (glob_use_alloca (alloca_used, size))
+ 			    newnames = names_alloca
+ 			      = alloca_account (size, alloca_used);
+ 			  else if ((newnames = malloc (size))
+@@ -1623,6 +1589,8 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
+ 			goto memory_error;
+ 		      ++cur;
+ 		      ++nfound;
++		      if (SIZE_MAX - pglob->gl_offs <= nfound)
++			goto memory_error;
+ 		    }
+ 		}
+ 	    }
+@@ -1633,29 +1601,27 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
+     {
+       size_t len = strlen (pattern);
+       nfound = 1;
+-      names->name[cur] = (char *) malloc (len + 1);
++      names->name[cur] = malloc (len + 1);
+       if (names->name[cur] == NULL)
+ 	goto memory_error;
+       *((char *) mempcpy (names->name[cur++], pattern, len)) = '\0';
+     }
+ 
+-  int result = GLOB_NOMATCH;
++  result = GLOB_NOMATCH;
+   if (nfound != 0)
+     {
++      char **new_gl_pathv;
+       result = 0;
+ 
+-      if (pglob->gl_pathc > UINTPTR_MAX - pglob->gl_offs
+-	  || pglob->gl_pathc + pglob->gl_offs > UINTPTR_MAX - nfound
+-	  || pglob->gl_pathc + pglob->gl_offs + nfound > UINTPTR_MAX - 1
+-	  || (pglob->gl_pathc + pglob->gl_offs + nfound + 1
+-	      > UINTPTR_MAX / sizeof (char *)))
++      if (SIZE_MAX / sizeof (char *) - pglob->gl_pathc
++	  < pglob->gl_offs + nfound + 1)
+ 	goto memory_error;
+ 
+-      char **new_gl_pathv;
+       new_gl_pathv
+-	= (char **) realloc (pglob->gl_pathv,
+-			     (pglob->gl_pathc + pglob->gl_offs + nfound + 1)
+-			     * sizeof (char *));
++	= realloc (pglob->gl_pathv,
++		   (pglob->gl_pathc + pglob->gl_offs + nfound + 1)
++		    * sizeof (char *));
++
+       if (new_gl_pathv == NULL)
+ 	{
+ 	memory_error:
+@@ -1671,7 +1637,7 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
+ 		 and this is the block assigned to OLD here.  */
+ 	      if (names == NULL)
+ 		{
+-		  assert (old == &init_names);
++		  assert (old == init_names);
+ 		  break;
+ 		}
+ 	      cur = names->count;
+@@ -1697,7 +1663,7 @@ glob_in_dir (const char *pattern, const char *directory, int flags,
+ 		 and this is the block assigned to OLD here.  */
+ 	      if (names == NULL)
+ 		{
+-		  assert (old == &init_names);
++		  assert (old == init_names);
+ 		  break;
+ 		}
+ 	      cur = names->count;
+diff --git a/posix/glob64.c b/posix/glob64.c
+index 6cb3d654a8..a515a1c12f 100644
+--- a/posix/glob64.c
++++ b/posix/glob64.c
+@@ -43,10 +43,4 @@ glob64 (const char *pattern, int flags,
+ }
+ libc_hidden_def (glob64)
+ 
+-void
+-globfree64 (glob64_t *pglob)
+-{
+-}
+-libc_hidden_def (globfree64)
+-
+ stub_warning (glob64)
+diff --git a/posix/glob_internal.h b/posix/glob_internal.h
+new file mode 100644
+index 0000000000..12c93660b7
+--- /dev/null
++++ b/posix/glob_internal.h
+@@ -0,0 +1,57 @@
++/* Shared definition for glob and glob_pattern_p.
++   Copyright (C) 2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef GLOB_INTERNAL_H
++# define GLOB_INTERNAL_H
++
++static inline int
++__glob_pattern_type (const char *pattern, int quote)
++{
++  const char *p;
++  int ret = 0;
++
++  for (p = pattern; *p != '\0'; ++p)
++    switch (*p)
++      {
++      case '?':
++      case '*':
++        return 1;
++
++      case '\\':
++        if (quote)
++          {
++            if (p[1] != '\0')
++              ++p;
++            ret |= 2;
++          }
++        break;
++
++      case '[':
++        ret |= 4;
++        break;
++
++      case ']':
++        if (ret & 4)
++          return 1;
++        break;
++      }
++
++  return ret;
++}
++
++#endif /* GLOB_INTERNAL_H  */
+diff --git a/posix/glob_pattern_p.c b/posix/glob_pattern_p.c
+new file mode 100644
+index 0000000000..a17d337182
+--- /dev/null
++++ b/posix/glob_pattern_p.c
+@@ -0,0 +1,33 @@
++/* Return nonzero if PATTERN contains any metacharacters.
++   Copyright (C) 2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef _LIBC
++# include <config.h>
++#endif
++
++#include <glob.h>
++#include "glob_internal.h"
++
++/* Return nonzero if PATTERN contains any metacharacters.
++   Metacharacters can be quoted with backslashes if QUOTE is nonzero.  */
++int
++__glob_pattern_p (const char *pattern, int quote)
++{
++  return __glob_pattern_type (pattern, quote) == 1;
++}
++weak_alias (__glob_pattern_p, glob_pattern_p)
+diff --git a/posix/globfree.c b/posix/globfree.c
+new file mode 100644
+index 0000000000..042e29d9b0
+--- /dev/null
++++ b/posix/globfree.c
+@@ -0,0 +1,41 @@
++/* Frees the dynamically allocated storage from an earlier call to glob.
++   Copyright (C) 2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef _LIBC
++# include <config.h>
++#endif
++
++#include <glob.h>
++#include <stdlib.h>
++
++/* Free storage allocated in PGLOB by a previous `glob' call.  */
++void
++globfree (glob_t *pglob)
++{
++  if (pglob->gl_pathv != NULL)
++    {
++      size_t i;
++      for (i = 0; i < pglob->gl_pathc; ++i)
++        free (pglob->gl_pathv[pglob->gl_offs + i]);
++      free (pglob->gl_pathv);
++      pglob->gl_pathv = NULL;
++    }
++}
++#ifndef globfree
++libc_hidden_def (globfree)
++#endif
+diff --git a/posix/globfree64.c b/posix/globfree64.c
+new file mode 100644
+index 0000000000..c9f8908a4e
+--- /dev/null
++++ b/posix/globfree64.c
+@@ -0,0 +1,31 @@
++/* Frees the dynamically allocated storage from an earlier call to glob.
++   Copyright (C) 2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef _LIBC
++# include <config.h>
++#endif
++
++#include <glob.h>
++#include <stdlib.h>
++
++/* Free storage allocated in PGLOB by a previous `glob' call.  */
++void
++globfree64 (glob64_t *pglob)
++{
++}
++libc_hidden_def (globfree64)
+diff --git a/posix/tst-glob-tilde.c b/posix/tst-glob-tilde.c
+new file mode 100644
+index 0000000000..6886f4371f
+--- /dev/null
++++ b/posix/tst-glob-tilde.c
+@@ -0,0 +1,143 @@
++/* Check for GLOB_TIDLE heap allocation issues (bugs 22320, 22325, 22332).
++   Copyright (C) 2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <glob.h>
++#include <mcheck.h>
++#include <nss.h>
++#include <pwd.h>
++#include <stdlib.h>
++#include <string.h>
++#include <support/check.h>
++#include <support/support.h>
++
++/* Flag which indicates whether to pass the GLOB_ONLYDIR flag.  */
++static int do_onlydir;
++
++/* Flag which indicates whether to pass the GLOB_NOCHECK flag.  */
++static int do_nocheck;
++
++/* Flag which indicates whether to pass the GLOB_MARK flag.  */
++static int do_mark;
++
++/* Flag which indicates whether to pass the GLOB_NOESCAPE flag.  */
++static int do_noescape;
++
++static void
++one_test (const char *prefix, const char *middle, const char *suffix)
++{
++  char *pattern = xasprintf ("%s%s%s", prefix, middle, suffix);
++  int flags = GLOB_TILDE;
++  if (do_onlydir)
++    flags |= GLOB_ONLYDIR;
++  if (do_nocheck)
++    flags |= GLOB_NOCHECK;
++  if (do_mark)
++    flags |= GLOB_MARK;
++  if (do_noescape)
++    flags |= GLOB_NOESCAPE;
++  glob_t gl;
++  /* This glob call might result in crashes or memory leaks.  */
++  if (glob (pattern, flags, NULL, &gl) == 0)
++    globfree (&gl);
++  free (pattern);
++}
++
++enum
++  {
++    /* The largest base being tested.  */
++    largest_base_size = 500000,
++
++    /* The actual size is the base size plus a variable whose absolute
++       value is not greater than this.  This helps malloc to trigger
++       overflows.  */
++    max_size_skew = 16,
++
++    /* The maximum string length supported by repeating_string
++       below.  */
++    repeat_size = largest_base_size + max_size_skew,
++  };
++
++/* Used to construct strings which repeat a single character 'x'.  */
++static char *repeat;
++
++/* Return a string of SIZE characters.  */
++const char *
++repeating_string (int size)
++{
++  TEST_VERIFY (size >= 0);
++  TEST_VERIFY (size <= repeat_size);
++  const char *repeated_shifted = repeat + repeat_size - size;
++  TEST_VERIFY (strlen (repeated_shifted) == size);
++  return repeated_shifted;
++}
++
++static int
++do_test (void)
++{
++  /* Avoid network-based NSS modules and initialize nss_files with a
++     dummy lookup.  This has to come before mtrace because NSS does
++     not free all memory.  */
++  __nss_configure_lookup ("passwd", "files");
++  (void) getpwnam ("root");
++
++  mtrace ();
++
++  repeat = xmalloc (repeat_size + 1);
++  memset (repeat, 'x', repeat_size);
++  repeat[repeat_size] = '\0';
++
++  /* These numbers control the size of the user name.  The values
++     cover the minimum (0), a typical size (8), a large
++     stack-allocated size (100000), and a somewhat large
++     heap-allocated size (largest_base_size).  */
++  static const int base_sizes[] = { 0, 8, 100, 100000, largest_base_size, -1 };
++
++  for (do_onlydir = 0; do_onlydir < 2; ++do_onlydir)
++    for (do_nocheck = 0; do_nocheck < 2; ++do_nocheck)
++      for (do_mark = 0; do_mark < 2; ++do_mark)
++	for (do_noescape = 0; do_noescape < 2; ++do_noescape)
++	  for (int base_idx = 0; base_sizes[base_idx] >= 0; ++base_idx)
++	    {
++	      for (int size_skew = -max_size_skew; size_skew <= max_size_skew;
++		   ++size_skew)
++		{
++		  int size = base_sizes[base_idx] + size_skew;
++		  if (size < 0)
++		    continue;
++
++		  const char *user_name = repeating_string (size);
++		  one_test ("~", user_name, "/a/b");
++		  one_test ("~", user_name, "x\\x\\x////x\\a");
++		}
++
++	      const char *user_name = repeating_string (base_sizes[base_idx]);
++	      one_test ("~", user_name, "");
++	      one_test ("~", user_name, "/");
++	      one_test ("~", user_name, "/a");
++	      one_test ("~", user_name, "/*/*");
++	      one_test ("~", user_name, "\\/");
++	      one_test ("/~", user_name, "");
++	      one_test ("*/~", user_name, "/a/b");
++	    }
++
++  free (repeat);
++
++  return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
+index 7cd54ab504..1e85e4f08f 100644
+--- a/resolv/nss_dns/dns-host.c
++++ b/resolv/nss_dns/dns-host.c
+@@ -889,19 +889,6 @@ getanswer_r (struct resolv_context *ctx,
+ 	  /* bind would put multiple PTR records as aliases, but we don't do
+ 	     that.  */
+ 	  result->h_name = bp;
+-	  if (have_to_map)
+-	    {
+-	      n = strlen (bp) + 1;	/* for the \0 */
+-	      if (__glibc_unlikely (n >= MAXHOSTNAMELEN))
+-		{
+-		  ++had_error;
+-		  break;
+-		}
+-	      bp += n;
+-	      linebuflen -= n;
+-	      if (map_v4v6_hostent (result, &bp, &linebuflen))
+-		goto too_small;
+-	    }
+ 	  *h_errnop = NETDB_SUCCESS;
+ 	  return NSS_STATUS_SUCCESS;
+ 	case T_A:
+diff --git a/resolv/res_init.c b/resolv/res_init.c
+index fa46ce7813..4e1f9fe8de 100644
+--- a/resolv/res_init.c
++++ b/resolv/res_init.c
+@@ -446,6 +446,11 @@ res_vinit_1 (FILE *fp, struct resolv_conf_parser *parser)
+                     (&parser->nameserver_list);
+                   if (p != NULL)
+                     *p = sa;
++                  else
++                    {
++                      free (sa);
++                      return false;
++                    }
+                 }
+               continue;
+             }
+diff --git a/resolv/resolv_conf.c b/resolv/resolv_conf.c
+index f391d30c27..e0f296d02e 100644
+--- a/resolv/resolv_conf.c
++++ b/resolv/resolv_conf.c
+@@ -600,10 +600,7 @@ __resolv_conf_attach (struct __res_state *resp, struct resolv_conf *conf)
+ 
+   struct resolv_conf_global *global_copy = get_locked_global ();
+   if (global_copy == NULL)
+-    {
+-      free (conf);
+-      return false;
+-    }
++    return false;
+ 
+   /* Try to find an unused index in the array.  */
+   size_t index;
+diff --git a/resolv/tst-res_use_inet6.c b/resolv/tst-res_use_inet6.c
+index 6f3db08892..d819f921d6 100644
+--- a/resolv/tst-res_use_inet6.c
++++ b/resolv/tst-res_use_inet6.c
+@@ -16,21 +16,121 @@
+    License along with the GNU C Library; if not, see
+    <http://www.gnu.org/licenses/>.  */
+ 
++#include <ctype.h>
+ #include <netdb.h>
+ #include <resolv.h>
++#include <stdio.h>
++#include <stdlib.h>
+ #include <string.h>
++#include <support/check.h>
+ #include <support/check_nss.h>
+ #include <support/resolv_test.h>
++#include <support/support.h>
+ #include <support/xthread.h>
+ 
++/* Handle IPv4 reverse lookup responses.  Product a PTR record
++   A-B-C-D.v4.example.  */
++static void
++response_ptr_v4 (const struct resolv_response_context *ctx,
++                 struct resolv_response_builder *b,
++                 const char *qname, uint16_t qclass, uint16_t qtype)
++{
++  int bytes[4];
++  int offset = -1;
++  TEST_VERIFY (sscanf (qname, "%d.%d.%d.%d.in-addr.arpa%n",
++                       bytes + 0, bytes + 1, bytes + 2, bytes + 3,
++                       &offset) == 4);
++  TEST_VERIFY (offset == strlen (qname));
++  resolv_response_init (b, (struct resolv_response_flags) {});
++  resolv_response_add_question (b, qname, qclass, qtype);
++  resolv_response_section (b, ns_s_an);
++  resolv_response_open_record (b, qname, qclass, T_PTR, 0);
++  char *name = xasprintf ("%d-%d-%d-%d.v4.example",
++                          bytes[3], bytes[2], bytes[1], bytes[0]);
++  resolv_response_add_name (b, name);
++  free (name);
++  resolv_response_close_record (b);
++}
++
++/* Handle IPv6 reverse lookup responses.  Produce a PTR record
++   <32 hex digits>.v6.example. */
++static void
++response_ptr_v6 (const struct resolv_response_context *ctx,
++                 struct resolv_response_builder *b,
++                 const char *qname, uint16_t qclass, uint16_t qtype)
++{
++
++  TEST_VERIFY_EXIT (strlen (qname) > 64);
++
++  char bytes[33];
++  for (int i = 0; i < 64; ++i)
++    if ((i % 2) == 0)
++      {
++        TEST_VERIFY (isxdigit ((unsigned char) qname[i]));
++        bytes[31 - i / 2] = qname[i];
++      }
++    else
++      TEST_VERIFY_EXIT (qname[i] == '.');
++  bytes[32] = '\0';
++
++    resolv_response_init (b, (struct resolv_response_flags) {});
++  resolv_response_add_question (b, qname, qclass, qtype);
++  resolv_response_section (b, ns_s_an);
++  resolv_response_open_record (b, qname, qclass, T_PTR, 0);
++  char *name = xasprintf ("%s.v6.example", bytes);
++  resolv_response_add_name (b, name);
++  free (name);
++  resolv_response_close_record (b);
++}
++
++/* Produce a response based on QNAME: Certain characters in the first
++   label of QNAME trigger the inclusion of resource records:
++
++   'a'   A record (IPv4 address)
++   'q'   AAAA record (quad A record, IPv6 address)
++   'p'   PTR record
++   'm'   record type must match QTYPE (no additional records)
++   '6'   stop flag processing if QTYPE == AAAA
++
++   For 'a' and 'q', QTYPE is ignored for record type selection if 'm'
++   is not specified.
++
++   in-addr.arpa and ip6.arpa queries are handled separately in
++   response_ptr_v4 and response_ptr_v6.  */
+ static void
+ response (const struct resolv_response_context *ctx,
+           struct resolv_response_builder *b,
+           const char *qname, uint16_t qclass, uint16_t qtype)
+ {
+-  bool include_both =  strcmp (qname, "both.example") == 0;
+-  bool include_a = qtype == T_A || include_both;
+-  bool include_aaaa = qtype == T_AAAA || include_both;
++  if (strstr (qname, ".in-addr.arpa") != NULL)
++    return response_ptr_v4 (ctx, b, qname, qclass, qtype);
++  else if (strstr (qname, ".ip6.arpa") != NULL)
++    return response_ptr_v6 (ctx, b, qname, qclass, qtype);
++
++  bool include_a = false;
++  bool include_aaaa = false;
++  bool include_match = false;
++  bool include_ptr = false;
++  for (const char *p = qname; *p != '.' && *p != '\0'; ++p)
++    {
++      if (*p == 'a')
++        include_a = true;
++      else if (*p == 'q')
++        include_aaaa = true;
++      else if (*p == 'm')
++        include_match = true;
++      else if (*p == 'p')
++        include_ptr = true;
++      else if (*p == '6' && qtype == T_AAAA)
++        break;
++    }
++  if (include_match)
++    {
++      if (qtype == T_A)
++        include_aaaa = false;
++      else if (qtype == T_AAAA)
++        include_a = false;
++    }
+ 
+   resolv_response_init (b, (struct resolv_response_flags) {});
+   resolv_response_add_question (b, qname, qclass, qtype);
+@@ -44,11 +144,17 @@ response (const struct resolv_response_context *ctx,
+     }
+   if (include_aaaa)
+     {
+-        char ipv6[16]
+-          = {0x20, 0x01, 0xd, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
+-        resolv_response_open_record (b, qname, qclass, T_AAAA, 0);
+-        resolv_response_add_data (b, &ipv6, sizeof (ipv6));
+-        resolv_response_close_record (b);
++      char ipv6[16]
++        = {0x20, 0x01, 0xd, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
++      resolv_response_open_record (b, qname, qclass, T_AAAA, 0);
++      resolv_response_add_data (b, &ipv6, sizeof (ipv6));
++      resolv_response_close_record (b);
++    }
++  if (include_ptr)
++    {
++      resolv_response_open_record (b, qname, qclass, T_PTR, 0);
++      resolv_response_add_name (b, "ptr-target.example");
++      resolv_response_close_record (b);
+     }
+ }
+ 
+@@ -64,16 +170,21 @@ test_gai (void)
+         .ai_protocol = IPPROTO_TCP,
+       };
+     struct addrinfo *ai;
+-    int ret = getaddrinfo ("www1.example", "80", &hints, &ai);
+-    check_addrinfo ("getaddrinfo AF_UNSPEC www1.example", ai, ret,
++    int ret = getaddrinfo ("qam.example", "80", &hints, &ai);
++    check_addrinfo ("getaddrinfo AF_UNSPEC qam.example", ai, ret,
+                     "address: STREAM/TCP 192.0.2.17 80\n"
+                     "address: STREAM/TCP 2001:db8::1 80\n");
+     if (ret == 0)
+       freeaddrinfo (ai);
+-    ret = getaddrinfo ("both.example", "80", &hints, &ai);
++    ret = getaddrinfo ("am.example", "80", &hints, &ai);
++    check_addrinfo ("getaddrinfo AF_UNSPEC am.example", ai, ret,
++                    "address: STREAM/TCP 192.0.2.17 80\n");
++    if (ret == 0)
++      freeaddrinfo (ai);
++    ret = getaddrinfo ("qa.example", "80", &hints, &ai);
+     /* Combined A/AAAA responses currently result in address
+        duplication.  */
+-    check_addrinfo ("getaddrinfo AF_UNSPEC both.example", ai, ret,
++    check_addrinfo ("getaddrinfo AF_UNSPEC qa.example", ai, ret,
+                     "address: STREAM/TCP 192.0.2.17 80\n"
+                     "address: STREAM/TCP 192.0.2.17 80\n"
+                     "address: STREAM/TCP 2001:db8::1 80\n"
+@@ -89,13 +200,18 @@ test_gai (void)
+         .ai_protocol = IPPROTO_TCP,
+       };
+     struct addrinfo *ai;
+-    int ret = getaddrinfo ("www1.example", "80", &hints, &ai);
+-    check_addrinfo ("getaddrinfo AF_INET www1.example", ai, ret,
++    int ret = getaddrinfo ("qam.example", "80", &hints, &ai);
++    check_addrinfo ("getaddrinfo AF_INET qam.example", ai, ret,
++                    "address: STREAM/TCP 192.0.2.17 80\n");
++    if (ret == 0)
++      freeaddrinfo (ai);
++    ret = getaddrinfo ("am.example", "80", &hints, &ai);
++    check_addrinfo ("getaddrinfo AF_INET am.example", ai, ret,
+                     "address: STREAM/TCP 192.0.2.17 80\n");
+     if (ret == 0)
+       freeaddrinfo (ai);
+-    ret = getaddrinfo ("both.example", "80", &hints, &ai);
+-    check_addrinfo ("getaddrinfo AF_INET both.example", ai, ret,
++    ret = getaddrinfo ("qa.example", "80", &hints, &ai);
++    check_addrinfo ("getaddrinfo AF_INET qa.example", ai, ret,
+                     "address: STREAM/TCP 192.0.2.17 80\n");
+     if (ret == 0)
+       freeaddrinfo (ai);
+@@ -108,40 +224,196 @@ test_gai (void)
+         .ai_protocol = IPPROTO_TCP,
+       };
+     struct addrinfo *ai;
+-    int ret = getaddrinfo ("www1.example", "80", &hints, &ai);
++    int ret = getaddrinfo ("qa.example", "80", &hints, &ai);
+     check_addrinfo ("getaddrinfo (AF_INET6)", ai, ret,
+                     "address: STREAM/TCP 2001:db8::1 80\n");
+     if (ret == 0)
+       freeaddrinfo (ai);
+-    ret = getaddrinfo ("both.example", "80", &hints, &ai);
+-    check_addrinfo ("getaddrinfo AF_INET6 both.example", ai, ret,
++    ret = getaddrinfo ("am.example", "80", &hints, &ai);
++    check_addrinfo ("getaddrinfo AF_INET6 am.example", ai, ret,
++                    "error: No address associated with hostname\n");
++    if (ret == 0)
++      freeaddrinfo (ai);
++    ret = getaddrinfo ("qam.example", "80", &hints, &ai);
++    check_addrinfo ("getaddrinfo AF_INET6 qam.example", ai, ret,
+                     "address: STREAM/TCP 2001:db8::1 80\n");
+     if (ret == 0)
+       freeaddrinfo (ai);
+   }
+ }
+ 
+-/* Test that gethostbyname2 is not influenced by RES_USE_INET6.  */
++/* Test gethostbyaddr and getnameinfo.  The results are independent of
++   RES_USE_INET6.  */
+ static void
+-test_get2 (void)
++test_reverse (void)
+ {
+-  check_hostent ("gethostbyname2 AF_INET www1.example",
+-                 gethostbyname2 ("www1.example", AF_INET),
+-                 "name: www1.example\n"
++  {
++    char ipv4[4] = { 192, 0, 2, 17 };
++    check_hostent ("gethostbyaddr AF_INET",
++                   gethostbyaddr (ipv4, sizeof (ipv4), AF_INET),
++                   "name: 192-0-2-17.v4.example\n"
++                   "address: 192.0.2.17\n");
++  }
++  {
++    char ipv6[16]
++      = {0x20, 0x01, 0xd, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
++    check_hostent ("gethostbyaddr AF_INET",
++                   gethostbyaddr (ipv6, sizeof (ipv6), AF_INET6),
++                   "name: 20010db8000000000000000000000001.v6.example\n"
++                   "address: 2001:db8::1\n");
++  }
++
++  {
++    struct sockaddr_in addr =
++      {
++        .sin_family = AF_INET,
++        .sin_addr = { .s_addr = htonl (0xc0000211) },
++        .sin_port = htons (80)
++      };
++    char host[NI_MAXHOST];
++    char service[NI_MAXSERV];
++    int ret = getnameinfo ((struct sockaddr *) &addr, sizeof (addr),
++                           host, sizeof (host), service, sizeof (service),
++                           NI_NUMERICSERV);
++    TEST_VERIFY (ret == 0);
++    TEST_VERIFY (strcmp (host, "192-0-2-17.v4.example") == 0);
++    TEST_VERIFY (strcmp (service, "80") == 0);
++  }
++  {
++    char ipv6[16]
++      = {0x20, 0x01, 0xd, 0xb8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1};
++    struct sockaddr_in6 addr =
++      {
++        .sin6_family = AF_INET6,
++        .sin6_port = htons (80),
++      };
++    TEST_VERIFY (sizeof (ipv6) == sizeof (addr.sin6_addr));
++    memcpy (&addr.sin6_addr, ipv6, sizeof (addr.sin6_addr));
++    char host[NI_MAXHOST];
++    char service[NI_MAXSERV];
++    int ret = getnameinfo ((struct sockaddr *) &addr, sizeof (addr),
++                           host, sizeof (host), service, sizeof (service),
++                           NI_NUMERICSERV);
++    TEST_VERIFY (ret == 0);
++    TEST_VERIFY
++      (strcmp (host, "20010db8000000000000000000000001.v6.example") == 0);
++    TEST_VERIFY (strcmp (service, "80") == 0);
++  }
++}
++
++/* Test that gethostbyname2 is mostly not influenced by
++   RES_USE_INET6.  */
++static void
++test_get2_any (void)
++{
++  check_hostent ("gethostbyname2 AF_INET am.example",
++                 gethostbyname2 ("am.example", AF_INET),
++                 "name: am.example\n"
++                 "address: 192.0.2.17\n");
++  check_hostent ("gethostbyname2 AF_INET a.example",
++                 gethostbyname2 ("a.example", AF_INET),
++                 "name: a.example\n"
+                  "address: 192.0.2.17\n");
+-  check_hostent ("gethostbyname2 AF_INET both.example",
+-                 gethostbyname2 ("both.example", AF_INET),
+-                 "name: both.example\n"
++  check_hostent ("gethostbyname2 AF_INET qm.example",
++                 gethostbyname2 ("qm.example", AF_INET),
++                 "error: NO_ADDRESS\n");
++  check_hostent ("gethostbyname2 AF_INET q.example",
++                 gethostbyname2 ("q.example", AF_INET),
++                 "error: NO_RECOVERY\n");
++  check_hostent ("gethostbyname2 AF_INET qam.example",
++                 gethostbyname2 ("qam.example", AF_INET),
++                 "name: qam.example\n"
++                 "address: 192.0.2.17\n");
++  check_hostent ("gethostbyname2 AF_INET qa.example",
++                 gethostbyname2 ("qa.example", AF_INET),
++                 "name: qa.example\n"
+                  "address: 192.0.2.17\n");
+ 
+-  check_hostent ("gethostbyname2 AF_INET6 www1.example",
+-                 gethostbyname2 ("www1.example", AF_INET6),
+-                 "name: www1.example\n"
++  check_hostent ("gethostbyname2 AF_INET6 qm.example",
++                 gethostbyname2 ("qm.example", AF_INET6),
++                 "name: qm.example\n"
++                 "address: 2001:db8::1\n");
++  check_hostent ("gethostbyname2 AF_INET6 q.example",
++                 gethostbyname2 ("q.example", AF_INET6),
++                 "name: q.example\n"
++                 "address: 2001:db8::1\n");
++  check_hostent ("gethostbyname2 AF_INET6 qam.example",
++                 gethostbyname2 ("qam.example", AF_INET6),
++                 "name: qam.example\n"
+                  "address: 2001:db8::1\n");
+-  check_hostent ("gethostbyname2 AF_INET6 both.example",
+-                 gethostbyname2 ("both.example", AF_INET6),
+-                 "name: both.example\n"
++  check_hostent ("gethostbyname2 AF_INET6 qa.example",
++                 gethostbyname2 ("qa.example", AF_INET6),
++                 "name: qa.example\n"
+                  "address: 2001:db8::1\n");
++  /* Additional AF_INET6 tests depend on RES_USE_INET6; see below.  */
++
++  test_reverse ();
++}
++
++/* gethostbyname2 tests with RES_USE_INET6 disabled.  */
++static void
++test_get2_no_inet6 (void)
++{
++  test_get2_any ();
++
++  check_hostent ("gethostbyname2 AF_INET6 am.example",
++                 gethostbyname2 ("am.example", AF_INET6),
++                 "error: NO_ADDRESS\n");
++  check_hostent ("gethostbyname2 AF_INET6 a.example",
++                 gethostbyname2 ("a.example", AF_INET6),
++                 "error: NO_RECOVERY\n");
++}
++
++/* gethostbyname2 tests with RES_USE_INET6 enabled.  */
++static void
++test_get2_inet6 (void)
++{
++  test_get2_any ();
++
++  check_hostent ("gethostbyname2 AF_INET6 am.example",
++                 gethostbyname2 ("am.example", AF_INET6),
++                 "name: am.example\n"
++                 "address: ::ffff:192.0.2.17\n");
++  check_hostent ("gethostbyname2 AF_INET6 a.example",
++                 gethostbyname2 ("a.example", AF_INET6),
++                 "error: NO_RECOVERY\n");
++}
++
++/* Collection of tests which assume no RES_USE_INET6 flag.  */
++static void
++test_no_inet6 (void)
++{
++  check_hostent ("gethostbyname (\"a.example\")",
++                 gethostbyname ("a.example"),
++                 "name: a.example\n"
++                 "address: 192.0.2.17\n");
++  check_hostent ("gethostbyname (\"qa.example\")",
++                 gethostbyname ("qa.example"),
++                 "name: qa.example\n"
++                 "address: 192.0.2.17\n");
++  check_hostent ("gethostbyname (\"am.example\")",
++                 gethostbyname ("am.example"),
++                 "name: am.example\n"
++                 "address: 192.0.2.17\n");
++  check_hostent ("gethostbyname (\"amp.example\")",
++                 gethostbyname ("amp.example"),
++                 "name: amp.example\n"
++                 "address: 192.0.2.17\n");
++  check_hostent ("gethostbyname (\"qam.example\")",
++                 gethostbyname ("qam.example"),
++                 "name: qam.example\n"
++                 "address: 192.0.2.17\n");
++  check_hostent ("gethostbyname (\"q.example\")",
++                 gethostbyname ("q.example"),
++                 "error: NO_RECOVERY\n");
++  check_hostent ("gethostbyname (\"qm.example\")",
++                 gethostbyname ("qm.example"),
++                 "error: NO_ADDRESS\n");
++  test_get2_no_inet6 ();
++  test_get2_no_inet6 ();
++  test_gai ();
++  test_get2_no_inet6 ();
++  test_get2_no_inet6 ();
+ }
+ 
+ static void *
+@@ -153,28 +425,64 @@ threadfunc (void *ignored)
+        .response_callback = response
+      });
+ 
+-  check_hostent ("gethostbyname (\"www1.example\")",
+-                 gethostbyname ("www1.example"),
+-                 "name: www1.example\n"
+-                 "address: 192.0.2.17\n");
+-  check_hostent ("gethostbyname (\"both.example\")",
+-                 gethostbyname ("both.example"),
+-                 "name: both.example\n"
+-                 "address: 192.0.2.17\n");
+-  test_get2 ();
+-  test_gai ();
++  TEST_VERIFY ((_res.options & RES_USE_INET6) == 0);
++  test_no_inet6 ();
+ 
+   _res.options |= RES_USE_INET6;
+-  check_hostent ("gethostbyname (\"www1.example\")",
+-                 gethostbyname ("www1.example"),
+-                 "name: www1.example\n"
++  check_hostent ("gethostbyname (\"a.inet6.example\")",
++                 gethostbyname ("a.inet6.example"),
++                 "error: NO_RECOVERY\n");
++  check_hostent ("gethostbyname (\"am.inet6.example\")",
++                 gethostbyname ("am.inet6.example"),
++                 "name: am.inet6.example\n"
++                 "address: ::ffff:192.0.2.17\n");
++  check_hostent ("gethostbyname (\"qa.inet6.example\")",
++                 gethostbyname ("qa.inet6.example"),
++                 "name: qa.inet6.example\n"
+                  "address: 2001:db8::1\n");
+-  check_hostent ("gethostbyname (\"both.example\")",
+-                 gethostbyname ("both.example"),
+-                 "name: both.example\n"
++  check_hostent ("gethostbyname (\"qam.inet6.example\")",
++                 gethostbyname ("qam.inet6.example"),
++                 "name: qam.inet6.example\n"
+                  "address: 2001:db8::1\n");
+-  test_get2 ();
++  check_hostent ("gethostbyname (\"q.inet6.example\")",
++                 gethostbyname ("q.inet6.example"),
++                 "name: q.inet6.example\n"
++                 "address: 2001:db8::1\n");
++  check_hostent ("gethostbyname (\"qm.inet6.example\")",
++                 gethostbyname ("qm.inet6.example"),
++                 "name: qm.inet6.example\n"
++                 "address: 2001:db8::1\n");
++  check_hostent ("gethostbyname (\"amp.inet6.example\")",
++                 gethostbyname ("amp.inet6.example"),
++                 "error: NO_RECOVERY\n");
++  check_hostent ("gethostbyname (\"qmp.inet6.example\")",
++                 gethostbyname ("qmp.inet6.example"),
++                 "name: qmp.inet6.example\n"
++                 "address: 2001:db8::1\n");
++  check_hostent ("gethostbyname (\"ap.inet6.example\")",
++                 gethostbyname ("ap.inet6.example"),
++                 "error: NO_RECOVERY\n");
++  check_hostent ("gethostbyname (\"6ap.inet6.example\")",
++                 gethostbyname ("6ap.inet6.example"),
++                 "name: 6ap.inet6.example\n"
++                 "address: ::ffff:192.0.2.17\n");
++  check_hostent ("gethostbyname (\"am6p.inet6.example\")",
++                 gethostbyname ("am6p.inet6.example"),
++                 "name: am6p.inet6.example\n"
++                 "address: ::ffff:192.0.2.17\n");
++  check_hostent ("gethostbyname (\"qp.inet6.example\")",
++                 gethostbyname ("qp.inet6.example"),
++                 "name: qp.inet6.example\n"
++                 "address: 2001:db8::1\n");
++  test_get2_inet6 ();
++  test_get2_inet6 ();
+   test_gai ();
++  test_get2_inet6 ();
++  test_get2_inet6 ();
++
++  TEST_VERIFY (_res.options & RES_USE_INET6);
++  _res.options &= ~RES_USE_INET6;
++  test_no_inet6 ();
+ 
+   resolv_test_end (obj);
+ 
+diff --git a/resolv/tst-resolv-basic.c b/resolv/tst-resolv-basic.c
+index 64eedbbd81..66a0e8a165 100644
+--- a/resolv/tst-resolv-basic.c
++++ b/resolv/tst-resolv-basic.c
+@@ -50,7 +50,7 @@ response (const struct resolv_response_context *ctx,
+     qname_compare = qname + 2;
+   else
+     qname_compare = qname;
+-  enum {www, alias, nxdomain, long_name} requested_qname;
++  enum {www, alias, nxdomain, long_name, nodata} requested_qname;
+   if (strcmp (qname_compare, "www.example") == 0)
+     requested_qname = www;
+   else if (strcmp (qname_compare, "alias.example") == 0)
+@@ -59,6 +59,8 @@ response (const struct resolv_response_context *ctx,
+     requested_qname = nxdomain;
+   else if (strcmp (qname_compare, LONG_NAME) == 0)
+     requested_qname = long_name;
++  else if (strcmp (qname_compare, "nodata.example") == 0)
++    requested_qname = nodata;
+   else
+     {
+       support_record_failure ();
+@@ -87,6 +89,8 @@ response (const struct resolv_response_context *ctx,
+       resolv_response_close_record (b);
+       resolv_response_open_record (b, "www.example", qclass, qtype, 0);
+       break;
++    case nodata:
++      return;
+     case nxdomain:
+       FAIL_EXIT1 ("unreachable");
+     }
+@@ -267,6 +271,55 @@ test_bug_21295 (void)
+     }
+ }
+ 
++/* Run tests which do not expect any data.  */
++static void
++test_nodata_nxdomain (void)
++{
++  /* Iterate through different address families.  */
++  int families[] = { AF_UNSPEC, AF_INET, AF_INET6, -1 };
++  for (int i = 0; families[i] >= 0; ++i)
++    /* If do_tcp, prepend "t." to the name to trigger TCP
++       fallback.  */
++    for (int do_tcp = 0; do_tcp < 2; ++do_tcp)
++      /* If do_nxdomain, trigger an NXDOMAIN error (DNS failure),
++         otherwise use a NODATA response (empty but successful
++         answer).  */
++      for (int do_nxdomain = 0; do_nxdomain < 2; ++do_nxdomain)
++        {
++          int family = families[i];
++          char *name = xasprintf ("%s%s.example",
++                                  do_tcp ? "t." : "",
++                                  do_nxdomain ? "nxdomain" : "nodata");
++
++          if (family != AF_UNSPEC)
++            {
++              if (do_nxdomain)
++                check_h (name, family, "error: HOST_NOT_FOUND\n");
++              else
++                check_h (name, family, "error: NO_ADDRESS\n");
++            }
++
++          const char *expected;
++          if (do_nxdomain)
++            expected = "error: Name or service not known\n";
++          else
++            expected = "error: No address associated with hostname\n";
++
++          check_ai (name, "80", family, expected);
++
++          struct addrinfo hints =
++            {
++              .ai_family = family,
++              .ai_flags = AI_V4MAPPED | AI_ALL,
++            };
++          check_ai_hints (name, "80", hints, expected);
++          hints.ai_flags |= AI_CANONNAME;
++          check_ai_hints (name, "80", hints, expected);
++
++          free (name);
++        }
++}
++
+ static int
+ do_test (void)
+ {
+@@ -439,29 +492,8 @@ do_test (void)
+             "address: DGRAM/UDP 2001:db8::4 80\n"
+             "address: RAW/IP 2001:db8::4 80\n");
+ 
+-  check_h ("nxdomain.example", AF_INET,
+-           "error: HOST_NOT_FOUND\n");
+-  check_h ("nxdomain.example", AF_INET6,
+-           "error: HOST_NOT_FOUND\n");
+-  check_ai ("nxdomain.example", "80", AF_UNSPEC,
+-            "error: Name or service not known\n");
+-  check_ai ("nxdomain.example", "80", AF_INET,
+-            "error: Name or service not known\n");
+-  check_ai ("nxdomain.example", "80", AF_INET6,
+-            "error: Name or service not known\n");
+-
+-  check_h ("t.nxdomain.example", AF_INET,
+-           "error: HOST_NOT_FOUND\n");
+-  check_h ("t.nxdomain.example", AF_INET6,
+-           "error: HOST_NOT_FOUND\n");
+-  check_ai ("t.nxdomain.example", "80", AF_UNSPEC,
+-            "error: Name or service not known\n");
+-  check_ai ("t.nxdomain.example", "80", AF_INET,
+-            "error: Name or service not known\n");
+-  check_ai ("t.nxdomain.example", "80", AF_INET6,
+-            "error: Name or service not known\n");
+-
+   test_bug_21295 ();
++  test_nodata_nxdomain ();
+ 
+   resolv_test_end (aux);
+ 
+diff --git a/resolv/tst-resolv-qtypes.c b/resolv/tst-resolv-qtypes.c
+index 06ea3dbd14..da3325f80c 100644
+--- a/resolv/tst-resolv-qtypes.c
++++ b/resolv/tst-resolv-qtypes.c
+@@ -50,7 +50,7 @@ response (const struct resolv_response_context *ctx,
+   resolv_response_close_record (b);
+ }
+ 
+-static const char * const domain = "www.example.com";
++static const char domain[] = "www.example.com";
+ 
+ static int
+ wrap_res_query (int type, unsigned char *answer, int answer_length)
+diff --git a/scripts/backport-support.sh b/scripts/backport-support.sh
+index 2ece7ce575..4057e42d3c 100644
+--- a/scripts/backport-support.sh
++++ b/scripts/backport-support.sh
+@@ -1,6 +1,6 @@
+ #!/bin/bash
+ # Create a patch which backports the support/ subdirectory.
+-# Copyright (C) 2017 Free Software Foundation, Inc.
++# Copyright (C) 2017-2018 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ 
+ # The GNU C Library is free software; you can redistribute it and/or
+diff --git a/scripts/check-local-headers.sh b/scripts/check-local-headers.sh
+index 7859f613b2..0cde6e8e92 100755
+--- a/scripts/check-local-headers.sh
++++ b/scripts/check-local-headers.sh
+@@ -33,7 +33,7 @@ exec ${AWK} -v includedir="$includedir" '
+ BEGIN {
+   status = 0
+   exclude = "^" includedir \
+-    "/(.*-.*-.*/|.*-.*/|)(asm[-/]|arch|linux/|selinux/|mach/|mach_debug/|device/|hurd/(((hurd|ioctl)_types|paths)\\.h|ioctls\\.defs|ihash\\.h)|cthreads\\.h|gd|nss3/|c\\+\\+/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h)"
++    "/(.*-.*-.*/|.*-.*/|)(asm[-/]|arch|linux/|selinux/|mach/|mach_debug/|device/|hurd/(((hurd|ioctl)_types|paths)\\.h|ioctls\\.defs|ihash\\.h)|cthreads\\.h|gd|nss3/|nspr4?/|c\\+\\+/|sys/(capability|sdt(|-config))\\.h|libaudit\\.h)"
+ }
+ /^[^ ]/ && $1 ~ /.*:/ { obj = $1 }
+ {
+diff --git a/scripts/gen-tunables.awk b/scripts/gen-tunables.awk
+index ccdd0c6c71..622199061a 100644
+--- a/scripts/gen-tunables.awk
++++ b/scripts/gen-tunables.awk
+@@ -1,6 +1,14 @@
+ # Generate dl-tunable-list.h from dl-tunables.list
+ 
+ BEGIN {
++  min_of["STRING"]="0"
++  max_of["STRING"]="0"
++  min_of["INT_32"]="INT32_MIN"
++  max_of["INT_32"]="INT32_MAX"
++  min_of["UINT_64"]="0"
++  max_of["UINT_64"]="UINT64_MAX"
++  min_of["SIZE_T"]="0"
++  max_of["SIZE_T"]="SIZE_MAX"
+   tunable=""
+   ns=""
+   top_ns=""
+@@ -43,10 +51,10 @@ $1 == "}" {
+       types[top_ns,ns,tunable] = "STRING"
+     }
+     if (!minvals[top_ns,ns,tunable]) {
+-      minvals[top_ns,ns,tunable] = "0"
++      minvals[top_ns,ns,tunable] = min_of[types[top_ns,ns,tunable]]
+     }
+     if (!maxvals[top_ns,ns,tunable]) {
+-      maxvals[top_ns,ns,tunable] = "0"
++      maxvals[top_ns,ns,tunable] = max_of[types[top_ns,ns,tunable]]
+     }
+     if (!env_alias[top_ns,ns,tunable]) {
+       env_alias[top_ns,ns,tunable] = "NULL"
+diff --git a/stdlib/getentropy.c b/stdlib/getentropy.c
+index a71d4cd8f5..a88bbf8de3 100644
+--- a/stdlib/getentropy.c
++++ b/stdlib/getentropy.c
+@@ -21,7 +21,7 @@
+ 
+ /* Write LENGTH bytes of randomness starting at BUFFER.  Return 0 on
+    success and -1 on failure.  */
+-ssize_t
++int
+ getentropy (void *buffer, size_t length)
+ {
+   __set_errno (ENOSYS);
+diff --git a/string/stratcliff.c b/string/stratcliff.c
+index e28b0c5058..4320336c9a 100644
+--- a/string/stratcliff.c
++++ b/string/stratcliff.c
+@@ -58,8 +58,8 @@
+ int
+ do_test (void)
+ {
+-  int size = sysconf (_SC_PAGESIZE);
+-  int nchars = size / sizeof (CHAR);
++  size_t size = sysconf (_SC_PAGESIZE);
++  size_t nchars = size / sizeof (CHAR);
+   CHAR *adr;
+   CHAR *dest;
+   int result = 0;
+@@ -80,7 +80,17 @@ do_test (void)
+     }
+   else
+     {
+-      int inner, middle, outer;
++      size_t inner, middle, outer, nchars64, max128;
++
++      if (nchars > 64)
++	nchars64 = nchars - 64;
++      else
++	nchars64 = 0;
++
++      if (nchars > 128)
++	max128 = nchars - 128;
++      else
++	max128 = 0;
+ 
+       mprotect (adr, size, PROT_NONE);
+       mprotect (adr + 2 * nchars, size, PROT_NONE);
+@@ -93,59 +103,65 @@ do_test (void)
+       MEMSET (adr, L('T'), nchars);
+ 
+       /* strlen/wcslen test */
+-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
++      for (outer = nchars - 1; outer >= max128; --outer)
+ 	{
+-	  for (inner = MAX (outer, nchars - 64); inner < nchars; ++inner)
++	  for (inner = MAX (outer, nchars64); inner < nchars; ++inner)
+ 	    {
+ 	      adr[inner] = L('\0');
+ 
+ 	      if (STRLEN (&adr[outer]) != (size_t) (inner - outer))
+ 		{
+-		  printf ("%s flunked for outer = %d, inner = %d\n",
++		  printf ("%s flunked for outer = %zu, inner = %zu\n",
+ 			  STRINGIFY (STRLEN), outer, inner);
+ 		  result = 1;
+ 		}
+ 
+ 	      adr[inner] = L('T');
+ 	    }
++	  if (outer == 0)
++	    break;
+ 	}
+ 
+       /* strnlen/wcsnlen test */
+-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
++      for (outer = nchars; outer >= max128; --outer)
+ 	{
+-	  for (inner = MAX (outer, nchars - 64); inner < nchars; ++inner)
++	  for (inner = MAX (outer, nchars64); inner < nchars; ++inner)
+ 	    {
+ 	      adr[inner] = L('\0');
+ 
+ 	      if (STRNLEN (&adr[outer], inner - outer + 1)
+ 		  != (size_t) (inner - outer))
+ 		{
+-		  printf ("%s flunked for outer = %d, inner = %d\n",
++		  printf ("%s flunked for outer = %zu, inner = %zu\n",
+ 			  STRINGIFY (STRNLEN), outer, inner);
+ 		  result = 1;
+ 		}
+ 
+ 	      adr[inner] = L('T');
+ 	    }
++	  if (outer == 0)
++	    break;
+ 	}
+-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
++      for (outer = nchars; outer >= max128; --outer)
+ 	{
+-	  for (inner = MAX (outer, nchars - 64); inner <= nchars; ++inner)
++	  for (inner = MAX (outer, nchars64); inner <= nchars; ++inner)
+ 	    {
+ 	      if (STRNLEN (&adr[outer], inner - outer)
+ 		  != (size_t) (inner - outer))
+ 		{
+-		  printf ("%s flunked bounded for outer = %d, inner = %d\n",
++		  printf ("%s flunked bounded for outer = %zu, inner = %zu\n",
+ 			  STRINGIFY (STRNLEN), outer, inner);
+ 		  result = 1;
+ 		}
+ 	    }
++	  if (outer == 0)
++	    break;
+ 	}
+ 
+       /* strchr/wcschr test */
+-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
++      for (outer = nchars - 1; outer >= max128; --outer)
+ 	{
+-	  for (middle = MAX (outer, nchars - 64); middle < nchars; ++middle)
++	  for (middle = MAX (outer, nchars64); middle < nchars; ++middle)
+ 	    {
+ 	      for (inner = middle; inner < nchars; ++inner)
+ 		{
+@@ -158,8 +174,8 @@ do_test (void)
+ 		      || (inner != middle
+ 			  && (cp - &adr[outer]) != middle - outer))
+ 		    {
+-		      printf ("%s flunked for outer = %d, middle = %d, "
+-			      "inner = %d\n",
++		      printf ("%s flunked for outer = %zu, middle = %zu, "
++			      "inner = %zu\n",
+ 			      STRINGIFY (STRCHR), outer, middle, inner);
+ 		      result = 1;
+ 		    }
+@@ -168,6 +184,8 @@ do_test (void)
+ 		  adr[middle] = L('T');
+ 		}
+ 	    }
++	  if (outer == 0)
++	    break;
+ 	}
+ 
+       /* Special test.  */
+@@ -180,9 +198,9 @@ do_test (void)
+ 	}
+ 
+       /* strrchr/wcsrchr test */
+-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
++      for (outer = nchars - 1; outer >= max128; --outer)
+ 	{
+-	  for (middle = MAX (outer, nchars - 64); middle < nchars; ++middle)
++	  for (middle = MAX (outer, nchars64); middle < nchars; ++middle)
+ 	    {
+ 	      for (inner = middle; inner < nchars; ++inner)
+ 		{
+@@ -195,8 +213,8 @@ do_test (void)
+ 		      || (inner != middle
+ 			  && (cp - &adr[outer]) != middle - outer))
+ 		    {
+-		      printf ("%s flunked for outer = %d, middle = %d, "
+-			      "inner = %d\n",
++		      printf ("%s flunked for outer = %zu, middle = %zu, "
++			      "inner = %zu\n",
+ 			      STRINGIFY (STRRCHR), outer, middle, inner);
+ 		      result = 1;
+ 		    }
+@@ -205,12 +223,14 @@ do_test (void)
+ 		  adr[middle] = L('T');
+ 		}
+ 	    }
++	  if (outer == 0)
++	    break;
+ 	}
+ 
+       /* memchr test */
+-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
++      for (outer = nchars - 1; outer >= max128; --outer)
+ 	{
+-	  for (middle = MAX (outer, nchars - 64); middle < nchars; ++middle)
++	  for (middle = MAX (outer, nchars64); middle < nchars; ++middle)
+ 	    {
+ 	      adr[middle] = L('V');
+ 
+@@ -218,32 +238,36 @@ do_test (void)
+ 
+ 	      if (cp - &adr[outer] != middle - outer)
+ 		{
+-		  printf ("%s flunked for outer = %d, middle = %d\n",
++		  printf ("%s flunked for outer = %zu, middle = %zu\n",
+ 			  STRINGIFY (MEMCHR), outer, middle);
+ 		  result = 1;
+ 		}
+ 
+ 	      adr[middle] = L('T');
+ 	    }
++	  if (outer == 0)
++	    break;
+ 	}
+-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
++      for (outer = nchars; outer >= max128; --outer)
+ 	{
+ 	  CHAR *cp = MEMCHR (&adr[outer], L('V'), nchars - outer);
+ 
+ 	  if (cp != NULL)
+ 	    {
+-	      printf ("%s flunked for outer = %d\n",
++	      printf ("%s flunked for outer = %zu\n",
+ 		      STRINGIFY (MEMCHR), outer);
+ 	      result = 1;
+ 	    }
++	  if (outer == 0)
++	    break;
+ 	}
+ 
+       /* These functions only exist for single-byte characters.  */
+ #ifndef WCSTEST
+       /* rawmemchr test */
+-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
++      for (outer = nchars - 1; outer >= max128; --outer)
+ 	{
+-	  for (middle = MAX (outer, nchars - 64); middle < nchars; ++middle)
++	  for (middle = MAX (outer, nchars64); middle < nchars; ++middle)
+ 	    {
+ 	      adr[middle] = L('V');
+ 
+@@ -251,19 +275,21 @@ do_test (void)
+ 
+ 	      if (cp - &adr[outer] != middle - outer)
+ 		{
+-		  printf ("%s flunked for outer = %d, middle = %d\n",
++		  printf ("%s flunked for outer = %zu, middle = %zu\n",
+ 			  STRINGIFY (rawmemchr), outer, middle);
+ 		  result = 1;
+ 		}
+ 
+ 	      adr[middle] = L('T');
+ 	    }
++	  if (outer == 0)
++	    break;
+ 	}
+ 
+       /* memrchr test */
+-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
++      for (outer = nchars - 1; outer >= max128; --outer)
+ 	{
+-	  for (middle = MAX (outer, nchars - 64); middle < nchars; ++middle)
++	  for (middle = MAX (outer, nchars64); middle < nchars; ++middle)
+ 	    {
+ 	      adr[middle] = L('V');
+ 
+@@ -271,44 +297,50 @@ do_test (void)
+ 
+ 	      if (cp - &adr[outer] != middle - outer)
+ 		{
+-		  printf ("%s flunked for outer = %d, middle = %d\n",
++		  printf ("%s flunked for outer = %zu, middle = %zu\n",
+ 			  STRINGIFY (memrchr), outer, middle);
+ 		  result = 1;
+ 		}
+ 
+ 	      adr[middle] = L('T');
+ 	    }
++	  if (outer == 0)
++	    break;
+ 	}
+-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
++      for (outer = nchars; outer >= max128; --outer)
+ 	{
+ 	  CHAR *cp = memrchr (&adr[outer], L('V'), nchars - outer);
+ 
+ 	  if (cp != NULL)
+ 	    {
+-	      printf ("%s flunked for outer = %d\n",
++	      printf ("%s flunked for outer = %zu\n",
+ 		      STRINGIFY (memrchr), outer);
+ 	      result = 1;
+ 	    }
++	  if (outer == 0)
++	    break;
+ 	}
+ #endif
+ 
+       /* strcpy/wcscpy test */
+-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
++      for (outer = nchars - 1; outer >= max128; --outer)
+ 	{
+-	  for (inner = MAX (outer, nchars - 64); inner < nchars; ++inner)
++	  for (inner = MAX (outer, nchars64); inner < nchars; ++inner)
+ 	    {
+ 	      adr[inner] = L('\0');
+ 
+ 	      if (STRCPY (dest, &adr[outer]) != dest
+ 		  || STRLEN (dest) != (size_t) (inner - outer))
+ 		{
+-		  printf ("%s flunked for outer = %d, inner = %d\n",
++		  printf ("%s flunked for outer = %zu, inner = %zu\n",
+ 			  STRINGIFY (STRCPY), outer, inner);
+ 		  result = 1;
+ 		}
+ 
+ 	      adr[inner] = L('T');
+ 	    }
++	  if (outer == 0)
++	    break;
+ 	}
+ 
+       /* strcmp/wcscmp tests */
+@@ -322,14 +354,14 @@ do_test (void)
+ 
+ 	    if (STRCMP (adr + middle, dest + nchars - outer) <= 0)
+ 	      {
+-		printf ("%s 1 flunked for outer = %d, middle = %d\n",
++		printf ("%s 1 flunked for outer = %zu, middle = %zu\n",
+ 			STRINGIFY (STRCMP), outer, middle);
+ 		result = 1;
+ 	      }
+ 
+ 	    if (STRCMP (dest + nchars - outer, adr + middle) >= 0)
+ 	      {
+-		printf ("%s 2 flunked for outer = %d, middle = %d\n",
++		printf ("%s 2 flunked for outer = %zu, middle = %zu\n",
+ 			STRINGIFY (STRCMP), outer, middle);
+ 		result = 1;
+ 	      }
+@@ -348,16 +380,16 @@ do_test (void)
+ 	      {
+ 		if (STRNCMP (adr + middle, dest + nchars - outer, inner) != 0)
+ 		  {
+-		    printf ("%s 1 flunked for outer = %d, middle = %d, "
+-			    "inner = %d\n",
++		    printf ("%s 1 flunked for outer = %zu, middle = %zu, "
++			    "inner = %zu\n",
+ 			    STRINGIFY (STRNCMP), outer, middle, inner);
+ 		    result = 1;
+ 		  }
+ 
+ 		if (STRNCMP (dest + nchars - outer, adr + middle, inner) != 0)
+ 		  {
+-		    printf ("%s 2 flunked for outer = %d, middle = %d, "
+-			    "inner = %d\n",
++		    printf ("%s 2 flunked for outer = %zu, middle = %zu, "
++			    "inner = %zu\n",
+ 			    STRINGIFY (STRNCMP), outer, middle, inner);
+ 		    result = 1;
+ 		  }
+@@ -365,14 +397,14 @@ do_test (void)
+ 
+ 	    if (STRNCMP (adr + middle, dest + nchars - outer, outer) >= 0)
+ 	      {
+-		printf ("%s 1 flunked for outer = %d, middle = %d, full\n",
++		printf ("%s 1 flunked for outer = %zu, middle = %zu, full\n",
+ 			STRINGIFY (STRNCMP), outer, middle);
+ 		result = 1;
+ 	      }
+ 
+ 	    if (STRNCMP (dest + nchars - outer, adr + middle, outer) <= 0)
+ 	      {
+-		printf ("%s 2 flunked for outer = %d, middle = %d, full\n",
++		printf ("%s 2 flunked for outer = %zu, middle = %zu, full\n",
+ 			STRINGIFY (STRNCMP), outer, middle);
+ 		result = 1;
+ 	      }
+@@ -380,7 +412,7 @@ do_test (void)
+ 
+       /* strncpy/wcsncpy tests */
+       adr[nchars - 1] = L('T');
+-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
++      for (outer = nchars; outer >= max128; --outer)
+ 	{
+ 	  size_t len;
+ 
+@@ -389,17 +421,19 @@ do_test (void)
+ 	      if (STRNCPY (dest, &adr[outer], len) != dest
+ 		  || MEMCMP (dest, &adr[outer], len) != 0)
+ 		{
+-		  printf ("outer %s flunked for outer = %d, len = %Zd\n",
++		  printf ("outer %s flunked for outer = %zu, len = %zu\n",
+ 			  STRINGIFY (STRNCPY), outer, len);
+ 		  result = 1;
+ 		}
+ 	    }
++	  if (outer == 0)
++	    break;
+ 	}
+       adr[nchars - 1] = L('\0');
+ 
+-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
++      for (outer = nchars - 1; outer >= max128; --outer)
+ 	{
+-	  for (inner = MAX (outer, nchars - 64); inner < nchars; ++inner)
++	  for (inner = MAX (outer, nchars64); inner < nchars; ++inner)
+ 	    {
+ 	      size_t len;
+ 
+@@ -413,8 +447,8 @@ do_test (void)
+ 		      || (inner - outer < len
+ 			  && STRLEN (dest) != (inner - outer)))
+ 		    {
+-		      printf ("%s flunked for outer = %d, inner = %d, "
+-			      "len = %Zd\n",
++		      printf ("%s flunked for outer = %zu, inner = %zu, "
++			      "len = %zu\n",
+ 			      STRINGIFY (STRNCPY), outer, inner, len);
+ 		      result = 1;
+ 		    }
+@@ -424,8 +458,8 @@ do_test (void)
+ 		      || (inner - outer < len
+ 			  && STRLEN (dest + 1) != (inner - outer)))
+ 		    {
+-		      printf ("%s+1 flunked for outer = %d, inner = %d, "
+-			      "len = %Zd\n",
++		      printf ("%s+1 flunked for outer = %zu, inner = %zu, "
++			      "len = %zu\n",
+ 			      STRINGIFY (STRNCPY), outer, inner, len);
+ 		      result = 1;
+ 		    }
+@@ -433,29 +467,33 @@ do_test (void)
+ 
+ 	      adr[inner] = L('T');
+ 	    }
++	  if (outer == 0)
++	    break;
+ 	}
+ 
+       /* stpcpy/wcpcpy test */
+-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
++      for (outer = nchars - 1; outer >= max128; --outer)
+ 	{
+-	  for (inner = MAX (outer, nchars - 64); inner < nchars; ++inner)
++	  for (inner = MAX (outer, nchars64); inner < nchars; ++inner)
+ 	    {
+ 	      adr[inner] = L('\0');
+ 
+ 	      if ((STPCPY (dest, &adr[outer]) - dest) != inner - outer)
+ 		{
+-		  printf ("%s flunked for outer = %d, inner = %d\n",
++		  printf ("%s flunked for outer = %zu, inner = %zu\n",
+ 			  STRINGIFY (STPCPY), outer, inner);
+ 		  result = 1;
+ 		}
+ 
+ 	      adr[inner] = L('T');
+ 	    }
++	  if (outer == 0)
++	    break;
+ 	}
+ 
+       /* stpncpy/wcpncpy test */
+       adr[nchars - 1] = L('T');
+-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
++      for (outer = nchars; outer >= max128; --outer)
+ 	{
+ 	  size_t len;
+ 
+@@ -464,17 +502,19 @@ do_test (void)
+ 	      if (STPNCPY (dest, &adr[outer], len) != dest + len
+ 		  || MEMCMP (dest, &adr[outer], len) != 0)
+ 		{
+-		  printf ("outer %s flunked for outer = %d, len = %Zd\n",
++		  printf ("outer %s flunked for outer = %zu, len = %zu\n",
+ 			  STRINGIFY (STPNCPY), outer, len);
+ 		  result = 1;
+ 		}
+ 	    }
++	  if (outer == 0)
++	    break;
+ 	}
+       adr[nchars - 1] = L('\0');
+ 
+-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
++      for (outer = nchars - 1; outer >= max128; --outer)
+ 	{
+-	  for (middle = MAX (outer, nchars - 64); middle < nchars; ++middle)
++	  for (middle = MAX (outer, nchars64); middle < nchars; ++middle)
+ 	    {
+ 	      adr[middle] = L('\0');
+ 
+@@ -483,8 +523,8 @@ do_test (void)
+ 		  if ((STPNCPY (dest, &adr[outer], inner) - dest)
+ 		      != MIN (inner, middle - outer))
+ 		    {
+-		      printf ("%s flunked for outer = %d, middle = %d, "
+-			      "inner = %d\n",
++		      printf ("%s flunked for outer = %zu, middle = %zu, "
++			      "inner = %zu\n",
+ 			      STRINGIFY (STPNCPY), outer, middle, inner);
+ 		      result = 1;
+ 		    }
+@@ -492,66 +532,84 @@ do_test (void)
+ 
+ 	      adr[middle] = L('T');
+ 	    }
++	  if (outer == 0)
++	    break;
+ 	}
+ 
+       /* memcpy/wmemcpy test */
+-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
+-	for (inner = 0; inner < nchars - outer; ++inner)
+-	  if (MEMCPY (dest, &adr[outer], inner) !=  dest)
+-	    {
+-	      printf ("%s flunked for outer = %d, inner = %d\n",
+-		      STRINGIFY (MEMCPY), outer, inner);
+-	      result = 1;
+-	    }
++      for (outer = nchars; outer >= max128; --outer)
++	{
++	  for (inner = 0; inner < nchars - outer; ++inner)
++	    if (MEMCPY (dest, &adr[outer], inner) !=  dest)
++	      {
++		printf ("%s flunked for outer = %zu, inner = %zu\n",
++			STRINGIFY (MEMCPY), outer, inner);
++		result = 1;
++	      }
++	  if (outer == 0)
++	    break;
++	}
+ 
+       /* mempcpy/wmempcpy test */
+-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
+-	for (inner = 0; inner < nchars - outer; ++inner)
+-	  if (MEMPCPY (dest, &adr[outer], inner) !=  dest + inner)
+-	    {
+-	      printf ("%s flunked for outer = %d, inner = %d\n",
+-		      STRINGIFY (MEMPCPY), outer, inner);
+-	      result = 1;
+-	    }
++      for (outer = nchars; outer >= max128; --outer)
++	{
++	  for (inner = 0; inner < nchars - outer; ++inner)
++	    if (MEMPCPY (dest, &adr[outer], inner) !=  dest + inner)
++	      {
++		printf ("%s flunked for outer = %zu, inner = %zu\n",
++			STRINGIFY (MEMPCPY), outer, inner);
++		result = 1;
++	      }
++	  if (outer == 0)
++	    break;
++	}
+ 
+       /* This function only exists for single-byte characters.  */
+ #ifndef WCSTEST
+       /* memccpy test */
+       memset (adr, '\0', nchars);
+-      for (outer = nchars; outer >= MAX (0, nchars - 128); --outer)
+-	for (inner = 0; inner < nchars - outer; ++inner)
+-	  if (memccpy (dest, &adr[outer], L('\1'), inner) != NULL)
+-	    {
+-	      printf ("memccpy flunked full copy for outer = %d, inner = %d\n",
+-		      outer, inner);
+-	      result = 1;
+-	    }
+-      for (outer = nchars - 1; outer >= MAX (0, nchars - 128); --outer)
+-	for (middle = 0; middle < nchars - outer; ++middle)
+-	  {
+-	    memset (dest, L('\2'), middle + 1);
+-	    for (inner = 0; inner < middle; ++inner)
++      for (outer = nchars; outer >= max128; --outer)
++	{
++	  for (inner = 0; inner < nchars - outer; ++inner)
++	    if (memccpy (dest, &adr[outer], L('\1'), inner) != NULL)
+ 	      {
+-		adr[outer + inner] = L('\1');
+-
+-		if (memccpy (dest, &adr[outer], '\1', middle + 128)
+-		    !=  dest + inner + 1)
+-		  {
+-		    printf ("\
+-memccpy flunked partial copy for outer = %d, middle = %d, inner = %d\n",
+-			    outer, middle, inner);
+-		    result = 1;
+-		  }
+-		else if (dest[inner + 1] != L('\2'))
+-		  {
+-		    printf ("\
+-memccpy copied too much for outer = %d, middle = %d, inner = %d\n",
+-			    outer, middle, inner);
+-		    result = 1;
+-		  }
+-		adr[outer + inner] = L('\0');
++		printf ("memccpy flunked full copy for outer = %zu, inner = %zu\n",
++			outer, inner);
++		result = 1;
+ 	      }
+-	  }
++	  if (outer == 0)
++	    break;
++	}
++      for (outer = nchars - 1; outer >= max128; --outer)
++	{
++	  for (middle = 0; middle < nchars - outer; ++middle)
++	    {
++	      memset (dest, L('\2'), middle + 1);
++	      for (inner = 0; inner < middle; ++inner)
++		{
++		  adr[outer + inner] = L('\1');
++
++		  if (memccpy (dest, &adr[outer], '\1', middle + 128)
++		      !=  dest + inner + 1)
++		    {
++		      printf ("\
++			      memccpy flunked partial copy for outer = %zu, middle = %zu, inner = %zu\n",
++			      outer, middle, inner);
++		      result = 1;
++		    }
++		  else if (dest[inner + 1] != L('\2'))
++		    {
++		      printf ("\
++			      memccpy copied too much for outer = %zu, middle = %zu, inner = %zu\n",
++			      outer, middle, inner);
++		      result = 1;
++		    }
++		  adr[outer + inner] = L('\0');
++		}
++	    }
++	  if (outer == 0)
++	    break;
++	}
+ #endif
+     }
+ 
+diff --git a/support/Makefile b/support/Makefile
+index 2ace3fa8cc..1bda81e55e 100644
+--- a/support/Makefile
++++ b/support/Makefile
+@@ -1,5 +1,5 @@
+ # Makefile for support library, used only at build and test time
+-# Copyright (C) 2016-2017 Free Software Foundation, Inc.
++# Copyright (C) 2016-2018 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ 
+ # The GNU C Library is free software; you can redistribute it and/or
+@@ -32,15 +32,18 @@ libsupport-routines = \
+   check_netent \
+   delayed_exit \
+   ignore_stderr \
++  next_to_fault \
+   oom_error \
+   resolv_test \
+   set_fortify_handler \
++  support-xfstat \
+   support-xstat \
+   support_become_root \
+   support_can_chroot \
+   support_capture_subprocess \
+   support_capture_subprocess_check \
+   support_chroot \
++  support_enter_mount_namespace \
+   support_enter_network_namespace \
+   support_format_address_family \
+   support_format_addrinfo \
+@@ -52,6 +55,7 @@ libsupport-routines = \
+   support_record_failure \
+   support_run_diff \
+   support_shared_allocate \
++  support_test_compare_failure \
+   support_write_file_string \
+   support_test_main \
+   support_test_verify_impl \
+@@ -65,12 +69,15 @@ libsupport-routines = \
+   xchroot \
+   xclose \
+   xconnect \
++  xdlfcn \
+   xdup2 \
+   xfclose \
+   xfopen \
+   xfork \
++  xftruncate \
+   xgetsockname \
+   xlisten \
++  xlseek \
+   xmalloc \
+   xmemstream \
+   xmkdir \
+@@ -83,8 +90,8 @@ libsupport-routines = \
+   xpthread_attr_destroy \
+   xpthread_attr_init \
+   xpthread_attr_setdetachstate \
+-  xpthread_attr_setstacksize \
+   xpthread_attr_setguardsize \
++  xpthread_attr_setstacksize \
+   xpthread_barrier_destroy \
+   xpthread_barrier_init \
+   xpthread_barrier_wait \
+@@ -108,19 +115,26 @@ libsupport-routines = \
+   xpthread_once \
+   xpthread_rwlock_init \
+   xpthread_rwlock_rdlock \
+-  xpthread_rwlock_wrlock \
+   xpthread_rwlock_unlock \
++  xpthread_rwlock_wrlock \
+   xpthread_rwlockattr_init \
+   xpthread_rwlockattr_setkind_np \
+   xpthread_sigmask \
+   xpthread_spin_lock \
+   xpthread_spin_unlock \
++  xraise \
++  xreadlink \
+   xrealloc \
+   xrecvfrom \
+   xsendto \
+   xsetsockopt \
++  xsigaction \
++  xsignal \
+   xsocket \
+   xstrdup \
++  xstrndup \
++  xsysconf \
++  xunlink \
+   xwaitpid \
+   xwrite \
+ 
+@@ -137,6 +151,8 @@ tests = \
+   tst-support_capture_subprocess \
+   tst-support_format_dns_packet \
+   tst-support_record_failure \
++  tst-test_compare \
++  tst-xreadlink \
+ 
+ ifeq ($(run-built-tests),yes)
+ tests-special = \
+diff --git a/support/capture_subprocess.h b/support/capture_subprocess.h
+index 43caf9bce4..b0886ba1d1 100644
+--- a/support/capture_subprocess.h
++++ b/support/capture_subprocess.h
+@@ -1,5 +1,5 @@
+ /* Capture output from a subprocess.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/check.c b/support/check.c
+index 592f2bc856..78f2b3cde1 100644
+--- a/support/check.c
++++ b/support/check.c
+@@ -1,5 +1,5 @@
+ /* Support code for reporting test results.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -18,6 +18,7 @@
+ 
+ #include <support/check.h>
+ 
++#include <errno.h>
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+@@ -26,9 +27,11 @@
+ static void
+ print_failure (const char *file, int line, const char *format, va_list ap)
+ {
++  int saved_errno = errno;
+   printf ("error: %s:%d: ", file, line);
+   vprintf (format, ap);
+   puts ("");
++  errno = saved_errno;
+ }
+ 
+ int
+diff --git a/support/check.h b/support/check.h
+index bdcd12952a..2192f38941 100644
+--- a/support/check.h
++++ b/support/check.h
+@@ -1,5 +1,5 @@
+ /* Functionality for reporting test results.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -86,6 +86,61 @@ void support_test_verify_exit_impl (int status, const char *file, int line,
+    does not support reporting failures from a DSO.  */
+ void support_record_failure (void);
+ 
++/* Static assertion, under a common name for both C++ and C11.  */
++#ifdef __cplusplus
++# define support_static_assert static_assert
++#else
++# define support_static_assert _Static_assert
++#endif
++
++/* Compare the two integers LEFT and RIGHT and report failure if they
++   are different.  */
++#define TEST_COMPARE(left, right)                                       \
++  ({                                                                    \
++    /* + applies the integer promotions, for bitfield support.   */     \
++    typedef __typeof__ (+ (left)) __left_type;                          \
++    typedef __typeof__ (+ (right)) __right_type;                        \
++    __left_type __left_value = (left);                                  \
++    __right_type __right_value = (right);                               \
++    int __left_is_positive = __left_value > 0;                          \
++    int __right_is_positive = __right_value > 0;                        \
++    /* Prevent use with floating-point types.  */                       \
++    support_static_assert ((__left_type) 1.0 == (__left_type) 1.5,      \
++                           "left value has floating-point type");       \
++    support_static_assert ((__right_type) 1.0 == (__right_type) 1.5,    \
++                           "right value has floating-point type");      \
++    /* Prevent accidental use with larger-than-long long types.  */     \
++    support_static_assert (sizeof (__left_value) <= sizeof (long long), \
++                           "left value fits into long long");           \
++    support_static_assert (sizeof (__right_value) <= sizeof (long long), \
++                    "right value fits into long long");                 \
++    /* Compare the value.  */                                           \
++    if (__left_value != __right_value                                   \
++        || __left_is_positive != __right_is_positive)                   \
++      /* Pass the sign for printing the correct value.  */              \
++      support_test_compare_failure                                      \
++        (__FILE__, __LINE__,                                            \
++         #left, __left_value, __left_is_positive, sizeof (__left_type), \
++         #right, __right_value, __right_is_positive, sizeof (__right_type)); \
++  })
++
++/* Internal implementation of TEST_COMPARE.  LEFT_POSITIVE and
++   RIGHT_POSITIVE are used to store the sign separately, so that both
++   unsigned long long and long long arguments fit into LEFT_VALUE and
++   RIGHT_VALUE, and the function can still print the original value.
++   LEFT_SIZE and RIGHT_SIZE specify the size of the argument in bytes,
++   for hexadecimal formatting.  */
++void support_test_compare_failure (const char *file, int line,
++                                   const char *left_expr,
++                                   long long left_value,
++                                   int left_positive,
++                                   int left_size,
++                                   const char *right_expr,
++                                   long long right_value,
++                                   int right_positive,
++                                   int right_size);
++
++
+ /* Internal function called by the test driver.  */
+ int support_report_failure (int status)
+   __attribute__ ((weak, warn_unused_result));
+diff --git a/support/check_addrinfo.c b/support/check_addrinfo.c
+index 55895ace3c..91ad7c56bd 100644
+--- a/support/check_addrinfo.c
++++ b/support/check_addrinfo.c
+@@ -1,5 +1,5 @@
+ /* Compare struct addrinfo values against a formatted string.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -20,6 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <support/check.h>
+ #include <support/format_nss.h>
+ #include <support/run_diff.h>
+diff --git a/support/check_dns_packet.c b/support/check_dns_packet.c
+index d2a31bed7b..6c1277bd67 100644
+--- a/support/check_dns_packet.c
++++ b/support/check_dns_packet.c
+@@ -1,5 +1,5 @@
+ /* Check that a DNS packet buffer has the expected contents.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -20,6 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <support/check.h>
+ #include <support/format_nss.h>
+ #include <support/run_diff.h>
+diff --git a/support/check_hostent.c b/support/check_hostent.c
+index 890d672d50..56384f9b03 100644
+--- a/support/check_hostent.c
++++ b/support/check_hostent.c
+@@ -1,5 +1,5 @@
+ /* Compare struct hostent values against a formatted string.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -20,6 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <support/check.h>
+ #include <support/format_nss.h>
+ #include <support/run_diff.h>
+diff --git a/support/check_netent.c b/support/check_netent.c
+index daa3083fd1..cbcbfb14e5 100644
+--- a/support/check_netent.c
++++ b/support/check_netent.c
+@@ -1,5 +1,5 @@
+ /* Compare struct netent values against a formatted string.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -20,6 +20,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include <support/check.h>
+ #include <support/format_nss.h>
+ #include <support/run_diff.h>
+diff --git a/support/check_nss.h b/support/check_nss.h
+index 2893f2c295..6aa28fa24e 100644
+--- a/support/check_nss.h
++++ b/support/check_nss.h
+@@ -1,5 +1,5 @@
+ /* Test verification functions for NSS- and DNS-related data.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/delayed_exit.c b/support/delayed_exit.c
+index 67442f95df..2780d9a6fe 100644
+--- a/support/delayed_exit.c
++++ b/support/delayed_exit.c
+@@ -1,5 +1,5 @@
+ /* Time-triggered process termination.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/format_nss.h b/support/format_nss.h
+index fb4597c238..e55354e788 100644
+--- a/support/format_nss.h
++++ b/support/format_nss.h
+@@ -1,5 +1,5 @@
+ /* String formatting functions for NSS- and DNS-related data.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/ignore_stderr.c b/support/ignore_stderr.c
+index 7b77a2cd56..450333ad38 100644
+--- a/support/ignore_stderr.c
++++ b/support/ignore_stderr.c
+@@ -1,5 +1,5 @@
+ /* Avoid all the buffer overflow messages on stderr.
+-   Copyright (C) 2015-2017 Free Software Foundation, Inc.
++   Copyright (C) 2015-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/namespace.h b/support/namespace.h
+index 859c2fda3f..3c3842a49b 100644
+--- a/support/namespace.h
++++ b/support/namespace.h
+@@ -1,5 +1,5 @@
+ /* Entering namespaces for test case isolation.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -51,6 +51,11 @@ bool support_can_chroot (void);
+    has sufficient privileges.  */
+ bool support_enter_network_namespace (void);
+ 
++/* Enter a mount namespace and mark / as private (not shared).  If
++   this function returns true, mount operations in this process will
++   not affect the host system afterwards.  */
++bool support_enter_mount_namespace (void);
++
+ /* Return true if support_enter_network_namespace managed to enter a
+    UTS namespace.  */
+ bool support_in_uts_namespace (void);
+@@ -66,7 +71,9 @@ struct support_chroot_configuration
+ {
+   /* File contents.  The files are not created if the field is
+      NULL.  */
+-  const char *resolv_conf;
++  const char *resolv_conf;      /* /etc/resolv.conf.  */
++  const char *hosts;            /* /etc/hosts.  */
++  const char *host_conf;        /* /etc/host.conf.  */
+ };
+ 
+ /* The result of the creation of a chroot.  */
+@@ -78,8 +85,11 @@ struct support_chroot
+   /* Path to the chroot directory.  */
+   char *path_chroot;
+ 
+-  /* Path to the /etc/resolv.conf file.  */
+-  char *path_resolv_conf;
++  /* Paths to files in the chroot.  These are absolute and outside of
++     the chroot.  */
++  char *path_resolv_conf;       /* /etc/resolv.conf.  */
++  char *path_hosts;             /* /etc/hosts.  */
++  char *path_host_conf;         /* /etc/host.conf.  */
+ };
+ 
+ /* Create a chroot environment.  The returned data should be freed
+diff --git a/support/next_to_fault.c b/support/next_to_fault.c
+new file mode 100644
+index 0000000000..1971bf7cd7
+--- /dev/null
++++ b/support/next_to_fault.c
+@@ -0,0 +1,52 @@
++/* Memory allocation next to an unmapped page.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <support/check.h>
++#include <support/next_to_fault.h>
++#include <support/xunistd.h>
++#include <sys/mman.h>
++#include <sys/param.h>
++
++struct support_next_to_fault
++support_next_to_fault_allocate (size_t size)
++{
++  long page_size = sysconf (_SC_PAGE_SIZE);
++  TEST_VERIFY_EXIT (page_size > 0);
++  struct support_next_to_fault result;
++  result.region_size = roundup (size, page_size) + page_size;
++  if (size + page_size <= size || result.region_size <= size)
++    FAIL_EXIT1 ("support_next_to_fault_allocate (%zu): overflow", size);
++  result.region_start
++    = xmmap (NULL, result.region_size, PROT_READ | PROT_WRITE,
++             MAP_PRIVATE | MAP_ANONYMOUS, -1);
++  /* Unmap the page after the allocation.  */
++  xmprotect (result.region_start + (result.region_size - page_size),
++             page_size, PROT_NONE);
++  /* Align the allocation within the region so that it ends just
++     before the PROT_NONE page.  */
++  result.buffer = result.region_start + result.region_size - page_size - size;
++  result.length = size;
++  return result;
++}
++
++void
++support_next_to_fault_free (struct support_next_to_fault *ntf)
++{
++  xmunmap (ntf->region_start, ntf->region_size);
++  *ntf = (struct support_next_to_fault) { NULL, };
++}
+diff --git a/support/next_to_fault.h b/support/next_to_fault.h
+new file mode 100644
+index 0000000000..75759b586c
+--- /dev/null
++++ b/support/next_to_fault.h
+@@ -0,0 +1,48 @@
++/* Memory allocation next to an unmapped page.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef SUPPORT_NEXT_TO_FAULT_H
++#define SUPPORT_NEXT_TO_FAULT_H
++
++#include <sys/cdefs.h>
++#include <sys/types.h>
++
++__BEGIN_DECLS
++
++/* The memory region created by next_to_fault_allocate.  */
++struct support_next_to_fault
++{
++  /* The user data.  */
++  char *buffer;
++  size_t length;
++
++  /* The entire allocated region.  */
++  void *region_start;
++  size_t region_size;
++};
++
++/* Allocate a buffer of SIZE bytes just before a page which is mapped
++   with PROT_NONE (so that overrunning the buffer will cause a
++   fault).  */
++struct support_next_to_fault support_next_to_fault_allocate (size_t size);
++
++/* Deallocate the memory region allocated by
++   next_to_fault_allocate.  */
++void support_next_to_fault_free (struct support_next_to_fault *);
++
++#endif /* SUPPORT_NEXT_TO_FAULT_H */
+diff --git a/support/oom_error.c b/support/oom_error.c
+index 7816978273..fd87fe2305 100644
+--- a/support/oom_error.c
++++ b/support/oom_error.c
+@@ -1,5 +1,5 @@
+ /* Reporting out-of-memory errors.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/resolv_test.c b/support/resolv_test.c
+index 1625dcf43a..3f2a09f36f 100644
+--- a/support/resolv_test.c
++++ b/support/resolv_test.c
+@@ -1,5 +1,5 @@
+ /* DNS test framework and libresolv redirection.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -43,15 +43,99 @@ enum
+     max_response_length = 65536
+   };
+ 
+-/* List of pointers to be freed.  The hash table implementation
+-   (struct hsearch_data) does not provide a way to deallocate all
+-   objects, so this approach is used to avoid memory leaks.  */
+-struct to_be_freed
++/* Used for locating domain names containing for the purpose of
++   forming compression references.  */
++struct compressed_name
+ {
+-  struct to_be_freed *next;
+-  void *ptr;
++  uint16_t offset;
++  unsigned char length;
++  unsigned char name[];         /* Without terminating NUL.  */
+ };
+ 
++static struct compressed_name *
++allocate_compressed_name (const unsigned char *encoded, unsigned int offset)
++{
++  /* Compute the length of the domain name.  */
++  size_t length;
++  {
++    const unsigned char *p;
++    for (p = encoded; *p != '\0';)
++      {
++        /* No compression references are allowed.  */
++        TEST_VERIFY (*p <= 63);
++        /* Skip over the label.  */
++        p += 1 + *p;
++      }
++    length = p - encoded;
++    ++length;                   /* For the terminating NUL byte.  */
++  }
++  TEST_VERIFY_EXIT (length <= 255);
++
++  struct compressed_name *result
++    = xmalloc (offsetof (struct compressed_name, name) + length);
++  result->offset = offset;
++  result->length = length;
++  memcpy (result->name, encoded, length);
++  return result;
++}
++
++/* Convert CH to lower case.  Only change letters in the ASCII
++   range.  */
++static inline unsigned char
++ascii_tolower (unsigned char ch)
++{
++  if ('A' <= ch && ch <= 'Z')
++    return ch - 'A' + 'a';
++  else
++    return ch;
++}
++
++/* Compare both names, for use with tsearch.  The order is arbitrary,
++   but the comparison is case-insenstive.  */
++static int
++compare_compressed_name (const void *left, const void *right)
++{
++  const struct compressed_name *crleft = left;
++  const struct compressed_name *crright = right;
++
++  if (crleft->length != crright->length)
++    /* The operands are converted to int before the subtraction.  */
++    return crleft->length - crright->length;
++
++  const unsigned char *nameleft = crleft->name;
++  const unsigned char *nameright = crright->name;
++
++  while (true)
++    {
++      int lenleft = *nameleft++;
++      int lenright = *nameright++;
++
++      /* Labels must not e compression references.  */
++      TEST_VERIFY (lenleft <= 63);
++      TEST_VERIFY (lenright <= 63);
++
++      if (lenleft != lenright)
++        return left - right;
++      if (lenleft == 0)
++        /* End of name reached without spotting a difference.  */
++        return 0;
++      /* Compare the label in a case-insenstive manner.  */
++      const unsigned char *endnameleft = nameleft + lenleft;
++      while (nameleft < endnameleft)
++        {
++          int l = *nameleft++;
++          int r = *nameright++;
++          if (l != r)
++            {
++              l = ascii_tolower (l);
++              r = ascii_tolower (r);
++              if (l != r)
++                return l - r;
++            }
++        }
++    }
++}
++
+ struct resolv_response_builder
+ {
+   const unsigned char *query_buffer;
+@@ -67,11 +151,8 @@ struct resolv_response_builder
+      written RDATA sub-structure.  0 if no RDATA is being written.  */
+   size_t current_rdata_offset;
+ 
+-  /* Hash table for locating targets for label compression.  */
+-  struct hsearch_data compression_offsets;
+-  /* List of pointers which need to be freed.  Used for domain names
+-     involved in label compression.  */
+-  struct to_be_freed *to_be_freed;
++  /* tsearch tree for locating targets for label compression.  */
++  void *compression_offsets;
+ 
+   /* Must be last.  Not zeroed for performance reasons.  */
+   unsigned char buffer[max_response_length];
+@@ -79,18 +160,6 @@ struct resolv_response_builder
+ 
+ /* Response builder. */
+ 
+-/* Add a pointer to the list of pointers to be freed when B is
+-   deallocated.  */
+-static void
+-response_push_pointer_to_free (struct resolv_response_builder *b, void *ptr)
+-{
+-  if (ptr == NULL)
+-    return;
+-  struct to_be_freed *e = xmalloc (sizeof (*e));
+-  *e = (struct to_be_freed) {b->to_be_freed, ptr};
+-  b->to_be_freed = e;
+-}
+-
+ void
+ resolv_response_init (struct resolv_response_builder *b,
+                       struct resolv_response_flags flags)
+@@ -194,120 +263,88 @@ void
+ resolv_response_add_name (struct resolv_response_builder *b,
+                           const char *const origname)
+ {
+-  /* Normalized name.  */
+-  char *name;
+-  /* Normalized name with case preserved.  */
+-  char *name_case;
+-  {
+-    size_t namelen = strlen (origname);
+-    /* Remove trailing dots.  FIXME: Handle trailing quoted dots.  */
+-    while (namelen > 0 && origname[namelen - 1] == '.')
+-      --namelen;
+-    name = xmalloc (namelen + 1);
+-    name_case = xmalloc (namelen + 1);
+-    /* Copy and convert to lowercase.  FIXME: This needs to normalize
+-       escaping as well.  */
+-    for (size_t i = 0; i < namelen; ++i)
+-      {
+-        char ch = origname[i];
+-        name_case[i] = ch;
+-        if ('A' <= ch && ch <= 'Z')
+-          ch = ch - 'A' + 'a';
+-        name[i] = ch;
+-      }
+-    name[namelen] = 0;
+-    name_case[namelen] = 0;
+-  }
+-  char *name_start = name;
+-  char *name_case_start = name_case;
++  unsigned char encoded_name[NS_MAXDNAME];
++  if (ns_name_pton (origname, encoded_name, sizeof (encoded_name)) < 0)
++    FAIL_EXIT1 ("ns_name_pton (\"%s\"): %m", origname);
+ 
+-  bool compression = false;
+-  while (*name)
++  /* Copy the encoded name into the output buffer, apply compression
++     where possible.  */
++  for (const unsigned char *name = encoded_name; ;)
+     {
+-      /* Search for a previous name we can reference.  */
+-      ENTRY new_entry =
++      if (*name == '\0')
+         {
+-          .key = name,
+-          .data = (void *) (uintptr_t) b->offset,
+-        };
++          /* We have reached the end of the name.  Add the terminating
++             NUL byte.  */
++          response_add_byte (b, '\0');
++          break;
++        }
+ 
+-      /* If the label can be a compression target because it is at a
+-         reachable offset, add it to the hash table.  */
+-      ACTION action;
+-      if (b->offset < (1 << 12))
+-        action = ENTER;
+-      else
+-        action = FIND;
++      /* Set to the compression target if compression is possible.  */
++      struct compressed_name *crname_target;
+ 
+-      /* Search for known compression offsets in the hash table.  */
+-      ENTRY *e;
+-      if (hsearch_r (new_entry, action, &e, &b->compression_offsets) == 0)
+-        {
+-          if (action == FIND && errno == ESRCH)
+-            /* Fall through.  */
+-            e = NULL;
+-          else
+-            FAIL_EXIT1 ("hsearch_r failure in name compression: %m");
+-        }
++      /* Compression references can only reach the beginning of the
++         packet.  */
++      enum { compression_limit = 1 << 12 };
++
++      {
++        /* The trailing part of the name to be looked up in the tree
++           with the compression targets.  */
++        struct compressed_name *crname
++          = allocate_compressed_name (name, b->offset);
++
++        if (b->offset < compression_limit)
++          {
++            /* Add the name to the tree, for future compression
++               references.  */
++            void **ptr = tsearch (crname, &b->compression_offsets,
++                                  compare_compressed_name);
++            if (ptr == NULL)
++              FAIL_EXIT1 ("tsearch out of memory");
++            crname_target = *ptr;
++
++            if (crname_target != crname)
++              /* The new name was not actually added to the tree.
++                 Deallocate it.  */
++              free (crname);
++            else
++              /* Signal that the tree did not yet contain the name,
++                 but keep the allocation because it is now part of the
++                 tree.  */
++              crname_target = NULL;
++          }
++        else
++          {
++            /* This name cannot be reached by a compression reference.
++               No need to add it to the tree for future reference.  */
++            void **ptr = tfind (crname, &b->compression_offsets,
++                                compare_compressed_name);
++            if (ptr != NULL)
++              crname_target = *ptr;
++            else
++              crname_target = NULL;
++            TEST_VERIFY (crname_target != crname);
++            /* Not added to the tree.  */
++            free (crname);
++          }
++      }
+ 
+-      /* The name is known.  Reference the previous location.  */
+-      if (e != NULL && e->data != new_entry.data)
++      if (crname_target != NULL)
+         {
+-          size_t old_offset = (uintptr_t) e->data;
++          /* The name is known.  Reference the previous location.  */
++          unsigned int old_offset = crname_target->offset;
++          TEST_VERIFY_EXIT (old_offset < compression_limit);
+           response_add_byte (b, 0xC0 | (old_offset >> 8));
+           response_add_byte (b, old_offset);
+-          compression = true;
+           break;
+         }
+-
+-      /* The name does not exist yet.  Write one label.  First, add
+-         room for the label length.  */
+-      size_t buffer_label_offset = b->offset;
+-      response_add_byte (b, 0);
+-
+-      /* Copy the label.  */
+-      while (true)
++      else
+         {
+-          char ch = *name_case;
+-          if (ch == '\0')
+-            break;
+-          ++name;
+-          ++name_case;
+-          if (ch == '.')
+-            break;
+-          /* FIXME: Handle escaping.  */
+-          response_add_byte (b, ch);
++          /* The name is new.  Add this label.  */
++          unsigned int len = 1 + *name;
++          resolv_response_add_data (b, name, len);
++          name += len;
+         }
+-
+-      /* Patch in the label length.  */
+-      size_t label_length = b->offset - buffer_label_offset - 1;
+-      if (label_length == 0)
+-        FAIL_EXIT1 ("empty label in name compression: %s", origname);
+-      if (label_length > 63)
+-        FAIL_EXIT1 ("label too long in name compression: %s", origname);
+-      b->buffer[buffer_label_offset] = label_length;
+-
+-      /* Continue with the tail of the name and the next label.  */
+-    }
+-
+-  if (compression)
+-    {
+-      /* If we found an immediate match for the name, we have not put
+-         it into the hash table, and can free it immediately.  */
+-      if (name == name_start)
+-        free (name_start);
+-      else
+-        response_push_pointer_to_free (b, name_start);
+-    }
+-  else
+-    {
+-      /* Terminate the sequence of labels.  With compression, this is
+-         implicit in the compression reference.  */
+-      response_add_byte (b, 0);
+-      response_push_pointer_to_free (b, name_start);
+     }
+-
+-  free (name_case_start);
+ }
+ 
+ void
+@@ -403,22 +440,13 @@ response_builder_allocate
+   memset (b, 0, offsetof (struct resolv_response_builder, buffer));
+   b->query_buffer = query_buffer;
+   b->query_length = query_length;
+-  TEST_VERIFY_EXIT (hcreate_r (10000, &b->compression_offsets) != 0);
+   return b;
+ }
+ 
+ static void
+ response_builder_free (struct resolv_response_builder *b)
+ {
+-  struct to_be_freed *current = b->to_be_freed;
+-  while (current != NULL)
+-    {
+-      struct to_be_freed *next = current->next;
+-      free (current->ptr);
+-      free (current);
+-      current = next;
+-    }
+-  hdestroy_r (&b->compression_offsets);
++  tdestroy (b->compression_offsets, free);
+   free (b);
+ }
+ 
+diff --git a/support/resolv_test.h b/support/resolv_test.h
+index b953dc1200..4c2e6c1b41 100644
+--- a/support/resolv_test.h
++++ b/support/resolv_test.h
+@@ -1,5 +1,5 @@
+ /* DNS test framework and libresolv redirection.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/run_diff.h b/support/run_diff.h
+index f65b5dd22c..6e949226fa 100644
+--- a/support/run_diff.h
++++ b/support/run_diff.h
+@@ -1,5 +1,5 @@
+ /* Invoke the system diff tool to compare two strings.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/set_fortify_handler.c b/support/set_fortify_handler.c
+index f434a8082a..c2dacbb179 100644
+--- a/support/set_fortify_handler.c
++++ b/support/set_fortify_handler.c
+@@ -1,5 +1,5 @@
+ /* Set signal handler for use in fortify tests.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/support-xfstat.c b/support/support-xfstat.c
+new file mode 100644
+index 0000000000..f69253af09
+--- /dev/null
++++ b/support/support-xfstat.c
+@@ -0,0 +1,28 @@
++/* fstat64 with error checking.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <support/check.h>
++#include <support/xunistd.h>
++#include <sys/stat.h>
++
++void
++xfstat (int fd, struct stat64 *result)
++{
++  if (fstat64 (fd, result) != 0)
++    FAIL_EXIT1 ("fstat64 (%d): %m", fd);
++}
+diff --git a/support/support-xstat.c b/support/support-xstat.c
+index 86a81ec601..fc10c6dcb7 100644
+--- a/support/support-xstat.c
++++ b/support/support-xstat.c
+@@ -1,5 +1,5 @@
+ /* stat64 with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/support.h b/support/support.h
+index 4b5f04c2cc..bc5827ed87 100644
+--- a/support/support.h
++++ b/support/support.h
+@@ -1,5 +1,5 @@
+ /* Common extra functions.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -68,6 +68,7 @@ void *xrealloc (void *p, size_t n);
+ char *xasprintf (const char *format, ...)
+   __attribute__ ((format (printf, 1, 2), malloc));
+ char *xstrdup (const char *);
++char *xstrndup (const char *, size_t);
+ 
+ __END_DECLS
+ 
+diff --git a/support/support_become_root.c b/support/support_become_root.c
+index 3fa0bd4ac0..6947dbaa80 100644
+--- a/support/support_become_root.c
++++ b/support/support_become_root.c
+@@ -1,5 +1,5 @@
+ /* Acquire root privileges.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -18,18 +18,80 @@
+ 
+ #include <support/namespace.h>
+ 
++#include <errno.h>
++#include <fcntl.h>
+ #include <sched.h>
+ #include <stdio.h>
++#include <string.h>
++#include <support/check.h>
++#include <support/xunistd.h>
+ #include <unistd.h>
+ 
++#ifdef CLONE_NEWUSER
++/* The necessary steps to allow file creation in user namespaces.  */
++static void
++setup_uid_gid_mapping (uid_t original_uid, gid_t original_gid)
++{
++  int fd = open64 ("/proc/self/uid_map", O_WRONLY);
++  if (fd < 0)
++    {
++      printf ("warning: could not open /proc/self/uid_map: %m\n"
++              "warning: file creation may not be possible\n");
++      return;
++    }
++
++  /* We map our original UID to the same UID in the container so we
++     own our own files normally.  Without that, file creation could
++     fail with EOVERFLOW (sic!).  */
++  char buf[100];
++  int ret = snprintf (buf, sizeof (buf), "%llu %llu 1\n",
++                      (unsigned long long) original_uid,
++                      (unsigned long long) original_uid);
++  TEST_VERIFY_EXIT (ret < sizeof (buf));
++  xwrite (fd, buf, ret);
++  xclose (fd);
++
++  /* Linux 3.19 introduced the setgroups file.  We need write "deny" to this
++     file otherwise writing to gid_map will fail with EPERM.  */
++  fd = open64 ("/proc/self/setgroups", O_WRONLY, 0);
++  if (fd < 0)
++    {
++      if (errno != ENOENT)
++        FAIL_EXIT1 ("open64 (\"/proc/self/setgroups\", 0x%x, 0%o): %m",
++                    O_WRONLY, 0);
++      /* This kernel doesn't expose the setgroups file so simply move on.  */
++    }
++  else
++    {
++      xwrite (fd, "deny\n", strlen ("deny\n"));
++      xclose (fd);
++    }
++
++  /* Now map our own GID, like we did for the user ID.  */
++  fd = xopen ("/proc/self/gid_map", O_WRONLY, 0);
++  ret = snprintf (buf, sizeof (buf), "%llu %llu 1\n",
++                  (unsigned long long) original_gid,
++                  (unsigned long long) original_gid);
++  TEST_VERIFY_EXIT (ret < sizeof (buf));
++  xwrite (fd, buf, ret);
++  xclose (fd);
++}
++#endif /* CLONE_NEWUSER */
++
+ bool
+ support_become_root (void)
+ {
+ #ifdef CLONE_NEWUSER
++  uid_t original_uid = getuid ();
++  gid_t original_gid = getgid ();
++
+   if (unshare (CLONE_NEWUSER | CLONE_NEWNS) == 0)
+-    /* Even if we do not have UID zero, we have extended privileges at
+-       this point.  */
+-    return true;
++    {
++      setup_uid_gid_mapping (original_uid, original_gid);
++      /* Even if we do not have UID zero, we have extended privileges at
++         this point.  */
++      return true;
++    }
+ #endif
+   if (setuid (0) != 0)
+     {
+diff --git a/support/support_can_chroot.c b/support/support_can_chroot.c
+index 0dfd2deb54..8922576d19 100644
+--- a/support/support_can_chroot.c
++++ b/support/support_can_chroot.c
+@@ -1,5 +1,5 @@
+ /* Return true if the process can perform a chroot operation.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -21,9 +21,9 @@
+ #include <support/check.h>
+ #include <support/namespace.h>
+ #include <support/support.h>
++#include <support/xunistd.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+-#include <xunistd.h>
+ 
+ static void
+ callback (void *closure)
+diff --git a/support/support_capture_subprocess.c b/support/support_capture_subprocess.c
+index 030f124252..6d2029e13b 100644
+--- a/support/support_capture_subprocess.c
++++ b/support/support_capture_subprocess.c
+@@ -1,5 +1,5 @@
+ /* Capture output from a subprocess.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/support_capture_subprocess_check.c b/support/support_capture_subprocess_check.c
+index e1cf73b6a5..ff5ee89fb0 100644
+--- a/support/support_capture_subprocess_check.c
++++ b/support/support_capture_subprocess_check.c
+@@ -1,5 +1,5 @@
+ /* Verify capture output from a subprocess.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/support_chroot.c b/support/support_chroot.c
+index c0807b313a..6356b1af6c 100644
+--- a/support/support_chroot.c
++++ b/support/support_chroot.c
+@@ -1,5 +1,5 @@
+ /* Setup a chroot environment for use within tests.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -24,30 +24,38 @@
+ #include <support/test-driver.h>
+ #include <support/xunistd.h>
+ 
++/* If CONTENTS is not NULL, write it to the file at DIRECTORY/RELPATH,
++   and store the name in *ABSPATH.  If CONTENTS is NULL, store NULL in
++   *ABSPATH.  */
++static void
++write_file (const char *directory, const char *relpath, const char *contents,
++            char **abspath)
++{
++  if (contents != NULL)
++    {
++      *abspath = xasprintf ("%s/%s", directory, relpath);
++      add_temp_file (*abspath);
++      support_write_file_string (*abspath, contents);
++    }
++  else
++    *abspath = NULL;
++}
++
+ struct support_chroot *
+ support_chroot_create (struct support_chroot_configuration conf)
+ {
+   struct support_chroot *chroot = xmalloc (sizeof (*chroot));
+-
+-  chroot->path_chroot = xasprintf ("%s/tst-resolv-res_init-XXXXXX", test_dir);
+-  if (mkdtemp (chroot->path_chroot) == NULL)
+-    FAIL_EXIT1 ("mkdtemp (\"%s\"): %m", chroot->path_chroot);
+-  add_temp_file (chroot->path_chroot);
++  chroot->path_chroot = support_create_temp_directory ("tst-resolv-res_init-");
+ 
+   /* Create the /etc directory in the chroot environment.  */
+   char *path_etc = xasprintf ("%s/etc", chroot->path_chroot);
+   xmkdir (path_etc, 0777);
+   add_temp_file (path_etc);
+ 
+-  if (conf.resolv_conf != NULL)
+-    {
+-      /* Create an empty resolv.conf file.  */
+-      chroot->path_resolv_conf = xasprintf ("%s/resolv.conf", path_etc);
+-      add_temp_file (chroot->path_resolv_conf);
+-      support_write_file_string (chroot->path_resolv_conf, conf.resolv_conf);
+-    }
+-  else
+-    chroot->path_resolv_conf = NULL;
++  write_file (path_etc, "resolv.conf", conf.resolv_conf,
++              &chroot->path_resolv_conf);
++  write_file (path_etc, "hosts", conf.hosts, &chroot->path_hosts);
++  write_file (path_etc, "host.conf", conf.host_conf, &chroot->path_host_conf);
+ 
+   free (path_etc);
+ 
+@@ -67,5 +75,7 @@ support_chroot_free (struct support_chroot *chroot)
+ {
+   free (chroot->path_chroot);
+   free (chroot->path_resolv_conf);
++  free (chroot->path_hosts);
++  free (chroot->path_host_conf);
+   free (chroot);
+ }
+diff --git a/support/support_enter_mount_namespace.c b/support/support_enter_mount_namespace.c
+new file mode 100644
+index 0000000000..ba68e990f2
+--- /dev/null
++++ b/support/support_enter_mount_namespace.c
+@@ -0,0 +1,47 @@
++/* Enter a mount namespace.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <support/namespace.h>
++
++#include <sched.h>
++#include <stdio.h>
++#ifdef CLONE_NEWNS
++# include <sys/mount.h>
++#endif /* CLONE_NEWNS */
++
++bool
++support_enter_mount_namespace (void)
++{
++#ifdef CLONE_NEWNS
++  if (unshare (CLONE_NEWNS) == 0)
++    {
++      /* On some systems, / is marked as MS_SHARED, which means that
++         mounts within the namespace leak to the rest of the system,
++         which is not what we want.  */
++      if (mount ("none", "/", NULL, MS_REC | MS_PRIVATE, NULL) != 0)
++        {
++          printf ("warning: making the mount namespace private failed: %m\n");
++          return false;
++        }
++      return true;
++    }
++  else
++    printf ("warning: unshare (CLONE_NEWNS) failed: %m\n");
++#endif /* CLONE_NEWNS */
++  return false;
++}
+diff --git a/support/support_enter_network_namespace.c b/support/support_enter_network_namespace.c
+index 28b0ee29cf..1d874df885 100644
+--- a/support/support_enter_network_namespace.c
++++ b/support/support_enter_network_namespace.c
+@@ -1,5 +1,5 @@
+ /* Enter a network namespace.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/support_format_address_family.c b/support/support_format_address_family.c
+index 5d42c42a45..2acb9afffd 100644
+--- a/support/support_format_address_family.c
++++ b/support/support_format_address_family.c
+@@ -1,5 +1,5 @@
+ /* Convert an address family to a string.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/support_format_addrinfo.c b/support/support_format_addrinfo.c
+index eedb030591..c5e00e516a 100644
+--- a/support/support_format_addrinfo.c
++++ b/support/support_format_addrinfo.c
+@@ -1,5 +1,5 @@
+ /* Convert struct addrinfo values to a string.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -21,6 +21,7 @@
+ #include <arpa/inet.h>
+ #include <errno.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <support/support.h>
+ #include <support/xmemstream.h>
+ 
+diff --git a/support/support_format_dns_packet.c b/support/support_format_dns_packet.c
+index 2992c57971..1170eafb0f 100644
+--- a/support/support_format_dns_packet.c
++++ b/support/support_format_dns_packet.c
+@@ -1,5 +1,5 @@
+ /* Convert a DNS packet to a human-readable representation.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -20,6 +20,7 @@
+ 
+ #include <arpa/inet.h>
+ #include <resolv.h>
++#include <stdbool.h>
+ #include <support/check.h>
+ #include <support/support.h>
+ #include <support/xmemstream.h>
+diff --git a/support/support_format_herrno.c b/support/support_format_herrno.c
+index 493d6ae962..3d2dc8b27a 100644
+--- a/support/support_format_herrno.c
++++ b/support/support_format_herrno.c
+@@ -1,5 +1,5 @@
+ /* Convert a h_errno error code to a string.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/support_format_hostent.c b/support/support_format_hostent.c
+index 5b5f26082e..a4a62afe0a 100644
+--- a/support/support_format_hostent.c
++++ b/support/support_format_hostent.c
+@@ -1,5 +1,5 @@
+ /* Convert a struct hostent object to a string.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -19,7 +19,9 @@
+ #include <support/format_nss.h>
+ 
+ #include <arpa/inet.h>
++#include <errno.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <support/support.h>
+ #include <support/xmemstream.h>
+ 
+@@ -41,10 +43,15 @@ support_format_hostent (struct hostent *h)
+ {
+   if (h == NULL)
+     {
+-      char *value = support_format_herrno (h_errno);
+-      char *result = xasprintf ("error: %s\n", value);
+-      free (value);
+-      return result;
++      if (h_errno == NETDB_INTERNAL)
++        return xasprintf ("error: NETDB_INTERNAL (errno %d, %m)\n", errno);
++      else
++        {
++          char *value = support_format_herrno (h_errno);
++          char *result = xasprintf ("error: %s\n", value);
++          free (value);
++          return result;
++        }
+     }
+ 
+   struct xmemstream mem;
+diff --git a/support/support_format_netent.c b/support/support_format_netent.c
+index 020f5720d9..0d15e78440 100644
+--- a/support/support_format_netent.c
++++ b/support/support_format_netent.c
+@@ -1,5 +1,5 @@
+ /* Convert a struct netent object to a string.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -20,6 +20,7 @@
+ 
+ #include <arpa/inet.h>
+ #include <stdio.h>
++#include <stdlib.h>
+ #include <support/support.h>
+ #include <support/xmemstream.h>
+ 
+diff --git a/support/support_isolate_in_subprocess.c b/support/support_isolate_in_subprocess.c
+index cf48614383..25edc00385 100644
+--- a/support/support_isolate_in_subprocess.c
++++ b/support/support_isolate_in_subprocess.c
+@@ -1,5 +1,5 @@
+ /* Run a function in a subprocess.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/support_record_failure.c b/support/support_record_failure.c
+index 684055c746..356798f556 100644
+--- a/support/support_record_failure.c
++++ b/support/support_record_failure.c
+@@ -1,5 +1,5 @@
+ /* Global test failure counter.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/support_run_diff.c b/support/support_run_diff.c
+index f5155de727..f24f6c3281 100644
+--- a/support/support_run_diff.c
++++ b/support/support_run_diff.c
+@@ -1,5 +1,5 @@
+ /* Invoke the system diff tool to compare two strings.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/support_shared_allocate.c b/support/support_shared_allocate.c
+index 61d088e8cf..8ab43c4b38 100644
+--- a/support/support_shared_allocate.c
++++ b/support/support_shared_allocate.c
+@@ -1,5 +1,5 @@
+ /* Allocate a memory region shared across processes.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/support_test_compare_failure.c b/support/support_test_compare_failure.c
+new file mode 100644
+index 0000000000..8eb51c439d
+--- /dev/null
++++ b/support/support_test_compare_failure.c
+@@ -0,0 +1,58 @@
++/* Reporting a numeric comparison failure.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <errno.h>
++#include <stdio.h>
++#include <support/check.h>
++
++static void
++report (const char *which, const char *expr, long long value, int positive,
++        int size)
++{
++  printf ("  %s: ", which);
++  if (positive)
++    printf ("%llu", (unsigned long long) value);
++  else
++    printf ("%lld", value);
++  unsigned long long mask
++    = (~0ULL) >> (8 * (sizeof (unsigned long long) - size));
++  printf (" (0x%llx); from: %s\n", (unsigned long long) value & mask, expr);
++}
++
++void
++support_test_compare_failure (const char *file, int line,
++                              const char *left_expr,
++                              long long left_value,
++                              int left_positive,
++                              int left_size,
++                              const char *right_expr,
++                              long long right_value,
++                              int right_positive,
++                              int right_size)
++{
++  int saved_errno = errno;
++  support_record_failure ();
++  if (left_size != right_size)
++    printf ("%s:%d: numeric comparison failure (widths %d and %d)\n",
++            file, line, left_size * 8, right_size * 8);
++  else
++    printf ("%s:%d: numeric comparison failure\n", file, line);
++  report (" left", left_expr, left_value, left_positive, left_size);
++  report ("right", right_expr, right_value, right_positive, right_size);
++  errno = saved_errno;
++}
+diff --git a/support/support_test_main.c b/support/support_test_main.c
+index 3c411a467b..396385729b 100644
+--- a/support/support_test_main.c
++++ b/support/support_test_main.c
+@@ -1,5 +1,5 @@
+ /* Main worker function for the test driver.
+-   Copyright (C) 1998-2017 Free Software Foundation, Inc.
++   Copyright (C) 1998-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/support_test_verify_impl.c b/support/support_test_verify_impl.c
+index 55ab2111b3..5ff5555a6a 100644
+--- a/support/support_test_verify_impl.c
++++ b/support/support_test_verify_impl.c
+@@ -1,5 +1,5 @@
+ /* Implementation of the TEST_VERIFY and TEST_VERIFY_EXIT macros.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -18,14 +18,17 @@
+ 
+ #include <support/check.h>
+ 
++#include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ 
+ void
+ support_test_verify_impl (const char *file, int line, const char *expr)
+ {
++  int saved_errno = errno;
+   support_record_failure ();
+   printf ("error: %s:%d: not true: %s\n", file, line, expr);
++  errno = saved_errno;
+ }
+ 
+ void
+diff --git a/support/support_write_file_string.c b/support/support_write_file_string.c
+index 48e89597f3..7505679401 100644
+--- a/support/support_write_file_string.c
++++ b/support/support_write_file_string.c
+@@ -1,5 +1,5 @@
+ /* Write a string to a file.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -19,7 +19,7 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <support/check.h>
+-#include <xunistd.h>
++#include <support/xunistd.h>
+ 
+ void
+ support_write_file_string (const char *path, const char *contents)
+diff --git a/support/temp_file-internal.h b/support/temp_file-internal.h
+index fb6cceb065..4cee3c0c35 100644
+--- a/support/temp_file-internal.h
++++ b/support/temp_file-internal.h
+@@ -1,5 +1,5 @@
+ /* Internal weak declarations for temporary file handling.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/temp_file.c b/support/temp_file.c
+index fdb2477ab9..0bbc7f9972 100644
+--- a/support/temp_file.c
++++ b/support/temp_file.c
+@@ -1,5 +1,5 @@
+ /* Temporary file handling for tests.
+-   Copyright (C) 1998-2017 Free Software Foundation, Inc.
++   Copyright (C) 1998-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -86,6 +86,19 @@ create_temp_file (const char *base, char **filename)
+   return fd;
+ }
+ 
++char *
++support_create_temp_directory (const char *base)
++{
++  char *path = xasprintf ("%s/%sXXXXXX", test_dir, base);
++  if (mkdtemp (path) == NULL)
++    {
++      printf ("error: mkdtemp (\"%s\"): %m", path);
++      exit (1);
++    }
++  add_temp_file (path);
++  return path;
++}
++
+ /* Helper functions called by the test skeleton follow.  */
+ 
+ void
+diff --git a/support/temp_file.h b/support/temp_file.h
+index 6fed8df1ea..c7795cc577 100644
+--- a/support/temp_file.h
++++ b/support/temp_file.h
+@@ -1,5 +1,5 @@
+ /* Declarations for temporary file handling.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -32,6 +32,11 @@ void add_temp_file (const char *name);
+    *FILENAME.  */
+ int create_temp_file (const char *base, char **filename);
+ 
++/* Create a temporary directory and schedule it for deletion.  BASE is
++   used as a prefix for the unique directory name, which the function
++   returns.  The caller should free this string.  */
++char *support_create_temp_directory (const char *base);
++
+ __END_DECLS
+ 
+ #endif /* SUPPORT_TEMP_FILE_H */
+diff --git a/support/test-driver.c b/support/test-driver.c
+index 47c387c2b4..09c8783e4f 100644
+--- a/support/test-driver.c
++++ b/support/test-driver.c
+@@ -1,5 +1,5 @@
+ /* Main function for test programs.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/test-driver.h b/support/test-driver.h
+index a8fe9c3565..1708d68d60 100644
+--- a/support/test-driver.h
++++ b/support/test-driver.h
+@@ -1,5 +1,5 @@
+ /* Interfaces for the test driver.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/tst-support-namespace.c b/support/tst-support-namespace.c
+index dbe7cc07c8..e20423c4a3 100644
+--- a/support/tst-support-namespace.c
++++ b/support/tst-support-namespace.c
+@@ -1,5 +1,5 @@
+ /* Test entering namespaces.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/tst-support_capture_subprocess.c b/support/tst-support_capture_subprocess.c
+index 5672fba0f7..a685256091 100644
+--- a/support/tst-support_capture_subprocess.c
++++ b/support/tst-support_capture_subprocess.c
+@@ -1,5 +1,5 @@
+ /* Test capturing output from a subprocess.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/tst-support_format_dns_packet.c b/support/tst-support_format_dns_packet.c
+index 9c8589c09c..b1135eebc6 100644
+--- a/support/tst-support_format_dns_packet.c
++++ b/support/tst-support_format_dns_packet.c
+@@ -1,5 +1,5 @@
+ /* Tests for the support_format_dns_packet function.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/tst-support_record_failure-2.sh b/support/tst-support_record_failure-2.sh
+index 2c9372cc29..09cd96290a 100644
+--- a/support/tst-support_record_failure-2.sh
++++ b/support/tst-support_record_failure-2.sh
+@@ -1,6 +1,6 @@
+ #!/bin/sh
+ # Test failure recording (with and without --direct).
+-# Copyright (C) 2016-2017 Free Software Foundation, Inc.
++# Copyright (C) 2016-2018 Free Software Foundation, Inc.
+ # This file is part of the GNU C Library.
+ 
+ # The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/tst-support_record_failure.c b/support/tst-support_record_failure.c
+index e739e739c3..8757f2da02 100644
+--- a/support/tst-support_record_failure.c
++++ b/support/tst-support_record_failure.c
+@@ -1,5 +1,5 @@
+ /* Test support_record_failure state sharing.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/tst-test_compare.c b/support/tst-test_compare.c
+new file mode 100644
+index 0000000000..123ba1bc3c
+--- /dev/null
++++ b/support/tst-test_compare.c
+@@ -0,0 +1,116 @@
++/* Basic test for the TEST_COMPARE macro.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <string.h>
++#include <support/check.h>
++#include <support/capture_subprocess.h>
++
++static void
++subprocess (void *closure)
++{
++  char ch = 1;
++  /* These tests should fail.  */
++  TEST_COMPARE (ch, -1);         /* Line 28.  */
++  TEST_COMPARE (2LL, -2LL);      /* Line 29.  */
++  TEST_COMPARE (3LL, (short) -3); /* Line 30.  */
++}
++
++struct bitfield
++{
++  int i2 : 2;
++  int i3 : 3;
++  unsigned int u2 : 2;
++  unsigned int u3 : 3;
++  int i31 : 31;
++  unsigned int u31 : 31 ;
++  long long int i63 : 63;
++  unsigned long long int u63 : 63;
++};
++
++/* Functions which return signed sizes are common, so test that these
++   results can readily checked using TEST_COMPARE.  */
++
++static int
++return_ssize_t (void)
++{
++  return 4;
++}
++
++static int
++return_int (void)
++{
++  return 4;
++}
++
++
++static int
++do_test (void)
++{
++  /* This should succeed.  */
++  TEST_COMPARE (1, 1);
++  TEST_COMPARE (2LL, 2U);
++  {
++    char i8 = 3;
++    unsigned short u16 = 3;
++    TEST_COMPARE (i8, u16);
++  }
++  TEST_COMPARE (return_ssize_t (), sizeof (char[4]));
++  TEST_COMPARE (return_int (), sizeof (char[4]));
++
++  struct bitfield bitfield = { 0 };
++  TEST_COMPARE (bitfield.i2, bitfield.i3);
++  TEST_COMPARE (bitfield.u2, bitfield.u3);
++  TEST_COMPARE (bitfield.u2, bitfield.i3);
++  TEST_COMPARE (bitfield.u3, bitfield.i3);
++  TEST_COMPARE (bitfield.i2, bitfield.u3);
++  TEST_COMPARE (bitfield.i3, bitfield.u2);
++  TEST_COMPARE (bitfield.i63, bitfield.i63);
++  TEST_COMPARE (bitfield.u63, bitfield.u63);
++  TEST_COMPARE (bitfield.i31, bitfield.i63);
++  TEST_COMPARE (bitfield.i63, bitfield.i31);
++
++  struct support_capture_subprocess proc = support_capture_subprocess
++    (&subprocess, NULL);
++
++  /* Discard the reported error.  */
++  support_record_failure_reset ();
++
++  puts ("info: *** subprocess output starts ***");
++  fputs (proc.out.buffer, stdout);
++  puts ("info: *** subprocess output ends ***");
++
++  TEST_VERIFY
++    (strcmp (proc.out.buffer,
++             "tst-test_compare.c:28: numeric comparison failure\n"
++             "   left: 1 (0x1); from: ch\n"
++             "  right: -1 (0xffffffff); from: -1\n"
++             "tst-test_compare.c:29: numeric comparison failure\n"
++             "   left: 2 (0x2); from: 2LL\n"
++             "  right: -2 (0xfffffffffffffffe); from: -2LL\n"
++             "tst-test_compare.c:30: numeric comparison failure"
++             " (widths 64 and 32)\n"
++             "   left: 3 (0x3); from: 3LL\n"
++             "  right: -3 (0xfffffffd); from: (short) -3\n") == 0);
++
++  /* Check that there is no output on standard error.  */
++  support_capture_subprocess_check (&proc, "TEST_COMPARE", 0, sc_allow_stdout);
++
++  return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/support/tst-xreadlink.c b/support/tst-xreadlink.c
+new file mode 100644
+index 0000000000..b142207228
+--- /dev/null
++++ b/support/tst-xreadlink.c
+@@ -0,0 +1,72 @@
++/* Test the xreadlink function.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <errno.h>
++#include <fcntl.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <support/check.h>
++#include <support/support.h>
++#include <support/temp_file.h>
++#include <support/xunistd.h>
++
++static int
++do_test (void)
++{
++  char *dir = support_create_temp_directory ("tst-xreadlink-");
++  char *symlink_name = xasprintf ("%s/symlink", dir);
++  add_temp_file (symlink_name);
++
++  /* The limit 10000 is arbitrary and simply there to prevent an
++     attempt to exhaust all available disk space.  */
++  for (int size = 1; size < 10000; ++size)
++    {
++      char *contents = xmalloc (size + 1);
++      for (int i = 0; i < size; ++i)
++        contents[i] = 'a' + (rand () % 26);
++      contents[size] = '\0';
++      if (symlink (contents, symlink_name) != 0)
++        {
++          if (errno == ENAMETOOLONG)
++            {
++              printf ("info: ENAMETOOLONG failure at %d bytes\n", size);
++              free (contents);
++              break;
++            }
++          FAIL_EXIT1 ("symlink (%d bytes): %m", size);
++        }
++
++      char *readlink_result = xreadlink (symlink_name);
++      TEST_VERIFY (strcmp (readlink_result, contents) == 0);
++      free (readlink_result);
++      xunlink (symlink_name);
++      free (contents);
++    }
++
++  /* Create an empty file to suppress the temporary file deletion
++     warning.  */
++  xclose (xopen (symlink_name, O_WRONLY | O_CREAT, 0));
++
++  free (symlink_name);
++  free (dir);
++
++  return 0;
++}
++
++#include <support/test-driver.c>
+diff --git a/support/write_message.c b/support/write_message.c
+index f03ed931d6..a3e2f90535 100644
+--- a/support/write_message.c
++++ b/support/write_message.c
+@@ -1,5 +1,5 @@
+ /* Write a message to standard output.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -18,12 +18,15 @@
+ 
+ #include <support/support.h>
+ 
++#include <errno.h>
+ #include <string.h>
+ #include <unistd.h>
+ 
+ void
+ write_message (const char *message)
+ {
++  int saved_errno = errno;
+   ssize_t unused __attribute__ ((unused));
+   unused = write (STDOUT_FILENO, message, strlen (message));
++  errno = saved_errno;
+ }
+diff --git a/support/xaccept.c b/support/xaccept.c
+index 7b25af3b05..fd65fc6c3a 100644
+--- a/support/xaccept.c
++++ b/support/xaccept.c
+@@ -1,5 +1,5 @@
+ /* accept with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xaccept4.c b/support/xaccept4.c
+index 67dd95e9fb..ada3c92267 100644
+--- a/support/xaccept4.c
++++ b/support/xaccept4.c
+@@ -1,5 +1,5 @@
+ /* accept4 with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xasprintf.c b/support/xasprintf.c
+index 5157680fa2..e593ec5e82 100644
+--- a/support/xasprintf.c
++++ b/support/xasprintf.c
+@@ -1,5 +1,5 @@
+ /* Error-checking wrapper for asprintf.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xbind.c b/support/xbind.c
+index cfc6dd8fa8..938e7c07d6 100644
+--- a/support/xbind.c
++++ b/support/xbind.c
+@@ -1,5 +1,5 @@
+ /* bind with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xcalloc.c b/support/xcalloc.c
+index 135f42dab2..403569041f 100644
+--- a/support/xcalloc.c
++++ b/support/xcalloc.c
+@@ -1,5 +1,5 @@
+ /* Error-checking wrapper for calloc.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xchroot.c b/support/xchroot.c
+index abcc299e00..d4759a1bd1 100644
+--- a/support/xchroot.c
++++ b/support/xchroot.c
+@@ -1,5 +1,5 @@
+ /* chroot with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xclose.c b/support/xclose.c
+index c931e08421..702bef6c6e 100644
+--- a/support/xclose.c
++++ b/support/xclose.c
+@@ -1,5 +1,5 @@
+ /* close with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xconnect.c b/support/xconnect.c
+index 0266dbc643..341805d80d 100644
+--- a/support/xconnect.c
++++ b/support/xconnect.c
+@@ -1,5 +1,5 @@
+ /* connect with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xdlfcn.c b/support/xdlfcn.c
+new file mode 100644
+index 0000000000..f34bb059c0
+--- /dev/null
++++ b/support/xdlfcn.c
+@@ -0,0 +1,59 @@
++/* Support functionality for using dlopen/dlclose/dlsym.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <stddef.h>
++#include <support/check.h>
++#include <support/xdlfcn.h>
++
++void *
++xdlopen (const char *filename, int flags)
++{
++  void *dso = dlopen (filename, flags);
++
++  if (dso == NULL)
++    FAIL_EXIT1 ("error: dlopen: %s\n", dlerror ());
++
++  /* Clear any errors.  */
++  dlerror ();
++
++  return dso;
++}
++
++void *
++xdlsym (void *handle, const char *symbol)
++{
++  void *sym = dlsym (handle, symbol);
++
++  if (sym == NULL)
++    FAIL_EXIT1 ("error: dlsym: %s\n", dlerror ());
++
++  /* Clear any errors.  */
++  dlerror ();
++
++  return sym;
++}
++
++void
++xdlclose (void *handle)
++{
++  if (dlclose (handle) != 0)
++    FAIL_EXIT1 ("error: dlclose: %s\n", dlerror ());
++
++  /* Clear any errors.  */
++  dlerror ();
++}
+diff --git a/support/xdlfcn.h b/support/xdlfcn.h
+new file mode 100644
+index 0000000000..5ab7494e70
+--- /dev/null
++++ b/support/xdlfcn.h
+@@ -0,0 +1,34 @@
++/* Support functionality for using dlopen/dlclose/dlsym.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#ifndef SUPPORT_DLOPEN_H
++#define SUPPORT_DLOPEN_H
++
++#include <dlfcn.h>
++
++__BEGIN_DECLS
++
++/* Each of these terminates process on failure with relevant error message.  */
++void *xdlopen (const char *filename, int flags);
++void *xdlsym (void *handle, const char *symbol);
++void xdlclose (void *handle);
++
++
++__END_DECLS
++
++#endif /* SUPPORT_DLOPEN_H */
+diff --git a/support/xdup2.c b/support/xdup2.c
+index dc08c94518..b8c4c223fb 100644
+--- a/support/xdup2.c
++++ b/support/xdup2.c
+@@ -1,5 +1,5 @@
+ /* dup2 with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xfclose.c b/support/xfclose.c
+index 2737f05044..39d46f042a 100644
+--- a/support/xfclose.c
++++ b/support/xfclose.c
+@@ -1,5 +1,5 @@
+ /* fclose with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xfopen.c b/support/xfopen.c
+index 14532a09f3..fb931cf22b 100644
+--- a/support/xfopen.c
++++ b/support/xfopen.c
+@@ -1,5 +1,5 @@
+ /* fopen with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xfork.c b/support/xfork.c
+index aa52ba62c5..dffa2a13d0 100644
+--- a/support/xfork.c
++++ b/support/xfork.c
+@@ -1,5 +1,5 @@
+ /* fork with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xftruncate.c b/support/xftruncate.c
+new file mode 100644
+index 0000000000..27c7e12ba2
+--- /dev/null
++++ b/support/xftruncate.c
+@@ -0,0 +1,27 @@
++/* ftruncate with error checking.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <support/check.h>
++#include <support/xunistd.h>
++
++void
++xftruncate (int fd, long long length)
++{
++  if (ftruncate64 (fd, length) != 0)
++    FAIL_EXIT1 ("ftruncate64 (%d, %lld): %m", fd, length);
++}
+diff --git a/support/xgetsockname.c b/support/xgetsockname.c
+index c3bd884f8d..797194f79d 100644
+--- a/support/xgetsockname.c
++++ b/support/xgetsockname.c
+@@ -1,5 +1,5 @@
+ /* getsockname with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xlisten.c b/support/xlisten.c
+index 1953e5900a..aa70091adb 100644
+--- a/support/xlisten.c
++++ b/support/xlisten.c
+@@ -1,5 +1,5 @@
+ /* listen with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xlseek.c b/support/xlseek.c
+new file mode 100644
+index 0000000000..2422939908
+--- /dev/null
++++ b/support/xlseek.c
+@@ -0,0 +1,29 @@
++/* lseek with error checking.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <support/check.h>
++#include <support/xunistd.h>
++
++long long
++xlseek (int fd, long long offset, int whence)
++{
++  long long result = lseek64 (fd, offset, whence);
++  if (result < 0)
++    FAIL_EXIT1 ("lseek64 (%d, %lld, %d): %m", fd, offset, whence);
++  return result;
++}
+diff --git a/support/xmalloc.c b/support/xmalloc.c
+index 450f699789..78317e2b12 100644
+--- a/support/xmalloc.c
++++ b/support/xmalloc.c
+@@ -1,5 +1,5 @@
+ /* Error-checking wrapper for malloc.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xmemstream.c b/support/xmemstream.c
+index bce6dc9170..df5fbc489a 100644
+--- a/support/xmemstream.c
++++ b/support/xmemstream.c
+@@ -1,5 +1,5 @@
+ /* Error-checking wrappers for memstream functions.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xmemstream.h b/support/xmemstream.h
+index e5ba231e4d..2d4a577f29 100644
+--- a/support/xmemstream.h
++++ b/support/xmemstream.h
+@@ -1,5 +1,5 @@
+ /* Error-checking wrappers for memstream functions.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xmkdir.c b/support/xmkdir.c
+index ea17d49391..7e67f783de 100644
+--- a/support/xmkdir.c
++++ b/support/xmkdir.c
+@@ -1,5 +1,5 @@
+ /* mkdir with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xmmap.c b/support/xmmap.c
+index 435b1eb733..d580c07013 100644
+--- a/support/xmmap.c
++++ b/support/xmmap.c
+@@ -1,5 +1,5 @@
+ /* mmap with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xmprotect.c b/support/xmprotect.c
+index 9410251c32..e6870988e0 100644
+--- a/support/xmprotect.c
++++ b/support/xmprotect.c
+@@ -1,5 +1,5 @@
+ /* mprotect with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xmunmap.c b/support/xmunmap.c
+index 6ef5a4a468..e8e5bc2d59 100644
+--- a/support/xmunmap.c
++++ b/support/xmunmap.c
+@@ -1,5 +1,5 @@
+ /* munmap with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xopen.c b/support/xopen.c
+index 7f033a03a7..3d888e8862 100644
+--- a/support/xopen.c
++++ b/support/xopen.c
+@@ -1,5 +1,5 @@
+ /* open64 with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpipe.c b/support/xpipe.c
+index 89a64a55c1..b8529df620 100644
+--- a/support/xpipe.c
++++ b/support/xpipe.c
+@@ -1,5 +1,5 @@
+ /* pipe with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpoll.c b/support/xpoll.c
+index bec2521ffc..b24bf32fc5 100644
+--- a/support/xpoll.c
++++ b/support/xpoll.c
+@@ -1,5 +1,5 @@
+ /* poll with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_attr_destroy.c b/support/xpthread_attr_destroy.c
+index 664c809e9f..52aa2602fe 100644
+--- a/support/xpthread_attr_destroy.c
++++ b/support/xpthread_attr_destroy.c
+@@ -1,5 +1,5 @@
+ /* pthread_attr_destroy with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_attr_init.c b/support/xpthread_attr_init.c
+index 2e30ade9ab..c7aa903db2 100644
+--- a/support/xpthread_attr_init.c
++++ b/support/xpthread_attr_init.c
+@@ -1,5 +1,5 @@
+ /* pthread_attr_init with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_attr_setdetachstate.c b/support/xpthread_attr_setdetachstate.c
+index b544dbaa42..6e845acc97 100644
+--- a/support/xpthread_attr_setdetachstate.c
++++ b/support/xpthread_attr_setdetachstate.c
+@@ -1,5 +1,5 @@
+ /* pthread_attr_setdetachstate with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_attr_setguardsize.c b/support/xpthread_attr_setguardsize.c
+index 35fed5d9ec..964ec058c9 100644
+--- a/support/xpthread_attr_setguardsize.c
++++ b/support/xpthread_attr_setguardsize.c
+@@ -1,5 +1,5 @@
+ /* pthread_attr_setguardsize with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_attr_setstacksize.c b/support/xpthread_attr_setstacksize.c
+index 02d06310a9..c5517c0c66 100644
+--- a/support/xpthread_attr_setstacksize.c
++++ b/support/xpthread_attr_setstacksize.c
+@@ -1,5 +1,5 @@
+ /* pthread_attr_setstacksize with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_barrier_destroy.c b/support/xpthread_barrier_destroy.c
+index efc0719a63..1dae148b46 100644
+--- a/support/xpthread_barrier_destroy.c
++++ b/support/xpthread_barrier_destroy.c
+@@ -1,5 +1,5 @@
+ /* pthread_barrier_destroy with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_barrier_init.c b/support/xpthread_barrier_init.c
+index b32dad1315..4a2975ad12 100644
+--- a/support/xpthread_barrier_init.c
++++ b/support/xpthread_barrier_init.c
+@@ -1,5 +1,5 @@
+ /* pthread_barrier_init with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_barrier_wait.c b/support/xpthread_barrier_wait.c
+index 7cee44d0a3..61690c5e7c 100644
+--- a/support/xpthread_barrier_wait.c
++++ b/support/xpthread_barrier_wait.c
+@@ -1,5 +1,5 @@
+ /* pthread_barrier_wait with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_cancel.c b/support/xpthread_cancel.c
+index 3af16f9b54..26e864ea3e 100644
+--- a/support/xpthread_cancel.c
++++ b/support/xpthread_cancel.c
+@@ -1,5 +1,5 @@
+ /* pthread_cancel with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_check_return.c b/support/xpthread_check_return.c
+index 3094d82e9c..1658db4b62 100644
+--- a/support/xpthread_check_return.c
++++ b/support/xpthread_check_return.c
+@@ -1,5 +1,5 @@
+ /* Return value checking for pthread functions, exit variant.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_cond_wait.c b/support/xpthread_cond_wait.c
+index b0e9b2a232..08ec683b66 100644
+--- a/support/xpthread_cond_wait.c
++++ b/support/xpthread_cond_wait.c
+@@ -1,5 +1,5 @@
+ /* pthread_cond_wait with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_create.c b/support/xpthread_create.c
+index 98c63e54c3..24b8456db9 100644
+--- a/support/xpthread_create.c
++++ b/support/xpthread_create.c
+@@ -1,5 +1,5 @@
+ /* pthread_create with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_detach.c b/support/xpthread_detach.c
+index 2088af2f57..c65f2d7db1 100644
+--- a/support/xpthread_detach.c
++++ b/support/xpthread_detach.c
+@@ -1,5 +1,5 @@
+ /* pthread_detach with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_join.c b/support/xpthread_join.c
+index f23bb9a5ae..29acbd283a 100644
+--- a/support/xpthread_join.c
++++ b/support/xpthread_join.c
+@@ -1,5 +1,5 @@
+ /* pthread_join with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_mutex_consistent.c b/support/xpthread_mutex_consistent.c
+index 52364be365..d337163609 100644
+--- a/support/xpthread_mutex_consistent.c
++++ b/support/xpthread_mutex_consistent.c
+@@ -1,5 +1,5 @@
+ /* pthread_mutex_consistent with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_mutex_destroy.c b/support/xpthread_mutex_destroy.c
+index f11f8f0acd..d03f016629 100644
+--- a/support/xpthread_mutex_destroy.c
++++ b/support/xpthread_mutex_destroy.c
+@@ -1,5 +1,5 @@
+ /* pthread_mutex_destroy with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_mutex_init.c b/support/xpthread_mutex_init.c
+index 2d16d1b9d9..40855954a8 100644
+--- a/support/xpthread_mutex_init.c
++++ b/support/xpthread_mutex_init.c
+@@ -1,5 +1,5 @@
+ /* pthread_mutex_init with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_mutex_lock.c b/support/xpthread_mutex_lock.c
+index af727b45f3..4257960aaa 100644
+--- a/support/xpthread_mutex_lock.c
++++ b/support/xpthread_mutex_lock.c
+@@ -1,5 +1,5 @@
+ /* pthread_mutex_lock with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_mutex_unlock.c b/support/xpthread_mutex_unlock.c
+index 161b41edf6..5c385c6934 100644
+--- a/support/xpthread_mutex_unlock.c
++++ b/support/xpthread_mutex_unlock.c
+@@ -1,5 +1,5 @@
+ /* pthread_mutex_unlock with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_mutexattr_destroy.c b/support/xpthread_mutexattr_destroy.c
+index c699e32b41..f352a7ad93 100644
+--- a/support/xpthread_mutexattr_destroy.c
++++ b/support/xpthread_mutexattr_destroy.c
+@@ -1,5 +1,5 @@
+ /* pthread_mutexattr_destroy with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_mutexattr_init.c b/support/xpthread_mutexattr_init.c
+index fa93fab178..fe231581e3 100644
+--- a/support/xpthread_mutexattr_init.c
++++ b/support/xpthread_mutexattr_init.c
+@@ -1,5 +1,5 @@
+ /* pthread_mutexattr_init with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_mutexattr_setprotocol.c b/support/xpthread_mutexattr_setprotocol.c
+index 353f75e3d7..e2f544d38c 100644
+--- a/support/xpthread_mutexattr_setprotocol.c
++++ b/support/xpthread_mutexattr_setprotocol.c
+@@ -1,5 +1,5 @@
+ /* pthread_mutexattr_setprotocol with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_mutexattr_setpshared.c b/support/xpthread_mutexattr_setpshared.c
+index 242da1aeca..2380560d79 100644
+--- a/support/xpthread_mutexattr_setpshared.c
++++ b/support/xpthread_mutexattr_setpshared.c
+@@ -1,5 +1,5 @@
+ /* pthread_mutexattr_setpshared with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_mutexattr_setrobust.c b/support/xpthread_mutexattr_setrobust.c
+index d7d6fa8630..7886c72a77 100644
+--- a/support/xpthread_mutexattr_setrobust.c
++++ b/support/xpthread_mutexattr_setrobust.c
+@@ -1,5 +1,5 @@
+ /* pthread_mutexattr_setrobust with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_mutexattr_settype.c b/support/xpthread_mutexattr_settype.c
+index cf22170b56..91f790c9e5 100644
+--- a/support/xpthread_mutexattr_settype.c
++++ b/support/xpthread_mutexattr_settype.c
+@@ -1,5 +1,5 @@
+ /* pthread_mutexattr_settype with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_once.c b/support/xpthread_once.c
+index 70d58dbab2..b22c1ce3dd 100644
+--- a/support/xpthread_once.c
++++ b/support/xpthread_once.c
+@@ -1,5 +1,5 @@
+ /* pthread_once with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_rwlock_init.c b/support/xpthread_rwlock_init.c
+index 824288c90e..e6c38115d8 100644
+--- a/support/xpthread_rwlock_init.c
++++ b/support/xpthread_rwlock_init.c
+@@ -1,5 +1,5 @@
+ /* pthread_rwlock_init with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_rwlock_rdlock.c b/support/xpthread_rwlock_rdlock.c
+index 96330a5637..a88068fc86 100644
+--- a/support/xpthread_rwlock_rdlock.c
++++ b/support/xpthread_rwlock_rdlock.c
+@@ -1,5 +1,5 @@
+ /* pthread_rwlock_rdlock with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_rwlock_unlock.c b/support/xpthread_rwlock_unlock.c
+index eaa136b3ec..7eb282fd18 100644
+--- a/support/xpthread_rwlock_unlock.c
++++ b/support/xpthread_rwlock_unlock.c
+@@ -1,5 +1,5 @@
+ /* pthread_rwlock_unlock with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_rwlock_wrlock.c b/support/xpthread_rwlock_wrlock.c
+index 8d25d5b818..0de37146c3 100644
+--- a/support/xpthread_rwlock_wrlock.c
++++ b/support/xpthread_rwlock_wrlock.c
+@@ -1,5 +1,5 @@
+ /* pthread_rwlock_wrlock with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_rwlockattr_init.c b/support/xpthread_rwlockattr_init.c
+index 48baf247f3..96ac47d777 100644
+--- a/support/xpthread_rwlockattr_init.c
++++ b/support/xpthread_rwlockattr_init.c
+@@ -1,5 +1,5 @@
+ /* pthread_rwlockattr_init with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_rwlockattr_setkind_np.c b/support/xpthread_rwlockattr_setkind_np.c
+index 958aace9f6..34aa3df0a9 100644
+--- a/support/xpthread_rwlockattr_setkind_np.c
++++ b/support/xpthread_rwlockattr_setkind_np.c
+@@ -1,5 +1,5 @@
+ /* pthread_rwlockattr_setkind_np with error checking.
+-   Copyright (C) 2017 Free Software Foundation, Inc.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_sigmask.c b/support/xpthread_sigmask.c
+index 0ba9ca02dc..1fb91dcc20 100644
+--- a/support/xpthread_sigmask.c
++++ b/support/xpthread_sigmask.c
+@@ -1,5 +1,5 @@
+ /* pthread_sigmask with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_spin_lock.c b/support/xpthread_spin_lock.c
+index 6975215b17..4cadbf70f9 100644
+--- a/support/xpthread_spin_lock.c
++++ b/support/xpthread_spin_lock.c
+@@ -1,5 +1,5 @@
+ /* pthread_spin_lock with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xpthread_spin_unlock.c b/support/xpthread_spin_unlock.c
+index 4f19a44c48..194613993a 100644
+--- a/support/xpthread_spin_unlock.c
++++ b/support/xpthread_spin_unlock.c
+@@ -1,5 +1,5 @@
+ /* pthread_spin_unlock with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xraise.c b/support/xraise.c
+new file mode 100644
+index 0000000000..1901e741eb
+--- /dev/null
++++ b/support/xraise.c
+@@ -0,0 +1,27 @@
++/* Error-checking wrapper for raise.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <support/check.h>
++#include <support/xsignal.h>
++
++void
++xraise (int sig)
++{
++  if (raise (sig) != 0)
++    FAIL_EXIT1 ("raise (%d): %m" , sig);
++}
+diff --git a/support/xreadlink.c b/support/xreadlink.c
+new file mode 100644
+index 0000000000..c6386491db
+--- /dev/null
++++ b/support/xreadlink.c
+@@ -0,0 +1,44 @@
++/* Error-checking, allocating wrapper for readlink.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <scratch_buffer.h>
++#include <support/check.h>
++#include <support/support.h>
++#include <xunistd.h>
++
++char *
++xreadlink (const char *path)
++{
++  struct scratch_buffer buf;
++  scratch_buffer_init (&buf);
++
++  while (true)
++    {
++      ssize_t count = readlink (path, buf.data, buf.length);
++      if (count < 0)
++        FAIL_EXIT1 ("readlink (\"%s\"): %m", path);
++      if (count < buf.length)
++        {
++          char *result = xstrndup (buf.data, count);
++          scratch_buffer_free (&buf);
++          return result;
++        }
++      if (!scratch_buffer_grow (&buf))
++        FAIL_EXIT1 ("scratch_buffer_grow in xreadlink");
++    }
++}
+diff --git a/support/xrealloc.c b/support/xrealloc.c
+index 00c313880c..4d9987c9bb 100644
+--- a/support/xrealloc.c
++++ b/support/xrealloc.c
+@@ -1,5 +1,5 @@
+ /* Error-checking wrapper for realloc.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xrecvfrom.c b/support/xrecvfrom.c
+index 17809c4dd2..a1011a5062 100644
+--- a/support/xrecvfrom.c
++++ b/support/xrecvfrom.c
+@@ -1,5 +1,5 @@
+ /* recvfrom with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xsendto.c b/support/xsendto.c
+index 20bddf6965..f51530793e 100644
+--- a/support/xsendto.c
++++ b/support/xsendto.c
+@@ -1,5 +1,5 @@
+ /* sendto with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xsetsockopt.c b/support/xsetsockopt.c
+index 9931882e75..b7c07f21f9 100644
+--- a/support/xsetsockopt.c
++++ b/support/xsetsockopt.c
+@@ -1,5 +1,5 @@
+ /* setsockopt with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xsigaction.c b/support/xsigaction.c
+new file mode 100644
+index 0000000000..51657de2b7
+--- /dev/null
++++ b/support/xsigaction.c
+@@ -0,0 +1,27 @@
++/* Error-checking wrapper for sigaction.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <support/check.h>
++#include <support/xsignal.h>
++
++void
++xsigaction (int sig, const struct sigaction *newact, struct sigaction *oldact)
++{
++  if (sigaction (sig, newact, oldact))
++    FAIL_EXIT1 ("sigaction (%d): %m" , sig);
++}
+diff --git a/support/xsignal.c b/support/xsignal.c
+new file mode 100644
+index 0000000000..e7369f0324
+--- /dev/null
++++ b/support/xsignal.c
+@@ -0,0 +1,29 @@
++/* Error-checking wrapper for signal.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <support/check.h>
++#include <support/xsignal.h>
++
++sighandler_t
++xsignal (int sig, sighandler_t handler)
++{
++  sighandler_t result = signal (sig, handler);
++  if (result == SIG_ERR)
++    FAIL_EXIT1 ("signal (%d, %p): %m", sig, handler);
++  return result;
++}
+diff --git a/support/xsignal.h b/support/xsignal.h
+index 3dc0d9d5ce..9ab8d1bfdd 100644
+--- a/support/xsignal.h
++++ b/support/xsignal.h
+@@ -1,5 +1,5 @@
+ /* Support functionality for using signals.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -24,6 +24,14 @@
+ 
+ __BEGIN_DECLS
+ 
++/* The following functions call the corresponding libc functions and
++   terminate the process on error.  */
++
++void xraise (int sig);
++sighandler_t xsignal (int sig, sighandler_t handler);
++void xsigaction (int sig, const struct sigaction *newact,
++                 struct sigaction *oldact);
++
+ /* The following functions call the corresponding libpthread functions
+    and terminate the process on error.  */
+ 
+diff --git a/support/xsocket.c b/support/xsocket.c
+index c1deaee924..20282fb810 100644
+--- a/support/xsocket.c
++++ b/support/xsocket.c
+@@ -1,5 +1,5 @@
+ /* socket with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xsocket.h b/support/xsocket.h
+index d6724948d8..9673abdf54 100644
+--- a/support/xsocket.h
++++ b/support/xsocket.h
+@@ -1,5 +1,5 @@
+ /* Error-checking wrappers for socket functions.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xstdio.h b/support/xstdio.h
+index bcc2e863bf..e7d0274474 100644
+--- a/support/xstdio.h
++++ b/support/xstdio.h
+@@ -1,5 +1,5 @@
+ /* Error-checking wrappers for stdio functions.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xstrdup.c b/support/xstrdup.c
+index d6a8c04baf..89eee8584e 100644
+--- a/support/xstrdup.c
++++ b/support/xstrdup.c
+@@ -1,5 +1,5 @@
+ /* strdup with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xstrndup.c b/support/xstrndup.c
+new file mode 100644
+index 0000000000..e85fddd439
+--- /dev/null
++++ b/support/xstrndup.c
+@@ -0,0 +1,30 @@
++/* strndup with error checking.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <support/support.h>
++
++#include <string.h>
++
++char *
++xstrndup (const char *s, size_t length)
++{
++  char *p = strndup (s, length);
++  if (p == NULL)
++    oom_error ("strndup", length);
++  return p;
++}
+diff --git a/support/xsysconf.c b/support/xsysconf.c
+new file mode 100644
+index 0000000000..afefc2d098
+--- /dev/null
++++ b/support/xsysconf.c
+@@ -0,0 +1,36 @@
++/* Error-checking wrapper for sysconf.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <errno.h>
++#include <support/check.h>
++#include <support/xunistd.h>
++
++long
++xsysconf (int name)
++{
++  /* Detect errors by a changed errno value, in case -1 is a valid
++     value.  Make sure that the caller does not see the zero value for
++     errno.  */
++  int old_errno = errno;
++  errno = 0;
++  long result = sysconf (name);
++  if (errno != 0)
++    FAIL_EXIT1 ("sysconf (%d): %m", name);
++  errno = old_errno;
++  return result;
++}
+diff --git a/support/xthread.h b/support/xthread.h
+index 472763ebe8..79358e7c99 100644
+--- a/support/xthread.h
++++ b/support/xthread.h
+@@ -1,5 +1,5 @@
+ /* Support functionality for using threads.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xunistd.h b/support/xunistd.h
+index c947bfd8fb..5fe5dae818 100644
+--- a/support/xunistd.h
++++ b/support/xunistd.h
+@@ -1,5 +1,5 @@
+ /* POSIX-specific extra functions.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+@@ -36,8 +36,17 @@ void xpipe (int[2]);
+ void xdup2 (int, int);
+ int xopen (const char *path, int flags, mode_t);
+ void xstat (const char *path, struct stat64 *);
++void xfstat (int fd, struct stat64 *);
+ void xmkdir (const char *path, mode_t);
+ void xchroot (const char *path);
++void xunlink (const char *path);
++long xsysconf (int name);
++long long xlseek (int fd, long long offset, int whence);
++void xftruncate (int fd, long long length);
++
++/* Read the link at PATH.  The caller should free the returned string
++   with free.  */
++char *xreadlink (const char *path);
+ 
+ /* Close the file descriptor.  Ignore EINTR errors, but terminate the
+    process on other errors.  */
+diff --git a/support/xunlink.c b/support/xunlink.c
+new file mode 100644
+index 0000000000..2ff9296fca
+--- /dev/null
++++ b/support/xunlink.c
+@@ -0,0 +1,27 @@
++/* Error-checking wrapper for unlink.
++   Copyright (C) 2017-2018 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <support/check.h>
++#include <support/xunistd.h>
++
++void
++xunlink (const char *path)
++{
++  if (unlink (path) != 0)
++    FAIL_EXIT1 ("unlink (\"%s\"): %m", path);
++}
+diff --git a/support/xwaitpid.c b/support/xwaitpid.c
+index 204795e4c0..1cb039ca17 100644
+--- a/support/xwaitpid.c
++++ b/support/xwaitpid.c
+@@ -1,5 +1,5 @@
+ /* waitpid with error checking.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/support/xwrite.c b/support/xwrite.c
+index 134e8ee4c1..bbaae9130a 100644
+--- a/support/xwrite.c
++++ b/support/xwrite.c
+@@ -1,5 +1,5 @@
+ /* write with error checking and retries.
+-   Copyright (C) 2016-2017 Free Software Foundation, Inc.
++   Copyright (C) 2016-2018 Free Software Foundation, Inc.
+    This file is part of the GNU C Library.
+ 
+    The GNU C Library is free software; you can redistribute it and/or
+diff --git a/sysdeps/aarch64/multiarch/Makefile b/sysdeps/aarch64/multiarch/Makefile
+index 78d52c717d..9aa1e79a80 100644
+--- a/sysdeps/aarch64/multiarch/Makefile
++++ b/sysdeps/aarch64/multiarch/Makefile
+@@ -1,3 +1,4 @@
+ ifeq ($(subdir),string)
+-sysdep_routines += memcpy_generic memcpy_thunderx
++sysdep_routines += memcpy_generic memcpy_thunderx memcpy_falkor \
++		   memmove_falkor
+ endif
+diff --git a/sysdeps/aarch64/multiarch/ifunc-impl-list.c b/sysdeps/aarch64/multiarch/ifunc-impl-list.c
+index 32056bcec3..2cb74d5b43 100644
+--- a/sysdeps/aarch64/multiarch/ifunc-impl-list.c
++++ b/sysdeps/aarch64/multiarch/ifunc-impl-list.c
+@@ -25,7 +25,7 @@
+ #include <stdio.h>
+ 
+ /* Maximum number of IFUNC implementations.  */
+-#define MAX_IFUNC	2
++#define MAX_IFUNC	3
+ 
+ size_t
+ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
+@@ -40,9 +40,11 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
+   /* Support sysdeps/aarch64/multiarch/memcpy.c and memmove.c.  */
+   IFUNC_IMPL (i, name, memcpy,
+ 	      IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_thunderx)
++	      IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_falkor)
+ 	      IFUNC_IMPL_ADD (array, i, memcpy, 1, __memcpy_generic))
+   IFUNC_IMPL (i, name, memmove,
+ 	      IFUNC_IMPL_ADD (array, i, memmove, 1, __memmove_thunderx)
++	      IFUNC_IMPL_ADD (array, i, memmove, 1, __memmove_falkor)
+ 	      IFUNC_IMPL_ADD (array, i, memmove, 1, __memmove_generic))
+ 
+   return i;
+diff --git a/sysdeps/aarch64/multiarch/memcpy.c b/sysdeps/aarch64/multiarch/memcpy.c
+index 9f73efbba7..b395df1c63 100644
+--- a/sysdeps/aarch64/multiarch/memcpy.c
++++ b/sysdeps/aarch64/multiarch/memcpy.c
+@@ -30,9 +30,14 @@ extern __typeof (__redirect_memcpy) __libc_memcpy;
+ 
+ extern __typeof (__redirect_memcpy) __memcpy_generic attribute_hidden;
+ extern __typeof (__redirect_memcpy) __memcpy_thunderx attribute_hidden;
++extern __typeof (__redirect_memcpy) __memcpy_falkor attribute_hidden;
+ 
+ libc_ifunc (__libc_memcpy,
+-            IS_THUNDERX (midr) ? __memcpy_thunderx : __memcpy_generic);
++            (IS_THUNDERX (midr)
++	     ? __memcpy_thunderx
++	     : (IS_FALKOR (midr)
++		? __memcpy_falkor
++		: __memcpy_generic)));
+ 
+ # undef memcpy
+ strong_alias (__libc_memcpy, memcpy);
+diff --git a/sysdeps/aarch64/multiarch/memcpy_falkor.S b/sysdeps/aarch64/multiarch/memcpy_falkor.S
+new file mode 100644
+index 0000000000..dea4f225ee
+--- /dev/null
++++ b/sysdeps/aarch64/multiarch/memcpy_falkor.S
+@@ -0,0 +1,184 @@
++/* Optimized memcpy for Qualcomm Falkor processor.
++   Copyright (C) 2017 Free Software Foundation, Inc.
++
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library.  If not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <sysdep.h>
++
++/* Assumptions:
++
++   ARMv8-a, AArch64, falkor, unaligned accesses.  */
++
++#define dstin	x0
++#define src	x1
++#define count	x2
++#define dst	x3
++#define srcend	x4
++#define dstend	x5
++#define A_l	x6
++#define A_lw	w6
++#define A_h	x7
++#define A_hw	w7
++#define tmp1	x14
++
++/* Copies are split into 3 main cases:
++
++   1. Small copies of up to 32 bytes
++   2. Medium copies of 33..128 bytes which are fully unrolled
++   3. Large copies of more than 128 bytes.
++
++   Large copies align the sourceto a quad word and use an unrolled loop
++   processing 64 bytes per iteration.
++
++   FALKOR-SPECIFIC DESIGN:
++
++   The smallest copies (32 bytes or less) focus on optimal pipeline usage,
++   which is why the redundant copies of 0-3 bytes have been replaced with
++   conditionals, since the former would unnecessarily break across multiple
++   issue groups.  The medium copy group has been enlarged to 128 bytes since
++   bumping up the small copies up to 32 bytes allows us to do that without
++   cost and also allows us to reduce the size of the prep code before loop64.
++
++   All copies are done only via two registers r6 and r7.  This is to ensure
++   that all loads hit a single hardware prefetcher which can get correctly
++   trained to prefetch a single stream.
++
++   The non-temporal stores help optimize cache utilization.  */
++
++#if IS_IN (libc)
++ENTRY_ALIGN (__memcpy_falkor, 6)
++
++	cmp	count, 32
++	add	srcend, src, count
++	add	dstend, dstin, count
++	b.ls	L(copy32)
++	ldp	A_l, A_h, [src]
++	cmp	count, 128
++	stp	A_l, A_h, [dstin]
++	b.hi	L(copy_long)
++
++	/* Medium copies: 33..128 bytes.  */
++	sub	tmp1, count, 1
++	ldp	A_l, A_h, [src, 16]
++	stp	A_l, A_h, [dstin, 16]
++	tbz	tmp1, 6, 1f
++	ldp	A_l, A_h, [src, 32]
++	stp	A_l, A_h, [dstin, 32]
++	ldp	A_l, A_h, [src, 48]
++	stp	A_l, A_h, [dstin, 48]
++	ldp	A_l, A_h, [srcend, -64]
++	stp	A_l, A_h, [dstend, -64]
++	ldp	A_l, A_h, [srcend, -48]
++	stp	A_l, A_h, [dstend, -48]
++1:
++	ldp	A_l, A_h, [srcend, -32]
++	stp	A_l, A_h, [dstend, -32]
++	ldp	A_l, A_h, [srcend, -16]
++	stp	A_l, A_h, [dstend, -16]
++	ret
++
++	.p2align 4
++	/* Small copies: 0..32 bytes.  */
++L(copy32):
++	/* 16-32 */
++	cmp	count, 16
++	b.lo	1f
++	ldp	A_l, A_h, [src]
++	stp	A_l, A_h, [dstin]
++	ldp	A_l, A_h, [srcend, -16]
++	stp	A_l, A_h, [dstend, -16]
++	ret
++	.p2align 4
++1:
++	/* 8-15 */
++	tbz	count, 3, 1f
++	ldr	A_l, [src]
++	str	A_l, [dstin]
++	ldr	A_l, [srcend, -8]
++	str	A_l, [dstend, -8]
++	ret
++	.p2align 4
++1:
++	/* 4-7 */
++	tbz	count, 2, 1f
++	ldr	A_lw, [src]
++	str	A_lw, [dstin]
++	ldr	A_lw, [srcend, -4]
++	str	A_lw, [dstend, -4]
++	ret
++	.p2align 4
++1:
++	/* 2-3 */
++	tbz	count, 1, 1f
++	ldrh	A_lw, [src]
++	strh	A_lw, [dstin]
++	ldrh	A_lw, [srcend, -2]
++	strh	A_lw, [dstend, -2]
++	ret
++	.p2align 4
++1:
++	/* 0-1 */
++	tbz	count, 0, 1f
++	ldrb	A_lw, [src]
++	strb	A_lw, [dstin]
++1:
++	ret
++
++	/* Align SRC to 16 bytes and copy; that way at least one of the
++	   accesses is aligned throughout the copy sequence.
++
++	   The count is off by 0 to 15 bytes, but this is OK because we trim
++	   off the last 64 bytes to copy off from the end.  Due to this the
++	   loop never runs out of bounds.  */
++	.p2align 6
++L(copy_long):
++	sub	count, count, 64 + 16
++	and	tmp1, src, 15
++	bic	src, src, 15
++	sub	dst, dstin, tmp1
++	add	count, count, tmp1
++
++L(loop64):
++	ldp	A_l, A_h, [src, 16]!
++	stnp	A_l, A_h, [dst, 16]
++	ldp	A_l, A_h, [src, 16]!
++	subs	count, count, 64
++	stnp	A_l, A_h, [dst, 32]
++	ldp	A_l, A_h, [src, 16]!
++	stnp	A_l, A_h, [dst, 48]
++	ldp	A_l, A_h, [src, 16]!
++	stnp	A_l, A_h, [dst, 64]
++	add	dst, dst, 64
++	b.hi	L(loop64)
++
++	/* Write the last full set of 64 bytes.  The remainder is at most 64
++	   bytes, so it is safe to always copy 64 bytes from the end even if
++	   there is just 1 byte left.  */
++L(last64):
++	ldp	A_l, A_h, [srcend, -64]
++	stnp	A_l, A_h, [dstend, -64]
++	ldp	A_l, A_h, [srcend, -48]
++	stnp	A_l, A_h, [dstend, -48]
++	ldp	A_l, A_h, [srcend, -32]
++	stnp	A_l, A_h, [dstend, -32]
++	ldp	A_l, A_h, [srcend, -16]
++	stnp	A_l, A_h, [dstend, -16]
++	ret
++
++END (__memcpy_falkor)
++libc_hidden_builtin_def (__memcpy_falkor)
++#endif
+diff --git a/sysdeps/aarch64/multiarch/memmove.c b/sysdeps/aarch64/multiarch/memmove.c
+index 34c6b29bd5..016f03ee50 100644
+--- a/sysdeps/aarch64/multiarch/memmove.c
++++ b/sysdeps/aarch64/multiarch/memmove.c
+@@ -30,9 +30,14 @@ extern __typeof (__redirect_memmove) __libc_memmove;
+ 
+ extern __typeof (__redirect_memmove) __memmove_generic attribute_hidden;
+ extern __typeof (__redirect_memmove) __memmove_thunderx attribute_hidden;
++extern __typeof (__redirect_memmove) __memmove_falkor attribute_hidden;
+ 
+ libc_ifunc (__libc_memmove,
+-            IS_THUNDERX (midr) ? __memmove_thunderx : __memmove_generic);
++            (IS_THUNDERX (midr)
++	     ? __memmove_thunderx
++	     : (IS_FALKOR (midr)
++		? __memmove_falkor
++		: __memmove_generic)));
+ 
+ # undef memmove
+ strong_alias (__libc_memmove, memmove);
+diff --git a/sysdeps/aarch64/multiarch/memmove_falkor.S b/sysdeps/aarch64/multiarch/memmove_falkor.S
+new file mode 100644
+index 0000000000..3a4e6a2a8e
+--- /dev/null
++++ b/sysdeps/aarch64/multiarch/memmove_falkor.S
+@@ -0,0 +1,232 @@
++/* Copyright (C) 2017 Free Software Foundation, Inc.
++
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library.  If not, see
++   <http://www.gnu.org/licenses/>.  */
++
++#include <sysdep.h>
++
++/* Assumptions: ARMv8-a, AArch64, falkor, unaligned accesses.  */
++
++#define dstin	x0
++#define src	x1
++#define count	x2
++#define dstlen	x3
++#define dst	x3
++#define srcend	x4
++#define dstend	x5
++#define A_l	x6
++#define A_lw	w6
++#define A_h	x7
++#define A_hw	w7
++#define B_l	x8
++#define B_lw	w8
++#define B_h	x9
++#define C_l	x10
++#define C_h	x11
++#define D_l	x12
++#define D_h	x13
++#define E_l	src
++#define E_h	count
++#define F_l	srcend
++#define F_h	dst
++#define tmp1	x14
++
++/* Alias with A_l and A_h to train the prefetcher.  */
++#define Q_l	x22
++#define Q_h	x23
++
++/* RATIONALE:
++
++   The copy has 4 distinct parts:
++   * Small copies of 16 bytes and under
++   * Medium sized copies of 17-96 bytes
++   * Large copies where the source address is higher than the destination
++     (forward copies)
++   * Large copies where the destination address is higher than the source
++     (copy backward, or move).
++
++   We use only two registerpairs x6,x7 and x22,x23 for the copies and copy 32
++   bytes at a time to correctly train the hardware prefetcher for better
++   throughput.  */
++ENTRY_ALIGN (__memmove_falkor, 6)
++
++	sub	tmp1, dstin, src
++	add	srcend, src, count
++	add	dstend, dstin, count
++	cmp	count, 96
++	ccmp	tmp1, count, 2, hi
++	b.lo	L(move_long)
++
++	cmp	count, 16
++	b.ls	L(copy16)
++	cmp	count, 96
++	b.hi	L(copy_long)
++
++	/* Medium copies: 17..96 bytes.  */
++	sub	tmp1, count, 1
++	ldp	A_l, A_h, [src]
++	tbnz	tmp1, 6, L(copy96)
++	ldp	D_l, D_h, [srcend, -16]
++	tbz	tmp1, 5, 1f
++	ldp	B_l, B_h, [src, 16]
++	ldp	C_l, C_h, [srcend, -32]
++	stp	B_l, B_h, [dstin, 16]
++	stp	C_l, C_h, [dstend, -32]
++1:
++	stp	A_l, A_h, [dstin]
++	stp	D_l, D_h, [dstend, -16]
++	ret
++
++	.p2align 4
++	/* Small copies: 0..16 bytes.  */
++L(copy16):
++	cmp	count, 8
++	b.lo	1f
++	ldr	A_l, [src]
++	ldr	A_h, [srcend, -8]
++	str	A_l, [dstin]
++	str	A_h, [dstend, -8]
++	ret
++	.p2align 4
++1:
++	/* 4-7 */
++	tbz	count, 2, 1f
++	ldr	A_lw, [src]
++	ldr	A_hw, [srcend, -4]
++	str	A_lw, [dstin]
++	str	A_hw, [dstend, -4]
++	ret
++	.p2align 4
++1:
++	/* 2-3 */
++	tbz	count, 1, 1f
++	ldrh	A_lw, [src]
++	ldrh	A_hw, [srcend, -2]
++	strh	A_lw, [dstin]
++	strh	A_hw, [dstend, -2]
++	ret
++	.p2align 4
++1:
++	/* 0-1 */
++	tbz	count, 0, 1f
++	ldrb	A_lw, [src]
++	strb	A_lw, [dstin]
++1:	ret
++
++	.p2align 4
++	/* Copy 64..96 bytes.  Copy 64 bytes from the start and
++	   32 bytes from the end.  */
++L(copy96):
++	ldp	B_l, B_h, [src, 16]
++	ldp	C_l, C_h, [src, 32]
++	ldp	D_l, D_h, [src, 48]
++	ldp	E_l, E_h, [srcend, -32]
++	ldp	F_l, F_h, [srcend, -16]
++	stp	A_l, A_h, [dstin]
++	stp	B_l, B_h, [dstin, 16]
++	stp	C_l, C_h, [dstin, 32]
++	stp	D_l, D_h, [dstin, 48]
++	stp	E_l, E_h, [dstend, -32]
++	stp	F_l, F_h, [dstend, -16]
++	ret
++
++	/* Align SRC to 16 byte alignment so that we don't cross cache line
++	   boundaries on both loads and stores.  There are at least 96 bytes
++	   to copy, so copy 16 bytes unaligned and then align.  The loop
++	   copies 32 bytes per iteration and prefetches one iteration ahead.  */
++
++	.p2align 4
++L(copy_long):
++	sub	count, count, 64 + 16	/* Test and readjust count.  */
++	mov	B_l, Q_l
++	mov	B_h, Q_h
++	ldp	A_l, A_h, [src]
++	and	tmp1, src, 15
++	bic	src, src, 15
++	sub	dst, dstin, tmp1
++	add	count, count, tmp1	/* Count is now 16 too large.  */
++	ldp	Q_l, Q_h, [src, 16]!
++	stp	A_l, A_h, [dstin]
++	ldp	A_l, A_h, [src, 16]!
++
++L(loop64):
++	subs	count, count, 32
++	stp	Q_l, Q_h, [dst, 16]
++	ldp	Q_l, Q_h, [src, 16]!
++	stp	A_l, A_h, [dst, 32]!
++	ldp	A_l, A_h, [src, 16]!
++	b.hi	L(loop64)
++
++	/* Write the last full set of 32 bytes.  The remainder is at most 32
++	   bytes, so it is safe to always copy 32 bytes from the end even if
++	   there is just 1 byte left.  */
++L(last64):
++	ldp	C_l, C_h, [srcend, -32]
++	stp	Q_l, Q_h, [dst, 16]
++	ldp	Q_l, Q_h, [srcend, -16]
++	stp	A_l, A_h, [dst, 32]
++	stp	C_l, C_h, [dstend, -32]
++	stp	Q_l, Q_h, [dstend, -16]
++	mov	Q_l, B_l
++	mov	Q_h, B_h
++	ret
++
++	.p2align 4
++L(move_long):
++	cbz	tmp1, 3f
++
++	mov	B_l, Q_l
++	mov	B_h, Q_h
++
++	/* Align SRCEND to 16 byte alignment so that we don't cross cache line
++	   boundaries on both loads and stores.  There are at least 96 bytes
++	   to copy, so copy 16 bytes unaligned and then align.  The loop
++	   copies 32 bytes per iteration and prefetches one iteration ahead.  */
++
++	ldp	A_l, A_h, [srcend, -16]
++	and	tmp1, srcend, 15
++	sub	srcend, srcend, tmp1
++	ldp	Q_l, Q_h, [srcend, -16]!
++	stp	A_l, A_h, [dstend, -16]
++	sub	count, count, tmp1
++	ldp	A_l, A_h, [srcend, -16]!
++	sub	dstend, dstend, tmp1
++	sub	count, count, 64
++
++1:
++	subs	count, count, 32
++	stp	Q_l, Q_h, [dstend, -16]
++	ldp	Q_l, Q_h, [srcend, -16]!
++	stp	A_l, A_h, [dstend, -32]!
++	ldp	A_l, A_h, [srcend, -16]!
++	b.hi	1b
++
++	/* Write the last full set of 32 bytes.  The remainder is at most 32
++	   bytes, so it is safe to always copy 32 bytes from the start even if
++	   there is just 1 byte left.  */
++2:
++	ldp	C_l, C_h, [src, 16]
++	stp	Q_l, Q_h, [dstend, -16]
++	ldp	Q_l, Q_h, [src]
++	stp	A_l, A_h, [dstend, -32]
++	stp	C_l, C_h, [dstin, 16]
++	stp	Q_l, Q_h, [dstin]
++	mov	Q_l, B_l
++	mov	Q_h, B_h
++3:	ret
++
++END (__memmove_falkor)
++libc_hidden_builtin_def (__memmove_falkor)
+diff --git a/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h b/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h
+index d13a75db07..9ab23d0474 100644
+--- a/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h
++++ b/sysdeps/aarch64/nptl/bits/pthreadtypes-arch.h
+@@ -45,6 +45,8 @@
+ #define __PTHREAD_COMPAT_PADDING_MID
+ #define __PTHREAD_COMPAT_PADDING_END
+ #define __PTHREAD_MUTEX_LOCK_ELISION	0
++#define __PTHREAD_MUTEX_NUSERS_AFTER_KIND  0
++#define __PTHREAD_MUTEX_USE_UNION          0
+ 
+ #define __LOCK_ALIGNMENT
+ #define __ONCE_ALIGNMENT
+diff --git a/sysdeps/aarch64/nptl/pthread-offsets.h b/sysdeps/aarch64/nptl/pthread-offsets.h
+new file mode 100644
+index 0000000000..16c6b0d9fd
+--- /dev/null
++++ b/sysdeps/aarch64/nptl/pthread-offsets.h
+@@ -0,0 +1,5 @@
++#define __PTHREAD_MUTEX_NUSERS_OFFSET   12
++#define __PTHREAD_MUTEX_KIND_OFFSET     16
++#define __PTHREAD_MUTEX_SPINS_OFFSET    20
++#define __PTHREAD_MUTEX_ELISION_OFFSET  22
++#define __PTHREAD_MUTEX_LIST_OFFSET     24
+diff --git a/sysdeps/alpha/nptl/bits/pthreadtypes-arch.h b/sysdeps/alpha/nptl/bits/pthreadtypes-arch.h
+index b6f6cb1347..429df10c0c 100644
+--- a/sysdeps/alpha/nptl/bits/pthreadtypes-arch.h
++++ b/sysdeps/alpha/nptl/bits/pthreadtypes-arch.h
+@@ -33,6 +33,8 @@
+ #define __PTHREAD_COMPAT_PADDING_MID
+ #define __PTHREAD_COMPAT_PADDING_END
+ #define __PTHREAD_MUTEX_LOCK_ELISION    0
++#define __PTHREAD_MUTEX_NUSERS_AFTER_KIND  0
++#define __PTHREAD_MUTEX_USE_UNION          0
+ 
+ #define __LOCK_ALIGNMENT
+ #define __ONCE_ALIGNMENT
+diff --git a/sysdeps/alpha/nptl/pthread-offsets.h b/sysdeps/alpha/nptl/pthread-offsets.h
+new file mode 100644
+index 0000000000..16c6b0d9fd
+--- /dev/null
++++ b/sysdeps/alpha/nptl/pthread-offsets.h
+@@ -0,0 +1,5 @@
++#define __PTHREAD_MUTEX_NUSERS_OFFSET   12
++#define __PTHREAD_MUTEX_KIND_OFFSET     16
++#define __PTHREAD_MUTEX_SPINS_OFFSET    20
++#define __PTHREAD_MUTEX_ELISION_OFFSET  22
++#define __PTHREAD_MUTEX_LIST_OFFSET     24
+diff --git a/sysdeps/arm/nptl/bits/pthreadtypes-arch.h b/sysdeps/arm/nptl/bits/pthreadtypes-arch.h
+index 3f9eca4645..3911c8183d 100644
+--- a/sysdeps/arm/nptl/bits/pthreadtypes-arch.h
++++ b/sysdeps/arm/nptl/bits/pthreadtypes-arch.h
+@@ -34,6 +34,8 @@
+ #define __PTHREAD_COMPAT_PADDING_MID
+ #define __PTHREAD_COMPAT_PADDING_END
+ #define __PTHREAD_MUTEX_LOCK_ELISION    0
++#define __PTHREAD_MUTEX_NUSERS_AFTER_KIND  1
++#define __PTHREAD_MUTEX_USE_UNION          1
+ 
+ #define __LOCK_ALIGNMENT
+ #define __ONCE_ALIGNMENT
+diff --git a/sysdeps/arm/nptl/pthread-offsets.h b/sysdeps/arm/nptl/pthread-offsets.h
+new file mode 100644
+index 0000000000..9617354dc7
+--- /dev/null
++++ b/sysdeps/arm/nptl/pthread-offsets.h
+@@ -0,0 +1,5 @@
++#define __PTHREAD_MUTEX_NUSERS_OFFSET   16
++#define __PTHREAD_MUTEX_KIND_OFFSET     12
++#define __PTHREAD_MUTEX_SPINS_OFFSET    20
++#define __PTHREAD_MUTEX_ELISION_OFFSET  22
++#define __PTHREAD_MUTEX_LIST_OFFSET     20
+diff --git a/sysdeps/gnu/glob64.c b/sysdeps/gnu/glob64.c
+index d1e4e6f0d5..52e97e2f6a 100644
+--- a/sysdeps/gnu/glob64.c
++++ b/sysdeps/gnu/glob64.c
+@@ -15,11 +15,8 @@
+ #undef __stat
+ #define __stat(file, buf) __xstat64 (_STAT_VER, file, buf)
+ 
+-#define NO_GLOB_PATTERN_P 1
+-
+ #define COMPILE_GLOB64	1
+ 
+ #include <posix/glob.c>
+ 
+ libc_hidden_def (glob64)
+-libc_hidden_def (globfree64)
+diff --git a/sysdeps/gnu/globfree64.c b/sysdeps/gnu/globfree64.c
+new file mode 100644
+index 0000000000..f092d0bf8b
+--- /dev/null
++++ b/sysdeps/gnu/globfree64.c
+@@ -0,0 +1,10 @@
++#include <dirent.h>
++#include <glob.h>
++#include <sys/stat.h>
++
++#define glob_t glob64_t
++#define globfree(pglob) globfree64 (pglob)
++
++#include <posix/globfree.c>
++
++libc_hidden_def (globfree64)
+diff --git a/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h b/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h
+index c1585625d1..865a14ee4a 100644
+--- a/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h
++++ b/sysdeps/hppa/nptl/bits/pthreadtypes-arch.h
+@@ -48,6 +48,8 @@
+    pthread_mutex_t is larger than Linuxthreads.  */
+ #define __PTHREAD_COMPAT_PADDING_END  int __reserved[2];
+ #define __PTHREAD_MUTEX_LOCK_ELISION    0
++#define __PTHREAD_MUTEX_NUSERS_AFTER_KIND  1
++#define __PTHREAD_MUTEX_USE_UNION          1
+ 
+ #define __LOCK_ALIGNMENT __attribute__ ((__aligned__(16)))
+ #define __ONCE_ALIGNMENT
+diff --git a/sysdeps/hppa/nptl/pthread-offsets.h b/sysdeps/hppa/nptl/pthread-offsets.h
+new file mode 100644
+index 0000000000..8ae01b9d95
+--- /dev/null
++++ b/sysdeps/hppa/nptl/pthread-offsets.h
+@@ -0,0 +1,5 @@
++#define __PTHREAD_MUTEX_NUSERS_OFFSET   32
++#define __PTHREAD_MUTEX_KIND_OFFSET     12
++#define __PTHREAD_MUTEX_SPINS_OFFSET    36
++#define __PTHREAD_MUTEX_ELISION_OFFSET  22
++#define __PTHREAD_MUTEX_LIST_OFFSET     36
+diff --git a/sysdeps/i386/fpu/libm-test-ulps b/sysdeps/i386/fpu/libm-test-ulps
+index ed685de35d..a269c7c343 100644
+--- a/sysdeps/i386/fpu/libm-test-ulps
++++ b/sysdeps/i386/fpu/libm-test-ulps
+@@ -2693,30 +2693,30 @@ ldouble: 2
+ 
+ Function: "y1_downward":
+ double: 2
+-float: 2
++float: 3
+ float128: 4
+ idouble: 2
+-ifloat: 2
++ifloat: 3
+ ifloat128: 4
+ ildouble: 7
+ ldouble: 7
+ 
+ Function: "y1_towardzero":
+ double: 2
+-float: 2
++float: 3
+ float128: 2
+ idouble: 2
+-ifloat: 2
++ifloat: 3
+ ifloat128: 2
+ ildouble: 5
+ ldouble: 5
+ 
+ Function: "y1_upward":
+ double: 1
+-float: 2
++float: 3
+ float128: 5
+ idouble: 1
+-ifloat: 2
++ifloat: 3
+ ifloat128: 5
+ ildouble: 7
+ ldouble: 7
+diff --git a/sysdeps/i386/i686/fpu/multiarch/libm-test-ulps b/sysdeps/i386/i686/fpu/multiarch/libm-test-ulps
+index 81dd1a09ea..053f5ec972 100644
+--- a/sysdeps/i386/i686/fpu/multiarch/libm-test-ulps
++++ b/sysdeps/i386/i686/fpu/multiarch/libm-test-ulps
+@@ -58,7 +58,7 @@ double: 1
+ float128: 2
+ idouble: 1
+ ifloat128: 2
+-ildouble: 4
++ildouble: 5
+ ldouble: 3
+ 
+ Function: "asin":
+@@ -1154,8 +1154,8 @@ float128: 4
+ idouble: 3
+ ifloat: 3
+ ifloat128: 4
+-ildouble: 7
+-ldouble: 7
++ildouble: 8
++ldouble: 8
+ 
+ Function: Imaginary part of "clog10_upward":
+ double: 1
+@@ -2013,8 +2013,8 @@ double: 3
+ float: 4
+ idouble: 3
+ ifloat: 4
+-ildouble: 5
+-ldouble: 5
++ildouble: 6
++ldouble: 6
+ 
+ Function: "hypot":
+ double: 1
+@@ -2205,8 +2205,8 @@ float128: 8
+ idouble: 3
+ ifloat: 4
+ ifloat128: 8
+-ildouble: 5
+-ldouble: 5
++ildouble: 6
++ldouble: 6
+ 
+ Function: "log":
+ double: 1
+diff --git a/sysdeps/i386/nptl/pthread-offsets.h b/sysdeps/i386/nptl/pthread-offsets.h
+new file mode 100644
+index 0000000000..9617354dc7
+--- /dev/null
++++ b/sysdeps/i386/nptl/pthread-offsets.h
+@@ -0,0 +1,5 @@
++#define __PTHREAD_MUTEX_NUSERS_OFFSET   16
++#define __PTHREAD_MUTEX_KIND_OFFSET     12
++#define __PTHREAD_MUTEX_SPINS_OFFSET    20
++#define __PTHREAD_MUTEX_ELISION_OFFSET  22
++#define __PTHREAD_MUTEX_LIST_OFFSET     20
+diff --git a/sysdeps/ia64/fpu/libm-test-ulps b/sysdeps/ia64/fpu/libm-test-ulps
+index 2776ba7fae..543cebcb63 100644
+--- a/sysdeps/ia64/fpu/libm-test-ulps
++++ b/sysdeps/ia64/fpu/libm-test-ulps
+@@ -1,508 +1,2396 @@
+ # Begin of automatic generation
+ 
+ # Maximal error of functions:
+-Function: "asin_downward":
++Function: "acos":
++double: 1
++float128: 1
++idouble: 1
++ifloat128: 1
++
++Function: "acos_downward":
+ double: 1
+ float: 1
++float128: 1
+ idouble: 1
+ ifloat: 1
+-ildouble: 1
+-ldouble: 1
++ifloat128: 1
+ 
+-Function: "asin_towardzero":
++Function: "acos_towardzero":
+ double: 1
+ float: 1
++float128: 1
+ idouble: 1
+ ifloat: 1
+-ildouble: 1
+-ldouble: 1
++ifloat128: 1
+ 
+-Function: "asin_upward":
++Function: "acos_upward":
+ double: 1
+ float: 1
++float128: 1
+ idouble: 1
+ ifloat: 1
+-ildouble: 1
+-ldouble: 1
++ifloat128: 1
+ 
+-Function: Real part of "cacos":
++Function: "acosh":
+ double: 1
+-float: 2
++float128: 2
+ idouble: 1
+-ifloat: 2
++ifloat128: 2
+ ildouble: 1
+ ldouble: 1
+ 
+-Function: Imaginary part of "cacos":
+-double: 1
+-float: 2
+-idouble: 1
+-ifloat: 2
+-ildouble: 2
+-ldouble: 2
++Function: "acosh_downward":
++float128: 3
++ifloat128: 3
+ 
+-Function: Real part of "cacosh":
+-double: 1
+-float: 2
+-idouble: 1
+-ifloat: 2
+-ildouble: 2
+-ldouble: 2
++Function: "acosh_towardzero":
++float128: 2
++ifloat128: 2
+ 
+-Function: Imaginary part of "cacosh":
++Function: "acosh_upward":
++float128: 2
++ifloat128: 2
++
++Function: "asin":
++float128: 1
++ifloat128: 1
++
++Function: "asin_downward":
+ double: 1
+-float: 2
++float: 1
++float128: 2
+ idouble: 1
+-ifloat: 2
++ifloat: 1
++ifloat128: 2
+ ildouble: 1
+ ldouble: 1
+ 
+-Function: Real part of "casin":
++Function: "asin_towardzero":
+ double: 1
+ float: 1
++float128: 1
+ idouble: 1
+ ifloat: 1
++ifloat128: 1
+ ildouble: 1
+ ldouble: 1
+ 
+-Function: Imaginary part of "casin":
++Function: "asin_upward":
+ double: 1
+-float: 2
++float: 1
++float128: 2
+ idouble: 1
+-ifloat: 2
+-ildouble: 2
+-ldouble: 2
++ifloat: 1
++ifloat128: 2
++ildouble: 1
++ldouble: 1
+ 
+-Function: Real part of "casinh":
++Function: "asinh":
+ double: 1
+-float: 2
++float128: 3
+ idouble: 1
+-ifloat: 2
+-ildouble: 2
+-ldouble: 2
++ifloat128: 3
+ 
+-Function: Imaginary part of "casinh":
++Function: "asinh_downward":
++float128: 4
++ifloat128: 4
++
++Function: "asinh_towardzero":
++float128: 2
++ifloat128: 2
++
++Function: "asinh_upward":
++float128: 4
++ifloat128: 4
++
++Function: "atan":
++float128: 1
++ifloat128: 1
++
++Function: "atan2":
++float128: 1
++ifloat128: 1
++
++Function: "atan2_downward":
+ double: 1
+ float: 1
++float128: 2
+ idouble: 1
+ ifloat: 1
++ifloat128: 2
+ ildouble: 1
+ ldouble: 1
+ 
+-Function: Imaginary part of "catan":
+-double: 1
++Function: "atan2_towardzero":
+ float: 1
+-idouble: 1
++float128: 3
+ ifloat: 1
++ifloat128: 3
+ ildouble: 1
+ ldouble: 1
+ 
+-Function: Real part of "catanh":
++Function: "atan2_upward":
+ double: 1
+ float: 1
++float128: 2
+ idouble: 1
+ ifloat: 1
++ifloat128: 2
+ ildouble: 1
+ ldouble: 1
+ 
+-Function: Real part of "ccos":
++Function: "atan_downward":
+ double: 1
++float: 1
++float128: 2
+ idouble: 1
++ifloat: 1
++ifloat128: 2
+ ildouble: 1
+ ldouble: 1
+ 
+-Function: Imaginary part of "ccos":
+-double: 1
++Function: "atan_towardzero":
+ float: 1
+-idouble: 1
++float128: 1
+ ifloat: 1
++ifloat128: 1
+ ildouble: 1
+ ldouble: 1
+ 
+-Function: Real part of "ccosh":
++Function: "atan_upward":
+ double: 1
+ float: 1
++float128: 2
+ idouble: 1
+ ifloat: 1
++ifloat128: 2
++ildouble: 1
++ldouble: 1
+ 
+-Function: Imaginary part of "ccosh":
+-double: 1
++Function: "atanh":
++float128: 3
++ifloat128: 3
++
++Function: "atanh_downward":
+ float: 1
+-idouble: 1
++float128: 4
+ ifloat: 1
+-ildouble: 1
+-ldouble: 1
++ifloat128: 4
+ 
+-Function: Real part of "cexp":
+-double: 2
++Function: "atanh_towardzero":
+ float: 1
+-idouble: 2
++float128: 2
++ifloat: 1
++ifloat128: 2
++
++Function: "atanh_upward":
++float: 1
++float128: 4
++ifloat: 1
++ifloat128: 4
++
++Function: "cabs":
++float128: 1
++ifloat128: 1
++
++Function: "cabs_downward":
++double: 1
++float: 1
++float128: 1
++idouble: 1
+ ifloat: 1
++ifloat128: 1
+ ildouble: 1
+ ldouble: 1
+ 
+-Function: Imaginary part of "cexp":
++Function: "cabs_towardzero":
+ double: 1
+-float: 2
++float: 1
++float128: 1
+ idouble: 1
+-ifloat: 2
++ifloat: 1
++ifloat128: 1
+ ildouble: 1
+ ldouble: 1
+ 
+-Function: Real part of "clog":
++Function: "cabs_upward":
+ double: 1
+ float: 1
++float128: 1
+ idouble: 1
+ ifloat: 1
++ifloat128: 1
+ ildouble: 1
+ ldouble: 1
+ 
+-Function: Imaginary part of "clog":
++Function: Real part of "cacos":
+ double: 1
++float: 2
++float128: 2
+ idouble: 1
++ifloat: 2
++ifloat128: 2
+ ildouble: 1
+ ldouble: 1
+ 
+-Function: Real part of "clog10":
++Function: Imaginary part of "cacos":
+ double: 2
+ float: 2
++float128: 2
+ idouble: 2
+ ifloat: 2
+-ildouble: 1
+-ldouble: 1
++ifloat128: 2
++ildouble: 2
++ldouble: 2
+ 
+-Function: Imaginary part of "clog10":
++Function: Real part of "cacos_downward":
+ double: 1
+ float: 1
++float128: 3
+ idouble: 1
+ ifloat: 1
+-ildouble: 1
+-ldouble: 1
++ifloat128: 3
++ildouble: 2
++ldouble: 2
+ 
+-Function: "cos":
+-double: 1
+-idouble: 1
++Function: Imaginary part of "cacos_downward":
++double: 5
++float: 6
++float128: 6
++idouble: 5
++ifloat: 6
++ifloat128: 6
++ildouble: 5
++ldouble: 5
+ 
+-Function: "cos_downward":
++Function: Real part of "cacos_towardzero":
+ double: 1
+ float: 1
++float128: 3
+ idouble: 1
+ ifloat: 1
+-ildouble: 1
+-ldouble: 1
++ifloat128: 3
++ildouble: 2
++ldouble: 2
+ 
+-Function: "cos_towardzero":
++Function: Imaginary part of "cacos_towardzero":
++double: 4
++float: 5
++float128: 5
++idouble: 4
++ifloat: 5
++ifloat128: 5
++ildouble: 4
++ldouble: 4
++
++Function: Real part of "cacos_upward":
++double: 2
++float: 2
++float128: 3
++idouble: 2
++ifloat: 2
++ifloat128: 3
++ildouble: 2
++ldouble: 2
++
++Function: Imaginary part of "cacos_upward":
++double: 5
++float: 5
++float128: 7
++idouble: 5
++ifloat: 5
++ifloat128: 7
++ildouble: 5
++ldouble: 5
++
++Function: Real part of "cacosh":
++double: 2
++float: 2
++float128: 2
++idouble: 2
++ifloat: 2
++ifloat128: 2
++ildouble: 2
++ldouble: 2
++
++Function: Imaginary part of "cacosh":
+ double: 1
+-float: 1
++float: 2
++float128: 2
+ idouble: 1
+-ifloat: 1
++ifloat: 2
++ifloat128: 2
+ ildouble: 1
+ ldouble: 1
+ 
+-Function: "cos_upward":
+-ildouble: 1
+-ldouble: 1
++Function: Real part of "cacosh_downward":
++double: 4
++float: 5
++float128: 5
++idouble: 4
++ifloat: 5
++ifloat128: 5
++ildouble: 4
++ldouble: 4
+ 
+-Function: Real part of "cpow":
++Function: Imaginary part of "cacosh_downward":
+ double: 2
+-float: 5
++float: 2
++float128: 4
+ idouble: 2
+-ifloat: 5
++ifloat: 2
++ifloat128: 4
+ ildouble: 3
+ ldouble: 3
+ 
+-Function: Imaginary part of "cpow":
+-float: 2
+-ifloat: 2
++Function: Real part of "cacosh_towardzero":
++double: 4
++float: 5
++float128: 5
++idouble: 4
++ifloat: 5
++ifloat128: 5
+ ildouble: 4
+ ldouble: 4
+ 
+-Function: Real part of "csin":
++Function: Imaginary part of "cacosh_towardzero":
+ double: 1
+ float: 1
++float128: 3
+ idouble: 1
+ ifloat: 1
+-ildouble: 1
+-ldouble: 1
++ifloat128: 3
++ildouble: 2
++ldouble: 2
+ 
+-Function: Imaginary part of "csin":
+-float: 1
+-ifloat: 1
++Function: Real part of "cacosh_upward":
++double: 4
++float: 3
++float128: 6
++idouble: 4
++ifloat: 3
++ifloat128: 6
++ildouble: 4
++ldouble: 4
+ 
+-Function: Real part of "csinh":
++Function: Imaginary part of "cacosh_upward":
++double: 3
++float: 2
++float128: 4
++idouble: 3
++ifloat: 2
++ifloat128: 4
++ildouble: 3
++ldouble: 3
++
++Function: "carg":
++float128: 2
++ifloat128: 2
++
++Function: "carg_downward":
+ double: 1
+ float: 1
++float128: 2
+ idouble: 1
+ ifloat: 1
++ifloat128: 2
+ ildouble: 1
+ ldouble: 1
+ 
+-Function: Imaginary part of "csinh":
+-double: 1
+-float: 1
+-idouble: 1
+-ifloat: 1
+-
+-Function: Real part of "csqrt":
+-double: 1
++Function: "carg_towardzero":
+ float: 1
+-idouble: 1
++float128: 3
+ ifloat: 1
++ifloat128: 3
+ ildouble: 1
+ ldouble: 1
+ 
+-Function: Imaginary part of "csqrt":
++Function: "carg_upward":
+ double: 1
+ float: 1
++float128: 2
+ idouble: 1
+ ifloat: 1
++ifloat128: 2
+ ildouble: 1
+ ldouble: 1
+ 
+-Function: Real part of "ctan":
++Function: Real part of "casin":
+ double: 1
+ float: 1
++float128: 2
+ idouble: 1
+ ifloat: 1
+-ildouble: 2
+-ldouble: 2
++ifloat128: 2
++ildouble: 1
++ldouble: 1
+ 
+-Function: Imaginary part of "ctan":
++Function: Imaginary part of "casin":
+ double: 2
+-float: 1
++float: 2
++float128: 2
+ idouble: 2
+-ifloat: 1
+-ildouble: 2
+-ldouble: 2
+-
+-Function: Real part of "ctan_downward":
+-double: 4
+-float: 4
+-idouble: 4
+-ifloat: 4
++ifloat: 2
++ifloat128: 2
+ ildouble: 2
+ ldouble: 2
+ 
+-Function: Imaginary part of "ctan_downward":
++Function: Real part of "casin_downward":
+ double: 3
+ float: 2
++float128: 3
+ idouble: 3
+ ifloat: 2
+-ildouble: 2
+-ldouble: 2
++ifloat128: 3
++ildouble: 3
++ldouble: 3
+ 
+-Function: Real part of "ctan_towardzero":
+-double: 2
+-float: 1
+-idouble: 2
+-ifloat: 1
+-ildouble: 2
+-ldouble: 2
++Function: Imaginary part of "casin_downward":
++double: 5
++float: 6
++float128: 6
++idouble: 5
++ifloat: 6
++ifloat128: 6
++ildouble: 5
++ldouble: 5
+ 
+-Function: Imaginary part of "ctan_towardzero":
++Function: Real part of "casin_towardzero":
+ double: 3
+ float: 2
++float128: 3
+ idouble: 3
+ ifloat: 2
++ifloat128: 3
++ildouble: 3
++ldouble: 3
++
++Function: Imaginary part of "casin_towardzero":
++double: 4
++float: 5
++float128: 5
++idouble: 4
++ifloat: 5
++ifloat128: 5
+ ildouble: 4
+ ldouble: 4
+ 
+-Function: Real part of "ctan_upward":
++Function: Real part of "casin_upward":
+ double: 2
+-float: 3
++float: 1
++float128: 3
+ idouble: 2
+-ifloat: 3
+-ildouble: 5
++ifloat: 1
++ifloat128: 3
++ildouble: 2
++ldouble: 2
++
++Function: Imaginary part of "casin_upward":
++double: 5
++float: 5
++float128: 7
++idouble: 5
++ifloat: 5
++ifloat128: 7
++ildouble: 5
++ldouble: 5
++
++Function: Real part of "casinh":
++double: 2
++float: 2
++float128: 2
++idouble: 2
++ifloat: 2
++ifloat128: 2
++ildouble: 2
++ldouble: 2
++
++Function: Imaginary part of "casinh":
++double: 1
++float: 1
++float128: 2
++idouble: 1
++ifloat: 1
++ifloat128: 2
++ildouble: 1
++ldouble: 1
++
++Function: Real part of "casinh_downward":
++double: 5
++float: 6
++float128: 6
++idouble: 5
++ifloat: 6
++ifloat128: 6
++ildouble: 5
++ldouble: 5
++
++Function: Imaginary part of "casinh_downward":
++double: 3
++float: 2
++float128: 3
++idouble: 3
++ifloat: 2
++ifloat128: 3
++ildouble: 3
++ldouble: 3
++
++Function: Real part of "casinh_towardzero":
++double: 4
++float: 5
++float128: 5
++idouble: 4
++ifloat: 5
++ifloat128: 5
++ildouble: 4
++ldouble: 4
++
++Function: Imaginary part of "casinh_towardzero":
++double: 3
++float: 2
++float128: 3
++idouble: 3
++ifloat: 2
++ifloat128: 3
++ildouble: 3
++ldouble: 3
++
++Function: Real part of "casinh_upward":
++double: 5
++float: 5
++float128: 7
++idouble: 5
++ifloat: 5
++ifloat128: 7
++ildouble: 5
++ldouble: 5
++
++Function: Imaginary part of "casinh_upward":
++double: 2
++float: 1
++float128: 3
++idouble: 2
++ifloat: 1
++ifloat128: 3
++ildouble: 2
++ldouble: 2
++
++Function: Real part of "catan":
++double: 1
++float128: 1
++idouble: 1
++ifloat128: 1
++
++Function: Imaginary part of "catan":
++double: 1
++float: 1
++float128: 1
++idouble: 1
++ifloat: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: Real part of "catan_downward":
++double: 1
++float: 1
++float128: 2
++idouble: 1
++ifloat: 1
++ifloat128: 2
++ildouble: 1
++ldouble: 1
++
++Function: Imaginary part of "catan_downward":
++double: 2
++float: 1
++float128: 2
++idouble: 2
++ifloat: 1
++ifloat128: 2
++ildouble: 2
++ldouble: 2
++
++Function: Real part of "catan_towardzero":
++double: 1
++float: 1
++float128: 2
++idouble: 1
++ifloat: 1
++ifloat128: 2
++ildouble: 1
++ldouble: 1
++
++Function: Imaginary part of "catan_towardzero":
++double: 1
++float: 1
++float128: 2
++idouble: 1
++ifloat: 1
++ifloat128: 2
++ildouble: 2
++ldouble: 2
++
++Function: Real part of "catan_upward":
++double: 1
++float: 1
++float128: 2
++idouble: 1
++ifloat: 1
++ifloat128: 2
++ildouble: 1
++ldouble: 1
++
++Function: Imaginary part of "catan_upward":
++double: 2
++float: 2
++float128: 3
++idouble: 2
++ifloat: 2
++ifloat128: 3
++ildouble: 3
++ldouble: 3
++
++Function: Real part of "catanh":
++double: 1
++float: 1
++float128: 1
++idouble: 1
++ifloat: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: Imaginary part of "catanh":
++double: 1
++float128: 1
++idouble: 1
++ifloat128: 1
++
++Function: Real part of "catanh_downward":
++double: 2
++float: 1
++float128: 2
++idouble: 2
++ifloat: 1
++ifloat128: 2
++ildouble: 2
++ldouble: 2
++
++Function: Imaginary part of "catanh_downward":
++double: 1
++float: 1
++float128: 2
++idouble: 1
++ifloat: 1
++ifloat128: 2
++ildouble: 1
++ldouble: 1
++
++Function: Real part of "catanh_towardzero":
++double: 1
++float: 1
++float128: 2
++idouble: 1
++ifloat: 1
++ifloat128: 2
++ildouble: 2
++ldouble: 2
++
++Function: Imaginary part of "catanh_towardzero":
++double: 1
++float: 1
++float128: 2
++idouble: 1
++ifloat: 1
++ifloat128: 2
++ildouble: 1
++ldouble: 1
++
++Function: Real part of "catanh_upward":
++double: 4
++float: 4
++float128: 4
++idouble: 4
++ifloat: 4
++ifloat128: 4
++ildouble: 4
++ldouble: 4
++
++Function: Imaginary part of "catanh_upward":
++double: 1
++float: 1
++float128: 2
++idouble: 1
++ifloat: 1
++ifloat128: 2
++ildouble: 1
++ldouble: 1
++
++Function: "cbrt":
++float128: 1
++ifloat128: 1
++
++Function: "cbrt_downward":
++double: 1
++float128: 1
++idouble: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: "cbrt_towardzero":
++float: 1
++float128: 1
++ifloat: 1
++ifloat128: 1
++
++Function: "cbrt_upward":
++float: 1
++float128: 1
++ifloat: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: Real part of "ccos":
++double: 1
++float128: 1
++idouble: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: Imaginary part of "ccos":
++double: 1
++float: 1
++float128: 1
++idouble: 1
++ifloat: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: Real part of "ccos_downward":
++double: 3
++float: 1
++float128: 2
++idouble: 3
++ifloat: 1
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Imaginary part of "ccos_downward":
++double: 3
++float: 3
++float128: 2
++idouble: 3
++ifloat: 3
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Real part of "ccos_towardzero":
++double: 3
++float: 1
++float128: 2
++idouble: 3
++ifloat: 1
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Imaginary part of "ccos_towardzero":
++double: 3
++float: 3
++float128: 2
++idouble: 3
++ifloat: 3
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Real part of "ccos_upward":
++double: 1
++float: 2
++float128: 3
++idouble: 1
++ifloat: 2
++ifloat128: 3
++ildouble: 2
++ldouble: 2
++
++Function: Imaginary part of "ccos_upward":
++double: 2
++float: 2
++float128: 2
++idouble: 2
++ifloat: 2
++ifloat128: 2
++ildouble: 2
++ldouble: 2
++
++Function: Real part of "ccosh":
++double: 1
++float: 1
++float128: 1
++idouble: 1
++ifloat: 1
++ifloat128: 1
++
++Function: Imaginary part of "ccosh":
++double: 1
++float: 1
++float128: 1
++idouble: 1
++ifloat: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: Real part of "ccosh_downward":
++double: 3
++float: 2
++float128: 2
++idouble: 3
++ifloat: 2
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Imaginary part of "ccosh_downward":
++double: 3
++float: 3
++float128: 2
++idouble: 3
++ifloat: 3
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Real part of "ccosh_towardzero":
++double: 3
++float: 2
++float128: 2
++idouble: 3
++ifloat: 2
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Imaginary part of "ccosh_towardzero":
++double: 3
++float: 3
++float128: 2
++idouble: 3
++ifloat: 3
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Real part of "ccosh_upward":
++double: 1
++float: 2
++float128: 3
++idouble: 1
++ifloat: 2
++ifloat128: 3
++ildouble: 2
++ldouble: 2
++
++Function: Imaginary part of "ccosh_upward":
++double: 2
++float: 2
++float128: 2
++idouble: 2
++ifloat: 2
++ifloat128: 2
++ildouble: 2
++ldouble: 2
++
++Function: Real part of "cexp":
++double: 2
++float: 1
++float128: 1
++idouble: 2
++ifloat: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: Imaginary part of "cexp":
++double: 1
++float: 2
++float128: 1
++idouble: 1
++ifloat: 2
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: Real part of "cexp_downward":
++double: 4
++float: 2
++float128: 2
++idouble: 4
++ifloat: 2
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Imaginary part of "cexp_downward":
++double: 3
++float: 3
++float128: 2
++idouble: 3
++ifloat: 3
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Real part of "cexp_towardzero":
++double: 4
++float: 2
++float128: 2
++idouble: 4
++ifloat: 2
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Imaginary part of "cexp_towardzero":
++double: 3
++float: 3
++float128: 2
++idouble: 3
++ifloat: 3
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Real part of "cexp_upward":
++double: 2
++float: 2
++float128: 3
++idouble: 2
++ifloat: 2
++ifloat128: 3
++ildouble: 2
++ldouble: 2
++
++Function: Imaginary part of "cexp_upward":
++double: 3
++float: 2
++float128: 3
++idouble: 3
++ifloat: 2
++ifloat128: 3
++ildouble: 2
++ldouble: 2
++
++Function: Real part of "clog":
++double: 2
++float: 3
++float128: 2
++idouble: 2
++ifloat: 3
++ifloat128: 2
++ildouble: 2
++ldouble: 2
++
++Function: Imaginary part of "clog":
++double: 1
++float128: 1
++idouble: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: Real part of "clog10":
++double: 3
++float: 4
++float128: 2
++idouble: 3
++ifloat: 4
++ifloat128: 2
++ildouble: 2
++ldouble: 2
++
++Function: Imaginary part of "clog10":
++double: 2
++float: 1
++float128: 2
++idouble: 2
++ifloat: 1
++ifloat128: 2
++ildouble: 1
++ldouble: 1
++
++Function: Real part of "clog10_downward":
++double: 4
++float: 4
++float128: 3
++idouble: 4
++ifloat: 4
++ifloat128: 3
++ildouble: 4
++ldouble: 4
++
++Function: Imaginary part of "clog10_downward":
++double: 2
++float: 2
++float128: 3
++idouble: 2
++ifloat: 2
++ifloat128: 3
++ildouble: 2
++ldouble: 2
++
++Function: Real part of "clog10_towardzero":
++double: 5
++float: 5
++float128: 4
++idouble: 5
++ifloat: 5
++ifloat128: 4
++ildouble: 4
++ldouble: 4
++
++Function: Imaginary part of "clog10_towardzero":
++double: 2
++float: 2
++float128: 3
++idouble: 2
++ifloat: 2
++ifloat128: 3
++ildouble: 2
++ldouble: 2
++
++Function: Real part of "clog10_upward":
++double: 4
++float: 5
++float128: 4
++idouble: 4
++ifloat: 5
++ifloat128: 4
++ildouble: 4
++ldouble: 4
++
++Function: Imaginary part of "clog10_upward":
++double: 2
++float: 2
++float128: 3
++idouble: 2
++ifloat: 2
++ifloat128: 3
++ildouble: 2
++ldouble: 2
++
++Function: Real part of "clog_downward":
++double: 3
++float: 3
++float128: 3
++idouble: 3
++ifloat: 3
++ifloat128: 3
++ildouble: 3
++ldouble: 3
++
++Function: Imaginary part of "clog_downward":
++double: 1
++float: 1
++float128: 2
++idouble: 1
++ifloat: 1
++ifloat128: 2
++ildouble: 1
++ldouble: 1
++
++Function: Real part of "clog_towardzero":
++double: 3
++float: 4
++float128: 3
++idouble: 3
++ifloat: 4
++ifloat128: 3
++ildouble: 3
++ldouble: 3
++
++Function: Imaginary part of "clog_towardzero":
++double: 1
++float: 1
++float128: 2
++idouble: 1
++ifloat: 1
++ifloat128: 2
++ildouble: 1
++ldouble: 1
++
++Function: Real part of "clog_upward":
++double: 2
++float: 3
++float128: 4
++idouble: 2
++ifloat: 3
++ifloat128: 4
++ildouble: 3
++ldouble: 3
++
++Function: Imaginary part of "clog_upward":
++double: 1
++float: 1
++float128: 2
++idouble: 1
++ifloat: 1
++ifloat128: 2
++ildouble: 1
++ldouble: 1
++
++Function: "cos":
++double: 1
++float128: 1
++idouble: 1
++ifloat128: 1
++
++Function: "cos_downward":
++double: 1
++float: 1
++float128: 3
++idouble: 1
++ifloat: 1
++ifloat128: 3
++ildouble: 1
++ldouble: 1
++
++Function: "cos_towardzero":
++double: 1
++float: 1
++float128: 1
++idouble: 1
++ifloat: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: "cos_upward":
++double: 1
++float128: 2
++idouble: 1
++ifloat128: 2
++ildouble: 1
++ldouble: 1
++
++Function: "cosh":
++float128: 1
++ifloat128: 1
++
++Function: "cosh_downward":
++float128: 2
++ifloat128: 1
++
++Function: "cosh_towardzero":
++float128: 2
++ifloat128: 1
++
++Function: "cosh_upward":
++float128: 3
++ifloat128: 1
++
++Function: Real part of "cpow":
++double: 2
++float: 5
++float128: 4
++idouble: 2
++ifloat: 5
++ifloat128: 4
++ildouble: 3
++ldouble: 3
++
++Function: Imaginary part of "cpow":
++float: 2
++float128: 1
++ifloat: 2
++ifloat128: 1
++ildouble: 4
++ldouble: 4
++
++Function: Real part of "cpow_downward":
++double: 5
++float: 8
++float128: 6
++idouble: 5
++ifloat: 8
++ifloat128: 6
++ildouble: 7
++ldouble: 7
++
++Function: Imaginary part of "cpow_downward":
++double: 2
++float: 2
++float128: 2
++idouble: 2
++ifloat: 2
++ifloat128: 2
++ildouble: 1
++ldouble: 1
++
++Function: Real part of "cpow_towardzero":
++double: 5
++float: 8
++float128: 6
++idouble: 5
++ifloat: 8
++ifloat128: 6
++ildouble: 7
++ldouble: 7
++
++Function: Imaginary part of "cpow_towardzero":
++double: 2
++float: 2
++float128: 2
++idouble: 2
++ifloat: 2
++ifloat128: 2
++ildouble: 1
++ldouble: 1
++
++Function: Real part of "cpow_upward":
++double: 4
++float: 1
++float128: 3
++idouble: 4
++ifloat: 1
++ifloat128: 3
++ildouble: 2
++ldouble: 2
++
++Function: Imaginary part of "cpow_upward":
++double: 2
++float: 2
++float128: 2
++idouble: 2
++ifloat: 2
++ifloat128: 2
++ildouble: 2
++ldouble: 2
++
++Function: Real part of "csin":
++double: 1
++float: 1
++float128: 1
++idouble: 1
++ifloat: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: Imaginary part of "csin":
++float: 1
++float128: 1
++ifloat: 1
++ifloat128: 1
++
++Function: Real part of "csin_downward":
++double: 3
++float: 3
++float128: 2
++idouble: 3
++ifloat: 3
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Imaginary part of "csin_downward":
++double: 3
++float: 1
++float128: 2
++idouble: 3
++ifloat: 1
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Real part of "csin_towardzero":
++double: 3
++float: 3
++float128: 2
++idouble: 3
++ifloat: 3
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Imaginary part of "csin_towardzero":
++double: 3
++float: 1
++float128: 2
++idouble: 3
++ifloat: 1
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Real part of "csin_upward":
++double: 2
++float: 2
++float128: 2
++idouble: 2
++ifloat: 2
++ifloat128: 2
++ildouble: 2
++ldouble: 2
++
++Function: Imaginary part of "csin_upward":
++double: 1
++float: 2
++float128: 3
++idouble: 1
++ifloat: 2
++ifloat128: 3
++ildouble: 1
++ldouble: 1
++
++Function: Real part of "csinh":
++double: 1
++float: 1
++float128: 1
++idouble: 1
++ifloat: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: Imaginary part of "csinh":
++double: 1
++float: 1
++float128: 1
++idouble: 1
++ifloat: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: Real part of "csinh_downward":
++double: 3
++float: 1
++float128: 2
++idouble: 3
++ifloat: 1
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Imaginary part of "csinh_downward":
++double: 3
++float: 3
++float128: 2
++idouble: 3
++ifloat: 3
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Real part of "csinh_towardzero":
++double: 3
++float: 1
++float128: 2
++idouble: 3
++ifloat: 1
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Imaginary part of "csinh_towardzero":
++double: 3
++float: 3
++float128: 2
++idouble: 3
++ifloat: 3
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: Real part of "csinh_upward":
++double: 1
++float: 2
++float128: 3
++idouble: 1
++ifloat: 2
++ifloat128: 3
++ildouble: 1
++ldouble: 1
++
++Function: Imaginary part of "csinh_upward":
++double: 2
++float: 2
++float128: 2
++idouble: 2
++ifloat: 2
++ifloat128: 2
++ildouble: 2
++ldouble: 2
++
++Function: Real part of "csqrt":
++double: 2
++float: 2
++float128: 2
++idouble: 2
++ifloat: 2
++ifloat128: 2
++ildouble: 2
++ldouble: 2
++
++Function: Imaginary part of "csqrt":
++double: 2
++float: 2
++float128: 2
++idouble: 2
++ifloat: 2
++ifloat128: 2
++ildouble: 2
++ldouble: 2
++
++Function: Real part of "csqrt_downward":
++double: 4
++float: 4
++float128: 4
++idouble: 4
++ifloat: 4
++ifloat128: 4
++ildouble: 4
++ldouble: 4
++
++Function: Imaginary part of "csqrt_downward":
++double: 3
++float: 3
++float128: 3
++idouble: 3
++ifloat: 3
++ifloat128: 3
++ildouble: 3
++ldouble: 3
++
++Function: Real part of "csqrt_towardzero":
++double: 3
++float: 3
++float128: 3
++idouble: 3
++ifloat: 3
++ifloat128: 3
++ildouble: 3
++ldouble: 3
++
++Function: Imaginary part of "csqrt_towardzero":
++double: 3
++float: 3
++float128: 3
++idouble: 3
++ifloat: 3
++ifloat128: 3
++ildouble: 3
++ldouble: 3
++
++Function: Real part of "csqrt_upward":
++double: 4
++float: 4
++float128: 4
++idouble: 4
++ifloat: 4
++ifloat128: 4
++ildouble: 4
++ldouble: 4
++
++Function: Imaginary part of "csqrt_upward":
++double: 3
++float: 2
++float128: 3
++idouble: 3
++ifloat: 2
++ifloat128: 3
++ildouble: 3
++ldouble: 3
++
++Function: Real part of "ctan":
++double: 1
++float: 1
++float128: 3
++idouble: 1
++ifloat: 1
++ifloat128: 3
++ildouble: 2
++ldouble: 2
++
++Function: Imaginary part of "ctan":
++double: 2
++float: 1
++float128: 3
++idouble: 2
++ifloat: 1
++ifloat128: 3
++ildouble: 2
++ldouble: 2
++
++Function: Real part of "ctan_downward":
++double: 4
++float: 4
++float128: 4
++idouble: 4
++ifloat: 4
++ifloat128: 4
++ildouble: 2
++ldouble: 2
++
++Function: Imaginary part of "ctan_downward":
++double: 3
++float: 2
++float128: 5
++idouble: 3
++ifloat: 2
++ifloat128: 5
++ildouble: 2
++ldouble: 2
++
++Function: Real part of "ctan_towardzero":
++double: 2
++float: 2
++float128: 4
++idouble: 2
++ifloat: 2
++ifloat128: 4
++ildouble: 2
++ldouble: 2
++
++Function: Imaginary part of "ctan_towardzero":
++double: 3
++float: 2
++float128: 5
++idouble: 3
++ifloat: 2
++ifloat128: 5
++ildouble: 4
++ldouble: 4
++
++Function: Real part of "ctan_upward":
++double: 2
++float: 3
++float128: 5
++idouble: 2
++ifloat: 3
++ifloat128: 5
++ildouble: 5
+ ldouble: 5
+ 
+ Function: Imaginary part of "ctan_upward":
+ double: 6
+ float: 2
++float128: 5
+ idouble: 6
+ ifloat: 2
++ifloat128: 5
+ ildouble: 7
+ ldouble: 7
+ 
+ Function: Real part of "ctanh":
+ double: 2
+ float: 1
++float128: 3
+ idouble: 2
+ ifloat: 1
++ifloat128: 3
+ ildouble: 1
+ ldouble: 1
+ 
+ Function: Imaginary part of "ctanh":
+ double: 2
+ float: 1
++float128: 3
+ idouble: 2
+ ifloat: 1
++ifloat128: 3
+ ildouble: 2
+ ldouble: 2
+ 
+ Function: Real part of "ctanh_downward":
+ double: 3
+ float: 2
++float128: 5
+ idouble: 3
+ ifloat: 2
++ifloat128: 5
+ ildouble: 1
+ ldouble: 1
+ 
+ Function: Imaginary part of "ctanh_downward":
+ double: 4
+ float: 4
++float128: 4
+ idouble: 4
+ ifloat: 4
++ifloat128: 4
+ ildouble: 2
+ ldouble: 2
+ 
+ Function: Real part of "ctanh_towardzero":
+ double: 3
+ float: 2
++float128: 5
+ idouble: 3
+ ifloat: 2
++ifloat128: 5
+ ildouble: 4
+ ldouble: 4
+ 
+ Function: Imaginary part of "ctanh_towardzero":
+ double: 2
+ float: 1
++float128: 3
+ idouble: 2
+ ifloat: 1
++ifloat128: 3
+ ildouble: 1
+ ldouble: 1
+ 
+ Function: Real part of "ctanh_upward":
+ double: 6
+ float: 2
++float128: 5
+ idouble: 6
+ ifloat: 2
++ifloat128: 5
+ ildouble: 7
+ ldouble: 7
+ 
+ Function: Imaginary part of "ctanh_upward":
+ double: 2
+ float: 3
++float128: 5
+ idouble: 2
+ ifloat: 3
++ifloat128: 5
+ ildouble: 5
+ ldouble: 5
+ 
+-Function: "expm1":
++Function: "erf":
++float128: 1
++ifloat128: 1
++
++Function: "erf_downward":
++float128: 2
++ifloat128: 2
++
++Function: "erf_towardzero":
++float128: 1
++ifloat128: 1
++
++Function: "erf_upward":
++float128: 2
++ifloat128: 2
++
++Function: "erfc":
++float128: 2
++ifloat128: 2
++
++Function: "erfc_downward":
++double: 1
++float128: 5
++idouble: 1
++ifloat128: 5
++
++Function: "erfc_towardzero":
++double: 1
++float128: 4
++idouble: 1
++ifloat128: 4
++
++Function: "erfc_upward":
++double: 1
++float128: 5
++idouble: 1
++ifloat128: 5
++
++Function: "exp":
++float: 1
++float128: 1
++ifloat: 1
++ifloat128: 1
++
++Function: "exp10":
++float128: 2
++ifloat128: 2
++
++Function: "exp10_downward":
++float128: 3
++ifloat128: 3
++
++Function: "exp10_towardzero":
++float128: 3
++ifloat128: 3
++
++Function: "exp10_upward":
++float128: 3
++ifloat128: 3
++
++Function: "exp2":
++double: 1
++float128: 1
++idouble: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: "exp2_downward":
++double: 1
++float128: 1
++idouble: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: "exp2_towardzero":
++double: 1
++float128: 1
++idouble: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: "exp2_upward":
++double: 1
++float128: 2
++idouble: 1
++ifloat128: 2
++ildouble: 1
++ldouble: 1
++
++Function: "expm1":
++double: 1
++float128: 1
++idouble: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: "expm1_downward":
++float128: 2
++ifloat128: 2
++ildouble: 1
++ldouble: 1
++
++Function: "expm1_towardzero":
++float128: 4
++ifloat128: 4
++
++Function: "expm1_upward":
++float128: 3
++ifloat128: 3
++
++Function: "gamma":
++float: 1
++ifloat: 1
++
++Function: "gamma_downward":
++double: 1
++float: 1
++idouble: 1
++ifloat: 1
++
++Function: "gamma_towardzero":
++double: 1
++float: 1
++idouble: 1
++ifloat: 1
++
++Function: "gamma_upward":
++double: 1
++float: 1
++idouble: 1
++ifloat: 1
++
++Function: "hypot":
++float128: 1
++ifloat128: 1
++
++Function: "hypot_downward":
++double: 1
++float: 1
++float128: 1
++idouble: 1
++ifloat: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: "hypot_towardzero":
++double: 1
++float: 1
++float128: 1
++idouble: 1
++ifloat: 1
++ifloat128: 1
+ ildouble: 1
+ ldouble: 1
+ 
+-Function: "expm1_downward":
++Function: "hypot_upward":
++double: 1
++float: 1
++float128: 1
++idouble: 1
++ifloat: 1
++ifloat128: 1
+ ildouble: 1
+ ldouble: 1
+ 
+ Function: "j0":
+ double: 2
+ float: 2
++float128: 2
+ idouble: 2
+ ifloat: 2
++ifloat128: 2
+ ildouble: 2
+ ldouble: 2
+ 
++Function: "j0_downward":
++double: 6
++float: 4
++float128: 4
++idouble: 6
++ifloat: 4
++ifloat128: 4
++ildouble: 3
++ldouble: 3
++
++Function: "j0_towardzero":
++double: 2
++float: 1
++float128: 2
++idouble: 2
++ifloat: 1
++ifloat128: 2
++ildouble: 5
++ldouble: 5
++
++Function: "j0_upward":
++double: 3
++float: 2
++float128: 5
++idouble: 3
++ifloat: 2
++ifloat128: 5
++ildouble: 5
++ldouble: 5
++
+ Function: "j1":
+ double: 1
+ float: 2
++float128: 4
+ idouble: 1
+ ifloat: 2
++ifloat128: 4
+ ildouble: 1
+ ldouble: 1
+ 
++Function: "j1_downward":
++double: 3
++float: 2
++float128: 4
++idouble: 3
++ifloat: 2
++ifloat128: 4
++ildouble: 4
++ldouble: 4
++
++Function: "j1_towardzero":
++double: 3
++float: 2
++float128: 4
++idouble: 3
++ifloat: 2
++ifloat128: 4
++ildouble: 4
++ldouble: 4
++
++Function: "j1_upward":
++double: 3
++float: 4
++float128: 3
++idouble: 3
++ifloat: 4
++ifloat128: 3
++ildouble: 3
++ldouble: 3
++
+ Function: "jn":
+ double: 4
+ float: 4
++float128: 7
+ idouble: 4
+ ifloat: 4
++ifloat128: 7
++ildouble: 4
++ldouble: 4
++
++Function: "jn_downward":
++double: 4
++float: 5
++float128: 8
++idouble: 4
++ifloat: 5
++ifloat128: 8
+ ildouble: 4
+ ldouble: 4
+ 
++Function: "jn_towardzero":
++double: 4
++float: 5
++float128: 8
++idouble: 4
++ifloat: 5
++ifloat128: 8
++ildouble: 5
++ldouble: 5
++
++Function: "jn_upward":
++double: 5
++float: 4
++float128: 7
++idouble: 5
++ifloat: 4
++ifloat128: 7
++ildouble: 5
++ldouble: 5
++
++Function: "lgamma":
++float: 1
++float128: 5
++ifloat: 1
++ifloat128: 5
++
++Function: "lgamma_downward":
++double: 1
++float: 1
++float128: 8
++idouble: 1
++ifloat: 1
++ifloat128: 8
++
++Function: "lgamma_towardzero":
++double: 1
++float: 1
++float128: 5
++idouble: 1
++ifloat: 1
++ifloat128: 5
++
++Function: "lgamma_upward":
++double: 1
++float: 1
++float128: 8
++idouble: 1
++ifloat: 1
++ifloat128: 8
++
++Function: "log":
++float128: 1
++ifloat128: 1
++
++Function: "log10":
++float128: 1
++ifloat128: 1
++
++Function: "log10_downward":
++double: 1
++float128: 1
++idouble: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: "log10_towardzero":
++double: 1
++float128: 1
++idouble: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: "log10_upward":
++double: 1
++float: 1
++float128: 1
++idouble: 1
++ifloat: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
++
++Function: "log1p":
++float128: 2
++ifloat128: 2
++
++Function: "log1p_downward":
++double: 1
++float128: 3
++idouble: 1
++ifloat128: 3
++
++Function: "log1p_towardzero":
++double: 1
++float128: 3
++idouble: 1
++ifloat128: 3
++
++Function: "log1p_upward":
++double: 1
++float128: 2
++idouble: 1
++ifloat128: 2
++
++Function: "log2":
++float128: 2
++ifloat128: 2
++
++Function: "log2_downward":
++float128: 3
++ifloat128: 3
++
++Function: "log2_towardzero":
++float128: 1
++ifloat128: 1
++
++Function: "log2_upward":
++float128: 1
++ifloat128: 1
++
++Function: "log_downward":
++double: 1
++float128: 1
++idouble: 1
++ifloat128: 1
++
++Function: "log_towardzero":
++double: 1
++float128: 2
++idouble: 1
++ifloat128: 2
++
++Function: "log_upward":
++double: 1
++float128: 1
++idouble: 1
++ifloat128: 1
++
++Function: "pow":
++float128: 2
++ifloat128: 2
++
+ Function: "pow_downward":
+ double: 1
+ float: 1
++float128: 2
+ idouble: 1
+ ifloat: 1
++ifloat128: 2
++ildouble: 1
++ldouble: 1
+ 
+ Function: "pow_towardzero":
+ double: 1
+ float: 1
++float128: 2
+ idouble: 1
+ ifloat: 1
++ifloat128: 2
++ildouble: 1
++ldouble: 1
+ 
+ Function: "pow_upward":
+ double: 1
+ float: 1
++float128: 2
+ idouble: 1
+ ifloat: 1
++ifloat128: 2
+ ildouble: 1
+ ldouble: 1
+ 
+ Function: "sin":
+ double: 1
++float128: 1
+ idouble: 1
++ifloat128: 1
+ 
+ Function: "sin_downward":
+ double: 1
++float: 1
++float128: 3
+ idouble: 1
++ifloat: 1
++ifloat128: 3
+ ildouble: 1
+ ldouble: 1
+ 
+ Function: "sin_towardzero":
+ double: 1
++float: 1
++float128: 2
+ idouble: 1
++ifloat: 1
++ifloat128: 2
+ ildouble: 1
+ ldouble: 1
+ 
+ Function: "sin_upward":
+ double: 1
++float: 1
++float128: 3
+ idouble: 1
++ifloat: 1
++ifloat128: 3
+ ildouble: 1
+ ldouble: 1
+ 
+ Function: "sincos":
+ double: 1
++float128: 1
+ idouble: 1
++ifloat128: 1
++
++Function: "sincos_downward":
++double: 1
++float: 1
++float128: 3
++idouble: 1
++ifloat: 1
++ifloat128: 3
++
++Function: "sincos_towardzero":
++double: 1
++float: 1
++float128: 2
++idouble: 1
++ifloat: 1
++ifloat128: 2
++
++Function: "sincos_upward":
++double: 1
++float: 1
++float128: 3
++idouble: 1
++ifloat: 1
++ifloat128: 3
++
++Function: "sinh":
++float128: 2
++ifloat128: 2
++
++Function: "sinh_downward":
++float128: 3
++ifloat128: 3
++
++Function: "sinh_towardzero":
++float128: 3
++ifloat128: 3
++
++Function: "sinh_upward":
++float128: 4
++ifloat128: 4
++
++Function: "tan":
++float128: 1
++ifloat128: 1
++ildouble: 1
++ldouble: 1
+ 
+ Function: "tan_downward":
++float128: 1
++ifloat128: 1
+ ildouble: 1
+ ldouble: 1
+ 
+ Function: "tan_towardzero":
++float128: 1
++ifloat128: 1
+ ildouble: 1
+ ldouble: 1
+ 
+ Function: "tan_upward":
++float128: 1
++ifloat128: 1
+ ildouble: 1
+ ldouble: 1
+ 
++Function: "tanh":
++float128: 2
++ifloat128: 2
++
++Function: "tanh_downward":
++float128: 4
++ifloat128: 4
++
++Function: "tanh_towardzero":
++float128: 3
++ifloat128: 3
++
++Function: "tanh_upward":
++float128: 3
++ifloat128: 3
++
+ Function: "tgamma":
++float128: 4
++ifloat128: 4
++ildouble: 1
++ldouble: 1
++
++Function: "tgamma_downward":
++double: 1
++float: 1
++float128: 5
++idouble: 1
++ifloat: 1
++ifloat128: 5
++ildouble: 1
++ldouble: 1
++
++Function: "tgamma_towardzero":
++double: 1
++float: 1
++float128: 5
++idouble: 1
++ifloat: 1
++ifloat128: 5
++ildouble: 1
++ldouble: 1
++
++Function: "tgamma_upward":
++double: 1
++float: 1
++float128: 4
++idouble: 1
++ifloat: 1
++ifloat128: 4
+ ildouble: 1
+ ldouble: 1
+ 
+ Function: "y0":
+ double: 2
+ float: 1
++float128: 3
+ idouble: 2
+ ifloat: 1
++ifloat128: 3
+ ildouble: 1
+ ldouble: 1
+ 
++Function: "y0_downward":
++double: 4
++float: 4
++float128: 4
++idouble: 4
++ifloat: 4
++ifloat128: 4
++ildouble: 4
++ldouble: 4
++
++Function: "y0_towardzero":
++double: 3
++float: 3
++float128: 3
++idouble: 3
++ifloat: 3
++ifloat128: 3
++ildouble: 5
++ldouble: 5
++
++Function: "y0_upward":
++double: 4
++float: 5
++float128: 3
++idouble: 4
++ifloat: 5
++ifloat128: 3
++ildouble: 3
++ldouble: 3
++
+ Function: "y1":
+ double: 3
+ float: 2
++float128: 2
+ idouble: 3
+ ifloat: 2
++ifloat128: 2
+ ildouble: 2
+ ldouble: 2
+ 
++Function: "y1_downward":
++double: 9
++float: 2
++float128: 4
++idouble: 9
++ifloat: 2
++ifloat128: 4
++ildouble: 3
++ldouble: 3
++
++Function: "y1_towardzero":
++double: 3
++float: 2
++float128: 2
++idouble: 3
++ifloat: 2
++ifloat128: 2
++ildouble: 3
++ldouble: 3
++
++Function: "y1_upward":
++double: 4
++float: 2
++float128: 5
++idouble: 4
++ifloat: 2
++ifloat128: 5
++ildouble: 7
++ldouble: 7
++
+ Function: "yn":
+ double: 3
+ float: 3
++float128: 5
+ idouble: 3
+ ifloat: 3
+-ildouble: 2
+-ldouble: 2
++ifloat128: 5
++ildouble: 3
++ldouble: 3
++
++Function: "yn_downward":
++double: 4
++float: 4
++float128: 5
++idouble: 4
++ifloat: 4
++ifloat128: 5
++ildouble: 4
++ldouble: 4
++
++Function: "yn_towardzero":
++double: 3
++float: 3
++float128: 5
++idouble: 3
++ifloat: 3
++ifloat128: 5
++ildouble: 5
++ldouble: 5
++
++Function: "yn_upward":
++double: 4
++float: 5
++float128: 5
++idouble: 4
++ifloat: 5
++ifloat128: 5
++ildouble: 3
++ldouble: 3
+ 
+ # end of automatic generation
+diff --git a/sysdeps/ia64/memchr.S b/sysdeps/ia64/memchr.S
+index d60cf7bd87..9a0abc6f0a 100644
+--- a/sysdeps/ia64/memchr.S
++++ b/sysdeps/ia64/memchr.S
+@@ -67,6 +67,10 @@ ENTRY(__memchr)
+ 	.body
+ 	mov	ret0 = str
+ 	add	last = str, in2		// last byte
++	;;
++	cmp.ltu	p6, p0 = last, str
++	;;
++(p6)	mov	last = -1
+ 	and	tmp = 7, str		// tmp = str % 8
+ 	cmp.ne	p7, p0 = r0, r0		// clear p7
+ 	extr.u	chr = in1, 0, 8		// chr = (unsigned char) in1
+diff --git a/sysdeps/ia64/nptl/bits/pthreadtypes-arch.h b/sysdeps/ia64/nptl/bits/pthreadtypes-arch.h
+index 631cb33d09..2a3bc75b20 100644
+--- a/sysdeps/ia64/nptl/bits/pthreadtypes-arch.h
++++ b/sysdeps/ia64/nptl/bits/pthreadtypes-arch.h
+@@ -33,6 +33,8 @@
+ #define __PTHREAD_COMPAT_PADDING_MID
+ #define __PTHREAD_COMPAT_PADDING_END
+ #define __PTHREAD_MUTEX_LOCK_ELISION    0
++#define __PTHREAD_MUTEX_NUSERS_AFTER_KIND  0
++#define __PTHREAD_MUTEX_USE_UNION          0
+ 
+ #define __LOCK_ALIGNMENT
+ #define __ONCE_ALIGNMENT
+diff --git a/sysdeps/ia64/nptl/pthread-offsets.h b/sysdeps/ia64/nptl/pthread-offsets.h
+new file mode 100644
+index 0000000000..16c6b0d9fd
+--- /dev/null
++++ b/sysdeps/ia64/nptl/pthread-offsets.h
+@@ -0,0 +1,5 @@
++#define __PTHREAD_MUTEX_NUSERS_OFFSET   12
++#define __PTHREAD_MUTEX_KIND_OFFSET     16
++#define __PTHREAD_MUTEX_SPINS_OFFSET    20
++#define __PTHREAD_MUTEX_ELISION_OFFSET  22
++#define __PTHREAD_MUTEX_LIST_OFFSET     24
+diff --git a/sysdeps/ieee754/dbl-64/s_nearbyint.c b/sysdeps/ieee754/dbl-64/s_nearbyint.c
+index dec0c5d6ee..6e3f8316b1 100644
+--- a/sysdeps/ieee754/dbl-64/s_nearbyint.c
++++ b/sysdeps/ieee754/dbl-64/s_nearbyint.c
+@@ -48,7 +48,7 @@ __nearbyint (double x)
+       if (j0 < 0)
+ 	{
+ 	  libc_feholdexcept (&env);
+-	  w = TWO52[sx] + x;
++	  w = TWO52[sx] + math_opt_barrier (x);
+ 	  t = w - TWO52[sx];
+ 	  math_force_eval (t);
+ 	  libc_fesetenv (&env);
+@@ -65,7 +65,7 @@ __nearbyint (double x)
+ 	return x;                       /* x is integral */
+     }
+   libc_feholdexcept (&env);
+-  w = TWO52[sx] + x;
++  w = TWO52[sx] + math_opt_barrier (x);
+   t = w - TWO52[sx];
+   math_force_eval (t);
+   libc_fesetenv (&env);
+diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c
+index 8293819981..7d135b54e4 100644
+--- a/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c
++++ b/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c
+@@ -42,9 +42,9 @@ __nearbyint(double x)
+ 	if(__builtin_expect(j0<52, 1)) {
+ 	    if(j0<0) {
+ 		libc_feholdexcept (&env);
+-		double w = TWO52[sx]+x;
++		double w = TWO52[sx] + math_opt_barrier (x);
+ 		double t =  w-TWO52[sx];
+-		math_opt_barrier(t);
++		math_force_eval (t);
+ 		libc_fesetenv (&env);
+ 		return __copysign (t, x);
+ 	    }
+@@ -53,9 +53,9 @@ __nearbyint(double x)
+ 	    else return x;		/* x is integral */
+ 	}
+ 	libc_feholdexcept (&env);
+-	double w = TWO52[sx]+x;
++	double w = TWO52[sx] + math_opt_barrier (x);
+ 	double t = w-TWO52[sx];
+-	math_opt_barrier (t);
++	math_force_eval (t);
+ 	libc_fesetenv (&env);
+ 	return t;
+ }
+diff --git a/sysdeps/ieee754/flt-32/s_nearbyintf.c b/sysdeps/ieee754/flt-32/s_nearbyintf.c
+index 5aebefafcf..b06df6b3c8 100644
+--- a/sysdeps/ieee754/flt-32/s_nearbyintf.c
++++ b/sysdeps/ieee754/flt-32/s_nearbyintf.c
+@@ -37,7 +37,7 @@ __nearbyintf(float x)
+ 	if(j0<23) {
+ 	    if(j0<0) {
+ 		libc_feholdexceptf (&env);
+-		w = TWO23[sx]+x;
++		w = TWO23[sx] + math_opt_barrier (x);
+ 		t =  w-TWO23[sx];
+ 		math_force_eval (t);
+ 		libc_fesetenvf (&env);
+@@ -50,7 +50,7 @@ __nearbyintf(float x)
+ 	    else return x;		/* x is integral */
+ 	}
+ 	libc_feholdexceptf (&env);
+-	w = TWO23[sx]+x;
++	w = TWO23[sx] + math_opt_barrier (x);
+ 	t = w-TWO23[sx];
+ 	math_force_eval (t);
+ 	libc_fesetenvf (&env);
+diff --git a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
+index bef2601bce..a80c9eaf33 100644
+--- a/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
++++ b/sysdeps/ieee754/ldbl-128/e_lgammal_r.c
+@@ -73,11 +73,7 @@
+ #include <float.h>
+ 
+ static const _Float128 PIL = L(3.1415926535897932384626433832795028841972E0);
+-#if LDBL_MANT_DIG == 106
+-static const _Float128 MAXLGM = L(0x5.d53649e2d469dbc1f01e99fd66p+1012);
+-#else
+ static const _Float128 MAXLGM = L(1.0485738685148938358098967157129705071571E4928);
+-#endif
+ static const _Float128 one = 1;
+ static const _Float128 huge = LDBL_MAX;
+ 
+@@ -777,7 +773,7 @@ __ieee754_lgammal_r (_Float128 x, int *signgamp)
+ 
+   if (x < 0)
+     {
+-      if (x < -2 && x > (LDBL_MANT_DIG == 106 ? -48 : -50))
++      if (x < -2 && x > -50)
+ 	return __lgamma_negl (x, signgamp);
+       q = -x;
+       p = __floorl (q);
+diff --git a/sysdeps/ieee754/ldbl-128/s_nearbyintl.c b/sysdeps/ieee754/ldbl-128/s_nearbyintl.c
+index 1565a8183f..98a33d24a7 100644
+--- a/sysdeps/ieee754/ldbl-128/s_nearbyintl.c
++++ b/sysdeps/ieee754/ldbl-128/s_nearbyintl.c
+@@ -45,7 +45,7 @@ _Float128 __nearbyintl(_Float128 x)
+ 	if(j0<112) {
+ 	    if(j0<0) {
+ 		feholdexcept (&env);
+-	        w = TWO112[sx]+x;
++	        w = TWO112[sx] + math_opt_barrier (x);
+ 	        t = w-TWO112[sx];
+ 		math_force_eval (t);
+ 	        fesetenv (&env);
+@@ -58,7 +58,7 @@ _Float128 __nearbyintl(_Float128 x)
+ 	    else return x;		/* x is integral */
+ 	}
+ 	feholdexcept (&env);
+-	w = TWO112[sx]+x;
++	w = TWO112[sx] + math_opt_barrier (x);
+ 	t = w-TWO112[sx];
+ 	math_force_eval (t);
+ 	fesetenv (&env);
+diff --git a/sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h b/sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h
+index 7ddb368d26..f756857c03 100644
+--- a/sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h
++++ b/sysdeps/ieee754/ldbl-128ibm/bits/iscanonical.h
+@@ -37,5 +37,22 @@ extern int __iscanonicall (long double __x)
+    conversion, before being discarded; in IBM long double, there are
+    encodings that are not consistently handled as corresponding to any
+    particular value of the type, and we return 0 for those.  */
+-# define iscanonical(x) __MATH_TG ((x), __iscanonical, (x))
+-#endif
++# ifndef __cplusplus
++#  define iscanonical(x) __MATH_TG ((x), __iscanonical, (x))
++# else
++/* In C++ mode, __MATH_TG cannot be used, because it relies on
++   __builtin_types_compatible_p, which is a C-only builtin.  On the
++   other hand, overloading provides the means to distinguish between
++   the floating-point types.  The overloading resolution will match
++   the correct parameter (regardless of type qualifiers (i.e.: const
++   and volatile)).  */
++extern "C++" {
++inline int iscanonical (float __val) { return __iscanonicalf (__val); }
++inline int iscanonical (double __val) { return __iscanonical (__val); }
++inline int iscanonical (long double __val) { return __iscanonicall (__val); }
++#  if __HAVE_DISTINCT_FLOAT128
++inline int iscanonical (_Float128 __val) { return __iscanonicalf128 (__val); }
++#  endif
++}
++# endif /* __cplusplus */
++#endif /* __NO_LONG_DOUBLE_MATH */
+diff --git a/sysdeps/ieee754/ldbl-128ibm/e_expl.c b/sysdeps/ieee754/ldbl-128ibm/e_expl.c
+index 10df6bb7d5..9185e7cb5c 100644
+--- a/sysdeps/ieee754/ldbl-128ibm/e_expl.c
++++ b/sysdeps/ieee754/ldbl-128ibm/e_expl.c
+@@ -66,10 +66,8 @@
+ #include <inttypes.h>
+ #include <math_private.h>
+ 
+-#define _Float128 long double
+-#define L(x) x ## L
+ 
+-#include <sysdeps/ieee754/ldbl-128/t_expl.h>
++#include "t_expl.h"
+ 
+ static const long double C[] = {
+ /* Smallest integer x for which e^x overflows.  */
+diff --git a/sysdeps/ieee754/ldbl-128ibm/e_j0l.c b/sysdeps/ieee754/ldbl-128ibm/e_j0l.c
+index 00bce29284..0a7fe32354 100644
+--- a/sysdeps/ieee754/ldbl-128ibm/e_j0l.c
++++ b/sysdeps/ieee754/ldbl-128ibm/e_j0l.c
+@@ -1,5 +1,864 @@
+-/* Looks like we can use ieee854 e_j0l.c as is for IBM extended format. */
+-#define _Float128 long double
+-#define L(x) x ## L
+-#include <sysdeps/ieee754/ldbl-128/e_j0l.c>
++/* Bessel function of order zero.  IBM Extended Precision version.
++   Copyright 2001 by Stephen L. Moshier (moshier at na-net.ornl.gov).
+ 
++   This library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   This library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with this library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++/* This file was copied from sysdeps/ieee754/ldbl-128/e_j0l.c.  */
++
++
++#include <math.h>
++#include <math_private.h>
++#include <float.h>
++
++/* 1 / sqrt(pi) */
++static const long double ONEOSQPI = 5.6418958354775628694807945156077258584405E-1L;
++/* 2 / pi */
++static const long double TWOOPI = 6.3661977236758134307553505349005744813784E-1L;
++static const long double zero = 0;
++
++/* J0(x) = 1 - x^2/4 + x^2 x^2 R(x^2)
++   Peak relative error 3.4e-37
++   0 <= x <= 2  */
++#define NJ0_2N 6
++static const long double J0_2N[NJ0_2N + 1] = {
++  3.133239376997663645548490085151484674892E16L,
++ -5.479944965767990821079467311839107722107E14L,
++  6.290828903904724265980249871997551894090E12L,
++ -3.633750176832769659849028554429106299915E10L,
++  1.207743757532429576399485415069244807022E8L,
++ -2.107485999925074577174305650549367415465E5L,
++  1.562826808020631846245296572935547005859E2L,
++};
++#define NJ0_2D 6
++static const long double J0_2D[NJ0_2D + 1] = {
++  2.005273201278504733151033654496928968261E18L,
++  2.063038558793221244373123294054149790864E16L,
++  1.053350447931127971406896594022010524994E14L,
++  3.496556557558702583143527876385508882310E11L,
++  8.249114511878616075860654484367133976306E8L,
++  1.402965782449571800199759247964242790589E6L,
++  1.619910762853439600957801751815074787351E3L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* J0(x)cosX + Y0(x)sinX = sqrt( 2/(pi x)) P0(x), P0(x) = 1 + 1/x^2 R(1/x^2),
++   0 <= 1/x <= .0625
++   Peak relative error 3.3e-36  */
++#define NP16_IN 9
++static const long double P16_IN[NP16_IN + 1] = {
++  -1.901689868258117463979611259731176301065E-16L,
++  -1.798743043824071514483008340803573980931E-13L,
++  -6.481746687115262291873324132944647438959E-11L,
++  -1.150651553745409037257197798528294248012E-8L,
++  -1.088408467297401082271185599507222695995E-6L,
++  -5.551996725183495852661022587879817546508E-5L,
++  -1.477286941214245433866838787454880214736E-3L,
++  -1.882877976157714592017345347609200402472E-2L,
++  -9.620983176855405325086530374317855880515E-2L,
++  -1.271468546258855781530458854476627766233E-1L,
++};
++#define NP16_ID 9
++static const long double P16_ID[NP16_ID + 1] = {
++  2.704625590411544837659891569420764475007E-15L,
++  2.562526347676857624104306349421985403573E-12L,
++  9.259137589952741054108665570122085036246E-10L,
++  1.651044705794378365237454962653430805272E-7L,
++  1.573561544138733044977714063100859136660E-5L,
++  8.134482112334882274688298469629884804056E-4L,
++  2.219259239404080863919375103673593571689E-2L,
++  2.976990606226596289580242451096393862792E-1L,
++  1.713895630454693931742734911930937246254E0L,
++  3.231552290717904041465898249160757368855E0L,
++  /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* J0(x)cosX + Y0(x)sinX = sqrt( 2/(pi x)) P0(x), P0(x) = 1 + 1/x^2 R(1/x^2)
++    0.0625 <= 1/x <= 0.125
++    Peak relative error 2.4e-35  */
++#define NP8_16N 10
++static const long double P8_16N[NP8_16N + 1] = {
++  -2.335166846111159458466553806683579003632E-15L,
++  -1.382763674252402720401020004169367089975E-12L,
++  -3.192160804534716696058987967592784857907E-10L,
++  -3.744199606283752333686144670572632116899E-8L,
++  -2.439161236879511162078619292571922772224E-6L,
++  -9.068436986859420951664151060267045346549E-5L,
++  -1.905407090637058116299757292660002697359E-3L,
++  -2.164456143936718388053842376884252978872E-2L,
++  -1.212178415116411222341491717748696499966E-1L,
++  -2.782433626588541494473277445959593334494E-1L,
++  -1.670703190068873186016102289227646035035E-1L,
++};
++#define NP8_16D 10
++static const long double P8_16D[NP8_16D + 1] = {
++  3.321126181135871232648331450082662856743E-14L,
++  1.971894594837650840586859228510007703641E-11L,
++  4.571144364787008285981633719513897281690E-9L,
++  5.396419143536287457142904742849052402103E-7L,
++  3.551548222385845912370226756036899901549E-5L,
++  1.342353874566932014705609788054598013516E-3L,
++  2.899133293006771317589357444614157734385E-2L,
++  3.455374978185770197704507681491574261545E-1L,
++  2.116616964297512311314454834712634820514E0L,
++  5.850768316827915470087758636881584174432E0L,
++  5.655273858938766830855753983631132928968E0L,
++  /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* J0(x)cosX + Y0(x)sinX = sqrt( 2/(pi x)) P0(x), P0(x) = 1 + 1/x^2 R(1/x^2)
++  0.125 <= 1/x <= 0.1875
++  Peak relative error 2.7e-35  */
++#define NP5_8N 10
++static const long double P5_8N[NP5_8N + 1] = {
++  -1.270478335089770355749591358934012019596E-12L,
++  -4.007588712145412921057254992155810347245E-10L,
++  -4.815187822989597568124520080486652009281E-8L,
++  -2.867070063972764880024598300408284868021E-6L,
++  -9.218742195161302204046454768106063638006E-5L,
++  -1.635746821447052827526320629828043529997E-3L,
++  -1.570376886640308408247709616497261011707E-2L,
++  -7.656484795303305596941813361786219477807E-2L,
++  -1.659371030767513274944805479908858628053E-1L,
++  -1.185340550030955660015841796219919804915E-1L,
++  -8.920026499909994671248893388013790366712E-3L,
++};
++#define NP5_8D 9
++static const long double P5_8D[NP5_8D + 1] = {
++  1.806902521016705225778045904631543990314E-11L,
++  5.728502760243502431663549179135868966031E-9L,
++  6.938168504826004255287618819550667978450E-7L,
++  4.183769964807453250763325026573037785902E-5L,
++  1.372660678476925468014882230851637878587E-3L,
++  2.516452105242920335873286419212708961771E-2L,
++  2.550502712902647803796267951846557316182E-1L,
++  1.365861559418983216913629123778747617072E0L,
++  3.523825618308783966723472468855042541407E0L,
++  3.656365803506136165615111349150536282434E0L,
++  /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* J0(x)cosX + Y0(x)sinX = sqrt( 2/(pi x)) P0(x), P0(x) = 1 + 1/x^2 R(1/x^2)
++   Peak relative error 3.5e-35
++   0.1875 <= 1/x <= 0.25  */
++#define NP4_5N 9
++static const long double P4_5N[NP4_5N + 1] = {
++  -9.791405771694098960254468859195175708252E-10L,
++  -1.917193059944531970421626610188102836352E-7L,
++  -1.393597539508855262243816152893982002084E-5L,
++  -4.881863490846771259880606911667479860077E-4L,
++  -8.946571245022470127331892085881699269853E-3L,
++  -8.707474232568097513415336886103899434251E-2L,
++  -4.362042697474650737898551272505525973766E-1L,
++  -1.032712171267523975431451359962375617386E0L,
++  -9.630502683169895107062182070514713702346E-1L,
++  -2.251804386252969656586810309252357233320E-1L,
++};
++#define NP4_5D 9
++static const long double P4_5D[NP4_5D + 1] = {
++  1.392555487577717669739688337895791213139E-8L,
++  2.748886559120659027172816051276451376854E-6L,
++  2.024717710644378047477189849678576659290E-4L,
++  7.244868609350416002930624752604670292469E-3L,
++  1.373631762292244371102989739300382152416E-1L,
++  1.412298581400224267910294815260613240668E0L,
++  7.742495637843445079276397723849017617210E0L,
++  2.138429269198406512028307045259503811861E1L,
++  2.651547684548423476506826951831712762610E1L,
++  1.167499382465291931571685222882909166935E1L,
++  /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* J0(x)cosX + Y0(x)sinX = sqrt( 2/(pi x)) P0(x), P0(x) = 1 + 1/x^2 R(1/x^2)
++   Peak relative error 2.3e-36
++   0.25 <= 1/x <= 0.3125  */
++#define NP3r2_4N 9
++static const long double P3r2_4N[NP3r2_4N + 1] = {
++  -2.589155123706348361249809342508270121788E-8L,
++  -3.746254369796115441118148490849195516593E-6L,
++  -1.985595497390808544622893738135529701062E-4L,
++  -5.008253705202932091290132760394976551426E-3L,
++  -6.529469780539591572179155511840853077232E-2L,
++  -4.468736064761814602927408833818990271514E-1L,
++  -1.556391252586395038089729428444444823380E0L,
++  -2.533135309840530224072920725976994981638E0L,
++  -1.605509621731068453869408718565392869560E0L,
++  -2.518966692256192789269859830255724429375E-1L,
++};
++#define NP3r2_4D 9
++static const long double P3r2_4D[NP3r2_4D + 1] = {
++  3.682353957237979993646169732962573930237E-7L,
++  5.386741661883067824698973455566332102029E-5L,
++  2.906881154171822780345134853794241037053E-3L,
++  7.545832595801289519475806339863492074126E-2L,
++  1.029405357245594877344360389469584526654E0L,
++  7.565706120589873131187989560509757626725E0L,
++  2.951172890699569545357692207898667665796E1L,
++  5.785723537170311456298467310529815457536E1L,
++  5.095621464598267889126015412522773474467E1L,
++  1.602958484169953109437547474953308401442E1L,
++  /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* J0(x)cosX + Y0(x)sinX = sqrt( 2/(pi x)) P0(x), P0(x) = 1 + 1/x^2 R(1/x^2)
++   Peak relative error 1.0e-35
++   0.3125 <= 1/x <= 0.375  */
++#define NP2r7_3r2N 9
++static const long double P2r7_3r2N[NP2r7_3r2N + 1] = {
++  -1.917322340814391131073820537027234322550E-7L,
++  -1.966595744473227183846019639723259011906E-5L,
++  -7.177081163619679403212623526632690465290E-4L,
++  -1.206467373860974695661544653741899755695E-2L,
++  -1.008656452188539812154551482286328107316E-1L,
++  -4.216016116408810856620947307438823892707E-1L,
++  -8.378631013025721741744285026537009814161E-1L,
++  -6.973895635309960850033762745957946272579E-1L,
++  -1.797864718878320770670740413285763554812E-1L,
++  -4.098025357743657347681137871388402849581E-3L,
++};
++#define NP2r7_3r2D 8
++static const long double P2r7_3r2D[NP2r7_3r2D + 1] = {
++  2.726858489303036441686496086962545034018E-6L,
++  2.840430827557109238386808968234848081424E-4L,
++  1.063826772041781947891481054529454088832E-2L,
++  1.864775537138364773178044431045514405468E-1L,
++  1.665660052857205170440952607701728254211E0L,
++  7.723745889544331153080842168958348568395E0L,
++  1.810726427571829798856428548102077799835E1L,
++  1.986460672157794440666187503833545388527E1L,
++  8.645503204552282306364296517220055815488E0L,
++  /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* J0(x)cosX + Y0(x)sinX = sqrt( 2/(pi x)) P0(x), P0(x) = 1 + 1/x^2 R(1/x^2)
++   Peak relative error 1.3e-36
++   0.3125 <= 1/x <= 0.4375  */
++#define NP2r3_2r7N 9
++static const long double P2r3_2r7N[NP2r3_2r7N + 1] = {
++  -1.594642785584856746358609622003310312622E-6L,
++  -1.323238196302221554194031733595194539794E-4L,
++  -3.856087818696874802689922536987100372345E-3L,
++  -5.113241710697777193011470733601522047399E-2L,
++  -3.334229537209911914449990372942022350558E-1L,
++  -1.075703518198127096179198549659283422832E0L,
++  -1.634174803414062725476343124267110981807E0L,
++  -1.030133247434119595616826842367268304880E0L,
++  -1.989811539080358501229347481000707289391E-1L,
++  -3.246859189246653459359775001466924610236E-3L,
++};
++#define NP2r3_2r7D 8
++static const long double P2r3_2r7D[NP2r3_2r7D + 1] = {
++  2.267936634217251403663034189684284173018E-5L,
++  1.918112982168673386858072491437971732237E-3L,
++  5.771704085468423159125856786653868219522E-2L,
++  8.056124451167969333717642810661498890507E-1L,
++  5.687897967531010276788680634413789328776E0L,
++  2.072596760717695491085444438270778394421E1L,
++  3.801722099819929988585197088613160496684E1L,
++  3.254620235902912339534998592085115836829E1L,
++  1.104847772130720331801884344645060675036E1L,
++  /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* J0(x)cosX + Y0(x)sinX = sqrt( 2/(pi x)) P0(x), P0(x) = 1 + 1/x^2 R(1/x^2)
++   Peak relative error 1.2e-35
++   0.4375 <= 1/x <= 0.5  */
++#define NP2_2r3N 8
++static const long double P2_2r3N[NP2_2r3N + 1] = {
++  -1.001042324337684297465071506097365389123E-4L,
++  -6.289034524673365824853547252689991418981E-3L,
++  -1.346527918018624234373664526930736205806E-1L,
++  -1.268808313614288355444506172560463315102E0L,
++  -5.654126123607146048354132115649177406163E0L,
++  -1.186649511267312652171775803270911971693E1L,
++  -1.094032424931998612551588246779200724257E1L,
++  -3.728792136814520055025256353193674625267E0L,
++  -3.000348318524471807839934764596331810608E-1L,
++};
++#define NP2_2r3D 8
++static const long double P2_2r3D[NP2_2r3D + 1] = {
++  1.423705538269770974803901422532055612980E-3L,
++  9.171476630091439978533535167485230575894E-2L,
++  2.049776318166637248868444600215942828537E0L,
++  2.068970329743769804547326701946144899583E1L,
++  1.025103500560831035592731539565060347709E2L,
++  2.528088049697570728252145557167066708284E2L,
++  2.992160327587558573740271294804830114205E2L,
++  1.540193761146551025832707739468679973036E2L,
++  2.779516701986912132637672140709452502650E1L,
++  /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* Y0(x)cosX - J0(x)sinX = sqrt( 2/(pi x)) Q0(x),
++   Q0(x) = 1/x (-.125 + 1/x^2 R(1/x^2))
++   Peak relative error 2.2e-35
++   0 <= 1/x <= .0625  */
++#define NQ16_IN 10
++static const long double Q16_IN[NQ16_IN + 1] = {
++  2.343640834407975740545326632205999437469E-18L,
++  2.667978112927811452221176781536278257448E-15L,
++  1.178415018484555397390098879501969116536E-12L,
++  2.622049767502719728905924701288614016597E-10L,
++  3.196908059607618864801313380896308968673E-8L,
++  2.179466154171673958770030655199434798494E-6L,
++  8.139959091628545225221976413795645177291E-5L,
++  1.563900725721039825236927137885747138654E-3L,
++  1.355172364265825167113562519307194840307E-2L,
++  3.928058355906967977269780046844768588532E-2L,
++  1.107891967702173292405380993183694932208E-2L,
++};
++#define NQ16_ID 9
++static const long double Q16_ID[NQ16_ID + 1] = {
++  3.199850952578356211091219295199301766718E-17L,
++  3.652601488020654842194486058637953363918E-14L,
++  1.620179741394865258354608590461839031281E-11L,
++  3.629359209474609630056463248923684371426E-9L,
++  4.473680923894354600193264347733477363305E-7L,
++  3.106368086644715743265603656011050476736E-5L,
++  1.198239259946770604954664925153424252622E-3L,
++  2.446041004004283102372887804475767568272E-2L,
++  2.403235525011860603014707768815113698768E-1L,
++  9.491006790682158612266270665136910927149E-1L,
++ /* 1.000000000000000000000000000000000000000E0 */
++ };
++
++/* Y0(x)cosX - J0(x)sinX = sqrt( 2/(pi x)) Q0(x),
++   Q0(x) = 1/x (-.125 + 1/x^2 R(1/x^2))
++   Peak relative error 5.1e-36
++   0.0625 <= 1/x <= 0.125  */
++#define NQ8_16N 11
++static const long double Q8_16N[NQ8_16N + 1] = {
++  1.001954266485599464105669390693597125904E-17L,
++  7.545499865295034556206475956620160007849E-15L,
++  2.267838684785673931024792538193202559922E-12L,
++  3.561909705814420373609574999542459912419E-10L,
++  3.216201422768092505214730633842924944671E-8L,
++  1.731194793857907454569364622452058554314E-6L,
++  5.576944613034537050396518509871004586039E-5L,
++  1.051787760316848982655967052985391418146E-3L,
++  1.102852974036687441600678598019883746959E-2L,
++  5.834647019292460494254225988766702933571E-2L,
++  1.290281921604364618912425380717127576529E-1L,
++  7.598886310387075708640370806458926458301E-2L,
++};
++#define NQ8_16D 11
++static const long double Q8_16D[NQ8_16D + 1] = {
++  1.368001558508338469503329967729951830843E-16L,
++  1.034454121857542147020549303317348297289E-13L,
++  3.128109209247090744354764050629381674436E-11L,
++  4.957795214328501986562102573522064468671E-9L,
++  4.537872468606711261992676606899273588899E-7L,
++  2.493639207101727713192687060517509774182E-5L,
++  8.294957278145328349785532236663051405805E-4L,
++  1.646471258966713577374948205279380115839E-2L,
++  1.878910092770966718491814497982191447073E-1L,
++  1.152641605706170353727903052525652504075E0L,
++  3.383550240669773485412333679367792932235E0L,
++  3.823875252882035706910024716609908473970E0L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* Y0(x)cosX - J0(x)sinX = sqrt( 2/(pi x)) Q0(x),
++   Q0(x) = 1/x (-.125 + 1/x^2 R(1/x^2))
++   Peak relative error 3.9e-35
++   0.125 <= 1/x <= 0.1875  */
++#define NQ5_8N 10
++static const long double Q5_8N[NQ5_8N + 1] = {
++  1.750399094021293722243426623211733898747E-13L,
++  6.483426211748008735242909236490115050294E-11L,
++  9.279430665656575457141747875716899958373E-9L,
++  6.696634968526907231258534757736576340266E-7L,
++  2.666560823798895649685231292142838188061E-5L,
++  6.025087697259436271271562769707550594540E-4L,
++  7.652807734168613251901945778921336353485E-3L,
++  5.226269002589406461622551452343519078905E-2L,
++  1.748390159751117658969324896330142895079E-1L,
++  2.378188719097006494782174902213083589660E-1L,
++  8.383984859679804095463699702165659216831E-2L,
++};
++#define NQ5_8D 10
++static const long double Q5_8D[NQ5_8D + 1] = {
++  2.389878229704327939008104855942987615715E-12L,
++  8.926142817142546018703814194987786425099E-10L,
++  1.294065862406745901206588525833274399038E-7L,
++  9.524139899457666250828752185212769682191E-6L,
++  3.908332488377770886091936221573123353489E-4L,
++  9.250427033957236609624199884089916836748E-3L,
++  1.263420066165922645975830877751588421451E-1L,
++  9.692527053860420229711317379861733180654E-1L,
++  3.937813834630430172221329298841520707954E0L,
++  7.603126427436356534498908111445191312181E0L,
++  5.670677653334105479259958485084550934305E0L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* Y0(x)cosX - J0(x)sinX = sqrt( 2/(pi x)) Q0(x),
++   Q0(x) = 1/x (-.125 + 1/x^2 R(1/x^2))
++   Peak relative error 3.2e-35
++   0.1875 <= 1/x <= 0.25  */
++#define NQ4_5N 10
++static const long double Q4_5N[NQ4_5N + 1] = {
++  2.233870042925895644234072357400122854086E-11L,
++  5.146223225761993222808463878999151699792E-9L,
++  4.459114531468296461688753521109797474523E-7L,
++  1.891397692931537975547242165291668056276E-5L,
++  4.279519145911541776938964806470674565504E-4L,
++  5.275239415656560634702073291768904783989E-3L,
++  3.468698403240744801278238473898432608887E-2L,
++  1.138773146337708415188856882915457888274E-1L,
++  1.622717518946443013587108598334636458955E-1L,
++  7.249040006390586123760992346453034628227E-2L,
++  1.941595365256460232175236758506411486667E-3L,
++};
++#define NQ4_5D 9
++static const long double Q4_5D[NQ4_5D + 1] = {
++  3.049977232266999249626430127217988047453E-10L,
++  7.120883230531035857746096928889676144099E-8L,
++  6.301786064753734446784637919554359588859E-6L,
++  2.762010530095069598480766869426308077192E-4L,
++  6.572163250572867859316828886203406361251E-3L,
++  8.752566114841221958200215255461843397776E-2L,
++  6.487654992874805093499285311075289932664E-1L,
++  2.576550017826654579451615283022812801435E0L,
++  5.056392229924022835364779562707348096036E0L,
++  4.179770081068251464907531367859072157773E0L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* Y0(x)cosX - J0(x)sinX = sqrt( 2/(pi x)) Q0(x),
++   Q0(x) = 1/x (-.125 + 1/x^2 R(1/x^2))
++   Peak relative error 1.4e-36
++   0.25 <= 1/x <= 0.3125  */
++#define NQ3r2_4N 10
++static const long double Q3r2_4N[NQ3r2_4N + 1] = {
++  6.126167301024815034423262653066023684411E-10L,
++  1.043969327113173261820028225053598975128E-7L,
++  6.592927270288697027757438170153763220190E-6L,
++  2.009103660938497963095652951912071336730E-4L,
++  3.220543385492643525985862356352195896964E-3L,
++  2.774405975730545157543417650436941650990E-2L,
++  1.258114008023826384487378016636555041129E-1L,
++  2.811724258266902502344701449984698323860E-1L,
++  2.691837665193548059322831687432415014067E-1L,
++  7.949087384900985370683770525312735605034E-2L,
++  1.229509543620976530030153018986910810747E-3L,
++};
++#define NQ3r2_4D 9
++static const long double Q3r2_4D[NQ3r2_4D + 1] = {
++  8.364260446128475461539941389210166156568E-9L,
++  1.451301850638956578622154585560759862764E-6L,
++  9.431830010924603664244578867057141839463E-5L,
++  3.004105101667433434196388593004526182741E-3L,
++  5.148157397848271739710011717102773780221E-2L,
++  4.901089301726939576055285374953887874895E-1L,
++  2.581760991981709901216967665934142240346E0L,
++  7.257105880775059281391729708630912791847E0L,
++  1.006014717326362868007913423810737369312E1L,
++  5.879416600465399514404064187445293212470E0L,
++ /* 1.000000000000000000000000000000000000000E0*/
++};
++
++/* Y0(x)cosX - J0(x)sinX = sqrt( 2/(pi x)) Q0(x),
++   Q0(x) = 1/x (-.125 + 1/x^2 R(1/x^2))
++   Peak relative error 3.8e-36
++   0.3125 <= 1/x <= 0.375  */
++#define NQ2r7_3r2N 9
++static const long double Q2r7_3r2N[NQ2r7_3r2N + 1] = {
++  7.584861620402450302063691901886141875454E-8L,
++  9.300939338814216296064659459966041794591E-6L,
++  4.112108906197521696032158235392604947895E-4L,
++  8.515168851578898791897038357239630654431E-3L,
++  8.971286321017307400142720556749573229058E-2L,
++  4.885856732902956303343015636331874194498E-1L,
++  1.334506268733103291656253500506406045846E0L,
++  1.681207956863028164179042145803851824654E0L,
++  8.165042692571721959157677701625853772271E-1L,
++  9.805848115375053300608712721986235900715E-2L,
++};
++#define NQ2r7_3r2D 9
++static const long double Q2r7_3r2D[NQ2r7_3r2D + 1] = {
++  1.035586492113036586458163971239438078160E-6L,
++  1.301999337731768381683593636500979713689E-4L,
++  5.993695702564527062553071126719088859654E-3L,
++  1.321184892887881883489141186815457808785E-1L,
++  1.528766555485015021144963194165165083312E0L,
++  9.561463309176490874525827051566494939295E0L,
++  3.203719484883967351729513662089163356911E1L,
++  5.497294687660930446641539152123568668447E1L,
++  4.391158169390578768508675452986948391118E1L,
++  1.347836630730048077907818943625789418378E1L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* Y0(x)cosX - J0(x)sinX = sqrt( 2/(pi x)) Q0(x),
++   Q0(x) = 1/x (-.125 + 1/x^2 R(1/x^2))
++   Peak relative error 2.2e-35
++   0.375 <= 1/x <= 0.4375  */
++#define NQ2r3_2r7N 9
++static const long double Q2r3_2r7N[NQ2r3_2r7N + 1] = {
++  4.455027774980750211349941766420190722088E-7L,
++  4.031998274578520170631601850866780366466E-5L,
++  1.273987274325947007856695677491340636339E-3L,
++  1.818754543377448509897226554179659122873E-2L,
++  1.266748858326568264126353051352269875352E-1L,
++  4.327578594728723821137731555139472880414E-1L,
++  6.892532471436503074928194969154192615359E-1L,
++  4.490775818438716873422163588640262036506E-1L,
++  8.649615949297322440032000346117031581572E-2L,
++  7.261345286655345047417257611469066147561E-4L,
++};
++#define NQ2r3_2r7D 8
++static const long double Q2r3_2r7D[NQ2r3_2r7D + 1] = {
++  6.082600739680555266312417978064954793142E-6L,
++  5.693622538165494742945717226571441747567E-4L,
++  1.901625907009092204458328768129666975975E-2L,
++  2.958689532697857335456896889409923371570E-1L,
++  2.343124711045660081603809437993368799568E0L,
++  9.665894032187458293568704885528192804376E0L,
++  2.035273104990617136065743426322454881353E1L,
++  2.044102010478792896815088858740075165531E1L,
++  8.445937177863155827844146643468706599304E0L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* Y0(x)cosX - J0(x)sinX = sqrt( 2/(pi x)) Q0(x),
++   Q0(x) = 1/x (-.125 + 1/x^2 R(1/x^2))
++   Peak relative error 3.1e-36
++   0.4375 <= 1/x <= 0.5  */
++#define NQ2_2r3N 9
++static const long double Q2_2r3N[NQ2_2r3N + 1] = {
++  2.817566786579768804844367382809101929314E-6L,
++  2.122772176396691634147024348373539744935E-4L,
++  5.501378031780457828919593905395747517585E-3L,
++  6.355374424341762686099147452020466524659E-2L,
++  3.539652320122661637429658698954748337223E-1L,
++  9.571721066119617436343740541777014319695E-1L,
++  1.196258777828426399432550698612171955305E0L,
++  6.069388659458926158392384709893753793967E-1L,
++  9.026746127269713176512359976978248763621E-2L,
++  5.317668723070450235320878117210807236375E-4L,
++};
++#define NQ2_2r3D 8
++static const long double Q2_2r3D[NQ2_2r3D + 1] = {
++  3.846924354014260866793741072933159380158E-5L,
++  3.017562820057704325510067178327449946763E-3L,
++  8.356305620686867949798885808540444210935E-2L,
++  1.068314930499906838814019619594424586273E0L,
++  6.900279623894821067017966573640732685233E0L,
++  2.307667390886377924509090271780839563141E1L,
++  3.921043465412723970791036825401273528513E1L,
++  3.167569478939719383241775717095729233436E1L,
++  1.051023841699200920276198346301543665909E1L,
++ /* 1.000000000000000000000000000000000000000E0*/
++};
++
++
++/* Evaluate P[n] x^n  +  P[n-1] x^(n-1)  +  ...  +  P[0] */
++
++static long double
++neval (long double x, const long double *p, int n)
++{
++  long double y;
++
++  p += n;
++  y = *p--;
++  do
++    {
++      y = y * x + *p--;
++    }
++  while (--n > 0);
++  return y;
++}
++
++
++/* Evaluate x^n+1  +  P[n] x^(n)  +  P[n-1] x^(n-1)  +  ...  +  P[0] */
++
++static long double
++deval (long double x, const long double *p, int n)
++{
++  long double y;
++
++  p += n;
++  y = x + *p--;
++  do
++    {
++      y = y * x + *p--;
++    }
++  while (--n > 0);
++  return y;
++}
++
++
++/* Bessel function of the first kind, order zero.  */
++
++long double
++__ieee754_j0l (long double x)
++{
++  long double xx, xinv, z, p, q, c, s, cc, ss;
++
++  if (! isfinite (x))
++    {
++      if (x != x)
++	return x + x;
++      else
++	return 0;
++    }
++  if (x == 0)
++    return 1;
++
++  xx = fabsl (x);
++  if (xx <= 2)
++    {
++      if (xx < 0x1p-57L)
++	return 1;
++      /* 0 <= x <= 2 */
++      z = xx * xx;
++      p = z * z * neval (z, J0_2N, NJ0_2N) / deval (z, J0_2D, NJ0_2D);
++      p -= 0.25L * z;
++      p += 1;
++      return p;
++    }
++
++  /* X = x - pi/4
++     cos(X) = cos(x) cos(pi/4) + sin(x) sin(pi/4)
++     = 1/sqrt(2) * (cos(x) + sin(x))
++     sin(X) = sin(x) cos(pi/4) - cos(x) sin(pi/4)
++     = 1/sqrt(2) * (sin(x) - cos(x))
++     sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
++     cf. Fdlibm.  */
++  __sincosl (xx, &s, &c);
++  ss = s - c;
++  cc = s + c;
++  if (xx <= LDBL_MAX / 2)
++    {
++      z = -__cosl (xx + xx);
++      if ((s * c) < 0)
++	cc = z / ss;
++      else
++	ss = z / cc;
++    }
++
++  if (xx > 0x1p256L)
++    return ONEOSQPI * cc / __ieee754_sqrtl (xx);
++
++  xinv = 1 / xx;
++  z = xinv * xinv;
++  if (xinv <= 0.25)
++    {
++      if (xinv <= 0.125)
++	{
++	  if (xinv <= 0.0625)
++	    {
++	      p = neval (z, P16_IN, NP16_IN) / deval (z, P16_ID, NP16_ID);
++	      q = neval (z, Q16_IN, NQ16_IN) / deval (z, Q16_ID, NQ16_ID);
++	    }
++	  else
++	    {
++	      p = neval (z, P8_16N, NP8_16N) / deval (z, P8_16D, NP8_16D);
++	      q = neval (z, Q8_16N, NQ8_16N) / deval (z, Q8_16D, NQ8_16D);
++	    }
++	}
++      else if (xinv <= 0.1875)
++	{
++	  p = neval (z, P5_8N, NP5_8N) / deval (z, P5_8D, NP5_8D);
++	  q = neval (z, Q5_8N, NQ5_8N) / deval (z, Q5_8D, NQ5_8D);
++	}
++      else
++	{
++	  p = neval (z, P4_5N, NP4_5N) / deval (z, P4_5D, NP4_5D);
++	  q = neval (z, Q4_5N, NQ4_5N) / deval (z, Q4_5D, NQ4_5D);
++	}
++    }				/* .25 */
++  else /* if (xinv <= 0.5) */
++    {
++      if (xinv <= 0.375)
++	{
++	  if (xinv <= 0.3125)
++	    {
++	      p = neval (z, P3r2_4N, NP3r2_4N) / deval (z, P3r2_4D, NP3r2_4D);
++	      q = neval (z, Q3r2_4N, NQ3r2_4N) / deval (z, Q3r2_4D, NQ3r2_4D);
++	    }
++	  else
++	    {
++	      p = neval (z, P2r7_3r2N, NP2r7_3r2N)
++		  / deval (z, P2r7_3r2D, NP2r7_3r2D);
++	      q = neval (z, Q2r7_3r2N, NQ2r7_3r2N)
++		  / deval (z, Q2r7_3r2D, NQ2r7_3r2D);
++	    }
++	}
++      else if (xinv <= 0.4375)
++	{
++	  p = neval (z, P2r3_2r7N, NP2r3_2r7N)
++	      / deval (z, P2r3_2r7D, NP2r3_2r7D);
++	  q = neval (z, Q2r3_2r7N, NQ2r3_2r7N)
++	      / deval (z, Q2r3_2r7D, NQ2r3_2r7D);
++	}
++      else
++	{
++	  p = neval (z, P2_2r3N, NP2_2r3N) / deval (z, P2_2r3D, NP2_2r3D);
++	  q = neval (z, Q2_2r3N, NQ2_2r3N) / deval (z, Q2_2r3D, NQ2_2r3D);
++	}
++    }
++  p = 1 + z * p;
++  q = z * xinv * q;
++  q = q - 0.125L * xinv;
++  z = ONEOSQPI * (p * cc - q * ss) / __ieee754_sqrtl (xx);
++  return z;
++}
++strong_alias (__ieee754_j0l, __j0l_finite)
++
++
++/* Y0(x) = 2/pi * log(x) * J0(x) + R(x^2)
++   Peak absolute error 1.7e-36 (relative where Y0 > 1)
++   0 <= x <= 2   */
++#define NY0_2N 7
++static long double Y0_2N[NY0_2N + 1] = {
++ -1.062023609591350692692296993537002558155E19L,
++  2.542000883190248639104127452714966858866E19L,
++ -1.984190771278515324281415820316054696545E18L,
++  4.982586044371592942465373274440222033891E16L,
++ -5.529326354780295177243773419090123407550E14L,
++  3.013431465522152289279088265336861140391E12L,
++ -7.959436160727126750732203098982718347785E9L,
++  8.230845651379566339707130644134372793322E6L,
++};
++#define NY0_2D 7
++static long double Y0_2D[NY0_2D + 1] = {
++  1.438972634353286978700329883122253752192E20L,
++  1.856409101981569254247700169486907405500E18L,
++  1.219693352678218589553725579802986255614E16L,
++  5.389428943282838648918475915779958097958E13L,
++  1.774125762108874864433872173544743051653E11L,
++  4.522104832545149534808218252434693007036E8L,
++  8.872187401232943927082914504125234454930E5L,
++  1.251945613186787532055610876304669413955E3L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++static const long double U0 = -7.3804295108687225274343927948483016310862e-02L;
++
++/* Bessel function of the second kind, order zero.  */
++
++long double
++ __ieee754_y0l(long double x)
++{
++  long double xx, xinv, z, p, q, c, s, cc, ss;
++
++  if (! isfinite (x))
++    return 1 / (x + x * x);
++  if (x <= 0)
++    {
++      if (x < 0)
++	return (zero / (zero * x));
++      return -1 / zero; /* -inf and divide by zero exception.  */
++    }
++  xx = fabsl (x);
++  if (xx <= 0x1p-57)
++    return U0 + TWOOPI * __ieee754_logl (x);
++  if (xx <= 2)
++    {
++      /* 0 <= x <= 2 */
++      z = xx * xx;
++      p = neval (z, Y0_2N, NY0_2N) / deval (z, Y0_2D, NY0_2D);
++      p = TWOOPI * __ieee754_logl (x) * __ieee754_j0l (x) + p;
++      return p;
++    }
++
++  /* X = x - pi/4
++     cos(X) = cos(x) cos(pi/4) + sin(x) sin(pi/4)
++     = 1/sqrt(2) * (cos(x) + sin(x))
++     sin(X) = sin(x) cos(pi/4) - cos(x) sin(pi/4)
++     = 1/sqrt(2) * (sin(x) - cos(x))
++     sin(x) +- cos(x) = -cos(2x)/(sin(x) -+ cos(x))
++     cf. Fdlibm.  */
++  __sincosl (x, &s, &c);
++  ss = s - c;
++  cc = s + c;
++  if (xx <= LDBL_MAX / 2)
++    {
++      z = -__cosl (x + x);
++      if ((s * c) < 0)
++	cc = z / ss;
++      else
++	ss = z / cc;
++    }
++
++  if (xx > 0x1p256L)
++    return ONEOSQPI * ss / __ieee754_sqrtl (x);
++
++  xinv = 1 / xx;
++  z = xinv * xinv;
++  if (xinv <= 0.25)
++    {
++      if (xinv <= 0.125)
++	{
++	  if (xinv <= 0.0625)
++	    {
++	      p = neval (z, P16_IN, NP16_IN) / deval (z, P16_ID, NP16_ID);
++	      q = neval (z, Q16_IN, NQ16_IN) / deval (z, Q16_ID, NQ16_ID);
++	    }
++	  else
++	    {
++	      p = neval (z, P8_16N, NP8_16N) / deval (z, P8_16D, NP8_16D);
++	      q = neval (z, Q8_16N, NQ8_16N) / deval (z, Q8_16D, NQ8_16D);
++	    }
++	}
++      else if (xinv <= 0.1875)
++	{
++	  p = neval (z, P5_8N, NP5_8N) / deval (z, P5_8D, NP5_8D);
++	  q = neval (z, Q5_8N, NQ5_8N) / deval (z, Q5_8D, NQ5_8D);
++	}
++      else
++	{
++	  p = neval (z, P4_5N, NP4_5N) / deval (z, P4_5D, NP4_5D);
++	  q = neval (z, Q4_5N, NQ4_5N) / deval (z, Q4_5D, NQ4_5D);
++	}
++    }				/* .25 */
++  else /* if (xinv <= 0.5) */
++    {
++      if (xinv <= 0.375)
++	{
++	  if (xinv <= 0.3125)
++	    {
++	      p = neval (z, P3r2_4N, NP3r2_4N) / deval (z, P3r2_4D, NP3r2_4D);
++	      q = neval (z, Q3r2_4N, NQ3r2_4N) / deval (z, Q3r2_4D, NQ3r2_4D);
++	    }
++	  else
++	    {
++	      p = neval (z, P2r7_3r2N, NP2r7_3r2N)
++		  / deval (z, P2r7_3r2D, NP2r7_3r2D);
++	      q = neval (z, Q2r7_3r2N, NQ2r7_3r2N)
++		  / deval (z, Q2r7_3r2D, NQ2r7_3r2D);
++	    }
++	}
++      else if (xinv <= 0.4375)
++	{
++	  p = neval (z, P2r3_2r7N, NP2r3_2r7N)
++	      / deval (z, P2r3_2r7D, NP2r3_2r7D);
++	  q = neval (z, Q2r3_2r7N, NQ2r3_2r7N)
++	      / deval (z, Q2r3_2r7D, NQ2r3_2r7D);
++	}
++      else
++	{
++	  p = neval (z, P2_2r3N, NP2_2r3N) / deval (z, P2_2r3D, NP2_2r3D);
++	  q = neval (z, Q2_2r3N, NQ2_2r3N) / deval (z, Q2_2r3D, NQ2_2r3D);
++	}
++    }
++  p = 1 + z * p;
++  q = z * xinv * q;
++  q = q - 0.125L * xinv;
++  z = ONEOSQPI * (p * ss + q * cc) / __ieee754_sqrtl (x);
++  return z;
++}
++strong_alias (__ieee754_y0l, __y0l_finite)
+diff --git a/sysdeps/ieee754/ldbl-128ibm/e_j1l.c b/sysdeps/ieee754/ldbl-128ibm/e_j1l.c
+index da9fd9eeca..5956c97b82 100644
+--- a/sysdeps/ieee754/ldbl-128ibm/e_j1l.c
++++ b/sysdeps/ieee754/ldbl-128ibm/e_j1l.c
+@@ -1,4 +1,884 @@
+-/* Looks like we can use ieee854 e_j1l.c as is for IBM extended format. */
+-#define _Float128 long double
+-#define L(x) x ## L
+-#include <sysdeps/ieee754/ldbl-128/e_j1l.c>
++/* Bessel function of order one.  IBM Extended Precision version.
++   Copyright 2001 by Stephen L. Moshier (moshier at na-net.onrl.gov).
++
++   This library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   This library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with this library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++/* This file was copied from sysdeps/ieee754/ldbl-128/e_j0l.c.  */
++
++
++#include <errno.h>
++#include <math.h>
++#include <math_private.h>
++#include <float.h>
++
++/* 1 / sqrt(pi) */
++static const long double ONEOSQPI = 5.6418958354775628694807945156077258584405E-1L;
++/* 2 / pi */
++static const long double TWOOPI = 6.3661977236758134307553505349005744813784E-1L;
++static const long double zero = 0;
++
++/* J1(x) = .5x + x x^2 R(x^2)
++   Peak relative error 1.9e-35
++   0 <= x <= 2  */
++#define NJ0_2N 6
++static const long double J0_2N[NJ0_2N + 1] = {
++ -5.943799577386942855938508697619735179660E16L,
++  1.812087021305009192259946997014044074711E15L,
++ -2.761698314264509665075127515729146460895E13L,
++  2.091089497823600978949389109350658815972E11L,
++ -8.546413231387036372945453565654130054307E8L,
++  1.797229225249742247475464052741320612261E6L,
++ -1.559552840946694171346552770008812083969E3L
++};
++#define NJ0_2D 6
++static const long double J0_2D[NJ0_2D + 1] = {
++  9.510079323819108569501613916191477479397E17L,
++  1.063193817503280529676423936545854693915E16L,
++  5.934143516050192600795972192791775226920E13L,
++  2.168000911950620999091479265214368352883E11L,
++  5.673775894803172808323058205986256928794E8L,
++  1.080329960080981204840966206372671147224E6L,
++  1.411951256636576283942477881535283304912E3L,
++ /* 1.000000000000000000000000000000000000000E0L */
++};
++
++/* J1(x)cosX + Y1(x)sinX = sqrt( 2/(pi x)) P1(x), P1(x) = 1 + 1/x^2 R(1/x^2),
++   0 <= 1/x <= .0625
++   Peak relative error 3.6e-36  */
++#define NP16_IN 9
++static const long double P16_IN[NP16_IN + 1] = {
++  5.143674369359646114999545149085139822905E-16L,
++  4.836645664124562546056389268546233577376E-13L,
++  1.730945562285804805325011561498453013673E-10L,
++  3.047976856147077889834905908605310585810E-8L,
++  2.855227609107969710407464739188141162386E-6L,
++  1.439362407936705484122143713643023998457E-4L,
++  3.774489768532936551500999699815873422073E-3L,
++  4.723962172984642566142399678920790598426E-2L,
++  2.359289678988743939925017240478818248735E-1L,
++  3.032580002220628812728954785118117124520E-1L,
++};
++#define NP16_ID 9
++static const long double P16_ID[NP16_ID + 1] = {
++  4.389268795186898018132945193912677177553E-15L,
++  4.132671824807454334388868363256830961655E-12L,
++  1.482133328179508835835963635130894413136E-9L,
++  2.618941412861122118906353737117067376236E-7L,
++  2.467854246740858470815714426201888034270E-5L,
++  1.257192927368839847825938545925340230490E-3L,
++  3.362739031941574274949719324644120720341E-2L,
++  4.384458231338934105875343439265370178858E-1L,
++  2.412830809841095249170909628197264854651E0L,
++  4.176078204111348059102962617368214856874E0L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* J1(x)cosX + Y1(x)sinX = sqrt( 2/(pi x)) P1(x), P1(x) = 1 + 1/x^2 R(1/x^2),
++    0.0625 <= 1/x <= 0.125
++    Peak relative error 1.9e-36  */
++#define NP8_16N 11
++static const long double P8_16N[NP8_16N + 1] = {
++  2.984612480763362345647303274082071598135E-16L,
++  1.923651877544126103941232173085475682334E-13L,
++  4.881258879388869396043760693256024307743E-11L,
++  6.368866572475045408480898921866869811889E-9L,
++  4.684818344104910450523906967821090796737E-7L,
++  2.005177298271593587095982211091300382796E-5L,
++  4.979808067163957634120681477207147536182E-4L,
++  6.946005761642579085284689047091173581127E-3L,
++  5.074601112955765012750207555985299026204E-2L,
++  1.698599455896180893191766195194231825379E-1L,
++  1.957536905259237627737222775573623779638E-1L,
++  2.991314703282528370270179989044994319374E-2L,
++};
++#define NP8_16D 10
++static const long double P8_16D[NP8_16D + 1] = {
++  2.546869316918069202079580939942463010937E-15L,
++  1.644650111942455804019788382157745229955E-12L,
++  4.185430770291694079925607420808011147173E-10L,
++  5.485331966975218025368698195861074143153E-8L,
++  4.062884421686912042335466327098932678905E-6L,
++  1.758139661060905948870523641319556816772E-4L,
++  4.445143889306356207566032244985607493096E-3L,
++  6.391901016293512632765621532571159071158E-2L,
++  4.933040207519900471177016015718145795434E-1L,
++  1.839144086168947712971630337250761842976E0L,
++  2.715120873995490920415616716916149586579E0L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* J1(x)cosX + Y1(x)sinX = sqrt( 2/(pi x)) P1(x), P1(x) = 1 + 1/x^2 R(1/x^2),
++  0.125 <= 1/x <= 0.1875
++  Peak relative error 1.3e-36  */
++#define NP5_8N 10
++static const long double P5_8N[NP5_8N + 1] = {
++  2.837678373978003452653763806968237227234E-12L,
++  9.726641165590364928442128579282742354806E-10L,
++  1.284408003604131382028112171490633956539E-7L,
++  8.524624695868291291250573339272194285008E-6L,
++  3.111516908953172249853673787748841282846E-4L,
++  6.423175156126364104172801983096596409176E-3L,
++  7.430220589989104581004416356260692450652E-2L,
++  4.608315409833682489016656279567605536619E-1L,
++  1.396870223510964882676225042258855977512E0L,
++  1.718500293904122365894630460672081526236E0L,
++  5.465927698800862172307352821870223855365E-1L
++};
++#define NP5_8D 10
++static const long double P5_8D[NP5_8D + 1] = {
++  2.421485545794616609951168511612060482715E-11L,
++  8.329862750896452929030058039752327232310E-9L,
++  1.106137992233383429630592081375289010720E-6L,
++  7.405786153760681090127497796448503306939E-5L,
++  2.740364785433195322492093333127633465227E-3L,
++  5.781246470403095224872243564165254652198E-2L,
++  6.927711353039742469918754111511109983546E-1L,
++  4.558679283460430281188304515922826156690E0L,
++  1.534468499844879487013168065728837900009E1L,
++  2.313927430889218597919624843161569422745E1L,
++  1.194506341319498844336768473218382828637E1L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* J1(x)cosX + Y1(x)sinX = sqrt( 2/(pi x)) P1(x), P1(x) = 1 + 1/x^2 R(1/x^2),
++   Peak relative error 1.4e-36
++   0.1875 <= 1/x <= 0.25  */
++#define NP4_5N 10
++static const long double P4_5N[NP4_5N + 1] = {
++  1.846029078268368685834261260420933914621E-10L,
++  3.916295939611376119377869680335444207768E-8L,
++  3.122158792018920627984597530935323997312E-6L,
++  1.218073444893078303994045653603392272450E-4L,
++  2.536420827983485448140477159977981844883E-3L,
++  2.883011322006690823959367922241169171315E-2L,
++  1.755255190734902907438042414495469810830E-1L,
++  5.379317079922628599870898285488723736599E-1L,
++  7.284904050194300773890303361501726561938E-1L,
++  3.270110346613085348094396323925000362813E-1L,
++  1.804473805689725610052078464951722064757E-2L,
++};
++#define NP4_5D 9
++static const long double P4_5D[NP4_5D + 1] = {
++  1.575278146806816970152174364308980863569E-9L,
++  3.361289173657099516191331123405675054321E-7L,
++  2.704692281550877810424745289838790693708E-5L,
++  1.070854930483999749316546199273521063543E-3L,
++  2.282373093495295842598097265627962125411E-2L,
++  2.692025460665354148328762368240343249830E-1L,
++  1.739892942593664447220951225734811133759E0L,
++  5.890727576752230385342377570386657229324E0L,
++  9.517442287057841500750256954117735128153E0L,
++  6.100616353935338240775363403030137736013E0L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* J1(x)cosX + Y1(x)sinX = sqrt( 2/(pi x)) P1(x), P1(x) = 1 + 1/x^2 R(1/x^2),
++   Peak relative error 3.0e-36
++   0.25 <= 1/x <= 0.3125  */
++#define NP3r2_4N 9
++static const long double P3r2_4N[NP3r2_4N + 1] = {
++  8.240803130988044478595580300846665863782E-8L,
++  1.179418958381961224222969866406483744580E-5L,
++  6.179787320956386624336959112503824397755E-4L,
++  1.540270833608687596420595830747166658383E-2L,
++  1.983904219491512618376375619598837355076E-1L,
++  1.341465722692038870390470651608301155565E0L,
++  4.617865326696612898792238245990854646057E0L,
++  7.435574801812346424460233180412308000587E0L,
++  4.671327027414635292514599201278557680420E0L,
++  7.299530852495776936690976966995187714739E-1L,
++};
++#define NP3r2_4D 9
++static const long double P3r2_4D[NP3r2_4D + 1] = {
++  7.032152009675729604487575753279187576521E-7L,
++  1.015090352324577615777511269928856742848E-4L,
++  5.394262184808448484302067955186308730620E-3L,
++  1.375291438480256110455809354836988584325E-1L,
++  1.836247144461106304788160919310404376670E0L,
++  1.314378564254376655001094503090935880349E1L,
++  4.957184590465712006934452500894672343488E1L,
++  9.287394244300647738855415178790263465398E1L,
++  7.652563275535900609085229286020552768399E1L,
++  2.147042473003074533150718117770093209096E1L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* J1(x)cosX + Y1(x)sinX = sqrt( 2/(pi x)) P1(x), P1(x) = 1 + 1/x^2 R(1/x^2),
++   Peak relative error 1.0e-35
++   0.3125 <= 1/x <= 0.375  */
++#define NP2r7_3r2N 9
++static const long double P2r7_3r2N[NP2r7_3r2N + 1] = {
++  4.599033469240421554219816935160627085991E-7L,
++  4.665724440345003914596647144630893997284E-5L,
++  1.684348845667764271596142716944374892756E-3L,
++  2.802446446884455707845985913454440176223E-2L,
++  2.321937586453963310008279956042545173930E-1L,
++  9.640277413988055668692438709376437553804E-1L,
++  1.911021064710270904508663334033003246028E0L,
++  1.600811610164341450262992138893970224971E0L,
++  4.266299218652587901171386591543457861138E-1L,
++  1.316470424456061252962568223251247207325E-2L,
++};
++#define NP2r7_3r2D 8
++static const long double P2r7_3r2D[NP2r7_3r2D + 1] = {
++  3.924508608545520758883457108453520099610E-6L,
++  4.029707889408829273226495756222078039823E-4L,
++  1.484629715787703260797886463307469600219E-2L,
++  2.553136379967180865331706538897231588685E-1L,
++  2.229457223891676394409880026887106228740E0L,
++  1.005708903856384091956550845198392117318E1L,
++  2.277082659664386953166629360352385889558E1L,
++  2.384726835193630788249826630376533988245E1L,
++  9.700989749041320895890113781610939632410E0L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* J1(x)cosX + Y1(x)sinX = sqrt( 2/(pi x)) P1(x), P1(x) = 1 + 1/x^2 R(1/x^2),
++   Peak relative error 1.7e-36
++   0.3125 <= 1/x <= 0.4375  */
++#define NP2r3_2r7N 9
++static const long double P2r3_2r7N[NP2r3_2r7N + 1] = {
++  3.916766777108274628543759603786857387402E-6L,
++  3.212176636756546217390661984304645137013E-4L,
++  9.255768488524816445220126081207248947118E-3L,
++  1.214853146369078277453080641911700735354E-1L,
++  7.855163309847214136198449861311404633665E-1L,
++  2.520058073282978403655488662066019816540E0L,
++  3.825136484837545257209234285382183711466E0L,
++  2.432569427554248006229715163865569506873E0L,
++  4.877934835018231178495030117729800489743E-1L,
++  1.109902737860249670981355149101343427885E-2L,
++};
++#define NP2r3_2r7D 8
++static const long double P2r3_2r7D[NP2r3_2r7D + 1] = {
++  3.342307880794065640312646341190547184461E-5L,
++  2.782182891138893201544978009012096558265E-3L,
++  8.221304931614200702142049236141249929207E-2L,
++  1.123728246291165812392918571987858010949E0L,
++  7.740482453652715577233858317133423434590E0L,
++  2.737624677567945952953322566311201919139E1L,
++  4.837181477096062403118304137851260715475E1L,
++  3.941098643468580791437772701093795299274E1L,
++  1.245821247166544627558323920382547533630E1L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* J1(x)cosX + Y1(x)sinX = sqrt( 2/(pi x)) P1(x), P1(x) = 1 + 1/x^2 R(1/x^2),
++   Peak relative error 1.7e-35
++   0.4375 <= 1/x <= 0.5  */
++#define NP2_2r3N 8
++static const long double P2_2r3N[NP2_2r3N + 1] = {
++  3.397930802851248553545191160608731940751E-4L,
++  2.104020902735482418784312825637833698217E-2L,
++  4.442291771608095963935342749477836181939E-1L,
++  4.131797328716583282869183304291833754967E0L,
++  1.819920169779026500146134832455189917589E1L,
++  3.781779616522937565300309684282401791291E1L,
++  3.459605449728864218972931220783543410347E1L,
++  1.173594248397603882049066603238568316561E1L,
++  9.455702270242780642835086549285560316461E-1L,
++};
++#define NP2_2r3D 8
++static const long double P2_2r3D[NP2_2r3D + 1] = {
++  2.899568897241432883079888249845707400614E-3L,
++  1.831107138190848460767699919531132426356E-1L,
++  3.999350044057883839080258832758908825165E0L,
++  3.929041535867957938340569419874195303712E1L,
++  1.884245613422523323068802689915538908291E2L,
++  4.461469948819229734353852978424629815929E2L,
++  5.004998753999796821224085972610636347903E2L,
++  2.386342520092608513170837883757163414100E2L,
++  3.791322528149347975999851588922424189957E1L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* Y1(x)cosX - J1(x)sinX = sqrt( 2/(pi x)) Q1(x),
++   Q1(x) = 1/x (.375 + 1/x^2 R(1/x^2)),
++   Peak relative error 8.0e-36
++   0 <= 1/x <= .0625  */
++#define NQ16_IN 10
++static const long double Q16_IN[NQ16_IN + 1] = {
++  -3.917420835712508001321875734030357393421E-18L,
++  -4.440311387483014485304387406538069930457E-15L,
++  -1.951635424076926487780929645954007139616E-12L,
++  -4.318256438421012555040546775651612810513E-10L,
++  -5.231244131926180765270446557146989238020E-8L,
++  -3.540072702902043752460711989234732357653E-6L,
++  -1.311017536555269966928228052917534882984E-4L,
++  -2.495184669674631806622008769674827575088E-3L,
++  -2.141868222987209028118086708697998506716E-2L,
++  -6.184031415202148901863605871197272650090E-2L,
++  -1.922298704033332356899546792898156493887E-2L,
++};
++#define NQ16_ID 9
++static const long double Q16_ID[NQ16_ID + 1] = {
++  3.820418034066293517479619763498400162314E-17L,
++  4.340702810799239909648911373329149354911E-14L,
++  1.914985356383416140706179933075303538524E-11L,
++  4.262333682610888819476498617261895474330E-9L,
++  5.213481314722233980346462747902942182792E-7L,
++  3.585741697694069399299005316809954590558E-5L,
++  1.366513429642842006385029778105539457546E-3L,
++  2.745282599850704662726337474371355160594E-2L,
++  2.637644521611867647651200098449903330074E-1L,
++  1.006953426110765984590782655598680488746E0L,
++ /* 1.000000000000000000000000000000000000000E0 */
++ };
++
++/* Y1(x)cosX - J1(x)sinX = sqrt( 2/(pi x)) Q1(x),
++   Q1(x) = 1/x (.375 + 1/x^2 R(1/x^2)),
++   Peak relative error 1.9e-36
++   0.0625 <= 1/x <= 0.125  */
++#define NQ8_16N 11
++static const long double Q8_16N[NQ8_16N + 1] = {
++  -2.028630366670228670781362543615221542291E-17L,
++  -1.519634620380959966438130374006858864624E-14L,
++  -4.540596528116104986388796594639405114524E-12L,
++  -7.085151756671466559280490913558388648274E-10L,
++  -6.351062671323970823761883833531546885452E-8L,
++  -3.390817171111032905297982523519503522491E-6L,
++  -1.082340897018886970282138836861233213972E-4L,
++  -2.020120801187226444822977006648252379508E-3L,
++  -2.093169910981725694937457070649605557555E-2L,
++  -1.092176538874275712359269481414448063393E-1L,
++  -2.374790947854765809203590474789108718733E-1L,
++  -1.365364204556573800719985118029601401323E-1L,
++};
++#define NQ8_16D 11
++static const long double Q8_16D[NQ8_16D + 1] = {
++  1.978397614733632533581207058069628242280E-16L,
++  1.487361156806202736877009608336766720560E-13L,
++  4.468041406888412086042576067133365913456E-11L,
++  7.027822074821007443672290507210594648877E-9L,
++  6.375740580686101224127290062867976007374E-7L,
++  3.466887658320002225888644977076410421940E-5L,
++  1.138625640905289601186353909213719596986E-3L,
++  2.224470799470414663443449818235008486439E-2L,
++  2.487052928527244907490589787691478482358E-1L,
++  1.483927406564349124649083853892380899217E0L,
++  4.182773513276056975777258788903489507705E0L,
++  4.419665392573449746043880892524360870944E0L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* Y1(x)cosX - J1(x)sinX = sqrt( 2/(pi x)) Q1(x),
++   Q1(x) = 1/x (.375 + 1/x^2 R(1/x^2)),
++   Peak relative error 1.5e-35
++   0.125 <= 1/x <= 0.1875  */
++#define NQ5_8N 10
++static const long double Q5_8N[NQ5_8N + 1] = {
++  -3.656082407740970534915918390488336879763E-13L,
++  -1.344660308497244804752334556734121771023E-10L,
++  -1.909765035234071738548629788698150760791E-8L,
++  -1.366668038160120210269389551283666716453E-6L,
++  -5.392327355984269366895210704976314135683E-5L,
++  -1.206268245713024564674432357634540343884E-3L,
++  -1.515456784370354374066417703736088291287E-2L,
++  -1.022454301137286306933217746545237098518E-1L,
++  -3.373438906472495080504907858424251082240E-1L,
++  -4.510782522110845697262323973549178453405E-1L,
++  -1.549000892545288676809660828213589804884E-1L,
++};
++#define NQ5_8D 10
++static const long double Q5_8D[NQ5_8D + 1] = {
++  3.565550843359501079050699598913828460036E-12L,
++  1.321016015556560621591847454285330528045E-9L,
++  1.897542728662346479999969679234270605975E-7L,
++  1.381720283068706710298734234287456219474E-5L,
++  5.599248147286524662305325795203422873725E-4L,
++  1.305442352653121436697064782499122164843E-2L,
++  1.750234079626943298160445750078631894985E-1L,
++  1.311420542073436520965439883806946678491E0L,
++  5.162757689856842406744504211089724926650E0L,
++  9.527760296384704425618556332087850581308E0L,
++  6.604648207463236667912921642545100248584E0L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* Y1(x)cosX - J1(x)sinX = sqrt( 2/(pi x)) Q1(x),
++   Q1(x) = 1/x (.375 + 1/x^2 R(1/x^2)),
++   Peak relative error 1.3e-35
++   0.1875 <= 1/x <= 0.25  */
++#define NQ4_5N 10
++static const long double Q4_5N[NQ4_5N + 1] = {
++  -4.079513568708891749424783046520200903755E-11L,
++  -9.326548104106791766891812583019664893311E-9L,
++  -8.016795121318423066292906123815687003356E-7L,
++  -3.372350544043594415609295225664186750995E-5L,
++  -7.566238665947967882207277686375417983917E-4L,
++  -9.248861580055565402130441618521591282617E-3L,
++  -6.033106131055851432267702948850231270338E-2L,
++  -1.966908754799996793730369265431584303447E-1L,
++  -2.791062741179964150755788226623462207560E-1L,
++  -1.255478605849190549914610121863534191666E-1L,
++  -4.320429862021265463213168186061696944062E-3L,
++};
++#define NQ4_5D 9
++static const long double Q4_5D[NQ4_5D + 1] = {
++  3.978497042580921479003851216297330701056E-10L,
++  9.203304163828145809278568906420772246666E-8L,
++  8.059685467088175644915010485174545743798E-6L,
++  3.490187375993956409171098277561669167446E-4L,
++  8.189109654456872150100501732073810028829E-3L,
++  1.072572867311023640958725265762483033769E-1L,
++  7.790606862409960053675717185714576937994E-1L,
++  3.016049768232011196434185423512777656328E0L,
++  5.722963851442769787733717162314477949360E0L,
++  4.510527838428473279647251350931380867663E0L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* Y1(x)cosX - J1(x)sinX = sqrt( 2/(pi x)) Q1(x),
++   Q1(x) = 1/x (.375 + 1/x^2 R(1/x^2)),
++   Peak relative error 2.1e-35
++   0.25 <= 1/x <= 0.3125  */
++#define NQ3r2_4N 9
++static const long double Q3r2_4N[NQ3r2_4N + 1] = {
++  -1.087480809271383885936921889040388133627E-8L,
++  -1.690067828697463740906962973479310170932E-6L,
++  -9.608064416995105532790745641974762550982E-5L,
++  -2.594198839156517191858208513873961837410E-3L,
++  -3.610954144421543968160459863048062977822E-2L,
++  -2.629866798251843212210482269563961685666E-1L,
++  -9.709186825881775885917984975685752956660E-1L,
++  -1.667521829918185121727268867619982417317E0L,
++  -1.109255082925540057138766105229900943501E0L,
++  -1.812932453006641348145049323713469043328E-1L,
++};
++#define NQ3r2_4D 9
++static const long double Q3r2_4D[NQ3r2_4D + 1] = {
++  1.060552717496912381388763753841473407026E-7L,
++  1.676928002024920520786883649102388708024E-5L,
++  9.803481712245420839301400601140812255737E-4L,
++  2.765559874262309494758505158089249012930E-2L,
++  4.117921827792571791298862613287549140706E-1L,
++  3.323769515244751267093378361930279161413E0L,
++  1.436602494405814164724810151689705353670E1L,
++  3.163087869617098638064881410646782408297E1L,
++  3.198181264977021649489103980298349589419E1L,
++  1.203649258862068431199471076202897823272E1L,
++ /* 1.000000000000000000000000000000000000000E0  */
++};
++
++/* Y1(x)cosX - J1(x)sinX = sqrt( 2/(pi x)) Q1(x),
++   Q1(x) = 1/x (.375 + 1/x^2 R(1/x^2)),
++   Peak relative error 1.6e-36
++   0.3125 <= 1/x <= 0.375  */
++#define NQ2r7_3r2N 9
++static const long double Q2r7_3r2N[NQ2r7_3r2N + 1] = {
++  -1.723405393982209853244278760171643219530E-7L,
++  -2.090508758514655456365709712333460087442E-5L,
++  -9.140104013370974823232873472192719263019E-4L,
++  -1.871349499990714843332742160292474780128E-2L,
++  -1.948930738119938669637865956162512983416E-1L,
++  -1.048764684978978127908439526343174139788E0L,
++  -2.827714929925679500237476105843643064698E0L,
++  -3.508761569156476114276988181329773987314E0L,
++  -1.669332202790211090973255098624488308989E0L,
++  -1.930796319299022954013840684651016077770E-1L,
++};
++#define NQ2r7_3r2D 9
++static const long double Q2r7_3r2D[NQ2r7_3r2D + 1] = {
++  1.680730662300831976234547482334347983474E-6L,
++  2.084241442440551016475972218719621841120E-4L,
++  9.445316642108367479043541702688736295579E-3L,
++  2.044637889456631896650179477133252184672E-1L,
++  2.316091982244297350829522534435350078205E0L,
++  1.412031891783015085196708811890448488865E1L,
++  4.583830154673223384837091077279595496149E1L,
++  7.549520609270909439885998474045974122261E1L,
++  5.697605832808113367197494052388203310638E1L,
++  1.601496240876192444526383314589371686234E1L,
++  /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* Y1(x)cosX - J1(x)sinX = sqrt( 2/(pi x)) Q1(x),
++   Q1(x) = 1/x (.375 + 1/x^2 R(1/x^2)),
++   Peak relative error 9.5e-36
++   0.375 <= 1/x <= 0.4375  */
++#define NQ2r3_2r7N 9
++static const long double Q2r3_2r7N[NQ2r3_2r7N + 1] = {
++  -8.603042076329122085722385914954878953775E-7L,
++  -7.701746260451647874214968882605186675720E-5L,
++  -2.407932004380727587382493696877569654271E-3L,
++  -3.403434217607634279028110636919987224188E-2L,
++  -2.348707332185238159192422084985713102877E-1L,
++  -7.957498841538254916147095255700637463207E-1L,
++  -1.258469078442635106431098063707934348577E0L,
++  -8.162415474676345812459353639449971369890E-1L,
++  -1.581783890269379690141513949609572806898E-1L,
++  -1.890595651683552228232308756569450822905E-3L,
++};
++#define NQ2r3_2r7D 8
++static const long double Q2r3_2r7D[NQ2r3_2r7D + 1] = {
++  8.390017524798316921170710533381568175665E-6L,
++  7.738148683730826286477254659973968763659E-4L,
++  2.541480810958665794368759558791634341779E-2L,
++  3.878879789711276799058486068562386244873E-1L,
++  3.003783779325811292142957336802456109333E0L,
++  1.206480374773322029883039064575464497400E1L,
++  2.458414064785315978408974662900438351782E1L,
++  2.367237826273668567199042088835448715228E1L,
++  9.231451197519171090875569102116321676763E0L,
++ /* 1.000000000000000000000000000000000000000E0 */
++};
++
++/* Y1(x)cosX - J1(x)sinX = sqrt( 2/(pi x)) Q1(x),
++   Q1(x) = 1/x (.375 + 1/x^2 R(1/x^2)),
++   Peak relative error 1.4e-36
++   0.4375 <= 1/x <= 0.5  */
++#define NQ2_2r3N 9
++static const long double Q2_2r3N[NQ2_2r3N + 1] = {
++  -5.552507516089087822166822364590806076174E-6L,
++  -4.135067659799500521040944087433752970297E-4L,
++  -1.059928728869218962607068840646564457980E-2L,
++  -1.212070036005832342565792241385459023801E-1L,
++  -6.688350110633603958684302153362735625156E-1L,
++  -1.793587878197360221340277951304429821582E0L,
++  -2.225407682237197485644647380483725045326E0L,
++  -1.123402135458940189438898496348239744403E0L,
++  -1.679187241566347077204805190763597299805E-1L,
++  -1.458550613639093752909985189067233504148E-3L,
++};
++#define NQ2_2r3D 8
++static const long double Q2_2r3D[NQ2_2r3D + 1] = {
++  5.415024336507980465169023996403597916115E-5L,
++  4.179246497380453022046357404266022870788E-3L,
++  1.136306384261959483095442402929502368598E-1L,
++  1.422640343719842213484515445393284072830E0L,
++  8.968786703393158374728850922289204805764E0L,
++  2.914542473339246127533384118781216495934E1L,
++  4.781605421020380669870197378210457054685E1L,
++  3.693865837171883152382820584714795072937E1L,
++  1.153220502744204904763115556224395893076E1L,
++  /* 1.000000000000000000000000000000000000000E0 */
++};
++
++
++/* Evaluate P[n] x^n  +  P[n-1] x^(n-1)  +  ...  +  P[0] */
++
++static long double
++neval (long double x, const long double *p, int n)
++{
++  long double y;
++
++  p += n;
++  y = *p--;
++  do
++    {
++      y = y * x + *p--;
++    }
++  while (--n > 0);
++  return y;
++}
++
++
++/* Evaluate x^n+1  +  P[n] x^(n)  +  P[n-1] x^(n-1)  +  ...  +  P[0] */
++
++static long double
++deval (long double x, const long double *p, int n)
++{
++  long double y;
++
++  p += n;
++  y = x + *p--;
++  do
++    {
++      y = y * x + *p--;
++    }
++  while (--n > 0);
++  return y;
++}
++
++
++/* Bessel function of the first kind, order one.  */
++
++long double
++__ieee754_j1l (long double x)
++{
++  long double xx, xinv, z, p, q, c, s, cc, ss;
++
++  if (! isfinite (x))
++    {
++      if (x != x)
++	return x + x;
++      else
++	return 0;
++    }
++  if (x == 0)
++    return x;
++  xx = fabsl (x);
++  if (xx <= 0x1p-58L)
++    {
++      long double ret = x * 0.5L;
++      math_check_force_underflow (ret);
++      if (ret == 0)
++	__set_errno (ERANGE);
++      return ret;
++    }
++  if (xx <= 2)
++    {
++      /* 0 <= x <= 2 */
++      z = xx * xx;
++      p = xx * z * neval (z, J0_2N, NJ0_2N) / deval (z, J0_2D, NJ0_2D);
++      p += 0.5L * xx;
++      if (x < 0)
++	p = -p;
++      return p;
++    }
++
++  /* X = x - 3 pi/4
++     cos(X) = cos(x) cos(3 pi/4) + sin(x) sin(3 pi/4)
++     = 1/sqrt(2) * (-cos(x) + sin(x))
++     sin(X) = sin(x) cos(3 pi/4) - cos(x) sin(3 pi/4)
++     = -1/sqrt(2) * (sin(x) + cos(x))
++     cf. Fdlibm.  */
++  __sincosl (xx, &s, &c);
++  ss = -s - c;
++  cc = s - c;
++  if (xx <= LDBL_MAX / 2)
++    {
++      z = __cosl (xx + xx);
++      if ((s * c) > 0)
++	cc = z / ss;
++      else
++	ss = z / cc;
++    }
++
++  if (xx > 0x1p256L)
++    {
++      z = ONEOSQPI * cc / __ieee754_sqrtl (xx);
++      if (x < 0)
++	z = -z;
++      return z;
++    }
++
++  xinv = 1 / xx;
++  z = xinv * xinv;
++  if (xinv <= 0.25)
++    {
++      if (xinv <= 0.125)
++	{
++	  if (xinv <= 0.0625)
++	    {
++	      p = neval (z, P16_IN, NP16_IN) / deval (z, P16_ID, NP16_ID);
++	      q = neval (z, Q16_IN, NQ16_IN) / deval (z, Q16_ID, NQ16_ID);
++	    }
++	  else
++	    {
++	      p = neval (z, P8_16N, NP8_16N) / deval (z, P8_16D, NP8_16D);
++	      q = neval (z, Q8_16N, NQ8_16N) / deval (z, Q8_16D, NQ8_16D);
++	    }
++	}
++      else if (xinv <= 0.1875)
++	{
++	  p = neval (z, P5_8N, NP5_8N) / deval (z, P5_8D, NP5_8D);
++	  q = neval (z, Q5_8N, NQ5_8N) / deval (z, Q5_8D, NQ5_8D);
++	}
++      else
++	{
++	  p = neval (z, P4_5N, NP4_5N) / deval (z, P4_5D, NP4_5D);
++	  q = neval (z, Q4_5N, NQ4_5N) / deval (z, Q4_5D, NQ4_5D);
++	}
++    }				/* .25 */
++  else /* if (xinv <= 0.5) */
++    {
++      if (xinv <= 0.375)
++	{
++	  if (xinv <= 0.3125)
++	    {
++	      p = neval (z, P3r2_4N, NP3r2_4N) / deval (z, P3r2_4D, NP3r2_4D);
++	      q = neval (z, Q3r2_4N, NQ3r2_4N) / deval (z, Q3r2_4D, NQ3r2_4D);
++	    }
++	  else
++	    {
++	      p = neval (z, P2r7_3r2N, NP2r7_3r2N)
++		  / deval (z, P2r7_3r2D, NP2r7_3r2D);
++	      q = neval (z, Q2r7_3r2N, NQ2r7_3r2N)
++		  / deval (z, Q2r7_3r2D, NQ2r7_3r2D);
++	    }
++	}
++      else if (xinv <= 0.4375)
++	{
++	  p = neval (z, P2r3_2r7N, NP2r3_2r7N)
++	      / deval (z, P2r3_2r7D, NP2r3_2r7D);
++	  q = neval (z, Q2r3_2r7N, NQ2r3_2r7N)
++	      / deval (z, Q2r3_2r7D, NQ2r3_2r7D);
++	}
++      else
++	{
++	  p = neval (z, P2_2r3N, NP2_2r3N) / deval (z, P2_2r3D, NP2_2r3D);
++	  q = neval (z, Q2_2r3N, NQ2_2r3N) / deval (z, Q2_2r3D, NQ2_2r3D);
++	}
++    }
++  p = 1 + z * p;
++  q = z * q;
++  q = q * xinv + 0.375L * xinv;
++  z = ONEOSQPI * (p * cc - q * ss) / __ieee754_sqrtl (xx);
++  if (x < 0)
++    z = -z;
++  return z;
++}
++strong_alias (__ieee754_j1l, __j1l_finite)
++
++
++/* Y1(x) = 2/pi * (log(x) * J1(x) - 1/x) + x R(x^2)
++   Peak relative error 6.2e-38
++   0 <= x <= 2   */
++#define NY0_2N 7
++static long double Y0_2N[NY0_2N + 1] = {
++  -6.804415404830253804408698161694720833249E19L,
++  1.805450517967019908027153056150465849237E19L,
++  -8.065747497063694098810419456383006737312E17L,
++  1.401336667383028259295830955439028236299E16L,
++  -1.171654432898137585000399489686629680230E14L,
++  5.061267920943853732895341125243428129150E11L,
++  -1.096677850566094204586208610960870217970E9L,
++  9.541172044989995856117187515882879304461E5L,
++};
++#define NY0_2D 7
++static long double Y0_2D[NY0_2D + 1] = {
++  3.470629591820267059538637461549677594549E20L,
++  4.120796439009916326855848107545425217219E18L,
++  2.477653371652018249749350657387030814542E16L,
++  9.954678543353888958177169349272167762797E13L,
++  2.957927997613630118216218290262851197754E11L,
++  6.748421382188864486018861197614025972118E8L,
++  1.173453425218010888004562071020305709319E6L,
++  1.450335662961034949894009554536003377187E3L,
++  /* 1.000000000000000000000000000000000000000E0 */
++};
++
++
++/* Bessel function of the second kind, order one.  */
++
++long double
++__ieee754_y1l (long double x)
++{
++  long double xx, xinv, z, p, q, c, s, cc, ss;
++
++  if (! isfinite (x))
++    return 1 / (x + x * x);
++  if (x <= 0)
++    {
++      if (x < 0)
++	return (zero / (zero * x));
++      return -1 / zero; /* -inf and divide by zero exception.  */
++    }
++  xx = fabsl (x);
++  if (xx <= 0x1p-114)
++    {
++      z = -TWOOPI / x;
++      if (isinf (z))
++	__set_errno (ERANGE);
++      return z;
++    }
++  if (xx <= 2)
++    {
++      /* 0 <= x <= 2 */
++      SET_RESTORE_ROUNDL (FE_TONEAREST);
++      z = xx * xx;
++      p = xx * neval (z, Y0_2N, NY0_2N) / deval (z, Y0_2D, NY0_2D);
++      p = -TWOOPI / xx + p;
++      p = TWOOPI * __ieee754_logl (x) * __ieee754_j1l (x) + p;
++      return p;
++    }
++
++  /* X = x - 3 pi/4
++     cos(X) = cos(x) cos(3 pi/4) + sin(x) sin(3 pi/4)
++     = 1/sqrt(2) * (-cos(x) + sin(x))
++     sin(X) = sin(x) cos(3 pi/4) - cos(x) sin(3 pi/4)
++     = -1/sqrt(2) * (sin(x) + cos(x))
++     cf. Fdlibm.  */
++  __sincosl (xx, &s, &c);
++  ss = -s - c;
++  cc = s - c;
++  if (xx <= LDBL_MAX / 2)
++    {
++      z = __cosl (xx + xx);
++      if ((s * c) > 0)
++	cc = z / ss;
++      else
++	ss = z / cc;
++    }
++
++  if (xx > 0x1p256L)
++    return ONEOSQPI * ss / __ieee754_sqrtl (xx);
++
++  xinv = 1 / xx;
++  z = xinv * xinv;
++  if (xinv <= 0.25)
++    {
++      if (xinv <= 0.125)
++	{
++	  if (xinv <= 0.0625)
++	    {
++	      p = neval (z, P16_IN, NP16_IN) / deval (z, P16_ID, NP16_ID);
++	      q = neval (z, Q16_IN, NQ16_IN) / deval (z, Q16_ID, NQ16_ID);
++	    }
++	  else
++	    {
++	      p = neval (z, P8_16N, NP8_16N) / deval (z, P8_16D, NP8_16D);
++	      q = neval (z, Q8_16N, NQ8_16N) / deval (z, Q8_16D, NQ8_16D);
++	    }
++	}
++      else if (xinv <= 0.1875)
++	{
++	  p = neval (z, P5_8N, NP5_8N) / deval (z, P5_8D, NP5_8D);
++	  q = neval (z, Q5_8N, NQ5_8N) / deval (z, Q5_8D, NQ5_8D);
++	}
++      else
++	{
++	  p = neval (z, P4_5N, NP4_5N) / deval (z, P4_5D, NP4_5D);
++	  q = neval (z, Q4_5N, NQ4_5N) / deval (z, Q4_5D, NQ4_5D);
++	}
++    }				/* .25 */
++  else /* if (xinv <= 0.5) */
++    {
++      if (xinv <= 0.375)
++	{
++	  if (xinv <= 0.3125)
++	    {
++	      p = neval (z, P3r2_4N, NP3r2_4N) / deval (z, P3r2_4D, NP3r2_4D);
++	      q = neval (z, Q3r2_4N, NQ3r2_4N) / deval (z, Q3r2_4D, NQ3r2_4D);
++	    }
++	  else
++	    {
++	      p = neval (z, P2r7_3r2N, NP2r7_3r2N)
++		  / deval (z, P2r7_3r2D, NP2r7_3r2D);
++	      q = neval (z, Q2r7_3r2N, NQ2r7_3r2N)
++		  / deval (z, Q2r7_3r2D, NQ2r7_3r2D);
++	    }
++	}
++      else if (xinv <= 0.4375)
++	{
++	  p = neval (z, P2r3_2r7N, NP2r3_2r7N)
++	      / deval (z, P2r3_2r7D, NP2r3_2r7D);
++	  q = neval (z, Q2r3_2r7N, NQ2r3_2r7N)
++	      / deval (z, Q2r3_2r7D, NQ2r3_2r7D);
++	}
++      else
++	{
++	  p = neval (z, P2_2r3N, NP2_2r3N) / deval (z, P2_2r3D, NP2_2r3D);
++	  q = neval (z, Q2_2r3N, NQ2_2r3N) / deval (z, Q2_2r3D, NQ2_2r3D);
++	}
++    }
++  p = 1 + z * p;
++  q = z * q;
++  q = q * xinv + 0.375L * xinv;
++  z = ONEOSQPI * (p * ss + q * cc) / __ieee754_sqrtl (xx);
++  return z;
++}
++strong_alias (__ieee754_y1l, __y1l_finite)
+diff --git a/sysdeps/ieee754/ldbl-128ibm/e_lgammal_r.c b/sysdeps/ieee754/ldbl-128ibm/e_lgammal_r.c
+index 8ac8283bd8..f881b8c0a4 100644
+--- a/sysdeps/ieee754/ldbl-128ibm/e_lgammal_r.c
++++ b/sysdeps/ieee754/ldbl-128ibm/e_lgammal_r.c
+@@ -1,5 +1,992 @@
+-/* Looks like we can use ieee854 e_lgammal_r.c as is for IBM extended format. */
+-#define _Float128 long double
+-#define L(x) x ## L
+-#include <sysdeps/ieee754/ldbl-128/e_lgammal_r.c>
++/* Natural logarithm of gamma function.  IBM Extended Precision version.
++   Copyright 2001 by Stephen L. Moshier <moshier at na-net.ornl.gov>
+ 
++   This library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   This library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with this library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++/* This file was copied from sysdeps/ieee754/ldbl-128/e_lgammal_r.c.  */
++
++
++#include <math.h>
++#include <math_private.h>
++#include <float.h>
++
++static const long double PIL = 3.1415926535897932384626433832795028841972E0L;
++static const long double MAXLGM = 0x5.d53649e2d469dbc1f01e99fd66p+1012L;
++static const long double one = 1;
++static const long double huge = LDBL_MAX;
++
++/* log gamma(x) = ( x - 0.5 ) * log(x) - x + LS2PI + 1/x P(1/x^2)
++   1/x <= 0.0741 (x >= 13.495...)
++   Peak relative error 1.5e-36  */
++static const long double ls2pi = 9.1893853320467274178032973640561763986140E-1L;
++#define NRASY 12
++static const long double RASY[NRASY + 1] =
++{
++  8.333333333333333333333333333310437112111E-2L,
++ -2.777777777777777777777774789556228296902E-3L,
++  7.936507936507936507795933938448586499183E-4L,
++ -5.952380952380952041799269756378148574045E-4L,
++  8.417508417507928904209891117498524452523E-4L,
++ -1.917526917481263997778542329739806086290E-3L,
++  6.410256381217852504446848671499409919280E-3L,
++ -2.955064066900961649768101034477363301626E-2L,
++  1.796402955865634243663453415388336954675E-1L,
++ -1.391522089007758553455753477688592767741E0L,
++  1.326130089598399157988112385013829305510E1L,
++ -1.420412699593782497803472576479997819149E2L,
++  1.218058922427762808938869872528846787020E3L
++};
++
++
++/* log gamma(x+13) = log gamma(13) +  x P(x)/Q(x)
++   -0.5 <= x <= 0.5
++   12.5 <= x+13 <= 13.5
++   Peak relative error 1.1e-36  */
++static const long double lgam13a = 1.9987213134765625E1L;
++static const long double lgam13b = 1.3608962611495173623870550785125024484248E-6L;
++#define NRN13 7
++static const long double RN13[NRN13 + 1] =
++{
++  8.591478354823578150238226576156275285700E11L,
++  2.347931159756482741018258864137297157668E11L,
++  2.555408396679352028680662433943000804616E10L,
++  1.408581709264464345480765758902967123937E9L,
++  4.126759849752613822953004114044451046321E7L,
++  6.133298899622688505854211579222889943778E5L,
++  3.929248056293651597987893340755876578072E3L,
++  6.850783280018706668924952057996075215223E0L
++};
++#define NRD13 6
++static const long double RD13[NRD13 + 1] =
++{
++  3.401225382297342302296607039352935541669E11L,
++  8.756765276918037910363513243563234551784E10L,
++  8.873913342866613213078554180987647243903E9L,
++  4.483797255342763263361893016049310017973E8L,
++  1.178186288833066430952276702931512870676E7L,
++  1.519928623743264797939103740132278337476E5L,
++  7.989298844938119228411117593338850892311E2L
++ /* 1.0E0L */
++};
++
++
++/* log gamma(x+12) = log gamma(12) +  x P(x)/Q(x)
++   -0.5 <= x <= 0.5
++   11.5 <= x+12 <= 12.5
++   Peak relative error 4.1e-36  */
++static const long double lgam12a = 1.75023040771484375E1L;
++static const long double lgam12b = 3.7687254483392876529072161996717039575982E-6L;
++#define NRN12 7
++static const long double RN12[NRN12 + 1] =
++{
++  4.709859662695606986110997348630997559137E11L,
++  1.398713878079497115037857470168777995230E11L,
++  1.654654931821564315970930093932954900867E10L,
++  9.916279414876676861193649489207282144036E8L,
++  3.159604070526036074112008954113411389879E7L,
++  5.109099197547205212294747623977502492861E5L,
++  3.563054878276102790183396740969279826988E3L,
++  6.769610657004672719224614163196946862747E0L
++};
++#define NRD12 6
++static const long double RD12[NRD12 + 1] =
++{
++  1.928167007860968063912467318985802726613E11L,
++  5.383198282277806237247492369072266389233E10L,
++  5.915693215338294477444809323037871058363E9L,
++  3.241438287570196713148310560147925781342E8L,
++  9.236680081763754597872713592701048455890E6L,
++  1.292246897881650919242713651166596478850E5L,
++  7.366532445427159272584194816076600211171E2L
++ /* 1.0E0L */
++};
++
++
++/* log gamma(x+11) = log gamma(11) +  x P(x)/Q(x)
++   -0.5 <= x <= 0.5
++   10.5 <= x+11 <= 11.5
++   Peak relative error 1.8e-35  */
++static const long double lgam11a = 1.5104400634765625E1L;
++static const long double lgam11b = 1.1938309890295225709329251070371882250744E-5L;
++#define NRN11 7
++static const long double RN11[NRN11 + 1] =
++{
++  2.446960438029415837384622675816736622795E11L,
++  7.955444974446413315803799763901729640350E10L,
++  1.030555327949159293591618473447420338444E10L,
++  6.765022131195302709153994345470493334946E8L,
++  2.361892792609204855279723576041468347494E7L,
++  4.186623629779479136428005806072176490125E5L,
++  3.202506022088912768601325534149383594049E3L,
++  6.681356101133728289358838690666225691363E0L
++};
++#define NRD11 6
++static const long double RD11[NRD11 + 1] =
++{
++  1.040483786179428590683912396379079477432E11L,
++  3.172251138489229497223696648369823779729E10L,
++  3.806961885984850433709295832245848084614E9L,
++  2.278070344022934913730015420611609620171E8L,
++  7.089478198662651683977290023829391596481E6L,
++  1.083246385105903533237139380509590158658E5L,
++  6.744420991491385145885727942219463243597E2L
++ /* 1.0E0L */
++};
++
++
++/* log gamma(x+10) = log gamma(10) +  x P(x)/Q(x)
++   -0.5 <= x <= 0.5
++   9.5 <= x+10 <= 10.5
++   Peak relative error 5.4e-37  */
++static const long double lgam10a = 1.280181884765625E1L;
++static const long double lgam10b = 8.6324252196112077178745667061642811492557E-6L;
++#define NRN10 7
++static const long double RN10[NRN10 + 1] =
++{
++  -1.239059737177249934158597996648808363783E14L,
++  -4.725899566371458992365624673357356908719E13L,
++  -7.283906268647083312042059082837754850808E12L,
++  -5.802855515464011422171165179767478794637E11L,
++  -2.532349691157548788382820303182745897298E10L,
++  -5.884260178023777312587193693477072061820E8L,
++  -6.437774864512125749845840472131829114906E6L,
++  -2.350975266781548931856017239843273049384E4L
++};
++#define NRD10 7
++static const long double RD10[NRD10 + 1] =
++{
++  -5.502645997581822567468347817182347679552E13L,
++  -1.970266640239849804162284805400136473801E13L,
++  -2.819677689615038489384974042561531409392E12L,
++  -2.056105863694742752589691183194061265094E11L,
++  -8.053670086493258693186307810815819662078E9L,
++  -1.632090155573373286153427982504851867131E8L,
++  -1.483575879240631280658077826889223634921E6L,
++  -4.002806669713232271615885826373550502510E3L
++ /* 1.0E0L */
++};
++
++
++/* log gamma(x+9) = log gamma(9) +  x P(x)/Q(x)
++   -0.5 <= x <= 0.5
++   8.5 <= x+9 <= 9.5
++   Peak relative error 3.6e-36  */
++static const long double lgam9a = 1.06045989990234375E1L;
++static const long double lgam9b = 3.9037218127284172274007216547549861681400E-6L;
++#define NRN9 7
++static const long double RN9[NRN9 + 1] =
++{
++  -4.936332264202687973364500998984608306189E13L,
++  -2.101372682623700967335206138517766274855E13L,
++  -3.615893404644823888655732817505129444195E12L,
++  -3.217104993800878891194322691860075472926E11L,
++  -1.568465330337375725685439173603032921399E10L,
++  -4.073317518162025744377629219101510217761E8L,
++  -4.983232096406156139324846656819246974500E6L,
++  -2.036280038903695980912289722995505277253E4L
++};
++#define NRD9 7
++static const long double RD9[NRD9 + 1] =
++{
++  -2.306006080437656357167128541231915480393E13L,
++  -9.183606842453274924895648863832233799950E12L,
++  -1.461857965935942962087907301194381010380E12L,
++  -1.185728254682789754150068652663124298303E11L,
++  -5.166285094703468567389566085480783070037E9L,
++  -1.164573656694603024184768200787835094317E8L,
++  -1.177343939483908678474886454113163527909E6L,
++  -3.529391059783109732159524500029157638736E3L
++  /* 1.0E0L */
++};
++
++
++/* log gamma(x+8) = log gamma(8) +  x P(x)/Q(x)
++   -0.5 <= x <= 0.5
++   7.5 <= x+8 <= 8.5
++   Peak relative error 2.4e-37  */
++static const long double lgam8a = 8.525146484375E0L;
++static const long double lgam8b = 1.4876690414300165531036347125050759667737E-5L;
++#define NRN8 8
++static const long double RN8[NRN8 + 1] =
++{
++  6.600775438203423546565361176829139703289E11L,
++  3.406361267593790705240802723914281025800E11L,
++  7.222460928505293914746983300555538432830E10L,
++  8.102984106025088123058747466840656458342E9L,
++  5.157620015986282905232150979772409345927E8L,
++  1.851445288272645829028129389609068641517E7L,
++  3.489261702223124354745894067468953756656E5L,
++  2.892095396706665774434217489775617756014E3L,
++  6.596977510622195827183948478627058738034E0L
++};
++#define NRD8 7
++static const long double RD8[NRD8 + 1] =
++{
++  3.274776546520735414638114828622673016920E11L,
++  1.581811207929065544043963828487733970107E11L,
++  3.108725655667825188135393076860104546416E10L,
++  3.193055010502912617128480163681842165730E9L,
++  1.830871482669835106357529710116211541839E8L,
++  5.790862854275238129848491555068073485086E6L,
++  9.305213264307921522842678835618803553589E4L,
++  6.216974105861848386918949336819572333622E2L
++  /* 1.0E0L */
++};
++
++
++/* log gamma(x+7) = log gamma(7) +  x P(x)/Q(x)
++   -0.5 <= x <= 0.5
++   6.5 <= x+7 <= 7.5
++   Peak relative error 3.2e-36  */
++static const long double lgam7a = 6.5792388916015625E0L;
++static const long double lgam7b = 1.2320408538495060178292903945321122583007E-5L;
++#define NRN7 8
++static const long double RN7[NRN7 + 1] =
++{
++  2.065019306969459407636744543358209942213E11L,
++  1.226919919023736909889724951708796532847E11L,
++  2.996157990374348596472241776917953749106E10L,
++  3.873001919306801037344727168434909521030E9L,
++  2.841575255593761593270885753992732145094E8L,
++  1.176342515359431913664715324652399565551E7L,
++  2.558097039684188723597519300356028511547E5L,
++  2.448525238332609439023786244782810774702E3L,
++  6.460280377802030953041566617300902020435E0L
++};
++#define NRD7 7
++static const long double RD7[NRD7 + 1] =
++{
++  1.102646614598516998880874785339049304483E11L,
++  6.099297512712715445879759589407189290040E10L,
++  1.372898136289611312713283201112060238351E10L,
++  1.615306270420293159907951633566635172343E9L,
++  1.061114435798489135996614242842561967459E8L,
++  3.845638971184305248268608902030718674691E6L,
++  7.081730675423444975703917836972720495507E4L,
++  5.423122582741398226693137276201344096370E2L
++  /* 1.0E0L */
++};
++
++
++/* log gamma(x+6) = log gamma(6) +  x P(x)/Q(x)
++   -0.5 <= x <= 0.5
++   5.5 <= x+6 <= 6.5
++   Peak relative error 6.2e-37  */
++static const long double lgam6a = 4.7874908447265625E0L;
++static const long double lgam6b = 8.9805548349424770093452324304839959231517E-7L;
++#define NRN6 8
++static const long double RN6[NRN6 + 1] =
++{
++  -3.538412754670746879119162116819571823643E13L,
++  -2.613432593406849155765698121483394257148E13L,
++  -8.020670732770461579558867891923784753062E12L,
++  -1.322227822931250045347591780332435433420E12L,
++  -1.262809382777272476572558806855377129513E11L,
++  -7.015006277027660872284922325741197022467E9L,
++  -2.149320689089020841076532186783055727299E8L,
++  -3.167210585700002703820077565539658995316E6L,
++  -1.576834867378554185210279285358586385266E4L
++};
++#define NRD6 8
++static const long double RD6[NRD6 + 1] =
++{
++  -2.073955870771283609792355579558899389085E13L,
++  -1.421592856111673959642750863283919318175E13L,
++  -4.012134994918353924219048850264207074949E12L,
++  -6.013361045800992316498238470888523722431E11L,
++  -5.145382510136622274784240527039643430628E10L,
++  -2.510575820013409711678540476918249524123E9L,
++  -6.564058379709759600836745035871373240904E7L,
++  -7.861511116647120540275354855221373571536E5L,
++  -2.821943442729620524365661338459579270561E3L
++  /* 1.0E0L */
++};
++
++
++/* log gamma(x+5) = log gamma(5) +  x P(x)/Q(x)
++   -0.5 <= x <= 0.5
++   4.5 <= x+5 <= 5.5
++   Peak relative error 3.4e-37  */
++static const long double lgam5a = 3.17803955078125E0L;
++static const long double lgam5b = 1.4279566695619646941601297055408873990961E-5L;
++#define NRN5 9
++static const long double RN5[NRN5 + 1] =
++{
++  2.010952885441805899580403215533972172098E11L,
++  1.916132681242540921354921906708215338584E11L,
++  7.679102403710581712903937970163206882492E10L,
++  1.680514903671382470108010973615268125169E10L,
++  2.181011222911537259440775283277711588410E9L,
++  1.705361119398837808244780667539728356096E8L,
++  7.792391565652481864976147945997033946360E6L,
++  1.910741381027985291688667214472560023819E5L,
++  2.088138241893612679762260077783794329559E3L,
++  6.330318119566998299106803922739066556550E0L
++};
++#define NRD5 8
++static const long double RD5[NRD5 + 1] =
++{
++  1.335189758138651840605141370223112376176E11L,
++  1.174130445739492885895466097516530211283E11L,
++  4.308006619274572338118732154886328519910E10L,
++  8.547402888692578655814445003283720677468E9L,
++  9.934628078575618309542580800421370730906E8L,
++  6.847107420092173812998096295422311820672E7L,
++  2.698552646016599923609773122139463150403E6L,
++  5.526516251532464176412113632726150253215E4L,
++  4.772343321713697385780533022595450486932E2L
++  /* 1.0E0L */
++};
++
++
++/* log gamma(x+4) = log gamma(4) +  x P(x)/Q(x)
++   -0.5 <= x <= 0.5
++   3.5 <= x+4 <= 4.5
++   Peak relative error 6.7e-37  */
++static const long double lgam4a = 1.791748046875E0L;
++static const long double lgam4b = 1.1422353055000812477358380702272722990692E-5L;
++#define NRN4 9
++static const long double RN4[NRN4 + 1] =
++{
++  -1.026583408246155508572442242188887829208E13L,
++  -1.306476685384622809290193031208776258809E13L,
++  -7.051088602207062164232806511992978915508E12L,
++  -2.100849457735620004967624442027793656108E12L,
++  -3.767473790774546963588549871673843260569E11L,
++  -4.156387497364909963498394522336575984206E10L,
++  -2.764021460668011732047778992419118757746E9L,
++  -1.036617204107109779944986471142938641399E8L,
++  -1.895730886640349026257780896972598305443E6L,
++  -1.180509051468390914200720003907727988201E4L
++};
++#define NRD4 9
++static const long double RD4[NRD4 + 1] =
++{
++  -8.172669122056002077809119378047536240889E12L,
++  -9.477592426087986751343695251801814226960E12L,
++  -4.629448850139318158743900253637212801682E12L,
++  -1.237965465892012573255370078308035272942E12L,
++  -1.971624313506929845158062177061297598956E11L,
++  -1.905434843346570533229942397763361493610E10L,
++  -1.089409357680461419743730978512856675984E9L,
++  -3.416703082301143192939774401370222822430E7L,
++  -4.981791914177103793218433195857635265295E5L,
++  -2.192507743896742751483055798411231453733E3L
++  /* 1.0E0L */
++};
++
++
++/* log gamma(x+3) = log gamma(3) +  x P(x)/Q(x)
++   -0.25 <= x <= 0.5
++   2.75 <= x+3 <= 3.5
++   Peak relative error 6.0e-37  */
++static const long double lgam3a = 6.93145751953125E-1L;
++static const long double lgam3b = 1.4286068203094172321214581765680755001344E-6L;
++
++#define NRN3 9
++static const long double RN3[NRN3 + 1] =
++{
++  -4.813901815114776281494823863935820876670E11L,
++  -8.425592975288250400493910291066881992620E11L,
++  -6.228685507402467503655405482985516909157E11L,
++  -2.531972054436786351403749276956707260499E11L,
++  -6.170200796658926701311867484296426831687E10L,
++  -9.211477458528156048231908798456365081135E9L,
++  -8.251806236175037114064561038908691305583E8L,
++  -4.147886355917831049939930101151160447495E7L,
++  -1.010851868928346082547075956946476932162E6L,
++  -8.333374463411801009783402800801201603736E3L
++};
++#define NRD3 9
++static const long double RD3[NRD3 + 1] =
++{
++  -5.216713843111675050627304523368029262450E11L,
++  -8.014292925418308759369583419234079164391E11L,
++  -5.180106858220030014546267824392678611990E11L,
++  -1.830406975497439003897734969120997840011E11L,
++  -3.845274631904879621945745960119924118925E10L,
++  -4.891033385370523863288908070309417710903E9L,
++  -3.670172254411328640353855768698287474282E8L,
++  -1.505316381525727713026364396635522516989E7L,
++  -2.856327162923716881454613540575964890347E5L,
++  -1.622140448015769906847567212766206894547E3L
++  /* 1.0E0L */
++};
++
++
++/* log gamma(x+2.5) = log gamma(2.5) +  x P(x)/Q(x)
++   -0.125 <= x <= 0.25
++   2.375 <= x+2.5 <= 2.75  */
++static const long double lgam2r5a = 2.8466796875E-1L;
++static const long double lgam2r5b = 1.4901722919159632494669682701924320137696E-5L;
++#define NRN2r5 8
++static const long double RN2r5[NRN2r5 + 1] =
++{
++  -4.676454313888335499356699817678862233205E9L,
++  -9.361888347911187924389905984624216340639E9L,
++  -7.695353600835685037920815799526540237703E9L,
++  -3.364370100981509060441853085968900734521E9L,
++  -8.449902011848163568670361316804900559863E8L,
++  -1.225249050950801905108001246436783022179E8L,
++  -9.732972931077110161639900388121650470926E6L,
++  -3.695711763932153505623248207576425983573E5L,
++  -4.717341584067827676530426007495274711306E3L
++};
++#define NRD2r5 8
++static const long double RD2r5[NRD2r5 + 1] =
++{
++  -6.650657966618993679456019224416926875619E9L,
++  -1.099511409330635807899718829033488771623E10L,
++  -7.482546968307837168164311101447116903148E9L,
++  -2.702967190056506495988922973755870557217E9L,
++  -5.570008176482922704972943389590409280950E8L,
++  -6.536934032192792470926310043166993233231E7L,
++  -4.101991193844953082400035444146067511725E6L,
++  -1.174082735875715802334430481065526664020E5L,
++  -9.932840389994157592102947657277692978511E2L
++  /* 1.0E0L */
++};
++
++
++/* log gamma(x+2) = x P(x)/Q(x)
++   -0.125 <= x <= +0.375
++   1.875 <= x+2 <= 2.375
++   Peak relative error 4.6e-36  */
++#define NRN2 9
++static const long double RN2[NRN2 + 1] =
++{
++  -3.716661929737318153526921358113793421524E9L,
++  -1.138816715030710406922819131397532331321E10L,
++  -1.421017419363526524544402598734013569950E10L,
++  -9.510432842542519665483662502132010331451E9L,
++  -3.747528562099410197957514973274474767329E9L,
++  -8.923565763363912474488712255317033616626E8L,
++  -1.261396653700237624185350402781338231697E8L,
++  -9.918402520255661797735331317081425749014E6L,
++  -3.753996255897143855113273724233104768831E5L,
++  -4.778761333044147141559311805999540765612E3L
++};
++#define NRD2 9
++static const long double RD2[NRD2 + 1] =
++{
++  -8.790916836764308497770359421351673950111E9L,
++  -2.023108608053212516399197678553737477486E10L,
++  -1.958067901852022239294231785363504458367E10L,
++  -1.035515043621003101254252481625188704529E10L,
++  -3.253884432621336737640841276619272224476E9L,
++  -6.186383531162456814954947669274235815544E8L,
++  -6.932557847749518463038934953605969951466E7L,
++  -4.240731768287359608773351626528479703758E6L,
++  -1.197343995089189188078944689846348116630E5L,
++  -1.004622911670588064824904487064114090920E3L
++/* 1.0E0 */
++};
++
++
++/* log gamma(x+1.75) = log gamma(1.75) +  x P(x)/Q(x)
++   -0.125 <= x <= +0.125
++   1.625 <= x+1.75 <= 1.875
++   Peak relative error 9.2e-37 */
++static const long double lgam1r75a = -8.441162109375E-2L;
++static const long double lgam1r75b = 1.0500073264444042213965868602268256157604E-5L;
++#define NRN1r75 8
++static const long double RN1r75[NRN1r75 + 1] =
++{
++  -5.221061693929833937710891646275798251513E7L,
++  -2.052466337474314812817883030472496436993E8L,
++  -2.952718275974940270675670705084125640069E8L,
++  -2.132294039648116684922965964126389017840E8L,
++  -8.554103077186505960591321962207519908489E7L,
++  -1.940250901348870867323943119132071960050E7L,
++  -2.379394147112756860769336400290402208435E6L,
++  -1.384060879999526222029386539622255797389E5L,
++  -2.698453601378319296159355612094598695530E3L
++};
++#define NRD1r75 8
++static const long double RD1r75[NRD1r75 + 1] =
++{
++  -2.109754689501705828789976311354395393605E8L,
++  -5.036651829232895725959911504899241062286E8L,
++  -4.954234699418689764943486770327295098084E8L,
++  -2.589558042412676610775157783898195339410E8L,
++  -7.731476117252958268044969614034776883031E7L,
++  -1.316721702252481296030801191240867486965E7L,
++  -1.201296501404876774861190604303728810836E6L,
++  -5.007966406976106636109459072523610273928E4L,
++  -6.155817990560743422008969155276229018209E2L
++  /* 1.0E0L */
++};
++
++
++/* log gamma(x+x0) = y0 +  x^2 P(x)/Q(x)
++   -0.0867 <= x <= +0.1634
++   1.374932... <= x+x0 <= 1.625032...
++   Peak relative error 4.0e-36  */
++static const long double x0a = 1.4616241455078125L;
++static const long double x0b = 7.9994605498412626595423257213002588621246E-6L;
++static const long double y0a = -1.21490478515625E-1L;
++static const long double y0b = 4.1879797753919044854428223084178486438269E-6L;
++#define NRN1r5 8
++static const long double RN1r5[NRN1r5 + 1] =
++{
++  6.827103657233705798067415468881313128066E5L,
++  1.910041815932269464714909706705242148108E6L,
++  2.194344176925978377083808566251427771951E6L,
++  1.332921400100891472195055269688876427962E6L,
++  4.589080973377307211815655093824787123508E5L,
++  8.900334161263456942727083580232613796141E4L,
++  9.053840838306019753209127312097612455236E3L,
++  4.053367147553353374151852319743594873771E2L,
++  5.040631576303952022968949605613514584950E0L
++};
++#define NRD1r5 8
++static const long double RD1r5[NRD1r5 + 1] =
++{
++  1.411036368843183477558773688484699813355E6L,
++  4.378121767236251950226362443134306184849E6L,
++  5.682322855631723455425929877581697918168E6L,
++  3.999065731556977782435009349967042222375E6L,
++  1.653651390456781293163585493620758410333E6L,
++  4.067774359067489605179546964969435858311E5L,
++  5.741463295366557346748361781768833633256E4L,
++  4.226404539738182992856094681115746692030E3L,
++  1.316980975410327975566999780608618774469E2L,
++  /* 1.0E0L */
++};
++
++
++/* log gamma(x+1.25) = log gamma(1.25) +  x P(x)/Q(x)
++   -.125 <= x <= +.125
++   1.125 <= x+1.25 <= 1.375
++   Peak relative error = 4.9e-36 */
++static const long double lgam1r25a = -9.82818603515625E-2L;
++static const long double lgam1r25b = 1.0023929749338536146197303364159774377296E-5L;
++#define NRN1r25 9
++static const long double RN1r25[NRN1r25 + 1] =
++{
++  -9.054787275312026472896002240379580536760E4L,
++  -8.685076892989927640126560802094680794471E4L,
++  2.797898965448019916967849727279076547109E5L,
++  6.175520827134342734546868356396008898299E5L,
++  5.179626599589134831538516906517372619641E5L,
++  2.253076616239043944538380039205558242161E5L,
++  5.312653119599957228630544772499197307195E4L,
++  6.434329437514083776052669599834938898255E3L,
++  3.385414416983114598582554037612347549220E2L,
++  4.907821957946273805080625052510832015792E0L
++};
++#define NRD1r25 8
++static const long double RD1r25[NRD1r25 + 1] =
++{
++  3.980939377333448005389084785896660309000E5L,
++  1.429634893085231519692365775184490465542E6L,
++  2.145438946455476062850151428438668234336E6L,
++  1.743786661358280837020848127465970357893E6L,
++  8.316364251289743923178092656080441655273E5L,
++  2.355732939106812496699621491135458324294E5L,
++  3.822267399625696880571810137601310855419E4L,
++  3.228463206479133236028576845538387620856E3L,
++  1.152133170470059555646301189220117965514E2L
++  /* 1.0E0L */
++};
++
++
++/* log gamma(x + 1) = x P(x)/Q(x)
++   0.0 <= x <= +0.125
++   1.0 <= x+1 <= 1.125
++   Peak relative error 1.1e-35  */
++#define NRN1 8
++static const long double RN1[NRN1 + 1] =
++{
++  -9.987560186094800756471055681088744738818E3L,
++  -2.506039379419574361949680225279376329742E4L,
++  -1.386770737662176516403363873617457652991E4L,
++  1.439445846078103202928677244188837130744E4L,
++  2.159612048879650471489449668295139990693E4L,
++  1.047439813638144485276023138173676047079E4L,
++  2.250316398054332592560412486630769139961E3L,
++  1.958510425467720733041971651126443864041E2L,
++  4.516830313569454663374271993200291219855E0L
++};
++#define NRD1 7
++static const long double RD1[NRD1 + 1] =
++{
++  1.730299573175751778863269333703788214547E4L,
++  6.807080914851328611903744668028014678148E4L,
++  1.090071629101496938655806063184092302439E5L,
++  9.124354356415154289343303999616003884080E4L,
++  4.262071638655772404431164427024003253954E4L,
++  1.096981664067373953673982635805821283581E4L,
++  1.431229503796575892151252708527595787588E3L,
++  7.734110684303689320830401788262295992921E1L
++ /* 1.0E0 */
++};
++
++
++/* log gamma(x + 1) = x P(x)/Q(x)
++   -0.125 <= x <= 0
++   0.875 <= x+1 <= 1.0
++   Peak relative error 7.0e-37  */
++#define NRNr9 8
++static const long double RNr9[NRNr9 + 1] =
++{
++  4.441379198241760069548832023257571176884E5L,
++  1.273072988367176540909122090089580368732E6L,
++  9.732422305818501557502584486510048387724E5L,
++  -5.040539994443998275271644292272870348684E5L,
++  -1.208719055525609446357448132109723786736E6L,
++  -7.434275365370936547146540554419058907156E5L,
++  -2.075642969983377738209203358199008185741E5L,
++  -2.565534860781128618589288075109372218042E4L,
++  -1.032901669542994124131223797515913955938E3L,
++};
++#define NRDr9 8
++static const long double RDr9[NRDr9 + 1] =
++{
++  -7.694488331323118759486182246005193998007E5L,
++  -3.301918855321234414232308938454112213751E6L,
++  -5.856830900232338906742924836032279404702E6L,
++  -5.540672519616151584486240871424021377540E6L,
++  -3.006530901041386626148342989181721176919E6L,
++  -9.350378280513062139466966374330795935163E5L,
++  -1.566179100031063346901755685375732739511E5L,
++  -1.205016539620260779274902967231510804992E4L,
++  -2.724583156305709733221564484006088794284E2L
++/* 1.0E0 */
++};
++
++
++/* Evaluate P[n] x^n  +  P[n-1] x^(n-1)  +  ...  +  P[0] */
++
++static long double
++neval (long double x, const long double *p, int n)
++{
++  long double y;
++
++  p += n;
++  y = *p--;
++  do
++    {
++      y = y * x + *p--;
++    }
++  while (--n > 0);
++  return y;
++}
++
++
++/* Evaluate x^n+1  +  P[n] x^(n)  +  P[n-1] x^(n-1)  +  ...  +  P[0] */
++
++static long double
++deval (long double x, const long double *p, int n)
++{
++  long double y;
++
++  p += n;
++  y = x + *p--;
++  do
++    {
++      y = y * x + *p--;
++    }
++  while (--n > 0);
++  return y;
++}
++
++
++long double
++__ieee754_lgammal_r (long double x, int *signgamp)
++{
++  long double p, q, w, z, nx;
++  int i, nn;
++
++  *signgamp = 1;
++
++  if (! isfinite (x))
++    return x * x;
++
++  if (x == 0)
++    {
++      if (signbit (x))
++	*signgamp = -1;
++    }
++
++  if (x < 0)
++    {
++      if (x < -2 && x > -48)
++	return __lgamma_negl (x, signgamp);
++      q = -x;
++      p = __floorl (q);
++      if (p == q)
++	return (one / __fabsl (p - p));
++      long double halfp = p * 0.5L;
++      if (halfp == __floorl (halfp))
++	*signgamp = -1;
++      else
++	*signgamp = 1;
++      if (q < 0x1p-120L)
++	return -__logl (q);
++      z = q - p;
++      if (z > 0.5L)
++	{
++	  p += 1;
++	  z = p - q;
++	}
++      z = q * __sinl (PIL * z);
++      w = __ieee754_lgammal_r (q, &i);
++      z = __logl (PIL / z) - w;
++      return (z);
++    }
++
++  if (x < 13.5L)
++    {
++      p = 0;
++      nx = __floorl (x + 0.5L);
++      nn = nx;
++      switch (nn)
++	{
++	case 0:
++	  /* log gamma (x + 1) = log(x) + log gamma(x) */
++	  if (x < 0x1p-120L)
++	    return -__logl (x);
++	  else if (x <= 0.125)
++	    {
++	      p = x * neval (x, RN1, NRN1) / deval (x, RD1, NRD1);
++	    }
++	  else if (x <= 0.375)
++	    {
++	      z = x - 0.25L;
++	      p = z * neval (z, RN1r25, NRN1r25) / deval (z, RD1r25, NRD1r25);
++	      p += lgam1r25b;
++	      p += lgam1r25a;
++	    }
++	  else if (x <= 0.625)
++	    {
++	      z = x + (1 - x0a);
++	      z = z - x0b;
++	      p = neval (z, RN1r5, NRN1r5) / deval (z, RD1r5, NRD1r5);
++	      p = p * z * z;
++	      p = p + y0b;
++	      p = p + y0a;
++	    }
++	  else if (x <= 0.875)
++	    {
++	      z = x - 0.75L;
++	      p = z * neval (z, RN1r75, NRN1r75) / deval (z, RD1r75, NRD1r75);
++	      p += lgam1r75b;
++	      p += lgam1r75a;
++	    }
++	  else
++	    {
++	      z = x - 1;
++	      p = z * neval (z, RN2, NRN2) / deval (z, RD2, NRD2);
++	    }
++	  p = p - __logl (x);
++	  break;
++
++	case 1:
++	  if (x < 0.875L)
++	    {
++	      if (x <= 0.625)
++		{
++		  z = x + (1 - x0a);
++		  z = z - x0b;
++		  p = neval (z, RN1r5, NRN1r5) / deval (z, RD1r5, NRD1r5);
++		  p = p * z * z;
++		  p = p + y0b;
++		  p = p + y0a;
++		}
++	      else if (x <= 0.875)
++		{
++		  z = x - 0.75L;
++		  p = z * neval (z, RN1r75, NRN1r75)
++			/ deval (z, RD1r75, NRD1r75);
++		  p += lgam1r75b;
++		  p += lgam1r75a;
++		}
++	      else
++		{
++		  z = x - 1;
++		  p = z * neval (z, RN2, NRN2) / deval (z, RD2, NRD2);
++		}
++	      p = p - __logl (x);
++	    }
++	  else if (x < 1)
++	    {
++	      z = x - 1;
++	      p = z * neval (z, RNr9, NRNr9) / deval (z, RDr9, NRDr9);
++	    }
++	  else if (x == 1)
++	    p = 0;
++	  else if (x <= 1.125L)
++	    {
++	      z = x - 1;
++	      p = z * neval (z, RN1, NRN1) / deval (z, RD1, NRD1);
++	    }
++	  else if (x <= 1.375)
++	    {
++	      z = x - 1.25L;
++	      p = z * neval (z, RN1r25, NRN1r25) / deval (z, RD1r25, NRD1r25);
++	      p += lgam1r25b;
++	      p += lgam1r25a;
++	    }
++	  else
++	    {
++	      /* 1.375 <= x+x0 <= 1.625 */
++	      z = x - x0a;
++	      z = z - x0b;
++	      p = neval (z, RN1r5, NRN1r5) / deval (z, RD1r5, NRD1r5);
++	      p = p * z * z;
++	      p = p + y0b;
++	      p = p + y0a;
++	    }
++	  break;
++
++	case 2:
++	  if (x < 1.625L)
++	    {
++	      z = x - x0a;
++	      z = z - x0b;
++	      p = neval (z, RN1r5, NRN1r5) / deval (z, RD1r5, NRD1r5);
++	      p = p * z * z;
++	      p = p + y0b;
++	      p = p + y0a;
++	    }
++	  else if (x < 1.875L)
++	    {
++	      z = x - 1.75L;
++	      p = z * neval (z, RN1r75, NRN1r75) / deval (z, RD1r75, NRD1r75);
++	      p += lgam1r75b;
++	      p += lgam1r75a;
++	    }
++	  else if (x == 2)
++	    p = 0;
++	  else if (x < 2.375L)
++	    {
++	      z = x - 2;
++	      p = z * neval (z, RN2, NRN2) / deval (z, RD2, NRD2);
++	    }
++	  else
++	    {
++	      z = x - 2.5L;
++	      p = z * neval (z, RN2r5, NRN2r5) / deval (z, RD2r5, NRD2r5);
++	      p += lgam2r5b;
++	      p += lgam2r5a;
++	    }
++	  break;
++
++	case 3:
++	  if (x < 2.75)
++	    {
++	      z = x - 2.5L;
++	      p = z * neval (z, RN2r5, NRN2r5) / deval (z, RD2r5, NRD2r5);
++	      p += lgam2r5b;
++	      p += lgam2r5a;
++	    }
++	  else
++	    {
++	      z = x - 3;
++	      p = z * neval (z, RN3, NRN3) / deval (z, RD3, NRD3);
++	      p += lgam3b;
++	      p += lgam3a;
++	    }
++	  break;
++
++	case 4:
++	  z = x - 4;
++	  p = z * neval (z, RN4, NRN4) / deval (z, RD4, NRD4);
++	  p += lgam4b;
++	  p += lgam4a;
++	  break;
++
++	case 5:
++	  z = x - 5;
++	  p = z * neval (z, RN5, NRN5) / deval (z, RD5, NRD5);
++	  p += lgam5b;
++	  p += lgam5a;
++	  break;
++
++	case 6:
++	  z = x - 6;
++	  p = z * neval (z, RN6, NRN6) / deval (z, RD6, NRD6);
++	  p += lgam6b;
++	  p += lgam6a;
++	  break;
++
++	case 7:
++	  z = x - 7;
++	  p = z * neval (z, RN7, NRN7) / deval (z, RD7, NRD7);
++	  p += lgam7b;
++	  p += lgam7a;
++	  break;
++
++	case 8:
++	  z = x - 8;
++	  p = z * neval (z, RN8, NRN8) / deval (z, RD8, NRD8);
++	  p += lgam8b;
++	  p += lgam8a;
++	  break;
++
++	case 9:
++	  z = x - 9;
++	  p = z * neval (z, RN9, NRN9) / deval (z, RD9, NRD9);
++	  p += lgam9b;
++	  p += lgam9a;
++	  break;
++
++	case 10:
++	  z = x - 10;
++	  p = z * neval (z, RN10, NRN10) / deval (z, RD10, NRD10);
++	  p += lgam10b;
++	  p += lgam10a;
++	  break;
++
++	case 11:
++	  z = x - 11;
++	  p = z * neval (z, RN11, NRN11) / deval (z, RD11, NRD11);
++	  p += lgam11b;
++	  p += lgam11a;
++	  break;
++
++	case 12:
++	  z = x - 12;
++	  p = z * neval (z, RN12, NRN12) / deval (z, RD12, NRD12);
++	  p += lgam12b;
++	  p += lgam12a;
++	  break;
++
++	case 13:
++	  z = x - 13;
++	  p = z * neval (z, RN13, NRN13) / deval (z, RD13, NRD13);
++	  p += lgam13b;
++	  p += lgam13a;
++	  break;
++	}
++      return p;
++    }
++
++  if (x > MAXLGM)
++    return (*signgamp * huge * huge);
++
++  if (x > 0x1p120L)
++    return x * (__logl (x) - 1);
++  q = ls2pi - x;
++  q = (x - 0.5L) * __logl (x) + q;
++  if (x > 1.0e18L)
++    return (q);
++
++  p = 1 / (x * x);
++  q += neval (p, RASY, NRASY) / x;
++  return (q);
++}
++strong_alias (__ieee754_lgammal_r, __lgammal_r_finite)
+diff --git a/sysdeps/ieee754/ldbl-128ibm/s_cbrtl.c b/sysdeps/ieee754/ldbl-128ibm/s_cbrtl.c
+index 64bfc46414..317d238057 100644
+--- a/sysdeps/ieee754/ldbl-128ibm/s_cbrtl.c
++++ b/sysdeps/ieee754/ldbl-128ibm/s_cbrtl.c
+@@ -1,10 +1,102 @@
+-/* Looks like we can use ieee854 s_cbrtl.c as is for IBM extended format. */
++/* Implementation of cbrtl.  IBM Extended Precision version.
++   Cephes Math Library Release 2.2: January, 1991
++   Copyright 1984, 1991 by Stephen L. Moshier
++   Adapted for glibc October, 2001.
++
++   This library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   This library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with this library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++/* This file was copied from sysdeps/ieee754/ldbl-128/e_j0l.c.  */
++
++
+ #include <math_ldbl_opt.h>
+-#undef weak_alias
+-#define weak_alias(n,a)
++#include <math.h>
++#include <math_private.h>
++
++static const long double CBRT2 = 1.259921049894873164767210607278228350570251L;
++static const long double CBRT4 = 1.587401051968199474751705639272308260391493L;
++static const long double CBRT2I = 0.7937005259840997373758528196361541301957467L;
++static const long double CBRT4I = 0.6299605249474365823836053036391141752851257L;
++
++
++long double
++__cbrtl (long double x)
++{
++  int e, rem, sign;
++  long double z;
++
++  if (!isfinite (x))
++    return x + x;
++
++  if (x == 0)
++    return (x);
++
++  if (x > 0)
++    sign = 1;
++  else
++    {
++      sign = -1;
++      x = -x;
++    }
++
++  z = x;
++ /* extract power of 2, leaving mantissa between 0.5 and 1  */
++  x = __frexpl (x, &e);
++
++  /* Approximate cube root of number between .5 and 1,
++     peak relative error = 1.2e-6  */
++  x = ((((1.3584464340920900529734e-1L * x
++	  - 6.3986917220457538402318e-1L) * x
++	 + 1.2875551670318751538055e0L) * x
++	- 1.4897083391357284957891e0L) * x
++       + 1.3304961236013647092521e0L) * x + 3.7568280825958912391243e-1L;
++
++  /* exponent divided by 3 */
++  if (e >= 0)
++    {
++      rem = e;
++      e /= 3;
++      rem -= 3 * e;
++      if (rem == 1)
++	x *= CBRT2;
++      else if (rem == 2)
++	x *= CBRT4;
++    }
++  else
++    {				/* argument less than 1 */
++      e = -e;
++      rem = e;
++      e /= 3;
++      rem -= 3 * e;
++      if (rem == 1)
++	x *= CBRT2I;
++      else if (rem == 2)
++	x *= CBRT4I;
++      e = -e;
++    }
++
++  /* multiply by power of 2 */
++  x = __ldexpl (x, e);
++
++  /* Newton iteration */
++  x -= (x - (z / (x * x))) * 0.3333333333333333333333333333333333333333L;
++  x -= (x - (z / (x * x))) * 0.3333333333333333333333333333333333333333L;
++  x -= (x - (z / (x * x))) * 0.3333333333333333333333333333333333333333L;
+ 
+-#define _Float128 long double
+-#define L(x) x ## L
++  if (sign < 0)
++    x = -x;
++  return (x);
++}
+ 
+-#include <sysdeps/ieee754/ldbl-128/s_cbrtl.c>
+ long_double_symbol (libm, __cbrtl, cbrtl);
+diff --git a/sysdeps/ieee754/ldbl-128ibm/t_expl.h b/sysdeps/ieee754/ldbl-128ibm/t_expl.h
+new file mode 100644
+index 0000000000..e2fe4dd2ef
+--- /dev/null
++++ b/sysdeps/ieee754/ldbl-128ibm/t_expl.h
+@@ -0,0 +1,970 @@
++/* Accurate table for expl().
++   Copyright (C) 1999-2017 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
++/* __expl_table basically consists of four tables, T_EXPL_ARG{1,2} and
++   T_EXPL_RES{1,2}. All tables use positive and negative indexes, the 0 points
++   are marked by T_EXPL_* defines.
++   For ARG1 and RES1 tables lets B be 89 and S 256.0, for ARG2 and RES2 B is 65
++   and S 32768.0.
++   These table have the property that, for all integers -B <= i <= B
++   expl(__expl_table[T_EXPL_ARGN+2*i]+__expl_table[T_EXPL_ARGN+2*i+1]+r) ==
++   __expl_table[T_EXPL_RESN+i], __expl_table[T_EXPL_RESN+i] is some exact number
++   with the low 58 bits of the mantissa 0,
++   __expl_table[T_EXPL_ARGN+2*i] == i/S+s
++   where absl(s) <= 2^-54 and absl(r) <= 2^-212.  */
++
++
++static const long double __expl_table [] = {
++ -3.47656250000000000584188889839535373E-01L, /* bffd640000000000002b1b04213cf000 */
++  6.90417668990715641167244540876988960E-32L, /* 3f97667c3fdb588a6ae1af8748357a17 */
++ -3.43749999999999981853132895957607418E-01L, /* bffd5ffffffffffffac4ff5f4050b000 */
++ -7.16021898043268093462818380603370350E-33L, /* bf94296c8219427edc1431ac2498583e */
++ -3.39843750000000013418643523138766329E-01L, /* bffd5c000000000003de1f027a30e000 */
++  8.16920774283317801641347327589583265E-32L, /* 3f97a82b65774bdc