Re: desmume, any special reqs to run it?
Mikolaj Kucharski writes: > I just wanted to see how Nintendo 3DS emulators work on OpenBSD. Never > played with them before. > > $ desmume some-game-decrypted.3ds > mprotect failed: Operation not permitted > Abort trap (core dumped) > > I tried with few 3DS files and one CIA file, always the same output > like above. Any tips? desmume is a DS emulator, not a 3DS emulator. It doesn't support 3DS files or CIA files. (citra is a 3DS emulator and should be able to handle those files.) That said, desmume shouldn't crash like that. I'll look into it.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2022/12/04 17:13:41 Modified files: net: Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: net/uucpd : Makefile distinfo net/uucpd/patches: patch-pathnames_h patch-uucpd_8 patch-uucpd_c net/uucpd/pkg : DESCR PLIST Log message: Remove net/uucpd, broken runtime and uses password auth over plain TCP Uses getpwnam(3) and crypt(3) to check the user passwords, but our getpwnam(3) doesn't return password hashes since 2016. Problem spotted by William Orr while toying with this port. William provided a fix but it's more reasonable to drop this ancient piece of software. ok tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2022/12/04 16:35:22 Modified files: security/rust-openssl-tests: Makefile distinfo Log message: Update to rust-openssl-tests 20221204
Re: desmume, any special reqs to run it?
I don't usually respond on here, but I felt it important to mention, there is a better DS emulator in the works, that uses a crapton less dependencies than desmume and melonDS. It currently is specified as rolling release and might not be to your standards yet, but I will show you the link, in case any of you are interested... It really only requires a few things, including portaudio, which does in fact work with sndio. I have tried it before with it, thanks to one of your very kind devs forking portaudio to work with it on a github repo. Anywho these are the dependencies: |install libwxgtk3.0-dev portaudio19-dev| |This is the link: | |https://github.com/Hydr8gon/NooDS| |Its prenounced more like New-DS, I think? A lack of thought might have been there... | |Btw, as of now, it works mostly good, but it might still be in a beta state more or less. | |It doesn't require any nds firmware added btw. I do run into a few issues, but they aren't common. | |As for 3DS emulators, not sure if any are stable enough where they don't need extra firmware. My two cents... | On 12/04/2022 05:40 PM, Mikolaj Kucharski wrote: Hi, I just wanted to see how Nintendo 3DS emulators work on OpenBSD. Never played with them before. $ desmume some-game-decrypted.3ds mprotect failed: Operation not permitted Abort trap (core dumped) I tried with few 3DS files and one CIA file, always the same output like above. Any tips? OpenBSD 7.2-current (GENERIC.MP) #859: Sat Nov 26 11:10:04 MST 2022 dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP # pkg_info -qI desmume desmume-0.9.11p10
desmume, any special reqs to run it?
Hi, I just wanted to see how Nintendo 3DS emulators work on OpenBSD. Never played with them before. $ desmume some-game-decrypted.3ds mprotect failed: Operation not permitted Abort trap (core dumped) I tried with few 3DS files and one CIA file, always the same output like above. Any tips? OpenBSD 7.2-current (GENERIC.MP) #859: Sat Nov 26 11:10:04 MST 2022 dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP # pkg_info -qI desmume desmume-0.9.11p10 -- Regards, Mikolaj
Re: [PATCH] Fix crash in uucpd on authentication
4 dic. 2022 16:10:48 Jeremie Courreges-Anglas : > On Sun, Dec 04 2022, Theo Buehler wrote: >> On Sun, Dec 04, 2022 at 01:19:45PM +0100, William Orr wrote: >>> Hey, >>> >>> getpwnam hasn't filled in passwd->pw_passwd since 5.9. This fixes a >>> crash in uucpd that relied on the legacy behavior. > > Back in 2014 I created a port foruucpd and rmail because both were > removed from the base system with no prior warning. Reconsidering this > now, I would probably not create a port for uucpd. I can't think of a > useful hack for uucpd to support TLS, and tunneling UUCP over SSH > (what I did back then) doesn't involve running uucpd. > > What use case do you have for this port? I was deploying uucp out of curiosity, and eventually settled on using uucpd via inetd. In my case, I'm doing it over an IPsec tunnel. I have no real-world use case for uucpd in particular (and iiuc I can just use uucico directly via inetd anyway), so don't count my use case as a need for keeping it in ports. > >>> Please cc me; not subscribed to this list. >> >> Thanks. While the diff is clearly correct, doesn't that mean that no one >> has used this port in >= 5 years? Is it worth keeping? > > IIUC using bare getpwnam(3) could not work after this commit: > > revision 1.61 > date: 2016/05/07 21:52:29; author: tedu; state: Exp; lines: +3 -5; > commitid: ubbtqq8abR4rInYW; > stop opening the shadow database by default. only programs that request it > via the _shadow functions will open now, preventing some programs running > as root from accidentally loading password hashes it into their memory. > ok deraadt > > IMO this calls for a removal. > > -- > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: UPDATE: faad 2.10.1
On 12/4/2022 3:00 PM, Stuart Henderson wrote: On 2022/12/03 23:42, Brad Smith wrote: Here is an update to faad 2.10.1. The previous update diffs for faad floating around had a lib dep on multimedia/libmp4v2, is that not needed? Ya, I noticed that. I don't see what the purpose of enabling it is. I looked around at 8 other OS's, FreeBSD, NetBSD and some Linux OS's and none of them have it enabled. FreeBSD used to many moons ago and has since removed enabling it. I have some recollection of the update breaking some other port, but I forget the details. and maybe that's been fixed elsewhere by now.. I copied a workaround from the FreeBSD port as part of the post-install target, but decided to go in the other direction. Only the one header is necessary for the libquicktime test.
Re: UPDATE: faad 2.10.1
On Sat, Dec 03, 2022 at 11:42:48PM -0500, Brad Smith wrote:
> Here is an update to faad 2.10.1.
Removed the workaround from faad for libquicktime and decided
to add a workaround there instead. It's just the one header
that is necessary.
Index: audio/faad/Makefile
===
RCS file: /home/cvs/ports/audio/faad/Makefile,v
retrieving revision 1.62
diff -u -p -u -p -r1.62 Makefile
--- audio/faad/Makefile 11 Mar 2022 18:20:09 - 1.62
+++ audio/faad/Makefile 4 Dec 2022 21:26:12 -
@@ -3,18 +3,15 @@ NOT_FOR_ARCHS=${GCC3_ARCHS}
COMMENT= MPEG-2 and MPEG-4 AAC decoder
-V= 2.7
-DISTNAME= faad2-${V}
+V= 2.10.1
+GH_ACCOUNT=knik0
+GH_PROJECT=faad2
+GH_TAGNAME=${V}
PKGNAME= faad-${V}
-REVISION= 2
CATEGORIES=audio
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=faac/}
-EXTRACT_SUFX= .tar.bz2
-SHARED_LIBS= faad3.0 \
- mp4ff 2.0
-
-HOMEPAGE= http://www.audiocoding.com/
+SHARED_LIBS= faad4.0 \
+ faad_drm0.0
# GPLv2+
PERMIT_PACKAGE=Yes
@@ -26,17 +23,9 @@ BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPEND
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool
-USE_GMAKE= Yes
-CONFIGURE_STYLE= gnu
-AUTOCONF_VERSION= 2.61
-AUTOMAKE_VERSION= 1.9
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-
-post-extract:
- @mv ${WRKSRC}/frontend/faad.man ${WRKSRC}/frontend/faad.1
-
-post-patch:
- @cd ${WRKSRC} && ${AUTOCONF_ENV} sh bootstrap
+AUTOCONF_VERSION= 2.71
+AUTOMAKE_VERSION= 1.16
+AUTORECONF=./bootstrap
+CONFIGURE_STYLE= autoreconf
.include
Index: audio/faad/distinfo
===
RCS file: /home/cvs/ports/audio/faad/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- audio/faad/distinfo 18 Jan 2015 03:12:40 - 1.7
+++ audio/faad/distinfo 4 Dec 2022 03:46:08 -
@@ -1,2 +1,2 @@
-SHA256 (faad2-2.7.tar.bz2) = FFYbXWvEV+glv9OSGuUKZkjzd6k5bq8W1LBXs5o/Y7U=
-SIZE (faad2-2.7.tar.bz2) = 901043
+SHA256 (faad2-2.10.1.tar.gz) = TBbHEpXKDL98Pf6Y6xHY+o0KwwQuQWBM/WzBGkCM8mQ=
+SIZE (faad2-2.10.1.tar.gz) = 803488
Index: audio/faad/patches/patch-common_mp4ff_Makefile_am
===
RCS file: audio/faad/patches/patch-common_mp4ff_Makefile_am
diff -N audio/faad/patches/patch-common_mp4ff_Makefile_am
--- audio/faad/patches/patch-common_mp4ff_Makefile_am 11 Mar 2022 18:20:09
- 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
common/mp4ff/Makefile.am.orig Fri Feb 6 09:24:21 2009
-+++ common/mp4ff/Makefile.am Thu May 10 19:02:20 2012
-@@ -1,7 +1,7 @@
--lib_LIBRARIES = libmp4ff.a
-+lib_LTLIBRARIES = libmp4ff.la
- include_HEADERS = mp4ff.h mp4ffint.h
-
--libmp4ff_a_CFLAGS = -DUSE_TAGGING=1
-+libmp4ff_la_CFLAGS = -DUSE_TAGGING=1
-
--libmp4ff_a_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-+libmp4ff_la_SOURCES = mp4ff.c mp4atom.c mp4meta.c mp4sample.c mp4util.c \
-mp4tagupdate.c mp4ff.h mp4ffint.h mp4ff_int_types.h
Index: audio/faad/patches/patch-common_mp4ff_mp4ff_h
===
RCS file: audio/faad/patches/patch-common_mp4ff_mp4ff_h
diff -N audio/faad/patches/patch-common_mp4ff_mp4ff_h
--- audio/faad/patches/patch-common_mp4ff_mp4ff_h 11 Mar 2022 18:20:09
- 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
common/mp4ff/mp4ff.h.orig Mon May 14 17:05:03 2012
-+++ common/mp4ff/mp4ff.h Mon May 14 17:05:27 2012
-@@ -35,11 +35,7 @@
- extern "C" {
- #endif /* __cplusplus */
-
--#ifdef HAVE_STDINT_H
- #include
--#else
--#include "mp4ff_int_types.h"
--#endif
-
- /* file callback structure */
- typedef struct
Index: audio/faad/patches/patch-common_mp4ff_mp4ffint_h
===
RCS file: audio/faad/patches/patch-common_mp4ff_mp4ffint_h
diff -N audio/faad/patches/patch-common_mp4ff_mp4ffint_h
--- audio/faad/patches/patch-common_mp4ff_mp4ffint_h11 Mar 2022 18:20:09
- 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
common/mp4ff/mp4ffint.h.orig Mon May 14 17:06:54 2012
-+++ common/mp4ff/mp4ffint.hMon May 14 17:07:25 2012
-@@ -35,7 +35,7 @@
- extern "C" {
- #endif /* __cplusplus */
-
--#include "mp4ff_int_types.h"
-+#include
- #include
-
- #define MAX_TRACKS 1024
Index: audio/faad/patches/patch-frontend_Makefile_am
===
RCS file: audio/faad/patches/patch-frontend_Makefile_am
diff -N audio/faad/patches/patch-frontend_Makefile_am
--- audio/faad/patches/patch-frontend_Makefile_am 11 Mar 2022 18:20:09
- 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,18 +0,0 @@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: cas...@cvs.openbsd.org 2022/12/04 13:43:11 Modified files: meta/tor-browser: Makefile www/tor-browser: Makefile.inc www/tor-browser/browser: Makefile distinfo www/tor-browser/browser/patches: patch-browser_app_profile_000-tor-browser_js www/tor-browser/noscript: Makefile distinfo Log message: Tor Browser: update to 12.0a5 Also remove TL_VERSION, pointed out by richard on #tor-dev. OK sdk@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/04 13:12:56 Modified files: multimedia/svt-av1: Makefile distinfo Added files: multimedia/svt-av1/patches: patch-CMakeLists_txt Log message: update to svt-av1-1.4.0, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/04 13:12:36 Modified files: graphics/ffmpeg: Makefile distinfo graphics/ffmpeg/patches: patch-configure x11/mplayer: Makefile Log message: update to ffmpeg-4.4.3, from Brad
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2022/12/04 13:07:34 Modified files: security/rust-openssl-tests: distinfo Log message: Fix distinfo pointed out by naddy
Re: UPDATE: faad 2.10.1
On 2022/12/03 23:42, Brad Smith wrote: > Here is an update to faad 2.10.1. The previous update diffs for faad floating around had a lib dep on multimedia/libmp4v2, is that not needed? I have some recollection of the update breaking some other port, but I forget the details. and maybe that's been fixed elsewhere by now..
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/04 12:52:53 Modified files: multimedia/libbluray: Makefile distinfo Log message: update to libbluray-1.3.4, from Brad
Re: [update] net/jitsi to 2.0.8044
On 2022/12/03 16:22, aisha wrote:
> attached a trivial update for net/jitsi ports to 2.0.8044.
>
> The patch itself is simple enough, the changes in jitsi are at
> https://github.com/jitsi/jitsi-meet/releases/download/stable%2Fjitsi-meet_8044/jitsi-meet_1.0.6776_CHANGELOG.txt
>
> ok?
Not using these, but mostly looks good to me. One nit inline below,
otherwise OK sthen@
> diff --git a/net/jitsi/videobridge/Makefile b/net/jitsi/videobridge/Makefile
> index 84bb5a74359..f3b0fc54400 100644
> --- a/net/jitsi/videobridge/Makefile
> +++ b/net/jitsi/videobridge/Makefile
> @@ -2,13 +2,13 @@ COMMENT = WebRTC compatible video router for jitsi
>
> CATEGORIES = net
>
> -VERSION =2.0.7882
> +VERSION =2.0.8044
> DISTNAME = jitsi-videobridge-${VERSION}
> REVISION = 0
Please remove REVISION here.
Re: libffi update
On Sun, Dec 04 2022, Antoine Jacoutot wrote:
> Hi.
>
> This updates devel/libffi to the latest release.
check_sym says:
/usr/local/lib/libffi.so.2.0 -->
/usr/ports/pobj/libffi-3.4.4/fake-amd64/usr/local/lib/libffi.so.2.0
Dynamic export changes:
added:
open_temp_exec_file
This function was previously marked as static, it's now used in
src/tramp.c. It looks internal so it may be fine to skip bumping the
minor version just for that reason. Just mentioning it in case you
missed it.
> I got an OK from jasper@ and it survived a bulk on amd64.
> Testers on other arches welcomed.
Not much worse on riscv64 than what we already have: 78 failures vs 75.
The additional failing tests seem new. No objection from me, I'll
investigate why so many failures on that arch later...
> Thanks.
Thanks for caring about this port!
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/libffi/Makefile,v
> retrieving revision 1.46
> diff -u -p -r1.46 Makefile
> --- Makefile 26 May 2022 07:24:38 - 1.46
> +++ Makefile 4 Dec 2022 09:34:33 -
> @@ -1,8 +1,8 @@
> COMMENT= Foreign Function Interface
>
> -V= 3.4.2
> +V= 3.4.4
> DISTNAME=libffi-$V
> -SHARED_LIBS += ffi 2.0 # 9.0
> +SHARED_LIBS += ffi 2.0 # 9.2
> CATEGORIES= devel
>
> MAINTAINER= Jasper Lievisse Adriaanse
> @@ -17,14 +17,18 @@ PERMIT_PACKAGE= Yes
> WANTLIB += c++abi
> .endif
>
> -MASTER_SITES= https://github.com/libffi/libffi/releases/download/v$V/
> +MASTER_SITES=
> https://github.com/libffi/libffi/releases/download/v$V/
>
> -DEBUG_PACKAGES = ${BUILD_PACKAGES}
> +DEBUG_PACKAGES= ${BUILD_PACKAGES}
> +
> +USE_GMAKE= Yes
>
> TEST_DEPENDS=devel/dejagnu
>
> CONFIGURE_STYLE= gnu
>
> -FAKE_FLAGS+= includesdir="${PREFIX}/include"
> +CONFIGURE_ARGS= --disable-multi-os-directory
> +
> +FAKE_FLAGS= includesdir="${PREFIX}/include"
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/libffi/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- distinfo 26 May 2022 07:24:38 - 1.7
> +++ distinfo 4 Dec 2022 09:34:33 -
> @@ -1,2 +1,2 @@
> -SHA256 (libffi-3.4.2.tar.gz) = VA+3IWGaaro73u99lA2Ong5tLBk1lbwkMkG3f/npNiA=
> -SIZE (libffi-3.4.2.tar.gz) = 1351355
> +SHA256 (libffi-3.4.4.tar.gz) = 1mxWrSWags8qnfxAizK/XaUjcVALhHRff7i2RXEt9nY=
> +SIZE (libffi-3.4.4.tar.gz) = 1362394
> Index: patches/patch-configure
> ===
> RCS file: /cvs/ports/devel/libffi/patches/patch-configure,v
> retrieving revision 1.13
> diff -u -p -r1.13 patch-configure
> --- patches/patch-configure 26 May 2022 07:24:38 - 1.13
> +++ patches/patch-configure 4 Dec 2022 09:34:33 -
> @@ -1,18 +1,28 @@
> +- Use our own libtool
> - Link with libc++abi on arm (to access unwind symbols)
>
> Index: configure
> --- configure.orig
> +++ configure
> -@@ -18650,6 +18650,12 @@ $as_echo "#define SYMBOL_UNDERSCORE 1" >>confdefs.h
> +@@ -9940,7 +9940,7 @@ esac
> + LIBTOOL_DEPS=$ltmain
>
> - fi
> + # Always use our own libtool.
> +-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
> ++#LIBTOOL='$(SHELL) $(top_builddir)/libtool'
> +
> +
> +
> +@@ -19725,6 +19725,12 @@ if test "x$sys_symbol_underscore" = xyes; then
> + printf "%s\n" "#define SYMBOL_UNDERSCORE 1" >>confdefs.h
>
> + fi
> ++
> +case "$target" in
> +arm-*-openbsd*)
> + LDFLAGS="-lc++abi $LDFLAGS"
> +;;
> +esac
> -+
> +
> FFI_EXEC_TRAMPOLINE_TABLE=0
> case "$target" in
> - *arm*-apple-* | aarch64-apple-*)
> Index: patches/patch-configure_host
> ===
> RCS file: /cvs/ports/devel/libffi/patches/patch-configure_host,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-configure_host
> --- patches/patch-configure_host 26 May 2022 07:24:38 - 1.3
> +++ patches/patch-configure_host 4 Dec 2022 09:34:33 -
> @@ -1,7 +1,7 @@
> Index: configure.host
> --- configure.host.orig
> +++ configure.host
> -@@ -216,7 +216,7 @@ case "${host}" in
> +@@ -223,7 +223,7 @@ case "${host}" in
> TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
> CFLAGS="$CFLAGS -D__NO_FPRS__"
> ;;
> Index: patches/patch-src_arm_ffi_c
> ===
> RCS file: /cvs/ports/devel/libffi/patches/patch-src_arm_ffi_c,v
> retrieving revision 1.11
> diff -u -p -r1.11 patch-src_arm_ffi_c
> --- patches/patch-src_arm_ffi_c 26 May 2022 07:24:38 - 1.11
> +++ patches/patch-src_arm_ffi_c 4 Dec 2022 09:34:33 -
> @@ -3,8 +3,8 @@ https://svnweb.freebsd.org/ports/head/de
> Index: src/arm/ffi.c
> ---
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/04 11:18:24 Modified files: net/nmap : Makefile net/nmap/patches: patch-configure_ac net/nmap/pkg : PLIST-main Added files: net/nmap/patches: patch-ndiff_ndiff_py patch-ndiff_setup_py Log message: nmap: port ndiff to python 3 (via 2to3 plus a few extra patches) and reenable it
Re: borgbackup/1.1: Fix msgpack runtime on sparc64
On Sun, Dec 04, 2022 at 01:29:48PM +, Klemens Nanni wrote: > I'll commit this with OK bket once someone gave this a try on some big > endian base-clang arch (macppc, powerpc64, riscv64), i.e. big endian, > but not sparc64 ports-gcc, or I came around to testing one of those. I managed to build and test macppc myself, so this is committed now.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/12/04 11:13:57 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm net/nmap : Makefile net/nmap/patches: patch-Makefile_in net/nmap/pkg : PLIST-main Added files: net/nmap/patches: patch-configure_ac Removed files: net/nmap/patches: patch-ndiff_setup_py patch-zenmap_install_scripts_unix_zenmap-root_desktop patch-zenmap_install_scripts_unix_zenmap_desktop patch-zenmap_setup_py net/nmap/pkg : DESCR-zenmap PLIST-zenmap Log message: Remove net/nmap,-zenmap and ndiff(1) from net/nmap zenmap is a python 2 gui supposed to be run as root, ndiff diffs nmap outputs. ndiff from the nmap package requires the nmap-zenmap package to be installed, but doesn't depend on it and won't work unless you actually install/use zenmap... which noone ever complained about. Upstream has some active python 3 pull requests, but nothing concrete and nmap port updates are overdue anyway. Completely remove all python (2) bits from this port. Feedback jca sthen OK jca (on zenmap removal, ndiff removal probably as well) OK sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2022/12/04 11:11:13 Modified files: www/sogo : Makefile www/sogo/pkg : PLIST README Removed files: www/sogo/patches: patch-Scripts_sql-update-2_2_17_to_2_3_0-mysql_sh patch-Scripts_sql-update-2_2_17_to_2_3_0_sh patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh patch-Scripts_sql-update-3_2_10_to_4_0_0_sh Log message: sogo: install additional database schema update scripts, and stop patching some (but not all) of them to use ksh instead of bash. also adjust nginx sample config in pkg-readme. problems reported by landry@. based on a diff from giovanni@, ok giovanni@ sebastia@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/12/04 11:08:41 Modified files: sysutils/borgbackup/1.1: Makefile distinfo Log message: Fix msgpack runtime on sparc64 $ borg init -e none ./repo ; echo $? Unknown integrity data version 0 in integrity.1 0 borg 1.1.x bundles msgpack-python, which messed up __BYTE_ORDER handling, but only on sparc64 using ports GCC 8.4.0; macppc base clang 13 is fine. msgpack-python got fixed, borg's 1.1-maint branch merged it, pull the PR. borgbackup/1.2 and py-msgpack will get the same fix but in a different commit as py-msgpack has more consumers than borg 1.2. Tested on little endian amd64/base-clang and big endian macppc/base-clang, sparc64/ports-gcc. OK bket
Re: net/nmap: drop python2 zenmap and ndiff
On Sun, Dec 04, 2022 at 06:33:56PM +0100, Jeremie Courreges-Anglas wrote:
> On Sun, Dec 04 2022, Klemens Nanni wrote:
> > On Sun, Dec 04, 2022 at 08:41:30AM +, Stuart Henderson wrote:
> >> I agree with dropping zenmap but I would prefer to keep the MULTI_PACKAGES
> >> setup (with just -main), it will be easier to get things right if readding
> >> zenmap in the future (the @pkgpath are incorrect in this diff), and easier
> >> to see from cvs history what was changed.
> >
> > Alright, here's a simpler diff removing -zenmap, ndiff and thus python 2
> > remain in the -main port (can be a separate commit).
>
> Before your diff, the ndiff script was shipped by the nmap package but
> the guts of its functionality (the python module) was shipped by the
> nmap-zenmap package.
> --8<--
> russell /usr/ports/net/nmap$ ndiff
> Could not import the ndiff module: 'No module named ndiff'.
> I checked in these directories:
> /usr/local/bin
> /usr/local/lib/python27.zip
> /usr/local/lib/python2.7
> /usr/local/lib/python2.7/plat-openbsd7
> /usr/local/lib/python2.7/lib-tk
> /usr/local/lib/python2.7/lib-old
> /usr/local/lib/python2.7/lib-dynload
> /usr/local/lib/python2.7/site-packages
> /usr/local/lib/python2.7/site-packages
> If you installed Ndiff in another directory, you may have to add the
> modules directory to the PYTHONPATH environment variable.
> -->8--
> So please run make plist so that ndiff.py goes to PLIST-main.
Hm... But that also means that you can't use ndiff from the nmap
package without installing the implicit nmap-zenmap dependency.
Install nmap without nmap-zenmap from binary packages and run ndiff,
it'll break just like your attempt (which is using my diff, I assume?).
So either every nmap/ndiff user also installs nmap-zenmap themselves or
no nmap knows ndiff is broken because they don't use ndiff/have zenmap
installed.
>
> IMO ndiff makes sense as a standalone tool, outside of zenmap (it's
> slightly better than the output of diff -u on two nmap text outputs).
> But I'm not sure we want to force the dep on python2 in the nmap package
> package (your diff is fine in that regard). Since ndiff doesn't need
> patches or python modules besides the python2 stdlib I have no strong
> opinion regarding its presence or removal in the nmap package.
>
> I hope upstream will finish the move of ndiff and zenmap to python3 so
> that we don't need to ask ourselves this kind of question...
Given the broken split scenario, I'd rather whack zenmap and ndiff
completely in one go, rather than moving around the ndiff parts.
Then upstream can figure out their stuff, port it to python 3 and we'll
reconsider adding it when it has become more usable and maintainable.
>
> > Now with a quirk for removal.
> > 31 => "python port without 3.x support, no other ports use it",
>
> Thanks for this, it makes more sense to me than just zapping magically
> zenmap.
>
> > OK?
>
> ok jca@ with the ndiff.py issue sorted out.
Full ndiff+zenmap+python2 removal diff with quirks, while leaving the
multi package -main bits behind to keep it simple. regen'ed PLIST.
Feedback? Objection? OK?
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1465
diff -u -p -r1.1465 Makefile
--- devel/quirks/Makefile 4 Dec 2022 12:21:48 - 1.1465
+++ devel/quirks/Makefile 4 Dec 2022 12:28:19 -
@@ -3,7 +3,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-6.81
+PKGNAME = quirks-6.82
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1476
diff -u -p -r1.1476 Quirks.pm
--- devel/quirks/files/Quirks.pm4 Dec 2022 12:21:48 - 1.1476
+++ devel/quirks/files/Quirks.pm4 Dec 2022 12:29:41 -
@@ -1764,6 +1764,7 @@ setup_obsolete_reason(
1 => 'stm32loader',
3 => 'tmda',
3 => 'spambayes',
+ 31 => 'nmap-zenmap',
);
# though it's not yet used, these should be pkgnames, so that eventually
Index: net/nmap/Makefile
===
RCS file: /cvs/ports/net/nmap/Makefile,v
retrieving revision 1.144
diff -u -p -r1.144 Makefile
--- net/nmap/Makefile 11 Mar 2022 19:46:31 - 1.144
+++ net/nmap/Makefile 4 Dec 2022 17:50:19 -
@@ -1,11 +1,8 @@
COMMENT-main= scan ports and fingerprint stack of network hosts
-COMMENT-zenmap=graphical frontend for nmap
-MODPY_EGG_VERSION= 7.91
-DISTNAME= nmap-${MODPY_EGG_VERSION}
+DISTNAME= nmap-7.91
PKGNAME-main= ${DISTNAME}
-PKGNAME-zenmap=nmap-zenmap-${MODPY_EGG_VERSION}
-REVISION= 2
+REVISION= 3
CATEGORIES=net security
Re: net/nmap: drop python2 zenmap and ndiff
On Sun, Dec 04 2022, Klemens Nanni wrote:
> On Sun, Dec 04, 2022 at 08:41:30AM +, Stuart Henderson wrote:
>> I agree with dropping zenmap but I would prefer to keep the MULTI_PACKAGES
>> setup (with just -main), it will be easier to get things right if readding
>> zenmap in the future (the @pkgpath are incorrect in this diff), and easier
>> to see from cvs history what was changed.
>
> Alright, here's a simpler diff removing -zenmap, ndiff and thus python 2
> remain in the -main port (can be a separate commit).
Before your diff, the ndiff script was shipped by the nmap package but
the guts of its functionality (the python module) was shipped by the
nmap-zenmap package.
--8<--
russell /usr/ports/net/nmap$ ndiff
Could not import the ndiff module: 'No module named ndiff'.
I checked in these directories:
/usr/local/bin
/usr/local/lib/python27.zip
/usr/local/lib/python2.7
/usr/local/lib/python2.7/plat-openbsd7
/usr/local/lib/python2.7/lib-tk
/usr/local/lib/python2.7/lib-old
/usr/local/lib/python2.7/lib-dynload
/usr/local/lib/python2.7/site-packages
/usr/local/lib/python2.7/site-packages
If you installed Ndiff in another directory, you may have to add the
modules directory to the PYTHONPATH environment variable.
-->8--
So please run make plist so that ndiff.py goes to PLIST-main.
IMO ndiff makes sense as a standalone tool, outside of zenmap (it's
slightly better than the output of diff -u on two nmap text outputs).
But I'm not sure we want to force the dep on python2 in the nmap package
package (your diff is fine in that regard). Since ndiff doesn't need
patches or python modules besides the python2 stdlib I have no strong
opinion regarding its presence or removal in the nmap package.
I hope upstream will finish the move of ndiff and zenmap to python3 so
that we don't need to ask ourselves this kind of question...
> Now with a quirk for removal.
> 31 => "python port without 3.x support, no other ports use it",
Thanks for this, it makes more sense to me than just zapping magically
zenmap.
> OK?
ok jca@ with the ndiff.py issue sorted out.
> Index: devel/quirks/Makefile
> ===
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.1465
> diff -u -p -r1.1465 Makefile
> --- devel/quirks/Makefile 4 Dec 2022 12:21:48 - 1.1465
> +++ devel/quirks/Makefile 4 Dec 2022 12:32:14 -
> @@ -3,7 +3,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME =quirks-6.81
> +PKGNAME =quirks-6.82
> PKG_ARCH = *
> MAINTAINER = Marc Espie
>
> Index: devel/quirks/files/Quirks.pm
> ===
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.1476
> diff -u -p -r1.1476 Quirks.pm
> --- devel/quirks/files/Quirks.pm 4 Dec 2022 12:21:48 - 1.1476
> +++ devel/quirks/files/Quirks.pm 4 Dec 2022 12:32:15 -
> @@ -1764,6 +1764,7 @@ setup_obsolete_reason(
> 1 => 'stm32loader',
> 3 => 'tmda',
> 3 => 'spambayes',
> + 31 => 'nmap-zenmap',
> );
>
> # though it's not yet used, these should be pkgnames, so that eventually
> Index: net/nmap/Makefile
> ===
> RCS file: /cvs/ports/net/nmap/Makefile,v
> retrieving revision 1.144
> diff -u -p -r1.144 Makefile
> --- net/nmap/Makefile 11 Mar 2022 19:46:31 - 1.144
> +++ net/nmap/Makefile 4 Dec 2022 12:32:15 -
> @@ -1,10 +1,8 @@
> COMMENT-main=scan ports and fingerprint stack of network hosts
> -COMMENT-zenmap= graphical frontend for nmap
>
> MODPY_EGG_VERSION= 7.91
> DISTNAME=nmap-${MODPY_EGG_VERSION}
> PKGNAME-main=${DISTNAME}
> -PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION}
> REVISION=2
>
> CATEGORIES= net security
> @@ -20,7 +18,7 @@ MAINTAINER= JR Aquino # XXX license needs checking over before updating beyond 7.92
> PERMIT_PACKAGE= Yes
>
> -MULTI_PACKAGES= -main -zenmap
> +MULTI_PACKAGES= -main
>
> COMPILER=base-clang ports-gcc base-gcc
>
> @@ -49,6 +47,7 @@ CONFIGURE_ARGS= --with-libpcap=included
> --with-libpcre=${LOCALBASE} \
> --with-mandir=${LOCALBASE}/man \
> --without-nmap-update \
> + --without-zenmap \
> --disable-nls
>
> WANTLIB-main=${COMPILER_LIBCXX} ${MODLUA_WANTLIB} \
> @@ -57,21 +56,12 @@ LIB_DEPENDS-main= ${MODLUA_LIB_DEPENDS}
> devel/pcre \
> security/libssh2
>
> -RUN_DEPENDS-zenmap= ${MODPY_RUN_DEPENDS} \
> - x11/py-gtk2 \
> - databases/py-sqlite2 \
> - devel/desktop-file-utils \
> - net/nmap
> -
> BUILD_DEPENDS= devel/bison
>
> post-extract:
> @cd ${WRKSRC} && rm -rf
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/12/04 10:23:22 Modified files: devel/abseil-cpp: Makefile distinfo devel/abseil-cpp/patches: patch-absl_base_internal_unscaledcycleclock_h patch-absl_debugging_CMakeLists_txt devel/abseil-cpp/pkg: PLIST Added files: devel/abseil-cpp/patches: patch-absl_types_CMakeLists_txt Removed files: devel/abseil-cpp/patches: patch-absl_base_config_h patch-absl_base_internal_raw_logging_cc patch-absl_debugging_internal_elf_mem_image_h Log message: Update to devel/abseil-cpp 20220623.1 LTS https://github.com/abseil/abseil-cpp/releases/tag/20220623.1 tg_owt and tdesktop build and work with this libphonenumber tested by sthen OK sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2022/12/04 09:29:44 Modified files: games/burgerspace: Makefile distinfo games/burgerspace/pkg: PLIST Removed files: games/burgerspace/patches: patch-Makefile_in Log message: games/burgerspace: update to 1.9.5 When an enemy gets carried down on a slice and has landed, it is now shown as frozen until it revives, instead of disappearing until it revives. To restore the old disappearing behavior, pass new option --hide-landed-enemies.
UPDATE: emulators/citra
Hi Thomas, Hi ports@,
Update citra-nightly to 1816. This update results form the devel/catch2
update and depends on it. There a some exciting port changes:
- Switch to the github repository.
- 1816 depends on C++20 so I add COMPILER and point to clang only.
- CXXFLAGS deleted as it no longer needed
- Use fmt, boost, sdl and robin-map from system
- Remove {catch2,fmt,boost} before configure to ensure it is not picked
up
- This update needs devel/catch2>=3.2.0 (see ports@)
I am not a user of citra so please test and send feedback.
Rafael
Index: Makefile
===
RCS file: /cvs/ports/emulators/citra/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- Makefile19 Jul 2022 20:01:00 - 1.16
+++ Makefile4 Dec 2022 16:10:06 -
@@ -7,46 +7,58 @@ USE_WXNEEDED =Yes
COMMENT = nintendo 3DS emulator
-V =729
-DISTNAME = citra-nightly-${V}
+V =1816
+DISTNAME = citra-unified-source-20221124-d117132
PKGNAME = citra-0.0.0.${V}
-REVISION = 5
CATEGORIES = emulators
MAINTAINER = Thomas Frohwein
-# GPLv2, BSD-2-clause (fmt), LGPL (getopt), MIT (httplib, json, lurlparser),
+# GPLv2, LGPL (getopt), MIT (httplib, json, lurlparser),
# "New BSD license" (inih), unlicense/public domain (microprofile),
# BSD-3-clause (nihstro), LGPLv2.1 (soundtouch), BSD-style (xbyak)
PERMIT_PACKAGE = Yes
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Multimedia Qt5Network Qt5OpenGL
-WANTLIB += Qt5Widgets SDL2 c cryptopp enet iconv m
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5Multimedia Qt5Widgets
+WANTLIB += SDL2 boost_serialization-mt c cryptopp enet fmt m usb-1.0
-MASTER_SITES = https://spacehopper.org/mirrors/
+MASTER_SITES =
https://github.com/citra-emu/citra-nightly/releases/download/nightly-${V}/
EXTRACT_SUFX = .tar.xz
MODULES = devel/cmake \
x11/qt5
-BUILD_DEPENDS =devel/catch2 \
- devel/boost
+
+# C++20
+COMPILER = base-clang ports-clang
+
+BUILD_DEPENDS =devel/catch2>=3.2.0 \
+ devel/robin-map
+
RUN_DEPENDS = devel/desktop-file-utils \
misc/shared-mime-info \
x11/gtk+3,-guic
-LIB_DEPENDS = devel/cryptopp \
+
+LIB_DEPENDS = devel/boost \
+ devel/cryptopp \
+ devel/fmt \
devel/sdl2 \
net/enet \
x11/qt5/qtmultimedia
CONFIGURE_ARGS = -DENABLE_CUBEB=OFF \
- -DENABLE_WEB_SERVICE=OFF
+ -DENABLE_WEB_SERVICE=OFF \
+ -DUSE_SYSTEM_BOOST=ON \
+ -DUSE_SYSTEM_SDL2=ON
+
+CONFIGURE_ARGS += -DDYNARMIC_NO_BUNDLED_ROBIN_MAP=ON
-CXXFLAGS +=-I${LOCALBASE}/include -I${LOCALBASE}/lib/qt5/cmake/Qt5/
MODCMAKE_LDFLAGS = -L${LOCALBASE}/lib
-do-test:
- cd ${WRKBUILD}/src/tests && ./tests
+WRKDIST = ${WRKDIR}/${DISTNAME}
+
+pre-configure:
+ rm -rf ${WRKSRC}/externals/{catch2,fmt,boost}
.include
Index: distinfo
===
RCS file: /cvs/ports/emulators/citra/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo18 Jun 2018 17:44:38 - 1.2
+++ distinfo4 Dec 2022 16:10:06 -
@@ -1,2 +1,2 @@
-SHA256 (citra-nightly-729.tar.xz) =
kJblK81dOGA98vkR9FKGLZvcKjJJ99ylBaq/VADdu94=
-SIZE (citra-nightly-729.tar.xz) = 10912304
+SHA256 (citra-unified-source-20221124-d117132.tar.xz) =
K7gaaGswJbLFAfJ6OGknvEvYfWB3CnNemxgjtNtHFrw=
+SIZE (citra-unified-source-20221124-d117132.tar.xz) = 29926248
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/emulators/citra/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt11 Mar 2022 18:59:33 - 1.2
+++ patches/patch-CMakeLists_txt4 Dec 2022 16:10:06 -
@@ -4,37 +4,44 @@ fix man path
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -29,20 +29,6 @@ endif()
+@@ -83,18 +83,6 @@ endif()
# Sanity check : Check that all submodules are present
# ===
-function(check_submodules_present)
--file(READ "${CMAKE_SOURCE_DIR}/.gitmodules" gitmodules)
+-file(READ "${PROJECT_SOURCE_DIR}/.gitmodules" gitmodules)
-string(REGEX MATCHALL "path *= *[^ \t\r\n]*" gitmodules ${gitmodules})
-foreach(module ${gitmodules})
-string(REGEX REPLACE "path *= *" "" module ${module})
--if (NOT EXISTS "${CMAKE_SOURCE_DIR}/${module}/.git")
+-if (NOT EXISTS "${PROJECT_SOURCE_DIR}/${module}/.git")
-message(SEND_ERROR "Git submodule ${module} not found."
-"Please run: git submodule update --init --recursive")
UPDATE: devel/catch2
Update catch2 to 3.2.0. There are a few ports changes here:
- No need for python anymore (Only if developer cmake option is set)
- Drop NO_BUILD. It needs to build a static lib now
OK?
Rafael
Index: Makefile
===
RCS file: /cvs/ports/devel/catch2/Makefile,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 Makefile
--- Makefile28 Apr 2022 09:47:17 - 1.41
+++ Makefile4 Dec 2022 16:06:56 -
@@ -2,7 +2,7 @@ COMMENT = C++-native, header-only, test
GH_ACCOUNT = catchorg
GH_PROJECT = Catch2
-GH_TAGNAME = v2.13.9
+GH_TAGNAME = v3.2.0
PKGNAME = ${DISTNAME:L}
CATEGORIES = devel
@@ -15,21 +15,7 @@ PERMIT_PACKAGE = Yes
# C++11 / C++14
COMPILER = base-clang ports-clang ports-gcc
-MODULES = devel/cmake \
- lang/python
+MODULES = devel/cmake
-MODPY_RUNDEP = No
-
-# just header files
-PKG_ARCH = *
-
-# compile tests only when testing
-NO_BUILD = Yes
-
-pre-configure:
- ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
-
-pre-test:
- ${MODCMAKE_BUILD_TARGET}
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/catch2/distinfo,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 distinfo
--- distinfo28 Apr 2022 09:47:17 - 1.37
+++ distinfo4 Dec 2022 16:06:56 -
@@ -1,2 +1,2 @@
-SHA256 (Catch2-2.13.9.tar.gz) = BtvHYg47lsK2nVe/M3AovyRaIRs83bhDg1v+JY9CelI=
-SIZE (Catch2-2.13.9.tar.gz) = 661915
+SHA256 (Catch2-3.2.0.tar.gz) = /u4EZH4orDy+/0bLQqvI7i2NX2RtNuP7O6J0uMaaWOo=
+SIZE (Catch2-3.2.0.tar.gz) = 1042498
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/catch2/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 PLIST
--- pkg/PLIST 11 Mar 2022 18:49:47 - 1.12
+++ pkg/PLIST 4 Dec 2022 16:06:56 -
@@ -1,17 +1,185 @@
include/catch2/
-include/catch2/catch.hpp
-include/catch2/catch_reporter_automake.hpp
-include/catch2/catch_reporter_sonarqube.hpp
-include/catch2/catch_reporter_tap.hpp
-include/catch2/catch_reporter_teamcity.hpp
+include/catch2/benchmark/
+include/catch2/benchmark/catch_benchmark.hpp
+include/catch2/benchmark/catch_benchmark_all.hpp
+include/catch2/benchmark/catch_chronometer.hpp
+include/catch2/benchmark/catch_clock.hpp
+include/catch2/benchmark/catch_constructor.hpp
+include/catch2/benchmark/catch_environment.hpp
+include/catch2/benchmark/catch_estimate.hpp
+include/catch2/benchmark/catch_execution_plan.hpp
+include/catch2/benchmark/catch_optimizer.hpp
+include/catch2/benchmark/catch_outlier_classification.hpp
+include/catch2/benchmark/catch_sample_analysis.hpp
+include/catch2/benchmark/detail/
+include/catch2/benchmark/detail/catch_analyse.hpp
+include/catch2/benchmark/detail/catch_benchmark_function.hpp
+include/catch2/benchmark/detail/catch_complete_invoke.hpp
+include/catch2/benchmark/detail/catch_estimate_clock.hpp
+include/catch2/benchmark/detail/catch_measure.hpp
+include/catch2/benchmark/detail/catch_repeat.hpp
+include/catch2/benchmark/detail/catch_run_for_at_least.hpp
+include/catch2/benchmark/detail/catch_stats.hpp
+include/catch2/benchmark/detail/catch_timing.hpp
+include/catch2/catch_all.hpp
+include/catch2/catch_approx.hpp
+include/catch2/catch_assertion_info.hpp
+include/catch2/catch_assertion_result.hpp
+include/catch2/catch_config.hpp
+include/catch2/catch_get_random_seed.hpp
+include/catch2/catch_message.hpp
+include/catch2/catch_section_info.hpp
+include/catch2/catch_session.hpp
+include/catch2/catch_tag_alias.hpp
+include/catch2/catch_tag_alias_autoregistrar.hpp
+include/catch2/catch_template_test_macros.hpp
+include/catch2/catch_test_case_info.hpp
+include/catch2/catch_test_macros.hpp
+include/catch2/catch_test_spec.hpp
+include/catch2/catch_timer.hpp
+include/catch2/catch_tostring.hpp
+include/catch2/catch_totals.hpp
+include/catch2/catch_translate_exception.hpp
+include/catch2/catch_user_config.hpp
+include/catch2/catch_version.hpp
+include/catch2/catch_version_macros.hpp
+include/catch2/generators/
+include/catch2/generators/catch_generator_exception.hpp
+include/catch2/generators/catch_generators.hpp
+include/catch2/generators/catch_generators_adapters.hpp
+include/catch2/generators/catch_generators_all.hpp
+include/catch2/generators/catch_generators_random.hpp
+include/catch2/generators/catch_generators_range.hpp
+include/catch2/interfaces/
+include/catch2/interfaces/catch_interfaces_all.hpp
+include/catch2/interfaces/catch_interfaces_capture.hpp
+include/catch2/interfaces/catch_interfaces_config.hpp
+include/catch2/interfaces/catch_interfaces_enum_values_registry.hpp
+include/catch2/interfaces/catch_interfaces_exception.hpp
+include/catch2/interfaces/catch_interfaces_generatortracker.hpp
+include/catch2/interfaces/catch_interfaces_registry_hub.hpp
Re: [PATCH] Fix crash in uucpd on authentication
On Sun, Dec 04 2022, Theo Buehler wrote: > On Sun, Dec 04, 2022 at 01:19:45PM +0100, William Orr wrote: >> Hey, >> >> getpwnam hasn't filled in passwd->pw_passwd since 5.9. This fixes a >> crash in uucpd that relied on the legacy behavior. Back in 2014 I created a port foruucpd and rmail because both were removed from the base system with no prior warning. Reconsidering this now, I would probably not create a port for uucpd. I can't think of a useful hack for uucpd to support TLS, and tunneling UUCP over SSH (what I did back then) doesn't involve running uucpd. What use case do you have for this port? >> Please cc me; not subscribed to this list. > > Thanks. While the diff is clearly correct, doesn't that mean that no one > has used this port in >= 5 years? Is it worth keeping? IIUC using bare getpwnam(3) could not work after this commit: revision 1.61 date: 2016/05/07 21:52:29; author: tedu; state: Exp; lines: +3 -5; commitid: ubbtqq8abR4rInYW; stop opening the shadow database by default. only programs that request it via the _shadow functions will open now, preventing some programs running as root from accidentally loading password hashes it into their memory. ok deraadt IMO this calls for a removal. -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [update] devel/fnc 0.12 => 0.13
On 2022/12/04 15:28:11 +0100, Stefan Hagen wrote: > Hi, > > this updates devel/fnc to version 0.13. > > [...] > > OK? works fine here, ok op@. (could drop the leading "a" from COMMENT btw) Thanks,
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2022/12/04 07:48:15 Modified files: x11/spectrwm : Makefile distinfo x11/spectrwm/patches: patch-spectrwm_1 patch-spectrwm_c Removed files: x11/spectrwm/patches: patch-baraction_sh Log message: Update spectrwm to HEAD Fixes a couple of issues, and merged some OpenBSD specific PRs. OK sdk@, gonzalo@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: matth...@cvs.openbsd.org2022/12/04 07:38:11 Modified files: x11/xcursorgen : Makefile distinfo x11/xcursorgen/pkg: DESCR Log message: Update x11/xcursorgen to version 1.0.8. tweaks and ok rsadowski@
[update] devel/fnc 0.12 => 0.13
Hi,
this updates devel/fnc to version 0.13.
Changes:
* improve reporting of invalid diff command arguments (reported by Dan Shearer)
* accept libfossil global -V|--verbose option for all commands
* plug memleak when using the p keymap in blame view
* fix fnc blame -r and make it behave like fossil blame -o for familiarity
* improve fnc timeline lookup of repository paths not in the work tree
* make tree navigation more intuitive when opening repository subtrees
* implement [ & ] keymaps to navigate to the previous/next hunk in the diff
* allow fnc stash get to take an optional argument
* document fnc(1) missing W diff view keymap to ignore end-of-line whitespace
* document optional argument of fnc stash pop [stash_id]
* fix typo producing gcc 12.1.0 compiler warning (comparison always true)
* improve scope matching for function prototype in diff hunk headers
* ifdef out A_BOLD attr on OpenBSD to fix diff view line highlight in xterm(1)
* display checkout hash and build date with fnc -v like fossil(1)
* miscellaneous diff API implementation improvements
* protect against out-of-bound reads now line_type array is optionally populated
* add -b|--brief option to fnc diff and b diff view keymap
* general fnc(1) manual page markup, syntax, and documentation improvements
* rename FNC_DIFF_COLOUR_CHUNK to FNC_DIFF_COLOUR_HUNK to match internal naming
* (breaking change: existing FNC_DIFF_COLOUR_CHUNK will be silently ignored)
* ensure diff parser does not internally mark modified files as renamed
* improve const correctness with fsl_uuid_cstr where possible
* fix contrived empty diff case when work tree root is passed to fnc diff
* improve path handling of files on disk vs. files in the repository database
* produce less verbose output on error by not presumptuously dumping help
* zap unnecessary allocation and minor refactor in the path parser
* don't display empty diff in contrived modified checkout edge case
* catch missed fsl_content_get() fsl_unlink_file() & fsl_mprintf() return codes
* miscellaneous style(9) fixes
* fix missed format specifier argument in blame path error message
* ensure fnc stash (get|pop) doesn't report updated files as renames
* use "(checkout)" label in diff header when diffing or stashing the work tree
* internal stash refactor in preparation to move code into libfossil
* catched missed SIGINT and SIGTERM signals
* use CHAR_BIT for bitstring manipulation macros
* fix assumption of invalid command argument as a path to pass to fnc timeline
* merge upstream libfossil with various changes
OK?
Stefan
diff /usr/ports
commit - 11c4773666fdabe0d68f0f66b6475bc761751e82
path + /usr/ports
blob - deae0331206e94fc9e9e053fc998060ba53ff7b9
file + devel/fnc/Makefile
--- devel/fnc/Makefile
+++ devel/fnc/Makefile
@@ -1,6 +1,6 @@
COMMENT = a terminal frontend for fossil
-V =0.12
+V =0.13
DISTNAME = fnc-${V}
CATEGORIES = devel
blob - b10dafc374f8bef3ec0f7ed27719837debdb957b
file + devel/fnc/distinfo
--- devel/fnc/distinfo
+++ devel/fnc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fnc-0.12.tar.gz) = ra+5YaSQTjWkk8HN25ywOdB1TBiiDw+MRyqGRlpEjxU=
-SIZE (fnc-0.12.tar.gz) = 3077617
+SHA256 (fnc-0.13.tar.gz) = JX191L3QuhZvYgJTYD10y3KIadPmhZsckLliJzWdyog=
+SIZE (fnc-0.13.tar.gz) = 3103502
Re: net/py-msgpack, sysutils/borgbackup/1.2: fix sparc64 runtime
On Sun, Dec 04, 2022 at 01:34:00PM +, Klemens Nanni wrote:
> Same fix as the borg 1.1 one except that borg 1.2 uses ports py-msgpack
> which has more consumers than borg 1.2:
>
> $ show-reverse-deps net/py-msgpack
> databases/py-influxdb,python3
> devel/py-buildbot/buildbot
> devel/py-buildslave
> editors/py-neovim
> editors/py-neovim,python3
> net/synapse
> net/synapse,
> sysutils/borgbackup/1.2
> sysutils/salt
> sysutils/salt-testing
> sysutils/vorta
> textproc/calibre
>
> I'm quite certain that all those are fine, but I have only tested borg
> myself.
>
> Good to go or does anyone want to do more tests?
with borg 1.2 rev bump now.
diff --git a/net/py-msgpack/Makefile b/net/py-msgpack/Makefile
index 30dc8b2ad05..d84d0feb2a4 100644
--- a/net/py-msgpack/Makefile
+++ b/net/py-msgpack/Makefile
@@ -1,7 +1,7 @@
COMMENT = messagepack (de)serializer
MODPY_EGG_VERSION =1.0.4
-REVISION = 1
+REVISION = 2
EPOCH =0
DISTNAME = msgpack-${MODPY_EGG_VERSION}
PKGNAME = py-msgpack-${MODPY_EGG_VERSION}
@@ -12,6 +12,17 @@ HOMEPAGE = https://msgpack.org/
MAINTAINER = Bjorn Ketelaars
+# same cherry-pick as in sysutils/borgbackup/1.1, see details in
+# https://github.com/borgbackup/borg/pull/6149#issuecomment-1335632116 ff.
+MASTER_SITES0 =https://github.com/msgpack/msgpack-python/
+# merged "Fallback to compiler defines when __BYTE_ORDER is not available"
+# https://github.com/msgpack/msgpack-python/pull/513
+PATCHFILES = ${PKGSTEM}-fallback-byte-order-{pull/}513.patch:0
+# merged "Fix build error caused by ntohs, ntohl"
+# https://github.com/msgpack/msgpack-python/pull/514
+PATCHFILES += ${PKGSTEM}-fix-ntohs-{pull/}514.patch:0
+PATCH_DIST_STRIP = -p1
+
# Apache 2.0
PERMIT_PACKAGE = Yes
diff --git a/net/py-msgpack/distinfo b/net/py-msgpack/distinfo
index 19a28b8bd56..20031d52b78 100644
--- a/net/py-msgpack/distinfo
+++ b/net/py-msgpack/distinfo
@@ -1,2 +1,6 @@
SHA256 (msgpack-1.0.4.tar.gz) = 9dhpwY8DAgLrQS8Iso0q/upVPWYTruieIA16yn7wH18=
+SHA256 (py3-msgpack-fallback-byte-order-513.patch) =
GjRxKmf7lHx3ECyJ7dlMb7toXHn9JYt22IJZdZ/oAZ0=
+SHA256 (py3-msgpack-fix-ntohs-514.patch) =
qLf2uPaIcccB/8NrA4il8WDQjqlvEeaxit9IWiY6nW0=
SIZE (msgpack-1.0.4.tar.gz) = 128053
+SIZE (py3-msgpack-fallback-byte-order-513.patch) = 2775
+SIZE (py3-msgpack-fix-ntohs-514.patch) = 1383
diff --git a/sysutils/borgbackup/1.2/Makefile b/sysutils/borgbackup/1.2/Makefile
index d98ab2af988..53bff86a9cc 100644
--- a/sysutils/borgbackup/1.2/Makefile
+++ b/sysutils/borgbackup/1.2/Makefile
@@ -1,11 +1,11 @@
MODPY_EGG_VERSION =1.2.2
-REVISION = 2
+REVISION = 3
COMPILER_LANGS = c
BUILD_DEPENDS =devel/py-pkgconfig${MODPY_FLAVOR} \
lang/cython${MODPY_FLAVOR}
-RUN_DEPENDS = net/py-msgpack${MODPY_FLAVOR}
+RUN_DEPENDS = net/py-msgpack${MODPY_FLAVOR}>=1.0.4p2v0
TEST_DEPENDS = devel/py-dateutil${MODPY_FLAVOR}
.include
[update] sysutils/hcloud 1.30.3 => 1.31.0
Hi,
here is an update for sysutils/hcloud.
Changes:
1.30.4:
* chore: update hcloud-go to v1.37.0 by @apricote in #413
* fix: primary-ip list returns max 50 items by @apricote in #415
1.31.0
* server/list: Add missing PlacementGroup to JSON by @tomsiewert in #416
* Update the toml library to the latest version by @cedi in #422
* Adding an age column to the cli, closes #417 by @cedi in #420
* feat(completion): read network zones from API by @apricote in #426
OK?
Stefan
diff /usr/ports
commit - 11c4773666fdabe0d68f0f66b6475bc761751e82
path + /usr/ports
blob - 74c544092c21bd0eda45cb10bcde88f804ea85f9
file + sysutils/hcloud/Makefile
--- sysutils/hcloud/Makefile
+++ sysutils/hcloud/Makefile
@@ -1,5 +1,5 @@
COMMENT = command-line interface for Hetzner Cloud
-V =1.30.3
+V =1.31.0
MODGO_MODNAME =github.com/hetznercloud/cli
MODGO_VERSION =v${V}
blob - 64aa01673359878b2b8417688624e46f050eb7a4
file + sysutils/hcloud/distinfo
--- sysutils/hcloud/distinfo
+++ sysutils/hcloud/distinfo
@@ -67,8 +67,8 @@ SHA256 (go_modules/github.com/hetznercloud/hcloud-go/@
SHA256 (go_modules/github.com/google/gofuzz/@v/v1.0.0.zip) =
dSVwJiV1u8tfAQfb2ApGOrrK9R6U4V+W9bxBZv8tM+E=
SHA256 (go_modules/github.com/guptarohit/asciigraph/@v/v0.5.5.mod) =
U6yrsr8kHxtWra3zhHTdIdO9sC/T7xbMTI3t1MCAHTk=
SHA256 (go_modules/github.com/guptarohit/asciigraph/@v/v0.5.5.zip) =
wrgdpXpQQl0xOmhO/RPZdBxOnfTDzKkt6jTVYtNCcaE=
-SHA256 (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.35.2.mod) =
eua4IX8fd2bTNN8OdbTDkhMUDNfSN0Znv8xj/XmXkB8=
-SHA256 (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.35.2.zip) =
5HJq/JAoT3t39PLNORcg5ey2owQFO5W5ia800lK2uvw=
+SHA256 (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.37.0.mod) =
eua4IX8fd2bTNN8OdbTDkhMUDNfSN0Znv8xj/XmXkB8=
+SHA256 (go_modules/github.com/hetznercloud/hcloud-go/@v/v1.37.0.zip) =
wn6Ix13jOFjQye9Nm/UeP4clJgXHAWTvmUO+mLGxErk=
SHA256 (go_modules/github.com/inconshreveable/mousetrap/@v/v1.0.0.mod) =
OR2uvJOw35u4momxS/pgJo2eueJ2I+xBUEGrq6vdAFw=
SHA256 (go_modules/github.com/inconshreveable/mousetrap/@v/v1.0.0.zip) =
w/oIE+ePXO8Q3A6ZEsQ+aOBv+XCpjpjEBQ/hTbv9GMc=
SHA256 (go_modules/github.com/jpillora/backoff/@v/v1.0.0.mod) =
vVTHrC9+ZiFhIBdJ1ig6I0ZcrnO6o4+lp86WJ3EDxns=
@@ -108,8 +108,8 @@ SHA256 (go_modules/github.com/pelletier/go-toml/@v/v1.
SHA256
(go_modules/github.com/mwitkow/go-conntrack/@v/v0.0.0-20161129095857-cc309e4a2223.mod)
= PxWlGPNyKPLQjGtDdi1DhppauK57o7USS/lhA15xzBg=
SHA256
(go_modules/github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.mod)
= PxWlGPNyKPLQjGtDdi1DhppauK57o7USS/lhA15xzBg=
SHA256
(go_modules/github.com/mwitkow/go-conntrack/@v/v0.0.0-20190716064945-2f068394615f.zip)
= 1vxRNJDVxz4/ZO3jzxi6lzpPjvTDnJgWzGCA45yMSAo=
-SHA256 (go_modules/github.com/pelletier/go-toml/@v/v1.9.5.mod) =
wOwmx/hD02ii1ak5A1nFZ+vjFhcb1lHTHc6tG7Lgetk=
-SHA256 (go_modules/github.com/pelletier/go-toml/@v/v1.9.5.zip) =
3j3NpmDMgAzYbQMnOiWVbWf0Fuj8vk0gAaLLSgHmrGA=
+SHA256 (go_modules/github.com/pelletier/go-toml/v2/@v/v2.0.6.mod) =
nnkRjVzXHeJoNkQB4SFfrBoGPS8+lwyS0irrghOlKm0=
+SHA256 (go_modules/github.com/pelletier/go-toml/v2/@v/v2.0.6.zip) =
AZ5KAXOefKNwHV97SvVxesXrTW1JIbiEJdf0DK2xvX0=
SHA256 (go_modules/github.com/pkg/errors/@v/v0.8.0.mod) =
3yjGqCPxgddheWlxd8DFlDxv+zjzwQstxTvjYO59RYk=
SHA256 (go_modules/github.com/pkg/errors/@v/v0.8.1.mod) =
3yjGqCPxgddheWlxd8DFlDxv+zjzwQstxTvjYO59RYk=
SHA256 (go_modules/github.com/pkg/errors/@v/v0.9.1.mod) =
3yjGqCPxgddheWlxd8DFlDxv+zjzwQstxTvjYO59RYk=
@@ -137,8 +137,8 @@ SHA256 (go_modules/github.com/rjeczalik/interfaces/@v/
SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.1.0.mod) =
bHMYonqNVHOo62YedfsAUoF24O/FkxDtJ3yhO9EqU/E=
SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.2.0.mod) =
bHMYonqNVHOo62YedfsAUoF24O/FkxDtJ3yhO9EqU/E=
SHA256 (go_modules/github.com/rivo/uniseg/@v/v0.2.0.zip) =
MZnZS+UChBQiIGYso7AOGd3R3r5OgN3HRf9CA+y2AcA=
-SHA256 (go_modules/github.com/rjeczalik/interfaces/@v/v0.1.1.mod) =
2APNjezWorRXqp6JFMzvvgmCy8Fn5fUKrf4P1eCJSVY=
-SHA256 (go_modules/github.com/rjeczalik/interfaces/@v/v0.1.1.zip) =
aSIoWFJzsR4Mi8+ca9yvhEAzVUaPLVZ/Qz+ioPus3iE=
+SHA256 (go_modules/github.com/rjeczalik/interfaces/@v/v0.3.0.mod) =
rnDSoI+lIXEvEiyKN5mZQUEkrRfFJVP63kbfRiYhD3I=
+SHA256 (go_modules/github.com/rjeczalik/interfaces/@v/v0.3.0.zip) =
UmJ08cSzQFKUBLkbVf788Ag08WOw5WZiHFlXuS6b2AY=
SHA256 (go_modules/github.com/russross/blackfriday/v2/@v/v2.1.0.mod) =
w5VHzOboZujPo5XSk3vOMIAc0H8LkBwhMySPH7oS9Y0=
SHA256 (go_modules/github.com/russross/blackfriday/v2/@v/v2.1.0.zip) =
eFJ1DVigU844sB8sIDIIgXVk9VLr83GytjAIHXAExq4=
SHA256 (go_modules/github.com/sirupsen/logrus/@v/v1.2.0.mod) =
1nBJZSdJq8ZWDyLe46J6q3laMu4sfgeKVGFaYberuZs=
@@ -152,7 +152,8 @@ SHA256 (go_modules/github.com/stretchr/objx/@v/v0.4.0.
SHA256 (go_modules/github.com/stretchr/objx/@v/v0.1.0.mod) =
E1A1TVLSKHpiM27MDVYjLUxHaZr5u6ScZ8K0glTamPE=
SHA256
Re: [PATCH] Fix crash in uucpd on authentication
On Sun, Dec 04, 2022 at 01:19:45PM +0100, William Orr wrote:
> Hey,
>
> getpwnam hasn't filled in passwd->pw_passwd since 5.9. This fixes a
> crash in uucpd that relied on the legacy behavior.
>
> Please cc me; not subscribed to this list.
Thanks. While the diff is clearly correct, doesn't that mean that no one
has used this port in >= 5 years? Is it worth keeping?
>
> Thanks,
> worr
>
> ---
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/uucpd/Makefile,v
> retrieving revision 1.3
> diff -u -b -w -p -r1.3 Makefile
> --- Makefile 11 Mar 2022 19:48:03 - 1.3
> +++ Makefile 4 Dec 2022 11:57:40 -
> @@ -1,6 +1,7 @@
> COMMENT =UUCP inetd program
>
> DISTNAME = uucpd-1.0
> +REVISION = 0
>
> CATEGORIES = net mail news
>
> Index: patches/patch-uucpd_c
> ===
> RCS file: /cvs/ports/net/uucpd/patches/patch-uucpd_c,v
> retrieving revision 1.2
> diff -u -b -w -p -r1.2 patch-uucpd_c
> --- patches/patch-uucpd_c 11 Mar 2022 19:48:03 - 1.2
> +++ patches/patch-uucpd_c 4 Dec 2022 11:57:40 -
> @@ -1,5 +1,6 @@
> uucpd.c.orig Wed Mar 12 15:35:25 2014
> -+++ uucpd.c Sun Jan 18 16:44:38 2015
> +Index: uucpd.c
> +--- uucpd.c.orig
> uucpd.c
> @@ -43,6 +43,7 @@
> #include
> #include
> @@ -8,12 +9,15 @@
> #include
> #include
> #include
> -@@ -170,7 +171,7 @@ doit(struct sockaddr *sa)
> +@@ -170,9 +171,9 @@ doit(struct sockaddr *sa)
> return;
> }
> } while (user[0] == '\0');
> -user[MAXLOGNAME] = '\0';
> +user[LOGIN_NAME_MAX] = '\0';
>
> - pw = getpwnam(user);
> +-pw = getpwnam(user);
> ++pw = getpwnam_shadow(user);
> if (pw == NULL) {
> + printf("Password: ");
> + fflush(stdout);
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: d...@cvs.openbsd.org2022/12/04 06:45:44 Modified files: net/haproxy: Makefile distinfo Log message: Update to haproxy-2.6.7
net/py-msgpack, sysutils/borgbackup/1.2: fix sparc64 runtime
Same fix as the borg 1.1 one except that borg 1.2 uses ports py-msgpack
which has more consumers than borg 1.2:
$ show-reverse-deps net/py-msgpack
databases/py-influxdb,python3
devel/py-buildbot/buildbot
devel/py-buildslave
editors/py-neovim
editors/py-neovim,python3
net/synapse
net/synapse,
sysutils/borgbackup/1.2
sysutils/salt
sysutils/salt-testing
sysutils/vorta
textproc/calibre
I'm quite certain that all those are fine, but I have only tested borg
myself.
Good to go or does anyone want to do more tests?
diff --git a/net/py-msgpack/Makefile b/net/py-msgpack/Makefile
index 30dc8b2ad05..d84d0feb2a4 100644
--- a/net/py-msgpack/Makefile
+++ b/net/py-msgpack/Makefile
@@ -1,7 +1,7 @@
COMMENT = messagepack (de)serializer
MODPY_EGG_VERSION =1.0.4
-REVISION = 1
+REVISION = 2
EPOCH =0
DISTNAME = msgpack-${MODPY_EGG_VERSION}
PKGNAME = py-msgpack-${MODPY_EGG_VERSION}
@@ -12,6 +12,17 @@ HOMEPAGE = https://msgpack.org/
MAINTAINER = Bjorn Ketelaars
+# same cherry-pick as in sysutils/borgbackup/1.1, see details in
+# https://github.com/borgbackup/borg/pull/6149#issuecomment-1335632116 ff.
+MASTER_SITES0 =https://github.com/msgpack/msgpack-python/
+# merged "Fallback to compiler defines when __BYTE_ORDER is not available"
+# https://github.com/msgpack/msgpack-python/pull/513
+PATCHFILES = ${PKGSTEM}-fallback-byte-order-{pull/}513.patch:0
+# merged "Fix build error caused by ntohs, ntohl"
+# https://github.com/msgpack/msgpack-python/pull/514
+PATCHFILES += ${PKGSTEM}-fix-ntohs-{pull/}514.patch:0
+PATCH_DIST_STRIP = -p1
+
# Apache 2.0
PERMIT_PACKAGE = Yes
diff --git a/net/py-msgpack/distinfo b/net/py-msgpack/distinfo
index 19a28b8bd56..20031d52b78 100644
--- a/net/py-msgpack/distinfo
+++ b/net/py-msgpack/distinfo
@@ -1,2 +1,6 @@
SHA256 (msgpack-1.0.4.tar.gz) = 9dhpwY8DAgLrQS8Iso0q/upVPWYTruieIA16yn7wH18=
+SHA256 (py3-msgpack-fallback-byte-order-513.patch) =
GjRxKmf7lHx3ECyJ7dlMb7toXHn9JYt22IJZdZ/oAZ0=
+SHA256 (py3-msgpack-fix-ntohs-514.patch) =
qLf2uPaIcccB/8NrA4il8WDQjqlvEeaxit9IWiY6nW0=
SIZE (msgpack-1.0.4.tar.gz) = 128053
+SIZE (py3-msgpack-fallback-byte-order-513.patch) = 2775
+SIZE (py3-msgpack-fix-ntohs-514.patch) = 1383
diff --git a/sysutils/borgbackup/1.2/Makefile b/sysutils/borgbackup/1.2/Makefile
index d98ab2af988..8cb70199799 100644
--- a/sysutils/borgbackup/1.2/Makefile
+++ b/sysutils/borgbackup/1.2/Makefile
@@ -5,7 +5,7 @@ COMPILER_LANGS =c
BUILD_DEPENDS =devel/py-pkgconfig${MODPY_FLAVOR} \
lang/cython${MODPY_FLAVOR}
-RUN_DEPENDS = net/py-msgpack${MODPY_FLAVOR}
+RUN_DEPENDS = net/py-msgpack${MODPY_FLAVOR}>=1.0.4p2v0
TEST_DEPENDS = devel/py-dateutil${MODPY_FLAVOR}
.include
[PATCH] Fix crash in uucpd on authentication
Hey,
getpwnam hasn't filled in passwd->pw_passwd since 5.9. This fixes a
crash in uucpd that relied on the legacy behavior.
Please cc me; not subscribed to this list.
Thanks,
worr
---
Index: Makefile
===
RCS file: /cvs/ports/net/uucpd/Makefile,v
retrieving revision 1.3
diff -u -b -w -p -r1.3 Makefile
--- Makefile11 Mar 2022 19:48:03 - 1.3
+++ Makefile4 Dec 2022 11:57:40 -
@@ -1,6 +1,7 @@
COMMENT = UUCP inetd program
DISTNAME = uucpd-1.0
+REVISION = 0
CATEGORIES = net mail news
Index: patches/patch-uucpd_c
===
RCS file: /cvs/ports/net/uucpd/patches/patch-uucpd_c,v
retrieving revision 1.2
diff -u -b -w -p -r1.2 patch-uucpd_c
--- patches/patch-uucpd_c 11 Mar 2022 19:48:03 - 1.2
+++ patches/patch-uucpd_c 4 Dec 2022 11:57:40 -
@@ -1,5 +1,6 @@
uucpd.c.orig Wed Mar 12 15:35:25 2014
-+++ uucpd.cSun Jan 18 16:44:38 2015
+Index: uucpd.c
+--- uucpd.c.orig
uucpd.c
@@ -43,6 +43,7 @@
#include
#include
@@ -8,12 +9,15 @@
#include
#include
#include
-@@ -170,7 +171,7 @@ doit(struct sockaddr *sa)
+@@ -170,9 +171,9 @@ doit(struct sockaddr *sa)
return;
}
} while (user[0] == '\0');
- user[MAXLOGNAME] = '\0';
+ user[LOGIN_NAME_MAX] = '\0';
- pw = getpwnam(user);
+- pw = getpwnam(user);
++ pw = getpwnam_shadow(user);
if (pw == NULL) {
+ printf("Password: ");
+ fflush(stdout);
Re: borgbackup/1.1: Fix msgpack runtime on sparc64
On Fri, Dec 02, 2022 at 09:55:08PM +, Klemens Nanni wrote:
> Upstream suggested to fix this in the 1.1.x branch, so here we go.
> This borg PR is just a recommit of the actual msgpack-python commits.
>
> Unbreaks sparc64/ports-gcc and keeps working on amd64/base-clang.
>
> Anyone up for tests on other big-endian base-clang architectures?
> octeon and macppc (big-endian base-clang) work without the fix, so it
> looks like big-endian sparc64 which has base-clang but keeps using
> ports-gcc is the only architecture needing this.
>
> borg 1.1.18 is the last 1.1.x release, but upstream suggested a PR for
> completeness.
>
> borg 1.2.2 suffers the same but uses net/py-msgpack rather than its own
> bundled version; same fix applies but I'd like to commit separately as
> this will effect all py3-msgpack consumers.
>
> Feedback? OK?
Both msgpack-python and borgbackup upstreams merged the relevant fixes,
here's the standalone borg 1.1.18 fix now that the PR dust settled.
I'll commit this with OK bket once someone gave this a try on some big
endian base-clang arch (macppc, powerpc64, riscv64), i.e. big endian,
but not sparc64 ports-gcc, or I came around to testing one of those.
diff --git a/sysutils/borgbackup/1.1/Makefile b/sysutils/borgbackup/1.1/Makefile
index 0c79ffa68e6..afab957a774 100644
--- a/sysutils/borgbackup/1.1/Makefile
+++ b/sysutils/borgbackup/1.1/Makefile
@@ -1,10 +1,18 @@
PORTROACH =limit:^1\.1\.
MODPY_EGG_VERSION =1.1.18
-REVISION = 2
+REVISION = 3
WANTLIB = ${COMPILER_LIBCXX} b2 m
LIB_DEPENDS = security/libb2
+# same cherry-pick as in net/py-msgpack (used by borg 1.2.x), see details in
+# https://github.com/borgbackup/borg/pull/6149#issuecomment-1335632116 ff.
+MASTER_SITES0 =https://github.com/borgbackup/borg/
+# merged "fix msgpack runtime on big-endian OpenBSD/sparc64"
+# https://github.com/borgbackup/borg/pull/7181
+PATCHFILES = ${PKGSTEM}-msgpack-fix-big-endian-{pull/}7181.patch:0
+PATCH_DIST_STRIP = -p1
+
.include
diff --git a/sysutils/borgbackup/1.1/distinfo b/sysutils/borgbackup/1.1/distinfo
index 8e499846d07..1294dbd8192 100644
--- a/sysutils/borgbackup/1.1/distinfo
+++ b/sysutils/borgbackup/1.1/distinfo
@@ -1,2 +1,4 @@
SHA256 (borgbackup-1.1.18.tar.gz) =
XLpf59tNCJRLRn7BHvwBdoelErDZjM8K0aqcQylmUnU=
+SHA256 (borgbackup-msgpack-fix-big-endian-7181.patch) =
li9NhN0ARAsKffKO7Umhe+MKoo4uVcBcQOaAj+hpLo0=
SIZE (borgbackup-1.1.18.tar.gz) = 3854385
+SIZE (borgbackup-msgpack-fix-big-endian-7181.patch) = 5633
Re: update or remove net/deluge-ltconfig ?
On Sat, Dec 03, 2022 at 05:34:06PM -0700, Anthony J. Bentley wrote:
> Klemens Nanni writes:
> > https://github.com/ratanakvlun/deluge-ltconfig/releases/tag/v2.0.0 with
> > deluge 2.x and python 3 support came out in 2019 (code in 2.x not master).
>
> Update seems trivial (only build tested).
Packages fine, but I fail to test it since the deluge-gtk window won't
even open for me... maybe that's a cwm/X bug, maybe that's deluge:
# make install
$ deluged -d
$ deluge-gtk
Then connect to the server on localhost with the default credentials in
~/.config/deluge/auth/.
debug logs (-L debug) to either deluged or deluge-gtk will tell you that
it connected fine and the server-select/connect dialouge disappears,
cwm has an entry called "Deluge" in the window list, but there is no
actual window I can see.
Feel free to commit this update if it works for anyone, otherwise I
suggest debugging broken and/or removing unused bits from the tree.
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/deluge-ltconfig/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile 11 Mar 2022 19:45:52 - 1.5
> +++ Makefile 4 Dec 2022 00:30:58 -
> @@ -1,7 +1,6 @@
> COMMENT =libtorrent settings modification plugin for deluge
>
> -MODPY_EGG_VERSION = 0.3.1
> -REVISION = 0
> +MODPY_EGG_VERSION = 2.0.0
>
> GH_ACCOUNT = ratanakvlun
> GH_PROJECT = deluge-ltconfig
> @@ -13,7 +12,6 @@ CATEGORIES =net
> PERMIT_PACKAGE = Yes
>
> MODULES =lang/python
> -MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
> MODPY_SETUPTOOLS = Yes
> RUN_DEPENDS =net/deluge
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/deluge-ltconfig/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo 9 Feb 2018 09:50:26 - 1.1.1.1
> +++ distinfo 4 Dec 2022 00:30:58 -
> @@ -1,2 +1,2 @@
> -SHA256 (deluge-ltconfig-0.3.1.tar.gz) =
> q/S2W02OWt0CdYsXK2/p10mSSM1tkqukOeDIdTq+OcI=
> -SIZE (deluge-ltconfig-0.3.1.tar.gz) = 16582
> +SHA256 (deluge-ltconfig-2.0.0.tar.gz) =
> B8WvUSy0/YGBxvlnNKxg8mNuBW/d/cZ9vT20L6I6Qlc=
> +SIZE (deluge-ltconfig-2.0.0.tar.gz) = 17758
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/deluge-ltconfig/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 11 Mar 2022 19:45:52 - 1.2
> +++ pkg/PLIST 4 Dec 2022 00:30:58 -
> @@ -1,5 +1,3 @@
> -lib/python${MODPY_VERSION}/site-packages/deluge/
> -lib/python${MODPY_VERSION}/site-packages/deluge/plugins/
>
> lib/python${MODPY_VERSION}/site-packages/deluge/plugins/ltConfig-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg
>
> lib/python${MODPY_VERSION}/site-packages/ltConfig-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>
> lib/python${MODPY_VERSION}/site-packages/ltConfig-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> @@ -9,31 +7,35 @@ lib/python${MODPY_VERSION}/site-packages
>
> lib/python${MODPY_VERSION}/site-packages/ltConfig-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
> lib/python${MODPY_VERSION}/site-packages/ltconfig/
> lib/python${MODPY_VERSION}/site-packages/ltconfig/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/ltconfig/__init__.pyc
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ltconfig/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/ltconfig/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/ltconfig/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/ltconfig/${MODPY_PYCACHE}gtkui.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/ltconfig/${MODPY_PYCACHE}webui.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/ltconfig/common/
> lib/python${MODPY_VERSION}/site-packages/ltconfig/common/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/ltconfig/common/__init__.pyc
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ltconfig/common/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/ltconfig/common/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/ltconfig/common/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/ltconfig/common/${MODPY_PYCACHE}presets.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/ltconfig/common/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/ltconfig/common/config/
> lib/python${MODPY_VERSION}/site-packages/ltconfig/common/config/__init__.py
> -lib/python${MODPY_VERSION}/site-packages/ltconfig/common/config/__init__.pyc
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/12/04 05:59:09 Modified files: devel/vte3 : Makefile distinfo Removed files: devel/vte3/patches: patch-meson_build Log message: Update to vte3-0.70.2.
Re: net/nmap: drop python2 zenmap and ndiff
On Sun, Dec 04, 2022 at 08:41:30AM +, Stuart Henderson wrote:
> I agree with dropping zenmap but I would prefer to keep the MULTI_PACKAGES
> setup (with just -main), it will be easier to get things right if readding
> zenmap in the future (the @pkgpath are incorrect in this diff), and easier
> to see from cvs history what was changed.
Alright, here's a simpler diff removing -zenmap, ndiff and thus python 2
remain in the -main port (can be a separate commit).
Now with a quirk for removal.
31 => "python port without 3.x support, no other ports use it",
OK?
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1465
diff -u -p -r1.1465 Makefile
--- devel/quirks/Makefile 4 Dec 2022 12:21:48 - 1.1465
+++ devel/quirks/Makefile 4 Dec 2022 12:32:14 -
@@ -3,7 +3,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-6.81
+PKGNAME = quirks-6.82
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1476
diff -u -p -r1.1476 Quirks.pm
--- devel/quirks/files/Quirks.pm4 Dec 2022 12:21:48 - 1.1476
+++ devel/quirks/files/Quirks.pm4 Dec 2022 12:32:15 -
@@ -1764,6 +1764,7 @@ setup_obsolete_reason(
1 => 'stm32loader',
3 => 'tmda',
3 => 'spambayes',
+ 31 => 'nmap-zenmap',
);
# though it's not yet used, these should be pkgnames, so that eventually
Index: net/nmap/Makefile
===
RCS file: /cvs/ports/net/nmap/Makefile,v
retrieving revision 1.144
diff -u -p -r1.144 Makefile
--- net/nmap/Makefile 11 Mar 2022 19:46:31 - 1.144
+++ net/nmap/Makefile 4 Dec 2022 12:32:15 -
@@ -1,10 +1,8 @@
COMMENT-main= scan ports and fingerprint stack of network hosts
-COMMENT-zenmap=graphical frontend for nmap
MODPY_EGG_VERSION= 7.91
DISTNAME= nmap-${MODPY_EGG_VERSION}
PKGNAME-main= ${DISTNAME}
-PKGNAME-zenmap=nmap-zenmap-${MODPY_EGG_VERSION}
REVISION= 2
CATEGORIES=net security
@@ -20,7 +18,7 @@ MAINTAINER= JR Aquino
Re: UPDATE: Tor Browser 12.0a5
Caspar Schutijser wrote (2022-12-02 13:25 CET):
> Hi,
>
> Below is a diff that updates Tor Browser to 12.0a5. Lightly tested on
> amd64 so far. Release notes:
> https://blog.torproject.org/new-alpha-release-tor-browser-120a5/
>
> Comments or OKs?
Builds and works fine here.
OK sdk@
> Caspar
>
> --
>
> Tor Browser: update to 12.0a5
>
> Also remove TL_VERSION, pointed out by richard on #tor-dev.
>
> OK ...
>
> --
>
> Index: meta/tor-browser/Makefile
> ===
> RCS file: /cvs/ports/meta/tor-browser/Makefile,v
> retrieving revision 1.62
> diff -u -p -r1.62 Makefile
> --- meta/tor-browser/Makefile 14 Nov 2022 22:13:58 - 1.62
> +++ meta/tor-browser/Makefile 2 Dec 2022 12:21:55 -
> @@ -2,11 +2,11 @@ COMMENT=Tor Browser meta package
>
> MAINTAINER= Caspar Schutijser
>
> -PKGNAME= tor-browser-12.0alpha4
> +PKGNAME= tor-browser-12.0alpha5
> ONLY_FOR_ARCHS = amd64
>
> -RUN_DEPENDS= www/tor-browser/browser>=12.0alpha4 \
> - www/tor-browser/noscript>=11.4.11 \
> - net/tor>=0.4.7.10
> +RUN_DEPENDS= www/tor-browser/browser>=12.0alpha5 \
> + www/tor-browser/noscript>=11.4.13 \
> + net/tor>=0.4.7.11
>
> .include
> Index: www/tor-browser/Makefile.inc
> ===
> RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
> retrieving revision 1.60
> diff -u -p -r1.60 Makefile.inc
> --- www/tor-browser/Makefile.inc 25 Nov 2022 13:59:35 - 1.60
> +++ www/tor-browser/Makefile.inc 2 Dec 2022 12:21:55 -
> @@ -3,7 +3,7 @@ HOMEPAGE ?= https://www.torproject.org
> PERMIT_PACKAGE ?=Yes
> CATEGORIES = www
> BROWSER_NAME = tor-browser
> -TB_VERSION = 12.0a4
> +TB_VERSION = 12.0a5
> TB_PREFIX = tb
>
> # keep meta/tor-browser in sync
> Index: www/tor-browser/browser/Makefile
> ===
> RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
> retrieving revision 1.96
> diff -u -p -r1.96 Makefile
> --- www/tor-browser/browser/Makefile 25 Nov 2022 13:59:35 - 1.96
> +++ www/tor-browser/browser/Makefile 2 Dec 2022 12:21:55 -
> @@ -7,14 +7,13 @@ COMMENT = modified version of Firefox E
> MOZILLA_VERSION =${TB_VERSION}
> MOZILLA_PROJECT =${BROWSER_NAME}
> MOZILLA_CODENAME = browser
> -TL_VERSION = 0.2.39
> REVISION = 0
>
> EXTRACT_SUFX = .tar.xz
> PATCHORIG = .pat.orig
>
> PKGNAME =${TB_PREFIX}-browser-${TB_VERSION:S/a/alpha/}
> -DISTNAME = src-firefox-tor-browser-102.4.0esr-12.0-2-build1
> +DISTNAME = src-firefox-tor-browser-102.5.0esr-12.0-1-build4
>
> FIX_EXTRACT_PERMISSIONS = Yes
> DISTFILES += ${DISTNAME}.tar.xz \
> @@ -76,7 +75,7 @@ MAKE_ENV += BUILD_OPT=1 \
> NSS_ENABLE_ECC=1 \
> XCFLAGS="-I${LOCALBASE}/include ${CFLAGS}"
>
> -RUN_DEPENDS += net/tor>=0.4.7.10
> +RUN_DEPENDS += net/tor>=0.4.7.11
>
> CONFIGURE_ARGS +=--enable-release #1386371
> CONFIGURE_ARGS +=--enable-sandbox
> Index: www/tor-browser/browser/distinfo
> ===
> RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
> retrieving revision 1.57
> diff -u -p -r1.57 distinfo
> --- www/tor-browser/browser/distinfo 14 Nov 2022 22:13:58 - 1.57
> +++ www/tor-browser/browser/distinfo 2 Dec 2022 12:21:55 -
> @@ -1,4 +1,4 @@
> -SHA256 (mozilla/src-firefox-tor-browser-102.4.0esr-12.0-2-build1.tar.xz) =
> 1ECZ70MRsUn8eXatwlHYYFTcnjjprRTeHEmw7VroErk=
> -SHA256 (mozilla/tor-browser-linux64-12.0a4_ALL.tar.xz) =
> oIxPAh+U3uw//SUlNSPyLLRpLcyg+Wk+RmdQDpFiwLA=
> -SIZE (mozilla/src-firefox-tor-browser-102.4.0esr-12.0-2-build1.tar.xz) =
> 512227588
> -SIZE (mozilla/tor-browser-linux64-12.0a4_ALL.tar.xz) = 110950112
> +SHA256 (mozilla/src-firefox-tor-browser-102.5.0esr-12.0-1-build4.tar.xz) =
> tMgfe3kPjoMuNS2jLk4ouwYXUoJpI4Z1Ly9bkDfpki0=
> +SHA256 (mozilla/tor-browser-linux64-12.0a5_ALL.tar.xz) =
> RL93mb9h6bfxRa0h26PbFPSwFhWq0Po/MY+DU+p1XZ4=
> +SIZE (mozilla/src-firefox-tor-browser-102.5.0esr-12.0-1-build4.tar.xz) =
> 512254868
> +SIZE (mozilla/tor-browser-linux64-12.0a5_ALL.tar.xz) = 104610060
> Index:
> www/tor-browser/browser/patches/patch-browser_app_profile_000-tor-browser_js
> ===
> RCS file:
> /cvs/ports/www/tor-browser/browser/patches/patch-browser_app_profile_000-tor-browser_js,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-browser_app_profile_000-tor-browser_js
> ---
> www/tor-browser/browser/patches/patch-browser_app_profile_000-tor-browser_js
> 14 Nov 2022 22:13:59 - 1.1
> +++
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/12/04 05:21:48 Modified files: mail : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: mail/spambayes : Makefile distinfo mail/spambayes/pkg: DESCR PLIST Log message: Remove mail/spambayes no maintainer, python 2 only, just a few old distros still package it, no upstream activity since years, i don't even see our 1.1b1 version from 2015 on their homepage which still takes about python 2.2.2, outlook 2000 and the alpha stage this software is in. OK jca
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2022/12/04 05:20:04 Modified files: mail : Makefile devel/quirks : Makefile devel/quirks/files: Quirks.pm Removed files: mail/tmda : Makefile distinfo mail/tmda/pkg : DESCR MESSAGE PLIST Log message: Remove mail/tmda no maintainer, python 2 only, no consumers, last port update in 2003, upstream has newer versions (don't know since when), no big distro packages it, homepage is reachable but clicking on "Download" yields a python 2.4 backtrace on EACCES failure... OK jca
libffi update
Hi.
This updates devel/libffi to the latest release.
I got an OK from jasper@ and it survived a bulk on amd64.
Testers on other arches welcomed.
Thanks.
Index: Makefile
===
RCS file: /cvs/ports/devel/libffi/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile26 May 2022 07:24:38 - 1.46
+++ Makefile4 Dec 2022 09:34:33 -
@@ -1,8 +1,8 @@
COMMENT= Foreign Function Interface
-V= 3.4.2
+V= 3.4.4
DISTNAME= libffi-$V
-SHARED_LIBS += ffi 2.0 # 9.0
+SHARED_LIBS += ffi 2.0 # 9.2
CATEGORIES=devel
MAINTAINER=Jasper Lievisse Adriaanse
@@ -17,14 +17,18 @@ PERMIT_PACKAGE= Yes
WANTLIB += c++abi
.endif
-MASTER_SITES= https://github.com/libffi/libffi/releases/download/v$V/
+MASTER_SITES= https://github.com/libffi/libffi/releases/download/v$V/
-DEBUG_PACKAGES = ${BUILD_PACKAGES}
+DEBUG_PACKAGES=${BUILD_PACKAGES}
+
+USE_GMAKE= Yes
TEST_DEPENDS= devel/dejagnu
CONFIGURE_STYLE= gnu
-FAKE_FLAGS+= includesdir="${PREFIX}/include"
+CONFIGURE_ARGS=--disable-multi-os-directory
+
+FAKE_FLAGS=includesdir="${PREFIX}/include"
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/libffi/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo26 May 2022 07:24:38 - 1.7
+++ distinfo4 Dec 2022 09:34:33 -
@@ -1,2 +1,2 @@
-SHA256 (libffi-3.4.2.tar.gz) = VA+3IWGaaro73u99lA2Ong5tLBk1lbwkMkG3f/npNiA=
-SIZE (libffi-3.4.2.tar.gz) = 1351355
+SHA256 (libffi-3.4.4.tar.gz) = 1mxWrSWags8qnfxAizK/XaUjcVALhHRff7i2RXEt9nY=
+SIZE (libffi-3.4.4.tar.gz) = 1362394
Index: patches/patch-configure
===
RCS file: /cvs/ports/devel/libffi/patches/patch-configure,v
retrieving revision 1.13
diff -u -p -r1.13 patch-configure
--- patches/patch-configure 26 May 2022 07:24:38 - 1.13
+++ patches/patch-configure 4 Dec 2022 09:34:33 -
@@ -1,18 +1,28 @@
+- Use our own libtool
- Link with libc++abi on arm (to access unwind symbols)
Index: configure
--- configure.orig
+++ configure
-@@ -18650,6 +18650,12 @@ $as_echo "#define SYMBOL_UNDERSCORE 1" >>confdefs.h
+@@ -9940,7 +9940,7 @@ esac
+ LIBTOOL_DEPS=$ltmain
- fi
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++#LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+
+
+
+@@ -19725,6 +19725,12 @@ if test "x$sys_symbol_underscore" = xyes; then
+ printf "%s\n" "#define SYMBOL_UNDERSCORE 1" >>confdefs.h
+ fi
++
+case "$target" in
+arm-*-openbsd*)
+ LDFLAGS="-lc++abi $LDFLAGS"
+;;
+esac
-+
+
FFI_EXEC_TRAMPOLINE_TABLE=0
case "$target" in
- *arm*-apple-* | aarch64-apple-*)
Index: patches/patch-configure_host
===
RCS file: /cvs/ports/devel/libffi/patches/patch-configure_host,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure_host
--- patches/patch-configure_host26 May 2022 07:24:38 - 1.3
+++ patches/patch-configure_host4 Dec 2022 09:34:33 -
@@ -1,7 +1,7 @@
Index: configure.host
--- configure.host.orig
+++ configure.host
-@@ -216,7 +216,7 @@ case "${host}" in
+@@ -223,7 +223,7 @@ case "${host}" in
TARGET=POWERPC_FREEBSD; TARGETDIR=powerpc
CFLAGS="$CFLAGS -D__NO_FPRS__"
;;
Index: patches/patch-src_arm_ffi_c
===
RCS file: /cvs/ports/devel/libffi/patches/patch-src_arm_ffi_c,v
retrieving revision 1.11
diff -u -p -r1.11 patch-src_arm_ffi_c
--- patches/patch-src_arm_ffi_c 26 May 2022 07:24:38 - 1.11
+++ patches/patch-src_arm_ffi_c 4 Dec 2022 09:34:33 -
@@ -3,8 +3,8 @@ https://svnweb.freebsd.org/ports/head/de
Index: src/arm/ffi.c
--- src/arm/ffi.c.orig
+++ src/arm/ffi.c
-@@ -64,6 +64,11 @@ extern unsigned char ffi_arm_trampoline[12] FFI_HIDDEN
- #include
+@@ -68,6 +68,11 @@ extern unsigned char ffi_arm_trampoline[12] FFI_HIDDEN
+ #include
#endif
+#ifdef __arm__
@@ -15,7 +15,7 @@ Index: src/arm/ffi.c
/* Forward declares. */
static int vfp_type_p (const ffi_type *);
static void layout_vfp_args (ffi_cif *);
-@@ -621,6 +626,16 @@ ffi_prep_closure_loc (ffi_closure * closure,
+@@ -625,6 +630,16 @@ ffi_prep_closure_loc (ffi_closure * closure,
config[0] = closure;
config[1] = closure_func;
#else
@@ -30,5 +30,5 @@ Index: src/arm/ffi.c
+ } while (0);
+#endif
- #if defined(FFI_EXEC_STATIC_TRAMP)
+ # if defined(FFI_EXEC_STATIC_TRAMP)
if (ffi_tramp_is_present(closure))
Index: patches/patch-src_closures_c
===
RCS file:
[UPDATE] Xaw3d to version 1.6.4
Trivial update to Xaw3d 1.6.4.
Changes since 1.6.3:
Alan Coopersmith (9):
Fix fd leak when write() fails in WriteToFile()
Update README for gitlab migration
Update configure.ac bug URL for gitlab migration
Pass correct number of atoms from SelectSave
to _XawTextSaltAwaySelection
Build xz tarballs instead of bzip2
Fix spelling/wording issues
gitlab CI: add a basic build test
convert ISO8859-1 encoded source files to UTF-8
libXaw3d 1.6.4
Eric Sesterhenn (1):
Bug 24635: File Descriptor leaks in libxaw-1.0.7
Thomas E. Dickey (2):
build-fixes when _CONST_X_STRING is defined
issue #4: configure doesn't fail if flex is not installed
ok ?
Index: Makefile
===
RCS file: /cvs/OpenBSD/ports/x11/Xaw3d/Makefile,v
retrieving revision 1.36
diff -u -p -u -r1.36 Makefile
--- Makefile11 Mar 2022 20:15:18 - 1.36
+++ Makefile4 Dec 2022 11:38:04 -
@@ -1,6 +1,6 @@
COMMENT= 3D Athena Widget set that looks like Motif
-PKGNAME= Xaw3d-1.6.3
+PKGNAME= Xaw3d-1.6.4
DISTNAME= lib${PKGNAME}
SHARED_LIBS += Xaw3d12.0 # 8.0
Index: distinfo
===
RCS file: /cvs/OpenBSD/ports/x11/Xaw3d/distinfo,v
retrieving revision 1.6
diff -u -p -u -r1.6 distinfo
--- distinfo23 Jun 2018 13:57:51 - 1.6
+++ distinfo4 Dec 2022 11:39:22 -
@@ -1,2 +1,2 @@
-SHA256 (libXaw3d-1.6.3.tar.gz) = n0K0CeWkoNeiyUWVsx0X/AeOXjB9FDidvDlnVMOgH8w=
-SIZE (libXaw3d-1.6.3.tar.gz) = 714250
+SHA256 (libXaw3d-1.6.4.tar.gz) = Cf7P2rnX1ZU1Z4g+IHTrIxvHoSKgblBV+cEZCQ8fdqc=
+SIZE (libXaw3d-1.6.4.tar.gz) = 723278
Index: pkg/PLIST
===
RCS file: /cvs/OpenBSD/ports/x11/Xaw3d/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -r1.10 PLIST
--- pkg/PLIST 11 Mar 2022 20:15:18 - 1.10
+++ pkg/PLIST 4 Dec 2022 11:40:26 -
@@ -74,7 +74,7 @@ include/X11/Xaw3d/ViewportP.h
include/X11/Xaw3d/Xaw3dP.h
include/X11/Xaw3d/XawImP.h
include/X11/Xaw3d/XawInit.h
-lib/libXaw3d.a
+@static-lib lib/libXaw3d.a
lib/libXaw3d.la
@lib lib/libXaw3d.so.${LIBXaw3d_VERSION}
lib/pkgconfig/xaw3d.pc
--
Matthieu Herrb
Re: [UPDATE] x11/xcursorgen to version 1.0.8
On Sun Dec 04, 2022 at 11:54:52AM +0100, Matthieu Herrb wrote:
> Trivial update
>
> this release fixes clang warnings during build.
>
> ok ?
>
> Index: Makefile
> ===
> RCS file: /cvs/OpenBSD/ports/x11/xcursorgen/Makefile,v
> retrieving revision 1.34
> diff -u -p -u -r1.34 Makefile
> --- Makefile 11 Mar 2022 20:17:46 - 1.34
> +++ Makefile 4 Dec 2022 10:48:07 -
> @@ -1,5 +1,5 @@
> COMMENT =X11 Cursors themes generator
> -DISTNAME = xcursorgen-1.0.7
> +DISTNAME = xcursorgen-1.0.8
> CATEGORIES = x11
> EPOCH = 0
>
> Index: distinfo
> ===
> RCS file: /cvs/OpenBSD/ports/x11/xcursorgen/distinfo,v
> retrieving revision 1.13
> diff -u -p -u -r1.13 distinfo
> --- distinfo 17 Jan 2019 20:42:45 - 1.13
> +++ distinfo 4 Dec 2022 10:48:27 -
> @@ -1,2 +1,2 @@
> -SHA256 (xcursorgen-1.0.7.tar.gz) =
> a8MtSXf/1gwAWDv9IX8dEkXKVNr7+7zb8U9pb5SHuD4=
> -SIZE (xcursorgen-1.0.7.tar.gz) = 159382
> +SHA256 (xcursorgen-1.0.8.tar.gz) =
> uLsnVpGDQ7i8FaTOh16e+2xOd3etugiCgOU90JdTtqw=
> +SIZE (xcursorgen-1.0.8.tar.gz) = 162415
>
> --
> Matthieu Herrb
>
Tweak WANTLIB and remove trailing whitespace in pkg/DESCR.
Otherwise OK rsadowski.
Index: Makefile
===
RCS file: /cvs/ports/x11/xcursorgen/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- Makefile11 Mar 2022 20:17:46 - 1.34
+++ Makefile4 Dec 2022 11:02:22 -
@@ -1,5 +1,5 @@
COMMENT = X11 Cursors themes generator
-DISTNAME = xcursorgen-1.0.7
+DISTNAME = xcursorgen-1.0.8
CATEGORIES = x11
EPOCH =0
@@ -12,7 +12,7 @@ LIB_DEPENDS = graphics/png
# X11
PERMIT_PACKAGE = Yes
-WANTLIB = Xcursor X11 c png z
+WANTLIB += X11 Xcursor c png
MASTER_SITES = ${MASTER_SITE_XORG:=app/}
Index: distinfo
===
RCS file: /cvs/ports/x11/xcursorgen/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo17 Jan 2019 20:42:45 - 1.13
+++ distinfo4 Dec 2022 11:02:22 -
@@ -1,2 +1,2 @@
-SHA256 (xcursorgen-1.0.7.tar.gz) = a8MtSXf/1gwAWDv9IX8dEkXKVNr7+7zb8U9pb5SHuD4=
-SIZE (xcursorgen-1.0.7.tar.gz) = 159382
+SHA256 (xcursorgen-1.0.8.tar.gz) = uLsnVpGDQ7i8FaTOh16e+2xOd3etugiCgOU90JdTtqw=
+SIZE (xcursorgen-1.0.8.tar.gz) = 162415
Index: pkg/DESCR
===
RCS file: /cvs/ports/x11/xcursorgen/pkg/DESCR,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 DESCR
--- pkg/DESCR 4 Feb 2006 10:30:53 - 1.3
+++ pkg/DESCR 4 Dec 2022 11:02:22 -
@@ -1,4 +1,4 @@
xcursorgen - create an X cursor file from a collection of PNG images
-Used by the xcursor-themes port to build the xcursor data file
+Used by the xcursor-themes port to build the xcursor data file
from PNG images.
[UPDATE] x11/xcursorgen to version 1.0.8
Trivial update this release fixes clang warnings during build. ok ? Index: Makefile === RCS file: /cvs/OpenBSD/ports/x11/xcursorgen/Makefile,v retrieving revision 1.34 diff -u -p -u -r1.34 Makefile --- Makefile11 Mar 2022 20:17:46 - 1.34 +++ Makefile4 Dec 2022 10:48:07 - @@ -1,5 +1,5 @@ COMMENT = X11 Cursors themes generator -DISTNAME = xcursorgen-1.0.7 +DISTNAME = xcursorgen-1.0.8 CATEGORIES = x11 EPOCH =0 Index: distinfo === RCS file: /cvs/OpenBSD/ports/x11/xcursorgen/distinfo,v retrieving revision 1.13 diff -u -p -u -r1.13 distinfo --- distinfo17 Jan 2019 20:42:45 - 1.13 +++ distinfo4 Dec 2022 10:48:27 - @@ -1,2 +1,2 @@ -SHA256 (xcursorgen-1.0.7.tar.gz) = a8MtSXf/1gwAWDv9IX8dEkXKVNr7+7zb8U9pb5SHuD4= -SIZE (xcursorgen-1.0.7.tar.gz) = 159382 +SHA256 (xcursorgen-1.0.8.tar.gz) = uLsnVpGDQ7i8FaTOh16e+2xOd3etugiCgOU90JdTtqw= +SIZE (xcursorgen-1.0.8.tar.gz) = 162415 -- Matthieu Herrb
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2022/12/04 03:46:29 Modified files: security/rust-openssl-tests: Makefile crates.inc distinfo security/rust-openssl-tests/pkg: PLIST Log message: Update to rust-openssl-tests 20221203
Re: remove mail/archivemail ?
On 2022/12/03 23:27, Stuart Henderson wrote: > Offlineimap and isync are not substitutes for this at all > > Worth seeing if running it through 2to3 is enough ..it isn't enough: this uses the long-deprecated rfc822.py (which was kept for compat from 2.3 to 2.7 and eventually removed in 3). https://github.com/zedinosaur/chewmail looks like the closest alternative
Re: net/nmap: drop python2 zenmap and ndiff
I agree with dropping zenmap but I would prefer to keep the MULTI_PACKAGES
setup (with just -main), it will be easier to get things right if readding
zenmap in the future (the @pkgpath are incorrect in this diff), and easier
to see from cvs history what was changed.
--
Sent from a phone, apologies for poor formatting.
On 3 December 2022 23:07:35 Klemens Nanni wrote:
zenmap is a gui that suggests to be run as root...
upstream's situation wrt. python 2/3 hasn't changed much, there is
activity in https://github.com/nmap/nmap/issues/1176 but the tools still
need python 2.
ndiff diffs nmap outputs.
Drop all python bits, neuter useless python2 detection so we can build
this port without any python installed, merge the -zenmap package into
the -main one which becomes the only one and drop the ndiff helper.
Update tested with
# pkg_add nmap-zenmap
$ make package
$ cp /usr/ports/packages/amd64/ftp/nmap-7.91p3.tgz .
$ doas env TRUSTED_PKG_PATH=. pkg_add -u
nmap+nmap-zenmap-7.91p2->nmap-7.91p3: ok
Once upstream sorted its python bits out and/or our port gets an update,
ndiff and zenmap can rejoin the party.
nmap-zenmap is the last consumer of databases/py-sqlite2, which can then
also be removed (python 2 AND sqlite 2).
Feedback? Objection? OK?
Index: Makefile
===
RCS file: /cvs/ports/net/nmap/Makefile,v
retrieving revision 1.144
diff -u -p -r1.144 Makefile
--- Makefile 11 Mar 2022 19:46:31 - 1.144
+++ Makefile 3 Dec 2022 22:48:11 -
@@ -1,11 +1,7 @@
-COMMENT-main= scan ports and fingerprint stack of network hosts
-COMMENT-zenmap= graphical frontend for nmap
+COMMENT= scan ports and fingerprint stack of network hosts
-MODPY_EGG_VERSION= 7.91
-DISTNAME= nmap-${MODPY_EGG_VERSION}
-PKGNAME-main= ${DISTNAME}
-PKGNAME-zenmap= nmap-zenmap-${MODPY_EGG_VERSION}
-REVISION= 2
+DISTNAME= nmap-7.91
+REVISION= 3
CATEGORIES= net security
MASTER_SITES= ${HOMEPAGE}/dist/
@@ -20,17 +16,12 @@ MAINTAINER= JR Aquino --$(ZENMAPDIR)/zenmapCore/Version.py
$(ZENMAPDIR)/share/zenmap/config/zenmap_version: nmap.h
-- cd $(ZENMAPDIR) && $(PYTHON) install_scripts/utils/version_update.py
"$(NMAP_VERSION)"
-+#$(ZENMAPDIR)/zenmapCore/Version.py
$(ZENMAPDIR)/share/zenmap/config/zenmap_version: nmap.h
-+# cd $(ZENMAPDIR) && $(PYTHON) install_scripts/utils/version_update.py
"$(NMAP_VERSION)"
-
- tests/check_dns: $(OBJS)
- $(CXX) -o $@ $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS)
tests/nmap_dns_test.cc
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac 3 Dec 2022 22:56:32 -
@@ -0,0 +1,14 @@
+Neuter python2 detection, ndiff and zenmap are disabled so nothing uses it
+
+Index: configure.ac
+--- configure.ac.orig
configure.ac
+@@ -230,8 +230,6 @@ AC_SEARCH_LIBS(gethostbyname, nsl)
+ dnl Check IPv6 raw sending flavor.
+ CHECK_IPV6_IPPROTO_RAW
+
+-m4_define_default([_AM_PYTHON_INTERPRETER_LIST],[python2 python2.7
python2.6 python2.5 python2.4 python])
+-AM_PATH_PYTHON([2.4], [HAVE_PYTHON=true], [HAVE_PYTHON=false])
+ HAVE_PYTHON2=false
+ if test $HAVE_PYTHON && test "x${PYTHON_VERSION%%.*}" = "x2"; then
+ HAVE_PYTHON2=true
Index: patches/patch-zenmap_install_scripts_unix_zenmap-root_desktop
===
RCS file: patches/patch-zenmap_install_scripts_unix_zenmap-root_desktop
diff -N patches/patch-zenmap_install_scripts_unix_zenmap-root_desktop
--- patches/patch-zenmap_install_scripts_unix_zenmap-root_desktop 11 Mar
2022 19:46:31 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
zenmap/install_scripts/unix/zenmap-root.desktop.orig Sat Dec 3
06:08:10 2016
-+++ zenmap/install_scripts/unix/zenmap-root.desktop Thu Dec 22 05:45:12 2016
-@@ -2,9 +2,9 @@
- Name=Zenmap (as root)
- GenericName=GUI Port Scanner
- TryExec=su-to-zenmap.sh
--Exec=su-to-zenmap.sh %F
-+Exec=${TRUEPREFIX}/share/zenmap/su-to-zenmap.sh %F
- Terminal=false
--Icon=zenmap
-+Icon=${TRUEPREFIX}/share/zenmap/pixmaps/zenmap.png
- Type=Application
- Categories=Application;Network;Security;
- Comment=A cross-platform GUI for the Nmap Security Scanner.
Index: patches/patch-zenmap_install_scripts_unix_zenmap_desktop
===
RCS file: patches/patch-zenmap_install_scripts_unix_zenmap_desktop
diff -N patches/patch-zenmap_install_scripts_unix_zenmap_desktop
--- patches/patch-zenmap_install_scripts_unix_zenmap_desktop 11 Mar 2022
19:46:31 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
zenmap/install_scripts/unix/zenmap.desktop.orig Sat Dec 3 06:08:10 2016
-+++ zenmap/install_scripts/unix/zenmap.desktop Thu Dec 22 05:45:12 2016
-@@ -4,7 +4,7 @@ GenericName=GUI Port Scanner
- TryExec=zenmap
- Exec=zenmap %F
- Terminal=false
--Icon=zenmap
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2022/12/04 01:42:19 Modified files: devel : Makefile Log message: Unbreak sqlports: stm32loader is gone.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2022/12/04 01:32:51 Modified files: devel/jenkins/stable: Makefile distinfo Log message: Update jenkins-stable to 2.375.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2022/12/04 01:32:36 Modified files: devel/jenkins/devel: Makefile distinfo Log message: Update jenkins-devel to 2.380
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2022/12/04 01:30:20 Modified files: x11/kde-plasma : Makefile.inc x11/kde-plasma/breeze: distinfo x11/kde-plasma/breeze/pkg: PLIST x11/kde-plasma/breeze-grub: distinfo x11/kde-plasma/breeze-gtk: distinfo x11/kde-plasma/kdecoration: distinfo x11/kde-plasma/kdecoration/pkg: PLIST x11/kde-plasma/oxygen: distinfo Log message: Update KDE Plasma to 5.26.4
