dsc
/
mxe
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update: libsodium, libuv, readline

Browse Source
pull/2263/head
Mark Brand 5 years ago
parent b0094067f6
commit 05f7fc85f1
4 changed files with 16 additions and 100 deletions
Show Stats Download Patch File Download Diff File

4
src/libsodium.mk
Unescape View File

@ -3,8 +3,8 @@
PKG := libsodium
$(PKG)_WEBSITE := https://download.libsodium.org/doc/
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.0.15
$(PKG)_CHECKSUM := fb6a9e879a2f674592e4328c5d9f79f082405ee4bb05cb6e679b90afe9e178f4
$(PKG)_VERSION := 1.0.17
$(PKG)_CHECKSUM := 0cc3dae33e642cc187b5ceb467e0ad0e1b51dcba577de1190e9ffa17766ac2b1
$(PKG)_GH_CONF := jedisct1/libsodium/releases
$(PKG)_DEPS := cc

4
src/libuv.mk
Unescape View File

@ -3,8 +3,8 @@
PKG := libuv
$(PKG)_WEBSITE := https://libuv.org
$(PKG)_IGNORE :=
$(PKG)_VERSION := 1.24.0
$(PKG)_CHECKSUM := 55587c525196a7a550fa7e5eb61794c377ec23b44adb435fdded86e8f7f31a16
$(PKG)_VERSION := 1.24.1
$(PKG)_CHECKSUM := 0d026c8f68c4d7b7c59de8f485f262ac71c24e0f3a80d740a25d20edd2f2774e
$(PKG)_GH_CONF := libuv/libuv/tags, v
$(PKG)_DEPS := cc

104
src/readline-1.patch
Unescape View File

@ -1,99 +1,18 @@
This file is part of MXE. See LICENSE.md for licensing information.
From c0572cecbeadc8fe24c70c5c39d49210a39ac719 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 30 Sep 2014 10:32:33 -0700
Subject: [PATCH 1/2] signals: safeguard the remaining usage of frequently
missing signals
diff --git a/input.c b/input.c
index 117dfe8..465f0b9 100644
--- a/input.c
+++ b/input.c
@@ -532,9 +532,17 @@ rl_getc (stream)
Otherwise (not EINTR), some error occurred, also signifying EOF. */
if (errno != EINTR)
return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
- else if (_rl_caught_signal == SIGHUP || _rl_caught_signal == SIGTERM)
+ else if (_rl_caught_signal == SIGTERM
+#if defined(SIGHUP)
+ || _rl_caught_signal == SIGHUP
+#endif
+ )
return (RL_ISSTATE (RL_STATE_READCMD) ? READERR : EOF);
- else if (_rl_caught_signal == SIGINT || _rl_caught_signal == SIGQUIT)
+ else if (_rl_caught_signal == SIGINT
+#if defined(SIGQUIT)
+ || _rl_caught_signal == SIGQUIT
+#endif
+ )
RL_CHECK_SIGNALS ();
if (rl_signal_event_hook)
diff --git a/signals.c b/signals.c
index 61f02f9..7c921d6 100644
--- a/signals.c
+++ b/signals.c
@@ -216,7 +216,9 @@ _rl_handle_signal (sig)
/* FALLTHROUGH */
case SIGTERM:
+#if defined (SIGHUP)
case SIGHUP:
+#endif
#if defined (SIGTSTP)
case SIGTSTP:
case SIGTTOU:
@@ -426,7 +428,9 @@ rl_set_signals ()
rl_maybe_set_sighandler (SIGINT, rl_signal_handler, &old_int);
rl_maybe_set_sighandler (SIGTERM, rl_signal_handler, &old_term);
+#if defined (SIGHUP)
rl_maybe_set_sighandler (SIGHUP, rl_signal_handler, &old_hup);
+#endif
#if defined (SIGQUIT)
rl_maybe_set_sighandler (SIGQUIT, rl_signal_handler, &old_quit);
#endif
@@ -491,7 +495,9 @@ rl_clear_signals ()
overhead */
rl_maybe_restore_sighandler (SIGINT, &old_int);
rl_maybe_restore_sighandler (SIGTERM, &old_term);
+#if defined (SIGHUP)
rl_maybe_restore_sighandler (SIGHUP, &old_hup);
+#endif
#if defined (SIGQUIT)
rl_maybe_restore_sighandler (SIGQUIT, &old_quit);
#endif
--
1.8.3.2
From 6896ffa4fc85bf0dfae58e69a860d2076c1d9fd2 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Tue, 30 Sep 2014 17:16:32 -0700
Subject: [PATCH 2/2] Handle missing S_IS* macros more gracefully
Subject: [PATCH 1/1] Handle missing S_IS* macros more gracefully
diff --git a/colors.c b/colors.c
index 89d9035..ec19844 100644
index 1111111..2222222 100644
--- a/colors.c
+++ b/colors.c
@@ -152,14 +152,22 @@ _rl_print_color_indicator (char *f)
{
colored_filetype = C_FILE;
+#if defined (S_ISUID)
if ((mode & S_ISUID) != 0 && is_colored (C_SETUID))
colored_filetype = C_SETUID;
- else if ((mode & S_ISGID) != 0 && is_colored (C_SETGID))
+ else
+#endif
+#if defined (S_ISGID)
+ if ((mode & S_ISGID) != 0 && is_colored (C_SETGID))
colored_filetype = C_SETGID;
- else if (is_colored (C_CAP) && 0) //f->has_capability)
+ else
+#endif
+ if (is_colored (C_CAP) && 0) //f->has_capability)
@@ -200,8 +200,10 @@ _rl_print_color_indicator (const char *f)
#endif
if (is_colored (C_CAP) && 0) //f->has_capability)
colored_filetype = C_CAP;
+#if defined(S_IXUGO)
else if ((mode & S_IXUGO) != 0 && is_colored (C_EXEC))
@ -102,7 +21,7 @@ index 89d9035..ec19844 100644
else if ((1 < astat.st_nlink) && is_colored (C_MULTIHARDLINK))
colored_filetype = C_MULTIHARDLINK;
}
@@ -173,8 +181,10 @@ _rl_print_color_indicator (char *f)
@@ -215,8 +217,10 @@ _rl_print_color_indicator (const char *f)
colored_filetype = C_STICKY_OTHER_WRITABLE;
else
#endif
@ -114,7 +33,7 @@ index 89d9035..ec19844 100644
else if ((mode & S_ISVTX) != 0 && is_colored (C_STICKY))
colored_filetype = C_STICKY;
diff --git a/colors.h b/colors.h
index fc926e5..e62edd0 100644
index 1111111..2222222 100644
--- a/colors.h
+++ b/colors.h
@@ -96,7 +96,7 @@ enum indicator_no
@ -127,7 +46,7 @@ index fc926e5..e62edd0 100644
#endif
diff --git a/posixstat.h b/posixstat.h
index 3eb7f29..854a2c9 100644
index 1111111..2222222 100644
--- a/posixstat.h
+++ b/posixstat.h
@@ -78,30 +78,44 @@
@ -184,6 +103,3 @@ index 3eb7f29..854a2c9 100644
+#endif
#endif /* _POSIXSTAT_H_ */
--
1.8.3.2

4
src/readline.mk
Unescape View File

@ -4,8 +4,8 @@ PKG := readline
$(PKG)_WEBSITE := https://tiswww.case.edu/php/chet/readline/rltop.html
$(PKG)_DESCR := Readline
$(PKG)_IGNORE :=
$(PKG)_VERSION := 6.3
$(PKG)_CHECKSUM := 56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43
$(PKG)_VERSION := 8.0
$(PKG)_CHECKSUM := e339f51971478d369f8a053a330a190781acb9864cf4c541060f12078948e461
$(PKG)_SUBDIR := readline-$($(PKG)_VERSION)
$(PKG)_FILE := readline-$($(PKG)_VERSION).tar.gz
$(PKG)_URL := https://ftp.gnu.org/gnu/readline/$($(PKG)_FILE)

Write Preview
Loading…
Cancel
Save