Re: [update] samba-4.17.1

2022-10-19 Thread Bjorn Ketelaars
On Wed 19/10/2022 19:05, Jeremie Courreges-Anglas wrote:
> 
> Release notes:
> https://www.samba.org/samba/history/samba-4.17.1.html
> 
> There will be security releases next week so better make sure that the
> changes in 4.17.1 don't cause a regression.

Diff looks good, builds, and works for me on amd64.



CVS: cvs.openbsd.org: ports

2022-10-19 Thread Anthony J . Bentley
CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2022/10/19 20:37:39

Modified files:
sysutils/vultr-cli: Makefile distinfo modules.inc 

Log message:
Update to vultr-cli-2.15.0.

>From Adriano Barbosa (maintainer); thanks!



Re: CVS: cvs.openbsd.org: ports

2022-10-19 Thread Brad Smith
On Wed, Oct 19, 2022 at 02:39:31PM +0100, Stuart Henderson wrote:
> On 2022/10/17 17:19, Christian Weisgerber wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: na...@cvs.openbsd.org   2022/10/17 17:19:36
> > 
> > Modified files:
> > graphics/png   : Makefile distinfo 
> > graphics/png/patches: patch-Makefile_in patch-libpng_pc_in 
> > graphics/png/pkg: PLIST 
> > 
> > Log message:
> > graphics/png: update to 1.6.38
> > 
> > * Fixed various errors in the handling of tRNS, hIST and eXIf.
> > * Implemented many stability improvements across all platforms.
> > 
> > from Brad
> > 
> 
> This moved zlib from 'Requires' to 'Requires.private' in the pkg-config
> file, which breaks graphics/azpainter (undefined references to zlib 
> functions).

Yes, there is a bug in the configure script.


Index: patches/patch-configure
===
RCS file: /home/cvs/ports/graphics/azpainter/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-configure
--- patches/patch-configure 16 Mar 2022 01:44:05 -  1.3
+++ patches/patch-configure 19 Oct 2022 17:50:12 -
@@ -13,15 +13,24 @@ Index: configure
fi
  fi
  
-@@ -290,6 +290,11 @@ elif test "$tmp1" = Darwin;then
-   CFLAGS=`fc_add_string "$CFLAGS" "-DMLK_NO_SIMD"`
- elif test "$tmp1" = FreeBSD;then
-   cf_os=freebsd
-+  cf_make=gmake
-+  CFLAGS=`fc_add_string "$CFLAGS" "-I/usr/local/include"`
-+  LDFLAGS=`fc_add_string "$LDFLAGS" "-L/usr/local/lib"`
-+elif test "$tmp1" = OpenBSD;then
-+  cf_os=openbsd
+@@ -293,6 +293,11 @@ elif test "$tmp1" = FreeBSD;then
cf_make=gmake
CFLAGS=`fc_add_string "$CFLAGS" "-I/usr/local/include"`
LDFLAGS=`fc_add_string "$LDFLAGS" "-L/usr/local/lib"`
++elif test "$tmp1" = OpenBSD;then
++  cf_os=openbsd
++  cf_make=gmake
++  CFLAGS=`fc_add_string "$CFLAGS" "-I/usr/local/include"`
++  LDFLAGS=`fc_add_string "$LDFLAGS" "-L/usr/local/lib"`
+ fi
+ 
+ # dir
+@@ -349,7 +354,7 @@ fc_check_sharedlib "iconv"
+ fc_check_funclink rt "clock_gettime"
+ 
+ fc_check_lib libpng "libpng" "" "-lpng -lz" "png.h" "" "libpng-dev or 
libpng-devel or libpng or png"
+-fc_check_lib zlib "zlib" "" "" "zlib.h" "" "zlib1g-dev or zlib-devel or zlib"
++fc_check_lib zlib "zlib" "" "-lz" "zlib.h" "" "zlib1g-dev or zlib-devel or 
zlib"
+ fc_check_lib libjpeg "libjpeg" "" "-ljpeg" "stdio.h jpeglib.h" "" 
"libjpeg-dev or libjpeg-devel or libjpeg-turbo or jpeg-turbo"
+ fc_check_lib libtiff "libtiff-4" "" "-ltiff" "tiff.h" "" "libtiff-dev or 
libtiff-devel or libtiff or tiff"
+ fc_check_lib libwebp "libwebp" "" "-lwebp" "webp/decode.h" "" "libwebp-dev or 
libwebp-devel or libwebp or webp"



Re: security update www/nginx to 1.22.1

2022-10-19 Thread Stuart Henderson
On 2022/10/19 16:30, Sergey A. Osokin wrote:
> Hi,
> 
> could you please review the following changes for the security
> update www/nginx to the recent stable version, 1.22.1.

adding maintainer to CC, it's usually helpful ..

> Here's the commit message.
> ---
> www/nginx: security update 1.22.0 -> 1.22.1
> 
> 
> 
> *) Security: processing of a specially crafted mp4 file by the
>ngx_http_mp4_module might cause a worker process crash, worker
>process memory disclosure, or might have potential other impact
>(CVE-2022-41741, CVE-2022-41742).

I'm ok with the update however it is a noop for us as we don't build
that module in the port.



[update] samba-4.17.1

2022-10-19 Thread Jeremie Courreges-Anglas


Release notes:
https://www.samba.org/samba/history/samba-4.17.1.html

There will be security releases next week so better make sure that the
changes in 4.17.1 don't cause a regression.


Index: Makefile
===
RCS file: /home/cvs/ports/net/samba/Makefile,v
retrieving revision 1.319
diff -u -p -r1.319 Makefile
--- Makefile5 Oct 2022 17:03:41 -   1.319
+++ Makefile19 Oct 2022 17:00:52 -
@@ -1,4 +1,4 @@
-VERSION =  4.17.0
+VERSION =  4.17.1
 DISTNAME = samba-${VERSION}
 EPOCH =0
 
@@ -25,7 +25,7 @@ SHARED_LIBS = dcerpc  1.1 \
samba-hostconfig10.0 \
samba-passdb3.0 \
samba-util  8.0 \
-   samdb   2.0 \
+   samdb   2.1 \
smbclient   6.1 \
smbconf 12.0 \
smbldap 1.0 \
Index: distinfo
===
RCS file: /home/cvs/ports/net/samba/distinfo,v
retrieving revision 1.97
diff -u -p -r1.97 distinfo
--- distinfo5 Oct 2022 17:03:41 -   1.97
+++ distinfo19 Oct 2022 16:08:10 -
@@ -1,2 +1,2 @@
-SHA256 (samba-4.17.0.tar.gz) = BIaOzagvy+2nuL9RmiRhpk1VxucO/G9gU7L7ulXxgjo=
-SIZE (samba-4.17.0.tar.gz) = 30767998
+SHA256 (samba-4.17.1.tar.gz) = G5OdA/jKVxlMQT7YYwFKOFDJzp+eMcKn33BoBvunfAE=
+SIZE (samba-4.17.1.tar.gz) = 30795757
Index: pkg/PLIST-main
===
RCS file: /home/cvs/ports/net/samba/pkg/PLIST-main,v
retrieving revision 1.66
diff -u -p -r1.66 PLIST-main
--- pkg/PLIST-main  5 Oct 2022 17:03:41 -   1.66
+++ pkg/PLIST-main  19 Oct 2022 16:44:26 -
@@ -1084,6 +1084,8 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}kdc_tgs_tests.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}kpasswd_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}kpasswd_tests.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}lockout_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}lockout_tests.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}ms_kile_client_principal_lookup_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}ms_kile_client_principal_lookup_tests.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/${MODPY_PYCACHE}nt_hash_tests.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1132,6 +1134,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/kdc_tests.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/kdc_tgs_tests.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/kpasswd_tests.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/lockout_tests.py
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/nt_hash_tests.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/krb5/pac_align_tests.py


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE



Iridium/Ungoogled Chromium as 7.2 Stable Updates?

2022-10-19 Thread Heppler, J. Scott

There was a significant update to www/Iridium that occurred just after
the ports freeze.  www/ungoogled-chromium was also added.  Is there any
consideration for providing Iridium as an update?  www/googled-chromium
is a newly added package but blurs the criteria for updates as it
patches www/chromium.

"My life is my own" (Not Googles) - Patrick McGoohan in the Prisoner

--
J. Scott Heppler



security update www/nginx to 1.22.1

2022-10-19 Thread Sergey A. Osokin
Hi,

could you please review the following changes for the security
update www/nginx to the recent stable version, 1.22.1.

Here's the commit message.
---
www/nginx: security update 1.22.0 -> 1.22.1



*) Security: processing of a specially crafted mp4 file by the
   ngx_http_mp4_module might cause a worker process crash, worker
   process memory disclosure, or might have potential other impact
   (CVE-2022-41741, CVE-2022-41742).


---

Thank you.

-- 
Sergey A. Osokin
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.164
diff -u -p -r1.164 Makefile
--- Makefile	29 Aug 2022 19:15:18 -	1.164
+++ Makefile	19 Oct 2022 16:22:00 -
@@ -15,7 +15,7 @@ COMMENT-passenger=	nginx passenger (ruby
 COMMENT-rtmp=		nginx module for RTMP streaming
 COMMENT-securelink=	nginx HMAC secure link module
 
-VERSION=	1.22.0
+VERSION=	1.22.1
 DISTNAME=	nginx-${VERSION}
 CATEGORIES=	www
 
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.79
diff -u -p -r1.79 distinfo
--- distinfo	30 May 2022 08:17:34 -	1.79
+++ distinfo	19 Oct 2022 16:22:00 -
@@ -2,7 +2,7 @@ SHA256 (headers-more-nginx-module-v0.33.
 SHA256 (lua-nginx-module-v0.10.11.tar.gz) = wPuR/P0cbn3sNMpkgm74H/66/e9hdNJURnY284BWZiY=
 SHA256 (naxsi-1.3.tar.gz) = Q5yGdzctJZe0Ngu8wQvIZJDeH8dWlbGTrV3xVKIU1ig=
 SHA256 (nginx-1.20.1-chroot.patch) = SS1TB0j8N4/dn5pUTGT6WvkN3aAUuKz5+R0Nt+MG0gk=
-SHA256 (nginx-1.22.0.tar.gz) = sz1Wmm8RoBQzpXzhfoOTXpU61Nx3zdTUD4lsiKwm61M=
+SHA256 (nginx-1.22.1.tar.gz) = nrszOp6CuVKs0+K0rrHU/2QG9ySRurbNn+afDepzfzE=
 SHA256 (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = aQxOW9sq4ZsP7nXNNW0YATRo20cmFrYJeloLvjRshGQ=
 SHA256 (nginx-rtmp-module-v1.2.1.tar.gz) = h6pZdACwtaBSdO4tI9jLgiThJoYiegq+MdeDs6ZF6jc=
 SHA256 (ngx_devel_kit-v0.3.0.tar.gz) = iOBamainQZBm9a51lm+x78QJutRSLRSYbaB0VUrmFhk=
@@ -12,7 +12,7 @@ SIZE (headers-more-nginx-module-v0.33.ta
 SIZE (lua-nginx-module-v0.10.11.tar.gz) = 616653
 SIZE (naxsi-1.3.tar.gz) = 235626
 SIZE (nginx-1.20.1-chroot.patch) = 8783
-SIZE (nginx-1.22.0.tar.gz) = 1073322
+SIZE (nginx-1.22.1.tar.gz) = 1073948
 SIZE (nginx-auth-ldap-83c059b73566c2ee9cbda920d91b66657cf120b7.tar.gz) = 18542
 SIZE (nginx-rtmp-module-v1.2.1.tar.gz) = 519919
 SIZE (ngx_devel_kit-v0.3.0.tar.gz) = 66455


signature.asc
Description: PGP signature


CVS: cvs.openbsd.org: ports

2022-10-19 Thread Anton Lindqvist
CVSROOT:/cvs
Module name:ports
Changes by: an...@cvs.openbsd.org   2022/10/19 10:21:44

Modified files:
mail/mdsort: Makefile distinfo 

Log message:
update to mdsort-11.5.0



CVS: cvs.openbsd.org: ports

2022-10-19 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2022/10/19 09:59:21

Modified files:
security/gnupg : Makefile distinfo 
Added files:
security/gnupg/patches: patch-dirmngr_server_c 

Log message:
Update to gnupg-2.2.40

ChangeLog: https://dev.gnupg.org/T6181

Test report from op@, thanks!



Re: CVS: cvs.openbsd.org: ports

2022-10-19 Thread Stuart Henderson
On 2022/10/17 17:19, Christian Weisgerber wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   na...@cvs.openbsd.org   2022/10/17 17:19:36
> 
> Modified files:
>   graphics/png   : Makefile distinfo 
>   graphics/png/patches: patch-Makefile_in patch-libpng_pc_in 
>   graphics/png/pkg: PLIST 
> 
> Log message:
> graphics/png: update to 1.6.38
> 
> * Fixed various errors in the handling of tRNS, hIST and eXIf.
> * Implemented many stability improvements across all platforms.
> 
> from Brad
> 

This moved zlib from 'Requires' to 'Requires.private' in the pkg-config
file, which breaks graphics/azpainter (undefined references to zlib functions).



CVS: cvs.openbsd.org: ports

2022-10-19 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/10/19 06:55:48

Modified files:
net/isc-bind   : Makefile distinfo 
net/isc-bind/patches: patch-bin_dig_dig_c 

Log message:
update to isc-bind-9.18.8



[maintainer update] remind 4.0.3 -> 4.2.0

2022-10-19 Thread Martin Ziemer
This patch updates remind from 4.0.3 to 4.2.0.

To get make test running i cherry picked two commits.

Tested on three amd64 systems. (Only one with tkremind)

Index: Makefile
===
RCS file: /cvs/ports/misc/remind/Makefile,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile
--- Makefile16 Aug 2022 17:42:21 -  1.60
+++ Makefile17 Oct 2022 14:21:00 -
@@ -1,7 +1,7 @@
 COMMENT=   scripting language for reminders, with a Tk front end
 
-DISTNAME=  remind-04.00.03
-PKGNAME=   remind-4.0.3
+DISTNAME=  remind-04.02.00
+PKGNAME=   remind-4.2.0
 
 CATEGORIES=misc
 
Index: distinfo
===
RCS file: /cvs/ports/misc/remind/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo16 Aug 2022 17:42:21 -  1.30
+++ distinfo17 Oct 2022 14:21:00 -
@@ -1,2 +1,2 @@
-SHA256 (remind-04.00.03.tar.gz) = slTeBD7zk3aUxaRYBwrOtNz4cbWL0q57Me8SWwB3eHk=
-SIZE (remind-04.00.03.tar.gz) = 466497
+SHA256 (remind-04.02.00.tar.gz) = pkds8N/nG8RmjndGaRAMWNaLaNxszwjKfqn6M0XnJzk=
+SIZE (remind-04.02.00.tar.gz) = 486788
Index: patches/patch-src_dosubst_c
===
RCS file: patches/patch-src_dosubst_c
diff -N patches/patch-src_dosubst_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_dosubst_c 17 Oct 2022 14:21:00 -
@@ -0,0 +1,13 @@
+# Cherry pick 
https://salsa.debian.org/dskoll/remind/-/commit/8fc19358bbea9429f8bed960ec60937b196751be
+Index: src/dosubst.c
+--- src/dosubst.c.orig
 src/dosubst.c
+@@ -244,7 +244,7 @@ int DoSubst(ParsePtr p, DynamicBuffer *dbuf, Trigger *
+ }
+ }
+ if (!c) {
+-Wprint("Warning: Unterminated %{...} substitution sequence");
++Wprint("Warning: Unterminated %%{...} substitution sequence");
+ }
+ if (UserFuncExists(s) != 3) {
+ continue;
Index: patches/patch-tests_test_cmp
===
RCS file: patches/patch-tests_test_cmp
diff -N patches/patch-tests_test_cmp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-tests_test_cmp17 Oct 2022 14:21:00 -
@@ -0,0 +1,162 @@
+# Cherry Pick from 
https://salsa.debian.org/dskoll/remind/-/commit/3692a6b265452d96904f67871325afb1b401c16e#444f828087e44bbf858dd1feeed7d2863b2d4bfc
+Index: tests/test.cmp
+--- tests/test.cmp.orig
 tests/test.cmp
+@@ -10334,20 +10334,20 @@ STDOUT is a: PIPE
+ 
+ set a localtoutc('2022-01-01@12:00')
+ localtoutc(2022-01-01@12:00) => 2022-01-01@17:00
+-set a localtoutc('2022-03-13@02:59')
+-localtoutc(2022-03-13@02:59) => 2022-03-13@07:59
+-set a localtoutc('2022-03-13@03:00')
+-localtoutc(2022-03-13@03:00) => 2022-03-13@07:00
+-set a localtoutc('2022-03-13@03:01')
+-localtoutc(2022-03-13@03:01) => 2022-03-13@07:01
++set a localtoutc('2022-03-13@03:59')
++localtoutc(2022-03-13@03:59) => 2022-03-13@07:59
++set a localtoutc('2022-03-13@04:00')
++localtoutc(2022-03-13@04:00) => 2022-03-13@08:00
++set a localtoutc('2022-03-13@04:01')
++localtoutc(2022-03-13@04:01) => 2022-03-13@08:01
+ set a localtoutc('2022-06-01@12:00')
+ localtoutc(2022-06-01@12:00) => 2022-06-01@16:00
+-set a localtoutc('2022-11-06@01:59')
+-localtoutc(2022-11-06@01:59) => 2022-11-06@05:59
+-set a localtoutc('2022-11-06@02:00')
+-localtoutc(2022-11-06@02:00) => 2022-11-06@07:00
+-set a localtoutc('2022-11-06@02:01')
+-localtoutc(2022-11-06@02:01) => 2022-11-06@07:01
++set a localtoutc('2022-11-06@02:59')
++localtoutc(2022-11-06@02:59) => 2022-11-06@07:59
++set a localtoutc('2022-11-06@03:00')
++localtoutc(2022-11-06@03:00) => 2022-11-06@08:00
++set a localtoutc('2022-11-06@03:01')
++localtoutc(2022-11-06@03:01) => 2022-11-06@08:01
+ set a localtoutc('2022-12-01@12:00')
+ localtoutc(2022-12-01@12:00) => 2022-12-01@17:00
+ 
+@@ -10355,10 +10355,10 @@ set b utctolocal('2022-01-01@17:00')
+ utctolocal(2022-01-01@17:00) => 2022-01-01@12:00
+ set b utctolocal('2022-03-13@06:00')
+ utctolocal(2022-03-13@06:00) => 2022-03-13@01:00
+-set b utctolocal('2022-03-13@06:01')
+-utctolocal(2022-03-13@06:01) => 2022-03-13@01:01
+-set b utctolocal('2022-03-13@06:59')
+-utctolocal(2022-03-13@06:59) => 2022-03-13@01:59
++set b utctolocal('2022-03-13@07:01')
++utctolocal(2022-03-13@07:01) => 2022-03-13@03:01
++set b utctolocal('2022-03-13@07:59')
++utctolocal(2022-03-13@07:59) => 2022-03-13@03:59
+ set b utctolocal('2022-03-13@07:00')
+ utctolocal(2022-03-13@07:00) => 2022-03-13@03:00
+ set b utctolocal('2022-03-13@07:01')
+@@ -10367,20 +10367,20 @@ set b utctolocal('2022-03-13@07:59')
+ utctolocal(2022-03-13@07:59) => 2022-03-13@03:59
+ set b utctolocal('2022-06-01@16:00')
+ utctolocal(2022-06-01@16:00) => 2022-06-01@12:00
+-set b utctolocal('2022-11-06@05:59')
+-utctolocal(2022-11-06@05:59) => 2022-11-06@01:59
+-set b 

Re: maintainer update net/py-nbxmpp --> 3.2.4

2022-10-19 Thread Stuart Henderson
On 2022/10/19 11:22, Paco Esteban wrote:
> By telling setup.py explicitly where the test suite is we avoid this.

No need to patch, just set MODPY_PYTEST_ARGS=test. OK with that.
(I would also do MODPY_PYBUILD=setuptools and regen PLIST)




Re: Early look: PostgreSQL 15.0

2022-10-19 Thread Theo Buehler
On Wed, Oct 19, 2022 at 01:14:44PM +0100, Stuart Henderson wrote:
> On 2022/10/19 09:47, Stuart Henderson wrote:
> > On 2022/10/19 01:38, Theo Buehler wrote:
> > > > The main part I want feedback on is a new patch that silently treats the
> > > > dynamic_shared_memory_type = posix as dynamic_shared_memory_type = shm.
> > > > Since 15beta1, I had an issue where the PostgreSQL server would stop
> > > > working after a week.  I traced that issue to OpenBSD deleting the
> > > > shared memory files in /tmp that shm_open(3) creates, since they were
> > > > more than a week old.  Possibly this is only an issue on lightly loaded
> > > > servers, but unless daily(8) skips deleting these files automatically, I
> > > > consider the approach the patch uses necessary for reliable operation.
> > > 
> > > I think a patch that extends the list before -prune in daily(8) with
> > > './*.shm' would be perfectly acceptable. I'd ok it once it's tested.
> > 
> > Since the decision to put these "files" in /tmp is OpenBSD's
> > (see libc/gen/shm_open.c) it should definitely be handling them
> > automatically in the system scripts.

Exactly.

> It needs to be after the -prune, as that acts only to trim the
> tree descended for the conditons after the "-o".

Ah, right. I knew it was too late for me to cook a diff :)

> OK?

Yes, this works here.

ok tb



> 
> 
> Index: daily
> ===
> RCS file: /cvs/src/etc/daily,v
> retrieving revision 1.95
> diff -u -p -r1.95 daily
> --- daily 20 Oct 2020 22:42:29 -  1.95
> +++ daily 19 Oct 2022 12:10:56 -
> @@ -49,8 +49,8 @@ if [ -d /tmp -a ! -L /tmp ]; then
>   cd /tmp && {
>   find -x . \
>   \( -path './ssh-*' -o -path ./.X11-unix -o -path ./.ICE-unix \
> - -o -path './tmux-*' \) \
> - -prune -o -type f -atime +7 -delete 2>/dev/null
> + -o -path './tmux-*' \) -prune -o \
> + -type f -and ! -path './*.shm' -atime +7 -delete 2>/dev/null
>   find -x . -type d -mtime +1 ! -path ./vi.recover ! -path ./.X11-unix \
>   ! -path ./.ICE-unix ! -name . \
>   -delete >/dev/null 2>&1; }
> 
> 
> > (I'm not entirely convinced /tmp is a great place to store them
> > but I don't really have a better idea. On most Linux they use
> > a separate /dev/shm ramdisk but I don't think adding a new fstab
> > entry for a libc requirement is going to work out for us!)
> 
> ...also, changing the path would require auditing ports for unveil.
> 



Re: Early look: PostgreSQL 15.0

2022-10-19 Thread Stuart Henderson
On 2022/10/19 09:47, Stuart Henderson wrote:
> On 2022/10/19 01:38, Theo Buehler wrote:
> > > The main part I want feedback on is a new patch that silently treats the
> > > dynamic_shared_memory_type = posix as dynamic_shared_memory_type = shm.
> > > Since 15beta1, I had an issue where the PostgreSQL server would stop
> > > working after a week.  I traced that issue to OpenBSD deleting the
> > > shared memory files in /tmp that shm_open(3) creates, since they were
> > > more than a week old.  Possibly this is only an issue on lightly loaded
> > > servers, but unless daily(8) skips deleting these files automatically, I
> > > consider the approach the patch uses necessary for reliable operation.
> > 
> > I think a patch that extends the list before -prune in daily(8) with
> > './*.shm' would be perfectly acceptable. I'd ok it once it's tested.
> 
> Since the decision to put these "files" in /tmp is OpenBSD's
> (see libc/gen/shm_open.c) it should definitely be handling them
> automatically in the system scripts.

It needs to be after the -prune, as that acts only to trim the
tree descended for the conditons after the "-o".

OK?


Index: daily
===
RCS file: /cvs/src/etc/daily,v
retrieving revision 1.95
diff -u -p -r1.95 daily
--- daily   20 Oct 2020 22:42:29 -  1.95
+++ daily   19 Oct 2022 12:10:56 -
@@ -49,8 +49,8 @@ if [ -d /tmp -a ! -L /tmp ]; then
cd /tmp && {
find -x . \
\( -path './ssh-*' -o -path ./.X11-unix -o -path ./.ICE-unix \
-   -o -path './tmux-*' \) \
-   -prune -o -type f -atime +7 -delete 2>/dev/null
+   -o -path './tmux-*' \) -prune -o \
+   -type f -and ! -path './*.shm' -atime +7 -delete 2>/dev/null
find -x . -type d -mtime +1 ! -path ./vi.recover ! -path ./.X11-unix \
! -path ./.ICE-unix ! -name . \
-delete >/dev/null 2>&1; }


> (I'm not entirely convinced /tmp is a great place to store them
> but I don't really have a better idea. On most Linux they use
> a separate /dev/shm ramdisk but I don't think adding a new fstab
> entry for a libc requirement is going to work out for us!)

...also, changing the path would require auditing ports for unveil.



CVS: cvs.openbsd.org: ports

2022-10-19 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/10/19 05:53:43

Modified files:
devel/py-tz: Makefile distinfo 

Log message:
update to py3-tz-2022.5



CVS: cvs.openbsd.org: ports

2022-10-19 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/10/19 05:50:06

Modified files:
databases/citus: Makefile distinfo 
databases/citus/pkg: PLIST 
Added files:
databases/citus/patches: patch-Makefile 

Log message:
update to citus-11.1.3 and fix up tests



CVS: cvs.openbsd.org: ports

2022-10-19 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/10/19 05:39:38

Modified files:
net/librenms   : Makefile distinfo 
net/librenms/patches: patch-LibreNMS_Config_php patch-daily_sh 
net/librenms/pkg: PLIST 

Log message:
update to librenms-22.10.0



CVS: cvs.openbsd.org: ports

2022-10-19 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/10/19 05:36:34

Modified files:
net/arp-scan   : Makefile distinfo 

Log message:
bump the version for arp-scan, a previous commit was tagged but not marked as a
release in github so I (and portroach) missed it



CVS: cvs.openbsd.org: ports

2022-10-19 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/10/19 05:23:23

Modified files:
textproc/py-patiencediff: Makefile distinfo 
textproc/py-patiencediff/pkg: DESCR 

Log message:
update to py3-patiencediff-0.2.6

add a note in DESCR on how to run this from the command-line rather than
as part of a Python program (python3 -m patiencediff file_a file_b)



CVS: cvs.openbsd.org: ports

2022-10-19 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/10/19 05:19:53

Modified files:
textproc/py-webencodings: Makefile 
textproc/py-webencodings/pkg: PLIST 

Log message:
use MODPY_PYBUILD



CVS: cvs.openbsd.org: ports

2022-10-19 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/10/19 05:17:04

Modified files:
textproc/py-tinycss2: Makefile distinfo 

Log message:
update to py3-tinycss2-1.2.1



update editors/ghostwriter to 2.2.0

2022-10-19 Thread Omar Polo
updated diff for latest release.  2.2.0 is also bugfixes.  freebsd and
alpine are fetching the 2.2.0 tag but doesn't seem to exists on
github, so i'm using a commit id like nixos does too.

On 2022/10/12 16:12:54 +0200, Omar Polo  wrote:
> On 2022/10/04 16:39:49 +0200, Omar Polo  wrote:
> > Hello,
> > 
> > simple update.  it was moved under the KDE wing and homepage is 404.
> > Don't know if in the future it should be moved under kde applications
> > due to this change, but at least for the moment i don't seem to find a
> > ghostwriter tarball in the KDE master site.
> > 
> > the changelog for 2.1.5 and 2.1.6 is only minor bugfixes and qt6
> > support.  sync WANTLIB too, it doesn't link to Qt5WebEngine, only to
> > the core and widgets.
> > 
> > ok?
> 
> friendly ping

ok?

Index: Makefile
===
RCS file: /home/cvs/ports/editors/ghostwriter/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile10 Jul 2022 17:34:05 -  1.19
+++ Makefile19 Oct 2022 10:37:51 -
@@ -3,20 +3,21 @@ USE_WXNEEDED =Yes
 
 COMMENT =  distraction-free Markdown editor
 
-GH_ACCOUNT =   wereturtle
+GH_ACCOUNT =   KDE
 GH_PROJECT =   ghostwriter
-GH_TAGNAME =   2.1.4
+GH_COMMIT =151268bcfdca57bba4944caa7172dde9549f0622
+DISTNAME = ghostwriter-2.2.0
 
 CATEGORIES =   editors
 
-HOMEPAGE = https://wereturtle.github.io/ghostwriter/
+HOMEPAGE = https://ghostwriter.kde.org/
 
 # GPLv3 code, CC BY-SA 4.0 resources
 PERMIT_PACKAGE =   Yes
 
 WANTLIB += ${COMPILER_LIBCXX} GL Qt5Concurrent Qt5Core Qt5Gui
 WANTLIB += Qt5Network Qt5Positioning Qt5PrintSupport Qt5Qml Qt5QmlModels
-WANTLIB += Qt5Quick Qt5Svg Qt5WebChannel Qt5WebEngine Qt5WebEngineCore
+WANTLIB += Qt5Quick Qt5Svg Qt5WebChannel Qt5WebEngineCore
 WANTLIB += Qt5WebEngineWidgets Qt5Widgets c hunspell-1.7 m
 
 USE_GMAKE =Yes
Index: distinfo
===
RCS file: /home/cvs/ports/editors/ghostwriter/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo10 Jul 2022 17:34:05 -  1.8
+++ distinfo19 Oct 2022 10:38:34 -
@@ -1,2 +1,2 @@
-SHA256 (ghostwriter-2.1.4.tar.gz) = 
y8GwbFclAx0UeGnCK61MJj1n6H5bMoTFy/41ry8p3N4=
-SIZE (ghostwriter-2.1.4.tar.gz) = 7725770
+SHA256 (ghostwriter-2.2.0-151268bc.tar.gz) = 
u6zK8v1BcNyztp2dia9LNeJC0Ry/9iaA7AX8++PuAEc=
+SIZE (ghostwriter-2.2.0-151268bc.tar.gz) = 7758672



Re: maintainer update net/gajim --> 1.5.2

2022-10-19 Thread Omar Polo
On 2022/10/18 19:57:32 +0200, Paco Esteban  wrote:
> Hi ports@,
> 
> This is an update of net/gajim to its latest version 1.5.2
> Lots of changes and bugfixes since the version we have in ports (1.4.7):
> https://dev.gajim.org/gajim/gajim/-/blob/master/ChangeLog
> 
> One of the most interesting ones is that, after a user opened an issue,
> there was some discussion and upstream fixed the plugins situation.
> They now work on OpenBSD (and probably others, as they now check
> specifically for win32 or darwin and treat the rest as equal) and can be
> managed from within gajim, so I removed all the comments/instructions on
> the pkg README
> 
> The update of the port itself is pretty straight forward.  It needs the
> update to net/py-nbxmpp sent on another thread.
> 
> Works fine for me on amd64.
> 
> Ok to commit ?

Works fine for me, happy that we can install plugins easily again!

OK op@

Thanks!



CVS: cvs.openbsd.org: ports

2022-10-19 Thread Klemens Nanni
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2022/10/19 03:48:08

Modified files:
security/qdigidoc4: Makefile 

Log message:
PR got merged, keep track



Re: maintainer update net/py-nbxmpp --> 3.2.4

2022-10-19 Thread Paco Esteban
On Tue, 18 Oct 2022, Paco Esteban wrote:

> Hi ports@,
> 
> This is an update for net/py-nbxmpp to its latest version.  It's needed
> for an update on net/gajim sent on a separate thread.
> 
> Here's the changelog: 
> https://dev.gajim.org/gajim/python-nbxmpp/-/blob/master/ChangeLog
> 
> On the port itself, I had to force the do-test target to use pytest, is
> the only way I found to make tests pass.  Let me know if there's
> a better way to do this.

sthen@ pointed me in the right direction.
The problem was that unittest was loading all the modules on the source
folder.  Upstream recently made the examples folder a module by adding
__init__.py, which tried to launch an app invoking Gtk.

By telling setup.py explicitly where the test suite is we avoid this.

New diff at the end.

> All tests pass and works for me on amd64.
> Ok to commit ?

diff refs/heads/master refs/heads/gajim-1.5.2
commit - 01fc26361d27dfcf739435434eaf1042d824c95b
commit + 6596f6b0a016d92ff5f3efe29b1299a32ffb1673
blob - c0b5b8d540727ef07a0c1cca4b577ea77b7f64c2
blob + 15c266ba186d9f036201f83abb325c9c0e69f911
--- net/py-nbxmpp/Makefile
+++ net/py-nbxmpp/Makefile
@@ -1,6 +1,6 @@
 COMMENT =  Python XMPP and Jabber implementation
 
-MODPY_EGG_VERSION =3.1.1
+MODPY_EGG_VERSION =3.2.4
 DISTNAME = nbxmpp-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   net devel
@@ -16,12 +16,13 @@ MODPY_PYTEST =  Yes 
 
 MODULES =  lang/python
 MODPY_SETUPTOOLS = Yes
-MODPY_PYTEST = Yes 
+MODPY_PYTEST = Yes
 
-RUN_DEPENDS=   devel/glib2>=2.6.0 \
+RUN_DEPENDS =  devel/glib2>=2.6.0 \
devel/libsoup \
devel/py-gobject3${MODPY_FLAVOR} \
net/py-idna${MODPY_FLAVOR} \
+   sysutils/py-packaging${MODPY_FLAVOR} \
textproc/py-precis_i18n${MODPY_FLAVOR}
 
 FLAVORS =  python3
blob - f41414382d59afb121a3f66a47c6b8186b28a5d7
blob + d7ad69572af4ab366b3c8905877c70805d0972a3
--- net/py-nbxmpp/distinfo
+++ net/py-nbxmpp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nbxmpp-3.1.1.tar.gz) = BLMqR592FdFjpJHMEcYLTBT9dFKB1GVWTMcQB87WyDk=
-SIZE (nbxmpp-3.1.1.tar.gz) = 158035
+SHA256 (nbxmpp-3.2.4.tar.gz) = dN7/T8IGAyVVcffgtM1oFX5E4edpNB5j0y3YRqKRphU=
+SIZE (nbxmpp-3.2.4.tar.gz) = 161470
blob - 107d2a579b45dba7aeeb89f396474a5f16bab4f4
blob + 1082fe0858176ab0c63a68efa971611e60c17169
--- net/py-nbxmpp/pkg/PLIST
+++ net/py-nbxmpp/pkg/PLIST
@@ -10,7 +10,6 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODP
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}addresses.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}c14n.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc
@@ -22,9 +21,12 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODP
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}namespaces.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}old_dispatcher.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}precis.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}protocol.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}sasl.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}simplexml.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}smacks.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}stringprep.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}structs.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}task.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}tcp.${MODPY_PYC_MAGIC_TAG}pyc
@@ -32,13 +34,18 @@ lib/python${MODPY_VERSION}/site-packages/nbxmpp/auth.p
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/nbxmpp/${MODPY_PYCACHE}websocket.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/nbxmpp/addresses.py
-lib/python${MODPY_VERSION}/site-packages/nbxmpp/auth.py
 

Re: Early look: PostgreSQL 15.0

2022-10-19 Thread Stuart Henderson
On 2022/10/19 01:38, Theo Buehler wrote:
> > The main part I want feedback on is a new patch that silently treats the
> > dynamic_shared_memory_type = posix as dynamic_shared_memory_type = shm.
> > Since 15beta1, I had an issue where the PostgreSQL server would stop
> > working after a week.  I traced that issue to OpenBSD deleting the
> > shared memory files in /tmp that shm_open(3) creates, since they were
> > more than a week old.  Possibly this is only an issue on lightly loaded
> > servers, but unless daily(8) skips deleting these files automatically, I
> > consider the approach the patch uses necessary for reliable operation.
> 
> I think a patch that extends the list before -prune in daily(8) with
> './*.shm' would be perfectly acceptable. I'd ok it once it's tested.

Since the decision to put these "files" in /tmp is OpenBSD's
(see libc/gen/shm_open.c) it should definitely be handling them
automatically in the system scripts.

(I'm not entirely convinced /tmp is a great place to store them
but I don't really have a better idea. On most Linux they use
a separate /dev/shm ramdisk but I don't think adding a new fstab
entry for a libc requirement is going to work out for us!)



Re: [maintainer update] www/gotosocial 0.3.7 -> 0.5.2

2022-10-19 Thread Hukadan
Hi,

Thank you! This is weird: tests passed on
my side. I will double check this evening
just to be sure.

This codeberg.org/gruf/go-ulid module has
been given me headaches. See:
https://marc.info/?l=openbsd-ports=166534427330832=2

I have still no clue about what's happening
here.

Regards,

Hukadan

Le 2022-10-19 09:50, Omar Polo a écrit :
> Hi!
> 
> On 2022/10/18 21:30:05 +0200, Hukadan  wrote:
>> Hi @ports,
>>
>> Here is an update for gotosocial. Sorry for
>> the delay since the last update.
>>
>> I added a do-test target and put the MAKE_ENV
>> needed for those tests just above. I am not sure
>> this is where they belong but portcheck did not
>> complain.
>>
>> I also added a MODGO_LDFLAGS so the version
>> of GtS is displayed on the homepage.
>>
>> Release notes:
>> https://github.com/superseriousbusiness/gotosocial/releases/tag/v0.5.2
>> https://github.com/superseriousbusiness/gotosocial/releases/tag/v0.5.1
>> https://github.com/superseriousbusiness/gotosocial/releases/tag/v0.5.0
>> https://github.com/superseriousbusiness/gotosocial/releases/tag/v0.4.0
>> https://github.com/superseriousbusiness/gotosocial/releases/tag/v0.3.8
>>
>> There was a lot of improvements such as a
>> user settings panel and shared boxes.
>>
>> I have been running the latest version for
>> more than a week without issue.
> 
> Thanks!  I've committed it with some minor tweaks, comments below:
> 
>> diff --git a/www/gotosocial/Makefile b/www/gotosocial/Makefile
>> index dba15d35662..b26fbd6e8e9 100644
>> --- a/www/gotosocial/Makefile
>> +++ b/www/gotosocial/Makefile
>> @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS = amd64
>>  COMMENT =   ActivityPub social network server
>>
>>  MODGO_MODNAME = github.com/superseriousbusiness/gotosocial
>> -MODGO_VERSION = v0.3.7
>> +MODGO_VERSION = v0.5.2
>>  REVISION =  0
> 
> Revision starts as '' (empty string), so when bumping the version just
> delete it.
> 
>>  DISTNAME =  gotosocial-${MODGO_VERSION}
>> @@ -28,6 +28,8 @@ MODULES =  lang/go
>>
>>  WRKDIST =   ${WRKSRC}
>>
>> +MODGO_LDFLAGS += -X 'main.Version=${MODGO_VERSION:S/v//}p${REVISION}'
>> +
> 
> so i've dropped the p${REVISION} part here too.
> 
>>  PREFIX =${VARBASE}
>>  INSTDIR =   ${PREFIX}/gotosocial
>>
>> @@ -51,6 +53,13 @@ do-install:
>>  ${INSTALL_DATA_DIR} ${INSTDIR}/storage
>>  cp -R ${WRKDIR}/web ${INSTDIR}
>>
>> +# for test purposes only
>> +MAKE_ENV +=GTS_DB_TYPE="sqlite"
>> +MAKE_ENV +=GTS_DB_ADDRESS=":memory:"
> 
> usually, variables are defined before targets.  Also, for tests please
> use TEST_ENV that is more appropriate in this case.
> 
>> +do-test:
>> +cd ${WRKSRC} && \
>> +   ${MODGO_TEST_CMD} -count 1 ./...
>> +
> 
> This fails for me, and since it has the same behavior of the default
> MODGO_TEST_TARGET, i dropped this bit and added a comment that test
> fails.  (i did not consider this a blocker for the update)
> 
> I get:
> 
> ===>  Regression tests for gotosocial-0.5.2
> cd
> /usr/ports/pobj/gotosocial-0.5.2/github.com/superseriousbusiness/gotosocial@v0.5.2
> && /usr/bin/env -i GO386=softfloat
> GOCACHE="/usr/ports/pobj/gotosocial-0.5.2/go-cache"
> TMPDIR="/usr/ports/pobj/gotosocial-0.5.2/build-amd64"
> GOPROXY=file:///usr/ports/pobj/gotosocial-0.5.2/go_modules
> GO111MODULE=on
> GOPATH="/usr/ports/pobj/gotosocial-0.5.2/go:/var/go-pkg"
> PORTSDIR="/home/ports" LIBTOOL="/usr/bin/libtool" 
> CCACHE_DIR=/usr/ports/pobj/.ccache 
> PATH='/usr/ports/pobj/gotosocial-0.5.2/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin'
> PREFIX='/var'  LOCALBASE='/usr/local' X11BASE='/usr/X11R6' 
> CFLAGS='-O2 -pipe'  TRUEPREFIX='/var' DESTDIR='' 
> HOME='/gotosocial-0.5.2_writes_to_HOME' PICFLAG="-fpic"  BINGRP=bin
> BINOWN=root BINMODE=755 NONBINMODE=644  DIRMODE=755  INSTALL_COPY=-c
> INSTALL_STRIP=  MANGRP=bin MANOWN=root MANMODE=644
> BSD_INSTALL_PROGRAM="/usr/ports/pobj/gotosocial-0.5.2/bin/install -c 
> -m 755" 
> BSD_INSTALL_SCRIPT="/usr/ports/pobj/gotosocial-0.5.2/bin/install -c -m
> 755"  BSD_INSTALL_DATA="/usr/ports/pobj/gotosocial-0.5.2/bin/install
> -c -m 644" 
> BSD_INSTALL_MAN="/usr/ports/pobj/gotosocial-0.5.2/bin/install -c -m
> 644" 
> BSD_INSTALL_PROGRAM_DIR="/usr/ports/pobj/gotosocial-0.5.2/bin/install
> -d -m 755" 
> BSD_INSTALL_SCRIPT_DIR="/usr/ports/pobj/gotosocial-0.5.2/bin/install
> -d -m 755" 
> BSD_INSTALL_DATA_DIR="/usr/ports/pobj/gotosocial-0.5.2/bin/install -d
> -m 755" 
> BSD_INSTALL_MAN_DIR="/usr/ports/pobj/gotosocial-0.5.2/bin/install -d
> -m 755" go test github.com/superseriousbusiness/gotosocial
> codeberg.org/gruf/go-logger/v2@v2.0.6 requires
> codeberg.org/gruf/go-middleware@v1.1.0 requires
> codeberg.org/gruf/go-ulid@v1.0.0: reading
> file:///usr/ports/pobj/gotosocial-0.5.2/go_modules/codeberg.org/gruf/go-ulid/@v/v1.0.0.mod:
> no such file or directory



Re: [maintainer update] www/gotosocial 0.3.7 -> 0.5.2

2022-10-19 Thread Omar Polo
Hi!

On 2022/10/18 21:30:05 +0200, Hukadan  wrote:
> Hi @ports,
> 
> Here is an update for gotosocial. Sorry for
> the delay since the last update.
> 
> I added a do-test target and put the MAKE_ENV
> needed for those tests just above. I am not sure
> this is where they belong but portcheck did not
> complain.
> 
> I also added a MODGO_LDFLAGS so the version
> of GtS is displayed on the homepage.
> 
> Release notes:
> https://github.com/superseriousbusiness/gotosocial/releases/tag/v0.5.2
> https://github.com/superseriousbusiness/gotosocial/releases/tag/v0.5.1
> https://github.com/superseriousbusiness/gotosocial/releases/tag/v0.5.0
> https://github.com/superseriousbusiness/gotosocial/releases/tag/v0.4.0
> https://github.com/superseriousbusiness/gotosocial/releases/tag/v0.3.8
> 
> There was a lot of improvements such as a
> user settings panel and shared boxes.
> 
> I have been running the latest version for
> more than a week without issue.

Thanks!  I've committed it with some minor tweaks, comments below:

> diff --git a/www/gotosocial/Makefile b/www/gotosocial/Makefile
> index dba15d35662..b26fbd6e8e9 100644
> --- a/www/gotosocial/Makefile
> +++ b/www/gotosocial/Makefile
> @@ -4,7 +4,7 @@ ONLY_FOR_ARCHS = amd64
>  COMMENT =ActivityPub social network server
>  
>  MODGO_MODNAME =  github.com/superseriousbusiness/gotosocial
> -MODGO_VERSION =  v0.3.7
> +MODGO_VERSION =  v0.5.2
>  REVISION =   0

Revision starts as '' (empty string), so when bumping the version just
delete it.

>  DISTNAME =   gotosocial-${MODGO_VERSION}
> @@ -28,6 +28,8 @@ MODULES =   lang/go
>  
>  WRKDIST =${WRKSRC}
>  
> +MODGO_LDFLAGS += -X 'main.Version=${MODGO_VERSION:S/v//}p${REVISION}'
> +

so i've dropped the p${REVISION} part here too.

>  PREFIX = ${VARBASE}
>  INSTDIR =${PREFIX}/gotosocial
>  
> @@ -51,6 +53,13 @@ do-install:
>   ${INSTALL_DATA_DIR} ${INSTDIR}/storage
>   cp -R ${WRKDIR}/web ${INSTDIR}
>  
> +# for test purposes only
> +MAKE_ENV +=GTS_DB_TYPE="sqlite" 
> +MAKE_ENV +=GTS_DB_ADDRESS=":memory:"

usually, variables are defined before targets.  Also, for tests please
use TEST_ENV that is more appropriate in this case.

> +do-test:
> + cd ${WRKSRC} && \
> +   ${MODGO_TEST_CMD} -count 1 ./...
> +

This fails for me, and since it has the same behavior of the default
MODGO_TEST_TARGET, i dropped this bit and added a comment that test
fails.  (i did not consider this a blocker for the update)

I get:

===>  Regression tests for gotosocial-0.5.2
cd 
/usr/ports/pobj/gotosocial-0.5.2/github.com/superseriousbusiness/gotosocial@v0.5.2
 && /usr/bin/env -i GO386=softfloat 
GOCACHE="/usr/ports/pobj/gotosocial-0.5.2/go-cache" 
TMPDIR="/usr/ports/pobj/gotosocial-0.5.2/build-amd64" 
GOPROXY=file:///usr/ports/pobj/gotosocial-0.5.2/go_modules GO111MODULE=on 
GOPATH="/usr/ports/pobj/gotosocial-0.5.2/go:/var/go-pkg" PORTSDIR="/home/ports" 
LIBTOOL="/usr/bin/libtool"  CCACHE_DIR=/usr/ports/pobj/.ccache  
PATH='/usr/ports/pobj/gotosocial-0.5.2/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11R6/bin'
 PREFIX='/var'  LOCALBASE='/usr/local' X11BASE='/usr/X11R6'  CFLAGS='-O2 -pipe' 
 TRUEPREFIX='/var' DESTDIR=''  HOME='/gotosocial-0.5.2_writes_to_HOME' 
PICFLAG="-fpic"  BINGRP=bin BINOWN=root BINMODE=755 NONBINMODE=644  DIRMODE=755 
 INSTALL_COPY=-c INSTALL_STRIP=  MANGRP=bin MANOWN=root MANMODE=644 
BSD_INSTALL_PROGRAM="/usr/ports/pobj/gotosocial-0.5.2/bin/install -c  -m 755"  
BSD_INSTALL_SCRIPT="/usr/ports/pobj/gotosocial-0.5.2/bin/install -c -m 755"  
BSD_INSTALL_DATA="/usr/ports/pobj/gotosocial-0.5.2/bin/install -c -m 644"  
BSD_INSTALL_MAN="/usr/ports/pobj/gotosocial-0.5.2/bin/install -c -m 644"  
BSD_INSTALL_PROGRAM_DIR="/usr/ports/pobj/gotosocial-0.5.2/bin/install -d -m 
755"  BSD_INSTALL_SCRIPT_DIR="/usr/ports/pobj/gotosocial-0.5.2/bin/install -d 
-m 755"  BSD_INSTALL_DATA_DIR="/usr/ports/pobj/gotosocial-0.5.2/bin/install -d 
-m 755"  BSD_INSTALL_MAN_DIR="/usr/ports/pobj/gotosocial-0.5.2/bin/install -d 
-m 755" go test github.com/superseriousbusiness/gotosocial
codeberg.org/gruf/go-logger/v2@v2.0.6 requires
codeberg.org/gruf/go-middleware@v1.1.0 requires
codeberg.org/gruf/go-ulid@v1.0.0: reading 
file:///usr/ports/pobj/gotosocial-0.5.2/go_modules/codeberg.org/gruf/go-ulid/@v/v1.0.0.mod:
 no such file or directory



CVS: cvs.openbsd.org: ports

2022-10-19 Thread Omar Polo
CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2022/10/19 01:42:55

Modified files:
www/gotosocial : Makefile distinfo modules.inc 
www/gotosocial/pkg: PLIST 

Log message:
update www/gotosocial to 0.5.2

diff from Hakudan (MAINTAINER), thanks!  Some tweaks on top: reset
REVISION, fix some whitespaces and annotate that regress is expected to
fail due to some missing go libraries.



CVS: cvs.openbsd.org: ports

2022-10-19 Thread Benoit Lecocq
CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2022/10/19 01:34:00

Modified files:
devel/git  : Makefile distinfo 

Log message:
Update to git-2.38.1.



Re: [update] gnupg-2.2.40

2022-10-19 Thread Omar Polo
On 2022/10/18 20:03:27 +0200, Jeremie Courreges-Anglas  wrote:
> 
> 
> Works for me verifying and encrypting mails (emacs), decrypting files
> and backups.  Test reports welcome.
> 
> ChangeLog: https://dev.gnupg.org/T6181

works for me too (password-store)

thanks!