Re: [update] samba-4.15.8

[Björn Ketelaars]

On Thu 30/06/2022 01:12, Jeremie Courreges-Anglas wrote:
> 
> Here's an update to the latest samba bugfix release.
> https://www.samba.org/samba/history/samba-4.15.8.html

Builds, and run tested on amd64 at home.

OK bket@

Re: Remove INSTALL_TARGET from security/lastpass-cli

[Björn Ketelaars]

On Thu 01/09/2022 11:04, Rafael Sadowski wrote:
> I would like to modernize cmake.port.mk but first I need to get rid of
> some spooky cmake anti-pattern.
> 
> OK to build install docs by default?

OK bket@

UPDATE net/samba-4.20.2

[Björn Ketelaars]

Update to the latest stable release of the Samba 4.20 release series for
current. Release notes:
https://www.samba.org/samba/history/samba-4.20.2.html

libdcerpc and libsamba-credentials require a minor bump because of the
addition of a couple of symbols.

Run tested on amd64.

Tests and OKs welcome.


diff --git Makefile Makefile
index 61777a12f00..311e62490ab 100644
--- Makefile
+++ Makefile
@@ -1,4 +1,4 @@
-VERSION =  4.20.1
+VERSION =  4.20.2
 DISTNAME = samba-${VERSION}
 EPOCH =0
 
@@ -10,7 +10,7 @@ PKGNAME-docs =samba-docs-${VERSION}
 
 PKG_ARCH-docs =*
 
-SHARED_LIBS =  dcerpc  1.1 \
+SHARED_LIBS =  dcerpc  1.2 \
dcerpc-binding  5.0 \
dcerpc-samr 1.0 \
dcerpc-server-core  3.1 \
@@ -20,7 +20,7 @@ SHARED_LIBS = dcerpc  1.1 \
ndr-nbt 2.1 \
ndr-standard6.0 \
netapi  3.3 \
-   samba-credentials   1.5 \
+   samba-credentials   1.6 \
samba-errors2.1 \
samba-hostconfig14.0 \
samba-passdb3.0 \
diff --git distinfo distinfo
index f75d0ea042a..d47334ad9a5 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-4.20.1.tar.gz) = +Tw69SlTQNCBBsfA3PuF5PhQV9/RRYeqiBe+sxr/iPc=
-SIZE (samba-4.20.1.tar.gz) = 42441898
+SHA256 (samba-4.20.2.tar.gz) = +Wn/7VjM8+hcu8wOM6FybQJcK0D0KmU7ESW4K5LS4OU=
+SIZE (samba-4.20.2.tar.gz) = 42458953
diff --git pkg/PLIST-main pkg/PLIST-main
index b826066f469..65400a77f88 100644
--- pkg/PLIST-main
+++ pkg/PLIST-main
@@ -1169,6 +1169,8 @@ 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}ht
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_content.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}mdsearch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}mdsearch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}misc_dfs_widelink.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}misc_dfs_widelink.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}ndrdump.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}ndrdump.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}netads_dns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1206,6 +1208,7 @@ 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/downgradedatabase.
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/http_chunk.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/http_content.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/mdsearch.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/misc_dfs_widelink.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/ndrdump.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/netads_dns.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/netads_json.py

Re: [update] security/rbw to 1.11.1

[Björn Ketelaars]

On Fri 05/07/2024 13:29, Lucas Raab wrote:
> Hello,
> 
> Here's an update for rbw that's been working fine here. Other tests?
> 
> changelogs:
> https://github.com/doy/rbw/releases/tag/1.11.0
> https://github.com/doy/rbw/releases/tag/1.11.1
> 
> Thanks,
> Lucas

Works for me. OK bket@

Re: new jupyter/jupyterlab deps

[Björn Ketelaars]

On Sun 14/07/2024 14:51, Daniel Dickman wrote:
> Attached are a few new ports needed in order to update jupyter and 
> jupyterlab.
> 
> This port is needed to update jupyter_server to the 2.x series:
> - devel/py-overrides
> 
> These 2 ports are needed by devel/py-jupyter_events (not in the tree yet):
> - textproc/py-python-json-logger
> - devel/py-test-console-scripts
> 
> These ports will be needed by jupyterlab 4.x:
> - devel/py-hatch-jupyter-builder
> - devel/py-async-lru
> - textproc/py-json5
> 
> ok to import these so I can move forward with updating the jupyter stack?

Ports look good and, with exception of devel/py-test-console-scripts,
build. py-test-console-scripts needs the diff below. Without it, it does
not build.

diff --git devel/py-test-console-scripts/Makefile 
devel/py-test-console-scripts/Makefile
index f7c59eaf6eb..096a6e643c1 100644
--- devel/py-test-console-scripts/Makefile
+++ devel/py-test-console-scripts/Makefile
@@ -15,6 +15,6 @@ FLAVORS = python3
 FLAVOR =   python3

 MODPY_PI = Yes
-MODPY_PYBUILD =setuptools
+MODPY_PYBUILD =setuptools_scm

 .include 



Would it make sense to rename rename py-python-json-logger to
py-json-logger? Seems a bit nicer, and is done by several other python
modules. Easily addressed by renaming the directory and applying the
diff below. It is up to you...

diff --git textproc/py-python-json-logger/Makefile 
textproc/py-python-json-logger/Makefile
index fa94b873aa2..a2602f45551 100644
--- textproc/py-python-json-logger/Makefile
+++ textproc/py-python-json-logger/Makefile
@@ -2,7 +2,7 @@ COMMENT =   Python library adding a json log 
formatter
 
 MODPY_EGG_VERSION =2.0.7
 DISTNAME = python-json-logger-${MODPY_EGG_VERSION}
-PKGNAME =  py-${DISTNAME}
+PKGNAME =  ${DISTNAME:S/python-/py-/}
 
 CATEGORIES =   textproc
 

With the first diff, OK bket@ for importing all ports.

Re: matplotlib 3.6.3 -> 3.7.2

[Björn Ketelaars]

On Wed 23/08/2023 21:51, Daniel Dickman wrote:
> Here's an update of matplotlib to the latest version.
> 
> All reverse depdendencies still compile.
> 
> ok?

Build- and run-tested on amd64 with several scripts I'm using on a near
daily basis.

OK bket@

UPDATE audio/ncmpc-0.37

[Björn Ketelaars]

Diff below brings ncmpc to 0.37. From
https://raw.githubusercontent.com/MusicPlayerDaemon/ncmpc/v0.37/NEWS:
* show performer on song page
* show partitions on outputs page (requires libmpdclient 2.18)
* search: add search tag "modified" (requires libmpdclient 2.10)
* fix compatibility with MPD versions older than 0.21
* switch to C++17

Run tested on amd64.

Comments/OK?


diff --git Makefile Makefile
index 2526cdb24a2..536aefd339d 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   curses based frontend for mpd
 
-VER=   0.36
+VER=   0.37
 DISTNAME=  ncmpc-${VER}
 EPOCH= 0
 CATEGORIES=audio
@@ -19,6 +19,7 @@ MASTER_SITES= 
https://www.musicpd.org/download/ncmpc/${VER:R}/
 
 EXTRACT_SUFX=  .tar.xz
 
+# c++17
 COMPILER = base-clang ports-gcc
 
 MODULES=   devel/meson
diff --git distinfo distinfo
index 9ad0fe92fb2..b1f608082df 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (ncmpc-0.36.tar.xz) = RjKHPfyO/mHlAdyRhKW5IbSCvi3b7dPSPQUkHUd6Piw=
-SIZE (ncmpc-0.36.tar.xz) = 237768
+SHA256 (ncmpc-0.37.tar.xz) = fI63J/bhLY+XpTkVsbVjKJi0r7M1oRIcXgHIHfaVYVw=
+SIZE (ncmpc-0.37.tar.xz) = 240740

UPDATE audio/libmpdclient-2.18

[Björn Ketelaars]

Diff below brings libmpdclient to 2.18. From
https://raw.githubusercontent.com/MusicPlayerDaemon/libmpdclient/v2.18/NEWS:
* more out-of-memory checks
* partition: add mpd_recv_partition()
* support MPD protocol 0.21
* support MPD protocol 0.22

Minor of libmpdclient has been bumped as symbols have been added.

Testing:
- Build tested all consumers
- Run tested on amd64 in combination with mpd/ncmpc

Comments/OK?


diff --git Makefile Makefile
index 97906e3d68b..643713e4e9b 100644
--- Makefile
+++ Makefile
@@ -2,9 +2,9 @@
 
 COMMENT=   library for interfacing MPD
 
-VER=   2.17
+VER=   2.18
 DISTNAME=  libmpdclient-${VER}
-SHARED_LIBS=   mpdclient 3.2   # 2.17
+SHARED_LIBS=   mpdclient 3.3   # 2.18
 CATEGORIES=audio
 HOMEPAGE=  https://www.musicpd.org/libs/libmpdclient/
 
diff --git distinfo distinfo
index c2598998a54..2394db97125 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (libmpdclient-2.17.tar.xz) = 
7puPHH6VtlyPGKNU2vexa/zUVfxSoPO1q+QCMWvONVk=
-SIZE (libmpdclient-2.17.tar.xz) = 64880
+SHA256 (libmpdclient-2.18.tar.xz) = 
TLAeH1Z+AWmsqUh1+24SAOf1zjW2Ok33aOwVkfsQgfo=
+SIZE (libmpdclient-2.18.tar.xz) = 67236

UPDATE audio/mpd-0.21.19

[Björn Ketelaars]

Simple diff for bringing mpd to 0.21.19. Changelog can be found at
https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.19/NEWS.

Run tested on amd64 together with libmpdclient and ncmpc.

Comments/OK?


diff --git Makefile Makefile
index c9496d284c1..59e049b270d 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 BROKEN-hppa =  no atomic ops
 COMMENT =  Music Player Daemon
-VER =  0.21.18
+VER =  0.21.19
 DISTNAME = mpd-${VER}
 EXTRACT_SUFX = .tar.xz
 CATEGORIES =   audio
diff --git distinfo distinfo
index 63aee9e3cbc..2e5b5b35611 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (mpd-0.21.18.tar.xz) = h4LmbNWv1skoYHJRlrNbbfB9PRJ+9w6QDhRDIwielEI=
-SIZE (mpd-0.21.18.tar.xz) = 676084
+SHA256 (mpd-0.21.19.tar.xz) = 0ydeEdhWN63eJQyt87T1rsIUQijw2AhXZ0k/xGxVsvk=
+SIZE (mpd-0.21.19.tar.xz) = 676020

Re: UPDATE: net/gophernicus to 3.0.1

[Björn Ketelaars]

On Tue 04/02/2020 09:37, Edd Barrett wrote:
> Hi,
> 
> Here's an update to gophernicus-3.0.1.
> 
> Notes:
> 
>  - I had to switch to GH_* as the old download URL no longer hosts
>tarballs, and I was unable to get a tarball from github itself.
>However, I'd appreciate it if someone could check the latter.

Some comments:
- DISTNAME can be removed as it is correctly set by GH_*
- Version (V) can be added to GH_TAGNAME, i.e. GH_TAGNAME=v3.0.1
- GH_* should be placed higher up in Makefile. See Makefile.template.

Something like:

diff --git Makefile Makefile
index eb7307ea140..54679849bc5 100644
--- Makefile
+++ Makefile
@@ -1,11 +1,15 @@
 # $OpenBSD: Makefile,v 1.18 2019/07/12 20:48:27 sthen Exp $
 
 COMMENT=   modern gopher server
-DISTNAME=  gophernicus-2.5
+
+GH_ACCOUNT=gophernicus
+GH_PROJECT=gophernicus
+GH_TAGNAME=v3.0.1
+
 CATEGORIES=net
-REVISION=  0
 
 HOMEPAGE=  gopher://gophernicus.org/
+
 MAINTAINER =   Brian Callahan 
 
 # BSD
@@ -13,17 +17,15 @@ PERMIT_PACKAGE= Yes
 
 WANTLIB += c
 
-MASTER_SITES=  http://gophernicus.org/software/gophernicus/
-
 MAKE_FLAGS=CC="${CC}" CFLAGS="${CFLAGS}"
 NO_TEST=   Yes
 
 do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/in.gophernicus ${PREFIX}/libexec
+   ${INSTALL_PROGRAM} ${WRKSRC}/gophernicus 
${PREFIX}/libexec/in.gophernicus
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gophernicus
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gophernicus
-   cd ${WRKSRC} && ${INSTALL_DATA} LICENSE README INSTALL \
-   TODO ChangeLog README.Gophermap gophertag \
+   cd ${WRKSRC} && ${INSTALL_DATA} LICENSE README INSTALL.md \
+   TODO README.Gophermap gophertag \
${PREFIX}/share/doc/gophernicus/
cd ${WRKSRC} && ${INSTALL_DATA} gophermap \
${PREFIX}/share/examples/gophernicus/
diff --git distinfo distinfo
index f4c422a822d..24f42e912ce 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (gophernicus-2.5.tar.gz) = ZRu3ZzJhrVUCKAPypMJUiu+ohiojIM301kwyEinl1Zo=
-SIZE (gophernicus-2.5.tar.gz) = 51710
+SHA256 (gophernicus-3.0.1.tar.gz) = 
Fl/SrU+wY430FHFJa7rGgiA6FdBdX3RhiFhYFyE4vJY=
+SIZE (gophernicus-3.0.1.tar.gz) = 52525
diff --git pkg/PLIST pkg/PLIST
index 849fd6008e0..97a3357f436 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -3,8 +3,7 @@
 @newuser _gophernicus:704:704:daemon:Gophernicus Gopher 
Server:/nonexistent:/sbin/nologin
 @bin libexec/in.gophernicus
 share/doc/gophernicus/
-share/doc/gophernicus/ChangeLog
-share/doc/gophernicus/INSTALL
+share/doc/gophernicus/INSTALL.md
 share/doc/gophernicus/LICENSE
 share/doc/gophernicus/README
 share/doc/gophernicus/README.Gophermap

Re: Remove: textproc/xxdiff

[Björn Ketelaars]

On Tue 04/02/2020 22:03, Rafael Sadowski wrote:
> Read this https://marc.info/?l=openbsd-ports&m=158084331321590&w=2 and
> s/beediff/xxdiff.
> 
> OK to remove xxdiff?

xxdiff is a RDEP of devel/git-cola. It could be that alternative diff
tools work as well, but these have not been tested. As such, for now, I
would like to propose to NOT remove xxdiff.

switch devel/git-cola to py-qt5 and python3

[Björn Ketelaars]

Diff below changes our port of git-cola a bit:
- Switch from py-qt4 to py-qt5
- Switch to python3
- Drop dependency on textproc/xxdiff.

Rationale for the latter is that git-cola per default uses git.tool from
.gitconfig. A user can easily pkg_add xxdiff, or one of its
alternatives.

Testing:
- 'make test' passes all tests
- run tested on amd64

Comments/OK?


diff --git Makefile Makefile
index ae56f932813..461839de26e 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,8 @@
 COMMENT =  python powered git gui
 
 MODPY_EGG_VERSION= 3.6
-DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION}
+REVISION = 0
+DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION}
 
 GH_ACCOUNT =   git-cola
 GH_PROJECT =   git-cola
@@ -16,26 +17,25 @@ HOMEPAGE =  https://git-cola.github.io/
 MAINTAINER =   Bjorn Ketelaars 
 
 # GPLv2 only
-PERMIT_PACKAGE=Yes
+PERMIT_PACKAGE =   Yes
 
 MODULES =  lang/python
 MODPY_PYTEST = Yes
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
 
 BUILD_DEPENDS =devel/gettext,-tools \
devel/git \
devel/git,-x11 \
-   textproc/xxdiff \
-   x11/py-qt4 \
-   x11/py-qtpy
+   x11/py-qt5${MODPY_FLAVOR} \
+   x11/py-qtpy${MODPY_FLAVOR}
 
 RUN_DEPENDS =  devel/desktop-file-utils \
devel/git \
devel/git,-x11 \
-   textproc/xxdiff \
-   x11/py-qt4 \
-   x11/py-qtpy
+   x11/py-qt5${MODPY_FLAVOR} \
+   x11/py-qtpy${MODPY_FLAVOR}
 
-TEST_DEPENDS = devel/py-mock
+TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR}
 
 USE_GMAKE =Yes
 
diff --git pkg/PLIST pkg/PLIST
index 22432fe9279..851d6eeae89 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -136,179 +136,182 @@ share/git-cola/icons/zoom-out.svg
 share/git-cola/lib/
 share/git-cola/lib/cola/
 share/git-cola/lib/cola/__init__.py
-share/git-cola/lib/cola/__init__.pyc
+${MODPY_COMMENT}share/git-cola/lib/cola/${MODPY_PYCACHE}/
+share/git-cola/lib/cola/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}actions.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}app.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}cmd.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}cmds.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}dag.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}diffparse.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}difftool.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}fsmonitor.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}git.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}gitcfg.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}gitcmds.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}gravatar.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}guicmds.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}hidpi.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}hotkeys.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}i18n.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}icons.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}inotify.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}interaction.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}observable.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}qtcompat.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}qtutils.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}resources.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}spellcheck.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}textwrap.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}themes.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 share/git-cola/lib/cola/_version.py
-share/git-cola/lib/cola/_version.pyc
 share/git-cola/lib/cola/actions.py
-share/git-cola/lib/cola/actions.pyc
 share/git-cola/lib/cola/app.py
-share/git-cola/lib/cola/app.pyc
 share/git-cola/lib/cola/cmd.py
-share/git-cola/lib/cola/cmd.pyc
 share/git-cola/lib/cola/cmds.py
-share/git-cola/lib/cola/cmds.pyc
 share/git-cola/lib/cola/compat.py
-

Re: Remove: textproc/xxdiff

[Björn Ketelaars]

On Wed 05/02/2020 10:52, Landry Breuil wrote:
> On Wed, Feb 05, 2020 at 10:42:50AM +0100, Björn Ketelaars wrote:
> > On Tue 04/02/2020 22:03, Rafael Sadowski wrote:
> > > Read this https://marc.info/?l=openbsd-ports&m=158084331321590&w=2 and
> > > s/beediff/xxdiff.
> > > 
> > > OK to remove xxdiff?
> > 
> > xxdiff is a RDEP of devel/git-cola. It could be that alternative diff
> > tools work as well, but these have not been tested. As such, for now, I
> > would like to propose to NOT remove xxdiff.
> 
> and per https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=875241
> apparently upstream (or a fork) has a QT5 version, archlinux takes it from
> https://bitbucket.org/blais/xxdiff/

Instead of removing xxdiff we could choose to update it to HEAD, which
indeed provides a QT5 version.

Run tested on amd64.

Comments/OK?


diff --git Makefile Makefile
index 3c7df35ce04..8f90da313b1 100644
--- Makefile
+++ Makefile
@@ -2,40 +2,37 @@
 
 COMMENT=   graphical file comparator and merge tool
 
-DISTNAME=  xxdiff-4.0.1
+PKGNAME=   xxdiff-4.0.1.20170623
+DISTNAME=  5e5f885dfc43559549a81c59e9e8c9525306356a
+
 CATEGORIES=textproc x11
-REVISION=  1
 
 HOMEPAGE=  http://furius.ca/xxdiff/
 
 # GPL
 PERMIT_PACKAGE=Yes
 
-WANTLIB += ICE QtGui SM X11 Xext Xi Xinerama Xrender c fontconfig
-WANTLIB += freetype m pthread ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Widgets c m
 
-COMPILER = base-clang ports-gcc base-gcc
+MASTER_SITES=  https://bitbucket.org/blais/xxdiff/get/
 
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=xxdiff/}
-EXTRACT_SUFX=  .tar.bz2
+COMPILER=  base-clang ports-gcc base-gcc
 
 MODULES=   devel/qmake \
lang/python \
-   x11/qt4
+   x11/qt5
+
 BUILD_DEPENDS= devel/bison
 
+MAKE_FLAGS=MAKEDIR=${WRKDIST}
+
 SEPARATE_BUILD=No
 
 MODPY_ADJ_FILES= ../bin/termdiff
 
 NO_TEST=   Yes
 
-WRKDIST=   ${WRKDIR}/${DISTNAME}/src
-
-post-extract:
-   @rm ${WRKSRC}/getopt.h
-   @rm ${WRKSRC}/getopt.c
-   @rm ${WRKSRC}/getopt1.c
+WRKDIST=   ${WRKDIR}/blais-xxdiff-${DISTNAME:C/([0-9a-f]{12}).*/\1/}/src
 
 post-configure:
cat ${WRKSRC}/Makefile.extra >>${WRKBUILD}/Makefile
diff --git distinfo distinfo
index 563604a65e8..e6a978a78ed 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (xxdiff-4.0.1.tar.bz2) = v1jd2p16iH9PXK4gBw7V8uDWX1da8ghgc4xuJ0LDoAA=
-SIZE (xxdiff-4.0.1.tar.bz2) = 1981869
+SHA256 (5e5f885dfc43559549a81c59e9e8c9525306356a.tar.gz) = 
hnS2wxB+EIfYMbVwdwv9U35p/h4NDitbrB8/dOlHo0M=
+SIZE (5e5f885dfc43559549a81c59e9e8c9525306356a.tar.gz) = 2044525
diff --git pkg/PLIST pkg/PLIST
index 163f6be89ae..c6f5ccaafcd 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -94,5 +94,5 @@ lib/python${MODPY_VERSION}/site-packages/xxdiff/utils.py
 lib/python${MODPY_VERSION}/site-packages/xxdiff/utils.pyc
 lib/python${MODPY_VERSION}/site-packages/xxdiff/xformloop.py
 lib/python${MODPY_VERSION}/site-packages/xxdiff/xformloop.pyc
-lib/python${MODPY_VERSION}/site-packages/xxdiff_scripts-4.0.1-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/xxdiff_scripts-5.0b1-py${MODPY_VERSION}.egg-info
 @man man/man1/xxdiff.1

Re: switch devel/git-cola to py-qt5 and python3

[Björn Ketelaars]

On Wed 05/02/2020 13:40, Landry Breuil wrote:
> On Wed, Feb 05, 2020 at 01:36:02PM +0100, Landry Breuil wrote:
> > On Wed, Feb 05, 2020 at 12:37:56PM +0100, Björn Ketelaars wrote:
> > > Diff below changes our port of git-cola a bit:
> > > - Switch from py-qt4 to py-qt5
> > > - Switch to python3
> > > - Drop dependency on textproc/xxdiff.
> > > 
> > > Rationale for the latter is that git-cola per default uses git.tool from
> > > .gitconfig. A user can easily pkg_add xxdiff, or one of its
> > > alternatives.
> > 
> > i've tried it and in the parameters, the "diff tool" and "merge tool"
> > still default to xxdiff, so if you have no .gitconfig xxdif should be
> > present :) Not sure removing the RDEP is ok unless you patch that and
> > use a contraption to run xterm -e diff... which might not be worth the
> > trouble.
> > 
> > Given that xxdiff can now use Qt5 and works fine, i'd keep the
> > dependency.
> > 
> > That said, ok for the xxdiff update & this git-cola move to py3, both
> > work fine here.
> 
> and git-cola reliably segfaults upon exit deep in py-sip so you might want
> to look into that and see if it's reproducible.. :)
> 
> [Current thread is 1 (process 531978)]
> (gdb) bt
> #0  0x17bfee4018d7 in sipOMFindObject () from 
> /usr/local/lib/python3.7/site-packages/sip.so
> #1  0x17bfcdff3226 in PyQtMonitor::on_destroyed(QObject*) () from 
> /usr/local/lib/python3.7/site-packages/PyQt5/QtCore.so
> #2  0x17bf8259f885 in QMetaObject::activate(QObject*, int, int, void**) 
> () from /usr/local/lib/qt5/libQt5Core.so.2.2
> #3  0x17bf8259ecca in QMetaObject::activate(QObject*, QMetaObject const*, 
> int, void**) () from /usr/local/lib/qt5/libQt5Core.so.2.2
> #4  0x17bf82596a43 in QObject::destroyed(QObject*) () from 
> /usr/local/lib/qt5/libQt5Core.so.2.2
> #5  0x17bf825962a5 in QObject::~QObject() () from 
> /usr/local/lib/qt5/libQt5Core.so.2.2
> #6  0x17bf82234a3d in QThreadPool::~QThreadPool() () from 
> /usr/local/lib/qt5/libQt5Core.so.2.2
> #7  0x17bf822358e6 in ?? () from /usr/local/lib/qt5/libQt5Core.so.2.2
> #8  0x17bfa2289f9d in _libc___cxa_finalize (dso=) at 
> /usr/src/lib/libc/stdlib/atexit.c:177
> #9  0x17bfa22692e1 in _libc_exit (status=0) at 
> /usr/src/lib/libc/stdlib/exit.c:54
> #10 0x17bf32f69932 in Py_Exit () from /usr/local/lib/libpython3.7m.so.0.0
> #11 0x17bf32f73741 in ?? () from /usr/local/lib/libpython3.7m.so.0.0
> #12 0x17bf32f73346 in PyErr_PrintEx () from 
> /usr/local/lib/libpython3.7m.so.0.0
> #13 0x17bf32f72862 in PyRun_SimpleFileExFlags () from 
> /usr/local/lib/libpython3.7m.so.0.0
> #14 0x17bf32f9701e in ?? () from /usr/local/lib/libpython3.7m.so.0.0
> #15 0x17bf32f97913 in _Py_UnixMain () from 
> /usr/local/lib/libpython3.7m.so.0.0

The version in ports as well as the proposed update segfault on exit.
Your analysis was spot on: issue is related to py-sip. Updating the
latter to a newer version (4.19.21) fixes the issue.

I will send an update for py-sip to ports@. In the mean time I propose
to move forward, and commit the changes to git-cola. OK?

UPDATE devel/py-sip-4.19.21

[Björn Ketelaars]

Diff below brings py-sip to 4.19.21, which is a bug fix release. This
update is needed to fix an issue with git-cola [0].

While here change HOMEPAGE to use https.

The API of py-sip is known to break often. Unfortunately, reading
through ${WRKSRC}/Changelog isn't enough to find out if this breakage
also occurs with this update. Testing:
- Build tested its consumers
- Run tested with the current version of git-cola in ports, as well as
  the proposed update [0]

Comments/OK?

[0] https://marc.info/?l=openbsd-ports&m=158093630218110&w=2


diff --git Makefile Makefile
index 58db8466cea..48eae4d07cd 100644
--- Makefile
+++ Makefile
@@ -5,13 +5,12 @@ COMMENT=  automatically generate Python bindings for C 
and C++ libs
 # XXX Be particularly careful when testing updates.
 # API breaks often.
 
-MODPY_EGG_VERSION =4.19.17
+MODPY_EGG_VERSION =4.19.21
 DISTNAME=  sip-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 CATEGORIES=devel
-REVISION=  0
 
-HOMEPAGE=  http://www.riverbankcomputing.co.uk/software/sip/intro
+HOMEPAGE=  https://www.riverbankcomputing.co.uk/software/sip/intro
 
 # SIP license (Python like)
 PERMIT_PACKAGE=Yes
diff --git distinfo distinfo
index 0a2e060db81..911ecd05d42 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (sip-4.19.17.tar.gz) = ErzY9NX+78EFvAddEsUJDueD9zgHKFY8kbi5XQ7EXfM=
-SIZE (sip-4.19.17.tar.gz) = 1056156
+SHA256 (sip-4.19.21.tar.gz) = avmXmrQVkOgxG4zJQ1ZxhCnvlroONZK91jDaASESAK4=
+SIZE (sip-4.19.21.tar.gz) = 1050654
diff --git patches/patch-configure_py patches/patch-configure_py
index 21d95bc5c3d..8d93938016f 100644
--- patches/patch-configure_py
+++ patches/patch-configure_py
@@ -3,12 +3,12 @@ $OpenBSD: patch-configure_py,v 1.1 2017/11/13 19:13:47 landry 
Exp $
 Index: configure.py
 --- configure.py.orig
 +++ configure.py
-@@ -281,7 +281,7 @@ def create_config(module, template, macros):
+@@ -270,7 +270,7 @@ def create_config(module, template, macros):
  "sip_version":  sip_version,
  "sip_version_str":  sip_version_str,
  "platform": build_platform,
 -"sip_bin":  os.path.join(sip_bin_dir, "sip"),
 +"sip_bin":  os.path.join(sip_bin_dir, 
"sip${MODPY_BIN_SUFFIX}"),
  "sip_inc_dir":  sip_inc_dir,
- "sip_mod_dir":  sip_module_dir,
- "default_bin_dir":  plat_bin_dir,
+ "sip_root_dir": sip_root_dir,
+ "sip_module_dir":   sip_module_dir,

UPDATE devel/py-jupyter_core-4.6.1

[Björn Ketelaars]

Diff below brings py-jupyter_core to 4.6.1, which is needed for a
pending update of www/jupyter-notebook. Changelog can be found at
https://github.com/jupyter/jupyter_core/blob/4.6.1/docs/changelog.rst

Changes to the port:
- Follow Makefile.template
- Remove ipython as TDEP, which is not needed
- Add py-nose as TDEP

Testing:
- 'make test' runs successfully for both python2 and python3
- Run tested on amd64 with jupyter-notebook from ports and an update
  hereof

Comments/OK?


diff --git devel/py-jupyter_core/Makefile devel/py-jupyter_core/Makefile
index 4962a3be9c3..b057b6fe65f 100644
--- devel/py-jupyter_core/Makefile
+++ devel/py-jupyter_core/Makefile
@@ -2,29 +2,26 @@
 
 COMMENT =  Jupyter core package
 
-MODPY_EGG_VERSION =4.4.0
+MODPY_EGG_VERSION =4.6.1
 DISTNAME = jupyter_core-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 1
 
 CATEGORIES =   devel
 
 HOMEPAGE = https://jupyter.org/
 
-RUN_DEPENDS =  devel/py-traitlets${MODPY_FLAVOR}
-TEST_DEPENDS = devel/ipython${MODPY_FLAVOR}>=5.1.0 \
-   devel/py-ipykernel${MODPY_FLAVOR}>=4.5.2
-
 # BSD
 PERMIT_PACKAGE =   Yes
 
 MODULES =  lang/python
-
 MODPY_PI = Yes
 MODPY_SETUPTOOLS = Yes
 MODPY_PYTEST = Yes
 MODPY_PYTEST_ARGS =jupyter_core
-PORTHOME = ${WRKDIR}
+
+RUN_DEPENDS =  devel/py-traitlets${MODPY_FLAVOR}
+TEST_DEPENDS = devel/py-ipykernel${MODPY_FLAVOR} \
+   devel/py-nose$(MODPY_FLAVOR)
 
 FLAVORS =  python3
 FLAVOR ?=
@@ -33,6 +30,8 @@ FLAVOR ?=
 TEST_DEPENDS +=devel/py-mock
 .endif
 
+PORTHOME = ${WRKDIR}
+
 post-install:
mv ${PREFIX}/bin/jupyter{,${MODPY_BIN_SUFFIX}}
mv ${PREFIX}/bin/jupyter-migrate{,${MODPY_BIN_SUFFIX}}
diff --git devel/py-jupyter_core/distinfo devel/py-jupyter_core/distinfo
index 534a6e1d7d5..f92949f9480 100644
--- devel/py-jupyter_core/distinfo
+++ devel/py-jupyter_core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jupyter_core-4.4.0.tar.gz) = 
unB1SqaAMAMGxpl5ASj2+9jDBu5ZJ5dsvkitrPJAwLc=
-SIZE (jupyter_core-4.4.0.tar.gz) = 63613
+SHA256 (jupyter_core-4.6.1.tar.gz) = 
oYPg7C6Pat3fYrCj/GoiN+PgBW04HlNtPnx+zDBn4kQ=
+SIZE (jupyter_core-4.6.1.tar.gz) = 66693
diff --git devel/py-jupyter_core/patches/patch-jupyter_core_command_py 
devel/py-jupyter_core/patches/patch-jupyter_core_command_py
index 4acbeb5f540..ef58670679e 100644
--- devel/py-jupyter_core/patches/patch-jupyter_core_command_py
+++ devel/py-jupyter_core/patches/patch-jupyter_core_command_py
@@ -1,7 +1,8 @@
 $OpenBSD: patch-jupyter_core_command_py,v 1.1 2016/12/13 14:46:43 shadchin Exp 
$
 jupyter_core/command.py.orig   Tue Sep 13 18:22:49 2016
-+++ jupyter_core/command.pyThu Sep 29 17:04:28 2016
-@@ -77,7 +77,13 @@ def list_subcommands():
+Index: jupyter_core/command.py
+--- jupyter_core/command.py.orig
 jupyter_core/command.py
+@@ -84,7 +84,13 @@ def list_subcommands():
  if sys.platform.startswith('win'):
  # remove file-extension on Windows
  name = os.path.splitext(name)[0]
@@ -16,10 +17,11 @@ $OpenBSD: patch-jupyter_core_command_py,v 1.1 2016/12/13 
14:46:43 shadchin Exp $
  # build a set of subcommand strings, excluding subcommands whose parents 
are defined
  subcommands = set()
  # Only include `jupyter-foo-bar` if `jupyter-foo` is not already present
-@@ -182,6 +188,8 @@ def main():
+@@ -245,7 +251,8 @@ def main():
  sys.exit("subcommand is required")
- 
- command = 'jupyter-' + subcommand
+ 
+ command = _jupyter_abspath(subcommand)
+-
 +if sys.version_info.major == 3 and not command.endswith('-3'):
 +command += '-3'
  try:
diff --git 
devel/py-jupyter_core/patches/patch-jupyter_core_tests_test_command_py 
devel/py-jupyter_core/patches/patch-jupyter_core_tests_test_command_py
index 2e56ec9a998..722657c8cd4 100644
--- devel/py-jupyter_core/patches/patch-jupyter_core_tests_test_command_py
+++ devel/py-jupyter_core/patches/patch-jupyter_core_tests_test_command_py
@@ -2,7 +2,7 @@ $OpenBSD: patch-jupyter_core_tests_test_command_py,v 1.2 
2018/12/29 11:50:35 mar
 Index: jupyter_core/tests/test_command.py
 --- jupyter_core/tests/test_command.py.orig
 +++ jupyter_core/tests/test_command.py
-@@ -98,16 +98,20 @@ def test_subcommand_not_found():
+@@ -99,20 +99,24 @@ def test_subcommand_not_found():
  
  @patch.object(sys, 'argv', [__file__] + sys.argv[1:])
  def test_subcommand_list(tmpdir):
@@ -21,12 +21,17 @@ Index: jupyter_core/tests/test_command.py
  'jupyterstuff',
  'jupyter-yo-eyropa-ganymyde-callysto'):
 -b.join(cmd).write('')
++b.join(cmd + cmd_sufx).write('')
+ c = tmpdir.mkdir("c")
+ for cmd in ('jupyter-baz',
+ 'jupyter-bop'):
+-c.join(cmd).write('')
 +b.join(cmd + cmd_sufx).write('')
  
  p

UPDATE devel/py-jupyter_client-5.3.4

[Björn Ketelaars]

Enclosed diff brings py-jupyer_client to 5.3.4, which is needed for a
pending update of jupyter-notebook. Changelog can be found at
https://github.com/jupyter/jupyter_client/blob/5.3.4/docs/changelog.rst.


Changes to the port:
- Follow Makefile.template
- Update dependencies

Testing:
- 'make test' fails TestKernelManager.test_signal_kernel_subprocesses
  for both python2 and python3. I do not understand why this test fails.
  On python3 all other tests are OK. Python2 fails one other tests
  because of 'too many open files'
- Run tested on amd64 with jupyter-notebook from ports and an update
  hereof

Comments/OK?


diff --git Makefile Makefile
index 824719ebdc3..39baa98de92 100644
--- Makefile
+++ Makefile
@@ -2,10 +2,9 @@
 
 COMMENT =  Jupyter protocol implementation and client libraries
 
-MODPY_EGG_VERSION =5.2.4
+MODPY_EGG_VERSION =5.3.4
 DISTNAME = jupyter_client-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 1
 
 CATEGORIES =   devel
 
@@ -20,24 +19,25 @@ MODPY_PI =  Yes
 MODPY_SETUPTOOLS = Yes
 MODPY_PYTEST = Yes
 MODPY_PYTEST_ARGS =jupyter_client
-PORTHOME = ${WRKDIR}
 
-FLAVORS =  python3
-FLAVOR ?=
-
-RUN_DEPENDS =  devel/py-dateutil${MODPY_FLAVOR} \
-   devel/py-jupyter_core${MODPY_FLAVOR}>=4.3.0 \
+RUN_DEPENDS =  devel/py-dateutil${MODPY_FLAVOR}>=2.1 \
+   devel/py-jupyter_core${MODPY_FLAVOR}>=4.6.0 \
devel/py-traitlets${MODPY_FLAVOR} \
-   net/py-zmq${MODPY_FLAVOR} \
-   www/py-tornado${MODPY_FLAVOR}
-TEST_DEPENDS = devel/ipython${MODPY_FLAVOR}>=5.1.0 \
-   devel/py-ipykernel${MODPY_FLAVOR}>=4.5.2 \
+   net/py-zmq${MODPY_FLAVOR}>=13 \
+   www/py-tornado${MODPY_FLAVOR}>=4.1
+TEST_DEPENDS = devel/ipython${MODPY_FLAVOR} \
+   devel/py-ipykernel${MODPY_FLAVOR} \
shells/bash
 
+FLAVORS =  python3
+FLAVOR ?=
+
 .if !${FLAVOR:Mpython3}
 TEST_DEPENDS +=devel/py-mock
 .endif
 
+PORTHOME = ${WRKDIR}
+
 post-install:
mv ${PREFIX}/bin/jupyter-kernel{,${MODPY_BIN_SUFFIX}}
mv ${PREFIX}/bin/jupyter-kernelspec{,${MODPY_BIN_SUFFIX}}
diff --git distinfo distinfo
index 8763b398bf6..6d67b9dab73 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (jupyter_client-5.2.4.tar.gz) = 
tfnLBhBcHS0wcZ21/7PqZ9pgkZ+2jervpYPezNiBNVE=
-SIZE (jupyter_client-5.2.4.tar.gz) = 273397
+SHA256 (jupyter_client-5.3.4.tar.gz) = 
YOb67BAx1j31fxzGce1nPc7Q7UIPQ3fqM9s3scGIuRA=
+SIZE (jupyter_client-5.3.4.tar.gz) = 275850
diff --git patches/patch-jupyter_client_connect_py 
patches/patch-jupyter_client_connect_py
index 3f522511b9f..84d90a98954 100644
--- patches/patch-jupyter_client_connect_py
+++ patches/patch-jupyter_client_connect_py
@@ -9,10 +9,10 @@ Index: jupyter_client/connect.py
  import warnings
 +import sys
  from getpass import getpass
+ from contextlib import contextmanager
  
- import zmq
-@@ -137,7 +138,7 @@ def write_connection_file(fname=None, shell_port=0, io
- with open(fname, 'w') as f:
+@@ -141,7 +142,7 @@ def write_connection_file(fname=None, shell_port=0, io
+ with secure_write(fname) as f:
  f.write(json.dumps(cfg, indent=2))
  
 -if hasattr(stat, 'S_ISVTX'):

UPDATE www/jupyter-notebook-6.0.3

[Björn Ketelaars]

Diff below updates jupyter-notebook to 6.0.3. Changelog can be found at
https://jupyter-notebook.readthedocs.io/en/stable/changelog.html.
Noticeable change is that upstream dropped support for python 2.

Changes to the port:
- Drop FLAVOR and set MODPY_VERSION
- Update dependencies
- Drop post-install bits as it is no longer necessary to add a suffix to
  jupyter-notebook and its tools
- Set @conflict- and @pkgpath-marker in PLIST

Testing:
- 'make test' runs successfully
- Run tested on amd64 in an existing jupyter-notebook environment

Comments/OK?


diff --git Makefile Makefile
index ad0314ebf9e..80b5d16b0c7 100644
--- Makefile
+++ Makefile
@@ -2,10 +2,9 @@
 
 COMMENT =  web-based notebook for interactive computing
 
-MODPY_EGG_VERSION =5.7.8
+MODPY_EGG_VERSION =6.0.3
 DISTNAME = notebook-${MODPY_EGG_VERSION}
 PKGNAME =  jupyter-notebook-${MODPY_EGG_VERSION}
-REVISION = 0
 
 CATEGORIES =   www devel
 
@@ -18,14 +17,12 @@ MODULES =   lang/python
 
 MODPY_PI = Yes
 MODPY_SETUPTOOLS = Yes
-
-FLAVORS =  python3
-FLAVOR ?=
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
 
 RUN_DEPENDS =  devel/py-ipykernel${MODPY_FLAVOR} \
devel/py-ipython_genutils${MODPY_FLAVOR} \
-   devel/py-jupyter_client${MODPY_FLAVOR}>=5.2.0 \
-   devel/py-jupyter_core${MODPY_FLAVOR}>=4.4.0 \
+   devel/py-jupyter_client${MODPY_FLAVOR}>=5.3.4 \
+   devel/py-jupyter_core${MODPY_FLAVOR}>=4.6.1 \
devel/py-nbconvert${MODPY_FLAVOR} \
devel/py-nbformat${MODPY_FLAVOR} \
devel/py-send2trash${MODPY_FLAVOR} \
@@ -34,7 +31,7 @@ RUN_DEPENDS = devel/py-ipykernel${MODPY_FLAVOR} \
sysutils/py-prometheus_client${MODPY_FLAVOR} \
www/py-jinja2${MODPY_FLAVOR} \
www/py-terminado${MODPY_FLAVOR}>=0.8.1 \
-   www/py-tornado${MODPY_FLAVOR}>=4.1,<7
+   www/py-tornado${MODPY_FLAVOR}>=5.0
 
 TEST_DEPENDS = devel/py-coverage${MODPY_FLAVOR} \
devel/py-nose${MODPY_FLAVOR} \
@@ -45,20 +42,6 @@ TEST_DEPENDS =   
devel/py-coverage${MODPY_FLAVOR} \
 
 # XXX once we have a port of pandoc, we can make docs.
 
-.if !${FLAVOR:Mpython3}
-RUN_DEPENDS += devel/py-futures \
-   net/py-ipaddress
-TEST_DEPENDS +=devel/py-mock
-.else
-PKGNAME =  
jupyter-notebook${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
-.endif
-
-post-install:
-   mv ${PREFIX}/bin/jupyter-bundlerextension{,${MODPY_BIN_SUFFIX}}
-   mv ${PREFIX}/bin/jupyter-nbextension{,${MODPY_BIN_SUFFIX}}
-   mv ${PREFIX}/bin/jupyter-notebook{,${MODPY_BIN_SUFFIX}}
-   mv ${PREFIX}/bin/jupyter-serverextension{,${MODPY_BIN_SUFFIX}}
-
 # XXX exclude selenium tests as recommended, and exclude tests that use
 # send2trash as they error out with "Trashing on system internal mounts is not
 # supported".
diff --git distinfo distinfo
index bf6347fa525..995e6fb7c94 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (notebook-5.7.8.tar.gz) = Vz4K5lDF12sYtuVkum0hvzIdAIR94dIVtBistk8Fbrg=
-SIZE (notebook-5.7.8.tar.gz) = 13371684
+SHA256 (notebook-6.0.3.tar.gz) = R6kJKXXJ55Za2gC5og8M9jfQAdtg0kHUefU8C+EXrUg=
+SIZE (notebook-6.0.3.tar.gz) = 14048151
diff --git pkg/PLIST pkg/PLIST
index 3cb8f27e809..21cb03ef3e0 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,8 +1,10 @@
 @comment $OpenBSD: PLIST,v 1.6 2019/05/10 11:36:55 bket Exp $
-bin/jupyter-bundlerextension${MODPY_BIN_SUFFIX}
-bin/jupyter-nbextension${MODPY_BIN_SUFFIX}
-bin/jupyter-notebook${MODPY_BIN_SUFFIX}
-bin/jupyter-serverextension${MODPY_BIN_SUFFIX}
+@conflict jupyter-notebook3-*
+@pkgpath www/jupyter-notebook,python3
+bin/jupyter-bundlerextension
+bin/jupyter-nbextension
+bin/jupyter-notebook
+bin/jupyter-serverextension
 lib/python${MODPY_VERSION}/site-packages/notebook/
 
lib/python${MODPY_VERSION}/site-packages/notebook-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/notebook-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -24,7 +26,6 @@ 
lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}config_manager
 
lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}jstest.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}metrics.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}nbextensions.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}notebookapp.${MODP

Re: UPDATE devel/py-jupyter_core-4.6.1

[Björn Ketelaars]

On Fri 07/02/2020 21:28, Björn Ketelaars wrote:
> Diff below brings py-jupyter_core to 4.6.1, which is needed for a
> pending update of www/jupyter-notebook. Changelog can be found at
> https://github.com/jupyter/jupyter_core/blob/4.6.1/docs/changelog.rst
> 
> Changes to the port:
> - Follow Makefile.template
> - Remove ipython as TDEP, which is not needed
> - Add py-nose as TDEP
> 
> Testing:
> - 'make test' runs successfully for both python2 and python3
> - Run tested on amd64 with jupyter-notebook from ports and an update
>   hereof
> 
> Comments/OK?

Oops, forgot to use '--relative' with git, new diff below.


diff --git Makefile Makefile
index 4962a3be9c3..b057b6fe65f 100644
--- Makefile
+++ Makefile
@@ -2,29 +2,26 @@
 
 COMMENT =  Jupyter core package
 
-MODPY_EGG_VERSION =4.4.0
+MODPY_EGG_VERSION =4.6.1
 DISTNAME = jupyter_core-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 1
 
 CATEGORIES =   devel
 
 HOMEPAGE = https://jupyter.org/
 
-RUN_DEPENDS =  devel/py-traitlets${MODPY_FLAVOR}
-TEST_DEPENDS = devel/ipython${MODPY_FLAVOR}>=5.1.0 \
-   devel/py-ipykernel${MODPY_FLAVOR}>=4.5.2
-
 # BSD
 PERMIT_PACKAGE =   Yes
 
 MODULES =  lang/python
-
 MODPY_PI = Yes
 MODPY_SETUPTOOLS = Yes
 MODPY_PYTEST = Yes
 MODPY_PYTEST_ARGS =jupyter_core
-PORTHOME = ${WRKDIR}
+
+RUN_DEPENDS =  devel/py-traitlets${MODPY_FLAVOR}
+TEST_DEPENDS = devel/py-ipykernel${MODPY_FLAVOR} \
+   devel/py-nose$(MODPY_FLAVOR)
 
 FLAVORS =  python3
 FLAVOR ?=
@@ -33,6 +30,8 @@ FLAVOR ?=
 TEST_DEPENDS +=devel/py-mock
 .endif
 
+PORTHOME = ${WRKDIR}
+
 post-install:
mv ${PREFIX}/bin/jupyter{,${MODPY_BIN_SUFFIX}}
mv ${PREFIX}/bin/jupyter-migrate{,${MODPY_BIN_SUFFIX}}
diff --git distinfo distinfo
index 534a6e1d7d5..f92949f9480 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (jupyter_core-4.4.0.tar.gz) = 
unB1SqaAMAMGxpl5ASj2+9jDBu5ZJ5dsvkitrPJAwLc=
-SIZE (jupyter_core-4.4.0.tar.gz) = 63613
+SHA256 (jupyter_core-4.6.1.tar.gz) = 
oYPg7C6Pat3fYrCj/GoiN+PgBW04HlNtPnx+zDBn4kQ=
+SIZE (jupyter_core-4.6.1.tar.gz) = 66693
diff --git patches/patch-jupyter_core_command_py 
patches/patch-jupyter_core_command_py
index 4acbeb5f540..ef58670679e 100644
--- patches/patch-jupyter_core_command_py
+++ patches/patch-jupyter_core_command_py
@@ -1,7 +1,8 @@
 $OpenBSD: patch-jupyter_core_command_py,v 1.1 2016/12/13 14:46:43 shadchin Exp 
$
 jupyter_core/command.py.orig   Tue Sep 13 18:22:49 2016
-+++ jupyter_core/command.pyThu Sep 29 17:04:28 2016
-@@ -77,7 +77,13 @@ def list_subcommands():
+Index: jupyter_core/command.py
+--- jupyter_core/command.py.orig
 jupyter_core/command.py
+@@ -84,7 +84,13 @@ def list_subcommands():
  if sys.platform.startswith('win'):
  # remove file-extension on Windows
  name = os.path.splitext(name)[0]
@@ -16,10 +17,11 @@ $OpenBSD: patch-jupyter_core_command_py,v 1.1 2016/12/13 
14:46:43 shadchin Exp $
  # build a set of subcommand strings, excluding subcommands whose parents 
are defined
  subcommands = set()
  # Only include `jupyter-foo-bar` if `jupyter-foo` is not already present
-@@ -182,6 +188,8 @@ def main():
+@@ -245,7 +251,8 @@ def main():
  sys.exit("subcommand is required")
- 
- command = 'jupyter-' + subcommand
+ 
+ command = _jupyter_abspath(subcommand)
+-
 +if sys.version_info.major == 3 and not command.endswith('-3'):
 +command += '-3'
  try:
diff --git patches/patch-jupyter_core_tests_test_command_py 
patches/patch-jupyter_core_tests_test_command_py
index 2e56ec9a998..722657c8cd4 100644
--- patches/patch-jupyter_core_tests_test_command_py
+++ patches/patch-jupyter_core_tests_test_command_py
@@ -2,7 +2,7 @@ $OpenBSD: patch-jupyter_core_tests_test_command_py,v 1.2 
2018/12/29 11:50:35 mar
 Index: jupyter_core/tests/test_command.py
 --- jupyter_core/tests/test_command.py.orig
 +++ jupyter_core/tests/test_command.py
-@@ -98,16 +98,20 @@ def test_subcommand_not_found():
+@@ -99,20 +99,24 @@ def test_subcommand_not_found():
  
  @patch.object(sys, 'argv', [__file__] + sys.argv[1:])
  def test_subcommand_list(tmpdir):
@@ -21,12 +21,17 @@ Index: jupyter_core/tests/test_command.py
  'jupyterstuff',
  'jupyter-yo-eyropa-ganymyde-callysto'):
 -b.join(cmd).write('')
++b.join(cmd + cmd_sufx).write('')
+ c = tmpdir.mkdir("c")
+ for cmd in ('jupyter-baz',
+ 'jupyter-bop'):
+-c.join(cmd).write('')
 +b.join(cmd + cmd_sufx).write('&

Re: [UPDATE] audio/ncspot to 0.1.2

[Björn Ketelaars]

On Fri 07/02/2020 20:16, Henrik Friedrichsen wrote:
> Attached diff updates audio/ncspot to 0.1.2.
> 
> OK?

Is there a reason for dropping the license markers after
MODCARGO_CRATES? If I'm not mistaken, these markers should be generated
using 'make modcargo-gen-crates-licenses'.

The update itself works for me (tested on amd64).

UPDATE games/freeciv-2.6.1

[Björn Ketelaars]

Diff below brings freeciv to 2.6.1, which is a bugfix release.
https://freeciv.fandom.com/wiki/NEWS-2.6.1 lists the changes since
2.6.0.

(Lightly) run tested on amd64 for the last couple of days.

Comments/OK?


diff --git Makefile Makefile
index 2d8260e17d8..1f8a076b1d8 100644
--- Makefile
+++ Makefile
@@ -4,7 +4,7 @@ COMMENT-main=   Civilization clone for X11; multiplayer; game 
server
 COMMENT-client=Freeciv client
 COMMENT-share= shared data files for Freeciv
 
-VERSION=   2.6.0
+VERSION=   2.6.1
 DISTNAME=  freeciv-${VERSION}
 PKGNAME-main=  freeciv-server-${VERSION}
 PKGNAME-client=freeciv-client-${VERSION}
@@ -23,15 +23,15 @@ EXTRACT_SUFX=   .tar.bz2
 cWANTLIB += bz2 c crypto curl iconv intl lzma m nghttp2 pthread sqlite3 ssl z
 cWANTLIB += ${MODLUA_WANTLIB}
 
-WANTLIB-main += curses readline ${cWANTLIB}
+WANTLIB-main += readline ${cWANTLIB}
 
-WANTLIB-client += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB-client += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
-WANTLIB-client += cairo cairo-gobject dbus-1 epoxy expat ffi fontconfig
-WANTLIB-client += freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB-client += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
-WANTLIB-client += harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
-WANTLIB-client += pixman-1 png xcb xcb-render xcb-shm ${cWANTLIB}
+WANTLIB-client += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB-client += Xrandr Xrender atk-1.0 atk-bridge-2.0 cairo cairo-gobject
+WANTLIB-client += epoxy expat fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0
+WANTLIB-client += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
+WANTLIB-client += gthread-2.0 gtk-3 harfbuzz pango-1.0 pangocairo-1.0
+WANTLIB-client += pangoft2-1.0 pixman-1 png xcb xcb-render xcb-shm
+WANTLIB-client += ${cWANTLIB}
 
 WANTLIB-share=
 
diff --git distinfo distinfo
index ba22aa32483..d0d6b4c0e07 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (freeciv-2.6.0.tar.bz2) = fCA5kZjWx9hG/tmmmwLgETSuU0Cjrg+Z0eOAY63myZk=
-SIZE (freeciv-2.6.0.tar.bz2) = 51912466
+SHA256 (freeciv-2.6.1.tar.bz2) = zOaEHaAZQTiq0mnMc1VX20OKRJCddf0D1NtnUHmGueI=
+SIZE (freeciv-2.6.1.tar.bz2) = 51915573

Re: [UPDATE] audio/ncspot to 0.1.2

[Björn Ketelaars]

On Sat 08/02/2020 14:52, Henrik Friedrichsen wrote:
> On Sat, Feb 08, 2020 at 07:10:48AM +0100, Sebastien Marie wrote:
> > Henrik, could you try with the following diff ?
> 
> Sure! Attached is a diff with the license bits. Looks better!

> -MODCARGO_CRATES +=   librespot-metadata  0.1.0   # MIT
> -MODCARGO_CRATES +=   librespot-playback  0.1.0   # MIT
> -MODCARGO_CRATES +=   librespot-protocol  0.1.0   # MIT
> +MODCARGO_CRATES +=   libpulse-sys0.0.0   # MODCARGO_CRATES +=
> librespot-audio 0.1.1   # MIT

Line above looks wrong.   ^

UPDATE www/e2guardian-5.3.4

[Björn Ketelaars]

Diff below brings e2guardian to 5.3.4, which is a bug fix release. From
changelog [0]:
  - Fix #565 segfault when no write permission on generated certs
directory 
  - Fix #493 referexception not working
  - Fix #549 - Url in CGI and bypass wrong in MITM 
  - Bug fix sigwait code for OpenBSD

Changes to the port:
  - Upstream has fixed sigwait code, as such remove relevant bits from
patch-src_FatController_cpp

Testing:
  - Lightly run tested on amd64. Note that I only played a bit with this
port, nothing serious.

Comments/OK?

[0] https://github.com/e2guardian/e2guardian/blob/v5.3.4/ChangeLog


diff --git Makefile Makefile
index 6ed036472e1..188a525976b 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 GH_ACCOUNT =   e2guardian
 GH_PROJECT =   e2guardian
-GH_TAGNAME =   5.3.3
+GH_TAGNAME =   v5.3.4
 
 COMMENT =  content scanning web filter
 CATEGORIES =   www net
diff --git distinfo distinfo
index b8064b9d2a3..bc0d2e23fad 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (e2guardian-5.3.3.tar.gz) = nYj30sM54BWG0mfyWjAYaC0RW4qq3Bi+2uke+rUchbQ=
-SIZE (e2guardian-5.3.3.tar.gz) = 2009254
+SHA256 (e2guardian-5.3.4.tar.gz) = CaEH/Xkb6S7csIN7j9ytYmkoFi0F4xrlP6j+Ott9VlI=
+SIZE (e2guardian-5.3.4.tar.gz) = 2083057
diff --git patches/patch-configs_e2guardian_conf_in 
patches/patch-configs_e2guardian_conf_in
index f5554370e95..21b191f1cc9 100644
--- patches/patch-configs_e2guardian_conf_in
+++ patches/patch-configs_e2guardian_conf_in
@@ -3,10 +3,10 @@ $OpenBSD: patch-configs_e2guardian_conf_in,v 1.1.1.1 
2019/09/18 16:34:03 sthen E
 Index: configs/e2guardian.conf.in
 --- configs/e2guardian.conf.in.orig
 +++ configs/e2guardian.conf.in
-@@ -568,7 +568,7 @@ logconnectionhandlingerrors = on
- # This figure is the maximum number of concurrent connections.
- # If more connections are made, connections will queue until a worker thread 
is free.
- # On large site you might want to try 5000 (max value 2)
+@@ -577,7 +577,7 @@ logconnectionhandlingerrors = on
+ # On 32-bit systems reduce this to 300 to avoid exceeding the <4GB
+ # virtual memory limit and on Linux decrease the thread stack size from
+ # 10MB to 2MB (ulimit -s 2048)
 -httpworkers = 500 
 +httpworkers = 50
  
diff --git patches/patch-configs_e2guardianf1_conf_in 
patches/patch-configs_e2guardianf1_conf_in
index 2d1623471ba..b68ad4f9c7c 100644
--- patches/patch-configs_e2guardianf1_conf_in
+++ patches/patch-configs_e2guardianf1_conf_in
@@ -3,7 +3,7 @@ $OpenBSD: patch-configs_e2guardianf1_conf_in,v 1.1.1.1 
2019/09/18 16:34:03 sthen
 Index: configs/e2guardianf1.conf.in
 --- configs/e2guardianf1.conf.in.orig
 +++ configs/e2guardianf1.conf.in
-@@ -303,7 +303,7 @@ bypasskey = ''
+@@ -308,7 +308,7 @@ bypasskey = ''
  #cgikey = 'you must change this text in order to be secure'
  
  #  Users will not be able to bypass sites/urls in these lists
diff --git patches/patch-src_FatController_cpp 
patches/patch-src_FatController_cpp
index cbbe878a4e5..8b44d503ef4 100644
--- patches/patch-src_FatController_cpp
+++ patches/patch-src_FatController_cpp
@@ -3,18 +3,7 @@ $OpenBSD: patch-src_FatController_cpp,v 1.1.1.1 2019/09/18 
16:34:03 sthen Exp $
 Index: src/FatController.cpp
 --- src/FatController.cpp.orig
 +++ src/FatController.cpp
-@@ -46,6 +46,10 @@
- #include 
- #endif //__SSLMITM
- 
-+#if defined(__OpenBSD__)
-+#include 
-+#endif
-+
- #include "FatController.hpp"
- #include "ConnectionHandler.hpp"
- #include "DynamicURLList.hpp"
-@@ -194,7 +198,7 @@ void stat_rec::reset()
+@@ -194,7 +194,7 @@ void stat_rec::reset()
fprintf(fs, "%s %d  %d  %d  %d  %ld %ld %ld 
 %ld%d   %d\n", buffer, o.http_workers,
  bc, o.http_worker_Q.size(), o.log_Q->size(), cnx, cps, rqx, rqs, mfd, 
LC);
  } else {
@@ -23,15 +12,3 @@ Index: src/FatController.cpp
  bc, o.http_worker_Q.size(), o.log_Q->size(), cnx, cps, rqx, rqs, mfd, 
LC);
  }
  
-@@ -1696,7 +1700,11 @@ int fc_controlit()   //
- }
- timeout.tv_sec = 5;
- timeout.tv_nsec = (long) 0;
-+#if defined(__OpenBSD__)
-+rc = syscall(SYS___thrsigdivert, signal_set, NULL, &timeout);
-+#else
- rc = sigtimedwait(&signal_set, NULL, &timeout);
-+#endif
- if (rc < 0) {
- if (errno != EAGAIN) {
- syslog(LOG_INFO, "%sUnexpected error from sigtimedwait() %d 
%s", thread_id.c_str(), errno, strerror(errno));
diff --git pkg/PLIST pkg/PLIST
index 969d2736f05..97401f52af8 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -253,6 +253,7 @@ 
share/examples/e2guardian/lists/contentscanners/exceptionvirussitelist
 @sample ${SYSCONFDIR}/e2guardian/lists/contentscanners/exceptionvirussitelist
 share/examples/e2guardian/lists/contentscanners/exceptionvirusurllist
 @sample ${SYSCONFDIR}/e2guardian/lists/contentscanners/exceptionvirusurllist
+share/examples/e2guardian/lists/domainsnobypass
 share/examples/e2guardian/lists/embededreferersiteiplist
 @sample ${SYSCONFDIR}/e2guardian/lists/embededreferersiteiplist
 s

Re: UPDATE www/e2guardian-5.3.4

[Björn Ketelaars]

On Tue 11/02/2020 10:26, Jeremie Courreges-Anglas wrote:
> On Mon, Feb 10 2020, Björn Ketelaars  wrote:
> > Diff below brings e2guardian to 5.3.4, which is a bug fix release. From
> > changelog [0]:
> >   - Fix #565 segfault when no write permission on generated certs
> > directory 
> >   - Fix #493 referexception not working
> >   - Fix #549 - Url in CGI and bypass wrong in MITM 
> >   - Bug fix sigwait code for OpenBSD
> >
> > Changes to the port:
> >   - Upstream has fixed sigwait code, as such remove relevant bits from
> > patch-src_FatController_cpp
> 
> It's sad that upstream has to emulate sigtimedwait using sigwait and
> SIGALRM.  I hope the emulation is as correct as what our patch did.
> 
> > Testing:
> >   - Lightly run tested on amd64. Note that I only played a bit with this
> > port, nothing serious.
> >
> > Comments/OK?
> 
> The new files in PLIST should probably be @sampled.

Yes, you are right, the new lists should be @sampled. New diff:


diff --git Makefile Makefile
index 6ed036472e1..188a525976b 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 GH_ACCOUNT =   e2guardian
 GH_PROJECT =   e2guardian
-GH_TAGNAME =   5.3.3
+GH_TAGNAME =   v5.3.4
 
 COMMENT =  content scanning web filter
 CATEGORIES =   www net
diff --git distinfo distinfo
index b8064b9d2a3..bc0d2e23fad 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (e2guardian-5.3.3.tar.gz) = nYj30sM54BWG0mfyWjAYaC0RW4qq3Bi+2uke+rUchbQ=
-SIZE (e2guardian-5.3.3.tar.gz) = 2009254
+SHA256 (e2guardian-5.3.4.tar.gz) = CaEH/Xkb6S7csIN7j9ytYmkoFi0F4xrlP6j+Ott9VlI=
+SIZE (e2guardian-5.3.4.tar.gz) = 2083057
diff --git patches/patch-configs_e2guardian_conf_in 
patches/patch-configs_e2guardian_conf_in
index f5554370e95..21b191f1cc9 100644
--- patches/patch-configs_e2guardian_conf_in
+++ patches/patch-configs_e2guardian_conf_in
@@ -3,10 +3,10 @@ $OpenBSD: patch-configs_e2guardian_conf_in,v 1.1.1.1 
2019/09/18 16:34:03 sthen E
 Index: configs/e2guardian.conf.in
 --- configs/e2guardian.conf.in.orig
 +++ configs/e2guardian.conf.in
-@@ -568,7 +568,7 @@ logconnectionhandlingerrors = on
- # This figure is the maximum number of concurrent connections.
- # If more connections are made, connections will queue until a worker thread 
is free.
- # On large site you might want to try 5000 (max value 2)
+@@ -577,7 +577,7 @@ logconnectionhandlingerrors = on
+ # On 32-bit systems reduce this to 300 to avoid exceeding the <4GB
+ # virtual memory limit and on Linux decrease the thread stack size from
+ # 10MB to 2MB (ulimit -s 2048)
 -httpworkers = 500 
 +httpworkers = 50
  
diff --git patches/patch-configs_e2guardianf1_conf_in 
patches/patch-configs_e2guardianf1_conf_in
index 2d1623471ba..b68ad4f9c7c 100644
--- patches/patch-configs_e2guardianf1_conf_in
+++ patches/patch-configs_e2guardianf1_conf_in
@@ -3,7 +3,7 @@ $OpenBSD: patch-configs_e2guardianf1_conf_in,v 1.1.1.1 
2019/09/18 16:34:03 sthen
 Index: configs/e2guardianf1.conf.in
 --- configs/e2guardianf1.conf.in.orig
 +++ configs/e2guardianf1.conf.in
-@@ -303,7 +303,7 @@ bypasskey = ''
+@@ -308,7 +308,7 @@ bypasskey = ''
  #cgikey = 'you must change this text in order to be secure'
  
  #  Users will not be able to bypass sites/urls in these lists
diff --git patches/patch-src_FatController_cpp 
patches/patch-src_FatController_cpp
index cbbe878a4e5..8b44d503ef4 100644
--- patches/patch-src_FatController_cpp
+++ patches/patch-src_FatController_cpp
@@ -3,18 +3,7 @@ $OpenBSD: patch-src_FatController_cpp,v 1.1.1.1 2019/09/18 
16:34:03 sthen Exp $
 Index: src/FatController.cpp
 --- src/FatController.cpp.orig
 +++ src/FatController.cpp
-@@ -46,6 +46,10 @@
- #include 
- #endif //__SSLMITM
- 
-+#if defined(__OpenBSD__)
-+#include 
-+#endif
-+
- #include "FatController.hpp"
- #include "ConnectionHandler.hpp"
- #include "DynamicURLList.hpp"
-@@ -194,7 +198,7 @@ void stat_rec::reset()
+@@ -194,7 +194,7 @@ void stat_rec::reset()
fprintf(fs, "%s %d  %d  %d  %d  %ld %ld %ld 
 %ld%d   %d\n", buffer, o.http_workers,
  bc, o.http_worker_Q.size(), o.log_Q->size(), cnx, cps, rqx, rqs, mfd, 
LC);
  } else {
@@ -23,15 +12,3 @@ Index: src/FatController.cpp
  bc, o.http_worker_Q.size(), o.log_Q->size(), cnx, cps, rqx, rqs, mfd, 
LC);
  }
  
-@@ -1696,7 +1700,11 @@ int fc_controlit()   //
- }
- timeout.tv_sec = 5;
- timeout.tv_nsec = (long) 0;
-+#if defined(__OpenBSD__)
-+rc = syscall(SYS___thrsigdivert, signal_set, NULL, &timeout);
-+#else
- rc = sigtimedwait(&signal_set, NULL, &timeout);
-+#endif
- if (rc < 0) {
- if (errno != EAGAIN) {
- syslog(LOG_INFO, "%sUnexpected error from sigtimedwait() %d 
%s", thread_id.c_str(), errno, strerror(errno

Re: UPDATE www/jupyter-notebook-6.0.3

[Björn Ketelaars]

On Tue 11/02/2020 16:21, Kurt Mosiejczuk wrote:
> On Fri, Feb 07, 2020 at 09:36:30PM +0100, Björn Ketelaars wrote:
> > Diff below updates jupyter-notebook to 6.0.3. Changelog can be found at
> > https://jupyter-notebook.readthedocs.io/en/stable/changelog.html.
> > Noticeable change is that upstream dropped support for python 2.
> 
> > Changes to the port:
> > - Drop FLAVOR and set MODPY_VERSION
> > - Update dependencies
> > - Drop post-install bits as it is no longer necessary to add a suffix to
> >   jupyter-notebook and its tools
> > - Set @conflict- and @pkgpath-marker in PLIST
> 
> > Testing:
> > - 'make test' runs successfully
> > - Run tested on amd64 in an existing jupyter-notebook environment
> 
> > Comments/OK?
> 
> Patch looks good to me. Will folks notice the python2 version going
> away? I suppose they might since the files going into bin/ are losing
> their -3 suffix.
> 
> If we don't think that will cause any problems, ok kmos

Upgrading jupyter-notebook to this newer version is transparent, which
could cause two problems:
  - Users of the python2 flavor will be presented with a python3
environment, which could cause their workbooks to 'fail';
  - Users of the python3 flavor python will wonder why
'jupyter-notebook-3' isn't working any more, and will notice that
'jupyter-notebook' does work.

Although I no not think the latter is bad, we could help users by
informing them about this update. My proposal would be to add something
to current.html.

The first problem is kind of a bad one as some notebooks will need to be
converted to pyhton3 code. Users will have to invest time and effort to
update their code. Least thing I should do is inform them of this. Also
here I propose to inform users via current.html.

Is this update important enough to possibly break people's work?
Probably not. Reason for wanting to move forward is that it does not
make sense to maintain ports of tools that are not fully supported by
their upstream. In the case of jupyter-notebook support for python2 has
been dropped.
Not moving past this small hurdle will, sooner or later, cause an issue
somewhere (else). My proposal is to do it now.

Additional comments/OK's to commit this update? Opinions on the above?

UPDATE devel/py-sip-4.19.18

[Björn Ketelaars]

Enclosed is another attempt to update devel/py-sip, this time to
4.19.18. Previous attempt [0] broke at least py-qt5, and has been
reverted. Updating to a newer version than 4.19.19 is unfortunately not
an option as it breaks all kinds of stuff (py-qt5 for example fails to
build).

Reason for wanting to update py-sip is that git-cola currently segfaults
on exit. This update fixes it.

I tested this update together with an update of py-qt5 (send in a
separate mail):
- Build tested:
devel/tortoisehg
geo/qgis
x11/kde4/py-kde
x11/py-qt4
x11/py-qt5
- Run tested:
devel/git-cola
devel/tortoisehg
geo/qgis

As my track record for this port is poor I think it makes sense to wait
until I have at least 2 OK's, preferably from heavy hitters.

Comments/OK?

[0] https://marc.info/?l=openbsd-ports&m=158093766318588&w=2


diff --git Makefile Makefile
index c9a03b65cf4..eb8b35bca70 100644
--- Makefile
+++ Makefile
@@ -5,13 +5,13 @@ COMMENT=  automatically generate Python bindings for C 
and C++ libs
 # XXX  py-sip updates FREQUENTLY break other ports
 # XXX  BE ESPECIALLY CAREFUL WHEN TESTING UPDATES!
 
-MODPY_EGG_VERSION =4.19.17
+MODPY_EGG_VERSION =4.19.18
 EPOCH= 0
 DISTNAME=  sip-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 CATEGORIES=devel
 
-HOMEPAGE=  https://www.riverbankcomputing.co.uk/software/sip/intro
+HOMEPAGE=  https://www.riverbankcomputing.com/software/sip/intro
 
 # SIP license (Python like)
 PERMIT_PACKAGE=Yes
diff --git distinfo distinfo
index 0a2e060db81..d8c32130f79 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (sip-4.19.17.tar.gz) = ErzY9NX+78EFvAddEsUJDueD9zgHKFY8kbi5XQ7EXfM=
-SIZE (sip-4.19.17.tar.gz) = 1056156
+SHA256 (sip-4.19.18.tar.gz) = wL2GOADtmxXcrUd8QBfNtz+oBcJZCLAkBWSt101pfh4=
+SIZE (sip-4.19.18.tar.gz) = 1056840
diff --git patches/patch-configure_py patches/patch-configure_py
index 283d332e419..d3b91cc951d 100644
--- patches/patch-configure_py
+++ patches/patch-configure_py
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure_py,v 1.3 2020/02/07 22:10:23 bket Exp 
$
 Index: configure.py
 --- configure.py.orig
 +++ configure.py
-@@ -269,7 +269,7 @@ def create_config(module, template, macros):
+@@ -270,7 +270,7 @@ def create_config(module, template, macros):
  "sip_version":  sip_version,
  "sip_version_str":  sip_version_str,
  "platform": build_platform,

UPDATE x11/py-qt5-5.9.2

[Björn Ketelaars]

Enclosed diff brings py-qt5 to 5.9.2, which is a small step forward.
Moving past the 5.9 branch is an endeavour by itself, and will take a
bit of effort.

Tested on amd64 in combination with an update of py-sip (send in
separate mail):
- Build tested:
  devel/git-cola
  geo/qgis
  math/veusz
  textproc/calibre
  www/weboob
- Run tested:
  devel/git-cola
  devel/spyder/spyder
  geo/qgis
  math/veusz
  shells/py-qtconsole
  textproc/calibre
  www/weboob (weboob-config-qt)

Comments/OK?


diff --git Makefile Makefile
index 376011907ca..325785b9e82 100644
--- Makefile
+++ Makefile
@@ -2,14 +2,13 @@
 
 COMMENT=   python Qt5 bindings
 
-V= 5.9
+V= 5.9.2
 DISTNAME=  PyQt5_gpl-${V}
 PKGNAME=   py-qt5-${V}
-REVISION=  6
 
 CATEGORIES=x11 devel
 
-HOMEPAGE=  http://www.riverbankcomputing.co.uk/software/pyqt/intro
+HOMEPAGE=  https://www.riverbankcomputing.com/software/pyqt/intro
 MAINTAINER=KDE porting team 
 
 # GPLv3 with exceptions for use with certain named open-source licenses
diff --git distinfo distinfo
index 335109979cb..e9a91d11b98 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (PyQt5_gpl-5.9.tar.gz) = qw55mc8gLMcpYseK7+Rh0WSXs8GoKCq5Zq2QtssnEJY=
-SIZE (PyQt5_gpl-5.9.tar.gz) = 3097557
+SHA256 (PyQt5_gpl-5.9.2.tar.gz) = wZDaxZjJewETyl56N8ccYj8C0dcTCIrd+srErPpLg5Q=
+SIZE (PyQt5_gpl-5.9.2.tar.gz) = 3102848
diff --git patches/patch-configure_py patches/patch-configure_py
index 6f98c7b8802..b7896e1298b 100644
--- patches/patch-configure_py
+++ patches/patch-configure_py
@@ -1,7 +1,8 @@
 $OpenBSD: patch-configure_py,v 1.2 2016/08/30 16:02:17 landry Exp $
 configure.py.orig  Mon Jul 25 15:55:28 2016
-+++ configure.py   Tue Aug  9 07:49:53 2016
-@@ -1984,7 +1984,18 @@ def run_command(cmd, verbose):
+Index: configure.py
+--- configure.py.orig
 configure.py
+@@ -1991,7 +1991,18 @@ def run_command(cmd, verbose):
  """ Run a command and display the output if requested.  cmd is the command
  to run.  verbose is set if the output is to be displayed.
  """
@@ -20,7 +21,7 @@ $OpenBSD: patch-configure_py,v 1.2 2016/08/30 16:02:17 landry 
Exp $
  if verbose:
  sys.stdout.write(cmd + "\n")
  
-@@ -2689,7 +2700,7 @@ Type 'no' to decline the terms of the license.
+@@ -2733,7 +2744,7 @@ Type 'no' to decline the terms of the license.
  sys.stdout.flush()
  
  try:
diff --git pkg/PLIST pkg/PLIST
index da52f2ccbd4..d12521fc0f5 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -167,6 +167,10 @@ 
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/QAxContainermod.sip
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxbase.sip
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxobject.sip
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxwidget.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/QtAndroidExtrasmod.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/qandroidjniobject.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/qtandroid.sip
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/QtBluetoothmod.sip
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/qbluetooth.sip

UPDATE www/bluefish-2.2.11

[Björn Ketelaars]

Diff below brings bluefish to 2.2.11, which is a minor maintenance
release and minor feature release. Although this release supports
python3 the enclosed plugins only work on python2. As such, do not
switch to python3...for now.

Changes to the port:
- Follow Makefile.template
- Sync WANTLIB and PLIST
- Add textproc/libxml as LDEP
- Bytecompile python plugins in post-install phase

Run tested on amd64. Everything, including the plugins, seem to work.

Comments/OK?


diff --git www/bluefish/Makefile www/bluefish/Makefile
index 2d6e9ab0570..72c0dec94ac 100644
--- www/bluefish/Makefile
+++ www/bluefish/Makefile
@@ -2,27 +2,27 @@
 
 COMMENT=   HTML editor for experienced web designers
 
-DISTNAME = bluefish-2.2.10
+DISTNAME=  bluefish-2.2.11
+
 CATEGORIES=www editors
-HOMEPAGE=  http://bluefish.openoffice.nl/
-REVISION = 6
 
-MASTER_SITES=  http://www.bennewitz.com/bluefish/stable/source/
+HOMEPAGE=  http://bluefish.openoffice.nl/
 
 # GPLv3
 PERMIT_PACKAGE=Yes
 
-WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
-WANTLIB += c cairo cairo-gobject dbus-1 enchant epoxy expat ffi
-WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
+WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} X11 Xcomposite Xcursor
+WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
+WANTLIB += atk-bridge-2.0 c cairo cairo-gobject enchant epoxy expat ffi
+WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
 WANTLIB += gucharmap_2_90 harfbuzz iconv intl lzma m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
-WANTLIB += ${MODPY_WANTLIB} ${COMPILER_LIBCXX} util xcb xcb-render
-WANTLIB += xcb-shm xml2 z fribidi
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png util xcb
+WANTLIB += xcb-render xcb-shm xml2 z
 
-COMPILER = base-clang ports-gcc base-gcc
+MASTER_SITES=  https://www.bennewitz.com/bluefish/stable/source/
+
+COMPILER=  base-clang ports-gcc base-gcc
 
 MODULES=   lang/python \
textproc/intltool
@@ -30,14 +30,13 @@ MODULES=lang/python \
 RUN_DEPENDS=   devel/desktop-file-utils \
misc/shared-mime-info \
x11/gtk+3,-guic
-
 LIB_DEPENDS=   textproc/enchant \
+   textproc/libxml \
x11/gnome/gucharmap
 
 CONFIGURE_STYLE=   gnu
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-
 CONFIGURE_ARGS=
--with-freedesktop_org-menu='${PREFIX}/share/applications/' \
--disable-update-databases
 
@@ -45,5 +44,6 @@ USE_GMAKE=Yes
 
 post-install:
rm ${PREFIX}/lib/bluefish/*.{a,la}
+   ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${PREFIX}/share/bluefish
 
 .include 
diff --git www/bluefish/distinfo www/bluefish/distinfo
index 6f1f81f2b63..7fcabbcfa41 100644
--- www/bluefish/distinfo
+++ www/bluefish/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bluefish-2.2.10.tar.gz) = BAdG2L/ZNz4nHQepaZ1kigLHcJXW7l8xPecuerSChMs=
-SIZE (bluefish-2.2.10.tar.gz) = 5522381
+SHA256 (bluefish-2.2.11.tar.gz) = XUwmNliA3r54csITmnVe5ORa10x6yhfJVUIygtFx8yg=
+SIZE (bluefish-2.2.11.tar.gz) = 5556158
diff --git www/bluefish/pkg/PLIST www/bluefish/pkg/PLIST
index 9c38dcd2382..9a0d4b538f5 100644
--- www/bluefish/pkg/PLIST
+++ www/bluefish/pkg/PLIST
@@ -1,13 +1,13 @@
 @comment $OpenBSD: PLIST,v 1.30 2018/07/01 18:33:38 espie Exp $
 @bin bin/bluefish
 lib/bluefish/
-lib/bluefish/about.so
-lib/bluefish/charmap.so
-lib/bluefish/entities.so
-lib/bluefish/htmlbar.so
-lib/bluefish/infbrowser.so
-lib/bluefish/snippets.so
-lib/bluefish/zencoding.so
+@so lib/bluefish/about.so
+@so lib/bluefish/charmap.so
+@so lib/bluefish/entities.so
+@so lib/bluefish/htmlbar.so
+@so lib/bluefish/infbrowser.so
+@so lib/bluefish/snippets.so
+@so lib/bluefish/zencoding.so
 @man man/man1/bluefish.1
 share/appdata/
 share/appdata/bluefish.appdata.xml
@@ -94,22 +94,33 @@ share/bluefish/colorprofiles/Dark_theme
 share/bluefish/colorprofiles/Light_theme
 share/bluefish/css_decompressor
 share/bluefish/cssmin.py
+share/bluefish/cssmin.pyc
 share/bluefish/default_accelmap
 share/bluefish/encodings
 share/bluefish/jsbeautifier/
 share/bluefish/jsbeautifier/__init__.py
+share/bluefish/jsbeautifier/__init__.pyc
 share/bluefish/jsbeautifier/__version__.py
+share/bluefish/jsbeautifier/__version__.pyc
 share/bluefish/jsbeautifier/unpackers/
 share/bluefish/jsbeautifier/unpackers/__init__.py
+share/bluefish/jsbeautifier/unpackers/__init__.pyc
 share/bluefish/jsbeautifier/unpackers/evalbased.py
+share/bluefish/jsbeautifier/unpackers/evalbased

Re: UPDATE www/bluefish-2.2.11

[Björn Ketelaars]

On Sun 16/02/2020 11:23, Antoine Jacoutot wrote:
> On Sun, Feb 16, 2020 at 12:36:29AM +0100, Björn Ketelaars wrote:
> > Diff below brings bluefish to 2.2.11, which is a minor maintenance
> > release and minor feature release. Although this release supports
> > python3 the enclosed plugins only work on python2. As such, do not
> > switch to python3...for now.
> > 
> > Changes to the port:
> > - Follow Makefile.template
> > - Sync WANTLIB and PLIST
> > - Add textproc/libxml as LDEP
> > - Bytecompile python plugins in post-install phase
> > 
> > Run tested on amd64. Everything, including the plugins, seem to work.
> > 
> > Comments/OK?
> > 
> > 
> > diff --git www/bluefish/Makefile www/bluefish/Makefile
> > index 2d6e9ab0570..72c0dec94ac 100644
> > --- www/bluefish/Makefile
> > +++ www/bluefish/Makefile
> > @@ -2,27 +2,27 @@
> >  
> >  COMMENT=   HTML editor for experienced web designers
> >  
> > -DISTNAME = bluefish-2.2.10
> > +DISTNAME=  bluefish-2.2.11
> > +
> >  CATEGORIES=www editors
> > -HOMEPAGE=  http://bluefish.openoffice.nl/
> > -REVISION = 6
> >  
> > -MASTER_SITES=  http://www.bennewitz.com/bluefish/stable/source/
> > +HOMEPAGE=  http://bluefish.openoffice.nl/
> >  
> >  # GPLv3
> >  PERMIT_PACKAGE=Yes
> >  
> > -WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
> > -WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
> > -WANTLIB += c cairo cairo-gobject dbus-1 enchant epoxy expat ffi
> > -WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> > -WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
> > +WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} X11 Xcomposite Xcursor
> > +WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
> > +WANTLIB += atk-bridge-2.0 c cairo cairo-gobject enchant epoxy expat ffi
> > +WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
> > +WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
> >  WANTLIB += gucharmap_2_90 harfbuzz iconv intl lzma m pango-1.0
> > -WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
> > -WANTLIB += ${MODPY_WANTLIB} ${COMPILER_LIBCXX} util xcb xcb-render
> > -WANTLIB += xcb-shm xml2 z fribidi
> > +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png util xcb
> > +WANTLIB += xcb-render xcb-shm xml2 z
> >  
> > -COMPILER = base-clang ports-gcc base-gcc
> > +MASTER_SITES=  
> > https://www.bennewitz.com/bluefish/stable/source/
> > +
> > +COMPILER=  base-clang ports-gcc base-gcc
> >  
> >  MODULES=   lang/python \
> > textproc/intltool
> > @@ -30,14 +30,13 @@ MODULES=lang/python \
> >  RUN_DEPENDS=   devel/desktop-file-utils \
> > misc/shared-mime-info \
> > x11/gtk+3,-guic
> > -
> >  LIB_DEPENDS=   textproc/enchant \
> > +   textproc/libxml \
> > x11/gnome/gucharmap
> 
> Why this change in LIB_DEPENDS?

>From ${WRKSRC}/INSTALL:

1) Compilation needs the following software packages - usually the headers and
   libraries (search for packages with a -dev or -devel suffix and/or prefix
   lib, e.g. libgtk2.0-dev)

 - Gtk 2 (2.20 or newer) or 3 (3.2.2) or newer
 - libxml2
 - libenchant (optional for spell checking)
 - libgucharmap (optional for character map plugin. Version 2.x is 
recommended)
 - python-dev (optional)

Re: UPDATE www/bluefish-2.2.11

[Björn Ketelaars]

On Sun 16/02/2020 15:18, Antoine Jacoutot wrote:
> On Sun, Feb 16, 2020 at 02:19:22PM +0100, Björn Ketelaars wrote:
> > On Sun 16/02/2020 11:23, Antoine Jacoutot wrote:
> > > On Sun, Feb 16, 2020 at 12:36:29AM +0100, Björn Ketelaars wrote:
> > > > Diff below brings bluefish to 2.2.11, which is a minor maintenance
> > > > release and minor feature release. Although this release supports
> > > > python3 the enclosed plugins only work on python2. As such, do not
> > > > switch to python3...for now.
> > > > 
> > > > Changes to the port:
> > > > - Follow Makefile.template
> > > > - Sync WANTLIB and PLIST
> > > > - Add textproc/libxml as LDEP
> > > > - Bytecompile python plugins in post-install phase
> > > > 
> > > > Run tested on amd64. Everything, including the plugins, seem to work.
> > > > 
> > > > Comments/OK?
> > > > 
> > > > 
> > > > diff --git www/bluefish/Makefile www/bluefish/Makefile
> > > > index 2d6e9ab0570..72c0dec94ac 100644
> > > > --- www/bluefish/Makefile
> > > > +++ www/bluefish/Makefile
> > > > @@ -2,27 +2,27 @@
> > > >  
> > > >  COMMENT=   HTML editor for experienced web designers
> > > >  
> > > > -DISTNAME = bluefish-2.2.10
> > > > +DISTNAME=  bluefish-2.2.11
> > > > +
> > > >  CATEGORIES=www editors
> > > > -HOMEPAGE=  http://bluefish.openoffice.nl/
> > > > -REVISION = 6
> > > >  
> > > > -MASTER_SITES=  http://www.bennewitz.com/bluefish/stable/source/
> > > > +HOMEPAGE=  http://bluefish.openoffice.nl/
> > > >  
> > > >  # GPLv3
> > > >  PERMIT_PACKAGE=Yes
> > > >  
> > > > -WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
> > > > -WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
> > > > -WANTLIB += c cairo cairo-gobject dbus-1 enchant epoxy expat ffi
> > > > -WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> > > > -WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
> > > > +WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} X11 Xcomposite Xcursor
> > > > +WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
> > > > +WANTLIB += atk-bridge-2.0 c cairo cairo-gobject enchant epoxy expat ffi
> > > > +WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
> > > > +WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
> > > >  WANTLIB += gucharmap_2_90 harfbuzz iconv intl lzma m pango-1.0
> > > > -WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
> > > > -WANTLIB += ${MODPY_WANTLIB} ${COMPILER_LIBCXX} util xcb xcb-render
> > > > -WANTLIB += xcb-shm xml2 z fribidi
> > > > +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png util xcb
> > > > +WANTLIB += xcb-render xcb-shm xml2 z
> > > >  
> > > > -COMPILER = base-clang ports-gcc base-gcc
> > > > +MASTER_SITES=  
> > > > https://www.bennewitz.com/bluefish/stable/source/
> > > > +
> > > > +COMPILER=  base-clang ports-gcc base-gcc
> > > >  
> > > >  MODULES=   lang/python \
> > > > textproc/intltool
> > > > @@ -30,14 +30,13 @@ MODULES=lang/python \
> > > >  RUN_DEPENDS=   devel/desktop-file-utils \
> > > > misc/shared-mime-info \
> > > > x11/gtk+3,-guic
> > > > -
> > > >  LIB_DEPENDS=   textproc/enchant \
> > > > +   textproc/libxml \
> > > > x11/gnome/gucharmap
> > > 
> > > Why this change in LIB_DEPENDS?
> > 
> > From ${WRKSRC}/INSTALL:
> > 
> > 1) Compilation needs the following software packages - usually the headers 
> > and
> >libraries (search for packages with a -dev or -devel suffix and/or prefix
> >lib, e.g. libgtk2.0-dev)
> > 
> >  - Gtk 2 (2.20 or newer) or 3 (3.2.2) or newer
> >  - libxml2
> >  - libenchant (optional for spell checking)
> >  - libgucharmap (optional for character map plugin. Version 2.x is 
> > recommended)
> >  - python-dev (optional)
> 
&

NEW devel/p5-Conf-Libconfig

[Björn Ketelaars]

Attached is a new port, devel/p5-Conf-Libconfig. p5-Conf-Libconfig is a
Perl extension for libconfig. This port is needed as test dep for
net/sslh.

pkg/DESCR:
Perl bindings to the C library libconfig.

'make test' runs successfully. Run tested on amd64 as test dep for
net/sslh.

Comments/OK?


p5-Conf-Libconfig.tgz
Description: application/tar-gz

Re: [UPDATE] net/ipcheck (207 -> 222)

[Björn Ketelaars]

On Mon 17/02/2020 20:36, Alex Naumov wrote:
> REVISION should be removed as version has been bumped.
> Thank you, Björn.
> 
> 
> 
> On Sun, Feb 16, 2020 at 11:55 PM Alex Naumov 
> wrote:
> 
> > Hi,
> >
> > this is the diff to update ipcheck to the latest release (207 -> 222).

I had another look at ipcheck:

http://ipcheck.sourceforge.net/releases/old.html lists two versions that
are newer than 222, and https://sourceforge.net/projects/ipcheck/files/
hosts an even newer version: 251. The latter btw has been released in
2013.
The homepage of ipcheck was last updated in 2011.

Is there a reason that you want to update this port to 222? Do you know
if there is a changelog of some sort? Is this tool still
useful/relevant?

Re: UPDATE www/jupyter-notebook-6.0.3

[Björn Ketelaars]

On Wed 12/02/2020 08:01, Björn Ketelaars wrote:
> On Tue 11/02/2020 16:21, Kurt Mosiejczuk wrote:
> > On Fri, Feb 07, 2020 at 09:36:30PM +0100, Björn Ketelaars wrote:
> > > Diff below updates jupyter-notebook to 6.0.3. Changelog can be found at
> > > https://jupyter-notebook.readthedocs.io/en/stable/changelog.html.
> > > Noticeable change is that upstream dropped support for python 2.
> > 
> > > Changes to the port:
> > > - Drop FLAVOR and set MODPY_VERSION
> > > - Update dependencies
> > > - Drop post-install bits as it is no longer necessary to add a suffix to
> > >   jupyter-notebook and its tools
> > > - Set @conflict- and @pkgpath-marker in PLIST
> > 
> > > Testing:
> > > - 'make test' runs successfully
> > > - Run tested on amd64 in an existing jupyter-notebook environment
> > 
> > > Comments/OK?
> > 
> > Patch looks good to me. Will folks notice the python2 version going
> > away? I suppose they might since the files going into bin/ are losing
> > their -3 suffix.
> > 
> > If we don't think that will cause any problems, ok kmos
> 
> Upgrading jupyter-notebook to this newer version is transparent, which
> could cause two problems:
>   - Users of the python2 flavor will be presented with a python3
> environment, which could cause their workbooks to 'fail';
>   - Users of the python3 flavor python will wonder why
> 'jupyter-notebook-3' isn't working any more, and will notice that
> 'jupyter-notebook' does work.
> 
> Although I no not think the latter is bad, we could help users by
> informing them about this update. My proposal would be to add something
> to current.html.
> 
> The first problem is kind of a bad one as some notebooks will need to be
> converted to pyhton3 code. Users will have to invest time and effort to
> update their code. Least thing I should do is inform them of this. Also
> here I propose to inform users via current.html.
> 
> Is this update important enough to possibly break people's work?
> Probably not. Reason for wanting to move forward is that it does not
> make sense to maintain ports of tools that are not fully supported by
> their upstream. In the case of jupyter-notebook support for python2 has
> been dropped.
> Not moving past this small hurdle will, sooner or later, cause an issue
> somewhere (else). My proposal is to do it now.
> 
> Additional comments/OK's to commit this update? Opinions on the above?

I will commit the update of jupyter-notebook tomorrow...unless someone
objects.

To inform users about the changes I will add the snippet below to
current.html:

2020/02/19 - [packages] www/jupyter-notebook updated to 6.0.3
Jupyter-notebook has been updated to 6.0.3, which removes support for
Python 2.x. Existing notebooks should be checked if they work with
Python 3. Please note that tools supplied by this port have been
renamed, e.g. jupyter-notebook-3 has been renamed to jupyter-notebook.

UPDATE x11/tilda-1.5.0

[Björn Ketelaars]

Diff below updates x11/tilda to 1.5.0. Changelog:
https://github.com/lanoxx/tilda/blob/tilda-1.5.0/ChangeLog.

Run tested on amd64.

OK?


diff --git Makefile Makefile
index 37205ca00a4..dd98eed2fce 100644
--- Makefile
+++ Makefile
@@ -4,10 +4,8 @@ COMMENT=   drop-down terminal emulator
 
 GH_ACCOUNT=lanoxx
 GH_PROJECT=tilda
-GH_TAGNAME=tilda-1.3.3
-DISTNAME=  tilda-1.3.3
-
-REVISION=  2
+GH_TAGNAME=tilda-1.5.0
+DISTNAME=  tilda-1.5.0
 
 CATEGORIES=x11
 
diff --git distinfo distinfo
index 889a65edb16..56f62bf3fcf 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (tilda-1.3.3.tar.gz) = cbqlVyxJjls+lPW1foEYwe8P2uommlskJSCOGt7ChLE=
-SIZE (tilda-1.3.3.tar.gz) = 671222
+SHA256 (tilda-1.5.0.tar.gz) = 9mTBfayiopAPSd6etldGztA8hnsCFEFJ7yEmDLzWEDk=
+SIZE (tilda-1.5.0.tar.gz) = 484754
diff --git patches/patch-src-tilda_c patches/patch-src-tilda_c
index f386301cad3..482fb772401 100644
--- patches/patch-src-tilda_c
+++ patches/patch-src-tilda_c
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src-tilda_c,v 1.3 2016/11/06 06:54:54 jca Exp $
 src/tilda.c.orig   Mon Apr 18 14:09:55 2016
-+++ src/tilda.cSun Nov  6 07:43:00 2016
-@@ -12,8 +12,6 @@
+Index: src/tilda.c
+--- src/tilda.c.orig
 src/tilda.c
+@@ -13,8 +13,6 @@
   * You should have received a copy of the GNU Library General Public
   * License along with this library. If not, see 
.
   */
@@ -10,7 +11,7 @@ $OpenBSD: patch-src-tilda_c,v 1.3 2016/11/06 06:54:54 jca Exp 
$
  
  /*
   * This message is shown in a modal dialog when tilda starts and there is a 
problem parsing the configuration file.
-@@ -230,7 +228,7 @@ nomatch:
+@@ -232,7 +230,7 @@ nomatch:
  static GSList *getPids() {
  GSList *pids = NULL;
  FILE *ps_output;
diff --git pkg/PLIST pkg/PLIST
index 6634a4414b8..def38674c15 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,7 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.7 2018/06/27 21:04:23 espie Exp $
 @bin bin/tilda
-share/appdata/
-share/appdata/tilda.appdata.xml
 share/applications/tilda.desktop
 share/doc/tilda/
 share/doc/tilda/README.md
@@ -16,6 +14,7 @@ share/locale/fr/LC_MESSAGES/tilda.mo
 share/locale/hu/LC_MESSAGES/tilda.mo
 share/locale/it/LC_MESSAGES/tilda.mo
 share/locale/lt/LC_MESSAGES/tilda.mo
+share/locale/nb/LC_MESSAGES/tilda.mo
 share/locale/pl/LC_MESSAGES/tilda.mo
 share/locale/pt/LC_MESSAGES/tilda.mo
 share/locale/pt_BR/LC_MESSAGES/tilda.mo
@@ -25,6 +24,9 @@ share/locale/sl/LC_MESSAGES/tilda.mo
 share/locale/sv/LC_MESSAGES/tilda.mo
 share/locale/tr/LC_MESSAGES/tilda.mo
 share/locale/zh_CN/LC_MESSAGES/tilda.mo
+share/locale/zh_TW/LC_MESSAGES/tilda.mo
+share/metainfo/
+share/metainfo/tilda.appdata.xml
 share/pixmaps/
 share/pixmaps/tilda.png
 @tag update-desktop-database

UPDATE games/freeciv-2.6.2

[Björn Ketelaars]

Enclosed diff updates freeciv to 2.6.2, which mainly fixes bugs in the
client. More information can be found at
https://freeciv.fandom.com/wiki/NEWS-2.6.2.

Run tested on amd64.

OK?


diff --git Makefile Makefile
index e4a1cf3c37a..a58453b1108 100644
--- Makefile
+++ Makefile
@@ -4,7 +4,7 @@ COMMENT-main=   Civilization clone for X11; multiplayer; game 
server
 COMMENT-client=Freeciv client
 COMMENT-share= shared data files for Freeciv
 
-VERSION=   2.6.1
+VERSION=   2.6.2
 DISTNAME=  freeciv-${VERSION}
 PKGNAME-main=  freeciv-server-${VERSION}
 PKGNAME-client=freeciv-client-${VERSION}
diff --git distinfo distinfo
index d0d6b4c0e07..848a5abe056 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (freeciv-2.6.1.tar.bz2) = zOaEHaAZQTiq0mnMc1VX20OKRJCddf0D1NtnUHmGueI=
-SIZE (freeciv-2.6.1.tar.bz2) = 51915573
+SHA256 (freeciv-2.6.2.tar.bz2) = YYHvPTx2JkODqrvg6vFVDYplykJjnmwXzCk4Fl4XbI8=
+SIZE (freeciv-2.6.2.tar.bz2) = 52139007
diff --git pkg/PLIST-main pkg/PLIST-main
index 8a96f345e6a..f1087483ca5 100644
--- pkg/PLIST-main
+++ pkg/PLIST-main
@@ -36,6 +36,7 @@ share/doc/freeciv/README.effects
 share/doc/freeciv/README.fcdb
 share/doc/freeciv/README.governor
 share/doc/freeciv/README.graphics
+share/doc/freeciv/README.modpack_installer
 share/doc/freeciv/README.msys2
 share/doc/freeciv/README.nations
 share/doc/freeciv/README.packaging

Re: py3-only ports

[Björn Ketelaars]

On Thu 20/02/2020 13:55, Stuart Henderson wrote:
> Quite a few python modules are now py3-only, and more are switching
> over to that. The current ports setup where we use MODPY_VERSION=
> ${MODPY_DEFAULT_VERSION_3} and no FLAVOR isn't really very good,
> especially where dependencies are concerned with the error-prone
> combination of "py2+3 ports using ${MODPY_FLAVOR}" and "py3-only
> ports with just the port path/name".
> 
> Before more are moved across I'd like to settle on a proper method.
> I've been discussing this with jasper@ (with some previous knowledge
> from adding a similar multi-version to pecl-* ports) and propose moving
> to a setup with:
> 
> FLAVOR=   python3
> FLAVORS=  python3
> 
> (and keep the ,python3 flavour in ../Makefile i.e. "SUBDIR += 
> py-Foo,python3").
> This also makes it easier to handle updates as we don't need to mess about
> with @pkgpath markers.

Sounds like a plan...

What about lines in Makefile like the one below. Does it make sense to
keep them around? There is no need to add a suffix to scripts in the
case of py3-only.

  mv ${PREFIX}/bin/$i{,${MODPY_BIN_SUFFIX}}

> Obviously there are currently a number of py3-only ports which should end
> up using the same flavour scheme (and dependency lines to fix), if there are
> not objections I can either review diffs or take care of those myself.

I'm not sure what is needed for ports that already made the jump from
py2/py3 to py3-only (e.g. www/jupyter-notebook). More specific: these
ports already do some funky PLIST and quirks stuff. Do these ports need
special attention?

Re: sysutils/py-prometheus_client py3 only

[Björn Ketelaars]

On Tue 25/02/2020 18:17, Paco Esteban wrote:
> Hi ports@,
> 
> www/jupyter-notebook is now py3 only.  That's the only consumer for
> sysutils/py-prometheus_client so here's a diff to make it py3 only too.
> 
> Comments and/or ok appreciated.

OK bket@

Re: NEW: news/nzbget

[Björn Ketelaars]

On Sun 25/01/2015 19:51, Björn Ketelaars wrote:
> On Mon 12/01/2015 22:19, Björn Ketelaars wrote:
> > Please find enclosed a port for news/nzbget (http://nzbget.net/).
> > 
> > NZBGet is a binary newsgrabber, which downloads files from usenet based on
> > information given in nzb-files.
> > 
> > Comments?
> 
> Ping
> 
> Nobody interested in NZBGet?
> 

NZBGet recently was update to 15.0. Enclosed a new port...

Comments?

-- 
Björn Ketelaars
GPG key: 0x4F0E5F21


nzbget.tgz
Description: application/tar-gz

Re: NEW: security/lastpass-cli

[Björn Ketelaars]

On Tue 17/03/2015 07:11, Björn Ketelaars wrote:
> Please find enclosed a port for security/lastpass-cli [0]. lastpass-cli is an
> open-source command-line interface to the popular LastPass password management
> service.
> 
> Comments/OK?
> 

lastpass-cli recently was updated to 0.5.1. Enclosed a new port...

Comments?


-- 
Björn Ketelaars
GPG key: 0x4F0E5F21


lastpass-cli.tgz
Description: application/tar-gz

Re: NEW: security/lastpass-cli

[Björn Ketelaars]

On Thu 27/08/2015 12:35, Stuart Henderson wrote:
> On 2015/03/17 07:11, Björn Ketelaars wrote:
> > Please find enclosed a port for security/lastpass-cli [0]. lastpass-cli is 
> > an
> > open-source command-line interface to the popular LastPass password 
> > management
> > service.
> > 
> > Comments/OK?
> > 
> > [0] https://github.com/lastpass/lastpass-cli
> > 
> > -- 
> > Björn Ketelaars
> > GPG key: 0x4F0E5F21
> 
> [replying to old mail]
> 
> 0.5.0 doesn't work for me, updating this to 0.6.0 does though. Ports-wise,
> it overrides CFLAGS with -O3 -march=native -fomit-frame-pointer which
> isn't suitable for ports builds. Also needs a WANTLIB regen (+pthread).
> 

Thank you for your feedback! Included an update to 0.6.0..

OK?


lastpass-cli.tgz
Description: application/tar-gz

Re: NEW: security/lastpass-cli

[Björn Ketelaars]

On Thu 27/08/2015 17:51, Stuart Henderson wrote:
> On 2015/08/27 17:26, Björn Ketelaars wrote:
> > On Thu 27/08/2015 12:35, Stuart Henderson wrote:
> > > On 2015/03/17 07:11, Björn Ketelaars wrote:
> > > > Please find enclosed a port for security/lastpass-cli [0]. lastpass-cli 
> > > > is an
> > > > open-source command-line interface to the popular LastPass password 
> > > > management
> > > > service.
> > > > 
> > > > Comments/OK?
> > > > 
> > > > [0] https://github.com/lastpass/lastpass-cli
> > > > 
> > > > -- 
> > > > Björn Ketelaars
> > > > GPG key: 0x4F0E5F21
> > > 
> > > [replying to old mail]
> > > 
> > > 0.5.0 doesn't work for me, updating this to 0.6.0 does though. Ports-wise,
> > > it overrides CFLAGS with -O3 -march=native -fomit-frame-pointer which
> > > isn't suitable for ports builds. Also needs a WANTLIB regen (+pthread).
> > > 
> > 
> > Thank you for your feedback! Included an update to 0.6.0..
> > 
> > OK?
> 
> Hmm, that still doesn't pass in CFLAGS from the environment (which
> is wanted so you can do things like 'make package DEBUG=-g'). The easiest
> way is probably to use ALL_TARGET to set the desired make targets, which
> passes in CFLAGS etc automatically. Then that part of the patch is
> also not needed. How does this look to you? Bonus 64-bit time_t patch
> in there too.
> 
> OK with you Björn?  Any OKs to import?
> 

OK for your changes...

python3 flavor for net/py-msgpack

[Björn Ketelaars]

Please find enclosed a diff for adding a python flavor3 to py-msgpack. I'm using
this flavor as dependency for some tools I'm using.

Maybe someone else thinks it is useful as well.

-- 
Björn Ketelaars
GPG key: 0x4F0E5F21


diff --git net/py-msgpack/Makefile net/py-msgpack/Makefile
index b1b4793..757181d 100644
--- net/py-msgpack/Makefile
+++ net/py-msgpack/Makefile
@@ -5,7 +5,7 @@ COMMENT =   messagepack (de)serializer
 MODPY_EGG_VERSION =0.4.6
 DISTNAME = msgpack-python-${MODPY_EGG_VERSION}
 PKGNAME =  py-msgpack-${MODPY_EGG_VERSION}
-REVISION = 0
+REVISION = 1
 
 CATEGORIES =   net textproc
 
@@ -24,6 +24,9 @@ TEST_DEPENDS =devel/py-test \
devel/py-nose \
devel/py-six
 
+FLAVORS=   python3
+FLAVOR?=
+
 do-test:
@cd ${WRKSRC} && nosetests test
 
diff --git net/py-msgpack/pkg/PLIST net/py-msgpack/pkg/PLIST
index 2df0585..62fc75c 100644
--- net/py-msgpack/pkg/PLIST
+++ net/py-msgpack/pkg/PLIST
@@ -1,15 +1,16 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2013/08/06 19:54:20 landry Exp $
 lib/python${MODPY_VERSION}/site-packages/msgpack/
 lib/python${MODPY_VERSION}/site-packages/msgpack/__init__.py
-lib/python${MODPY_VERSION}/site-packages/msgpack/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/msgpack/${MODPY_PYCACHE}fallback.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/msgpack/_packer.so
 lib/python${MODPY_VERSION}/site-packages/msgpack/_unpacker.so
 lib/python${MODPY_VERSION}/site-packages/msgpack/_version.py
-lib/python${MODPY_VERSION}/site-packages/msgpack/_version.pyc
 lib/python${MODPY_VERSION}/site-packages/msgpack/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/msgpack/exceptions.pyc
 lib/python${MODPY_VERSION}/site-packages/msgpack/fallback.py
-lib/python${MODPY_VERSION}/site-packages/msgpack/fallback.pyc
 
lib/python${MODPY_VERSION}/site-packages/msgpack_python-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/msgpack_python-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 
lib/python${MODPY_VERSION}/site-packages/msgpack_python-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt

Re: NEW: news/nzbget

[Björn Ketelaars]

On Sun 24/05/2015 15:57, Björn Ketelaars wrote:
> > > Please find enclosed a port for news/nzbget (http://nzbget.net/).
> > > 
> > > NZBGet is a binary newsgrabber, which downloads files from usenet based on
> > > information given in nzb-files.
> > Ping
> > 
> > Nobody interested in NZBGet?
> > 
> 
> NZBGet recently was update to 15.0. Enclosed a new port...
> 
> Comments?

NZBGet was updated to 16.3. Enclosed a new port.

Comments?

-- 
Björn Ketelaars
GPG key: 0x4F0E5F21


nzbget.tgz
Description: application/tar-gz

Re: UPDATE x11/py-qtawesome-0.6.0

[Björn Ketelaars]

On Sun 10/11/2019 21:55, Kurt Mosiejczuk wrote:
> On Sun, Nov 10, 2019 at 08:38:12PM +0200, Kurt Mosiejczuk wrote:
> > On Sun, Nov 10, 2019 at 03:17:21PM +0100, Bj??rn Ketelaars wrote:
> > > Below a simple update to the latest version of py-qtawesome. Changelog
> > > can be found at
> > > https://github.com/spyder-ide/qtawesome/blob/v0.6.0/CHANGELOG.md.
> 
> > > This update is needed for an update of its only consumer: spyder.
> 
> > > Run tested in combination with the above.
> 
> > > Comments/OK?
> 
> > I'd prefer this. It adds the glue to enable the tests. Only one of two
> > pass, but it's still better than NO_TEST.
> 
> Now with actual diff!

'make test' works for me for both flavors. Thanks!

Additional comments/OK?

Re: UPDATE: databases/influxd

[Björn Ketelaars]

On Mon 11/11/2019 06:29, Rafael Sadowski wrote:
> On Mon Oct 21, 2019 at 07:40:29AM +0200, Rafael Sadowski wrote:
> > Simple update to the latest stable version in the 1.6 branch.
> > 
> > I've had some problems with 161 and after updating to 1.6.4 and later to
> > 1.6.6 there are gone.  However, this version works fine for me with
> > collected and grafana.
> > 
> > BTW, the "hackish" target to bundle/vendor dependencies is really handy.
> > 
> > OK?


Lightly tested, no issues found.

OK bket@

Re: UPDATE www/hiawatha-10.10

[Björn Ketelaars]

On Sat 09/11/2019 15:25, Björn Ketelaars wrote:
> Diff below brings www/hiawatha to version 10.10, which fixes a bug
> (AlterMode not working correctly) and brings some small improvements.
> Changelog can be found at https://www.hiawatha-webserver.org/changelog.
> 
> Installation of a Let's Encrypt script has been patched out as it relies
> on PHP. This shouldn't be an issue as there are numerous alternatives.
> 
> Run tested on amd64.
> 
> Comments/OK?

Ping. Diff reattached for convenience.


diff --git Makefile Makefile
index a5e458ebc14..6ac98aa404a 100644
--- Makefile
+++ Makefile
@@ -1,8 +1,7 @@
 # $OpenBSD: Makefile,v 1.61 2019/07/12 20:50:46 sthen Exp $
 
 COMMENT =  secure webserver
-DISTNAME = hiawatha-10.8.4
-REVISION = 0
+DISTNAME = hiawatha-10.10
 CATEGORIES =   www net
 
 HOMEPAGE = https://www.hiawatha-webserver.org/
diff --git distinfo distinfo
index 854e6912524..18aa79211ce 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (hiawatha-10.8.4.tar.gz) = fLMi6Qca0+6QkWfGJMb4Cw0qZjCp0jLVJAYonYNlixQ=
-SIZE (hiawatha-10.8.4.tar.gz) = 1095071
+SHA256 (hiawatha-10.10.tar.gz) = teRvV1f6ZH530h0k9+6pEtWfJqdVWMungLRcHDozpNk=
+SIZE (hiawatha-10.10.tar.gz) = 1168325
diff --git patches/patch-CMakeLists_txt patches/patch-CMakeLists_txt
new file mode 100644
index 000..1049dc657bf
--- /dev/null
+++ patches/patch-CMakeLists_txt
@@ -0,0 +1,33 @@
+$OpenBSD$
+
+Don't install Let's Encrypt script, which relies on PHP. We have acme-client(1)
+in base, and several alternatives in ports.
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -192,15 +192,15 @@ endforeach()
+ 
+ install(FILES extra/index.html DESTINATION ${WEBROOT_DIR})
+ 
+-if(ENABLE_TLS AND NOT CYGWIN)
+-  configure_file(extra/letsencrypt/lefh.in lefh)
+-  install(FILES ${PROJECT_BINARY_DIR}/lefh DESTINATION 
${CMAKE_INSTALL_SBINDIR}
+-  PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+-  install(DIRECTORY extra/letsencrypt/letsencrypt DESTINATION 
${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha)
+-  configure_file(extra/letsencrypt/letsencrypt.conf.in letsencrypt.conf)
+-  install(FILES ${PROJECT_BINARY_DIR}/letsencrypt.conf DESTINATION 
${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha/letsencrypt)
+-  install(FILES man/lefh.1 DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1)
+-endif()
++#if(ENABLE_TLS AND NOT CYGWIN)
++# configure_file(extra/letsencrypt/lefh.in lefh)
++# install(FILES ${PROJECT_BINARY_DIR}/lefh DESTINATION 
${CMAKE_INSTALL_SBINDIR}
++# PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
++# install(DIRECTORY extra/letsencrypt/letsencrypt DESTINATION 
${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha)
++# configure_file(extra/letsencrypt/letsencrypt.conf.in letsencrypt.conf)
++# install(FILES ${PROJECT_BINARY_DIR}/letsencrypt.conf DESTINATION 
${CMAKE_INSTALL_FULL_LIBDIR}/hiawatha/letsencrypt)
++# install(FILES man/lefh.1 DESTINATION ${CMAKE_INSTALL_FULL_MANDIR}/man1)
++#endif()
+ 
+ # Create directories
+ install(DIRECTORY DESTINATION ${LOG_DIR})
diff --git patches/patch-src_serverconfig_c patches/patch-src_serverconfig_c
index 27811e951f5..c869d786bbf 100644
--- patches/patch-src_serverconfig_c
+++ patches/patch-src_serverconfig_c
@@ -11,7 +11,7 @@ Index: src/serverconfig.c
  #define MAX_LENGTH_CONFIGLINE  1024
  #define MAX_CACHE_SIZE 1024
  #define MAX_UPLOAD_SIZE2047
-@@ -300,8 +300,8 @@ t_config *default_config(void) {
+@@ -298,8 +298,8 @@ t_config *default_config(void) {
config->tomahawk_port  = NULL;
  #endif
  

UPDATE net/libfilezilla-0.19.1

[Björn Ketelaars]

Enclosed diff brings libfilezilla to 0.19.1, which is needed for an
update of filezilla. Changelog can be found at
https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?revision=9513&view=markup.

Major of SHARED_LIBS has been bumped as symbols have been removed.

Run tested in combination with filezilla (amd64). Everything seems to
work OK. Regression tests depend on cppunit>=1.13.0, which we do not
have. As such, these tests fail.

Comments/OK?


diff --git Makefile Makefile
index d554c0da9e2..5454662d019 100644
--- Makefile
+++ Makefile
@@ -2,9 +2,9 @@
 
 COMMENT =  support library for FileZilla
 
-DISTNAME = libfilezilla-0.15.1
+DISTNAME = libfilezilla-0.19.1
 
-SHARED_LIBS +=  filezilla 0.0 # 0.0
+SHARED_LIBS +=  filezilla  1.0 # 2.0.0
 
 CATEGORIES =   net
 
@@ -13,20 +13,32 @@ HOMEPAGE =  https://lib.filezilla-project.org/
 # GPLv2+
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += ${COMPILER_LIBCXX} gmp hogweed iconv m nettle
+WANTLIB += ${COMPILER_LIBCXX} ffi gmp gnutls hogweed iconv idn2
+WANTLIB += intl m nettle p11-kit tasn1 unistring
 
 MASTER_SITES = https://download.filezilla-project.org/libfilezilla/
 EXTRACT_SUFX = .tar.bz2
 
 COMPILER = base-clang ports-gcc
 
-BUILD_DEPENDS =devel/cppunit
+BUILD_DEPENDS =devel/cppunit \
+   devel/gettext,-tools
 LIB_DEPENDS =  converters/libiconv \
+   security/gnutls \
security/libnettle
 
-CONFIGURE_STYLE =  gnu
+USE_GMAKE =Yes
+
+CONFIGURE_STYLE =  autoreconf
 CONFIGURE_ARGS =   --disable-doxygen-doc
 CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
 
+AUTOCONF_VERSION = 2.69
+AUTOMAKE_VERSION = 1.15
+
+# XXX tests fail as cppunit>=1.13.0 is required.
+do-test:
+   cd ${WRKSRC}/tests && ${MAKE_PROGRAM} check
+
 .include 
diff --git distinfo distinfo
index cf24891067f..21f410bf2fd 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (libfilezilla-0.15.1.tar.bz2) = 
IEjEEo8783oqTs4XyL6lRV89dBT+LgYK/PKosAqH9J8=
-SIZE (libfilezilla-0.15.1.tar.bz2) = 404746
+SHA256 (libfilezilla-0.19.1.tar.bz2) = 
CkLv7YMgpurFGxDU1ZYMEpzEQr+qk6TW3xFbi8xmWjI=
+SIZE (libfilezilla-0.19.1.tar.bz2) = 539952
diff --git patches/patch-configure_ac patches/patch-configure_ac
new file mode 100644
index 000..40914c1e92e
--- /dev/null
+++ patches/patch-configure_ac
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: configure.ac
+--- configure.ac.orig
 configure.ac
+@@ -42,9 +42,7 @@ if ! test "$localesonly" = "yes"; then
+ 
+ if test "X$GCC" = Xyes; then
+   AX_APPEND_FLAG(-Wall, CFLAGS)
+-  AX_APPEND_FLAG(-g, CFLAGS)
+   AX_APPEND_FLAG(-Wall, CXXFLAGS)
+-  AX_APPEND_FLAG(-g, CXXFLAGS)
+ fi
+ 
+ # Do this early: Compiler and linker flags to work around a nasty bug in 
Xcode.
diff --git pkg/PLIST pkg/PLIST
index 8c7ba817a58..8797c497f14 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -10,11 +10,13 @@ include/libfilezilla/event_loop.hpp
 include/libfilezilla/file.hpp
 include/libfilezilla/format.hpp
 include/libfilezilla/glue/
+include/libfilezilla/glue/unix.hpp
 include/libfilezilla/glue/wx.hpp
 include/libfilezilla/hash.hpp
 include/libfilezilla/iputils.hpp
 include/libfilezilla/libfilezilla.hpp
 include/libfilezilla/local_filesys.hpp
+include/libfilezilla/logger.hpp
 include/libfilezilla/mutex.hpp
 include/libfilezilla/optional.hpp
 include/libfilezilla/private/
@@ -22,17 +24,150 @@ include/libfilezilla/private/defs.hpp
 include/libfilezilla/private/visibility.hpp
 include/libfilezilla/private/windows.hpp
 include/libfilezilla/process.hpp
+include/libfilezilla/rate_limited_layer.hpp
+include/libfilezilla/rate_limiter.hpp
 include/libfilezilla/recursive_remove.hpp
 include/libfilezilla/shared.hpp
 include/libfilezilla/signature.hpp
+include/libfilezilla/socket.hpp
 include/libfilezilla/string.hpp
 include/libfilezilla/thread.hpp
 include/libfilezilla/thread_pool.hpp
 include/libfilezilla/time.hpp
+include/libfilezilla/tls_info.hpp
+include/libfilezilla/tls_layer.hpp
+include/libfilezilla/tls_system_trust_store.hpp
+include/libfilezilla/translate.hpp
 include/libfilezilla/uri.hpp
 include/libfilezilla/util.hpp
 include/libfilezilla/version.hpp
-lib/libfilezilla.a
+@static-lib lib/libfilezilla.a
 lib/libfilezilla.la
 @lib lib/libfilezilla.so.${LIBfilezilla_VERSION}
 lib/pkgconfig/libfilezilla.pc
+share/locale/an/
+share/locale/an/LC_MESSAGES/
+share/locale/an/LC_MESSAGES/libfilezilla.mo
+share/locale/ar/
+share/locale/ar/LC_MESSAGES/
+share/locale/ar/LC_MESSAGES/libfilezilla.mo
+share/locale/az/
+share/locale/az/LC_MESSAGES/
+share/locale/az/LC_MESSAGES/libfilezilla.mo
+share/locale/bg_BG/
+share/locale/bg_BG/LC_MESSAGES/
+share/locale/bg_BG/LC_MESSAGES/libfilezilla.mo
+share/locale/ca/LC_MESSAGES/libfilezilla.mo
+share/locale/ca_ES@valencia/
+share/locale/ca_ES@valencia/LC_MESSAGES/
+share/locale/ca_ES@valencia

UPDATE net/filezilla-3.45.1

[Björn Ketelaars]

Diff below brings filezilla to 3.45.1. Changelog can be found at
https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?revision=9474&view=markup&pathrev=9474.

Security related bugfix or otherwise critical bugfix:
- Filenames containing double-quotation marks were not escaped correctly
  when selected for opening/editing. Depending on the associated
  program, parts of the filename could be interpreted as commands.

Note that this update depends on a newer version of libfilezilla than
the one we have in ports. An update of the latter has been sent to
ports@.

'make test' fails as cppunit>=1.13.0 is required, which we do not have.
Run tested on amd64.

It would be nice if this update would be tested on hppa and/or alpha...

Comments/OK?


diff --git Makefile Makefile
index e70aa79b564..b12d56340da 100644
--- Makefile
+++ Makefile
@@ -4,11 +4,10 @@ COMMENT=  fast FTP and SFTP GUI client with a lot of 
features
 BROKEN-hppa=   serverpath.h:17:19: error: variable 'CServerPath final' has 
initializer but incomplete type
 BROKEN-alpha=  serverpath.h:17:19: error: variable 'CServerPath final' has 
initializer but incomplete type
 
-V= 3.41.2
+V= 3.45.1
 PKGNAME=   filezilla-$V
 DISTNAME=  FileZilla_$V_src
 EXTRACT_SUFX=  .tar.bz2
-REVISION=  1
 
 CATEGORIES=net
 
@@ -19,8 +18,8 @@ HOMEPAGE= https://www.filezilla-project.org/
 PERMIT_PACKAGE=Yes
 
 WANTLIB += ${COMPILER_LIBCXX} ICE SDL2 SM X11 Xcomposite Xcursor
-WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
-WANTLIB += atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
+WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xss
+WANTLIB += Xxf86vm atk-1.0 atk-bridge-2.0 c cairo cairo-gobject
 WANTLIB += dbus-1 epoxy expat ffi filezilla fontconfig freetype
 WANTLIB += fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gmp gnutls gobject-2.0 graphite2 gthread-2.0 gtk-3
@@ -37,7 +36,7 @@ COMPILER =base-clang ports-gcc
 LIB_DEPENDS=   databases/sqlite3 \
devel/harfbuzz \
devel/libidn \
-   net/libfilezilla \
+   net/libfilezilla>=0.18.2 \
security/gnutls \
textproc/pugixml \
x11/dbus \
@@ -50,8 +49,10 @@ RUN_DEPENDS= devel/desktop-file-utils \
devel/xdg-utils \
x11/gtk+3,-guic
 
-SEPARATE_BUILD= Yes
-CONFIGURE_STYLE=gnu
+SEPARATE_BUILD=Yes
+USE_GMAKE= Yes
+
+CONFIGURE_STYLE=autoreconf
 CONFIGURE_ARGS+=--with-dbus \
--with-tinyxml=builtin \
--disable-manualupdatecheck
@@ -60,11 +61,14 @@ CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
GREP=/usr/bin/grep \
SED=/usr/bin/sed
 
-USE_GMAKE= Yes
+AUTOCONF_VERSION = 2.69
+AUTOMAKE_VERSION = 1.15
+
 WRKDIST=   ${WRKDIR}/filezilla-$V
 
 FAKE_FLAGS+=   docsdir="${PREFIX}/share/examples/filezilla/"
 
+#XXX tests fail as cppunit>=1.13.0 is required.
 do-test:
@cd ${WRKBUILD}/tests && ${MAKE_PROGRAM} check-TESTS
 
diff --git distinfo distinfo
index 6fead29135a..1364b21e5c8 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (FileZilla_3.41.2_src.tar.bz2) = 
wjviSDHxFXSLT9LBJoQPAxjltNpc09obA9qu+fff8Bc=
-SIZE (FileZilla_3.41.2_src.tar.bz2) = 4994803
+SHA256 (FileZilla_3.45.1_src.tar.bz2) = 
iJwIpyR/BVB8pL129OLNDgUE3rGBXHoqKNjPvaqdHsI=
+SIZE (FileZilla_3.45.1_src.tar.bz2) = 4649083
diff --git patches/patch-configure_ac patches/patch-configure_ac
new file mode 100644
index 000..8d614f732fb
--- /dev/null
+++ patches/patch-configure_ac
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: configure.ac
+--- configure.ac.orig
 configure.ac
+@@ -37,9 +37,7 @@ if ! test "$localesonly" = "yes"; then
+ 
+   if test "X$GCC" = Xyes; then
+ AX_APPEND_FLAG(-Wall, CFLAGS)
+-AX_APPEND_FLAG(-g, CFLAGS)
+ AX_APPEND_FLAG(-Wall, CXXFLAGS)
+-AX_APPEND_FLAG(-g, CXXFLAGS)
+   fi
+ 
+   # Do this early: Compiler and linker flags to work around a nasty bug in 
Xcode.
diff --git patches/patch-src_interface_file_utils_cpp 
patches/patch-src_interface_file_utils_cpp
index c81a1f243d3..cbe6e7b91eb 100644
--- patches/patch-src_interface_file_utils_cpp
+++ patches/patch-src_interface_file_utils_cpp
@@ -3,8 +3,8 @@ Index: src/interface/file_utils.cpp
 --- src/interface/file_utils.cpp.orig
 +++ src/interface/file_utils.cpp
 @@ -7,8 +7,8 @@
- #include  // Used by GetDownloadDir
  #include 
+ #include 
  #else
 +#include 
  #include 
@@ -12,7 +12,7 @@ Index: src/interface/file_utils.cpp
  #endif
  
  std::wstring GetAsURL(std::wstring const& dir)
-@@ -359,12 +359,12 @@ wxString ShellUnescape(wxString const& path)
+@@ -370,12 +370,12 @@ wxString ShellUnescape(wxString const& path)
  
const wxWX2MBbuf buf = path.mb_str();
if (buf && *buf) {
diff --git pkg/PLIST pkg/PLIST
index dfcb94c2806..8a822e1c5d7 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -728,12 +728,9 @@ share/filezilla/resources/tan

Re: UPDATE devel/spyder/spyder-3.3.6

[Björn Ketelaars]

On Sun 10/11/2019 15:19, Björn Ketelaars wrote:
> Please find below an update to the latest version of spyder. Changelog
> can be found at
> https://github.com/spyder-ide/spyder/blob/v3.3.6/CHANGELOG.md.
> 
> While here sort order of RUN_DEPENDS.
> 
> Run tested on amd64.

Ping...

Diff enclosed below for convenience.


diff --git Makefile Makefile
index 43890c53a23..be245fdafaf 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  Scientific PYthon Development EnviRonment
 
-MODPY_EGG_VERSION =3.3.3
+MODPY_EGG_VERSION =3.3.6
 DISTNAME = spyder-${MODPY_EGG_VERSION}
 PKGNAME =  spyder${MAJOR_VERSION}-${MODPY_EGG_VERSION}
 
@@ -19,7 +19,6 @@ PKGNAME = spyder3-${MODPY_EGG_VERSION}
 .else
 MAJOR_VERSION =
 .endif
-REVISION = 1
 
 SUBST_VARS +=  MAJOR_VERSION
 
@@ -32,20 +31,21 @@ RUN_DEPENDS +=  databases/py-pickleshare${MODPY_FLAVOR} 
\
devel/py-rope${MODPY_FLAVOR}>=0.10.5 \
devel/pyflakes${MODPY_FLAVOR} \
devel/pylint${MODPY_FLAVOR} \
+   devel/spyder/py-spyder-kernels${MODPY_FLAVOR}>=0.5.0,<1.0 \
net/py-zmq${MODPY_FLAVOR} \
-   shells/py-qtconsole${MODPY_FLAVOR}>=4.2.0 \
security/py-keyring${MODPY_FLAVOR} \
+   shells/py-qtconsole${MODPY_FLAVOR}>=4.2.0 \
sysutils/py-psutil${MODPY_FLAVOR} \
textproc/py-chardet${MODPY_FLAVOR}>=2.0.0 \
textproc/py-numpydoc${MODPY_FLAVOR} \
textproc/py-pygments${MODPY_FLAVOR}>=2.0 \
textproc/py-sphinx${MODPY_FLAVOR} \
-   x11/py-qt5${MODPY_FLAVOR}<5.12 \
-   x11/py-qtpy${MODPY_FLAVOR}>=1.5.0 \
+   x11/py-qt5${MODPY_FLAVOR}<5.13 \
x11/py-qtawesome${MODPY_FLAVOR}>=0.4.1 \
-   devel/spyder/py-spyder-kernels${MODPY_FLAVOR}<1.0
+   x11/py-qtpy${MODPY_FLAVOR}>=1.5.0
 
-TEST_DEPENDS +=${RUN_DEPENDS}
+# No tests on PyPi.
+NO_TEST =  Yes
 
 pre-configure:
${SUBST_CMD} ${WRKSRC}/spyder/__init__.py
diff --git distinfo distinfo
index 09b790daa9d..82c94cd5637 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (spyder/spyder-3.3.3.tar.gz) = 
7zHeA89vFJB35k7Vc2uHl9vSeOPJJeQ/C/wxu1X25bo=
-SIZE (spyder/spyder-3.3.3.tar.gz) = 2988827
+SHA256 (spyder/spyder-3.3.6.tar.gz) = 
YZczN+HiEMjvTNhRI8EOyD3xDf+5o828CIrBPGDg+Pw=
+SIZE (spyder/spyder-3.3.6.tar.gz) = 2996872
diff --git patches/patch-setup_py patches/patch-setup_py
index 5c4e85ccc25..deefe5bf7f4 100644
--- patches/patch-setup_py
+++ patches/patch-setup_py
@@ -3,7 +3,7 @@ $OpenBSD: patch-setup_py,v 1.2 2019/02/23 17:57:43 mariani Exp $
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
-@@ -27,7 +27,7 @@ import subprocess
+@@ -28,7 +28,7 @@ import subprocess
  import sys
  import shutil
  
@@ -12,7 +12,7 @@ Index: setup.py
  from distutils.command.install_data import install_data
  
  
-@@ -82,7 +82,7 @@ def get_subpackages(name):
+@@ -83,7 +83,7 @@ def get_subpackages(name):
  
  def get_data_files():
  """Return data_files in a platform dependent manner"""
@@ -21,7 +21,7 @@ Index: setup.py
  if PY3:
  data_files = [('share/applications', ['scripts/spyder3.desktop']),
('share/icons', ['img_src/spyder3.png']),
-@@ -132,7 +132,7 @@ CMDCLASS = {'install_data': MyInstallData}
+@@ -133,7 +133,7 @@ CMDCLASS = {'install_data': MyInstallData}
  # NOTE: the '[...]_win_post_install.py' script is installed even on 
non-Windows
  # platforms due to a bug in pip installation process (see Issue 1158)
  SCRIPTS = ['%s_win_post_install.py' % NAME]
@@ -30,12 +30,16 @@ Index: setup.py
  SCRIPTS.append('spyder3')
  else:
  SCRIPTS.append('spyder')
-@@ -244,7 +244,7 @@ install_requires = [
+@@ -238,10 +238,10 @@ install_requires = [
  'keyring;sys_platform!="linux2"',
  # Packages for pyqt5 are only available in
  # Python 3
--'pyqt5<=5.12;python_version>="3"'
-+#'pyqt5<=5.12;python_version>="3"'
+-'pyqt5<5.13;python_version>="3"',
++#'pyqt5<5.13;python_version>="3"',
+ # pyqt5 5.12 split WebEngine into the
+ # pyqtwebengine module
+-'pyqtwebengine<5.13;python_version>="3"'
++#'pyqtwebengine<5.13;python_version>="3"'
  ]
  
  extras_require = {

Re: UPDATE devel/spyder/py-spyder-kernels-0.5.2

[Björn Ketelaars]

On Sun 10/11/2019 15:18, Björn Ketelaars wrote:
> Please find below a simple update to the latest version of
> py-spyder-kernels that supports both python2 and python3. This update
> is required for an update of spyder. Changelog can be found at
> https://github.com/spyder-ide/spyder-kernels/blob/v0.5.2/CHANGELOG.md.
> 
> Run tested on amd64 in combination with the spyder update.
> 
> Comments/OK?

Ping...

Diff enclosed below for convenience.


diff --git Makefile Makefile
index 819dc5434fa..c7edd980265 100644
--- Makefile
+++ Makefile
@@ -2,10 +2,9 @@
 
 COMMENT=   kernels used by spyder on its ipython console
 
-MODPY_EGG_VERSION= 0.4.2
+MODPY_EGG_VERSION= 0.5.2
 DISTNAME=  spyder-kernels-${MODPY_EGG_VERSION}
 PKGNAME=   ${MODPY_PY_PREFIX}${DISTNAME}
-REVISION=  1
 
 PORTROACH= limit:^0
 
@@ -18,8 +17,9 @@ RUN_DEPENDS +=devel/py-cloudpickle${MODPY_FLAVOR} \
devel/py-ipykernel${MODPY_FLAVOR}>=4.8.2 \
devel/py-jupyter_client${MODPY_FLAVOR}>=5.2.3 \
devel/py-wurlitzer${MODPY_FLAVOR} \
-   net/py-zmq${MODPY_FLAVOR}
+   net/py-zmq${MODPY_FLAVOR}>=17
 
+# No tests on PyPi.
 NO_TEST =  Yes
 
 .include 
diff --git distinfo distinfo
index c7a4d834b13..c01b337857b 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (spyder/spyder-kernels-0.4.2.tar.gz) = 
oTzvtWnvn2OBTLX889DbZuCdLX5sxoxwPVEYste6Bis=
-SIZE (spyder/spyder-kernels-0.4.2.tar.gz) = 36369
+SHA256 (spyder/spyder-kernels-0.5.2.tar.gz) = 
ATVLf6GAqHISzABVU7MacwAVmxCNNoKOMB03gikTI/c=
+SIZE (spyder/spyder-kernels-0.5.2.tar.gz) = 38054

Re: UPDATE: SMPLayer-19.10.2

[Björn Ketelaars]

On Tue 19/11/2019 13:47, Gonzalo L. Rodriguez wrote:
> Hello,
> 
> Update for SMPLayer to 19.10.2:
> 
> https://www.smplayer.info/en/changes
> 
> OK? Comments?

OK bket@

Re: UPDATE net/filezilla-3.45.1

[Björn Ketelaars]

On Fri 22/11/2019 18:02, Giovanni Bechis wrote:
> On Sat, Nov 16, 2019 at 05:31:28PM +0100, Björn Ketelaars wrote:
> > Diff below brings filezilla to 3.45.1. Changelog can be found at
> > https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?revision=9474&view=markup&pathrev=9474.
> > 
> > Security related bugfix or otherwise critical bugfix:
> > - Filenames containing double-quotation marks were not escaped correctly
> >   when selected for opening/editing. Depending on the associated
> >   program, parts of the filename could be interpreted as commands.
> > 
> > Note that this update depends on a newer version of libfilezilla than
> > the one we have in ports. An update of the latter has been sent to
> > ports@.
> > 
> > 'make test' fails as cppunit>=1.13.0 is required, which we do not have.
> > Run tested on amd64.
> > 
> cppunit update to 1.14 follows.
> comments ? ok ?
> 
>  Cheers
>   Giovanni

The update of cppunit needs some additional love, especially in the
SHARED_LIBS department. I enclosed a new diff, which should fix this.
Major of SHARED_LIBS has been bumped as symbols have been removed. Note
that MASTER_SITES can be switched to https.

'make test' runs successfully and thanks to this update regression tests
of filezilla and libfilezilla are also OK. However, I'm not sure if this
enough testing:

$ echo "select fullpkgpath from depends where dependspath like 'devel/cppunit'"|
sqlite3 /usr/local/share/sqlports | wc -l
  53


diff --git Makefile Makefile
index b9723aafdd7..2903896a489 100644
--- Makefile
+++ Makefile
@@ -2,23 +2,20 @@
 
 COMMENT=   c++ unit testing framework
 
-DISTNAME=  cppunit-1.12.1
-REVISION = 4
+DISTNAME=  cppunit-1.14.0
 
-SHARED_LIBS += cppunit  3.0  # .1.0
+SHARED_LIBS += cppunit 4.0 # 1.14.0
 
 CATEGORIES=devel
 
-# XXX dead.  Switch to newer releases at
-# https://freedesktop.org/wiki/Software/cppunit/ ?
-HOMEPAGE=  http://cppunit.sourceforge.net/
+HOMEPAGE=  https://www.freedesktop.org/wiki/Software/cppunit/
 
 # LGPLv2.1
 PERMIT_PACKAGE=Yes
 
 WANTLIB=   c m ${COMPILER_LIBCXX}
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=cppunit/}
+MASTER_SITES=  https://dev-www.libreoffice.org/src/
 
 COMPILER = base-clang ports-gcc base-gcc
 
diff --git distinfo distinfo
index a0869eaec88..b37b399fac8 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (cppunit-1.12.1.tar.gz) = rCigTI5skhfZELCucSKDLSjZkX+maLzJ4LiwmstOpEo=
-SIZE (cppunit-1.12.1.tar.gz) = 762803
+SHA256 (cppunit-1.14.0.tar.gz) = PVaYadJ7SIYCEMdYxPMTCCEDpeWCGadmm1K/0p1nR4A=
+SIZE (cppunit-1.14.0.tar.gz) = 959716
diff --git patches/patch-Makefile_in patches/patch-Makefile_in
index 58d53f248d2..02bda14216a 100644
--- patches/patch-Makefile_in
+++ patches/patch-Makefile_in
@@ -1,12 +1,13 @@
 $OpenBSD: patch-Makefile_in,v 1.1 2008/10/24 14:49:44 jasper Exp $
 Makefile.in.orig   Sun Oct 19 23:43:08 2008
-+++ Makefile.inSun Oct 19 23:43:11 2008
-@@ -231,7 +231,7 @@ top_builddir = @top_builddir@
+Index: Makefile.in
+--- Makefile.in.orig
 Makefile.in
+@@ -385,7 +385,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.4
- ACLOCAL_AMFLAGS = -I config
+ ACLOCAL_AMFLAGS = -I m4
 -SUBDIRS = src include examples doc
 +SUBDIRS = src include examples
- pkgconfigdatadir = $(libdir)/pkgconfig
- pkgconfigdata_DATA = cppunit.pc
- bin_SCRIPTS = cppunit-config
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = cppunit.pc
+ doc_DATA = \
diff --git patches/patch-src_cppunit_Makefile_in 
patches/patch-src_cppunit_Makefile_in
index dd6c4cabd13..0410c349726 100644
--- patches/patch-src_cppunit_Makefile_in
+++ patches/patch-src_cppunit_Makefile_in
@@ -1,13 +1,14 @@
 $OpenBSD: patch-src_cppunit_Makefile_in,v 1.2 2008/10/24 14:49:44 jasper Exp $
 src/cppunit/Makefile.in.orig   Wed Feb 20 06:59:55 2008
-+++ src/cppunit/Makefile.inSun Oct 19 23:03:52 2008
-@@ -299,8 +299,7 @@ libcppunit_la_SOURCES = \
+Index: src/cppunit/Makefile.in
+--- src/cppunit/Makefile.in.orig
 src/cppunit/Makefile.in
+@@ -446,8 +446,7 @@ libcppunit_la_SOURCES = \
Win32DynamicLibraryManager.cpp
  
  libcppunit_la_LDFLAGS = \
 - -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-- -release $(LT_RELEASE)
+- -release $(LT_RELEASE) $(LIBADD_DL)
 + -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
+ libcppunit_la_LIBADD = $(LIBADD_DL)
  all: all-am
- 
diff --git pkg/PLIST pkg/PLIST
index 64890cb17e3..a8f51eda0af 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,6 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:39 naddy Exp $
 @bin bin/DllPlugInTester
-bin/cppunit-config
 include/cppunit/
 include/cppunit/AdditionalMessage.h
 include/cppunit/As

Re: UPDATE net/filezilla-3.45.1

[Björn Ketelaars]

On Fri 22/11/2019 23:45, Stuart Henderson wrote:
> On 2019/11/22 21:51, Stuart Henderson wrote:
> > On 2019/11/22 20:50, Björn Ketelaars wrote:
> > > $ echo "select fullpkgpath from depends where dependspath like 
> > > 'devel/cppunit'"|
> > > sqlite3 /usr/local/share/sqlports | wc -l
> > >   53
> > 
> > It's not quite as bad as it looks, there are a bunch of subpackages in 
> > there.
> > But one of them is libreoffice..
> > 
> > audio/libmusicbrainz
> > audio/taglib
> > comms/gnuradio
> > databases/strigi
> > editors/libreoffice
> > graphics/zxing
> > net/filezilla
> > net/libfilezilla
> > net/libtorrent
> > net/rtorrent
> > security/fwbuilder
> > security/softhsm2
> > textproc/podofo
> > www/aria2
> > www/squid
> > x11/wxWidgets
> > 
> > >  COMPILER =   base-clang ports-gcc base-gcc
> > 
> > base-gcc should be removed, the new version needs C++11.
> > 
> 
> I've built/packaged some of the dependent ports (haven't tried "make test").
> 
> fails:databases/strigi
> 
> builds:   audio/libmusicbrainz
> builds:   audio/taglib
> builds:   comms/gnuradio
> builds:   graphics/zxing
> builds:   net/filezilla
> builds:   net/libfilezilla
> builds:   net/libtorrent
> builds:   net/rtorrent
> builds:   security/fwbuilder
> builds:   security/softhsm2
> builds:   textproc/podofo
> 
> ?:editors/libreoffice
> ?:www/aria2
> ?:www/squid
> ?:x11/wxWidgets

Problem with databases/strigi seems related to:

# NOTE: CppUnit's public API also required C++11 for compiling, hence
# any project using CppUnit must be compiled with C++11 support,
# regardless of whether the project itself requires C++11.

cppunit is only needed to build some tests, as such we could leave this
out. I have a diff, which I will send later today.
For a real solution help from strigi upstream is needed. Likelihood of
this happening is slim...there has been no activity on strigi since
2013.

Additionally:

builds: www/aria2
builds: www/squid
builds: x11/wxWidgets

?:  editors/libreoffice

UPDATE databases/strigi

[Björn Ketelaars]

databases/strigi blocks an update of devel/cppunit [0], which seems
related to cppunit's public API requiring C++11 for compiling [1].
strigi in turn doesn't like C++11.

cppunit is only needed to build some tests, as such we could leave this
out.

Output 'make test':

96% tests passed, 1 tests failed out of 25

Total Test time (real) =   0.37 sec

The following tests FAILED:
 10 - InputStreamReaderTest (Failed)

The failing test already occurs with the version in ports.

While here sync PLIST.

Comments/OK?

[0] https://marc.info/?l=openbsd-ports&m=157446636510981&w=2
[1] https://cgit.freedesktop.org/libreoffice/cppunit/tree/NEWS



diff --git Makefile Makefile
index fc2c4441325..6b3858e735f 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  document indexer
 DISTNAME = strigi-0.7.8
-REVISION = 2
+REVISION = 3
 CATEGORIES =   databases devel textproc sysutils
 
 HOMEPAGE = https://www.vandenoever.info/software/strigi/
@@ -28,8 +28,7 @@ COMPILER =base-clang ports-gcc base-gcc
 MODULES =  devel/cmake \
x11/qt4
 
-BUILD_DEPENDS =devel/cppunit \
-   devel/boost
+BUILD_DEPENDS =devel/boost
 
 LIB_DEPENDS =  archivers/bzip2 \
converters/libiconv \
diff --git patches/patch-strigidaemon_CMakeLists_txt 
patches/patch-strigidaemon_CMakeLists_txt
new file mode 100644
index 000..e5ed1b70569
--- /dev/null
+++ patches/patch-strigidaemon_CMakeLists_txt
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Do not pick up cppunit as newer versions of it require C++11 for compiling,
+hence any project using cppunit must be compiled with C++11 support. strigi
+doesn't build with C++11.
+
+Index: strigidaemon/CMakeLists.txt
+--- strigidaemon/CMakeLists.txt.orig
 strigidaemon/CMakeLists.txt
+@@ -65,7 +65,7 @@ find_optional_dep(FAM ENABLE_FAM FAM_FOUND "efficient 
+ find_optional_dep(Log4cxx ENABLE_LOG4CXX LOG4CXX_FOUND "advanced logging")
+ #find_optional_dep(CLucene ENABLE_CLUCENE CLucene_FOUND "CLucene backend")
+ #find_optional_dep(Exiv2 ENABLE_EXIV2 EXIV2_FOUND "indexing of EXIF/IPTC 
metadata")
+-find_package(CppUnit)
++#find_package(CppUnit)
+ include(ConfigureChecks.cmake)
+ set (LIBSEARCHCLIENT_VERSION ${STRIGI_VERSION_STRING})
+ 
diff --git pkg/PLIST pkg/PLIST
index cea7d0c3e3b..7cf43242d67 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -94,26 +94,26 @@ lib/cmake/Strigi/StrigiConfigVersion.cmake
 lib/pkgconfig/libstreamanalyzer.pc
 lib/pkgconfig/libstreams.pc
 lib/strigi/
-lib/strigi/strigiea_digest.so
-lib/strigi/strigiea_ffmpeg.so
-lib/strigi/strigiea_jpeg.so
-lib/strigi/strigiea_riff.so
-lib/strigi/strigiindex_cluceneng.so
-lib/strigi/strigila_cpp.so
-lib/strigi/strigila_deb.so
-lib/strigi/strigila_namespaceharvester.so
-lib/strigi/strigila_txt.so
-lib/strigi/strigila_xpm.so
-lib/strigi/strigita_au.so
-lib/strigi/strigita_avi.so
-lib/strigi/strigita_dds.so
-lib/strigi/strigita_gif.so
-lib/strigi/strigita_ico.so
-lib/strigi/strigita_pcx.so
-lib/strigi/strigita_rgb.so
-lib/strigi/strigita_sid.so
-lib/strigi/strigita_wav.so
-lib/strigi/strigita_xbm.so
+@so lib/strigi/strigiea_digest.so
+@so lib/strigi/strigiea_ffmpeg.so
+@so lib/strigi/strigiea_jpeg.so
+@so lib/strigi/strigiea_riff.so
+@so lib/strigi/strigiindex_cluceneng.so
+@so lib/strigi/strigila_cpp.so
+@so lib/strigi/strigila_deb.so
+@so lib/strigi/strigila_namespaceharvester.so
+@so lib/strigi/strigila_txt.so
+@so lib/strigi/strigila_xpm.so
+@so lib/strigi/strigita_au.so
+@so lib/strigi/strigita_avi.so
+@so lib/strigi/strigita_dds.so
+@so lib/strigi/strigita_gif.so
+@so lib/strigi/strigita_ico.so
+@so lib/strigi/strigita_pcx.so
+@so lib/strigi/strigita_rgb.so
+@so lib/strigi/strigita_sid.so
+@so lib/strigi/strigita_wav.so
+@so lib/strigi/strigita_xbm.so
 share/dbus-1/services/org.freedesktop.xesam.searcher.service
 share/dbus-1/services/vandenoever.strigi.service
 share/strigi/

Re: NEW: security/py-scrypt

[Björn Ketelaars]

On Sat 23/11/2019 14:54, Stuart Henderson wrote:
> ok to import?
> 
> 
> This is a set of Python bindings for the scrypt key derivation function.
> 
> Scrypt is useful when encrypting passwords as it is possible to specify a
> *minimum* amount of time to use when encrypting and decrypting. If, for
> example, a password takes 0.05 seconds to verify, a user won't notice
> the slight delay when signing in, but doing a brute force search of
> several billion passwords will take a considerable amount of time. This
> is in contrast to more traditional hash functions such as MD5 or the SHA
> family which can be implemented extremely fast on cheap hardware.
> 

Port looks good, builds and packages, and all tests are OK.

OK bket@

UPDATE security/rhash-1.3.8

[Björn Ketelaars]

Diff below brings rhash to the latest version fixing some bugs and
adding support for a new hash function. Changelog can be found at
https://github.com/rhash/RHash/blob/v1.3.8/ChangeLog.

Notable change is that a configure script is supplied.

Changes to the port:
- New HOMEPAGE as the old one gave a 404
- Take MAINTAINER
- Add sysutils/ggrep as TDEP. Some of the tests do some grepping, which
  are not supported by our grep
- The configure script negates the use of heavy patching

Testing (amd64):
- All tests run successfully
- rhash has a single consumer: cmake. Output of 'make test' of the
  latter is the same as without this update:

99% tests passed, 5 tests failed out of 501

Label Time Summary:
Label1=   0.09 sec*proc (1 test)
Label2=   0.09 sec*proc (1 test)

Total Test time (real) = 2778.14 sec

The following tests FAILED:
177 - RuntimePath (Failed)
312 - RunCMake.CMP0060 (Failed)
334 - RunCMake.FindLua (Failed)
442 - RunCMake.CommandLine (Failed)
444 - RunCMake.install (Failed)


Comments/OK?


diff --git Makefile Makefile
index 3d4cfb61aad..464fac84aae 100644
--- Makefile
+++ Makefile
@@ -2,42 +2,42 @@
 
 COMMENT =  utility and library for computing hash sums
 
-DISTNAME = rhash-1.3.5-src
-
+DISTNAME = rhash-1.3.8-src
 PKGNAME =  ${DISTNAME:S/-src$//}
-REVISION = 0
 
 SHARED_LIBS =  rhash 0.0
 
 CATEGORIES =   security
 
-HOMEPAGE = http://rhash.anz.ru/
+HOMEPAGE = http://rhash.sf.net
+
+MAINTAINER =   Bjorn Ketelaars 
 
 # MIT
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += c
+WANTLIB =  c
 
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=rhash/}
 
-MAKE_FLAGS =   SONAME="librhash.so.${LIBrhash_VERSION}"
+TEST_DEPENDS = sysutils/ggrep
 
-FAKE_FLAGS =   PREFIX=${PREFIX} \
-   INSTALL_DATA="${INSTALL_DATA}" \
-   INSTALL_PROGRAM="${INSTALL_PROGRAM}" \
-   INSTALL_SHARED="${INSTALL_DATA}" \
-   MANDIR=${PREFIX}/man \
-   SONAME="librhash.so.${LIBrhash_VERSION}"
+CONFIGURE_STYLE =  simple
+CONFIGURE_ARGS =   --enable-lib-static \
+   --extra-cflags="${CFLAGS}" \
+   --extra-ldflags="${LDFLAGS}" \
+   --mandir=${PREFIX}/man \
+   --prefix=${PREFIX} \
+   --sysconfdir=${SYSCONFDIR}
 
 WRKDIST =  ${WRKDIR}/${PKGNAME:S/^rhash/RHash/}
 
-ALL_TARGET =   build-shared
-
-INSTALL_TARGET =install-shared
-
 pre-configure:
${SUBST_CMD} ${WRKSRC}/common_func.h \
-   ${WRKSRC}/parse_cmdline.c
+   ${WRKSRC}/configure
+
+pre-test:
+   sed -i 's,grep,ggrep,g' ${WRKSRC}/tests/test_rhash.sh
 
 do-test:
cd ${WRKSRC}/tests && env \
diff --git distinfo distinfo
index b073854f437..67d2dc248cb 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (rhash-1.3.5-src.tar.gz) = mOBoisrinmjCmP+827D4OIZBBfmyvYhXmAZkQ1sfHy4=
-SIZE (rhash-1.3.5-src.tar.gz) = 316867
+SHA256 (rhash-1.3.8-src.tar.gz) = vlNqVqz+/IfbyLHbMPxjkCDkHt8FUYGF6phjDj33wEw=
+SIZE (rhash-1.3.8-src.tar.gz) = 393544
diff --git patches/patch-Makefile patches/patch-Makefile
index e84596ccc4b..97011bccaf8 100644
--- patches/patch-Makefile
+++ patches/patch-Makefile
@@ -3,46 +3,14 @@ $OpenBSD: patch-Makefile,v 1.2 2017/08/14 12:20:57 dcoppa Exp 
$
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -6,10 +6,10 @@ VERSION = 1.3.5
- PREFIX  ?= /usr/local
- CC  ?= gcc
- # using OPTFLAGS/OPTLDFLAGS for compatibilty with old scripts using this 
makefile
--OPTFLAGS = -O2 -DNDEBUG -fomit-frame-pointer -ffunction-sections 
-fdata-sections
-+OPTFLAGS = -DNDEBUG -fomit-frame-pointer -ffunction-sections -fdata-sections
- OPTLDFLAGS =
--CFLAGS = $(OPTFLAGS)
--LDFLAGS = $(OPTLDFLAGS)
-+CFLAGS += $(OPTFLAGS)
-+LDFLAGS += $(OPTLDFLAGS)
- ADDCFLAGS =
- ADDLDFLAGS =
- ALLCFLAGS = -pipe $(CFLAGS) $(ADDCFLAGS) \
-@@ -71,7 +71,7 @@ lib-shared: $(SHAREDLIB)
- lib-static: $(LIBRHASH)
- 
- install: build-install-binary install-data install-symlinks
--install-shared: build-install-shared-binary install-data install-symlinks
-+install-shared: build-install-shared-binary install-lib-static 
install-lib-shared install-data install-symlinks
- install-data: install-man install-conf
- uninstall: uninstall-binary uninstall-data uninstall-symlinks uninstall-lib
- 
-@@ -112,8 +112,8 @@ install-man:
-   $(INSTALL_DATA) dist/rhash.1 $(DESTDIR)$(MANDIR)/man1/rhash.1
+@@ -81,8 +81,8 @@ install-man:
+   $(INSTALL_DATA) dist/rhash.1 $(MANDIR)/man1/rhash.1
  
  install-conf:
--  $(INSTALL) -d $(DESTDIR)/etc
--  tr -d \\r < dist/rhashrc.sample > rc.tmp && $(INSTALL_DATA) rc.tmp 
$(DESTDIR)/etc/rhashrc
-+  $(INSTALL) -d $(DESTDIR)$(PREFIX)/share/examples/$(PROGNAME)
-+  tr -d \\r < dist/rhashrc.sample > rc.tmp && $(INSTALL_DATA) rc.tmp 
$(DESTDIR)$(PREFIX)/share/examples/$(PROGNAME)/rhashrc
+-  $(INSTALL) -d $(SYSCONFDIR)
+-  tr -d \\r < dist/rhashrc.sample > rc.tmp && $(INSTALL_DATA) r

Re: [NEW] audio/ncspot: ncurses Spotify client written in Rust

[Björn Ketelaars]

On Sun 24/11/2019 18:29, Henrik Friedrichsen wrote:
> Since the initial motivation for this project was to have a working
> Spotify client on OpenBSD, I figured I should submit a port for this.
> 
> As this is my first Rust OpenBSD port, please bear with me.
> 
> Description:
> ncurses Spotify client written in Rust using librespot. It is heavily
> inspired by ncurses MPD clients, such as ncmpc.  The main motivation was
> to provide a simple and resource friendly alternative to the official
> client as well as to support platforms that currently don't have a
> Spotify client, such as the *BSDs.
> 
> WWW:
> https://github.com/hrkfdn/ncspot
> 
> Feedback? OK?

Thank you for this port!

I have no experience with porting Rust related tools. As such I'm not
confident to give any feedback on the port itself. I did however build,
package and test the port. Initially packaging failed, which seems
related to 'PORTS_PRIVSEP=Yes'.

I didn't know of ncspot, but I'm really glad that I know now. The tool
itself does something really interesting: it brings Spotify to OpenBSD,
and it does it really well.

One remark:

>From https://www.openbsd.org/faq/ports/guide.html:

"Submit the port. Create a gzipped tarball of the port directory."

Re: UPDATE net/libfilezilla-0.19.1

[Björn Ketelaars]

On Sat 16/11/2019 17:15, Björn Ketelaars wrote:
> Enclosed diff brings libfilezilla to 0.19.1, which is needed for an
> update of filezilla. Changelog can be found at
> https://svn.filezilla-project.org/filezilla/libfilezilla/trunk/NEWS?revision=9513&view=markup.
> 
> Major of SHARED_LIBS has been bumped as symbols have been removed.
> 
> Run tested in combination with filezilla (amd64). Everything seems to
> work OK. Regression tests depend on cppunit>=1.13.0, which we do not
> have. As such, these tests fail.
> 
> Comments/OK?

Ping

Slightly updated diff (no need for 'do-test'). 'make test' runs
successful with the update of cppunit [0].

OK?

[0] https://marc.info/?l=openbsd-ports&m=157445228006211&w=2]


diff --git Makefile Makefile
index d554c0da9e2..b373a0de5a7 100644
--- Makefile
+++ Makefile
@@ -2,9 +2,9 @@
 
 COMMENT =  support library for FileZilla
 
-DISTNAME = libfilezilla-0.15.1
+DISTNAME = libfilezilla-0.19.1
 
-SHARED_LIBS +=  filezilla 0.0 # 0.0
+SHARED_LIBS +=  filezilla  1.0 # 2.0.0
 
 CATEGORIES =   net
 
@@ -13,20 +13,30 @@ HOMEPAGE =  https://lib.filezilla-project.org/
 # GPLv2+
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += ${COMPILER_LIBCXX} gmp hogweed iconv m nettle
+WANTLIB += ${COMPILER_LIBCXX} ffi gmp gnutls hogweed iconv idn2
+WANTLIB += intl m nettle p11-kit tasn1 unistring
 
 MASTER_SITES = https://download.filezilla-project.org/libfilezilla/
 EXTRACT_SUFX = .tar.bz2
 
 COMPILER = base-clang ports-gcc
 
-BUILD_DEPENDS =devel/cppunit
+# XXX regression tests depend on cppunit>=1.13.0
+BUILD_DEPENDS =devel/cppunit \
+   devel/gettext,-tools
 LIB_DEPENDS =  converters/libiconv \
+   security/gnutls \
security/libnettle
 
-CONFIGURE_STYLE =  gnu
+SEPARATE_BUILD =   Yes
+USE_GMAKE =Yes
+
+CONFIGURE_STYLE =  autoreconf
 CONFIGURE_ARGS =   --disable-doxygen-doc
 CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
 
+AUTOCONF_VERSION = 2.69
+AUTOMAKE_VERSION = 1.15
+
 .include 
diff --git distinfo distinfo
index cf24891067f..21f410bf2fd 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (libfilezilla-0.15.1.tar.bz2) = 
IEjEEo8783oqTs4XyL6lRV89dBT+LgYK/PKosAqH9J8=
-SIZE (libfilezilla-0.15.1.tar.bz2) = 404746
+SHA256 (libfilezilla-0.19.1.tar.bz2) = 
CkLv7YMgpurFGxDU1ZYMEpzEQr+qk6TW3xFbi8xmWjI=
+SIZE (libfilezilla-0.19.1.tar.bz2) = 539952
diff --git patches/patch-configure_ac patches/patch-configure_ac
new file mode 100644
index 000..40914c1e92e
--- /dev/null
+++ patches/patch-configure_ac
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: configure.ac
+--- configure.ac.orig
 configure.ac
+@@ -42,9 +42,7 @@ if ! test "$localesonly" = "yes"; then
+ 
+ if test "X$GCC" = Xyes; then
+   AX_APPEND_FLAG(-Wall, CFLAGS)
+-  AX_APPEND_FLAG(-g, CFLAGS)
+   AX_APPEND_FLAG(-Wall, CXXFLAGS)
+-  AX_APPEND_FLAG(-g, CXXFLAGS)
+ fi
+ 
+ # Do this early: Compiler and linker flags to work around a nasty bug in 
Xcode.
diff --git pkg/PLIST pkg/PLIST
index 8c7ba817a58..8797c497f14 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -10,11 +10,13 @@ include/libfilezilla/event_loop.hpp
 include/libfilezilla/file.hpp
 include/libfilezilla/format.hpp
 include/libfilezilla/glue/
+include/libfilezilla/glue/unix.hpp
 include/libfilezilla/glue/wx.hpp
 include/libfilezilla/hash.hpp
 include/libfilezilla/iputils.hpp
 include/libfilezilla/libfilezilla.hpp
 include/libfilezilla/local_filesys.hpp
+include/libfilezilla/logger.hpp
 include/libfilezilla/mutex.hpp
 include/libfilezilla/optional.hpp
 include/libfilezilla/private/
@@ -22,17 +24,150 @@ include/libfilezilla/private/defs.hpp
 include/libfilezilla/private/visibility.hpp
 include/libfilezilla/private/windows.hpp
 include/libfilezilla/process.hpp
+include/libfilezilla/rate_limited_layer.hpp
+include/libfilezilla/rate_limiter.hpp
 include/libfilezilla/recursive_remove.hpp
 include/libfilezilla/shared.hpp
 include/libfilezilla/signature.hpp
+include/libfilezilla/socket.hpp
 include/libfilezilla/string.hpp
 include/libfilezilla/thread.hpp
 include/libfilezilla/thread_pool.hpp
 include/libfilezilla/time.hpp
+include/libfilezilla/tls_info.hpp
+include/libfilezilla/tls_layer.hpp
+include/libfilezilla/tls_system_trust_store.hpp
+include/libfilezilla/translate.hpp
 include/libfilezilla/uri.hpp
 include/libfilezilla/util.hpp
 include/libfilezilla/version.hpp
-lib/libfilezilla.a
+@static-lib lib/libfilezilla.a
 lib/libfilezilla.la
 @lib lib/libfilezilla.so.${LIBfilezilla_VERSION}
 lib/pkgconfig/libfilezilla.pc
+share/locale/an/
+share/locale/an/LC_MESSAGES/
+share/locale/an/LC_MESSAGES/libfilezilla.mo
+share/locale/ar/
+share/locale/ar/LC_MESSAGES/
+share/locale/ar/LC_MESSAGES/libfilezilla.mo

Re: UPDATE net/filezilla-3.45.1

[Björn Ketelaars]

On Sat 16/11/2019 17:31, Björn Ketelaars wrote:
> Diff below brings filezilla to 3.45.1. Changelog can be found at
> https://svn.filezilla-project.org/filezilla/FileZilla3/trunk/NEWS?revision=9474&view=markup&pathrev=9474.
> 
> Security related bugfix or otherwise critical bugfix:
> - Filenames containing double-quotation marks were not escaped correctly
>   when selected for opening/editing. Depending on the associated
>   program, parts of the filename could be interpreted as commands.
> 
> Note that this update depends on a newer version of libfilezilla than
> the one we have in ports. An update of the latter has been sent to
> ports@.
> 
> 'make test' fails as cppunit>=1.13.0 is required, which we do not have.
> Run tested on amd64.
> 
> It would be nice if this update would be tested on hppa and/or alpha...
> 
> Comments/OK?

Slightly updated diff (no need for 'do-test'). 'make test' runs¬   
successful with the update of cppunit [0].¬
¬  
OK?¬   
¬  
[0] https://marc.info/?l=openbsd-ports&m=157445228006211&w=2]¬


diff --git Makefile Makefile
index e70aa79b564..9fe36d0a42a 100644
--- Makefile
+++ Makefile
@@ -4,11 +4,10 @@ COMMENT=  fast FTP and SFTP GUI client with a lot of 
features
 BROKEN-hppa=   serverpath.h:17:19: error: variable 'CServerPath final' has 
initializer but incomplete type
 BROKEN-alpha=  serverpath.h:17:19: error: variable 'CServerPath final' has 
initializer but incomplete type
 
-V= 3.41.2
+V= 3.45.1
 PKGNAME=   filezilla-$V
 DISTNAME=  FileZilla_$V_src
 EXTRACT_SUFX=  .tar.bz2
-REVISION=  1
 
 CATEGORIES=net
 
@@ -19,8 +18,8 @@ HOMEPAGE= https://www.filezilla-project.org/
 PERMIT_PACKAGE=Yes
 
 WANTLIB += ${COMPILER_LIBCXX} ICE SDL2 SM X11 Xcomposite Xcursor
-WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
-WANTLIB += atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
+WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xss
+WANTLIB += Xxf86vm atk-1.0 atk-bridge-2.0 c cairo cairo-gobject
 WANTLIB += dbus-1 epoxy expat ffi filezilla fontconfig freetype
 WANTLIB += fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
 WANTLIB += gmp gnutls gobject-2.0 graphite2 gthread-2.0 gtk-3
@@ -37,12 +36,13 @@ COMPILER =  base-clang ports-gcc
 LIB_DEPENDS=   databases/sqlite3 \
devel/harfbuzz \
devel/libidn \
-   net/libfilezilla \
+   net/libfilezilla>=0.18.2 \
security/gnutls \
textproc/pugixml \
x11/dbus \
x11/wxWidgets>=3.0.4
 
+# XXX regression tests depend on cppunit>=1.13.0
 BUILD_DEPENDS= devel/cppunit \
devel/gettext,-tools \
devel/xdg-utils
@@ -50,8 +50,10 @@ RUN_DEPENDS= devel/desktop-file-utils \
devel/xdg-utils \
x11/gtk+3,-guic
 
-SEPARATE_BUILD= Yes
-CONFIGURE_STYLE=gnu
+SEPARATE_BUILD=Yes
+USE_GMAKE= Yes
+
+CONFIGURE_STYLE=autoreconf
 CONFIGURE_ARGS+=--with-dbus \
--with-tinyxml=builtin \
--disable-manualupdatecheck
@@ -60,12 +62,11 @@ CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
GREP=/usr/bin/grep \
SED=/usr/bin/sed
 
-USE_GMAKE= Yes
+AUTOCONF_VERSION = 2.69
+AUTOMAKE_VERSION = 1.15
+
 WRKDIST=   ${WRKDIR}/filezilla-$V
 
 FAKE_FLAGS+=   docsdir="${PREFIX}/share/examples/filezilla/"
 
-do-test:
-   @cd ${WRKBUILD}/tests && ${MAKE_PROGRAM} check-TESTS
-
 .include 
diff --git distinfo distinfo
index 6fead29135a..1364b21e5c8 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (FileZilla_3.41.2_src.tar.bz2) = 
wjviSDHxFXSLT9LBJoQPAxjltNpc09obA9qu+fff8Bc=
-SIZE (FileZilla_3.41.2_src.tar.bz2) = 4994803
+SHA256 (FileZilla_3.45.1_src.tar.bz2) = 
iJwIpyR/BVB8pL129OLNDgUE3rGBXHoqKNjPvaqdHsI=
+SIZE (FileZilla_3.45.1_src.tar.bz2) = 4649083
diff --git patches/patch-configure_ac patches/patch-configure_ac
new file mode 100644
index 000..8d614f732fb
--- /dev/null
+++ patches/patch-configure_ac
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: configure.ac
+--- configure.ac.orig
 configure.ac
+@@ -37,9 +37,7 @@ if ! test "$localesonly" = "yes"; then
+ 
+   if test "X$GCC" = Xyes; then
+ AX_APPEND_FLAG(-Wall, CFLAGS)
+-AX_APPEND_FLAG(-g, CFLAGS)
+ AX_APPEND_FLAG(-Wall, CXXFLAGS)
+-AX_APPEND_FLAG(-g, CXXFLAGS)
+   fi
+ 
+   # Do this early: Compiler and linker flags to work around a nasty bug in 
Xcode.
diff --git patches/patch-src_interface_file_utils_cpp 
patches/pat

FIX devel/py-prompt-toolkit

[Björn Ketelaars]

ipython is currently broken because of an import error:

ImportError: cannot import name 'create_prompt_application' from 
'prompt_toolkit.shortcuts' 
(/usr/local/lib/python3.7/site-packages/prompt_toolkit/shortcuts/__init__.py)

This is caused by having a newer version of py-prompt-toolkit installed
than is depended upon by IPython.

$ cd devel/py-prompt-toolkit && cvs log Makefile
...
revision 1.13
date: 2019/11/23 16:18:42;  author: ajacoutot;  state: Exp;  lines: +3 -8;  
commitid: pFCRGRLxxSuuji9U;
Update to py-prompt_toolkit-2.0.10.
- drop MAINTAINERship

revision 1.12
date: 2019/11/12 09:59:00;  author: kmos;  state: Exp;  lines: +6 -2;  
commitid: 04VgoCb1mMGxq38L;
Revert previous update. Doesn't work with ipython 5.8.0 and newer ipython
removes python2 support. Bump EPOCH.

ok kn

revision 1.11
date: 2019/11/11 09:11:19;  author: kn;  state: Exp;  lines: +2 -6;  commitid: 
Igef1UnzTSKllmdY;
Update to prompt_toolkit 2.0.10

Required for an upcoming iPython update.
aja removed aws-shell so the dependency requirement is invalid.

OK kmos
...

As of yet, no update of iPython has been proposed on ports@. OK to
revert py-prompt-toolkit once more to 1.0.15?


diff --git Makefile Makefile
index 9612032447b..ab172f7bf45 100644
--- Makefile
+++ Makefile
@@ -2,10 +2,10 @@
 
 COMMENT=   python library for building powerful interactive CLI
 
-MODPY_EGG_VERSION= 2.0.10
+MODPY_EGG_VERSION= 1.0.15
 DISTNAME=  prompt_toolkit-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
-EPOCH= 0
+EPOCH= 1
 
 CATEGORIES=devel
 
diff --git distinfo distinfo
index c11dd341ca9..ef04ab37e73 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (prompt_toolkit-2.0.10.tar.gz) = 
8Vr2j2bmZOqlWdSsipKBEe69X+2gwRc4tZmARSJIKds=
-SIZE (prompt_toolkit-2.0.10.tar.gz) = 347981
+SHA256 (prompt_toolkit-1.0.15.tar.gz) = 
hYWI8Zg8pJfxz0/94B2Xij6gKwHIomqLvFzS5m2BaRc=
+SIZE (prompt_toolkit-1.0.15.tar.gz) = 243734
diff --git pkg/PLIST pkg/PLIST
index bfe360cfcb1..febcc21ac32 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -9,37 +9,33 @@ 
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}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}patch_stdout.${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}renderer.${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}search_state.${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

Re: update net/dnscrypt-proxy 2.0.34

[Björn Ketelaars]

On Wed 04/12/2019 19:25, Nam Nguyen wrote:
> Here is an update to dnscrypt-proxy 2.0.34, released December 3, 2019.
> 
> Changelog:
> https://github.com/DNSCrypt/dnscrypt-proxy/releases/tag/2.0.34
> 
> The main change is dnscrypt-proxy acting as a local DoH server to
> support Encrypted Server Name Indication (ESNI) with Firefox and
> Cloudflare. I followed the instructions
> (https://github.com/DNSCrypt/dnscrypt-proxy/wiki/Local-DoH), and it
> works as described.
> 
> Tests pass and dnscrypt-proxy works. Feedback and tests are welcome.

Thanks for this update!

Diff looks good. No issues found while using it.

I will commit this update later tonight.

UPDATE devel/cppunit

[Björn Ketelaars]

Enclosed diff brings cppunit to 1.14.0. Overview on changes can be found
at https://cgit.freedesktop.org/libreoffice/cppunit/tree/NEWS.

This update is actually from giovanni@ [0], and includes some input from
sthen@ and me.

Changes to the port:
- Bump major of SHARED_LIBS as symbols have been removed
- Updated HOMEPAGE and MASTER_SITES
- Removed base-gcc from COMPILER. This update needs C++11

Tests:
- Regression test passes
- Build tested all consumers, including libreoffice, and ran 'make test'
  on some of the smaller ones

BTW, it seems that libreoffice is currently _not_ using cppunit from
ports although it is listed as BDEP:

configure:24201: checking which cppunit to use
configure:24302: result: internal

Comments/OK?


[0] https://marc.info/?l=openbsd-ports&m=157444225202584&w=2


diff --git Makefile Makefile
index b9723aafdd7..0878e966577 100644
--- Makefile
+++ Makefile
@@ -2,25 +2,22 @@
 
 COMMENT=   c++ unit testing framework
 
-DISTNAME=  cppunit-1.12.1
-REVISION = 4
+DISTNAME=  cppunit-1.14.0
 
-SHARED_LIBS += cppunit  3.0  # .1.0
+SHARED_LIBS += cppunit 4.0 # 1.14.0
 
 CATEGORIES=devel
 
-# XXX dead.  Switch to newer releases at
-# https://freedesktop.org/wiki/Software/cppunit/ ?
-HOMEPAGE=  http://cppunit.sourceforge.net/
+HOMEPAGE=  https://www.freedesktop.org/wiki/Software/cppunit/
 
 # LGPLv2.1
 PERMIT_PACKAGE=Yes
 
 WANTLIB=   c m ${COMPILER_LIBCXX}
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=cppunit/}
+MASTER_SITES=  https://dev-www.libreoffice.org/src/
 
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc
 
 USE_GMAKE= Yes
 
diff --git distinfo distinfo
index a0869eaec88..b37b399fac8 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (cppunit-1.12.1.tar.gz) = rCigTI5skhfZELCucSKDLSjZkX+maLzJ4LiwmstOpEo=
-SIZE (cppunit-1.12.1.tar.gz) = 762803
+SHA256 (cppunit-1.14.0.tar.gz) = PVaYadJ7SIYCEMdYxPMTCCEDpeWCGadmm1K/0p1nR4A=
+SIZE (cppunit-1.14.0.tar.gz) = 959716
diff --git patches/patch-Makefile_in patches/patch-Makefile_in
index 58d53f248d2..02bda14216a 100644
--- patches/patch-Makefile_in
+++ patches/patch-Makefile_in
@@ -1,12 +1,13 @@
 $OpenBSD: patch-Makefile_in,v 1.1 2008/10/24 14:49:44 jasper Exp $
 Makefile.in.orig   Sun Oct 19 23:43:08 2008
-+++ Makefile.inSun Oct 19 23:43:11 2008
-@@ -231,7 +231,7 @@ top_builddir = @top_builddir@
+Index: Makefile.in
+--- Makefile.in.orig
 Makefile.in
+@@ -385,7 +385,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
- AUTOMAKE_OPTIONS = 1.4
- ACLOCAL_AMFLAGS = -I config
+ ACLOCAL_AMFLAGS = -I m4
 -SUBDIRS = src include examples doc
 +SUBDIRS = src include examples
- pkgconfigdatadir = $(libdir)/pkgconfig
- pkgconfigdata_DATA = cppunit.pc
- bin_SCRIPTS = cppunit-config
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = cppunit.pc
+ doc_DATA = \
diff --git patches/patch-src_cppunit_Makefile_in 
patches/patch-src_cppunit_Makefile_in
index dd6c4cabd13..0410c349726 100644
--- patches/patch-src_cppunit_Makefile_in
+++ patches/patch-src_cppunit_Makefile_in
@@ -1,13 +1,14 @@
 $OpenBSD: patch-src_cppunit_Makefile_in,v 1.2 2008/10/24 14:49:44 jasper Exp $
 src/cppunit/Makefile.in.orig   Wed Feb 20 06:59:55 2008
-+++ src/cppunit/Makefile.inSun Oct 19 23:03:52 2008
-@@ -299,8 +299,7 @@ libcppunit_la_SOURCES = \
+Index: src/cppunit/Makefile.in
+--- src/cppunit/Makefile.in.orig
 src/cppunit/Makefile.in
+@@ -446,8 +446,7 @@ libcppunit_la_SOURCES = \
Win32DynamicLibraryManager.cpp
  
  libcppunit_la_LDFLAGS = \
 - -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
-- -release $(LT_RELEASE)
+- -release $(LT_RELEASE) $(LIBADD_DL)
 + -no-undefined -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
+ libcppunit_la_LIBADD = $(LIBADD_DL)
  all: all-am
- 
diff --git pkg/PLIST pkg/PLIST
index 64890cb17e3..a8f51eda0af 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,6 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.3 2015/03/16 18:07:39 naddy Exp $
 @bin bin/DllPlugInTester
-bin/cppunit-config
 include/cppunit/
 include/cppunit/AdditionalMessage.h
 include/cppunit/Asserter.h
@@ -67,33 +66,27 @@ include/cppunit/plugin/PlugInParameters.h
 include/cppunit/plugin/TestPlugIn.h
 include/cppunit/plugin/TestPlugInDefaultImpl.h
 include/cppunit/portability/
-include/cppunit/portability/CppUnitDeque.h
-include/cppunit/portability/CppUnitMap.h
-include/cppunit/portability/CppUnitSet.h
-include/cppunit/portability/CppUnitStack.h
-include/cppunit/portability/CppUnitVector.h
 include/cppunit/portability/FloatingPoint.h
 include/cppunit/portability/Stream.h
 include/cppunit/tools/
 include/cppunit/tools/Algorithm.h
+include/cppunit/tools/StringHelper.h
 include/cppunit/tools/StringTools.h
 include/cppunit/tools/XmlDocument.h
 include/cppunit/tools/XmlElement.h
 include/cppunit/ui/
-include/cppunit/ui/mfc/
-include/cppunit/ui/mfc/MfcTestR

Re: update net/dnscrypt-proxy 2.0.35

[Björn Ketelaars]

On Mon 09/12/2019 18:34, Nam Nguyen wrote:
> Here is an update to net/dnscrypt-proxy 2.0.35 released December 9,
> 2019.
> 

Committed. Thank you!

Re: NEW: sysutils/py-filelock 3.0.12 - Needed for py-tox update

[Björn Ketelaars]

On Fri 13/12/2019 18:01, Kurt Mosiejczuk wrote:
> On Mon, Nov 25, 2019 at 12:02:44AM -0500, Kurt Mosiejczuk wrote:
> > On Sun, Oct 27, 2019 at 11:46:37PM -0400, Kurt Mosiejczuk wrote:
> > > On Sat, Jul 20, 2019 at 10:09:37PM -0400, Kurt Mosiejczuk wrote:
> > > > On Wed, Jun 26, 2019 at 03:57:12PM -0400, Kurt Mosiejczuk wrote:
> > > > > On Sun, Jun 09, 2019 at 08:44:30PM -0400, Kurt Mosiejczuk wrote:
> > > > > > Attached is sysutils/py-filelock 3.0.12
> 
> > > > > > This is a dependency needed to update devel/py-tox
> 
> > > > > > Passes its regression tests on amd64 and sparc64.
> 
> > > > > Ping
> 
> > > > Ping
> 
> > > > (Port attached again for convenience)
> 
> > > Ping.
> 
> > Ping.
> 
> Ping.


OK bket@

Re: NEW: py-query

[Björn Ketelaars]

On Fri 13/12/2019 18:08, Kurt Mosiejczuk wrote:
> On Mon, Nov 25, 2019 at 12:01:37AM -0500, Kurt Mosiejczuk wrote:
> > On Sun, Oct 27, 2019 at 11:47:46PM -0400, Kurt Mosiejczuk wrote:
> > > On Mon, Sep 23, 2019 at 01:09:11AM -0400, Kurt Mosiejczuk wrote:
> > > > On Sun, Jun 30, 2019 at 10:19:16PM -0400, Kurt Mosiejczuk wrote:
> > > > > Here is www/py-query a new port. pyquery is a jquery like facility for
> > > > > Python. 
> 
> > > > > This is one of the missing TEST_DEPENDS for www/py-webtest, along with
> > > > > WSGIProxy2 (Which I sent out earlier as a potential replacement for
> > > > > www/py-wsgiproxy).
> 
> > > > Ping.
> 
> > > > Now with missing TEST_DEPENDS on www/py-webtest
> 
> > > Ping.
> 
> > Ping.
> 
> Ping.
> 
> --Kurt

OK bket@

Re: NEW: devel/py-process-tests

[Björn Ketelaars]

On Fri 13/12/2019 18:13, Kurt Mosiejczuk wrote:
> On Fri, Nov 22, 2019 at 09:55:58PM -0500, Kurt Mosiejczuk wrote:
> > This is one I ported to get the tests for the existing py-test-cov going.
> > Looks like will be useful for another port pamela@ is looking at.
> 
> > "Tools for testing processes."
> 
> > No regression tests upstream.
> 
> Ping.
> 
> --Kurt

OK bket@

FIX textproc/podofo

[Björn Ketelaars]

jca@ found that textproc/podofo uses -std=c++98 but cppunit now uses
c++11 features for which ports-gcc insists that -std=c/gnu++11 should be
used.

/usr/local/include/c++/8.3.0/bits/c++0x_warning.h:32:2: error: #error This file 
requires compiler and library support for the ISO C++ 2011 standard

This issue has been addressed upstream [0]. Updating podofo to the
latest version is kind of a thing as it breaks one of the consumers [1].
As such, I propose to cherry-pick the fix.

OK?

[0] https://sourceforge.net/p/podofo/code/1826
[1] https://marc.info/?l=openbsd-ports&m=156512669427812&w=2


diff --git Makefile Makefile
index f4d66b611bf..5cd0e969e22 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,7 @@
 COMMENT=   library and tools to modify and parse PDF documents
 
 DISTNAME=  podofo-0.9.5
-REVISION=  1
+REVISION=  2
 
 SHARED_LIBS += podofo2.0 # 0.9
 
diff --git patches/patch-CMakeLists_txt patches/patch-CMakeLists_txt
index 18dacdea78c..54d760c5b6d 100644
--- patches/patch-CMakeLists_txt
+++ patches/patch-CMakeLists_txt
@@ -1,12 +1,20 @@
 $OpenBSD: patch-CMakeLists_txt,v 1.4 2017/02/07 15:10:10 sthen Exp $
 CMakeLists.txt.origWed Feb  1 21:23:03 2017
-+++ CMakeLists.txt Tue Feb  7 14:51:41 2017
-@@ -298,7 +298,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
+
+Do not force c++98 standard for GNUCXX compiler. Adapted from
+https://sourceforge.net/p/podofo/code/1826.
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -296,9 +296,9 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
+ SET(PODOFO_USE_VISIBILITY ${PODOFO_HAVE_GCC4})
+ ENDIF(NOT DEFINED PODOFO_USE_VISIBILITY)
  
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
+-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++98")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
  
 -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual 
-Wswitch-enum -Wcast-qual -Wwrite-strings -Wredundant-decls -Wreorder")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual 
-Wswitch-enum -Wcast-qual -Wwrite-strings -Wreorder")
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Woverloaded-virtual 
-Wswitch-enum -Wcast-qual -Wwrite-strings -Wreorder 
-Wno-deprecated-declarations")
  
  #
  # Note that we do not need debug definitions here. Set
diff --git pkg/PLIST pkg/PLIST
index 905eb627d4b..787fb017c3d 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -127,7 +127,7 @@ include/podofo/doc/PdfTilingPattern.h
 include/podofo/doc/PdfXObject.h
 include/podofo/podofo-base.h
 include/podofo/podofo.h
-lib/libpodofo.a
+@static-lib lib/libpodofo.a
 @lib lib/libpodofo.so.${LIBpodofo_VERSION}
 lib/pkgconfig/libpodofo-0.pc
 @man man/man1/podofobox.1

UPDATE security/rhash

[Björn Ketelaars]

Enclosed diff brings rhash to 1.3.9, which is a maintenance release.
One of the changes is that the project license changed to BSD Zero
Clause License. Changelog can be found at
https://github.com/rhash/RHash/blob/v1.3.9/ChangeLog.

Changes to the port:
- update license marker to BSD
- set DEBUG_PACKAGES=${BUILD_PACKAGES}

Testing:
- 'make test' runs successful
- tested its only consumer: cmake

Comments/OK?


diff --git Makefile Makefile
index 6524a596f1c..30f26250a78 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  utility and library for computing hash sums
 
-DISTNAME = rhash-1.3.8-src
+DISTNAME = rhash-1.3.9-src
 PKGNAME =  ${DISTNAME:S/-src$//}
 
 SHARED_LIBS =  rhash 0.0
@@ -13,7 +13,7 @@ HOMEPAGE =http://rhash.sf.net
 
 MAINTAINER =   Bjorn Ketelaars 
 
-# MIT
+# BSD
 PERMIT_PACKAGE =   Yes
 
 WANTLIB =  c
@@ -30,6 +30,8 @@ CONFIGURE_ARGS =  --enable-lib-static \
--prefix=${PREFIX} \
--sysconfdir=${SYSCONFDIR}
 
+DEBUG_PACKAGES =   ${BUILD_PACKAGES}
+
 WRKDIST =  ${WRKDIR}/${PKGNAME:S/^rhash/RHash/}
 
 pre-configure:
diff --git distinfo distinfo
index 67d2dc248cb..fdcb7dce9db 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (rhash-1.3.8-src.tar.gz) = vlNqVqz+/IfbyLHbMPxjkCDkHt8FUYGF6phjDj33wEw=
-SIZE (rhash-1.3.8-src.tar.gz) = 393544
+SHA256 (rhash-1.3.9-src.tar.gz) = QrEAb5mK2xibHzFr8aYOMXHaBHqFxKre0tDSbBR2yfY=
+SIZE (rhash-1.3.9-src.tar.gz) = 403415
diff --git patches/patch-Makefile patches/patch-Makefile
index 55b73d3f330..c4be7bec9b3 100644
--- patches/patch-Makefile
+++ patches/patch-Makefile
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.3 2019/11/24 04:43:26 bket Exp $
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -81,8 +81,8 @@ install-man:
+@@ -79,8 +79,8 @@ install-man:
$(INSTALL_DATA) dist/rhash.1 $(MANDIR)/man1/rhash.1
  
  install-conf:
diff --git patches/patch-configure patches/patch-configure
index d79cb451346..67720861944 100644
--- patches/patch-configure
+++ patches/patch-configure
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.1 2019/11/24 04:43:26 bket Exp $
 Index: configure
 --- configure.orig
 +++ configure
-@@ -540,7 +540,7 @@ OPTFLAGS=$(join_params $BUILD_DEBUG $OPTLEVEL $OPTFLAG
+@@ -598,7 +598,7 @@ log_finish
  # detect proper shared library name
  SHARED_PREFIX="lib"
  STATIC_PREFIX="lib"
diff --git pkg/PLIST pkg/PLIST
index e215531df8a..bf7979c5ae3 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -2,7 +2,8 @@
 bin/ed2k-link
 bin/edonr256-hash
 bin/edonr512-hash
-bin/gost-hash
+bin/gost12-256-hash
+bin/gost12-512-hash
 bin/has160-hash
 bin/magnet-link
 @bin bin/rhash
@@ -17,7 +18,8 @@ include/rhash_torrent.h
 @man man/man1/ed2k-link.1
 @man man/man1/edonr256-hash.1
 @man man/man1/edonr512-hash.1
-@man man/man1/gost-hash.1
+@man man/man1/gost12-256-hash.1
+@man man/man1/gost12-512-hash.1
 @man man/man1/has160-hash.1
 @man man/man1/magnet-link.1
 @man man/man1/rhash.1

Re: NEW: mail/gmail-oauth2

[Björn Ketelaars]

On Mon 16/12/2019 19:52, Stuart Henderson wrote:
> 
> oauth2.py is a script that can be used as a standalone utility for
> generating and authorizing OAuth tokens, and for generating OAuth2
> authentication strings from OAuth tokens.
> 
> This can be used with mutt to allow oauth2 logins to Gmail.
> 
> 
> More info at https://github.com/google/gmail-oauth2-tools /
> https://github.com/google/gmail-oauth2-tools/wiki/OAuth2DotPyRunThrough
> 
> OK to import?


oauth2.py is noisy when refreshing a token. This causes mutt to fail
when using the *_oauth_refresh_command from pkg/README. This is easily
fixed by using the '--quiet' argument. Use of the latter is mentioned by
http://www.mutt.org/doc/manual/#oauth.

Your port, with the diff below has been tested successfully with mutt
and a gmail account.

OK with the diff below.


diff --git pkg/README pkg/README
index db32dd7d032..f4856afa093 100644
--- pkg/README
+++ pkg/README
@@ -29,8 +29,8 @@ token:
 
 set imap_authenticators="oauthbearer"
 set imap_user=""
-set imap_oauth_refresh_command="oauth2.py --user=USER 
--client_id=CLIENTID.apps.googleusercontent.com --client_secret=CLIENT_SECRET 
--refresh_token=REFRESH_TOKEN"
+set imap_oauth_refresh_command="oauth2.py --quiet --user=USER 
--client_id=CLIENTID.apps.googleusercontent.com --client_secret=CLIENT_SECRET 
--refresh_token=REFRESH_TOKEN"
 
 set smtp_authenticators="oauthbearer"
 set smtp_url="smtps://u...@gmail.com@smtp.gmail.com:465"
-set smtp_oauth_refresh_command="oauth2.py --user=USER 
--client_id=CLIENTID.apps.googleusercontent.com --client_secret=CLIENT_SECRET 
--refresh_token=REFRESH_TOKEN"
+set smtp_oauth_refresh_command="oauth2.py --quiet --user=USER 
--client_id=CLIENTID.apps.googleusercontent.com --client_secret=CLIENT_SECRET 
--refresh_token=REFRESH_TOKEN"

Re: NEW: devel/py-argparse

[Björn Ketelaars]

On Fri 20/12/2019 00:30, Pamela Mosiejczuk wrote:
> py-argparse is a new build dependency required to update our existing
> backport of py-unittest2.
> 
> DESCR:
> The argparse module makes it easy to write user friendly command line
> interfaces.
> The program defines what arguments it requires, and argparse will figure out
> how to parse those out of sys.argv. The argparse module also automatically
> generates help and usage messages and issues errors when users give the
> program invalid arguments.
> 
> 
> Passes all tests on both flavors.
> 
> Comments/OKs?

OK bket@

Re: NEW: devel/py-fixtures

[Björn Ketelaars]

On Fri 20/12/2019 00:33, Pamela Mosiejczuk wrote:
> py-fixtures is a shared test dependency for new ports py-traceback2 and
> py-linecache2, which are needed to update py-unittest2.
> 
> Fixtures defines a Python contract for reusable state / support
> logic, primarily for unit testing. Helper and adaptation logic is
> included to make it easy to write your own fixtures using the
> fixtures contract.
> 
> One test intermittently fails (I haven't figured out why), 129 pass for both
> flavors.
> 
> Comments/OKs?

OK bket@

Re: NEW: devel/py-traceback2

[Björn Ketelaars]

On Fri 20/12/2019 00:35, Pamela Mosiejczuk wrote:
> py-traceback2 is a new build+run dependency needed for an update to
> py-unittest2.
> 
> traceback2 is a backport of the traceback module. To test this port, my new
> proposed ports py-linecache2 and py-fixtures are needed (and unittest2
> itself).
> 
> All tests pass.
> 
> Comments/OKs?
> 

OK bket@

Re: update dnscrypt-proxy 2.0.36

[Björn Ketelaars]

On Sun 22/12/2019 00:44, Nam Nguyen wrote:
> 
> There is a security fix with this update so consider committing this to
> -stable.
> 
> Details:
> The changelog omits the details so I inferred that "[security]
> Predictable TXID can lead to response forgeries" was the issue.
> 
> "The miegkg/dns module was updated to version 1.1.26, that fixes a
> security issue affecting non-encrypted/non-authenticated DNS traffic. In
> dnscrypt-proxy, this only affects the forwarding feature."
> 
> https://github.com/miekg/dns/pull/1044
> https://github.com/miekg/dns/issues/1043
> https://github.com/DNSCrypt/dnscrypt-proxy/wiki/Forwarding
> 
> Changelog:
> https://github.com/DNSCrypt/dnscrypt-proxy/blob/2.0.36/ChangeLog
> 
> This update is for dnscrypt-proxy 2.0.36, released December 21,
> 2019. Tests are welcome.

I tested your update on amd64 current without any issues, and have
committed it. Thank you!

I think it is worth the effort to commit this update to 6.6 as well, and
will do so tonight...unless someone objects.

Re: UPDATE security/rhash

[Björn Ketelaars]

On Sun 15/12/2019 07:04, Björn Ketelaars wrote:
> Enclosed diff brings rhash to 1.3.9, which is a maintenance release.
> One of the changes is that the project license changed to BSD Zero
> Clause License. Changelog can be found at
> https://github.com/rhash/RHash/blob/v1.3.9/ChangeLog.
> 
> Changes to the port:
> - update license marker to BSD
> - set DEBUG_PACKAGES=${BUILD_PACKAGES}
> 
> Testing:
> - 'make test' runs successful
> - tested its only consumer: cmake
> 
> Comments/OK?

Ping...

For your convenience:


diff --git Makefile Makefile
index 6524a596f1c..30f26250a78 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  utility and library for computing hash sums
 
-DISTNAME = rhash-1.3.8-src
+DISTNAME = rhash-1.3.9-src
 PKGNAME =  ${DISTNAME:S/-src$//}
 
 SHARED_LIBS =  rhash 0.0
@@ -13,7 +13,7 @@ HOMEPAGE =http://rhash.sf.net
 
 MAINTAINER =   Bjorn Ketelaars 
 
-# MIT
+# BSD
 PERMIT_PACKAGE =   Yes
 
 WANTLIB =  c
@@ -30,6 +30,8 @@ CONFIGURE_ARGS =  --enable-lib-static \
--prefix=${PREFIX} \
--sysconfdir=${SYSCONFDIR}
 
+DEBUG_PACKAGES =   ${BUILD_PACKAGES}
+
 WRKDIST =  ${WRKDIR}/${PKGNAME:S/^rhash/RHash/}
 
 pre-configure:
diff --git distinfo distinfo
index 67d2dc248cb..fdcb7dce9db 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (rhash-1.3.8-src.tar.gz) = vlNqVqz+/IfbyLHbMPxjkCDkHt8FUYGF6phjDj33wEw=
-SIZE (rhash-1.3.8-src.tar.gz) = 393544
+SHA256 (rhash-1.3.9-src.tar.gz) = QrEAb5mK2xibHzFr8aYOMXHaBHqFxKre0tDSbBR2yfY=
+SIZE (rhash-1.3.9-src.tar.gz) = 403415
diff --git patches/patch-Makefile patches/patch-Makefile
index 55b73d3f330..c4be7bec9b3 100644
--- patches/patch-Makefile
+++ patches/patch-Makefile
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.3 2019/11/24 04:43:26 bket Exp $
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -81,8 +81,8 @@ install-man:
+@@ -79,8 +79,8 @@ install-man:
$(INSTALL_DATA) dist/rhash.1 $(MANDIR)/man1/rhash.1
  
  install-conf:
diff --git patches/patch-configure patches/patch-configure
index d79cb451346..67720861944 100644
--- patches/patch-configure
+++ patches/patch-configure
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.1 2019/11/24 04:43:26 bket Exp $
 Index: configure
 --- configure.orig
 +++ configure
-@@ -540,7 +540,7 @@ OPTFLAGS=$(join_params $BUILD_DEBUG $OPTLEVEL $OPTFLAG
+@@ -598,7 +598,7 @@ log_finish
  # detect proper shared library name
  SHARED_PREFIX="lib"
  STATIC_PREFIX="lib"
diff --git pkg/PLIST pkg/PLIST
index e215531df8a..bf7979c5ae3 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -2,7 +2,8 @@
 bin/ed2k-link
 bin/edonr256-hash
 bin/edonr512-hash
-bin/gost-hash
+bin/gost12-256-hash
+bin/gost12-512-hash
 bin/has160-hash
 bin/magnet-link
 @bin bin/rhash
@@ -17,7 +18,8 @@ include/rhash_torrent.h
 @man man/man1/ed2k-link.1
 @man man/man1/edonr256-hash.1
 @man man/man1/edonr512-hash.1
-@man man/man1/gost-hash.1
+@man man/man1/gost12-256-hash.1
+@man man/man1/gost12-512-hash.1
 @man man/man1/has160-hash.1
 @man man/man1/magnet-link.1
 @man man/man1/rhash.1

UPDATE sysutils/rclone-1.50.2

[Björn Ketelaars]

Enclosed diff brings rclone to 1.50.2, which fixes a couple of bugs. The
list of changes between the version in ports and this update is a bit
long. Overview can be found at https://rclone.org/changelog/.

I'm a frequent user of rclone and would like to take MAINTAINER.

The webdav backend has been tested extensively. No regressions found.

OK?

diff --git Makefile Makefile
index b6f813d22bc..7afddf985ec 100644
--- Makefile
+++ Makefile
@@ -2,15 +2,16 @@
 
 COMMENT =  rsync for cloud storage
 
-V =1.48.0
+V =1.50.2
 DISTNAME = rclone-v${V}
 PKGNAME =  rclone-${V}
-REVISION = 0
 
 CATEGORIES =   sysutils
 
 HOMEPAGE = https://rclone.org/
 
+MAINTAINER =   Bjorn Ketelaars 
+
 # MIT
 PERMIT_PACKAGE = Yes
 
@@ -21,7 +22,7 @@ MASTER_SITES =  
https://github.com/ncw/rclone/releases/download/v${V}/
 MODULES =  lang/go
 MODGO_TYPE =   bin
 
-ALL_TARGET =   github.com/ncw/rclone
+ALL_TARGET =   github.com/rclone/rclone
 
 do-install:
${INSTALL_PROGRAM} ${MODGO_WORKSPACE}/bin/rclone ${PREFIX}/bin/
diff --git distinfo distinfo
index 58e0372fae7..a9606cc6019 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (rclone-v1.48.0.tar.gz) = jP7QsODDQcdNRm0+zITjXjJmY5HQdURdUP5iMDXNA+Q=
-SIZE (rclone-v1.48.0.tar.gz) = 17613425
+SHA256 (rclone-v1.50.2.tar.gz) = bdiZinJRTTgg0kGuRtxgnAMFt0Ku49tqr2AXtGyZYJE=
+SIZE (rclone-v1.50.2.tar.gz) = 18472434

UPDATE security/scrypt

[Björn Ketelaars]

Diff below brings security/scrypt to 1.3.0. Significant changes since
1.2.1 [0]:
- In addition to the scrypt command-line utility, a library
  "libscrypt-kdf" can now be built and installed by passing the
  --enable-libscrypt-kdf option to configure.
- On x86 CPUs which support them, RDRAND and SHA extensions are used to
  provide supplemental entropy and speed up hash computations
  respectively.
- When estimating the amount of available RAM, scrypt ignores
  RLIMIT_DATA on systems which have mmap.
- A new command "scrypt info encfile" prints information about an
  encrypted file without decrypting it.

Changes to the port:
- Build and package libscrypt-kdf.
- Change HOMEPAGE/MASTER_SITES to https.
- Enable tests.
- Set DEBUG_PACKAGES.

Testing:
'make test' runs successfully

Comments/OK?


[0] http://mail.tarsnap.com/scrypt/msg00261.html


diff --git Makefile Makefile
index 3c3a2989df8..57667e2dd9a 100644
--- Makefile
+++ Makefile
@@ -2,11 +2,13 @@
 
 COMMENT =  command-line encryption using scrypt key derivation function
 
-DISTNAME = scrypt-1.2.1
+DISTNAME = scrypt-1.3.0
+
+SHARED_LIBS += scrypt-kdf0.0 # 1.0
 
 CATEGORIES =   security
 
-HOMEPAGE = http://www.tarsnap.com/scrypt/
+HOMEPAGE = https://www.tarsnap.com/scrypt/
 
 # BSD
 PERMIT_PACKAGE =   Yes
@@ -17,7 +19,10 @@ MASTER_SITES =   ${HOMEPAGE}
 EXTRACT_SUFX = .tgz
 
 CONFIGURE_STYLE =  gnu
+CONFIGURE_ARGS =   --enable-libscrypt-kdf
+
+DEBUG_PACKAGES =   ${BUILD_PACKAGES}
 
-NO_TEST =  Yes
+TEST_TARGET =  test
 
 .include 
diff --git distinfo distinfo
index 8a34c030d44..a08d6ba134c 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (scrypt-1.2.1.tgz) = RiH159ovgC4ghQQ2IZNwCS6fzak71Zj21CNszjP0xXc=
-SIZE (scrypt-1.2.1.tgz) = 127619
+SHA256 (scrypt-1.3.0.tgz) = JjA07dTR4RfUBR2akmDHTe2w769EkcUVK3OJeLPzJ0g=
+SIZE (scrypt-1.3.0.tgz) = 380332
diff --git patches/patch-tests_test_scrypt_sh patches/patch-tests_test_scrypt_sh
new file mode 100644
index 000..5ee6fb254f2
--- /dev/null
+++ patches/patch-tests_test_scrypt_sh
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: tests/test_scrypt.sh
+--- tests/test_scrypt.sh.orig
 tests/test_scrypt.sh
+@@ -14,7 +14,7 @@ out_valgrind="${bindir}/tests-valgrind"
+ password="hunter2"
+ 
+ # Find system scrypt, and ensure it supports -P.
+-system_scrypt=$( find_system scrypt enc -P )
++system_scrypt=$( find_system ${scriptdir}/../scrypt enc -P )
+ 
+ 
+ ### Run tests using project-specific constants
diff --git pkg/PLIST pkg/PLIST
index 733536472a5..d6f4b7b7bec 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,3 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2009/05/25 22:48:48 sthen Exp $
 @bin bin/scrypt
+include/scrypt-kdf.h
+@static-lib lib/libscrypt-kdf.a
+lib/libscrypt-kdf.la
+@lib lib/libscrypt-kdf.so.${LIBscrypt-kdf_VERSION}
 @man man/man1/scrypt.1

UPDATE audio/mpd-0.21.18

[Björn Ketelaars]

Diff below brings mpd to 0.21.18, which fixes a curl related bug.
Changelog can be found at
https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.18/NEWS.

While here sync WANTLIB.

Tested on amd64 in combination with mpc and ncmpc.

Comments/OK?


diff --git Makefile Makefile
index fc78d4511ea..6efd562363a 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 BROKEN-hppa =  no atomic ops
 COMMENT =  Music Player Daemon
-VER =  0.21.16
+VER =  0.21.18
 DISTNAME = mpd-${VER}
 EXTRACT_SUFX = .tar.xz
 CATEGORIES =   audio
@@ -13,7 +13,7 @@ PERMIT_PACKAGE =  Yes
 
 WANTLIB =  FLAC audiofile avcodec avformat avutil \
bz2 c cdio cdio_cdda cdio_paranoia curl \
-   expat faad iconv icui18n icuuc \
+   expat faad icui18n icuuc \
id3tag iso9660 m mikmod mp3lame mpcdec \
mpdclient ogg opus pcre pthread samplerate \
shout sndfile sndio sqlite3 \
diff --git distinfo distinfo
index bf82fac8c5d..63aee9e3cbc 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (mpd-0.21.16.tar.xz) = MM8b3ffXOISHJ2dFrTUV8TTgfwxX+fl8srXTvv1KTZI=
-SIZE (mpd-0.21.16.tar.xz) = 673732
+SHA256 (mpd-0.21.18.tar.xz) = h4LmbNWv1skoYHJRlrNbbfB9PRJ+9w6QDhRDIwielEI=
+SIZE (mpd-0.21.18.tar.xz) = 676084

UPDATE audio/mpc-0.33

[Björn Ketelaars]

Enclosed a simple diff for updating mpc to the latest release. Changes
between the version in ports and this update [0]:
- fix off-by-one bug in "prio" command
- reduce network transfer for "playlist", "ls", "listall"

Tested in combination with mpd-0.21.18 (update send to ports@).

Comments/OK?

[0] https://raw.githubusercontent.com/MusicPlayerDaemon/mpc/v0.33/NEWS


diff --git Makefile Makefile
index 9e4629fb04d..9064d0e84df 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   command line client for mpd
 
-VER=   0.32
+VER=   0.33
 DISTNAME=  mpc-${VER}
 CATEGORIES=audio
 EXTRACT_SUFX=  .tar.xz
diff --git distinfo distinfo
index c6140d0cb12..15b99f7caf6 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (mpc-0.32.tar.xz) = eWHZW3zgGZlr6rKBz5V+kFZnyYnFP//ROt5eYv6jMcc=
-SIZE (mpc-0.32.tar.xz) = 44716
+SHA256 (mpc-0.33.tar.xz) = T0DMvhj1CVQ3KDz8UlqXgV6YPL/Top5I/2EPpPG/EpY=
+SIZE (mpc-0.33.tar.xz) = 45044

UPDATE audio/ncmpc-0.36

[Björn Ketelaars]

Enclosed diff brings audio/ncmpc to 0.36. From
https://raw.githubusercontent.com/MusicPlayerDaemon/ncmpc/v0.36/NEWS:

ncmpc 0.36 - (2019-11-05)
- screen_keydef: show "Add new key" only if there is room for more keys
- support the Alt modifier in hotkeys
- reduce network transfer

While here sync WANTLIB.

Tested on amd64 in combination with mpd-0.21.18 (update send to ports@).

Comments/OK?


diff --git Makefile Makefile
index a922e4d6cb4..2db1d3bc9ec 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   curses based frontend for mpd
 
-VER=   0.35
+VER=   0.36
 DISTNAME=  ncmpc-${VER}
 EPOCH= 0
 CATEGORIES=audio
@@ -13,7 +13,7 @@ HOMEPAGE= https://www.musicpd.org/clients/ncmpc/
 PERMIT_PACKAGE=Yes
 
 # make sure to regen WANTLIB on ld.lld arches (-Wl,--as-needed)
-WANTLIB=   c intl m mpdclient>=1 ${COMPILER_LIBCXX} curses pcre
+WANTLIB=   c intl mpdclient>=1 ${COMPILER_LIBCXX} curses pcre
 
 MASTER_SITES=  https://www.musicpd.org/download/ncmpc/${VER:R}/
 
diff --git distinfo distinfo
index 51f552669da..9ad0fe92fb2 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (ncmpc-0.35.tar.xz) = vU8eY4KQkV4IvgRQh8HfLVYtASsU9mLdM/18cEPd0kE=
-SIZE (ncmpc-0.35.tar.xz) = 232828
+SHA256 (ncmpc-0.36.tar.xz) = RjKHPfyO/mHlAdyRhKW5IbSCvi3b7dPSPQUkHUd6Piw=
+SIZE (ncmpc-0.36.tar.xz) = 237768
diff --git patches/patch-src_ProgressBar_cxx patches/patch-src_ProgressBar_cxx
index 96977e3fa76..397f4a202f6 100644
--- patches/patch-src_ProgressBar_cxx
+++ patches/patch-src_ProgressBar_cxx
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_ProgressBar_cxx,v 1.1 2019/01/02 21:30:48 
landry Exp $
 Index: src/ProgressBar.cxx
 --- src/ProgressBar.cxx.orig
 +++ src/ProgressBar.cxx
-@@ -29,7 +29,7 @@ ProgressBar::ProgressBar(Point p, unsigned _width)
+@@ -30,7 +30,7 @@ ProgressBar::ProgressBar(Point p, unsigned _width) noe
leaveok(window.w, true);
  #ifdef ENABLE_COLORS
if (options.enable_colors)
diff --git patches/patch-src_StatusBar_cxx patches/patch-src_StatusBar_cxx
index 1edd55c9e45..03b04fe857f 100644
--- patches/patch-src_StatusBar_cxx
+++ patches/patch-src_StatusBar_cxx
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_StatusBar_cxx,v 1.1 2019/01/02 21:30:48 
landry Exp $
 Index: src/StatusBar.cxx
 --- src/StatusBar.cxx.orig
 +++ src/StatusBar.cxx
-@@ -44,7 +44,7 @@ StatusBar::StatusBar(boost::asio::io_service &io_servi
+@@ -43,7 +43,7 @@ StatusBar::StatusBar(boost::asio::io_service &io_servi
  
  #ifdef ENABLE_COLORS
if (options.enable_colors)
diff --git patches/patch-src_TitleBar_cxx patches/patch-src_TitleBar_cxx
index 2774df51142..319f3edd150 100644
--- patches/patch-src_TitleBar_cxx
+++ patches/patch-src_TitleBar_cxx
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_TitleBar_cxx,v 1.1 2019/01/02 21:30:48 
landry Exp $
 Index: src/TitleBar.cxx
 --- src/TitleBar.cxx.orig
 +++ src/TitleBar.cxx
-@@ -38,7 +38,7 @@ TitleBar::TitleBar(Point p, unsigned width)
+@@ -38,7 +38,7 @@ TitleBar::TitleBar(Point p, unsigned width) noexcept
  
  #ifdef ENABLE_COLORS
if (options.enable_colors)
diff --git patches/patch-src_screen_cxx patches/patch-src_screen_cxx
index a20ebc2efe1..ad53b705eb1 100644
--- patches/patch-src_screen_cxx
+++ patches/patch-src_screen_cxx
@@ -5,7 +5,7 @@ Because c++14 zomg woot woot
 Index: src/screen.cxx
 --- src/screen.cxx.orig
 +++ src/screen.cxx
-@@ -48,8 +48,8 @@ ScreenManager::MakePage(const PageMeta &sf)
+@@ -44,8 +44,8 @@ ScreenManager::MakePage(const PageMeta &sf) noexcept
return i;
  
auto j = pages.emplace(&sf,
diff --git patches/patch-src_screen_init_cxx patches/patch-src_screen_init_cxx
index fcaf9c60bc1..3ba805ce7ec 100644
--- patches/patch-src_screen_init_cxx
+++ patches/patch-src_screen_init_cxx
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_screen_init_cxx,v 1.1 2019/01/02 21:30:48 
landry Exp $
 Index: src/screen_init.cxx
 --- src/screen_init.cxx.orig
 +++ src/screen_init.cxx
-@@ -54,8 +54,8 @@ ScreenManager::ScreenManager(boost::asio::io_service &
+@@ -50,8 +50,8 @@ ScreenManager::ScreenManager(boost::asio::io_service &
  #ifdef ENABLE_COLORS
if (options.enable_colors) {
/* set background attributes */

UPDATE audio/libmpdclient-2.17

[Björn Ketelaars]

Diff below brings libmpdclient to 2.17, which is a maintenance release.
Changelog [0] does not indicate any breaking changes.

Minor of SHARED_LIBS has been bumped as symbols have been added.

Build test all consumers:
audio/ario
audio/mpc
audio/mpd
audio/mpdscribble
audio/ncmpc
audio/ncmpcpp
audio/scmpc
audio/ympd
x11/gnustep/mpdcon
x11/polybar

Run tested on amd64 in combination with mpc/mpd/ncmpc.

Comments/OK?


[0] https://raw.githubusercontent.com/MusicPlayerDaemon/libmpdclient/v2.17/NEWS.


diff --git Makefile Makefile
index a3e449c2d26..941153eb896 100644
--- Makefile
+++ Makefile
@@ -2,12 +2,11 @@
 
 COMMENT=   library for interfacing MPD
 
-VER=   2.16
+VER=   2.17
 DISTNAME=  libmpdclient-${VER}
-SHARED_LIBS=   mpdclient 3.1   # 2.13
+SHARED_LIBS=   mpdclient 3.2   # 2.17
 CATEGORIES=audio
 HOMEPAGE=  https://www.musicpd.org/libs/libmpdclient/
-REVISION=  0
 
 # 3-BSD
 PERMIT_PACKAGE=Yes
diff --git distinfo distinfo
index ebf21bb9ed8..c2598998a54 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (libmpdclient-2.16.tar.xz) = 
+mvatnwOBJAwKzjwDCe0lZc1w+yK73qIMnrbFAdlRGQ=
-SIZE (libmpdclient-2.16.tar.xz) = 60480
+SHA256 (libmpdclient-2.17.tar.xz) = 
7puPHH6VtlyPGKNU2vexa/zUVfxSoPO1q+QCMWvONVk=
+SIZE (libmpdclient-2.17.tar.xz) = 64880
diff --git patches/patch-src_socket_c patches/patch-src_socket_c
index 3757be5c86a..f9858c23bd5 100644
--- patches/patch-src_socket_c
+++ patches/patch-src_socket_c
@@ -1,11 +1,12 @@
 $OpenBSD: patch-src_socket_c,v 1.1.1.1 2010/04/05 18:59:01 landry Exp $
 src/socket.c.orig  Mon Apr  5 05:20:56 2010
-+++ src/socket.c   Mon Apr  5 05:21:32 2010
+Index: src/socket.c
+--- src/socket.c.orig
 src/socket.c
 @@ -34,6 +34,7 @@
  #include 
  #include 
  #include 
 +#include 
  #include 
- #include 
  
+ #ifdef _WIN32
diff --git patches/patch-src_sync_c patches/patch-src_sync_c
index bd20232b7a1..8b395759f38 100644
--- patches/patch-src_sync_c
+++ patches/patch-src_sync_c
@@ -1,11 +1,12 @@
 $OpenBSD: patch-src_sync_c,v 1.3 2017/08/11 08:57:16 dcoppa Exp $
 src/sync.c.origMon Feb 23 15:50:40 2015
-+++ src/sync.c Tue Mar 17 10:52:58 2015
-@@ -36,6 +36,7 @@
+Index: src/sync.c
+--- src/sync.c.orig
 src/sync.c
+@@ -39,6 +39,7 @@
  #ifndef _WIN32
  #include 
  #endif
 +#include 
  #include 
- #include 
  
+ static enum mpd_async_event
diff --git pkg/PLIST pkg/PLIST
index 5324762da0d..5ace5cd0591 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -10,14 +10,17 @@ include/mpd/database.h
 include/mpd/directory.h
 include/mpd/entity.h
 include/mpd/error.h
+include/mpd/fingerprint.h
 include/mpd/idle.h
 include/mpd/list.h
 include/mpd/message.h
 include/mpd/mixer.h
 include/mpd/mount.h
+include/mpd/neighbor.h
 include/mpd/output.h
 include/mpd/pair.h
 include/mpd/parser.h
+include/mpd/partition.h
 include/mpd/password.h
 include/mpd/player.h
 include/mpd/playlist.h

Re: UPDATE security/scrypt

[Björn Ketelaars]

On Wed 01/01/2020 23:03, Ted Unangst wrote:
> Björn Ketelaars wrote:
> > - When estimating the amount of available RAM, scrypt ignores
> >   RLIMIT_DATA on systems which have mmap.
> 
> This is wrong on OpenBSD. I sent an email to Colin, but the update should
> patch this out in the meantime.

Although I'm not doubting that you are right, I fail to understand why
ignoring RLIMIT_DATA on OpenBSD is bad. Could you explain why?

I prepared a patch, which:
- addresses ignoring RLIMIT DATA, reverting
  
https://github.com/Tarsnap/scrypt/commit/2b478e7ce590a6564d89417ddad4f3dd4bbdcaf6
- fixes compiling on base-gcc archs (found by kmos@)

OK?


diff --git Makefile Makefile
index 31dc84c3443..04b73ef02b3 100644
--- Makefile
+++ Makefile
@@ -3,6 +3,7 @@
 COMMENT =  command-line encryption using scrypt key derivation function
 
 DISTNAME = scrypt-1.3.0
+REVISION = 0
 
 SHARED_LIBS += scrypt-kdf0.0 # 1.0
 
@@ -18,6 +19,9 @@ WANTLIB = c crypto
 MASTER_SITES = ${HOMEPAGE}
 EXTRACT_SUFX = .tgz
 
+COMPILER = base-clang ports-gcc
+COMPILER_LANGS =   C
+
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS =   --enable-libscrypt-kdf
 
diff --git patches/patch-lib_util_memlimit_c patches/patch-lib_util_memlimit_c
new file mode 100644
index 000..788724aa76e
--- /dev/null
+++ patches/patch-lib_util_memlimit_c
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Do not ignore RLIMIT_DATA on OpenBSD. Revert
+https://github.com/Tarsnap/scrypt/commit/2b478e7ce590a6564d89417ddad4f3dd4bbdcaf6
+
+Index: lib/util/memlimit.c
+--- lib/util/memlimit.c.orig
 lib/util/memlimit.c
+@@ -167,14 +167,12 @@ memlimit_rlimit(size_t * memlimit)
+   memrlimit = (uint64_t)rl.rlim_cur;
+ #endif
+ 
+-#ifndef HAVE_MMAP
+-  /* ... RLIMIT_DATA (if we're not using mmap)... */
++  /* ... RLIMIT_DATA... */
+   if (getrlimit(RLIMIT_DATA, &rl))
+   return (1);
+   if ((rl.rlim_cur != RLIM_INFINITY) &&
+   ((uint64_t)rl.rlim_cur < memrlimit))
+   memrlimit = (uint64_t)rl.rlim_cur;
+-#endif
+ 
+   /* ... and RLIMIT_RSS. */
+ #ifdef RLIMIT_RSS

Re: ranger: Update to 1.9.3

[Björn Ketelaars]

On Thu 02/01/2020 06:03, Klemens Nanni wrote:
> Lots of fixes, full changelog at https://ranger.github.io/changelog.html
> 
> Tests still partially fail due to outdated py-astroid, but I've adjusted
> the comment;  shellcheck is being used as well now.
> 
> Keeps working for me as in:  I can quickly browse files, common formats
> such as pdf, jpg, mkv, etc. are opened just fine with mupdf, sxiv and
> mpv.
> 
> Patches only changed in offsets, but I added comments for clarity.
> 
> Feedack? OK?

Lightly tested. Seems to work for me, OK bket@

UPDATE net/hexchat-2.14.3

[Björn Ketelaars]

Enclosed diff brings hexchat to 2.14.3, which is a maintenance release.
Changelog: https://hexchat.readthedocs.io/en/latest/changelog.html

Changes to port:
- Drop patch which has been addressed upstream
- sync PLIST

Lightly tested on amd64

Comments/OK?


diff --git Makefile Makefile
index 8f77d857e50..8e065b8e8ce 100644
--- Makefile
+++ Makefile
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.27 2019/10/23 05:06:11 bket Exp $
 
 COMMENT =  GTK+2 IRC Client
-DISTNAME = hexchat-2.14.2
+DISTNAME = hexchat-2.14.3
 EXTRACT_SUFX = .tar.xz
 CATEGORIES =   net x11
 
diff --git distinfo distinfo
index 88f02c3cc50..9dcbf475ec2 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (hexchat-2.14.2.tar.xz) = d5K55SVg+9PhDXW/tdE4ogkTqHdx1nbSllR/G0rAlhg=
-SIZE (hexchat-2.14.2.tar.xz) = 1288732
+SHA256 (hexchat-2.14.3.tar.xz) = kBqdE9taTaabgn9gkzBrvRaGPcSQFvdmi9PkUGUS6II=
+SIZE (hexchat-2.14.3.tar.xz) = 1292072
diff --git patches/patch-src_common_meson_build 
patches/patch-src_common_meson_build
deleted file mode 100644
index 86c20ee93e5..000
--- patches/patch-src_common_meson_build
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_common_meson_build,v 1.1 2019/10/23 05:06:11 bket Exp $
-
-Ensure that generated headers are built before anything else, from:
-https://github.com/hexchat/hexchat/commit/92014628d1cc06334a9ca8c91a7184d50f5ab9a0
-
-Index: src/common/meson.build
 src/common/meson.build.orig
-+++ src/common/meson.build
-@@ -109,6 +109,7 @@ hexchat_common = static_library('hexchatcommon',
- )
- 
- hexchat_common_dep = declare_dependency(
-+  sources: [textevents] + marshal,
-   link_with: hexchat_common,
-   include_directories: common_includes,
-   compile_args: common_cflags,
diff --git pkg/PLIST pkg/PLIST
index ff1668bb67c..66e66606572 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -4,15 +4,15 @@ include/hexchat-plugin.h
 lib/hexchat/
 lib/hexchat/plugins/
 @comment lib/hexchat/plugins/checksum.la
-lib/hexchat/plugins/checksum.so
+@so lib/hexchat/plugins/checksum.so
 @comment lib/hexchat/plugins/fishlim.la
-lib/hexchat/plugins/fishlim.so
+@so lib/hexchat/plugins/fishlim.so
 @comment lib/hexchat/plugins/lua.la
-lib/hexchat/plugins/lua.so
+@so lib/hexchat/plugins/lua.so
 @comment lib/hexchat/plugins/perl.la
-lib/hexchat/plugins/perl.so
+@so lib/hexchat/plugins/perl.so
 @comment lib/hexchat/plugins/python.la
-lib/hexchat/plugins/python.so
+@so lib/hexchat/plugins/python.so
 lib/pkgconfig/hexchat-plugin.pc
 @man man/man1/hexchat.1
 share/applications/io.github.Hexchat.desktop

Re: UPDATE security/scrypt

[Björn Ketelaars]

On Thu 02/01/2020 06:27, Björn Ketelaars wrote:
> On Wed 01/01/2020 23:03, Ted Unangst wrote:
> > Björn Ketelaars wrote:
> > > - When estimating the amount of available RAM, scrypt ignores
> > >   RLIMIT_DATA on systems which have mmap.
> > 
> > This is wrong on OpenBSD. I sent an email to Colin, but the update should
> > patch this out in the meantime.
> 
> Although I'm not doubting that you are right, I fail to understand why
> ignoring RLIMIT_DATA on OpenBSD is bad. Could you explain why?
> 
> I prepared a patch, which:
> - addresses ignoring RLIMIT DATA, reverting
>   
> https://github.com/Tarsnap/scrypt/commit/2b478e7ce590a6564d89417ddad4f3dd4bbdcaf6
> - fixes compiling on base-gcc archs (found by kmos@)
> 
> OK?

Ping...

Diff below for your convenience.

diff --git Makefile Makefile
index 31dc84c3443..04b73ef02b3 100644
--- Makefile
+++ Makefile
@@ -3,6 +3,7 @@
 COMMENT =  command-line encryption using scrypt key derivation function
 
 DISTNAME = scrypt-1.3.0
+REVISION = 0
 
 SHARED_LIBS += scrypt-kdf0.0 # 1.0
 
@@ -18,6 +19,9 @@ WANTLIB = c crypto
 MASTER_SITES = ${HOMEPAGE}
 EXTRACT_SUFX = .tgz
 
+COMPILER = base-clang ports-gcc
+COMPILER_LANGS =   C
+
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS =   --enable-libscrypt-kdf
 
diff --git patches/patch-lib_util_memlimit_c patches/patch-lib_util_memlimit_c
new file mode 100644
index 000..788724aa76e
--- /dev/null
+++ patches/patch-lib_util_memlimit_c
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Do not ignore RLIMIT_DATA on OpenBSD. Revert
+https://github.com/Tarsnap/scrypt/commit/2b478e7ce590a6564d89417ddad4f3dd4bbdcaf6
+
+Index: lib/util/memlimit.c
+--- lib/util/memlimit.c.orig
 lib/util/memlimit.c
+@@ -167,14 +167,12 @@ memlimit_rlimit(size_t * memlimit)
+   memrlimit = (uint64_t)rl.rlim_cur;
+ #endif
+ 
+-#ifndef HAVE_MMAP
+-  /* ... RLIMIT_DATA (if we're not using mmap)... */
++  /* ... RLIMIT_DATA... */
+   if (getrlimit(RLIMIT_DATA, &rl))
+   return (1);
+   if ((rl.rlim_cur != RLIM_INFINITY) &&
+   ((uint64_t)rl.rlim_cur < memrlimit))
+   memrlimit = (uint64_t)rl.rlim_cur;
+-#endif
+ 
+   /* ... and RLIMIT_RSS. */
+ #ifdef RLIMIT_RSS

Re: UPDATE security/scrypt

[Björn Ketelaars]

On Sun 12/01/2020 15:38, Björn Ketelaars wrote:
> On Thu 02/01/2020 06:27, Björn Ketelaars wrote:
> > On Wed 01/01/2020 23:03, Ted Unangst wrote:
> > > Björn Ketelaars wrote:
> > > > - When estimating the amount of available RAM, scrypt ignores
> > > >   RLIMIT_DATA on systems which have mmap.
> > > 
> > > This is wrong on OpenBSD. I sent an email to Colin, but the update should
> > > patch this out in the meantime.
> > 
> > Although I'm not doubting that you are right, I fail to understand why
> > ignoring RLIMIT_DATA on OpenBSD is bad. Could you explain why?
> > 
> > I prepared a patch, which:
> > - addresses ignoring RLIMIT DATA, reverting
> >   
> > https://github.com/Tarsnap/scrypt/commit/2b478e7ce590a6564d89417ddad4f3dd4bbdcaf6
> > - fixes compiling on base-gcc archs (found by kmos@)
> > 
> > OK?
> 
> Ping...

Oops, forgot to mention the following:

Following https://github.com/Tarsnap/scrypt/issues/226:

Without patch:

$ ulimit -d 123456
$ scrypt enc -v Makefile Makefile.enc   
 
Please enter passphrase: 
Please confirm passphrase: 
Parameters used: N = 262144; r = 8; p = 1;
This requires at least 268 MB bytes of memory (995 MB available),
and will take approximately 0.4 seconds (limit: 5.0 seconds).
scrypt: Error computing derived key: Cannot allocate memory

With patch:

$ ulimit -d 123456
$ scrypt enc -v Makefile Makefile.enc 
Please enter passphrase: 
Please confirm passphrase: 
Parameters used: N = 8192; r = 8; p = 48;
This requires at least 8.3 MB bytes of memory (15 MB available),
and will take approximately 0.6 seconds (limit: 5.0 seconds).

Re: [update] nnn 2.8.1 > v2.9

[Björn Ketelaars]

On Tue 21/01/2020 11:55, Dnsgate wrote:
> The last sent diff had weird encoding for spaces.
> Here is a good one:

Diff looks good, however did you see https://github.com/jarun/nnn/pull/441?
Maybe this is something you could discuss with MAINTAINER?

UPDATE audia/audacity

[Björn Ketelaars]

Enclosed diff brings audacity to 2.3.3, which focuses on bug fixes and
code restructuring. Additional information on this release can be found
in the release announcement [0].

Run tested on amd64. More precise, I have been using this update for a
couple of days. So far, no regression.

Comments/OK?


[0] https://github.com/audacity/audacity/releases/tag/Audacity-2.3.3


diff --git Makefile Makefile
index e396d07d11c..51dad91c94c 100644
--- Makefile
+++ Makefile
@@ -6,9 +6,8 @@ COMMENT=free audio editor
 # so can't be fetched automatically
 GH_ACCOUNT=audacity
 GH_PROJECT=audacity
-GH_TAGNAME=Audacity-2.3.2
+GH_TAGNAME=Audacity-2.3.3
 DISTNAME=  ${GH_TAGNAME:L}
-REVISION=  1
 CATEGORIES=audio
 
 HOMEPAGE=  https://www.audacityteam.org/
diff --git distinfo distinfo
index 31e7b242cb0..67bf53ba677 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacity-2.3.2.tar.gz) = zEd6cf9Vcccoh6ehVTZbB6GlC86hq/SQpN57iEN2xzE=
-SIZE (audacity-2.3.2.tar.gz) = 61972597
+SHA256 (audacity-2.3.3.tar.gz) = QE5sSWk97clCEvxVJZdAWNhIU2Al4Z2jE1muArq+i9c=
+SIZE (audacity-2.3.3.tar.gz) = 62073352
diff --git patches/patch-configure_ac patches/patch-configure_ac
index d4356305ae5..c466434334a 100644
--- patches/patch-configure_ac
+++ patches/patch-configure_ac
@@ -6,7 +6,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2019/06/12 20:28:36 rapha 
Exp $
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
-@@ -204,12 +204,16 @@ if test x$enable_universal_binary = xyes; then
+@@ -200,12 +200,16 @@ if test x$enable_universal_binary = xyes; then
 esac
  fi
  
@@ -29,7 +29,7 @@ Index: configure.ac
  fi
  
  if test x$enable_sse = xyes; then
-@@ -650,10 +654,6 @@ case "${host_os}" in
+@@ -646,10 +650,6 @@ case "${host_os}" in
AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
if [[ $have_alsa = "yes" ]] ; then
   LIBS="$LIBS -lasound"
diff --git patches/patch-lib-src_FileDialog_Makefile_am 
patches/patch-lib-src_FileDialog_Makefile_am
index 1df0fbbc809..ec192221959 100644
--- patches/patch-lib-src_FileDialog_Makefile_am
+++ patches/patch-lib-src_FileDialog_Makefile_am
@@ -5,7 +5,8 @@ $OpenBSD: patch-lib-src_FileDialog_Makefile_am,v 1.1 2019/03/26 
18:26:45 rapha E
 Index: lib-src/FileDialog/Makefile.am
 --- lib-src/FileDialog/Makefile.am.orig
 +++ lib-src/FileDialog/Makefile.am
-@@ -1,6 +1,6 @@
+@@ -1,7 +1,7 @@
+ AM_LIBTOOLFLAGS = --tag CC
  ACLOCAL_AMFLAGS = -I m4
  
 -lib_LTLIBRARIES = libFileDialog.la
diff --git patches/patch-src_AudacityApp_cpp patches/patch-src_AudacityApp_cpp
index 4e61dcf65f6..5f5328b6605 100644
--- patches/patch-src_AudacityApp_cpp
+++ patches/patch-src_AudacityApp_cpp
@@ -5,7 +5,7 @@ Don't hardcode shared libraries version number.
 Index: src/AudacityApp.cpp
 --- src/AudacityApp.cpp.orig
 +++ src/AudacityApp.cpp
-@@ -540,12 +540,12 @@ class GnomeShutdown
+@@ -642,12 +642,12 @@ class GnomeShutdown
 {
mArgv[0].reset(strdup("Audacity"));
  
diff --git patches/patch-src_AudioIO_cpp patches/patch-src_AudioIO_cpp
index 5d078224adc..85a534c1f28 100644
--- patches/patch-src_AudioIO_cpp
+++ patches/patch-src_AudioIO_cpp
@@ -6,7 +6,7 @@ $OpenBSD: patch-src_AudioIO_cpp,v 1.10 2019/09/26 13:54:54 
sthen Exp $
 Index: src/AudioIO.cpp
 --- src/AudioIO.cpp.orig
 +++ src/AudioIO.cpp
-@@ -802,18 +802,15 @@ static double streamStartTime = 0; // bias system time
+@@ -797,18 +797,15 @@ static double streamStartTime = 0; // bias system time
  static double SystemTime(bool usingAlsa)
  {
  #ifdef __WXGTK__
@@ -27,12 +27,12 @@ Index: src/AudioIO.cpp
  }
  #endif
  
-@@ -4738,7 +4735,7 @@ void AudioIoCallback::ComputeMidiTimings(
+@@ -3606,7 +3603,7 @@ void AudioIoCallback::ComputeMidiTimings(
 }
  
 /* GSW: Save timeInfo in case MidiPlayback needs it */
 -   mAudioCallbackClockTime = PaUtil_GetTime();
-+   mAudioCallbackClockTime = SystemTime(gAudioIO->mUsingAlsa);
++   mAudioCallbackClockTime = SystemTime(mUsingAlsa);
  
 /* for Linux, estimate a smooth audio time as a slowly-changing
offset from system time */
diff --git patches/patch-src_MemoryX_h patches/patch-src_MemoryX_h
deleted file mode 100644
index 7fbd8a0874c..000
--- patches/patch-src_MemoryX_h
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_MemoryX_h,v 1.4 2019/09/26 13:54:54 sthen Exp $
-
-Index: src/MemoryX.h
 src/MemoryX.h.orig
-+++ src/MemoryX.h
-@@ -641,7 +641,6 @@ make_iterator_range( const Container &container )
- // For using std::unordered_map on wxString
- namespace std
- {
--   template struct hash;
-template<> struct hash< wxString > {
-   size_t operator () (const wxString &str) const // noexcept
-   {
diff --git pkg/PLIST pkg/PLIST
index 6978510d226..82298e79ae8 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -88,7 +88,6 @@ share/audacity/plug-ins/sample-data-export.ny
 share/audacity/plug-ins/sample-data-import.ny
 share/audacity/plug-ins/tremolo.ny
 share/audacity/plug-ins/vocalrediso.ny
-share/audacity/plug-ins/vocalremove

UPDATE audio/audacious-plugins

[Björn Ketelaars]

Diff below brings audacious-plugins to 3.10.1. This update is needed for
bringing audio/audacious up to date. A diff for the latter has been send
to ports@.

Changes to the port:
- Sync WANTLIB
- Switch MASTER_SITES to https

Lightly run tested on amd64.

Comments/OK?


diff --git Makefile Makefile
index 1501a02b0b0..3d99084988d 100644
--- Makefile
+++ Makefile
@@ -2,9 +2,8 @@
 
 COMMENT =  input and output plugins for Audacious
 
-V =3.9
+V =3.10.1
 DISTNAME = audacious-plugins-$V
-REVISION = 3
 
 CATEGORIES =   audio multimedia
 
@@ -18,12 +17,12 @@ WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 
audgui
 WANTLIB += audtag avcodec avformat avutil c cairo cddb cdio cdio_cdda
 WANTLIB += cue curl dbus-1 dbus-glib-1 faad fontconfig freetype
 WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 gtk-x11-2.0 iconv intl m mms modplug mp3lame
+WANTLIB += gobject-2.0 gtk-x11-2.0 harfbuzz iconv intl m mms modplug mp3lame
 WANTLIB += mpg123 neon notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += samplerate sndfile sndio soxr vorbis vorbisenc vorbisfile
 WANTLIB += wavpack xml2 z
 
-MASTER_SITES = http://distfiles.audacious-media-player.org/
+MASTER_SITES = https://distfiles.audacious-media-player.org/
 
 EXTRACT_SUFX = .tar.bz2
 
diff --git distinfo distinfo
index f261a81d563..b4a3f1061c9 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-plugins-3.9.tar.bz2) = 
i/fyEInLNAaWjMnHEwd3Su5xAOxGB/KPY89WkNXJJ7g=
-SIZE (audacious-plugins-3.9.tar.bz2) = 1843084
+SHA256 (audacious-plugins-3.10.1.tar.bz2) = 
7sMXdjH5lym/DpQiO2J0BsxkjHDmZG41YTx7VQQKJkI=
+SIZE (audacious-plugins-3.10.1.tar.bz2) = 1715477
diff --git patches/patch-buildsys_mk_in patches/patch-buildsys_mk_in
index 0b32ca27e8b..59f544b9292 100644
--- patches/patch-buildsys_mk_in
+++ patches/patch-buildsys_mk_in
@@ -1,12 +1,13 @@
 $OpenBSD: patch-buildsys_mk_in,v 1.6 2014/11/03 04:29:05 bcallah Exp $
 buildsys.mk.in.origThu Oct 16 20:01:19 2014
-+++ buildsys.mk.in Sat Nov  1 19:44:28 2014
-@@ -107,7 +107,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
+Index: buildsys.mk.in
+--- buildsys.mk.in.orig
 buildsys.mk.in
+@@ -113,7 +113,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
  
  MO_FILES = ${LOCALES:.po=.mo}
  
 -.SILENT:
 +#.SILENT:
  .SUFFIXES:
- .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o 
.java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
- .PHONY: all subdirs pre-depend depend install install-extra uninstall 
uninstall-extra clean distclean locales ${SUBDIRS}
+ .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o 
.java .mo .m .m.dep .mm .mm.dep .moslib.o .o .plugin.o .po .py .pyc .rc .S 
.S.dep .xpm
+ .PHONY: all subdirs subdirs-after pre-depend depend install install-includes 
install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} 
${SUBDIRS_AFTER}
diff --git patches/patch-configure patches/patch-configure
index 051879f438f..f66a9125a79 100644
--- patches/patch-configure
+++ patches/patch-configure
@@ -7,7 +7,7 @@ polluted very early on, breaking most of the checks using 
AC_CHECK_LIB.
 Index: configure
 --- configure.orig
 +++ configure
-@@ -9675,8 +9675,6 @@ $as_echo "yes" >&6; }
+@@ -9702,8 +9702,6 @@ $as_echo "yes" >&6; }
  
  fi
  
@@ -16,7 +16,7 @@ Index: configure
  
  
  if test $HAVE_DARWIN = yes ; then
-@@ -14657,6 +14655,8 @@ as_fn_error ()
+@@ -14701,6 +14699,8 @@ as_fn_error ()
as_fn_exit $as_status
  } # as_fn_error
  
diff --git pkg/PLIST pkg/PLIST
index f25ab5d6cae..021807726dc 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -2,72 +2,70 @@
 @pkgpath audio/audacious-plugins,-main
 lib/audacious/
 lib/audacious/Container/
-lib/audacious/Container/asx.so
-lib/audacious/Container/asx3.so
-lib/audacious/Container/audpl.so
-lib/audacious/Container/cue.so
-lib/audacious/Container/m3u.so
-lib/audacious/Container/pls.so
-lib/audacious/Container/xspf.so
+@so lib/audacious/Container/asx.so
+@so lib/audacious/Container/asx3.so
+@so lib/audacious/Container/audpl.so
+@so lib/audacious/Container/cue.so
+@so lib/audacious/Container/m3u.so
+@so lib/audacious/Container/pls.so
+@so lib/audacious/Container/xspf.so
 lib/audacious/Effect/
-lib/audacious/Effect/compressor.so
-lib/audacious/Effect/crossfade.so
-lib/audacious/Effect/crystalizer.so
-lib/audacious/Effect/echo.so
-lib/audacious/Effect/ladspa.so
-lib/audacious/Effect/mixer.so
-lib/audacious/Effect/resample.so
-lib/audacious/Effect/silence-removal.so
-lib/audacious/Effect/sox-resampler.so
-lib/audacious/Effect/speed-pitch.so
-lib/audacious/Effect/stereo.so
-lib/audacious/Effect/voice_removal.so
+@so lib/audacious/Effect/compressor.so
+@so lib/audacious/Effect/crossfade.so
+@so lib/audacious/Effect/crystalizer.so
+@so lib/audacious/Effect/echo.so
+@so lib/audacious/Effect/ladspa.so
+@so lib/audacious/Effect/mixer.so
+@so lib/aud

UPDATE audio/audacious

[Björn Ketelaars]

Diff below updates audacious to 3.10.1. Changes between 3.9 and 3.10 are
explained at [0]. 3.10.1 fixes some additional bugs. Note that this
update relies on a newer version of audacious-plugins, which has been
send to ports@.

Changes to the port:
- Switch HOMEPAGE and MASTER_SITES to https
- Sync WANTLIB
- Bump major of libaudcore as symbols have been removed

Lightly tested on amd64.

Comments/OK?

[0] https://audacious-media-player.org/news/43-audacious-3-10-released


diff --git Makefile Makefile
index cc130f2b4fb..42b1adf225a 100644
--- Makefile
+++ Makefile
@@ -5,16 +5,15 @@ BROKEN-alpha =tinylock.c:58: internal compiler error: 
in extract_insn, at recog
 
 COMMENT =  graphical audio player which supports lots of formats
 
-DISTNAME = audacious-3.9
-REVISION = 2
+DISTNAME = audacious-3.10.1
 
-SHARED_LIBS += audcore 4.0 # 5.0
+SHARED_LIBS += audcore 5.0 # 5.1
 SHARED_LIBS += audgui  4.0 # 5.0
 SHARED_LIBS += audtag  3.0 # 3.0
 
 CATEGORIES =   audio multimedia
 
-HOMEPAGE = http://audacious-media-player.org/
+HOMEPAGE = https://audacious-media-player.org/
 
 # BSD
 PERMIT_PACKAGE =   Yes
@@ -22,10 +21,10 @@ PERMIT_PACKAGE =Yes
 WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
 WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
 WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 iconv intl m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 z
+WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 harfbuzz iconv
+WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 z
 
-MASTER_SITES = http://distfiles.audacious-media-player.org/
+MASTER_SITES = https://distfiles.audacious-media-player.org/
 
 EXTRACT_SUFX = .tar.bz2
 
diff --git distinfo distinfo
index 7dfae153553..65a2003c36a 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-3.9.tar.bz2) = LYBEZzrHhtcbCABPGQu8o2gli/YOZgL/wNliKDXMsF4=
-SIZE (audacious-3.9.tar.bz2) = 599488
+SHA256 (audacious-3.10.1.tar.bz2) = 
g2boQLs8lEjCzwz5oIABVbC9fMISooukSZDD0iica5M=
+SIZE (audacious-3.10.1.tar.bz2) = 564481
diff --git patches/patch-buildsys_mk_in patches/patch-buildsys_mk_in
index a94f8f206f4..2a349cb9230 100644
--- patches/patch-buildsys_mk_in
+++ patches/patch-buildsys_mk_in
@@ -1,12 +1,13 @@
 $OpenBSD: patch-buildsys_mk_in,v 1.7 2014/11/03 04:28:11 bcallah Exp $
 buildsys.mk.in.origThu Oct 16 20:00:28 2014
-+++ buildsys.mk.in Sat Nov  1 19:11:40 2014
-@@ -107,7 +107,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
+Index: buildsys.mk.in
+--- buildsys.mk.in.orig
 buildsys.mk.in
+@@ -113,7 +113,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
  
  MO_FILES = ${LOCALES:.po=.mo}
  
 -.SILENT:
 +#.SILENT:
  .SUFFIXES:
- .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o 
.java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
- .PHONY: all subdirs pre-depend depend install install-extra uninstall 
uninstall-extra clean distclean locales ${SUBDIRS}
+ .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o 
.java .mo .m .m.dep .mm .mm.dep .moslib.o .o .plugin.o .po .py .pyc .rc .S 
.S.dep .xpm
+ .PHONY: all subdirs subdirs-after pre-depend depend install install-includes 
install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} 
${SUBDIRS_AFTER}
diff --git patches/patch-src_libaudcore_Makefile 
patches/patch-src_libaudcore_Makefile
index d0c0dbb7e45..ebe69ad1409 100644
--- patches/patch-src_libaudcore_Makefile
+++ patches/patch-src_libaudcore_Makefile
@@ -6,5 +6,5 @@ Index: src/libaudcore/Makefile
 -SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
 +SHARED_LIB = ${LIB_PREFIX}audcore.so.${LIBaudcore_VERSION}
  LIB_MAJOR = 5
- LIB_MINOR = 0
+ LIB_MINOR = 1
  
diff --git pkg/PLIST pkg/PLIST
index cba79e04c41..e1ea6e88af0 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -46,20 +46,9 @@ share/applications/audacious.desktop
 share/audacious/
 share/audacious/AUTHORS
 share/audacious/COPYING
-share/audacious/images/
-share/audacious/images/about-logo.png
-share/audacious/images/about-logo.svg
-share/audacious/images/album.png
-share/audacious/images/appearance.png
-share/audacious/images/audio.png
-share/audacious/images/connectivity.png
-share/audacious/images/info.png
-share/audacious/images/playlist.png
-share/audacious/images/plugins.png
 share/icons/hicolor/48x48/apps/audacious.png
 share/icons/hicolor/scalable/apps/audacious.svg
 share/locale/ar/LC_MESSAGES/audacious.mo
-share/locale/ast/LC_MESSAGES/audacious.mo
 share/locale/be/LC_MESSAGES/audacious.mo
 share/locale/bg/LC_MESSAGES/audacious.mo
 share/locale/ca/LC_MESSAGES/audacious.mo
@@ -71,7 +60,6 @@ share/locale/da/LC_MESSAGES/audacious.mo
 share/locale/de/LC_MESSAGES/audacious.mo
 share/locale/el/LC_MESSAGES/audacious.mo
 share/locale/e

UPDATE graphics/py-seaborn-0.10.0

[Björn Ketelaars]

Diff below brings py-seaborn to 0.10.0, which is a major update. Notable
change is that this update is strictly compatible with Python 3.6+.

There are no consumers of this port.

Changes to the port:
- set MODPY_VERSION in Makefile
- set pkgpath marker in PLIST
- update the list of RDEPs

Testing:
- one failing test: TestAxesStyle.test_reset_orig needs GTK3Agg as
  backend. This is also the case with the version in ports
- run tested on amd64 with some work related tools

Comments/OK?


diff --git Makefile Makefile
index f7aa3ae7e7a..8cc83ca3433 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  statistical data visualization
 
-MODPY_EGG_VERSION =0.9.0
+MODPY_EGG_VERSION =0.10.0
 DISTNAME = seaborn-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 
@@ -20,18 +20,16 @@ MODPY_PI =  Yes
 MODPY_SETUPTOOLS = Yes
 MODPY_PYTEST = Yes
 MODPY_PYTEST_ARGS =seaborn
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
 
-RUN_DEPENDS =  graphics/py-matplotlib${MODPY_FLAVOR}>=1.4.3 \
-   math/py-numpy${MODPY_FLAVOR}>=1.9.3 \
-   math/py-pandas${MODPY_FLAVOR}>=0.15.2 \
-   math/py-scipy${MODPY_FLAVOR}>=0.14.0
+RUN_DEPENDS =  graphics/py-matplotlib${MODPY_FLAVOR}>=2.1.2 \
+   math/py-numpy${MODPY_FLAVOR}>=1.13.3 \
+   math/py-pandas${MODPY_FLAVOR}>=0.22.0 \
+   math/py-scipy${MODPY_FLAVOR}>=1.0.1
 
 TEST_DEPENDS = ${RUN_DEPENDS} \
devel/py-nose${MODPY_FLAVOR}
 
-FLAVORS =  python3
-FLAVOR ?=
-
 # TestAxesStyle.test_reset_orig is the only test that fails as it needs
 # 'GTK3Agg' as backend.
 TEST_ENV = MPLBACKEND=AGG
diff --git distinfo distinfo
index 310a58cf74e..4b14f8003c4 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (seaborn-0.9.0.tar.gz) = dsg/eUyjIPtrI6fGGS1eGFpfz0dYlmoMClS67kbUHi8=
-SIZE (seaborn-0.9.0.tar.gz) = 198184
+SHA256 (seaborn-0.10.0.tar.gz) = Wf5BThONfV6giw/rAbhsr0aC42+nSOOYdzBSOomuy7k=
+SIZE (seaborn-0.10.0.tar.gz) = 194113
diff --git pkg/PLIST pkg/PLIST
index cf7619ca2f7..8649aafb36f 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2019/08/10 03:48:32 bket Exp $
+@pkgpath graphics/py-seaborn,python3
 lib/python${MODPY_VERSION}/site-packages/seaborn/
 
lib/python${MODPY_VERSION}/site-packages/seaborn-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/seaborn-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -10,24 +11,20 @@ lib/python${MODPY_VERSION}/site-packages/seaborn/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}algorithms.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}apionly.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}axisgrid.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}categorical.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}cm.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}distributions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}linearmodels.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}matrix.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}miscplot.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}palettes.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}rcmod.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}regression.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}relational.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}timeseries.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}widgets.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/seaborn/algorithms.py
-lib/python${MODPY_VERSION}/site-packages/seaborn/apionly.py
 lib/python${MODPY_VERSION}/site-packages/seaborn/axisgrid.py
 lib/python${MODPY_VERSION}/site-packages/seaborn/categorical.py
 lib/python${MODPY_VERSION}/site-packages/seaborn/cm.py
@@ -46,10 +43,7 @@ 
lib/python${MODPY_VERSION}/site-packages/

Re: UPDATE audio/audacious

[Björn Ketelaars]

On Sat 25/01/2020 16:21, Charlene Wendling wrote:
> On Wed, 22 Jan 2020 16:19:21 +0100
> Björn Ketelaars wrote:
> 
> > Diff below updates audacious to 3.10.1. Changes between 3.9 and 3.10
> > are explained at [0]. 3.10.1 fixes some additional bugs. Note that
> > this update relies on a newer version of audacious-plugins, which has
> > been send to ports@.
> >
> > Changes to the port:
> > - Switch HOMEPAGE and MASTER_SITES to https
> > - Sync WANTLIB
> > - Bump major of libaudcore as symbols have been removed
> > 
> > Lightly tested on amd64.
> > 
> > Comments/OK?
> 
> It builds and works fine on powerpc. audacious-plugins has "extra"
> WANTLIBs (c.96 dbus-1.11 dbus-glib-1.5), but actually makes use of
> DBus so they seem legit.
> 
> Once it's cleared up by someone who knows better than me, OK cwen@ for
> audacious and audacious-plugins ^^

My bad, I should have removed those extra WANTLIBs.

Only thing that seems to be dbus related is the plugin mpris2, which is
a standard dbus interface aiming to provide a API for controlling
audacious. This plugin depends on gdbus-codegen(1), provided by glib,
which generates some dbus code.

I grepped through the output of ldd(1) of all plugins. There is no
dependency on dbus or dbus-glib.

Enclosed is an updated diff, which additionally removes the extra
WANTLIBs.

OK?


diff --git Makefile Makefile
index 1501a02b0b0..3d31fa025d1 100644
--- Makefile
+++ Makefile
@@ -2,9 +2,8 @@
 
 COMMENT =  input and output plugins for Audacious
 
-V =3.9
+V =3.10.1
 DISTNAME = audacious-plugins-$V
-REVISION = 3
 
 CATEGORIES =   audio multimedia
 
@@ -15,15 +14,15 @@ PERMIT_PACKAGE =Yes
 
 WANTLIB += ${COMPILER_LIBCXX} FLAC GL X11 Xcomposite Xcursor Xdamage
 WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 audgui
-WANTLIB += audtag avcodec avformat avutil c cairo cddb cdio cdio_cdda
-WANTLIB += cue curl dbus-1 dbus-glib-1 faad fontconfig freetype
-WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 gtk-x11-2.0 iconv intl m mms modplug mp3lame
-WANTLIB += mpg123 neon notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += samplerate sndfile sndio soxr vorbis vorbisenc vorbisfile
-WANTLIB += wavpack xml2 z
-
-MASTER_SITES = http://distfiles.audacious-media-player.org/
+WANTLIB += audtag avcodec avformat avutil cairo cddb cdio cdio_cdda
+WANTLIB += cue curl faad fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-x11-2.0
+WANTLIB += harfbuzz iconv intl m mms modplug mp3lame mpg123 neon
+WANTLIB += notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 samplerate
+WANTLIB += sndfile sndio soxr vorbis vorbisenc vorbisfile wavpack
+WANTLIB += xml2 z
+
+MASTER_SITES = https://distfiles.audacious-media-player.org/
 
 EXTRACT_SUFX = .tar.bz2
 
diff --git distinfo distinfo
index f261a81d563..b4a3f1061c9 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-plugins-3.9.tar.bz2) = 
i/fyEInLNAaWjMnHEwd3Su5xAOxGB/KPY89WkNXJJ7g=
-SIZE (audacious-plugins-3.9.tar.bz2) = 1843084
+SHA256 (audacious-plugins-3.10.1.tar.bz2) = 
7sMXdjH5lym/DpQiO2J0BsxkjHDmZG41YTx7VQQKJkI=
+SIZE (audacious-plugins-3.10.1.tar.bz2) = 1715477
diff --git patches/patch-buildsys_mk_in patches/patch-buildsys_mk_in
index 0b32ca27e8b..59f544b9292 100644
--- patches/patch-buildsys_mk_in
+++ patches/patch-buildsys_mk_in
@@ -1,12 +1,13 @@
 $OpenBSD: patch-buildsys_mk_in,v 1.6 2014/11/03 04:29:05 bcallah Exp $
 buildsys.mk.in.origThu Oct 16 20:01:19 2014
-+++ buildsys.mk.in Sat Nov  1 19:44:28 2014
-@@ -107,7 +107,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
+Index: buildsys.mk.in
+--- buildsys.mk.in.orig
 buildsys.mk.in
+@@ -113,7 +113,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
  
  MO_FILES = ${LOCALES:.po=.mo}
  
 -.SILENT:
 +#.SILENT:
  .SUFFIXES:
- .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o 
.java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
- .PHONY: all subdirs pre-depend depend install install-extra uninstall 
uninstall-extra clean distclean locales ${SUBDIRS}
+ .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o 
.java .mo .m .m.dep .mm .mm.dep .moslib.o .o .plugin.o .po .py .pyc .rc .S 
.S.dep .xpm
+ .PHONY: all subdirs subdirs-after pre-depend depend install install-includes 
install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} 
${SUBDIRS_AFTER}
diff --git patches/patch-configure patches/patch-configure
index 051879f438f..f66a9125a79 100644
--- patches/patch-configure
+++ patches/patch-configure
@@ -7,7 +7,7 @@ polluted very early on, breaking most of the checks using 
AC_CHECK_LIB.
 Index: configure
 --- configure.orig
 +++ configure
-@@ -9675,8 +9675,6 @@ $as_e

Re: Remove: security/kqoauth

[Björn Ketelaars]

On Tue 28/01/2020 06:34, Rafael Sadowski wrote:
> Facts: Qt4 OAuth support library with no consumers, last update 2013.
> Need I say more? OK to nuke it?
> 
OK bket@

Re: Remove: net/qsynergy

[Björn Ketelaars]

On Tue 28/01/2020 06:30, Rafael Sadowski wrote:
> Facts: Qt4 synergy application, last update 2010, upstream dead.
> 
> Synergy looks also more or less dead as open-source:
> https://en.wikipedia.org/wiki/Synergy_(software)
> https://synergy-foss.org/
> 
> BTW, Qt4 ports in the category "net" no longer make sense to.
> 
> OK to remove?

OK bket@

UPDATE x11/icewim-1.6.4

[Björn Ketelaars]

Enclosed diff brings icewm to 1.6.4. Overview of changes can be found at
https://github.com/ice-wm/icewm/releases/. While here update HOMEPAGE.

(Lightly) run tested on amd64.

Comments/OK?


diff --git Makefile Makefile
index 15af55123f5..9f2b5b35bdd 100644
--- Makefile
+++ Makefile
@@ -3,13 +3,13 @@
 # unconditionally uses machine/apmvar.h and related structures/defines
 ONLY_FOR_ARCHS=${APM_ARCHS}
 
-V= 1.6.2
+V= 1.6.4
 COMMENT=   small and fast window manager
 DISTNAME=  icewm-${V}
 EXTRACT_SUFX=  .tar.lz
 CATEGORIES=x11
 
-HOMEPAGE=  https://www.ice-wm.org/
+HOMEPAGE=  https://ice-wm.org/
 
 # LGPLv2 only
 PERMIT_PACKAGE=Yes
diff --git distinfo distinfo
index b4deafc4663..54fa162eb04 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (icewm-1.6.2.tar.lz) = j/Ca4REHXyINv1zbE0AaLCoFHMq4yBFn0jTW5FDGqiQ=
-SIZE (icewm-1.6.2.tar.lz) = 1673647
+SHA256 (icewm-1.6.4.tar.lz) = c83MIQl7lPPYNSLi5od8up8G6SwYI8oU4KoyowztDKs=
+SIZE (icewm-1.6.4.tar.lz) = 1684348
diff --git patches/patch-man_icewm-preferences_pod 
patches/patch-man_icewm-preferences_pod
index c4422af55a8..b2ba9bdf036 100644
--- patches/patch-man_icewm-preferences_pod
+++ patches/patch-man_icewm-preferences_pod
@@ -3,7 +3,7 @@ $OpenBSD: patch-man_icewm-preferences_pod,v 1.4 2019/11/09 
14:06:33 fcambus Exp
 Index: man/icewm-preferences.pod
 --- man/icewm-preferences.pod.orig
 +++ man/icewm-preferences.pod
-@@ -977,7 +977,7 @@ B to allow B for B to allow B for B /dev/null && watch -t ss -putswl 
|| netstat -c'")
  XSV(const char *, netClassHint, "ss.XTerm")
  #else
diff --git patches/patch-src_icesh_cc patches/patch-src_icesh_cc
index 1d257d81791..af81036cb9c 100644
--- patches/patch-src_icesh_cc
+++ patches/patch-src_icesh_cc
@@ -5,7 +5,7 @@ Don't do this GNU extension stuff.
 Index: src/icesh.cc
 --- src/icesh.cc.orig
 +++ src/icesh.cc
-@@ -1823,6 +1823,8 @@ void IceSh::doSync()
+@@ -1930,6 +1930,8 @@ void IceSh::doSync()
  
  bool IceSh::colormaps()
  {
@@ -14,7 +14,7 @@ Index: src/icesh.cc
  if ( !isAction("colormaps", 0))
  return false;
  
-@@ -1831,7 +1833,7 @@ bool IceSh::colormaps()
+@@ -1938,7 +1940,7 @@ bool IceSh::colormaps()
  
  tlog("colormaps");
  running = true;
@@ -23,7 +23,7 @@ Index: src/icesh.cc
  while (running) {
  int n = 0;
  Colormap* map = XListInstalledColormaps(display, root, &n);
-@@ -1858,11 +1860,13 @@ bool IceSh::colormaps()
+@@ -1965,11 +1967,13 @@ bool IceSh::colormaps()
  
  bool IceSh::guiEvents()
  {
diff --git patches/patch-src_yapp_cc patches/patch-src_yapp_cc
index 934057626d2..36be4293f0d 100644
--- patches/patch-src_yapp_cc
+++ patches/patch-src_yapp_cc
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_yapp_cc,v 1.8 2019/08/26 19:43:45 bcallah 
Exp $
 Index: src/yapp.cc
 --- src/yapp.cc.orig
 +++ src/yapp.cc
-@@ -264,7 +264,7 @@ int YApplication::mainLoop() {
+@@ -272,7 +272,7 @@ int YApplication::mainLoop() {
  // This is irrelevant when using monotonic clocks:
  // if time travel to past, decrease the timeouts
  if (diff < zerotime()) {

Re: Missing CVEs in quirks

[Björn Ketelaars]

On Fri 31/01/2020 06:27, Rafael Sadowski wrote:
> The diff contains some forgotten CVE entries in quirks. I went through
> all the January commits and looked for CVE in the commit msg.
> 
> I also ran sort over the list.
> 
> OK, opinions?

My opinion is that we either maintain CVE entries in quirks, or remove
it completely. I prefer the first option.

Diff looks good.

OK bket@

Re: update net/dnscrypt-proxy 2.0.38

[Björn Ketelaars]

On Thu 30/01/2020 19:21, Nam Nguyen wrote:
> This is a security fix release that I propose adding to -stable. It
> affects 32-bit arches when dnscrypt-proxy's DNS over HTTPS (DoH) feature
> is used. It was fixed in Go 1.13.7 (now available in ports) and in the
> version of golang.org/x/crypto specified in {WRKSRC}/go.mod.
> 
> From issue:
> "On 32-bit architectures, a malformed input to crypto/x509 or the ASN.1
> parsing functions of golang.org/x/crypto/cryptobyte can lead to a
> panic."
> 
> From Go commit:
> "When int is 32 bits wide (on 32-bit architectures like 386 and arm), an
> overflow could occur, causing a panic, due to malformed ASN.1 being
> passed to any of the ASN1 methods of String."
> 
> From changelog:
> "- Security (affecting DoH): precompiled binaries of dnscrypt-proxy
> 2.0.37 are built using Go 1.13.7 that fixes a TLS certificate parsing
> issue present in previous versions of the compiler"
> 
> Sources:
> CVE-2020-7919
> https://github.com/golang/go/issues/36837
> https://github.com/golang/go/commit/b13ce14c4a6aa59b7b041ad2b6eed2d23e15b574
> https://github.com/golang/crypto/commit/69ecbb4d6d5dab05e49161c6e77ea40a030884e1
> 
> Changelog:
> https://github.com/DNSCrypt/dnscrypt-proxy/blob/2.0.38/ChangeLog
> 
> This is an update for net/dnscrypt-proxy 2.0.38, released on January 30,
> 2020. I tested on amd64 and unit tests pass.

2.0.39 has been released a couple of hours ago, which fixes the firefox
local DOH service: https://github.com/DNSCrypt/dnscrypt-proxy/releases

Re: UPDATE: archivers/libzip 1.5.2 => 1.6.0

[Björn Ketelaars]

On Sat 01/02/2020 12:45, Brian Callahan wrote:
> Hi ports --
> 
> Attached is an update to libzip.
> Changelog is here: https://libzip.org/news/release-1.6.0.html
> 
> All tests pass. I then built everything that depends on libzip and
> everything built OK too.
> 
> OK?

Diff looks good, and run tested with fuse-zip on amd64.

OK bket@

Re: [update] x11/xdesktopwaves 1.3 -> 1.4

[Björn Ketelaars]

On Sun 02/02/2020 18:02, Charlene Wendling wrote:
> Hi,
> 
> Here is an update for xdesktopwaves. 
> 
> What's new upstream (from $WRKSRC/README):
> 
> - Added backdrop failure checking, and because this is not always
>   reliable, also added an (emergency) exit button.
> - Adapted to new KDE versions.
> - Added support for Hygon Dhyana processor (Chinese variant of AMD Epyc)
> - Fixed some minor portability flaws.
> 
> Port-wise it's a simple update, with just some hardcoded paths needing
> to be removed.
> 
> It builds and works fine on powerpc [0] and amd64.
> 
> Comments/feedback are welcome,
> 
> Charlène.

Update works for me, and diff looks good.

OK bket@

[update] net/sslh 1.11 -> 1.14

[Björn Ketelaars]

This update brings net/sslh from 1.11 to 1.14. Main changes:

Added support for configuration file
Corrected OpenVPN probe to support pre-shared secret mode
Added an actual TLS/SSL probe

Full changelog can be found at http://www.rutschle.net/tech/sslh.shtml

Tested on amd64.

OK?
Index: Makefile
===
RCS file: /cvs/ports/net/sslh/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile22 Apr 2012 20:50:12 -  1.3
+++ Makefile6 Mar 2013 10:58:59 -
@@ -2,10 +2,9 @@
 
 COMMENT =  ssl/ssh multiplexer
 
-VERSION =  1.11
+VERSION =  1.14
 DISTNAME = sslh-${VERSION}
 CATEGORIES =   security net
-REVISION = 0
 
 HOMEPAGE = http://www.rutschle.net/tech/sslh.shtml
 
@@ -15,18 +14,25 @@ PERMIT_PACKAGE_FTP =Yes
 PERMIT_DISTFILES_CDROM =   Yes
 PERMIT_DISTFILES_FTP = Yes
 
-MASTER_SITES = http://www.rutschle.net/tech/ \
-   http://mirror2.openwrt.org/sources/
+MASTER_SITES = http://www.rutschle.net/tech/
 
-WANTLIB =  c wrap
+WANTLIB =  c config wrap
+
+LIB_DEPENDS =  devel/libconfig
+
+MAKE_FLAGS =   CFLAGS="${CFLAGS} -I${LOCALBASE}/include -DLIBWRAP -DLIBCONFIG" 
\
+   LIBS="-L${LOCALBASE}/lib -lconfig -lwrap"
 
-MAKE_FLAGS =   CC="${CC}"
 NO_REGRESS =   Yes
 
 do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sslh
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sslh
${INSTALL_DATA} ${WRKSRC}/sslh.8 ${PREFIX}/man/man8
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sslh
+.for p in basic.cfg example.cfg
+   ${INSTALL_DATA} ${WRKSRC}/$p ${PREFIX}/share/examples/sslh
+.endfor
 .for p in sslh-fork sslh-select
${INSTALL_PROGRAM} ${WRKSRC}/$p ${PREFIX}/sbin
 .endfor
Index: distinfo
===
RCS file: /cvs/ports/net/sslh/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo22 Apr 2012 20:50:12 -  1.2
+++ distinfo6 Mar 2013 10:58:59 -
@@ -1,5 +1,2 @@
-MD5 (sslh-1.11.tar.gz) = TqWZ8PoxriNWRuWiALj4+w==
-RMD160 (sslh-1.11.tar.gz) = M5SJ9peu42Wppt2BADbrzxRikIg=
-SHA1 (sslh-1.11.tar.gz) = +TDdC6F+prHf+S6lZuPvZorVhGg=
-SHA256 (sslh-1.11.tar.gz) = 4b9pmsKZCVRGKSbCYUC4rkDavhB7ua74mWelLH4UHlQ=
-SIZE (sslh-1.11.tar.gz) = 25779
+SHA256 (sslh-1.14.tar.gz) = AokiBxz2u1gW3jqnD09FHuLOL0pwS8GNKYQzSXbM6Oc=
+SIZE (sslh-1.14.tar.gz) = 33278
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/net/sslh/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile  13 Apr 2012 14:14:21 -  1.1.1.1
+++ patches/patch-Makefile  6 Mar 2013 10:58:59 -
@@ -1,6 +1,6 @@
 Makefile.orig  Sat Nov 26 19:06:58 2011
-+++ Makefile   Fri Mar 23 19:53:40 2012
-@@ -5,26 +5,19 @@
+--- Makefile.orig  Sat Dec 15 16:29:38 2012
 Makefile   Tue Mar  5 19:29:11 2013
+@@ -6,31 +6,17 @@ USELIBWRAP=  # Use libwrap?
  COV_TEST= # Perform test coverage?
  PREFIX=/usr/local
  
@@ -14,33 +14,31 @@
 -CFLAGS_COV=-fprofile-arcs -ftest-coverage
 -endif
 -
- CC = gcc
--CFLAGS=-Wall -g $(CFLAGS_COV)
+ CC ?= gcc
+ CFLAGS ?=-Wall -g $(CFLAGS_COV)
  
- #LIBS=-lnet
- LIBS=
- OBJS=common.o sslh-main.o
+ LIBS=$(LDFLAGS)
+ OBJS=common.o sslh-main.o probe.o
  
 -ifneq ($(strip $(USELIBWRAP)),)
 -  LIBS:=$(LIBS) -lwrap
 -  CFLAGS:=$(CFLAGS) -DLIBWRAP
 -endif
-+LIBS:=$(LIBS) -lwrap
-+CFLAGS:=$(CFLAGS) -Wall -DLIBWRAP
- 
+-
+-ifneq ($(strip $(USELIBCONFIG)),)
+-  LIBS:=$(LIBS) -lconfig
+-  CFLAGS:=$(CFLAGS) -DLIBCONFIG
+-endif
+-
  all: sslh $(MAN) echosrv
  
-@@ -46,7 +39,7 @@
-   $(CC) $(CFLAGS) -o echosrv echosrv.o common.o $(LIBS)
+ .c.o: *.h
+@@ -51,7 +37,7 @@ echosrv: $(OBJS) echosrv.o
+   $(CC) $(CFLAGS) -o echosrv echosrv.o probe.o common.o $(LIBS)
  
  $(MAN): sslh.pod Makefile
 -  pod2man --section=8 --release=$(VERSION) --center=" " sslh.pod | gzip 
-9 - > $(MAN)
 +  pod2man --section=8 --release=$(VERSION) --center=" " sslh.pod > $(MAN)
  
- # generic install: install binary and man page
- install: sslh $(MAN)
-@@ -72,4 +65,3 @@
- 
- test:
-   ./t
--
+ # Create release: export clean tree and tag current
+ # configuration
Index: patches/patch-basic_cfg
===
RCS file: patches/patch-basic_cfg
diff -N patches/patch-basic_cfg
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-basic_cfg 6 Mar 2013 10:58:59 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- basic.cfg.orig Tue Mar  5 19:01:27 2013
 basic.cfg  Tue Mar  5 19:01:27 2013
+@@ -6,7 +6,7 @@ foreground: false;
+ inetd: false;
+ numeric: false;
+ timeout: 2;
+-user: "nobody";
++user: "_sslh";
+ pidfile: "/var/run/sslh.pid";
+ 
+ 
Index: patches/patch-example_cfg
===
RCS file: pa

Re: [update] net/sslh 1.11 -> 1.14

[Björn Ketelaars]

On Wed, Mar 06, 2013 at 09:07:05PM +0100, Björn Ketelaars wrote:
> This update brings net/sslh from 1.11 to 1.14. Main changes:
> 
> Added support for configuration file
> Corrected OpenVPN probe to support pre-shared secret mode
> Added an actual TLS/SSL probe
> 
> Full changelog can be found at http://www.rutschle.net/tech/sslh.shtml
> 
> Tested on amd64.
> 
> OK?

Ping.
Index: Makefile
===
RCS file: /cvs/ports/net/sslh/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile22 Apr 2012 20:50:12 -  1.3
+++ Makefile6 Mar 2013 10:58:59 -
@@ -2,10 +2,9 @@
 
 COMMENT =  ssl/ssh multiplexer
 
-VERSION =  1.11
+VERSION =  1.14
 DISTNAME = sslh-${VERSION}
 CATEGORIES =   security net
-REVISION = 0
 
 HOMEPAGE = http://www.rutschle.net/tech/sslh.shtml
 
@@ -15,18 +14,25 @@ PERMIT_PACKAGE_FTP =Yes
 PERMIT_DISTFILES_CDROM =   Yes
 PERMIT_DISTFILES_FTP = Yes
 
-MASTER_SITES = http://www.rutschle.net/tech/ \
-   http://mirror2.openwrt.org/sources/
+MASTER_SITES = http://www.rutschle.net/tech/
 
-WANTLIB =  c wrap
+WANTLIB =  c config wrap
+
+LIB_DEPENDS =  devel/libconfig
+
+MAKE_FLAGS =   CFLAGS="${CFLAGS} -I${LOCALBASE}/include -DLIBWRAP -DLIBCONFIG" 
\
+   LIBS="-L${LOCALBASE}/lib -lconfig -lwrap"
 
-MAKE_FLAGS =   CC="${CC}"
 NO_REGRESS =   Yes
 
 do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sslh
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sslh
${INSTALL_DATA} ${WRKSRC}/sslh.8 ${PREFIX}/man/man8
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sslh
+.for p in basic.cfg example.cfg
+   ${INSTALL_DATA} ${WRKSRC}/$p ${PREFIX}/share/examples/sslh
+.endfor
 .for p in sslh-fork sslh-select
${INSTALL_PROGRAM} ${WRKSRC}/$p ${PREFIX}/sbin
 .endfor
Index: distinfo
===
RCS file: /cvs/ports/net/sslh/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo22 Apr 2012 20:50:12 -  1.2
+++ distinfo6 Mar 2013 10:58:59 -
@@ -1,5 +1,2 @@
-MD5 (sslh-1.11.tar.gz) = TqWZ8PoxriNWRuWiALj4+w==
-RMD160 (sslh-1.11.tar.gz) = M5SJ9peu42Wppt2BADbrzxRikIg=
-SHA1 (sslh-1.11.tar.gz) = +TDdC6F+prHf+S6lZuPvZorVhGg=
-SHA256 (sslh-1.11.tar.gz) = 4b9pmsKZCVRGKSbCYUC4rkDavhB7ua74mWelLH4UHlQ=
-SIZE (sslh-1.11.tar.gz) = 25779
+SHA256 (sslh-1.14.tar.gz) = AokiBxz2u1gW3jqnD09FHuLOL0pwS8GNKYQzSXbM6Oc=
+SIZE (sslh-1.14.tar.gz) = 33278
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/net/sslh/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile  13 Apr 2012 14:14:21 -  1.1.1.1
+++ patches/patch-Makefile  6 Mar 2013 10:58:59 -
@@ -1,6 +1,6 @@
 Makefile.orig  Sat Nov 26 19:06:58 2011
-+++ Makefile   Fri Mar 23 19:53:40 2012
-@@ -5,26 +5,19 @@
+--- Makefile.orig  Sat Dec 15 16:29:38 2012
 Makefile   Tue Mar  5 19:29:11 2013
+@@ -6,31 +6,17 @@ USELIBWRAP=  # Use libwrap?
  COV_TEST= # Perform test coverage?
  PREFIX=/usr/local
  
@@ -14,33 +14,31 @@
 -CFLAGS_COV=-fprofile-arcs -ftest-coverage
 -endif
 -
- CC = gcc
--CFLAGS=-Wall -g $(CFLAGS_COV)
+ CC ?= gcc
+ CFLAGS ?=-Wall -g $(CFLAGS_COV)
  
- #LIBS=-lnet
- LIBS=
- OBJS=common.o sslh-main.o
+ LIBS=$(LDFLAGS)
+ OBJS=common.o sslh-main.o probe.o
  
 -ifneq ($(strip $(USELIBWRAP)),)
 -  LIBS:=$(LIBS) -lwrap
 -  CFLAGS:=$(CFLAGS) -DLIBWRAP
 -endif
-+LIBS:=$(LIBS) -lwrap
-+CFLAGS:=$(CFLAGS) -Wall -DLIBWRAP
- 
+-
+-ifneq ($(strip $(USELIBCONFIG)),)
+-  LIBS:=$(LIBS) -lconfig
+-  CFLAGS:=$(CFLAGS) -DLIBCONFIG
+-endif
+-
  all: sslh $(MAN) echosrv
  
-@@ -46,7 +39,7 @@
-   $(CC) $(CFLAGS) -o echosrv echosrv.o common.o $(LIBS)
+ .c.o: *.h
+@@ -51,7 +37,7 @@ echosrv: $(OBJS) echosrv.o
+   $(CC) $(CFLAGS) -o echosrv echosrv.o probe.o common.o $(LIBS)
  
  $(MAN): sslh.pod Makefile
 -  pod2man --section=8 --release=$(VERSION) --center=" " sslh.pod | gzip 
-9 - > $(MAN)
 +  pod2man --section=8 --release=$(VERSION) --center=" " sslh.pod > $(MAN)
  
- # generic install: install binary and man page
- install: sslh $(MAN)
-@@ -72,4 +65,3 @@
- 
- test:
-   ./t
--
+ # Create release: export clean tree and tag current
+ # configuration
Index: patches/patch-basic_cfg
===
RCS file: patches/patch-basic_cfg
diff -N patches/patch-basic_cfg
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-basic_cfg 6 Mar 2013 10:58:59 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- basic.cfg.orig Tue Mar  5 19:01:27 2013
 basic.cfg  Tue Mar  5 19:01:27 2013
+@@ -6,7 +6,7 @@ foreground: false;
+ inetd: false;
+ numeric: false;
+ timeout: 2