mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'upstream'

Browse Source 
Former-commit-id: 0c0a4a4ca63448c3c7ae95c0ac6a25c9144dd8c7
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-09-01 08:27:18 +00:00
commit d3f15cd814
61 changed files with 88 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
ad5c394c5eaa6733f3dfbdb3f444a98a4952d109
4d4ef565049e2cd1fa0bf44be14ae23d425026b8

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
07de5a7327b030685cf322da0ea00819caf97b99
9e0a9efcb9f0156b8fa33eba4a59a8ed823bebc7

2
mcs/build/common/Consts.cs
View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.16.0.127";
public const string MonoVersion = "5.16.0.135";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

2
mcs/class/System/Mono.Net.Security/MobileAuthenticatedStream.cs
View File

@ -77,7 +77,7 @@ namespace Mono.Net.Security
Settings = settings;
Provider = provider;
readBuffer = new BufferOffsetSize2 (16384);
readBuffer = new BufferOffsetSize2 (16834);
writeBuffer = new BufferOffsetSize2 (16384);
operation = Operation.None;
}

11
mcs/class/System/Mono.Net.Security/MonoTlsStream.cs
View File

@ -50,7 +50,7 @@ using System.Security.Cryptography;
namespace Mono.Net.Security
{
class MonoTlsStream : IDisposable
class MonoTlsStream
{
#if SECURITY_DEP
readonly MonoTlsProvider provider;
@ -136,7 +136,6 @@ namespace Mono.Net.Security
request.ServicePoint.UpdateClientCertificate (sslStream.InternalLocalCertificate);
else {
request.ServicePoint.UpdateClientCertificate (null);
sslStream.Dispose ();
sslStream = null;
}
}
@ -155,13 +154,5 @@ namespace Mono.Net.Security
throw new PlatformNotSupportedException (EXCEPTION_MESSAGE);
#endif
}
public void Dispose ()
{
if (sslStream != null) {
sslStream.Dispose ();
sslStream = null;
}
}
}
}

8
mcs/class/System/System.Net/WebConnection.cs
View File

@ -405,7 +405,6 @@ namespace System.Net
void CloseSocket ()
{
lock (this) {
Debug ($"WC CLOSE SOCKET: Cnc={ID} NS={networkStream} TLS={monoTlsStream}");
if (networkStream != null) {
try {
networkStream.Dispose ();
@ -413,13 +412,6 @@ namespace System.Net
networkStream = null;
}
if (monoTlsStream != null) {
try {
monoTlsStream.Dispose ();
} catch { }
monoTlsStream = null;
}
if (socket != null) {
try {
socket.Dispose ();

2
mcs/class/System/System.Net/WebReadStream.cs
View File

@ -41,7 +41,7 @@ namespace System.Net
}
#if MONO_WEB_DEBUG
internal string ME => $"WRS({GetType ().Name}:Op={Operation.ID})";
internal string ME => $"WRS({GetType ().Name}:Op={operation.ID})";
#else
internal string ME => null;
#endif

2
mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
3415b4700e5e7f96b90170d92495cca6cbd1427d
69bd0fc4c0542553b5fd030f3aa2be77d44b91a0

2
mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
d771de342ef8174e767368ae53cb13435d62f751
41237ab35261a093d70cfb46a706988944a2fe91

BIN
mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
d3c03f4245b44d43dec965911e029c83ff5ec21f
9dad5a97d4beb66ca299a769b1120d1a8e216baf

2
mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
ec5c16e7fa46086d165ca589a888afb621cf27a0
bfca0374a6fa9b21f8dfdbfbd9046fcc2d9d3647

2
mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
ba352fa31af7edf32625787dfc25b41eb0a363b0
6db7ca567c9f0072c556397c50da9169e5058892

2
mcs/class/lib/monolite-darwin/1051600011/System.dll.REMOVED.git-id
View File

@ -1 +1 @@
210d0a1bf843db79fb9e32d97345686d52789b15
ee989464bba21bcece33919ef912d836328b37d5

2
mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
5d2fd270e40afe3fe9427a332c9b25fc1d10a049
4b7b0a51812de6a0fb4f6476fa3464b18278f342

2
mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
e260715ef65ab4c6fb25b255262b4a8410b085f4
bf69562e337368809f7b67ed4f50b9ae2d18add3

2
mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
3415b4700e5e7f96b90170d92495cca6cbd1427d
69bd0fc4c0542553b5fd030f3aa2be77d44b91a0

2
mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
d771de342ef8174e767368ae53cb13435d62f751
41237ab35261a093d70cfb46a706988944a2fe91

BIN
mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
d3c03f4245b44d43dec965911e029c83ff5ec21f
9dad5a97d4beb66ca299a769b1120d1a8e216baf

2
mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
ec5c16e7fa46086d165ca589a888afb621cf27a0
bfca0374a6fa9b21f8dfdbfbd9046fcc2d9d3647

2
mcs/class/lib/monolite-linux/1051600011/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
ba352fa31af7edf32625787dfc25b41eb0a363b0
6db7ca567c9f0072c556397c50da9169e5058892

2
mcs/class/lib/monolite-linux/1051600011/System.dll.REMOVED.git-id
View File

@ -1 +1 @@
210d0a1bf843db79fb9e32d97345686d52789b15
ee989464bba21bcece33919ef912d836328b37d5

2
mcs/class/lib/monolite-linux/1051600011/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
5d2fd270e40afe3fe9427a332c9b25fc1d10a049
4b7b0a51812de6a0fb4f6476fa3464b18278f342

2
mcs/class/lib/monolite-linux/1051600011/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
e260715ef65ab4c6fb25b255262b4a8410b085f4
bf69562e337368809f7b67ed4f50b9ae2d18add3

2
mcs/class/lib/monolite-win32/1051600011/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
3415b4700e5e7f96b90170d92495cca6cbd1427d
69bd0fc4c0542553b5fd030f3aa2be77d44b91a0

2
mcs/class/lib/monolite-win32/1051600011/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
d771de342ef8174e767368ae53cb13435d62f751
41237ab35261a093d70cfb46a706988944a2fe91

BIN
mcs/class/lib/monolite-win32/1051600011/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-win32/1051600011/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
d3c03f4245b44d43dec965911e029c83ff5ec21f
9dad5a97d4beb66ca299a769b1120d1a8e216baf

2
mcs/class/lib/monolite-win32/1051600011/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
ec5c16e7fa46086d165ca589a888afb621cf27a0
bfca0374a6fa9b21f8dfdbfbd9046fcc2d9d3647

2
mcs/class/lib/monolite-win32/1051600011/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
ba352fa31af7edf32625787dfc25b41eb0a363b0
6db7ca567c9f0072c556397c50da9169e5058892

2
mcs/class/lib/monolite-win32/1051600011/System.dll.REMOVED.git-id
View File

@ -1 +1 @@
210d0a1bf843db79fb9e32d97345686d52789b15
ee989464bba21bcece33919ef912d836328b37d5

2
mcs/class/lib/monolite-win32/1051600011/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
5d2fd270e40afe3fe9427a332c9b25fc1d10a049
4b7b0a51812de6a0fb4f6476fa3464b18278f342

2
mcs/class/lib/monolite-win32/1051600011/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
e260715ef65ab4c6fb25b255262b4a8410b085f4
bf69562e337368809f7b67ed4f50b9ae2d18add3

2
mono/metadata/loader.c
View File

@ -2238,6 +2238,7 @@ stack_walk_adapter (MonoStackFrameInfo *frame, MonoContext *ctx, gpointer data)
case FRAME_TYPE_MANAGED_TO_NATIVE:
case FRAME_TYPE_TRAMPOLINE:
case FRAME_TYPE_INTERP_TO_MANAGED:
case FRAME_TYPE_INTERP_TO_MANAGED_WITH_CTX:
return FALSE;
case FRAME_TYPE_MANAGED:
case FRAME_TYPE_INTERP:
@ -2283,6 +2284,7 @@ async_stack_walk_adapter (MonoStackFrameInfo *frame, MonoContext *ctx, gpointer
case FRAME_TYPE_MANAGED_TO_NATIVE:
case FRAME_TYPE_TRAMPOLINE:
case FRAME_TYPE_INTERP_TO_MANAGED:
case FRAME_TYPE_INTERP_TO_MANAGED_WITH_CTX:
return FALSE;
case FRAME_TYPE_MANAGED:
case FRAME_TYPE_INTERP:

1
mono/mini/Makefile.am
View File

@ -280,7 +280,6 @@ endif
wasm_sources = \
mini-wasm.c \
mini-wasm.h \
mini-wasm-debugger.c \
debugger-engine.c \
exceptions-wasm.c \
tramp-wasm.c

1
mono/mini/Makefile.am.in
View File

@ -280,7 +280,6 @@ endif
wasm_sources = \
mini-wasm.c \
mini-wasm.h \
mini-wasm-debugger.c \
debugger-engine.c \
exceptions-wasm.c \
tramp-wasm.c

2
mono/mini/Makefile.in.REMOVED.git-id
View File

@ -1 +1 @@
60c618f2bd6492fbfb171eee7cf11963ed7b5934
8a05fbf6f22cbe22fbd6226898404afe7e104140

6
mono/mini/arch-stubs.c
View File

@ -81,6 +81,12 @@ mono_arch_undo_ip_adjustment (MonoContext *context)
g_assert_not_reached ();
}
void
mono_arch_do_ip_adjustment (MonoContext *context)
{
g_assert_not_reached ();
}
#endif
#ifndef MONO_ARCH_HAVE_EXCEPTIONS_INIT

2
mono/mini/debugger-agent.c.REMOVED.git-id
View File

@ -1 +1 @@
5500716c656e96de6976ce309e5f40e8fbb80299
7bd26dad12e4930bcb115b47836d61819796dd2f

6
mono/mini/exceptions-amd64.c
View File

@ -1968,3 +1968,9 @@ mono_arch_undo_ip_adjustment (MonoContext *ctx)
{
ctx->gregs [AMD64_RIP]++;
}
void
mono_arch_do_ip_adjustment (MonoContext *ctx)
{
ctx->gregs [AMD64_RIP]--;
}

9
mono/mini/exceptions-arm.c
View File

@ -639,3 +639,12 @@ mono_arch_undo_ip_adjustment (MonoContext *ctx)
if (mono_arm_thumb_supported ())
ctx->pc |= 1;
}
void
mono_arch_do_ip_adjustment (MonoContext *ctx)
{
/* Clear thumb bit */
ctx->pc &= ~1;
ctx->pc--;
}

6
mono/mini/exceptions-arm64.c
View File

@ -605,3 +605,9 @@ mono_arch_undo_ip_adjustment (MonoContext *ctx)
{
ctx->pc++;
}
void
mono_arch_do_ip_adjustment (MonoContext *ctx)
{
ctx->pc--;
}

2
mono/mini/interp/interp.c.REMOVED.git-id
View File

@ -1 +1 @@
c474a4690a17c6ac1ba8a0bd19ac2419c68b24f7
272c87416beb6b1f2c81432b9f635d7ead8264f5

2
mono/mini/mini-exceptions.c.REMOVED.git-id
View File

@ -1 +1 @@
a984905c86090377b0630031ad2e25a436d6b861
9aaca6b472e5626585f9d689edd52a4109db5b46

12
mono/mini/mini-runtime.h
View File

@ -146,16 +146,18 @@ struct MonoJitTlsData {
#endif
};
#define MONO_LMFEXT_DEBUGGER_INVOKE 1
#define MONO_LMFEXT_INTERP_EXIT 2
#define MONO_LMFEXT_INTERP_EXIT_WITH_CTX 3
/*
* This structure is an extension of MonoLMF and contains extra information.
*/
typedef struct {
struct MonoLMF lmf;
gboolean debugger_invoke;
gboolean interp_exit;
MonoContext ctx; /* if debugger_invoke is TRUE */
/* If interp_exit is TRUE */
gpointer interp_exit_data;
int kind;
MonoContext ctx; /* valid if kind == DEBUGGER_INVOKE || kind == INTERP_EXIT_WITH_CTX */
gpointer interp_exit_data; /* valid if kind == INTERP_EXIT || kind == INTERP_EXIT_WITH_CTX */
} MonoLMFExt;
typedef void (*MonoFtnPtrEHCallback) (guint32 gchandle);

0
mono/mini/mini-wasm-debugger.c
View File

2
mono/mini/mini-wasm.c
View File

@ -747,7 +747,7 @@ mono_wasm_current_bp_id (void)
g_assert (((guint64)lmf->previous_lmf) & 2);
MonoLMFExt *ext = (MonoLMFExt*)lmf;
g_assert (ext->interp_exit);
g_assert (ext->kind == MONO_LMFEXT_INTERP_EXIT || ext->kind == MONO_LMFEXT_INTERP_EXIT_WITH_CTX);
MonoInterpFrameHandle *frame = ext->interp_exit_data;
MonoJitInfo *ji = mini_get_interp_callbacks ()->frame_get_jit_info (frame);
guint8 *ip = mini_get_interp_callbacks ()->frame_get_ip (frame);

2
mono/mini/mini.h.REMOVED.git-id
View File

@ -1 +1 @@
12ebc1be2df609999cee08a4eb9f6ffb90050f17
64231b50d67cdac68b1aaee8cf93c7a07c0d1f46

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/43e7e83"
#define FULL_VERSION "explicit/ac8b05bd"

6
mono/utils/mono-compiler.h
View File

@ -122,6 +122,12 @@ typedef SSIZE_T ssize_t;
#define MONO_COLD
#endif
#ifdef __GNUC__
#define MONO_NO_OPTIMIZATION __attribute__ ((optimize("O0")))
#else
#define MONO_NO_OPTIMIZATION
#endif
#if defined (__GNUC__) && defined (__GNUC_MINOR__) && defined (__GNUC_PATCHLEVEL__)
#define MONO_GNUC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
#endif

4
mono/utils/mono-stack-unwinding.h
View File

@ -26,7 +26,9 @@ typedef enum {
FRAME_TYPE_INTERP = 4,
/* Frame for transitioning from interpreter to managed code */
FRAME_TYPE_INTERP_TO_MANAGED = 5,
FRAME_TYPE_NUM = 6
/* same, but with MonoContext */
FRAME_TYPE_INTERP_TO_MANAGED_WITH_CTX = 6,
FRAME_TYPE_NUM = 7
} MonoStackFrameType;
typedef enum {

BIN
po/mcs/de.gmo
View File

Binary file not shown.

2
po/mcs/de.po.REMOVED.git-id
View File

@ -1 +1 @@
7e5f7d41a7c415141cd3d6f620757af399431574
c97f53c1a02209c0dc09fe8b6312e60f7fa52bef

BIN
po/mcs/es.gmo
View File

Binary file not shown.

2
po/mcs/es.po.REMOVED.git-id
View File

@ -1 +1 @@
67cf3696b5c2921e8e030d9cfde8aa56e9664a7c
691d93b3677ff19915310263729d818f55720a48

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

2
po/mcs/ja.po.REMOVED.git-id
View File

@ -1 +1 @@
505c9f2c21b5fd776a637bde5e96fe5be5bfad0c
8ebad121d3967fa847df6d03ebdf71d9ba78af6a

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.16.0.127\n"
"Project-Id-Version: mono 5.16.0.135\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-08-30 08:06+0000\n"
"POT-Creation-Date: 2018-09-01 08:06+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

BIN
po/mcs/pt_BR.gmo
View File

Binary file not shown.

2
po/mcs/pt_BR.po.REMOVED.git-id
View File

@ -1 +1 @@
aab884301f62f739647e4e92906a73c8c18661af
fcd4a445ec738115bf0045081739c897f7e438f0