diff --git a/srcpkgs/musl/patches/musl-1.1.10-uselocale-0-fix.diff b/srcpkgs/musl/patches/musl-1.1.10-uselocale-0-fix.diff deleted file mode 100644 index f05fe0a2d43..00000000000 --- a/srcpkgs/musl/patches/musl-1.1.10-uselocale-0-fix.diff +++ /dev/null @@ -1,26 +0,0 @@ -From 63f4b9f18f3674124d8bcb119739fec85e6da005 Mon Sep 17 00:00:00 2001 -From: Timo Teräs -Date: Fri, 05 Jun 2015 07:39:42 +0000 -Subject: fix uselocale((locale_t)0) not to modify locale - -commit 68630b55c0c7219fe9df70dc28ffbf9efc8021d8 made the new locale to -be assigned unconditonally resulting in crashes later on. ---- -diff --git src/locale/uselocale.c src/locale/uselocale.c -index b70a0c1..0fc5ecb 100644 ---- src/locale/uselocale.c -+++ src/locale/uselocale.c -@@ -8,9 +8,7 @@ locale_t __uselocale(locale_t new) - locale_t old = self->locale; - locale_t global = &libc.global_locale; - -- if (new == LC_GLOBAL_LOCALE) new = global; -- -- self->locale = new; -+ if (new) self->locale = new == LC_GLOBAL_LOCALE ? global : new; - - return old == global ? LC_GLOBAL_LOCALE : old; - } --- -cgit v0.9.0.3-65-g4555 - diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template index 59adc67daa2..151454b693a 100644 --- a/srcpkgs/musl/template +++ b/srcpkgs/musl/template @@ -1,7 +1,7 @@ # Template file for 'musl'. pkgname=musl -version=1.1.10 -revision=3 +version=1.1.11 +revision=1 build_pie=yes build_style=gnu-configure configure_args="--prefix=/usr --disable-gcc-wrapper" @@ -11,7 +11,7 @@ maintainer="Juan RP " license="MIT" homepage="http://www.musl-libc.org/" distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz" -checksum=45bbe9b1c7f7a0f743477af1e103b6889bfe4dd9815e16f6c89f6c90831c8b7c +checksum=bb9e6da51b7b12641f5d1abb39705c6c6c1b2fbd20002362948aa736a0aa353f nostrip_files="libc.so" shlib_provides="libc.so"