CVS: cvs.openbsd.org: ports

2021-02-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/11 00:57:25

Modified files:
sysutils/google-cloud-sdk: Makefile distinfo 
sysutils/google-cloud-sdk/pkg: PLIST 

Log message:
Update to google-cloud-sdk-327.0.0.



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/11 00:50:24

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.19.5.



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/11 00:50:09

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py3-boto3-1.17.5.



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/11 00:49:58

Modified files:
net/py-botocore: Makefile distinfo 
net/py-botocore/pkg: PLIST 

Log message:
Update to py3-botocore-1.20.5.



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/11 00:44:50

Modified files:
devel/pango: Makefile distinfo 

Log message:
Update to pango-1.48.2.



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/11 00:43:50

Modified files:
multimedia/py-chromecast: Makefile distinfo 
multimedia/py-chromecast/pkg: PLIST 

Log message:
Update to py3-chromecast-8.1.0.



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Stefan Sperling
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2021/02/11 00:40:22

Modified files:
devel/got  : Makefile distinfo 

Log message:
Update to got 0.49

- implicitly mark all files in work tree as up-to-date after 'got integrate'
- tog: fix behaviour if 'n' is pressed before search is started (found by naddy)
- in 'got clone', allow -l together with -q, for consistency with 'got fetch'
- add 'got commit -F' option to commit with a log message stored in a file
- simplify error message shown when 'got rebase' has nothing to do
- tolerate tag objects which lack tagger timestamp information (found by naddy)
- got info: fix a pasto in an error message (naddy)
- include remote branches in the output of 'got branch -l' (suggested by helg)



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/11 00:40:13

Modified files:
sysutils/terraform: Tag: OPENBSD_6_8 Makefile 
Removed files:
sysutils/terraform/patches: Tag: OPENBSD_6_8 

patch-vendor_github_com_apparentlymart_go-userdirs_userdirs_app_stub_go 

patch-vendor_github_com_apparentlymart_go-userdirs_userdirs_app_unix_go 

Log message:
Unbreak runtime; these 2 patches should have been removed during the last
update (they now revert the intent).

reported by "jxlambda"



Re: UPDATE: games/prboom-plus

2021-02-10 Thread Landry Breuil
On Wed, Feb 10, 2021 at 05:39:42PM -0800, Ryan Freeman wrote:
> Hey,
> 
> Attached is a patch for prboom-plus, which takes it to a new repo that is
> receiving 'cleanups', but some other assorted improvements.
> https://github.com/coelckers/prboom-plus/
> 
> One thing I'm unsure of is the version scheme chosen, they use 'um' as a
> suffix.   The port packages up just fine, passes port-lib-depends-check
> and lib-depends-check.

um isnt a valid suffix, only beta/alpha/rc/pre/pl are allowed, per
packages-specs(7). Maybe pl0 ?



Re: nicotine-plus port (take 2)

2021-02-10 Thread Ryan Freeman
On Sun, Jan 31, 2021 at 12:27:31PM +0100, Han Boetes wrote:
> And the comment should start with an upcase and not end in a dot.

Tested good here on amd64 with my slsk account.  Runs quite snappy,
thanks for the port!

-ryan



NEW: games/crispy-doom

2021-02-10 Thread Ryan Freeman
Here is a shot at a port for crispy-doom, I adapted off the
chocolate-doom port.  builds and runs fine here on amd64.

provides a 'medium-ground' Doom experience:
- can double the resolution for a 640x400 'crisp' experience
- has support for non-4:3 screens, even in low resolution mode
- new fullscreen hud options
- static limit removal, play larger maps without crashing
- various other 'crisp' features

Also supports Heretic.

Comments? OK?

-ryan



crispy-doom.tar.gz
Description: application/tar-gz


CVS: cvs.openbsd.org: ports

2021-02-10 Thread Daniel Dickman
CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/10 23:53:55

Modified files:
astro/wmsun: Makefile 
Added files:
astro/wmsun/patches: patch-wmgeneral_wmgeneral_c 
 patch-wmgeneral_wmgeneral_h 

Log message:
fix the build



Re: UPDATE: textproc/lowdown 0.8.1

2021-02-10 Thread Bryan Vyhmeister
On Tue, Feb 09, 2021 at 06:15:06PM +0100, Caspar Schutijser wrote:
> Hi,
> 
> Below is a diff that updates textproc/lowdown to 0.8.1. Tested on amd64.

OK maintainer

Thank you for doing this.

Bryan



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Daniel Dickman
CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/10 21:17:32

Modified files:
x11/lablgtk3   : Makefile distinfo 

Log message:
update to lablgtk-3.1.1 to fix the build and unlock coq



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Daniel Dickman
CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/10 21:07:39

Modified files:
graphics/ocaml-cairo: Makefile distinfo 
Added files:
graphics/ocaml-cairo/patches: patch-cairo2_opam 
  patch-config_dune 

Log message:
fix the build for ocaml-cairo to unlock coq

mostly from Yozo Toda



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Daniel Dickman
CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/10 21:05:51

ports/graphics/ocaml-cairo/patches

Update of /cvs/ports/graphics/ocaml-cairo/patches
In directory cvs.openbsd.org:/tmp/cvs-serv96130/patches

Log Message:
Directory /cvs/ports/graphics/ocaml-cairo/patches added to the repository



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Daniel Dickman
CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/10 20:10:28

Modified files:
astro/wmspaceweather: Makefile 
astro/wmspaceweather/patches: patch-GetKp 
Added files:
astro/wmspaceweather/patches: patch-wmgeneral_wmgeneral_c 
  patch-wmgeneral_wmgeneral_h 

Log message:
fix the build and make this actually work; from freebsd



Re: [New] libva-intel-media-driver port

2021-02-10 Thread Bryan Steele
On Tue, Feb 09, 2021 at 01:47:37PM +, Laurence Tratt wrote:
> On Tue, Feb 09, 2021 at 10:57:32PM +1100, Jonathan Gray wrote:
> 
> Hello Jonathan,
> 
> > See previous libva discussions.  If it is to support more than just Intel
> > it needs to be in xenocara and new Mesa Makefiles will need to be written.
> >
> > That would also be the case to use gallium-va with the iris Mesa driver for
> > Intel >= gen8.
> 
> I'm not aware of the previous discussions, but I'm not sure if you're saying
> "don't put it in ports" or not?

Yes. On AMD graphics (and I guess Intel >= gen8) Mesa needs to be linked
with libva, and Mesa is a part of xenocara. Building the base system does
not depend on ports.

> Even if it means that *only* Intel hardware benefits for the time being, this
> port is really very useful and I've been working with Eugene to test his
> work. Now that I've got it up and running, it's pretty impressive: for
> example, on my OpenBSD machine, ffmpeg video encoding on a test file went
> from 6m30 down to 2m20 (also, not coincidentally, moving from fully consuming
> all 4 cores at to consuming only a small portion of 1 core).

It's certainly something that would be nice to have, and has been
attempted a few times. Someone just needs to pick up the work that has
been started by others.

The original ports discussions:

https://marc.info/?t=15762647571=1=2
https://marc.info/?t=15758739041=1=2

..when it moved to tech@ to attempt xenocara integration:

https://marc.info/?t=15767653863=1=2

> If nothing else, support in ports might be a useful stepping stone on the way
> to having libva in xenocara which, I imagine, is a rather harder job?
> 
> Laurie

Putting something into ports knowing that it's the wrong place feels
wrong, and will undoubtedly cause friction later when moved to base.

-Bryan.



REMOVE: games/prboom

2021-02-10 Thread Ryan Freeman
First time trying to remove something, here is a patch to move
games/prboom to the attic.  games/prboom-plus does everything it
did and more with fixes.  netgames can be played with:
- games/chocolate-doom
- games/odamex
- games/gzdoom

anything I've forgotten for removal?

OK?
-ryan

? prboom.diff
Index: Makefile
===
RCS file: Makefile
diff -N Makefile
--- Makefile10 Feb 2021 03:12:27 -  1.28
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,35 +0,0 @@
-# $OpenBSD: Makefile,v 1.28 2021/02/10 03:12:27 jeremy Exp $
-
-COMMENT=   enhanced clone of Id Software's Doom game; multiplayer#'
-DISTNAME=  prboom-2.5.0
-REVISION=  3
-
-CATEGORIES=games x11
-
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=prboom/}
-
-HOMEPAGE=  http://prboom.sourceforge.net/
-
-# GPLv2+
-PERMIT_PACKAGE=Yes
-
-WANTLIB =  SDL c m pthread GL GLU SDL_mixer>=3 SDL_net>=1 png>=4
-
-RUN_DEPENDS =  audio/timidity
-
-LIB_DEPENDS =  devel/sdl-mixer \
-   devel/sdl-net \
-   graphics/png
-
-CONFIGURE_STYLE=autoconf
-AUTOCONF_VERSION=2.61
-CONFIGURE_ENV+=CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS+=--disable-cpu-opt \
-   --with-waddir=${TRUEPREFIX}/share/doom
-MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/autotools
-
-FAKE_FLAGS +=  gamesdir=${PREFIX}/bin \
-   docdir=${PREFIX}/share/doc/prboom
-
-.include 
Index: distinfo
===
RCS file: distinfo
diff -N distinfo
--- distinfo31 Mar 2013 21:09:32 -  1.10
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-SHA256 (prboom-2.5.0.tar.gz) = ImwcRw+MyYMydTZAT0BaHQJs8KUYjGlKEkPMhjABS64=
-SIZE (prboom-2.5.0.tar.gz) = 1049505
Index: patches/patch-autotools_ac_c_compile_flags_m4
===
RCS file: patches/patch-autotools_ac_c_compile_flags_m4
diff -N patches/patch-autotools_ac_c_compile_flags_m4
--- patches/patch-autotools_ac_c_compile_flags_m4   28 Sep 2017 23:12:48 
-  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-autotools_ac_c_compile_flags_m4,v 1.1 2017/09/28 23:12:48 
naddy Exp $
-
-Index: autotools/ac_c_compile_flags.m4
 autotools/ac_c_compile_flags.m4.orig
-+++ autotools/ac_c_compile_flags.m4
-@@ -5,7 +5,6 @@ do
-  AC_MSG_CHECKING(whether compiler supports $ac_flag)
-  CFLAGS="$NEW_CFLAGS $ac_flag"
-  AC_TRY_COMPILE(,[
--  void f() {};
-  ],[
-   NEW_CFLAGS="$CFLAGS"
-   AC_MSG_RESULT(yes)
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac  28 Sep 2017 23:12:48 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1 2017/09/28 23:12:48 naddy Exp $
-
-Index: configure.ac
 configure.ac.orig
-+++ configure.ac
-@@ -26,9 +26,9 @@ fi
- AC_ARG_WITH(waddir,AC_HELP_STRING([--with-waddir],[Path to install prboom.wad 
and look for other WAD files]),
- DOOMWADDIR="$withval",
- if test "x$prefix" != xNONE; then
--  DOOMWADDIR="$prefix/share/games/doom"
-+  DOOMWADDIR="$prefix/share/prboom"
- else
--  DOOMWADDIR="$ac_default_prefix/share/games/doom"
-+  DOOMWADDIR="$ac_default_prefix/share/prboom"
- fi
- )
- AC_DEFINE_UNQUOTED(DOOMWADDIR,"$DOOMWADDIR",[Define to be the path where Doom 
WADs are stored])
Index: patches/patch-src_SDL_i_sshot_c
===
RCS file: patches/patch-src_SDL_i_sshot_c
diff -N patches/patch-src_SDL_i_sshot_c
--- patches/patch-src_SDL_i_sshot_c 31 Mar 2013 21:09:33 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,24 +0,0 @@
-$OpenBSD: patch-src_SDL_i_sshot_c,v 1.1 2013/03/31 21:09:33 bentley Exp $
-
-Fix build with png-1.5.
-
 src/SDL/i_sshot.c.orig Wed Mar 27 00:17:06 2013
-+++ src/SDL/i_sshot.c  Wed Mar 27 00:18:10 2013
-@@ -231,7 +231,7 @@ int I_ScreenShot (const char *fname)
-   if (fp)
-   {
- png_struct *png_ptr = png_create_write_struct(
--PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn);
-+PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn);
- 
- if (png_ptr)
- {
-@@ -279,7 +279,7 @@ int I_ScreenShot (const char *fname)
- break;
- }
-   }
--  png_destroy_write_struct(_ptr,  png_infopp_NULL);
-+  png_destroy_write_struct(_ptr,  NULL);
- }
- fclose(fp);
-   }
Index: patches/patch-src_gl_intern_h
===
RCS file: patches/patch-src_gl_intern_h
diff -N patches/patch-src_gl_intern_h
--- patches/patch-src_gl_intern_h   10 Feb 2021 03:12:27 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_gl_intern_h,v 

UPDATE: games/prboom-plus

2021-02-10 Thread Ryan Freeman
Hey,

Attached is a patch for prboom-plus, which takes it to a new repo that is
receiving 'cleanups', but some other assorted improvements.
https://github.com/coelckers/prboom-plus/

One thing I'm unsure of is the version scheme chosen, they use 'um' as a
suffix.   The port packages up just fine, passes port-lib-depends-check
and lib-depends-check.

The DESCR still mentions prboom which I've suggested we just send to the
attic as development and interest there has shuttered.  The classic Doom
scene seems to point most people to prboom-plus... diff to remove that
coming shortly.

One other thing of note, they fixed -fno-common differently:
https://github.com/coelckers/prboom-plus/commit/8a390a16853aef9348d714eb3b0b4e15f39ff217

I've removed the very-recently added patches as they seem to be covered
(Thanks Jeremy Evans!)

Comments?
-Ryan


? prboom-plus.diff
Index: Makefile
===
RCS file: /cvs/ports/games/prboom-plus/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile10 Feb 2021 03:18:48 -  1.8
+++ Makefile11 Feb 2021 01:30:28 -
@@ -1,9 +1,11 @@
-# $OpenBSD: Makefile,v 1.8 2021/02/10 03:18:48 jeremy Exp $
+# $OpenBSD: Makefile,v 1.7 2019/07/12 20:46:23 sthen Exp $
 
 COMMENT =  enhanced version the PrBoom Doom engine
-DISTNAME = prboom-plus-2.5.1.4
 CATEGORIES =   games x11
-REVISION = 1
+
+GH_TAGNAME =v2.6um
+GH_ACCOUNT =coelckers
+GH_PROJECT =prboom-plus
 
 HOMEPAGE = http://prboom-plus.sourceforge.net/
 
@@ -19,18 +21,24 @@ COMPILER_LANGS =c
 
 BUILD_DEPENDS =archivers/unzip
 
-WANTLIB += SDL c m pthread GL GLU SDL_mixer SDL_net
+MODULES =  devel/cmake
 
-LIB_DEPENDS =  devel/sdl-mixer \
-   devel/sdl-net
+WANTLIB += SDL2 c m z pthread GL GLU SDL2_mixer SDL2_net SDL2_image fluidsynth
+WANTLIB += ${COMPILER_LIBCXX} vorbisfile pcreposix mad portmidi
 
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=prboom-plus/}
+LIB_DEPENDS =  devel/sdl2-mixer \
+   devel/sdl2-net \
+   devel/sdl2-image \
+   audio/fluidsynth \
+   audio/libvorbis \
+   audio/libmad \
+   audio/portmidi
 
-CONFIGURE_STYLE =  gnu
-CONFIGURE_ARGS +=  --with-waddir=${TRUEPREFIX}/share/doom
-CONFIGURE_ENV +=   CPPFLAGS="${CPPFLAGS} -I${X11BASE}/include"
+CONFIGURE_ARGS +=   -DCMAKE_C_FLAGS=-I${X11BASE}/include
 
 FAKE_FLAGS +=  gamesdir=${PREFIX}/bin \
docdir=${PREFIX}/share/doc/prboom-plus
+
+WRKDIST =  ${WRKDIR}/${PKGNAME}/prboom2
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/games/prboom-plus/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo12 Jun 2018 06:07:29 -  1.3
+++ distinfo11 Feb 2021 01:30:28 -
@@ -1,2 +1,2 @@
-SHA256 (prboom-plus-2.5.1.4.tar.gz) = 
4OIkHRdIObEH8aQrGRqpiV3GdJ5HfLyFCtUg+6I1O5Q=
-SIZE (prboom-plus-2.5.1.4.tar.gz) = 1627558
+SHA256 (prboom-plus-2.6um.tar.gz) = 
/tVVNQnF5yEaAtFZwhLGEDDbx+i7HtCt/s+tVzB0GRs=
+SIZE (prboom-plus-2.6um.tar.gz) = 1526732
Index: patches/patch-data_Makefile_in
===
RCS file: patches/patch-data_Makefile_in
diff -N patches/patch-data_Makefile_in
--- patches/patch-data_Makefile_in  12 Jun 2018 06:07:29 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-data_Makefile_in,v 1.3 2018/06/12 06:07:29 bentley Exp $
-
-fix accidental inclusion of SDL_Mixer for wad creation
-
-Index: data/Makefile.in
 data/Makefile.in.orig
-+++ data/Makefile.in
-@@ -689,7 +689,7 @@ clean-noinstPROGRAMS:
- 
- rdatawad$(EXEEXT): $(rdatawad_OBJECTS) $(rdatawad_DEPENDENCIES) 
$(EXTRA_rdatawad_DEPENDENCIES) 
-   @rm -f rdatawad$(EXEEXT)
--  $(AM_V_CCLD)$(LINK) $(rdatawad_OBJECTS) $(rdatawad_LDADD) $(LIBS)
-+  $(AM_V_CCLD)$(LINK) $(rdatawad_OBJECTS) $(rdatawad_LDADD)
- 
- mostlyclean-compile:
-   -rm -f *.$(OBJEXT)
Index: patches/patch-src_doomstat_c
===
RCS file: patches/patch-src_doomstat_c
diff -N patches/patch-src_doomstat_c
--- patches/patch-src_doomstat_c10 Feb 2021 03:18:48 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_doomstat_c,v 1.1 2021/02/10 03:18:48 jeremy Exp $
-
-Index: src/doomstat.c
 src/doomstat.c.orig
-+++ src/doomstat.c
-@@ -54,7 +54,7 @@ complevel_t compatibility_level, default_compatibility
- 
- // e6y
- // it's required for demos recorded in "demo compatibility" mode by boom201 
for example
--int demover;
-+extern int demover;
- 
- int comp[COMP_TOTAL], default_comp[COMP_TOTAL];// killough 10/98
- int /*comperr[COMPERR_NUM], */default_comperr[COMPERR_NUM];
Index: patches/patch-src_gl_intern_h
===
RCS file: 

update net/gajim to 1.3.0 (and net/py-nbxmpp to 2.0.1)

2021-02-10 Thread 3un0s
Hi ports@,

This is an update for net/gajim and also net/py-nbxmpp as gajim requires
that. I've been running beta of 1.3.0 and this release on amd64 for
quite some time now and everything seems to work fine.

Any comments or OK?
Index: net/gajim/Makefile
===
RCS file: /cvs/ports/net/gajim/Makefile,v
retrieving revision 1.91
diff -u -p -r1.91 Makefile
--- net/gajim/Makefile  6 Jan 2021 09:56:15 -   1.91
+++ net/gajim/Makefile  10 Feb 2021 20:43:14 -
@@ -1,15 +1,17 @@
 # $OpenBSD: Makefile,v 1.91 2021/01/06 09:56:15 paco Exp $
 
 COMMENT=   jabber client written in pygtk
-MODPY_EGG_VERSION= 1.2.2
+MODPY_EGG_VERSION= 1.3.0
 DISTNAME=  gajim-${MODPY_EGG_VERSION}
 CATEGORIES=net x11
 
 HOMEPAGE=  https://www.gajim.org
 
+WRKDIST =  ${WRKDIR}/gajim-${DISTNAME}
+
 MAINTAINER=Pierre-Emmanuel Andre 
 
-MASTER_SITES=  ${HOMEPAGE}/downloads/1.2/
+MASTER_SITES=  ${HOMEPAGE}/downloads/1.3/
 
 # GPLv3 only
 PERMIT_PACKAGE=Yes
@@ -25,7 +27,7 @@ RUN_DEPENDS=  devel/desktop-file-utils \
devel/libsoup \
graphics/py-Pillow${MODPY_FLAVOR} \
graphics/py-cairo${MODPY_FLAVOR} \
-   net/py-nbxmpp${MODPY_FLAVOR}>=1.0.2 \
+   net/py-nbxmpp${MODPY_FLAVOR}>=2.0.1 \
security/py-cryptodome${MODPY_FLAVOR} \
security/py-gnupg${MODPY_FLAVOR} \
security/py-keyring${MODPY_FLAVOR} \
Index: net/gajim/distinfo
===
RCS file: /cvs/ports/net/gajim/distinfo,v
retrieving revision 1.32
diff -u -p -r1.32 distinfo
--- net/gajim/distinfo  6 Jan 2021 09:56:15 -   1.32
+++ net/gajim/distinfo  10 Feb 2021 20:43:14 -
@@ -1,2 +1,2 @@
-SHA256 (gajim-1.2.2.tar.gz) = /Q0WU/s/f5cgf+zDIY04kVrbHXQb+Vp+74NgW9a4zL0=
-SIZE (gajim-1.2.2.tar.gz) = 9416794
+SHA256 (gajim-1.3.0.tar.gz) = RejDnkgiXW60d/DEcBEvO6d8Xe9XlRlPkCrlHzLqDOw=
+SIZE (gajim-1.3.0.tar.gz) = 9886259
Index: net/gajim/patches/patch-setup_py
===
RCS file: /cvs/ports/net/gajim/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_py
--- net/gajim/patches/patch-setup_py30 Jan 2019 17:09:17 -  1.2
+++ net/gajim/patches/patch-setup_py10 Feb 2021 20:43:14 -
@@ -1,21 +1,21 @@
-$OpenBSD: patch-setup_py,v 1.2 2019/01/30 17:09:17 feinerer Exp $
+$OpenBSD$
 
 Use correct location and do not compress man pages.
 
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
-@@ -111,11 +111,11 @@ def build_man(build_cmd):
+@@ -109,11 +109,11 @@ def build_man(build_cmd):
  def install_man(install_cmd):
  data_files = install_cmd.distribution.data_files
- man_dir = os.path.join(build_dir, 'man')
+ man_dir = build_dir / 'man'
 -target = 'share/man/man1'
 +target = 'man/man1'
- 
+
  for man in MAN_FILES:
- man_file_gz = os.path.join(man_dir, man + '.gz')
+ man_file_gz = str(man_dir / (man + '.gz'))
 -data_files.append((target, [man_file_gz]))
 +data_files.append((target, [os.path.join('data', man)]))
- 
- 
+
+
  def build_intl(build_cmd):
Index: net/gajim/pkg/PLIST
===
RCS file: /cvs/ports/net/gajim/pkg/PLIST,v
retrieving revision 1.29
diff -u -p -r1.29 PLIST
--- net/gajim/pkg/PLIST 6 Jan 2021 09:56:15 -   1.29
+++ net/gajim/pkg/PLIST 10 Feb 2021 20:43:14 -
@@ -96,13 +96,14 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_session.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_transport.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}jingle_xtls.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}logging_helpers.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}multimedia_helpers.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}nec.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}optparser.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}passwords.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}proxy65_manager.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}setting_values.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/gajim/common/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
 

CVS: cvs.openbsd.org: ports

2021-02-10 Thread James Turner
CVSROOT:/cvs
Module name:ports
Changes by: jtur...@cvs.openbsd.org 2021/02/10 17:27:14

Modified files:
lang/janet : Makefile distinfo 

Log message:
Update janet to 1.15.0



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Klemens Nanni
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2021/02/10 16:25:43

Modified files:
sysutils/portroach-cli: Makefile 
sysutils/portroach-cli/files: portroach-cli portroach-cli.1 

Log message:
Update to portroach-cli 1.4

Add "-j" to print results in raw JSON format;  for example,
to get all outdated ports in a category but defer processing
to an external filter:
$ portroach-cli -j -o -m . -p ^sysutils/ | jq -f ./filter



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Charlene Wendling
CVSROOT:/cvs
Module name:ports
Changes by: c...@cvs.openbsd.org2021/02/10 15:51:28

Modified files:
net/echoping   : Makefile 
net/echoping/pkg: DESCR 

Log message:
echoping: unbreak on powerpc

clang does not inline sqrt(3) on powerpc, leading to undefined references, it
requires libm (it has been applied to all archs). Thanks to gkoehler and naddy
for providing better explanations about the situation!

While here, remove a trailing whitespace in DESCR.

OK gkoehler@



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/10 15:07:24

Modified files:
databases/citus: Makefile distinfo 

Log message:
bugfix update to citus-9.5.2



Re: [macppc, all archs] net/echoping wants libm

2021-02-10 Thread Christian Weisgerber
Charlene Wendling:

> > util.o: In function `tvstddev':
> > util.c:(.text+0x6f4): undefined reference to `sqrt'
> 
> The autoconf stuff really detects the need for`-lm' as seen in
> config.log: 'ac_cv_lib_m_sqrt=yes', but is not used anywhere at all.

No, we are preloading the autoconf cache with this and many other
results.  See infrastructure/db/config.site.  There is no actual
test for this in the configure script.

There _is_ a test whether -lm is required for pow(3),
"checking if libmath is mandatory".

If you run nm(1) on the compiled util.o on amd64, there is no
unresolved reference to sqrt().  What's happening here is that the
compiler inlines its own optimized sqrt(), instead of calling the
libm function.  The same happens for pow() in the configure test.
Or worse, I think the compiler notices that this lone pow() call
has no effect and just drops it, neutering the test.

If you compile with -ffreestanding, which is the ultimate hammer
to prevent such shenanigans, util.o has a reference to sqrt() and
the configure check for -lm actually works.  Anyway, that's not a
solution for the port.

Your solution is fine, but the comment needs to be tweaked.
Maybe like this?

# Requires libm: uses sqrt(3), inlined by the compiler on some archs

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



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Remi Locherer
CVSROOT:/cvs
Module name:ports
Changes by: r...@cvs.openbsd.org2021/02/10 14:26:44

Modified files:
sysutils/librelp: Makefile distinfo 
Added files:
sysutils/librelp/patches: patch-src_tcp_c 

Log message:
update librelp to version 1.9.0

The TLS tests currently fail when executed with libressl. Partly
because of bogus information in the certificates used by the tests.
GnuTLS and OpenSSL apparently accept that. Our rsyslog which uses
librelp is linked with GnuTLS.

ok tb



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2021/02/10 13:57:22

Modified files:
security/dirb  : Makefile 
Added files:
security/dirb/patches: patch-src_Makefile_in patch-src_dirb_h 
   patch-src_variables_c 
   patch-src_variables_h 

Log message:
fix build with -fno-common, from altlinux



fix sysutils/conky -fno-common

2021-02-10 Thread Ryan Boggs
Hi,

Attached is my attempt to fix sysutils/conky.  It's now working for me
in current but I am sure there is room for improvement.  Please let me
know if I need to do more.

Thanks,
Ryan
Index: Makefile
===
RCS file: /cvs/ports/sysutils/conky/Makefile,v
retrieving revision 1.60
diff -u -p -u -p -r1.60 Makefile
--- Makefile	17 Jul 2020 08:36:04 -	1.60
+++ Makefile	10 Feb 2021 15:01:45 -
@@ -7,7 +7,7 @@ COMMENT=	light-weight system monitor
 DISTNAME=	conky-1.9.0
 CATEGORIES=	sysutils
 HOMEPAGE=	http://conky.sourceforge.net/
-REVISION=	20
+REVISION=	21
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=conky/}
 
Index: patches/patch-src_common_c
===
RCS file: patches/patch-src_common_c
diff -N patches/patch-src_common_c
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-src_common_c	10 Feb 2021 15:01:45 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/common.c
+--- src/common.c.orig
 src/common.c
+@@ -387,7 +387,7 @@ static void *run_update_callback(void *data)
+ 	}
+ }
+ 
+-int no_buffers;
++/*int no_buffers;*/
+ 
+ void update_stuff(void)
+ {
Index: patches/patch-src_conky_c
===
RCS file: /cvs/ports/sysutils/conky/patches/patch-src_conky_c,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-src_conky_c
--- patches/patch-src_conky_c	23 Sep 2018 21:00:17 -	1.7
+++ patches/patch-src_conky_c	10 Feb 2021 15:01:45 -
@@ -26,7 +26,24 @@ Index: src/conky.c
  long color0, color1, color2, color3, color4, color5, color6, color7, color8,
  	 color9;
  
-@@ -1015,7 +1011,7 @@ void generate_text_internal(char *p, int p_max_size,
+@@ -418,13 +414,15 @@ unsigned int text_buffer_size = DEFAULT_TEXT_BUFFER_SI
+ int utf8_mode = 0;
+ 
+ /* no buffers in used memory? */
+-int no_buffers;
++int no_buffers = 0;
+ 
+ /* pad percentages to decimals? */
+ static int pad_percents = 0;
+ 
+ static char *global_text = 0;
+ 
++enum IFUP_STRICTNESS ifup_strictness = IFUP_UP;
++
+ char *get_global_text(void)
+ {
+ 	return global_text;
+@@ -1015,7 +1013,7 @@ void generate_text_internal(char *p, int p_max_size,
  get_powerbook_batt_info(p, p_max_size, obj->data.i);
  			}
  #endif /* __linux__ */
@@ -35,7 +52,7 @@ Index: src/conky.c
  			OBJ(if_up) {
  if (!interface_up(obj)) {
  	DO_JUMP;
-@@ -1899,7 +1895,7 @@ void generate_text_internal(char *p, int p_max_size,
+@@ -1899,7 +1897,7 @@ void generate_text_internal(char *p, int p_max_size,
  			}
  #endif /* __linux__ */
  #if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__) \
@@ -44,7 +61,7 @@ Index: src/conky.c
  			OBJ(apm_adapter) {
  char *msg;
  
-@@ -3494,6 +3490,7 @@ static void main_loop(void)
+@@ -3494,6 +3492,7 @@ static void main_loop(void)
  	info.looped = 0;
  	while (terminate == 0 && (total_run_times == 0 || info.looped < total_run_times)) {
  		if(update_interval_bat != NOBATTERY && update_interval_bat != update_interval_old) {
@@ -52,7 +69,7 @@ Index: src/conky.c
  			char buf[max_user_text];
  
  			get_battery_short_status(buf, max_user_text, "BAT0");
-@@ -3502,6 +3499,18 @@ static void main_loop(void)
+@@ -3502,6 +3501,18 @@ static void main_loop(void)
  			} else {
  update_interval = update_interval_old;
  			}
Index: patches/patch-src_conky_h
===
RCS file: patches/patch-src_conky_h
diff -N patches/patch-src_conky_h
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-src_conky_h	10 Feb 2021 15:01:45 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Index: src/conky.h
+--- src/conky.h.orig
 src/conky.h
+@@ -206,11 +206,13 @@ enum {
+ 
+ /* if_up strictness selector
+  * needed by conky.c and linux.c (and potentially others) */
+-enum {
++enum IFUP_STRICTNESS {
+ 	IFUP_UP,
+ 	IFUP_LINK,
+ 	IFUP_ADDR
+-} ifup_strictness;
++};
++
++extern enum IFUP_STRICTNESS ifup_strictness;
+ 
+ struct information {
+ 	unsigned int mask;


CVS: cvs.openbsd.org: ports

2021-02-10 Thread Marc Espie
CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2021/02/10 13:39:57

Modified files:
japanese/onew  : Makefile 
japanese/onew/patches: patch-engine_CannaRk_c 
   patch-engine_Canna_c patch-onew_c 

Log message:
fix -fno-common
okay naddy@



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Edd Barrett
CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2021/02/10 13:28:56

Modified files:
games/angband  : Makefile 
Added files:
games/angband/patches: patch-src_mon-blows_h 

Log message:
-fno-common fixes for games/angband.

OK naddy@, thanks!



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Christian Weisgerber
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2021/02/10 13:27:48

Modified files:
net/tinyfugue  : Makefile 
Added files:
net/tinyfugue/patches: patch-src_socket_h 

Log message:
net/tinyfugue: fix build with -fno-common; from maintainer Markus Lude



Re: [maintainer update] graphics/chafa to 1.6.0

2021-02-10 Thread Tracey Emery
On Wed, Feb 10, 2021 at 05:07:07PM +0100, Florian Viehweger wrote:
> Hi,
> 
> 
> Thanks!
> 
> -- 
> greetings,
> 
> Florian Viehweger

Commited. Thanks!

-- 

Tracey Emery



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Tracey Emery
CVSROOT:/cvs
Module name:ports
Changes by: tra...@cvs.openbsd.org  2021/02/10 13:18:11

Modified files:
graphics/chafa : Makefile distinfo 
graphics/chafa/pkg: PLIST 

Log message:
Maintainer update from Florian Viehweger for graphics/chafa to 1.6.0.
Slight tweaks by me.



Re: -fno-common for games/angband

2021-02-10 Thread Edd Barrett
On Wed, Feb 10, 2021 at 08:35:20PM +0100, Christian Weisgerber wrote:
> Maybe, but I suggest to bump all ports that get fixed nevertheless.

I'll bump to be on the safe side.

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/10 12:44:31

Modified files:
lang/php/7.2   : Makefile 
lang/php/7.3   : Makefile 
lang/php/7.4   : Makefile 
lang/php/files : README-main 

Log message:
lang/php/*: update pecl examples in readme



Re: -fno-common for games/angband

2021-02-10 Thread Christian Weisgerber
Edd Barrett:

> I think this is right. The variables in question are already defined in
> mon-init.c, so just the missing `extern` qualifiers.

Yes, that's exactly right.

> No bump required I think.

Maybe, but I suggest to bump all ports that get fixed nevertheless.

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



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2021/02/10 10:55:45

Modified files:
security/py-tlsfuzzer: Makefile distinfo 

Log message:
Update to tlsfuzzer 20210210



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Ricardo Mestre
CVSROOT:/cvs
Module name:ports
Changes by: mes...@cvs.openbsd.org  2021/02/10 10:23:25

Modified files:
www/youtube-dl : Makefile distinfo 

Log message:
update to 2021.02.10



-fno-common for games/angband

2021-02-10 Thread Edd Barrett
Hi,

I think this is right. The variables in question are already defined in
mon-init.c, so just the missing `extern` qualifiers.

No bump required I think.

OK?

Index: patches/patch-src_mon-blows_h
===
RCS file: patches/patch-src_mon-blows_h
diff -N patches/patch-src_mon-blows_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_mon-blows_h   10 Feb 2021 17:01:15 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Fixes for -fno-common.
+
+Index: src/mon-blows.h
+--- src/mon-blows.h.orig
 src/mon-blows.h
+@@ -35,7 +35,7 @@ struct blow_method {
+   struct blow_method *next;
+ };
+ 
+-struct blow_method *blow_methods;
++extern struct blow_method *blow_methods;
+ 
+ /**
+  * Storage for context information for effect handlers called in
+@@ -76,7 +76,7 @@ struct blow_effect {
+   struct blow_effect *next;
+ };
+ 
+-struct blow_effect *blow_effects;
++extern struct blow_effect *blow_effects;
+ 
+ /* Functions */
+ int blow_index(const char *name);

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



UPDATE: Lynis-3.0.3

2021-02-10 Thread Gonzalo L. Rodriguez
Hello,

Update for Lynis to 3.0.3:

https://github.com/CISOfy/lynis/releases

OK? Comments?

Cheers.-

-- 

 %gonzalo
Index: Makefile
===
RCS file: /cvs/ports/security/lynis/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile26 Oct 2020 12:09:54 -  1.38
+++ Makefile10 Feb 2021 16:30:32 -
@@ -2,7 +2,7 @@
 
 COMMENT=   security auditing tool
 
-DISTNAME = lynis-3.0.1
+DISTNAME = lynis-3.0.3
 
 CATEGORIES=security
 
Index: distinfo
===
RCS file: /cvs/ports/security/lynis/distinfo,v
retrieving revision 1.34
diff -u -p -r1.34 distinfo
--- distinfo26 Oct 2020 12:09:54 -  1.34
+++ distinfo10 Feb 2021 16:30:32 -
@@ -1,2 +1,2 @@
-SHA256 (lynis-3.0.1.tar.gz) = g4G2LhGl4OrUF7z9koRa2rfcO50GJxyFKhFmy2WmGv8=
-SIZE (lynis-3.0.1.tar.gz) = 322638
+SHA256 (lynis-3.0.3.tar.gz) = 0ok3UeLXjgwaslPO8OmCu4RwPI7fKxG+YGF4lOKZ4tE=
+SIZE (lynis-3.0.3.tar.gz) = 331182


UPDATE: SMPlayer-21.1.0

2021-02-10 Thread Gonzalo L. Rodriguez
Hello,

Update for SMPlayer to 21.1.0:

https://www.smplayer.info/en/changes

OK? Comments?

Cheers.-

-- 

 %gonzalo
Index: Makefile
===
RCS file: /cvs/ports/x11/smplayer/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile27 Jul 2020 08:04:55 -  1.62
+++ Makefile10 Feb 2021 16:12:30 -
@@ -2,7 +2,7 @@
 
 COMMENT =  complete front-end for MPlayer and MPV
 
-DISTNAME = smplayer-20.6.0
+DISTNAME = smplayer-21.1.0
 CATEGORIES =   multimedia x11
 
 HOMEPAGE = https://www.smplayer.info/
Index: distinfo
===
RCS file: /cvs/ports/x11/smplayer/distinfo,v
retrieving revision 1.44
diff -u -p -r1.44 distinfo
--- distinfo27 Jul 2020 08:04:55 -  1.44
+++ distinfo10 Feb 2021 16:12:30 -
@@ -1,2 +1,2 @@
-SHA256 (smplayer-20.6.0.tar.bz2) = vnZZa5oLcHm8Qb6PIAwQJGcL2A/+nW7F8kh5UZ97qTA=
-SIZE (smplayer-20.6.0.tar.bz2) = 5227856
+SHA256 (smplayer-21.1.0.tar.bz2) = Y0uq32XoQ8fpIJDScRfA7p3RYd6x1PWZSsYyAYYKf/c=
+SIZE (smplayer-21.1.0.tar.bz2) = 5199956
Index: patches/patch-src_preferences_cpp
===
RCS file: /cvs/ports/x11/smplayer/patches/patch-src_preferences_cpp,v
retrieving revision 1.16
diff -u -p -r1.16 patch-src_preferences_cpp
--- patches/patch-src_preferences_cpp   11 Jul 2018 08:17:11 -  1.16
+++ patches/patch-src_preferences_cpp   10 Feb 2021 16:12:30 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_preferences_cpp,v 1.
 Index: src/preferences.cpp
 --- src/preferences.cpp.orig
 +++ src/preferences.cpp
-@@ -211,8 +211,8 @@ void Preferences::reset() {
+@@ -212,8 +212,8 @@ void Preferences::reset() {
 Drives (CD/DVD)
 *** */
  
@@ -13,7 +13,7 @@ Index: src/preferences.cpp
  #ifdef BLURAY_SUPPORT
bluray_device = "";
  #endif
-@@ -334,13 +334,13 @@ void Preferences::reset() {
+@@ -335,13 +335,13 @@ void Preferences::reset() {
  mplayer_additional_audio_filters="";
  
  #ifdef LOG_MPLAYER


Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.10.1]

2021-02-10 Thread Dimitri Karamazov
On Wed, Feb 10, 2021 at 06:01:03AM +0100, Rafael Sadowski wrote:
> On Tue Feb 09, 2021 at 07:34:29AM +, Dimitri Karamazov wrote:
> > Ping
> > 
> > A new dependency is required only during build.
> > All tests pass for robin-map
> > 
> > Information for inst:robin-map-0.6.3
> > 
> > Comment:
> > fast hash map and hash set
> > 
> > Description:
> > A C++ implementation of a fast hash map and hash set using
> > open-addressing and linear robin hood hashing with backward
> > shift deletion to resolve collisions.
> > 
> > Maintainer: Dimitri Karamazov 
> > 
> > WWW: https://github.com/Tessil/robin-map
> > 
> With TEST_DEPENDS = devel/boost, OK rsadowski to import robin-map-0.6.3.

Reattached with necessary changes

regards,
  Dimitri

Index: Makefile
===
RCS file: /cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile23 Jan 2021 12:46:26 -  1.50
+++ Makefile29 Jan 2021 17:50:59 -
@@ -8,12 +8,10 @@ COMMENT = library for reading and writi
 GH_ACCOUNT =   OpenImageIO
 GH_PROJECT =   oiio
 GH_TAGNAME =   Release-$V
-V =2.2.10.0
-ROBIN_VER =0.6.2
+V =2.2.10.1
 DISTNAME = openimageio-${V}
-REVISION = 0
 
-SHARED_LIBS += OpenImageIO 8.0 # 2.2.10
+SHARED_LIBS += OpenImageIO 8.1 # 2.2.10
 SHARED_LIBS += OpenImageIO_Util4.0 # 2.2.10
 
 CATEGORIES =   graphics devel
@@ -34,11 +32,6 @@ WANTLIB += boost_filesystem-mt boost_sys
 WANTLIB += bz2 c freetype gif intl jpeg m openjp2 png pugixml
 WANTLIB += raw_r swscale tiff util webp webpdemux z
 
-MASTER_SITES0 =https://github.com/Tessil/robin-map/
-
-DISTFILES =${DISTNAME}.tar.gz \
-   robin-map-{archive/v}${ROBIN_VER}.tar.gz:0
-
 MODULES =  devel/cmake \
lang/python \
x11/qt5
@@ -48,8 +41,9 @@ MODPY_VERSION =   ${MODPY_DEFAULT_VERSION
 COMPILER = base-clang ports-gcc
 
 BUILD_DEPENDS =devel/fmt \
-   textproc/txt2man \
-   devel/py-pybind11${MODPY_FLAVOR}
+   devel/py-pybind11${MODPY_FLAVOR} \
+   devel/robin-map \
+   textproc/txt2man
 
 LIB_DEPENDS =  devel/boost \
graphics/ffmpeg \
@@ -66,9 +60,10 @@ LIB_DEPENDS =devel/boost \
 CONFIGURE_ARGS +=  -DCMAKE_INSTALL_MANDIR="man/man1" \
-DSTOP_ON_WARNING=OFF \
-DUSE_CCACHE=OFF \
-   -DUSE_DICOM=OFF \
+   -DDCMTK_FOUND=OFF \
-DUSE_EXTERNAL_PUGIXML=ON \
-DUSE_OPENCV=OFF \
+   -DUSE_OPENVDB=OFF \
-DUSE_HDF5=OFF \
-DUSE_LIBHEIF=OFF \

-Dpybind11_DIR=${MODPY_SITEPKG}/pybind11/share/cmake/pybind11/
@@ -78,10 +73,6 @@ CONFIGURE_ARGS +=-DCMAKE_INSTALL_MANDIR
 CONFIGURE_ENV +=   LDFLAGS="${LDFLAGS} -latomic"
 WANTLIB += atomic
 .endif
-
-post-extract:
-   mkdir ${WRKSRC}/ext
-   cp -r ${WRKDIR}/robin-map-${ROBIN_VER} ${WRKSRC}/ext/robin-map
 
 post-install:
find ${PREFIX} -name '*.orig' -delete
Index: distinfo
===
RCS file: /cvs/ports/graphics/openimageio/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo5 Jan 2021 20:53:18 -   1.10
+++ distinfo29 Jan 2021 17:50:59 -
@@ -1,4 +1,2 @@
-SHA256 (openimageio-2.2.10.0.tar.gz) = 
28Dj6XGEl9n3HqAfsd6Lh0SXda2dvOpNJTjZxSu+HVo=
-SHA256 (robin-map-0.6.2.tar.gz) = wI7Esb8chesNZDIkSmqJhiIp2hy4NPP5D7qNw12MjvE=
-SIZE (openimageio-2.2.10.0.tar.gz) = 29215970
-SIZE (robin-map-0.6.2.tar.gz) = 63782
+SHA256 (openimageio-2.2.10.1.tar.gz) = 
Yl9K1mb5qhMwOcCuat6Pxdq4NfrayYjL5l+CRGPWFNw=
+SIZE (openimageio-2.2.10.1.tar.gz) = 29215445
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/openimageio/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST   5 Jan 2021 20:53:18 -   1.11
+++ pkg/PLIST   29 Jan 2021 17:50:59 -
@@ -70,7 +70,7 @@ lib/cmake/OpenImageIO/OpenImageIOTargets
 @lib lib/libOpenImageIO.so.${LIBOpenImageIO_VERSION}
 @lib lib/libOpenImageIO_Util.so.${LIBOpenImageIO_Util_VERSION}
 lib/pkgconfig/OpenImageIO.pc
-lib/python${MODPY_VERSION}/site-packages/OpenImageIO.so.8.0
+lib/python${MODPY_VERSION}/site-packages/OpenImageIO.so.8.1
 @man man/man1/iconvert.1
 @man man/man1/idiff.1
 @man man/man1/igrep.1


robin-map.tar.gz
Description: Binary data


Re: [maintainer update] graphics/chafa to 1.6.0

2021-02-10 Thread Florian Viehweger
Hi,

> On Sun, Jan 24, 2021 at 09:17:22AM +0100, Florian Viehweger wrote:
> > Hi,
> > 
> > this updates graphics/chafa to 1.6.0
> > 
> > * Added support for fullwidth symbols that take up two character
> >   cells. These are common in East Asian scripts. Single-cell and
> >   double-cell symbols can be mixed, and -f symbols mode will use
> > both if possible.
> > 
> > * New symbol tags: Alpha, digit, alnum, narrow, wide, ambiguous,
> > ugly, bad. "Ambiguous" symbols have uncertain widths and may render
> > poorly in some terminals. "Ugly" denotes symbols that are
> > unsuitable for Chafa's cell-based graphics (multicolor emoji,
> > ideographic descriptors, etc). "Bad" is a superset of these two
> > categories. Bad symbols are always excluded unless explicitly
> > enabled with e.g. CHAFA_SYMBOL_TAG_BAD (--symbols +bad in the
> > frontend).
> > 
> > * The font loader (--glyph-file option) now does a better job with
> >   proportional fonts.
> > 
> > * Added options for controlling lossless optimization of output.
> >   Currently, attribute reuse and character repetition (REP sequence)
> >   are implemented.
> > 
> > * Added -O option to the frontend. This controls the optimization
> > level.
> > 
> > * Added a simple abstraction layer for terminal control sequences
> >   (ChafaTermInfo and ChafaTermDb). This allows for improved terminal
> >   support.
> > 
> > * FbTerm is now supported with TERM=fbterm in the environment.
> > 
> > * Bug fixes:
> >   github#43  Fix signal handler (reported by Markus Elfring).
> >   [unfiled]  Crash when invalid font paths were passed on command
> > line. [unfiled]  Small typo in fontgen's README (Tim Gates).
> >   [unfiled]  Bad contrast adjustment in images with transparency.
> > 
> > 
> > 'make test' passes, as well as 'portcheck -N'. No issues found on
> > amd64 and i386.
> > 
> > Feedback welcome.  
> 
> The diff in distinfo is mangled.
> 
> > 
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/graphics/chafa/Makefile,v
> > retrieving revision 1.2
> > diff -u -p -u -p -r1.2 Makefile
> > --- Makefile24 Sep 2020 20:05:22 -  1.2
> > +++ Makefile23 Jan 2021 15:36:15 -
> > @@ -1,9 +1,9 @@
> >  # $OpenBSD: Makefile,v 1.2 2020/09/24 20:05:22 danj Exp $
> >  
> >  COMMENT =  character art facsimile generator
> > -DISTNAME = chafa-1.4.1
> > +DISTNAME = chafa-1.6.0
> >  
> > -SHARED_LIBS += chafa 0.0 # 4.0
> > +SHARED_LIBS += chafa 0.0 # 5.0  
> 
> Did you compare old and new ABI? There are huge changes and this
> requires a bump in the major, which you can also see they did. At a
> minimum, run /usr/src/lib/check_sym. For further information, please
> read https://www.openbsd.org/faq/ports/specialtopics.html.

I had set what 'portcheck -N' had suggested. I'll look at the
documentation again. Thanks!

> >  
> >  CATEGORIES =   graphics
> >  
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/graphics/chafa/distinfo,v
> > retrieving revision 1.1.1.1
> > diff -u -p -u -p -r1.1.1.1 distinfo
> > --- distinfo22 Sep 2020 22:08:23 -  1.1.1.1
> > +++ distinfo23 Jan 2021 15:36:15 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (chafa-1.4.1.tar.xz) =
> > RtNANPTJbRIOBjn4eiZZBCfMKelf5UiekDpI7JZAK6M= -SIZE
> > (chafa-1.4.1.tar.xz) = 389428 +SHA256 (chafa-1.6.0.tar.xz) =
> > BwbhAabg6AYzWutXRF4va+/+C+Kadh9WGXnoFpHCxoE= +SIZE
> > (chafa-1.6.0.tar.xz) = 417888 Index: pkg/PLIST  
> 
> See above for the mangling. Compare with diff below. Easily fixed, but
> all diffs should apply cleanly. If in doubt, email yourself your diff
> first, then try to apply it again. Not sure what happened, since the
> rest of it is fine! I'd suggest to look and see if the diff was
> mangled before sending. Weird that only this section would be
> affected. Stranger things have happened! LOL

I know what happened. These two lines are the only lines which are
above my line limit in my e-mail client. D'oh! I'll watch that in the
future.

> > ===
> > RCS file: /cvs/ports/graphics/chafa/pkg/PLIST,v
> > retrieving revision 1.1.1.1
> > diff -u -p -u -p -r1.1.1.1 PLIST
> > --- pkg/PLIST   22 Sep 2020 22:08:23 -  1.1.1.1
> > +++ pkg/PLIST   23 Jan 2021 15:36:15 -
> > @@ -6,6 +6,9 @@ include/chafa/chafa-canvas.h
> >  include/chafa/chafa-common.h
> >  include/chafa/chafa-features.h
> >  include/chafa/chafa-symbol-map.h
> > +include/chafa/chafa-term-db.h
> > +include/chafa/chafa-term-info.h
> > +include/chafa/chafa-term-seq-def.h
> >  include/chafa/chafa-util.h
> >  include/chafa/chafa-version-macros.h
> >  include/chafa/chafa.h
> > @@ -24,6 +27,8 @@ share/gtk-doc/html/chafa/ch02.html
> >  share/gtk-doc/html/chafa/chafa-ChafaCanvas.html
> >  

Build failures from -fno-common (2021-02-10)

2021-02-10 Thread Christian Weisgerber
Here is an updated list of ports that fail to build with -fno-common:

astro/wmspaceweather- ports@openbsd.org
astro/wmsun - ports@openbsd.org
audio/audacity  UPDATEports@openbsd.org
audio/gtkpodUPDATEports@openbsd.org
audio/nspmod- ports@openbsd.org
audio/wmtune- ports@openbsd.org
cad/geda-gaf- e...@openbsd.org
cad/graywolf- jus...@atlantide.mooo.com
comms/birda - ports@openbsd.org
comms/efax  - i...@openbsd.org
comms/jpilot- ports@openbsd.org
comms/lcdproc   UPDATEports@openbsd.org
comms/scmxx UPDATEports@openbsd.org
comms/seyon - ports@openbsd.org
comms/xastir- ports@openbsd.org
comms/xdx   - ports@openbsd.org
databases/citus UPDATEports@openbsd.org
databases/pgpoolUPDATEp...@openbsd.org
devel/avr32/binutils- ports@openbsd.org
devel/giggle- ports@openbsd.org
devel/mingw - p...@irofti.net
devel/remakeUPDATEports@openbsd.org
devel/ti-msp430gcc  - ports@openbsd.org
editors/beaver  - ports@openbsd.org
editors/hexcurse- ports@openbsd.org
editors/tea UPDATEports@openbsd.org
education/gamgi UPDATEports@openbsd.org
emulators/coldfire  - ports@openbsd.org
emulators/fuse  UPDATEports@openbsd.org
emulators/libretro-genesis-plus-gx  - ports@openbsd.org
emulators/mupen64plus/rsp-cxd4  - anth...@anjbe.name
emulators/pcsxr - ports@openbsd.org
emulators/simh  - ports@openbsd.org
games/angband   UPDATEe...@openbsd.org
games/atomix- ports@openbsd.org
games/clonekeen - e...@openbsd.org
games/corewars  - ports@openbsd.org
games/egobooUPDATEports@openbsd.org
games/freeblocks- ports@openbsd.org
games/freedroid - ports@openbsd.org
games/freedroidrpg  - ports@openbsd.org
games/gnurobbo  - ports@openbsd.org
games/heroes- anth...@anjbe.name
games/mirrormagic   - ports@openbsd.org
games/nethack/3.6   - es...@openbsd.org
games/oolite- n...@openbsd.org
games/opentyrian- ports@openbsd.org
games/pacman-arena  - ports@openbsd.org
games/sdlpop- rob...@openbsd.org
games/sdlroids  - ports@openbsd.org
games/spider- ports@openbsd.org
games/vms-empire- ports@openbsd.org
games/xboing- ports@openbsd.org
graphics/dpic   - ports@openbsd.org
graphics/enjoympeg  - ports@openbsd.org
graphics/gimp/liquid-rescale- ports@openbsd.org
graphics/ocaml-cairoUPDATEports@openbsd.org
inputmethods/cellwriter - vas...@lxmx.com.au
japanese/onew   - es...@openbsd.org
lang/arena  - ports@openbsd.org
lang/erlang/19  - ports@openbsd.org
lang/moarvm UPDATEpas...@stumpf.co
lang/pccUPDATEports@openbsd.org
lang/snobol4UPDATEst...@wb8wsf.org
mail/avengerUPDATEports@openbsd.org
mail/mlmmj  - ports@openbsd.org
mail/sma- ports@openbsd.org
mail/wmmultipop3- ports@openbsd.org
mail/wmpop3 - ports@openbsd.org
math/abs- ports@openbsd.org
math/foma   - ports@openbsd.org
math/mcl- ports@openbsd.org
math/pspp 

CVS: cvs.openbsd.org: ports

2021-02-10 Thread Jeremy Evans
CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2021/02/10 08:53:11

Modified files:
databases/postgresql-pllua: Makefile distinfo 

Log message:
Update to pllua 2.0.7

The GitHub project changed from pllua/pllua-ng to pllua/pllua,
so adjust for that.



Re: [Update] security/py-scrypt : Update to 0.8.17

2021-02-10 Thread Klemens Nanni
On Wed, Feb 10, 2021 at 01:27:28PM +, Charlene Wendling wrote:
>  Here is a patch for security/py-scrypt:
>  i) Update to 0.8.17
>  ii) Switch to python3
>  It build well and pass all tests on amd64-6.8 system.
> 
>  Only one port depends on it, security/py-passlib, build
> well pass test with this patch too.
You also need to remove the unflavored py-scrypt line from
security/Makefile and add a quirks for py-scrypt -> py3->script which
will require a @pkgpath marker for the Python 2 PKGPATH in PLIST.

With that OK kn



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/10 08:35:38

Modified files:
infrastructure/db: user.list 
net/icinga/web2-module-director: Makefile 
net/icinga/web2-module-director/pkg: PLIST README 
Added files:
net/icinga/web2-module-director/pkg: icingadirector.rc 

Log message:
add uid and rcscript for the daemon for icinga director; mention in pkg-readme



Re: [maintainer update] graphics/chafa to 1.6.0

2021-02-10 Thread Tracey Emery
On Sun, Jan 24, 2021 at 09:17:22AM +0100, Florian Viehweger wrote:
> Hi,
> 
> this updates graphics/chafa to 1.6.0
> 
> * Added support for fullwidth symbols that take up two character
>   cells. These are common in East Asian scripts. Single-cell and
>   double-cell symbols can be mixed, and -f symbols mode will use both
>   if possible.
> 
> * New symbol tags: Alpha, digit, alnum, narrow, wide, ambiguous, ugly,
>   bad. "Ambiguous" symbols have uncertain widths and may render poorly
>   in some terminals. "Ugly" denotes symbols that are unsuitable for
>   Chafa's cell-based graphics (multicolor emoji, ideographic
>   descriptors, etc). "Bad" is a superset of these two categories. Bad
>   symbols are always excluded unless explicitly enabled with e.g.
>   CHAFA_SYMBOL_TAG_BAD (--symbols +bad in the frontend).
> 
> * The font loader (--glyph-file option) now does a better job with
>   proportional fonts.
> 
> * Added options for controlling lossless optimization of output.
>   Currently, attribute reuse and character repetition (REP sequence)
>   are implemented.
> 
> * Added -O option to the frontend. This controls the optimization level.
> 
> * Added a simple abstraction layer for terminal control sequences
>   (ChafaTermInfo and ChafaTermDb). This allows for improved terminal
>   support.
> 
> * FbTerm is now supported with TERM=fbterm in the environment.
> 
> * Bug fixes:
>   github#43  Fix signal handler (reported by Markus Elfring).
>   [unfiled]  Crash when invalid font paths were passed on command line.
>   [unfiled]  Small typo in fontgen's README (Tim Gates).
>   [unfiled]  Bad contrast adjustment in images with transparency.
> 
> 
> 'make test' passes, as well as 'portcheck -N'. No issues found on amd64
> and i386.
> 
> Feedback welcome.

The diff in distinfo is mangled.

> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/chafa/Makefile,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 Makefile
> --- Makefile  24 Sep 2020 20:05:22 -  1.2
> +++ Makefile  23 Jan 2021 15:36:15 -
> @@ -1,9 +1,9 @@
>  # $OpenBSD: Makefile,v 1.2 2020/09/24 20:05:22 danj Exp $
>  
>  COMMENT =character art facsimile generator
> -DISTNAME =   chafa-1.4.1
> +DISTNAME =   chafa-1.6.0
>  
> -SHARED_LIBS +=   chafa 0.0 # 4.0
> +SHARED_LIBS +=   chafa 0.0 # 5.0

Did you compare old and new ABI? There are huge changes and this
requires a bump in the major, which you can also see they did. At a
minimum, run /usr/src/lib/check_sym. For further information, please
read https://www.openbsd.org/faq/ports/specialtopics.html.

>  
>  CATEGORIES = graphics
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/graphics/chafa/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo  22 Sep 2020 22:08:23 -  1.1.1.1
> +++ distinfo  23 Jan 2021 15:36:15 -
> @@ -1,2 +1,2 @@
> -SHA256 (chafa-1.4.1.tar.xz) =
> RtNANPTJbRIOBjn4eiZZBCfMKelf5UiekDpI7JZAK6M= -SIZE (chafa-1.4.1.tar.xz)
> = 389428 +SHA256 (chafa-1.6.0.tar.xz) =
> BwbhAabg6AYzWutXRF4va+/+C+Kadh9WGXnoFpHCxoE= +SIZE (chafa-1.6.0.tar.xz)
> = 417888 Index: pkg/PLIST

See above for the mangling. Compare with diff below. Easily fixed, but
all diffs should apply cleanly. If in doubt, email yourself your diff
first, then try to apply it again. Not sure what happened, since the
rest of it is fine! I'd suggest to look and see if the diff was mangled
before sending. Weird that only this section would be affected. Stranger
things have happened! LOL

> ===
> RCS file: /cvs/ports/graphics/chafa/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 22 Sep 2020 22:08:23 -  1.1.1.1
> +++ pkg/PLIST 23 Jan 2021 15:36:15 -
> @@ -6,6 +6,9 @@ include/chafa/chafa-canvas.h
>  include/chafa/chafa-common.h
>  include/chafa/chafa-features.h
>  include/chafa/chafa-symbol-map.h
> +include/chafa/chafa-term-db.h
> +include/chafa/chafa-term-info.h
> +include/chafa/chafa-term-seq-def.h
>  include/chafa/chafa-util.h
>  include/chafa/chafa-version-macros.h
>  include/chafa/chafa.h
> @@ -24,6 +27,8 @@ share/gtk-doc/html/chafa/ch02.html
>  share/gtk-doc/html/chafa/chafa-ChafaCanvas.html
>  share/gtk-doc/html/chafa/chafa-ChafaCanvasConfig.html
>  share/gtk-doc/html/chafa/chafa-ChafaSymbolMap.html
> +share/gtk-doc/html/chafa/chafa-ChafaTermDb.html
> +share/gtk-doc/html/chafa/chafa-ChafaTermInfo.html
>  share/gtk-doc/html/chafa/chafa-Features.html
>  share/gtk-doc/html/chafa/chafa-Miscellaneous.html
>  share/gtk-doc/html/chafa/chafa-building.html
> 
> 
> -- 
> greetings,
> 
> Florian Viehweger

Below is a fixed diff, which I'll commit later today.

Thanks.

-- 

Tracey Emery

Index: Makefile

CVS: cvs.openbsd.org: ports

2021-02-10 Thread Stefan Sperling
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2021/02/10 06:41:09

Modified files:
devel/subversion: Tag: OPENBSD_6_8 Makefile distinfo 

Log message:
Update to Subversion 1.14.1

Fixes CVE-2020-17525 (unauthenticated denial-of-service in mod_authz_svn)

ok sthen@



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Stefan Sperling
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2021/02/10 06:40:55

Modified files:
devel/subversion: Makefile distinfo 

Log message:
Update to Subversion 1.14.1

Fixes CVE-2020-17525 (unauthenticated denial-of-service in mod_authz_svn)

ok sthen@



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/10 06:35:28

Modified files:
net/icinga/web2: Makefile 
net/icinga/web2/pkg: README 

Log message:
..actually I was mistaken about the icinga-web2 setup module. revert
that bit and add a note that setup currently requires PHP 7.3



[Update] security/py-scrypt : Update to 0.8.17

2021-02-10 Thread wen heping
Hi, ports@:

 Here is a patch for security/py-scrypt:
 i) Update to 0.8.17
 ii) Switch to python3
 It build well and pass all tests on amd64-6.8 system.

 Only one port depends on it, security/py-passlib, build
well pass test with this patch too.


wen
Index: Makefile
===
RCS file: /cvs/ports/security/py-scrypt/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile4 Jan 2021 14:06:37 -   1.3
+++ Makefile10 Feb 2021 13:20:55 -
@@ -2,11 +2,10 @@
 
 COMMENT =  support for the scrypt key derivation function
 
-MODPY_EGG_VERSION =0.8.13
+MODPY_EGG_VERSION =0.8.17
 
 DISTNAME = scrypt-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 1
 
 CATEGORIES =   security
 
@@ -21,6 +20,6 @@ MODPY_PI =Yes
 MODPY_SETUPTOOLS = Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/security/py-scrypt/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo23 Nov 2019 15:10:06 -  1.1.1.1
+++ distinfo10 Feb 2021 13:20:55 -
@@ -1,2 +1,2 @@
-SHA256 (scrypt-0.8.13.tar.gz) = E3exrcmMQVJpS/XX6TtBqdLpBgr2m3R8+tjJOsQm+eo=
-SIZE (scrypt-0.8.13.tar.gz) = 53606
+SHA256 (scrypt-0.8.17.tar.gz) = JbUHXyI4vpOvHNV0VApeoBuFR/m2eKpy0i/OIld0dew=
+SIZE (scrypt-0.8.17.tar.gz) = 56638
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/py-scrypt/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   4 Jan 2021 14:06:37 -   1.2
+++ pkg/PLIST   10 Feb 2021 13:20:55 -
@@ -11,3 +11,17 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
 
lib/python${MODPY_VERSION}/site-packages/scrypt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/scrypt/${MODPY_PYCACHE}scrypt.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/scrypt/scrypt.py
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/scrypt/tests/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/${MODPY_PYCACHE}test_scrypt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/${MODPY_PYCACHE}test_scrypt_c_module.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/${MODPY_PYCACHE}test_scrypt_py2x.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/${MODPY_PYCACHE}test_scrypt_py3x.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/ciphertexts.csv
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/hashvectors.csv
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/test_scrypt.py
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/test_scrypt_c_module.py
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/test_scrypt_py2x.py
+lib/python${MODPY_VERSION}/site-packages/scrypt/tests/test_scrypt_py3x.py


CVS: cvs.openbsd.org: ports

2021-02-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/10 06:26:23

Modified files:
net/icinga/web2: Makefile 
net/icinga/web2/pkg: README 

Log message:
icingaweb2; setup module is disabled by default, add enabling it to pkg-readme



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/10 05:49:31

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
convert icinga 1 eol to $obsolete_reason



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/10 05:47:07

Modified files:
net/icinga/core2: Makefile 
net/icinga/core2/pkg: PLIST-main PLIST-mysql 
net/icinga/web2: Makefile 
net/icinga/web2/pkg: PLIST 

Log message:
icinga port maintenance:
- switch back to libressl, cert problem was fixed in x509_verify.c 1.26
- after real-world experience, get rid of the automatic update path from 1.x to 
2.x



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Klemens Nanni
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2021/02/10 05:35:33

Modified files:
audio/mumble   : Makefile distinfo 

Log message:
Update to Mumble 1.3.4

Client
Fixed: Security vulnerability caused by allowing non http/https URL schemes in 
public server list (#4733)

Server
Fixed: Exit status for actions like --version or --supw was always set to 
non-zero ( #3998)

General
Fixed: Packet loss & audio artifacts caused by OCB2 XEX* mitigation (#4720)



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Klemens Nanni
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2021/02/10 05:32:37

Modified files:
sysutils/ruby-puppet/6: Makefile distinfo 

Log message:
Update to Puppet 6.21.0

https://puppet.com/docs/puppet/6.21/release_notes_puppet.html



Re: [Update from Maintainer] games/ezquake 3.2.3

2021-02-10 Thread Tom Murphy
Hi,

  I realized I hadn't cleaned up the Makefile properly. Anyway,
here is a fixed version of the patch.

  Thanks,
  Tom

Index: Makefile
===
RCS file: /cvs/ports/games/ezquake/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile3 Oct 2020 14:58:48 -   1.10
+++ Makefile10 Feb 2021 08:12:08 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.10 2020/10/03 14:58:48 solene Exp $
 
 N =ezquake
-V =3.2.2
+V =3.2.3
 COMMENT =  modern QuakeWorld client
 
 PKGNAME =  ${N}-${V}
Index: distinfo
===
RCS file: /cvs/ports/games/ezquake/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo3 Oct 2020 14:58:48 -   1.6
+++ distinfo10 Feb 2021 08:12:08 -
@@ -1,2 +1,2 @@
-SHA256 (ezquake-source-3.2.2.tar.gz) = 
LKLEVbzdTNfDrJX6h6ik40Y6qGpdvg/RhXb42XkEJfo=
-SIZE (ezquake-source-3.2.2.tar.gz) = 5759652
+SHA256 (ezquake-source-3.2.3.tar.gz) = 
7FGHtHrYWc9Fk4Epbo0dVgBB/ZBGLb4KuJxl4yBnftQ=
+SIZE (ezquake-source-3.2.3.tar.gz) = 5760982
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/games/ezquake/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  18 May 2020 09:29:06 -  1.2
+++ patches/patch-Makefile  10 Feb 2021 08:12:08 -
@@ -1,10 +1,20 @@
 $OpenBSD: patch-Makefile,v 1.2 2020/05/18 09:29:06 solene Exp $
 
 Skip the architecture dance.
+Add X11BASE/lib to LDFLAGS
 
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
+@@ -36,7 +36,7 @@ JSON2C ?= ./json2c.sh
+ 
+ CFLAGS ?= -O2 -Wall -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast 
-Wno-strict-aliasing -Werror=strict-prototypes -Werror=old-style-definition -g 
-MMD $(INCLUDES)
+ RCFLAGS ?=
+-LDFLAGS ?=
++LDFLAGS ?= -L${X11BASE}/lib
+ LIBS ?=
+ 
+ #Temporarily disable tree vectorization optimization enabled at O3 due to gcc 
bug
 @@ -379,7 +379,7 @@ endif
  ifdef CONFIG_WINDOWS
  TARG_c := ezquake.exe



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/10 04:43:58

Modified files:
mail/altermime : Makefile 
Added files:
mail/altermime/patches: patch-altermime_c 

Log message:
Run altermime with pledge(). It's fairly small and self-contained and
does string processing on what is often untrusted input, so this seems
a good candidate for defensive use of pledge (allowing all file io,
as it creates temporary files at various points during run, but has
no need for network).

pledge() is often not a good match for software in ports, but this seems
a suitable candidate and it changes very infrequently so doesn't add a
big maintenance burden.

looks good to deraadt, ok semarie@



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/10 04:16:02

Modified files:
x11/gnome/tracker: Makefile 
x11/gnome/tracker3: Makefile 
devel/appstream-glib: Makefile 

Log message:
Add support for libstemmer.



Re: NEW: sysutils/hfsfuse

2021-02-10 Thread Stuart Henderson
It would be helpful to hold off on this until helg's fuse changes are done.

On 2021/02/06 09:13, Morgan Aldridge wrote:
> [Unrelated to the recent update of misc/hfsplus.]
> 
> "[Read-only] FUSE driver for HFS+, based on NetBSD's kernel driver
> with modifications."
> 
> "[It] also includes a standalone tool, hfsdump, to inspect the
> contents of an HFS+ volume without FUSE."
> 
> I have tested on amd64 6.8-stable and -current. I'm currently using
> libutf8proc from ports and not building with libublio support (that
> particular licensing needs further review). The developer was already
> testing on OpenBSD, so this was a straightforward port.
> 
> I know you're all busy with -fno-common right now, so comments/OKs
> when you have time.
> 
> Morgan




CVS: cvs.openbsd.org: ports

2021-02-10 Thread Kirill Bychkov
CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2021/02/10 03:19:02

Modified files:
games/naev : Makefile distinfo 
games/naev/pkg : PLIST-data 
Added files:
games/naev/patches: patch-configure_ac 
Removed files:
games/naev/patches: patch-configure 

Log message:
update to naev-0.8.1



Re: [PATCH] Use erlang21 for net/rabbitmq

2021-02-10 Thread Stuart Henderson
On 2021/02/09 17:44, Greg Steuck wrote:
> The current state of the port is broken by -fno-commit which took out
> erlang19. On top of that the imported version has known security issues
> and EOLed upstream support. I'm inclined to remove the port and let
> somebody who needs the port send a working version with resolved
> security issues.

sebastia@, could you comment please? are you still using this?

The bad security issues fixed are Windows-specific, the others (XSS and
DoS in management interfaces) there are probably much worse than those
in other ports. It is overdue an update though.

> OK to remove net/rabbitmq?

If it is going, I would prefer to mark BROKEN than remove. It is quite
possobly something that someone will want to fix at some point and cvs
makes it a pain to readd removed ports.



Re: Fix net/gophernicus -fno-common

2021-02-10 Thread Brian Callahan
On Tuesday, February 9th, 2021 at 11:19 PM, Greg Steuck  
wrote:

> Brian Callahan bcal...@protonmail.com writes:
>
> > Hi ports --
> >
> > This diff fixes gophernicus with -fno-common.
> >
> > I didn't update it since upstream has a new and broken build process.
> >
> > Also drop myself as maintainer.
> >
> > OK?
>
> The patch reads OK but I don't understand why these would get declared
>
> given the statement that we don't have libwrap?
>

At the beginning of the build, gophernicus does this:
echo "/* Automatically generated function definitions */" > functions.h
echo >> functions.h
grep -h "^[a-z]" gophernicus.c file.c menu.c string.c platform.c session.c 
options.c |  grep -v "int main" |  grep -v "strlc" |  grep -v "[a-z]:" |  sed 
-e "s/ =.*$//" -e "s/ *$/;/" >> functions.h

This unconditionally sticks an
int allow_severity;
int deny_serverity;
in functions.h, which gets pulled into multiple C files.

~Brian

> > ~Brian
> >
> > Index: Makefile
> > ===
> >
> > RCS file: /cvs/ports/net/gophernicus/Makefile,v
> >
> > retrieving revision 1.19
> >
> > diff -u -p -r1.19 Makefile
> >
> > --- Makefile 6 Feb 2020 18:06:10 - 1.19
> >
> > +++ Makefile 10 Feb 2021 01:57:11 -
> >
> > @@ -1,6 +1,7 @@
> >
> > $OpenBSD: Makefile,v 1.19 2020/02/06 18:06:10 edd Exp $
> > ===
> >
> > COMMENT= modern gopher server
> >
> > +REVISION = 0
> >
> > GH_ACCOUNT= gophernicus
> >
> > GH_PROJECT= gophernicus
> >
> > @@ -9,8 +10,6 @@ GH_TAGNAME= v3.0.1
> >
> > CATEGORIES= net
> >
> > HOMEPAGE= gopher://gophernicus.org/
> > ---
> >
> > -MAINTAINER = Brian Callahan bcal...@openbsd.org
> >
> > BSD
> > ===
> >
> > PERMIT_PACKAGE= Yes
> >
> > Index: patches/patch-gophernicus_c
> > ===
> >
> > RCS file: patches/patch-gophernicus_c
> >
> > diff -N patches/patch-gophernicus_c
> >
> > --- /dev/null 1 Jan 1970 00:00:00 -
> >
> > +++ patches/patch-gophernicus_c 10 Feb 2021 01:57:11 -
> >
> > @@ -0,0 +1,16 @@
> >
> > +$OpenBSD$
> >
> > +
> >
> > +We don't have libwrap, and these cause issues with -fno-common
> >
> > +
> >
> > +Index: gophernicus.c
> >
> > +--- gophernicus.c.orig
> >
> >  gophernicus.c
> >
> > +@@ -30,8 +30,6 @@
> >
> > -   -   Libwrap needs these defined
> > -   */
> > -   #ifdef HAVE_LIBWRAP
> >
> > +-int allow_severity = LOG_DEBUG;
> >
> > +-int deny_severity = LOG_ERR;
> > -   #endif



Update or remove mail/avenger

2021-02-10 Thread Klemens Nanni
We package 0.8.3 05-Apr-2012 but 0.8.4 in 13-Jul-2013 and 0.8.5 in
08-Oct-2018 were released;  the NEWS file in the latest tarball says:

* Changes in release 0.8.5

Various changes to make it compile with newer g++ and libcrypto.

Manually parse /etc/resolv.conf, rather than attempting to make use of
the res data structure (which at least on OpenBSD no longer actually
contains the addresses of resolvers).

* Changes in release 0.8.4

Switch to new resolver library interface, as previous way of reloading
resolv.conf is no longer compatible with glibc.

Set IP_FREEBIND option if available.

Added systemd avenger.service file.


Does anyone still use this "highly-configurable, MTA-independent SMTP
server daemon" on OpenBSD?  I'm inclined to assume the answer is "no",
especially if the latest release from over two years ago contains
DNS and crypto relevant specifically for OpenBSD.

Does anyone want to look at updating and testing this port or shall we
send it to the attic?

PS: http://www.mailavenger.org/NEWS is sitll missing 0.8.5 changes, so
best look at the actual tarball.



CVS: cvs.openbsd.org: ports

2021-02-10 Thread Klemens Nanni
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2021/02/10 01:25:47

Modified files:
editors: Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 
Removed files:
editors/hnb: Makefile distinfo 
editors/hnb/patches: patch-Makefile patch-expanded_c 
 patch-libcli_Makefile 
editors/hnb/pkg: DESCR PLIST 

Log message:
Remove editors/hnb

This port hits segmentation faults right on startup (amd64, default/empty
`vm.malloc_conf'), both built with either `-fcommon' or fixes from FreeBSD.

No update since 2003.
Fails to build the now default "-fno-common".

OK gnezdo