Re: serurity/aircrack-ng builds successfully but core dumped airodump-ng

2020-07-14 Thread Theo Buehler
On Wed, Jul 15, 2020 at 12:01:55AM +, Martin wrote:
> Can it be implemented in -current ports tree to check?

Yes, you can apply the patch to the -current ports tree to check.
Save the email to a file,

cd /usr/ports/*/aircrack-ng
patch < /path/to/patch
make
make install



python-3.8.3 don't build (probably) _gdbm.so and can't install it -current ports tree

2020-07-14 Thread Martin
Stuck with building Python-3.8.3 from -current ports. During build all the 
necessary dependences and gdbm especially builds as should be, but finally 
_gdbm.so does not installed. The question is how to fix it for this particular 
build?

Error: 
/usr/obj/ports/Python-3.8.3/fake-amd64/usr/local/lib/pytohn3.8/lib-dynload/_gdbm.so
 does not exist
at /usr/ports/infrastructure/bin/build-debug-info line 147.

6.7 -current

Martin

CVS: cvs.openbsd.org: ports

2020-07-14 Thread Brian Callahan
CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2020/07/14 18:53:04

Modified files:
lang/kona  : Makefile distinfo 

Log message:
Update to kona-3.2.0.20200711



[UPDATE] games/gnubg to latest release

2020-07-14 Thread Nils Reuße

Hi all,

this patch brings gnubg to the latest release.

I am not too sure about adding "-I$(top_srcdir)" to the DEFAULT_INCLUDES 
in the two Makefiles (for the two subdirectories), but I couldn't get it 
to compile otherwise.  The affected includes are in subdirectories of 
the source, but the compilation step is executed from build_amd64, and 
then the already present "-I$(top_builddir)" resolves to .. (the top dir 
of build_amd64) and not the top dir of the source code subdir.


Any comments on that?  gnubg runs fine otherwise.

Thanks!

Nils
Index: Makefile
===
RCS file: /cvs/ports/games/gnubg/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile	29 Dec 2019 23:56:59 -	1.10
+++ Makefile	14 Jul 2020 22:32:30 -
@@ -1,12 +1,11 @@
 # $OpenBSD: Makefile,v 1.10 2019/12/29 23:56:59 ajacoutot Exp $
 
 COMMENT =		GNU Backgammon
-V =			1.05.002
+V =			1.06.002
 DISTNAME =		gnubg-release-$V-sources
 PKGNAME =		gnubg-$V
 CATEGORIES =		games x11
-HOMEPAGE =		http://gnubg.org/
-REVISION =		7
+HOMEPAGE =		https://www.gnu.org/software/gnubg/
 
 # GPLv3+
 PERMIT_PACKAGE =	Yes
@@ -24,7 +23,7 @@ WANTLIB += xcb-present xcb-render xcb-sh
 WANTLIB += xshmfence z
 WANTLIB += ${MODPY_WANTLIB}
 
-MASTER_SITES =		http://gnubg.org/media/sources/
+MASTER_SITES =		ftp://ftp.gnu.org/gnu/gnubg/
 
 MODULES =		lang/python
 BUILD_DEPENDS =		devel/gettext,-tools
Index: distinfo
===
RCS file: /cvs/ports/games/gnubg/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo	7 Oct 2016 21:49:45 -	1.1.1.1
+++ distinfo	14 Jul 2020 22:32:30 -
@@ -1,2 +1,2 @@
-SHA256 (gnubg-release-1.05.002-sources.tar.gz) = ssX5RXoCOiKXCLt4iu5vcSQoyRHhmfMvsH86g9bItgs=
-SIZE (gnubg-release-1.05.002-sources.tar.gz) = 15092499
+SHA256 (gnubg-release-1.06.002-sources.tar.gz) = zhsLDBkAcXzFmAMqFM+MDuYPryTYQ2izmSLAECmDvIc=
+SIZE (gnubg-release-1.06.002-sources.tar.gz) = 13163681
Index: patches/patch-board3d_Makefile_in
===
RCS file: patches/patch-board3d_Makefile_in
diff -N patches/patch-board3d_Makefile_in
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-board3d_Makefile_in	14 Jul 2020 22:32:30 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: board3d/Makefile.in
+--- board3d/Makefile.in.orig
 board3d/Makefile.in
+@@ -151,7 +151,7 @@ AM_V_at = $(am__v_at_@AM_V@)
+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 = 
+-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_srcdir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__maybe_remake_depfiles = depfiles
+ am__depfiles_remade = ./$(DEPDIR)/libboard3d_la-drawboard3d.Plo \
Index: patches/patch-board3d_font3d_c
===
RCS file: /cvs/ports/games/gnubg/patches/patch-board3d_font3d_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-board3d_font3d_c
--- patches/patch-board3d_font3d_c	7 Oct 2016 21:49:45 -	1.1.1.1
+++ patches/patch-board3d_font3d_c	14 Jul 2020 22:32:30 -
@@ -3,8 +3,9 @@ $OpenBSD: patch-board3d_font3d_c,v 1.1.1
 We make GNU Backgammon use system-supplied DejaVu fonts instead of bundling Vera
 fonts.  Thus stop building dynamically allocated paths for fonts.
 
 board3d/font3d.c.orig	Sun Apr  5 10:05:29 2015
-+++ board3d/font3d.c	Sun Apr  5 10:10:56 2015
+Index: board3d/font3d.c
+--- board3d/font3d.c.orig
 board3d/font3d.c
 @@ -73,7 +73,6 @@ static int RenderGlyph(const FT_Outline * pOutline);
  int
  CreateNumberFont(OGLFont ** ppFont, const char *fontFile, int pitch, float size, float heightRatio)
@@ -33,10 +34,10 @@ fonts.  Thus stop building dynamically a
  CreateFontText(OGLFont ** ppFont, const char *text, const char *fontFile, int pitch, float size, float heightRatio)
  {
 -char *filename;
- 
  FT_Library ftLib;
  if (FT_Init_FreeType())
-@@ -103,13 +98,10 @@ CreateFontText(OGLFont ** ppFont, const char *text, co
+ return 0;
+@@ -102,13 +97,10 @@ CreateFontText(OGLFont ** ppFont, const char *text, co
  free(*ppFont);
  *ppFont = (OGLFont *) malloc(sizeof(OGLFont));
  
Index: patches/patch-configure
===
RCS file: /cvs/ports/games/gnubg/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- patches/patch-configure	7 Oct 2016 21:49:45 -	1.1.1.1
+++ patches/patch-configure	14 Jul 2020 22:32:30 -
@@ -2,9 +2,10 @@ $OpenBSD: patch-configure,v 1.1.1.1 2016
 
 Remove hardcoded CFLAGS
 
 configure.orig	Mon Oct  3 11:08:53 2016
-+++ configure	Mon Oct  3 11:09:09 2016
-@@ -17556,10 +17556,6 @@ else
+Index: configure
+--- configure.orig
 configure
+@@ -18466,10 +18466,6 @@ else
  $as_echo "yes" >&6; }
  fi
  
Index: patches/patch-doc_Makefile_in

Re: 'tr' extra brackets treated literally

2020-07-14 Thread Christian Weisgerber
On 2020-07-14, Jordan Geoghegan  wrote:

> I was grepping around the ports tree and I found a few places where 
> unnecessary brackets were used with 'tr'. Using square brackets with tr 
> for character ranges is unnecessary, and in fact the brackets are 
> treated literally:

This is a historical portability habit since System V systems
required range expressions to be enclosed in square brackets, and
as you note it is harmless on BSD.  POSIX has since standardized
the BSD behavior.

There is nothing to do here.

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



CVS: cvs.openbsd.org: ports

2020-07-14 Thread Bjorn Ketelaars
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2020/07/14 13:45:40

Modified files:
net/filezilla  : Makefile distinfo 

Log message:
Update to filezilla-3.49.0

Changelog: https://filezilla-project.org/changelog.php



CVS: cvs.openbsd.org: ports

2020-07-14 Thread Bjorn Ketelaars
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2020/07/14 13:45:12

Modified files:
net/libfilezilla: Makefile distinfo 
net/libfilezilla/pkg: PLIST 

Log message:
Update to libfilezilla-0.23.0

Changes: https://lib.filezilla-project.org/. Bump major as symbol has
been removed.



CVS: cvs.openbsd.org: ports

2020-07-14 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/07/14 12:10:33

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

Log message:
register cve quirk for apache-ant



CVS: cvs.openbsd.org: ports

2020-07-14 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/07/14 12:08:49

Modified files:
devel/apache-ant: Makefile distinfo 
devel/apache-ant/pkg: PLIST 

Log message:
update to apache-ant 1.10.8

this addresses CVE-2020-1945



CVS: cvs.openbsd.org: ports

2020-07-14 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/07/14 11:59:56

Modified files:
security/py-cryptodome: Makefile distinfo 

Log message:
update to cryptodome-3.9.8 (mostly fixes related to the Shamir's Secret Sharing 
implementation)



CVS: cvs.openbsd.org: ports

2020-07-14 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/07/14 11:52:11

Modified files:
sysutils/py-ghmi: Makefile distinfo 

Log message:
update to pyghmi-1.5.15



Re: to Pandoc or not

2020-07-14 Thread Ingo Schwarze
Hi,

sven falempin wrote on Tue, Jul 14, 2020 at 01:23:21PM -0400:

> Is anyone working on that for openbsd ?
> 
> https://github.com/freebsd/freebsd-ports/blob/master/textproc/hs-pandoc/Makefile

I never found pandoc useful for anything - so much so that i never
even felt a need to evalute its quality for real.  I dimly remember
that on rare occasions, i saw man(7) output generated by pandoc,
and if i remeber correctly, that was of poor quality - but i'm not
sure and it isn't terribly relevant because pandoc is used very
rarely in practice in the first place.

What do you want to do with it?

Yours,
  Ingo



Re: to Pandoc or not

2020-07-14 Thread Stuart Henderson
On 2020/07/14 13:23, sven falempin wrote:
> Dear readers,
> 
> Is anyone working on that for openbsd ?
> 
> https://github.com/freebsd/freebsd-ports/blob/master/textproc/hs-pandoc/Makefile
> 
> I do not know the Cabal build system nor haskell
> so
> I have no idea of the difficulty level of bringing that in ports .
> 
> IE: is it possible to have it work with just a few tweeks
> 
> Best,

You maybe able to build it outside of ports by using cabal (see notes at
https://marc.info/?l=openbsd-ports=152175625404877=2)

It would be nice to have a package of this, but it's not a beginner-level thing 
;)



to Pandoc or not

2020-07-14 Thread sven falempin
Dear readers,

Is anyone working on that for openbsd ?

https://github.com/freebsd/freebsd-ports/blob/master/textproc/hs-pandoc/Makefile

I do not know the Cabal build system nor haskell
so
I have no idea of the difficulty level of bringing that in ports .

IE: is it possible to have it work with just a few tweeks

Best,


CVS: cvs.openbsd.org: ports

2020-07-14 Thread Bjorn Ketelaars
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2020/07/14 10:53:57

Modified files:
net/sslh   : Makefile distinfo 
net/sslh/patches: patch-Makefile patch-t 
Added files:
net/sslh/patches: patch-sslh-conf_c 

Log message:
Update to sslh-1.21

Changelog: https://github.com/yrutschle/sslh/blob/v1.21/ChangeLog



CVS: cvs.openbsd.org: ports

2020-07-14 Thread Bjorn Ketelaars
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2020/07/14 10:52:25

Modified files:
sysutils/nnn   : Makefile distinfo 

Log message:
Update to nnn-3.3

Changes: https://github.com/jarun/nnn/blob/v3.3/CHANGELOG

>From Martin Ziemer  (maintainer). Thank you!



UPDATE devel/py-prompt_toolkit-3.0.5

2020-07-14 Thread Bjorn Ketelaars
Diff below brings py-prompt_toolkit to the latest release (3.0.5), which
is needed for updating ipython. Changes:
https://github.com/prompt-toolkit/python-prompt-toolkit/blob/3.0.5/CHANGELOG.

While here, take MAINTAINER.

Testing:
- 'make test' runs successfully
- run tested, on amd64, in combination with its only consumer: ipython

Comments/OK?


diff --git Makefile Makefile
index 060487e5d84..2ed95d04672 100644
--- Makefile
+++ Makefile
@@ -2,24 +2,21 @@
 
 COMMENT=   python library for building powerful interactive CLI
 
-# !!! do not update blindly: devel/ipython requires a specific version
-PORTROACH= ignore:1
-
-MODPY_EGG_VERSION= 1.0.15
+MODPY_EGG_VERSION= 3.0.5
 DISTNAME=  prompt_toolkit-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 EPOCH= 1
-REVISION=  1
 
 CATEGORIES=devel
 
 HOMEPAGE=  https://github.com/prompt-toolkit/python-prompt-toolkit
 
+MAINTAINER=Bjorn Ketelaars 
+
 # BSD
 PERMIT_PACKAGE=Yes
 
 MODULES=   lang/python
-
 MODPY_PI=  Yes
 MODPY_SETUPTOOLS=  Yes
 MODPY_PYTEST=  Yes
diff --git distinfo distinfo
index ef04ab37e73..0357db4bd9c 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (prompt_toolkit-1.0.15.tar.gz) = 
hYWI8Zg8pJfxz0/94B2Xij6gKwHIomqLvFzS5m2BaRc=
-SIZE (prompt_toolkit-1.0.15.tar.gz) = 243734
+SHA256 (prompt_toolkit-3.0.5.tar.gz) = 
Vj0aQUC2P/ndWHvalVfP+y/nNlAgWrb0ODCS+4gufcg=
+SIZE (prompt_toolkit-3.0.5.tar.gz) = 2999763
diff --git pkg/PLIST pkg/PLIST
index ef38d7ee708..2f733156bf3 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -11,33 +11,38 @@ 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit-${MODPY_EGG_VERSION}-py$
 lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}application.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}auto_suggest.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}buffer.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}buffer_mapping.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}cache.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}completion.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}data_structures.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}document.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}enums.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}history.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}input.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}keys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}mouse_events.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}output.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}reactive.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}patch_stdout.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}renderer.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}search_state.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}search.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}selection.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}shortcuts.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}token.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}validation.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/prompt_toolkit/${MODPY_PYCACHE}win32_types.${MODPY_PYC_MAGIC_TAG}pyc

UPDATE devel/ipython-7.16.1

2020-07-14 Thread Bjorn Ketelaars
Diff below brings ipython to 7.16.1, which is a jump forward from what
we currently have in ports. List of changes/additions is long, and can
be found at https://ipython.readthedocs.io/en/stable/whatsnew/.

Note that this update depends on an update of devel/py-prompt_toolkit,
which will be send to ports@ in a separate mail.

Testing:
- 'make test' runs successfully
- build tested all consumers
- run tested on amd64
- run tested several consumers, i.e. the jupyter-notebook stuff and
  py-qtconsole, on amd64

Comments/OK?


diff --git Makefile Makefile
index 78f7ffb2752..c502b544590 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  enhanced interactive Python shell
 
-MODPY_EGG_VERSION =5.10.0
+MODPY_EGG_VERSION =7.16.1
 DISTNAME = ipython-${MODPY_EGG_VERSION}
 PKGNAME =  ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
 
@@ -18,29 +18,31 @@ PERMIT_PACKAGE =Yes
 MODULES =  lang/python
 MODPY_PI = Yes
 
+# Optional dependency which gets picked up if it happens to be installed, thus
+# causing race conditions under dpb. Pull it in to avoid this possibility.
+BUILD_DEPENDS =www/py-mako${MODPY_FLAVOR}
+
 RUN_DEPENDS =  databases/py-pickleshare${MODPY_FLAVOR} \
devel/desktop-file-utils \
+   devel/py-backcall${MODPY_FLAVOR} \
devel/py-decorator${MODPY_FLAVOR} \
+   devel/py-jedi${MODPY_FLAVOR}>=0.10 \
devel/py-pexpect${MODPY_FLAVOR} \
-   devel/py-prompt_toolkit${MODPY_FLAVOR} \
-   devel/py-simplegeneric${MODPY_FLAVOR}>0.8 \
+   
devel/py-prompt_toolkit${MODPY_FLAVOR}>=2.0.0v1,<3.1.0v1 \
devel/py-traitlets${MODPY_FLAVOR}>=4.2 \
-   math/py-numpy${MODPY_FLAVOR} \
-   textproc/py-pygments${MODPY_FLAVOR}<2.6
+   textproc/py-pygments${MODPY_FLAVOR}
 
-# Note that if you have pdb++ installed, tests will fail.
+# Note that if you have pdb++ installed OR are using PORTS_PRIVSEP, tests will
+# fail.
 TEST_DEPENDS = ${BASE_PKGPATH}=${MODPY_EGG_VERSION} \
devel/py-ipykernel${MODPY_FLAVOR} \
-   devel/py-nbformat${MODPY_FLAVOR}>=4.2.0 \
-   devel/py-nose${MODPY_FLAVOR} \
+   devel/py-nbformat${MODPY_FLAVOR} \
+   devel/py-nose${MODPY_FLAVOR}>=0.10.1 \
devel/py-testpath${MODPY_FLAVOR} \
-   graphics/py-matplotlib${MODPY_FLAVOR} \
+   math/py-numpy${MODPY_FLAVOR}>=1.14 \
+   textproc/py-pygments${MODPY_FLAVOR} \
www/py-requests${MODPY_FLAVOR}
 
-# Optional dependency which gets picked up if it happens to be installed, thus
-# causing race conditions under dpb. Pull it in to avoid this possibility.
-BUILD_DEPENDS +=   www/py-mako${MODPY_FLAVOR}
-
 FLAVORS =  python3
 FLAVOR =   python3
 
@@ -60,7 +62,6 @@ pre-build:
${SUBST_CMD} ${WRKBUILD}/IPython/core/tests/test_interactiveshell.py
${SUBST_CMD} ${WRKBUILD}/examples/IPython\ Kernel/ipython.desktop
 
-# XXX Some tests fail with PORTS_PRIVSEP
 do-test:
env LC_CTYPE=en_US.UTF-8 PYTHONNOUSERSITE=1 \
${LOCALBASE}/bin/iptest
diff --git distinfo distinfo
index 0ce1d512f6a..4a298ab8250 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (ipython-5.10.0.tar.gz) = 0fni0CuwkA3e97avEUrKOlzz3EO53h8Z03xK7bxyT+4=
-SIZE (ipython-5.10.0.tar.gz) = 4978748
+SHA256 (ipython-7.16.1.tar.gz) = n0/LMdOyxTMzOJO5FyJk5IIcGskYOVAPMb1D8sWbPM8=
+SIZE (ipython-7.16.1.tar.gz) = 5136303
diff --git patches/patch-IPython_core_interactiveshell_py 
patches/patch-IPython_core_interactiveshell_py
deleted file mode 100644
index 6900d31bae3..000
--- patches/patch-IPython_core_interactiveshell_py
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-IPython_core_interactiveshell_py,v 1.1 2020/07/08 13:01:23 
bket Exp $
-
-IPython is broken on python-3.8, due to changes to ast.Module. Taken from
-https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1715405.html
-
-Index: IPython/core/interactiveshell.py
 IPython/core/interactiveshell.py.orig
-+++ IPython/core/interactiveshell.py
-@@ -2813,7 +2813,7 @@ class InteractiveShell(SingletonConfigurable):
- 
- try:
- for i, node in enumerate(to_run_exec):
--mod = ast.Module([node])
-+mod = ast.Module([node], [])
- code = compiler(mod, cell_name, "exec")
- if self.run_code(code, result):
- return True
diff --git patches/patch-IPython_core_tests_test_interactiveshell_py 
patches/patch-IPython_core_tests_test_interactiveshell_py
index 318f2679f13..1580f47436a 100644
--- 

CVS: cvs.openbsd.org: ports

2020-07-14 Thread Mark Kettenis
CVSROOT:/cvs
Module name:ports
Changes by: kette...@cvs.openbsd.org2020/07/14 09:52:54

Added files:
devel/libffi/patches: patch-configure_host 

Log message:
Add support for OpenBSD/powerpc64.

ok jasper@



CVS: cvs.openbsd.org: ports

2020-07-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/07/14 09:16:11

Modified files:
www/tomcat/v8  : Tag: OPENBSD_6_7 Makefile distinfo 
www/tomcat/v9  : Tag: OPENBSD_6_7 Makefile distinfo 
www/tomcat/v9/pkg: Tag: OPENBSD_6_7 PLIST-examples 

Log message:
update to tomcat-8.5.57, 9.0.37 - DoS fixes



CVS: cvs.openbsd.org: ports

2020-07-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/07/14 09:13:37

Modified files:
www/tomcat/v8  : Makefile distinfo 
www/tomcat/v9  : Makefile distinfo 
www/tomcat/v9/pkg: PLIST-examples 

Log message:
update to tomcat-8.5.57, 9.0.37 - DoS fixes



serurity/aircrack-ng builds successfully but core dumped airodump-ng

2020-07-14 Thread Martin
Hi ports@,

security/aircrack-ng coredumped wih malloc set to CF. OpenBSD 6.7-current

# airodump-ng athn0
airodump-ng(13664) in free(): chunk canary corrupted 0xbb2425f7400 0x2ac@ox2ac
Abort trap (core dumped)

I don't know how to deal with it.

Please check the issue.

CVS: cvs.openbsd.org: ports

2020-07-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/07/14 08:15:47

Modified files:
net/unifi  : Makefile.inc 
net/unifi/lts  : Makefile 
net/unifi/stable: Makefile distinfo 
net/unifi/testing: Makefile 

Log message:
unifi: provide a new snappy-java-1.1.7.3.jar with rebuilt
libsnappyjava.so, not sure what happened but somewhere along the line
the old one stopped working and adoption failed (at least in the testing
version) as it was unable to uncompress inform packets coming from APs.

may also be needed for the lts version, if anyone uses it let me know
if it's also failing (snappy-java is a pain to build..).



CVS: cvs.openbsd.org: ports

2020-07-14 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/07/14 06:43:56

Modified files:
x11/gnome/gjs  : Makefile distinfo 

Log message:
Update to gjs-1.64.4.

ok jasper@



Re: serurity/aircrack-ng builds successfully but core dumped airodump-ng

2020-07-14 Thread Theo Buehler
On Tue, Jul 14, 2020 at 01:58:12PM +0200, Theo Buehler wrote:
> On Tue, Jul 14, 2020 at 11:07:24AM +, Martin wrote:
> > Hi ports@,
> > 
> > security/aircrack-ng coredumped wih malloc set to CF. OpenBSD 6.7-current
> > 
> > # airodump-ng athn0
> > airodump-ng(13664) in free(): chunk canary corrupted 0xbb2425f7400 
> > 0x2ac@ox2ac
> > Abort trap (core dumped)
> 
> stsp changed SIOCGIFMEDIA to take a 64-bit integer 5 years ago, so this
> was broken since then.  The patch below fixes the issue for me.
> 
> This was only a matter of compiling with 'make DEBUG="-g -O0"' and
> looking at the backtrace to see that it was the free(mwords) call on
> line 363 of src/aircrack-osdep/openbsd.c.
> 
> (gdb) bt
> #0  thrkill () at -:3
> #1  0x08143e665f2e in _libc_abort () at 
> /usr/src/lib/libc/stdlib/abort.c:51
> #2  0x08143e66d836 in wrterror (d=0x814b1e9d680,
> msg=0x8143e5c83be "chunk canary corrupted %p %#tx@%#zx%s")
> at /usr/src/lib/libc/stdlib/malloc.c:300
> #3  0x08143e670b7a in validate_canary (d=, ptr= out>,
> sz=140187732400336, allocated=) at 
> /usr/src/lib/libc/stdlib/malloc.c:1047
> #4  find_chunknum (d=0x0, info=, ptr=0x0, check= out>)
> at /usr/src/lib/libc/stdlib/malloc.c:1072
> #5  0x08143e66de14 in ofree (argpool=0x7f7ddc00, p=0x81460deec00, 
> clear=0,
> check=, argsz=0) at /usr/src/lib/libc/stdlib/malloc.c:1431
> #6  0x08143e66da80 in free (ptr=0x81460deec00) at 
> /usr/src/lib/libc/stdlib/malloc.c:1488
> #7  0x081450bcc621 in do_obsd_open (wi=0x81460ded800, iface=0x81460debda0 
> "iwm0")
> at openbsd.c:363

Sorry, I had the wrong type. It should be an uint64_t, not an int64_t.

Index: Makefile
===
RCS file: /var/cvs/ports/security/aircrack-ng/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile13 Jun 2020 17:38:49 -  1.30
+++ Makefile14 Jul 2020 11:58:25 -
@@ -2,7 +2,7 @@
 
 COMMENT=   802.11 WEP and WPA-PSK keys cracking program
 DISTNAME=  aircrack-ng-1.5.2
-REVISION=  3
+REVISION=  4
 CATEGORIES=security
 
 HOMEPAGE=  https://www.aircrack-ng.org/
Index: patches/patch-src_aircrack-osdep_openbsd_c
===
RCS file: 
/var/cvs/ports/security/aircrack-ng/patches/patch-src_aircrack-osdep_openbsd_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_aircrack-osdep_openbsd_c
--- patches/patch-src_aircrack-osdep_openbsd_c  13 May 2019 17:15:40 -  
1.1
+++ patches/patch-src_aircrack-osdep_openbsd_c  14 Jul 2020 12:06:49 -
@@ -11,3 +11,21 @@ Index: src/aircrack-osdep/openbsd.c
  #undef _KERNEL
  #include 
  #include 
+@@ -322,7 +321,7 @@ static int do_obsd_open(struct wif * wi, char * iface)
+   int s;
+   unsigned int flags;
+   struct ifmediareq ifmr;
+-  int * mwords;
++  uint64_t * mwords;
+   struct priv_obsd * po = wi_priv(wi);
+   unsigned int size = sizeof(po->po_buf);
+ 
+@@ -353,7 +352,7 @@ static int do_obsd_open(struct wif * wi, char * iface)
+ 
+   assert(ifmr.ifm_count != 0);
+ 
+-  mwords = (int *) malloc(ifmr.ifm_count * sizeof(int));
++  mwords = calloc(ifmr.ifm_count, sizeof(*mwords));
+   if (!mwords) goto close_sock;
+   ifmr.ifm_ulist = mwords;
+   if (ioctl(s, SIOCGIFMEDIA, ) == -1)



Re: serurity/aircrack-ng builds successfully but core dumped airodump-ng

2020-07-14 Thread Theo Buehler
On Tue, Jul 14, 2020 at 11:07:24AM +, Martin wrote:
> Hi ports@,
> 
> security/aircrack-ng coredumped wih malloc set to CF. OpenBSD 6.7-current
> 
> # airodump-ng athn0
> airodump-ng(13664) in free(): chunk canary corrupted 0xbb2425f7400 0x2ac@ox2ac
> Abort trap (core dumped)

stsp changed SIOCGIFMEDIA to take a 64-bit integer 5 years ago, so this
was broken since then.  The patch below fixes the issue for me.

This was only a matter of compiling with 'make DEBUG="-g -O0"' and
looking at the backtrace to see that it was the free(mwords) call on
line 363 of src/aircrack-osdep/openbsd.c.

(gdb) bt
#0  thrkill () at -:3
#1  0x08143e665f2e in _libc_abort () at /usr/src/lib/libc/stdlib/abort.c:51
#2  0x08143e66d836 in wrterror (d=0x814b1e9d680,
msg=0x8143e5c83be "chunk canary corrupted %p %#tx@%#zx%s")
at /usr/src/lib/libc/stdlib/malloc.c:300
#3  0x08143e670b7a in validate_canary (d=, ptr=,
sz=140187732400336, allocated=) at 
/usr/src/lib/libc/stdlib/malloc.c:1047
#4  find_chunknum (d=0x0, info=, ptr=0x0, check=)
at /usr/src/lib/libc/stdlib/malloc.c:1072
#5  0x08143e66de14 in ofree (argpool=0x7f7ddc00, p=0x81460deec00, 
clear=0,
check=, argsz=0) at /usr/src/lib/libc/stdlib/malloc.c:1431
#6  0x08143e66da80 in free (ptr=0x81460deec00) at 
/usr/src/lib/libc/stdlib/malloc.c:1488
#7  0x081450bcc621 in do_obsd_open (wi=0x81460ded800, iface=0x81460debda0 
"iwm0")
at openbsd.c:363

Index: Makefile
===
RCS file: /var/cvs/ports/security/aircrack-ng/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile13 Jun 2020 17:38:49 -  1.30
+++ Makefile14 Jul 2020 11:33:56 -
@@ -2,7 +2,7 @@
 
 COMMENT=   802.11 WEP and WPA-PSK keys cracking program
 DISTNAME=  aircrack-ng-1.5.2
-REVISION=  3
+REVISION=  4
 CATEGORIES=security
 
 HOMEPAGE=  https://www.aircrack-ng.org/
Index: patches/patch-src_aircrack-osdep_openbsd_c
===
RCS file: 
/var/cvs/ports/security/aircrack-ng/patches/patch-src_aircrack-osdep_openbsd_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_aircrack-osdep_openbsd_c
--- patches/patch-src_aircrack-osdep_openbsd_c  13 May 2019 17:15:40 -  
1.1
+++ patches/patch-src_aircrack-osdep_openbsd_c  14 Jul 2020 11:33:44 -
@@ -11,3 +11,21 @@ Index: src/aircrack-osdep/openbsd.c
  #undef _KERNEL
  #include 
  #include 
+@@ -322,7 +321,7 @@ static int do_obsd_open(struct wif * wi, char * iface)
+   int s;
+   unsigned int flags;
+   struct ifmediareq ifmr;
+-  int * mwords;
++  int64_t * mwords;
+   struct priv_obsd * po = wi_priv(wi);
+   unsigned int size = sizeof(po->po_buf);
+ 
+@@ -353,7 +352,7 @@ static int do_obsd_open(struct wif * wi, char * iface)
+ 
+   assert(ifmr.ifm_count != 0);
+ 
+-  mwords = (int *) malloc(ifmr.ifm_count * sizeof(int));
++  mwords = calloc(ifmr.ifm_count, sizeof(*mwords));
+   if (!mwords) goto close_sock;
+   ifmr.ifm_ulist = mwords;
+   if (ioctl(s, SIOCGIFMEDIA, ) == -1)



CVS: cvs.openbsd.org: ports

2020-07-14 Thread Klemens Nanni
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/07/14 03:19:32

Modified files:
devel  : Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 
devel/pylint   : Makefile 
devel/pylint/pkg: PLIST-gui PLIST-main 
devel/py-astroid: Makefile 
devel/py-astroid/pkg: PLIST 

Log message:
Move py-astroid and pylint to py3 only

py2 pylint is the only consumer of py2 py-astroid and nothing depends
on py2 pylint.

OK bket



Re: NEW: x11/ntk

2020-07-14 Thread Dimitri Karamazov
On Sun, July 5, 2020 15:51, deserter...@danwin1210.me wrote:
> On Sat, July 4, 2020 2:47 pm, Stuart Henderson wrote:
>
>>
>> so that is a better description than "custom LGPLv2" :)
>>
> Hey,
>
>
> Now the shared library version control is more seamless and occurs in the
> Makefile alone, so no need to update the patch file. Portcheck passes too,
> and the audio/luppp port that I've sent can be used as a test.
>
> Any comments/OK?
>
>
PING

ntk.tar.gz
Description: application/gzip


Re: NEW: x11/fff

2020-07-14 Thread Bjorn Ketelaars
On Mon 06/07/2020 07:53, deserter...@danwin1210.me wrote:
> On Mon, July 6, 2020 4:53 am, Bjorn Ketelaars wrote:
> >
> > Hi,
> >
> >
> > Couple of comments:
> > - I think CATEGORIES=sysutils is better. nnn and ranger are also there.
> > - No need to set HOMEPAGE as this is done by the GH_* magic. Have a look
> > at infrastructure/mk/bsd.port.mk. However, if fff has a homepage other than
> > the one on GitHUb than you could use HOMEPAGE - Please sort RUN_DEPENDS
> > - Instead of using do-install you could set FAKE_FLAGS and have Makefile
> > handle the rest. Something like the line below works FAKE_FLAGS=DESTDIR=
> > MANDIR="${DESTDIR}${PREFIX}/man
> > - No need to set CONFIGURE_STYLE as there is nothing to override
> >
> >
> Hey, Thanks for the feedback!
> 
> I've have made the appropriate changes and reattached the tarball.

OK bket@ with the nit below.


diff --git Makefile Makefile
index 8d940f3aa63..68051a2c860 100644
--- Makefile
+++ Makefile
@@ -18,9 +18,9 @@ RUN_DEPENDS = converters/libiconv \
devel/xdg-utils \
shells/bash
 
+FAKE_FLAGS =   DESTDIR= MANDIR="${DESTDIR}${PREFIX}/man"
+
 NO_BUILD = Yes
 NO_TEST =  Yes
 
-FAKE_FLAGS = DESTDIR= MANDIR=${DESTDIR}${PREFIX}/man
-
 .include 



'tr' extra brackets treated literally

2020-07-14 Thread Jordan Geoghegan

Hello,

I was grepping around the ports tree and I found a few places where 
unnecessary brackets were used with 'tr'. Using square brackets with tr 
for character ranges is unnecessary, and in fact the brackets are 
treated literally:


ryzen$ echo "[hello]" | tr -d a-z
[]
ryzen$ echo "[hello]" | tr -d '[a-z]'


Most of the issues were found in the patch folders for various ports, so 
I'm not really sure what the procedure is for fixing that. Not sure if 
this is at all useful, but hopefully somebody more knowledgeable about 
the ports system could offer some guidance, as these are technically bugs.


ryzen$ rg "tr '\["  ports/

ports/infrastructure/db/config.guess
866:    echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 
's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 
's/[-(].*//'`-gnu


ports/benchmarks/wrk/patches/patch-Makefile
12: TARGET  := $(shell uname -s | tr '[A-Z]' '[a-z]' 2>/dev/null || echo 
unknown)


ports/emulators/qemu/patches/patch-configure
81: def=CONFIG_AUDIO_$(echo $drv | LC_ALL=C tr '[a-z]' '[A-Z]')

ports/print/lilypond/patches/patch-aclocal_m4
17: vervar="`echo $1 | tr '[a-z]' '[A-Z]'`_VERSION"

ports/security/cracklib/patches/patch-util_cracklib-format
17: tr '[A-Z]' '[a-z]' |

ports/net/munin/patches/patch-Makefile_config
73:@@ -105,7 +108,7 @@ OSTYPE := $(shell uname | LANG=C tr '[A-Z]' 
'[a-z]



Regards,

Jordan




[update patch] nnn 3.2 -> 3.3

2020-07-14 Thread Martin Ziemer
This patch updates nnn from 3.2 to 3.3.

Tested on two amd64 systems.


Index: Makefile
===
RCS file: /cvs/ports/sysutils/nnn/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile16 Jun 2020 15:02:51 -  1.9
+++ Makefile14 Jul 2020 06:31:21 -
@@ -2,7 +2,7 @@
 
 COMMENT =  the missing terminal file browser for X
 
-V =3.2
+V =3.3
 DISTNAME = nnn-v${V}
 PKGNAME =  nnn-${V}
 
Index: distinfo
===
RCS file: /cvs/ports/sysutils/nnn/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo26 May 2020 12:46:34 -  1.6
+++ distinfo14 Jul 2020 06:31:21 -
@@ -1,2 +1,2 @@
-SHA256 (nnn-v3.2.tar.gz) = TrvQJHdhU+y3nHXRpY/FzXzRaMboIXEAte3zIv351P0=
-SIZE (nnn-v3.2.tar.gz) = 143122
+SHA256 (nnn-v3.3.tar.gz) = FrJFz5hNgafjXxpqb1K+3kgQeE8GB01pNp9mTv3zKso=
+SIZE (nnn-v3.3.tar.gz) = 148795



CVS: cvs.openbsd.org: ports

2020-07-14 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/07/14 00:32:03

Modified files:
x11/gnome/gdm  : Makefile distinfo 
x11/gnome/gdm/patches: patch-daemon_gdm-local-display-factory_c 

Log message:
Update to gdm-3.36.3.