OpenBSD Mail Box: February 2020

Saturday, February 29, 2020

Re: [update patch] remind 3.1.16 -> 3.3.0

On Wed, Feb 26, 2020 at 11:35:03AM +0100, Martin Ziemer wrote:
> On Wed, Feb 26, 2020 at 11:15:37AM +0100, Bjorn Ketelaars wrote:
> > On Mon 24/02/2020 14:15, Martin Ziemer wrote:
> > > This patch updates remind from 3.1.16 to 3.3.0.
> > >
> > > Since i saw there is no maintainer, i also added myself as maintainer.
> > >
> > > Tested the new version on three amd64 systems.
> >
> > I'm seeing the issue below. Does tkremind work for you?
> >
> > $ tkremind
> > Error in startup script: couldn't recognize image data
> > while executing
> > "image create photo leftarrow -data {
> > iVBORw0KGgoAAAANSUhEUgAAAAwAAAAMCAYAAABWdVznAAAC3XpUWHRSYXcgcHJvZmlsZSB0eXBl
> > IGV4aWYAAHja7ZdRkuMoDIbfOcUeAUkIieNg..."
> > (file "/usr/local/bin/tkremind" line 54)
> Get the same error. (My usage is daily cli and weekly export to ps for
> printing)
> I should have tested this too!
>
> I will look into it and try to get a solution.
>
> Just one day after i mailed this patch, a beta for 3.3.1 was released.
>
> I think, i will mail a new patch as 3.3.1 is released. (If i find
> a solution to the tk problem)
Today the second beta started. (I guessed the next version would be out
on friday)
I think, as the next release could be later, we should update before
3.3.1.

To solve the problem with tkremind we need to use tk 8.6 since before
there was no support for png images. (Fixed in the patch below)

Tested the patch in cli on three amd64 systems and gui on two amd64
systems.

Index: Makefile
===================================================================
RCS file: /cvs/ports/misc/remind/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile 12 Jul 2019 21:02:23 -0000 1.38
+++ Makefile 26 Feb 2020 10:46:24 -0000
@@ -2,20 +2,23 @@

COMMENT= scripting language for reminders, with a Tk front end

-DISTNAME= remind-03.01.16
-PKGNAME= remind-3.1.16
+DISTNAME= remind-03.03.00
+PKGNAME= remind-3.3.0
CATEGORIES= misc

MASTER_SITES= https://dianne.skoll.ca/projects/remind/download/

HOMEPAGE= https://dianne.skoll.ca/projects/remind/

+MAINTAINER = Martin Ziemer <horrad@horrad.de>
+
# GPLv2
PERMIT_PACKAGE= Yes

WANTLIB= c m

MODULES= x11/tk
+MODTK_VERSION = 8.6
RUN_DEPENDS= ${MODTK_RUN_DEPENDS} \
devel/tcllib

Index: distinfo
===================================================================
RCS file: /cvs/ports/misc/remind/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 6 Mar 2019 18:24:43 -0000 1.11
+++ distinfo 26 Feb 2020 10:46:24 -0000
@@ -1,2 +1,2 @@
-SHA256 (remind-03.01.16.tar.gz) = 7reb1AGdI6Az/j6GxnLZYDmdtqJ8dH5bRmrVWDHfypM=
-SIZE (remind-03.01.16.tar.gz) = 354521
+SHA256 (remind-03.03.00.tar.gz) = lolbmBrlnDuhNsWa1UvMqk+5WRl/Nxr/TrFuyoGztho=
+SIZE (remind-03.03.00.tar.gz) = 390762

[maintainer update] chicken-5.2.0

Hi,

Chicken had new release, notes below:

---
This is mostly a maintenance and bugfix release, and it is recommended
to update to this version if you're already running CHICKEN 5. Of
course, if you're still running CHICKEN 4, now is also a great time to
switch to 5 :)

One important change might cause breakage of existing code: CHICKEN will
now error out when you use -c with multiple files (see #1655 for more
info).

Thanks to everyone who helped to test this release.

For a full list of the changes since 5.1.0, see the NEWS file:
https://code.call-cc.org/releases/5.2.0/NEWS
---

Here's the diff, pretty straightforward. Tested slightly on amd64.

timo

Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/lang/chicken/Makefile.inc,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile.inc
--- Makefile.inc 6 Aug 2019 18:19:51 -0000 1.15
+++ Makefile.inc 1 Mar 2020 05:59:14 -0000
@@ -2,7 +2,7 @@

COMMENT= practical and portable Scheme system

-V= 5.1.0
+V= 5.2.0
DISTNAME= chicken-${V}

MAINTAINER= Timo Myyra <timo.myyra@bittivirhe.fi>
Index: bootstrap/distinfo
===================================================================
RCS file: /cvs/ports/lang/chicken/bootstrap/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- bootstrap/distinfo 6 Aug 2019 18:19:51 -0000 1.8
+++ bootstrap/distinfo 1 Mar 2020 05:59:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (chicken-5.1.0.tar.gz) = XBEBqNj6q/1QCtaRAeDHyL2CbGiXD4nCcGQEcOe4S0s=
-SIZE (chicken-5.1.0.tar.gz) = 4071169
+SHA256 (chicken-5.2.0.tar.gz) = gZFJyM5zA6mzgdP9wdV2XF+axN7m9ifRZS9HlmqHgPo=
+SIZE (chicken-5.2.0.tar.gz) = 4052305
Index: core/Makefile
===================================================================
RCS file: /cvs/ports/lang/chicken/core/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- core/Makefile 6 Aug 2019 18:19:51 -0000 1.14
+++ core/Makefile 1 Mar 2020 05:59:14 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.14 2019/08/06 18:19:51 juanfra Exp $

-SHARED_LIBS= chicken 7.0 # 11
+SHARED_LIBS= chicken 7.1 # 11

TEST_TARGET= check
TEST_DEPENDS= ${BUILD_PKGPATH}
Index: core/distinfo
===================================================================
RCS file: /cvs/ports/lang/chicken/core/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- core/distinfo 6 Aug 2019 18:19:51 -0000 1.8
+++ core/distinfo 1 Mar 2020 05:59:14 -0000
@@ -1,2 +1,2 @@
-SHA256 (chicken-5.1.0.tar.gz) = XBEBqNj6q/1QCtaRAeDHyL2CbGiXD4nCcGQEcOe4S0s=
-SIZE (chicken-5.1.0.tar.gz) = 4071169
+SHA256 (chicken-5.2.0.tar.gz) = gZFJyM5zA6mzgdP9wdV2XF+axN7m9ifRZS9HlmqHgPo=
+SIZE (chicken-5.2.0.tar.gz) = 4052305
Index: core/pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/chicken/core/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- core/pkg/PLIST 17 Nov 2018 13:29:18 -0000 1.5
+++ core/pkg/PLIST 1 Mar 2020 05:59:14 -0000
@@ -13,51 +13,51 @@ include/chicken/chicken-config.h
include/chicken/chicken.h
lib/chicken/
lib/chicken/${BINARYVERSION}/
-lib/chicken/${BINARYVERSION}/chicken.base.import.so
-lib/chicken/${BINARYVERSION}/chicken.bitwise.import.so
-lib/chicken/${BINARYVERSION}/chicken.blob.import.so
-lib/chicken/${BINARYVERSION}/chicken.compiler.user-pass.import.so
-lib/chicken/${BINARYVERSION}/chicken.condition.import.so
-lib/chicken/${BINARYVERSION}/chicken.continuation.import.so
-lib/chicken/${BINARYVERSION}/chicken.csi.import.so
-lib/chicken/${BINARYVERSION}/chicken.errno.import.so
-lib/chicken/${BINARYVERSION}/chicken.eval.import.so
-lib/chicken/${BINARYVERSION}/chicken.file.import.so
-lib/chicken/${BINARYVERSION}/chicken.file.posix.import.so
-lib/chicken/${BINARYVERSION}/chicken.fixnum.import.so
-lib/chicken/${BINARYVERSION}/chicken.flonum.import.so
-lib/chicken/${BINARYVERSION}/chicken.foreign.import.so
-lib/chicken/${BINARYVERSION}/chicken.format.import.so
-lib/chicken/${BINARYVERSION}/chicken.gc.import.so
-lib/chicken/${BINARYVERSION}/chicken.internal.import.so
-lib/chicken/${BINARYVERSION}/chicken.io.import.so
-lib/chicken/${BINARYVERSION}/chicken.irregex.import.so
-lib/chicken/${BINARYVERSION}/chicken.keyword.import.so
-lib/chicken/${BINARYVERSION}/chicken.load.import.so
-lib/chicken/${BINARYVERSION}/chicken.locative.import.so
-lib/chicken/${BINARYVERSION}/chicken.memory.import.so
-lib/chicken/${BINARYVERSION}/chicken.memory.representation.import.so
-lib/chicken/${BINARYVERSION}/chicken.pathname.import.so
-lib/chicken/${BINARYVERSION}/chicken.platform.import.so
-lib/chicken/${BINARYVERSION}/chicken.plist.import.so
-lib/chicken/${BINARYVERSION}/chicken.port.import.so
-lib/chicken/${BINARYVERSION}/chicken.pretty-print.import.so
-lib/chicken/${BINARYVERSION}/chicken.process-context.import.so
-lib/chicken/${BINARYVERSION}/chicken.process-context.posix.import.so
-lib/chicken/${BINARYVERSION}/chicken.process.import.so
-lib/chicken/${BINARYVERSION}/chicken.process.signal.import.so
-lib/chicken/${BINARYVERSION}/chicken.random.import.so
-lib/chicken/${BINARYVERSION}/chicken.read-syntax.import.so
-lib/chicken/${BINARYVERSION}/chicken.repl.import.so
-lib/chicken/${BINARYVERSION}/chicken.sort.import.so
-lib/chicken/${BINARYVERSION}/chicken.string.import.so
-lib/chicken/${BINARYVERSION}/chicken.syntax.import.so
-lib/chicken/${BINARYVERSION}/chicken.tcp.import.so
-lib/chicken/${BINARYVERSION}/chicken.time.import.so
-lib/chicken/${BINARYVERSION}/chicken.time.posix.import.so
-lib/chicken/${BINARYVERSION}/srfi-4.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.base.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.bitwise.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.blob.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.compiler.user-pass.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.condition.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.continuation.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.csi.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.errno.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.eval.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.file.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.file.posix.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.fixnum.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.flonum.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.foreign.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.format.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.gc.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.internal.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.io.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.irregex.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.keyword.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.load.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.locative.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.memory.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.memory.representation.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.pathname.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.platform.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.plist.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.port.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.pretty-print.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.process-context.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.process-context.posix.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.process.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.process.signal.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.random.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.read-syntax.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.repl.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.sort.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.string.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.syntax.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.tcp.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.time.import.so
+@so lib/chicken/${BINARYVERSION}/chicken.time.posix.import.so
+@so lib/chicken/${BINARYVERSION}/srfi-4.import.so
lib/chicken/${BINARYVERSION}/types.db
-lib/libchicken.a
+@static-lib lib/libchicken.a
@lib lib/libchicken.so.${LIBchicken_VERSION}
@man man/man1/chicken-csc.1
@man man/man1/chicken-csi.1
Index: core/pkg/README
===================================================================
RCS file: /cvs/ports/lang/chicken/core/pkg/README,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 README
--- core/pkg/README 6 Aug 2019 18:19:51 -0000 1.4
+++ core/pkg/README 1 Mar 2020 05:59:14 -0000
@@ -1,4 +1,8 @@
+<<<<<<< README
+$OpenBSD$
+=======
$OpenBSD: README,v 1.4 2019/08/06 18:19:51 juanfra Exp $
+>>>>>>> 1.4
+-----------------------------------------------------------------------
| Running ${PKGSTEM} on OpenBSD
+-----------------------------------------------------------------------

Prometheus not starting

Hi,

I have been trying to run the current Prometheus port version 2.9.2 on
OpenBSD 6.6 and I just cannot figure out why Prometheus fails to start.
My rc.conf.local looks like this:

node_exporter_flags="--web.listen-address=localhost:9100"
prometheus_flags=""
pkg_scripts=node_exporter prometheus

That works nicely for node_exporter but prometheus is giving me this:

prometheus: level=info ts=2020-03-01T00:04:05.104Z caller=main.go:285 msg="no time or size retention was set so using the default time retention" duration=15d
prometheus: level=info ts=2020-03-01T00:04:05.104Z caller=main.go:321 msg="Starting Prometheus" version="(version=2.9.2, branch=non-git, revision=non-git)"
prometheus: level=info ts=2020-03-01T00:04:05.104Z caller=main.go:322 build_context="(go=go1.13.1, user=_pbuild@amd64.ports.openbsd.org, date=20191012-03:10:07)"
prometheus: level=info ts=2020-03-01T00:04:05.104Z caller=main.go:323 host_details=(openbsd)
prometheus: level=info ts=2020-03-01T00:04:05.104Z caller=main.go:324 fd_limits="(soft=128, hard=1024)"
prometheus: level=info ts=2020-03-01T00:04:05.104Z caller=main.go:325 vm_limits="(soft=34359738368b, hard=34359738368b)"
prometheus: level=info ts=2020-03-01T00:04:05.108Z caller=main.go:640 msg="Starting TSDB ..."
prometheus: level=info ts=2020-03-01T00:04:05.109Z caller=main.go:509 msg="Stopping scrape discovery manager..."
prometheus: level=info ts=2020-03-01T00:04:05.109Z caller=main.go:523 msg="Stopping notify discovery manager..."
prometheus: level=info ts=2020-03-01T00:04:05.109Z caller=main.go:545 msg="Stopping scrape manager..."
prometheus: level=info ts=2020-03-01T00:04:05.109Z caller=main.go:519 msg="Notify discovery manager stopped"
prometheus: level=info ts=2020-03-01T00:04:05.109Z caller=web.go:416 component=web msg="Start listening for connections" address=localhost:9090
prometheus: level=info ts=2020-03-01T00:04:05.111Z caller=main.go:505 msg="Scrape discovery manager stopped"
prometheus: level=info ts=2020-03-01T00:04:05.112Z caller=manager.go:743 component="rule manager" msg="Stopping rule manager..."
prometheus: level=info ts=2020-03-01T00:04:05.112Z caller=manager.go:749 component="rule manager" msg="Rule manager stopped"
prometheus: level=info ts=2020-03-01T00:04:05.112Z caller=notifier.go:527 component=notifier msg="Stopping notification manager..."
prometheus: level=info ts=2020-03-01T00:04:05.112Z caller=main.go:708 msg="Notifier manager stopped"
prometheus: level=info ts=2020-03-01T00:04:05.112Z caller=main.go:539 msg="Scrape manager stopped"
prometheus: level=error ts=2020-03-01T00:04:05.112Z caller=main.go:717 err="opening storage failed: mkdir data/: permission denied"

Apparently it is reading its TSDB from the built-in default "data/"
instead of what the port packager set in the rc.d script:

# cat rc.d/prometheus
#!/bin/sh
#
# $OpenBSD: prometheus.rc,v 1.1.1.1 2018/01/10 16:26:19 claudio Exp $

daemon="/usr/local/bin/prometheus"
daemon_flags="--config.file /etc/prometheus/prometheus.yml"
daemon_flags="${daemon_flags} --storage.tsdb.path '/var/prometheus'"
daemon_user=_prometheus

. /etc/rc.d/rc.subr

pexp="${daemon}.*"
rc_bg=YES
rc_reload=NO

rc_start() {
${rcexec} "${daemon} ${daemon_flags} < /dev/null 2>&1 | \
logger -p daemon.info -t prometheus"
}

rc_cmd $1

Strangely, it seems to me like the config.file option is being picked
up, otherwise it would bail out even earlier. rcctl seems to recognize
the flags:

# rcctl -d start prometheus
doing _rc_parse_conf
doing _rc_quirks
prometheus_flags empty, using default >--config.file /etc/prometheus/prometheus.yml --storage.tsdb.path '/var/prometheus'<
doing _rc_parse_conf /var/run/rc.d/prometheus
doing _rc_quirks
doing rc_check
prometheus
doing rc_start
doing _rc_wait start
No home directory /nonexistent!
Logging in with home = "/".
doing rc_check
doing _rc_write_runfile
(ok)

When I run prometheus manually like this, it starts fine:

su -l -s /bin/sh _prometheus -c 'prometheus --config.file=/etc/prometheus/prometheus.yml --storage.tsdb.path=/var/prometheus'

I am running out of ideas what to do here. It looks like an issue with
the rc.d script?

Fabian

Re: [update] librelp version 1.5.0

On 2020/02/29 22:04, Remi Locherer wrote:
> librelp version 1.5.0 was released in January 2020. According to the
> changelog it contains mostly bug fixes.
> --> https://github.com/rsyslog/librelp/blob/master/ChangeLog
>
> This release also introduces the usage of OpenSSL's SSL_CONF_cmd API.
> --> https://github.com/rsyslog/librelp/blob/master/ChangeLog
> This is a bit problematic since LibreSSL is not providing this API.
> Are there better approaches for this issue than my patch?
>
> I verified on amd64 that rsyslog from ports can send and receive messages
> via imrelp and omrelp with librelp 1.5.0.
>
> Comments? OKs?

The common (and more easily greppable) way to do this is to use
"&& !defined(LIBRESSL_VERSION_NUMBER)" in the patch rather than replacing
with #if 0.

Re: py2+3->py3-only devel/quirks update

On Sat, Feb 29, 2020 at 10:26:26PM +0000, Stuart Henderson wrote:
> - replace existing "py2 has been replaced with py3" $obsolete_reason
> ports with "automatically switch to py3 version"

Took me a few to figure this out exactly. I thought you were changing
the string itself :)

Makes sense.

> - remove the jupyter-notebook "py2 has been replaced with py3" entry
> which is bogus as the new package is still named 'jupyter-notebook',
> instead replace with a "rename jupyter-notebook3 to jupyter-notebook"

> OK?

Looks like a good idea to me.

ok kmos

--Kurt

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.865
> diff -u -p -r1.865 Makefile
> --- Makefile 29 Feb 2020 19:57:47 -0000 1.865
> +++ Makefile 29 Feb 2020 22:21:47 -0000
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME = quirks-3.256
> +PKGNAME = quirks-3.257
> PKG_ARCH = *
> MAINTAINER = Marc Espie <espie@openbsd.org>
>
> Index: files/Quirks.pm
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.883
> diff -u -p -r1.883 Quirks.pm
> --- files/Quirks.pm 29 Feb 2020 19:57:47 -0000 1.883
> +++ files/Quirks.pm 29 Feb 2020 22:21:47 -0000
> @@ -365,6 +365,13 @@ my $stem_extensions = {
> 'py-daemon' => 'py3-daemon',
> 'py-nbval' => 'py3-nbval',
> 'py-oauthlib' => 'py3-oauthlib',
> + 'py-semver' => 'py3-semver',
> + 'py-seaborn' => 'py3-seaborn',
> + 'py-natsort' => 'py3-natsort',
> + 'py-mastodon.py' => 'py3-mastodon.py',
> + 'py-bokeh' => 'py3-bokeh',
> + 'py-algorithm-munkres' => 'py3-algorithm-munkres',
> + 'py-pdfminer' => 'py3-pdfminer',
> };
>
> my $obsolete_reason = {
> @@ -1339,7 +1346,6 @@ my $obsolete_reason = {
> 'arm-elf-gcc' => 6,
> 'arm-elf-gdb' => 6,
> 'arm-elf-newlib' => 6,
> - 'py-mastodon.py' => 14,
> 'g77' => 5,
> 'libf2c' => 5,
> 'p5-WWW-Curl' => 3,
> @@ -1356,14 +1362,11 @@ my $obsolete_reason = {
> 'postgresql-plv8' => 5,
> 'py-GeoIP' => 6,
> 'cvsync' => 3,
> - 'py-bokeh' => 14,
> 'pecl-geoip' => 6,
> 'clive' => 5,
> 'aws-shell' => 6,
> 'aqsis' => 5,
> - 'py-algorithm-munkres' => 14,
> 'gtk-xfce-engine' => 3,
> - 'py-pdfminer' => 14,
> 'firewalk' => 0,
> 'goffice08' => 5,
> 'terraform-provider-terraform' => 3,
> @@ -1375,7 +1378,6 @@ my $obsolete_reason = {
> 'py-oauth2' => 5,
> 'afm' => 6,
> 'p5-Geo-IP' => 6,
> - 'py-semver' => 14,
> 'py-libnacl' => 3,
> 'py3-libnacl' => 3,
> 'py3-typing' => 5,
> @@ -1386,11 +1388,9 @@ my $obsolete_reason = {
> 'qt3-sqlite3' => 5,
> 'eigen' => 5,
> 'eigen2' => 5,
> - 'py-seaborn' => 14,
> 'qt-gstreamer' => 5,
> 'qsynergy' => 3,
> 'kqoauth' => 5,
> - 'py-natsort' => 14,
> 'valknut' => 3,
> 'dclib' => 3,
> 'luma' => 3,
> @@ -1405,7 +1405,6 @@ my $obsolete_reason = {
> 'rebar17' => 5,
> 'bouml' => 3,
> 'beediff' => 18,
> - 'jupyter-notebook' => 14,
> 'php-mcrypt' => 3,
> 'sqliteman' => 19,
> 'entomologist' => 3,
>

Re: [maintainer update] audio/py-discogs-client

I've committed www/py-requests-oauthlib, audio/py-discogs-client and
added quirks entries.

py2+3->py3-only devel/quirks update

- replace existing "py2 has been replaced with py3" $obsolete_reason
ports with "automatically switch to py3 version"

- remove the jupyter-notebook "py2 has been replaced with py3" entry
which is bogus as the new package is still named 'jupyter-notebook',
instead replace with a "rename jupyter-notebook3 to jupyter-notebook"

OK?

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.865
diff -u -p -r1.865 Makefile
--- Makefile 29 Feb 2020 19:57:47 -0000 1.865
+++ Makefile 29 Feb 2020 22:21:47 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =

# API.rev
-PKGNAME = quirks-3.256
+PKGNAME = quirks-3.257
PKG_ARCH = *
MAINTAINER = Marc Espie <espie@openbsd.org>

Index: files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.883
diff -u -p -r1.883 Quirks.pm
--- files/Quirks.pm 29 Feb 2020 19:57:47 -0000 1.883
+++ files/Quirks.pm 29 Feb 2020 22:21:47 -0000
@@ -365,6 +365,13 @@ my $stem_extensions = {
'py-daemon' => 'py3-daemon',
'py-nbval' => 'py3-nbval',
'py-oauthlib' => 'py3-oauthlib',
+ 'py-semver' => 'py3-semver',
+ 'py-seaborn' => 'py3-seaborn',
+ 'py-natsort' => 'py3-natsort',
+ 'py-mastodon.py' => 'py3-mastodon.py',
+ 'py-bokeh' => 'py3-bokeh',
+ 'py-algorithm-munkres' => 'py3-algorithm-munkres',
+ 'py-pdfminer' => 'py3-pdfminer',
};

my $obsolete_reason = {
@@ -1339,7 +1346,6 @@ my $obsolete_reason = {
'arm-elf-gcc' => 6,
'arm-elf-gdb' => 6,
'arm-elf-newlib' => 6,
- 'py-mastodon.py' => 14,
'g77' => 5,
'libf2c' => 5,
'p5-WWW-Curl' => 3,
@@ -1356,14 +1362,11 @@ my $obsolete_reason = {
'postgresql-plv8' => 5,
'py-GeoIP' => 6,
'cvsync' => 3,
- 'py-bokeh' => 14,
'pecl-geoip' => 6,
'clive' => 5,
'aws-shell' => 6,
'aqsis' => 5,
- 'py-algorithm-munkres' => 14,
'gtk-xfce-engine' => 3,
- 'py-pdfminer' => 14,
'firewalk' => 0,
'goffice08' => 5,
'terraform-provider-terraform' => 3,
@@ -1375,7 +1378,6 @@ my $obsolete_reason = {
'py-oauth2' => 5,
'afm' => 6,
'p5-Geo-IP' => 6,
- 'py-semver' => 14,
'py-libnacl' => 3,
'py3-libnacl' => 3,
'py3-typing' => 5,
@@ -1386,11 +1388,9 @@ my $obsolete_reason = {
'qt3-sqlite3' => 5,
'eigen' => 5,
'eigen2' => 5,
- 'py-seaborn' => 14,
'qt-gstreamer' => 5,
'qsynergy' => 3,
'kqoauth' => 5,
- 'py-natsort' => 14,
'valknut' => 3,
'dclib' => 3,
'luma' => 3,
@@ -1405,7 +1405,6 @@ my $obsolete_reason = {
'rebar17' => 5,
'bouml' => 3,
'beediff' => 18,
- 'jupyter-notebook' => 14,
'php-mcrypt' => 3,
'sqliteman' => 19,
'entomologist' => 3,

Re: fonts/spleen: Install scalable OTF fonts.

Hi,

On Fri, Feb 28, 2020 at 03:54:30PM +0000, Edd Barrett wrote:

> Install the OTF Spleen fonts so that you can have scalable Spleen in
> (e.g.) your XTerm.

Given that each OTF font has a different name, I believe they can safely
be installed alongside in the same directory.

OK fcambus@

> Put this in your ~/.Xdefaults:
>
> ```
> xterm*faceName: Spleen 32x64
> xterm*faceSize: 14

For best results though, please note that they should be used in the
exact size specified in the README, with anti-aliasing disabled.

- Spleen 8x16: 12 Pt (16 pixels)
- Spleen 12x24: 18 Pt (24 pixels)
- Spleen 16x32: 24 Pt (32 pixels)
- Spleen 32x64: 48 Pt (64 pixels)

[update] librelp version 1.5.0

librelp version 1.5.0 was released in January 2020. According to the
changelog it contains mostly bug fixes.
--> https://github.com/rsyslog/librelp/blob/master/ChangeLog

This release also introduces the usage of OpenSSL's SSL_CONF_cmd API.
--> https://github.com/rsyslog/librelp/blob/master/ChangeLog
This is a bit problematic since LibreSSL is not providing this API.
Are there better approaches for this issue than my patch?

I verified on amd64 that rsyslog from ports can send and receive messages
via imrelp and omrelp with librelp 1.5.0.

Comments? OKs?

Remi

Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/librelp/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 12 Jul 2019 20:49:45 -0000 1.15
+++ Makefile 29 Feb 2020 18:52:48 -0000
@@ -2,9 +2,9 @@

COMMENT = reliable event logging protocol library

-DISTNAME = librelp-1.4.0
+DISTNAME = librelp-1.5.0

-SHARED_LIBS += relp 3.0 # 5.0
+SHARED_LIBS += relp 3.1 # 5.0

CATEGORIES = sysutils

Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/librelp/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 4 May 2019 20:16:42 -0000 1.7
+++ distinfo 29 Feb 2020 13:47:21 -0000
@@ -1,2 +1,2 @@
-SHA256 (librelp-1.4.0.tar.gz) = XNAs5+3i/qA35lzFOJ5B3embabHfmEtCwUAp5gu53QU=
-SIZE (librelp-1.4.0.tar.gz) = 519235
+SHA256 (librelp-1.5.0.tar.gz) = aShO8aBRqywvd2WVjoR77x/POPR+sbA3LGX2PwPIOV4=
+SIZE (librelp-1.5.0.tar.gz) = 521793
Index: patches/patch-src_tcp_c
===================================================================
RCS file: /cvs/ports/sysutils/librelp/patches/patch-src_tcp_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_tcp_c
--- patches/patch-src_tcp_c 4 May 2019 20:16:42 -0000 1.1
+++ patches/patch-src_tcp_c 29 Feb 2020 15:29:22 -0000
@@ -1,11 +1,11 @@
$OpenBSD: patch-src_tcp_c,v 1.1 2019/05/04 20:16:42 remi Exp $

-LibreSSL has no support for @SECLEVEL
+LibreSSL has no support for @SECLEVEL and SSL_CONF_CTX_set_flags().

Index: src/tcp.c
--- src/tcp.c.orig
+++ src/tcp.c
-@@ -1183,14 +1183,8 @@ relpTcpTLSSetPrio_ossl(relpTcp_t *const pThis)
+@@ -1200,14 +1200,8 @@ relpTcpTLSSetPrio_ossl(relpTcp_t *const pThis)
/* Compute priority string (in simple cases where the user does not care...) */
if(pThis->pristring == NULL) {
if (pThis->authmode == eRelpAuthMode_None) {
@@ -20,3 +20,12 @@ Index: src/tcp.c
} else {
strncpy(pristringBuf, "DEFAULT", sizeof(pristringBuf));
}
+@@ -1578,7 +1572,7 @@ relpTcpSetSslConfCmd_ossl(relpTcp_t *const pThis, char
+ } else {
+ pThis->pEngine->dbgprint("relpTcpSetSslConfCmd_ossl: set to '%s'\n", tlsConfigCmd);
+ char errmsg[1424];
+-#if OPENSSL_VERSION_NUMBER >= 0x10020000L
++#if 0
+ char *pCurrentPos;
+ char *pNextPos;
+ char *pszCmd;

Re: [maintainer update] security/py-oauthlib

On Sat, Feb 29, 2020 at 01:55:02PM -0500, Johan Huldtgren wrote:
> On 2020-02-29 13:08, Johan Huldtgren wrote:
> > hello,

> > update of py-oauthlib from 2.1.0 to 3.1.0

> > full changelog is here:
> > https://github.com/oauthlib/oauthlib/blob/master/CHANGELOG.rst

> > Drop python2 FLAVOR. Built, packaged, tested on amd64 with no issues.
> > Consumers are www/py-request-oauthlib and audio/py-discogs-client,
> > updates to each of those in separate emails.

> This time with 100% more @conflict markers.

Commited. Thanks!

--Kurt

Re: NEW: devel/py-kitchen

On Sat, Feb 01, 2020 at 07:56:57PM +0000, Stuart Henderson wrote:
> On 2020/02/01 19:10, Klemens Nanni wrote:
> > On Sun, Jan 26, 2020 at 01:07:26PM +0100, Klemens Nanni wrote:
> > > Python's kitchen sink exists as package; I need this for another, more
> > > existential port.
> > >
> > > Upstream's test consists of a messy bash script that checks Python's
> > > version at runtime and executes different paths based on that.
> > >
> > > The consumer I'm running work fine and I don't want to sink any more
> > >
> > > time in such regress suites, so I'd like to leave them as is (for now).
> > >
> > > Feedback? OK?
> > >
> > > Information for inst:py3-kitchen-1.2.6
> > >
> > > Comment:
> > > kitchen contains a cornucopia of useful code
> > >
> > > Required by:
> > > tuir-1.28.3
> > >
> > > Description:
> > > We've all done it. In the process of writing a brand new application we've
> > > discovered that we need a little bit of code that we've invented before.
> > > Perhaps it's something to handle unicode text. Perhaps it's something to make
> > > a bit of python-2.5 code run on python-2.3. Whatever it is, it ends up being
> > > a tiny bit of code that seems too small to worry about pushing into its own
> > > module so it sits there, a part of your current project, waiting to be cut and
> > > pasted into your next project. And the next. And the next. And since that
> > > little bittybit of code proved so useful to you, it's highly likely that it
> > > proved useful to someone else as well. Useful enough that they've written it
> > > and copy and pasted it over and over into each of their new projects.
> > >
> > > Maintainer: The OpenBSD ports mailing-list <ports@openbsd.org>
> > >
> > > WWW: https://fedorahosted.org/kitchen
> > Here's a new tarball that drops flavors and uses Python 3 only, just in
> > case that's preferred. I've also replaced tabs in DESCR with two spaces.
>
>
> comments from my previous review still apply;
Thanks, I waited for the Python FLAVOR discussion to settle.

> ----- Forwarded message from Stuart Henderson <stu@spacehopper.org> -----
>
> From: Stuart Henderson <stu@spacehopper.org>
> Date: Tue, 28 Jan 2020 22:12:23 +0000
> To: ports@openbsd.org
> Subject: Re: NEW: www/tuir
> Mail-Followup-To: ports@openbsd.org

> py-kitchen:
>
> - HOMEPAGE is dead, it's a toss-up between the github page which is
> current but not very useful (https://github.com/fedora-infra/kitchen)
> or https://pythonhosted.org/kitchen/ which is terribly out of date
> but does actually have some readable docs.
I simply went with pythonhosted, upstream is responsible for providing
up to date content.

> - DESCR is not very informative. It could do with at least saying
> the types of things the functions deal with (i18n, iterating over
> objects, miscellaneous functions to deal with text and character
> set conversion)..
You're right, I picked another sentence from upstream's description and
shamelessly used your wording as well:

Kitchen aims to pull small snippets of code into a few python modules which you
can import and use within your project; those include but are not limited to:

- i18n
- iterating over objects
- misc. functions to deal with text and character set conversion

> tuir: one nit otherwise ok once kitchen is in:
>
> > tuir supports mailcap for opening media links, color schemes, user login and
> > persistent authentication; all with extensive examples and documentation.
>
> at first glance it reads like "mailcap for: opening media links, color
> schemes, user login and persistent authentication" which doesn't make sense.
> with different ordering it's easier to parse:
>
> tuir supports color schemes, mailcap for opening media links, user login and
> persistent authentication; all with extensive examples and documentation.
>
>
>
> ----- End forwarded message -----

Besides HOMEPAGE and DESCR this new tarball only does the new
FLAVORS=python3 FLAVOR=python3 dance, all else untouched.

OK?

Re: [maintainer update] audio/py-discogs-client

Index: audio/Makefile
===================================================================
RCS file: /cvs/ports/audio/Makefile,v
retrieving revision 1.424
diff -u -p -u -p -r1.424 Makefile
--- audio/Makefile 22 Jan 2020 07:49:02 -0000 1.424
+++ audio/Makefile 29 Feb 2020 18:46:53 -0000
@@ -194,7 +194,6 @@
SUBDIR += py-cddb
SUBDIR += py-discid
SUBDIR += py-discid,python3
- SUBDIR += py-discogs-client
SUBDIR += py-discogs-client,python3
SUBDIR += py-eyed3
SUBDIR += py-last
Index: audio/py-discogs-client/Makefile
===================================================================
RCS file: /cvs/ports/audio/py-discogs-client/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- audio/py-discogs-client/Makefile 23 Nov 2019 23:36:47 -0000 1.12
+++ audio/py-discogs-client/Makefile 29 Feb 2020 18:46:55 -0000
@@ -2,12 +2,11 @@

COMMENT = Python interface to Discogs website

-MODPY_EGG_VERSION = 2.2.1
+MODPY_EGG_VERSION = 2.2.2
DISTNAME = discogs-client-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = audio
MAINTAINER = Johan Huldtgren <jhuldtgren@gmail.com>
-REVISION = 1

HOMEPAGE = https://github.com/discogs/discogs_client

@@ -22,7 +21,7 @@ MODPY_PYTEST = Yes
MODPY_PYTEST_ARGS = discogs_client

FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3

RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} \
security/py-oauthlib${MODPY_FLAVOR} \
Index: audio/py-discogs-client/distinfo
===================================================================
RCS file: /cvs/ports/audio/py-discogs-client/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- audio/py-discogs-client/distinfo 14 Dec 2015 18:09:09 -0000 1.4
+++ audio/py-discogs-client/distinfo 29 Feb 2020 18:46:55 -0000
@@ -1,2 +1,2 @@
-SHA256 (discogs-client-2.2.1.tar.gz) = njK15Fz/Qa+AJYkccaowJbPhiV3lmzfBH9IDqK9odBQ=
-SIZE (discogs-client-2.2.1.tar.gz) = 24645
+SHA256 (discogs-client-2.2.2.tar.gz) = rq5D+5KB4nxYDRvNSE5sMJ9POgWvOQgBbuM2N4bvQ9g=
+SIZE (discogs-client-2.2.2.tar.gz) = 25005
Index: audio/py-discogs-client/pkg/PLIST
===================================================================
RCS file: /cvs/ports/audio/py-discogs-client/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- audio/py-discogs-client/pkg/PLIST 11 Jun 2017 21:14:22 -0000 1.3
+++ audio/py-discogs-client/pkg/PLIST 29 Feb 2020 18:46:56 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.3 2017/06/11 21:14:22 sthen Exp $
+@conflict py-discogs-client-*
+@pkgpath audio/py-discogs-client
lib/python${MODPY_VERSION}/site-packages/discogs_client/
lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
On 2020-02-29 13:19, Johan Huldtgren wrote:
> hello,
>
> minor update to py-discogs-client from 2.2.1 to 2.2.2
>
> Drop python2 FLAVOR, only consumer audio/beets is already
> python3 only. Built, packaged and tested (with beets) on
> amd64 with no issues.

Now with 100% more @onflict markers.

.jh

> Index: audio/Makefile
> ===================================================================
> RCS file: /cvs/ports/audio/Makefile,v
> retrieving revision 1.424
> diff -u -p -u -p -r1.424 Makefile
> --- audio/Makefile 22 Jan 2020 07:49:02 -0000 1.424
> +++ audio/Makefile 29 Feb 2020 17:19:59 -0000
> @@ -194,7 +194,6 @@
> SUBDIR += py-cddb
> SUBDIR += py-discid
> SUBDIR += py-discid,python3
> - SUBDIR += py-discogs-client
> SUBDIR += py-discogs-client,python3
> SUBDIR += py-eyed3
> SUBDIR += py-last
> Index: audio/py-discogs-client/Makefile
> ===================================================================
> RCS file: /cvs/ports/audio/py-discogs-client/Makefile,v
> retrieving revision 1.12
> diff -u -p -u -p -r1.12 Makefile
> --- audio/py-discogs-client/Makefile 23 Nov 2019 23:36:47 -0000 1.12
> +++ audio/py-discogs-client/Makefile 29 Feb 2020 17:20:00 -0000
> @@ -2,12 +2,11 @@
>
> COMMENT = Python interface to Discogs website
>
> -MODPY_EGG_VERSION = 2.2.1
> +MODPY_EGG_VERSION = 2.2.2
> DISTNAME = discogs-client-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> CATEGORIES = audio
> MAINTAINER = Johan Huldtgren <jhuldtgren@gmail.com>
> -REVISION = 1
>
> HOMEPAGE = https://github.com/discogs/discogs_client
>
> @@ -22,7 +21,7 @@ MODPY_PYTEST = Yes
> MODPY_PYTEST_ARGS = discogs_client
>
> FLAVORS = python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} \
> security/py-oauthlib${MODPY_FLAVOR} \
> Index: audio/py-discogs-client/distinfo
> ===================================================================
> RCS file: /cvs/ports/audio/py-discogs-client/distinfo,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 distinfo
> --- audio/py-discogs-client/distinfo 14 Dec 2015 18:09:09 -0000 1.4
> +++ audio/py-discogs-client/distinfo 29 Feb 2020 17:20:00 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (discogs-client-2.2.1.tar.gz) = njK15Fz/Qa+AJYkccaowJbPhiV3lmzfBH9IDqK9odBQ=
> -SIZE (discogs-client-2.2.1.tar.gz) = 24645
> +SHA256 (discogs-client-2.2.2.tar.gz) = rq5D+5KB4nxYDRvNSE5sMJ9POgWvOQgBbuM2N4bvQ9g=
> +SIZE (discogs-client-2.2.2.tar.gz) = 25005
> Index: audio/py-discogs-client/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/audio/py-discogs-client/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 PLIST
> --- audio/py-discogs-client/pkg/PLIST 11 Jun 2017 21:14:22 -0000 1.3
> +++ audio/py-discogs-client/pkg/PLIST 29 Feb 2020 17:20:01 -0000
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.3 2017/06/11 21:14:22 sthen Exp $
> +@pkgpath audio/py-discogs-client
> lib/python${MODPY_VERSION}/site-packages/discogs_client/
> lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO

Re: [update] www/py-requests-oauthlib

Index: www/Makefile
===================================================================
RCS file: /cvs/ports/www/Makefile,v
retrieving revision 1.947
diff -u -p -u -p -r1.947 Makefile
--- www/Makefile 25 Feb 2020 20:29:28 -0000 1.947
+++ www/Makefile 29 Feb 2020 18:50:49 -0000
@@ -468,7 +468,6 @@
SUBDIR += py-requests-futures,python3
SUBDIR += py-requests-mock
SUBDIR += py-requests-mock,python3
- SUBDIR += py-requests-oauthlib
SUBDIR += py-requests-oauthlib,python3
SUBDIR += py-requests-toolbelt
SUBDIR += py-requests-toolbelt,python3
Index: www/py-requests-oauthlib/Makefile
===================================================================
RCS file: /cvs/ports/www/py-requests-oauthlib/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- www/py-requests-oauthlib/Makefile 12 Jul 2019 20:51:03 -0000 1.5
+++ www/py-requests-oauthlib/Makefile 29 Feb 2020 18:50:56 -0000
@@ -2,10 +2,9 @@

COMMENT = OAuth library support for python-requests

-MODPY_EGG_VERSION = 1.0.0
+MODPY_EGG_VERSION = 1.3.0
DISTNAME = requests-oauthlib-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 0

CATEGORIES = www

@@ -28,7 +27,7 @@ MODPY_SETUPTOOLS = Yes
MODPY_PYTEST = Yes

FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3

pre-test:
rm -rf ${WRKSRC}/tests/__pycache__
Index: www/py-requests-oauthlib/distinfo
===================================================================
RCS file: /cvs/ports/www/py-requests-oauthlib/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- www/py-requests-oauthlib/distinfo 14 Aug 2018 05:56:19 -0000 1.1.1.1
+++ www/py-requests-oauthlib/distinfo 29 Feb 2020 18:50:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (requests-oauthlib-1.0.0.tar.gz) = iIa/7FrXr7OR7VRDsfaXxvSumNDlYgg52LRJnAMq2j8=
-SIZE (requests-oauthlib-1.0.0.tar.gz) = 74092
+SHA256 (requests-oauthlib-1.3.0.tar.gz) = tCYWAacf1yGovW16ocwdaoqTtKn16WYm+OTZHovuqmo=
+SIZE (requests-oauthlib-1.3.0.tar.gz) = 88157
Index: www/py-requests-oauthlib/pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/py-requests-oauthlib/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- www/py-requests-oauthlib/pkg/PLIST 14 Aug 2018 05:56:19 -0000 1.1.1.1
+++ www/py-requests-oauthlib/pkg/PLIST 29 Feb 2020 18:50:56 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2018/08/14 05:56:19 remi Exp $
+@conflict py-requests-oauthlib-*
+@pkgpath www/py-requests-oauthlib
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -21,6 +23,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}douban.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}facebook.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}fitbit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}instagram.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}linkedin.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}mailchimp.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}plentymarkets.${MODPY_PYC_MAGIC_TAG}pyc
@@ -29,6 +32,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/douban.py
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/facebook.py
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/fitbit.py
+lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/instagram.py
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/linkedin.py
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/mailchimp.py
lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/plentymarkets.py
On 2020-02-29 13:14, Johan Huldtgren wrote:
> hello,
>
> update to py-requests-oauthlib from 1.0.0 to 1.3.0
>
> full changelog is here:
> https://github.com/requests/requests-oauthlib/blob/master/HISTORY.rst
>
> Drop python2 FLAVOR, only consumer vdirsyncer is already python3 only.
> Built, packaged, and tested (with vdirsyncer) on amd64 with no issues.

Now with 100% more @conflict markers.

.jh

> Index: www/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/Makefile,v
> retrieving revision 1.947
> diff -u -p -u -p -r1.947 Makefile
> --- www/Makefile 25 Feb 2020 20:29:28 -0000 1.947
> +++ www/Makefile 29 Feb 2020 17:30:51 -0000
> @@ -468,7 +468,6 @@
> SUBDIR += py-requests-futures,python3
> SUBDIR += py-requests-mock
> SUBDIR += py-requests-mock,python3
> - SUBDIR += py-requests-oauthlib
> SUBDIR += py-requests-oauthlib,python3
> SUBDIR += py-requests-toolbelt
> SUBDIR += py-requests-toolbelt,python3
> Index: www/py-requests-oauthlib/Makefile
> ===================================================================
> RCS file: /cvs/ports/www/py-requests-oauthlib/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 Makefile
> --- www/py-requests-oauthlib/Makefile 12 Jul 2019 20:51:03 -0000 1.5
> +++ www/py-requests-oauthlib/Makefile 29 Feb 2020 17:31:00 -0000
> @@ -2,10 +2,9 @@
>
> COMMENT = OAuth library support for python-requests
>
> -MODPY_EGG_VERSION = 1.0.0
> +MODPY_EGG_VERSION = 1.3.0
> DISTNAME = requests-oauthlib-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
> -REVISION = 0
>
> CATEGORIES = www
>
> @@ -28,7 +27,7 @@ MODPY_SETUPTOOLS = Yes
> MODPY_PYTEST = Yes
>
> FLAVORS = python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> pre-test:
> rm -rf ${WRKSRC}/tests/__pycache__
> Index: www/py-requests-oauthlib/distinfo
> ===================================================================
> RCS file: /cvs/ports/www/py-requests-oauthlib/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- www/py-requests-oauthlib/distinfo 14 Aug 2018 05:56:19 -0000 1.1.1.1
> +++ www/py-requests-oauthlib/distinfo 29 Feb 2020 17:31:00 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (requests-oauthlib-1.0.0.tar.gz) = iIa/7FrXr7OR7VRDsfaXxvSumNDlYgg52LRJnAMq2j8=
> -SIZE (requests-oauthlib-1.0.0.tar.gz) = 74092
> +SHA256 (requests-oauthlib-1.3.0.tar.gz) = tCYWAacf1yGovW16ocwdaoqTtKn16WYm+OTZHovuqmo=
> +SIZE (requests-oauthlib-1.3.0.tar.gz) = 88157
> Index: www/py-requests-oauthlib/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/www/py-requests-oauthlib/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 PLIST
> --- www/py-requests-oauthlib/pkg/PLIST 14 Aug 2018 05:56:19 -0000 1.1.1.1
> +++ www/py-requests-oauthlib/pkg/PLIST 29 Feb 2020 17:31:00 -0000
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.1.1.1 2018/08/14 05:56:19 remi Exp $
> +@pkgpath www/py-requests-oauthlib
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> @@ -21,6 +22,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}douban.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}facebook.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}fitbit.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}instagram.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}linkedin.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}mailchimp.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/${MODPY_PYCACHE}plentymarkets.${MODPY_PYC_MAGIC_TAG}pyc
> @@ -29,6 +31,7 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/douban.py
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/facebook.py
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/fitbit.py
> +lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/instagram.py
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/linkedin.py
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/mailchimp.py
> lib/python${MODPY_VERSION}/site-packages/requests_oauthlib/compliance_fixes/plentymarkets.py

Re: [maintainer update] security/py-oauthlib

Index: security/Makefile
===================================================================
RCS file: /cvs/ports/security/Makefile,v
retrieving revision 1.567
diff -u -p -u -p -r1.567 Makefile
--- security/Makefile 29 Feb 2020 07:59:50 -0000 1.567
+++ security/Makefile 29 Feb 2020 18:48:29 -0000
@@ -310,7 +310,6 @@
SUBDIR += py-miasm
SUBDIR += py-openssl
SUBDIR += py-openssl,python3
- SUBDIR += py-oauthlib
SUBDIR += py-oauthlib,python3
SUBDIR += py-paramiko
SUBDIR += py-paramiko,python3
Index: security/py-oauthlib/Makefile
===================================================================
RCS file: /cvs/ports/security/py-oauthlib/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- security/py-oauthlib/Makefile 8 Nov 2019 09:09:19 -0000 1.16
+++ security/py-oauthlib/Makefile 29 Feb 2020 18:48:32 -0000
@@ -2,14 +2,13 @@

COMMENT = Python library for OAuth

-MODPY_EGG_VERSION = 2.1.0
+MODPY_EGG_VERSION = 3.1.0

GH_ACCOUNT = idan
GH_PROJECT = oauthlib
GH_TAGNAME = v${MODPY_EGG_VERSION}

PKGNAME = py-oauthlib-${MODPY_EGG_VERSION}
-REVISION = 0

CATEGORIES = security
MAINTAINER = Johan Huldtgren <jhuldtgren@gmail.com>
@@ -29,12 +28,8 @@ TEST_DEPENDS = devel/py-coverage${MODPY_
devel/py-mock${MODPY_FLAVOR}

FLAVORS = python3
-FLAVOR ?=
+FLAVOR = python3

FIX_EXTRACT_PERMISSIONS = Yes
-
-# tests/oauth2/rfc5849/endpoints/test_error_responses.py
-# will throw a warning when make test is run under
-# the python3 flavor, fixing this breaks python2 though.

.include <bsd.port.mk>
Index: security/py-oauthlib/distinfo
===================================================================
RCS file: /cvs/ports/security/py-oauthlib/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- security/py-oauthlib/distinfo 1 Jul 2018 06:28:12 -0000 1.10
+++ security/py-oauthlib/distinfo 29 Feb 2020 18:48:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (oauthlib-2.1.0.tar.gz) = q91fFJCn+n1R89Wdg+nBZznVYhzETXUOMiRtLuLiTyQ=
-SIZE (oauthlib-2.1.0.tar.gz) = 164989
+SHA256 (oauthlib-3.1.0.tar.gz) = QeihlgRruM0m+HDI/Ccd4Roj5WzQSRspkDkXAg5j3cY=
+SIZE (oauthlib-3.1.0.tar.gz) = 208920
Index: security/py-oauthlib/patches/patch-tests_oauth2_rfc6749_endpoints_test_error_responses_py
===================================================================
RCS file: security/py-oauthlib/patches/patch-tests_oauth2_rfc6749_endpoints_test_error_responses_py
diff -N security/py-oauthlib/patches/patch-tests_oauth2_rfc6749_endpoints_test_error_responses_py
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ security/py-oauthlib/patches/patch-tests_oauth2_rfc6749_endpoints_test_error_responses_py 29 Feb 2020 18:48:32 -0000
@@ -0,0 +1,31 @@
+$OpenBSD$
+
+Index: tests/oauth2/rfc6749/endpoints/test_error_responses.py
+--- tests/oauth2/rfc6749/endpoints/test_error_responses.py.orig
++++ tests/oauth2/rfc6749/endpoints/test_error_responses.py
+@@ -179,21 +179,21 @@ class ErrorResponseTest(TestCase):
+ description = 'Duplicate client_id parameter.'
+
+ # Authorization code
+- self.assertRaisesRegexp(errors.InvalidRequestFatalError,
++ self.assertRaisesRegex(errors.InvalidRequestFatalError,
+ description,
+ self.web.validate_authorization_request,
+ uri.format('code'))
+- self.assertRaisesRegexp(errors.InvalidRequestFatalError,
++ self.assertRaisesRegex(errors.InvalidRequestFatalError,
+ description,
+ self.web.create_authorization_response,
+ uri.format('code'), scopes=['foo'])
+
+ # Implicit grant
+- self.assertRaisesRegexp(errors.InvalidRequestFatalError,
++ self.assertRaisesRegex(errors.InvalidRequestFatalError,
+ description,
+ self.mobile.validate_authorization_request,
+ uri.format('token'))
+- self.assertRaisesRegexp(errors.InvalidRequestFatalError,
++ self.assertRaisesRegex(errors.InvalidRequestFatalError,
+ description,
+ self.mobile.create_authorization_response,
+ uri.format('token'), scopes=['foo'])
Index: security/py-oauthlib/pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/py-oauthlib/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- security/py-oauthlib/pkg/PLIST 1 Oct 2016 15:20:08 -0000 1.4
+++ security/py-oauthlib/pkg/PLIST 29 Feb 2020 18:48:33 -0000
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2016/10/01 15:20:08 danj Exp $
+@conflict py-oauthlib-*
+@pkgpath security/py-oauthlib
lib/python${MODPY_VERSION}/site-packages/oauthlib/
lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -84,12 +86,16 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}authorization.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}introspect.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}pre_configured.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}resource.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}revocation.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}token.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/authorization.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/base.py
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/introspect.py
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/metadata.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/resource.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/revocation.py
@@ -103,19 +109,59 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}client_credentials.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}implicit.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}openid_connect.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}refresh_token.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}resource_owner_password_credentials.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/base.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/implicit.py
-lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/openid_connect.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/parameters.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/request_validator.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/tokens.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/utils.py
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}request_validator.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}tokens.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}pre_configured.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}userinfo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/pre_configured.py
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/userinfo.py
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/exceptions.py
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}authorization_code.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}dispatchers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}hybrid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}implicit.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/authorization_code.py
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/base.py
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/dispatchers.py
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/exceptions.py
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/hybrid.py
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/implicit.py
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/request_validator.py
+lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/tokens.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/signals.py
lib/python${MODPY_VERSION}/site-packages/oauthlib/uri_validate.py
On 2020-02-29 13:08, Johan Huldtgren wrote:
> hello,
>
> update of py-oauthlib from 2.1.0 to 3.1.0
>
> full changelog is here:
> https://github.com/oauthlib/oauthlib/blob/master/CHANGELOG.rst
>
> Drop python2 FLAVOR. Built, packaged, tested on amd64 with no issues.
> Consumers are www/py-request-oauthlib and audio/py-discogs-client,
> updates to each of those in separate emails.

This time with 100% more @conflict markers.

.jh

> Index: security/Makefile
> ===================================================================
> RCS file: /cvs/ports/security/Makefile,v
> retrieving revision 1.567
> diff -u -p -u -p -r1.567 Makefile
> --- security/Makefile 29 Feb 2020 07:59:50 -0000 1.567
> +++ security/Makefile 29 Feb 2020 18:05:14 -0000
> @@ -310,7 +310,6 @@
> SUBDIR += py-miasm
> SUBDIR += py-openssl
> SUBDIR += py-openssl,python3
> - SUBDIR += py-oauthlib
> SUBDIR += py-oauthlib,python3
> SUBDIR += py-paramiko
> SUBDIR += py-paramiko,python3
> Index: security/py-oauthlib/Makefile
> ===================================================================
> RCS file: /cvs/ports/security/py-oauthlib/Makefile,v
> retrieving revision 1.16
> diff -u -p -u -p -r1.16 Makefile
> --- security/py-oauthlib/Makefile 8 Nov 2019 09:09:19 -0000 1.16
> +++ security/py-oauthlib/Makefile 29 Feb 2020 18:05:18 -0000
> @@ -2,14 +2,13 @@
>
> COMMENT = Python library for OAuth
>
> -MODPY_EGG_VERSION = 2.1.0
> +MODPY_EGG_VERSION = 3.1.0
>
> GH_ACCOUNT = idan
> GH_PROJECT = oauthlib
> GH_TAGNAME = v${MODPY_EGG_VERSION}
>
> PKGNAME = py-oauthlib-${MODPY_EGG_VERSION}
> -REVISION = 0
>
> CATEGORIES = security
> MAINTAINER = Johan Huldtgren <jhuldtgren@gmail.com>
> @@ -29,12 +28,8 @@ TEST_DEPENDS = devel/py-coverage${MODPY_
> devel/py-mock${MODPY_FLAVOR}
>
> FLAVORS = python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> FIX_EXTRACT_PERMISSIONS = Yes
> -
> -# tests/oauth2/rfc5849/endpoints/test_error_responses.py
> -# will throw a warning when make test is run under
> -# the python3 flavor, fixing this breaks python2 though.
>
> .include <bsd.port.mk>
> Index: security/py-oauthlib/distinfo
> ===================================================================
> RCS file: /cvs/ports/security/py-oauthlib/distinfo,v
> retrieving revision 1.10
> diff -u -p -u -p -r1.10 distinfo
> --- security/py-oauthlib/distinfo 1 Jul 2018 06:28:12 -0000 1.10
> +++ security/py-oauthlib/distinfo 29 Feb 2020 18:05:18 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (oauthlib-2.1.0.tar.gz) = q91fFJCn+n1R89Wdg+nBZznVYhzETXUOMiRtLuLiTyQ=
> -SIZE (oauthlib-2.1.0.tar.gz) = 164989
> +SHA256 (oauthlib-3.1.0.tar.gz) = QeihlgRruM0m+HDI/Ccd4Roj5WzQSRspkDkXAg5j3cY=
> +SIZE (oauthlib-3.1.0.tar.gz) = 208920
> Index: security/py-oauthlib/patches/patch-tests_oauth2_rfc6749_endpoints_test_error_responses_py
> ===================================================================
> RCS file: security/py-oauthlib/patches/patch-tests_oauth2_rfc6749_endpoints_test_error_responses_py
> diff -N security/py-oauthlib/patches/patch-tests_oauth2_rfc6749_endpoints_test_error_responses_py
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ security/py-oauthlib/patches/patch-tests_oauth2_rfc6749_endpoints_test_error_responses_py 29 Feb 2020 18:05:18 -0000
> @@ -0,0 +1,31 @@
> +$OpenBSD$
> +
> +Index: tests/oauth2/rfc6749/endpoints/test_error_responses.py
> +--- tests/oauth2/rfc6749/endpoints/test_error_responses.py.orig
> ++++ tests/oauth2/rfc6749/endpoints/test_error_responses.py
> +@@ -179,21 +179,21 @@ class ErrorResponseTest(TestCase):
> + description = 'Duplicate client_id parameter.'
> +
> + # Authorization code
> +- self.assertRaisesRegexp(errors.InvalidRequestFatalError,
> ++ self.assertRaisesRegex(errors.InvalidRequestFatalError,
> + description,
> + self.web.validate_authorization_request,
> + uri.format('code'))
> +- self.assertRaisesRegexp(errors.InvalidRequestFatalError,
> ++ self.assertRaisesRegex(errors.InvalidRequestFatalError,
> + description,
> + self.web.create_authorization_response,
> + uri.format('code'), scopes=['foo'])
> +
> + # Implicit grant
> +- self.assertRaisesRegexp(errors.InvalidRequestFatalError,
> ++ self.assertRaisesRegex(errors.InvalidRequestFatalError,
> + description,
> + self.mobile.validate_authorization_request,
> + uri.format('token'))
> +- self.assertRaisesRegexp(errors.InvalidRequestFatalError,
> ++ self.assertRaisesRegex(errors.InvalidRequestFatalError,
> + description,
> + self.mobile.create_authorization_response,
> + uri.format('token'), scopes=['foo'])
> Index: security/py-oauthlib/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/security/py-oauthlib/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 PLIST
> --- security/py-oauthlib/pkg/PLIST 1 Oct 2016 15:20:08 -0000 1.4
> +++ security/py-oauthlib/pkg/PLIST 29 Feb 2020 18:05:18 -0000
> @@ -1,4 +1,5 @@
> @comment $OpenBSD: PLIST,v 1.4 2016/10/01 15:20:08 danj Exp $
> +@pkgpath security/py-oauthlib
> lib/python${MODPY_VERSION}/site-packages/oauthlib/
> lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> @@ -84,12 +85,16 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}authorization.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}introspect.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}metadata.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}pre_configured.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}resource.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}revocation.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/${MODPY_PYCACHE}token.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/authorization.py
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/base.py
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/introspect.py
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/metadata.py
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/pre_configured.py
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/resource.py
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/endpoints/revocation.py
> @@ -103,19 +108,59 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}client_credentials.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}implicit.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}openid_connect.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}refresh_token.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/${MODPY_PYCACHE}resource_owner_password_credentials.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/authorization_code.py
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/base.py
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/client_credentials.py
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/implicit.py
> -lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/openid_connect.py
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/refresh_token.py
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/grant_types/resource_owner_password_credentials.py
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/parameters.py
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/request_validator.py
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/tokens.py
> lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc6749/utils.py
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}request_validator.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/${MODPY_PYCACHE}tokens.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}pre_configured.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/${MODPY_PYCACHE}userinfo.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/pre_configured.py
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/endpoints/userinfo.py
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/exceptions.py
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/__init__.py
> +${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}/
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}authorization_code.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}base.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}dispatchers.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}hybrid.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/${MODPY_PYCACHE}implicit.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/authorization_code.py
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/base.py
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/dispatchers.py
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/exceptions.py
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/hybrid.py
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/grant_types/implicit.py
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/request_validator.py
> +lib/python${MODPY_VERSION}/site-packages/oauthlib/openid/connect/core/tokens.py
> lib/python${MODPY_VERSION}/site-packages/oauthlib/signals.py
> lib/python${MODPY_VERSION}/site-packages/oauthlib/uri_validate.py

Re: UPDATE devel/py-nbval-0.9.5

On Sat, Feb 29, 2020 at 03:00:20PM +0100, Bjorn Ketelaars wrote:
> Diff below brings devel/py-nbval to 0.9.5. Commit log doesn't list any
> big changes. Primary reason for wanting to update this port is that it
> blocks other updates.

> Consumer (TDEP of jupyter-notebook) is already python3-only, as such
> migrate this port away from python2. While here add HOMEPAGE.

> Testing:
> - 'make test' fails 1 test less (2->1)
> - ran 'make test' of www/jupyter-notebook

> I will add a quirk to devel/quirks after committing.

> Comments/OK?

Same test results for me on sparc64. ok kmos

--Kurt

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/Makefile,v
> retrieving revision 1.1940
> diff -u -p -r1.1940 Makefile
> --- Makefile 23 Feb 2020 17:35:29 -0000 1.1940
> +++ Makefile 29 Feb 2020 13:52:56 -0000
> @@ -1550,7 +1550,6 @@
> SUBDIR += py-nbconvert,python3
> SUBDIR += py-nbformat
> SUBDIR += py-nbformat,python3
> - SUBDIR += py-nbval
> SUBDIR += py-nbval,python3
> SUBDIR += py-nose
> SUBDIR += py-nose,python3
> Index: py-nbval/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/py-nbval/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- py-nbval/Makefile 12 Jul 2019 20:45:51 -0000 1.3
> +++ py-nbval/Makefile 29 Feb 2020 13:53:01 -0000
> @@ -2,12 +2,14 @@
>
> COMMENT = py.test plugin to validate Jupyter notebooks
>
> -MODPY_EGG_VERSION = 0.9.1
> +MODPY_EGG_VERSION = 0.9.5
> DISTNAME = nbval-${MODPY_EGG_VERSION}
> PKGNAME = py-${DISTNAME}
>
> CATEGORIES = devel
>
> +HOMEPAGE = https://github.com/computationalmodelling/nbval
> +
> # BSD
> PERMIT_PACKAGE = Yes
>
> @@ -26,7 +28,7 @@ TEST_DEPENDS = devel/py-nbval${MODPY_FL
> math/py-sympy${MODPY_FLAVOR}
>
> FLAVORS = python3
> -FLAVOR ?=
> +FLAVOR = python3
>
> post-patch:
> sed -i 's,py.test,py.test${MODPY_BIN_SUFFIX},' \
> Index: py-nbval/distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/py-nbval/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- py-nbval/distinfo 29 Apr 2019 12:55:44 -0000 1.1.1.1
> +++ py-nbval/distinfo 29 Feb 2020 13:53:01 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (nbval-0.9.1.tar.gz) = Pxi4evTpTM0HMmPdWM0+66vp9eTWq1NbOdOvZIEcfto=
> -SIZE (nbval-0.9.1.tar.gz) = 64476
> +SHA256 (nbval-0.9.5.tar.gz) = 6HJ7tUroRDaP0XpAwV878q5kvm7DqawUM+AVXd65AvY=
> +SIZE (nbval-0.9.5.tar.gz) = 60761
> Index: py-nbval/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/py-nbval/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- py-nbval/pkg/PLIST 29 Apr 2019 12:55:44 -0000 1.1.1.1
> +++ py-nbval/pkg/PLIST 29 Feb 2020 13:53:01 -0000
> @@ -1,4 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.1.1.1 2019/04/29 12:55:44 bket Exp $
> +@conflict py-nbval-*
> +@pkgpath devel/py-nbval
> lib/python${MODPY_VERSION}/site-packages/nbval/
> lib/python${MODPY_VERSION}/site-packages/nbval-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> lib/python${MODPY_VERSION}/site-packages/nbval-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> @@ -10,11 +12,15 @@ lib/python${MODPY_VERSION}/site-packages
> lib/python${MODPY_VERSION}/site-packages/nbval/__init__.py
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/nbval/${MODPY_PYCACHE}/
> lib/python${MODPY_VERSION}/site-packages/nbval/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/nbval/${MODPY_PYCACHE}_cover4.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/nbval/${MODPY_PYCACHE}_cover5.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/nbval/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/nbval/${MODPY_PYCACHE}cover.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/nbval/${MODPY_PYCACHE}kernel.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/nbval/${MODPY_PYCACHE}nbdime_reporter.${MODPY_PYC_MAGIC_TAG}pyc
> lib/python${MODPY_VERSION}/site-packages/nbval/${MODPY_PYCACHE}plugin.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/nbval/_cover4.py
> +lib/python${MODPY_VERSION}/site-packages/nbval/_cover5.py
> lib/python${MODPY_VERSION}/site-packages/nbval/_version.py
> lib/python${MODPY_VERSION}/site-packages/nbval/cover.py
> lib/python${MODPY_VERSION}/site-packages/nbval/kernel.py
>

sparc64 bulk build report