NEW: net/kdsoap-ws-discovery-client
Depends on net/kdsoap,qt6. OK to import? Upcoming KDE6 depends on it. Information for inst:kdsoap-ws-discovery-client-0.4.0 Comment: KDSoap WS-Discovery client Description: This project is trying to create a WS-Discovery client library based on the KDSoap library. Maintainer: The OpenBSD ports mailing-list WWW: https://www.kdab.com/development-resources/qt-tools/kd-soap/ kdsoap-ws-discovery-client.tar.gz Description: application/gzip
net/kdsoap: qt6 flavor
Update kdsoap to 2.2.0 and enable the qt6 flavor.
OK, Feedback?
diff --git a/net/kdsoap/Makefile b/net/kdsoap/Makefile
index 71d94148bba..3bdb71f1702 100644
--- a/net/kdsoap/Makefile
+++ b/net/kdsoap/Makefile
@@ -1,9 +1,13 @@
COMMENT = Qt-based client-side and server-side SOAP component
-DISTNAME = kdsoap-1.10.0
+V =2.2.0
+DISTNAME = kdsoap-${V}
-SHARED_LIBS += kdsoap 0.1
-SHARED_LIBS += kdsoap-server 0.0
+SHARED_LIBS += kdsoap 1.0
+SHARED_LIBS += kdsoap-server 1.0
+
+SHARED_LIBS += kdsoap-qt60.0 # 0.0
+SHARED_LIBS += kdsoap-server-qt6 0.0 # 0.0
CATEGORIES = net devel
@@ -12,15 +16,26 @@ HOMEPAGE =
https://www.kdab.com/development-resources/qt-tools/kd-soap/
# AGPL3 modified
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network Qt5Xml c m
+FLAVORS= qt6
+FLAVOR ?=
SITES =
https://github.com/KDAB/KDSoap/releases/download/${DISTNAME}/
-MODULES = devel/cmake \
- x11/qt5
+MODULES = devel/cmake
BUILD_DEPENDS =devel/boost
CONFIGURE_ARGS = -DCMAKE_INSTALL_PREFIX=${LOCALBASE}
+.if ${FLAVOR:Mqt6}
+FULLPKGNAME= kdsoap-qt6-${V}
+MODULES += x11/qt6
+WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Network Qt6Xml c m
+CONFIGURE_ARGS += -DKDSoap_QT6=ON
+.else
+MODULES += x11/qt5
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Network Qt5Xml c m
+CONFIGURE_ARGS += -DKDSoap_QT6=OFF
+.endif
+
.include
diff --git a/net/kdsoap/distinfo b/net/kdsoap/distinfo
index ee836e502c0..1e7a5766a83 100644
--- a/net/kdsoap/distinfo
+++ b/net/kdsoap/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kdsoap-1.10.0.tar.gz) = DGBuzENEZtutsoKYIMoWOvYMx8oib1U7XUAyGWc3M48=
-SIZE (kdsoap-1.10.0.tar.gz) = 1399777
+SHA256 (kdsoap-2.2.0.tar.gz) = 2e8RlIRCGXyfpEvW+63IQrcoCmDfxAV3r2b97WN681Y=
+SIZE (kdsoap-2.2.0.tar.gz) = 11918875
diff --git a/net/kdsoap/pkg/PFRAG.no-qt6 b/net/kdsoap/pkg/PFRAG.no-qt6
new file mode 100644
index 000..b9b2f6a921d
--- /dev/null
+++ b/net/kdsoap/pkg/PFRAG.no-qt6
@@ -0,0 +1,86 @@
+@bin bin/kdwsdl2cpp
+include/KDSoapClient/
+include/KDSoapClient/KDDateTime
+include/KDSoapClient/KDDateTime.h
+include/KDSoapClient/KDQName
+include/KDSoapClient/KDQName.h
+include/KDSoapClient/KDSoap
+include/KDSoapClient/KDSoap.h
+include/KDSoapClient/KDSoapAuthentication
+include/KDSoapClient/KDSoapAuthentication.h
+include/KDSoapClient/KDSoapClient
+include/KDSoapClient/KDSoapClientInterface
+include/KDSoapClient/KDSoapClientInterface.h
+include/KDSoapClient/KDSoapEndpointReference
+include/KDSoapClient/KDSoapEndpointReference.h
+include/KDSoapClient/KDSoapFaultException
+include/KDSoapClient/KDSoapFaultException.h
+include/KDSoapClient/KDSoapGlobal
+include/KDSoapClient/KDSoapGlobal.h
+include/KDSoapClient/KDSoapHeaders
+include/KDSoapClient/KDSoapJob
+include/KDSoapClient/KDSoapJob.h
+include/KDSoapClient/KDSoapMessage
+include/KDSoapClient/KDSoapMessage.h
+include/KDSoapClient/KDSoapMessageAddressingProperties
+include/KDSoapClient/KDSoapMessageAddressingProperties.h
+include/KDSoapClient/KDSoapNamespaceManager
+include/KDSoapClient/KDSoapNamespaceManager.h
+include/KDSoapClient/KDSoapPendingCall
+include/KDSoapClient/KDSoapPendingCall.h
+include/KDSoapClient/KDSoapPendingCallWatcher
+include/KDSoapClient/KDSoapPendingCallWatcher.h
+include/KDSoapClient/KDSoapSslHandler
+include/KDSoapClient/KDSoapSslHandler.h
+include/KDSoapClient/KDSoapUdpClient
+include/KDSoapClient/KDSoapUdpClient.h
+include/KDSoapClient/KDSoapValue
+include/KDSoapClient/KDSoapValue.h
+include/KDSoapClient/KDSoapValueList
+include/KDSoapClient/kdsoap_version.h
+include/KDSoapServer/
+include/KDSoapServer/KDSoapDelayedResponseHandle
+include/KDSoapServer/KDSoapDelayedResponseHandle.h
+include/KDSoapServer/KDSoapServer
+include/KDSoapServer/KDSoapServer.h
+include/KDSoapServer/KDSoapServerAuthInterface
+include/KDSoapServer/KDSoapServerAuthInterface.h
+include/KDSoapServer/KDSoapServerCustomVerbRequestInterface
+include/KDSoapServer/KDSoapServerCustomVerbRequestInterface.h
+include/KDSoapServer/KDSoapServerGlobal
+include/KDSoapServer/KDSoapServerGlobal.h
+include/KDSoapServer/KDSoapServerObjectInterface
+include/KDSoapServer/KDSoapServerObjectInterface.h
+include/KDSoapServer/KDSoapServerRawXMLInterface
+include/KDSoapServer/KDSoapServerRawXMLInterface.h
+include/KDSoapServer/KDSoapThreadPool
+include/KDSoapServer/KDSoapThreadPool.h
+lib/cmake/KDSoap/
+lib/cmake/KDSoap/KDSoapConfig.cmake
+lib/cmake/KDSoap/KDSoapConfigVersion.cmake
+lib/cmake/KDSoap/KDSoapMacros.cmake
+lib/cmake/KDSoap/KDSoapTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/KDSoap/KDSoapTargets.cmake
+@lib lib/libkdsoap-server.so.${LIBkdsoap-server_VERSION}
+@lib lib/libkdsoap.so.${LIBkdsoap_VERSION}
+mkspecs/
+mkspecs/modules/
+mkspecs/modules/qt_KDSoapClient.pri
+mkspecs/modules/qt_KDSoapServer.pri
+share/doc/KDSoap/
+share/doc/KDSoap/LICENSES/
+share/doc/KDSoap/LICENSES/BSD-3-Clause.txt
Re: NEW: multimedia/phonon-qt6 and multimedia/phonon-backend/vlc-qt6
On Sat Apr 06, 2024 at 02:36:43PM +, Klemens Nanni wrote: > 14.03.2024 23:42, Rafael Sadowski via ports пишет: > > I would like to import multimedia/phonon-backend/vlc-qt6 > > multimedia/phonon-qt6. Please find tarball attached. This import does > > not create any conflicts but it needs a simple adjustment > > Why those LIB_DEPENDS those? > No REVISION bumps? > Nothing changes: I moved LIB_DEPENDS as it is from Makefile.inc to the Makefile's. This change is necessary to import multimedia/phonon-backend/vlc-qt6 otherwise multimedia/phonon-backend/vlc-qt6 depends on "multimedia/phonon>=4.12.0" which is qt5. > > > > Looking for post-lock import OKs. > > > > Rafael > > > > ? vlc-qt6 > > Index: Makefile.inc > > === > > RCS file: /cvs/ports/multimedia/phonon-backend/Makefile.inc,v > > diff -u -p -r1.10 Makefile.inc > > --- Makefile.inc6 Jan 2024 15:21:43 - 1.10 > > +++ Makefile.inc14 Mar 2024 20:40:07 - > > @@ -2,5 +2,3 @@ CATEGORIES += multimedia > > > > # LGPL 2.1 > > PERMIT_PACKAGE = Yes > > - > > -LIB_DEPENDS += multimedia/phonon>=4.12.0 > > Index: gstreamer/Makefile > > === > > RCS file: /cvs/ports/multimedia/phonon-backend/gstreamer/Makefile,v > > diff -u -p -r1.33 Makefile > > --- gstreamer/Makefile 6 Jan 2024 15:21:43 - 1.33 > > +++ gstreamer/Makefile 14 Mar 2024 20:40:07 - > > @@ -21,7 +21,8 @@ RUN_DEPENDS = multimedia/gstreamer1/plug > > multimedia/gstreamer1/plugins-libav \ > > x11/gtk+4,-guic > > > > -LIB_DEPENDS = multimedia/gstreamer1/core \ > > +LIB_DEPENDS = multimedia/phonon>=4.12.0 \ > > + multimedia/gstreamer1/core \ > > multimedia/gstreamer1/plugins-base \ > > x11/qt5/qtx11extras > > > > Index: vlc/Makefile > > === > > RCS file: /cvs/ports/multimedia/phonon-backend/vlc/Makefile,v > > diff -u -p -r1.17 Makefile > > --- vlc/Makefile6 Jan 2024 15:21:43 - 1.17 > > +++ vlc/Makefile14 Mar 2024 20:40:07 - > > @@ -12,7 +12,8 @@ MODULES = devel/kf5 > > > > BUILD_DEPENDS =devel/gettext,-tools > > > > -LIB_DEPENDS = x11/vlc > > +LIB_DEPENDS = multimedia/phonon>=4.12.0 \ > > + x11/vlc > > > > NO_TEST = Yes > > > > >
NEW: net/signond-qt6
Simple qt6 signond port. It was easier and cleaner to create a new port then to add qt6 flavor in the currert net/signond. Upstream, it doesn't matter what package maintaienr has to fight. OK to import? No conflicts at all. Rafael signond-qt6.tar.gz Description: application/gzip
net/libaccounts-qt: qt6 flavor
The same pattern like in the perverse qt6 flavor diffs. OK?
diff --git a/net/libaccounts-qt/Makefile b/net/libaccounts-qt/Makefile
index 83723cd0e9c..cb67cfb1ca1 100644
--- a/net/libaccounts-qt/Makefile
+++ b/net/libaccounts-qt/Makefile
@@ -3,10 +3,13 @@ COMMENT = Qt-based client library for the accounts
database
CATEGORIES = net
V =VERSION_1.16
+DIST_TUPLE = gitlab nicolasfella libaccounts-qt \
+ 18557f7def9af8f4a9e0e93e9f575ae11e5066aa .
DISTNAME = libaccounts-qt-${V:S/VERSION_//}
-REVISION = 2
+REVISION = 3
SHARED_LIBS += accounts-qt5 0.0 # 1.4
+SHARED_LIBS += accounts-qt6 0.0 # 1.4
HOMEPAGE = https://accounts-sso.gitlab.io/
@@ -15,28 +18,40 @@ MAINTAINER =Rafael Sadowski
# LGPLv2.1+, GPLv2+
PERMIT_PACKAGE = Yes
-SITES =https://gitlab.com/accounts-sso/libaccounts-qt/-/archive/${V}/
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Test Qt5Xml accounts-glib
-WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 intl m
+FLAVORS= qt6
+FLAVOR ?=
+.if ${FLAVOR:Mqt6}
+FULLPKGNAME= libaccounts-qt6-${V:S/VERSION_//}
+MODULES = x11/qt6 \
+ devel/qmake
+WANTLIB += ${COMPILER_LIBCXX} Qt6Core Qt6Test Qt6Xml accounts-glib
+WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 intl m
+QT_VERSION = qt6
+.else
MODULES = x11/qt5 \
devel/qmake
-
-BUILD_DEPENDS =devel/doxygen>=1.10.0 \
- textproc/gtk-doc
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Test Qt5Xml accounts-glib
+WANTLIB += c gio-2.0 glib-2.0 gobject-2.0 intl m
+QT_VERSION = qt5
+.endif
LIB_DEPENDS = net/libaccounts-glib \
devel/glib2
-WRKDIST =
${WRKDIR}/libaccounts-qt-${V}-525ec684cfa8d234f797d7e49e21c476eea04d8e
+WRKDIST =
${WRKDIR}/libaccounts-qt-18557f7def9af8f4a9e0e93e9f575ae11e5066aa
TEST_TARGET = check
TEST_IS_INTERACTIVE = Yes
pre-configure:
- ln -sf ${LOCALBASE}/lib/qt5/bin/q{collection,help}generator
${WRKDIR}/bin/
- ${SUBST_CMD} ${WRKSRC}/Accounts/AccountsQt5Config.cmake.in
+ ln -sf ${LOCALBASE}/lib/${QT_VERSION}/bin/q{collection,help}generator
${WRKDIR}/bin/
+ ${SUBST_CMD} ${WRKSRC}/Accounts/AccountsQt5Config.cmake.in \
+ ${WRKSRC}/Accounts/AccountsQt6Config.cmake.in
+
+post-install:
+ mv ${PREFIX}/bin/accountstest ${PREFIX}/bin/accountstest-${QT_VERSION}
.include
diff --git a/net/libaccounts-qt/distinfo b/net/libaccounts-qt/distinfo
index ee0597cf09e..01aab518a38 100644
--- a/net/libaccounts-qt/distinfo
+++ b/net/libaccounts-qt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libaccounts-qt-1.16.tar.gz) =
KG6wL5NoU+MuYQADoqMyoSUkBQ0iZwfnYwtqKb0732Y=
-SIZE (libaccounts-qt-1.16.tar.gz) = 64445
+SHA256
(nicolasfella-libaccounts-qt-18557f7def9af8f4a9e0e93e9f575ae11e5066aa.tar.gz) =
yJ35yVN6+lsvAVVqmaKMt4vKYyVYgUfA6QLVKgbGTEk=
+SIZE
(nicolasfella-libaccounts-qt-18557f7def9af8f4a9e0e93e9f575ae11e5066aa.tar.gz) =
65468
diff --git
a/net/libaccounts-qt/patches/patch-Accounts_AccountsQt5Config_cmake_in
b/net/libaccounts-qt/patches/patch-Accounts_AccountsQt5Config_cmake_in
index 649a8539009..5b37053778d 100644
--- a/net/libaccounts-qt/patches/patch-Accounts_AccountsQt5Config_cmake_in
+++ b/net/libaccounts-qt/patches/patch-Accounts_AccountsQt5Config_cmake_in
@@ -6,7 +6,5 @@ Index: Accounts/AccountsQt5Config.cmake.in
# ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
-set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
--set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
-\ No newline at end of file
+set(ACCOUNTSQT_LIBRARIES
$${INSTALL_LIBDIR}/lib$${TARGET}.so.${LIBaccounts-qt5_VERSION})
-+set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
+ set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
diff --git
a/net/libaccounts-qt/patches/patch-Accounts_AccountsQt6Config_cmake_in
b/net/libaccounts-qt/patches/patch-Accounts_AccountsQt6Config_cmake_in
new file mode 100644
index 000..c129c13e6a1
--- /dev/null
+++ b/net/libaccounts-qt/patches/patch-Accounts_AccountsQt6Config_cmake_in
@@ -0,0 +1,12 @@
+Index: Accounts/AccountsQt6Config.cmake.in
+--- Accounts/AccountsQt6Config.cmake.in.orig
Accounts/AccountsQt6Config.cmake.in
+@@ -1,5 +1,5 @@
+ # ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
+ # ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
+
+-set(ACCOUNTSQT_LIBRARIES $${INSTALL_LIBDIR}/lib$${TARGET}.so)
+-set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
+\ No newline at end of file
++set(ACCOUNTSQT_LIBRARIES
$${INSTALL_LIBDIR}/lib$${TARGET}.so.${LIBaccounts-qt6_VERSION})
++set(ACCOUNTSQT_INCLUDE_DIRS $${INSTALL_PREFIX}/include/$${TARGET}/)
diff --git a/net/libaccounts-qt/patches/patch-accounts-qt_pro
b/net/libaccounts-qt/patches/patch-accounts-qt_pro
new file mode 100644
index 000..bd05329914f
--- /dev/null
+++
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/04/07 21:11:30 Modified files: net/magic-wormhole: Makefile Log message: register new deps, forgotten in previous update
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/04/07 21:07:49 Modified files: archivers : Makefile Log message: +py3-zipstream-ng
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/04/07 21:06:44 Log message: import archivers/py-zipstream-ng 1.7.2; new magic-wormhole dep; OK daniel A modern and easy to use streamable zip file generator. It can package and stream many files and folders into a zip on the fly without needing temporary files or excessive memory. It can also calculate the final size of the zip file before streaming it. Status: Vendor Tag: kn Release Tags: kn_20240408 N ports/archivers/py-zipstream-ng/Makefile N ports/archivers/py-zipstream-ng/distinfo N ports/archivers/py-zipstream-ng/pkg/DESCR N ports/archivers/py-zipstream-ng/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/04/07 21:05:28 Modified files: devel : Makefile Log message: + py3-iterable-io
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/04/07 21:04:37 Log message: import devel/py-iterable-io 1.0.0; new magic-wormhole dep; OK daniel iterable-io is a small Python library that provides an adapter so that it's possible to read from iterable objects in the same way as file-like objects. Status: Vendor Tag: kn Release Tags: kn_20240408 N ports/devel/py-iterable-io/Makefile N ports/devel/py-iterable-io/distinfo N ports/devel/py-iterable-io/pkg/DESCR N ports/devel/py-iterable-io/pkg/PLIST No conflicts created by this import
[NEW] net/crawley-v1.7.5
Hello all! Attached is a port of crawley, the unix-way web crawler. It handily crawls web pages and prints any link it can find. homepage: https://github.com/s0rg/crawley Tested on amd64. OK, please? crawley-1.7.5.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2024/04/07 15:16:58 Modified files: www/p5-HTTP-Body: Makefile distinfo www/p5-HTTP-Body/pkg: DESCR Log message: update p5-HTTP-Body to 1.23
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/04/07 14:06:17 Modified files: lang/fpc : Makefile Log message: replace bootstrap libc with a current libc to unbreak build
Re: NEW devel/py-iterable-io-1.0.0 (magic-wormhole dep)
Fixed subject... On Sun, Apr 07, 2024 at 05:17:46PM +, Klemens Nanni wrote: > I should have wrapped up and sent this port *before* updating to newest > wormhole, as this is a runtime dep... > > No deps itself, all tests pass on amd64. > Feedback? OK? > > Information for inst:py3-iterable-io-1.0.0 > > Comment: > adapt generators and other iterable to a file-like interface > > Required by: > magic-wormhole-0.14.0p0 > > Description: > iterable-io is a small Python library that provides an adapter so that it's > possible to read from iterable objects in the same way as file-like objects. > > It is primarily useful as "glue" between two incompatible interfaces. > As an example, in the case where one interface expects a file-like object to > call .read() on, and the other only provides a generator of bytes. > > One way to solve this issue would be to write all the bytes in the generator > to > a temporary file, then provide that file instead, but if the generator > produces > a large amount of data then this is both slow to start, and > resource-intensive. > > This library allows streaming data between these two incompatible interfaces > so > as data is requested by .read(), it's pulled from the iterable. > This keeps resource usage low and removes the startup delay. > > Maintainer: Klemens Nanni > > WWW: https://pypi.python.org/pypi/iterable-io
NEW devel/py-zipstream-ng 1.7.1 (magic-wormhole dep)
I should have wrapped up and sent this port *before* updating to newest wormhole, as this is a runtime dep... No deps itself, all tests pass on amd64. Feedback? OK? Information for inst:py3-zipstream-ng-1.7.1 Comment: modern and easy to use streamable zip file generator Required by: magic-wormhole-0.14.0p0 Description: A modern and easy to use streamable zip file generator. It can package and stream many files and folders into a zip on the fly without needing temporary files or excessive memory. It can also calculate the final size of the zip file before streaming it. Maintainer: Klemens Nanni WWW: https://pypi.python.org/pypi/zipstream-ng py-zipstream-ng.tgz Description: application/tar-gz
NEW devel/py-zipstream-io-1.0.0 (magic-wormhole dep)
I should have wrapped up and sent this port *before* updating to newest wormhole, as this is a runtime dep... No deps itself, all tests pass on amd64. Feedback? OK? Information for inst:py3-iterable-io-1.0.0 Comment: adapt generators and other iterable to a file-like interface Required by: magic-wormhole-0.14.0p0 Description: iterable-io is a small Python library that provides an adapter so that it's possible to read from iterable objects in the same way as file-like objects. It is primarily useful as "glue" between two incompatible interfaces. As an example, in the case where one interface expects a file-like object to call .read() on, and the other only provides a generator of bytes. One way to solve this issue would be to write all the bytes in the generator to a temporary file, then provide that file instead, but if the generator produces a large amount of data then this is both slow to start, and resource-intensive. This library allows streaming data between these two incompatible interfaces so as data is requested by .read(), it's pulled from the iterable. This keeps resource usage low and removes the startup delay. Maintainer: Klemens Nanni WWW: https://pypi.python.org/pypi/iterable-io py-iterable-io.tgz Description: application/tar-gz
Re: [editor/micro] stopped working
On Sun, 7 Apr 2024 15:57:26 +0200
Rob Schmersel wrote:
> I tracked it down to the use of syscall in the tcell package file
> tscreen_bsd.go (line 46)
>
>
> > fd = uintptr(t.out.(*os.File).Fd())
> > if _, _, e1 := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioc,
> > tios, 0, 0, 0); e1 != 0 { e = e1
> > goto failed
> > }
Joel Sing patched our lang/go to allow SYS_IOCTL in Syscall, but not
in Syscall6. I tried changing Syscall6 to Syscall in tscreen_bsd.go.
The "function not implemented" error stopped appearing, but
- micro got stuck on a black screen; I needed to close the terminal.
- I can't add my patch to the port, because "make update-patches"
doesn't see it. The file is outside WRKSRC, in
WRKDIR/go/pkg/mod/github.com/zyedidia/tcell/v2@v2.0.10
--- tscreen_bsd.go.orig.portSun Apr 7 11:53:03 2024
+++ tscreen_bsd.go Sun Apr 7 11:57:57 2024
@@ -43,7 +43,7 @@
tios = uintptr(unsafe.Pointer(t.tiosp))
ioc = uintptr(syscall.TIOCGETA)
fd = uintptr(t.out.(*os.File).Fd())
- if _, _, e1 := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioc, tios, 0, 0,
0); e1 != 0 {
+ if _, _, e1 := syscall.Syscall(syscall.SYS_IOCTL, fd, ioc, tios); e1 !=
0 {
e = e1
goto failed
}
@@ -61,7 +61,7 @@
tios = uintptr(unsafe.Pointer())
ioc = uintptr(syscall.TIOCSETA)
- if _, _, e1 := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioc, tios, 0, 0,
0); e1 != 0 {
+ if _, _, e1 := syscall.Syscall(syscall.SYS_IOCTL, fd, ioc, tios); e1 !=
0 {
e = e1
goto failed
}
@@ -94,7 +94,7 @@
fd := uintptr(t.out.(*os.File).Fd())
ioc := uintptr(syscall.TIOCSETAF)
tios := uintptr(unsafe.Pointer(t.tiosp))
- syscall.Syscall6(syscall.SYS_IOCTL, fd, ioc, tios, 0, 0, 0)
+ syscall.Syscall(syscall.SYS_IOCTL, fd, ioc, tios)
t.out.(*os.File).Close()
}
if t.in != nil {
@@ -108,8 +108,8 @@
dim := [4]uint16{}
dimp := uintptr(unsafe.Pointer())
ioc := uintptr(syscall.TIOCGWINSZ)
- if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL,
- fd, ioc, dimp, 0, 0, 0); err != 0 {
+ if _, _, err := syscall.Syscall(syscall.SYS_IOCTL,
+ fd, ioc, dimp); err != 0 {
return -1, -1, err
}
return int(dim[1]), int(dim[0]), nil
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org 2024/04/07 09:19:57
Modified files:
net/curl : Tag: OPENBSD_7_5 Makefile distinfo
net/curl/pkg : Tag: OPENBSD_7_5 PLIST
Removed files:
net/curl/patches: Tag: OPENBSD_7_5 patch-lib_curl_ntlm_wb_c
Log message:
net/curl: security update to 8.7.1
Changes:
* CURLINFO_USED_PROXY: return bool whether the proxy was used
* digest: support SHA-512/256
* DoH: add trace configuration
* write-out: add '%{proxy_used}'
Includes fixes for
CVE-2024-2004: Usage of disabled protocol
CVE-2024-2398: HTTP/2 push headers memory-leak
Also install zsh and fish shell completions.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2024/04/07 08:18:42 Modified files: net/tdesktop : Makefile distinfo Log message: update to tdesktop 4.16.4
[editor/micro] stopped working
Hi,
Since awhile ago the micro editor (editor/micro) stopped working on
OpenBSD with the following error:
> fatboy$ micro
> function not implemented
> Fatal: Micro could not initialize a Screen.
I tracked it down to the use of syscall in the tcell package file
tscreen_bsd.go (line 46)
> fd = uintptr(t.out.(*os.File).Fd())
> if _, _, e1 := syscall.Syscall6(syscall.SYS_IOCTL, fd, ioc,
> tios, 0, 0, 0); e1 != 0 { e = e1
> goto failed
> }
Not surprisingly since the syscall interface went the way of the dodo:
https://github.com/golang/go/issues/63900
I've got no clue on how to handle this though, anybody here has??
BR/Rob
Re: [patch (kind of)] sysutils/gitlab-cli: terminal input doesn't work properly on OpenBSD
On Fri, Apr 05, 2024 at 09:18:12PM +0300, Mikhail Pchelin wrote:
> [cc'ing maintainer]
>
> Currently glab port doesn't properly handle terminal input, for example,
> after 'glab auth login' (setup wizard) you won't be able to type
> properly or choose the options, you will get ^[[B^[[A etc stuff.
>
> This happens because survey library on which whole interface is based
> still uses syscall.* interface, which was removed in OpenBSD.
gitlab-cli and github-cli have been broken in this regard for some time
already, but I never investigated it, thanks for tracking it down.
>
> The library (https://github.com/AlecAivazis/survey/) was abandoned by
> the author:
>
> > This project is no longer maintained. For an alternative, please check
> > out: https://github.com/charmbracelet/bubbletea
>
> Inlined patch for this library fixes everything for me, but I must admit
> that I've spent only couple hours with Go, and even if the patch looks
> simple it can contain stupid mistakes, I'd be appreciated if someone
> more proficient in Go can take a look at it (especially this 'unsafe'
> stuff).
>
> What would be the best way to bring the fix into the ports tree?
Best would to have it fixed upstream, either via patched survey or by
switching to whatever can replace it.
Otherwise patching MODULES=lang/go ports isn't possible as modules are
extracted during build, i.e. not before the patch target.
One way is to build from a vendor tarball, such that the lang/go module
doesn't do module-wise extraction and we can patch is like any other port.
> To understand what I'm talking about here is the steps for reproduction:
>
> # build original gitlab-cli
> cd /tmp
> export GOPATH=/tmp/go
> git clone https://gitlab.com/gitlab-org/cli
> cd cli
> gmake
> ./bin/glab auth login
>
>
> reset
>
> # clone the library with the patch
> cd /tmp
> git clone https://github.com/bsdmp/survey
>
> # make go use patched library
> cd /tmp/cli
> go mod edit -replace github.com/AlecAivazis/survey/v2=/tmp/survey
> gmake
> ./bin/glab auth login
>
>
> diff --git a/go.mod b/go.mod
> index 4837ce7..cc04509 100644
> --- a/go.mod
> +++ b/go.mod
> @@ -10,6 +10,7 @@ require (
> github.com/mattn/go-isatty v0.0.8
> github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
> github.com/stretchr/testify v1.6.1
> + golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f
> golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
> golang.org/x/text v0.4.0
> )
> diff --git a/terminal/runereader_posix.go b/terminal/runereader_posix.go
> index 563a081..4c1e88a 100644
> --- a/terminal/runereader_posix.go
> +++ b/terminal/runereader_posix.go
> @@ -14,7 +14,7 @@ import (
> "bytes"
> "fmt"
> "syscall"
> - "unsafe"
> + "golang.org/x/sys/unix"
> )
>
> const (
> @@ -23,7 +23,7 @@ const (
> )
>
> type runeReaderState struct {
> - term syscall.Termios
> + termunix.Termios
> reader *bufio.Reader
> buf*bytes.Buffer
> }
> @@ -45,19 +45,20 @@ func (rr *RuneReader) Buffer() *bytes.Buffer {
>
> // For reading runes we just want to disable echo.
> func (rr *RuneReader) SetTermMode() error {
> - if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL,
> uintptr(rr.stdio.In.Fd()), ioctlReadTermios,
> uintptr(unsafe.Pointer()), 0, 0, 0); err != 0 {
> + termios, err := unix.IoctlGetTermios((int)(rr.stdio.In.Fd()),
> ioctlReadTermios)
> + if err != nil {
> return err
> }
>
> - newState := rr.state.term
> - newState.Lflag &^= syscall.ECHO | syscall.ECHONL | syscall.ICANON |
> syscall.ISIG
> + rr.state.term = *termios
> + termios.Lflag &^= syscall.ECHO | syscall.ECHONL | syscall.ICANON |
> syscall.ISIG
> // Because we are clearing canonical mode, we need to ensure VMIN &
> VTIME are
> // set to the values we expect. This combination puts things in standard
> // "blocking read" mode (see termios(3)).
> - newState.Cc[syscall.VMIN] = 1
> - newState.Cc[syscall.VTIME] = 0
> + termios.Cc[syscall.VMIN] = 1
> + termios.Cc[syscall.VTIME] = 0
>
> - if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL,
> uintptr(rr.stdio.In.Fd()), ioctlWriteTermios,
> uintptr(unsafe.Pointer()), 0, 0, 0); err != 0 {
> + if err = unix.IoctlSetTermios((int)(rr.stdio.In.Fd()),
> ioctlWriteTermios, termios); err != nil {
> return err
> }
>
> @@ -65,7 +66,7 @@ func (rr *RuneReader) SetTermMode() error {
> }
>
> func (rr *RuneReader) RestoreTermMode() error {
> - if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL,
> uintptr(rr.stdio.In.Fd()), ioctlWriteTermios,
> uintptr(unsafe.Pointer()), 0, 0, 0); err != 0 {
> + if err := unix.IoctlSetTermios((int)(rr.stdio.In.Fd()),
> ioctlWriteTermios, ); err != nil {
> return err
> }
> return nil
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: mar...@cvs.openbsd.org 2024/04/07 04:49:03 Modified files: archivers/blosc2: Makefile distinfo Log message: Update blosc2 to 2.14.3, fixing CVE-2024-3203 and CVE-2024-3204.
