Commit a92c6e30 authored by Natanael Copa's avatar Natanael Copa

main/musl: remove traces of uclibc

Clean up traces of uclibc, which we havent supported for years
parent f9f7dad5
From 3ec82877e7783f0706ba3c9e3c815cd2aa34059e Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 7 Dec 2017 23:18:54 +0100
Subject: [PATCH] fix sysconf for infinite rlimits
sysconf should return -1 for infinity, not LONG_MAX.
---
src/conf/sysconf.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/conf/sysconf.c b/src/conf/sysconf.c
index b8b761d0..9ce330a5 100644
--- a/src/conf/sysconf.c
+++ b/src/conf/sysconf.c
@@ -174,6 +174,8 @@ long sysconf(int name)
} else if (values[name] < -256) {
struct rlimit lim;
getrlimit(values[name]&16383, &lim);
+ if (lim.rlim_cur == RLIM_INFINITY)
+ return -1;
return lim.rlim_cur > LONG_MAX ? LONG_MAX : lim.rlim_cur;
}
--
2.15.0
From eb7f93c4f6fd0b637a9f8d6e112131b88ad2b00f Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 7 Dec 2017 17:54:07 +0100
Subject: [PATCH] use the name UTC instead of GMT for UTC timezone
notes by maintainer:
both C and POSIX use the term UTC to specify related functionality,
despite POSIX defining it as something more like UT1 or historical
(pre-UTC) GMT without leap seconds. neither specifies the associated
string for %Z. old choice of "GMT" violated principle of least
surprise for users and some applications/tests. use "UTC" instead.
---
src/time/__tz.c | 16 ++++++++--------
src/time/gmtime_r.c | 4 ++--
src/time/timegm.c | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/time/__tz.c b/src/time/__tz.c
index ffe8d402..8cc96032 100644
--- a/src/time/__tz.c
+++ b/src/time/__tz.c
@@ -15,7 +15,7 @@ weak_alias(__tzname, tzname);
static char std_name[TZNAME_MAX+1];
static char dst_name[TZNAME_MAX+1];
-const char __gmt[] = "GMT";
+const char __utc[] = "UTC";
static int dst_off;
static int r0[5], r1[5];
@@ -126,7 +126,7 @@ static void do_tzset()
s = getenv("TZ");
if (!s) s = "/etc/localtime";
- if (!*s) s = __gmt;
+ if (!*s) s = __utc;
if (old_tz && !strcmp(s, old_tz)) return;
@@ -136,7 +136,7 @@ static void do_tzset()
* free so as not to pull it into static programs. Growth
* strategy makes it so free would have minimal benefit anyway. */
i = strlen(s);
- if (i > PATH_MAX+1) s = __gmt, i = 3;
+ if (i > PATH_MAX+1) s = __utc, i = 3;
if (i >= old_tz_size) {
old_tz_size *= 2;
if (i >= old_tz_size) old_tz_size = i+1;
@@ -165,12 +165,12 @@ static void do_tzset()
}
}
}
- if (!map) s = __gmt;
+ if (!map) s = __utc;
}
if (map && (map_size < 44 || memcmp(map, "TZif", 4))) {
__munmap((void *)map, map_size);
map = 0;
- s = __gmt;
+ s = __utc;
}
zi = map;
@@ -207,7 +207,7 @@ static void do_tzset()
}
}
if (!__tzname[0]) __tzname[0] = __tzname[1];
- if (!__tzname[0]) __tzname[0] = (char *)__gmt;
+ if (!__tzname[0]) __tzname[0] = (char *)__utc;
if (!__daylight) {
__tzname[1] = __tzname[0];
dst_off = __timezone;
@@ -216,7 +216,7 @@ static void do_tzset()
}
}
- if (!s) s = __gmt;
+ if (!s) s = __utc;
getname(std_name, &s);
__tzname[0] = std_name;
__timezone = getoff(&s);
@@ -413,7 +413,7 @@ const char *__tm_to_tzname(const struct tm *tm)
const void *p = tm->__tm_zone;
LOCK(lock);
do_tzset();
- if (p != __gmt && p != __tzname[0] && p != __tzname[1] &&
+ if (p != __utc && p != __tzname[0] && p != __tzname[1] &&
(!zi || (uintptr_t)p-(uintptr_t)abbrevs >= abbrevs_end - abbrevs))
p = "";
UNLOCK(lock);
diff --git a/src/time/gmtime_r.c b/src/time/gmtime_r.c
index 8cbdadcb..cba72447 100644
--- a/src/time/gmtime_r.c
+++ b/src/time/gmtime_r.c
@@ -2,7 +2,7 @@
#include <errno.h>
#include "libc.h"
-extern const char __gmt[];
+extern const char __utc[];
struct tm *__gmtime_r(const time_t *restrict t, struct tm *restrict tm)
{
@@ -12,7 +12,7 @@ struct tm *__gmtime_r(const time_t *restrict t, struct tm *restrict tm)
}
tm->tm_isdst = 0;
tm->__tm_gmtoff = 0;
- tm->__tm_zone = __gmt;
+ tm->__tm_zone = __utc;
return tm;
}
diff --git a/src/time/timegm.c b/src/time/timegm.c
index b5dae8b6..f444e76e 100644
--- a/src/time/timegm.c
+++ b/src/time/timegm.c
@@ -2,7 +2,7 @@
#include "time_impl.h"
#include <errno.h>
-extern const char __gmt[];
+extern const char __utc[];
time_t timegm(struct tm *tm)
{
@@ -15,6 +15,6 @@ time_t timegm(struct tm *tm)
*tm = new;
tm->tm_isdst = 0;
tm->__tm_gmtoff = 0;
- tm->__tm_zone = __gmt;
+ tm->__tm_zone = __utc;
return t;
}
--
2.15.0
...@@ -2,14 +2,11 @@ ...@@ -2,14 +2,11 @@
# Maintainer: Timo Teräs <timo.teras@iki.fi> # Maintainer: Timo Teräs <timo.teras@iki.fi>
pkgname=musl pkgname=musl
pkgver=1.1.19 pkgver=1.1.19
pkgrel=8 pkgrel=9
pkgdesc="the musl c library (libc) implementation" pkgdesc="the musl c library (libc) implementation"
url="http://www.musl-libc.org/" url="http://www.musl-libc.org/"
arch="all" arch="all"
license="MIT" license="MIT"
depends=""
depends_dev="!uclibc-dev"
makedepends="$depends_dev"
subpackages="$pkgname-dev $pkgname-dbg libc6-compat:compat:noarch" subpackages="$pkgname-dev $pkgname-dbg libc6-compat:compat:noarch"
case "$BOOTSTRAP" in case "$BOOTSTRAP" in
nocc) pkgname="musl-dev"; subpackages="";; nocc) pkgname="musl-dev"; subpackages="";;
...@@ -109,8 +106,8 @@ package() { ...@@ -109,8 +106,8 @@ package() {
} }
utils() { utils() {
depends="!uclibc-utils scanelf" depends="scanelf"
replaces="libiconv uclibc-utils" replaces="libiconv"
license="MIT BSD GPL2+" license="MIT BSD GPL2+"
mkdir -p "$subpkgdir"/usr "$subpkgdir"/sbin mkdir -p "$subpkgdir"/usr "$subpkgdir"/sbin
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment