Re: productivity/khal missing dependencies

[Johan Huldtgren]

hello,

On 2024-04-21 17:32, Daniel Dickman wrote:
> 
> 
> On Sun, 21 Apr 2024, Johan Huldtgren wrote:
> 
> > hello,
> > 
> > i don't use ikhal very often, so I'm not sure how new this issue is,
> > but after upgrading to latest -current and packages ikhal would die
> > with:
> 
> From the stack trace, the problem is actually that the urwid port is 
> missing those dependencies rather than being an issue in khal. I checked 
> the urwid port and indeed the requiremenst.txt file lists those as being 
> RDEPs.
> 
> I've just committed a fix to the py-urwid port which should hopefully 
> solve the issue you ran into.

I can confirm that with -current packages ikhal works again.

thanks,

.jh

productivity/khal missing dependencies

[Johan Huldtgren]

hello,

i don't use ikhal very often, so I'm not sure how new this issue is,
but after upgrading to latest -current and packages ikhal would die
with:

$ ikhal
Traceback (most recent call last):
  File "/usr/local/bin/ikhal", line 8, in 
sys.exit(main_ikhal())
  File "/usr/local/lib/python3.10/site-packages/click/core.py", line 1157, in 
__call__
return self.main(*args, **kwargs)
  File "/usr/local/lib/python3.10/site-packages/click/core.py", line 1078, in 
main
rv = self.invoke(ctx)
  File "/usr/local/lib/python3.10/site-packages/click/core.py", line 1434, in 
invoke
return ctx.invoke(self.callback, **ctx.params)
  File "/usr/local/lib/python3.10/site-packages/click/core.py", line 783, in 
invoke
return __callback(*args, **kwargs)
  File "/usr/local/lib/python3.10/site-packages/click/decorators.py", line 33, 
in new_func
return f(get_current_context(), *args, **kwargs)
  File "/usr/local/lib/python3.10/site-packages/khal/cli.py", line 501, in 
interactive_cli
controllers.interactive(
  File "/usr/local/lib/python3.10/site-packages/khal/controllers.py", line 589, 
in interactive
from . import ui
  File "/usr/local/lib/python3.10/site-packages/khal/ui/__init__.py", line 29, 
in 
import urwid
  File "/usr/local/lib/python3.10/site-packages/urwid/__init__.py", line 30, in 

from urwid.canvas import (
  File "/usr/local/lib/python3.10/site-packages/urwid/canvas.py", line 30, in 

from urwid.str_util import calc_text_pos, calc_width
  File "/usr/local/lib/python3.10/site-packages/urwid/str_util.py", line 27, in 

import wcwidth
ModuleNotFoundError: No module named 'wcwidth'

I updated the port to include a runtime dependency on devel/py-wcwidth, however 
it then fails with:

$ ikhal
Traceback (most recent call last):
  File "/usr/local/bin/ikhal", line 8, in 
sys.exit(main_ikhal())
  File "/usr/local/lib/python3.10/site-packages/click/core.py", line 1157, in 
__call__
return self.main(*args, **kwargs)
  File "/usr/local/lib/python3.10/site-packages/click/core.py", line 1078, in 
main
rv = self.invoke(ctx)
  File "/usr/local/lib/python3.10/site-packages/click/core.py", line 1434, in 
invoke
return ctx.invoke(self.callback, **ctx.params)
  File "/usr/local/lib/python3.10/site-packages/click/core.py", line 783, in 
invoke
return __callback(*args, **kwargs)
  File "/usr/local/lib/python3.10/site-packages/click/decorators.py", line 33, 
in new_func
return f(get_current_context(), *args, **kwargs)
  File "/usr/local/lib/python3.10/site-packages/khal/cli.py", line 501, in 
interactive_cli
controllers.interactive(
  File "/usr/local/lib/python3.10/site-packages/khal/controllers.py", line 589, 
in interactive
from . import ui
  File "/usr/local/lib/python3.10/site-packages/khal/ui/__init__.py", line 29, 
in 
import urwid
  File "/usr/local/lib/python3.10/site-packages/urwid/__init__.py", line 97, in 

from . import display, event_loop, widget
  File "/usr/local/lib/python3.10/site-packages/urwid/event_loop/__init__.py", 
line 9, in 
from .main_loop import MainLoop
  File "/usr/local/lib/python3.10/site-packages/urwid/event_loop/main_loop.py", 
line 38, in 
from urwid.widget import PopUpTarget
  File "/usr/local/lib/python3.10/site-packages/urwid/widget/__init__.py", line 
32, in 
from .listbox import ListBox, ListBoxError, ListWalker, ListWalkerError, 
SimpleFocusListWalker, SimpleListWalker
  File "/usr/local/lib/python3.10/site-packages/urwid/widget/listbox.py", line 
29, in 
from typing_extensions import Protocol, runtime_checkable
ModuleNotFoundError: No module named 'typing_extensions'

I updated the port again to also have a runtime dependency on 
devel/py-typing-extensions. After that ikal works
as expected for me again. I've attached a diff to update the port.

thanks,

.jh
Index: khal/Makefile
===
RCS file: /cvs/ports/productivity/khal/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- khal/Makefile   11 Dec 2023 12:40:37 -  1.21
+++ khal/Makefile   21 Apr 2024 19:14:25 -
@@ -2,6 +2,7 @@ COMMENT =   standards based terminal cale
 
 MODPY_EGG_VERSION =0.11.2
 DISTNAME = khal-${MODPY_EGG_VERSION}
+REVISION = 0
 
 CATEGORIES =   productivity
 
@@ -25,9 +26,11 @@ RUN_DEPENDS =devel/py-atomicwrites${MO
devel/py-dateutil${MODPY_FLAVOR} \
devel/py-icalendar${MODPY_FLAVOR} \
devel/py-setproctitle${MODPY_FLAVOR} \
+   devel/py-typing-extensions \
devel/py-tz${MODPY_FLAVOR} \
devel/py-tzlocal${MODPY_FLAVOR} \
devel/py-urwid${MODPY_FLAVOR} \
+   devel/py-wcwidth${MODPY_FLAVOR} \
devel/py-xdg${MODPY_FLAVOR} \

[maintainer update] www/py-jwt

[Johan Huldtgren]

hello,

update of www/py-jwt from 2.6.0 to 2.8.0 full changelog is here:

https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst

Built, and packaged on amd64 with no issues. Tests fail as they
have been for the last few updates. Consumers are
security/py-oauthlib which I've confirmed works as it's a dependency
for audio/py-discogs-client (updated in separte email but both
versions work with this update). Remaining consumers
devel/py-buildbot, mail/grommunio, mail/kopano, www/woob, and
security/py-duo_universal I cannot verify work beyond building them.
If there are any users of those ports who can test them it would be
good.

thanks,

.jh
Index: py-jwt/Makefile
===
RCS file: /cvs/ports/www/py-jwt/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- py-jwt/Makefile 30 Mar 2023 10:47:25 -  1.24
+++ py-jwt/Makefile 24 Feb 2024 22:58:27 -
@@ -1,11 +1,10 @@
 COMMENT =  JSON Web Token implementation in Python
 
-MODPY_EGG_VERSION = 2.6.0
+MODPY_EGG_VERSION = 2.8.0
 DISTNAME = PyJWT-${MODPY_EGG_VERSION}
 PKGNAME =  py-jwt-${MODPY_EGG_VERSION}
 CATEGORIES =   www
 MAINTAINER =   Johan Huldtgren 
-REVISION = 2
 
 HOMEPAGE = http://github.com/jpadilla/pyjwt
 
Index: py-jwt/distinfo
===
RCS file: /cvs/ports/www/py-jwt/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- py-jwt/distinfo 9 Nov 2022 18:35:22 -   1.11
+++ py-jwt/distinfo 24 Feb 2024 22:58:27 -
@@ -1,2 +1,2 @@
-SHA256 (PyJWT-2.6.0.tar.gz) = aShcfjH8RPaKH+swnpSODfUyWdV5KV5s/isXkjKfBf0=
-SIZE (PyJWT-2.6.0.tar.gz) = 72984
+SHA256 (PyJWT-2.8.0.tar.gz) = V+KNFW49XBAIjgxoq7kL+sPfgrQKcb0NqiDGXM1cI94=
+SIZE (PyJWT-2.8.0.tar.gz) = 78313
Index: py-jwt/pkg/PLIST
===
RCS file: /cvs/ports/www/py-jwt/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 PLIST
--- py-jwt/pkg/PLIST30 Mar 2023 10:47:25 -  1.8
+++ py-jwt/pkg/PLIST24 Feb 2024 22:58:27 -
@@ -28,6 +28,8 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}jwk_set_cache.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}jwks_client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}jwks_client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}types.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}warnings.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -41,5 +43,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/jwt/jwk_set_cache.py
 lib/python${MODPY_VERSION}/site-packages/jwt/jwks_client.py
 lib/python${MODPY_VERSION}/site-packages/jwt/py.typed
+lib/python${MODPY_VERSION}/site-packages/jwt/types.py
 lib/python${MODPY_VERSION}/site-packages/jwt/utils.py
 lib/python${MODPY_VERSION}/site-packages/jwt/warnings.py

[maintainer update] audio/py-discogs-client

[Johan Huldtgren]

hello,

update of audio/py-discogs-client from 2.5 to 2.7

Built, packaged, tested on amd64. The only consumer
is audio/beets and this has been tested and works.

thanks,

.jh
Index: py-discogs-client/Makefile
===
RCS file: /cvs/ports/audio/py-discogs-client/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- py-discogs-client/Makefile  13 Nov 2022 15:27:37 -  1.23
+++ py-discogs-client/Makefile  24 Feb 2024 22:52:09 -
@@ -1,11 +1,10 @@
 COMMENT =  Python interface to Discogs website
 
-MODPY_EGG_VERSION = 2.5
+MODPY_EGG_VERSION = 2.7
 DISTNAME = python3-discogs-client-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:S/thon3//}
 CATEGORIES =   audio
 MAINTAINER =   Johan Huldtgren 
-REVISION = 0
 
 HOMEPAGE = https://github.com/joalla/discogs_client
 
Index: py-discogs-client/distinfo
===
RCS file: /cvs/ports/audio/py-discogs-client/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- py-discogs-client/distinfo  9 Nov 2022 18:26:21 -   1.8
+++ py-discogs-client/distinfo  24 Feb 2024 22:52:09 -
@@ -1,2 +1,2 @@
-SHA256 (python3-discogs-client-2.5.tar.gz) = 
trGhs0J4VSeqUmEDlM/5DfxLxwh2h2/+SCEsDlkE6oM=
-SIZE (python3-discogs-client-2.5.tar.gz) = 36003
+SHA256 (python3-discogs-client-2.7.tar.gz) = 
JZSbncYTCYXY4BmeTJUDUeNk4nP5R2VGvZ4XGALgB6E=
+SIZE (python3-discogs-client-2.7.tar.gz) = 36551

Re: UPDATE games/freeciv

[Johan Huldtgren]

hello,

On 2023-01-17 21:08, Thomas Frohwein wrote:
> Built it, tested and runs... I tested without the sound sets that would
> need to be downloaded. This makes me wonder about maybe adding a little
> more detail to what's in DESCR-client:
> 
>   This package contains the client for Freeciv.
> 
>   Freeciv comes without sound sets.  You can get them from:
>   http://download.gna.org/freeciv/contrib/audio/

as far as I can tell download.gna.org does not exist anymore.

$ host download.gna.org
Host download.gna.org not found: 3(NXDOMAIN)

I don't know if these are the correct sounds/audio but freeciv.org
has a "freesounds" section here:

https://modpack.freeciv.org/soundsets/freesounds/freesounds/

.jh
 
> Maybe a hint to where/how to install the sound sets would lower the
> barrier for some to play this. Also, maybe a hint somewhere that for
> singleplayer, installing and running freeciv-server is needed?
> 
> Those are just some thoughts, overall ok thfr@ for the update with or
> without those addressed.
> 
> On Mon, Jan 16, 2023 at 04:17:01PM +0300, Kirill Bychkov wrote:
> > Hi,
> > Attcahed patch updates freeciv to 3.0.5 version.
> > I moved all locale files to -share package so a @conflict
> > marker was added.
> > Ok?
> > 
> > Changelogs available here:
> > http://www.freeciv.org/wiki/NEWS-3.0.0
> > https://www.freeciv.org/wiki/NEWS-3.0.5
> 

Re: update or remove security/clamav-unofficial-sigs ?

[Johan Huldtgren]

On 2022-11-13 22:32, Klemens Nanni wrote:
> We're stuck at a 2014 version while upstream is at 7.2.5 from 2021.
> 
> Anyone still using this?  Does it work with recent clamav?

I have this configured and working on my mailserver (still at 7.1)
with clamav-0.104.3, from the logs it updates the various configured
databases. I am uncertain of exactly how effective it is.

> Anyone want to update or even maintain it?
> 
> If not, can we move it to the attic?
> ---
> Information for 
> https://cdn.openbsd.org/pub/OpenBSD/snapshots/packages/amd64/clamav-unofficial-sigs-4.9.2p2.tgz
> 
> Comment:
> fetch and update unofficial signatures for ClamAV
> 
> Description:
> The clamav-unofficial-sigs script provides a simple way to download, test
> and update third-party signature databases for ClamAV. Various databases
> (primarily for email-borne malware/phishing) are available.
> 
> Maintainer: The OpenBSD ports mailing-list 
> 
> WWW: https://github.com/extremeshok/clamav-unofficial-sigs
> 
> Install notice:
> After configuring /etc/clamav-unofficial-sigs.conf you can add the following
> to root's crontab to update the signatures regularly:
> 
> 35 * * * * /usr/local/bin/clamav-unofficial-sigs.sh 2>&1 > /dev/null
> 

thanks,

.jh

[maintainer update] www/py-jwt

[Johan Huldtgren]

hello,

update of www/py-jwt from 2.3.0 to 2.6.0 full changelog is here:

https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst

Built, and packaged on amd64 with no issues. However tests
fail quite spectacularly, but this does not seem related to
this update as trying to run tests on 2.3.0 gives the same
failures. I'm not sure but it looks like the issue is with
py-cryptography. Snippet of failure (this repeats):

tests/test_advisory.py:54: 
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 
jwt/api_jwt.py:168: in decode
decoded = self.decode_complete(
jwt/api_jwt.py:120: in decode_complete
decoded = api_jws.decode_complete(
jwt/api_jws.py:202: in decode_complete
self._verify_signature(signing_input, header, signature, key, algorithms)
jwt/api_jws.py:298: in _verify_signature
key = alg_obj.prepare_key(key)
jwt/algorithms.py:594: in prepare_key
key = load_ssh_public_key(key)
/usr/local/lib/python3.9/site-packages/cryptography/hazmat/primitives/serialization/ssh.py:720:
 in load_ssh_public_key
public_key, rest = kformat.load_public(rest)
/usr/local/lib/python3.9/site-packages/cryptography/hazmat/primitives/serialization/ssh.py:457:
 in load_public
public_key = ed25519.Ed25519PublicKey.from_public_bytes(
_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ 

cls = 
data = 
b'\xf2\xf5#\xda"\xab\xe0|r\xb9&\xb9^\x18V(\x94\x9e\x17K\x8c*w\x86\xfc\xb5l\xd1\xae\x19\xf3K'

@classmethod
def from_public_bytes(cls, data: bytes) -> "Ed25519PublicKey":
from cryptography.hazmat.backends.openssl.backend import backend

if not backend.ed25519_supported():
>   raise UnsupportedAlgorithm(
"ed25519 is not supported by this version of OpenSSL.",
_Reasons.UNSUPPORTED_PUBLIC_KEY_ALGORITHM,
)
E   cryptography.exceptions.UnsupportedAlgorithm: ed25519 is not 
supported by this version of OpenSSL.

/usr/local/lib/python3.9/site-packages/cryptography/hazmat/primitives/asymmetric/ed25519.py:22:
 UnsupportedAlgorithm
___ TestOKPAlgorithms.test_okp_ed25519_should_reject_non_string_key 

self = 

def test_okp_ed25519_should_reject_non_string_key(self):
algo = OKPAlgorithm()

with pytest.raises(InvalidKeyError):
algo.prepare_key(None)

with open(key_path("testkey_ed25519")) as keyfile:
>   algo.prepare_key(keyfile.read())


Consumers are security/py-oauthlib (update in separate email
but works fine), devel/py-buildbot/buildbot (builds, tests
are previously broken), mail/kopano/core which only uses
it for a migration script, and net/synapse (builds but
tests are broken - irrespective of this update).

As far as I can tell the failures only affect tests, however
my only real world use for this is as a dependency via
py-oauthlib to py-discogs-client which works with this
update. If there are any users of buildbot, kopano
and/or synapse which can test this it that would be good.

thanks,

.jh
Index: py-jwt/Makefile
===
RCS file: /cvs/ports/www/py-jwt/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- py-jwt/Makefile 11 Mar 2022 20:10:47 -  1.20
+++ py-jwt/Makefile 8 Nov 2022 20:59:05 -
@@ -1,6 +1,6 @@
 COMMENT =  JSON Web Token implementation in Python
 
-MODPY_EGG_VERSION = 2.3.0
+MODPY_EGG_VERSION = 2.6.0
 DISTNAME = PyJWT-${MODPY_EGG_VERSION}
 PKGNAME =  py-jwt-${MODPY_EGG_VERSION}
 CATEGORIES =   www
@@ -20,7 +20,7 @@ MODPY_PI =Yes
 MODPY_SETUPTOOLS = Yes
 MODPY_PYTEST = Yes
 
-RUN_DEPENDS =   security/py-cryptography${MODPY_FLAVOR}>=1.4.0
+RUN_DEPENDS =   security/py-cryptography${MODPY_FLAVOR}>=3.4.0
 
 TEST_DEPENDS = devel/py-test-cov${MODPY_FLAVOR} \
devel/py-test-runner${MODPY_FLAVOR}
Index: py-jwt/distinfo
===
RCS file: /cvs/ports/www/py-jwt/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- py-jwt/distinfo 7 Dec 2021 10:45:33 -   1.10
+++ py-jwt/distinfo 8 Nov 2022 20:59:05 -
@@ -1,2 +1,2 @@
-SHA256 (PyJWT-2.3.0.tar.gz) = uIi01W8G9tzXdyEMM05pxze+dHVdPl6e4/5n3Big7kE=
-SIZE (PyJWT-2.3.0.tar.gz) = 62279
+SHA256 (PyJWT-2.6.0.tar.gz) = aShcfjH8RPaKH+swnpSODfUyWdV5KV5s/isXkjKfBf0=
+SIZE (PyJWT-2.6.0.tar.gz) = 72984
Index: py-jwt/pkg/PLIST
===
RCS file: /cvs/ports/www/py-jwt/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- py-jwt/pkg/PLIST11 Mar 2022 20:10:47 -  1.6
+++ py-jwt/pkg/PLIST8 Nov 2022 20:59:05 -
@@ -17,14 +17,18 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}api_jwt.${MODPY_PYC_MAGIC_TAG}pyc
 

[maintainer update] security/py-oauthlib

[Johan Huldtgren]

hello,

minor update of security/py-oauthlib from 3.2.0 to 3.2.2 full
changelog can be seen here:

https://github.com/oauthlib/oauthlib/blob/master/CHANGELOG.rst

Built, packaged, and tested on amd64 with no issues. Consumers
are www/py-request-oauthlib (builds and tests) and 
audio-py-discogs-client (update coming in separate e-mail).

thanks,

.jh
Index: py-oauthlib/Makefile
===
RCS file: /cvs/ports/security/py-oauthlib/Makefile,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 Makefile
--- py-oauthlib/Makefile28 Mar 2022 09:43:20 -  1.22
+++ py-oauthlib/Makefile8 Nov 2022 20:58:15 -
@@ -1,6 +1,6 @@
 COMMENT =  Python library for OAuth
 
-MODPY_EGG_VERSION = 3.2.0
+MODPY_EGG_VERSION = 3.2.2
 
 GH_ACCOUNT =   idan
 GH_PROJECT =   oauthlib
Index: py-oauthlib/distinfo
===
RCS file: /cvs/ports/security/py-oauthlib/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- py-oauthlib/distinfo28 Mar 2022 09:43:20 -  1.13
+++ py-oauthlib/distinfo8 Nov 2022 20:58:15 -
@@ -1,2 +1,2 @@
-SHA256 (oauthlib-3.2.0.tar.gz) = GJ5+QDQ/u8+yHDj437cDBPNSUju+59QwrQF0NIvosaI=
-SIZE (oauthlib-3.2.0.tar.gz) = 670230
+SHA256 (oauthlib-3.2.2.tar.gz) = L9iPYk8UQ494pJIQGFQoiE5duR2mOQSexxyTxb9/2EE=
+SIZE (oauthlib-3.2.2.tar.gz) = 672382

[maintainer update] audio/py-discogs-client

[Johan Huldtgren]

hello,

update of audio/py-discogs-clint from 2.3.14 to 2.5

Built, packaged, tested on amd64 with no issues. The only
consumer is audio/beets and this has been tested and works.

thanks,

.jh
Index: py-discogs-client/Makefile
===
RCS file: /cvs/ports/audio/py-discogs-client/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- py-discogs-client/Makefile  13 Sep 2022 20:56:18 -  1.21
+++ py-discogs-client/Makefile  8 Nov 2022 21:02:01 -
@@ -1,7 +1,6 @@
 COMMENT =  Python interface to Discogs website
 
-MODPY_EGG_VERSION = 2.3.14
-REVISION = 0
+MODPY_EGG_VERSION = 2.5
 DISTNAME = python3-discogs-client-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:S/thon3//}
 CATEGORIES =   audio
Index: py-discogs-client/distinfo
===
RCS file: /cvs/ports/audio/py-discogs-client/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- py-discogs-client/distinfo  28 Mar 2022 09:45:57 -  1.7
+++ py-discogs-client/distinfo  8 Nov 2022 21:02:01 -
@@ -1,2 +1,2 @@
-SHA256 (python3-discogs-client-2.3.14.tar.gz) = 
y2fQClz2T0RAXF/fQ8hJYiXlvcX2Xus5EkO+6eRbxao=
-SIZE (python3-discogs-client-2.3.14.tar.gz) = 34461
+SHA256 (python3-discogs-client-2.5.tar.gz) = 
trGhs0J4VSeqUmEDlM/5DfxLxwh2h2/+SCEsDlkE6oM=
+SIZE (python3-discogs-client-2.5.tar.gz) = 36003

net/netatalk3 broken by latest update?

[Johan Huldtgren]

hello,

today I syspatched and then did a pkg_add -u picking up the latest
stable packages on my amd64 server. The only update was net/netatalk3
going from 3.1.12p3 to 3.1.13. However after that I could no longer
access any files over afp (nfs was fine). I could map the share but
when trying to access any file I would get I/O error. Checking
/var/log/afpd.log I had thousands of lines as such:

Apr 06 20:20:36.383810 afpd[13057] {fork.c:423} (error:AFPDaemon): 
afp_openfork(.DS_Store): ad_open: Input/output error
Apr 06 20:20:36.384161 afpd[13057] {ad_open.c:424} (warn:ad): parse_entries: 
bogus eid: 2, off: 741, len: 0
Apr 06 20:20:36.384179 afpd[13057] {ad_open.c:485} (warn:ad): 
ad_header_read(/some/path): malformed AppleDouble
Apr 06 20:20:36.384193 afpd[13057] {ad_open.c:1169} (error:Default): 
ad->ad_ops->ad_header_read(path, ad, pst) failed: Input/output error
Apr 06 20:20:37.924249 afpd[13057] {ad_open.c:424} (warn:ad): parse_entries: 
bogus eid: 2, off: 741, len: 0
Apr 06 20:20:37.924274 afpd[13057] {ad_open.c:485} (warn:ad): 
ad_header_read(/some/path/to/something/.DS_Store): malformed AppleDouble

etc, for every single file and folder.

Googling quickly on that malformed AppleDouble I found some old
reports about it possibly being corrupted ._* files which macOS
likes to put everywhere. In some cases removing those files would
help, but in other cases it did not. As I had to restore access I
removed the 3.1.13 package and reinstalled 3.1.12p3 from the 7.0
packages. After this the errors are gone and everything is working
again. I'm not sure if this is something in my environment but as we
are close to release I wanted to report it.

thanks,

.jh

[maintainer update] audio/py-discogs-client

[Johan Huldtgren]

hello,

minor update of audio/py-discogs-clint from 2.3.12 to 2.3.14

Built, packaged, tested on amd64 with no issues. The only
consumer is audio/beets and this has been tested and works.

thanks,

.jh
Index: py-discogs-client/Makefile
===
RCS file: /cvs/ports/audio/py-discogs-client/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- py-discogs-client/Makefile  11 Mar 2022 18:20:28 -  1.18
+++ py-discogs-client/Makefile  28 Mar 2022 02:27:33 -
@@ -1,6 +1,6 @@
 COMMENT =  Python interface to Discogs website
 
-MODPY_EGG_VERSION = 2.3.12
+MODPY_EGG_VERSION = 2.3.14
 DISTNAME = python3-discogs-client-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:S/thon3//}
 CATEGORIES =   audio
Index: py-discogs-client/distinfo
===
RCS file: /cvs/ports/audio/py-discogs-client/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- py-discogs-client/distinfo  7 Dec 2021 10:47:32 -   1.6
+++ py-discogs-client/distinfo  28 Mar 2022 02:27:33 -
@@ -1,2 +1,2 @@
-SHA256 (python3-discogs-client-2.3.12.tar.gz) = 
ieNe4jxDQB0GXRGNS+jYt2IUyMxsPni9S5tFmSJYsf4=
-SIZE (python3-discogs-client-2.3.12.tar.gz) = 32604
+SHA256 (python3-discogs-client-2.3.14.tar.gz) = 
y2fQClz2T0RAXF/fQ8hJYiXlvcX2Xus5EkO+6eRbxao=
+SIZE (python3-discogs-client-2.3.14.tar.gz) = 34461

[maintainer update] security/py-oauthlib

[Johan Huldtgren]

hello,

update of security/py-oauthlib from 3.1.1 to 3.2.0, mainly bug fixes.
full changelog can be seen here:

https://github.com/oauthlib/oauthlib/blob/master/CHANGELOG.rst

This release lets us get rid of the one patch we were carrying as
that has been fixed upstream now.

Built, packaged, tested on amd64 with no issues. Consumers are 
www/py-request-oauthlib (builds and tests) and audio/py-discogs-client
(update coming in separate e-mail).

thanks,

.jh
Index: py-oauthlib/Makefile
===
RCS file: /cvs/ports/security/py-oauthlib/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- py-oauthlib/Makefile11 Mar 2022 19:53:56 -  1.21
+++ py-oauthlib/Makefile28 Mar 2022 02:26:23 -
@@ -1,6 +1,6 @@
 COMMENT =  Python library for OAuth
 
-MODPY_EGG_VERSION = 3.1.1
+MODPY_EGG_VERSION = 3.2.0
 
 GH_ACCOUNT =   idan
 GH_PROJECT =   oauthlib
Index: py-oauthlib/distinfo
===
RCS file: /cvs/ports/security/py-oauthlib/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- py-oauthlib/distinfo7 Dec 2021 10:44:34 -   1.12
+++ py-oauthlib/distinfo28 Mar 2022 02:26:23 -
@@ -1,2 +1,2 @@
-SHA256 (oauthlib-3.1.1.tar.gz) = i8NcolvHSZqB8XAazkF/yHs5HwM6sQmReydhBC1iASs=
-SIZE (oauthlib-3.1.1.tar.gz) = 664049
+SHA256 (oauthlib-3.2.0.tar.gz) = GJ5+QDQ/u8+yHDj437cDBPNSUju+59QwrQF0NIvosaI=
+SIZE (oauthlib-3.2.0.tar.gz) = 670230
Index: py-oauthlib/pkg/PLIST
===
RCS file: /cvs/ports/security/py-oauthlib/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 PLIST
--- py-oauthlib/pkg/PLIST   11 Mar 2022 19:53:56 -  1.7
+++ py-oauthlib/pkg/PLIST   28 Mar 2022 02:26:23 -
@@ -120,6 +120,16 @@ lib/python${MODPY_VERSION}/site-packages
 
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/oauth2/rfc8628/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/clients/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/clients/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/clients/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/clients/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/clients/${MODPY_PYCACHE}device.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth2/rfc8628/clients/device.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}/
@@ -153,11 +163,13 @@ lib/python${MODPY_VERSION}/site-packages
 
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}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/${MODPY_PYCACHE}refresh_token.${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/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/grant_types/refresh_token.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

[maintainer update] archivers/pecl-lzf

[Johan Huldtgren]

hello,

minor update from 1.6.8 to 1.7.0 which drops support for php7.1 and older
as well as adds type hinting. 

built / packaged / passes tests on amd64, I don't actively use this
anymore though so I have no real world tests. This port has no consumers.

thanks,

.jh
Index: pecl-lzf/Makefile
===
RCS file: /cvs/ports/archivers/pecl-lzf/Makefile,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 Makefile
--- pecl-lzf/Makefile   23 Mar 2022 23:58:29 -  1.29
+++ pecl-lzf/Makefile   27 Mar 2022 21:44:39 -
@@ -1,7 +1,6 @@
 COMMENT =  PHP support for LZF de/compression
 
-DISTNAME = LZF-1.6.8
-REVISION = 3
+DISTNAME = LZF-1.7.0
 
 CATEGORIES =   archivers
 
Index: pecl-lzf/distinfo
===
RCS file: /cvs/ports/archivers/pecl-lzf/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- pecl-lzf/distinfo   28 Oct 2020 11:59:54 -  1.7
+++ pecl-lzf/distinfo   27 Mar 2022 21:44:39 -
@@ -1,2 +1,2 @@
-SHA256 (LZF-1.6.8.tgz) = jhwu0hFDmnj277gBFqH7C/JK7C9lnpBmm48D7YFC9Yk=
-SIZE (LZF-1.6.8.tgz) = 18071
+SHA256 (LZF-1.7.0.tgz) = +aUVEKtS2lHCs5upMpA2JHo3hLOjJ4jL8Zkya5D4vHg=
+SIZE (LZF-1.7.0.tgz) = 18267

Re: [new] net/py-maxminddb

[Johan Huldtgren]

On 2021-12-08 17:04, Johan Huldtgren wrote:
> On 2021-12-08 15:43, Stuart Henderson wrote:
> > On 2021/12/08 15:41, Stuart Henderson wrote:
> > > oops, needs a fix, will send shortly
> > > 
> > > > +LIB_DEPENDS =  net/libmaxminddb,-db
> > 
> > just s/-db/-main/ here (no need for an explicit dep on -db as
> > libmaxminddb,-main already pulls that in)
> > 
> > updated tgz attached
> 
> thanks for catching that (and the rest), your updated tgz
> works well for me.

ping?

thanks,

.jh


py-maxminddb.tgz
Description: application/tar-gz

Re: [new] net/py-geoip2

[Johan Huldtgren]

On 2021-12-08 12:42, Johan Huldtgren wrote:
> On 2021-12-08 15:49, Stuart Henderson wrote:
> > On 2021/12/08 10:31, Johan Huldtgren wrote:
> > > hello,
> > > 
> > > this a new port for py-geoip2 which provides an API for
> > > the GeoIP2 and GeoLite2 web services and databases. This
> > > is a dependency for another port I'm working on. This 
> > > depends on the new net/py-maxminddb port. Built,
> > > packaged, and tested on amd64.
> > > 
> > > thanks.
> > > 
> > > .jh
> > 
> > py-pip + py-wheel are used to download+install missing modules for tests,
> > but that isn't allowed anyway.
> > 
> > I would either go for this, or add a port for mocket and set TEST_DEPENDS to
> > that (no need to list RUN_DEPENDS separately, that's implicit).
> 
> Thanks, that makes sense. Updated tgz attached with changes as
> below.
 
ping?

thanks,

.jh 
  
> > diff --git net/py-geoip2/Makefile net/py-geoip2/Makefile
> > index 6712ca5..5c54b8b 100755
> > --- net/py-geoip2/Makefile
> > +++ net/py-geoip2/Makefile
> > @@ -15,7 +15,8 @@ PERMIT_PACKAGE =  Yes
> >  
> >  MODULES =  lang/python
> >  MODPY_PI = Yes
> > -MODPY_SETUPTOOLS = Yes
> > +MODPY_SETUPTOOLS = Yes
> > +MODPY_PYTEST = Yes
> >  
> >  FLAVORS =  python3
> >  FLAVOR =   python3
> > @@ -26,8 +27,7 @@ RUN_DEPENDS = net/libmaxminddb,-db \
> > www/py-requests${MODPY_FLAVOR} \
> > www/py-urllib3${MODPY_FLAVOR}
> >  
> > -TEST_DEPENDS = ${RUN_DEPENDS} \
> > -   devel/py-pip${MODPY_FLAVOR} \
> > -   devel/py-wheel${MODPY_FLAVOR}
> > +# requires mocket (not yet ported)
> > +NO_TEST =  Yes
> >  
> >  .include 
> > 




py-geoip2.tgz
Description: application/tar-gz

Re: [new] net/py-maxminddb

[Johan Huldtgren]

On 2021-12-08 15:43, Stuart Henderson wrote:
> On 2021/12/08 15:41, Stuart Henderson wrote:
> > oops, needs a fix, will send shortly
> > 
> > > +LIB_DEPENDS =net/libmaxminddb,-db
> 
> just s/-db/-main/ here (no need for an explicit dep on -db as
> libmaxminddb,-main already pulls that in)
> 
> updated tgz attached

thanks for catching that (and the rest), your updated tgz
works well for me.

thanks,

.jh

Re: [new] net/py-geoip2

[Johan Huldtgren]

On 2021-12-08 15:49, Stuart Henderson wrote:
> On 2021/12/08 10:31, Johan Huldtgren wrote:
> > hello,
> > 
> > this a new port for py-geoip2 which provides an API for
> > the GeoIP2 and GeoLite2 web services and databases. This
> > is a dependency for another port I'm working on. This 
> > depends on the new net/py-maxminddb port. Built,
> > packaged, and tested on amd64.
> > 
> > thanks.
> > 
> > .jh
> 
> py-pip + py-wheel are used to download+install missing modules for tests,
> but that isn't allowed anyway.
> 
> I would either go for this, or add a port for mocket and set TEST_DEPENDS to
> that (no need to list RUN_DEPENDS separately, that's implicit).

Thanks, that makes sense. Updated tgz attached with changes as
below.

.jh

 
> diff --git net/py-geoip2/Makefile net/py-geoip2/Makefile
> index 6712ca5..5c54b8b 100755
> --- net/py-geoip2/Makefile
> +++ net/py-geoip2/Makefile
> @@ -15,7 +15,8 @@ PERMIT_PACKAGE =Yes
>  
>  MODULES =lang/python
>  MODPY_PI =   Yes
> -MODPY_SETUPTOOLS =   Yes
> +MODPY_SETUPTOOLS =   Yes
> +MODPY_PYTEST =   Yes
>  
>  FLAVORS =python3
>  FLAVOR = python3
> @@ -26,8 +27,7 @@ RUN_DEPENDS =   net/libmaxminddb,-db \
>   www/py-requests${MODPY_FLAVOR} \
>   www/py-urllib3${MODPY_FLAVOR}
>  
> -TEST_DEPENDS =   ${RUN_DEPENDS} \
> - devel/py-pip${MODPY_FLAVOR} \
> - devel/py-wheel${MODPY_FLAVOR}
> +# requires mocket (not yet ported)
> +NO_TEST =Yes
>  
>  .include 
> 


py-geoip2.tgz
Description: application/tar-gz

[new] net/py-geoip2

[Johan Huldtgren]

hello,

this a new port for py-geoip2 which provides an API for
the GeoIP2 and GeoLite2 web services and databases. This
is a dependency for another port I'm working on. This 
depends on the new net/py-maxminddb port. Built,
packaged, and tested on amd64.

thanks.

.jh


py-geoip2.tgz
Description: application/tar-gz

[new] net/py-maxminddb

[Johan Huldtgren]

hello,

this is a new port for py-maxminddb, a Python module for reading MaxMind
DB files. The module includes both a pure Python reader and a C
extension. This is a dependency for another port I'm working on. Built,
packaged, and tested on amd64.

thanks,

.jh


py-maxminddb.tgz
Description: application/tar-gz

Re: [maintainer update] www/py-jwt

[Johan Huldtgren]

On 2021-12-06 20:13, Johan Huldtgren wrote:
> hello,
> 
> update of www/py-jwt from 2.0.1 to 2.3.0 full changelog is here:
> 
> https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst
> 
> Built, packaged, tested on amd64 with no issues. Consumers are
> security/py-oauthlib (update in separate email but works fine),
> devel/py-buildbotr/buildbot (builds, tests are broken), and
> mail/kopano/core which only uses it for a migration script

forgot that net/synapse uses this for tests, those tests pass
ok even though there are unrelated tests which fail.


> Index: py-jwt/Makefile
> ===
> RCS file: /cvs/ports/www/py-jwt/Makefile,v
> retrieving revision 1.18
> diff -u -p -u -p -r1.18 Makefile
> --- py-jwt/Makefile   2 Nov 2021 00:02:54 -   1.18
> +++ py-jwt/Makefile   6 Dec 2021 23:40:32 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =JSON Web Token implementation in Python
>  
> -MODPY_EGG_VERSION = 2.0.1
> +MODPY_EGG_VERSION = 2.3.0
>  DISTNAME =   PyJWT-${MODPY_EGG_VERSION}
>  PKGNAME =py-jwt-${MODPY_EGG_VERSION}
>  CATEGORIES = www
> Index: py-jwt/distinfo
> ===
> RCS file: /cvs/ports/www/py-jwt/distinfo,v
> retrieving revision 1.9
> diff -u -p -u -p -r1.9 distinfo
> --- py-jwt/distinfo   15 Mar 2021 21:40:46 -  1.9
> +++ py-jwt/distinfo   6 Dec 2021 23:40:32 -
> @@ -1,2 +1,2 @@
> -SHA256 (PyJWT-2.0.1.tar.gz) = pccKBuHzPYHvJe7NUNUL0w403hyosrn6P+Daqrz2m/c=
> -SIZE (PyJWT-2.0.1.tar.gz) = 57496
> +SHA256 (PyJWT-2.3.0.tar.gz) = uIi01W8G9tzXdyEMM05pxze+dHVdPl6e4/5n3Big7kE=
> +SIZE (PyJWT-2.3.0.tar.gz) = 62279

[maintainer update] audio/py-discogs-client

[Johan Huldtgren]

hello,

update of audio/py-discogs-client from 2.2.2 to 2.3.12, this update
also changes the repo as py-discogs-client was deprecated by discogs
but then forked and continued by the Joalla Team. Built, packaged,
tested on amd64 with no issues. The only consumer is audio/beets 
and this has been tested and works.

thanks,

.jh
Index: py-discogs-client/Makefile
===
RCS file: /cvs/ports/audio/py-discogs-client/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- py-discogs-client/Makefile  2 Nov 2021 00:00:13 -   1.16
+++ py-discogs-client/Makefile  6 Dec 2021 23:41:14 -
@@ -2,14 +2,13 @@
 
 COMMENT =  Python interface to Discogs website
 
-MODPY_EGG_VERSION = 2.2.2
-REVISION = 2
-DISTNAME = discogs-client-${MODPY_EGG_VERSION}
-PKGNAME =  py-${DISTNAME}
+MODPY_EGG_VERSION = 2.3.12
+DISTNAME = python3-discogs-client-${MODPY_EGG_VERSION}
+PKGNAME =  ${DISTNAME:S/thon3//}
 CATEGORIES =   audio
 MAINTAINER =   Johan Huldtgren 
 
-HOMEPAGE = https://github.com/discogs/discogs_client
+HOMEPAGE = https://github.com/joalla/discogs_client
 
 # MIT
 PERMIT_PACKAGE =   Yes
Index: py-discogs-client/distinfo
===
RCS file: /cvs/ports/audio/py-discogs-client/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- py-discogs-client/distinfo  29 Feb 2020 22:31:11 -  1.5
+++ py-discogs-client/distinfo  6 Dec 2021 23:41:14 -
@@ -1,2 +1,2 @@
-SHA256 (discogs-client-2.2.2.tar.gz) = 
rq5D+5KB4nxYDRvNSE5sMJ9POgWvOQgBbuM2N4bvQ9g=
-SIZE (discogs-client-2.2.2.tar.gz) = 25005
+SHA256 (python3-discogs-client-2.3.12.tar.gz) = 
ieNe4jxDQB0GXRGNS+jYt2IUyMxsPni9S5tFmSJYsf4=
+SIZE (python3-discogs-client-2.3.12.tar.gz) = 32604
Index: py-discogs-client/pkg/PLIST
===
RCS file: /cvs/ports/audio/py-discogs-client/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- py-discogs-client/pkg/PLIST 29 Feb 2020 22:32:42 -  1.5
+++ py-discogs-client/pkg/PLIST 6 Dec 2021 23:41:14 -
@@ -2,12 +2,6 @@
 @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
-lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/discogs_client/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/discogs_client/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/discogs_client/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
@@ -21,3 +15,9 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/discogs_client/fetchers.py
 lib/python${MODPY_VERSION}/site-packages/discogs_client/models.py
 lib/python${MODPY_VERSION}/site-packages/discogs_client/utils.py
+lib/python${MODPY_VERSION}/site-packages/python3_discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/python3_discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/python3_discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/python3_discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/python3_discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/python3_discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt

[maintaniner update] www/py-jwt

[Johan Huldtgren]

hello,

update of www/py-jwt from 2.0.1 to 2.3.0 full changelog is here:

https://github.com/jpadilla/pyjwt/blob/master/CHANGELOG.rst

Built, packaged, tested on amd64 with no issues. Consumers are
security/py-oauthlib (update in separate email but works fine),
devel/py-buildbotr/buildbot (builds, tests are broken), and
mail/kopano/core which only uses it for a migration script

thanks,

.jh
Index: py-jwt/Makefile
===
RCS file: /cvs/ports/www/py-jwt/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- py-jwt/Makefile 2 Nov 2021 00:02:54 -   1.18
+++ py-jwt/Makefile 6 Dec 2021 23:40:32 -
@@ -2,7 +2,7 @@
 
 COMMENT =  JSON Web Token implementation in Python
 
-MODPY_EGG_VERSION = 2.0.1
+MODPY_EGG_VERSION = 2.3.0
 DISTNAME = PyJWT-${MODPY_EGG_VERSION}
 PKGNAME =  py-jwt-${MODPY_EGG_VERSION}
 CATEGORIES =   www
Index: py-jwt/distinfo
===
RCS file: /cvs/ports/www/py-jwt/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- py-jwt/distinfo 15 Mar 2021 21:40:46 -  1.9
+++ py-jwt/distinfo 6 Dec 2021 23:40:32 -
@@ -1,2 +1,2 @@
-SHA256 (PyJWT-2.0.1.tar.gz) = pccKBuHzPYHvJe7NUNUL0w403hyosrn6P+Daqrz2m/c=
-SIZE (PyJWT-2.0.1.tar.gz) = 57496
+SHA256 (PyJWT-2.3.0.tar.gz) = uIi01W8G9tzXdyEMM05pxze+dHVdPl6e4/5n3Big7kE=
+SIZE (PyJWT-2.3.0.tar.gz) = 62279

[maintainer update] security/py-oauthlib

[Johan Huldtgren]

hello,

minor update of security/py-oauthlib from 3.1.0 to 3.1.1
this is mainly a bug fix release. Full changelog is here:

https://github.com/oauthlib/oauthlib/blob/master/CHANGELOG.rst

Built, packaged, tested on amd64 with no issues. Consumers are 
www/py-request-oauthlib (builds and tests) and
audio/py-discogs-client (update coming in separate e-mail).

thanks,

.jh
Index: py-oauthlib/Makefile
===
RCS file: /cvs/ports/security/py-oauthlib/Makefile,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 Makefile
--- py-oauthlib/Makefile2 Nov 2021 00:02:18 -   1.19
+++ py-oauthlib/Makefile6 Dec 2021 23:39:54 -
@@ -2,14 +2,13 @@
 
 COMMENT =  Python library for OAuth
 
-MODPY_EGG_VERSION = 3.1.0
+MODPY_EGG_VERSION = 3.1.1
 
 GH_ACCOUNT =   idan
 GH_PROJECT =   oauthlib
 GH_TAGNAME =   v${MODPY_EGG_VERSION}
 
 PKGNAME =  py-oauthlib-${MODPY_EGG_VERSION}
-REVISION = 1
 
 CATEGORIES =   security
 MAINTAINER =   Johan Huldtgren 
Index: py-oauthlib/distinfo
===
RCS file: /cvs/ports/security/py-oauthlib/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- py-oauthlib/distinfo29 Feb 2020 19:34:27 -  1.11
+++ py-oauthlib/distinfo6 Dec 2021 23:39:54 -
@@ -1,2 +1,2 @@
-SHA256 (oauthlib-3.1.0.tar.gz) = QeihlgRruM0m+HDI/Ccd4Roj5WzQSRspkDkXAg5j3cY=
-SIZE (oauthlib-3.1.0.tar.gz) = 208920
+SHA256 (oauthlib-3.1.1.tar.gz) = i8NcolvHSZqB8XAazkF/yHs5HwM6sQmReydhBC1iASs=
+SIZE (oauthlib-3.1.1.tar.gz) = 664049
Index: py-oauthlib/pkg/PLIST
===
RCS file: /cvs/ports/security/py-oauthlib/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- py-oauthlib/pkg/PLIST   29 Feb 2020 19:34:28 -  1.5
+++ py-oauthlib/pkg/PLIST   6 Dec 2021 23:39:54 -
@@ -152,13 +152,11 @@ lib/python${MODPY_VERSION}/site-packages
 
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

[patch] audio/beets unbreak lyrics plugin

[Johan Huldtgren]

hello,

when using the lyrics plugin, if lyrics are found and beets attempts
to write them to the file it will throw this error and stop:

Traceback (most recent call last):
  File "/usr/local/bin/beet", line 11, in 
load_entry_point('beets==1.4.9', 'console_scripts', 'beet')()
  File "/usr/local/lib/python3.8/site-packages/beets/ui/__init__.py", line 
1266, in main
_raw_main(args)
  File "/usr/local/lib/python3.8/site-packages/beets/ui/__init__.py", line 
1253, in _raw_main
subcommand.func(lib, suboptions, subargs)
  File "/usr/local/lib/python3.8/site-packages/beets/ui/commands.py", line 955, 
in import_func
import_files(lib, paths, query)
  File "/usr/local/lib/python3.8/site-packages/beets/ui/commands.py", line 925, 
in import_files
session.run()
  File "/usr/local/lib/python3.8/site-packages/beets/importer.py", line 329, in 
run
pl.run_parallel(QUEUE_SIZE)
  File "/usr/local/lib/python3.8/site-packages/beets/util/pipeline.py", line 
445, in run_parallel
six.reraise(exc_info[0], exc_info[1], exc_info[2])
  File "/usr/local/lib/python3.8/site-packages/six.py", line 703, in reraise
raise value
  File "/usr/local/lib/python3.8/site-packages/beets/util/pipeline.py", line 
312, in run
out = self.coro.send(msg)
  File "/usr/local/lib/python3.8/site-packages/beets/util/pipeline.py", line 
194, in coro
func(*(args + (task,)))
  File "/usr/local/lib/python3.8/site-packages/beets/importer.py", line 1511, 
in plugin_stage
func(session, task)
  File "/usr/local/lib/python3.8/site-packages/beets/plugins.py", line 143, in 
wrapper
return func(*args, **kwargs)
  File "/usr/local/lib/python3.8/site-packages/beetsplug/lyrics.py", line 833, 
in imported
self.fetch_item_lyrics(session.lib, item,
  File "/usr/local/lib/python3.8/site-packages/beetsplug/lyrics.py", line 847, 
in fetch_item_lyrics
lyrics = [self.get_lyrics(artist, title) for title in titles]
  File "/usr/local/lib/python3.8/site-packages/beetsplug/lyrics.py", line 847, 
in 
lyrics = [self.get_lyrics(artist, title) for title in titles]
  File "/usr/local/lib/python3.8/site-packages/beetsplug/lyrics.py", line 880, 
in get_lyrics
lyrics = backend.fetch(artist, title)
  File "/usr/local/lib/python3.8/site-packages/beetsplug/lyrics.py", line 403, 
in fetch
return self.lyrics_from_song_api_path(song_api_path)
  File "/usr/local/lib/python3.8/site-packages/beetsplug/lyrics.py", line 375, 
in lyrics_from_song_api_path
lyrics = html.find("div", class_="lyrics").get_text()
AttributeError: 'NoneType' object has no attribute 'get_text'

this is suspisciously like the other issue we have a patch for in the
port already. I went and took a look and found that there is a patch
for this[0] from back in September. Unfortunately just backporting
those exact changes does not fix the above error. There are
significant changes between the lyrics.py from version 1.4.9 and what
that patch is applied to. However if we just grab the lyrics.py with
that patch applied this error is resolved. That is what the attched
update does. I am not sure if this is the correct thing to do or not,
or if we at this point should simply pick a commit and wholesale
update the port (that would probably let us drop both current
patches).

thanks,

.jh

[0] 
https://github.com/beetbox/beets/commit/b239a0b3d2dcbde0495750903dc2e69067d48ebf.patch
Index: beets/Makefile
===
RCS file: /cvs/ports/audio/beets/Makefile,v
retrieving revision 1.51
diff -u -p -u -p -r1.51 Makefile
--- beets/Makefile  23 Feb 2021 19:39:09 -  1.51
+++ beets/Makefile  15 May 2021 18:00:24 -
@@ -5,7 +5,7 @@ COMMENT=CLI tools to manage music colle
 MODPY_EGG_VERSION= 1.4.9
 DISTNAME=  beets-${MODPY_EGG_VERSION}
 CATEGORIES=audio
-REVISION=  9
+REVISION=  10
 
 HOMEPAGE=  https://beets.io/
 
Index: beets/patches/patch-beetsplug_lyrics_py
===
RCS file: beets/patches/patch-beetsplug_lyrics_py
diff -N beets/patches/patch-beetsplug_lyrics_py
--- /dev/null   1 Jan 1970 00:00:00 -
+++ beets/patches/patch-beetsplug_lyrics_py 15 May 2021 18:00:24 -
@@ -0,0 +1,211 @@
+$OpenBSD$
+
+Index: beetsplug/lyrics.py
+--- beetsplug/lyrics.py.orig
 beetsplug/lyrics.py
+@@ -55,6 +55,7 @@ except ImportError:
+ 
+ from beets import plugins
+ from beets import ui
++from beets import util
+ import beets
+ 
+ DIV_RE = re.compile(r'<(/?)div>?', re.I)
+@@ -186,6 +187,9 @@ def search_pairs(item):
+ In addition to the artist and title obtained from the `item` the
+ method tries to strip extra information like paranthesized suffixes
+ and featured artists from the strings and add them as candidates.
++The artist sort name is added as a fallback candidate to help in
++cases where artist name includes special characters or is in a
++non-latin script.
+ The method also tries to split 

Re: UPDATE: Nextcloud-21.0.0

[Johan Huldtgren]

On 2021-02-24 13:34, Stuart Henderson wrote:
> On 2021/02/24 14:21, Landry Breuil wrote:
> > On Wed, Feb 24, 2021 at 01:39:15PM +0100, Stefan Sperling wrote:
> > > On Wed, Feb 24, 2021 at 10:04:05AM +0100, Gonzalo Rodriguez wrote:
> > > > Yes, this is for -current users 
> > > > 
> > > > — gonzalo
> > > 
> > > I think Johan is suggesting that 6.9 should be shipped with Nextcloud 20,
> > > not Nextcloud 21. And right now, "6.9" means -current.
> > > 
> > > Otherwise people upgrading directly from OpenBSD 6.8 to OpenBSD 6.9 would
> > > skip an intermediate upgrade to Nextcloud 20. Skipping a release is not
> > > recommended by the Nextcloud team.
> > > 
> > > If Nextcloud 21 is committed after 6.9 then users will upgrade like this:
> > >   OpenBSD 6.8 (NC 19) -> OpenBSD 6.9 (NC 20) -> OpenBSD 7.0 (NC 21)
> > > Instead of:
> > >   OpenBSD 6.8 (NC 19) -> OpenBSD 6.9 (NC 21 maybe cannot upgrade from NC 
> > > 19?)
> > 
> > that cant work on the long run i think, as nextcloud major releases
> > arent fully synched with our 6 month release scheme, cf
> > https://en.wikipedia.org/wiki/Nextcloud#Release_history and
> > https://github.com/nextcloud/server/wiki/Maintenance-and-Release-Schedule
> > 
> > eg if 7.0 ships with 21 but the upstream last release is already at 24
> > or something .. we'll never catch up. As 21 was released upstream, 18
> > was EOLed.
> > 
> > on the other hand, can we *expect* ppl running 6.8 to update via
> > packages-stable to make sure that they go from 19 to 20 via -stable ?
> 
> I don't think we can, really...
> 
> Would it make sense to have a couple of versions in ports?
> Say nextcloud/20, nextcloud/21
> 
> Initially have an upgrade path via @pkgpath from www/nextcloud to
> www/nextcloud/20, then at some point after release (maybe when 22 is out)
> remove /20 and add an upgrade path to /21. That way people running
> pkg_add nextcloud get a choice, they have an upgrade path that's
> still valid with upstream, and if they're running 20 and want to move to
> 21 before the port upgrade path is adjusted they can just pkg_delete +
> pkg_add.

without knowing about ports internals, as an end user this sounds like the
easiest approach. From previous upgrades I can confirm that skipping a
major version will not work (or at least it didn't work) the updater has
a check and if you're on 19 and you try to go to 21 it bombs out and tells
you to go install 20 first.

thanks,

.jh

Re: [maintainer update] archivers/pecl-lzf

[Johan Huldtgren]

On 2020-10-17 19:43, Johan Huldtgren wrote:
> hello,
> 
> minor update from 1.6.7 to 1.6.8 which includes a fix for filter
> protoypes for 7.2+
> 
> built / packaged / passes tests on amd64, I don't actively use this
> anymore though so I have no real world tests.
> 
> thanks,
> 
> .jh

ping? I should have noted that this port has no consumers.

.jh

> Index: pecl-lzf/Makefile
> ===
> RCS file: /cvs/ports/archivers/pecl-lzf/Makefile,v
> retrieving revision 1.23
> diff -u -p -u -p -r1.23 Makefile
> --- pecl-lzf/Makefile 11 Dec 2019 16:08:29 -  1.23
> +++ pecl-lzf/Makefile 17 Oct 2020 23:35:22 -
> @@ -2,9 +2,8 @@
>  
>  COMMENT =PHP support for LZF de/compression
>  
> -DISTNAME =   LZF-1.6.7
> +DISTNAME =   LZF-1.6.8
>  CATEGORIES = archivers
> -REVISION =   0
>  MAINTAINER = Johan Huldtgren 
>  
>  # PHP
> Index: pecl-lzf/distinfo
> ===
> RCS file: /cvs/ports/archivers/pecl-lzf/distinfo,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 distinfo
> --- pecl-lzf/distinfo 4 Mar 2019 10:37:19 -   1.6
> +++ pecl-lzf/distinfo 17 Oct 2020 23:35:22 -
> @@ -1,2 +1,2 @@
> -SHA256 (LZF-1.6.7.tgz) = SBeNokQBl2+KxRiQUiKvZMAz9J8qUNgw5V3hP6gOj+A=
> -SIZE (LZF-1.6.7.tgz) = 17999
> +SHA256 (LZF-1.6.8.tgz) = jhwu0hFDmnj277gBFqH7C/JK7C9lnpBmm48D7YFC9Yk=
> +SIZE (LZF-1.6.8.tgz) = 18071
> Index: pecl-lzf/pkg/PLIST
> ===
> RCS file: /cvs/ports/archivers/pecl-lzf/pkg/PLIST,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 PLIST
> --- pecl-lzf/pkg/PLIST11 Dec 2019 16:08:29 -  1.6
> +++ pecl-lzf/pkg/PLIST17 Oct 2020 23:35:22 -
> @@ -5,6 +5,6 @@ ${MODPECL_DEFAULTV}@pkgpath archivers/pe
>  ${MODPECL_DEFAULTV}@pkgpath archivers/pecl-lzf,php70
>  ${MODPECL_DEFAULTV}@pkgpath archivers/pecl-lzf,php71
>  @extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini 
> -lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
> +@so lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
>  share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
>  @sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/${MODULE_NAME}.ini

[maintainer update] archivers/pecl-lzf

[Johan Huldtgren]

hello,

minor update from 1.6.7 to 1.6.8 which includes a fix for filter
protoypes for 7.2+

built / packaged / passes tests on amd64, I don't actively use this
anymore though so I have no real world tests.

thanks,

.jh
Index: pecl-lzf/Makefile
===
RCS file: /cvs/ports/archivers/pecl-lzf/Makefile,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 Makefile
--- pecl-lzf/Makefile   11 Dec 2019 16:08:29 -  1.23
+++ pecl-lzf/Makefile   17 Oct 2020 23:35:22 -
@@ -2,9 +2,8 @@
 
 COMMENT =  PHP support for LZF de/compression
 
-DISTNAME = LZF-1.6.7
+DISTNAME = LZF-1.6.8
 CATEGORIES =   archivers
-REVISION = 0
 MAINTAINER =   Johan Huldtgren 
 
 # PHP
Index: pecl-lzf/distinfo
===
RCS file: /cvs/ports/archivers/pecl-lzf/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- pecl-lzf/distinfo   4 Mar 2019 10:37:19 -   1.6
+++ pecl-lzf/distinfo   17 Oct 2020 23:35:22 -
@@ -1,2 +1,2 @@
-SHA256 (LZF-1.6.7.tgz) = SBeNokQBl2+KxRiQUiKvZMAz9J8qUNgw5V3hP6gOj+A=
-SIZE (LZF-1.6.7.tgz) = 17999
+SHA256 (LZF-1.6.8.tgz) = jhwu0hFDmnj277gBFqH7C/JK7C9lnpBmm48D7YFC9Yk=
+SIZE (LZF-1.6.8.tgz) = 18071
Index: pecl-lzf/pkg/PLIST
===
RCS file: /cvs/ports/archivers/pecl-lzf/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pecl-lzf/pkg/PLIST  11 Dec 2019 16:08:29 -  1.6
+++ pecl-lzf/pkg/PLIST  17 Oct 2020 23:35:22 -
@@ -5,6 +5,6 @@ ${MODPECL_DEFAULTV}@pkgpath archivers/pe
 ${MODPECL_DEFAULTV}@pkgpath archivers/pecl-lzf,php70
 ${MODPECL_DEFAULTV}@pkgpath archivers/pecl-lzf,php71
 @extra ${SYSCONFDIR}/php-${MODPHP_VERSION}/${MODULE_NAME}.ini 
-lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
+@so lib/php-${MODPHP_VERSION}/modules/${MODULE_NAME}.so
 share/examples/php-${MODPHP_VERSION}/${MODULE_NAME}.ini
 @sample ${SYSCONFDIR}/php-${MODPHP_VERSION}.sample/${MODULE_NAME}.ini

Re: [new] devel/py-metallum

[Johan Huldtgren]

On 2020-03-13  9:25, Johan Huldtgren wrote:
> hello,
> 
> py-metallum is a basic python API for querying the Encyclopedia Metallum
> (aka metal-archives.com). Tested, built and packaged on amd64.

ping?

thanks,

.jh


py-metallum.tgz
Description: application/tar-gz

[new] devel/py-metallum

[Johan Huldtgren]

hello,

py-metallum is a basic python API for querying the Encyclopedia Metallum
(aka metal-archives.com). Tested, built and packaged on amd64.

thanks,

.jh


py-metallum.tgz
Description: application/tar-gz

Re: [new] www/py-requests-cache

[Johan Huldtgren]

On 2020-03-02 20:32, Stuart Henderson wrote:
> On 2020/03/02 13:42, Johan Huldtgren wrote:
> > hello,
> > 
> > this is a new port for py-requests-cache, a transparent persistent
> > cache for the py-requests library (version >= 1.1.0). This is a
> > dependency for another new port which I'm working on. Built, packaged
> > and tested on amd64.
> > 
> > thanks,
> > 
> > .jh
> 
> OK with this added on top. Tests work fine here if I remove the pf rule
> to block _pbuild.

ah, hade missed that, looks good to me.

.jh
 
> diff 901c8e85fc967ae7a6dd1f51615d039fab32db31 /usr/ports/mystuff
> blob - 9b788811f362368946fbe0837dc3212019307d36
> file + www/py-requests-cache/Makefile
> --- www/py-requests-cache/Makefile
> +++ www/py-requests-cache/Makefile
> @@ -20,10 +20,9 @@ FLAVOR =   python3
>  MODPY_PI =   Yes
>  MODPY_SETUPTOOLS =   Yes
>  
> -# Dependencies
> -RUN_DEPENDS =www/py-requests${MODPY_FLAVOR}>=1.1.0
> +# tests require network
> +MODPY_PYTEST =   Yes
>  
> -# Requires older py-test and py-test-cov
> -NO_TEST =Yes
> +RUN_DEPENDS =www/py-requests${MODPY_FLAVOR}>=1.1.0
>  
>  .include 
> blob - e6ddbffb34d7c3aefcba41761d7b5943eb44582e
> file + www/py-requests-cache/pkg/DESCR
> --- www/py-requests-cache/pkg/DESCR
> +++ www/py-requests-cache/pkg/DESCR
> @@ -1,2 +1,2 @@
>  Requests-cache is a transparent persistent cache for the py-requests
> -library
> +library.

[new] www/py-requests-cache

[Johan Huldtgren]

hello,

this is a new port for py-requests-cache, a transparent persistent
cache for the py-requests library (version >= 1.1.0). This is a
dependency for another new port which I'm working on. Built, packaged
and tested on amd64.

thanks,

.jh


py-requests-cache.tgz
Description: application/tar-gz

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

[Johan Huldtgren]

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/Makefile22 Jan 2020 07:49:02 -  1.424
> +++ audio/Makefile29 Feb 2020 17:19:59 -
> @@ -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 -  1.12
> +++ audio/py-discogs-client/Makefile  29 Feb 2020 17:20:00 -
> @@ -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 
> -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 -  1.4
> +++ audio/py-discogs-client/distinfo  29 Feb 2020 17:20:00 -
> @@ -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 -  1.3
> +++ audio/py-discogs-client/pkg/PLIST 29 Feb 2020 17:20:01 -
> @@ -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

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 -  1.424
+++ audio/Makefile  29 Feb 2020 18:46:53 -
@@ -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/Makefile23 Nov 2019 23:36:47 -  1.12
+++ audio/py-discogs-client/Makefile29 Feb 2020 18:46:55 -
@@ -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 
-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} 

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

[Johan Huldtgren]

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 -  1.947
> +++ www/Makefile  29 Feb 2020 17:30:51 -
> @@ -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 -  1.5
> +++ www/py-requests-oauthlib/Makefile 29 Feb 2020 17:31:00 -
> @@ -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 -  1.1.1.1
> +++ www/py-requests-oauthlib/distinfo 29 Feb 2020 17:31:00 -
> @@ -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/PLIST14 Aug 2018 05:56:19 -  
> 1.1.1.1
> +++ www/py-requests-oauthlib/pkg/PLIST29 Feb 2020 17:31:00 -
> @@ -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/fac

Re: [maintainer update] security/py-oauthlib

[Johan Huldtgren]

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 -  1.567
> +++ security/Makefile 29 Feb 2020 18:05:14 -
> @@ -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 -   1.16
> +++ security/py-oauthlib/Makefile 29 Feb 2020 18:05:18 -
> @@ -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 
> @@ -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 
> 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 -   1.10
> +++ security/py-oauthlib/distinfo 29 Feb 2020 18:05:18 -
> @@ -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 -
> +++ 
> security/py-oauthlib/patches/patch-tests_oauth2_rfc6749_endpoints_test_error_responses_py
>  29 Feb 2020 18:05:18 -
> @@ -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_auth

[maintainer update] audio/py-discogs-client

[Johan Huldtgren]

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. 

thanks,

.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 -  1.424
+++ audio/Makefile  29 Feb 2020 17:19:59 -
@@ -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/Makefile23 Nov 2019 23:36:47 -  1.12
+++ audio/py-discogs-client/Makefile29 Feb 2020 17:20:00 -
@@ -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 
-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/distinfo14 Dec 2015 18:09:09 -  1.4
+++ audio/py-discogs-client/distinfo29 Feb 2020 17:20:00 -
@@ -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 -  1.3
+++ audio/py-discogs-client/pkg/PLIST   29 Feb 2020 17:20:01 -
@@ -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

[update] www/py-requests-oauthlib

[Johan Huldtgren]

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.

thanks,

.jh
Index: www/Makefile
===
RCS file: /cvs/ports/www/Makefile,v
retrieving revision 1.947
diff -u -p -u -p -r1.947 Makefile
--- www/Makefile25 Feb 2020 20:29:28 -  1.947
+++ www/Makefile29 Feb 2020 17:30:51 -
@@ -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 -  1.5
+++ www/py-requests-oauthlib/Makefile   29 Feb 2020 17:31:00 -
@@ -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 -  1.1.1.1
+++ www/py-requests-oauthlib/distinfo   29 Feb 2020 17:31:00 -
@@ -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 -  1.1.1.1
+++ www/py-requests-oauthlib/pkg/PLIST  29 Feb 2020 17:31:00 -
@@ -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

[maintainer update] security/py-oauthlib

[Johan Huldtgren]

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.

thanks,

.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 -  1.567
+++ security/Makefile   29 Feb 2020 18:05:14 -
@@ -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 -   1.16
+++ security/py-oauthlib/Makefile   29 Feb 2020 18:05:18 -
@@ -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 
@@ -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 
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 -   1.10
+++ security/py-oauthlib/distinfo   29 Feb 2020 18:05:18 -
@@ -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 -
+++ 
security/py-oauthlib/patches/patch-tests_oauth2_rfc6749_endpoints_test_error_responses_py
   29 Feb 2020 18:05:18 -
@@ -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

Re: Remove net/py-oauth2?

[Johan Huldtgren]

hello,

On 2019-11-30 20:02, Kurt Mosiejczuk wrote:
> net/py-oauth2 is python2-only and has no consumers. 
> 
> Shall we remove it?

I was the original submitter for this as it used
to be a requirement for py-discogs-client. It is
no longer needed and as far as I'm concerned it
can be removed.

That said, I submitted a patch to bring python3
support to this two years ago[0] :) I think the
lack of interest is a good sign that this can
be removed.

thanks,

.jh

[0] https://marc.info/?l=openbsd-ports=153209673227329=2

[update] devel/py-test-cov

[Johan Huldtgren]

hello,

minor update to py-test-cov from 2.5.1 to 2.7.1, this is one of the
required dependencies needed to update audio/py-jwt.

thanks,

.jh
Index: py-test-cov/Makefile
===
RCS file: /cvs/ports/devel/py-test-cov/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- py-test-cov/Makefile12 Jul 2019 20:45:54 -  1.13
+++ py-test-cov/Makefile6 Sep 2019 20:55:02 -
@@ -2,7 +2,7 @@
 
 COMMENT =  library for stubbing in Python
 
-MODPY_EGG_VERSION =2.5.1
+MODPY_EGG_VERSION =2.7.1
 DISTNAME = pytest-cov-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:S/py/py-/}
 CATEGORIES =   devel
Index: py-test-cov/distinfo
===
RCS file: /cvs/ports/devel/py-test-cov/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- py-test-cov/distinfo12 May 2017 09:39:17 -  1.8
+++ py-test-cov/distinfo6 Sep 2019 20:55:02 -
@@ -1,2 +1,2 @@
-SHA256 (pytest-cov-2.5.1.tar.gz) = A6p1LPEdtB0oHqHYB9lUxO2jXPobIdaXGWbMBBu/bi0=
-SIZE (pytest-cov-2.5.1.tar.gz) = 36201
+SHA256 (pytest-cov-2.7.1.tar.gz) = 4A6k/d6XByVILx81Yw0S8HThIaI4Aaq/KuFU7GvdNDo=
+SIZE (pytest-cov-2.7.1.tar.gz) = 42121

sysutils/apcupsd on mips64

[Johan Huldtgren]

hello,

i recently updated my ERL to 6.5 and when updating the packages
noticed there was none for sysutils/apcupsd. I attempted to build it
but it will fail as such:

$ env SUBPACKAGE="-main" FLAVOR="no_x11" make package
===>  Checking files for apcupsd-3.14.14
`/usr/ports/distfiles/apcupsd-3.14.14.tar.gz' is up to date.
>> (SHA256) apcupsd-3.14.14.tar.gz: OK
===>  Verifying specs:  estdc++>=17 pthread c m pthread estdc++>=19 usb 
estdc++>=17 pthread c m pthread estdc++>=19 gd
Missing library for estdc++>=19.0
Fatal error
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2253 
'/usr/ports/pobj/apcupsd-3.14.14-no_x11/.buildwantlibs')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2545 
'/usr/ports/pobj/apcupsd-3.14.14-no_x11/.extract_done')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2021 
'/usr/ports/packages/mips64/all/apcupsd-3.14.14p5.tgz')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2487 
'_internal-package')
*** Error 1 in /usr/ports/sysutils/apcupsd 
(/usr/ports/infrastructure/mk/bsd.port.mk:2466 'package')

I googled the 'Missing library for estdc++>=19.0' and someone had
fixed a similar thing by adding

${MODGCC4_CPPLIBDEP} to LIB_DEPENDS-main

adding that will try to add in gcc-libs-8.3.0, however that conflicts
with the already installed gcc-libs-4.9.4, which come as a dependency
of graphics/gd, if I remove gcc-libs-4.9.4 (and everything that
depends on it) and then add gcc-libs-8.3.0 I get past the 'Missing
library' error but then it fails since it needs graphics/gd which
can't be installed without gcc-libs4.9.4. Is there a way around this
or is it a lost cause?

thanks,

.jh

updates to py-test-cov and py-test-runner

[Johan Huldtgren]

hello,

in addition to Kurt's update[1] of py-test and py-pluggy to get
www/py-jwt updated[2] I need the two attached ports updated as well.
My only tests were making sure they built, packaged and installed on
amd64 and once installed that I could run 'make test' for www/py-jwt
without it trying to go out and fetch updated versions of these
anymore. This should be tested and looked at by someone with more
python experience than me.

thanks,

.jh

[1] https://marc.info/?l=openbsd-ports=155495802000719=2
[2] https://marc.info/?l=openbsd-ports=154990723519915=2
Index: py-test-cov/Makefile
===
RCS file: /cvs/ports/devel/py-test-cov/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- py-test-cov/Makefile12 May 2017 09:39:17 -  1.10
+++ py-test-cov/Makefile17 Mar 2019 20:22:45 -
@@ -2,7 +2,7 @@
 
 COMMENT =  library for stubbing in Python
 
-MODPY_EGG_VERSION =2.5.1
+MODPY_EGG_VERSION =2.6.1
 DISTNAME = pytest-cov-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:S/py/py-/}
 CATEGORIES =   devel
Index: py-test-cov/distinfo
===
RCS file: /cvs/ports/devel/py-test-cov/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- py-test-cov/distinfo12 May 2017 09:39:17 -  1.8
+++ py-test-cov/distinfo17 Mar 2019 20:22:45 -
@@ -1,2 +1,2 @@
-SHA256 (pytest-cov-2.5.1.tar.gz) = A6p1LPEdtB0oHqHYB9lUxO2jXPobIdaXGWbMBBu/bi0=
-SIZE (pytest-cov-2.5.1.tar.gz) = 36201
+SHA256 (pytest-cov-2.6.1.tar.gz) = CrZkslxqqXFsvyA7F92zAZMjgwRggsCBuYSKDt9a3TM=
+SIZE (pytest-cov-2.6.1.tar.gz) = 35307
Index: py-test-runner/Makefile
===
RCS file: /cvs/ports/devel/py-test-runner/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- py-test-runner/Makefile 11 Feb 2017 16:51:14 -  1.8
+++ py-test-runner/Makefile 17 Mar 2019 21:05:24 -
@@ -2,7 +2,7 @@
 
 COMMENT =  invoke py.test as distutils command
 
-MODPY_EGG_VERSION =2.11.1
+MODPY_EGG_VERSION =4.2
 DISTNAME = pytest-runner-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:S/py/py-/}
 CATEGORIES =   devel
Index: py-test-runner/distinfo
===
RCS file: /cvs/ports/devel/py-test-runner/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- py-test-runner/distinfo 11 Feb 2017 16:51:14 -  1.7
+++ py-test-runner/distinfo 17 Mar 2019 21:05:24 -
@@ -1,2 +1,2 @@
-SHA256 (pytest-runner-2.11.1.tar.gz) = 
mDox6rReN1JA4lAWGlVhY7yNJQ7aupeWCQkzjCc6ibM=
-SIZE (pytest-runner-2.11.1.tar.gz) = 9661
+SHA256 (pytest-runner-4.2.tar.gz) = 
0j8Re+OZGfAN2Rv/608V4DHseXUBtxeiReN3ruD1d74=
+SIZE (pytest-runner-4.2.tar.gz) = 11947
Index: py-test-runner/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-test-runner/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- py-test-runner/pkg/PLIST9 Apr 2016 17:44:26 -   1.2
+++ py-test-runner/pkg/PLIST17 Mar 2019 21:05:24 -
@@ -7,4 +7,5 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/pytest_runner-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
 
lib/python${MODPY_VERSION}/site-packages/pytest_runner-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
 
lib/python${MODPY_VERSION}/site-packages/pytest_runner-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/namespace_packages.txt
+lib/python${MODPY_VERSION}/site-packages/pytest_runner-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 
lib/python${MODPY_VERSION}/site-packages/pytest_runner-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt

Re: devel/py-coveralls: use python 3

[Johan Huldtgren]

hello,

On 2019-03-17 16:45, Klemens Nanni wrote:

On Sun, Mar 17, 2019 at 04:30:13PM -0400, Kurt Mosiejczuk wrote:
Is there a reason there is no python3 flavor? I checked and it 
supports

Python 2.7 and 3.4-3.7.


I was wondering the same and just started on moving this port to
Python 3 all together.


to answer the first part I ported this back when it was a dependency
for py-discogs-client, at some point it stopped being, and I've not
had real world tests for this since. So just didn't occur to me.
If this port has value, someone who uses (or depends on) it should
perhaps grab maintainership to ensure greater care and feeding.


Minimal dependencies are taken from setup.py.

@Johan: The release tarball (from PyPi) does not include tests/, but
they're present in the upstream git repo.  Would you mind tackling this
so downstreams like us can run tests with future releases?


I assume we use PyPi instead of github because github only provides the
auto generated tarballs and not proper ones?


Feedback? Objections?


Reads fine, as noted above I don't have any uses for this so no real
world tests.

.jh


Index: Makefile
===
RCS file: /cvs/ports/devel/py-coveralls/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile17 Mar 2019 20:22:46 -  1.9
+++ Makefile17 Mar 2019 20:41:04 -
@@ -3,6 +3,7 @@
 COMMENT =  display coverage stats online via coveralls.io

 MODPY_EGG_VERSION =1.6.0
+REVISION = 0
 DISTNAME = coveralls-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   devel
@@ -14,13 +15,13 @@ HOMEPAGE =  https://github.com/coagulant/
 PERMIT_PACKAGE_CDROM = Yes

 MODULES =  lang/python
-
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
 MODPY_PI = Yes
 MODPY_SETUPTOOLS = Yes

-RUN_DEPENDS =  devel/py-docopt \
-   devel/py-coverage \
-   www/py-requests
+RUN_DEPENDS =  devel/py-coverage${MODPY_FLAVOR}>=3.6 \
+   devel/py-docopt${MODPY_FLAVOR}>=0.6.1 \
+   www/py-requests${MODPY_FLAVOR}>=1.0.0

 NO_TEST =  Yes

Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-coveralls/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   17 Mar 2019 20:22:46 -  1.5
+++ pkg/PLIST   17 Mar 2019 20:41:04 -
@@ -9,18 +9,19 @@ lib/python${MODPY_VERSION}/site-packages

lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt

lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/__main__.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/__main__.pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}api.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}cli.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}exception.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}git.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}reporter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/api.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/api.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/cli.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/cli.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/exception.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/exception.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/git.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/git.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/version.py
-lib/python${MODPY_VERSION}/site-packages/coveralls/version.pyc

Re: [maintainer update] devel/py-coveralls

[Johan Huldtgren]

On 2019-01-20 16:06, Johan Huldtgren wrote:

minor update of py-coveralls from 1.3.0 to 1.5.0, built
and packaged on amd64. This used to be a dependency for
py-dicogs-client, but as it no longer is I have no real
world tests.


updated to 1.5.1, only big difference since 1.5.0 is
that py-test-runner has been removed as a dependency.


and update to 1.6.0, only change since 1.5.1 is added support
for semaphoreCI.

as previously built and packaged on amd64 without issues.

thanks,

.jh
Index: py-coveralls/Makefile
===
RCS file: /cvs/ports/devel/py-coveralls/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- py-coveralls/Makefile	24 Apr 2018 16:59:43 -	1.8
+++ py-coveralls/Makefile	17 Mar 2019 19:57:17 -
@@ -2,7 +2,7 @@
 
 COMMENT =	display coverage stats online via coveralls.io
 
-MODPY_EGG_VERSION =	1.3.0
+MODPY_EGG_VERSION =	1.6.0
 DISTNAME =	coveralls-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 CATEGORIES =	devel
@@ -18,7 +18,6 @@ MODULES =		lang/python
 MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 
-BUILD_DEPENDS =		devel/py-test-runner
 RUN_DEPENDS =		devel/py-docopt \
 			devel/py-coverage \
 			www/py-requests
Index: py-coveralls/distinfo
===
RCS file: /cvs/ports/devel/py-coveralls/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- py-coveralls/distinfo	24 Apr 2018 16:59:43 -	1.5
+++ py-coveralls/distinfo	17 Mar 2019 19:57:17 -
@@ -1,2 +1,2 @@
-SHA256 (coveralls-1.3.0.tar.gz) = ZkeUdI0uVnPjR+xHYVmp2H9D4NLUSVDpjtDie5jag0Y=
-SIZE (coveralls-1.3.0.tar.gz) = 11790
+SHA256 (coveralls-1.6.0.tar.gz) = byE+RhOQlz9Kl/uenU69SVavKW/wpNho5iIQgUWDXLc=
+SIZE (coveralls-1.6.0.tar.gz) = 11024
Index: py-coveralls/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-coveralls/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- py-coveralls/pkg/PLIST	24 Apr 2018 16:59:43 -	1.4
+++ py-coveralls/pkg/PLIST	17 Mar 2019 19:57:17 -
@@ -10,12 +10,16 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/__main__.py
+lib/python${MODPY_VERSION}/site-packages/coveralls/__main__.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/api.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/api.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/cli.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/cli.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/exception.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/exception.pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/git.py
+lib/python${MODPY_VERSION}/site-packages/coveralls/git.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/version.py

Re: [maintainer update] www/py-jwt

[Johan Huldtgren]

hello,

On 2019/02/11 12:46, Stuart Henderson wrote:
> On 2019/02/07 16:44, Pamela Mosiejczuk wrote:
>>
>>
>> On 1/30/19 12:10 PM, Johan Huldtgren wrote:
>>> On 2019-01-20 17:41, Johan Huldtgren wrote:
>>>> hello,
>>>>
>>>> minor update of py-jwt from 1.6.4 to 1.7.1, built,
>>>> packaged, and tested with py-discogs-client on
>>>> amd64.
>>>
>>> ping?
>>>
>>> .jh
>>>
>>
>> Hi Johan,
>> With this release's new test dependency version ranges, the tests now
>> download them from pypi, rather than using ours. Perhaps it is better to
>> simply disable tests?
> 
> Best fix is to port or update the dependencies (it will only try to fetch from
> pypi if they are not present or too old) .. though even if they're not updated
> I think I'd rather not just knock out the tests completely because they are
> still useful. Maybe leave them enabled but with an XXX comment.

I had never seen the original mail from Pamela (guess I have to take a closer
look at what is being blocked by my mailserver - make sure to cc my gmail for
the time being).  I will look into this during the week and see if I can come
up with a better diff. Thanks for seeing this.

.jh

> 
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/www/py-jwt/Makefile,v
>> retrieving revision 1.12
>> diff -u -p -r1.12 Makefile
>> --- Makefile 1 Jul 2018 06:26:52 -   1.12
>> +++ Makefile 7 Feb 2019 21:03:27 -
>> @@ -2,7 +2,7 @@
>>  
>>  COMMENT =   JSON Web Token implementation in Python
>>  
>> -MODPY_EGG_VERSION = 1.6.4
>> +MODPY_EGG_VERSION = 1.7.1
>>  DISTNAME =  PyJWT-${MODPY_EGG_VERSION}
>>  PKGNAME =   py-jwt-${MODPY_EGG_VERSION}
>>  CATEGORIES =www
>> @@ -23,9 +23,8 @@ MODPY_SETUPTOOLS = Yes
>>  
>>  RUN_DEPENDS =   security/py-cryptography${MODPY_FLAVOR}>=1.4.0
>>  
>> -TEST_DEPENDS =  devel/py-test${MODPY_FLAVOR} \
>> -devel/py-test-cov${MODPY_FLAVOR} \
>> -devel/py-test-runner${MODPY_FLAVOR}
>> +# Attempts to download dependencies from pypi
>> +NO_TEST =   Yes
>>  
>>  post-install:
>>  mv ${PREFIX}/bin/pyjwt ${PREFIX}/bin/pyjwt${MODPY_BIN_SUFFIX}
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/www/py-jwt/distinfo,v
>> retrieving revision 1.8
>> diff -u -p -r1.8 distinfo
>> --- distinfo 1 Jul 2018 06:26:52 -   1.8
>> +++ distinfo 7 Feb 2019 21:03:27 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (PyJWT-1.6.4.tar.gz) = TuQTs1fVP9P7RHBFd6+siOcuh4cWEWJw1yJyPWW0IXY=
>> -SIZE (PyJWT-1.6.4.tar.gz) = 41694
>> +SHA256 (PyJWT-1.7.1.tar.gz) = jVmpdvt3Pz5qOchWNjV8Tw4kJwc5TK2t2YFPXLqiDpY=
>> +SIZE (PyJWT-1.7.1.tar.gz) = 41979
>> Index: pkg/PLIST
>> ===
>> RCS file: /cvs/ports/www/py-jwt/pkg/PLIST,v
>> retrieving revision 1.3
>> diff -u -p -r1.3 PLIST
>> --- pkg/PLIST24 Apr 2017 09:30:00 -  1.3
>> +++ pkg/PLIST7 Feb 2019 21:03:27 -
>> @@ -1,4 +1,4 @@
>> -@comment $OpenBSD: PLIST,v 1.3 2017/04/24 09:30:00 sthen Exp $
>> +@comment $OpenBSD: PLIST,v$
>>  bin/pyjwt${MODPY_BIN_SUFFIX}
>>  
>> lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>>  
>> lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
>> @@ -18,6 +18,7 @@ lib/python${MODPY_VERSION}/site-packages
>>  
>> lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}api_jwt.${MODPY_PYC_MAGIC_TAG}pyc
>>  
>> lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
>>  
>> lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
>> +lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}help.${MODPY_PYC_MAGIC_TAG}pyc
>>  
>> lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
>>  lib/python${MODPY_VERSION}/site-packages/jwt/algorithms.py
>>  lib/python${MODPY_VERSION}/site-packages/jwt/api_jws.py
>> @@ -36,4 +37,5 @@ lib/python${MODPY_VERSION}/site-packages
>>  lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/py_ecdsa.py
>>  lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/pycrypto.py
>>  lib/python${MODPY_VERSION}/site-packages/jwt/exceptions.py
>> +lib/python${MODPY_VERSION}/site-packages/jwt/help.py
>>  lib/python${MODPY_VERSION}/site-packages/jwt/utils.py
> 

Re: [maintainer update] www/py-jwt

[Johan Huldtgren]

On 2019-01-20 17:41, Johan Huldtgren wrote:

hello,

minor update of py-jwt from 1.6.4 to 1.7.1, built,
packaged, and tested with py-discogs-client on
amd64.


ping?

.jh

Re: [maintainer update] devel/py-coveralls

[Johan Huldtgren]

On 2019-01-20 16:06, Johan Huldtgren wrote:

minor update of py-coveralls from 1.3.0 to 1.5.0, built
and packaged on amd64. This used to be a dependency for
py-dicogs-client, but as it no longer is I have no real
world tests.


updated to 1.5.1, only big difference since 1.5.0 is
that py-test-runner has been removed as a dependency.


ping?

.jh

Re: [maintainer update] archivers/pecl-lzf

[Johan Huldtgren]

On 2019-01-20 16:31, Johan Huldtgren wrote:

hello,

minor update from 1.6.6 to 1.6.7 including
the following changes:

- increase compression buffer up to 104% to
  avoid failure when output is larger than
  input
- don't try to compress very large
  input (>4GB)

built / packaged / passes tests on amd64, I don't
actively use this anymore though so I have no real
world tests.


ping?

.jh

[maintainer update] www/py-jwt

[Johan Huldtgren]

hello,

minor update of py-jwt from 1.6.4 to 1.7.1, built,
packaged, and tested with py-discogs-client on
amd64.

thanks,

.jh
Index: py-jwt/Makefile
===
RCS file: /cvs/ports/www/py-jwt/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- py-jwt/Makefile	1 Jul 2018 06:26:52 -	1.12
+++ py-jwt/Makefile	20 Jan 2019 22:04:49 -
@@ -2,7 +2,7 @@
 
 COMMENT =	JSON Web Token implementation in Python
 
-MODPY_EGG_VERSION = 1.6.4
+MODPY_EGG_VERSION = 1.7.1
 DISTNAME =	PyJWT-${MODPY_EGG_VERSION}
 PKGNAME =	py-jwt-${MODPY_EGG_VERSION}
 CATEGORIES =	www
Index: py-jwt/distinfo
===
RCS file: /cvs/ports/www/py-jwt/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- py-jwt/distinfo	1 Jul 2018 06:26:52 -	1.8
+++ py-jwt/distinfo	20 Jan 2019 22:04:49 -
@@ -1,2 +1,2 @@
-SHA256 (PyJWT-1.6.4.tar.gz) = TuQTs1fVP9P7RHBFd6+siOcuh4cWEWJw1yJyPWW0IXY=
-SIZE (PyJWT-1.6.4.tar.gz) = 41694
+SHA256 (PyJWT-1.7.1.tar.gz) = jVmpdvt3Pz5qOchWNjV8Tw4kJwc5TK2t2YFPXLqiDpY=
+SIZE (PyJWT-1.7.1.tar.gz) = 41979
Index: py-jwt/pkg/PLIST
===
RCS file: /cvs/ports/www/py-jwt/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- py-jwt/pkg/PLIST	24 Apr 2017 09:30:00 -	1.3
+++ py-jwt/pkg/PLIST	20 Jan 2019 22:04:49 -
@@ -18,6 +18,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}api_jwt.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}help.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/algorithms.py
 lib/python${MODPY_VERSION}/site-packages/jwt/api_jws.py
@@ -36,4 +37,5 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/py_ecdsa.py
 lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/pycrypto.py
 lib/python${MODPY_VERSION}/site-packages/jwt/exceptions.py
+lib/python${MODPY_VERSION}/site-packages/jwt/help.py
 lib/python${MODPY_VERSION}/site-packages/jwt/utils.py

[maintainer update] archivers/pecl-lzf

[Johan Huldtgren]

hello,

minor update from 1.6.6 to 1.6.7 including
the following changes:

- increase compression buffer up to 104% to
  avoid failure when output is larger than
  input
- don't try to compress very large
  input (>4GB)

built / packaged / passes tests on amd64, I don't
actively use this anymore though so I have no real
world tests.

thanks,

.jh
Index: pecl-lzf/Makefile
===
RCS file: /cvs/ports/archivers/pecl-lzf/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- pecl-lzf/Makefile	11 Dec 2018 12:33:26 -	1.20
+++ pecl-lzf/Makefile	20 Jan 2019 21:21:45 -
@@ -2,7 +2,7 @@
 
 COMMENT =		PHP support for LZF de/compression
 
-DISTNAME =		LZF-1.6.6
+DISTNAME =		LZF-1.6.7
 REVISION =		1
 CATEGORIES =		archivers
 MAINTAINER =		Johan Huldtgren 
Index: pecl-lzf/distinfo
===
RCS file: /cvs/ports/archivers/pecl-lzf/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- pecl-lzf/distinfo	6 Jul 2017 11:08:41 -	1.5
+++ pecl-lzf/distinfo	20 Jan 2019 21:21:45 -
@@ -1,2 +1,2 @@
-SHA256 (LZF-1.6.6.tgz) = IgXxZ7xCM0G4sZhZKVH3Lk9sKUzBD+EdhQTYKbrJIGM=
-SIZE (LZF-1.6.6.tgz) = 17603
+SHA256 (LZF-1.6.7.tgz) = SBeNokQBl2+KxRiQUiKvZMAz9J8qUNgw5V3hP6gOj+A=
+SIZE (LZF-1.6.7.tgz) = 17999

Re: [maintainer update] devel/py-coveralls

[Johan Huldtgren]

minor update of py-coveralls from 1.3.0 to 1.5.0, built
and packaged on amd64. This used to be a dependency for
py-dicogs-client, but as it no longer is I have no real
world tests.


updated to 1.5.1, only big difference since 1.5.0 is
that py-test-runner has been removed as a dependency.

thanks,

.jh
Index: py-coveralls/Makefile
===
RCS file: /cvs/ports/devel/py-coveralls/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- py-coveralls/Makefile	24 Apr 2018 16:59:43 -	1.8
+++ py-coveralls/Makefile	20 Jan 2019 21:01:50 -
@@ -2,7 +2,7 @@
 
 COMMENT =	display coverage stats online via coveralls.io
 
-MODPY_EGG_VERSION =	1.3.0
+MODPY_EGG_VERSION =	1.5.1
 DISTNAME =	coveralls-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 CATEGORIES =	devel
@@ -18,7 +18,6 @@ MODULES =		lang/python
 MODPY_PI =		Yes
 MODPY_SETUPTOOLS =	Yes
 
-BUILD_DEPENDS =		devel/py-test-runner
 RUN_DEPENDS =		devel/py-docopt \
 			devel/py-coverage \
 			www/py-requests
Index: py-coveralls/distinfo
===
RCS file: /cvs/ports/devel/py-coveralls/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- py-coveralls/distinfo	24 Apr 2018 16:59:43 -	1.5
+++ py-coveralls/distinfo	20 Jan 2019 21:01:50 -
@@ -1,2 +1,2 @@
-SHA256 (coveralls-1.3.0.tar.gz) = ZkeUdI0uVnPjR+xHYVmp2H9D4NLUSVDpjtDie5jag0Y=
-SIZE (coveralls-1.3.0.tar.gz) = 11790
+SHA256 (coveralls-1.5.1.tar.gz) = q2OOiNOJFqbO2/gKnNiZLV+lXHerdV4mLgCzZ5K3zW0=
+SIZE (coveralls-1.5.1.tar.gz) = 11404
Index: py-coveralls/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-coveralls/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- py-coveralls/pkg/PLIST	24 Apr 2018 16:59:43 -	1.4
+++ py-coveralls/pkg/PLIST	20 Jan 2019 21:01:50 -
@@ -10,12 +10,16 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/__main__.py
+lib/python${MODPY_VERSION}/site-packages/coveralls/__main__.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/api.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/api.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/cli.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/cli.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/exception.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/exception.pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/git.py
+lib/python${MODPY_VERSION}/site-packages/coveralls/git.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/version.py

Re: [maintainer update] devel/py-coveralls

[Johan Huldtgren]

> hello,
> 
> minor update of py-coveralls from 1.3.0 to 1.5.0, built
> and packaged on amd64. This used to be a dependency for
> py-dicogs-client, but as it no longer is I have no real
> world tests.

ping?

.jh

[maintainer update] devel/py-coveralls

[Johan Huldtgren]

hello,

minor update of py-coveralls from 1.3.0 to 1.5.0, built
and packaged on amd64. This used to be a dependency for
py-dicogs-client, but as it no longer is I have no real
world tests.

thanks,

.jh
Index: py-coveralls/Makefile
===
RCS file: /cvs/ports/devel/py-coveralls/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- py-coveralls/Makefile	24 Apr 2018 16:59:43 -	1.8
+++ py-coveralls/Makefile	1 Sep 2018 08:57:53 -
@@ -2,7 +2,7 @@
 
 COMMENT =	display coverage stats online via coveralls.io
 
-MODPY_EGG_VERSION =	1.3.0
+MODPY_EGG_VERSION =	1.5.0
 DISTNAME =	coveralls-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 CATEGORIES =	devel
Index: py-coveralls/distinfo
===
RCS file: /cvs/ports/devel/py-coveralls/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- py-coveralls/distinfo	24 Apr 2018 16:59:43 -	1.5
+++ py-coveralls/distinfo	1 Sep 2018 08:57:53 -
@@ -1,2 +1,2 @@
-SHA256 (coveralls-1.3.0.tar.gz) = ZkeUdI0uVnPjR+xHYVmp2H9D4NLUSVDpjtDie5jag0Y=
-SIZE (coveralls-1.3.0.tar.gz) = 11790
+SHA256 (coveralls-1.5.0.tar.gz) = ne5n547BezbFK3eCR3YoUcjhmok8mhTpIaL8N/BfrCI=
+SIZE (coveralls-1.5.0.tar.gz) = 11295
Index: py-coveralls/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-coveralls/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 PLIST
--- py-coveralls/pkg/PLIST	24 Apr 2018 16:59:43 -	1.4
+++ py-coveralls/pkg/PLIST	1 Sep 2018 08:57:53 -
@@ -10,12 +10,16 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/__main__.py
+lib/python${MODPY_VERSION}/site-packages/coveralls/__main__.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/api.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/api.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/cli.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/cli.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/exception.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/exception.pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/git.py
+lib/python${MODPY_VERSION}/site-packages/coveralls/git.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/version.py

Re: openbsd port of Emby or Plex

[Johan Huldtgren]

hello,

> I am thinking of migrating my main hom server from Linux to OpenBSD or
> NetBSD sometime. But if I were going to do that, I would want som home
> media solution like Plex for Linux. Could Emby or Plex get a port in
> OpenBSD? If I learned more about BSD stuff, I would be willing to maintain
> a port but I dont know enough about it right now.

I've been using Plex for a long time and would love to see it on OpenBSD
however it's closed source proprietary so don't hold your breath. I
currently have an older mac that runs Plex media server but NFS mounts
my OpenBSD server where all the media resides. Eventually my plan
is to get a vmm guest spun up where I run the Plex media server either
under Linux or FreeBSD.

If you want something which can be made to run natively perhaps the best
option is to look at porting something like xbmc/kodi which from the few
minutes I spent on github looks open source so you'd "just" need to write
a port around it :)

.jh

Re: [maintainer update] net/py-oauth2

[Johan Huldtgren]

On 2018/07/20 18:25, Stuart Henderson wrote:
> On 2018/07/20 10:24, Johan Huldtgren wrote:
>> On 2018/07/12 12:38, Raf Czlonka wrote:
>>> On Thu, Dec 07, 2017 at 04:34:13PM GMT, Johan Huldtgren wrote:
>>>>> there was a request recently to add a python3 flavor to py-oauth2,
> 
> Did they say what they wanted it for? It seems that this has largely been
> replaced with oauthlib (certainly has in the ports tree anyway, and the module
> was only really added to support py-discogs-client). It would be easier to
> decide what to do with net/py-oauth2 if there was a reason to keep it.

It was to get allow productivity/calcurse to sync with google calendar via
a python3 script[1] which apparently required an OAuth2 python library. I
don't know if this can be solved with oauthlib. If there is no use for
py-oauth2, as the original submitter I am more than happy to let it die, as
I have no use for it anymore.

.jh

[1] http://git.calcurse.org/calcurse.git/tree/contrib/caldav/calcurse-caldav.py

> (Annoyingly there are pypi projects "oauth2", "py-oauth2" and "python-oauth2"
> which makes it a bit confusing to decide if any projects are really using it
> ...)
> 
> 
>>>>> I've done so, and while there I did a very minor update which got rid of
>>>>> py-coverage as a test dependency as well as removed our patch as that
>>>>> has been merged upstream. Homepage also changed. This builds,
>>>>> packages, and passes tests but I have no real world test for it anymore
>>>>> so if you do please test.
>>>>
>>>> ping?
>>>
>>> It's been a while - sorry for the delay ;^)
>>>
>>> I've just built and installed it - all OK, but I don't have anything to
>>> test it against, I'm afraid :^(
>>
>> Well there have been no new releases of this since then, so the diff should
>> still be valid if anyone wants to commit it. It does get rid of a, now,
>> superfluous patch if that's an incentive :)
>>
>> .jh
> 
>> Index: py-oauth2/Makefile
>> ===
>> RCS file: /cvs/ports/net/py-oauth2/Makefile,v
>> retrieving revision 1.5
>> diff -u -p -u -p -r1.5 Makefile
>> --- py-oauth2/Makefile   5 Jan 2016 06:57:50 -   1.5
>> +++ py-oauth2/Makefile   19 Nov 2017 05:35:29 -
>> @@ -3,24 +3,30 @@
>>  COMMENT =   Python library for OAuth
>>  
>>  MODPY_EGG_VERSION = 1.9.0.post1
>> +REVISION =  0
>> +
>> +GH_ACCOUNT =joestump
>> +GH_PROJECT =python-oauth2
>> +GH_COMMIT = 6689960ca23f79eccf9a25a39e93f6540f44ca23
>> +
>>  DISTNAME =  oauth2-${MODPY_EGG_VERSION}
>>  PKGNAME =   py-${DISTNAME}
>>  CATEGORIES =net
>>  MAINTAINER =Johan Huldtgren 
>>  
>> -HOMEPAGE =  http://github.com/simplegeo/python-oauth2
>> +HOMEPAGE =  http://github.com/joestump/python-oauth2
>>  
>>  # MIT
>>  PERMIT_PACKAGE_CDROM =  Yes
>>  
>> -MODPY_PI =  Yes
>> -
>>  MODULES =   lang/python
>>  MODPY_SETUPTOOLS = Yes
>>  
>> -RUN_DEPENDS =   www/py-httplib2
>> -TEST_DEPENDS =  devel/py-mock \
>> -devel/py-coverage \
>> +FLAVORS =   python3
>> +FLAVOR ?=
>> +
>> +RUN_DEPENDS =   www/py-httplib2${MODPY_FLAVOR}
>> +TEST_DEPENDS =  devel/py-mock${MODPY_FLAVOR} \
>>  ${RUN_DEPENDS}
>>  
>>  .include 
>> Index: py-oauth2/distinfo
>> ===
>> RCS file: /cvs/ports/net/py-oauth2/distinfo,v
>> retrieving revision 1.2
>> diff -u -p -u -p -r1.2 distinfo
>> --- py-oauth2/distinfo   5 Jan 2016 06:57:50 -   1.2
>> +++ py-oauth2/distinfo   19 Nov 2017 05:35:29 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (oauth2-1.9.0.post1.tar.gz) = 
>> wAaoXnxgEHx8xtobGEtccZ9t1yAgmBlt+m5V32abWb8=
>> -SIZE (oauth2-1.9.0.post1.tar.gz) = 21306
>> +SHA256 (oauth2-1.9.0.post1-6689960c.tar.gz) = 
>> OUhEktnMIyJTvMDDHzsgYdBhqEIyva2YGiWwWWCpUX8=
>> +SIZE (oauth2-1.9.0.post1-6689960c.tar.gz) = 27646
>> Index: py-oauth2/patches/patch-setup_py
>> ===
>> RCS file: py-oauth2/patches/patch-setup_py
>> diff -N py-oauth2/patches/patch-setup_py
>> --- py-oauth2/patches/patch-setup_py 5 Jan 2016 06:57:50 -   1.2
>> +++ /dev/null1 Jan 1970 00:00:00 -
>> @@ -1,12 +0,0 @@
>> -$OpenBSD: patch-setup_py,v 1.2 2016/01/05 06:57:50 benoit Exp $
>>  setup.py.orig   Mon Jan  4 

Re: [maintainer update] net/py-oauth2

[Johan Huldtgren]

On 2018/07/12 12:38, Raf Czlonka wrote:
> On Thu, Dec 07, 2017 at 04:34:13PM GMT, Johan Huldtgren wrote:
>>> there was a request recently to add a python3 flavor to py-oauth2,
>>> I've done so, and while there I did a very minor update which got rid of
>>> py-coverage as a test dependency as well as removed our patch as that
>>> has been merged upstream. Homepage also changed. This builds,
>>> packages, and passes tests but I have no real world test for it anymore
>>> so if you do please test.
>>
>> ping?
> 
> It's been a while - sorry for the delay ;^)
> 
> I've just built and installed it - all OK, but I don't have anything to
> test it against, I'm afraid :^(

Well there have been no new releases of this since then, so the diff should
still be valid if anyone wants to commit it. It does get rid of a, now,
superfluous patch if that's an incentive :)

.jh
Index: py-oauth2/Makefile
===
RCS file: /cvs/ports/net/py-oauth2/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- py-oauth2/Makefile  5 Jan 2016 06:57:50 -   1.5
+++ py-oauth2/Makefile  19 Nov 2017 05:35:29 -
@@ -3,24 +3,30 @@
 COMMENT =  Python library for OAuth
 
 MODPY_EGG_VERSION = 1.9.0.post1
+REVISION = 0
+
+GH_ACCOUNT =   joestump
+GH_PROJECT =   python-oauth2
+GH_COMMIT =6689960ca23f79eccf9a25a39e93f6540f44ca23
+
 DISTNAME = oauth2-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   net
 MAINTAINER =   Johan Huldtgren 
 
-HOMEPAGE = http://github.com/simplegeo/python-oauth2
+HOMEPAGE = http://github.com/joestump/python-oauth2
 
 # MIT
 PERMIT_PACKAGE_CDROM =  Yes
 
-MODPY_PI = Yes
-
 MODULES =  lang/python
 MODPY_SETUPTOOLS = Yes
 
-RUN_DEPENDS =  www/py-httplib2
-TEST_DEPENDS = devel/py-mock \
-   devel/py-coverage \
+FLAVORS =  python3
+FLAVOR ?=
+
+RUN_DEPENDS =  www/py-httplib2${MODPY_FLAVOR}
+TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR} \
${RUN_DEPENDS}
 
 .include 
Index: py-oauth2/distinfo
===
RCS file: /cvs/ports/net/py-oauth2/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- py-oauth2/distinfo  5 Jan 2016 06:57:50 -   1.2
+++ py-oauth2/distinfo  19 Nov 2017 05:35:29 -
@@ -1,2 +1,2 @@
-SHA256 (oauth2-1.9.0.post1.tar.gz) = 
wAaoXnxgEHx8xtobGEtccZ9t1yAgmBlt+m5V32abWb8=
-SIZE (oauth2-1.9.0.post1.tar.gz) = 21306
+SHA256 (oauth2-1.9.0.post1-6689960c.tar.gz) = 
OUhEktnMIyJTvMDDHzsgYdBhqEIyva2YGiWwWWCpUX8=
+SIZE (oauth2-1.9.0.post1-6689960c.tar.gz) = 27646
Index: py-oauth2/patches/patch-setup_py
===
RCS file: py-oauth2/patches/patch-setup_py
diff -N py-oauth2/patches/patch-setup_py
--- py-oauth2/patches/patch-setup_py5 Jan 2016 06:57:50 -   1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.2 2016/01/05 06:57:50 benoit Exp $
 setup.py.orig  Mon Jan  4 22:34:54 2016
-+++ setup.py   Mon Jan  4 22:33:50 2016
-@@ -45,7 +45,7 @@ setup(name=PKG,
- "Natural Language :: English",
- "License :: OSI Approved :: MIT License"
-   ],
--  packages = find_packages(),
-+  packages = find_packages(exclude=['tests']),
-   install_requires = ['httplib2'],
-   license = "MIT License",
-   keywords="oauth",
Index: py-oauth2/pkg/PLIST
===
RCS file: /cvs/ports/net/py-oauth2/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- py-oauth2/pkg/PLIST 5 Jan 2016 06:57:50 -   1.3
+++ py-oauth2/pkg/PLIST 19 Nov 2017 05:35:29 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2016/01/05 06:57:50 benoit Exp $
+@comment $OpenBSD$
 lib/python${MODPY_VERSION}/site-packages/oauth2/
 
lib/python${MODPY_VERSION}/site-packages/oauth2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/oauth2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -8,15 +8,17 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/oauth2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 
lib/python${MODPY_VERSION}/site-packages/oauth2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/oauth2/__init__.py
-lib/python${MODPY_VERSION}/site-packages/oauth2/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauth2/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauth2/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauth2/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauth2/${MODPY_PYCACHE}_version.${M

sysutils/collectd cannot read cpu info

[Johan Huldtgren]

hello,

I recently decided to give collectd a try. However it seems it cannot
collect CPU information, if that is enabled it will complain as such:

Jul  6 10:38:35 monitor collectd[24483]: cpu plugin: sysctl failed: Cannot 
allocate memory.
Jul  6 10:38:35 monitor collectd[24483]: read-function of plugin `cpu' failed. 
Will suspend it for 20.000 seconds.

Talking to sthen@ he suspects the issue came about as a result of
the cpu stats change:

https://github.com/openbsd/src/commit/531d8034253fb82282f0f353c086e9ad827e031c#diff-fee7dc79f296ae9ec5c557e620e80ed9

And the solution is probably to fix something in collectd's cpu
collection code here, around the CAN_USE_SYSCTL block.

https://github.com/collectd/collectd/blob/master/src/cpu.c

#elif CAN_USE_SYSCTL /* {{{ */
  uint64_t cpuinfo[numcpu][CPUSTATES];
  size_t cpuinfo_size;
  int status;

  if (numcpu < 1) {
ERROR("cpu plugin: Could not determine number of "
  "installed CPUs using sysctl(3).");
return -1;
  }

  memset(cpuinfo, 0, sizeof(cpuinfo));

#if defined(KERN_CPTIME2)
  if (numcpu > 1) {
for (int i = 0; i < numcpu; i++) {
  int mib[] = {CTL_KERN, KERN_CPTIME2, i};

  cpuinfo_size = sizeof(cpuinfo[0]);

  status = sysctl(mib, STATIC_ARRAY_SIZE(mib), cpuinfo[i], _size,
  NULL, 0);
  if (status == -1) {
ERROR("cpu plugin: sysctl failed: %s.", STRERRNO);
return -1;
  }
}
  } else
#endif /* defined(KERN_CPTIME2) */
  {
int mib[] = {CTL_KERN, KERN_CPTIME};
long cpuinfo_tmp[CPUSTATES];

cpuinfo_size = sizeof(cpuinfo_tmp);

status = sysctl(mib, STATIC_ARRAY_SIZE(mib), _tmp, _size,
NULL, 0);
if (status == -1) {
  ERROR("cpu plugin: sysctl failed: %s.", STRERRNO);
  return -1;
}

for (int i = 0; i < CPUSTATES; i++) {
  cpuinfo[0][i] = cpuinfo_tmp[i];
}
  }

  for (int i = 0; i < numcpu; i++) {
cpu_stage(i, COLLECTD_CPU_STATE_USER, (derive_t)cpuinfo[i][CP_USER], now);
cpu_stage(i, COLLECTD_CPU_STATE_NICE, (derive_t)cpuinfo[i][CP_NICE], now);
cpu_stage(i, COLLECTD_CPU_STATE_SYSTEM, (derive_t)cpuinfo[i][CP_SYS], now);
cpu_stage(i, COLLECTD_CPU_STATE_IDLE, (derive_t)cpuinfo[i][CP_IDLE], now);
cpu_stage(i, COLLECTD_CPU_STATE_INTERRUPT, (derive_t)cpuinfo[i][CP_INTR],
  now);
  }
/* }}} #endif CAN_USE_SYSCTL */


However this is far and above my skills, so I'm hoping someone sees
something obvious to fix this.

This is on a -current snap with the latest packages on amd64 (I am
seeing the same behaviour on i386, and while the host below is a
vmm I'm seeing it on physical hardware as well)

thanks,

.jh

---

$ dmesg
OpenBSD 6.3-current (GENERIC) #99: Fri Jul  6 10:18:31 MDT 2018
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC
real mem = 1056956416 (1007MB)
avail mem = 1015943168 (968MB)
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0
acpi at bios0 not configured
cpu0 at mainbus0: (uniprocessor)
cpu0: Intel(R) Xeon(R) CPU E5-2620 v3 @ 2.40GHz, 2395.06 MHz
cpu0: 
FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,SEP,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,SSE3,PCLMUL,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,HV,NXE,PAGE1GB,LONG,LAHF,ABM,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,MELTDOWN
cpu0: 256KB 64b/line 8-way L2 cache
cpu0: smt 0, core 0, package 0
pvbus0 at mainbus0: OpenBSD
pci0 at mainbus0 bus 0
pchb0 at pci0 dev 0 function 0 "OpenBSD VMM Host" rev 0x00
virtio0 at pci0 dev 1 function 0 "Qumranet Virtio RNG" rev 0x00
viornd0 at virtio0
virtio0: irq 3
virtio1 at pci0 dev 2 function 0 "Qumranet Virtio Storage" rev 0x00
vioblk0 at virtio1
scsibus1 at vioblk0: 2 targets
sd0 at scsibus1 targ 0 lun 0:  SCSI3 0/direct fixed
sd0: 20480MB, 512 bytes/sector, 41943040 sectors
virtio1: irq 5
virtio2 at pci0 dev 3 function 0 "Qumranet Virtio Network" rev 0x00
vio0 at virtio2: address fe:e1:bb:d1:1b:85
virtio2: irq 6
virtio3 at pci0 dev 4 function 0 "OpenBSD VMM Control" rev 0x00
vmmci0 at virtio3
virtio3: irq 7
isa0 at mainbus0
isadma0 at isa0
com0 at isa0 port 0x3f8/8 irq 4: ns16450, no fifo
com0: console
vscsi0 at root
scsibus2 at vscsi0: 256 targets
softraid0 at root
scsibus3 at softraid0: 256 targets
root on sd0a (b3b0e43be04b11e0.a) swap on sd0b dump on sd0b

$ pkg_info | grep collectd
collectd-5.8.0p0system metrics collection engine

[maintainer update] security/py-oauthlib

[Johan Huldtgren]

hello,

minor update of py-oauthlib from 2.0.7 to 2.1.0, built,
packaged, and tested with py-discogs-client on
amd64.

thanks,

.jh
Index: py-oauthlib/Makefile
===
RCS file: /cvs/ports/security/py-oauthlib/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- py-oauthlib/Makefile	24 Apr 2018 20:55:04 -	1.11
+++ py-oauthlib/Makefile	30 Jun 2018 21:13:29 -
@@ -2,7 +2,7 @@
 
 COMMENT =	Python library for OAuth
 
-MODPY_EGG_VERSION = 2.0.7
+MODPY_EGG_VERSION = 2.1.0
 
 GH_ACCOUNT =	idan
 GH_PROJECT =	oauthlib
Index: py-oauthlib/distinfo
===
RCS file: /cvs/ports/security/py-oauthlib/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- py-oauthlib/distinfo	24 Apr 2018 20:55:04 -	1.9
+++ py-oauthlib/distinfo	30 Jun 2018 21:13:29 -
@@ -1,2 +1,2 @@
-SHA256 (oauthlib-2.0.7.tar.gz) = IfEPPqAbCgQublWAn5thDW8RD8atvWcfBA4bkLBN/Bo=
-SIZE (oauthlib-2.0.7.tar.gz) = 164442
+SHA256 (oauthlib-2.1.0.tar.gz) = q91fFJCn+n1R89Wdg+nBZznVYhzETXUOMiRtLuLiTyQ=
+SIZE (oauthlib-2.1.0.tar.gz) = 164989

[maintainer update] www/py-jwt

[Johan Huldtgren]

hello,

minor update of py-jwt from 1.6.1 to 1.6.4, built,
packaged, and tested with py-discogs-client on
amd64.

thanks,

.jh
Index: py-jwt/Makefile
===
RCS file: /cvs/ports/www/py-jwt/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- py-jwt/Makefile	24 Apr 2018 18:46:24 -	1.11
+++ py-jwt/Makefile	30 Jun 2018 20:28:38 -
@@ -2,7 +2,7 @@
 
 COMMENT =	JSON Web Token implementation in Python
 
-MODPY_EGG_VERSION = 1.6.1
+MODPY_EGG_VERSION = 1.6.4
 DISTNAME =	PyJWT-${MODPY_EGG_VERSION}
 PKGNAME =	py-jwt-${MODPY_EGG_VERSION}
 CATEGORIES =	www
Index: py-jwt/distinfo
===
RCS file: /cvs/ports/www/py-jwt/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- py-jwt/distinfo	24 Apr 2018 18:46:24 -	1.7
+++ py-jwt/distinfo	30 Jun 2018 20:28:38 -
@@ -1,2 +1,2 @@
-SHA256 (PyJWT-1.6.1.tar.gz) = 2suleG/jvxoK6Gc4dOKfmsSXhglVxQEonGOxXT2q5jo=
-SIZE (PyJWT-1.6.1.tar.gz) = 40743
+SHA256 (PyJWT-1.6.4.tar.gz) = TuQTs1fVP9P7RHBFd6+siOcuh4cWEWJw1yJyPWW0IXY=
+SIZE (PyJWT-1.6.4.tar.gz) = 41694

[maintainer update] devel/py-coveralls

[Johan Huldtgren]

hello,

minor update of py-coveralls from 1.2.0 to 1.3.0, built
and packaged on amd64. This used to be a dependency for
py-dicogs-client, but as it no longer is I have no real
world tests.

thanks,

.jh
Index: py-coveralls/Makefile
===
RCS file: /cvs/ports/devel/py-coveralls/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- py-coveralls/Makefile	6 Oct 2017 21:57:18 -	1.7
+++ py-coveralls/Makefile	18 Apr 2018 12:22:14 -
@@ -2,7 +2,7 @@
 
 COMMENT =	display coverage stats online via coveralls.io
 
-MODPY_EGG_VERSION =	1.2.0
+MODPY_EGG_VERSION =	1.3.0
 DISTNAME =	coveralls-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 CATEGORIES =	devel
Index: py-coveralls/distinfo
===
RCS file: /cvs/ports/devel/py-coveralls/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- py-coveralls/distinfo	6 Oct 2017 13:45:08 -	1.4
+++ py-coveralls/distinfo	18 Apr 2018 12:22:14 -
@@ -1,2 +1,2 @@
-SHA256 (coveralls-1.2.0.tar.gz) = UQaCABUXvMod759iUt9s5zD8uYMcYtn/98fVW2/avfM=
-SIZE (coveralls-1.2.0.tar.gz) = 14281
+SHA256 (coveralls-1.3.0.tar.gz) = ZkeUdI0uVnPjR+xHYVmp2H9D4NLUSVDpjtDie5jag0Y=
+SIZE (coveralls-1.3.0.tar.gz) = 11790
Index: py-coveralls/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-coveralls/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- py-coveralls/pkg/PLIST	6 Oct 2017 13:45:08 -	1.3
+++ py-coveralls/pkg/PLIST	18 Apr 2018 12:22:14 -
@@ -14,6 +14,8 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/coveralls/api.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/cli.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/cli.pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/exception.py
+lib/python${MODPY_VERSION}/site-packages/coveralls/exception.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/version.py

[maintainer update] www/py-jwt

[Johan Huldtgren]

hello,

update of py-jwt from 1.5.3 to 1.6.1, built,
packaged, and tested with py-discogs-client on
amd64.

thanks,

.jh
Index: py-jwt/Makefile
===
RCS file: /cvs/ports/www/py-jwt/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- py-jwt/Makefile	6 Oct 2017 13:46:17 -	1.10
+++ py-jwt/Makefile	18 Apr 2018 12:25:59 -
@@ -2,7 +2,7 @@
 
 COMMENT =	JSON Web Token implementation in Python
 
-MODPY_EGG_VERSION = 1.5.3
+MODPY_EGG_VERSION = 1.6.1
 DISTNAME =	PyJWT-${MODPY_EGG_VERSION}
 PKGNAME =	py-jwt-${MODPY_EGG_VERSION}
 CATEGORIES =	www
@@ -26,9 +26,6 @@ RUN_DEPENDS =   security/py-cryptography
 TEST_DEPENDS =	devel/py-test \
 		devel/py-test-cov \
 		devel/py-test-runner
-
-post-extract:
-	@find ${WRKSRC}/tests -name '__pycache__'  -print0 | xargs -0 rm -rf
 
 post-install:
 	mv ${PREFIX}/bin/pyjwt ${PREFIX}/bin/pyjwt${MODPY_BIN_SUFFIX}
Index: py-jwt/distinfo
===
RCS file: /cvs/ports/www/py-jwt/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- py-jwt/distinfo	6 Oct 2017 13:46:17 -	1.6
+++ py-jwt/distinfo	18 Apr 2018 12:25:59 -
@@ -1,2 +1,2 @@
-SHA256 (PyJWT-1.5.3.tar.gz) = UAvnWxemP3AHJBaEPcgMiCEQkDC+gk9NFHWPEUl4uuc=
-SIZE (PyJWT-1.5.3.tar.gz) = 73044
+SHA256 (PyJWT-1.6.1.tar.gz) = 2suleG/jvxoK6Gc4dOKfmsSXhglVxQEonGOxXT2q5jo=
+SIZE (PyJWT-1.6.1.tar.gz) = 40743

[maintainer update] security/py-oauthlib

[Johan Huldtgren]

hello,

minor update of py-oauthlib from 2.0.3 to 2.0.7, built,
packaged, and tested with py-discogs-client on
amd64.

thanks,

.jh
Index: py-oauthlib/Makefile
===
RCS file: /cvs/ports/security/py-oauthlib/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- py-oauthlib/Makefile	6 Oct 2017 13:51:25 -	1.10
+++ py-oauthlib/Makefile	18 Apr 2018 12:26:43 -
@@ -2,7 +2,7 @@
 
 COMMENT =	Python library for OAuth
 
-MODPY_EGG_VERSION = 2.0.3
+MODPY_EGG_VERSION = 2.0.7
 
 GH_ACCOUNT =	idan
 GH_PROJECT =	oauthlib
Index: py-oauthlib/distinfo
===
RCS file: /cvs/ports/security/py-oauthlib/distinfo,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 distinfo
--- py-oauthlib/distinfo	6 Oct 2017 13:51:25 -	1.8
+++ py-oauthlib/distinfo	18 Apr 2018 12:26:43 -
@@ -1,2 +1,2 @@
-SHA256 (oauthlib-2.0.3.tar.gz) = xMyuVU4bf0Dx9gNxq/dWjxMKGtnfEnYtJxU8VLDAgzY=
-SIZE (oauthlib-2.0.3.tar.gz) = 162720
+SHA256 (oauthlib-2.0.7.tar.gz) = IfEPPqAbCgQublWAn5thDW8RD8atvWcfBA4bkLBN/Bo=
+SIZE (oauthlib-2.0.7.tar.gz) = 164442

Re: [maintainer update] net/py-oauth2

[Johan Huldtgren]

there was a request recently to add a python3 flavor to py-oauth2,
I've done so, and while there I did a very minor update which got rid 
of

py-coverage as a test dependency as well as removed our patch as that
has been merged upstream. Homepage also changed. This builds,
packages, and passes tests but I have no real world test for it anymore
so if you do please test.


ping?

thanks,

.jh

[maintainer update] net/py-oauth2

[Johan Huldtgren]

hello,

there was a request recently to add a python3 flavor to py-oauth2,
I've done so, and while there I did a very minor update which got rid of
py-coverage as a test dependency as well as removed our patch as that
has been merged upstream. Homepage also changed. This builds,
packages, and passes tests but I have no real world test for it anymore
so if you do please test.

thanks,

.jhIndex: py-oauth2/Makefile
===
RCS file: /cvs/ports/net/py-oauth2/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- py-oauth2/Makefile	5 Jan 2016 06:57:50 -	1.5
+++ py-oauth2/Makefile	19 Nov 2017 05:35:29 -
@@ -3,24 +3,30 @@
 COMMENT =	Python library for OAuth
 
 MODPY_EGG_VERSION = 1.9.0.post1
+REVISION =	0
+
+GH_ACCOUNT =	joestump
+GH_PROJECT =	python-oauth2
+GH_COMMIT =	6689960ca23f79eccf9a25a39e93f6540f44ca23
+
 DISTNAME =	oauth2-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 CATEGORIES =	net
 MAINTAINER =	Johan Huldtgren <jhuldtg...@gmail.com>
 
-HOMEPAGE =	http://github.com/simplegeo/python-oauth2
+HOMEPAGE =	http://github.com/joestump/python-oauth2
 
 # MIT
 PERMIT_PACKAGE_CDROM =  Yes
 
-MODPY_PI =	Yes
-
 MODULES =	lang/python
 MODPY_SETUPTOOLS = Yes
 
-RUN_DEPENDS =	www/py-httplib2
-TEST_DEPENDS =	devel/py-mock \
-		devel/py-coverage \
+FLAVORS =	python3
+FLAVOR ?=
+
+RUN_DEPENDS =	www/py-httplib2${MODPY_FLAVOR}
+TEST_DEPENDS =	devel/py-mock${MODPY_FLAVOR} \
 		${RUN_DEPENDS}
 
 .include 
Index: py-oauth2/distinfo
===
RCS file: /cvs/ports/net/py-oauth2/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- py-oauth2/distinfo	5 Jan 2016 06:57:50 -	1.2
+++ py-oauth2/distinfo	19 Nov 2017 05:35:29 -
@@ -1,2 +1,2 @@
-SHA256 (oauth2-1.9.0.post1.tar.gz) = wAaoXnxgEHx8xtobGEtccZ9t1yAgmBlt+m5V32abWb8=
-SIZE (oauth2-1.9.0.post1.tar.gz) = 21306
+SHA256 (oauth2-1.9.0.post1-6689960c.tar.gz) = OUhEktnMIyJTvMDDHzsgYdBhqEIyva2YGiWwWWCpUX8=
+SIZE (oauth2-1.9.0.post1-6689960c.tar.gz) = 27646
Index: py-oauth2/patches/patch-setup_py
===
RCS file: py-oauth2/patches/patch-setup_py
diff -N py-oauth2/patches/patch-setup_py
--- py-oauth2/patches/patch-setup_py	5 Jan 2016 06:57:50 -	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.2 2016/01/05 06:57:50 benoit Exp $
 setup.py.orig	Mon Jan  4 22:34:54 2016
-+++ setup.py	Mon Jan  4 22:33:50 2016
-@@ -45,7 +45,7 @@ setup(name=PKG,
- "Natural Language :: English",
- "License :: OSI Approved :: MIT License"
-   ],
--  packages = find_packages(),
-+  packages = find_packages(exclude=['tests']),
-   install_requires = ['httplib2'],
-   license = "MIT License",
-   keywords="oauth",
Index: py-oauth2/pkg/PLIST
===
RCS file: /cvs/ports/net/py-oauth2/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- py-oauth2/pkg/PLIST	5 Jan 2016 06:57:50 -	1.3
+++ py-oauth2/pkg/PLIST	19 Nov 2017 05:35:29 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2016/01/05 06:57:50 benoit Exp $
+@comment $OpenBSD$
 lib/python${MODPY_VERSION}/site-packages/oauth2/
 lib/python${MODPY_VERSION}/site-packages/oauth2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/oauth2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -8,15 +8,17 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/oauth2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/oauth2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/oauth2/__init__.py
-lib/python${MODPY_VERSION}/site-packages/oauth2/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauth2/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauth2/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauth2/${MODPY_PYCACHE}_compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauth2/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauth2/_compat.py
-lib/python${MODPY_VERSION}/site-packages/oauth2/_compat.pyc
 lib/python${MODPY_VERSION}/site-packages/oauth2/_version.py
-lib/python${MODPY_VERSION}/site-packages/oauth2/_version.pyc
 lib/python${MODPY_VERSION}/site-packages/oauth2/clients/
 lib/python${MODPY_VERSION}/site-packages/oauth2/clients/__init__.py
-lib/python${MODPY_VERSION}/site-packages/oauth2/clients/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauth2/clients/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauth2/clients/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG

[maintainer update] security/py-oauthlib

[Johan Huldtgren]

hello,

minor update of py-oauthlib from 2.0.2 to 2.0.3, built,
packaged, and tested with py-discogs-client on
amd64. The two patches we had are no longer needed, so
they have been removed.

thanks,

.jhIndex: py-oauthlib/Makefile
===
RCS file: /cvs/ports/security/py-oauthlib/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- py-oauthlib/Makefile	24 Apr 2017 09:32:14 -	1.9
+++ py-oauthlib/Makefile	15 Sep 2017 18:25:34 -
@@ -2,7 +2,7 @@
 
 COMMENT =	Python library for OAuth
 
-MODPY_EGG_VERSION = 2.0.2
+MODPY_EGG_VERSION = 2.0.3
 
 GH_ACCOUNT =	idan
 GH_PROJECT =	oauthlib
Index: py-oauthlib/distinfo
===
RCS file: /cvs/ports/security/py-oauthlib/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- py-oauthlib/distinfo	24 Apr 2017 09:32:14 -	1.7
+++ py-oauthlib/distinfo	15 Sep 2017 18:25:34 -
@@ -1,2 +1,2 @@
-SHA256 (oauthlib-2.0.2.tar.gz) = s3hsXybkUefMIwXZ+x1dkLnUarcuaP5TNppxbyH84pw=
-SIZE (oauthlib-2.0.2.tar.gz) = 161329
+SHA256 (oauthlib-2.0.3.tar.gz) = xMyuVU4bf0Dx9gNxq/dWjxMKGtnfEnYtJxU8VLDAgzY=
+SIZE (oauthlib-2.0.3.tar.gz) = 162720
Index: py-oauthlib/patches/patch-tests_oauth1_rfc5849_test_client_py
===
RCS file: py-oauthlib/patches/patch-tests_oauth1_rfc5849_test_client_py
diff -N py-oauthlib/patches/patch-tests_oauth1_rfc5849_test_client_py
--- py-oauthlib/patches/patch-tests_oauth1_rfc5849_test_client_py	22 Apr 2016 22:25:53 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-tests_oauth1_rfc5849_test_client_py,v 1.1 2016/04/22 22:25:53 sthen Exp $
 tests/oauth1/rfc5849/test_client.py.orig	Wed Dec 23 16:15:03 2015
-+++ tests/oauth1/rfc5849/test_client.py	Wed Dec 23 16:15:18 2015
-@@ -133,7 +133,7 @@ class SignatureMethodTest(TestCase):
- 
- u, h, b = client.sign('http://example.com')
- 
--self.assertEquals(h['Authorization'], (
-+self.assertEqual(h['Authorization'], (
- 'OAuth oauth_nonce="abc", oauth_timestamp="1234567890", '
- 'oauth_version="1.0", oauth_signature_method="PIZZA", '
- 'oauth_consumer_key="client_key", '
Index: py-oauthlib/patches/patch-tests_oauth1_rfc5849_test_signatures_py
===
RCS file: py-oauthlib/patches/patch-tests_oauth1_rfc5849_test_signatures_py
diff -N py-oauthlib/patches/patch-tests_oauth1_rfc5849_test_signatures_py
--- py-oauthlib/patches/patch-tests_oauth1_rfc5849_test_signatures_py	22 Apr 2016 22:25:53 -	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,101 +0,0 @@
-$OpenBSD: patch-tests_oauth1_rfc5849_test_signatures_py,v 1.1 2016/04/22 22:25:53 sthen Exp $
 tests/oauth1/rfc5849/test_signatures.py.orig	Wed Dec 23 16:14:30 2015
-+++ tests/oauth1/rfc5849/test_signatures.py	Wed Dec 23 16:14:51 2015
-@@ -142,12 +142,12 @@ class SignatureTests(TestCase):
- 
- # test a URI with the default port
- uri = "http://www.example.com:80/;
--self.assertEquals(normalize_base_string_uri(uri),
-+self.assertEqual(normalize_base_string_uri(uri),
-   "http://www.example.com/;)
- 
- # test a URI missing a path
- uri = "http://www.example.com;
--self.assertEquals(normalize_base_string_uri(uri),
-+self.assertEqual(normalize_base_string_uri(uri),
-   "http://www.example.com/;)
- 
- # test a relative URI
-@@ -158,14 +158,14 @@ class SignatureTests(TestCase):
- # test overriding the URI's netloc with a host argument
- uri = "http://www.example.com/a-path;
- host = "alternatehost.example.com"
--self.assertEquals(normalize_base_string_uri(uri, host),
-+self.assertEqual(normalize_base_string_uri(uri, host),
-   "http://alternatehost.example.com/a-path;)
- 
- def test_collect_parameters(self):
- """We check against parameters multiple times in case things change
- after more parameters are added.
- """
--self.assertEquals(collect_parameters(), [])
-+self.assertEqual(collect_parameters(), [])
- 
- # Check against uri_query
- parameters = collect_parameters(uri_query=self.uri_query)
-@@ -241,8 +241,8 @@ class SignatureTests(TestCase):
- sign = sign_hmac_sha1(self.control_base_string,
-   self.client_secret.decode('utf-8'),
-   self.resource_owner_secret.decode('utf-8'))
--self.assertEquals(len(sign), 28)
--self.assertEquals(sign, self.control_signature)
-+self.assertEqual(len(sign), 28)
-+self.assertEqual(sign, self.control_signature)
- 
- def test_sign_hmac_sha1_with_client(self):
- self.assertRaises(ValueError,
-@@ -254,8 +254,8 @@ class 

[maintainer update] www/py-jwt

[Johan Huldtgren]

hello,

minor update of py-jwt from 1.5.2 to 1.5.3, built,
packaged, and tested with py-discogs-client on
amd64.

thanks,

.jhIndex: py-jwt/Makefile
===
RCS file: /cvs/ports/www/py-jwt/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- py-jwt/Makefile	4 Jul 2017 13:59:57 -	1.9
+++ py-jwt/Makefile	15 Sep 2017 17:41:11 -
@@ -2,7 +2,7 @@
 
 COMMENT =	JSON Web Token implementation in Python
 
-MODPY_EGG_VERSION = 1.5.2
+MODPY_EGG_VERSION = 1.5.3
 DISTNAME =	PyJWT-${MODPY_EGG_VERSION}
 PKGNAME =	py-jwt-${MODPY_EGG_VERSION}
 CATEGORIES =	www
@@ -21,7 +21,7 @@ FLAVOR ?=
 MODPY_PI =	Yes
 MODPY_SETUPTOOLS = Yes
 
-RUN_DEPENDS =   security/py-cryptography${MODPY_FLAVOR}
+RUN_DEPENDS =   security/py-cryptography${MODPY_FLAVOR}>=1.4.0
 
 TEST_DEPENDS =	devel/py-test \
 		devel/py-test-cov \
Index: py-jwt/distinfo
===
RCS file: /cvs/ports/www/py-jwt/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- py-jwt/distinfo	4 Jul 2017 13:59:57 -	1.5
+++ py-jwt/distinfo	15 Sep 2017 17:41:11 -
@@ -1,2 +1,2 @@
-SHA256 (PyJWT-1.5.2.tar.gz) = EXnwv/hkY7UwjuX3r/HDUOHzgTnWKnI+FvssVX0ceV8=
-SIZE (PyJWT-1.5.2.tar.gz) = 72715
+SHA256 (PyJWT-1.5.3.tar.gz) = UAvnWxemP3AHJBaEPcgMiCEQkDC+gk9NFHWPEUl4uuc=
+SIZE (PyJWT-1.5.3.tar.gz) = 73044

[maintainer update] devel/py-coveralls

[Johan Huldtgren]

hello,

minor update of py-coveralls from 1.1 to 1.2.0, built
and packaged on amd64. This used to be a dependency for
py-dicogs-client, but as it no longer is I have no real
world tests.

thanks,

.jhIndex: py-coveralls/Makefile
===
RCS file: /cvs/ports/devel/py-coveralls/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- py-coveralls/Makefile	14 Dec 2016 06:39:20 -	1.5
+++ py-coveralls/Makefile	15 Sep 2017 17:25:10 -
@@ -2,7 +2,7 @@
 
 COMMENT =	display coverage stats online via coveralls.io
 
-MODPY_EGG_VERSION =	1.1
+MODPY_EGG_VERSION =	1.2.0
 DISTNAME =	coveralls-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 CATEGORIES =	devel
Index: py-coveralls/distinfo
===
RCS file: /cvs/ports/devel/py-coveralls/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- py-coveralls/distinfo	14 Dec 2016 06:39:20 -	1.3
+++ py-coveralls/distinfo	15 Sep 2017 17:25:10 -
@@ -1,2 +1,2 @@
-SHA256 (coveralls-1.1.tar.gz) = NBYDhcE7DENpGrEcCA1LENq+MoD8CyFzxzHvxduDaAg=
-SIZE (coveralls-1.1.tar.gz) = 12072
+SHA256 (coveralls-1.2.0.tar.gz) = UQaCABUXvMod759iUt9s5zD8uYMcYtn/98fVW2/avfM=
+SIZE (coveralls-1.2.0.tar.gz) = 14281
Index: py-coveralls/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-coveralls/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- py-coveralls/pkg/PLIST	14 Dec 2016 06:39:20 -	1.2
+++ py-coveralls/pkg/PLIST	15 Sep 2017 17:25:10 -
@@ -6,7 +6,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
 lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
 lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.py
@@ -17,3 +16,5 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/coveralls/cli.pyc
 lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.py
 lib/python${MODPY_VERSION}/site-packages/coveralls/reporter.pyc
+lib/python${MODPY_VERSION}/site-packages/coveralls/version.py
+lib/python${MODPY_VERSION}/site-packages/coveralls/version.pyc

[maintainer update] archivers/pecl-lzf

[Johan Huldtgren]

Updates archivers/pecl-lzf to 1.6.6 which updates the
bundled liblzf to 3.6.

built / packaged / passes tests on amd64, I don't
actively use this anymore though so I have no real
world tests.

thanks,

.jhIndex: pecl-lzf/Makefile
===
RCS file: /cvs/ports/archivers/pecl-lzf/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- pecl-lzf/Makefile	22 Apr 2016 22:22:57 -	1.17
+++ pecl-lzf/Makefile	6 Jul 2017 02:53:34 -
@@ -2,7 +2,7 @@
 
 COMMENT =		PHP support for LZF de/compression
 
-DISTNAME =		LZF-1.6.5
+DISTNAME =		LZF-1.6.6
 CATEGORIES =		archivers
 MAINTAINER =		Johan Huldtgren <jhuldtg...@gmail.com>
 
Index: pecl-lzf/distinfo
===
RCS file: /cvs/ports/archivers/pecl-lzf/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- pecl-lzf/distinfo	22 Apr 2016 22:22:57 -	1.4
+++ pecl-lzf/distinfo	6 Jul 2017 02:53:34 -
@@ -1,2 +1,2 @@
-SHA256 (LZF-1.6.5.tgz) = 3RFtEqO+mF9CJWZQzpoDP9PE6NpPIoDHn7n9anMZmkw=
-SIZE (LZF-1.6.5.tgz) = 16968
+SHA256 (LZF-1.6.6.tgz) = IgXxZ7xCM0G4sZhZKVH3Lk9sKUzBD+EdhQTYKbrJIGM=
+SIZE (LZF-1.6.6.tgz) = 17603

[maintainer update] www/py-jwt

[Johan Huldtgren]

hello,

minor update of www/py-jwt from 1.5.0 to 1.5.2, I've removed
our patch which just disabled pytest_runner, IIRC at the time
we put it in, it was to stop the port from trying to autofetch
it as we didn't have it in tree. I can no longer duplicate this
behavior (i.e. on a system without pytest_runner and with no
internet connection this still builds correctly). However I'd
appreciate a second set of eyes to confirm.

thanks,

.jhIndex: py-jwt/Makefile
===
RCS file: /cvs/ports/www/py-jwt/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- py-jwt/Makefile	24 Apr 2017 09:30:00 -	1.8
+++ py-jwt/Makefile	2 Jul 2017 21:37:03 -
@@ -2,12 +2,11 @@
 
 COMMENT =	JSON Web Token implementation in Python
 
-MODPY_EGG_VERSION = 1.5.0
+MODPY_EGG_VERSION = 1.5.2
 DISTNAME =	PyJWT-${MODPY_EGG_VERSION}
 PKGNAME =	py-jwt-${MODPY_EGG_VERSION}
 CATEGORIES =	www
 MAINTAINER =	Johan Huldtgren <jhuldtg...@gmail.com>
-REVISION =	0
 
 HOMEPAGE =	http://github.com/jpadilla/pyjwt
 
@@ -27,6 +26,9 @@ RUN_DEPENDS =   security/py-cryptography
 TEST_DEPENDS =	devel/py-test \
 		devel/py-test-cov \
 		devel/py-test-runner
+
+post-extract:
+	@find ${WRKSRC}/tests -name '__pycache__'  | xargs rm -rf
 
 post-install:
 	mv ${PREFIX}/bin/pyjwt ${PREFIX}/bin/pyjwt${MODPY_BIN_SUFFIX}
Index: py-jwt/distinfo
===
RCS file: /cvs/ports/www/py-jwt/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- py-jwt/distinfo	24 Apr 2017 09:30:00 -	1.4
+++ py-jwt/distinfo	2 Jul 2017 21:37:03 -
@@ -1,2 +1,2 @@
-SHA256 (PyJWT-1.5.0.tar.gz) = /Rgrco0T8EwonZsmI9CSVtNWybSmd4AYABRUqVTXxUs=
-SIZE (PyJWT-1.5.0.tar.gz) = 34841
+SHA256 (PyJWT-1.5.2.tar.gz) = EXnwv/hkY7UwjuX3r/HDUOHzgTnWKnI+FvssVX0ceV8=
+SIZE (PyJWT-1.5.2.tar.gz) = 72715

Re: roundcube doesn't work on latest snap

[Johan Huldtgren]

On 2017/06/06 20:34, Stuart Henderson wrote:
> On 2017/06/04 10:30, Johan Huldtgren wrote:
>> On 2017/06/04 05:11, Stuart Henderson wrote:
>>> On 2017/06/03 17:07, Johan Huldtgren wrote:
>>>> I updated my mail server from the May 4th snap to the June 2nd snap,
>>>> everything works with the exception of rundcube. When trying to log in
>>>> the user gets the generic "Connection to storage server failed.", this
>>>> normally means some sort of problem with talking to the imap server,
>>>> however nothing gets logged in maillog (so as far as I can tell it
>>>> never even gets as far as attempting a login).
>>>
>>> I'm seeing this too, no tcp connection is made to the imap server. In
>>> my case, roundcube 1.3-rc, PHP 7, nginx, sqlite db. I updated packages
>>> (but not roundcube) on the 25th and then again on the 30th, no version
>>> updates in php-related packages, but they did get updated due to
>>> library changes. I have a failed login in logs (indicating that it
>>> was working) from May 27. I've been poring over kdumps, no clues yet.
>>>
>>> Is anyone seeing any problems with other simpler PHP things?
>>
>> FWIW, I'm not seeing this with anything else. The following PHP
>> things all work:
>>
>> www/nextcloud (auths via imap)
>> wordpress
>> phpBB
>> postfixadmin
>>
>> custom php app with simple auth against postgresql.
> 
> I tracked it down a bit further: this happens for me if php-intl
> is enabled, doesn't happen without it. I think it may be connected
> with the icu4c changes, that's the only related thing which I can
> think of that's been updated recently.

I can confirm that disabling php-intl resolves the issue for me as
well.

> Not tried playing with icu4c yet but reading the commit...
> 
> : * as per upstream recommendation
> :   - use --with-data-packaging=archive on all archs
> 
> ...this is a likely candidate, it moves ICU data from the shared
> libraries to separate .dat files, which isn't going to work in
> chroot.

Re: roundcube doesn't work on latest snap

[Johan Huldtgren]

On 2017/06/04 05:11, Stuart Henderson wrote:
> On 2017/06/03 17:07, Johan Huldtgren wrote:
>> I updated my mail server from the May 4th snap to the June 2nd snap,
>> everything works with the exception of rundcube. When trying to log in
>> the user gets the generic "Connection to storage server failed.", this
>> normally means some sort of problem with talking to the imap server,
>> however nothing gets logged in maillog (so as far as I can tell it
>> never even gets as far as attempting a login).
> 
> I'm seeing this too, no tcp connection is made to the imap server. In
> my case, roundcube 1.3-rc, PHP 7, nginx, sqlite db. I updated packages
> (but not roundcube) on the 25th and then again on the 30th, no version
> updates in php-related packages, but they did get updated due to
> library changes. I have a failed login in logs (indicating that it
> was working) from May 27. I've been poring over kdumps, no clues yet.
> 
> Is anyone seeing any problems with other simpler PHP things?

FWIW, I'm not seeing this with anything else. The following PHP
things all work:

www/nextcloud (auths via imap)
wordpress
phpBB
postfixadmin

custom php app with simple auth against postgresql.

>> SELECT * FROM "users" WHERE "mail_host" = '' AND "username" = '';
>>
>> this would seem to indicate it's not getting the mail_host or
>> username, but I've never had this log turned on before so I don't know
>> if there should be something in there.
> 
> I'll have a look on a production box later..it's certainly getting
> sent from the web server to php.
> 

roundcube doesn't work on latest snap

[Johan Huldtgren]

hello,

I updated my mail server from the May 4th snap to the June 2nd snap,
everything works with the exception of rundcube. When trying to log in
the user gets the generic "Connection to storage server failed.", this
normally means some sort of problem with talking to the imap server,
however nothing gets logged in maillog (so as far as I can tell it
never even gets as far as attempting a login). I turned on all debug
logging I could find in the roundcube configuration. The only thing
which stands out (other than the lack of imap log which would seem to
confirm my suspicion that it never gets that far) is this from the sql
log (my users are all virtual):

SELECT * FROM "users" WHERE "mail_host" = '' AND "username" = '';

this would seem to indicate it's not getting the mail_host or
username, but I've never had this log turned on before so I don't know
if there should be something in there.

Roundcube version didn't change between the two snaps, but to verify I
did try building 1.2.4 and I see the same behavior. I also tried a
clean install (new database and all), without any luck. There were no
changes to php or nginx between the two snaps, I do see that
postgresql went from 9.6.2 to 9.6.3, but no other packages which would
seem relevant had changes, downgrading postgresql to 9.6.2 didn't
change anything regardless. So has something else changed between the two
snaps which I should be looking at? Frustratingly there is very little
information in any logs to help troubleshoot.

Here are the relevant parts from the roundcube logs (the rest have not
seen updates)

# cd /var/www/roundcubemail/logs
# tail userlogins
[03-Jun-2017 06:04:23 -0700]:  Failed login for user1 from 
dead:beef:dead:beef in session gi75piite4ms89aj2arj5b1rs2 (error: -2)
[03-Jun-2017 06:04:27 -0700]:  Failed login for user1 from 
dead:beef:dead:beef in session gi75piite4ms89aj2arj5b1rs2 (error: -2)
[03-Jun-2017 08:51:58 -0700]:  Failed login for user2 from 
123.123.123.123 in session uqvcileufnqq7q3l6ob1vvhgs2 (error: -2)

# tail sql
[03-Jun-2017 06:04:20 -0700]:  [1] SELECT "vars", "ip", "changed", 
now() AS ts FROM "session" WHERE "sess_id" = 'gi75piite4ms89aj2arj5b1rs2';
[03-Jun-2017 06:04:20 -0700]:  [2] SELECT * FROM "users" WHERE 
"user_id" = '5';
[03-Jun-2017 06:04:20 -0700]:  [3] SELECT id FROM 
carddav_addressbooks WHERE user_id='5' AND active=1;
[03-Jun-2017 06:04:20 -0700]:  [4] DELETE FROM "session" WHERE 
"sess_id" = 'gi75piite4ms89aj2arj5b1rs2';
[03-Jun-2017 06:04:20 -0700]:  [5] INSERT INTO "session" ("sess_id", 
"vars", "ip", "created", "changed") VALUES ('gi75piite4ms89aj2arj5b1rs2', 
'bGFuZ3VhZ2V8czo1OiJlbl9VUyI7dGVtcHxiOjE7c2tpbnxzOjU6ImxhcnJ5IjtyZXF1ZXN0X3Rva2VufHM6MzI6IjRiYkpCUDdXRnB5RVJ3dFlmWkQ1T0s4MHBKSDQ0OUNXIjs=',
 '2a02:908:13b0:7f20:e83a:cd11:9644:f28d', now(), now());
[03-Jun-2017 06:04:22 -0700]:  [1] SELECT "vars", "ip", "changed", 
now() AS ts FROM "session" WHERE "sess_id" = 'gi75piite4ms89aj2arj5b1rs2';
[03-Jun-2017 06:04:22 -0700]:  [2] DELETE FROM "session" WHERE 
"sess_id" = 'gi75piite4ms89aj2arj5b1rs2';
[03-Jun-2017 06:04:22 -0700]:  [3] SELECT * FROM "users" WHERE 
"mail_host" = '' AND "username" = '';
[03-Jun-2017 06:04:23 -0700]:  [4] DELETE FROM "session" WHERE 
"sess_id" = 'gi75piite4ms89aj2arj5b1rs2';
[03-Jun-2017 06:04:23 -0700]:  [5] INSERT INTO "session" ("sess_id", 
"vars", "ip", "created", "changed") VALUES ('gi75piite4ms89aj2arj5b1rs2', 
'bGFuZ3VhZ2V8czo1OiJlbl9VUyI7dGVtcHxiOjE7c2tpbnxzOjU6ImxhcnJ5IjtyZXF1ZXN0X3Rva2VufHM6MzI6IkVvTkw2aGFOUmJhRzh0SUk4UVpzWXhJVmxnVU0yb1YzIjs=',
 '2a02:908:13b0:7f20:e83a:cd11:9644:f28d', now(), now());
[03-Jun-2017 06:04:26 -0700]:  [1] SELECT "vars", "ip", "changed", 
now() AS ts FROM "session" WHERE "sess_id" = 'gi75piite4ms89aj2arj5b1rs2';
[03-Jun-2017 06:04:26 -0700]:  [2] DELETE FROM "session" WHERE 
"sess_id" = 'gi75piite4ms89aj2arj5b1rs2';
[03-Jun-2017 06:04:26 -0700]:  [3] SELECT * FROM "users" WHERE 
"mail_host" = '' AND "username" = '';
[03-Jun-2017 06:04:27 -0700]:  [4] DELETE FROM "session" WHERE 
"sess_id" = 'gi75piite4ms89aj2arj5b1rs2';
[03-Jun-2017 06:04:27 -0700]:  [5] INSERT INTO "session" ("sess_id", 
"vars", "ip", "created", "changed") VALUES ('gi75piite4ms89aj2arj5b1rs2', 
'bGFuZ3VhZ2V8czo1OiJlbl9VUyI7dGVtcHxiOjE7c2tpbnxzOjU6ImxhcnJ5IjtyZXF1ZXN0X3Rva2VufHM6MzI6IkR0MzZmSkdpYXhJRWRMOUJjRk90OXNFSGo5MnU2ZnZFIjs=',
 '2a02:908:13b0:7f20:e83a:cd11:9644:f28d', now(), now());
[03-Jun-2017 06:35:56 -0700]: <4eeh18du> [1] SELECT "vars", "ip", "changed", 
now() AS ts FROM "session" WHERE "sess_id" = '4eeh18du2s1tp0v37hsntq4ps3';
[03-Jun-2017 06:35:56 -0700]: <4eeh18du> [2] INSERT INTO "session" ("sess_id", 
"vars", "ip", "created", "changed") VALUES ('4eeh18du2s1tp0v37hsntq4ps3', 
'dGVtcHxiOjE7bGFuZ3VhZ2V8czo1OiJzdl9TRSI7dGFza3xzOjU6ImxvZ2luIjtyZXF1ZXN0X3Rva2VufHM6MzI6InEzM2ZzbXRTNmpmSERiMFRCVER2V1hmbEV6WVdjUzk4Ijs=',
 '46.39.111.252', now(), now());
[03-Jun-2017 08:51:52 -0700]:  [1] SELECT "vars", "ip", "changed", 
now() AS ts FROM "session" WHERE 

[maintainer update] www/py-jwt

[Johan Huldtgren]

hello,

update to py-jwt from 1.4.2 to 1.5.0; built, packaged and tested with
beets and discogs-client on amd64.

Tests are now enabled as those dependencies are in tree which removes
our patch.

thanks,

.jhIndex: py-jwt/Makefile
===
RCS file: /cvs/ports/www/py-jwt/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- py-jwt/Makefile	3 Jan 2017 19:28:49 -	1.7
+++ py-jwt/Makefile	23 Apr 2017 14:09:21 -
@@ -2,7 +2,7 @@
 
 COMMENT =	JSON Web Token implementation in Python
 
-MODPY_EGG_VERSION = 1.4.2
+MODPY_EGG_VERSION = 1.5.0
 DISTNAME =	PyJWT-${MODPY_EGG_VERSION}
 PKGNAME =	py-jwt-${MODPY_EGG_VERSION}
 CATEGORIES =	www
@@ -24,11 +24,11 @@ MODPY_SETUPTOOLS = Yes
 
 RUN_DEPENDS =   security/py-cryptography${MODPY_FLAVOR}
 
-# tests are available, but need pytest-runner plus dep's (which aren't in
-# tree) at build time; if adding these, remove patch-setup_py
-NO_TEST =	Yes
+TEST_DEPENDS =	devel/py-test \
+		devel/py-test-cov \
+		devel/py-test-runner
 
 post-install:
-	mv ${PREFIX}/bin/jwt ${PREFIX}/bin/jwt${MODPY_BIN_SUFFIX}
+	mv ${PREFIX}/bin/pyjwt ${PREFIX}/bin/pyjwt${MODPY_BIN_SUFFIX}
 
 .include 
Index: py-jwt/distinfo
===
RCS file: /cvs/ports/www/py-jwt/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- py-jwt/distinfo	1 Oct 2016 15:14:45 -	1.3
+++ py-jwt/distinfo	23 Apr 2017 14:09:21 -
@@ -1,2 +1,2 @@
-SHA256 (PyJWT-1.4.2.tar.gz) = h6gxt6O/qDUVEZYUae0EYqdpck1NpIpQHLjJbR4X9XA=
-SIZE (PyJWT-1.4.2.tar.gz) = 30486
+SHA256 (PyJWT-1.5.0.tar.gz) = /Rgrco0T8EwonZsmI9CSVtNWybSmd4AYABRUqVTXxUs=
+SIZE (PyJWT-1.5.0.tar.gz) = 34841
Index: py-jwt/pkg/PLIST
===
RCS file: /cvs/ports/www/py-jwt/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- py-jwt/pkg/PLIST	23 Dec 2015 22:53:31 -	1.2
+++ py-jwt/pkg/PLIST	23 Apr 2017 14:09:21 -
@@ -1,5 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.2 2015/12/23 22:53:31 sthen Exp $
-bin/jwt${MODPY_BIN_SUFFIX}
+bin/pyjwt${MODPY_BIN_SUFFIX}
 lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt

Re: [new] www/nextcloud

[Johan Huldtgren]

On 3/13/17 10:58, Gonzalo L. Rodriguez wrote:
> On [27/02/17] [07:44P], Johan Huldtgren wrote:
> ; On 2/26/17 18:35, Gonzalo L. Rodriguez wrote:
> ; >
> ; > I do some tweaks on your port, can you try if this works for you?
> ; 
> ; looks good to me, packages and installs fine on my test system.
> ; 
> ; .jh
> ; 
> 
> New version attached, any interested on this in?

I have been running 11.0.2 in production for the past week or so. Works
well for me.

.jh

Re: [new] www/nextcloud

[Johan Huldtgren]

On 2/26/17 18:35, Gonzalo L. Rodriguez wrote:
>
> I do some tweaks on your port, can you try if this works for you?

looks good to me, packages and installs fine on my test system.

.jh

[new] www/nextcloud

[Johan Huldtgren]

hello,

Nextcloud is a fork of ownCloud by many former ownCloud
developers. after a recent ownCloud upgrade I ran into
some issues with and decided to give nextcloud a run. It
worked well enough that I decided to switch over. the
port is essentially a copy of www/owncloud tweaked and
updated to the latest version.

thanks,

.jh

nextcloud.tgz
Description: GNU Zip compressed data

Re: [maintainer update] devel/py-coveralls

[Johan Huldtgren]

On 2016-12-13 11:27, Alexandr Shadchin wrote:

On Sun, Dec 11, 2016 at 11:21:37AM -0500, Johan Huldtgren wrote:

hello,

update from 0.5 to 1.1; built, packaged and tested with
beets and discogs-client on amd64.

thanks,

.jh


I small rework your diff.
If no objections, then I will commit.


No objections from me.

.jh


--
Alexandr Shadchin

Index: Makefile
===
RCS file: /cvs/ports/devel/py-coveralls/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile29 Sep 2015 10:51:53 -  1.4
+++ Makefile13 Dec 2016 16:21:35 -
@@ -2,22 +2,26 @@

 COMMENT =  display coverage stats online via coveralls.io

-MODPY_EGG_VERSION = 0.5
+MODPY_EGG_VERSION =1.1
 DISTNAME = coveralls-${MODPY_EGG_VERSION}
-EXTRACT_SUFX=  .zip
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   devel
 MAINTAINER =   Johan Huldtgren <jhuldtg...@gmail.com>
-REVISION = 0

 HOMEPAGE = http://github.com/coagulant/coveralls-python

 # MIT
-PERMIT_PACKAGE_CDROM =  Yes
-
-MODPY_PI = Yes
+PERMIT_PACKAGE_CDROM = Yes

 MODULES =  lang/python
-MODPY_SETUPTOOLS = Yes
+
+MODPY_PI = Yes
+MODPY_SETUPTOOLS = Yes
+
+RUN_DEPENDS =  devel/py-docopt \
+   devel/py-coverage \
+   www/py-requests
+
+NO_TEST =  Yes

 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-coveralls/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo13 Dec 2014 10:34:25 -  1.2
+++ distinfo13 Dec 2016 16:21:35 -
@@ -1,2 +1,2 @@
-SHA256 (coveralls-0.5.zip) = 
kJZzc9yEGvwrJfpLWhoFbUF4Rn5t6Q5RImZgg5r0ErA=

-SIZE (coveralls-0.5.zip) = 18691
+SHA256 (coveralls-1.1.tar.gz) = 
NBYDhcE7DENpGrEcCA1LENq+MoD8CyFzxzHvxduDaAg=

+SIZE (coveralls-1.1.tar.gz) = 12072
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-coveralls/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   31 Oct 2014 12:00:03 -  1.1.1.1
+++ pkg/PLIST   13 Dec 2016 16:21:35 -
@@ -6,6 +6,7 @@ lib/python${MODPY_VERSION}/site-packages

lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt

lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt

lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json

lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt

lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.py

[maintainer update] devel/py-coveralls

[Johan Huldtgren]

hello,

update from 0.5 to 1.1; built, packaged and tested with
beets and discogs-client on amd64.

thanks,

.jhIndex: py-coveralls/Makefile
===
RCS file: /cvs/ports/devel/py-coveralls/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- py-coveralls/Makefile	29 Sep 2015 10:51:53 -	1.4
+++ py-coveralls/Makefile	11 Dec 2016 16:17:10 -
@@ -2,13 +2,11 @@
 
 COMMENT =	display coverage stats online via coveralls.io
 
-MODPY_EGG_VERSION = 0.5
+MODPY_EGG_VERSION = 1.1
 DISTNAME =	coveralls-${MODPY_EGG_VERSION}
-EXTRACT_SUFX=	.zip
 PKGNAME =	py-${DISTNAME}
 CATEGORIES =	devel
 MAINTAINER =	Johan Huldtgren <jhuldtg...@gmail.com>
-REVISION =	0
 
 HOMEPAGE =	http://github.com/coagulant/coveralls-python
 
@@ -19,5 +17,8 @@ MODPY_PI =	Yes
 
 MODULES =	lang/python
 MODPY_SETUPTOOLS = Yes
+
+post-install:
+	rm -fr ${WRKSRC}/coveralls.egg-info
 
 .include 
Index: py-coveralls/distinfo
===
RCS file: /cvs/ports/devel/py-coveralls/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- py-coveralls/distinfo	13 Dec 2014 10:34:25 -	1.2
+++ py-coveralls/distinfo	11 Dec 2016 16:17:10 -
@@ -1,2 +1,2 @@
-SHA256 (coveralls-0.5.zip) = kJZzc9yEGvwrJfpLWhoFbUF4Rn5t6Q5RImZgg5r0ErA=
-SIZE (coveralls-0.5.zip) = 18691
+SHA256 (coveralls-1.1.tar.gz) = NBYDhcE7DENpGrEcCA1LENq+MoD8CyFzxzHvxduDaAg=
+SIZE (coveralls-1.1.tar.gz) = 12072
Index: py-coveralls/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-coveralls/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- py-coveralls/pkg/PLIST	31 Oct 2014 12:00:03 -	1.1.1.1
+++ py-coveralls/pkg/PLIST	11 Dec 2016 16:17:10 -
@@ -6,6 +6,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
 lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
 lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 lib/python${MODPY_VERSION}/site-packages/coveralls-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/coveralls/__init__.py

[maintainer update] devel/py-sh

[Johan Huldtgren]

hello,

minor update from 1.11 to 1.12.7; built, packaged and tested
with beets and discogs-client on amd64.

thanks,

.jhIndex: py-sh/Makefile
===
RCS file: /cvs/ports/devel/py-sh/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- py-sh/Makefile	2 Apr 2015 14:21:15 -	1.3
+++ py-sh/Makefile	11 Dec 2016 16:16:41 -
@@ -2,7 +2,7 @@
 
 COMMENT =	Python subprocess interface
 
-MODPY_EGG_VERSION = 1.11
+MODPY_EGG_VERSION = 1.12.7
 DISTNAME =	sh-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 CATEGORIES =	devel
@@ -13,9 +13,13 @@ HOMEPAGE =	https://github.com/amoffat/sh
 # MIT
 PERMIT_PACKAGE_CDROM =  Yes
 
-MODPY_PI =	Yes
+MODPY_PI =		Yes
+MODPY_SETUPTOOLS =	Yes
 
-MODULES =	lang/python
-NO_TEST =	Yes
+MODULES =		lang/python
+NO_TEST =		Yes
+
+post-install:
+	rm -fr ${WRKSRC}/sh.egg-info
 
 .include 
Index: py-sh/distinfo
===
RCS file: /cvs/ports/devel/py-sh/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- py-sh/distinfo	13 Jan 2015 11:55:08 -	1.2
+++ py-sh/distinfo	11 Dec 2016 16:16:41 -
@@ -1,2 +1,2 @@
-SHA256 (sh-1.11.tar.gz) = WQ+5uEq/ix9WDfktc9h5ZfHoXGuDMPil9rM2s28FWaQ=
-SIZE (sh-1.11.tar.gz) = 36821
+SHA256 (sh-1.12.7.tar.gz) = Wgc3NlehpwSjTqG/c7LlXEI4jF1EljTW18lhR/VmAIY=
+SIZE (sh-1.12.7.tar.gz) = 53819
Index: py-sh/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-sh/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- py-sh/pkg/PLIST	31 Oct 2014 12:01:09 -	1.1.1.1
+++ py-sh/pkg/PLIST	11 Dec 2016 16:16:41 -
@@ -1,4 +1,9 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2014/10/31 12:01:09 landry Exp $
-lib/python${MODPY_VERSION}/site-packages/sh-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/sh-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/sh-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/sh-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/sh-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/sh-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/pbr.json
+lib/python${MODPY_VERSION}/site-packages/sh-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/sh.py
 lib/python${MODPY_VERSION}/site-packages/sh.pyc

Re: [new] mail/rmilter

[Johan Huldtgren]

On 11/19/16 11:37, Stuart Henderson wrote:
> On 2016/11/19 11:13, Johan Huldtgren wrote:
>> hello,
>>
>> rmilter is used to integrate rspamd with any milter-compatible
>> MTA, this is mostly taken from openbsd-wip with all the heavy
>> lifting by @sthen. I made some minor changes:
>>
>> - Update from 1.9.2 to a later working version
>> - bumped the uid/gid as 780 which was originally in there is now taken
>> - changed the configuration files to live in /etc/rmilter/* as the
>>   recommendation is that you make changes to a .local file and/or create
>>   /etc/rmilter/local.d/ for further user/local customization
>>
>> # cat pkg/DESCR
>> Rmilter is used to integrate rspamd with any milter-compatible
>> MTA, for example postfix or sendmail. Features include:
>>
>> - ClamAV scanning (via unix or tcp socket).
>> - Rspamd scanning
>> - Greylisting and rate-limiting with redis upstream
>> - Auto-whitelisting (internal and via redis upstream)
>> - Replies check (whitelisting replies to sent messages)
>> - Passing messages and/or their headers to beanstalk servers
>>
>> I've been running this on my mailserver (amd64) for a few weeks
>> now and it works for me.
>>
>> thanks,
>>
>> .jh
> 
> Updated one - fix deps and use a PKGNAME that can move to a normal
> release once one has been done on the 2.10 branch without an ugly v0.

Thanks, agreed that's better.

> I still see the problem I was getting with the previous version
> though:
> 
> 2016-11-19T16:36:32.261Z symphytum rmilter[19335]: ; mlfi_data: 
> cannot get queue id, set to 'NOQUEUE'
> (Plus no evidence of it feeding the mail through rspamd..)

I don't see that on my end:

from /var/log/maillog

Nov 19 09:29:41 www rmilter[2887]: <22672d052d>; mlfi_data: queue id: 
<829A4CB7F>
Nov 19 09:29:41 www rmilter[2887]: <22672d052d>; mlfi_eom: 
tempfile=/tmp/msg.n6FTWSkH, size=2828
Nov 19 09:29:41 www rmilter[2887]: <22672d052d>; spamdscan: start scanning 
message on localhost
Nov 19 09:29:41 www rmilter[2887]: <22672d052d>; spamdscan: finish scanning 
message on localhost
Nov 19 09:29:41 www rmilter[2887]: <22672d052d>; spamdscan: scan, time: 0.188, 
server: localhost, metric: default: [-0.750 / 15.000], symbols: 
R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36], MIME_GOOD(-0.10)[text/plain], 
DMARC_POLICY_ALLOW(-0.25)[gmail.com], RCVD_IN_DNSWL_LOW(0.00)[], 
R_DKIM_ALLOW(-0.20)[gmail.com]
Nov 19 09:29:41 www rmilter[2887]: <22672d052d>; clamscan: start scanning 
message on /tmp/clamd.sock
Nov 19 09:29:41 www rmilter[2887]: <22672d052d>; clamscan: finish scanning 
message on /tmp/clamd.sock
Nov 19 09:29:41 www rmilter[2887]: <22672d052d>; clamscan: scan 0.013669, 
/tmp/clamd.sock, /tmp/msg.n6FTWSkH
Nov 19 09:29:41 www rmilter[2887]: <22672d052d>; msg done: queue_id: 
<829A4CB7F>; message id: <3d72cff0-2837-9dea-50f2-af04a1014...@gmail.com>; ip: 
2607:f8b0:400d:c09::22a; from: <jhuldtg...@gmail.com>; rcpt: 
<jo...@huldtgren.com> (1 total); user: unauthorized; spam scan: no spam; virus 
scan: clean; dkim: not signed, ignored

>From /var/log/rspamd/rspamd.log

2016-11-19 09:29:41 #93200(normal) <2c578b>; task; accept_socket: accepted 
connection from 127.0.0.1 port 38870, task ptr: 04A231124790
2016-11-19 09:29:41 #93200(normal) <2c578b>; task; rspamd_url_text_extract: got 
empty text part
2016-11-19 09:29:41 #93200(normal) <2c578b>; task; rspamd_message_parse: loaded 
message; id: <3d72cff0-2837-9dea-50f2-af04a1014...@gmail.com>; queue-id: 
<829A4CB7F>; size: 2828; checksum: <80cf205c674f4682ffc4789fdcbcae65>
2016-11-19 09:29:41 #93200(normal) <2c578b>; task; fuzzy_generate_commands: 
<3d72cff0-2837-9dea-50f2-af04a1014...@gmail.com>, part is shorter than 100 
bytes (2 bytes), skip fuzzy check
2016-11-19 09:29:41 #93200(normal) <2c578b>; task; bayes_classify: skip 
classification as ham class has not enough learns: 0, 200 required
2016-11-19 09:29:41 #93200(normal) <2c578b>; task; rspamd_stat_check_autolearn: 
<3d72cff0-2837-9dea-50f2-af04a1014...@gmail.com>: autolearn ham for classifier 
'bayes' as message's score is negative: -0.75
2016-11-19 09:29:41 #93200(normal) <2c578b>; task; 
rspamd_stat_classifiers_learn: <3d72cff0-2837-9dea-50f2-af04a1014...@gmail.com> 
contains less tokens than required for bayes classifier: 4 < 11
2016-11-19 09:29:41 #93200(normal) <2c578b>; task; rspamd_task_process: learn 
error: <3d72cff0-2837-9dea-50f2-af04a1014...@gmail.com> contains less tokens 
than required for bayes classifier: 4 < 11
2016-11-19 09:29:41 #93200(normal) <2c578b>; task; rspamd_task_write_log: id: 
<3d72cff0-2837-9dea-50f2-af04a1014...@gmail.com>, qid: <829A4CB7F>, ip: 
2607:f8b0:400d:c09::22a, from: <jhuldtg...@gmail.com>, (default: F (no action): 
[-0.75/15.00] 
[DMARC_POLICY_ALLOW(-0.25),R_DKIM_ALLOW(-0.20),R_SPF_ALLOW(-0.20),MIME_GOOD(-0.10),RCVD_IN_DNSWL_LOW(0.00)]),
 len: 2828, time: 187.683116ms real, 4.045855ms virtual, dns req: 21


.jh

[new] mail/rmilter

[Johan Huldtgren]

hello,

rmilter is used to integrate rspamd with any milter-compatible
MTA, this is mostly taken from openbsd-wip with all the heavy
lifting by @sthen. I made some minor changes:

- Update from 1.9.2 to a later working version
- bumped the uid/gid as 780 which was originally in there is now taken
- changed the configuration files to live in /etc/rmilter/* as the
  recommendation is that you make changes to a .local file and/or create
  /etc/rmilter/local.d/ for further user/local customization

# cat pkg/DESCR
Rmilter is used to integrate rspamd with any milter-compatible
MTA, for example postfix or sendmail. Features include:

- ClamAV scanning (via unix or tcp socket).
- Rspamd scanning
- Greylisting and rate-limiting with redis upstream
- Auto-whitelisting (internal and via redis upstream)
- Replies check (whitelisting replies to sent messages)
- Passing messages and/or their headers to beanstalk servers

I've been running this on my mailserver (amd64) for a few weeks
now and it works for me.

thanks,

.jh

rmilter.tgz
Description: GNU Zip compressed data

[new] mail/opendkim

[Johan Huldtgren]

hello,

opendkim is a dependency for mail/rmilter (separate mail). This port is
taken 100% from openbsd-wip by @sthen. I've been running this on my
mail server for a few weeks now and it works in conjunction with
rmilter.

# cat DESCR
OpenDKIM is an implementation of DKIM (RFC 6376, Domain Keys Identified 
Mail),
an email sender authentication system. It consists of a library that 
implements
the DKIM service and a milter-based filter application that can plug in 
to any
milter-aware MTA to provide that service to sufficiently recent sendmail 
MTAs

and other MTAs that support the milter protocol.

thanks,

.jh

opendkim.tgz
Description: GNU Zip compressed data

Re: [maintainer update] www/py-jwt

[Johan Huldtgren]

hello,

On 2016-10-01 09:32, Daniel Jakots wrote:


# tests are available, but need pytest-runner plus dep's (which aren't
in # tree) at build time; if adding these, remove patch-setup_py
NO_TEST =   Yes

but they removed the needs of pytest-runner [0], and other depends seem
to be in the tree, have you look at it?

[0]:
https://github.com/jpadilla/pyjwt/commit/acc30b90666f2edb891a674bbb1727114776421a


however it's still in setup.py

--

tests_require = [
'pytest==2.7.3',
'pytest-cov',
'pytest-runner',
]

--

so I'm not sure it's been completely eliminated, also tests seem to
fail (all this said I'm not a python person and might be completely
misreading this I just use this as a dependency for beets)

.jh

[maintainer update] security/py-oauthlib

[Johan Huldtgren]

hello,

update from 1.1.1 to 2.0.0, this is mostly bug fixes but 2.0.0
introduces support for openid. tested on amd64 as a dependency for
py-discogs-client.

thanks,

.jhIndex: py-oauthlib/Makefile
===
RCS file: /cvs/ports/security/py-oauthlib/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- py-oauthlib/Makefile	21 May 2016 13:50:11 -	1.5
+++ py-oauthlib/Makefile	1 Oct 2016 13:10:02 -
@@ -2,10 +2,10 @@
 
 COMMENT =	Python library for OAuth
 
-MODPY_EGG_VERSION = 1.1.1
+MODPY_EGG_VERSION = 2.0.0
 
 DISTNAME =	py-oauthlib-${MODPY_EGG_VERSION}
-DISTFILES =	${DISTNAME}{${MODPY_EGG_VERSION}}.tar.gz
+DISTFILES =	v${MODPY_EGG_VERSION}.zip
 WRKDIST =	${WRKDIR}/oauthlib-${MODPY_EGG_VERSION}
 
 CATEGORIES =	security
@@ -15,6 +15,7 @@ MAINTAINER =	Johan Huldtgren https://github.com/idan/oauthlib/archive/
+EXTRACT_SUFX =	.zip
 
 MODULES =	lang/python
 MODPY_SETUPTOOLS = Yes
Index: py-oauthlib/distinfo
===
RCS file: /cvs/ports/security/py-oauthlib/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- py-oauthlib/distinfo	21 May 2016 13:50:11 -	1.4
+++ py-oauthlib/distinfo	1 Oct 2016 13:10:02 -
@@ -1,2 +1,2 @@
-SHA256 (py-oauthlib-1.1.1.tar.gz) = jzOSUgLK62gerw7q1VUkh/jJAmwkHb7TCEpUYsUqxpM=
-SIZE (py-oauthlib-1.1.1.tar.gz) = 146321
+SHA256 (v2.0.0.zip) = 4ZhgV8k8XX+ukLfD/P4ZF3mC28ExaRj7Tko6f9fuDA0=
+SIZE (v2.0.0.zip) = 244892
Index: py-oauthlib/pkg/PLIST
===
RCS file: /cvs/ports/security/py-oauthlib/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- py-oauthlib/pkg/PLIST	22 Apr 2016 22:25:53 -	1.3
+++ py-oauthlib/pkg/PLIST	1 Oct 2016 13:10:02 -
@@ -103,12 +103,14 @@ 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

[maintainer update] www/py-jwt

[Johan Huldtgren]

hello,

minor update from 1.4.0 to 1.4.2; built, packaged and tested with
beets and discogs-client on amd64.

thanks,

.jhIndex: py-jwt/Makefile
===
RCS file: /cvs/ports/www/py-jwt/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- py-jwt/Makefile	5 Jan 2016 06:46:01 -	1.5
+++ py-jwt/Makefile	1 Oct 2016 12:59:37 -
@@ -2,7 +2,7 @@
 
 COMMENT =	JSON Web Token implementation in Python
 
-MODPY_EGG_VERSION = 1.4.0
+MODPY_EGG_VERSION = 1.4.2
 DISTNAME =	PyJWT-${MODPY_EGG_VERSION}
 PKGNAME =	py-jwt-${MODPY_EGG_VERSION}
 CATEGORIES =	www
Index: py-jwt/distinfo
===
RCS file: /cvs/ports/www/py-jwt/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- py-jwt/distinfo	5 Jan 2016 06:46:01 -	1.2
+++ py-jwt/distinfo	1 Oct 2016 12:59:37 -
@@ -1,2 +1,2 @@
-SHA256 (PyJWT-1.4.0.tar.gz) = 4bI4bPrVQURbHUPkgLAso37Fcln9GiPnlBW1e6XYppQ=
-SIZE (PyJWT-1.4.0.tar.gz) = 34613
+SHA256 (PyJWT-1.4.2.tar.gz) = h6gxt6O/qDUVEZYUae0EYqdpck1NpIpQHLjJbR4X9XA=
+SIZE (PyJWT-1.4.2.tar.gz) = 30486
Index: py-jwt/patches/patch-setup_py
===
RCS file: /cvs/ports/www/py-jwt/patches/patch-setup_py,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-setup_py
--- py-jwt/patches/patch-setup_py	30 Jun 2015 13:42:16 -	1.1
+++ py-jwt/patches/patch-setup_py	1 Oct 2016 12:59:37 -
@@ -1,11 +1,11 @@
 $OpenBSD: patch-setup_py,v 1.1 2015/06/30 13:42:16 sthen Exp $
 setup.py.orig	Tue Jun 30 08:58:03 2015
-+++ setup.py	Tue Jun 30 08:58:06 2015
-@@ -61,7 +61,6 @@ setup(
+--- setup.py.orig	Thu Jun 30 00:07:44 2016
 setup.py	Fri Sep 30 18:47:10 2016
+@@ -65,7 +65,6 @@ setup(
  'Topic :: Utilities',
  ],
  test_suite='tests',
--setup_requires=['pytest-runner'],
+-setup_requires=pytest_runner,
  tests_require=tests_require,
  extras_require=dict(
  test=tests_require,

Re: apache2 fails with rc.d (but actually starts)

[Johan Huldtgren]

On 6/22/16 10:28, Antoine Jacoutot wrote:


Should be fixed in current.
Thanks for the report.


I can confirm this works again, thank you!

.jh

apache2 fails with rc.d (but actually starts)

[Johan Huldtgren]

hello,

when the old openbsd apache went away recently I swapped to apache2
for the one site I have which still needs it, while it works, when it
gets started at boot (or if I wish to restart it), using rc.d or rcctl
will report a failure, but it will start nonetheless. If I use
apachectl2 it starts without issue. Using -d to rcctl produces nothing
obviously wrong (as far as I can tell). My httpd2.conf is barely
changed from the default one shipped (diff below), the only
substantial changes are that mod_rewrite and mod_perl are active and
there is one virtual host (but removing all those does not change the
behavior). Since apache seems happy with the config and it runs, turning up
debugging or syntax checks haven't produced anything useful. I don't know
if there is any additional debugging I can set for rcctl which would be
helpful.

If anybody has any ideas I'd appreciate it, while it's not a huge
issue it's a bit unnerving to see apache2 being reported as not running
each morning in the daily mail.

thanks,

.jh


# rcctl -d start apache2
doing _rc_parse_conf
doing _rc_quirks
apache2_flags empty, using default ><
doing _rc_parse_conf /var/run/rc.d/apache2
doing _rc_quirks
doing rc_check
apache2
doing rc_start
doing _rc_wait start
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing rc_check
doing _rc_rm_runfile
(failed)

# ps auxww | grep httpd
root  4803  0.0  0.2 19940 31124 ??  Ss 2:30PM0:00.54 
httpd2: /usr/local/sbin/httpd2
www  96364  0.0  0.0 19816  3616 ??  I  2:30PM0:00.05 
httpd2: /usr/local/sbin/httpd2
www  92392  0.0  0.0 19816  3656 ??  I  2:30PM0:00.05 
httpd2: /usr/local/sbin/httpd2
www  60610  0.0  0.0 19816  3588 ??  I  2:30PM0:00.03 
httpd2: /usr/local/sbin/httpd2
www  45996  0.0  0.0 19816  3580 ??  I  2:30PM0:00.05 
httpd2: /usr/local/sbin/httpd2
www  90635  0.0  0.0 19816  3548 ??  I  2:30PM0:00.02 
httpd2: /usr/local/sbin/httpd2

root 42612  0.0  0.0   172   364 p2  R+ 2:30PM0:00.00 grep httpd

# apachectl2 -t 


Syntax OK

# diff -u /usr/local/share/examples/apache2/conf/httpd2.conf 
/etc/apache2/httpd2.conf
--- /usr/local/share/examples/apache2/conf/httpd2.conf  Mon Jun 13 
08:19:54 2016

+++ /etc/apache2/httpd2.confTue Jun 21 14:28:14 2016
@@ -49,7 +49,7 @@
 # prevent Apache from glomming onto all bound IP addresses.
 #
 #Listen 12.34.56.78:80
-Listen 80
+Listen 127.0.0.1:80

 #
 # Dynamic Shared Object (DSO) Support
@@ -172,7 +172,8 @@
 #LoadModule speling_module /usr/local/lib/apache2/mod_speling.so
 #LoadModule userdir_module /usr/local/lib/apache2/mod_userdir.so
 LoadModule alias_module /usr/local/lib/apache2/mod_alias.so
-#LoadModule rewrite_module /usr/local/lib/apache2/mod_rewrite.so
+LoadModule rewrite_module /usr/local/lib/apache2/mod_rewrite.so
+LoadModule perl_module /usr/local/lib/apache2/mod_perl.so

 
 #
@@ -205,7 +206,7 @@
 # e-mailed.  This address appears on some server-generated pages, such
 # as error documents.  e.g. ad...@your-domain.com
 #
-ServerAdmin y...@example.com
+ServerAdmin hostmas...@mysite.com

 #
 # ServerName gives the name and port that the server uses to identify 
itself.

@@ -214,7 +215,7 @@
 #
 # If your host doesn't have a registered DNS name, enter its IP 
address here.

 #
-#ServerName www.example.com:80
+ServerName www.mysite.com

 #
 # Deny access to the entirety of your server's filesystem. You must
@@ -238,8 +239,8 @@
 # documents. By default, all requests are taken from this directory, but
 # symbolic links and aliases may be used to point to other locations.
 #
-DocumentRoot "/var/www/htdocs"
-
+DocumentRoot "/var/www/htdocs_www"
+
 #
 # Possible values for the Options directive are "None", "All",
 # or any combination of:
@@ -290,7 +291,7 @@
 # logged here.  If you *do* define an error logfile for a 
 # container, that host's errors will be logged there and not here.
 #
-ErrorLog "logs/error_log"
+ErrorLog "logs/default/error_apache.log"

 #
 # LogLevel: Control the number of messages logged to the error_log.
@@ -319,7 +320,7 @@
 # define per- access logfiles, transactions will be
 # logged therein and *not* in this file.
 #
-CustomLog "logs/access_log" common
+CustomLog "logs/default/access_apache.log" combined

 #
 # If you prefer a logfile with access, agent, and referer information
@@ -438,7 +439,7 @@
 #
 # Some examples:
 #ErrorDocument 500 "The server made a boo boo."
-#ErrorDocument 404 /missing.html
+ErrorDocument 404 http://www.mysite.com/missing.html
 #ErrorDocument 404 "/cgi-bin/missing_handler.pl"
 

Re: sysutils/apcupsd with USB cable broken in latest snap

[Johan Huldtgren]

On 6/8/16 01:41, Kirill Bychkov wrote:

On Wed, June 8, 2016 03:33, Johan Huldtgren wrote:
[...]


ok, on the off chance that this was an amd64 vs i386 issue (unlikely but
figured it couldn't hurt to try) I installed the latest amd64 snap on a
different host and updated ports (I had apcupsd installed here in client
mode), attached the UPS and swapped the config file to the server one,
but alas the results are the same. Must be an issue with my UPS and the
new code I guess.


Just a guess but may be you need to use modbus driver instead of usb?


Using modbus via usb didn't work, however this model has both a usb
port and an rs232 serial port[1]. Using the rs232 port together with
the 940-0625A cable (rs232 <-> db9) and connecting to a serial port on
another server I can get apcupsd to work. So I have a work around,
that said it seems it no longer works with usb, I tried all
permutations I could imagine of physical cables, UPSCABLE, UPSTYPE,
and DEVICE; but if connected via USB (even if from the rs232 port via
a db9 <-> usb adapter) I never get apcupsd to communicate with the
UPS. I suspect the errors which could be seen yesterday in the apctest
and apcupsd -d output might be relevant but as I said then I'm not
sure how to deal with them.  apctest succeeds now and none of the
errors seen with the USB cable are evident when using a serial
connection.

thanks,

.jh

[1] https://media.cablesandkits.com/p/SMT2200RM2Uc.jpg

Re: sysutils/apcupsd with USB cable broken in latest snap

[Johan Huldtgren]

On 6/7/16 07:37, Kirill Bychkov wrote:


apcupsd was switched from "bsd" driver to "generic-usb" driver after
USB_GET_STRING_DESC removal. In 3.14.14 "generic-usb" is on by default. It
works through libusb from ports.

I've updated my machine to recent amd64 snapshot and updated apcupsd from
packages. Everything works fine.
I've rebuild apcupsd from ports and reinstalled it and it's still works fine:

kirby@humppalaki:ttyp0 %  apcaccess
APC  : 001,045,1057
DATE : 2016-06-07 14:24:02 +0300
HOSTNAME : humppalaki
VERSION  : 3.14.14 (31 May 2016) openbsd
UPSNAME  : rs500
CABLE: USB Cable
DRIVER   : USB UPS Driver
UPSMODE  : Stand Alone
STARTTIME: 2016-06-07 14:23:59 +0300
MODEL: Back-UPS CS 500
STATUS   : ONLINE
LINEV: 228.0 Volts
LOADPCT  : 18.0 Percent
BCHARGE  : 100.0 Percent
TIMELEFT : 28.4 Minutes
MBATTCHG : 10 Percent
MINTIMEL : 5 Minutes
MAXTIME  : 0 Seconds
OUTPUTV  : 230.0 Volts
SENSE: Medium
DWAKE: 0 Seconds
DSHUTD   : 180 Seconds
LOTRANS  : 180.0 Volts
HITRANS  : 266.0 Volts
RETPCT   : 0.0 Percent
ITEMP: 29.2 C
ALARMDEL : 30 Seconds
BATTV: 13.5 Volts
LINEFREQ : 50.0 Hz
LASTXFER : Low line voltage
NUMXFERS : 0
TONBATT  : 0 Seconds
CUMONBATT: 0 Seconds
XOFFBATT : N/A
SELFTEST : NO
STESTI   : None
STATFLAG : 0x0508
MANDATE  : 2011-11-19
SERIALNO : 4B1147P44167
BATTDATE : 2011-11-19
NOMOUTV  : 230 Volts
NOMINV   : 0 Volts
NOMBATTV : 12.0 Volts
NOMPOWER : 300 Watts
FIRMWARE : 808.q10 .I USB FW:q
END APC  : 2016-06-07 14:24:03 +0300

ugen0 at uhub5 port 1 "American Power Conversion Back-UPS CS 500 FW:808.q10 .I
USB FW:q10" rev 1.10/0.06 addr 2


ok, on the off chance that this was an amd64 vs i386 issue (unlikely
but figured it couldn't hurt to try) I installed the latest amd64 snap
on a different host and updated ports (I had apcupsd installed here in
client mode), attached the UPS and swapped the config file to the
server one, but alas the results are the same. Must be an issue with
my UPS and the new code I guess.

On 6/7/16 08:12, Stuart Henderson wrote:

I am pretty sure you will have the broken behaviour with 3.4.14 on
the old kernel too, which would suggest that there's a problem with
apcupsd's generic usb code either on OpenBSD or in your configuration
(e.g. with your UPS etc).

The easiest case would probably be if you can find someone who has
a working 3.4.14 on -current. If so, I'd install the same, obtain debug
logs and compare with theirs. If there's nothing obvious then maybe
ask upstream for suggestions.


So I started poking around, and this might be relevant

# apctest
2016-06-07 20:18:30 apctest 3.14.14 (31 May 2016) openbsd
Checking configuration ...
sharenet.type = Network & ShareUPS Disabled
cable.type = USB Cable
mode.type = USB UPS Driver
Setting up the port ...
apctest FATAL ERROR in apctest.c at line 321
Unable to open UPS device.
  If apcupsd or apctest is already running,
  please stop it and run this program again.
apctest error termination completed

(it should be noted nothing was running at this time, I had just
rebooted the host with apcupsd disabled)

Further when setting the debug high and running it on the console I
get this:

# apcupsd -d 666
0.000 apcupsd: apcupsd.c:156 Options parsed.
0.001 apcupsd: apcconfig.c:755 After config scriptdir: "/etc/apcupsd"
0.001 apcupsd: apcconfig.c:756 After config pwrfailpath: "/etc/apcupsd"
0.001 apcupsd: apcconfig.c:757 After config nologinpath: "/etc"
0.001 apcupsd: apcupsd.c:179 Config file /etc/apcupsd/apcupsd.conf 
processed.

0.001 apcupsd: newups.c:102 write_lock at drivers.c:109
0.001 apcupsd: drivers.c:111 Looking for driver: usb
0.001 apcupsd: drivers.c:115 Driver dumb is configured.
0.001 apcupsd: drivers.c:115 Driver apcsmart is configured.
0.001 apcupsd: drivers.c:115 Driver net is configured.
0.001 apcupsd: drivers.c:115 Driver usb is configured.
0.002 apcupsd: drivers.c:118 Driver usb found and attached.
0.002 apcupsd: newups.c:108 write_unlock at drivers.c:135
0.002 apcupsd: drivers.c:137 Driver ptr=0xb223d800
0.002 apcupsd: drivers.c:138 Attached to driver: usb
0.012 apcupsd: apcupsd.c:251 NIS thread started.
0.013 apcupsd: apclog.c:62 apcupsd 3.14.14 (31 May 2016) openbsd startup 
succeeded

0.014 apcupsd: apclog.c:62 NIS server startup succeeded
0.023 apcupsd: newups.c:102 write_lock at generic-usb.c:457
0.023 apcupsd: HidUps.cpp:50 Initializing libusb
0.033 apcupsd: HidUps.cpp:55 Found 8 USB busses
0.045 apcupsd: HidUps.cpp:57 Found 9 USB devices
0.045 apcupsd: HidUps.cpp:68 000:001 - 8086:
0.045 apcupsd: HidUps.cpp:112 Not an APC device.
0.045 apcupsd: HidUps.cpp:68 001:001 - 8086:
0.045 apcupsd: HidUps.cpp:112 Not an APC device.
0.045 apcupsd: HidUps.cpp:68 002:001 - 8086:
0.045 apcupsd: HidUps.cpp:112 Not an APC device.
0.045 apcupsd: HidUps.cpp:68 002:002 - 051d:0003
0.050 apcupsd: HidUps.cpp:232 Got string of length=16
0.050 apcupsd: HidUps.cpp:151 device='AS1505230549', user='/dev/ugen0'
0.051 apcupsd: HidUps.cpp:68 003:001 - 8086:
0.051 apcupsd: 

Re: sysutils/apcupsd with USB cable broken in latest snap

[Johan Huldtgren]

On 6/7/16 03:21, Martin Pieuchot wrote:

On 06/06/16(Mon) 19:01, Johan Huldtgren wrote:

hello,

I have an APC Smart-UPS-2200 which is connected via USB, as long as
I've followed the instructions in pkg-readme about disabling uhidev
and upd it's always worked fine. When I updated to the latest snap
(June 4th) however I am now always seeing "COMMLOST" in the output of
'apcaccess status' I tried booting the previous kernel (May 19th,
#1709), but that did not resolve it, it seems the breakage occurred
when apcupsd went from 3.14.13p1 to 3.14.13p2 which seems to have been
because the removal of USB_GET_STRING_DESC. I did try the newly
committed (but as yet unpackaged) 3.14.14 but no more luck there.

I tried to build 3.14.13p1 to see if I can confirm what broke it, but
I've been unable to succeed. I backed out the USB_GET_STRING_DESC
changes and built a new kernel based on sources from around
2016-05-20, I tried to do the same thing with the ports tree but
clearly I've missed something, because I never make it further than:

make[5]: Entering directory
'/usr/ports/pobj/apcupsd-3.14.13/apcupsd-3.14.13/src/drivers/usb/bsd'
  CXX   src/drivers/usb/bsd/hidutils.c
if test ! -d .obj; then mkdir -p .obj; fi
c++ -x c++ -I/usr/local/include
-I/usr/ports/pobj/apcupsd-3.14.13/apcupsd-3.14.13/src/libusbhid
-I/usr/ports/pobj/apcupsd-3.14.13/apcupsd-3.14.13/include  -O2 -pipe
-fno-exceptions -fno-rtti -Wall -pthread -c -o .obj/hidutils.o hidutils.c
hidutils.c: In function 'const char* hidu_get_string(int, int)':
hidutils.c:354: error: 'USB_GET_STRING_DESC' was not declared in this scope
../../../../autoconf/targets.mak:141: recipe for target '.obj/hidutils.o'
failed
gmake[5]: *** [.obj/hidutils.o] Error 1
gmake[5]: Leaving directory
'/usr/ports/pobj/apcupsd-3.14.13/apcupsd-3.14.13/src/drivers/usb/bsd'
../../../../autoconf/targets.mak:55: recipe for target 'all' failed
gmake[4]: *** [all] Error 2
gmake[4]: Leaving directory
'/usr/ports/pobj/apcupsd-3.14.13/apcupsd-3.14.13/src/drivers/usb/bsd'
../../../autoconf/targets.mak:105: recipe for target 'bsd_DIR' failed
gmake[3]: *** [bsd_DIR] Error 2
gmake[3]: Leaving directory
'/usr/ports/pobj/apcupsd-3.14.13/apcupsd-3.14.13/src/drivers/usb'
../../autoconf/targets.mak:105: recipe for target 'usb_DIR' failed
gmake[2]: *** [usb_DIR] Error 2
gmake[2]: Leaving directory
'/usr/ports/pobj/apcupsd-3.14.13/apcupsd-3.14.13/src/drivers'
../autoconf/targets.mak:105: recipe for target 'drivers_DIR' failed
gmake[1]: *** [drivers_DIR] Error 2
gmake[1]: Leaving directory
'/usr/ports/pobj/apcupsd-3.14.13/apcupsd-3.14.13/src'
autoconf/targets.mak:105: recipe for target 'src_DIR' failed
gmake: *** [src_DIR] Error 2
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2675
'/usr/ports/pobj/apcupsd-3.14.13/.build_done')
*** Error 1 in /usr/ports/sysutils/apcupsd
(/usr/ports/infrastructure/mk/bsd.port.mk:2397 'all')

any clues?


Does it work if you use the system libusbhid instead of the bundled one?


I'm not exactly sure how to do this, but I'll take a look at it this
evening when I'm back from work.

.jh

sysutils/apcupsd with USB cable broken in latest snap

[Johan Huldtgren]

hello,

I have an APC Smart-UPS-2200 which is connected via USB, as long as
I've followed the instructions in pkg-readme about disabling uhidev
and upd it's always worked fine. When I updated to the latest snap
(June 4th) however I am now always seeing "COMMLOST" in the output of
'apcaccess status' I tried booting the previous kernel (May 19th,
#1709), but that did not resolve it, it seems the breakage occurred
when apcupsd went from 3.14.13p1 to 3.14.13p2 which seems to have been
because the removal of USB_GET_STRING_DESC. I did try the newly
committed (but as yet unpackaged) 3.14.14 but no more luck there.

I tried to build 3.14.13p1 to see if I can confirm what broke it, but
I've been unable to succeed. I backed out the USB_GET_STRING_DESC
changes and built a new kernel based on sources from around
2016-05-20, I tried to do the same thing with the ports tree but
clearly I've missed something, because I never make it further than:

make[5]: Entering directory 
'/usr/ports/pobj/apcupsd-3.14.13/apcupsd-3.14.13/src/drivers/usb/bsd'

  CXX   src/drivers/usb/bsd/hidutils.c
if test ! -d .obj; then mkdir -p .obj; fi
c++ -x c++ -I/usr/local/include 
-I/usr/ports/pobj/apcupsd-3.14.13/apcupsd-3.14.13/src/libusbhid 
-I/usr/ports/pobj/apcupsd-3.14.13/apcupsd-3.14.13/include  -O2 -pipe 
-fno-exceptions -fno-rtti -Wall -pthread -c -o .obj/hidutils.o hidutils.c

hidutils.c: In function 'const char* hidu_get_string(int, int)':
hidutils.c:354: error: 'USB_GET_STRING_DESC' was not declared in this scope
../../../../autoconf/targets.mak:141: recipe for target 
'.obj/hidutils.o' failed

gmake[5]: *** [.obj/hidutils.o] Error 1
gmake[5]: Leaving directory 
'/usr/ports/pobj/apcupsd-3.14.13/apcupsd-3.14.13/src/drivers/usb/bsd'

../../../../autoconf/targets.mak:55: recipe for target 'all' failed
gmake[4]: *** [all] Error 2
gmake[4]: Leaving directory 
'/usr/ports/pobj/apcupsd-3.14.13/apcupsd-3.14.13/src/drivers/usb/bsd'

../../../autoconf/targets.mak:105: recipe for target 'bsd_DIR' failed
gmake[3]: *** [bsd_DIR] Error 2
gmake[3]: Leaving directory 
'/usr/ports/pobj/apcupsd-3.14.13/apcupsd-3.14.13/src/drivers/usb'

../../autoconf/targets.mak:105: recipe for target 'usb_DIR' failed
gmake[2]: *** [usb_DIR] Error 2
gmake[2]: Leaving directory 
'/usr/ports/pobj/apcupsd-3.14.13/apcupsd-3.14.13/src/drivers'

../autoconf/targets.mak:105: recipe for target 'drivers_DIR' failed
gmake[1]: *** [drivers_DIR] Error 2
gmake[1]: Leaving directory 
'/usr/ports/pobj/apcupsd-3.14.13/apcupsd-3.14.13/src'

autoconf/targets.mak:105: recipe for target 'src_DIR' failed
gmake: *** [src_DIR] Error 2
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2675 
'/usr/ports/pobj/apcupsd-3.14.13/.build_done')
*** Error 1 in /usr/ports/sysutils/apcupsd 
(/usr/ports/infrastructure/mk/bsd.port.mk:2397 'all')


any clues?

Below is a dmesg from current, as well as output from usbdevs
and apcaccess.

thanks,

.jh



# dmesg
OpenBSD 6.0-beta (GENERIC) #1783: Sat Jun  4 20:02:48 MDT 2016
dera...@i386.openbsd.org:/usr/src/sys/arch/i386/compile/GENERIC
cpu0: Intel(R) Pentium(R) 4 Mobile CPU 1.70GHz ("GenuineIntel" 
686-class) 1.20 GHz
cpu0: 
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,PERF

real mem  = 536240128 (511MB)
avail mem = 513286144 (489MB)
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: date 01/07/04, BIOS32 rev. 0 @ 0xffe90, SMBIOS rev. 
2.3 @ 0xf76b0 (62 entries)

bios0: vendor Dell Computer Corporation version "A11" date 01/07/2004
bios0: Dell Computer Corporation Inspiron 8200
acpi0 at bios0: rev 0
acpi0: sleep states S0 S1 S3 S4 S5
acpi0: tables DSDT FACP
acpi0: wakeup devices LID_(S3) PBTN(S4) PCI0(S3) UAR1(S3) USB0(S1) 
USB1(S1) USB2(S1) MODM(S3) PCIE(S3) MPCI(S3)

acpitimer0 at acpi0: 3579545 Hz, 24 bits
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus 1 (AGP_)
acpiprt2 at acpi0: bus 2 (PCIE)
acpiprt3 at acpi0: bus -1 (MPCI)
acpicpu0 at acpi0acpicpu0: struck PSS entry, core frequency equals  last
acpicpu0: struck PSS entry, core frequency equals  last
acpicpu0: invalid _PSS length
: !C2(@50 io@0x8e4), C1(@1 halt!)
acpipwrres0 at acpi0: PADA, resource for ADPT
acpitz0 at acpi0: critical temperature is 94 degC
acpiac0 at acpi0: AC unit online
acpibat0 at acpi0: BAT0 not present
acpibat1 at acpi0: BAT1 model "LIP8120DLP" serial 20216 type LION oem 
"Sony Corp."

acpibtn0 at acpi0: LID_
acpibtn1 at acpi0: PBTN
acpibtn2 at acpi0: SBTN
"PNP0F13" at acpi0 not configured
"PNP0303" at acpi0 not configured
"PNP0700" at acpi0 not configured
"PNP0501" at acpi0 not configured
"PNP0401" at acpi0 not configured
acpidock0 at acpi0: GDCK not docked (0)
acpivideo0 at acpi0: VID_
bios0: ROM list: 0xc/0xf800 0xcf800/0x800!
cpu0 at mainbus0: (uniprocessor)
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
pci0 at mainbus0 bus 0: configuration mode 1 (bios)
pchb0 at pci0 dev 0 function 0 "Intel 82845 Host" rev 0x04
intelagp0 at pchb0

[maintainer update] security/py-oauthlib

[Johan Huldtgren]

hello,

minor bugfix update from 1.1.0 to 1.1.1, tested on amd64 as
a dependency for py-discogs-client.

thanks,

.jhIndex: py-oauthlib/Makefile
===
RCS file: /cvs/ports/security/py-oauthlib/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- py-oauthlib/Makefile	22 Apr 2016 22:25:53 -	1.4
+++ py-oauthlib/Makefile	21 May 2016 13:34:35 -
@@ -2,7 +2,7 @@
 
 COMMENT =	Python library for OAuth
 
-MODPY_EGG_VERSION = 1.1.0
+MODPY_EGG_VERSION = 1.1.1
 
 DISTNAME =	py-oauthlib-${MODPY_EGG_VERSION}
 DISTFILES =	${DISTNAME}{${MODPY_EGG_VERSION}}.tar.gz
Index: py-oauthlib/distinfo
===
RCS file: /cvs/ports/security/py-oauthlib/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- py-oauthlib/distinfo	22 Apr 2016 22:25:53 -	1.3
+++ py-oauthlib/distinfo	21 May 2016 13:34:35 -
@@ -1,2 +1,2 @@
-SHA256 (py-oauthlib-1.1.0.tar.gz) = ozEkFuuy7rEEH5LpUVBq6MPxo29B3tvunRKPEav0bdU=
-SIZE (py-oauthlib-1.1.0.tar.gz) = 146045
+SHA256 (py-oauthlib-1.1.1.tar.gz) = jzOSUgLK62gerw7q1VUkh/jJAmwkHb7TCEpUYsUqxpM=
+SIZE (py-oauthlib-1.1.1.tar.gz) = 146321

www/blogsum

[Johan Huldtgren]

hello,

since apache-httpd-openbsd has been replaced by apache-httpd-2.4 we
should reference the example file for httpd2. While there, fix
homepage. Maintainer address needs updating too.

thanks,

.jhIndex: blogsum/Makefile
===
RCS file: /cvs/ports/www/blogsum/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- blogsum/Makefile	28 Apr 2016 17:03:50 -	1.12
+++ blogsum/Makefile	7 May 2016 21:52:16 -
@@ -3,9 +3,9 @@
 COMMENT =		simple weblog
 
 DISTNAME =		blogsum-1.1
-REVISION =		5
+REVISION =		6
 CATEGORIES =		www
-HOMEPAGE =		http://blogsum.obfuscurity.com/
+HOMEPAGE =		https://github.com/obfuscurity/blogsum/
 
 MAINTAINER =		Jason Dixon 
 
Index: blogsum/pkg/PLIST
===
RCS file: /cvs/ports/www/blogsum/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- blogsum/pkg/PLIST	11 Nov 2010 23:02:21 -	1.3
+++ blogsum/pkg/PLIST	7 May 2016 21:52:16 -
@@ -19,8 +19,8 @@ blogsum/docs/README
 blogsum/examples/
 @group bin
 blogsum/examples/create_sqlite.sql
-blogsum/examples/httpd-blogsum.conf
-@comment blogsum/examples/httpd2-blogsum.conf
+@comment blogsum/examples/httpd-blogsum.conf
+blogsum/examples/httpd2-blogsum.conf
 blogsum/examples/wp2blogsum.pl
 blogsum/index.cgi
 blogsum/startup.pl

[maintainer update] security/py-oauthlib

[Johan Huldtgren]

self.control_signature_plaintext)
 
 
 def test_sign_plaintext_with_client(self):
@@ -354,5 +354,5 @@ Ga6FHdjGPcfajt+nrpB1n8UQBEH9ZxniokR/IPvdMlxqXA==
 
 sign = sign_plaintext_with_client(None, self.client)
 
-self.assertEquals(sign, self.control_signature_plaintext)
+self.assertEqual(sign, self.control_signature_plaintext)
 
? py-oauthlib/patches
Index: py-oauthlib/Makefile
===
RCS file: /cvs/ports/security/py-oauthlib/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- py-oauthlib/Makefile	29 Sep 2015 10:52:34 -	1.3
+++ py-oauthlib/Makefile	22 Apr 2016 14:26:48 -
@@ -2,12 +2,11 @@
 
 COMMENT =	Python library for OAuth
 
-MODPY_EGG_VERSION = 1.0.3
+MODPY_EGG_VERSION = 1.1.0
 
 DISTNAME =	py-oauthlib-${MODPY_EGG_VERSION}
 DISTFILES =	${DISTNAME}{${MODPY_EGG_VERSION}}.tar.gz
 WRKDIST =	${WRKDIR}/oauthlib-${MODPY_EGG_VERSION}
-REVISION =	0
 
 CATEGORIES =	security
 MAINTAINER =	Johan Huldtgren <jhuldtg...@gmail.com>
@@ -20,18 +19,24 @@ MASTER_SITES =	https://github.com/idan/o
 MODULES =	lang/python
 MODPY_SETUPTOOLS = Yes
 
-RUN_DEPENDS =	devel/py-blinker \
-		security/py-cryptography \
-		www/py-jwt
-
-TEST_DEPENDS =	devel/py-nose \
-		devel/py-coverage \
-		devel/py-mock \
+RUN_DEPENDS =	devel/py-blinker${MODPY_FLAVOR} \
+		security/py-cryptography${MODPY_FLAVOR} \
+		www/py-jwt${MODPY_FLAVOR}
+
+TEST_DEPENDS =	devel/py-nose${MODPY_FLAVOR} \
+		devel/py-coverage${MODPY_FLAVOR} \
+		devel/py-mock${MODPY_FLAVOR} \
 		${RUN_DEPENDS}
 
+FLAVORS =	python3
+FLAVOR ?=
+
 post-extract:
 	chmod -R o+rX ${WRKSRC}
 
+# tests/oauth2/rfc5849/endpoints/test_error_responses.py
+# will through a warning when make test is run under
+# the python3 flavor, fixing this breaks python2 though.
 do-test:
 	cd ${WRKSRC} && ${MODPY_BIN} -m unittest discover
 
Index: py-oauthlib/distinfo
===
RCS file: /cvs/ports/security/py-oauthlib/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- py-oauthlib/distinfo	23 Sep 2015 21:14:21 -	1.2
+++ py-oauthlib/distinfo	22 Apr 2016 14:26:48 -
@@ -1,2 +1,2 @@
-SHA256 (py-oauthlib-1.0.3.tar.gz) = mJrsUfp9fgPQZv3Gtvmqby2nWMCyXewNiU5md4ttlvs=
-SIZE (py-oauthlib-1.0.3.tar.gz) = 145451
+SHA256 (py-oauthlib-1.1.0.tar.gz) = ozEkFuuy7rEEH5LpUVBq6MPxo29B3tvunRKPEav0bdU=
+SIZE (py-oauthlib-1.1.0.tar.gz) = 146045
Index: py-oauthlib/pkg/PLIST
===
RCS file: /cvs/ports/security/py-oauthlib/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- py-oauthlib/pkg/PLIST	23 Sep 2015 21:14:21 -	1.2
+++ py-oauthlib/pkg/PLIST	22 Apr 2016 14:26:48 -
@@ -7,104 +7,113 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 lib/python${MODPY_VERSION}/site-packages/oauthlib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/oauthlib/__init__.py
-lib/python${MODPY_VERSION}/site-packages/oauthlib/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}signals.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/${MODPY_PYCACHE}uri_validate.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/common.py
-lib/python${MODPY_VERSION}/site-packages/oauthlib/common.pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/__init__.py
-lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/
 lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/__init__.py
-lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}parameters.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/oauthlib/oauth1/rfc5849/${MODPY_PYCACHE}request_validator.${MOD

[maintainer update] archivers/pecl-lzf

[Johan Huldtgren]

Updates archivers/pecl-lzf to 1.6.5 which includes bug
fixes.

built / packaged / passes regression on amd64, I don't
actively use this anymore though so I have no real
world tests.

thanks,

.jhIndex: pecl-lzf/Makefile
===
RCS file: /cvs/ports/archivers/pecl-lzf/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- pecl-lzf/Makefile	19 Mar 2016 21:18:37 -	1.16
+++ pecl-lzf/Makefile	22 Apr 2016 12:37:43 -
@@ -2,10 +2,9 @@
 
 COMMENT =		PHP support for LZF de/compression
 
-DISTNAME =		LZF-1.6.3
+DISTNAME =		LZF-1.6.5
 CATEGORIES =		archivers
 MAINTAINER =		Johan Huldtgren <jhuldtg...@gmail.com>
-REVISION =		0
 
 # PHP
 PERMIT_PACKAGE_CDROM =	Yes
Index: pecl-lzf/distinfo
===
RCS file: /cvs/ports/archivers/pecl-lzf/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- pecl-lzf/distinfo	19 Jun 2015 16:46:34 -	1.3
+++ pecl-lzf/distinfo	22 Apr 2016 12:37:43 -
@@ -1,2 +1,2 @@
-SHA256 (LZF-1.6.3.tgz) = QuxFjqEBKKgB6NOXNrUZuoH6ddKmF9J3e31rMnZgGl0=
-SIZE (LZF-1.6.3.tgz) = 15545
+SHA256 (LZF-1.6.5.tgz) = 3RFtEqO+mF9CJWZQzpoDP9PE6NpPIoDHn7n9anMZmkw=
+SIZE (LZF-1.6.5.tgz) = 16968

[maintainer update] net/py-oauth2

[Johan Huldtgren]

hello,

minor update from 1.5.211 to 1.9.0post1 built, packaged and
tests passed on amd64. Since this is no longer a dependency
for py-discogs-client I don't have any real world tests for
it though.

thanks,

.jhIndex: py-oauth2/Makefile
===
RCS file: /cvs/ports/net/py-oauth2/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- py-oauth2/Makefile	29 Sep 2015 10:52:29 -	1.4
+++ py-oauth2/Makefile	5 Jan 2016 04:15:01 -
@@ -2,10 +2,9 @@
 
 COMMENT =	Python library for OAuth
 
-MODPY_EGG_VERSION = 1.5.211
+MODPY_EGG_VERSION = 1.9.0.post1
 DISTNAME =	oauth2-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	1
 CATEGORIES =	net
 MAINTAINER =	Johan Huldtgren <jhuldtg...@gmail.com>
 
Index: py-oauth2/distinfo
===
RCS file: /cvs/ports/net/py-oauth2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- py-oauth2/distinfo	31 Oct 2014 11:59:07 -	1.1.1.1
+++ py-oauth2/distinfo	5 Jan 2016 04:15:01 -
@@ -1,2 +1,2 @@
-SHA256 (oauth2-1.5.211.tar.gz) = gqOPZ02h+klsD8TfcUy7BYVAvtcqMMUKLjRLDZhMTSE=
-SIZE (oauth2-1.5.211.tar.gz) = 18608
+SHA256 (oauth2-1.9.0.post1.tar.gz) = wAaoXnxgEHx8xtobGEtccZ9t1yAgmBlt+m5V32abWb8=
+SIZE (oauth2-1.9.0.post1.tar.gz) = 21306
Index: py-oauth2/patches/patch-setup_py
===
RCS file: /cvs/ports/net/py-oauth2/patches/patch-setup_py,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-setup_py
--- py-oauth2/patches/patch-setup_py	30 May 2015 09:42:37 -	1.1
+++ py-oauth2/patches/patch-setup_py	5 Jan 2016 04:15:01 -
@@ -1,10 +1,10 @@
-$OpenBSD: patch-setup_py,v 1.1 2015/05/30 09:42:37 czarkoff Exp $
 setup.py.orig	Thu May 28 22:25:46 2015
-+++ setup.py	Thu May 28 22:26:16 2015
-@@ -31,7 +31,7 @@ setup(name=PKG,
-   author="Joe Stump",
-   author_email="j...@simplegeo.com",
-   url="http://github.com/simplegeo/python-oauth2;,
+$OpenBSD$
+--- setup.py.orig	Mon Jan  4 22:34:54 2016
 setup.py	Mon Jan  4 22:33:50 2016
+@@ -45,7 +45,7 @@ setup(name=PKG,
+ "Natural Language :: English",
+ "License :: OSI Approved :: MIT License"
+   ],
 -  packages = find_packages(),
 +  packages = find_packages(exclude=['tests']),
install_requires = ['httplib2'],
Index: py-oauth2/pkg/PLIST
===
RCS file: /cvs/ports/net/py-oauth2/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- py-oauth2/pkg/PLIST	30 May 2015 09:42:38 -	1.2
+++ py-oauth2/pkg/PLIST	5 Jan 2016 04:15:01 -
@@ -6,9 +6,12 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/oauth2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
 lib/python${MODPY_VERSION}/site-packages/oauth2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 lib/python${MODPY_VERSION}/site-packages/oauth2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/oauth2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/version.txt
 lib/python${MODPY_VERSION}/site-packages/oauth2-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/oauth2/__init__.py
 lib/python${MODPY_VERSION}/site-packages/oauth2/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/oauth2/_compat.py
+lib/python${MODPY_VERSION}/site-packages/oauth2/_compat.pyc
 lib/python${MODPY_VERSION}/site-packages/oauth2/_version.py
 lib/python${MODPY_VERSION}/site-packages/oauth2/_version.pyc
 lib/python${MODPY_VERSION}/site-packages/oauth2/clients/

[maintainer update] www/py-jwt

[Johan Huldtgren]

hello,

update from 1.3.0 to 1.4.0, built, packaged and tested with
beets and discogs-client on amd64.

thanks,

.jhIndex: py-jwt/Makefile
===
RCS file: /cvs/ports/www/py-jwt/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- py-jwt/Makefile	23 Dec 2015 22:53:31 -	1.4
+++ py-jwt/Makefile	5 Jan 2016 04:32:10 -
@@ -2,8 +2,7 @@
 
 COMMENT =	JSON Web Token implementation in Python
 
-MODPY_EGG_VERSION = 1.3.0
-REVISION =	1
+MODPY_EGG_VERSION = 1.4.0
 DISTNAME =	PyJWT-${MODPY_EGG_VERSION}
 PKGNAME =	py-jwt-${MODPY_EGG_VERSION}
 CATEGORIES =	www
Index: py-jwt/distinfo
===
RCS file: /cvs/ports/www/py-jwt/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- py-jwt/distinfo	26 Jun 2015 07:35:50 -	1.1.1.1
+++ py-jwt/distinfo	5 Jan 2016 04:32:10 -
@@ -1,2 +1,2 @@
-SHA256 (PyJWT-1.3.0.tar.gz) = /CMCROxOQBTW7q6JSshS6CCkyEPcIJ1Pd+dtVk9G7kk=
-SIZE (PyJWT-1.3.0.tar.gz) = 61828
+SHA256 (PyJWT-1.4.0.tar.gz) = 4bI4bPrVQURbHUPkgLAso37Fcln9GiPnlBW1e6XYppQ=
+SIZE (PyJWT-1.4.0.tar.gz) = 34613

Re: add a py3 flavor to security/py-oauthlib

[Johan Huldtgren]

On 2015-12-23 15:02, Daniel Jakots wrote:

On Wed, 23 Dec 2015 20:41:03 +0100, Daniel Jakots
<vigdis+o...@chown.me> wrote:


This diff adds a py3 flavor to py-oauthlib. It needs the patch
previously sent by shadchin@ on ports for devel/py-mock (because it
adds the py3 flavor).


... which needs the py3 flavor from www/py-jwt. py-jwt collides but
sthen@ kindly solved the problem. His diff:


this diff maintainer ok.

I've attached an updated diff for security/py-oauthlib, 'make test'
throws some warnings when ran under the python3 flavor, I patched
two of them away, the third one if fixed for python3 breaks python2
so I've left it with a note in the makefile.

.jh


Index: Makefile
===
RCS file: /cvs/ports/www/py-jwt/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile29 Sep 2015 10:52:55 -  1.3
+++ Makefile21 Dec 2015 21:49:53 -
@@ -3,26 +3,32 @@
 COMMENT =  JSON Web Token implementation in Python

 MODPY_EGG_VERSION = 1.3.0
+REVISION = 1
 DISTNAME = PyJWT-${MODPY_EGG_VERSION}
 PKGNAME =  py-jwt-${MODPY_EGG_VERSION}
 CATEGORIES =   www
 MAINTAINER =   Johan Huldtgren <jhuldtg...@gmail.com>
-REVISION = 0

 HOMEPAGE = http://github.com/jpadilla/pyjwt

 # BSD
 PERMIT_PACKAGE_CDROM =  Yes

-MODPY_PI = Yes
-
 MODULES =  lang/python
+
+FLAVORS =  python3
+FLAVOR ?=
+
+MODPY_PI = Yes
 MODPY_SETUPTOOLS = Yes

-RUN_DEPENDS =   security/py-cryptography
+RUN_DEPENDS =   security/py-cryptography${MODPY_FLAVOR}

 # tests are available, but need pytest-runner plus dep's (which aren't 
in

 # tree) at build time; if adding these, remove patch-setup_py
 NO_TEST =  Yes
+
+post-install:
+   mv ${PREFIX}/bin/jwt ${PREFIX}/bin/jwt${MODPY_BIN_SUFFIX}

 .include 
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-jwt/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   26 Jun 2015 07:35:50 -  1.1.1.1
+++ pkg/PLIST   21 Dec 2015 21:49:53 -
@@ -1,5 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2015/06/26 07:35:50 landry Exp $
-bin/jwt
+bin/jwt${MODPY_BIN_SUFFIX}

lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/

lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO

lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
@@ -9,28 +9,31 @@ lib/python${MODPY_VERSION}/site-packages

lib/python${MODPY_VERSION}/site-packages/PyJWT-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/jwt/
 lib/python${MODPY_VERSION}/site-packages/jwt/__init__.py
-lib/python${MODPY_VERSION}/site-packages/jwt/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/__main__.py
-lib/python${MODPY_VERSION}/site-packages/jwt/__main__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}algorithms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}api_jws.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}api_jwt.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/jwt/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/algorithms.py
-lib/python${MODPY_VERSION}/site-packages/jwt/algorithms.pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/api_jws.py
-lib/python${MODPY_VERSION}/site-packages/jwt/api_jws.pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/api_jwt.py
-lib/python${MODPY_VERSION}/site-packages/jwt/api_jwt.pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/compat.py
-lib/python${MODPY_VERSION}/site-packages/jwt/compat.pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/contrib/
 lib/python${MODPY_VERSION}/site-packages/jwt/contrib/__init__.py
-lib/python${MODPY_VERSION}/site-packages/jwt/contrib/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jwt/contrib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/jwt/contrib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/
 
lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/__init__.py

-lib/python${MODPY_VERSION}/site-packages/jwt/contrib/algorithms/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/jwt/contri

[maintainer update] audio/py-discogs-client

[Johan Huldtgren]

hello,

minor update of py-discogs-client from 2.2.0
to 2.2.1 tested on amd64 with beets. Passes
all tests.

thanks,

.jh

Index: py-discogs-client/Makefile
===
RCS file: /cvs/ports/audio/py-discogs-client/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- py-discogs-client/Makefile	29 Sep 2015 10:51:14 -	1.5
+++ py-discogs-client/Makefile	14 Dec 2015 17:02:05 -
@@ -2,7 +2,7 @@
 
 COMMENT =	Python interface to Discogs website
 
-MODPY_EGG_VERSION = 2.2.0
+MODPY_EGG_VERSION = 2.2.1
 DISTNAME =	discogs-client-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
 CATEGORIES =	audio
Index: py-discogs-client/distinfo
===
RCS file: /cvs/ports/audio/py-discogs-client/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- py-discogs-client/distinfo	26 Jun 2015 07:38:28 -	1.3
+++ py-discogs-client/distinfo	14 Dec 2015 17:02:05 -
@@ -1,2 +1,2 @@
-SHA256 (discogs-client-2.2.0.tar.gz) = gFipdt3VDn7pE21Um9Qj39W5qPaAftK8ZGhP2v0nVc4=
-SIZE (discogs-client-2.2.0.tar.gz) = 9893
+SHA256 (discogs-client-2.2.1.tar.gz) = njK15Fz/Qa+AJYkccaowJbPhiV3lmzfBH9IDqK9odBQ=
+SIZE (discogs-client-2.2.1.tar.gz) = 24645
Index: py-discogs-client/pkg/PLIST
===
RCS file: /cvs/ports/audio/py-discogs-client/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- py-discogs-client/pkg/PLIST	31 Oct 2014 12:05:06 -	1.2
+++ py-discogs-client/pkg/PLIST	14 Dec 2015 17:02:05 -
@@ -6,6 +6,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
 lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/version.txt
 lib/python${MODPY_VERSION}/site-packages/discogs_client/__init__.py
 lib/python${MODPY_VERSION}/site-packages/discogs_client/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/discogs_client/client.py

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

[Johan Huldtgren]

hello,


You forgot to remove the REVISION. Do you mind adding a py3 flavor?
Pass regressions test with py2/py3 on amd64 and i386.


I have no philosophical opposition to adding a py3 flavor,
however my only use for this port is as a dependency for
beets. beets does not support py3 yet, so I'm uncertain how
I'd test this. That said it builds and passes tests and (the
py2 version) works with beets.


Index: Makefile
===
RCS file: /cvs/ports/audio/py-discogs-client/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile29 Sep 2015 10:51:14 -  1.5
+++ Makefile14 Dec 2015 17:21:35 -
@@ -2,12 +2,11 @@

 COMMENT =  Python interface to Discogs website

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

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

@@ -18,6 +17,9 @@ MODPY_PI =Yes

 MODULES =  lang/python
 MODPY_SETUPTOOLS = Yes
+
+FLAVORS =  python3
+FLAVOR ?=

 RUN_DEPENDS =  devel/py-coverage \
devel/py-coveralls \
Index: distinfo
===
RCS file: /cvs/ports/audio/py-discogs-client/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo26 Jun 2015 07:38:28 -  1.3
+++ distinfo14 Dec 2015 17:21:35 -
@@ -1,2 +1,2 @@
-SHA256 (discogs-client-2.2.0.tar.gz) =
gFipdt3VDn7pE21Um9Qj39W5qPaAftK8ZGhP2v0nVc4=
-SIZE (discogs-client-2.2.0.tar.gz) = 9893
+SHA256 (discogs-client-2.2.1.tar.gz) =
njK15Fz/Qa+AJYkccaowJbPhiV3lmzfBH9IDqK9odBQ=
+SIZE (discogs-client-2.2.1.tar.gz) = 24645
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/py-discogs-client/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   31 Oct 2014 12:05:06 -  1.2
+++ pkg/PLIST   14 Dec 2015 17:21:35 -
@@ -7,14 +7,15 @@ lib/python${MODPY_VERSION}/site-packages

lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt

lib/python${MODPY_VERSION}/site-packages/discogs_client-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/discogs_client/__init__.py
-lib/python${MODPY_VERSION}/site-packages/discogs_client/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/discogs_client/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/discogs_client/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/discogs_client/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/discogs_client/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/discogs_client/${MODPY_PYCACHE}fetchers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/discogs_client/${MODPY_PYCACHE}models.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/discogs_client/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/discogs_client/client.py
-lib/python${MODPY_VERSION}/site-packages/discogs_client/client.pyc
 lib/python${MODPY_VERSION}/site-packages/discogs_client/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/discogs_client/exceptions.pyc
 lib/python${MODPY_VERSION}/site-packages/discogs_client/fetchers.py
-lib/python${MODPY_VERSION}/site-packages/discogs_client/fetchers.pyc
 lib/python${MODPY_VERSION}/site-packages/discogs_client/models.py
-lib/python${MODPY_VERSION}/site-packages/discogs_client/models.pyc
 lib/python${MODPY_VERSION}/site-packages/discogs_client/utils.py
-lib/python${MODPY_VERSION}/site-packages/discogs_client/utils.pyc

Re: openvpn user wanted

[Johan Huldtgren]

On 9/15/15 05:29, Jiri B wrote:

On Mon, Sep 14, 2015 at 08:38:32PM -0400, Johan Huldtgren wrote:

I see some errors in output:

...
Mon Sep 14 10:33:06 2015 SENT CONTROL [ovpn-brq.example.com]: 'PUSH_REQUEST' 
(status=1)
Mon Sep 14 10:33:06 2015 PUSH: Received control message: 
'PUSH_REPLY,route-gateway 10.40.204.1,route 10.0.0.0 255.0.0.0,dhcp-option DNS 
10.38.5.26,dhcp-option DNS 10.35.255.14,dhcp-option DOMAIN example.com,ping 
30,ping-exit 600,explicit-exit-notify 3,topology subnet,ifconfig 10.40.204.79 
255.255.252.0'
Mon Sep 14 10:33:06 2015 OPTIONS IMPORT: timers and/or timeouts modified
Mon Sep 14 10:33:06 2015 OPTIONS IMPORT: explicit notify parm(s) modified
Mon Sep 14 10:33:06 2015 OPTIONS IMPORT: --ifconfig/up options modified
Mon Sep 14 10:33:06 2015 OPTIONS IMPORT: route options modified
Mon Sep 14 10:33:06 2015 OPTIONS IMPORT: route-related options modified
Mon Sep 14 10:33:06 2015 OPTIONS IMPORT: --ip-win32 and/or --dhcp-option 
options modified
Mon Sep 14 10:33:06 2015 ROUTE_GATEWAY 10.34.131.254
Mon Sep 14 10:33:06 2015 TUN/TAP device /dev/tun0 opened
Mon Sep 14 10:33:06 2015 do_ifconfig, tt->ipv6=0, tt->did_ifconfig_ipv6_setup=0
Mon Sep 14 10:33:06 2015 /sbin/ifconfig tun0 10.40.204.79 10.40.204.79 mtu 1360 
netmask 255.255.252.0 up link0
Mon Sep 14 10:33:06 2015 /sbin/route add -net 10.40.204.0 10.40.204.79 -netmask 
255.255.252.0
route: writing to routing socket: File exists
add net 10.40.204.0: gateway 10.40.204.79: File exists
Mon Sep 14 10:33:06 2015 ERROR: OpenBSD/NetBSD route add command failed: 
external program exited with error status: 1
Mon Sep 14 10:33:06 2015 PLUGIN_CALL: POST 
/usr/local/lib/openvpn/plugins/openvpn-plugin-down-root.so/PLUGIN_UP status=0
Mon Sep 14 10:33:06 2015 /etc/openvpn/ovpn-brq-udp-client.up tun0 1360 1417 
10.40.204.79 255.255.252.0 init
OpenVPN run:
Opening socket /var/pdnsd/pdnsd.status
Succeeded
Mon Sep 14 10:33:06 2015 /sbin/route add -net 10.0.0.0 10.40.204.1 -netmask 
255.0.0.0
add net 10.0.0.0: gateway 10.40.204.1
Mon Sep 14 10:33:06 2015 GID set to _openvpn
Mon Sep 14 10:33:06 2015 UID set to _openvpn
Mon Sep 14 10:33:06 2015 Initialization Sequence Completed


While I too see those errors they are not new, I've got them in my log since
as far as my logs go back.

Functionality seems unaffected, I installed the patched version and could
connect successfully and work
as I normally would.


Your comment is not correct, I don't see the ERROR without Stuart's diff.
See below with openvpn not having the diff:


Sorry my reply should have been more precise. I have seen that ERROR 
previously, so

for me it's not new.

This is from my failover node which does *NOT* have Stuarts patch on it.

# grep ERROR openvpn.log | wc -l
  72
# grep ERROR openvpn.log 

Fri Feb 20 17:48:42 2015 us=754484 ERROR: OpenBSD/NetBSD route delete 
command failed: external program exited with error status: 1
Fri Feb 20 17:48:42 2015 us=761266 ERROR: OpenBSD/NetBSD route delete 
command failed: external program exited with error status: 1

...
Wed Sep  9 23:29:47 2015 us=653939 ERROR: OpenBSD/NetBSD route delete 
command failed: external program exited with error status: 1

#

So I saw the errors previously and I see them now for me nothing 
changed, for

you that's obviously not the case so that probably needs more investigating.

.jh