From cb0c5dade000fec003acfdd78ea3fa7bab730dc1 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 5 Jun 2015 07:21:22 +0200 Subject: [PATCH] musl: update to 1.1.10. --- .../patches/dcngettext-deref-NULL-pointer.patch | 13 ------------- srcpkgs/musl/template | 7 +++---- 2 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 srcpkgs/musl/patches/dcngettext-deref-NULL-pointer.patch diff --git a/srcpkgs/musl/patches/dcngettext-deref-NULL-pointer.patch b/srcpkgs/musl/patches/dcngettext-deref-NULL-pointer.patch deleted file mode 100644 index a4cbd02fba8..00000000000 --- a/srcpkgs/musl/patches/dcngettext-deref-NULL-pointer.patch +++ /dev/null @@ -1,13 +0,0 @@ -Fix a NULL pointer dereference in case CURRENT_LOCALE is not set up properly. - ---- src/locale/dcngettext.c.orig 2015-05-18 12:29:14.897996949 +0200 -+++ src/locale/dcngettext.c 2015-05-18 12:29:26.730132449 +0200 -@@ -132,7 +132,7 @@ char *dcngettext(const char *domainname, - switch (category) { - case LC_MESSAGES: - locname = loc->messages_name; -- if (!*locname) goto notrans; -+ if (!locname || !*locname) goto notrans; - break; - case LC_TIME: - case LC_MONETARY: diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template index 42ed3f333b8..13b1ef19235 100644 --- a/srcpkgs/musl/template +++ b/srcpkgs/musl/template @@ -1,7 +1,7 @@ # Template file for 'musl'. pkgname=musl -version=1.1.9 -revision=6 +version=1.1.10 +revision=1 build_style=gnu-configure configure_args="--prefix=/usr --disable-gcc-wrapper" conflicts="glibc>=0" @@ -10,12 +10,11 @@ maintainer="Juan RP " license="MIT" homepage="http://www.musl-libc.org/" distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz" -checksum=00bf7173caf972c88cd07cb0d420c082a2f35efcccc1a81f8909bec2d030283e +checksum=45bbe9b1c7f7a0f743477af1e103b6889bfe4dd9815e16f6c89f6c90831c8b7c nostrip_files="libc.so" shlib_provides="libc.so" only_for_archs="i686-musl x86_64-musl armv6l-musl armv7l-musl aarch64-musl" -CFLAGS="-U_FORTIFY_SOURCE" post_build() { $CC $CFLAGS $LDFLAGS ${FILESDIR}/getent.c -o getent