From 9d6beb2dd3414f62e42a9a1940e9e3d0b2700500 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Mat=C3=ADas=20Fonzo?= <selk@dragora.org>
Date: Sat, 23 Feb 2019 16:39:58 -0300
Subject: [PATCH] musl upgraded to snapshot #ad795d5

---
 recipes/libs/musl/recipe                                     | 12 ++++++------
 sources/SOURCELIST.txt                                       |  2 +-
 ...sl-1691b23955590d1eb66a11158fdd91c86337e886.tar.gz.sha256 |  1 -
 ...sl-ad795d56ba3fb9d69f524ee676e3b1e2355cceb7.tar.gz.sha256 |  1 +
 stages/0/04-musl                                             |  2 +-
 stages/1/02-musl                                             |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 sources/musl-1691b23955590d1eb66a11158fdd91c86337e886.tar.gz.sha256
 create mode 100644 sources/musl-ad795d56ba3fb9d69f524ee676e3b1e2355cceb7.tar.gz.sha256

diff --git a/recipes/libs/musl/recipe b/recipes/libs/musl/recipe
index 03bdbb6f..d63f92f9 100644
--- a/recipes/libs/musl/recipe
+++ b/recipes/libs/musl/recipe
@@ -15,8 +15,8 @@
 # limitations under the License.
 
 program=musl
-version=1691b23955590d1eb66a11158fdd91c86337e886
-release=2
+version=ad795d56ba3fb9d69f524ee676e3b1e2355cceb7
+release=1
 
 # Set 'outdir' for a nice and well-organized output directory
 outdir="${outdir}/${arch}/libs"
@@ -86,10 +86,10 @@ build()
     ln -sf /usr/lib${libSuffix}/libc.so "${destdir}/usr/bin/ldd"
 
     # Create dynamic linker runtime file taking -$(ARCH) as reference
-    for file in "${destdir}"/lib/ld-musl-*.so*
+    for file in "${destdir}"/lib/ld-musl-*.so.1
     do
-        ld_path="${file##*/}"		# Basename
-        ld_path="${ld_path%%.so*}.path"	# Get the rid of .so*
+        ld_path="${file##*/}"			# Basename
+        ld_path="${ld_path%%.so.1}.path"	# Get the rid of .so.1
         export ld_path
         break;
     done
@@ -106,11 +106,11 @@ build()
 
 EOF
         chmod 644 "${destdir}"/etc/$ld_path
-        unset ld_path
         touch "${destdir}/etc/.graft-config"
     else
         echo "WARNING: \$ld_path is empty." 1>&2
     fi
+    unset ld_path
 
     # Copy documentation
     mkdir -p "${destdir}${docsdir}"
diff --git a/sources/SOURCELIST.txt b/sources/SOURCELIST.txt
index 21800207..9e7e483a 100644
--- a/sources/SOURCELIST.txt
+++ b/sources/SOURCELIST.txt
@@ -137,7 +137,7 @@ http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-7.8p1.tar.gz
 http://ftpmirror.gnu.org/coreutils/coreutils-8.30.tar.xz
 http://ftpmirror.gnu.org/gdb/gdb-8.2.1.tar.gz
 http://git.alpinelinux.org/cgit/ca-certificates/snapshot/ca-certificates-33042b0af9d4139959a1b9a7179dd3843ea00f0d.tar.bz2
-http://git.musl-libc.org/cgit/musl/snapshot/musl-1691b23955590d1eb66a11158fdd91c86337e886.tar.gz
+http://git.musl-libc.org/cgit/musl/snapshot/musl-ad795d56ba3fb9d69f524ee676e3b1e2355cceb7.tar.gz
 http://git.savannah.nongnu.org/cgit/grub.git/snapshot/grub-a661a321c314d23cd2666c82cbb38d356c7956ba.tar.gz
 http://github.com/anholt/libepoxy/releases/download/1.5.3/libepoxy-1.5.3.tar.xz
 http://github.com/arsv/perl-cross/releases/download/1.2.1/perl-cross-1.2.1.tar.gz
diff --git a/sources/musl-1691b23955590d1eb66a11158fdd91c86337e886.tar.gz.sha256 b/sources/musl-1691b23955590d1eb66a11158fdd91c86337e886.tar.gz.sha256
deleted file mode 100644
index 6f72f2f3..00000000
--- a/sources/musl-1691b23955590d1eb66a11158fdd91c86337e886.tar.gz.sha256
+++ /dev/null
@@ -1 +0,0 @@
-25355040fad46bbb4cfb21fd939be03f5ce97bd110106993484e997fb927648d  musl-1691b23955590d1eb66a11158fdd91c86337e886.tar.gz
diff --git a/sources/musl-ad795d56ba3fb9d69f524ee676e3b1e2355cceb7.tar.gz.sha256 b/sources/musl-ad795d56ba3fb9d69f524ee676e3b1e2355cceb7.tar.gz.sha256
new file mode 100644
index 00000000..c58d6a8e
--- /dev/null
+++ b/sources/musl-ad795d56ba3fb9d69f524ee676e3b1e2355cceb7.tar.gz.sha256
@@ -0,0 +1 @@
+4473394fda47ccb9747b7ef52d8d161dcd6d9f7e3641a423a2d890247baf0a08  musl-ad795d56ba3fb9d69f524ee676e3b1e2355cceb7.tar.gz
diff --git a/stages/0/04-musl b/stages/0/04-musl
index 99e967ab..4b71f5b9 100755
--- a/stages/0/04-musl
+++ b/stages/0/04-musl
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=1691b23955590d1eb66a11158fdd91c86337e886
+version=ad795d56ba3fb9d69f524ee676e3b1e2355cceb7
 
 cd -- "$TMPDIR"
 rm -rf musl-${version}
diff --git a/stages/1/02-musl b/stages/1/02-musl
index 76bbd441..f30f9d93 100755
--- a/stages/1/02-musl
+++ b/stages/1/02-musl
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-version=1691b23955590d1eb66a11158fdd91c86337e886
+version=ad795d56ba3fb9d69f524ee676e3b1e2355cceb7
 
 cd -- "$TMPDIR"
 rm -rf musl-${version}
-- 
2.11.4.GIT