Re: UPDATE: Nono-0.7.0
Le jeudi 22 février 2024 à 3:31 PM, Gonzalo L. Rodriguez a écrit : > Hello, > > Update for Nono to 0.7.0: > > http://www.pastel-flower.jp/~isaki/nono/ > > OK? Comments? ok benoit@ > > Cheers.- > > > Index: Makefile > === > RCS file: /cvs/ports/emulators/nono/Makefile,v > retrieving revision 1.31 > diff -u -p -r1.31 Makefile > --- Makefile 8 Jan 2024 08:14:12 - 1.31 > +++ Makefile 22 Feb 2024 14:30:31 - > @@ -2,7 +2,7 @@ BROKEN-i386= requires __m128i and simil > > COMMENT= OMRON LUNA-I and LUNA-88K emulator > > -DISTNAME= nono-0.6.4 > +DISTNAME= nono-0.7.0 > CATEGORIES= emulators > > MAINTAINER= Gonzalo L. R. gonz...@openbsd.org > > Index: distinfo > === > RCS file: /cvs/ports/emulators/nono/distinfo,v > retrieving revision 1.21 > diff -u -p -r1.21 distinfo > --- distinfo 8 Jan 2024 08:14:12 - 1.21 > +++ distinfo 22 Feb 2024 14:30:31 - > @@ -1,2 +1,2 @@ > -SHA256 (nono-0.6.4.tar.gz) = ZHgMmgUBqN2tvGhN6EkBMRQoOVtXfe26FgZMvW25trw= > -SIZE (nono-0.6.4.tar.gz) = 3224619 > +SHA256 (nono-0.7.0.tar.gz) = t+C0rSwPXyMK+UO6HKS1DrpsEmX4qKZtVWZ/2CNCc/k= > +SIZE (nono-0.7.0.tar.gz) = 3268612 > -- > > %gonzalo
[update] graphics/azpainter to 3.0.7
Hi ports@
Update azpainter to 3.0.7 and patch added to remove uses of -v
argument with install(1) (not available on OpenBSD).
Built and tested on arm64.
bcallah CC.
diff /usr/ports
commit - af1d37e1bd51078697215d14839221baf88fcb84
path + /usr/ports
blob - 25051d0456ba73717d2db6de07a83f6bf39ed43c
file + graphics/azpainter/Makefile
--- graphics/azpainter/Makefile
+++ graphics/azpainter/Makefile
@@ -1,4 +1,4 @@
-V =3.0.6
+V =3.0.7
COMMENT = full color painting software for illustrations
DISTNAME = azpainter-v${V}
PKGNAME = azpainter-${V}
@@ -45,7 +45,7 @@ do-gen:
sed -i "s,%LOCALBASE%,${LOCALBASE},g" ${WRKSRC}/src/main.c
do-build:
- ${SETENV} ${MAKE_ENV} ninja -C ${WRKSRC}/build -v -j ${MAKE_JOBS}
+ ${SETENV} ${MAKE_ENV} ninja -C ${WRKSRC}/build -j ${MAKE_JOBS}
do-install:
ninja -C ${WRKSRC}/build install
blob - 0b75486bab9a25f051e4e84b7a8fb6c69be7785e
file + graphics/azpainter/distinfo
--- graphics/azpainter/distinfo
+++ graphics/azpainter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (azpainter-v3.0.6.tar.bz2) =
rJW6YtqQP+rrAHRr0Fg/pLMXKYfX4UhVFPVFa5MZYMQ=
-SIZE (azpainter-v3.0.6.tar.bz2) = 991153
+SHA256 (azpainter-v3.0.7.tar.bz2) =
2j0m90TTwN8aiejUwHW/ciBx6J7zj1rlvDMYoppx+TI=
+SIZE (azpainter-v3.0.7.tar.bz2) = 992188
blob - /dev/null
file + graphics/azpainter/patches/patch-install_sh_in (mode 644)
--- /dev/null
+++ graphics/azpainter/patches/patch-install_sh_in
@@ -0,0 +1,16 @@
+-v is unknown in openbsd install(1)
+Index: install.sh.in
+--- install.sh.in.orig
install.sh.in
+@@ -11,9 +11,9 @@ package_name="@PACKAGE_NAME@"
+ package_version="@PACKAGE_VERSION@"
+ package_full=${package_name}-${package_version}
+
+-inst_exe="install -m 755 -v"
++inst_exe="install -m 755"
+ inst_dir="install -m 755 -d"
+-inst_file="install -m 644 -v"
++inst_file="install -m 644"
+
+ update_cache() {
+ if test -z "$DESTDIR";then
blob - 60402d561c4c688081f6ac9f0398ddb74c973f53
file + graphics/azpainter/patches/patch-src_main_c
--- graphics/azpainter/patches/patch-src_main_c
+++ graphics/azpainter/patches/patch-src_main_c
@@ -8,7 +8,7 @@ Index: src/main.c
//パスセット
- mGuiSetPath_data_exe("../share/azpainter3");
-+ mGuiSetPath_data_exe("%LOCALBASE%/share/azpainter3");
++ mGuiSetPath_data_exe("/usr/local/share/azpainter3");
mGuiSetPath_config_home(".config/azpainter");
//翻訳データ
--
~Justin
Re: Update arm-trusted-firmware 2.10.2
Hi, > I'm not sure about the "move away with date" approach. That is > probably something a ports hacker should judge. > > But otherwise this is ok kettenis@ committed, first posted diff with REVISION=0. In fact this diff is not enough to avoid ethernet PHY malfunction for OrangePi One Plus (and Orange Pi 3/LTS). Currently ethernet works with cold boot, no warm boot working. To completely fix the problem, DTS and driver needs to be modified like Armbian patch. This patch is for Orange Pi 3 but might be helpful for Orange Pi One Plus. https://github.com/armbian/build/blob/main/patch/kernel/archive/sunxi-6.1/patches.megous/arm64-dts-allwinner-orange-pi-3-Enable-ethernet.patch best regards, -- SASANO Takayoshi (JG1UAA)
[update] www/luakit to 2.3.6
Hi,
luakit now works with libsoup3 and webkitgtk4.1. And some bugs have been
fixed.
Changes: https://luakit.github.io/news/
The test target runs fine on amd64.
portcheck/p-l-d-check are happy.
OK?
Index: www/luakit/Makefile
===
RCS file: /cvs/ports/www/luakit/Makefile,v
diff -u -p -u -p -r1.43 Makefile
--- www/luakit/Makefile 27 Sep 2023 19:13:03 - 1.43
+++ www/luakit/Makefile 23 Feb 2024 06:40:18 -
@@ -1,8 +1,7 @@
COMMENT = fast, small, webkit based browser written in lua
-V =2.3.3
+V =2.3.6
DISTNAME = luakit-${V}
-REVISION = 2
EPOCH =1
@@ -21,10 +20,10 @@ USE_GMAKE = Yes
COMPILER = base-clang ports-gcc
-WANTLIB += atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB = atk-1.0 c cairo cairo-gobject gdk-3 gdk_pixbuf-2.0 gio-2.0
WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3 harfbuzz
-WANTLIB += intl javascriptcoregtk-4.0 pango-1.0 pangocairo-1.0 pthread
-WANTLIB += soup-2.4 sqlite3 webkit2gtk-4.0
+WANTLIB += intl javascriptcoregtk-4.1 pango-1.0 pangocairo-1.0 pthread
+WANTLIB += soup-3.0 sqlite3 webkit2gtk-4.1
# luajit archs
.if ${MACHINE_ARCH} == "arm" \
@@ -52,7 +51,7 @@ RUN_DEPENDS = devel/desktop-file-utils \
net/luasocket \
textproc/lua-markdown
-LIB_DEPENDS += www/webkitgtk4
+LIB_DEPENDS += www/webkitgtk4,webkitgtk41
TEST_DEPENDS = devel/luassert \
devel/luacheck
Index: www/luakit/distinfo
===
RCS file: /cvs/ports/www/luakit/distinfo,v
diff -u -p -u -p -r1.14 distinfo
--- www/luakit/distinfo 9 Nov 2022 18:18:35 - 1.14
+++ www/luakit/distinfo 23 Feb 2024 06:40:18 -
@@ -1,2 +1,2 @@
-SHA256 (luakit-2.3.3.tar.gz) = jmVx8REZsx56ND23sD9o2CPx/Rdf3/SHDUCir9nnMtU=
-SIZE (luakit-2.3.3.tar.gz) = 507343
+SHA256 (luakit-2.3.6.tar.gz) = ggL8UVx+ZN3AeUtWIxZ7Ny9pa851fm92fF4Dv74r66A=
+SIZE (luakit-2.3.6.tar.gz) = 508466
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: u...@cvs.openbsd.org2024/02/22 23:47:06 Modified files: sysutils/arm-trusted-firmware: Makefile sysutils/arm-trusted-firmware/pkg: PLIST Log message: add Allwinner H6 SUNXI_SETUP_REGULATORS=0 support this is required for OrangePi OnePlus and OrangePi 3/LTS to solve ethernet PHY malfunction problem. this option is applied to sun50i_h6-bl31-noreg.bin. ok kettenis@
Re: -current Haskell ports aborting with SIGILL
> Evan, if you have abundant time, could you try to run `make test` with > and without the patches? `make clean` in the middle is probably the > easiest way to ensure the patches get applied as expected. Did `make test` in lang/ghc with and without the patches and got the same three failed tests in both, with no evident relation to the text package. Further, I ran the tests in the patched `text` library and they ran fine; had to make a minor modification for the tests to build due to QuickCheck drift but that's of no significance. So it all looks good to me. Phew! Evan
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2024/02/22 20:15:30 Modified files: devel/libfirm : Makefile distinfo devel/libfirm/patches: patch-Makefile patch-ir_be_amd64_amd64_bearch_c patch-ir_be_platform_c devel/libfirm/pkg: PLIST lang/cparser : Makefile distinfo lang/cparser/patches: patch-Makefile Log message: Update to the latest trees of libfirm and cparser. Removes libfirm's dep on Python 2 (now uses Python 3). Spurred on by ddickman@'s work to retire Python 2 ports.
Re: New: volk - dynamic loader for vulkan (dependency for updating vulkan-tools)
On Thu, Feb 22, 2024 at 10:07:29PM -0500, Thomas Frohwein wrote: > *ping* > > As this is needed for vulkan-loader update, I worry that stalling on > this might lead to issues with ports that rely on recen vulkan API... correction: it's needed for vulkan-utils, but updating vulkan-loader without vulkan-utils seems unwise if we can avoid it. > > Re-attached for convenience. > > On Tue, Feb 13, 2024 at 04:19:06PM -0500, Thomas Frohwein wrote: > > Hi, > > > > Please find attached a tarball for "volk", a meta loader for vulkan. It > > appears to manage dynamic loading of the vulkan library including > > simplification of extension management/loading. This is now a > > dependency for the latest version of vulkan-tools, so I would like to > > import this to proceed with the updates for vulkan.. > > > > ok? > >
Re: New: volk - dynamic loader for vulkan (dependency for updating vulkan-tools)
*ping* As this is needed for vulkan-loader update, I worry that stalling on this might lead to issues with ports that rely on recen vulkan API... Re-attached for convenience. On Tue, Feb 13, 2024 at 04:19:06PM -0500, Thomas Frohwein wrote: > Hi, > > Please find attached a tarball for "volk", a meta loader for vulkan. It > appears to manage dynamic loading of the vulkan library including > simplification of extension management/loading. This is now a > dependency for the latest version of vulkan-tools, so I would like to > import this to proceed with the updates for vulkan.. > > ok? volk.tgz Description: application/tar-gz
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2024/02/22 19:40:26 Modified files: devel/py-debugpy: Makefile distinfo devel/py-debugpy/pkg: PLIST Log message: update debugpy to 1.8.1 and set COMPILER to try to fix build on sparc64
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dan...@cvs.openbsd.org 2024/02/22 19:36:51 Modified files: graphics/py-matplotlib: Makefile distinfo graphics/py-matplotlib/pkg: PLIST Log message: update matplotlib to 3.8.3
Re: devel/ffcall: ENDBR64
Looks good enough. (I mean good enough for those two stupid ports)
Re: retire some python 2 ports
> >> - lang/flang and lang/cparser (bcallah@ may have a plan) > > flang seems to be out of sync with LLVM versions anyway. > cparser doesn't use python at all? > Flang I have updated to the latest version but something else is subtly broken; I am working on it. CParser should work with python3, I'll test right now. ~Brian
Re: UPDATE net/unison-2.53.4
Le Tue, Feb 20, 2024 at 08:42:23PM +0100, Bjorn Ketelaars a écrit :
> On Tue 20/02/2024 11:30, Jeremie Courreges-Anglas wrote:
> > On Mon, Feb 19 2024, Bjorn Ketelaars wrote:
> > > Diff below updates net/unison to 2.53.4, which includes bug fixes, minor
> > > improvements and clean-ups. Release notes:
> > > https://github.com/bcpierce00/unison/releases/tag/v2.53.4.
> > >
> > > Change in the build system is that the gtk3 flavor of unison is
> > > renamed to unison-gui. This is undone in the diff below by setting the
> > > correct binary and renaming it in the do-install phase. I'm not sure
> > > if this is the way to go, or if there is a better way to do this.
> >
> > If lablgtk3 is installed then both unison and unison-gui are built, with
> > or without FLAVOR=no_x11. The problem is you're *adding* to MAKE_FLAGS
> > instead of *setting* ALL_TARGET=gui/tui.
> >
> > Now that the build system lets you build both, it would be interesting
> > to use MULTI_PACKAGES, with a -gui subpackage shipping just the
> > unison-gui program and carrying the gtk3 dep. With proper @pkgpaths the
> > upgrade path would be mostly transparent for users (gotta retrain their
> > fingers to type unison-gui when needed).
> >
> > Additionally no_x11 could stay as a PSEUDO_FLAVOR so that people can
> > build and install the tui program/package without having lablgtk3
> > installed.
>
> New diff, which addresses Jeremie's feedback:
> - uses MULTI_PACKAGES (with a -x11 subpackage);
> - no_x11 as PSEUDO_FLAVOR;
> - updated @pkgpath markers;
> - added quirks entry;
> - updated net/Makefile.
>
> With this users are able to use `pkg_add -u` and:
> - update unison-2.53.3 to unison-x11-2.53.4 (pulls in unison-2.53.4 as
> RDEP);
> - update unison-no_x11-2.53.3 to unison-2.53.4.
>
> Comments/OK?
Looks mostly good, please see comments inline.
> diff --git devel/quirks/Makefile devel/quirks/Makefile
> index b52a6ca153c..29352025828 100644
> --- devel/quirks/Makefile
> +++ devel/quirks/Makefile
> @@ -3,7 +3,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME =quirks-7.6
> +PKGNAME =quirks-7.7
> PKG_ARCH = *
> MAINTAINER = Marc Espie
>
> diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm
> index a5641d20104..e0a8ce89fc4 100644
> --- devel/quirks/files/Quirks.pm
> +++ devel/quirks/files/Quirks.pm
> @@ -809,6 +809,8 @@ my $stem_extensions = {
> 'py-analyzemft' => 'py3-analyzemft',
> 'llama' => 'walk',
> 'py-setuptools-git' => 'py3-setuptools-git',
> + 'unison' => 'unison-x11',
This line is correct and needed for the upgrade path.
> + 'unison-no_x11' => 'unison',
This one looks incorrect: there never was a unison-no_x11 package
(rather unison--no_x11). It's not needed for pkg_add -u to work so
you can just drop it.
> };
>
> my $obsolete_reason = {};
> diff --git net/Makefile net/Makefile
> index eaee3c5bf66..370c6a22f70 100644
> --- net/Makefile
> +++ net/Makefile
> @@ -749,7 +749,6 @@
> SUBDIR += uhttpmock
> SUBDIR += unifi
> SUBDIR += unison
> - SUBDIR += unison,no_x11
> SUBDIR += unworkable
> SUBDIR += usockets
> SUBDIR += utox
> diff --git net/unison/Makefile net/unison/Makefile
> index d240adb9879..da4c1fef4e1 100644
> --- net/unison/Makefile
> +++ net/unison/Makefile
> @@ -2,12 +2,12 @@
> USE_NOEXECONLY = yes
> .endif
>
> -COMMENT =multi-platform file synchronization tool
> +COMMENT-main = multi-platform file synchronization tool
> +COMMENT-x11 =gtk3 based interface for unison
You're using the default unison-x11 package name for the GUI program.
Was there a reason not to name the package unison-gui instead, just
like the program it ships? (Not objecting, just wondering.)
> GH_ACCOUNT = bcpierce00
> GH_PROJECT = unison
> -GH_TAGNAME = v2.53.3
> -REVISION = 2
> +GH_TAGNAME = v2.53.4
>
> CATEGORIES = net
>
> @@ -16,47 +16,46 @@ MAINTAINER = Bjorn Ketelaars
> # GPLv3
> PERMIT_PACKAGE = Yes
>
> -WANTLIB =c m util
> +WANTLIB =c m pthread util
> +WANTLIB-x11 =${WANTLIB} atk-1.0 cairo cairo-gobject fontconfig
> freetype
> +WANTLIB-x11 += gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0 gtk-3
> +WANTLIB-x11 += harfbuzz intl pango-1.0 pangocairo-1.0
>
> MODULES =lang/ocaml
> MODOCAML_RUNDEP =if-not-native
>
> -USE_GMAKE = Yes
> +LIB_DEPENDS-x11 =x11/gtk+3
> +RUN_DEPENDS-x11 =${BASE_PKGPATH},-main=${GH_TAGNAME:S/v//} \
> + devel/desktop-file-utils
>
> # CFLAGS _must_ be empty. This is an OCaml compiler.
> MAKE_FLAGS = NATIVE=${MODOCAML_NATIVE:S/Yes/true/:S/No/false/} \
> OCAMLOPT=ocamlopt.opt \
> CFLAGS=
>
> -FLAVORS =no_x11
> -FLAVOR ?=
> -
> -.if ${FLAVOR:Mno_x11}
> -MAKE_FLAGS +=UISTYLE=text
> -.else
> -WANTLIB += atk-1.0 cairo cairo-gobject fontconfig freetype gdk-3
> -WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
Re: x11/remmina: update to 1.4.34
On Thu, Feb 22, 2024 at 09:05:44PM +, Stuart Henderson wrote:
> > +WANTLIB += json-glib-1.0 pango-1.0 pthread python3.10 secret-1
>
> Please drop the hardcoded python3.10, you already have MODPY_WANTLIB.
Of course, copy/paste after WANTLIB= and port-lib-depends-check.
> > +WANTLIB += sndio sodium spice-client-glib-2.0 spice-client-gtk-3.0
> > +WANTLIB += ssh ssl vncclient vncserver vte-2.91 winpr2
> > +
> > +SITES=
> > https://gitlab.com/Remmina/Remmina/-/archive/v${V}/
> > +SITES.fix= https://gitlab.com/Remmina/Remmina/commit/
> > +# "Fix build for openssl-1.1"
> > +PATCHFILES.fix=93d703ec8524dec774f36d2285a6ec87c6fabb8d.patch
>
> truncated hashes in the index lines, this isn't a stable file
I see what you mean, thanks.
Thanks to minimal differences between release and fix commit, we can
safely use DIST_TUPLE and the latter.
93d703ec8 Fix build for openssl-1.1
f6f3b3e5d Translated using Weblate ...
b918127da Translated using Weblate ...
83f1c29ed Translated using Weblate ...
a0828e365 Translated using Weblate ...
71009501c Translated using Weblate ...
d2335e45c Update translation files
98a83761f Updating pot file via remmina-ci
75a0bdb79 (tag: v1.4.34) Update translation files
Feedback? OK?
Index: Makefile
===
RCS file: /cvs/ports/x11/remmina/Makefile,v
diff -u -p -r1.62 Makefile
--- Makefile3 Feb 2024 12:39:41 - 1.62
+++ Makefile22 Feb 2024 21:32:37 -
@@ -1,9 +1,10 @@
COMMENT= GTK+ remote desktop client
-V= 1.4.33
-DISTNAME= Remmina-v.${V}
-PKGNAME= ${DISTNAME:L:S/v.//}
-
+# post-release "Fix build for openssl-1.1"
+C= 93d703ec8524dec774f36d2285a6ec87c6fabb8d
+DIST_TUPLE=gitlab Remmina Remmina ${C}.
+DISTNAME= Remmina-${C}
+PKGNAME= remmina-1.4.34
CATEGORIES=x11 net
HOMEPAGE= https://www.remmina.org/
@@ -13,12 +14,11 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${MODPY_WANTLIB}
WANTLIB += avahi-client avahi-common avahi-ui-gtk3 c cairo crypto
-WANTLIB += cups freerdp-client2 freerdp2 gcrypt gdk-3 gdk_pixbuf-2.0
+WANTLIB += cups curl freerdp-client2 gcrypt gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-3 intl
-WANTLIB += json-glib-1.0 pango-1.0 pthread secret-1 sodium
spice-client-glib-2.0
-WANTLIB += spice-client-gtk-3.0 ssh ssl vncclient vncserver vte-2.91 winpr2
-
-SITES= https://gitlab.com/Remmina/Remmina/-/archive/v.${V}/
+WANTLIB += json-glib-1.0 pango-1.0 pthread secret-1 sndio sodium
+WANTLIB += spice-client-glib-2.0 spice-client-gtk-3.0 ssh ssl
+WANTLIB += vncclient vncserver vte-2.91 winpr2
MODULES= devel/cmake \
lang/python
@@ -34,6 +34,7 @@ LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
devel/json-glib \
devel/vte3 \
net/avahi,,-gtk3 \
+ net/curl \
net/libvncserver \
security/libsodium \
security/libssh \
@@ -46,6 +47,8 @@ RUN_DEPENDS= devel/desktop-file-utils \
misc/shared-mime-info \
x11/gtk+4,-guic
+CONFIGURE_ARGS=-DCMAKE_DISABLE_FIND_PACKAGE_Git=ON
+
# Appindicator is only used by Ubuntu's Unity.
CONFIGURE_ARGS += -DHAVE_LIBAPPINDICATOR=OFF \
-DWITH_ICON_CACHE=OFF \
@@ -64,5 +67,10 @@ CONFIGURE_ARGS +=-DWITH_KF5WALLET=OFF \
-DWITH_WWW=OFF
DEBUG_PACKAGES=${BUILD_PACKAGES}
+
+post-install:
+ # pending "Use universal /bin/sh shebang in remmina-rile-wrapper(1)"
+ # https://gitlab.com/Remmina/Remmina/-/merge_requests/2572
+ sed -i '1s,/usr/bin/env bash,/bin/sh,'
${PREFIX}/bin/remmina-file-wrapper
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/remmina/distinfo,v
diff -u -p -r1.13 distinfo
--- distinfo3 Feb 2024 12:39:41 - 1.13
+++ distinfo22 Feb 2024 21:31:35 -
@@ -1,2 +1,2 @@
-SHA256 (Remmina-v.1.4.33.tar.gz) = CYj47FyX8puDx+NNuicFjuOCydC6+qbVggCKdKIYcFM=
-SIZE (Remmina-v.1.4.33.tar.gz) = 3690770
+SHA256 (Remmina-Remmina-93d703ec8524dec774f36d2285a6ec87c6fabb8d.tar.gz) =
sQPaF6QTHIshMfabsWcfDerj1BT3N8qt6KV8ieZu/jw=
+SIZE (Remmina-Remmina-93d703ec8524dec774f36d2285a6ec87c6fabb8d.tar.gz) =
3774333
Index: patches/patch-src_remmina_ssh_c
===
RCS file: /cvs/ports/x11/remmina/patches/patch-src_remmina_ssh_c,v
diff -u -p -r1.2 patch-src_remmina_ssh_c
--- patches/patch-src_remmina_ssh_c 11 Jun 2023 20:59:09 - 1.2
+++ patches/patch-src_remmina_ssh_c 22 Feb 2024 16:49:44 -
@@ -1,7 +1,7 @@
Index:
Re: x11/remmina: update to 1.4.34
On 2024/02/22 18:33, Klemens Nanni wrote:
> Works fine for me with RDP to a Windows 11 box.
> Needs cherry-picking a post-release for LibreSSL.
> I've also sent my wrapper shebang fix upstream.
>
> More tests?
> Feedback? OK?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/remmina/Makefile,v
> diff -u -p -r1.62 Makefile
> --- Makefile 3 Feb 2024 12:39:41 - 1.62
> +++ Makefile 22 Feb 2024 18:18:19 -
> @@ -1,8 +1,8 @@
> COMMENT= GTK+ remote desktop client
>
> -V= 1.4.33
> -DISTNAME=Remmina-v.${V}
> -PKGNAME= ${DISTNAME:L:S/v.//}
> +V= 1.4.34
> +DISTNAME=Remmina-v${V}
> +PKGNAME= ${DISTNAME:L:S/v//}
>
> CATEGORIES= x11 net
>
> @@ -13,12 +13,17 @@ PERMIT_PACKAGE= Yes
>
> WANTLIB += ${MODPY_WANTLIB}
> WANTLIB += avahi-client avahi-common avahi-ui-gtk3 c cairo crypto
> -WANTLIB += cups freerdp-client2 freerdp2 gcrypt gdk-3 gdk_pixbuf-2.0
> +WANTLIB += cups curl freerdp-client2 gcrypt gdk-3 gdk_pixbuf-2.0
> WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-3 intl
> -WANTLIB += json-glib-1.0 pango-1.0 pthread secret-1 sodium
> spice-client-glib-2.0
> -WANTLIB += spice-client-gtk-3.0 ssh ssl vncclient vncserver vte-2.91 winpr2
> -
> -SITES=
> https://gitlab.com/Remmina/Remmina/-/archive/v.${V}/
> +WANTLIB += json-glib-1.0 pango-1.0 pthread python3.10 secret-1
Please drop the hardcoded python3.10, you already have MODPY_WANTLIB.
> +WANTLIB += sndio sodium spice-client-glib-2.0 spice-client-gtk-3.0
> +WANTLIB += ssh ssl vncclient vncserver vte-2.91 winpr2
> +
> +SITES=
> https://gitlab.com/Remmina/Remmina/-/archive/v${V}/
> +SITES.fix= https://gitlab.com/Remmina/Remmina/commit/
> +# "Fix build for openssl-1.1"
> +PATCHFILES.fix= 93d703ec8524dec774f36d2285a6ec87c6fabb8d.patch
truncated hashes in the index lines, this isn't a stable file
> +PATCH_DIST_STRIP=-p1
>
> MODULES= devel/cmake \
> lang/python
> @@ -34,6 +39,7 @@ LIB_DEPENDS=${MODPY_LIB_DEPENDS} \
> devel/json-glib \
> devel/vte3 \
> net/avahi,,-gtk3 \
> + net/curl \
> net/libvncserver \
> security/libsodium \
> security/libssh \
> @@ -64,5 +70,10 @@ CONFIGURE_ARGS += -DWITH_KF5WALLET=OFF \
> -DWITH_WWW=OFF
>
> DEBUG_PACKAGES= ${BUILD_PACKAGES}
> +
> +post-install:
> + # pending "Use universal /bin/sh shebang in remmina-rile-wrapper(1)"
> + # https://gitlab.com/Remmina/Remmina/-/merge_requests/2572
> + sed -i '1s,/usr/bin/env bash,/bin/sh,'
> ${PREFIX}/bin/remmina-file-wrapper
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/remmina/distinfo,v
> diff -u -p -r1.13 distinfo
> --- distinfo 3 Feb 2024 12:39:41 - 1.13
> +++ distinfo 22 Feb 2024 17:53:58 -
> @@ -1,2 +1,4 @@
> -SHA256 (Remmina-v.1.4.33.tar.gz) =
> CYj47FyX8puDx+NNuicFjuOCydC6+qbVggCKdKIYcFM=
> -SIZE (Remmina-v.1.4.33.tar.gz) = 3690770
> +SHA256 (93d703ec8524dec774f36d2285a6ec87c6fabb8d.patch) =
> BpPEjlDlAUiOZQiWQADtezXtBB/+ME5g2SkCJPF4MRo=
> +SHA256 (Remmina-v1.4.34.tar.gz) =
> NDYiOaagnbfg/4D6ocRt5nl7pWlkAbxUvLZ85DjWCjs=
> +SIZE (93d703ec8524dec774f36d2285a6ec87c6fabb8d.patch) = 5748
> +SIZE (Remmina-v1.4.34.tar.gz) = 3744088
> Index: patches/patch-src_remmina_ssh_c
> ===
> RCS file: /cvs/ports/x11/remmina/patches/patch-src_remmina_ssh_c,v
> diff -u -p -r1.2 patch-src_remmina_ssh_c
> --- patches/patch-src_remmina_ssh_c 11 Jun 2023 20:59:09 - 1.2
> +++ patches/patch-src_remmina_ssh_c 22 Feb 2024 16:49:44 -
> @@ -1,7 +1,7 @@
> Index: src/remmina_ssh.c
> --- src/remmina_ssh.c.orig
> +++ src/remmina_ssh.c
> -@@ -40,7 +40,7 @@
> +@@ -41,7 +41,7 @@
> #ifdef HAVE_LIBSSH
>
> /* To get definitions of NI_MAXHOST and NI_MAXSERV from */
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/x11/remmina/pkg/PLIST,v
> diff -u -p -r1.18 PLIST
> --- pkg/PLIST 11 Jun 2023 20:59:09 - 1.18
> +++ pkg/PLIST 22 Feb 2024 18:07:32 -
> @@ -79,6 +79,7 @@ share/icons/hicolor/scalable/emblems/org
> share/icons/hicolor/scalable/emblems/org.remmina.Remmina-vnc-symbolic.svg
> share/locale/ar/LC_MESSAGES/remmina.mo
> share/locale/ast/LC_MESSAGES/remmina.mo
> +share/locale/be/LC_MESSAGES/remmina.mo
> share/locale/ber/
> share/locale/ber/LC_MESSAGES/
> share/locale/ber/LC_MESSAGES/remmina.mo
>
Re: security/libgcrypt: Sprinkle some ENDBR64 instructions
No need for an apology. You understand that stuff much better than I do anyway :-) Clueless OK for me. — Antoine > On Feb 22, 2024, at 09:57, Mark Kettenis wrote: > > >> >> From: Renato Aguiar >> Date: Wed, 21 Feb 2024 17:31:41 -0800 > > Apologies to Antoine, I forgot to CC you the first time I sent this > out. Anyway, here is a new version. Thinking about this a bit more > changing CFI_STARTPROC like we did on arm64 will make maintenance a > lot easier. This will over-BTI, but I'm also looking at having the > linker remove unnecessary ENDBR64 instructions at the start of a > function. > > ok? > >> On Tue, Feb 20 2024, Mark Kettenis wrote: >> >> I probably could have done this by changing CFI_STARTPROC, like >> on >> arm64. But that would "over-BTI" and there is a benefit in >> trying to >> avoid that on amd64. >> >> Let me know what you think. > > Index: security/libgcrypt/Makefile > === > RCS file: /cvs/ports/security/libgcrypt/Makefile,v > retrieving revision 1.93 > diff -u -p -r1.93 Makefile > --- security/libgcrypt/Makefile20 Nov 2023 16:53:17 -1.93 > +++ security/libgcrypt/Makefile22 Feb 2024 13:57:00 - > @@ -6,7 +6,7 @@ USE_NOEXECONLY=Yes > COMMENT=crypto library based on code used in GnuPG > > DISTNAME=libgcrypt-1.10.3 > -REVISION=0 > +REVISION=1 > > CATEGORIES=security > > Index: security/libgcrypt/patches/patch-cipher_asm-common-amd64_h > === > RCS file: security/libgcrypt/patches/patch-cipher_asm-common-amd64_h > diff -N security/libgcrypt/patches/patch-cipher_asm-common-amd64_h > --- /dev/null1 Jan 1970 00:00:00 - > +++ security/libgcrypt/patches/patch-cipher_asm-common-amd64_h22 Feb 2024 > 13:57:00 - > @@ -0,0 +1,21 @@ > +Index: cipher/asm-common-amd64.h > +--- cipher/asm-common-amd64.h.orig > cipher/asm-common-amd64.h > +@@ -68,7 +68,7 @@ > + > + #ifdef HAVE_GCC_ASM_CFI_DIRECTIVES > + /* CFI directives to emit DWARF stack unwinding information. */ > +-# define CFI_STARTPROC().cfi_startproc > ++# define CFI_STARTPROC().cfi_startproc; endbr64 > + # define CFI_ENDPROC() .cfi_endproc > + # define CFI_REMEMBER_STATE() .cfi_remember_state > + # define CFI_RESTORE_STATE().cfi_restore_state > +@@ -136,7 +136,7 @@ > +DW_SLEB128_28BIT(rsp_offs) > + > + #else > +-# define CFI_STARTPROC() > ++# define CFI_STARTPROC() endbr64 > + # define CFI_ENDPROC() > + # define CFI_REMEMBER_STATE() > + # define CFI_RESTORE_STATE()
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: kette...@cvs.openbsd.org2024/02/22 12:40:27 Modified files: security/libgcrypt: Makefile Added files: security/libgcrypt/patches: patch-cipher_asm-common-amd64_h Log message: Add ENDBR64 instructions at the start of functions in the same wat as we already add BTI instructions on arm64. ok tb@, tobhe@
devel/ffcall: ENDBR64
This has various asm bits that do some nasty things. Ionly fixed some as the other stuff seems to violate X-only and R^W. And some bits even use an executable stack. But nothing that uses this (lang/clisp and lang/gforth as far as I can tell) use -Wl,-zwxneeded or -Wl,--no-execute-only. So this should be good enough? Index: devel/ffcall/Makefile === RCS file: /cvs/ports/devel/ffcall/Makefile,v retrieving revision 1.34 diff -u -p -r1.34 Makefile --- devel/ffcall/Makefile 21 Sep 2023 09:49:53 - 1.34 +++ devel/ffcall/Makefile 22 Feb 2024 18:56:50 - @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS= alpha amd64 hppa i386 mi COMMENT= foreign function call libraries DISTNAME= ffcall-1.10 -REVISION = 5 +REVISION = 6 SHARED_LIBS= avcall 1.0 \ callback1.0 CATEGORIES=devel Index: devel/ffcall/patches/patch-avcall_avcall-x86_64_s === RCS file: /cvs/ports/devel/ffcall/patches/patch-avcall_avcall-x86_64_s,v retrieving revision 1.2 diff -u -p -r1.2 patch-avcall_avcall-x86_64_s --- devel/ffcall/patches/patch-avcall_avcall-x86_64_s 11 Mar 2022 18:50:02 - 1.2 +++ devel/ffcall/patches/patch-avcall_avcall-x86_64_s 22 Feb 2024 18:56:50 - @@ -1,7 +1,15 @@ Index: avcall/avcall-x86_64.s --- avcall/avcall-x86_64.s.orig +++ avcall/avcall-x86_64.s -@@ -326,50 +326,4 @@ __builtin_avcall: +@@ -5,6 +5,7 @@ + .type __builtin_avcall,@function + __builtin_avcall: + .LFB1: ++ endbr64 + pushq %r12 + .LCFI0: + xorl%r11d, %r11d +@@ -326,50 +327,4 @@ __builtin_avcall: movq16(%rbx), %rax movss %xmm0, (%rax) jmp .L24 Index: devel/ffcall/patches/patch-vacall_vacall-x86_64_s === RCS file: /cvs/ports/devel/ffcall/patches/patch-vacall_vacall-x86_64_s,v retrieving revision 1.2 diff -u -p -r1.2 patch-vacall_vacall-x86_64_s --- devel/ffcall/patches/patch-vacall_vacall-x86_64_s 11 Mar 2022 18:50:02 - 1.2 +++ devel/ffcall/patches/patch-vacall_vacall-x86_64_s 22 Feb 2024 18:56:50 - @@ -1,7 +1,15 @@ Index: vacall/vacall-x86_64.s --- vacall/vacall-x86_64.s.orig +++ vacall/vacall-x86_64.s -@@ -203,42 +203,4 @@ __vacall: +@@ -5,6 +5,7 @@ + .type __vacall,@function + __vacall: + .LFB1: ++ endbr64 + pushq %r12 + .LCFI0: + subq$192, %rsp +@@ -203,42 +204,4 @@ __vacall: .L53: movsbq 40(%rsp),%rax jmp .L1
Re: security/libgcrypt: Sprinkle some ENDBR64 instructions
On February 22, 2024 7:56:45 PM GMT+01:00, Theo Buehler wrote: >On Thu, Feb 22, 2024 at 02:57:39PM +0100, Mark Kettenis wrote: >> > From: Renato Aguiar >> > Date: Wed, 21 Feb 2024 17:31:41 -0800 >> >> Apologies to Antoine, I forgot to CC you the first time I sent this >> out. Anyway, here is a new version. Thinking about this a bit more >> changing CFI_STARTPROC like we did on arm64 will make maintenance a >> lot easier. This will over-BTI, but I'm also looking at having the >> linker remove unnecessary ENDBR64 instructions at the start of a >> function. >> >> ok? > >I think this is preferable, especially if you are planning to amortize >the cost in lld. > >ok tb > oh I missed that there was a second version. ok with me too, we arrived at the same conclusion for arm64 after all.
x11/freerdp: update to 2.11.5
Really just decoder fixes for us:
2.11.5
* Fix integer overflow in progressive decoder
* Update OpenSSL API usage for compatiblility with newer versions (#9747)
* Prevent NULL dereference for single thread decoder (#9712)
2.11.4
* fix a typo in unicode commit (#9652)
Also drop -fcommon from 2021 as it builds without now.
More tests?
Feedback? OK?
Index: Makefile
===
RCS file: /cvs/ports/x11/freerdp/Makefile,v
diff -u -p -r1.69 Makefile
--- Makefile10 Feb 2024 17:52:47 - 1.69
+++ Makefile22 Feb 2024 18:42:17 -
@@ -1,5 +1,5 @@
COMMENT = client for Microsoft RDP (remote desktop protocol)
-DISTNAME = freerdp-2.11.3
+DISTNAME = freerdp-2.11.5
DPB_PROPERTIES = parallel
CATEGORIES = x11 net
@@ -33,8 +33,6 @@ MODULES = devel/cmake
CFLAGS += -I${X11BASE}/include \
-I${LOCALBASE}/include
-
-CFLAGS += -fcommon
BUILD_DEPENDS =security/pcsc-lite \
textproc/xmlto
Index: distinfo
===
RCS file: /cvs/ports/x11/freerdp/distinfo,v
diff -u -p -r1.27 distinfo
--- distinfo10 Feb 2024 17:52:47 - 1.27
+++ distinfo22 Feb 2024 18:42:22 -
@@ -1,4 +1,4 @@
-SHA256 (freerdp-2.11.3.tar.gz) = kjTswmEeb4G7fEy9d8RStihU/DoDbX5lh66pWd5t14o=
+SHA256 (freerdp-2.11.5.tar.gz) = cHha2ZNNda7Rc0+JGKBa/5V4jljlMIHoRlEQayQwPcI=
SHA256 (freerdp-sndio-upd2.patch) =
aQEVS0+WMH4D0tPX56gdMHgpiEL1d0Pv3g8QgHno6jk=
-SIZE (freerdp-2.11.3.tar.gz) = 7328876
+SIZE (freerdp-2.11.5.tar.gz) = 7330372
SIZE (freerdp-sndio-upd2.patch) = 23241
Re: security/libgcrypt: Sprinkle some ENDBR64 instructions
On Thu, Feb 22, 2024 at 02:57:39PM +0100, Mark Kettenis wrote: > > From: Renato Aguiar > > Date: Wed, 21 Feb 2024 17:31:41 -0800 > > Apologies to Antoine, I forgot to CC you the first time I sent this > out. Anyway, here is a new version. Thinking about this a bit more > changing CFI_STARTPROC like we did on arm64 will make maintenance a > lot easier. This will over-BTI, but I'm also looking at having the > linker remove unnecessary ENDBR64 instructions at the start of a > function. > > ok? I think this is preferable, especially if you are planning to amortize the cost in lld. ok tb
x11/remmina: update to 1.4.34
Works fine for me with RDP to a Windows 11 box.
Needs cherry-picking a post-release for LibreSSL.
I've also sent my wrapper shebang fix upstream.
More tests?
Feedback? OK?
Index: Makefile
===
RCS file: /cvs/ports/x11/remmina/Makefile,v
diff -u -p -r1.62 Makefile
--- Makefile3 Feb 2024 12:39:41 - 1.62
+++ Makefile22 Feb 2024 18:18:19 -
@@ -1,8 +1,8 @@
COMMENT= GTK+ remote desktop client
-V= 1.4.33
-DISTNAME= Remmina-v.${V}
-PKGNAME= ${DISTNAME:L:S/v.//}
+V= 1.4.34
+DISTNAME= Remmina-v${V}
+PKGNAME= ${DISTNAME:L:S/v//}
CATEGORIES=x11 net
@@ -13,12 +13,17 @@ PERMIT_PACKAGE= Yes
WANTLIB += ${MODPY_WANTLIB}
WANTLIB += avahi-client avahi-common avahi-ui-gtk3 c cairo crypto
-WANTLIB += cups freerdp-client2 freerdp2 gcrypt gdk-3 gdk_pixbuf-2.0
+WANTLIB += cups curl freerdp-client2 gcrypt gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-3 intl
-WANTLIB += json-glib-1.0 pango-1.0 pthread secret-1 sodium
spice-client-glib-2.0
-WANTLIB += spice-client-gtk-3.0 ssh ssl vncclient vncserver vte-2.91 winpr2
-
-SITES= https://gitlab.com/Remmina/Remmina/-/archive/v.${V}/
+WANTLIB += json-glib-1.0 pango-1.0 pthread python3.10 secret-1
+WANTLIB += sndio sodium spice-client-glib-2.0 spice-client-gtk-3.0
+WANTLIB += ssh ssl vncclient vncserver vte-2.91 winpr2
+
+SITES= https://gitlab.com/Remmina/Remmina/-/archive/v${V}/
+SITES.fix= https://gitlab.com/Remmina/Remmina/commit/
+# "Fix build for openssl-1.1"
+PATCHFILES.fix=93d703ec8524dec774f36d2285a6ec87c6fabb8d.patch
+PATCH_DIST_STRIP= -p1
MODULES= devel/cmake \
lang/python
@@ -34,6 +39,7 @@ LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \
devel/json-glib \
devel/vte3 \
net/avahi,,-gtk3 \
+ net/curl \
net/libvncserver \
security/libsodium \
security/libssh \
@@ -64,5 +70,10 @@ CONFIGURE_ARGS +=-DWITH_KF5WALLET=OFF \
-DWITH_WWW=OFF
DEBUG_PACKAGES=${BUILD_PACKAGES}
+
+post-install:
+ # pending "Use universal /bin/sh shebang in remmina-rile-wrapper(1)"
+ # https://gitlab.com/Remmina/Remmina/-/merge_requests/2572
+ sed -i '1s,/usr/bin/env bash,/bin/sh,'
${PREFIX}/bin/remmina-file-wrapper
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/remmina/distinfo,v
diff -u -p -r1.13 distinfo
--- distinfo3 Feb 2024 12:39:41 - 1.13
+++ distinfo22 Feb 2024 17:53:58 -
@@ -1,2 +1,4 @@
-SHA256 (Remmina-v.1.4.33.tar.gz) = CYj47FyX8puDx+NNuicFjuOCydC6+qbVggCKdKIYcFM=
-SIZE (Remmina-v.1.4.33.tar.gz) = 3690770
+SHA256 (93d703ec8524dec774f36d2285a6ec87c6fabb8d.patch) =
BpPEjlDlAUiOZQiWQADtezXtBB/+ME5g2SkCJPF4MRo=
+SHA256 (Remmina-v1.4.34.tar.gz) = NDYiOaagnbfg/4D6ocRt5nl7pWlkAbxUvLZ85DjWCjs=
+SIZE (93d703ec8524dec774f36d2285a6ec87c6fabb8d.patch) = 5748
+SIZE (Remmina-v1.4.34.tar.gz) = 3744088
Index: patches/patch-src_remmina_ssh_c
===
RCS file: /cvs/ports/x11/remmina/patches/patch-src_remmina_ssh_c,v
diff -u -p -r1.2 patch-src_remmina_ssh_c
--- patches/patch-src_remmina_ssh_c 11 Jun 2023 20:59:09 - 1.2
+++ patches/patch-src_remmina_ssh_c 22 Feb 2024 16:49:44 -
@@ -1,7 +1,7 @@
Index: src/remmina_ssh.c
--- src/remmina_ssh.c.orig
+++ src/remmina_ssh.c
-@@ -40,7 +40,7 @@
+@@ -41,7 +41,7 @@
#ifdef HAVE_LIBSSH
/* To get definitions of NI_MAXHOST and NI_MAXSERV from */
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/remmina/pkg/PLIST,v
diff -u -p -r1.18 PLIST
--- pkg/PLIST 11 Jun 2023 20:59:09 - 1.18
+++ pkg/PLIST 22 Feb 2024 18:07:32 -
@@ -79,6 +79,7 @@ share/icons/hicolor/scalable/emblems/org
share/icons/hicolor/scalable/emblems/org.remmina.Remmina-vnc-symbolic.svg
share/locale/ar/LC_MESSAGES/remmina.mo
share/locale/ast/LC_MESSAGES/remmina.mo
+share/locale/be/LC_MESSAGES/remmina.mo
share/locale/ber/
share/locale/ber/LC_MESSAGES/
share/locale/ber/LC_MESSAGES/remmina.mo
Re: acme-client: add challenge hook to support dns-01
On February 20, 2024 11:45:26 PM GMT+01:00, Evan Silberman wrote: > >Any example hook included should probably only use tools found in base, so it >shouldn’t depend on curl. I thought so, too. And it would be easy enough to replace curl by base ftp. But base ftp needs the URL (and therefore the password) passed via the commandline, which is an unsafe channel. Any ideas how to pass passwords to ftp without revealing them to ps -ax ? Christopher
Re: security/libgcrypt: Sprinkle some ENDBR64 instructions
On Tue, Feb 20, 2024 at 01:11:35PM +0100, Mark Kettenis wrote: > I probably could have done this by changing CFI_STARTPROC, like on > arm64. But that would "over-BTI" and there is a benefit in trying to > avoid that on amd64. > > Let me know what you think. Looks ok to me. Hard to tell if that covers everything but I think that's fine. If anything is missing people will complain and we fix it. > > > Index: security/libgcrypt/Makefile > === > RCS file: /cvs/ports/security/libgcrypt/Makefile,v > retrieving revision 1.93 > diff -u -p -r1.93 Makefile > --- security/libgcrypt/Makefile 20 Nov 2023 16:53:17 - 1.93 > +++ security/libgcrypt/Makefile 20 Feb 2024 11:27:18 - > @@ -6,7 +6,7 @@ USE_NOEXECONLY= Yes > COMMENT= crypto library based on code used in GnuPG > > DISTNAME=libgcrypt-1.10.3 > -REVISION=0 > +REVISION=1 > > CATEGORIES= security > > Index: security/libgcrypt/patches/patch-cipher_arcfour-amd64_S > === > RCS file: security/libgcrypt/patches/patch-cipher_arcfour-amd64_S > diff -N security/libgcrypt/patches/patch-cipher_arcfour-amd64_S > --- /dev/null 1 Jan 1970 00:00:00 - > +++ security/libgcrypt/patches/patch-cipher_arcfour-amd64_S 20 Feb 2024 > 11:27:18 - > @@ -0,0 +1,11 @@ > +Index: cipher/arcfour-amd64.S > +--- cipher/arcfour-amd64.S.orig > cipher/arcfour-amd64.S > +@@ -26,6 +26,7 @@ > + ELF(.type _gcry_arcfour_amd64,@function) > + _gcry_arcfour_amd64: > + CFI_STARTPROC() > ++endbr64 > + ENTER_SYSV_FUNC_PARAMS_0_4 > + push%rbp > + CFI_PUSH(%rbp) > Index: security/libgcrypt/patches/patch-cipher_blake2b-amd64-avx2_S > === > RCS file: > /cvs/ports/security/libgcrypt/patches/patch-cipher_blake2b-amd64-avx2_S,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-cipher_blake2b-amd64-avx2_S > --- security/libgcrypt/patches/patch-cipher_blake2b-amd64-avx2_S 19 Jan > 2023 17:11:02 - 1.1 > +++ security/libgcrypt/patches/patch-cipher_blake2b-amd64-avx2_S 20 Feb > 2024 11:27:18 - > @@ -17,3 +17,11 @@ Index: cipher/blake2b-amd64-avx2.S > .align 64 > .globl _gcry_blake2b_transform_amd64_avx2 > ELF(.type _gcry_blake2b_transform_amd64_avx2,@function;) > +@@ -208,6 +210,7 @@ _gcry_blake2b_transform_amd64_avx2: > + * %rdx: num_blks > + */ > + CFI_STARTPROC(); > ++endbr64; > + > + vzeroupper; > + > Index: security/libgcrypt/patches/patch-cipher_blake2s-amd64-avx_S > === > RCS file: > /cvs/ports/security/libgcrypt/patches/patch-cipher_blake2s-amd64-avx_S,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-cipher_blake2s-amd64-avx_S > --- security/libgcrypt/patches/patch-cipher_blake2s-amd64-avx_S 19 Jan > 2023 17:11:02 - 1.1 > +++ security/libgcrypt/patches/patch-cipher_blake2s-amd64-avx_S 20 Feb > 2024 11:27:18 - > @@ -18,3 +18,11 @@ Index: cipher/blake2s-amd64-avx.S > .align 64 > .globl _gcry_blake2s_transform_amd64_avx > ELF(.type _gcry_blake2s_transform_amd64_avx,@function;) > +@@ -192,6 +193,7 @@ _gcry_blake2s_transform_amd64_avx: > + * %rdx: num_blks > + */ > + CFI_STARTPROC(); > ++endbr64; > + > + vzeroupper; > + > Index: security/libgcrypt/patches/patch-cipher_blowfish-amd64_S > === > RCS file: security/libgcrypt/patches/patch-cipher_blowfish-amd64_S > diff -N security/libgcrypt/patches/patch-cipher_blowfish-amd64_S > --- /dev/null 1 Jan 1970 00:00:00 - > +++ security/libgcrypt/patches/patch-cipher_blowfish-amd64_S 20 Feb 2024 > 11:27:18 - > @@ -0,0 +1,51 @@ > +Index: cipher/blowfish-amd64.S > +--- cipher/blowfish-amd64.S.orig > cipher/blowfish-amd64.S > +@@ -166,6 +166,7 @@ _gcry_blowfish_amd64_do_encrypt: > + * %rdx: u32 *ret_xr > + */ > + CFI_STARTPROC(); > ++endbr64; > + ENTER_SYSV_FUNC_PARAMS_0_4 > + > + movl (%rdx), RX0d; > +@@ -197,6 +198,7 @@ _gcry_blowfish_amd64_encrypt_block: > + * %rdx: src > + */ > + CFI_STARTPROC(); > ++endbr64; > + ENTER_SYSV_FUNC_PARAMS_0_4 > + > + movq %rsi, %r10; > +@@ -225,6 +227,7 @@ _gcry_blowfish_amd64_decrypt_block: > + * %rdx: src > + */ > + CFI_STARTPROC(); > ++endbr64; > + ENTER_SYSV_FUNC_PARAMS_0_4 > + > + movq %rbp, %r11; > +@@ -413,6 +416,7 @@ _gcry_blowfish_amd64_ctr_enc: > + * %rcx: iv (big endian, 64bit) > + */ > + CFI_STARTPROC(); > ++endbr64; > + ENTER_SYSV_FUNC_PARAMS_0_4 > + > + pushq %rbp; > +@@ -483,6 +487,7 @@ _gcry_blowfish_amd64_cbc_dec: > + * %rcx: iv (64bit) > + */ > +
UPDATE: Nono-0.7.0
Hello, Update for Nono to 0.7.0: http://www.pastel-flower.jp/~isaki/nono/ OK? Comments? Cheers.- Index: Makefile === RCS file: /cvs/ports/emulators/nono/Makefile,v retrieving revision 1.31 diff -u -p -r1.31 Makefile --- Makefile8 Jan 2024 08:14:12 - 1.31 +++ Makefile22 Feb 2024 14:30:31 - @@ -2,7 +2,7 @@ BROKEN-i386=requires __m128i and simil COMMENT= OMRON LUNA-I and LUNA-88K emulator -DISTNAME= nono-0.6.4 +DISTNAME= nono-0.7.0 CATEGORIES=emulators MAINTAINER=Gonzalo L. R. Index: distinfo === RCS file: /cvs/ports/emulators/nono/distinfo,v retrieving revision 1.21 diff -u -p -r1.21 distinfo --- distinfo8 Jan 2024 08:14:12 - 1.21 +++ distinfo22 Feb 2024 14:30:31 - @@ -1,2 +1,2 @@ -SHA256 (nono-0.6.4.tar.gz) = ZHgMmgUBqN2tvGhN6EkBMRQoOVtXfe26FgZMvW25trw= -SIZE (nono-0.6.4.tar.gz) = 3224619 +SHA256 (nono-0.7.0.tar.gz) = t+C0rSwPXyMK+UO6HKS1DrpsEmX4qKZtVWZ/2CNCc/k= +SIZE (nono-0.7.0.tar.gz) = 3268612 -- %gonzalo
Re: security/libgcrypt: Sprinkle some ENDBR64 instructions
> From: Renato Aguiar > Date: Wed, 21 Feb 2024 17:31:41 -0800 Apologies to Antoine, I forgot to CC you the first time I sent this out. Anyway, here is a new version. Thinking about this a bit more changing CFI_STARTPROC like we did on arm64 will make maintenance a lot easier. This will over-BTI, but I'm also looking at having the linker remove unnecessary ENDBR64 instructions at the start of a function. ok? On Tue, Feb 20 2024, Mark Kettenis wrote: > I probably could have done this by changing CFI_STARTPROC, like > on > arm64. But that would "over-BTI" and there is a benefit in > trying to > avoid that on amd64. > > Let me know what you think. Index: security/libgcrypt/Makefile === RCS file: /cvs/ports/security/libgcrypt/Makefile,v retrieving revision 1.93 diff -u -p -r1.93 Makefile --- security/libgcrypt/Makefile 20 Nov 2023 16:53:17 - 1.93 +++ security/libgcrypt/Makefile 22 Feb 2024 13:57:00 - @@ -6,7 +6,7 @@ USE_NOEXECONLY= Yes COMMENT= crypto library based on code used in GnuPG DISTNAME= libgcrypt-1.10.3 -REVISION= 0 +REVISION= 1 CATEGORIES=security Index: security/libgcrypt/patches/patch-cipher_asm-common-amd64_h === RCS file: security/libgcrypt/patches/patch-cipher_asm-common-amd64_h diff -N security/libgcrypt/patches/patch-cipher_asm-common-amd64_h --- /dev/null 1 Jan 1970 00:00:00 - +++ security/libgcrypt/patches/patch-cipher_asm-common-amd64_h 22 Feb 2024 13:57:00 - @@ -0,0 +1,21 @@ +Index: cipher/asm-common-amd64.h +--- cipher/asm-common-amd64.h.orig cipher/asm-common-amd64.h +@@ -68,7 +68,7 @@ + + #ifdef HAVE_GCC_ASM_CFI_DIRECTIVES + /* CFI directives to emit DWARF stack unwinding information. */ +-# define CFI_STARTPROC().cfi_startproc ++# define CFI_STARTPROC().cfi_startproc; endbr64 + # define CFI_ENDPROC() .cfi_endproc + # define CFI_REMEMBER_STATE() .cfi_remember_state + # define CFI_RESTORE_STATE().cfi_restore_state +@@ -136,7 +136,7 @@ + DW_SLEB128_28BIT(rsp_offs) + + #else +-# define CFI_STARTPROC() ++# define CFI_STARTPROC() endbr64 + # define CFI_ENDPROC() + # define CFI_REMEMBER_STATE() + # define CFI_RESTORE_STATE()
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2024/02/22 06:47:11 Modified files: security/openssl/3.1: Makefile Log message: openssl/3.1: postfix/snapshot is no more
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/02/22 06:46:35 Modified files: mail/postfix/stable: Makefile distinfo mail/postfix/stable/patches: patch-conf_master_cf patch-makedefs mail/postfix/stable/pkg: PLIST Log message: update to postfix-3.8.5, ok brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/02/22 06:45:28 Modified files: mail/postfix/stable35: Makefile distinfo Log message: update to postfix-3.5.24, ok brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/02/22 06:45:11 Removed files: mail/postfix/snapshot: Makefile distinfo mail/postfix/snapshot/files: postfix-disable postfix-enable postfix-install mail/postfix/snapshot/patches: patch-conf_main_cf patch-conf_master_cf patch-makedefs patch-src_util_sys_defs_h mail/postfix/snapshot/pkg: DESCR MESSAGE PLIST postfix.rc Log message: rm mail/postfix/snapshot, discussed with Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/02/22 06:44:41 Modified files: mail/postfix : Makefile Log message: unhook mail/postfix/snapshot, discussed with Brad
Re: Update arm-trusted-firmware 2.10.2
On 2024/02/22 14:13, Mark Kettenis wrote:
> > Date: Thu, 22 Feb 2024 05:32:57 +0900
> > From: SASANO Takayoshi
> >
> > Hi, here is the fixed version:
>
> I'm not sure about the "move away with date" approach. That is
> probably something a ports hacker should judge.
I think your suggestion of just moving the rm was better, there doesn't
seem a reason to backup old build directories.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/arm-trusted-firmware/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile19 Feb 2024 18:38:12 - 1.21
+++ Makefile22 Feb 2024 13:39:30 -
@@ -9,6 +9,7 @@ GH_ACCOUNT= ARM-software
GH_PROJECT=arm-trusted-firmware
GH_TAGNAME=lts-v${VERSION}
+REVISION= 0
EPOCH= 0
CATEGORIES=sysutils
@@ -39,6 +40,18 @@ PLATFORMS=\
do-build:
.for P in ${PLATFORMS}
+. if "$P" == "sun50i_h6"
+ # ATF's Makefile looks not easy to tweak, rename directory name that
+ # stores compiled objects. First, make with SUNXI_SETUP_REGULATORS=0.
+ cd ${WRKSRC} && \
+ ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
+ V=1 PLAT=${P} DEBUG=0 SUNXI_SETUP_REGULATORS=0 bl31
+ rm -rf ${WRKBUILD}/build/sun50i_h6.noreg
+ mv ${WRKBUILD}/build/sun50i_h6 ${WRKBUILD}/build/sun50i_h6.noreg
+
+ # Second, make default (SUNXI_SETUP_REGULATORS=1).
+ # (FALLTHROUGH)
+. endif
cd ${WRKSRC} && \
${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
V=1 PLAT=${P} DEBUG=0 bl31
@@ -54,6 +67,8 @@ do-install:
${PREFIX}/share/arm-trusted-firmware/sun50i_a64-bl31.bin
${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h6/release/bl31.bin \
${PREFIX}/share/arm-trusted-firmware/sun50i_h6-bl31.bin
+ ${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h6.noreg/release/bl31.bin \
+ ${PREFIX}/share/arm-trusted-firmware/sun50i_h6-bl31-noreg.bin
${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h616/release/bl31.bin \
${PREFIX}/share/arm-trusted-firmware/sun50i_h616-bl31.bin
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/arm-trusted-firmware/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST 19 Feb 2024 18:38:12 - 1.7
+++ pkg/PLIST 22 Feb 2024 13:39:30 -
@@ -3,5 +3,6 @@ share/arm-trusted-firmware/
share/arm-trusted-firmware/rk3328-bl31.elf
share/arm-trusted-firmware/rk3399-bl31.elf
share/arm-trusted-firmware/sun50i_a64-bl31.bin
+share/arm-trusted-firmware/sun50i_h6-bl31-noreg.bin
share/arm-trusted-firmware/sun50i_h6-bl31.bin
share/arm-trusted-firmware/sun50i_h616-bl31.bin
Re: Update arm-trusted-firmware 2.10.2
> Date: Thu, 22 Feb 2024 05:32:57 +0900
> From: SASANO Takayoshi
>
> Hi, here is the fixed version:
I'm not sure about the "move away with date" approach. That is
probably something a ports hacker should judge.
But otherwise this is ok kettenis@
> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/arm-trusted-firmware/Makefile,v
> diff -u -p -r1.21 Makefile
> --- Makefile 19 Feb 2024 18:38:12 - 1.21
> +++ Makefile 21 Feb 2024 20:27:57 -
> @@ -9,6 +9,7 @@ GH_ACCOUNT= ARM-software
> GH_PROJECT= arm-trusted-firmware
> GH_TAGNAME= lts-v${VERSION}
>
> +REVISION=0
> EPOCH= 0
>
> CATEGORIES= sysutils
> @@ -39,6 +40,22 @@ PLATFORMS=\
>
> do-build:
> .for P in ${PLATFORMS}
> +. if "$P" == "sun50i_h6"
> + # ATF's Makefile looks not easy to tweak, rename directory name that
> + # stores compiled objects. First, make with SUNXI_SETUP_REGULATORS=0.
> + # rename (not remove for safety) existing build directory
> + if [[ -e ${WRKBUILD}/build/sun50i_h6.noreg ]]; then \
> + mv -f ${WRKBUILD}/build/sun50i_h6.noreg \
> + ${WRKBUILD}/build/sun50i_h6.noreg-`date +%Y%m%d%H%M%S`; \
> + fi
> + cd ${WRKSRC} && \
> + ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
> + V=1 PLAT=${P} DEBUG=0 SUNXI_SETUP_REGULATORS=0 bl31
> + mv ${WRKBUILD}/build/sun50i_h6 ${WRKBUILD}/build/sun50i_h6.noreg
> +
> + # Second, make default (SUNXI_SETUP_REGULATORS=1).
> + # (FALLTHROUGH)
> +. endif
> cd ${WRKSRC} && \
> ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${MAKE_FLAGS} \
> V=1 PLAT=${P} DEBUG=0 bl31
> @@ -54,6 +71,8 @@ do-install:
> ${PREFIX}/share/arm-trusted-firmware/sun50i_a64-bl31.bin
> ${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h6/release/bl31.bin \
> ${PREFIX}/share/arm-trusted-firmware/sun50i_h6-bl31.bin
> + ${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h6.noreg/release/bl31.bin \
> + ${PREFIX}/share/arm-trusted-firmware/sun50i_h6-bl31-noreg.bin
> ${INSTALL_DATA} ${WRKBUILD}/build/sun50i_h616/release/bl31.bin \
> ${PREFIX}/share/arm-trusted-firmware/sun50i_h616-bl31.bin
>
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/sysutils/arm-trusted-firmware/pkg/PLIST,v
> diff -u -p -r1.7 PLIST
> --- pkg/PLIST 19 Feb 2024 18:38:12 - 1.7
> +++ pkg/PLIST 21 Feb 2024 20:27:57 -
> @@ -3,5 +3,6 @@ share/arm-trusted-firmware/
> share/arm-trusted-firmware/rk3328-bl31.elf
> share/arm-trusted-firmware/rk3399-bl31.elf
> share/arm-trusted-firmware/sun50i_a64-bl31.bin
> +share/arm-trusted-firmware/sun50i_h6-bl31-noreg.bin
> share/arm-trusted-firmware/sun50i_h6-bl31.bin
> share/arm-trusted-firmware/sun50i_h616-bl31.bin
>
>
> regards,
> --
> SASANO Takayoshi (JG1UAA)
>
remmina: libcrypto crash
An RDP session I frequently use died on me yesterday, first time I had remmina crash -- I'll see if I can reproduce and get a connection config or xfreerdp(1) equivalent as tester to share. Backtrace says libcrypto/TLS, perhaps this is of interest. I'm on snapshots with pkg_add -u from yesterday: OpenBSD 7.5-beta (GENERIC.MP) #1695: Sat Feb 17 18:39:13 MST 2024 Core was generated by `remmina'. Program terminated with signal SIGSEGV, Segmentation fault. #0 BIO_test_flags (bio=0x0, flags=15) at /usr/src/lib/libcrypto/bio/bio_lib.c:266 warning: Source file is more recent than executable. 266 return (bio->flags & flags); [Current thread is 1 (process 390573)] (gdb) bt #0 BIO_test_flags (bio=0x0, flags=15) at /usr/src/lib/libcrypto/bio/bio_lib.c:266 #1 BIO_copy_next_retry (b=0x25a1ad52b60) at /usr/src/lib/libcrypto/bio/bio_lib.c:851 #2 0x0259b3c663b7 in bio_rdp_tls_ctrl () from /usr/local/lib/libfreerdp2.so.3.0 #3 0x025a49641de6 in BIO_ctrl (b=0x25a1ad52b60, cmd=11, larg=0, parg=0x0) at /usr/src/lib/libcrypto/bio/bio_lib.c:590 #4 0x0259b3cb5267 in transport_write () from /usr/local/lib/libfreerdp2.so.3.0 #5 0x0259b3ca996e in rdp_send_data_pdu () from /usr/local/lib/libfreerdp2.so.3.0 #6 0x025a71f59e52 in remmina_rdp_main_loop () from /usr/local/lib/remmina/plugins/remmina-plugin-rdp.so #7 0x025a71f58c34 in remmina_rdp_main () from /usr/local/lib/remmina/plugins/remmina-plugin-rdp.so #8 0x025a71f55cc8 in remmina_rdp_main_thread () from /usr/local/lib/remmina/plugins/remmina-plugin-rdp.so #9 0x025a49190d35 in _rthread_start (v=) at /usr/src/lib/librthread/rthread.c:96 #10 0x02597a65fc6a in __tfork_thread () at /usr/src/lib/libc/arch/amd64/sys/tfork_thread.S:87
Re: net/miniupnp updates (libnatpmp, miniupnpc, miniupnpd, minissdpd)
On 2024/02/21 16:42, Stuart Henderson wrote:
> I don't use these, but noticed they were really old. Anyone using them
> want to give them a spin?
Now that I've built all ports depending on these, I see libnatpmp has a
problem upstream where a required header isn't installed. Here's a fixed
patchset (also simpler, using the cmake build infrastructure, which
lets us remove some patches).
Index: Makefile.inc
===
RCS file: /cvs/ports/net/miniupnp/Makefile.inc,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile.inc
--- Makefile.inc27 Sep 2023 14:18:19 - 1.11
+++ Makefile.inc22 Feb 2024 11:41:39 -
@@ -5,7 +5,7 @@ HOMEPAGE= https://miniupnp.tuxfamily.org
# BSD
PERMIT_PACKAGE=Yes
-.if !defined(GH_ACCOUNT)
+.if !defined(GH_ACCOUNT) && !defined(DIST_TUPLE)
SITES?=https://miniupnp.tuxfamily.org/files/
.endif
NO_TEST= Yes
Index: libnatpmp/Makefile
===
RCS file: /cvs/ports/net/miniupnp/libnatpmp/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- libnatpmp/Makefile 11 Mar 2022 19:46:22 - 1.13
+++ libnatpmp/Makefile 22 Feb 2024 11:41:39 -
@@ -1,28 +1,19 @@
COMMENT = NAT Port Mapping Protocol client library
-DISTNAME = libnatpmp-20150609
-REVISION = 2
+DIST_TUPLE = github miniupnp libnatpmp
f2433bec24ca3d3f22a8a7840728a3ac177f94ba .
+DISTNAME = libnatpmp-20240116
+WRKDIST = ${WRKDIR}/libnatpmp-${DIST_TUPLE:M[0-9a-f]*}
SHARED_LIBS = natpmp 0.1
WANTLIB = c
-MAKE_FLAGS = CC="${CC}"
+CONFIGURE_ARGS = -DBUILD_SHARED_LIBS=TRUE
-MAKE_ENV = SHAREDLIB=libnatpmp.so.${LIBnatpmp_VERSION} \
- SONAME=libnatpmp.so.${LIBnatpmp_VERSION}
-
-FAKE_FLAGS = INSTALL_DATA_DIR="${INSTALL_DATA_DIR}" \
- INSTALL_DATA="${INSTALL_DATA}" \
- INSTALL_PROGRAM_DIR="${INSTALL_PROGRAM_DIR}" \
- INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
- INSTALLPREFIX=${WRKINST}${PREFIX}
-
-USE_GMAKE =Yes
+MODULES = devel/cmake
post-install:
- ${INSTALL_MAN_DIR} ${PREFIX}/man/man1
- ${INSTALL_MAN} ${WRKSRC}/natpmpc.1 \
- ${PREFIX}/man/man1/natpmpc.1
+ #${INSTALL_MAN_DIR} ${PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/natpmpc.1 ${PREFIX}/man/man1/natpmpc.1
.include
Index: libnatpmp/distinfo
===
RCS file: /cvs/ports/net/miniupnp/libnatpmp/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- libnatpmp/distinfo 17 Aug 2017 11:28:00 - 1.6
+++ libnatpmp/distinfo 22 Feb 2024 11:41:39 -
@@ -1,2 +1,2 @@
-SHA256 (libnatpmp-20150609.tar.gz) =
4aqcTEIZvAaUPWshMPZk2u4hP7Ji/LlN01WBW49FNrA=
-SIZE (libnatpmp-20150609.tar.gz) = 24392
+SHA256 (miniupnp-libnatpmp-f2433bec24ca3d3f22a8a7840728a3ac177f94ba.tar.gz) =
74SXmVDfs1VnBbY8nNbJVQG3Xoh/ukZiNLGH88kClmk=
+SIZE (miniupnp-libnatpmp-f2433bec24ca3d3f22a8a7840728a3ac177f94ba.tar.gz) =
28356
Index: libnatpmp/patches/patch-CMakeLists_txt
===
RCS file: libnatpmp/patches/patch-CMakeLists_txt
diff -N libnatpmp/patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ libnatpmp/patches/patch-CMakeLists_txt 22 Feb 2024 11:41:39 -
@@ -0,0 +1,14 @@
+https://github.com/miniupnp/libnatpmp/pull/39/commits/e654ac0638fd014d6279bafe646f049a95198661
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -61,7 +61,7 @@ install(TARGETS natpmp natpmpc
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+
+-install(FILES natpmp.h
++install(FILES natpmp.h natpmp_declspec.h
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/natpmp.pc
Index: libnatpmp/patches/patch-Makefile
===
RCS file: libnatpmp/patches/patch-Makefile
diff -N libnatpmp/patches/patch-Makefile
--- libnatpmp/patches/patch-Makefile11 Mar 2022 19:46:22 - 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,48 +0,0 @@
-Index: Makefile
Makefile.orig
-+++ Makefile
-@@ -5,8 +5,8 @@
- # http://miniupnp.free.fr/libnatpmp.html
-
- OS = $(shell uname -s)
--CC = gcc
--INSTALL = install -p
-+CC ?= cc
-+INSTALL ?= install -p
- ARCH = $(shell uname -m | sed -e s/i.86/i686/)
- VERSION = $(shell cat VERSION)
-
-@@ -49,9 +49,9 @@ ifneq (,$(findstring WIN,$(OS)))
- CC = i686-w64-mingw32-gcc
- EXTRA_LD = -lws2_32 -lIphlpapi -Wl,--no-undefined
-Wl,--enable-runtime-pseudo-reloc --Wl,kill-at
- else
-- SHAREDLIB = libnatpmp.so
-+ SHAREDLIB ?= libnatpmp.so
- JNISHAREDLIB = libjninatpmp.so
-- SONAME = $(SHAREDLIB).$(APIVERSION)
-+ SONAME ?= $(SHAREDLIB).$(APIVERSION)
- SONAMEFLAGS=-Wl,-soname,$(JNISHAREDLIB)
- endif
- endif
-@@
Re: UPDATE: portaudio
On Thu, Feb 22, 2024 at 12:37:10AM -0500, Brad Smith wrote: > Sync with the sndio backend I was finally able to have commited upstream. Works for me, OK kn
Re: [Maintainer Update] lang/lfe 2.1.4
Volker Schlecht wrote: > Update to latest release 2.1.4, minor update. > Built and tested on amd64 - nothing depends on it. > > ok? looks fine to me, and all tests are passing. ok op@ Thanks, Omar Polo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2024/02/22 04:28:56 Modified files: sysutils/crust : Makefile Log message: sysutils/crust: requires bison
Re: Remove www/youtube-dl and old ports related
On 2/22/24 09:31, Ricardo Mestre wrote: Hi, I don't even remember the last time I used youtube-dl, but I know it didn't work and random people already complained that back to me as well. In fact, youtube-dl still works, but you need to take the latest commits in github repo for it to work. No tagged releases work anymore. So, indeed, the port might not be relevant since it was always be a little bit behind. smime.p7s Description: S/MIME Cryptographic Signature
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2024/02/22 03:03:20 Modified files: www/squid : Makefile Log message: fix packaging for squid-ldap, it needed adjustments to cope with the rerolled tarball. reported by tb@.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: cas...@cvs.openbsd.org 2024/02/22 02:51:45 Modified files: meta/tor-browser: Tag: OPENBSD_7_4 Makefile www/tor-browser: Tag: OPENBSD_7_4 Makefile.inc www/tor-browser/browser: Tag: OPENBSD_7_4 Makefile distinfo Log message: Tor Browser: update to 13.0.10
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: cas...@cvs.openbsd.org 2024/02/22 02:50:07 Modified files: meta/tor-browser: Makefile www/tor-browser: Makefile.inc www/tor-browser/browser: Makefile distinfo Log message: Tor Browser: update to 13.0.10
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2024/02/22 02:49:35 Modified files: security/suricata: Makefile distinfo security/suricata/patches: patch-configure_ac patch-suricata_yaml_in Log message: Update for Suricata to 7.0.3. OK rsadowski@
Re: Remove www/youtube-dl and old ports related
Hi,
I don't even remember the last time I used youtube-dl, but I know it didn't work
and random people already complained that back to me as well.
I'm ok with it going away, nothing would be lost here.
On 20:23 Wed 21 Feb , Stuart Henderson wrote:
> On 2024/02/21 15:45, Jose Maldonado wrote:
> >
> > Hi!, ports list!
> >
> > Reviewing some things with yt-dlp I have seen that in our port tree we
> > still have a mention of youtube-dl, more specifically the version
> > www/youtube-dl-2021.12.17p1 (its latest version).
> >
> > It seemed strange to me, so I decided to install and test it thinking
> > that it was patched in some way to keep it working. It is not the case.
> > The port does not work, and as we know the development of youtube-dl is
> > abandoned, in favor of yt-dlp.
> >
> > The same thing happens with other ports related to youtube-dl
> >
> > 1) audio/yt-audio: abandoned since 2020, depends on youtube-dl and
> > therefore does not work.
>
> I think this is enough, the flags seem compatible:
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/yt-audio/Makefile,v
> diff -u -p -r1.10 Makefile
> --- Makefile 13 Nov 2022 15:27:39 - 1.10
> +++ Makefile 21 Feb 2024 20:18:31 -
> @@ -3,7 +3,7 @@ COMMENT = youtube-dl wrapper to manage
> MODPY_EGG_VERSION = 0.1
> DISTNAME = yt-audio-${MODPY_EGG_VERSION}
> CATEGORIES = audio
> -REVISION = 4
> +REVISION = 5
>
> MAINTAINER = Paul Irofti
>
> @@ -12,7 +12,7 @@ PERMIT_PACKAGE =Yes
>
> MODULES =lang/python
>
> -RUN_DEPENDS =www/youtube-dl \
> +RUN_DEPENDS =www/yt-dlp \
> graphics/ffmpeg
>
> MODPY_PI = Yes
> Index: patches/patch-yt_audio_common_py
> ===
> RCS file: patches/patch-yt_audio_common_py
> diff -N patches/patch-yt_audio_common_py
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-yt_audio_common_py 21 Feb 2024 20:18:31 -
> @@ -0,0 +1,33 @@
> +Index: yt_audio/common.py
> +--- yt_audio/common.py.orig
> yt_audio/common.py
> +@@ -11,9 +11,9 @@ class Common:
> + """
> +
> + DEFAULT_ARGUMENT_VALUES = {
> +-'download_command': 'youtube-dl -x -q --print-json --audio-format
> mp3 --audio-quality 0 '
> ++'download_command': 'yt-dlp -x -q --print-json --audio-format mp3
> --audio-quality 0 '
> + '--add-metadata --embed-thumbnail -o "$OUTPUT$"
> $URL$',
> +-'playlist_info_command': 'youtube-dl --flat-playlist -J
> $PLAYLIST_URL$',
> ++'playlist_info_command': 'yt-dlp --flat-playlist -J $PLAYLIST_URL$',
> + 'output_format': '%%(title)s.%%(ext)s',
> + 'ffprobe_command': 'ffprobe -v quiet -print_format json
> -show_format -hide_banner "$PATH$"',
> + 'output_directory': str(PurePath(Path.home(), "Music"))
> +@@ -88,7 +88,7 @@ class Common:
> +
> + Parameters:
> + ==
> +-> download_command (string): youtube-dl download command
> ++> download_command (string): yt-dlp download command
> +
> + > title_count (int): no. of titles to download
> + """
> +@@ -203,7 +203,7 @@ class Common:
> + def check_dependencies(self):
> + _dependencies = ["ffmpeg -version|avconv -version",
> + "ffprobe -version|avprobe -version",
> +- "youtube-dl --version",
> ++ "yt-dlp --version",
> + ]
> + for _dep in _dependencies:
> + try:
>
>
>
> > 2) multimedia/py-pafy: abandoned since 2019, same situation as the
> > previous port.
>
> A bit more complex as it uses the Python API. Needs s/youtube_dl/yt_dlp/
> but also accounting for other API changes (at least dislikes are no longer
> supported).
>
