Re: [UPDATE] math/z3 to 4.8.16

2022-05-03 Thread Omar Polo
Frederic Cambus  wrote:
> Hi ports@,
> 
> Here is a diff to update z3 to 4.8.16.
> 
> Some functions have been removed from the library, so a major bump
> is needed.
> 
> Comments? OK?

ok op@

I somehow managed to boostrap F* with OCaml using the updated z3.  It's
still half broken (not the parts that deal with z3) and the other half
requires ugly hacks to work.  But it verified the hello world so z3 is
fine :)

> Index: Makefile
> ===
> RCS file: /cvs/ports/math/z3/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- Makefile  11 Mar 2022 19:36:33 -  1.25
> +++ Makefile  3 May 2022 15:16:12 -
> @@ -1,6 +1,6 @@
>  COMMENT =Z3 theorem prover
>  
> -VERSION =4.8.9
> +VERSION =4.8.16
>  
>  GH_ACCOUNT = Z3Prover
>  GH_PROJECT = z3
> @@ -8,9 +8,8 @@ GH_TAGNAME =  ${GH_PROJECT}-${VERSION}
>  
>  DISTNAME =   ${GH_TAGNAME}
>  PKGNAME =${DISTNAME:L}
> -REVISION =   0
>  
> -SHARED_LIBS =z3  2.2 # 4.8
> +SHARED_LIBS =z3  3.0 # 4.8
>  
>  CATEGORIES = math
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/math/z3/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo  18 Sep 2020 07:52:58 -  1.9
> +++ distinfo  3 May 2022 15:16:12 -
> @@ -1,2 +1,2 @@
> -SHA256 (z3-4.8.9.tar.gz) = yf0EubM750//qsPsK8LDINGkzDLjlSA8VRJrEqFP8/Q=
> -SIZE (z3-4.8.9.tar.gz) = 4624159
> +SHA256 (z3-4.8.16.tar.gz) = dfleCfPzX+90blcdXsiKTvuifxvI8aDvERcWdIbsPcY=
> +SIZE (z3-4.8.16.tar.gz) = 5223980
> Index: patches/patch-scripts_mk_util_py
> ===
> RCS file: /cvs/ports/math/z3/patches/patch-scripts_mk_util_py,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-scripts_mk_util_py
> --- patches/patch-scripts_mk_util_py  11 Mar 2022 19:36:33 -  1.7
> +++ patches/patch-scripts_mk_util_py  3 May 2022 15:16:12 -
> @@ -1,7 +1,7 @@
>  Index: scripts/mk_util.py
>  --- scripts/mk_util.py.orig
>  +++ scripts/mk_util.py
> -@@ -2478,7 +2478,6 @@ def mk_config():
> +@@ -2573,7 +2573,6 @@ def mk_config():
>   EXAMP_DEBUG_FLAG = '-g'
>   CPPFLAGS = '%s -DZ3DEBUG -D_DEBUG' % CPPFLAGS
>   else:
> @@ -9,7 +9,7 @@ Index: scripts/mk_util.py
>   if GPROF:
>   CXXFLAGS += '-fomit-frame-pointer'
>   CPPFLAGS = '%s -DNDEBUG -D_EXTERNAL_RELEASE' % CPPFLAGS
> -@@ -2491,7 +2490,7 @@ def mk_config():
> +@@ -2586,7 +2585,7 @@ def mk_config():
>   elif sysname == 'Linux':
>   CXXFLAGS   = '%s -D_LINUX_' % CXXFLAGS
>   OS_DEFINES = '-D_LINUX_'
> @@ -18,7 +18,7 @@ Index: scripts/mk_util.py
>   SLIBFLAGS  = '-shared'
>   SLIBEXTRAFLAGS = '%s -Wl,-soname,libz3.so' % SLIBEXTRAFLAGS
>   elif sysname == 'GNU':
> -@@ -2528,9 +2527,9 @@ def mk_config():
> +@@ -2629,9 +2628,9 @@ def mk_config():
>   LIB_EXT= '.lib'
>   else:
>   raise MKException('Unsupported platform: %s' % sysname)




Re: [Update] graphics/glfw 3.3.4 -> 3.3.7

2022-05-03 Thread Gregor Best
Hi,

On Tue, May 03, 2022 at 10:52:07AM -0400, Kurt Mosiejczuk wrote:
> On Fri, Apr 22, 2022 at 07:05:28PM -0400, Kurt Mosiejczuk wrote:
> > This is an update to glfw to 3.3.7
>
> > https://www.glfw.org/changelog.html
>
> > With the new version installed, I was still able to play minecraft
> > without any issues (on amd64).
>
> > ok?
>
> > (cc maintainer)
>
> ping
>
> (Fresh copy attached for convenience)
> [...]

OK with me, FWIW. If it's not too much trouble, can you amend the diff so that 
I'm dropped as the
maintainer? I haven't been as active in OpenBSD on the desktop lately as this 
port deserves.

> --Kurt
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/glfw/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile  11 Mar 2022 19:22:25 -  1.7
> +++ Makefile  21 Apr 2022 18:09:05 -
> @@ -1,5 +1,5 @@
>  COMMENT =open source, multi-platform library for creating windows
> -V =  3.3.4
> +V =  3.3.7
>  DISTNAME =   glfw-${V}
>  CATEGORIES = graphics x11
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/glfw/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo  9 May 2021 05:28:17 -   1.5
> +++ distinfo  21 Apr 2022 18:09:05 -
> @@ -1,2 +1,2 @@
> -SHA256 (glfw-3.3.4.zip) = 
> bbd2c42c660b725e9755eb417e40b373f0d4c03138c9b2e210d02cd308bd99cd
> -SIZE (glfw-3.3.4.zip) = 1444675
> +SHA256 (glfw-3.3.7.zip) = TvDFRKis6abNDgrvglAJD4n+ob+W6fwdnW92OGwpDJw=
> +SIZE (glfw-3.3.7.zip) = 1468890
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: /cvs/ports/graphics/glfw/patches/patch-CMakeLists_txt,v
> retrieving revision 1.5
> diff -u -p -r1.5 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt  11 Mar 2022 19:22:25 -  1.5
> +++ patches/patch-CMakeLists_txt  21 Apr 2022 18:09:05 -
> @@ -1,7 +1,7 @@
>  Index: CMakeLists.txt
>  --- CMakeLists.txt.orig
>  +++ CMakeLists.txt
> -@@ -163,13 +163,6 @@ endif()
> +@@ -168,13 +168,6 @@ endif()
>   # Find and add Unix math and time libraries
>   #
>   if (UNIX AND NOT APPLE)
> Index: patches/patch-src-egl_context-c
> ===
> RCS file: patches/patch-src-egl_context-c
> diff -N patches/patch-src-egl_context-c
> --- patches/patch-src-egl_context-c   11 Mar 2022 19:22:25 -  1.5
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -Index: src/egl_context.c
>  src/egl_context.c.orig
> -+++ src/egl_context.c
> -@@ -655,6 +655,8 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window,
> - _GLFW_OPENGL_LIBRARY,
> - #elif defined(_GLFW_WIN32)
> - #elif defined(_GLFW_COCOA)
> -+#elif defined(__OpenBSD__)
> -+"libGL.so",
> - #else
> - "libGL.so.1",
> - #endif
> Index: patches/patch-src_x11_init_c
> ===
> RCS file: patches/patch-src_x11_init_c
> diff -N patches/patch-src_x11_init_c
> --- patches/patch-src_x11_init_c  11 Mar 2022 19:22:25 -  1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,14 +0,0 @@
> -Fix cursor hiding
> -
> -Index: src/x11_init.c
>  src/x11_init.c.orig
> -+++ src/x11_init.c
> -@@ -710,6 +710,8 @@ static GLFWbool initExtensions(void)
> -
> - #if defined(__CYGWIN__)
> - _glfw.x11.xcursor.handle = _glfw_dlopen("libXcursor-1.so");
> -+#elif defined(__OpenBSD__)
> -+_glfw.x11.xcursor.handle = _glfw_dlopen("libXcursor.so");
> - #else
> - _glfw.x11.xcursor.handle = _glfw_dlopen("libXcursor.so.1");
> - #endif
>

--
Gregor



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/05/03 15:18:30

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.23.5.



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/05/03 15:18:17

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py3-boto3-1.22.5.



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/05/03 15:18:05

Modified files:
net/py-botocore: Makefile distinfo 

Log message:
Update to py3-botocore-1.25.5.



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/05/03 14:34:57

Modified files:
textproc/libxml: Makefile 

Log message:
Bump to be ahead of stable.
An update to 2.9.14 will be committed soon (fixing security issues) but I
am waiting for a bulk to finish.



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/05/03 14:33:44

Modified files:
textproc/libxml: Tag: OPENBSD_7_1 Makefile 
Added files:
textproc/libxml/patches: Tag: OPENBSD_7_1 patch-HTMLparser_c 
 patch-buf_c patch-encoding_c 
 patch-parser_c 
 patch-result_XPath_expr_strings 
 patch-test_XPath_expr_strings 
 patch-tree_c patch-valid_c 
 patch-xpath_c patch-xpointer_c 

Log message:
Merge SECURITY fixes for:
- [CVE-2022-29824] Integer overflow in xmlBuf and xmlBuffer
- Fix potential double-free in xmlXPtrStringRangeFunction
- Fix memory leak in xmlFindCharEncodingHandler
- Normalize XPath strings in-place
- Prevent integer-overflow in htmlSkipBlankChars() and xmlSkipBlankChars()
- Fix leak of xmlElementContent



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Kirill Bychkov
CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2022/05/03 14:08:18

Modified files:
games/fheroes2 : Makefile 

Log message:
Add HOMEPAGE
OK thfr@, maintainer



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/05/03 13:36:38

Modified files:
sysutils/libvirt-python: Makefile distinfo 
sysutils/libvirt-python/pkg: PLIST 

Log message:
Update to py3-libvirt-8.3.0.



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/05/03 13:36:19

Modified files:
sysutils/libvirt: Makefile distinfo 
sysutils/libvirt/patches: patch-meson_build 
sysutils/libvirt/pkg: PLIST 

Log message:
Update to libvirt-8.3.0.



Re: firefox 99.0.1 fails to start on -current

2022-05-03 Thread Mihai Popescu
It starts and runs fine for _me_:

_me_ is:

OpenBSD 7.1-current (GENERIC.MP) #491: Mon May  2 15:33:23 MDT 2022
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 7711170560 (7353MB)
avail mem = 7460143104 (7114MB)
random: good seed from bootblocks
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.7 @ 0xe86ed (64 entries)
bios0: vendor Hewlett-Packard version "K06 v02.77" date 03/22/2018
bios0: Hewlett-Packard HP Compaq Pro 6305 SFF
acpi0 at bios0: ACPI 5.0
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP APIC FPDT MCFG HPET SSDT MSDM TCPA IVRS VFCT
SSDT SSDT CRAT
acpi0: wakeup devices SBAZ(S4) PS2K(S3) PS2M(S3) P0PC(S4) PE20(S4)
PE21(S4) PE22(S4) BNIC(S4) PE23(S4) BR12(S4) BR14(S4) OHC1(S3)
EHC1(S3) OHC2(S3) EHC2(S3) OHC3(S3) [...]
acpitimer0 at acpi0: 3579545 Hz, 32 bits
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 16 (boot processor)
cpu0: AMD A8-5500B APU with Radeon(tm) HD Graphics, 3194.41 MHz, 15-10-01
cpu0: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,POPCNT,AES,XSAVE,AVX,F16C,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,XOP,SKINIT,WDT,FMA4,TCE,NODEID,TBM,TOPEXT,CPCTR,ITSC,BMI1,IBPB
cpu0: 64KB 64b/line 2-way I-cache, 16KB 64b/line 4-way D-cache, 2MB
64b/line 16-way L2 cache
cpu0: ITLB 48 4KB entries fully associative, 24 4MB entries fully associative
cpu0: DTLB 64 4KB entries fully associative, 64 4MB entries fully associative
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
cpu0: apic clock running at 99MHz
cpu0: mwait min=64, max=64, IBE
cpu1 at mainbus0: apid 17 (application processor)
cpu1: AMD A8-5500B APU with Radeon(tm) HD Graphics, 3194.04 MHz, 15-10-01
cpu1: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,POPCNT,AES,XSAVE,AVX,F16C,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,XOP,SKINIT,WDT,FMA4,TCE,NODEID,TBM,TOPEXT,CPCTR,ITSC,BMI1,IBPB
cpu1: 64KB 64b/line 2-way I-cache, 16KB 64b/line 4-way D-cache, 2MB
64b/line 16-way L2 cache
cpu1: ITLB 48 4KB entries fully associative, 24 4MB entries fully associative
cpu1: DTLB 64 4KB entries fully associative, 64 4MB entries fully associative
cpu1: disabling user TSC (skew=125)
cpu1: smt 1, core 0, package 0
cpu2 at mainbus0: apid 18 (application processor)
cpu2: AMD A8-5500B APU with Radeon(tm) HD Graphics, 3194.04 MHz, 15-10-01
cpu2: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,POPCNT,AES,XSAVE,AVX,F16C,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,XOP,SKINIT,WDT,FMA4,TCE,NODEID,TBM,TOPEXT,CPCTR,ITSC,BMI1,IBPB
cpu2: 64KB 64b/line 2-way I-cache, 16KB 64b/line 4-way D-cache, 2MB
64b/line 16-way L2 cache
cpu2: ITLB 48 4KB entries fully associative, 24 4MB entries fully associative
cpu2: DTLB 64 4KB entries fully associative, 64 4MB entries fully associative
cpu2: disabling user TSC (skew=454)
cpu2: smt 0, core 1, package 0
cpu3 at mainbus0: apid 19 (application processor)
cpu3: AMD A8-5500B APU with Radeon(tm) HD Graphics, 3194.05 MHz, 15-10-01
cpu3: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,POPCNT,AES,XSAVE,AVX,F16C,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,XOP,SKINIT,WDT,FMA4,TCE,NODEID,TBM,TOPEXT,CPCTR,ITSC,BMI1,IBPB
cpu3: 64KB 64b/line 2-way I-cache, 16KB 64b/line 4-way D-cache, 2MB
64b/line 16-way L2 cache
cpu3: ITLB 48 4KB entries fully associative, 24 4MB entries fully associative
cpu3: DTLB 64 4KB entries fully associative, 64 4MB entries fully associative
cpu3: smt 1, core 1, package 0
ioapic0 at mainbus0: apid 5 pa 0xfec0, version 21, 24 pins
acpimcfg0 at acpi0
acpimcfg0: addr 0xf000, bus 0-63
acpihpet0 at acpi0: 14318180 Hz
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus -1 (BR13)
acpiprt2 at acpi0: bus -1 (BR15)
acpiprt3 at acpi0: bus -1 (BR16)
acpiprt4 at acpi0: bus -1 (BR17)
acpiprt5 at acpi0: bus 1 (P0PC)
acpiprt6 at acpi0: bus 2 (PE20)
acpiprt7 at acpi0: bus -1 (PE21)
acpiprt8 at acpi0: bus 3 (PE22)
acpiprt9 at acpi0: bus -1 (PE23)
acpiprt10 at acpi0: bus -1 (BR12)
acpiprt11 at acpi0: bus -1 (BR14)
acpipci0 at acpi0 PCI0: 0x 0x0011 0x0001
acpicmos0 at acpi0
com0 at acpi0 UAR1 addr 0x3f8/0x8 irq 4: ns16550a, 16 byte fifo
com1 at acpi0 UAR2 addr 0x2f8/0x8 irq 3: ns16550a, 16 byte fifo
tpm0 at acpi0 TPM_ 1.2 (TIS) addr 0xfed4/0x1, Infineon SLB9635
1.2 rev 0x10
acpibtn0 at acpi0: PWRB
"PNP0C14" at acpi0 not configured
acpicpu0 

offline use of the ports tree (was: Re: 7.1 ports.tar.gz slightly corrupted?)

2022-05-03 Thread Jonathan Thornburg
In ,
Sol??ne Rapenne  wrote
> The ports tree alone isn't helpful without Internet access so I doubt an
> argument like "I can use the tarball offline" make sense.

On the contrary, I would argue that the ports tree (unpacked from the
tarball and/or updated with CVS) *is* useful offline.
I personally often do so; my typical offline usage cases are:
* 'cat pkg/DESCR' to get a brief summary of what a port is and does
* 'less Makefile' to find out a port's current version & patchlevel
* 'cd /usr/ports; make search key=FOO' and/or
  'cd /usr/ports; find . -iname '*FOO*' and/or (if I'm really desperate)
  'cd /usr/ports; find . -name DESCR | xargs egrep -i FOO' or
  'cd /usr/ports; find . -name DESCR | xargs agrep -i2 FOO' to see if
  there are any ports that might be relevant to problem area FOO.
  (There's also sqlports.)  If I find anything potentially interesting
  I can investigate it further/later (which likely requires being online),
  but the search result itself is often useful already.

Keep safe and COVID-free,
--
-- "Jonathan Thornburg [remove -color to reply]" 
   currently on the west coast of Canada
 "Totalitarianism will not be satisfied to assert, in the face of contrary
  facts, that unemployment does not exist; it will abolish unemployment
  benefits as part of its propaganda," -- Hannah Arendt (1951)



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Frederic Cambus
CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2022/05/03 12:24:01

Modified files:
audio/ocp  : Makefile distinfo 
audio/ocp/patches: patch-filesel_cdfs_Makefile 
audio/ocp/pkg  : PLIST 

Log message:
Update ocp to 0.2.96.



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Frederic Cambus
CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2022/05/03 12:23:07

Modified files:
misc/dialog: Makefile distinfo 

Log message:
Update dialog to 1.3-20220414.



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Frederic Cambus
CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2022/05/03 12:21:44

Modified files:
lang/clisp : Makefile 

Log message:
Follow redirects chain for HOMEPAGE, point to SourceForge directly.



Re: [new] net/gmid -- a gemini server

2022-05-03 Thread Stuart Henderson
On 2022/05/02 21:25, Omar Polo wrote:
> here's another try for net/gmid

: @newuser _gmid:878:878:default:Gmid User:/var/empty:/sbin/nologin

just blank rather than "default", i.e.

@newuser _gmid:878:878::Gmid User:/var/empty:/sbin/nologin

: daemon="${LOCALBASE}/bin/gmid"
: daemon_flags="-c /etc/gmid.conf"

if it's using variables then it should be ${TRUEPREFIX}, ${SYSCONFDIR}
for these two

(if it's not using variables then probably better not to have some lines
using vars and some not)



Re: [new] www/py-httpretty-1.1.4

2022-05-03 Thread Stuart Henderson
On 2022/05/02 23:55, portno12 wrote:
> created by portgen and seems fine on amd64, no tests due to needing a lot of 
> new or updated ports. its a dep for another port i am working on so will get 
> tested via that soon

portgen isn't really good at python ports at the moment.

Here are some changes on top and the 1 new port needed to enable most
tests.

diff --git www/py-httpretty/Makefile www/py-httpretty/Makefile
index f29b61f..8d28950 100644
--- www/py-httpretty/Makefile
+++ www/py-httpretty/Makefile
@@ -16,12 +16,22 @@ MODULES =   lang/python
 
 MODPY_PI = Yes
 MODPY_SETUPTOOLS = Yes
-MODPY_TEST =   Yes
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+MODPY_PYTEST = Yes
 
-# many test deps either need ported or updated
-NO_TEST =  Yes
+# need https, eventlet - not ported
+MODPY_PYTEST_ARGS =--ignore tests/bugfixes/nosetests/test_414_httpx.py \
+   --ignore tests/bugfixes/nosetests/test_eventlet.py \
+   --ignore tests/functional/test_httplib2.py
+
+FLAVOR =   python3
+FLAVORS =  python3
+
+TEST_DEPENDS = devel/py-freezegun${MODPY_FLAVOR} \
+   devel/py-sure${MODPY_FLAVOR} \
+   net/py-boto3${MODPY_FLAVOR} \
+   www/py-httplib2${MODPY_FLAVOR} \
+   www/py-tornado${MODPY_FLAVOR}
 
-# Lines below not in the template
 FIX_EXTRACT_PERMISSIONS =  Yes
+
 .include 



py-sure.tgz
Description: application/tar-gz


[UPDATE] math/z3 to 4.8.16

2022-05-03 Thread Frederic Cambus
Hi ports@,

Here is a diff to update z3 to 4.8.16.

Some functions have been removed from the library, so a major bump
is needed.

Comments? OK?

Index: Makefile
===
RCS file: /cvs/ports/math/z3/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile11 Mar 2022 19:36:33 -  1.25
+++ Makefile3 May 2022 15:16:12 -
@@ -1,6 +1,6 @@
 COMMENT =  Z3 theorem prover
 
-VERSION =  4.8.9
+VERSION =  4.8.16
 
 GH_ACCOUNT =   Z3Prover
 GH_PROJECT =   z3
@@ -8,9 +8,8 @@ GH_TAGNAME =${GH_PROJECT}-${VERSION}
 
 DISTNAME = ${GH_TAGNAME}
 PKGNAME =  ${DISTNAME:L}
-REVISION = 0
 
-SHARED_LIBS =  z3  2.2 # 4.8
+SHARED_LIBS =  z3  3.0 # 4.8
 
 CATEGORIES =   math
 
Index: distinfo
===
RCS file: /cvs/ports/math/z3/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo18 Sep 2020 07:52:58 -  1.9
+++ distinfo3 May 2022 15:16:12 -
@@ -1,2 +1,2 @@
-SHA256 (z3-4.8.9.tar.gz) = yf0EubM750//qsPsK8LDINGkzDLjlSA8VRJrEqFP8/Q=
-SIZE (z3-4.8.9.tar.gz) = 4624159
+SHA256 (z3-4.8.16.tar.gz) = dfleCfPzX+90blcdXsiKTvuifxvI8aDvERcWdIbsPcY=
+SIZE (z3-4.8.16.tar.gz) = 5223980
Index: patches/patch-scripts_mk_util_py
===
RCS file: /cvs/ports/math/z3/patches/patch-scripts_mk_util_py,v
retrieving revision 1.7
diff -u -p -r1.7 patch-scripts_mk_util_py
--- patches/patch-scripts_mk_util_py11 Mar 2022 19:36:33 -  1.7
+++ patches/patch-scripts_mk_util_py3 May 2022 15:16:12 -
@@ -1,7 +1,7 @@
 Index: scripts/mk_util.py
 --- scripts/mk_util.py.orig
 +++ scripts/mk_util.py
-@@ -2478,7 +2478,6 @@ def mk_config():
+@@ -2573,7 +2573,6 @@ def mk_config():
  EXAMP_DEBUG_FLAG = '-g'
  CPPFLAGS = '%s -DZ3DEBUG -D_DEBUG' % CPPFLAGS
  else:
@@ -9,7 +9,7 @@ Index: scripts/mk_util.py
  if GPROF:
  CXXFLAGS += '-fomit-frame-pointer'
  CPPFLAGS = '%s -DNDEBUG -D_EXTERNAL_RELEASE' % CPPFLAGS
-@@ -2491,7 +2490,7 @@ def mk_config():
+@@ -2586,7 +2585,7 @@ def mk_config():
  elif sysname == 'Linux':
  CXXFLAGS   = '%s -D_LINUX_' % CXXFLAGS
  OS_DEFINES = '-D_LINUX_'
@@ -18,7 +18,7 @@ Index: scripts/mk_util.py
  SLIBFLAGS  = '-shared'
  SLIBEXTRAFLAGS = '%s -Wl,-soname,libz3.so' % SLIBEXTRAFLAGS
  elif sysname == 'GNU':
-@@ -2528,9 +2527,9 @@ def mk_config():
+@@ -2629,9 +2628,9 @@ def mk_config():
  LIB_EXT= '.lib'
  else:
  raise MKException('Unsupported platform: %s' % sysname)



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Kirill Bychkov
CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2022/05/03 11:03:38

Modified files:
www/goaccess   : Makefile distinfo 

Log message:
update to goaccess-1.5.7



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/05/03 10:26:52

Modified files:
sysutils/exoscale-cli: Makefile distinfo 

Log message:
Update to exoscale-cli-1.54.0.



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/05/03 10:21:40

Modified files:
x11/gtk3mm : Makefile distinfo 

Log message:
Update to gtk3mm-3.24.6.



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/05/03 09:55:30

Modified files:
devel/glib2mm  : Makefile distinfo 

Log message:
update to glib2mm-2.66.3.



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/05/03 09:46:54

Modified files:
security/openssl/3.0: Tag: OPENBSD_7_1 Makefile 

Log message:
MFC: OpenSSL 3.0: minor bump due to addition of OPENSSL_str{,n}casecmp()



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/05/03 09:45:56

Modified files:
security/openssl/3.0: Makefile 

Log message:
OpenSSL 3.0: missed minor bump due to addition of OPENSSL_str{,n}casecmp()



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Frederic Cambus
CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2022/05/03 09:39:24

Modified files:
textproc/lowdown: Makefile distinfo 
textproc/lowdown/pkg: PLIST 

Log message:
Update lowdown to 0.10.0.

>From Justin Berthault, thanks!

OK Bryan Vyhmeister (MAINTAINER).



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/05/03 09:31:53

Modified files:
misc/hwdata: Makefile distinfo 

Log message:
Update to hwdata-0.359.



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/05/03 09:28:30

Modified files:
multimedia/gstreamer1: Makefile.inc 
multimedia/gstreamer1/core: Makefile distinfo 
multimedia/gstreamer1/core/pkg: PLIST 
multimedia/gstreamer1/plugins-bad: Makefile distinfo 
multimedia/gstreamer1/plugins-base: Makefile distinfo 
multimedia/gstreamer1/plugins-good: distinfo 
multimedia/gstreamer1/plugins-good/patches: 

patch-ext_soup_gstsouploader_c 
multimedia/gstreamer1/plugins-libav: distinfo 
multimedia/gstreamer1/plugins-ugly: distinfo 
multimedia/gstreamer1/py-gstreamer: distinfo 

Log message:
Update Gstreamer stack to version 1.20.2.



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/05/03 09:28:19

Modified files:
security/openssl/1.1: Makefile 

Log message:
OpenSSL 1.1: bump to be ahead of -stable



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/05/03 09:27:52

Modified files:
security/openssl/3.0: Makefile 

Log message:
OpenSSL 3.0: bump to be ahead of -stable



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Frederic Cambus
CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2022/05/03 09:27:52

Modified files:
emulators/mame : Makefile distinfo 
emulators/mame/patches: patch-scripts_genie_lua 

Log message:
Update mame to 0.243.



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/05/03 09:25:23

Modified files:
security/sslscan: Tag: OPENBSD_7_1 Makefile 

Log message:
sslscan: bump after openssl update (static linking)



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/05/03 09:24:04

Modified files:
security/openssl/1.1: Tag: OPENBSD_7_1 Makefile distinfo 

Log message:
MFC: Update to OpenSSL 1.1.1o

c_rehash command injection
https://www.openssl.org/news/secadv/20220503.txt



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/05/03 09:23:28

Modified files:
security/openssl/3.0: Tag: OPENBSD_7_1 Makefile distinfo 
security/openssl/3.0/pkg: Tag: OPENBSD_7_1 PLIST 
Removed files:
security/openssl/3.0/patches: Tag: OPENBSD_7_1 
  patch-ssl_ssl_txt_c 

Log message:
MFC: Update to openssl 3.0.3

c_rehash command injection, OCSP basic verify, and a few low severity
issues.

https://www.openssl.org/news/secadv/20220503.txt



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/05/03 09:15:11

Modified files:
security/sslscan: Makefile 

Log message:
sslscan: bump after openssl 1.1.1 update (static linking)



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/05/03 09:14:28

Modified files:
security/openssl/1.1: Makefile distinfo 

Log message:
Update to OpenSSL 1.1.1o

c_rehash command injection
https://www.openssl.org/news/secadv/20220503.txt



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/05/03 09:13:11

Modified files:
security/openssl/3.0: Makefile distinfo 
security/openssl/3.0/pkg: PLIST 
Removed files:
security/openssl/3.0/patches: patch-ssl_ssl_txt_c 

Log message:
Update to openssl 3.0.3

c_rehash command injection, OCSP basic verify, and a few low severity
issues.

https://www.openssl.org/news/secadv/20220503.txt



Re: [Update] graphics/glfw 3.3.4 -> 3.3.7

2022-05-03 Thread Kurt Mosiejczuk
On Fri, Apr 22, 2022 at 07:05:28PM -0400, Kurt Mosiejczuk wrote:
> This is an update to glfw to 3.3.7

> https://www.glfw.org/changelog.html

> With the new version installed, I was still able to play minecraft
> without any issues (on amd64).

> ok?

> (cc maintainer)

ping

(Fresh copy attached for convenience)

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/graphics/glfw/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile11 Mar 2022 19:22:25 -  1.7
+++ Makefile21 Apr 2022 18:09:05 -
@@ -1,5 +1,5 @@
 COMMENT =  open source, multi-platform library for creating windows
-V =3.3.4
+V =3.3.7
 DISTNAME = glfw-${V}
 CATEGORIES =   graphics x11
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/glfw/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo9 May 2021 05:28:17 -   1.5
+++ distinfo21 Apr 2022 18:09:05 -
@@ -1,2 +1,2 @@
-SHA256 (glfw-3.3.4.zip) = 
bbd2c42c660b725e9755eb417e40b373f0d4c03138c9b2e210d02cd308bd99cd
-SIZE (glfw-3.3.4.zip) = 1444675
+SHA256 (glfw-3.3.7.zip) = TvDFRKis6abNDgrvglAJD4n+ob+W6fwdnW92OGwpDJw=
+SIZE (glfw-3.3.7.zip) = 1468890
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/graphics/glfw/patches/patch-CMakeLists_txt,v
retrieving revision 1.5
diff -u -p -r1.5 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt11 Mar 2022 19:22:25 -  1.5
+++ patches/patch-CMakeLists_txt21 Apr 2022 18:09:05 -
@@ -1,7 +1,7 @@
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -163,13 +163,6 @@ endif()
+@@ -168,13 +168,6 @@ endif()
  # Find and add Unix math and time libraries
  #
  if (UNIX AND NOT APPLE)
Index: patches/patch-src-egl_context-c
===
RCS file: patches/patch-src-egl_context-c
diff -N patches/patch-src-egl_context-c
--- patches/patch-src-egl_context-c 11 Mar 2022 19:22:25 -  1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-Index: src/egl_context.c
 src/egl_context.c.orig
-+++ src/egl_context.c
-@@ -655,6 +655,8 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window,
- _GLFW_OPENGL_LIBRARY,
- #elif defined(_GLFW_WIN32)
- #elif defined(_GLFW_COCOA)
-+#elif defined(__OpenBSD__)
-+"libGL.so",
- #else
- "libGL.so.1",
- #endif
Index: patches/patch-src_x11_init_c
===
RCS file: patches/patch-src_x11_init_c
diff -N patches/patch-src_x11_init_c
--- patches/patch-src_x11_init_c11 Mar 2022 19:22:25 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-Fix cursor hiding
-
-Index: src/x11_init.c
 src/x11_init.c.orig
-+++ src/x11_init.c
-@@ -710,6 +710,8 @@ static GLFWbool initExtensions(void)
- 
- #if defined(__CYGWIN__)
- _glfw.x11.xcursor.handle = _glfw_dlopen("libXcursor-1.so");
-+#elif defined(__OpenBSD__)
-+_glfw.x11.xcursor.handle = _glfw_dlopen("libXcursor.so");
- #else
- _glfw.x11.xcursor.handle = _glfw_dlopen("libXcursor.so.1");
- #endif



Re: 7.1 ports.tar.gz slightly corrupted?

2022-05-03 Thread Stuart Henderson
On 2022/05/03 15:13, Solène Rapenne wrote:
> Le Tue, 3 May 2022 14:10:19 +0100,
> Stuart Henderson  a écrit :
> 
> > On 2022/05/02 20:35, Jonathan Thornburg wrote:
> > > The 7.1 ports.tar.gz (I tried downloading from both
> > >   https://ftp.openbsd.org/pub/OpenBSD/
> > >   https://openbsd.cs.toronto.edu/pub/OpenBSD/
> > > and verified that they gave identical files; checksums are below)
> > > appears to have a slightly corrupted 'graphics/libraw' port:
> > > 
> > >   % /bin/tar xzf /tmp/ports.tar.gz
> > >   % cd ports
> > >   % ls -d g*
> > >   games/geo/  gnome/graphics/ grapics/
> > > 
> > > I was curious about the directory name 'grapics' (which looks like a
> > > 1-letter typo from 'graphics'), so I looked around.  'grapics' contains
> > > only a single port, libraw, and that port is missing various files:  
> > 
> > These directories are present in the cvs tree due to broken imports in the
> > past (there are a bunch of others). This one was from 2010. I think that
> > when the tar was created it was done from a checkout without -d.
> > 
> > It also misses some files with names which are too long for the default
> > tar format.
> > 
> > I recommend ignoring this file and doing a checkout from anoncvs.
> > 
> 
> Should we continue to distribute that file is it's broken due to tar
> limitations?

Another option would be to distribute a file that works ok with OpenBSD
(and FreeBSD, but not GNU) tar:

cd /usr/ports
cvs up -Pd -r OPENBSD_X_Y_BASE
cd ..
pax -x cpio -w ports | gzip -9 > ports.tar.gz

A better option would be to add support for writing extended headers
in tar(1), it already handles reading them (so, if the tree was archived
with bsdtar/gtar which do this it would include all the files and tar(1)
could unpack them OK, but using a non-OpenBSD archiver to produce a
file distributed by OpenBSD would be quite distasteful).

anoncvs is usually not all that slow though.



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/05/03 07:37:13

Modified files:
www/firefox-esr: Tag: OPENBSD_7_1 Makefile distinfo 

Log message:
www/firefox-esr: MFC update to 91.9.0.

see https://www.mozilla.org/en-US/firefox/91.9.0/releasenotes/
fixes https://www.mozilla.org/en-US/security/advisories/mfsa2022-17/



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/05/03 07:36:29

Modified files:
www/firefox-esr: Makefile distinfo 
www/firefox-esr-i18n: Makefile.inc distinfo 

Log message:
www/firefox-esr: update to 91.9.0.

see https://www.mozilla.org/en-US/firefox/91.9.0/releasenotes/
fixes https://www.mozilla.org/en-US/security/advisories/mfsa2022-17/



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/05/03 07:34:59

Modified files:
www/mozilla-firefox: Makefile distinfo 
www/mozilla-firefox/patches: 
 
patch-toolkit_system_gnome_nsGIOService_cpp 
www/firefox-i18n: Makefile.inc distinfo 
Removed files:
www/mozilla-firefox/patches: 
 patch-widget_nsPrintSettingsImpl_cpp 

Log message:
www/mozilla-firefox: update to 100.0.

see https://www.mozilla.org/en-US/firefox/100.0/releasenotes/
fixes https://www.mozilla.org/en-US/security/advisories/mfsa2022-16/



Re: UPDATE: lang/ldc 1.28.0 => 1.29.0

2022-05-03 Thread Ryan Boggs
On Mon, Apr 18, 2022, 5:32 PM Ryan Boggs  wrote:

>
>
> On Mon, Apr 18, 2022, 4:25 PM Brian Callahan  wrote:
>
>> On 4/14/2022 2:57 PM, Brian Callahan wrote:
>> > Hi Ryan --
>> >
>> > On 4/14/2022 1:58 PM, Ryan Boggs wrote:
>> >> Hi Brian,
>> >>
>> >> On Tue, Apr 12, 2022 at 6:42 PM Brian Callahan 
>> wrote:
>> >>>
>> >>> Hi ports --
>> >>>
>> >>> Here is a diff to update the LDC compiler.
>> >>> The big changelog is here:
>> >>> https://github.com/ldc-developers/ldc/releases/tag/v1.29.0
>> >>>
>> >>> All is good on my machine, looking for tests/oks.
>> >> This failed for me during the build of ldc-build-runtime complaining
>> >> about undefined symbols.  Is there something else I need to set for
>> >> this to build successfully?  Please let me know.
>> >>
>> >
>> > Can you send me a build log off-list? That way I can cross-reference
>> > what I have here.
>> >
>> > Thanks.
>> >
>> > ~Brian
>> >
>>
>> New diff attached to fix a build error if you have the old LDC 1.28.0
>> installed on your system. Problem found the hard way by Ryan Boggs.
>>
>> OK?
>>
> Finally builds and installs as ot is supposed to.  ;)  Tested with simple
> project and works as expected.
>
> Thanks for fixing this one Brian.
>
> Thanks,
> Ryan
>
>>
>> ~Brian
>
>
Ping?

Thanks,
Ryan

>


CVS: cvs.openbsd.org: ports

2022-05-03 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/05/03 07:33:11

Modified files:
security/nss   : Makefile distinfo 

Log message:
security/nss: update to 3.78

see https://firefox-source-docs.mozilla.org/security/nss/releases/nss_3_78.html



Re: 7.1 ports.tar.gz slightly corrupted?

2022-05-03 Thread Theo de Raadt
> Should we continue to distribute that file is it's broken due to tar
> limitations?

Yes, we should.  People can extract the tar, then update on top of it, and
at minimum this is much faster.  At maximum, the small amounts of damage
people find in the tar file are not going to hurt the majority.



Re: 7.1 ports.tar.gz slightly corrupted?

2022-05-03 Thread Stuart Henderson
On 2022/05/02 20:35, Jonathan Thornburg wrote:
> The 7.1 ports.tar.gz (I tried downloading from both
>   https://ftp.openbsd.org/pub/OpenBSD/
>   https://openbsd.cs.toronto.edu/pub/OpenBSD/
> and verified that they gave identical files; checksums are below)
> appears to have a slightly corrupted 'graphics/libraw' port:
> 
>   % /bin/tar xzf /tmp/ports.tar.gz
>   % cd ports
>   % ls -d g*
>   games/geo/  gnome/graphics/ grapics/
> 
> I was curious about the directory name 'grapics' (which looks like a
> 1-letter typo from 'graphics'), so I looked around.  'grapics' contains
> only a single port, libraw, and that port is missing various files:

These directories are present in the cvs tree due to broken imports in the
past (there are a bunch of others). This one was from 2010. I think that
when the tar was created it was done from a checkout without -d.

It also misses some files with names which are too long for the default
tar format.

I recommend ignoring this file and doing a checkout from anoncvs.



Re: Is there a way to display the block of another man page inside a man page

2022-05-03 Thread Ingo Schwarze
Hi,

Tilo Stritzky wrote on Tue, May 03, 2022 at 08:45:05AM +0200:
> On 02/05/22 01:46  Tom Smyth wrote:

>> while documenting nsh and its features,
>> I wanted to display the command switches of telnet command inside the
>> manual page for nsh,

> Within more/less you can get a shell by typing:
> |.command
> [pipe + period + command]
> 
> That way you can nest as many manpages as you like in a single terminal.

I have rarely seen worse advice regarding the design and writing of
manual pages.

To start with, Tom's idea of including substantial parts of the text
of one manual page into another one was a bad idea, and he already
admitted as much and settled for a much better solution for his
actual task.

Then, even if your idea worked, it would include the whole manual,
including even headers and footers, and not just the parts Tom asked
for.

Most importantly, the mdoc(7) source code of a manual page obviously
cannot issue less(1) commands.  If it could, that would be a major
security hole in mandoc(1), so massive that it would probably be the
first time ever that a mandoc bug would have to be fixed by an
OpenBSD erratum.  Or would that be a bug in less(1)?  Likely, but
probably an erratum either way.

To go on, for security reasons, the OpenBSD version of less(1) does
not support escaping to a shell.  If you press the "exclamation mark"
key in OpenBSD less(1), it just beeps and does nothing.

Even on Linux, your advice does not work:

   $ uname -a
  Linux login-1 4.19.0-13-amd64 #1 SMP Debian 4.19.160-2
(2020-11-28) x86_64 GNU/Linux
   $ man man
  [...]
  [ optionally hit the space bar here ]
  [ now type !.ls as you suggested and hit RETURN ]
  /bin/sh: 1: .ls: not found
  !done  (press RETURN)
  [ press the RETURN KEY]
  [...]
  Manual page man(1) line 80 (press h for help or q to quit)
  [ now type !ls (without the dot) and hit RETURN ]
  [ it now displays a list of my files, then ]
  !done  (press RETURN)
  [ press the RETURN KEY]
  [...]
  Manual page man(1) line 80 (press h for help or q to quit)

Of course, even without your "period" (no idea where you got that from),
it does not display anything "inside the manual page" but switches back
and forth between either displaying the manual page or displaying the
result of the shell command.

Please guys, when you provide advice to others on our mailing lists,
you should at least bother to test your own advice before posting.

Yours,
  Ingo



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/05/03 04:34:14

Modified files:
games/renpy: Makefile 

Log message:
This doesn't need x11/gnome/zenity anymore.



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/05/03 04:26:48

Modified files:
net/netatalk3  : Makefile distinfo 
net/netatalk3/patches: patch-contrib_shell_utils_afpstats 
   patch-etc_netatalk_Makefile_in 
Added files:
net/netatalk3/patches: 
   patch-contrib_shell_utils_asip-status_pl_in 
   patch-doc_manpages_man1_asip-status_pl_1_xml 
   patch-etc_afpd_directory_h 
   patch-man_man1_asip-status_pl_1_in 

Log message:
Revert to netatalk-3.1.12.
While there are known security issues in this release, 3.1.13 is not functionnal
and segfault pretty fast. Netatalk should only be used in trusted local network
anyway.
https://sourceforge.net/p/netatalk/bugs/670/
https://sourceforge.net/p/netatalk/bugs/669/
https://github.com/Netatalk/Netatalk/issues/175

Work is ongoing and a fix is being tested.

While here, add a fix to use perl Net::Socket::IP and make sure tracker3 is not
picked up.
Bump to be ahead of -stable.



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/05/03 04:25:18

Modified files:
net/netatalk3  : Tag: OPENBSD_7_1 Makefile distinfo 
net/netatalk3/patches: Tag: OPENBSD_7_1 
   patch-etc_netatalk_Makefile_in 
Added files:
net/netatalk3/patches: Tag: OPENBSD_7_1 
   patch-etc_afpd_directory_h 

Log message:
Revert to netatalk-3.1.12.
While there are known security issues in this release, 3.1.13 is not functionnal
and segfault pretty fast. Netatalk should only be used in trusted local network
anyway.
https://sourceforge.net/p/netatalk/bugs/670/
https://sourceforge.net/p/netatalk/bugs/669/
https://github.com/Netatalk/Netatalk/issues/175

Work is ongoing and a fix is being tested.



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/05/03 01:59:09

Modified files:
security/py-cryptography: Makefile distinfo 
security/py-cryptography_vectors: Makefile distinfo 

Log message:
update to py3-cryptography-37.0.1



CVS: cvs.openbsd.org: ports

2022-05-03 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/05/03 01:57:43

Modified files:
security/py-bcrypt: Makefile distinfo 
security/py-bcrypt/pkg: PLIST 

Log message:
update to py3-bcrypt-3.2.2



Re: Is there a way to display the block of another man page inside a man page

2022-05-03 Thread Tilo Stritzky
On 02/05/22 01:46  Tom Smyth wrote:
> Hello,
> while documenting nsh and its features,
> I wanted to  display the command switches of telnet command inside the
> manual page for nsh,

Within more/less you can get a shell by typing:
|.command

[pipe + period + command]

That way you can nest as many manpages as you like in a single terminal.

tilo