sparc64 bulk build report

2022-09-13 Thread kmos 
Bulk build on sparc64-0a.ports.openbsd.org

Started : Sat Sep 10 22:09:09 MDT 2022
Finished: Tue Sep 13 22:55:18 MDT 2022
Duration: 3 Days 0 hours 46 minutes

Built using OpenBSD 7.2-beta (GENERIC.MP) #1448: Sat Sep 10 13:40:02 MDT 2022

Built 9363 packages

Number of packages built each day:
Sep 10: 2745
Sep 11: 5412
Sep 12: 1080
Sep 13: 126



Critical path missing pkgs:
http://build-failures.rhaalovely.net/sparc64/2022-09-10/summary.log

Build failures: 45
http://build-failures.rhaalovely.net/sparc64/2022-09-10/cad/dxf2gcode.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/cad/oce.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/databases/recoll.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/devel/avr/gcc.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/devel/clang-tools-extra.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/devel/jdk/1.8.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/devel/kf5/kio.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/devel/libdispatch.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/devel/qcoro.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/devel/quirks.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/devel/xsd.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/editors/kakoune.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/games/arx-libertatis.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/games/gargoyle.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/games/mvdsv.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/geo/pdal.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/graphics/aspect-crop.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/graphics/asymptote.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/graphics/birdfont.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/graphics/gimp/snapshot.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/graphics/makehuman.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/graphics/opencolorio.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/graphics/posterazor.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/graphics/webp-pixbuf-loader.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/inputmethods/libime.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/mail/mu.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/math/igraph.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/misc/open62541.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/multimedia/mkvtoolnix.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/net/irssi.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/productivity/gnucash.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/security/clamav.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/security/keepassxc,yubikey.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/security/veracrypt.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/telephony/asterisk/16.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/telephony/asterisk/18.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/telephony/asterisk/19.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/textproc/libmarisa.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/textproc/xxdiff.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/www/unit/unit-ruby.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/x11/gnome/console.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/x11/gnome/gjs.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/x11/gnome/secrets.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/x11/lumina.log
http://build-failures.rhaalovely.net/sparc64/2022-09-10/x11/qt5/qttranslations.log

Recurrent failures:
 failures/cad/oce.log
 failures/databases/recoll.log
 failures/devel/avr/gcc.log
 failures/devel/kf5/kio.log
 failures/devel/libdispatch.log
 failures/devel/qcoro.log
 failures/devel/xsd.log
 failures/games/arx-libertatis.log
 failures/games/gargoyle.log
 failures/games/mvdsv.log
 failures/graphics/aspect-crop.log
 failures/graphics/asymptote.log
 failures/graphics/birdfont.log
 failures/graphics/makehuman.log
 failures/graphics/opencolorio.log
 failures/graphics/posterazor.log
 failures/graphics/webp-pixbuf-loader.log
 failures/inputmethods/libime.log
 failures/mail/mu.log
 failures/misc/open62541.log
 failures/multimedia/mkvtoolnix.log
 failures/net/irssi.log
 failures/productivity/gnucash.log
 failures/security/clamav.log
 failures/security/keepassxc,yubikey.log
 failures/security/veracrypt.log
 failures/telephony/asterisk/16.log
 failures/telephony/asterisk/18.log
 failures/telephony/asterisk/19.log
 failures/textproc/libmarisa.log
 failures/textproc/xxdiff.log
 failures/www/unit/unit-ruby.log
 failures/x11/gnome/console

[update] emacs-28.2

2022-09-13 Thread Timo Myyrä 
Hi,

I'd like to see latest emacs in 7.2 release. Here's update to latest
28.2 which was minor release focused on fixing bugs. Works for me on
amd64 with gtk3 flavor.

Timo

diff /usr/ports
commit - b5573adcb9ec5d1af5faa614d573d3c4f66faf53
path + /usr/ports
blob - 0e98a6ae4357a3f36db5187d58ff0b150a2fa8f6
file + editors/emacs/Makefile
--- editors/emacs/Makefile
+++ editors/emacs/Makefile
@@ -1,6 +1,6 @@
 COMMENT=   GNU editor: extensible, customizable, self-documenting
 
-VERSION=   28.1
+VERSION=   28.2
 DISTNAME=  emacs-${VERSION}
 
 CATEGORIES=editors
@@ -27,7 +27,8 @@ GCCARCH=  ${MACHINE_ARCH}-unknown-openbsd
 CONFIGURE_STYLE=   gnu
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/build-aux
 CONFIGURE_ARGS=--build="${GCCARCH}" \
-   --without-sound
+   --without-sound \
+   --without-native-compilation
 
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
blob - f0f4496ccf69ed3c9680d987f261312d0cf1d56f
file + editors/emacs/distinfo
--- editors/emacs/distinfo
+++ editors/emacs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (emacs-28.1.tar.xz) = KLGz0JkDegiPCkyiUdfnJi6rXqFneqv/psRCaWGtdeE=
-SIZE (emacs-28.1.tar.xz) = 47699512
+SHA256 (emacs-28.2.tar.xz) = 7iEYIjPvMjLcl7SGry2G4UBC27ZbvFNd9WLDqFgjJIg=
+SIZE (emacs-28.2.tar.xz) = 47722600
blob - ecfec6ea57f35c450a7d7151a49b311d77e976ad
file + editors/emacs/patches/patch-lisp_files_el
--- editors/emacs/patches/patch-lisp_files_el
+++ editors/emacs/patches/patch-lisp_files_el
@@ -3,7 +3,7 @@
 Index: lisp/files.el
 --- lisp/files.el.orig
 +++ lisp/files.el
-@@ -2918,6 +2918,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB
+@@ -2919,6 +2919,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CB
   ("\\.\\(as\\|mi\\|sm\\)2\\'" . snmpv2-mode)
   ("\\.\\(diffs?\\|patch\\|rej\\)\\'" . diff-mode)
   ("\\.\\(dif\\|pat\\)\\'" . diff-mode) ; for MS-DOS
blob - ffe5d789b5333e8f9e5c043534746f9c3fce45eb
file + editors/emacs/patches/patch-src_emacs_c
--- editors/emacs/patches/patch-src_emacs_c
+++ editors/emacs/patches/patch-src_emacs_c
@@ -3,7 +3,7 @@ Don't use printf %n.
 Index: src/emacs.c
 --- src/emacs.c.orig
 +++ src/emacs.c
-@@ -2742,21 +2742,13 @@ shut_down_emacs (int sig, Lisp_Object stuff)
+@@ -2746,21 +2746,13 @@ shut_down_emacs (int sig, Lisp_Object stuff)
reset_all_sys_modes ();
if (sig && sig != SIGTERM)
{
blob - e9cfe21585d748e19f19862e9b1bbdb2e433f389
file + editors/emacs/pkg/PLIST
--- editors/emacs/pkg/PLIST
+++ editors/emacs/pkg/PLIST
@@ -80,8 +80,6 @@ include/emacs-module.h
 @info info/widget.info
 @info info/wisent.info
 @info info/woman.info
-lib/systemd/
-lib/systemd/user/
 lib/systemd/user/emacs.service
 libexec/emacs/
 libexec/emacs/${VERSION}/
@@ -96,7 +94,6 @@ libexec/emacs/${VERSION}/${GCCARCH}/rcs2log
 @man man/man1/emacsclient.1
 @man man/man1/etags.1
 share/doc/pkg-readmes/${PKGSTEM}
-share/emacs/
 share/emacs/${VERSION}/
 share/emacs/${VERSION}/etc/
 share/emacs/${VERSION}/etc/AUTHORS
@@ -3810,6 +3807,8 @@ share/emacs/${VERSION}/lisp/term/common-win.el.gz
 share/emacs/${VERSION}/lisp/term/common-win.elc
 share/emacs/${VERSION}/lisp/term/cygwin.el.gz
 share/emacs/${VERSION}/lisp/term/cygwin.elc
+share/emacs/${VERSION}/lisp/term/fbterm.el.gz
+share/emacs/${VERSION}/lisp/term/fbterm.elc
 share/emacs/${VERSION}/lisp/term/internal.el.gz
 share/emacs/${VERSION}/lisp/term/internal.elc
 share/emacs/${VERSION}/lisp/term/iris-ansi.el.gz
@@ -4173,7 +4172,6 @@ share/emacs/${VERSION}/lisp/xwidget.el.gz
 share/emacs/${VERSION}/lisp/xwidget.elc
 share/emacs/${VERSION}/site-lisp/
 share/emacs/${VERSION}/site-lisp/subdirs.el
-share/emacs/site-lisp/
 share/emacs/site-lisp/subdirs.el
 share/metainfo/
 share/metainfo/emacs.metainfo.xml

cups, libusb1, Backend returned status -139 (crashed), /usb.core

2022-09-13 Thread Mikolaj Kucharski 
Hi,

I configured cups as network printer around beginning of 2022. Few
months later I've noticed coredump at /usb.core. Then it took me a while
to collect what I have so far. I don't know when this started, but I
assume from day one, when I've setup cups as a remote.

I imagine it will take me a while to troubleshoot this and I will
probably need some guidenance. I know we are pre-release, I'm not
in rush to fix this, but I finally collected enough into to write
this email.

Any clue what could be the problem here?


pce-0035# pkg_info -qI cups cups-libs cups-filters libusb1 debug-cups 
debug-cups-libs debug-cups-filters debug-libusb1
cups-2.4.2p0
cups-libs-2.4.2
cups-filters-1.28.16
libusb1-1.0.23p2-debug
debug-cups-2.4.2p0
debug-cups-libs-2.4.2
debug-cups-filters-1.28.16
debug-libusb1-1.0.23p2-debug

pce-0035# ls -l /usb.core
-rw---  1 root  wheel  2405480 Sep 13 16:09 /usb.core

pce-0035# ls -l /usr/local/libexec/cups/backend/usb
-rwxr--r--  1 root  bin  38702 Aug 31 11:36 /usr/local/libexec/cups/backend/usb

pce-0035# egdb /usr/local/libexec/cups/backend/usb /usb.core
GNU gdb (GDB) 9.2
...

For help, type "help".
Type "apropos word" to search for commands related to "word"...
Reading symbols from /usr/local/libexec/cups/backend/usb...
Reading symbols from /usr/local/libexec/cups/backend/.debug/usb.dbg...
[New process 244617]
[New process 426606]
Core was generated by `usb'.
Program terminated with signal SIGSEGV, Segmentation fault.
#0  0x0118371b4360 in list_del (entry=) at ./libusbi.h:163
163 ./libusbi.h: No such file or directory.
[Current thread is 1 (process 244617)]
(gdb) bt
#0  0x0118371b4360 in list_del (entry=) at ./libusbi.h:163
#1  remove_from_flying_list (transfer=0x118a9179600) at io.c:1465
#2  libusb_submit_transfer (transfer=0x118a9179650) at io.c:1559
#3  0x0118371b64cd in do_sync_bulk_transfer (dev_handle=, 
endpoint=129 '\201', buffer=0x1190a6a5850 "", length=512, 
transferred=0x1190a6a5a5c, timeout=6, type=2 '\002') at sync.c:193
#4  0x0118371b63fe in libusb_bulk_transfer (dev_handle=0x1184e1f8b40, 
endpoint=129 '\201', data=0x2 , 
length=0, transferred=0x0, timeout=1236779248) at sync.c:281
#5  0x01162dd39d28 in read_thread (reference=) at 
./usb-libusb.c:1734
#6  0x0118b7ebc801 in _rthread_start (v=) at 
/usr/src/lib/librthread/rthread.c:96
#7  0x011849b5cdaa in __tfork_thread () at 
/usr/src/lib/libc/arch/amd64/sys/tfork_thread.S:84
(gdb) thread apply all bt

Thread 2 (process 426606):
#0  0x0118371afbcd in libusb_close (dev_handle=0x1184e1dc280) at core.c:1530
#1  0x01162dd39c33 in close_device (printer=0x1162dd3d798 
) at ./usb-libusb.c:762
#2  0x01162dd391d5 in print_device (uri=, 
hostname=, resource=, options=, 
print_fd=0, copies=, argc=, argv=0x7f7fa3b8) 
at ./usb-libusb.c:645
#3  0x01162dd39f90 in main (argc=6, argv=0x7f7fa3b8) at usb.c:235

Thread 1 (process 244617):
#0  0x0118371b4360 in list_del (entry=) at ./libusbi.h:163
#1  remove_from_flying_list (transfer=0x118a9179600) at io.c:1465
#2  libusb_submit_transfer (transfer=0x118a9179650) at io.c:1559
#3  0x0118371b64cd in do_sync_bulk_transfer (dev_handle=, 
endpoint=129 '\201', buffer=0x1190a6a5850 "", length=512, 
transferred=0x1190a6a5a5c, timeout=6, type=2 '\002') at sync.c:193
#4  0x0118371b63fe in libusb_bulk_transfer (dev_handle=0x1184e1f8b40, 
endpoint=129 '\201', data=0x2 , 
length=0, transferred=0x0, timeout=1236779248) at sync.c:281
#5  0x01162dd39d28 in read_thread (reference=) at 
./usb-libusb.c:1734
#6  0x0118b7ebc801 in _rthread_start (v=) at 
/usr/src/lib/librthread/rthread.c:96
#7  0x011849b5cdaa in __tfork_thread () at 
/usr/src/lib/libc/arch/amd64/sys/tfork_thread.S:84
(gdb)


# /var/log/cups/access_log
192.168.5.107 - - [13/Sep/2022:16:08:08 +] "POST /printers/Samsung-M2070 
HTTP/1.1" 200 697 Validate-Job successful-ok
192.168.5.107 - - [13/Sep/2022:16:08:08 +] "POST /printers/Samsung-M2070 
HTTP/1.1" 200 437096 Print-Job successful-ok


# /var/log/cups/error_log
W [13/Sep/2022:16:09:10 +] [Job 93] Backend returned status -139 (crashed)
E [13/Sep/2022:16:09:10 +] [Job 93] Job aborted due to backend errors; 
please consult the /var/log/cups/error_log file for details.
D [13/Sep/2022:16:09:10 +] [Job 93] The following messages were recorded 
from 16:08:21 to 16:09:10
D [13/Sep/2022:16:09:10 +] [Job 93] [11.195487] [0006826e] libusb: debug 
[handle_events] poll() 1 fds with timeout in 48846ms
D [13/Sep/2022:16:09:10 +] [Job 93] [11.195525] [0006826e] libusb: debug 
[handle_events] poll() returned 1
D [13/Sep/2022:16:09:10 +] [Job 93] [11.195537] [0006826e] libusb: debug 
[handle_events] caught a fish on the event pipe
D [13/Sep/2022:16:09:10 +] [Job 93] [11.195550] [0006826e] libusb: debug 
[usbi_handle_transfer_completion] transfer 0x118c17e0e50 has callback 
0x118371b62e0
D [13/Sep/2022:16:09:10 +] [Job 93] [11.195593] [0006826e] libusb: debug 
[sync_transfer_cb] actual

Cannot start www/sogo 5.7.1

2022-09-13 Thread Giovanni Bechis 

Hi,
after updating to latest snapshot, sogod doesn't start anymore.
The error I have on my log files is:

Sep 13 23:20:23 sogod [36455]: version 5.7.1 (build @amd64.ports.openbsd.org 
202209110944) -- starting
Sep 13 23:20:23 sogod [36455]: vmem size check enabled: shutting down app when 
vmem > 384 MB. Currently at 0 MB
Sep 13 23:20:23 sogod [36455]: <0x0xad538afbe88[SOGoProductLoader]> SOGo 
products loaded from '/usr/local/lib/GNUstep/SOGo':
Sep 13 23:20:23 sogod [36455]: <0x0xad538afbe88[SOGoProductLoader]>   
AdministrationUI.SOGo, Appointments.SOGo, CommonUI.SOGo, Contacts.SOGo, 
ContactsUI.SOGo, MailPartViewers.SOGo, Mailer.SOGo, MailerUI.SOGo, MainUI.SOGo, 
PreferencesUI.SOGo, SchedulerUI.SOGo
Sep 13 23:20:23 sogod [36455]: All products loaded - current memory usage at 0 
MB
Sep 13 23:20:23 sogod [36455]: [WARN] <0x0xad4ebfad808[WOWatchDog]> listening 
socket: attempt 1 failed
Sep 13 23:20:24 sogod [36455]: [WARN] <0x0xad4ebfad808[WOWatchDog]> listening 
socket: attempt 2 failed
Sep 13 23:20:25 sogod [36455]: [WARN] <0x0xad4ebfad808[WOWatchDog]> listening 
socket: attempt 3 failed
Sep 13 23:20:26 sogod [36455]: [WARN] <0x0xad4ebfad808[WOWatchDog]> listening 
socket: attempt 4 failed
Sep 13 23:20:27 sogod [36455]: [WARN] <0x0xad4ebfad808[WOWatchDog]> listening 
socket: attempt 5 failed
Sep 13 23:20:28 sogod [36455]: [ERROR] <0x0xad4ebfad808[WOWatchDog]> unable to 
listen on specified port, check that no other process is already using it
Loading two versions of SOGoMailBodyPart.  The class that will be used is 
undefined
...

In sogo.conf I have 'WOPort = "2";' and there is no other process listening 
on that port.

 Cheers
  Giovanni

$ doas pkg_info | grep -E '^so[go,pe]'
sogo-5.7.1  web based groupware server
sope-5.7.1  Skyrix Object Publishing Environment
sope-mysql-5.7.1SOPE MySQL adaptor
sope-postgres-5.7.1 SOPE PostgreSQL adaptor

$ doas dmesg

OpenBSD 7.2 (GENERIC.MP) #720: Sun Sep 11 15:41:58 MDT 2022
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 4277010432 (4078MB)
avail mem = 4129984512 (3938MB)
random: good seed from bootblocks
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 2.4 @ 0xe0010 (260 entries)
bios0: vendor Phoenix Technologies LTD version "6.00" date 12/12/2018
bios0: VMware, Inc. VMware Virtual Platform
acpi0 at bios0: ACPI 4.0
acpi0: sleep states S0 S1 S4 S5
acpi0: tables DSDT FACP BOOT APIC MCFG SRAT HPET WAET
acpi0: wakeup devices PCI0(S3) USB_(S1) P2P0(S3) S1F0(S3) S2F0(S3) S8F0(S3) 
S16F(S3) S18F(S3) S22F(S3) S23F(S3) S24F(S3) S25F(S3) PE40(S3) S1F0(S3) 
PE50(S3) S1F0(S3) [...]
acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpimadt0 at acpi0 addr 0xfee0: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: Intel(R) Xeon(R) CPU E5-2680 v4 @ 2.40GHz, 2394.52 MHz, 06-3a-00
cpu0: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,FSGSBASE,TSC_ADJUST,SMEP,ERMS,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,ARAT,MELTDOWN
cpu0: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB 64b/line 
8-way L2 cache, 35MB 64b/line 20-way L3 cache
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
cpu0: apic clock running at 66MHz
cpu1 at mainbus0: apid 2 (application processor)
cpu1: Intel(R) Xeon(R) CPU E5-2680 v4 @ 2.40GHz, 2394.59 MHz, 06-3a-00
cpu1: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,FSGSBASE,TSC_ADJUST,SMEP,ERMS,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,ARAT,MELTDOWN
cpu1: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB 64b/line 
8-way L2 cache, 35MB 64b/line 20-way L3 cache
cpu1: smt 0, core 0, package 2
cpu2 at mainbus0: apid 4 (application processor)
cpu2: Intel(R) Xeon(R) CPU E5-2680 v4 @ 2.40GHz, 2394.56 MHz, 06-3a-00
cpu2: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,FSGSBASE,TSC_ADJUST,SMEP,ERMS,MD_CLEAR,IBRS,IBPB,STIBP,L1DF,SSBD,ARAT,MELTDOWN
cpu2: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 256KB 64b/line 
8-way L2 cache, 35MB 64b/line 20-way L3 cache
cpu2: smt 0, core 0, package 4
cpu3 at mainbus0: apid 6 (application processor)
cpu3: Intel(R) Xeon(R) CPU E5-2680 v4 @ 2.40GHz, 2394.57 MHz, 06-3a-00
cpu3: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SS,SSE3,PCLMUL,SSSE3,CX16,PCID,SSE4.1,SSE4.2,x2APIC,POPCNT,DEADLINE,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,RDTSCP,LONG,LAHF,PERF,ITSC,FSGSBASE,TSC_ADJUST,SMEP,ERMS,MD_CLE

[NEW] net/py-eventlet-0.33.1

2022-09-13 Thread George Rosamond 

The third newly ported DEPENDS for net/py-onionshare_cli.

$ cat pkg/DESCR
Eventlet is a concurrent networking library for Python that allows
you to change how you run your code, not how you write it.

It uses epoll or libevent for highly scalable non-blocking I/O.
Coroutines ensure that the developer uses a blocking style of
programming that is similar to threading, but provide the benefits
of non-blocking I/O. The event dispatch is implicit, which means
you can easily use Eventlet from the Python interpreter, or as a
small part of a larger application.

thanks

g

py-eventlet-0.33.1.tgz
Description: Binary data

[NEW] www/py-flask-socketio-5.3.1

2022-09-13 Thread George Rosamond 

Another future net/py-onionshare_cli DEPEND

$ cat pkg/DESCR
Flask-SocketIO gives Flask applications access to low latency
bi-directional communications between the clients and the server.
The client-side application can use any of the SocketIO client
libraries in Javascript, Python, C++, Java and Swift, or any other
compatible client to establish a permanent connection to the server.

Thanks.

g

py-flask-socketio-5.3.1.tgz
Description: Binary data

[NEW] net/py-gevent-websocket-0.10.1

2022-09-13 Thread George Rosamond 

Dependency for future net/py-onionshare_cli.

$ cat pkg/DESCR
Websocket handler for the gevent pywsgi server, a Python network
library.

Thanks

g

py-gevent-websocket-0.10.1.tgz
Description: Binary data

net/onionshare status

2022-09-13 Thread George Rosamond 
Planning on replacing the current net/onionshare with 
net/py-onionshare_cli (https://pypi.org/project/onionshare-cli/) at some 
point after the release depending on a few things, including more 
options for PEP517 support (the replacement for MODPY_SETUPTOOLS) and 
porting a few additional py modules which are in my queue: 
gevent-websocket, cepa, flask-socketio, eventlet.


Thanks.

g

Re: [NEW] math/py-datedelta 1.4

2022-09-13 Thread Kurt Mosiejczuk 
On Tue, Sep 13, 2022 at 07:10:57AM -0400, George Rosamond wrote:
> ping

imported. Thanks George!

--Kurt

> On 9/6/22 16:15, Stuart Henderson wrote:
> > On 2022/09/05 21:10, George Rosamond wrote:
> > > Attached is py-datedelta... useful tool for doing date deltas/math.
> > > 
> > >  From pkg/DESCR:
> > > 
> > > datedelta.datedelta is datetime.timedelta for date arithmetic.
> > > 
> > > It accounts for oddities of the Gregorian calendar.
> > > 
> > > It's convenient for computing yearly, monthly, or weekly subscriptions
> > > periods.
> > > 
> > > g
> > 
> > This is OK sthen@
>

Slowing down for the 7.2 release

2022-09-13 Thread Christian Weisgerber 
The OpenBSD 7.2 release is approaching fast and it is time to slow
down ports development.

There are no restrictions on commits yet, but it's time to start
limiting ourselves to commits that are important for the release.
If you break something, there will be very little time left to fix
it.

I also urge people to test package snapshots now, so problems that
you find can still be dealt with BEFORE it is too late.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

Update: lang/jruby 9.3.8.0

2022-09-13 Thread Jeremy Evans 
Simple update to the latest version of JRuby.  Release notes at: 
https://www.jruby.org/2022/09/13/jruby-9-3-8-0.html

Among other things, a security fix for a YAML parsing bug
(CVE-2022-25857).

Tested on amd64, the only supported arch.  Will be committing in a
couple days unless I hear objections.

Thanks,
Jeremy

Index: Makefile
===
RCS file: /cvs/ports/lang/jruby/Makefile,v
retrieving revision 1.103
diff -u -p -r1.103 Makefile
--- Makefile18 Aug 2022 23:28:38 -  1.103
+++ Makefile13 Sep 2022 17:17:57 -
@@ -3,7 +3,7 @@ ONLY_FOR_ARCHS = amd64
 
 COMMENT =  pure-Java implementation of the Ruby language
 
-V =9.3.7.0
+V =9.3.8.0
 DISTNAME = jruby-dist-${V}-bin
 PKGNAME =  jruby-${V}
 CATEGORIES =   lang lang/ruby
Index: distinfo
===
RCS file: /cvs/ports/lang/jruby/distinfo,v
retrieving revision 1.69
diff -u -p -r1.69 distinfo
--- distinfo18 Aug 2022 23:28:38 -  1.69
+++ distinfo13 Sep 2022 17:17:57 -
@@ -1,6 +1,6 @@
 SHA256 (jffi-1.3.5.tar.gz) = 15HSIg5X5jGP9s1jfd64nWu4O9HkJivnhS9tVmnLLrQ=
-SHA256 (jruby-dist-9.3.7.0-bin.tar.gz) = 
lKeos77qwiU6iHbnOt+sa+zssrVNLd+mjyRdyBln0ME=
+SHA256 (jruby-dist-9.3.8.0-bin.tar.gz) = 
Z0pNEwhjH6pfASTQHXPrHtyJNG7n3iHHDhQwW9YbRt8=
 SHA256 (jruby-launcher-1.1.19-java.gem) = 
LPGrpNcsdLNq7MSjCxiSXh4h+vcPVuC0ykUyUYquGJo=
 SIZE (jffi-1.3.5.tar.gz) = 3152240
-SIZE (jruby-dist-9.3.7.0-bin.tar.gz) = 27731024
+SIZE (jruby-dist-9.3.8.0-bin.tar.gz) = 27752001
 SIZE (jruby-launcher-1.1.19-java.gem) = 64000
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/jruby/pkg/PLIST,v
retrieving revision 1.60
diff -u -p -r1.60 PLIST
--- pkg/PLIST   29 Jun 2022 22:46:52 -  1.60
+++ pkg/PLIST   13 Sep 2022 17:17:57 -
@@ -420,7 +420,7 @@ jruby/lib/ruby/gems/1.8/specifications/
 jruby/lib/ruby/gems/1.8/specifications/default/
 jruby/lib/ruby/gems/1.8/specifications/default/bundler-2.2.29.gemspec
 jruby/lib/ruby/gems/1.8/specifications/default/cmath-1.0.0.gemspec
-jruby/lib/ruby/gems/1.8/specifications/default/csv-3.1.2.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/csv-3.2.5.gemspec
 jruby/lib/ruby/gems/1.8/specifications/default/e2mmap-0.1.0.gemspec
 jruby/lib/ruby/gems/1.8/specifications/default/ffi-1.15.4-java.gemspec
 jruby/lib/ruby/gems/1.8/specifications/default/fileutils-1.4.1.gemspec
@@ -437,7 +437,7 @@ jruby/lib/ruby/gems/1.8/specifications/d
 jruby/lib/ruby/gems/1.8/specifications/default/mutex_m-0.1.0.gemspec
 jruby/lib/ruby/gems/1.8/specifications/default/ostruct-0.5.5.gemspec
 jruby/lib/ruby/gems/1.8/specifications/default/prime-0.1.0.gemspec
-jruby/lib/ruby/gems/1.8/specifications/default/psych-3.3.2-java.gemspec
+jruby/lib/ruby/gems/1.8/specifications/default/psych-3.3.3-java.gemspec
 jruby/lib/ruby/gems/1.8/specifications/default/racc-1.5.2-java.gemspec
 jruby/lib/ruby/gems/1.8/specifications/default/rake-ant-1.0.4.gemspec
 jruby/lib/ruby/gems/1.8/specifications/default/rdoc-6.1.2.1.gemspec
@@ -842,9 +842,8 @@ jruby/lib/ruby/stdlib/csv.rb
 jruby/lib/ruby/stdlib/csv/core_ext/
 jruby/lib/ruby/stdlib/csv/core_ext/array.rb
 jruby/lib/ruby/stdlib/csv/core_ext/string.rb
-jruby/lib/ruby/stdlib/csv/delete_suffix.rb
 jruby/lib/ruby/stdlib/csv/fields_converter.rb
-jruby/lib/ruby/stdlib/csv/match_p.rb
+jruby/lib/ruby/stdlib/csv/input_record_separator.rb
 jruby/lib/ruby/stdlib/csv/parser.rb
 jruby/lib/ruby/stdlib/csv/row.rb
 jruby/lib/ruby/stdlib/csv/table.rb
@@ -1165,8 +1164,8 @@ jruby/lib/ruby/stdlib/org/bouncycastle/b
 
jruby/lib/ruby/stdlib/org/bouncycastle/bctls-jdk15on/1.68/bctls-jdk15on-1.68.jar
 jruby/lib/ruby/stdlib/org/yaml/
 jruby/lib/ruby/stdlib/org/yaml/snakeyaml/
-jruby/lib/ruby/stdlib/org/yaml/snakeyaml/1.28/
-jruby/lib/ruby/stdlib/org/yaml/snakeyaml/1.28/snakeyaml-1.28.jar
+jruby/lib/ruby/stdlib/org/yaml/snakeyaml/1.31/
+jruby/lib/ruby/stdlib/org/yaml/snakeyaml/1.31/snakeyaml-1.31.jar
 jruby/lib/ruby/stdlib/org/yaml/snakeyaml/maven-metadata-local.xml
 jruby/lib/ruby/stdlib/ostruct.rb
 jruby/lib/ruby/stdlib/pathname.rb

Re: UPDATE: www/dokuwiki (drop PHP7)

2022-09-13 Thread Mike Fischer 


> Am 13.09.2022 um 15:58 schrieb Landry Breuil :
> 
> Le Sat, Aug 13, 2022 at 09:30:45AM +0200, Landry Breuil a écrit :
>> Le Sat, Aug 13, 2022 at 09:15:30AM +0200, Rafael Sadowski a écrit :
>>> I'm no longer a dokuwiki user so I can't test it. The update looks quite
>>> simple. My motivation is to get rid of PHP7 here.
>> 
>> oh great there's finally been a release with php8 ? will test that next
>> week at work, thanks !
> 
> Two things:
> 
> - this update works here with php 7.4 (not via a package but a git clone
>  of the upstream stable branch), will confirm that it works with 8.0
> but don't wait for me :)
> - there's been a 2022-07-31a for
>  https://github.com/splitbrain/dokuwiki/issues/3761
> 
> definitely ok with me to commit this before 7.2.
> 
> Landry

I agree! I have DokuWiki from packages (Hogfather) running fine on 7.1 stable 
and 7.4.30. And a copy that I manually updated to 2022-07-31a is running on PHP 
8.0.23. I have not done any testing with PHP 8.1 yet (or with Igor on 7.4).

There are a few minor issues but for the most part they are PHP 8 related and 
only warnings in the logs. I have filed a number of issues and PRs upstream, 
and some of them have already been fixed. DW itself is pretty much ok, but some 
of the plugins and themes may need some attention. Depending on what plugins 
and themes you use YMMV though. About 90% of the PHP related issues are caused 
by stricter rules for accessing missing array elements.

My manually patched version of DW 2022-07-31a running on PHP 8.0.23 incl. the 
sprintDoc theme and an number of additional plugins is now working fine, i.e. 
there have been no more warnings or errors in my logs for a few days and 
everything seems to work as expected. Until the rest of the upstream plugin 
maintainers get around to releasing new versions with the fixes either ignoring 
the warnings or manually patching things should work.

Mike

Re: UPDATE: www/dokuwiki (drop PHP7)

2022-09-13 Thread Landry Breuil 
Le Sat, Aug 13, 2022 at 09:30:45AM +0200, Landry Breuil a écrit :
> Le Sat, Aug 13, 2022 at 09:15:30AM +0200, Rafael Sadowski a écrit :
> > I'm no longer a dokuwiki user so I can't test it. The update looks quite
> > simple. My motivation is to get rid of PHP7 here.
> 
> oh great there's finally been a release with php8 ? will test that next
> week at work, thanks !

Two things:

- this update works here with php 7.4 (not via a package but a git clone
  of the upstream stable branch), will confirm that it works with 8.0
but don't wait for me :)
- there's been a 2022-07-31a for
  https://github.com/splitbrain/dokuwiki/issues/3761

definitely ok with me to commit this before 7.2.

Landry

Re: [new] jitsi-meet and friends

2022-09-13 Thread Stuart Henderson 
Little organisational tweak, how about grouping them under net/jitsi
so it's easier to find them in the tree? i.e.

$ cd /usr/ports/mystuff/net/jitsi; ls | cat
Makefile
jicofo
meet
videobridge

$ make show=PKGNAMES | paste - -
===> net/jitsi/jicofo   jicofo-2.0.7648
===> net/jitsi/meet jitsi-meet-1.0.6542
===> net/jitsi/videobridge  jitsi-videobridge-2.0.7648

(We can also factor out some common parts of the Makefiles into
net/jitsi/Makefile.inc but that can come later - I'm trying to keep
changes to a minimum, the only difference is adding "net" to
CATEGORIES for jitsi-meet).

I'm ok with importing them.


Index: user.list
===
RCS file: /cvs/ports/infrastructure/db/user.list,v
retrieving revision 1.409
diff -u -p -r1.409 user.list
--- user.list   12 Sep 2022 20:35:31 -  1.409
+++ user.list   13 Sep 2022 13:38:24 -
@@ -41,8 +41,8 @@ id  user  group   port
 530 _vscan _vscan  mail/amavisd-new
 531 _cnupm _cnupm  net/cnupm
 532 _milter-spamd  _milter-spamd   mail/milter-spamd
-#533 _jabberd  _jabberdnet/jabberd
-#534 _zope _zope   www/zope
+533 _jicofo_jicofo net/jitsi/jicofo
+534 _jvb   _jvbnet/jitsi/videobridge
 535 _symon _symon  sysutils/symon
 536 _nostromo  _nostromo   www/nostromo
 537 _maradns   _maradnsnet/maradns



jitsi.tgz
Description: application/tar-gz

lang/gcc/8 diff for riscv64

2022-09-13 Thread Jeremie Courreges-Anglas 
On Sun, Sep 11 2022, Jeremie Courreges-Anglas  wrote:
> On Fri, Sep 09 2022, Pascal Stumpf  wrote:
>> OK as soon as the lld patch is in.  Great work!
>
> This involved a fair amount of headdesks, thanks for your kind words. :)
>
> It might be doable to work around the lld problem within the gcc ports.
> Thay may be sufficient given that not many C++ ports will be built with
> ports-gcc on riscv64.  I'm gonna work on this next.

The diff below (for lang/gcc/8 only this time) includes the workaround
for the ld.lld error.

> Meanwhile, I fixed the lang/gcc/11 build with what I learnt from
> lang/gcc/8, diff below.
>
>> On Fri, 09 Sep 2022 00:34:21 +0200, Jeremie Courreges-Anglas wrote:
>>> 
>>> With the diff below I can build ports-gcc on riscv64.  PIE is disabled
>>> by default because I hit crashes at build time.  Since not many ports
>>> require ports-gcc for for C or C++ code I believe that's okay for now.
>>> Trying to forcefully disable PIE led to some dubious patches, I'm not
>>> sure yet why they are actually needed (see the comments).  The rest of
>>> the patches are as riscv64-specific as possible.
>>> 
>>> One patch which isn't included here is for ld.lld in base, which I have
>>> yet to submit.
>>> 
>>> With this I can build blas, lapack, numpy with fortran support... more
>>> to come.
>>> 
>>> Thoughts?  oks?
>>> 
>>> PS: I have yet to backport my recent fixes to lang/gcc/11, crossing
>>>   fingers...
>>> 
>>> PPS: the ONLY_FOR_ARCHS and GCC49_ARCHS changes aren't included for now
>>>   but they're trivial
>
> (This time with riscv64 added to ONLY_FOR_ARCHS.)

Updated diff for lang/gcc/8.  I only have dim memories and don't have
notes about the errors I hit when hacking on this during k2k21 and
h2k21.  But it seems that only ssp is currently a problem, and I can
enable PIE by default.  Since ld.lld in base actually defaults to PIE,
this lets me drop most initial patches and hacks, and build eg math/hdf5
without hitting errors.

lang/gcc/11 is still building with a similarly simplified diff.
I intend to commit the lang/gcc/8 part this evening, review/ok still
welcome.


Index: Makefile
===
RCS file: /cvs/ports/lang/gcc/8/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile24 Jul 2022 09:52:45 -  1.56
+++ Makefile12 Sep 2022 21:52:48 -
@@ -1,5 +1,5 @@
 ONLY_FOR_ARCHS = aarch64 alpha amd64 arm hppa i386 mips64 mips64el \
-   powerpc powerpc64 sparc64
+   powerpc powerpc64 riscv64 sparc64
 
 # XXX: sparc64
 ONLY_FOR_ARCHS-ada = amd64 hppa i386 mips64 powerpc
@@ -64,7 +64,7 @@ EXTRACT_ONLY =${DISTNAME}.tar.xz
 BUILD_DEPENDS +=   devel/bison
 
 .if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "arm" || \
-${MACHINE_ARCH} == "powerpc64"
+${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "riscv64"
 # would be helpful on i386/amd64 too, but some ports also need the old
 # ld.bfd in base which can't cope with new gas.
 BUILD_DEPENDS +=   devel/gas
@@ -133,10 +133,15 @@ CONFIGURE_ARGS += \
--with-gmp="${LOCALBASE}" \
--enable-languages=${LANGS} \
--disable-libstdcxx-pch \
-   --enable-default-ssp \
--enable-default-pie \
--without-isl
 
+# Enable the stack protector by default where supported
+.if ${MACHINE_ARCH} != "riscv64"
+CONFIGURE_ARGS += \
+   --enable-default-ssp
+.endif
+
 # This is needed, as internal cpp is no longer compatible with the
 # visible beast
 CONFIGURE_ARGS += --enable-cpp
@@ -203,6 +208,13 @@ LIB_DEPENDS-libs =
 
 .if ${MACHINE_ARCH:Mamd64}
 CONFIG = x86_64-unknown-openbsd${OSREV}
+.endif
+
+.if ${MACHINE_ARCH} == "riscv64"
+# lld complains about .gcc_except_table referencing
+# symbols in discarded sections.  Tell gcc to split .gcc_except_table
+# so that its unused parts can also be discarded.
+EXTRA_ENV +=   PORTS_FORCE_SPLIT_SECTIONS="-ffunction-sections -fdata-sections"
 .endif
 
 post-extract:
Index: patches/patch-gcc_config_gcc
===
RCS file: /cvs/ports/lang/gcc/8/patches/patch-gcc_config_gcc,v
retrieving revision 1.6
diff -u -p -r1.6 patch-gcc_config_gcc
--- patches/patch-gcc_config_gcc11 Mar 2022 19:28:59 -  1.6
+++ patches/patch-gcc_config_gcc5 Apr 2022 14:38:47 -
@@ -96,7 +96,28 @@ Index: gcc/config.gcc
  i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-gnu* | 
i[34567]86-*-kopensolaris*-gnu)
# Intel 80386's running GNU/*
# with ELF format using glibc 2
-@@ -2394,6 +2432,18 @@ pdp11-*-*)
+@@ -2113,6 +2151,20 @@ riscv*-*-freebsd*)
+   # automatically detect that GAS supports it, yet we require it.
+   gcc_cv_initfini_array=yes
+   ;;
++riscv64-*-openbsd*)
++  tm_file="${tm_file} dbxelf.h elfos.h"
++  tm_file="${tm_file} openbsd-stdint.h"
++  tm_file="${tm_file} openbsd.h riscv/openbsd.h openbsd-libpthread.h"

UPDATE: Nextcloud-23.0.9

2022-09-13 Thread Gonzalo L. Rodriguez 
Hello,

Update for Nextcloud to 23.0.9:

https://nextcloud.com/changelog/#latest23

OK? Comments?

Cheers.-



Index: Makefile
===
RCS file: /cvs/ports/www/nextcloud/23/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile19 Aug 2022 17:24:46 -  1.11
+++ Makefile13 Sep 2022 11:43:51 -
@@ -1,3 +1,3 @@
-NC_VERSION=23.0.8
+NC_VERSION=23.0.9
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/www/nextcloud/23/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo19 Aug 2022 17:24:46 -  1.8
+++ distinfo13 Sep 2022 11:43:51 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloud-23.0.8.tar.bz2) = 
rD0EIlM5m+JaKqAceZ3sdaFFm2rkU4dEFPZSjMLuUGE=
-SIZE (nextcloud-23.0.8.tar.bz2) = 140679380
+SHA256 (nextcloud-23.0.9.tar.bz2) = 
Ysxapp8IpRcRBC3CRM4yxoGYCuedAVURT3FhDD4jNBY=
+SIZE (nextcloud-23.0.9.tar.bz2) = 140677417
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/nextcloud/23/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- pkg/PLIST   19 Aug 2022 17:24:46 -  1.10
+++ pkg/PLIST   13 Sep 2022 11:43:54 -
@@ -9267,6 +9267,8 @@ nextcloud/apps/circles/l10n/tr.js
 nextcloud/apps/circles/l10n/tr.json
 nextcloud/apps/circles/l10n/uk.js
 nextcloud/apps/circles/l10n/uk.json
+nextcloud/apps/circles/l10n/uz.js
+nextcloud/apps/circles/l10n/uz.json
 nextcloud/apps/circles/l10n/vi.js
 nextcloud/apps/circles/l10n/vi.json
 nextcloud/apps/circles/l10n/zh_CN.js
@@ -10215,6 +10217,8 @@ nextcloud/apps/contactsinteraction/l10n/
 nextcloud/apps/contactsinteraction/l10n/sv.json
 nextcloud/apps/contactsinteraction/l10n/tr.js
 nextcloud/apps/contactsinteraction/l10n/tr.json
+nextcloud/apps/contactsinteraction/l10n/uk.js
+nextcloud/apps/contactsinteraction/l10n/uk.json
 nextcloud/apps/contactsinteraction/l10n/zh_CN.js
 nextcloud/apps/contactsinteraction/l10n/zh_CN.json
 nextcloud/apps/contactsinteraction/l10n/zh_HK.js
@@ -10359,6 +10363,8 @@ nextcloud/apps/dashboard/l10n/tr.js
 nextcloud/apps/dashboard/l10n/tr.json
 nextcloud/apps/dashboard/l10n/uk.js
 nextcloud/apps/dashboard/l10n/uk.json
+nextcloud/apps/dashboard/l10n/uz.js
+nextcloud/apps/dashboard/l10n/uz.json
 nextcloud/apps/dashboard/l10n/zh_CN.js
 nextcloud/apps/dashboard/l10n/zh_CN.json
 nextcloud/apps/dashboard/l10n/zh_HK.js
@@ -13184,6 +13190,8 @@ nextcloud/apps/files_rightclick/l10n/uk.
 nextcloud/apps/files_rightclick/l10n/uk.json
 nextcloud/apps/files_rightclick/l10n/ur_PK.js
 nextcloud/apps/files_rightclick/l10n/ur_PK.json
+nextcloud/apps/files_rightclick/l10n/uz.js
+nextcloud/apps/files_rightclick/l10n/uz.json
 nextcloud/apps/files_rightclick/l10n/vi.js
 nextcloud/apps/files_rightclick/l10n/vi.json
 nextcloud/apps/files_rightclick/l10n/zh_CN.js
@@ -15135,6 +15143,7 @@ nextcloud/apps/notifications/lib/Migrati
 nextcloud/apps/notifications/lib/Migration/Version2010Date20210218082811.php
 nextcloud/apps/notifications/lib/Migration/Version2010Date20210218082855.php
 nextcloud/apps/notifications/lib/Migration/Version2011Date20210930134607.php
+nextcloud/apps/notifications/lib/Migration/Version2011Date20220826074907.php
 nextcloud/apps/notifications/lib/Model/
 nextcloud/apps/notifications/lib/Model/Settings.php
 nextcloud/apps/notifications/lib/Model/SettingsMapper.php
@@ -15297,6 +15306,8 @@ nextcloud/apps/oauth2/l10n/sv.js
 nextcloud/apps/oauth2/l10n/sv.json
 nextcloud/apps/oauth2/l10n/tr.js
 nextcloud/apps/oauth2/l10n/tr.json
+nextcloud/apps/oauth2/l10n/uk.js
+nextcloud/apps/oauth2/l10n/uk.json
 nextcloud/apps/oauth2/l10n/vi.js
 nextcloud/apps/oauth2/l10n/vi.json
 nextcloud/apps/oauth2/l10n/zh_CN.js
@@ -15632,6 +15643,8 @@ nextcloud/apps/photos/js/photos-vendors-
 nextcloud/apps/photos/l10n/
 nextcloud/apps/photos/l10n/af.js
 nextcloud/apps/photos/l10n/af.json
+nextcloud/apps/photos/l10n/an.js
+nextcloud/apps/photos/l10n/an.json
 nextcloud/apps/photos/l10n/ar.js
 nextcloud/apps/photos/l10n/ar.json
 nextcloud/apps/photos/l10n/ast.js
@@ -16021,6 +16034,8 @@ nextcloud/apps/provisioning_api/l10n/pl.
 nextcloud/apps/provisioning_api/l10n/pl.json
 nextcloud/apps/provisioning_api/l10n/pt_BR.js
 nextcloud/apps/provisioning_api/l10n/pt_BR.json
+nextcloud/apps/provisioning_api/l10n/pt_PT.js
+nextcloud/apps/provisioning_api/l10n/pt_PT.json
 nextcloud/apps/provisioning_api/l10n/ro.js
 nextcloud/apps/provisioning_api/l10n/ro.json
 nextcloud/apps/provisioning_api/l10n/ru.js
@@ -16210,6 +16225,8 @@ nextcloud/apps/serverinfo/js/smoothie.js
 nextcloud/apps/serverinfo/l10n/
 nextcloud/apps/serverinfo/l10n/af.js
 nextcloud/apps/serverinfo/l10n/af.json
+nextcloud/apps/serverinfo/l10n/an.js
+nextcloud/apps/serverinfo/l10n/an.json
 nextcloud/apps/serverinfo/l10n/ar.js
 nextcloud/apps/serverinfo/l10n/ar.json
 nextcloud/apps/serverinfo/l10n/ast.js
@@ -17144,6 +17161,8 @@ nextcloud/apps/survey_client/l10n/lt_LT.
 nextclo

UPDATE: Nextcloud-24.0.5

2022-09-13 Thread Gonzalo L. Rodriguez 
Hello,

Update for Nextcloud to 24.0.5:

https://nextcloud.com/changelog/#latest24

OK? Comments?


Index: Makefile
===
RCS file: /cvs/ports/www/nextcloud/24/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile19 Aug 2022 17:25:58 -  1.3
+++ Makefile13 Sep 2022 11:44:12 -
@@ -1,3 +1,3 @@
-NC_VERSION=24.0.4
+NC_VERSION=24.0.5
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/www/nextcloud/24/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo19 Aug 2022 17:25:58 -  1.3
+++ distinfo13 Sep 2022 11:44:12 -
@@ -1,2 +1,2 @@
-SHA256 (nextcloud-24.0.4.tar.bz2) = 
0QdCb44cGT24gqBMhE+bx+fut8IeRsRhl+UVTW1qwo4=
-SIZE (nextcloud-24.0.4.tar.bz2) = 123646294
+SHA256 (nextcloud-24.0.5.tar.bz2) = 
sieIN3zLk5Hn+eztP2mpI2Zprqqy4OpSUKc+318e8CY=
+SIZE (nextcloud-24.0.5.tar.bz2) = 123536042
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/nextcloud/24/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   19 Aug 2022 17:25:58 -  1.3
+++ pkg/PLIST   13 Sep 2022 11:44:14 -
@@ -9289,6 +9289,8 @@ nextcloud/apps/circles/l10n/tr.js
 nextcloud/apps/circles/l10n/tr.json
 nextcloud/apps/circles/l10n/uk.js
 nextcloud/apps/circles/l10n/uk.json
+nextcloud/apps/circles/l10n/uz.js
+nextcloud/apps/circles/l10n/uz.json
 nextcloud/apps/circles/l10n/vi.js
 nextcloud/apps/circles/l10n/vi.json
 nextcloud/apps/circles/l10n/zh_CN.js
@@ -10193,6 +10195,8 @@ nextcloud/apps/contactsinteraction/l10n/
 nextcloud/apps/contactsinteraction/l10n/sv.json
 nextcloud/apps/contactsinteraction/l10n/tr.js
 nextcloud/apps/contactsinteraction/l10n/tr.json
+nextcloud/apps/contactsinteraction/l10n/uk.js
+nextcloud/apps/contactsinteraction/l10n/uk.json
 nextcloud/apps/contactsinteraction/l10n/zh_CN.js
 nextcloud/apps/contactsinteraction/l10n/zh_CN.json
 nextcloud/apps/contactsinteraction/l10n/zh_HK.js
@@ -10334,6 +10338,8 @@ nextcloud/apps/dashboard/l10n/tr.js
 nextcloud/apps/dashboard/l10n/tr.json
 nextcloud/apps/dashboard/l10n/uk.js
 nextcloud/apps/dashboard/l10n/uk.json
+nextcloud/apps/dashboard/l10n/uz.js
+nextcloud/apps/dashboard/l10n/uz.json
 nextcloud/apps/dashboard/l10n/zh_CN.js
 nextcloud/apps/dashboard/l10n/zh_CN.json
 nextcloud/apps/dashboard/l10n/zh_HK.js
@@ -13029,6 +13035,8 @@ nextcloud/apps/files_rightclick/l10n/uk.
 nextcloud/apps/files_rightclick/l10n/uk.json
 nextcloud/apps/files_rightclick/l10n/ur_PK.js
 nextcloud/apps/files_rightclick/l10n/ur_PK.json
+nextcloud/apps/files_rightclick/l10n/uz.js
+nextcloud/apps/files_rightclick/l10n/uz.json
 nextcloud/apps/files_rightclick/l10n/vi.js
 nextcloud/apps/files_rightclick/l10n/vi.json
 nextcloud/apps/files_rightclick/l10n/zh_CN.js
@@ -14841,6 +14849,7 @@ nextcloud/apps/notifications/lib/Migrati
 nextcloud/apps/notifications/lib/Migration/Version2010Date20210218082811.php
 nextcloud/apps/notifications/lib/Migration/Version2010Date20210218082855.php
 nextcloud/apps/notifications/lib/Migration/Version2011Date20210930134607.php
+nextcloud/apps/notifications/lib/Migration/Version2011Date20220826074907.php
 nextcloud/apps/notifications/lib/Model/
 nextcloud/apps/notifications/lib/Model/Settings.php
 nextcloud/apps/notifications/lib/Model/SettingsMapper.php
@@ -15000,6 +15009,8 @@ nextcloud/apps/oauth2/l10n/sv.js
 nextcloud/apps/oauth2/l10n/sv.json
 nextcloud/apps/oauth2/l10n/tr.js
 nextcloud/apps/oauth2/l10n/tr.json
+nextcloud/apps/oauth2/l10n/uk.js
+nextcloud/apps/oauth2/l10n/uk.json
 nextcloud/apps/oauth2/l10n/vi.js
 nextcloud/apps/oauth2/l10n/vi.json
 nextcloud/apps/oauth2/l10n/zh_CN.js
@@ -15344,6 +15355,8 @@ nextcloud/apps/photos/js/photos-vendors-
 nextcloud/apps/photos/l10n/
 nextcloud/apps/photos/l10n/af.js
 nextcloud/apps/photos/l10n/af.json
+nextcloud/apps/photos/l10n/an.js
+nextcloud/apps/photos/l10n/an.json
 nextcloud/apps/photos/l10n/ar.js
 nextcloud/apps/photos/l10n/ar.json
 nextcloud/apps/photos/l10n/ast.js
@@ -15730,6 +15743,8 @@ nextcloud/apps/provisioning_api/l10n/pl.
 nextcloud/apps/provisioning_api/l10n/pl.json
 nextcloud/apps/provisioning_api/l10n/pt_BR.js
 nextcloud/apps/provisioning_api/l10n/pt_BR.json
+nextcloud/apps/provisioning_api/l10n/pt_PT.js
+nextcloud/apps/provisioning_api/l10n/pt_PT.json
 nextcloud/apps/provisioning_api/l10n/ro.js
 nextcloud/apps/provisioning_api/l10n/ro.json
 nextcloud/apps/provisioning_api/l10n/ru.js
@@ -15919,6 +15934,8 @@ nextcloud/apps/serverinfo/js/smoothie.js
 nextcloud/apps/serverinfo/l10n/
 nextcloud/apps/serverinfo/l10n/af.js
 nextcloud/apps/serverinfo/l10n/af.json
+nextcloud/apps/serverinfo/l10n/an.js
+nextcloud/apps/serverinfo/l10n/an.json
 nextcloud/apps/serverinfo/l10n/ar.js
 nextcloud/apps/serverinfo/l10n/ar.json
 nextcloud/apps/serverinfo/l10n/ast.js
@@ -16822,6 +16839,8 @@ nextcloud/apps/survey_client/l10n/lt_LT.
 nextcloud/apps/survey_cl

Re: [NEW] math/py-datedelta 1.4

2022-09-13 Thread George Rosamond 

ping

On 9/6/22 16:15, Stuart Henderson wrote:

On 2022/09/05 21:10, George Rosamond wrote:

Attached is py-datedelta... useful tool for doing date deltas/math.

 From pkg/DESCR:

datedelta.datedelta is datetime.timedelta for date arithmetic.

It accounts for oddities of the Gregorian calendar.

It's convenient for computing yearly, monthly, or weekly subscriptions
periods.

g


This is OK sthen@

Update prometheus to 2.37.1

2022-09-13 Thread Claudio Jeker 
Since 2.37 is a LTS branch I think it is a good idea to track this branch
for now. Now officially the 2.37 has no OpenBSD support (but that also
applies to 2.38). The mmap patch should make prometheus work well enough
on OpenBSD (at least as well as the 2.36.2 version).

This updates the mmap patch to apply cleany. The patch is base on
https://github.com/prometheus/prometheus/pull/9085

Seems to work for me
-- 
:wq Claudio

Index: Makefile
===
RCS file: /cvs/ports/sysutils/prometheus/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile8 Aug 2022 12:51:39 -   1.15
+++ Makefile13 Sep 2022 08:47:27 -
@@ -1,10 +1,9 @@
 COMMENT =  systems monitoring and alerting toolkit
 
-V =2.36.2
+V =2.37.1
 GH_ACCOUNT =   prometheus
 GH_PROJECT =   prometheus
 GH_TAGNAME =   v${V}
-REVISION = 0
 
 CATEGORIES =   sysutils
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/prometheus/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo28 Jun 2022 19:23:03 -  1.6
+++ distinfo13 Sep 2022 08:49:38 -
@@ -1,6 +1,6 @@
-SHA256 (prometheus-2.36.2.tar.gz) = 
aDhtNHthgGVlxEi0jHj/NJiT8m9jwKvQSnhtp0PdFds=
-SHA256 (prometheus-vendor-2.36.2.tar.gz) = 
biPiNBWhDWojsm67ZNlVEGUVOwZ/rZ7KAdTjbJ8RU70=
-SHA256 (prometheus-web-ui-2.36.2.tar.gz) = 
ckcy/e+OfebUwWaGCDUH1k1DLoJLQfPPcuDXD/Ftx74=
-SIZE (prometheus-2.36.2.tar.gz) = 6021280
-SIZE (prometheus-vendor-2.36.2.tar.gz) = 11345259
-SIZE (prometheus-web-ui-2.36.2.tar.gz) = 4388423
+SHA256 (prometheus-2.37.1.tar.gz) = 
8ON5hpfzQ7HDQqqPWdF5inLdZyBwHVX1KR6gMQsUI7Y=
+SHA256 (prometheus-vendor-2.37.1.tar.gz) = 
JeQkPS5dpt8n5f0JmJ+ZvSPAvpcQ7j8LbVWj5dJ5hLQ=
+SHA256 (prometheus-web-ui-2.37.1.tar.gz) = 
Uu9uO0lk79k7nu4Yx/wo+tv4FVu5nl+TUSF1w8vUoaM=
+SIZE (prometheus-2.37.1.tar.gz) = 6049188
+SIZE (prometheus-vendor-2.37.1.tar.gz) = 11627435
+SIZE (prometheus-web-ui-2.37.1.tar.gz) = 4333534
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/sysutils/prometheus/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile
--- patches/patch-Makefile  28 Jun 2022 19:23:04 -  1.5
+++ patches/patch-Makefile  13 Sep 2022 09:17:55 -
@@ -3,7 +3,7 @@ The react build is provided via extra di
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -60,7 +60,7 @@ ui-lint:
+@@ -66,7 +66,7 @@ ui-lint:
cd $(UI_PATH) && npm run lint
  
  .PHONY: assets
@@ -12,7 +12,7 @@ Index: Makefile
  
  .PHONY: assets-compress
  assets-compress: assets
-@@ -101,7 +101,7 @@ plugins/plugins.go: plugins.yml plugins/generate.go
+@@ -107,7 +107,7 @@ plugins/plugins.go: plugins.yml plugins/generate.go
  plugins: plugins/plugins.go
  
  .PHONY: build
Index: patches/patch-Makefile_common
===
RCS file: /cvs/ports/sysutils/prometheus/patches/patch-Makefile_common,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile_common
--- patches/patch-Makefile_common   28 Jun 2022 19:23:04 -  1.5
+++ patches/patch-Makefile_common   13 Sep 2022 09:17:55 -
@@ -3,7 +3,7 @@ Don't fetch promu form internet. This is
 Index: Makefile.common
 --- Makefile.common.orig
 +++ Makefile.common
-@@ -276,11 +276,7 @@ common-docker-manifest:
+@@ -229,11 +229,7 @@ common-docker-manifest:
  promu: $(PROMU)
  
  $(PROMU):
Index: patches/patch-mmap_openbsd
===
RCS file: /cvs/ports/sysutils/prometheus/patches/patch-mmap_openbsd,v
retrieving revision 1.1
diff -u -p -r1.1 patch-mmap_openbsd
--- patches/patch-mmap_openbsd  28 Jun 2022 19:23:04 -  1.1
+++ patches/patch-mmap_openbsd  13 Sep 2022 07:45:14 -
@@ -1,21 +1,24 @@
-Diff from https://github.com/prometheus/prometheus/issues/8877
-to make tsdb only use mmap and not hit missing UBC issues.
+Diff from https://github.com/prometheus/prometheus/issues/8799
+and https://github.com/prometheus/prometheus/pull/9085
+to make tsdb only use mmap and work around missing UBC support.
 
-Index: go.mod
 go.mod.orig
+diff --git go.mod go.mod
+index 39c3fcb5b..760b39a8b 100644
+--- go.mod
 +++ go.mod
 @@ -13,7 +13,6 @@ require (
github.com/dgryski/go-sip13 v0.0.0-20200911182023-62edffca9245
-   github.com/digitalocean/godo v1.80.0
-   github.com/docker/docker v20.10.16+incompatible
+   github.com/digitalocean/godo v1.81.0
+   github.com/docker/docker v20.10.17+incompatible
 -  github.com/edsrzf/mmap-go v1.1.0
-   github.com/envoyproxy/go-control-plane 
v0.10.2-0.20220325020618-49ff273808a1
+   github.com/envoyproxy/go-control-plane v0.10.3
github.com/envoyproxy/protoc-gen-validate v0.6.7
github.com/fsnotify/fsnot

UPDATE: arm-compute-library 22.08

2022-09-13 Thread Kevin Lo 
Hi,

Here is a straight forward update to arm-compute-library bringing us to 22.08.
For a list of changes, please read
https://arm-software.github.io/ComputeLibrary/v22.08/versions_changelogs.xhtml#S2_2_changelog

ok?

Index: devel/arm-compute-library/Makefile
===
RCS file: /cvs/ports/devel/arm-compute-library/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- devel/arm-compute-library/Makefile  13 Jul 2022 08:12:21 -  1.7
+++ devel/arm-compute-library/Makefile  13 Sep 2022 07:51:32 -
@@ -2,7 +2,7 @@ ONLY_FOR_ARCHS =aarch64
 
 COMMENT =  Arm compute library
 
-V =22.05
+V =22.08
 PKGNAME =  arm-compute-library-${V}
 
 GH_ACCOUNT =   ARM-software
@@ -15,12 +15,13 @@ HOMEPAGE =  https://github.com/ARM-softwa
 
 MAINTAINER =   Kevin Lo 
 
-SO_VERSION =   2.0
-COMPUTE_SO_V = 3.0
+CORE_SO_V =2.0
+GRAPH_SO_V =   2.1
+COMPUTE_SO_V = 3.1
 
 SHARED_LIBS += arm_compute ${COMPUTE_SO_V}
-SHARED_LIBS += arm_compute_core ${SO_VERSION}
-SHARED_LIBS += arm_compute_graph ${SO_VERSION}
+SHARED_LIBS += arm_compute_core ${CORE_SO_V}
+SHARED_LIBS += arm_compute_graph ${GRAPH_SO_V}
 
 # MIT
 PERMIT_PACKAGE=Yes
@@ -49,9 +50,9 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/build/libarm_compute.so \
 ${PREFIX}/lib/libarm_compute.so.${COMPUTE_SO_V}
${INSTALL_DATA} ${WRKSRC}/build/libarm_compute_core.so \
-${PREFIX}/lib/libarm_compute_core.so.${SO_VERSION}
+${PREFIX}/lib/libarm_compute_core.so.${CORE_SO_V}
${INSTALL_DATA} ${WRKSRC}/build/libarm_compute_graph.so \
-${PREFIX}/lib/libarm_compute_graph.so.${SO_VERSION}
+${PREFIX}/lib/libarm_compute_graph.so.${GRAPH_SO_V}
${INSTALL_DATA} ${WRKSRC}/build/*.a ${PREFIX}/lib
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/arm-compute-library
${INSTALL_DATA} ${WRKSRC}/examples/*.{h,cpp} \
Index: devel/arm-compute-library/distinfo
===
RCS file: /cvs/ports/devel/arm-compute-library/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- devel/arm-compute-library/distinfo  13 Jul 2022 08:12:21 -  1.4
+++ devel/arm-compute-library/distinfo  13 Sep 2022 07:51:32 -
@@ -1,2 +1,2 @@
-SHA256 (ComputeLibrary-22.05.tar.gz) = 
lOLp/4fCYanJmHvJAkxEnEgBT3/nBzEb36drh/PdpcU=
-SIZE (ComputeLibrary-22.05.tar.gz) = 13119545
+SHA256 (ComputeLibrary-22.08.tar.gz) = 
rCzntWNumfF1sIQ2L4P+JNcubOsL1i7lhmdy9zVdAk0=
+SIZE (ComputeLibrary-22.08.tar.gz) = 13257068
Index: devel/arm-compute-library/patches/patch-SConscript
===
RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConscript,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-SConscript
--- devel/arm-compute-library/patches/patch-SConscript  13 Jul 2022 08:12:21 
-  1.5
+++ devel/arm-compute-library/patches/patch-SConscript  13 Sep 2022 07:51:32 
-
@@ -1,7 +1,7 @@
 Index: SConscript
 --- SConscript.orig
 +++ SConscript
-@@ -623,7 +623,7 @@ else:
+@@ -632,7 +632,7 @@ else:
  elif 'sve' in env['arch']:
  lib_files += lib_files_sve
  
@@ -10,7 +10,7 @@ Index: SConscript
  
  Export('arm_compute_a')
  
-@@ -642,7 +642,7 @@ if env['os'] == 'macos':
+@@ -651,7 +651,7 @@ if env['os'] == 'macos':
  # macos static library archiver fails if given an empty list of files
  arm_compute_core_a = build_library('arm_compute_core-static', 
arm_compute_env, lib_files, static=True)
  else:
@@ -19,7 +19,7 @@ Index: SConscript
  
  Export('arm_compute_core_a')
  
-@@ -655,7 +655,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
+@@ -664,7 +664,7 @@ arm_compute_graph_env = arm_compute_env.Clone()
  # Build graph libraries
  arm_compute_graph_env.Append(CXXFLAGS = ['-Wno-redundant-move', 
'-Wno-pessimizing-move'])
  
Index: devel/arm-compute-library/patches/patch-SConstruct
===
RCS file: /cvs/ports/devel/arm-compute-library/patches/patch-SConstruct,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-SConstruct
--- devel/arm-compute-library/patches/patch-SConstruct  13 Jul 2022 08:12:21 
-  1.5
+++ devel/arm-compute-library/patches/patch-SConstruct  13 Sep 2022 07:51:32 
-
@@ -1,7 +1,7 @@
 Index: SConstruct
 --- SConstruct.orig
 +++ SConstruct
-@@ -228,17 +228,8 @@ c_compiler = os.environ.get('CC', default_c_compiler)
+@@ -244,17 +244,8 @@ c_compiler = os.environ.get('CC', default_c_compiler)
  if env['os'] == 'android' and ( 'clang++' not in cpp_compiler or 'clang' not 
in c_compiler ):
  print( "WARNING: Only clang is officially supported to build the Compute 
Library for Android")
  
@@ -20,7 +20,7 @@ Index: SConstruct
  if env['cppthreads']:
  env.Append(CPPDEFINES = [('ARM_COMPUTE_CPP_SCHEDULER', 1)])
  
-@@ -373,25 +364,6 @@ if not