CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/06/09 22:59:13 Modified files: security/py-tlsfuzzer: Makefile distinfo security/py-tlsfuzzer/pkg: PLIST Log message: Update to py-tlsfuzzer 20230609
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2023/06/09 22:57:09 Modified files: net/py-tlslite-ng: Makefile distinfo net/py-tlslite-ng/pkg: PLIST Log message: Update to py3-tlslite-ng 0.8.0alpha44 Now uses 65537 as RSA e with all backends. https://github.com/tlsfuzzer/tlslite-ng/releases/tag/v0.8.0-alpha44
UPDATE: glog 0.6.0
Here is an update to glog 0.6.0.
https://github.com/google/glog/releases/tag/v0.6.0
https://github.com/google/glog/releases/tag/v0.5.0
Index: Makefile
===
RCS file: /home/cvs/ports/devel/glog/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- Makefile23 Feb 2023 12:38:31 - 1.24
+++ Makefile10 Jun 2023 04:37:49 -
@@ -2,10 +2,9 @@ COMMENT = C++ application-level logging
GH_ACCOUNT = google
GH_PROJECT = glog
-GH_TAGNAME = v0.4.0
-REVISION = 3
+GH_TAGNAME = v0.6.0
-SHARED_LIBS += glog 2.0 # 0.2.1
+SHARED_LIBS += glog 3.0 # 0.2.1
CATEGORIES = devel
@@ -14,7 +13,7 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} execinfo gflags m
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc
MODULES = devel/cmake
Index: distinfo
===
RCS file: /home/cvs/ports/devel/glog/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo26 Nov 2020 20:37:13 - 1.6
+++ distinfo10 Jun 2023 01:48:48 -
@@ -1,2 +1,2 @@
-SHA256 (glog-0.4.0.tar.gz) = 8oNZrroS8w1z2eRxHvNW3IQohpaBEhYrxzACZFE5w5w=
-SIZE (glog-0.4.0.tar.gz) = 200955
+SHA256 (glog-0.6.0.tar.gz) = ioO/mC83u3CCXfcalwn6kOqfREf7PAmeHXIKQ52IutY=
+SIZE (glog-0.6.0.tar.gz) = 193267
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt23 Feb 2023 12:38:31 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-Index: CMakeLists.txt
CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -72,11 +72,13 @@ check_include_file (stdlib.h HAVE_STDLIB_H)
- check_include_file (string.h HAVE_STRING_H)
- check_include_file (strings.h HAVE_STRINGS_H)
- check_include_file (sys/stat.h HAVE_SYS_STAT_H)
--check_include_file (sys/syscall.h HAVE_SYS_SYSCALL_H)
-+# Do not use syscall(2) directly
-+# check_include_file (sys/syscall.h HAVE_SYS_SYSCALL_H)
- check_include_file (sys/time.h HAVE_SYS_TIME_H)
- check_include_file (sys/types.h HAVE_SYS_TYPES_H)
- check_include_file (sys/utsname.h HAVE_SYS_UTSNAME_H)
--check_include_file (syscall.h HAVE_SYSCALL_H)
-+# Do not use syscall(2) directly
-+# check_include_file (syscall.h HAVE_SYSCALL_H)
- check_include_file (syslog.h HAVE_SYSLOG_H)
- check_include_file (ucontext.h HAVE_UCONTEXT_H)
- check_include_file (unistd.h HAVE_UNISTD_H)
Index: patches/patch-src_raw_logging_cc
===
RCS file: patches/patch-src_raw_logging_cc
diff -N patches/patch-src_raw_logging_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_raw_logging_cc10 Jun 2023 01:59:00 -
@@ -0,0 +1,15 @@
+fixed OpenBSD support (#921)
+
+Index: src/raw_logging.cc
+--- src/raw_logging.cc.orig
src/raw_logging.cc
+@@ -59,7 +59,8 @@
+ # include
+ #endif
+
+-#if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) &&
(!(defined(GLOG_OS_MACOSX)))
++#if (defined(HAVE_SYSCALL_H) || defined(HAVE_SYS_SYSCALL_H)) && \
++(!(defined(GLOG_OS_MACOSX)) && !(defined(GLOG_OS_OPENBSD)))
+ # define safe_write(fd, s, len) syscall(SYS_write, fd, s, len)
+ #else
+ // Not so safe, but what can you do?
Index: patches/patch-src_stacktrace_powerpc-inl_h
===
RCS file: patches/patch-src_stacktrace_powerpc-inl_h
diff -N patches/patch-src_stacktrace_powerpc-inl_h
--- patches/patch-src_stacktrace_powerpc-inl_h 11 Mar 2022 18:50:07 -
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-Fix the lack of _CALL_SYSV on powerpc with clang, from:
-https://github.com/google/glog/pull/545
-
-Index: src/stacktrace_powerpc-inl.h
src/stacktrace_powerpc-inl.h.orig
-+++ src/stacktrace_powerpc-inl.h
-@@ -114,7 +114,7 @@ int GetStackTrace(void** result, int max_depth, int sk
- #elif defined(__APPLE__) || ((defined(__linux) || defined(__linux__)) &&
defined(__PPC64__))
- // This check is in case the compiler doesn't define _CALL_AIX/etc.
- result[n++] = *(sp+2);
--#elif defined(__linux)
-+#elif defined(__linux) || defined(__OpenBSD__)
- // This check is in case the compiler doesn't define _CALL_SYSV.
- result[n++] = *(sp+1);
- #else
Index: patches/patch-src_symbolize_unittest_cc
===
RCS file: /home/cvs/ports/devel/glog/patches/patch-src_symbolize_unittest_cc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_symbolize_unittest_cc
--- patches/patch-src_symbolize_unittest_cc 11 Mar 2022 18:50:07 -
1.2
+++ patches/patch-src_symbolize_unittest_cc 10 Jun 2023 01:51:58 -
@@ -4,10
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sema...@cvs.openbsd.org 2023/06/09 22:25:16 Modified files: devel/gmp : Makefile Added files: devel/gmp/patches: patch-mpn_x86_64_k8_mul_basecase_asm patch-mpn_x86_64_k8_mullo_basecase_asm patch-mpn_x86_64_k8_mulmid_basecase_asm patch-mpn_x86_64_k8_redc_1_asm patch-mpn_x86_64_k8_sqr_basecase_asm patch-mpn_x86_64_mod_34lsub1_asm patch-mpn_x86_64_x86_64-defs_m4 Log message: devel/gmp: adds endbr64 instruction on amd64 specific code. It permits the testsuite to pass on IBT machine, and it unbreaks lang/gcc/8. As it is based on testsuite coverage, some faulting cases could be still present. ok naddy@
Re: [new] sysutils/awscliv2, devel/py-awscrt
On Tue, May 30, 2023 at 7:06 AM Stuart Henderson wrote: > > I've attached an updated py-awscrt tar with what I think is slightly > better handling of this. It's still a bit ugly but I think not as bad > and it will pick up new things from cmake.port.mk. Thank you. That is indeed much cleaner. > Now onto awscliv2 (which I thought was going to be the easy part...) > > See https://github.com/aws/aws-cli/issues/4947#issuecomment-586046886 > #3: they don't want to support a wide range of dependency versions > #4: they want to use their own python build with a specific openssl version > #5: they want to be able to include other binaries written in various > languages > > Backing this up, upstream's supported installation method is a zip with > a bundled copy of Python 3.11, static-linked to their own copy of an > OpenSSL 1.1.1 release, bundled libbz2 libffi libsqlite3 etc plus various > Python modules. That's what upstream's installer does, yes. That's not what the port does. The port uses the base Python, libcrypto in base, and picks up the dependent Python modules from ports. I'm hopeful you're not influenced to vote -1 for something that isn't part of the port. > As things stand, ignoring awscrt (where keeping in sync with > awscliv2 is no problem), this would add tight version restrictions > on the following ports: > > devel/py-colorama > devel/py-dateutil > devel/py-flit_core > devel/py-jmespath > devel/py-prompt_toolkit > security/py-cryptography > sysutils/py-distro > textproc/py-docutils > textproc/py-ruamel.yaml > textproc/py-ruamel.yaml.clib > www/py-urllib3 > > This already breaks the port (the current versions of several of those > deps are not accepted, even in upstream git head). And tight specs > for those ports, many of which are very common, make it difficult to > work on general Python ecosystem ports. Upstream is getting better as they're hearing from the wider community that their tight dependency versions are making things painful. As Antoine said, isn't this something we patch around? With all the software in ports, there must be others where upstream has narrow dependencies. How are they handled? .joel
UPDATE: minizip 4.0.0
Here is an update to minizip 4.0.0.
https://github.com/zlib-ng/minizip-ng/releases/tag/4.0.0
Index: Makefile
===
RCS file: /home/cvs/ports/archivers/minizip/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile13 Jul 2022 19:54:47 - 1.6
+++ Makefile9 Jun 2023 23:41:18 -
@@ -2,11 +2,11 @@ COMMENT = zip manipulation library
GH_ACCOUNT = zlib-ng
GH_PROJECT = minizip-ng
-GH_TAGNAME = 3.0.6
+GH_TAGNAME = 4.0.0
PKGNAME = minizip-${GH_TAGNAME}
-SHARED_LIBS += minizip 1.1 # 3
+SHARED_LIBS += minizip 2.0 # 4
CATEGORIES = archivers
Index: distinfo
===
RCS file: /home/cvs/ports/archivers/minizip/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo13 Jul 2022 19:54:47 - 1.4
+++ distinfo9 Jun 2023 23:19:48 -
@@ -1,2 +1,2 @@
-SHA256 (minizip-ng-3.0.6.tar.gz) = OD+hvcKMSCgoqKjbU/dY29RCkbZBGCck/aXfW1nM5UM=
-SIZE (minizip-ng-3.0.6.tar.gz) = 642138
+SHA256 (minizip-ng-4.0.0.tar.gz) = +QYuV23gJv1QJtZVl947BSY81NkUAMrNu+Nt+opkL/8=
+SIZE (minizip-ng-4.0.0.tar.gz) = 766989
Index: patches/patch-CMakeLists_txt
===
RCS file: /home/cvs/ports/archivers/minizip/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt13 Jul 2022 19:54:47 - 1.5
+++ patches/patch-CMakeLists_txt9 Jun 2023 23:38:11 -
@@ -1,22 +1,12 @@
-install headers in include/minizip to avoid conflicts with libzip
-
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -86,7 +86,7 @@ include(cmake/clone-repo.cmake)
-
- set(INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Installation
directory for executables")
- set(INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Installation
directory for libraries")
--set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Installation
directory for headers")
-+set(INSTALL_INC_DIR ${CMAKE_INSTALL_INCLUDEDIR}/minizip CACHE PATH
"Installation directory for headers")
- set(INSTALL_MAN_DIR ${CMAKE_INSTALL_MANDIR} CACHE PATH "Installation
directory for manual pages")
-
- set(STDLIB_DEF)
-@@ -442,7 +442,6 @@ endif()
-
- # Unix specific
- if(UNIX)
--list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200112L)
+@@ -455,7 +455,7 @@ if(WIN32)
+ set(MZ_LIBBSD OFF)
+ set(MZ_ICONV OFF)
+ else()
+-list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200809L)
++list(APPEND STDLIB_DEF -D_POSIX_C_SOURCE=200809L -D_BSD_SOURCE)
list(APPEND MINIZIP_SRC mz_os_posix.c mz_strm_os_posix.c)
- if(MZ_PKCRYPT OR MZ_WZAES OR MZ_SIGNING)
+ if(MZ_PKCRYPT OR MZ_WZAES)
Index: patches/patch-minizip_pc_cmakein
===
RCS file: patches/patch-minizip_pc_cmakein
diff -N patches/patch-minizip_pc_cmakein
--- patches/patch-minizip_pc_cmakein11 Mar 2022 18:16:22 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-Index: minizip.pc.cmakein
minizip.pc.cmakein.orig
-+++ minizip.pc.cmakein
-@@ -2,7 +2,7 @@ prefix=@CMAKE_INSTALL_PREFIX@
- exec_prefix=@CMAKE_INSTALL_PREFIX@
- libdir=@CMAKE_INSTALL_FULL_LIBDIR@
- sharedlibdir=@CMAKE_INSTALL_FULL_LIBDIR@
--includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/minizip
-
- Name: @PROJECT_NAME@
- Description: Minizip zip file manipulation library
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/archivers/minizip/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST 11 Mar 2022 18:16:22 - 1.5
+++ pkg/PLIST 9 Jun 2023 23:39:34 -
@@ -21,10 +21,9 @@ include/minizip/mz_zip_rw.h
include/minizip/unzip.h
include/minizip/zip.h
lib/cmake/
-lib/cmake/minizip/
-lib/cmake/minizip/minizip-config-version.cmake
-lib/cmake/minizip/minizip-config.cmake
-lib/cmake/minizip/minizip${MODCMAKE_BUILD_SUFFIX}
-lib/cmake/minizip/minizip.cmake
+lib/cmake/minizip-config-version.cmake
+lib/cmake/minizip-config.cmake
+lib/cmake/minizip${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/minizip.cmake
@lib lib/libminizip.so.${LIBminizip_VERSION}
lib/pkgconfig/minizip.pc
Re: [Update] shells/nushell 0.81.0
On 6/9/23 22:51, Solène Rapenne wrote: the port is fine for me, but that new version seems to have a huge regression, or did they change too much things? The output of this command is completely wrong with the new version ls /bsd | find str bsd Ha, yes - find with more than one search parameter seems broken indeed. I filed a bug on github for that.
Re: [Update] shells/nushell 0.81.0
On Fri, 2023-06-09 at 13:51 +0200, Volker Schlecht wrote: > * Updates nushell to 0.81.0 > https://www.nushell.sh/blog/2023-06-06-nushell_0_81.html > > * Make COMMENT the same as in the project's homepage > > * This release (temporarily) removes support for ARMv7 > and RISC-V, added those to NOT_FOR_ARCHS > > Built and tested on amd64. the port is fine for me, but that new version seems to have a huge regression, or did they change too much things? The output of this command is completely wrong with the new version ls /bsd | find str bsd
Re: devel/gmp: patch for IBT support
Sebastien Marie: > The following diff makes devel/gmp to pass its testsuite on IBT machine. Thank you! > As it is based on testsuite coverage, some faulting cases could be still > present. But it is enough to fully unbreak lang/gcc/8 build (with a new > bootstrap and new libgmp.so file). The devel/mpfr testsuite also passes. ok naddy@ -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: [Maintainer Update] lang/erlang/25 25.3.2.2
On 6/9/23 18:57, Klemens Nanni wrote:
-V= 25.3.2
+V= 25.3.2.2
Looks like for 25 you keep the conflict in sync, would this be better?
UPDATE_PLIST_ARGS = -i V
Yup, looks better, thanks! :-)
26, however, is at 26.0.1 and <26.1 with your latest diff, so I'm unsure.
I tried it out and keeping that bit in sync between 25 and 26 gives me
clean updates with both erlang versions.
Index: Makefile
===
RCS file: /cvs/ports/lang/erlang/25/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 31 May 2023 15:17:33 - 1.17
+++ Makefile 9 Jun 2023 19:26:56 -
@@ -3,14 +3,13 @@ BROKEN-alpha= beam/erl_process.c:6692: i
COMMENT-main= ${COMMENT}
COMMENT-wx= WxWidgets bindings for Erlang
-V= 25.3.2
+V= 25.3.2.2
PORTROACH= limit:^OTP-25\.
DISTNAME= otp_src_$V
PKGNAME= erlang-$V
PKGNAME-main= erlang-$V
PKGNAME-wx= erlang-wx-$V
EPOCH= 0
-REVISION= 0
VERSION_SPEC= >=25v0,<26v0
PKGSPEC-main= erlang-${VERSION_SPEC}
@@ -60,11 +59,13 @@ FAKE_FLAGS = libdir_suffix="/erlang${MAJ
AUTOCONF_VERSION = 2.69
+UPDATE_PLIST_ARGS = -i V
+
# Use the target 'gen-versions' to update this list
ERL_VERSIONS= \
ASN1_VSN5.0.21 \
COMMON_TEST_VSN 1.24 \
-COMPILER_VSN8.2.6 \
+COMPILER_VSN8.2.6.2 \
CRYPTO_VSN 5.1.4 \
DEBUGGER_VSN5.3.1 \
DIALYZER_VSN5.0.5 \
@@ -93,12 +94,12 @@ SASL_VSN4.2 \
SNMP_VSN5.13.5 \
SSH_VSN 4.15.3 \
SSL_VSN 10.9.1 \
-STDLIB_VSN 4.3.1 \
+STDLIB_VSN 4.3.1.1 \
SYNTAX_TOOLS_VSN3.0.1 \
TFTP_VSN1.0.4 \
TOOLS_VSN 3.5.3 \
WX_VSN 2.2.2 \
-XMERL_VSN 1.3.31 \
-ERTS_VSN13.2.2
+XMERL_VSN 1.3.31.1 \
+ERTS_VSN13.2.2.1
.include
Index: distinfo
===
RCS file: /cvs/ports/lang/erlang/25/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 17 May 2023 13:39:46 - 1.9
+++ distinfo 9 Jun 2023 19:26:56 -
@@ -1,4 +1,4 @@
-SHA256 (otp_doc_man_25.3.2.tar.gz) = H5hRYz30VrMZ9rxw1vkDXFrF1j0ZN+GnlL2MiIs5Eq8=
-SHA256 (otp_src_25.3.2.tar.gz) = rtTkcmzcWHq4IMg3nWPlEeRqGxzAxZ1qcgtRrmJbJRA=
-SIZE (otp_doc_man_25.3.2.tar.gz) = 1717601
-SIZE (otp_src_25.3.2.tar.gz) = 103757566
+SHA256 (otp_doc_man_25.3.2.2.tar.gz) = GoQkTwUYpIDEGWlwh+DseYjhIhfF8X6OI3LQCiiEMlk=
+SHA256 (otp_src_25.3.2.2.tar.gz) = g6NvPZDe7zatthW7+0bNMn8Ldrdmjh9/JT/Wa0riRRg=
+SIZE (otp_doc_man_25.3.2.2.tar.gz) = 1718654
+SIZE (otp_src_25.3.2.2.tar.gz) = 103844480
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/erlang/25/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-main
--- pkg/PLIST-main 31 May 2023 15:17:34 - 1.10
+++ pkg/PLIST-main 9 Jun 2023 19:26:56 -
@@ -2,7 +2,7 @@
@option is-branch
@conflict erlang->=25,<26
@conflict erlang->=25v0,<26v0
-@conflict erlang-wx->=25,<25.3.2
+@conflict erlang-wx->=25,<${V}
@pkgpath lang/erlang/21,-main
@newgroup _epmd:888
@newuser _epmd:888:_epmd::Erlang EPMD Account:/var/empty:/sbin/nologin
Index: Makefile
===
RCS file: /cvs/ports/lang/erlang/26/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 31 May 2023 15:06:44 - 1.1.1.1
+++ Makefile 9 Jun 2023 19:26:04 -
@@ -5,7 +5,7 @@ USE_WXNEEDED= Yes
COMMENT-main= ${COMMENT}
COMMENT-wx= WxWidgets bindings for Erlang
-V= 26.0
+V= 26.0.1
DISTNAME= otp_src_${V}
PORTROACH= limit:^OTP-26\.
PKGNAME= erlang-${V}
@@ -61,11 +61,13 @@ FAKE_FLAGS = libdir_suffix="/erlang${MAJ
AUTOCONF_VERSION = 2.69
+UPDATE_PLIST_ARGS = -i V
+
# Use the target 'gen-versions' to update this list
ERL_VERSIONS= \
ASN1_VSN5.1 \
COMMON_TEST_VSN 1.25 \
-COMPILER_VSN8.3 \
+COMPILER_VSN8.3.1 \
CRYPTO_VSN 5.2 \
DEBUGGER_VSN5.3.1 \
DIALYZER_VSN5.1 \
@@ -79,9 +81,9 @@ ERL_INTERFACE_VSN 5.4 \
ET_VSN 1.7 \
EUNIT_VSN 2.8.2 \
FTP_VSN 1.2 \
-INETS_VSN 9.0 \
+INETS_VSN 9.0.1 \
JINTERFACE_VSN 1.14 \
-KERNEL_VSN 9.0 \
+KERNEL_VSN 9.0.1 \
MEGACO_VSN 4.4.4 \
MNESIA_VSN 4.22 \
OBSERVER_VSN2.15 \
@@ -94,13 +96,13 @@ RUNTIME_TOOLS_VSN 2.0 \
SASL_VSN4.2.1 \
SNMP_VSN5.14 \
SSH_VSN 5.0 \
-SSL_VSN 11.0 \
-STDLIB_VSN 5.0 \
+SSL_VSN 11.0.1 \
+STDLIB_VSN 5.0.1 \
SYNTAX_TOOLS_VSN3.1 \
TFTP_VSN1.1 \
TOOLS_VSN 3.6 \
WX_VSN 2.3 \
-XMERL_VSN 1.3.31 \
-ERTS_VSN14.0
+XMERL_VSN 1.3.32 \
+ERTS_VSN14.0.1
.include
Index: distinfo
===
RCS file: /cvs/ports/lang/erlang/26/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 31 May 2023 15:06:44 - 1.1.1.1
+++ distinfo 9 Jun 2023 19:26:04 -
@@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/06/09 12:11:37 Modified files: www/mozilla-firefox: Tag: OPENBSD_7_3 Makefile distinfo Log message: www/mozilla-firefox: MFC update to 114.0.1. see https://www.mozilla.org/en-US/firefox/114.0.1/releasenotes/ fixes #1837201
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/06/09 12:10:25 Modified files: www/mozilla-firefox: Makefile distinfo www/firefox-i18n: Makefile.inc distinfo Log message: www/mozilla-firefox: bugfix update to 114.0.1 see https://www.mozilla.org/en-US/firefox/114.0.1/releasenotes/ fixes #1837201
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2023/06/09 11:56:28 Modified files: net/synapse: Makefile distinfo Log message: net/synapse: update to 1.85.2, from MAINTAINER Renaud Allard
Re: [Maintainer Update] lang/erlang/25 25.3.2.2
On Fri, Jun 09, 2023 at 10:36:13AM +0200, Volker Schlecht wrote:
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/erlang/25/Makefile,v
> retrieving revision 1.17
> diff -u -p -r1.17 Makefile
> --- Makefile 31 May 2023 15:17:33 - 1.17
> +++ Makefile 9 Jun 2023 16:45:03 -
> @@ -3,14 +3,13 @@ BROKEN-alpha= beam/erl_process.c:6692: i
> COMMENT-main=${COMMENT}
> COMMENT-wx= WxWidgets bindings for Erlang
>
> -V= 25.3.2
> +V= 25.3.2.2
Looks like for 25 you keep the conflict in sync, would this be better?
UPDATE_PLIST_ARGS = -i V
> Index: pkg/PLIST-main
> ===
> RCS file: /cvs/ports/lang/erlang/25/pkg/PLIST-main,v
> retrieving revision 1.10
> diff -u -p -r1.10 PLIST-main
> --- pkg/PLIST-main31 May 2023 15:17:34 - 1.10
> +++ pkg/PLIST-main9 Jun 2023 16:45:03 -
> @@ -2,7 +2,7 @@
> @option is-branch
> @conflict erlang->=25,<26
> @conflict erlang->=25v0,<26v0
> -@conflict erlang-wx->=25,<25.3.2
> +@conflict erlang-wx->=25,<25.3.2.2
@conflict erlang-wx->=25,<${V}
> @pkgpath lang/erlang/21,-main
> @newgroup _epmd:888
> @newuser _epmd:888:_epmd::Erlang EPMD Account:/var/empty:/sbin/nologin
26, however, is at 26.0.1 and <26.1 with your latest diff, so I'm unsure.
Re: [Maintainer Update] lang/gleam 0.29.0
Ping. On 6/1/23 20:13, Volker Schlecht wrote: Update gleam to 0.29.0 Adds a few improvements, most notably initial support for LSP autocompletion, which still has its troubles (not related to the port, though.) Builds and tests fine on amd64.Index: Makefile === RCS file: /cvs/ports/lang/gleam/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 25 Apr 2023 19:50:46 - 1.1.1.1 +++ Makefile 1 Jun 2023 18:08:59 - @@ -2,7 +2,7 @@ COMMENT = statically typed language for GH_ACCOUNT = gleam-lang GH_PROJECT = gleam -GH_TAGNAME = v0.28.3 +GH_TAGNAME = v0.29.0 HOMEPAGE = https://gleam.run Index: crates.inc === RCS file: /cvs/ports/lang/gleam/crates.inc,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 crates.inc --- crates.inc 25 Apr 2023 19:50:47 - 1.1.1.1 +++ crates.inc 1 Jun 2023 18:08:59 - @@ -25,8 +25,8 @@ MODCARGO_CRATES += capnpc 0.14.9 # MIT MODCARGO_CRATES += cc 1.0.79 # MIT OR Apache-2.0 MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0 MODCARGO_CRATES += chrono 0.4.24 # MIT/Apache-2.0 -MODCARGO_CRATES += clap 3.2.23 # MIT OR Apache-2.0 -MODCARGO_CRATES += clap_derive 3.2.18 # MIT OR Apache-2.0 +MODCARGO_CRATES += clap 3.2.25 # MIT OR Apache-2.0 +MODCARGO_CRATES += clap_derive 3.2.25 # MIT OR Apache-2.0 MODCARGO_CRATES += clap_lex 0.2.4 # MIT OR Apache-2.0 MODCARGO_CRATES += codespan-reporting 0.11.1 # Apache-2.0 MODCARGO_CRATES += combine 4.6.6 # MIT @@ -74,7 +74,7 @@ MODCARGO_CRATES += futures-util 0.3.28 # MODCARGO_CRATES += generic-array 0.14.7 # MIT MODCARGO_CRATES += getrandom 0.2.9 # MIT OR Apache-2.0 MODCARGO_CRATES += globset 0.4.10 # Unlicense OR MIT -MODCARGO_CRATES += h2 0.3.17 # MIT +MODCARGO_CRATES += h2 0.3.18 # MIT MODCARGO_CRATES += hashbrown 0.12.3 # MIT OR Apache-2.0 MODCARGO_CRATES += heck 0.4.1 # MIT OR Apache-2.0 MODCARGO_CRATES += hermit-abi 0.1.19 # MIT/Apache-2.0 @@ -88,7 +88,7 @@ MODCARGO_CRATES += http-body 0.4.5 # MIT MODCARGO_CRATES += httparse 1.8.0 # MIT/Apache-2.0 MODCARGO_CRATES += httpdate 1.0.2 # MIT/Apache-2.0 MODCARGO_CRATES += humansize 1.1.1 # MIT/Apache-2.0 -MODCARGO_CRATES += hyper 0.14.25 # MIT +MODCARGO_CRATES += hyper 0.14.26 # MIT MODCARGO_CRATES += hyper-rustls 0.23.2 # Apache-2.0/ISC/MIT MODCARGO_CRATES += idna 0.3.0 # MIT OR Apache-2.0 MODCARGO_CRATES += ignore 0.4.20 # Unlicense OR MIT @@ -104,9 +104,9 @@ MODCARGO_CRATES += js-sys 0.3.61 # MIT/A MODCARGO_CRATES += kstring 1.0.6 # MIT OR Apache-2.0 MODCARGO_CRATES += lazy_static 1.4.0 # MIT/Apache-2.0 MODCARGO_CRATES += lexical-core 0.7.6 # MIT/Apache-2.0 -MODCARGO_CRATES += libc 0.2.141 # MIT OR Apache-2.0 +MODCARGO_CRATES += libc 0.2.142 # MIT OR Apache-2.0 MODCARGO_CRATES += linked-hash-map 0.5.6 # MIT/Apache-2.0 -MODCARGO_CRATES += linux-raw-sys 0.3.1 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +MODCARGO_CRATES += linux-raw-sys 0.3.3 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT MODCARGO_CRATES += log 0.4.17 # MIT OR Apache-2.0 MODCARGO_CRATES += lsp-server 0.5.2 # MIT OR Apache-2.0 MODCARGO_CRATES += lsp-types 0.92.1 # MIT @@ -161,7 +161,7 @@ MODCARGO_CRATES += ring 0.16.20 # LICENS MODCARGO_CRATES += rpassword 5.0.1 # Apache-2.0 MODCARGO_CRATES += rustc-hash 1.1.0 # Apache-2.0/MIT MODCARGO_CRATES += rusticata-macros 3.2.0 # MIT/Apache-2.0 -MODCARGO_CRATES += rustix 0.37.11 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT +MODCARGO_CRATES += rustix 0.37.13 # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT MODCARGO_CRATES += rustls 0.20.8 # Apache-2.0/ISC/MIT MODCARGO_CRATES += rustls-native-certs 0.6.2 # Apache-2.0/ISC/MIT MODCARGO_CRATES += rustls-pemfile 1.0.2 # Apache-2.0 OR ISC OR MIT @@ -196,7 +196,7 @@ MODCARGO_CRATES += strum 0.24.1 # MIT MODCARGO_CRATES += strum_macros 0.24.3 # MIT MODCARGO_CRATES += symlink 0.1.0 # MIT/Apache-2.0 MODCARGO_CRATES += syn 1.0.109 # MIT OR Apache-2.0 -MODCARGO_CRATES += syn 2.0.14 # MIT OR Apache-2.0 +MODCARGO_CRATES += syn 2.0.15 # MIT OR Apache-2.0 MODCARGO_CRATES += tap 1.0.1 # MIT MODCARGO_CRATES += tar 0.4.38 # MIT/Apache-2.0 MODCARGO_CRATES += tempfile 3.5.0 # MIT OR Apache-2.0 Index: distinfo === RCS file: /cvs/ports/lang/gleam/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 25 Apr 2023 19:50:47 - 1.1.1.1 +++ distinfo 1 Jun 2023 18:08:59 - @@ -25,8 +25,8 @@ SHA256 (cargo/capnpc-0.14.9.tar.gz) = vc SHA256 (cargo/cc-1.0.79.tar.gz) = UNMJBihhIdlb49R5UztFj4dJOzCktfeaYH249dEaqR8= SHA256 (cargo/cfg-if-1.0.0.tar.gz) = uvHeQzl2FYi8Bhnjy8ASDuWC67dLU7Tvv3kRe9LaQP0= SHA256 (cargo/chrono-0.4.24.tar.gz) = TjxZGQZq3yLfc3YuUM/83jp1jyqEixE7WG0fhnKLZzs= -SHA256 (cargo/clap-3.2.23.tar.gz) = cWVcRcuYRdMnDJ1t+E6+crTa08K6P3AjrUfBROTkc6U= -SHA256 (cargo/clap_derive-3.2.18.tar.gz) =
[Update] x11/alacritty 0.12.1
Cc: Maintainer
* Updates alacritty to version 0.12.1
https://github.com/alacritty/alacritty/releases/tag/v0.12.1
* For whatever reason, github returns a '300 Multiple Choices' when
trying to retrieve anything later than 0.10.0 via GH_*, so I propose
to switch to explicit MASTER_SITES, DISTFILES etc.
* Sets homepage to the project's homepage
* Adds a remark as to why the only test failure occurs
* Integrate recent proposal from Joel Carnat (add desktop file):
https://marc.info/?l=openbsd-ports=168600758810361=2
Everything else is dependency churn. Works fine on amd64.Index: Makefile
===
RCS file: /cvs/ports/x11/alacritty/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 30 Jan 2023 13:28:40 - 1.12
+++ Makefile 9 Jun 2023 13:06:51 -
@@ -3,10 +3,12 @@ CATEGORIES = x11
MAINTAINER = Eric Auge
-GH_ACCOUNT = alacritty
-GH_PROJECT = alacritty
-GH_TAGNAME = v0.10.0
-REVISION = 4
+VERSION = 0.12.1
+DISTNAME = alacritty-${VERSION}
+MASTER_SITES = https://github.com/alacritty/alacritty/
+DISTFILES += alacritty-{archive/refs/tags/}v${VERSION}${EXTRACT_SUFX}
+
+HOMEPAGE = https://alacritty.org/
# Apache 2.0
PERMIT_PACKAGE = Yes
@@ -16,6 +18,8 @@ WANTLIB += c c++abi fontconfig freetype
MODULES = devel/cargo \
lang/python
+RUN_DEPENDS = devel/desktop-file-utils
+
# for riscv64 and powerpc64, please keep: cc >= 1.0.73 and libc >= 0.2.113
MODCARGO_CRATES_UPDATE = cc libc
MODCARGO_RUSTFLAGS += -L${PREFIX}/lib
@@ -33,10 +37,12 @@ CONFIGURE_STYLE = cargo
SEPARATE_BUILD = Yes
RELEASE_DIR = ${MODCARGO_TARGET_DIR}/release
-EXTRA_DIR= ${WRKSRC}/extra
+EXTRA_DIR = ${WRKSRC}/extra
-# test result: FAILED. 60 passed; 1 failed;
+# test result: FAILED. 68 passed; 1 failed;
# failed test: config::tests::config_read_eof
+# because we patch the default configuration value
+# for live_config_reload
do-install:
${INSTALL_PROGRAM} ${RELEASE_DIR}/alacritty ${PREFIX}/bin/
@@ -50,6 +56,12 @@ do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/zsh/site-functions
${INSTALL_DATA} ${EXTRA_DIR}/completions/_alacritty \
${PREFIX}/share/zsh/site-functions/_alacritty
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+ ${INSTALL_DATA} ${EXTRA_DIR}/linux/Alacritty.desktop \
+ ${PREFIX}/share/applications/
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+ ${INSTALL_DATA} ${EXTRA_DIR}/logo/alacritty-term.svg \
+ ${PREFIX}/share/pixmaps/Alacritty.svg
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/alacritty
${INSTALL_DATA} ${WRKSRC}/alacritty.yml \
${PREFIX}/share/examples/alacritty/alacritty.yml
Index: crates.inc
===
RCS file: /cvs/ports/x11/alacritty/crates.inc,v
retrieving revision 1.4
diff -u -p -r1.4 crates.inc
--- crates.inc 31 Aug 2022 10:46:01 - 1.4
+++ crates.inc 9 Jun 2023 13:06:51 -
@@ -1,201 +1,232 @@
-MODCARGO_CRATES += adler32 1.2.0 # Zlib
-MODCARGO_CRATES += android_glue 0.2.3 # MIT
-MODCARGO_CRATES += ansi_term 0.12.1 # MIT
+MODCARGO_CRATES += adler 1.0.2 # 0BSD OR MIT OR Apache-2.0
+MODCARGO_CRATES += android-activity 0.4.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += android-properties 0.2.2 # MIT
+MODCARGO_CRATES += arrayref 0.3.6 # BSD-2-Clause
+MODCARGO_CRATES += arrayvec 0.7.2 # MIT OR Apache-2.0
MODCARGO_CRATES += atty 0.2.14 # MIT
-MODCARGO_CRATES += autocfg 1.0.1 # Apache-2.0 OR MIT
+MODCARGO_CRATES += autocfg 1.1.0 # Apache-2.0 OR MIT
MODCARGO_CRATES += base64 0.13.0 # MIT/Apache-2.0
-MODCARGO_CRATES += bitflags 1.2.1 # MIT/Apache-2.0
+MODCARGO_CRATES += bitflags 1.3.2 # MIT/Apache-2.0
MODCARGO_CRATES += block 0.1.6 # MIT
-MODCARGO_CRATES += bumpalo 3.9.1 # MIT/Apache-2.0
-MODCARGO_CRATES += calloop 0.9.3 # MIT
+MODCARGO_CRATES += block-sys 0.1.0-beta.1 # MIT
+MODCARGO_CRATES += block2 0.2.0-alpha.6 # MIT
+MODCARGO_CRATES += bumpalo 3.12.0 # MIT/Apache-2.0
+MODCARGO_CRATES += bytemuck 1.12.1 # Zlib OR Apache-2.0 OR MIT
+MODCARGO_CRATES += calloop 0.10.4 # MIT
MODCARGO_CRATES += cc 1.0.73 # MIT/Apache-2.0
MODCARGO_CRATES += cfg-if 0.1.10 # MIT/Apache-2.0
MODCARGO_CRATES += cfg-if 1.0.0 # MIT/Apache-2.0
+MODCARGO_CRATES += cfg_aliases 0.1.1 # MIT
MODCARGO_CRATES += cgl 0.3.2 # MIT / Apache-2.0
-MODCARGO_CRATES += clap 2.34.0 # MIT
+MODCARGO_CRATES += clap 3.2.21 # MIT OR Apache-2.0
+MODCARGO_CRATES += clap_complete 3.2.5 # MIT OR Apache-2.0
+MODCARGO_CRATES += clap_derive 3.2.18 # MIT OR Apache-2.0
+MODCARGO_CRATES += clap_lex 0.2.4 # MIT OR Apache-2.0
MODCARGO_CRATES += clipboard-win 3.1.1 # MIT
MODCARGO_CRATES += cmake 0.1.48 # MIT/Apache-2.0
MODCARGO_CRATES += cocoa 0.24.0 # MIT / Apache-2.0
MODCARGO_CRATES += cocoa-foundation 0.1.0 # MIT / Apache-2.0
-MODCARGO_CRATES += copypasta 0.7.1 # MIT / Apache-2.0
-MODCARGO_CRATES += core-foundation 0.7.0 # MIT / Apache-2.0
-MODCARGO_CRATES += core-foundation 0.9.2 # MIT / Apache-2.0
-MODCARGO_CRATES += core-foundation-sys 0.7.0 # MIT / Apache-2.0
+MODCARGO_CRATES +=
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2023/06/09 05:22:43 Modified files: devel/p5-Date-Extract: Makefile Log message: Replace test dependency p5-Test-MockTime with p5-Test-MockTime-HiRes as newer p5-Date-Extract 0.07 needs that.
[Maintainer Update] lang/erlang/26 26.0.1
Updates lang/erlang/26 to latest bugfix release 26.0.1
Builds, installs, tests pass on amd64.Index: Makefile
===
RCS file: /cvs/ports/lang/erlang/26/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile 31 May 2023 15:06:44 - 1.1.1.1
+++ Makefile 9 Jun 2023 11:13:26 -
@@ -5,7 +5,7 @@ USE_WXNEEDED= Yes
COMMENT-main= ${COMMENT}
COMMENT-wx= WxWidgets bindings for Erlang
-V= 26.0
+V= 26.0.1
DISTNAME= otp_src_${V}
PORTROACH= limit:^OTP-26\.
PKGNAME= erlang-${V}
@@ -65,7 +65,7 @@ AUTOCONF_VERSION = 2.69
ERL_VERSIONS= \
ASN1_VSN5.1 \
COMMON_TEST_VSN 1.25 \
-COMPILER_VSN8.3 \
+COMPILER_VSN8.3.1 \
CRYPTO_VSN 5.2 \
DEBUGGER_VSN5.3.1 \
DIALYZER_VSN5.1 \
@@ -79,9 +79,9 @@ ERL_INTERFACE_VSN 5.4 \
ET_VSN 1.7 \
EUNIT_VSN 2.8.2 \
FTP_VSN 1.2 \
-INETS_VSN 9.0 \
+INETS_VSN 9.0.1 \
JINTERFACE_VSN 1.14 \
-KERNEL_VSN 9.0 \
+KERNEL_VSN 9.0.1 \
MEGACO_VSN 4.4.4 \
MNESIA_VSN 4.22 \
OBSERVER_VSN2.15 \
@@ -94,13 +94,13 @@ RUNTIME_TOOLS_VSN 2.0 \
SASL_VSN4.2.1 \
SNMP_VSN5.14 \
SSH_VSN 5.0 \
-SSL_VSN 11.0 \
-STDLIB_VSN 5.0 \
+SSL_VSN 11.0.1 \
+STDLIB_VSN 5.0.1 \
SYNTAX_TOOLS_VSN3.1 \
TFTP_VSN1.1 \
TOOLS_VSN 3.6 \
WX_VSN 2.3 \
-XMERL_VSN 1.3.31 \
-ERTS_VSN14.0
+XMERL_VSN 1.3.32 \
+ERTS_VSN14.0.1
.include
Index: distinfo
===
RCS file: /cvs/ports/lang/erlang/26/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 31 May 2023 15:06:44 - 1.1.1.1
+++ distinfo 9 Jun 2023 11:13:26 -
@@ -1,4 +1,4 @@
-SHA256 (otp_doc_man_26.0.tar.gz) = nD6nvzNrIQg5Rnn1o4J7YnxhqppBrVnSUG25b+fEnVw=
-SHA256 (otp_src_26.0.tar.gz) = P/PFPX75pFtXIOlbh1YmnBobWOtRrMyZLKl1Iv2yNNQ=
-SIZE (otp_doc_man_26.0.tar.gz) = 1742307
-SIZE (otp_src_26.0.tar.gz) = 104683285
+SHA256 (otp_doc_man_26.0.1.tar.gz) = p3ZwPTxbvLetKKgB63IJc00YZCsKG5yZitQkCUF5IJ8=
+SHA256 (otp_src_26.0.1.tar.gz) = 0Mjhf3PnFGKUujn0md4IbQZABY7AOMJAIXIuphIgfZI=
+SIZE (otp_doc_man_26.0.1.tar.gz) = 1735789
+SIZE (otp_src_26.0.1.tar.gz) = 104738804
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2023/06/09 05:17:20 Modified files: infrastructure/lib/DPB: Job.pm Log message: fiddle with job naming some more: have basic tasks not have a name, and teach job to not add (taskname) if it's undefined. will fix some minor display nits as seen by naddy@
devel/gmp: patch for IBT support
Hi,
The following diff makes devel/gmp to pass its testsuite on IBT machine.
I bumped REVISION for all subpackages as I am unsure if cxx is affected by asm
changes or not. So in doubt, bump.
The patches adds `endbr64' instruction on amd64 specific code. There was found
by running in loop the testsuite, identify the function where a SIGILL occurs,
read, understand and patch the whole file.
As it is based on testsuite coverage, some faulting cases could be still
present. But it is enough to fully unbreak lang/gcc/8 build (with a new
bootstrap and new libgmp.so file).
Comments or OK ?
--
Sebastien Marie
Index: Makefile
===
RCS file: /cvs/ports/devel/gmp/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile25 Apr 2023 09:39:14 - 1.47
+++ Makefile9 Jun 2023 10:31:32 -
@@ -2,7 +2,7 @@ COMMENT-main= library for arbitrary prec
COMMENT-cxx= C++ library for arbitrary precision arithmetic
VERSION= 6.2.1
-REVISION-main= 1
+REVISION= 2
DISTNAME= gmp-${VERSION}
MULTI_PACKAGES=-main -cxx
PKGNAME-cxx= gmpxx-${VERSION}
Index: patches/patch-mpn_x86_64_k8_mul_basecase_asm
===
RCS file: patches/patch-mpn_x86_64_k8_mul_basecase_asm
diff -N patches/patch-mpn_x86_64_k8_mul_basecase_asm
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-mpn_x86_64_k8_mul_basecase_asm9 Jun 2023 10:31:32
-
@@ -0,0 +1,47 @@
+Index: mpn/x86_64/k8/mul_basecase.asm
+--- mpn/x86_64/k8/mul_basecase.asm.orig
mpn/x86_64/k8/mul_basecase.asm
+@@ -335,9 +335,11 @@ C addmul_2 for remaining vp's
+ C adjusted value of n that is reloaded on each iteration
+
+ L(addmul_outer_0):
++ endbr64
+ add $3, un
+ lea 0(%rip), outer_addr
+
++ endbr64
+ mov un, n
+ mov -24(up,un,8), %rax
+ mul v0
+@@ -348,6 +350,7 @@ L(addmul_outer_0):
+ jmp L(addmul_entry_0)
+
+ L(addmul_outer_1):
++ endbr64
+ mov un, n
+ mov (up,un,8), %rax
+ mul v0
+@@ -358,9 +361,11 @@ L(addmul_outer_1):
+ jmp L(addmul_entry_1)
+
+ L(addmul_outer_2):
++ endbr64
+ add $1, un
+ lea 0(%rip), outer_addr
+
++ endbr64
+ mov un, n
+ mov -8(up,un,8), %rax
+ mul v0
+@@ -372,9 +377,11 @@ L(addmul_outer_2):
+ jmp L(addmul_entry_2)
+
+ L(addmul_outer_3):
++ endbr64
+ add $2, un
+ lea 0(%rip), outer_addr
+
++ endbr64
+ mov un, n
+ mov -16(up,un,8), %rax
+ xor R32(w3), R32(w3)
Index: patches/patch-mpn_x86_64_k8_mullo_basecase_asm
===
RCS file: patches/patch-mpn_x86_64_k8_mullo_basecase_asm
diff -N patches/patch-mpn_x86_64_k8_mullo_basecase_asm
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-mpn_x86_64_k8_mullo_basecase_asm 9 Jun 2023 10:31:32
-
@@ -0,0 +1,46 @@
+Index: mpn/x86_64/k8/mullo_basecase.asm
+--- mpn/x86_64/k8/mullo_basecase.asm.orig
mpn/x86_64/k8/mullo_basecase.asm
+@@ -99,12 +99,14 @@ dnlJMPENT( L(2m4), L(tab)) C 10
+ dnl JMPENT( L(3m4), L(tab)) C 11
+ TEXT
+
+-L(1): imul%r8, %rax
++L(1): endbr64
++ imul%r8, %rax
+ mov %rax, (rp)
+ FUNC_EXIT()
+ ret
+
+-L(2): mov 8(vp_param), %r11
++L(2): endbr64
++ mov 8(vp_param), %r11
+ imul%rax, %r11 C u0 x v1
+ mul %r8 C u0 x v0
+ mov %rax, (rp)
+@@ -115,7 +117,8 @@ L(2): mov 8(vp_param), %r11
+ FUNC_EXIT()
+ ret
+
+-L(3): mov 8(vp_param), %r9C v1
++L(3): endbr64
++ mov 8(vp_param), %r9C v1
+ mov 16(vp_param), %r11
+ mul %r8 C u0 x v0 ->
+ mov %rax, (rp) C r0
+@@ -335,6 +338,7 @@ L(mul_2_entry_1):
+
+
+ L(addmul_outer_1):
++ endbr64
+ lea -2(n), j
+ mov -16(up,n,8), %rax
+ mul v0
+@@ -346,6 +350,7 @@ L(addmul_outer_1):
+ jmp L(addmul_entry_1)
+
+ L(addmul_outer_3):
++ endbr64
+ lea 0(n), j
+ mov -16(up,n,8), %rax
+ xor R32(w3), R32(w3)
Index: patches/patch-mpn_x86_64_k8_mulmid_basecase_asm
===
RCS file: patches/patch-mpn_x86_64_k8_mulmid_basecase_asm
diff -N patches/patch-mpn_x86_64_k8_mulmid_basecase_asm
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-mpn_x86_64_k8_mulmid_basecase_asm 9 Jun 2023 10:31:32
-
@@ -0,0 +1,67 @@
+Index: mpn/x86_64/k8/mulmid_basecase.asm
+--- mpn/x86_64/k8/mulmid_basecase.asm.orig
mpn/x86_64/k8/mulmid_basecase.asm
+@@ -329,6 +329,7 @@ C addmul_2 for remaining vp's
+
+ ALIGN(16)
+
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: cas...@cvs.openbsd.org 2023/06/09 02:57:55 Modified files: meta/tor-browser: Tag: OPENBSD_7_3 Makefile www/tor-browser: Tag: OPENBSD_7_3 Makefile.inc www/tor-browser/browser: Tag: OPENBSD_7_3 Makefile distinfo www/tor-browser/noscript: Tag: OPENBSD_7_3 Makefile distinfo Log message: Tor Browser: update to 12.0.7
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: cas...@cvs.openbsd.org 2023/06/09 02:57:21 Modified files: meta/tor-browser: Makefile www/tor-browser: Makefile.inc www/tor-browser/browser: Makefile distinfo www/tor-browser/noscript: Makefile distinfo Log message: Tor Browser: update to 12.0.7
[Maintainer Update] lang/erlang/25 25.3.2.2
Not pinging again, but updating the diff to the next release.
On 6/6/23 18:09, Volker Schlecht wrote:
Ping.
On 5/31/23 21:44, Volker Schlecht wrote:
Updates lang/erlang/25 to 25.3.2.1
Bugfix Release, which I might have skipped, if it weren't for
a fix for an OpenBSD issue:
OTP-18561 Application(s): erts
Fixed a crash during tracing on certain platforms that
cannot use the machine stack for Erlang code (mainly
OpenBSD and Linux with musl).
https://github.com/erlang/otp/releases/tag/OTP-25.3.2.1
Tests pass, dependent ports all build, test and work fine
on amd64.Index: Makefile
===
RCS file: /cvs/ports/lang/erlang/25/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile 31 May 2023 15:17:33 - 1.17
+++ Makefile 9 Jun 2023 08:33:44 -
@@ -3,14 +3,13 @@ BROKEN-alpha= beam/erl_process.c:6692: i
COMMENT-main= ${COMMENT}
COMMENT-wx= WxWidgets bindings for Erlang
-V= 25.3.2
+V= 25.3.2.2
PORTROACH= limit:^OTP-25\.
DISTNAME= otp_src_$V
PKGNAME= erlang-$V
PKGNAME-main= erlang-$V
PKGNAME-wx= erlang-wx-$V
EPOCH= 0
-REVISION= 0
VERSION_SPEC= >=25v0,<26v0
PKGSPEC-main= erlang-${VERSION_SPEC}
@@ -64,7 +63,7 @@ AUTOCONF_VERSION = 2.69
ERL_VERSIONS= \
ASN1_VSN5.0.21 \
COMMON_TEST_VSN 1.24 \
-COMPILER_VSN8.2.6 \
+COMPILER_VSN8.2.6.2 \
CRYPTO_VSN 5.1.4 \
DEBUGGER_VSN5.3.1 \
DIALYZER_VSN5.0.5 \
@@ -93,12 +92,12 @@ SASL_VSN4.2 \
SNMP_VSN5.13.5 \
SSH_VSN 4.15.3 \
SSL_VSN 10.9.1 \
-STDLIB_VSN 4.3.1 \
+STDLIB_VSN 4.3.1.1 \
SYNTAX_TOOLS_VSN3.0.1 \
TFTP_VSN1.0.4 \
TOOLS_VSN 3.5.3 \
WX_VSN 2.2.2 \
-XMERL_VSN 1.3.31 \
-ERTS_VSN13.2.2
+XMERL_VSN 1.3.31.1 \
+ERTS_VSN13.2.2.1
.include
Index: distinfo
===
RCS file: /cvs/ports/lang/erlang/25/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo 17 May 2023 13:39:46 - 1.9
+++ distinfo 9 Jun 2023 08:33:44 -
@@ -1,4 +1,4 @@
-SHA256 (otp_doc_man_25.3.2.tar.gz) = H5hRYz30VrMZ9rxw1vkDXFrF1j0ZN+GnlL2MiIs5Eq8=
-SHA256 (otp_src_25.3.2.tar.gz) = rtTkcmzcWHq4IMg3nWPlEeRqGxzAxZ1qcgtRrmJbJRA=
-SIZE (otp_doc_man_25.3.2.tar.gz) = 1717601
-SIZE (otp_src_25.3.2.tar.gz) = 103757566
+SHA256 (otp_doc_man_25.3.2.2.tar.gz) = GoQkTwUYpIDEGWlwh+DseYjhIhfF8X6OI3LQCiiEMlk=
+SHA256 (otp_src_25.3.2.2.tar.gz) = g6NvPZDe7zatthW7+0bNMn8Ldrdmjh9/JT/Wa0riRRg=
+SIZE (otp_doc_man_25.3.2.2.tar.gz) = 1718654
+SIZE (otp_src_25.3.2.2.tar.gz) = 103844480
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/lang/erlang/25/pkg/PLIST-main,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-main
--- pkg/PLIST-main 31 May 2023 15:17:34 - 1.10
+++ pkg/PLIST-main 9 Jun 2023 08:33:44 -
@@ -2,7 +2,7 @@
@option is-branch
@conflict erlang->=25,<26
@conflict erlang->=25v0,<26v0
-@conflict erlang-wx->=25,<25.3.2
+@conflict erlang-wx->=25,<25.3.2.2
@pkgpath lang/erlang/21,-main
@newgroup _epmd:888
@newuser _epmd:888:_epmd::Erlang EPMD Account:/var/empty:/sbin/nologin
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2023/06/09 01:16:09 Modified files: www/nghttp2: Makefile distinfo Log message: update to nghttp2-1.54.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/06/09 00:51:08 Modified files: fonts : Makefile Log message: +intel-one-mono
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2023/06/09 00:46:35 Log message: Import intel-one-mono-1.2.0. Intel One Mono is an expressive monospaced font family that's built with clarity, legibility, and the needs of developers in mind. ok florian@ Status: Vendor Tag: bentley Release Tags: bentley_20230609 N ports/fonts/intel-one-mono/Makefile N ports/fonts/intel-one-mono/distinfo N ports/fonts/intel-one-mono/pkg/DESCR N ports/fonts/intel-one-mono/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/06/09 00:24:26 Modified files: devel/libgusb : Makefile distinfo Log message: Update to libgusb-0.4.6.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2023/06/09 00:24:10 Modified files: x11/gnome/zenity: Makefile distinfo Removed files: x11/gnome/zenity/patches: patch-data_README_manpage patch-data_generate-manpage_sh patch-data_meson_build patch-data_zenity_1 patch-data_zenity_roff Log message: Update to zenity-3.99.0.
