openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

update to 6.14.1; switch over winehq.org as the new maintainer after MS

Browse Source
This commit is contained in:
robert
2026-03-31 12:05:43 +00:00
parent cdc7e06ad5
commit aad0ecc214
14 changed files with 36 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/mono/Makefile
+4 -5
View File
@@ -3,10 +3,9 @@ USE_NOBTCFI= Yes
COMMENT= cross platform, open source .NET developement framework
V= 6.12.0.199
V= 6.14.1
DISTNAME= mono-${V}
REVISION= 4
CATEGORIES= lang devel
@@ -20,7 +19,7 @@ SHARED_LIBS += mono-profiler-aot 1.0 # .0.0
SHARED_LIBS += mono-profiler-coverage 0.0 # .0.0
SHARED_LIBS += mono-profiler-log 0.0 # .0.0
HOMEPAGE= http://www.mono-project.com/
HOMEPAGE= https://gitlab.winehq.org/mono/mono
MAINTAINER= Robert Nagy <robert@openbsd.org>
@@ -29,7 +28,7 @@ PERMIT_PACKAGE= Yes
WANTLIB= c execinfo m pthread z
SITES= https://download.mono-project.com/sources/mono/
SITES= https://dl.winehq.org/mono/sources/mono/
EXTRACT_SUFX= .tar.xz
MODULES= lang/mono \
@@ -83,7 +82,7 @@ pre-configure:
sed -i -e 's,^prefix=.*,prefix=\@prefix\@,g;' \
-e 's,^exec_prefix=.*,exec_prefix=\@prefix\@,g' \
${WRKSRC}/data/*.pc.in
sed -i -e 's,/usr/bin/env python,${MODPY_BIN},g' \
sed -i -e 's,/usr/bin/env python3,${MODPY_BIN},g' \
${WRKSRC}/mono/tests/gc-descriptors/gen-descriptor-tests.py
lang/mono/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (mono-6.12.0.199.tar.xz) = wIUNVFNTproiONRfCRRJDGoUoAF/FR05BbVY8DNHjvU=
SIZE (mono-6.12.0.199.tar.xz) = 304146664
SHA256 (mono-6.14.1.tar.xz) = MCTJfAvIy81hHEAdX5lFKHBBCM6zHzGyjepHgwBNCCA=
SIZE (mono-6.14.1.tar.xz) = 303688164
lang/mono/patches/patch-configure_ac
+5 -5
View File
@@ -3,7 +3,7 @@ enable cooperative suspend by default
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -1356,7 +1356,7 @@ with_unreal_default=no
@@ -1325,7 +1325,7 @@ with_unreal_default=no
with_wasm_default=no
with_bitcode_default=no
@@ -12,7 +12,7 @@ Index: configure.ac
enable_hybrid_suspend_default=no
# For the sake of clearer error messages, these numbers should all be different from each other.
@@ -5727,7 +5727,7 @@ fi
@@ -5764,7 +5764,7 @@ fi
dnl Now check if there were flags overriding the defaults
AC_ARG_WITH(cooperative_gc, [ --with-cooperative-gc=yes|no Enable cooperative stop-the-world garbage collection (sgen only) (defaults to no)], [AC_MSG_WARN([--with-cooperative-gc is deprecated, use --enable-cooperative-suspend instead])], [with_cooperative_gc=default])
@@ -21,7 +21,7 @@ Index: configure.ac
if test x$enable_cooperative_suspend = xdefault -a x$with_cooperative_gc != xdefault; then
enable_cooperative_suspend=$with_cooperative_gc
@@ -5742,7 +5742,7 @@ if test x$enable_cooperative_suspend != xno; then
@@ -5779,7 +5779,7 @@ if test x$enable_cooperative_suspend != xno; then
enable_hybrid_suspend_default=no
fi
@@ -30,7 +30,7 @@ Index: configure.ac
AC_ARG_ENABLE(hybrid_suspend, [ --enable-hybrid-suspend Enable hybrid stop-the-world garbage collection (sgen only) - cooperative suspend for threads running managed and runtime code, and preemptive suspend for threads running native and P/Invoke code (defaults to no)], [], [enable_hybrid_suspend=default])
@@ -6605,6 +6605,22 @@ elif case $host_os in netbsd*) true;; *) false;; esac;
@@ -6630,6 +6630,22 @@ elif case $host_os in netbsd*) true;; *) false;; esac;
AC_MSG_RESULT(netbsd)
MONO_NATIVE_PLATFORM_TYPE="MONO_NATIVE_PLATFORM_TYPE_NETBSD"
@@ -53,7 +53,7 @@ Index: configure.ac
elif case $host_os in haiku*) true;; *) false;; esac; then
mono_native_text="Haiku"
MONO_NATIVE_CC=$CC
@@ -6679,6 +6695,7 @@ AM_CONDITIONAL(MONO_NATIVE_PLATFORM_AIX, test x$MONO_N
@@ -6704,6 +6720,7 @@ AM_CONDITIONAL(MONO_NATIVE_PLATFORM_AIX, test x$MONO_N
AM_CONDITIONAL(MONO_NATIVE_PLATFORM_ANDROID, test x$MONO_NATIVE_PLATFORM = xandroid)
AM_CONDITIONAL(MONO_NATIVE_PLATFORM_FREEBSD, test x$MONO_NATIVE_PLATFORM = xfreebsd)
AM_CONDITIONAL(MONO_NATIVE_PLATFORM_NETBSD, test x$MONO_NATIVE_PLATFORM = xnetbsd)
lang/mono/patches/patch-external_boringssl_CMakeLists_txt
+1 -1
View File
@@ -2,7 +2,7 @@ Index: external/boringssl/CMakeLists.txt
--- external/boringssl/CMakeLists.txt.orig
+++ external/boringssl/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8.10)
-cmake_minimum_required (VERSION 2.8.10...4.0)
+cmake_minimum_required(VERSION 2.8.12...3.20)
# Defer enabling C and CXX languages.
lang/mono/patches/patch-external_boringssl_crypto_cpu-aarch64-linux_c
-29
View File
@@ -1,29 +0,0 @@
Index: external/boringssl/crypto/cpu-aarch64-linux.c
--- external/boringssl/crypto/cpu-aarch64-linux.c.orig
+++ external/boringssl/crypto/cpu-aarch64-linux.c
@@ -16,7 +16,9 @@
#if defined(OPENSSL_AARCH64) && !defined(OPENSSL_STATIC_ARMCAP)
+#if !defined(__OpenBSD__)
#include <sys/auxv.h>
+#endif
#include <openssl/arm_arch.h>
@@ -63,6 +65,15 @@ void OPENSSL_cpuid_setup(void) {
if (ID_AA64ISAR0_SHA2_VAL(isar0_val) >= ID_AA64ISAR0_SHA2_BASE) {
OPENSSL_armcap_P |= ARMV8_SHA256;
}
+}
+
+#elif defined(__OpenBSD__)
+
+#include <stdlib.h>
+#include <sys/types.h>
+
+void OPENSSL_cpuid_setup(void) {
+ OPENSSL_armcap_P |= ARMV7_NEON;
}
#else // linux
lang/mono/patches/patch-external_corefx_src_Native_Unix_System_Native_pal_io_c
+9 -9
View File
@@ -14,16 +14,16 @@ Index: external/corefx/src/Native/Unix/System.Native/pal_io.c
#include "pal_compiler.h"
#include "pal_config.h"
#include "pal_errno.h"
@@ -100,7 +102,7 @@ c_static_assert(PAL_DT_BLK == DT_BLK);
c_static_assert(PAL_DT_REG == DT_REG);
c_static_assert(PAL_DT_LNK == DT_LNK);
c_static_assert(PAL_DT_SOCK == DT_SOCK);
-c_static_assert(PAL_DT_WHT == DT_WHT);
+//c_static_assert(PAL_DT_WHT == DT_WHT); // per comment, AIX doesn't do any of this anyway
@@ -101,7 +103,7 @@ c_static_assert(PAL_DT_BLK == TO_NODETYPE(DT_BLK));
c_static_assert(PAL_DT_REG == TO_NODETYPE(DT_REG));
c_static_assert(PAL_DT_LNK == TO_NODETYPE(DT_LNK));
c_static_assert(PAL_DT_SOCK == TO_NODETYPE(DT_SOCK));
-c_static_assert(PAL_DT_WHT == TO_NODETYPE(DT_WHT));
+//c_static_assert(PAL_DT_WHT == TO_NODETYPE(DT_WHT)); // per comment, AIX doesn't do any of this anyway
#undef TO_NODETYPE
#endif
// Validate that our Lock enum value are correct for the platform
@@ -1421,7 +1423,7 @@ int32_t SystemNative_GetPeerID(intptr_t socket, uid_t*
@@ -1436,7 +1438,7 @@ int32_t SystemNative_GetPeerID(intptr_t socket, uid_t*
socklen_t len = sizeof(creds);
if (getsockopt(fd, SOL_SOCKET, SO_PEERCRED, &creds, &len) == 0)
{
@@ -32,7 +32,7 @@ Index: external/corefx/src/Native/Unix/System.Native/pal_io.c
return 0;
}
return -1;
@@ -1450,11 +1452,7 @@ int32_t SystemNative_LockFileRegion(intptr_t fd, int64
@@ -1465,11 +1467,7 @@ int32_t SystemNative_LockFileRegion(intptr_t fd, int64
return -1;
}
lang/mono/patches/patch-mcs_class_System_System_Net_Sockets_Socket_cs
+5 -5
View File
@@ -4,12 +4,12 @@ set DualMode in mono either.
Index: mcs/class/System/System.Net.Sockets/Socket.cs
--- mcs/class/System/System.Net.Sockets/Socket.cs.orig
+++ mcs/class/System/System.Net.Sockets/Socket.cs
@@ -148,7 +148,7 @@ namespace System.Net.Sockets
this.DontFragment = false;
if (protocolType == ProtocolType.Tcp)
@@ -150,7 +150,7 @@ namespace System.Net.Sockets
this.NoDelay = false;
- } else if (addressFamily == AddressFamily.InterNetworkV6) {
+ } else if (addressFamily == AddressFamily.InterNetworkV6 && !Platform.IsOpenBSD) {
// The socket was created successfully; enable IPV6_V6ONLY by default for normal AF_INET6 sockets.
// This fails on raw sockets so we just let them be in default state.
- } else if (addressFamily == AddressFamily.InterNetworkV6 && socketType != SocketType.Raw) {
+ } else if (addressFamily == AddressFamily.InterNetworkV6 && socketType != SocketType.Raw && !Platform.IsOpenBSD) {
this.DualMode = true;
}
lang/mono/patches/patch-mcs_class_corlib_System_Environment_cs
+2 -2
View File
@@ -1,7 +1,7 @@
Index: mcs/class/corlib/System/Environment.cs
--- mcs/class/corlib/System/Environment.cs.orig
+++ mcs/class/corlib/System/Environment.cs
@@ -678,7 +678,7 @@ namespace System {
@@ -677,7 +677,7 @@ namespace System {
case SpecialFolder.MyVideos:
return ReadXdgUserDir (config, home, "XDG_VIDEOS_DIR", "Videos");
case SpecialFolder.CommonTemplates:
@@ -10,7 +10,7 @@ Index: mcs/class/corlib/System/Environment.cs
case SpecialFolder.Fonts:
if (Platform == PlatformID.MacOSX)
return Path.Combine (home, "Library", "Fonts");
@@ -741,7 +741,7 @@ namespace System {
@@ -740,7 +740,7 @@ namespace System {
return String.Empty;
// This is where data common to all users goes
case SpecialFolder.CommonApplicationData:
lang/mono/patches/patch-mono_btls_CMakeLists_txt
+1 -8
View File
@@ -2,15 +2,8 @@ Index: mono/btls/CMakeLists.txt
--- mono/btls/CMakeLists.txt.orig
+++ mono/btls/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required (VERSION 2.8.10)
-cmake_minimum_required (VERSION 2.8.10...4.0)
+cmake_minimum_required(VERSION 2.8.12...3.20)
project (mono-btls)
@@ -129,4 +129,4 @@ endif ()
if (CYGWIN)
target_link_libraries (mono-btls-shared wsock32 ws2_32)
-endif ()
\ No newline at end of file
+endif ()
lang/mono/patches/patch-mono_mini_mini-exceptions_c
+1 -1
View File
@@ -6,7 +6,7 @@ https://github.com/mono/mono/issues/6359
Index: mono/mini/mini-exceptions.c
--- mono/mini/mini-exceptions.c.orig
+++ mono/mini/mini-exceptions.c
@@ -3690,7 +3690,7 @@ mono_thread_state_init (MonoThreadUnwindState *ctx)
@@ -3326,7 +3326,7 @@ mono_thread_state_init (MonoThreadUnwindState *ctx)
#endif
ctx->unwind_data [MONO_UNWIND_DATA_DOMAIN] = mono_domain_get ();
lang/mono/patches/patch-mono_mini_mini-posix_c
+1 -1
View File
@@ -3,7 +3,7 @@ use fork(2) instead of syscall (SYS_fork)
Index: mono/mini/mini-posix.c
--- mono/mini/mini-posix.c.orig
+++ mono/mini/mini-posix.c
@@ -940,7 +940,7 @@ fork_crash_safe (void)
@@ -860,7 +860,7 @@ fork_crash_safe (void)
#if defined(HOST_ANDROID)
/* SYS_fork is defined to be __NR_fork which is not defined in some ndk versions */
g_assert_not_reached ();
lang/mono/patches/patch-mono_profiler_Makefile_am
+1 -1
View File
@@ -3,7 +3,7 @@ adapt to the coop-by-default syntax in our port
Index: mono/profiler/Makefile.am
--- mono/profiler/Makefile.am.orig
+++ mono/profiler/Makefile.am
@@ -36,7 +36,7 @@ suppression_DATA = mono-profiler-coverage.suppression
@@ -42,7 +42,7 @@ suppression_DATA = mono-profiler-coverage.suppression
# sampling infrastructure depends on signals being available.
#
# See: https://bugzilla.xamarin.com/show_bug.cgi?id=57011
lang/mono/patches/patch-mono_utils_mono-sigcontext_h
-16
View File
@@ -1,16 +0,0 @@
Index: mono/utils/mono-sigcontext.h
--- mono/utils/mono-sigcontext.h.orig
+++ mono/utils/mono-sigcontext.h
@@ -472,6 +472,12 @@ typedef struct ucontext {
#define UCONTEXT_REG_SP(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_gpregs.gp_sp)
#define UCONTEXT_REG_R0(ctx) (((ucontext_t*)(ctx))->uc_mcontext.mc_gpregs.gp_x [ARMREG_R0])
#define UCONTEXT_GREGS(ctx) (&(((ucontext_t*)(ctx))->uc_mcontext.mc_gpregs.gp_x))
+#elif defined(__OpenBSD__)
+ /* ucontext_t == sigcontext */
+ #define UCONTEXT_REG_PC(ctx) (((ucontext_t*)(ctx))->sc_elr)
+ #define UCONTEXT_REG_SP(ctx) (((ucontext_t*)(ctx))->sc_sp)
+ #define UCONTEXT_REG_R0(ctx) (((ucontext_t*)(ctx))->sc_x [ARMREG_R0])
+ #define UCONTEXT_GREGS(ctx) (&(((ucontext_t*)(ctx))->sc_x))
#else
#include <ucontext.h>
#define UCONTEXT_REG_PC(ctx) (((ucontext_t*)(ctx))->uc_mcontext.pc)
lang/mono/pkg/PLIST
+4
View File
@@ -96,6 +96,7 @@ include/mono-2.0/mono/cil/
include/mono-2.0/mono/cil/opcode.def
include/mono-2.0/mono/jit/
include/mono-2.0/mono/jit/jit.h
include/mono-2.0/mono/jit/mono-private-unstable.h
include/mono-2.0/mono/metadata/
include/mono-2.0/mono/metadata/appdomain.h
include/mono-2.0/mono/metadata/assembly.h
@@ -112,6 +113,7 @@ include/mono-2.0/mono/metadata/metadata.h
include/mono-2.0/mono/metadata/mono-config.h
include/mono-2.0/mono/metadata/mono-debug.h
include/mono-2.0/mono/metadata/mono-gc.h
include/mono-2.0/mono/metadata/mono-private-unstable.h
include/mono-2.0/mono/metadata/object-forward.h
include/mono-2.0/mono/metadata/object.h
include/mono-2.0/mono/metadata/opcodes.h
@@ -130,6 +132,7 @@ include/mono-2.0/mono/utils/mono-error.h
include/mono-2.0/mono/utils/mono-forward.h
include/mono-2.0/mono/utils/mono-jemalloc.h
include/mono-2.0/mono/utils/mono-logger.h
include/mono-2.0/mono/utils/mono-private-unstable.h
include/mono-2.0/mono/utils/mono-publib.h
@static-lib lib/libMonoPosixHelper.a
lib/libMonoPosixHelper.la
@@ -3872,6 +3875,7 @@ share/examples/mono/mconfig/config.xml
share/locale/de/LC_MESSAGES/mcs.mo
share/locale/es/LC_MESSAGES/mcs.mo
share/locale/ja/LC_MESSAGES/mcs.mo
share/locale/ka/LC_MESSAGES/mcs.mo
share/locale/pt_BR/LC_MESSAGES/mcs.mo
share/mono-2.0/
share/mono-2.0/mono/