mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-30 22:56:33 +00:00
musl: bump to version 1.1.11
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
parent
67d6276c1b
commit
64ab4ffd18
@ -1,30 +0,0 @@
|
|||||||
From 63f4b9f18f3674124d8bcb119739fec85e6da005 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Timo Teräs <timo.teras@iki.fi>
|
|
||||||
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.
|
|
||||||
|
|
||||||
Backported from: 63f4b9f18f3674124d8bcb119739fec85e6da005
|
|
||||||
|
|
||||||
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
|
|
||||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
|
||||||
---
|
|
||||||
diff --git a/src/locale/uselocale.c b/src/locale/uselocale.c
|
|
||||||
index b70a0c1..0fc5ecb 100644
|
|
||||||
--- a/src/locale/uselocale.c
|
|
||||||
+++ b/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
|
|
@ -1,2 +1,2 @@
|
|||||||
# Locally calculated after checking pgp signature
|
# Locally calculated after checking pgp signature
|
||||||
sha256 45bbe9b1c7f7a0f743477af1e103b6889bfe4dd9815e16f6c89f6c90831c8b7c musl-1.1.10.tar.gz
|
sha256 bb9e6da51b7b12641f5d1abb39705c6c6c1b2fbd20002362948aa736a0aa353f musl-1.1.11.tar.gz
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
#
|
#
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
MUSL_VERSION = 1.1.10
|
MUSL_VERSION = 1.1.11
|
||||||
MUSL_SITE = http://www.musl-libc.org/releases
|
MUSL_SITE = http://www.musl-libc.org/releases
|
||||||
MUSL_LICENSE = MIT
|
MUSL_LICENSE = MIT
|
||||||
MUSL_LICENSE_FILES = COPYRIGHT
|
MUSL_LICENSE_FILES = COPYRIGHT
|
||||||
|
Loading…
x
Reference in New Issue
Block a user