Update: ezquake 3.1rc2 to 3.1

Hi,

Since games/ezquake was accepted, the final 3.1 version has since
come out. I've asked upstream to please provide a source tarball as
part of the release, and they did get back to me but haven't
done so yet. So here's a patch to get 3.1 built using GH_TAGNAME
for the time being.

Thanks,
Tom

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/ezquake/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile 15 Aug 2018 22:15:02 -0000 1.1.1.1
+++ Makefile 30 Aug 2018 18:20:37 -0000
@@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.1.1.1 2018/08/15 22:15:02 bcallah Exp $

COMMENT = modern QuakeWorld client
-DISTNAME = ezquake-3.1rc2
+DISTNAME = ezquake-3.1

GH_ACCOUNT = ezQuake
GH_PROJECT = ezquake-source
-GH_COMMIT = c0a4d0eaf3f1c12bcb43a028a4f75c533a0a0b1e
+GH_TAGNAME = 3.1

CATEGORIES = games

Index: distinfo
===================================================================
RCS file: /cvs/ports/games/ezquake/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo 15 Aug 2018 22:15:02 -0000 1.1.1.1
+++ distinfo 30 Aug 2018 18:20:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (ezquake-3.1rc2-c0a4d0ea.tar.gz) = ohZd4eERUtfIa5c65cqlWU48pFFBRkKdsPu6yXDGeb8=
-SIZE (ezquake-3.1rc2-c0a4d0ea.tar.gz) = 3743011
+SHA256 (ezquake-3.1.tar.gz) = WKAllPDUpjLDvjCKuxiwXN7YWiPijmsqX8P0nNTc0k4=
+SIZE (ezquake-3.1.tar.gz) = 3738048

Re: how to install perl modules w/ dependencies that mix packages & CPAN

On Sat, Sep 01, 2018 at 12:52:57AM +0000, Jonathan Thornburg wrote:
> What's the "OpenBSD way" to install Perl modules which don't exist
> as packages?
>
> The usual Perl idiom for "install module foo & all of its (recursive)
> dependencies" is "cpan install foo", but this fetches all dependencies
> from CPAN, ignoring any OpenBSD packages which may exist. What I'd like
> is something like "cpan install foo", but with the semantics that for
> each dependency, if there's OpenBSD package in /etc/installurl which
> is the same module version as the latest CPAN version, then install
> the OpenBSD package instead. Is there a utility already around which
> does this?
>

Afraid not.
I've only added or updated a very small number of Perl ports.
I've found that some are very simple to do. Just learn how and submit it
to ports@ (which is the correct list for this question, just remember
that for the future,please).

Others must have patches. Really, they need some minor but crucial
patches to be "OpenBSDified". This isn't linux.

And when you start to talk about recursively adding multiple
dependencies, that's where disaster strikes. A big mess with wrong
locations, wrong this, wrong that.

And exactly how would you even figure out the nightmare of updating or
removal? After all, you don't have any idea where anything is. Testing?
Not gonna work out.
Security? Oh yeah, that's not important, is it?
Your clients or your own data getting processed or lost? Oops!

This is why everything is moving as a solid unified system and packages.
Everything is examined by multiple eyes. Some Perl modules don't and
cannot ever work under OpenBSD.

Our ports system works well, but is plagued by all of those screwy
linuxisms.

Now, if you really want to do this sort of thing without adding to and
using the existing ports tree, feel free to.
See the instructions for doing a fresh re-install. You might need it.

Seriousness aside, it's a good question to ask and anyone coming from
another OS usually wants (expects?) to be able to do this.

Welcome to OpenBSD! It's a tight ship and those ships usually don't
sink! ;>)

Chris Bennett

Re: NEW: sysutils/ufetch

Attached is a newer version addressing some of your comments.

> 2018.07.21-git is not a valid version number.
I've changed the version from 2018.07.21-git to 2018.07.18, dropping
-git and moving the date to the latest change made to any of the files
used in this port.

I contacted upstream about tagging a release. I got an initial response
about hosting a versioned tarball, but have not heard back since.

> Why is there a V variable? You only use it once.
> License marker is just "# ISC"
> Please reel in the extra tabs.
Fixed. Is the tab style correct in the updated version?

> There's no MAINTAINER line. There should be one, and it should be you.
I intentionally left it off. It was my understanding that it was
alright to contribute a port without also being the maintainer. To
quote the Porting Guide:
> Porting some new software takes time. Maintaining it over time is
> harder. It is quite okay to port software and let other people
> handle it afterwards.

OK?

Re: how to install perl modules w/ dependencies that mix packages & CPAN

On Fri, Aug 31, 2018 at 10:08:48PM -0300, Alceu Rodrigues de Freitas Junior wrote:
> Em 31/08/2018 21:52, Jonathan Thornburg escreveu:
> > What's the "OpenBSD way" to install Perl modules which don't exist
> > as packages?
<SNIP>
> I'm afraid that is no such thing. My best would to search something on ports
> to do exactly that.

I don't know of anything in ports to automatically merge CPAN
dependencies and the ports tree, but I do know of portgen.

http://man.openbsd.org/portgen


> If there is no repository, you might want to take a look in ways to convert
> Perl modules from CPAN into OpenBSD packages. I know there is an effort to
> build those packages automatically for Linux (Ubuntu and CentOS).

portgen is pretty good at it, I usually start there. It gets you most
of the way to submitting something to be included in the ports tree.

I don't know that it will ever reach the point where it just pulls stuff
directly off the CPAN, but I do hope that someday what's required to
exist in the ports tree is fairly minimal. For now though, portgen will
create ports for the module and any dependencies that you can then
adjust for anything that was not detected automatically.


> Another possibility is to use perlbrew instead.

I do use plenv for testing things on multiple perl versions and with
different perl modules, but generally if I want to run something for
real, rather than just from my homedir, I'll make ports for the required
modules.

https://github.com/tokuhirom/plenv

l8rZ,
--
andrew - http://afresh1.com

Unix is very simple,
but it takes a genius to understand the simplicity.
-- Dennis Ritchie

Re: how to install perl modules w/ dependencies that mix packages & CPAN

I'm afraid that is no such thing. My best would to search something on
ports to do exactly that.

If there is no repository, you might want to take a look in ways to
convert Perl modules from CPAN into OpenBSD packages. I know there is an
effort to build those packages automatically for Linux (Ubuntu and CentOS).

Another possibility is to use perlbrew instead.

Regards,

Alceu


Em 31/08/2018 21:52, Jonathan Thornburg escreveu:
> What's the "OpenBSD way" to install Perl modules which don't exist
> as packages?
>
> The usual Perl idiom for "install module foo & all of its (recursive)
> dependencies" is "cpan install foo", but this fetches all dependencies
> from CPAN, ignoring any OpenBSD packages which may exist. What I'd like
> is something like "cpan install foo", but with the semantics that for
> each dependency, if there's OpenBSD package in /etc/installurl which
> is the same module version as the latest CPAN version, then install
> the OpenBSD package instead. Is there a utility already around which
> does this?
>

NEW: math/gap 4.9.2

Hello ports@,

pkg/DESCR-*:
GAP is a system for computational discrete algebra, with particular
emphasis on Computational Group Theory. GAP provides a programming
language, a library of thousands of functions implementing algebraic
algorithms written in the GAP language as well as large data libraries
of algebraic objects.

I split it into 3 packages:

* gap-main with the gap binary itself and the base packages without
which you can't even start gap.

* gap-docs with the manuals

* gap-pkgs with all of the other packages in the GAP distribution

There is a test suite you can run with `make test`, it passes for me
on amd64.

I decided to split this port up since the whole GAP distribution is
quite big, it takes up 1.4G on disk. The gap-main package is still
useful on its own, too, so it's not like everyone will need or want to
install all three packages.

--
Kaashif Hymabaccus
GPG: 3E810B04

how to install perl modules w/ dependencies that mix packages & CPAN

What's the "OpenBSD way" to install Perl modules which don't exist
as packages?

The usual Perl idiom for "install module foo & all of its (recursive)
dependencies" is "cpan install foo", but this fetches all dependencies
from CPAN, ignoring any OpenBSD packages which may exist. What I'd like
is something like "cpan install foo", but with the semantics that for
each dependency, if there's OpenBSD package in /etc/installurl which
is the same module version as the latest CPAN version, then install
the OpenBSD package instead. Is there a utility already around which
does this?

NEW: devel/py-chai-1.1.2 (cookiecutter porting cont.)

Hello,

In continuing to port cookiecutter I was led to find some extra
dependencies missing. This module is needed by a dependency for testing
purposes so is needed to continue working on this porting project.

py-chai is an easy to use API for mocking and stubbing framework based
on the unittest module.

- All tests pass for both py2 and py3
- No errors with `make package` on python2, there is a helper file for
Python 2 included which has a syntax error for python3 but `make
package` still works and does not seem to bother the module.
- No existing ports rely on this module.

Can I please get feedback on this and get it merged if things look good?

Thank you in advance,

--
Edward Lopez-Acosta

Re: [NEW] devel/wabt

On 08/31/18 12:25, Fabian Raetz wrote:
> On Fri, Aug 31, 2018 at 02:40:26PM +0200, Raphael Graf wrote:
>> Hi Fabian
>>
>> On 08/31/18 02:00, Fabian Raetz wrote:
>>> On Thu, Aug 30, 2018 at 06:49:34PM -0400, Brian Callahan wrote:
>>>> On 08/30/18 18:35, Brian Callahan wrote:
>>>>> Hi Fabian --
>>>>>
>>>>> On 08/30/18 17:28, Fabian Raetz wrote:
>>>>>> On Thu, Aug 30, 2018 at 05:12:35PM -0400, Brian Callahan wrote:
>>>>>>> Hi Fabian --
>>>>>>>
>>>>>>> On 08/30/18 16:42, Fabian Raetz wrote:
>>>>>>>> Hi all.
>>>>>>>>
>>>>>>>> i've been using the "WebAssembly Binary Toolkit" lately and
>>>>>>>> thought i create a
>>>>>>>> proper port for it.
>>>>>>>>
>>>>>>>> The port doesn't support running the tests as they require
>>>>>>>> some git submodules including
>>>>>>>> the gtest source. Sadly, my cmake skills are not good enough
>>>>>>>> to make the build system
>>>>>>>> use gtest from ports so i decided against it for the moment.
>>>>>>>>
>>>>>>>> In case you wanna compile a small WebAssembly programm
>>>>>>>> yourself, take a look at
>>>>>>>> https://jameshfisher.com/2017/10/13/webassembly-hello-world.html
>>>>>>>>
>>>>>>>> Cheers,
>>>>>>>> Fabian
>>>>>>>>
>>>>>>>> HOMEPAGE: https://github.com/WebAssembly/wabt
>>>>>>>>
>>>>>>>> DESCR:
>>>>>>>> WABT (we pronounce it "wabbit") is a suite of tools for
>>>>>>>> WebAssembly, including:
>>>>>>>>
>>>>>>>> wat2wasm:     translate from WebAssembly text format to the
>>>>>>>> WebAssembly binary
>>>>>>>>                 format
>>>>>>>> wasm2wat:     the inverse of wat2wasm, translate from the
>>>>>>>> binary format back
>>>>>>>>         to the text format (also known as a .wat)
>>>>>>>> wasm-objdump:     print information about a wasm binary.
>>>>>>>> Similiar to objdump.
>>>>>>>> wasm-interp:     decode and run a WebAssembly binary file
>>>>>>>> using a stack-based
>>>>>>>>                    interpreter
>>>>>>>> wat-desugar:     parse .wat text form as supported by the
>>>>>>>> spec interpreter
>>>>>>>>                    (s-expressions, flat syntax, or mixed)
>>>>>>>> and print "canonical"
>>>>>>>>                    flat format
>>>>>>>> wasm2c:     convert a WebAssembly binary file to a C source and header
>>>>>>>>
>>>>>>>>
>>>>>>> Is this different from the wabt port I ok'd here?
>>>>>>> https://marc.info/?l=openbsd-ports&m=152950481400669&w=2
>>>>>> There are some subtle differences. The port I sent is in the
>>>>>> category "devel"
>>>>>> instead of "lang". Also, I packaged version 1.0.5 where the local
>>>>>> patch is
>>>>>> already included. DESCR is also slightly different with regards to
>>>>>> formating.
>>>>>>
>>>>>> Otherwise both port are equal :)
>>>>> I changed the DESCR formatting to be different than both of them:
>>>>> ---
>>>>> WABT (we pronounce it "wabbit") is a suite of tools for WebAssembly,
>>>>> including:
>>>>>
>>>>> wat2wasm:
>>>>>   translate from WebAssembly text format to the WebAssembly binary format
>>>>>
>>>>> wasm2wat:
>>>>>   the inverse of wat2wasm, translate from the binary format back to the
>>>>>   text format (also known as a .wat)
>>>>>
>>>>> wasm-objdump:
>>>>>   print information about a wasm binary. Similiar to objdump.
>>>>>
>>>>> wasm-interp:
>>>>>   decode and run a WebAssembly binary file using a stack-based
>>>>> interpreter
>>>>>
>>>>> wat-desugar:
>>>>>   parse .wat text form as supported by the spec interpreter
>>>>>   (s-expressions, flat syntax, or mixed) and print "canonical" flat
>>>>> format
>>>>>
>>>>> wasm2c:
>>>>>   convert a WebAssembly binary file to a C source and header
>>>>> ---
>>>
>>> Thanks for your review :)
>>>
>>> I attached a new tar which integrates your feedback. Some comments inline ...
>>>
>>>>> It reads better for my eyes but I guess these things eventually become a
>>>>> matter of opinion.
>>>>>
>>>>> On the more necessary side of things:
>>>>> * the build picks up a -Werror that has to go
>>> I patched the CMakeLists.txt. Is there a better way to this?
>>>
>>>>> * CMake will pick up re2c if you have it installed so either set
>>>>> -DRUN_RE2C=OFF in CONFIGURE_ARGS or add a BDEP on re2c.
>>> Added the BDEP because the option is on by default.
>> re2c is only needed when you make changes to the lexer, I would prefer
>> not to make this a build dependency.
>>
> Hi.
>
> Yes, you're right. Attached is a new tarball which uses the included lexer
> by adding -DRUN_RE2C=OFF and removed the BUILD_DEPENDS.

A few more things, then I think it's ok for import.
* Bonus newline at the end of pkg/DESCR
* Usually I see COMPILER=base-clang ports-gcc but I don't know how much
that matters nowadays
* Judging by the CMakeLists.txt, python is only used running the tests,
since we are using the prebuilt stuff. So maybe better is to remove the
find_package for Python from CMakeLists.txt and then we can get rid of
the python MODULE.

~Brian

> Thanks,
> Fabian
>
>>>>> * It's C++11, so needs a COMPILER line.
>>> Done.
>>>
>>>>> * It looks for, and finds, python. Do we need to add MODULES=lang/python?
>>>>>
>>>>> There's no MAINTAINER. Either of you want to do it?
>>> I would take it and added myself as MAINTAINER if that's ok for Raphael
>> sure..
>>
>>>> And now that I think about it, I think I like this living in lang/. devel/
>>>> is overloaded, and we can at least justify this one living somewhere else.
>>> Done.
>>>
>>>> ~Brian
>>>>
>>>>> ~Brian
>>>>>
>>>>>>> I'm still waiting for an OK to import that one.
>>>>>>>
>>>>>>> ~Brian

Re: libreoffice do not print but crash

On Fri, 31 Aug 2018 23:19:54 +0200
Landry Breuil wrote:

> On Fri, Aug 31, 2018 at 10:48:19PM +0200, vincent delft wrote:
> > Hello,
> >
> > I'm using -current and since few days, maybe the new release of
> > Libreoffice (6.1.0.3), I'm no more able to print, print to file or
> > export to pdf. My test case is to print from a new calc sheet where
> > 1 cell is containing a small text (like "hello" for example).
> >
> > I had the problem with -current of 24/08/2018 and I still see this
> > problem with -current of 31/08/2018.
> >
> > I've tried in "safe mode" too (with option --safe-mode), but the
> > problem remains.
> >
> > Am I the only one having the problem ?
>
> Same thing for me when exporting a pdf from draw.
>

Hi,

Same issue on my amd64 machine. I tried to see if that could be
bypassed, by using the headless mode, and it crashes while exporting
a PDF.

It impacts writer as well.

Log:

$ libreoffice --headless --convert-to pdf calc.ods
Warning: failed to launch javaldx - java may not function correctly
func=xmlSecCheckVersionExt:file=xmlsec.c:line=188:obj=unknown:subj=unknown:error=19:invalid
version:mode=abi compatible;expected minor version=2;real minor
version=2;expected subminor version=25;real subminor version=26
convert /shm/calc.ods -> /shm/calc.pdf using filter : calc_pdf_Export
Application Error

Charlène.

Re: libreoffice do not print but crash

On Fri, Aug 31, 2018 at 10:48:19PM +0200, vincent delft wrote:
> Hello,
>
> I'm using -current and since few days, maybe the new release of Libreoffice
> (6.1.0.3), I'm no more able to print, print to file or export to pdf.
> My test case is to print from a new calc sheet where 1 cell is containing a
> small text (like "hello" for example).
>
> I had the problem with -current of 24/08/2018 and I still see this problem
> with -current of 31/08/2018.
>
> I've tried in "safe mode" too (with option --safe-mode), but the problem
> remains.
>
> Am I the only one having the problem ?

Same thing for me when exporting a pdf from draw.

Re: rm ports marked as BROKEN for years?

On 08/31/18 04:38, Martijn van Duren wrote:
> So here's an updated diff that's been tried and tested.
> I placed a comment in both the Makefile and the DESCR so that both users
> and future ports maintainers see that it might not work on every system.
>
> OK?

I can't directly test this myself as you know. But if this works for
Intel GPUs then it's ok for me.

~Brian

> martijn@
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/fretsonfire/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile 29 Sep 2015 10:52:12 -0000 1.15
> +++ Makefile 31 Aug 2018 08:37:30 -0000
> @@ -1,6 +1,7 @@
> # $OpenBSD: Makefile,v 1.15 2015/09/29 10:52:12 sthen Exp $
>
> -BROKEN = fails at runtime "python2.7 in free(): error: modified chunk-pointer 0x..."
> +# This port is known to generate errors on (some) radeon cards.
> +# Intel cards appear to work fine.
>
> V = 1.3.110
> COMMENT = guitar hero clone
> Index: patches/patch-src_Texture_py
> ===================================================================
> RCS file: /cvs/ports/games/fretsonfire/patches/patch-src_Texture_py,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-src_Texture_py
> --- patches/patch-src_Texture_py 6 Apr 2014 21:10:25 -0000 1.1
> +++ patches/patch-src_Texture_py 31 Aug 2018 08:37:30 -0000
> @@ -1,6 +1,7 @@
> $OpenBSD: patch-src_Texture_py,v 1.1 2014/04/06 21:10:25 sthen Exp $
> ---- src/Texture.py.orig Sun Apr 6 18:28:33 2014
> -+++ src/Texture.py Sun Apr 6 18:29:48 2014
> +Index: src/Texture.py
> +--- src/Texture.py.orig
> ++++ src/Texture.py
> @@ -24,10 +24,10 @@ from __future__ import division
>
> import Log
> @@ -14,3 +15,41 @@ $OpenBSD: patch-src_Texture_py,v 1.1 201
> from OpenGL.GL import *
> from OpenGL.GLU import *
> from Queue import Queue, Empty
> +@@ -210,13 +210,13 @@ class Texture:
> + """Load the texture from a PIL image"""
> + image = image.transpose(Image.FLIP_TOP_BOTTOM)
> + if image.mode == "RGBA":
> +- string = image.tostring('raw', 'RGBA', 0, -1)
> ++ string = image.tobytes('raw', 'RGBA', 0, -1)
> + self.loadRaw(image.size, string, GL_RGBA, 4)
> + elif image.mode == "RGB":
> +- string = image.tostring('raw', 'RGB', 0, -1)
> ++ string = image.tobytes('raw', 'RGB', 0, -1)
> + self.loadRaw(image.size, string, GL_RGB, 3)
> + elif image.mode == "L":
> +- string = image.tostring('raw', 'L', 0, -1)
> ++ string = image.tobytes('raw', 'L', 0, -1)
> + self.loadRaw(image.size, string, GL_LUMINANCE, 1)
> + else:
> + raise TextureException("Unsupported image mode '%s'" % image.mode)
> +@@ -254,16 +254,16 @@ class Texture:
> + if monochrome:
> + # pygame doesn't support monochrome, so the fastest way
> + # appears to be using PIL to do the conversion.
> +- string = pygame.image.tostring(surface, "RGB")
> ++ string = pygame.image.tobytes(surface, "RGB")
> + image = Image.fromstring("RGB", surface.get_size(), string).convert("L")
> +- string = image.tostring('raw', 'L', 0, -1)
> ++ string = image.tobytes('raw', 'L', 0, -1)
> + self.loadRaw(surface.get_size(), string, GL_LUMINANCE, GL_INTENSITY8)
> + else:
> + if alphaChannel:
> +- string = pygame.image.tostring(surface, "RGBA", True)
> ++ string = pygame.image.tobytes(surface, "RGBA", True)
> + self.loadRaw(surface.get_size(), string, GL_RGBA, 4)
> + else:
> +- string = pygame.image.tostring(surface, "RGB", True)
> ++ string = pygame.image.tobytes(surface, "RGB", True)
> + self.loadRaw(surface.get_size(), string, GL_RGB, 3)
> + self.size = (w / w2, h / h2)
> +
> Index: pkg/DESCR
> ===================================================================
> RCS file: /cvs/ports/games/fretsonfire/pkg/DESCR,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 DESCR
> --- pkg/DESCR 16 Oct 2009 23:11:38 -0000 1.1.1.1
> +++ pkg/DESCR 31 Aug 2018 08:37:30 -0000
> @@ -10,3 +10,5 @@ Features
> * Supports importing Guitar Hero I and Guitar Hero II songs
> * Multiplatform; runs on Windows, Linux, Mac OS X, OpenBSD and FreeBSD
> * Open source, full Python source code available
> +
> +This game is known to crash on some (mostly radeon) graphics card.
>

[UPDATE] py-zmq 16.0.3 -> 17.1.2

Index: net/py-zmq/Makefile
===================================================================
RCS file: /cvs/ports/net/py-zmq/Makefile,v
retrieving revision 1.17
diff -u -p -u -r1.17 Makefile
--- net/py-zmq/Makefile 22 Dec 2017 10:24:05 -0000 1.17
+++ net/py-zmq/Makefile 31 Aug 2018 20:48:06 -0000
@@ -2,7 +2,7 @@

COMMENT = Python bindings for ZeroMQ

-MODPY_EGG_VERSION = 16.0.3
+MODPY_EGG_VERSION = 17.1.2
DISTNAME = pyzmq-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:S/py/py-/}

@@ -10,7 +10,7 @@ CATEGORIES = net devel

HOMEPAGE = https://github.com/zeromq/pyzmq/

-MAINTAINER = Alexandr Shadchin <shadchin@openbsd.org>
+MAINTAINER = Elias M. Mariani <marianielias@gmail.com>

# LGPLv3/BSD
PERMIT_PACKAGE_CDROM = Yes
@@ -21,10 +21,6 @@ MODULES = lang/python

LIB_DEPENDS = ${MODPY_LIB_DEPENDS} \
net/zeromq
-
-# ssh tunnelling
-RUN_DEPENDS = security/py-paramiko${MODPY_FLAVOR} \
- devel/py-pexpect${MODPY_FLAVOR}

MODPY_PI = Yes
MODPY_DISTUTILS_BUILDARGS = --zmq=${LOCALBASE}
Index: net/py-zmq/distinfo
===================================================================
RCS file: /cvs/ports/net/py-zmq/distinfo,v
retrieving revision 1.12
diff -u -p -u -r1.12 distinfo
--- net/py-zmq/distinfo 22 Dec 2017 10:24:05 -0000 1.12
+++ net/py-zmq/distinfo 31 Aug 2018 20:48:06 -0000
@@ -1,2 +1,2 @@
-SHA256 (pyzmq-16.0.3.tar.gz) = iog4JBR1I8D+dtJH3ViZTBwo7wfxzF3eWVpP0cKPJYA=
-SIZE (pyzmq-16.0.3.tar.gz) = 1063036
+SHA256 (pyzmq-17.1.2.tar.gz) = pyuCrBkQ8s9hpJE59JdPmUmER193Gw+qcwg5YH7u3d8=
+SIZE (pyzmq-17.1.2.tar.gz) = 1080194
Index: net/py-zmq/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/py-zmq/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -u -r1.10 PLIST
--- net/py-zmq/pkg/PLIST 15 Jan 2017 13:28:04 -0000 1.10
+++ net/py-zmq/pkg/PLIST 31 Aug 2018 20:48:06 -0000
@@ -4,8 +4,10 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zmq/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zmq/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/zmq/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zmq/${MODPY_PYCACHE}_future.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zmq/_future.py
lib/python${MODPY_VERSION}/site-packages/zmq/asyncio/
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zmq/asyncio/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zmq/asyncio/${MODPY_PYCACHE}/
@@ -96,9 +98,11 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/${MODPY_PYCACHE}_deprecated.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/${MODPY_PYCACHE}future.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/${MODPY_PYCACHE}ioloop.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/${MODPY_PYCACHE}zmqstream.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/_deprecated.py
lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/future.py
lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/ioloop.py
lib/python${MODPY_VERSION}/site-packages/zmq/eventloop/minitornado/
@@ -194,6 +198,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_context.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_decorators.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_device.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_draft.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_error.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_etc.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/zmq/tests/${MODPY_PYCACHE}test_future.${MODPY_PYC_MAGIC_TAG}pyc
@@ -231,6 +236,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_context.py
lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_decorators.py
lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_device.py
+lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_draft.py
lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_error.py
lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_etc.py
lib/python${MODPY_VERSION}/site-packages/zmq/tests/test_future.py
@@ -277,6 +283,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/zmq/utils/ipcmaxlen.h
lib/python${MODPY_VERSION}/site-packages/zmq/utils/jsonapi.py
lib/python${MODPY_VERSION}/site-packages/zmq/utils/monitor.py
+lib/python${MODPY_VERSION}/site-packages/zmq/utils/mutex.h
lib/python${MODPY_VERSION}/site-packages/zmq/utils/pyversion_compat.h
lib/python${MODPY_VERSION}/site-packages/zmq/utils/sixcerpt.py
lib/python${MODPY_VERSION}/site-packages/zmq/utils/strtypes.py
-Taking maintainership. (Already talked with Alexandr).

-Changelog:
https://pyzmq.readthedocs.io/en/latest/changelog.html

I see no possible problems with the update.
Self-testing returns the same as the current version, the same for the
consumers. There are some problems with the self-test not working, is
not something that has to do with the update, the problem was there
with the old version. I will try to figure it out when I have the
time.

I removed two RUN_DEPENDS that are not mandatory to use py-zmq, they
are picked on runtime if needed. (I don't think that any consumer is
affected).

Cheers.
Elias.

libreoffice do not print but crash

Hello,

I'm using -current and since few days, maybe the new release of Libreoffice
(6.1.0.3), I'm no more able to print, print to file or export to pdf.
My test case is to print from a new calc sheet where 1 cell is containing a
small text (like "hello" for example).

I had the problem with -current of 24/08/2018 and I still see this problem
with -current of 31/08/2018.

I've tried in "safe mode" too (with option --safe-mode), but the problem
remains.

Am I the only one having the problem ?


regards

Re: isakmpd and iked on the same box

Tommy Nevtelen wrote on 31-8-2018 16:12:
> On 2018-08-31 10:44, Daniel Polak wrote:
>
>>
>> Tommy Nevtelen wrote on 30-8-2018 23:13:
>>> We use isakmpd to interconnect 30ish routers and I would like to switch
>>> to iked, but since there is no support to run both at the same time it
>>> makes it quite hard to migrate slowly. Will basically need to do it all
>>> at the same time and that is not very good for SLAs which complicates
>>> things. Or am I missing something?
>> Would it work for you to add a separate VPN gateway with iked next to
>> the VPN gateway running isakmpd?
>> If you do that you can then set routes to direct traffic for networks
>> that have migrated to ikev2 to the iked gateway.
> Sure, there are many solutions.
> But that is kind of a lot of work and investment in hardware compared
> to just running both at the same time right?
Of course it is but if the work on and the investment in software has
not been done for you by the OpenBSD developers (or sometimes their
sponsors) then that's how it is.
Needs must.

Re: [NEW] net/qbittorrent 4.1.2

Hi!

I tested the port on amd64:

- The build is fine
- Installed the -nox package
- Started downloading a torrent
- Installed the main package on top of that, no errors.
- The download has been finished properly.
- Deinstalling caused no issues as well.

I met the same segfaults at exit that Elias mentioned earlier with
the Qt interface, but it doesn't affect the stability of the program
itself.

As a user, it's fine for me.

Charlène.


On Fri, 31 Aug 2018 16:44:35 -0300
Elias M. Mariani wrote:

> Sorry for pinging,
> Just a small change to the README of qbittorrent-nox, tweak from
> Charlene Wendling.
>
> Cheers.
> Elias.
>
> 2018-08-28 16:34 GMT-03:00 Elias M. Mariani <marianielias@gmail.com>:
> > Separate ports sharing the same parent folder (net/qbittorrent) it
> > is then.
> >
> >
> > 2018-08-27 20:04 GMT-03:00 Stuart Henderson <stu@spacehopper.org>:
> >> On 2018/08/27 19:30, Elias M. Mariani wrote:
> >>> Yes, but in this case they are built separately and the do not
> >>> share any files.
> >>>
> >>> Cheers.
> >>> Elias.
> >>>
> >>> 2018-08-27 18:14 GMT-03:00 Stuart Henderson <stu@spacehopper.org>:
> >>> > On 2018/08/27 15:17, Elias M. Mariani wrote:
> >>> >> Also if someone could check if I'm using correctly the FLAVORS.
> >>> >> The port creates 2 packages that are built separately:
> >>> >> - qbittorrent (Qt5 + web interface)
> >>> >> - qbittorrent-nox (web interface only)
> >>> >> My doubts come when using the PLIST when all the files are
> >>> >> different. (I think that is OK but getting feedback doesn't
> >>> >> hurt...)
> >>> >
> >>> > That would usually be done a single build (i.e. get rid of the
> >>> > flavour, split it in the packaging stage instead using
> >>> > MULTI_PACKAGES and PLIST-main and PLIST-nox).
> >>> >
> >>>
> >>
> >> Multiple flavours are for when you build mostly the same files with
> >> different options. You can skip some files for certain flavours,
> >> but when there is no overlap at all, that is not the situation
> >> flavours are meant to deal with.
> >>
> >> Can you get both of them to build in a single run? If so,
> >> MULTI_PACKAGES. If not, separate ports (can share a parent
> >> directory and some scaffolding via Makefile.inc).
> >>

Re: [NEW] net/qbittorrent 4.1.2

Sorry for pinging,
Just a small change to the README of qbittorrent-nox, tweak from
Charlene Wendling.

Cheers.
Elias.

2018-08-28 16:34 GMT-03:00 Elias M. Mariani <marianielias@gmail.com>:
> Separate ports sharing the same parent folder (net/qbittorrent) it is then.
>
>
> 2018-08-27 20:04 GMT-03:00 Stuart Henderson <stu@spacehopper.org>:
>> On 2018/08/27 19:30, Elias M. Mariani wrote:
>>> Yes, but in this case they are built separately and the do not share any files.
>>>
>>> Cheers.
>>> Elias.
>>>
>>> 2018-08-27 18:14 GMT-03:00 Stuart Henderson <stu@spacehopper.org>:
>>> > On 2018/08/27 15:17, Elias M. Mariani wrote:
>>> >> Also if someone could check if I'm using correctly the FLAVORS.
>>> >> The port creates 2 packages that are built separately:
>>> >> - qbittorrent (Qt5 + web interface)
>>> >> - qbittorrent-nox (web interface only)
>>> >> My doubts come when using the PLIST when all the files are different.
>>> >> (I think that is OK but getting feedback doesn't hurt...)
>>> >
>>> > That would usually be done a single build (i.e. get rid of the flavour,
>>> > split it in the packaging stage instead using MULTI_PACKAGES and PLIST-main
>>> > and PLIST-nox).
>>> >
>>>
>>
>> Multiple flavours are for when you build mostly the same files with
>> different options. You can skip some files for certain flavours, but
>> when there is no overlap at all, that is not the situation flavours
>> are meant to deal with.
>>
>> Can you get both of them to build in a single run? If so, MULTI_PACKAGES.
>> If not, separate ports (can share a parent directory and some scaffolding
>> via Makefile.inc).
>>

Re: update games/minecraft

On Sat, Aug 11 2018, Solene Rapenne <solene@perso.pw> wrote:
> bump the minecraft script from 0.4 to 0.6, from the git commits
> it only increase the datasize to max available when running.

Indeed, the diff between the two tarballs is trivial. ok jca@

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/minecraft/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile 29 Jun 2018 22:16:14 -0000 1.9
> +++ Makefile 10 Aug 2018 22:22:21 -0000
> @@ -5,7 +5,7 @@ PORTROACH_COMMENT=version 0.1 is actuall
>
> COMMENT= wrapper for a game about breaking and placing blocks
>
> -V= 0.0.4
> +V= 0.0.6
> GH_PROJECT= minecraft
> GH_ACCOUNT= qbit
> GH_TAGNAME= ${GH_PROJECT}-${V}
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/minecraft/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo 14 Oct 2014 18:45:10 -0000 1.1.1.1
> +++ distinfo 10 Aug 2018 22:22:21 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (minecraft-0.0.4.tar.gz) = 8RycJ5mY1DCd5nZOOyAnBqw0MP3aNe9Bql9xycTxK8A=
> -SIZE (minecraft-0.0.4.tar.gz) = 2897
> +SHA256 (minecraft-0.0.6.tar.gz) = mpsCsn+sN5cggaB2vRz9CMUoLto+vAMYlnE5jduAjQA=
> +SIZE (minecraft-0.0.6.tar.gz) = 2882
>

--
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE

Re: [NEW] devel/wabt

On Fri, Aug 31, 2018 at 02:40:26PM +0200, Raphael Graf wrote:
> Hi Fabian
>
> On 08/31/18 02:00, Fabian Raetz wrote:
> > On Thu, Aug 30, 2018 at 06:49:34PM -0400, Brian Callahan wrote:
> > >
> > > On 08/30/18 18:35, Brian Callahan wrote:
> > > > Hi Fabian --
> > > >
> > > > On 08/30/18 17:28, Fabian Raetz wrote:
> > > > > On Thu, Aug 30, 2018 at 05:12:35PM -0400, Brian Callahan wrote:
> > > > > > Hi Fabian --
> > > > > >
> > > > > > On 08/30/18 16:42, Fabian Raetz wrote:
> > > > > > > Hi all.
> > > > > > >
> > > > > > > i've been using the "WebAssembly Binary Toolkit" lately and
> > > > > > > thought i create a
> > > > > > > proper port for it.
> > > > > > >
> > > > > > > The port doesn't support running the tests as they require
> > > > > > > some git submodules including
> > > > > > > the gtest source. Sadly, my cmake skills are not good enough
> > > > > > > to make the build system
> > > > > > > use gtest from ports so i decided against it for the moment.
> > > > > > >
> > > > > > > In case you wanna compile a small WebAssembly programm
> > > > > > > yourself, take a look at
> > > > > > > https://jameshfisher.com/2017/10/13/webassembly-hello-world.html
> > > > > > >
> > > > > > > Cheers,
> > > > > > > Fabian
> > > > > > >
> > > > > > > HOMEPAGE: https://github.com/WebAssembly/wabt
> > > > > > >
> > > > > > > DESCR:
> > > > > > > WABT (we pronounce it "wabbit") is a suite of tools for
> > > > > > > WebAssembly, including:
> > > > > > >
> > > > > > > wat2wasm:     translate from WebAssembly text format to the
> > > > > > > WebAssembly binary
> > > > > > >                 format
> > > > > > > wasm2wat:     the inverse of wat2wasm, translate from the
> > > > > > > binary format back
> > > > > > >         to the text format (also known as a .wat)
> > > > > > > wasm-objdump:     print information about a wasm binary.
> > > > > > > Similiar to objdump.
> > > > > > > wasm-interp:     decode and run a WebAssembly binary file
> > > > > > > using a stack-based
> > > > > > >                    interpreter
> > > > > > > wat-desugar:     parse .wat text form as supported by the
> > > > > > > spec interpreter
> > > > > > >                    (s-expressions, flat syntax, or mixed)
> > > > > > > and print "canonical"
> > > > > > >                    flat format
> > > > > > > wasm2c:     convert a WebAssembly binary file to a C source and header
> > > > > > >
> > > > > > >
> > > > > > Is this different from the wabt port I ok'd here?
> > > > > > https://marc.info/?l=openbsd-ports&m=152950481400669&w=2
> > > > > There are some subtle differences. The port I sent is in the
> > > > > category "devel"
> > > > > instead of "lang". Also, I packaged version 1.0.5 where the local
> > > > > patch is
> > > > > already included. DESCR is also slightly different with regards to
> > > > > formating.
> > > > >
> > > > > Otherwise both port are equal :)
> > > >
> > > > I changed the DESCR formatting to be different than both of them:
> > > > ---
> > > > WABT (we pronounce it "wabbit") is a suite of tools for WebAssembly,
> > > > including:
> > > >
> > > > wat2wasm:
> > > >   translate from WebAssembly text format to the WebAssembly binary format
> > > >
> > > > wasm2wat:
> > > >   the inverse of wat2wasm, translate from the binary format back to the
> > > >   text format (also known as a .wat)
> > > >
> > > > wasm-objdump:
> > > >   print information about a wasm binary. Similiar to objdump.
> > > >
> > > > wasm-interp:
> > > >   decode and run a WebAssembly binary file using a stack-based
> > > > interpreter
> > > >
> > > > wat-desugar:
> > > >   parse .wat text form as supported by the spec interpreter
> > > >   (s-expressions, flat syntax, or mixed) and print "canonical" flat
> > > > format
> > > >
> > > > wasm2c:
> > > >   convert a WebAssembly binary file to a C source and header
> > > > ---
> >
> >
> > Thanks for your review :)
> >
> > I attached a new tar which integrates your feedback. Some comments inline ...
> >
> > > >
> > > > It reads better for my eyes but I guess these things eventually become a
> > > > matter of opinion.
> > > >
> > > > On the more necessary side of things:
> > > > * the build picks up a -Werror that has to go
> >
> > I patched the CMakeLists.txt. Is there a better way to this?
> >
> > > > * CMake will pick up re2c if you have it installed so either set
> > > > -DRUN_RE2C=OFF in CONFIGURE_ARGS or add a BDEP on re2c.
> >
> > Added the BDEP because the option is on by default.
>
> re2c is only needed when you make changes to the lexer, I would prefer
> not to make this a build dependency.
>

Hi.

Yes, you're right. Attached is a new tarball which uses the included lexer
by adding -DRUN_RE2C=OFF and removed the BUILD_DEPENDS.

Thanks,
Fabian

> >
> > > > * It's C++11, so needs a COMPILER line.
> >
> > Done.
> >
> > > > * It looks for, and finds, python. Do we need to add MODULES=lang/python?
> > > >
> > > > There's no MAINTAINER. Either of you want to do it?
> >
> > I would take it and added myself as MAINTAINER if that's ok for Raphael
>
> sure..
>
> >
> > > >
> > >
> > > And now that I think about it, I think I like this living in lang/. devel/
> > > is overloaded, and we can at least justify this one living somewhere else.
> >
> > Done.
> >
> > >
> > > ~Brian
> > >
> > > > ~Brian
> > > >
> > > > > > I'm still waiting for an OK to import that one.
> > > > > >
> > > > > > ~Brian
> > > >
> > >
>

Re: isakmpd and iked on the same box

Hello Philipp,

I use to (reliably) run from two to four parallel instances of isakmpd on
same boxes (for years) - first using different ports, then different IPs.
It seems like they've had to (peacefully) share the SADB. Did I just not
have enough tunnels to trigger the problem? If this isn't the case, why
can't iked be as "nice" as isakmpd? Just wondering.


Thursday, August 30, 2018, 10:39:21 AM, you wrote:

PB> Hi,

PB> Am 30.08.2018 10:27 schrieb Sebastian Reitenbach:
>> Hi,
>>
>> I'm wondering if it would be possible to add iked to my box already
>> running isakmpd.
>> I found this quite old thread:
>> http://openbsd-archive.7691.n7.nabble.com/iked-isakmpd-on-the-same-machine-td246610.html

PB> Why is it "always" my old threads in this area? :-)

PB> I was not following development too closely, but I think that on the
PB> kernel side
PB> things have not changed. Which means iked and isakmpd will happily "toe
PB> tap"
PB> on each others SADB in the kernel (even if there is *some* PID
PB> handling).

PB> Would like to hear if kernel side has "improved" lately, but the overall
PB> standpoint
PB> looks like: IKEv1 is dead (e.g. see the removal of IKEv1 stubs in iked
PB> some "months ago").

PB> [Still stuck with my ikev2 with strongswan on a different box solution]

PB> HTH... wait, no:
PB> ciao

--
Best regards,
Boris mailto:psilon@prodigy.net

UPDATE: devel/cmocka 1.1.1 => 1.1.2

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmocka/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile 1 Jan 2018 18:11:46 -0000 1.10
+++ Makefile 31 Aug 2018 14:26:13 -0000
@@ -2,12 +2,11 @@

COMMENT = elegant unit testing framework for C

-DISTNAME = cmocka-1.1.1
-REVISION = 0
+DISTNAME = cmocka-1.1.2

EXTRACT_SUFX = .tar.xz

-SHARED_LIBS += cmocka 0.2 # 0.4
+SHARED_LIBS += cmocka 0.3 # 0.4

CATEGORIES = devel

Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/cmocka/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 9 Jun 2017 13:36:08 -0000 1.4
+++ distinfo 31 Aug 2018 14:26:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (cmocka-1.1.1.tar.xz) = 8C70inA5qncZHVJcWxruPxMoa3ehNhXRG8EUh1P8A4k=
-SIZE (cmocka-1.1.1.tar.xz) = 85648
+SHA256 (cmocka-1.1.2.tar.xz) = 0RzR4SmCf/JApQHBxDVX6Ajeiej82KueljyNtBkzK90=
+SIZE (cmocka-1.1.2.tar.xz) = 82300
Index: patches/patch-include_cmocka_h
===================================================================
RCS file: /cvs/ports/devel/cmocka/patches/patch-include_cmocka_h,v
retrieving revision 1.7
diff -u -p -r1.7 patch-include_cmocka_h
--- patches/patch-include_cmocka_h 23 Sep 2016 19:45:39 -0000 1.7
+++ patches/patch-include_cmocka_h 31 Aug 2018 14:26:13 -0000
@@ -2,18 +2,19 @@ $OpenBSD: patch-include_cmocka_h,v 1.7 2

Avoid a conflicting typedef on 32-bit arch.

---- include/cmocka.h.orig Wed Sep 21 15:31:28 2016
-+++ include/cmocka.h Wed Sep 21 17:33:59 2016
-@@ -56,7 +56,7 @@ int __stdcall IsDebuggerPresent();
+Index: include/cmocka.h
+--- include/cmocka.h.orig
++++ include/cmocka.h
+@@ -57,7 +57,7 @@ int __stdcall IsDebuggerPresent();

/* If __WORDSIZE is not set, try to figure it out and default to 32 bit. */
#ifndef __WORDSIZE
--# if defined(__x86_64__) && !defined(__ILP32__)
+-# if (defined(__x86_64__) && !defined(__ILP32__)) || defined(__sparc_v9__) || defined(__sparcv9)
+# if defined(_LP64)
# define __WORDSIZE 64
# else
# define __WORDSIZE 32
-@@ -109,6 +109,9 @@ typedef uintmax_t LargestIntegralType;
+@@ -110,6 +110,9 @@ typedef uintmax_t LargestIntegralType;
#define cast_to_largest_integral_type(value) \
((LargestIntegralType)(value))

@@ -23,7 +24,7 @@ Avoid a conflicting typedef on 32-bit ar
/* Smallest integral type capable of holding a pointer. */
#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
# if defined(_WIN32)
-@@ -137,6 +140,7 @@ typedef uintmax_t LargestIntegralType;
+@@ -138,6 +141,7 @@ typedef uintmax_t LargestIntegralType;
# define _UINTPTR_T
# define _UINTPTR_T_DEFINED
#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */
Hi ports --

Attached is an update for devel/cmocka.

Not too much from upstream, this is the entirety of the ChangeLog:
Wed Aug 29 2018 Andreas Schneider <asn@cryptomilk.org>
    * cmocka version 1.1.2
    * Added function to filter tests (cmocka_set_test_filter)
    * Added new mocking example (uptime)
    * Fixed fixture error reporting
    * Fixed compiler flags detection
    * Some improvement for API documentation

That's good enough for a minor bump to the shared library.

cmocka is only used as a BDEP for a handful of ports (libssh, gnutls,
and samba). Everything builds ok (on amd64) with the new cmocka. More
tests appreciated.

OK?

~Brian

Re: update mail/hypermail from 2.1.8 to 2.3.0

Hiltjo Posthuma <hiltjo@codemadness.org> wrote:
> On Wed, Aug 15, 2018 at 06:10:51PM +0100, Stuart Henderson wrote:
> > On 2018/08/14 17:45, Hiltjo Posthuma wrote:
> > > +Use base pcre library.
> >
> > This is a bit confusing - there's no pcre library in base (it's in
> > packages), and the second part of the patch is something to do with
> > restoring LDFLAGS. I'd either skip the comment, or reword ("don't
> > use bundled pcre" perhaps?) and explain both parts.
> >
> > > +Use the proper hmrc man page category number 5 for file formats.
> >
> > It doesn't hurt, but this seems a bit superfluous, the patches
> > speak for themselves.
> >
>
> Hi,
>
> Thanks for the feedback. I also made a few other mistakes:
>
> Changes vs previous patch:
>
> - Remove superfluous comments.
> - Don't update the patch which don't have line (offset) changes.
> - Add patch back again for doc/hypermail.html, line offset changed.
>
>

still ok solene@ with last patches

I tested it quickly with cat /var/mail/solene | hypermail -i and it produced
something usable.

Re: isakmpd and iked on the same box

On 2018-08-31 10:44, Daniel Polak wrote:

>
> Tommy Nevtelen wrote on 30-8-2018 23:13:
>> We use isakmpd to interconnect 30ish routers and I would like to switch
>> to iked, but since there is no support to run both at the same time it
>> makes it quite hard to migrate slowly. Will basically need to do it all
>> at the same time and that is not very good for SLAs which complicates
>> things. Or am I missing something?
> Would it work for you to add a separate VPN gateway with iked next to
> the VPN gateway running isakmpd?
> If you do that you can then set routes to direct traffic for networks
> that have migrated to ikev2 to the iked gateway.
Sure, there are many solutions.
But that is kind of a lot of work and investment in hardware compared to
just running both at the same time right?

--
Tommy

Re: [update] games/barony 3.2.1

David CARLIER <devnexen@gmail.com> wrote:
> Hi,
>
> There is an update to the 3.2.1 (got) version.
> Removing the shell "trick" not necessary anymore, the game now saving
> into the home directory.
>
> Regards.

Hello,

The update doesn't work for me. The game crashes when I start a play.
I fetched the latest GOG barony_cursed_edition_en_3_2_1_23267.sh
I tried with an empty ~/.barony too.

I'm on -current amd64

cat ~/.barony/log.txt
[15-47-50] Caught segfault at address 0x0
[15-47-50] Signal 11 (dumping stack):
0xf128d756048 <_Z17listDeconstructorPv+175944> at barony
0xf150af10005
0xf128d736432 <_Z17listDeconstructorPv+45874> at barony
0xf128d81f143 <_Z16actSpriteNametagP6Entity+68595> at barony
0xf128d75c07c <_Z17listDeconstructorPv+200572> at barony
0xf128d701946 <+86> at barony


In egdb I get this backtrace
(gdb) bt
#0 strlen () at /usr/src/lib/libc/arch/amd64/string/strlen.S:125
#1 0x0000183fdd6c1938 in std::__1::char_traits<char>::length (__s=0x0)
at /usr/src/lib/libcxx/include/string:647
#2 std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >::assign (
this=0x7f7ffffee740, __s=0x0) at /usr/src/lib/libcxx/include/string:2600
#3 0x0000183d1d436432 in physfsLoadMapFile(int, unsigned int, bool, int*) ()
#4 0x0000183d1d51f143 in handleMainMenu(bool) ()
#5 0x0000183d1d45c07c in main ()

About the diff, the README file should be updated because the game requires
assets for 3.2.x files now.

Re: Selling things through the mailing list allowed? I have compatible THIN CLIENTS for Firewall / Router appliance use Available

On Fri, 31 Aug 2018 08:16:12 +0100, Maurice McCarthy wrote:
> On 31/08/2018, Alexis <flexibeast@gmail.com> wrote:
>>
>> Jon Tabor <taborj@obsolete.site> writes:
>>
>>> Yep, right there with ya. So, ah...what's everyone using for
>>> mail
>>> filtering these days? Spamassassin? ClamAV? Something else
>>> entirely?
>>
>> i use maildrop:
>>
>> http://www.courier-mta.org/maildrop/
>
> $ pkg_info fdm

I like sieve, mostly because it's a publicly specified language.
pkg_info shows three manage-sieve implementations. I think most sieve
implementations are included with LDAs, which prolly means IMAP servers
(I use Dovecot's, which is called pigeonhole; I don't have managesieve
turned on so it's just a file in my home dir and sievec to
compile/validate it).

Amy!

Re: [NEW] devel/wabt

Hi Fabian

On 08/31/18 02:00, Fabian Raetz wrote:
> On Thu, Aug 30, 2018 at 06:49:34PM -0400, Brian Callahan wrote:
>>
>> On 08/30/18 18:35, Brian Callahan wrote:
>>> Hi Fabian --
>>>
>>> On 08/30/18 17:28, Fabian Raetz wrote:
>>>> On Thu, Aug 30, 2018 at 05:12:35PM -0400, Brian Callahan wrote:
>>>>> Hi Fabian --
>>>>>
>>>>> On 08/30/18 16:42, Fabian Raetz wrote:
>>>>>> Hi all.
>>>>>>
>>>>>> i've been using the "WebAssembly Binary Toolkit" lately and
>>>>>> thought i create a
>>>>>> proper port for it.
>>>>>>
>>>>>> The port doesn't support running the tests as they require
>>>>>> some git submodules including
>>>>>> the gtest source. Sadly, my cmake skills are not good enough
>>>>>> to make the build system
>>>>>> use gtest from ports so i decided against it for the moment.
>>>>>>
>>>>>> In case you wanna compile a small WebAssembly programm
>>>>>> yourself, take a look at
>>>>>> https://jameshfisher.com/2017/10/13/webassembly-hello-world.html
>>>>>>
>>>>>> Cheers,
>>>>>> Fabian
>>>>>>
>>>>>> HOMEPAGE: https://github.com/WebAssembly/wabt
>>>>>>
>>>>>> DESCR:
>>>>>> WABT (we pronounce it "wabbit") is a suite of tools for
>>>>>> WebAssembly, including:
>>>>>>
>>>>>> wat2wasm:     translate from WebAssembly text format to the
>>>>>> WebAssembly binary
>>>>>>                 format
>>>>>> wasm2wat:     the inverse of wat2wasm, translate from the
>>>>>> binary format back
>>>>>>         to the text format (also known as a .wat)
>>>>>> wasm-objdump:     print information about a wasm binary.
>>>>>> Similiar to objdump.
>>>>>> wasm-interp:     decode and run a WebAssembly binary file
>>>>>> using a stack-based
>>>>>>                    interpreter
>>>>>> wat-desugar:     parse .wat text form as supported by the
>>>>>> spec interpreter
>>>>>>                    (s-expressions, flat syntax, or mixed)
>>>>>> and print "canonical"
>>>>>>                    flat format
>>>>>> wasm2c:     convert a WebAssembly binary file to a C source and header
>>>>>>
>>>>>>
>>>>> Is this different from the wabt port I ok'd here?
>>>>> https://marc.info/?l=openbsd-ports&m=152950481400669&w=2
>>>> There are some subtle differences. The port I sent is in the
>>>> category "devel"
>>>> instead of "lang". Also, I packaged version 1.0.5 where the local
>>>> patch is
>>>> already included. DESCR is also slightly different with regards to
>>>> formating.
>>>>
>>>> Otherwise both port are equal :)
>>>
>>> I changed the DESCR formatting to be different than both of them:
>>> ---
>>> WABT (we pronounce it "wabbit") is a suite of tools for WebAssembly,
>>> including:
>>>
>>> wat2wasm:
>>>   translate from WebAssembly text format to the WebAssembly binary format
>>>
>>> wasm2wat:
>>>   the inverse of wat2wasm, translate from the binary format back to the
>>>   text format (also known as a .wat)
>>>
>>> wasm-objdump:
>>>   print information about a wasm binary. Similiar to objdump.
>>>
>>> wasm-interp:
>>>   decode and run a WebAssembly binary file using a stack-based
>>> interpreter
>>>
>>> wat-desugar:
>>>   parse .wat text form as supported by the spec interpreter
>>>   (s-expressions, flat syntax, or mixed) and print "canonical" flat
>>> format
>>>
>>> wasm2c:
>>>   convert a WebAssembly binary file to a C source and header
>>> ---
>
>
> Thanks for your review :)
>
> I attached a new tar which integrates your feedback. Some comments inline ...
>
>>>
>>> It reads better for my eyes but I guess these things eventually become a
>>> matter of opinion.
>>>
>>> On the more necessary side of things:
>>> * the build picks up a -Werror that has to go
>
> I patched the CMakeLists.txt. Is there a better way to this?
>
>>> * CMake will pick up re2c if you have it installed so either set
>>> -DRUN_RE2C=OFF in CONFIGURE_ARGS or add a BDEP on re2c.
>
> Added the BDEP because the option is on by default.

re2c is only needed when you make changes to the lexer, I would prefer
not to make this a build dependency.

>
>>> * It's C++11, so needs a COMPILER line.
>
> Done.
>
>>> * It looks for, and finds, python. Do we need to add MODULES=lang/python?
>>>
>>> There's no MAINTAINER. Either of you want to do it?
>
> I would take it and added myself as MAINTAINER if that's ok for Raphael

sure..

>
>>>
>>
>> And now that I think about it, I think I like this living in lang/. devel/
>> is overloaded, and we can at least justify this one living somewhere else.
>
> Done.
>
>>
>> ~Brian
>>
>>> ~Brian
>>>
>>>>> I'm still waiting for an OK to import that one.
>>>>>
>>>>> ~Brian
>>>
>>

Re: Block TLD senders with opensmtpd

Hello,

complists@risei.net (Scott Seekamp), 2018.08.31 (Fri) 00:55 (CEST):
> Looking at the manpage for smtpd.conf it's possible to block a domain
> with:
> reject sender <table>
> and put:
> @domain.tld
> Is it possible to block entire tld's and if so what would the syntax be?
> I'd like to filter out high spam content senders ".bid, .date, .us"
> that I"m seeing and avoid spam processing altogether.

I think you cannot match on the "From:" in the mail header.

Remember config syntax and structure in 6.4 will be different from 6.3,
you did not tell what you use...

What I *would* try for -current:

table denydomains { "*.bid", "*.data" }
match mail-from <denydomains> reject
match helo <denydomains> reject

"smtpd -n -v -f" says that's OK, I'm not going to test it live.
And it's only for "MAIL FROM:" and "HELO", easy to forge.

I think with 6.3 (or earlier) this is *not* going to work, unless
someone sends with "MAIL FROM:<me@biz>":

table badsenders { "@biz", "@date" }
reject from any sender <badsenders>

Marcus

Re: update graphics/sketch

Jeremie Courreges-Anglas <jca@wxcvbn.org> wrote:
> On Thu, Aug 30 2018, Jeremie Courreges-Anglas <jca@wxcvbn.org> wrote:
> > On Thu, Aug 30 2018, Solene Rapenne <solene@perso.pw> wrote:
> >> Solene Rapenne <solene@perso.pw> wrote:
> >>> The 0.3.7 version has been released in 2012, it's time to update the
> >>> port... The version seems to be code cleanup and adding asin and acos
> >>> function.
> >>>
> >>> Examples provided seems to work.
> >>>
> >>> Index: Makefile
> >>> ===================================================================
> >>> RCS file: /cvs/ports/graphics/sketch/Makefile,v
> >>> retrieving revision 1.2
> >>> diff -u -p -r1.2 Makefile
> >>> --- Makefile 11 Mar 2013 11:10:55 -0000 1.2
> >>> +++ Makefile 10 Aug 2018 22:26:03 -0000
> >>> @@ -2,7 +2,7 @@
> >>>
> >>> COMMENT = 3D scene description translator for TeX
> >>>
> >>> -DISTNAME = sketch-0.3.2
> >>> +DISTNAME = sketch-0.3.7
> >>> EXTRACT_SUFX = .tgz
> >>>
> >>> CATEGORIES = graphics
> >>> Index: distinfo
> >>> ===================================================================
> >>> RCS file: /cvs/ports/graphics/sketch/distinfo,v
> >>> retrieving revision 1.2
> >>> diff -u -p -r1.2 distinfo
> >>> --- distinfo 18 Jan 2015 03:14:14 -0000 1.2
> >>> +++ distinfo 10 Aug 2018 22:26:03 -0000
> >>> @@ -1,2 +1,2 @@
> >>> -SHA256 (sketch-0.3.2.tgz) = 9vyJH881KEwBiqZ4a69nQpSU90mcUzt5AbDnQbKo5S8=
> >>> -SIZE (sketch-0.3.2.tgz) = 2881333
> >>> +SHA256 (sketch-0.3.7.tgz) = EpYq1f5aD3yfxthL1NCbh5u/YEl1yDlAXxYTvmV7qAQ=
> >>> +SIZE (sketch-0.3.7.tgz) = 2882384
> >>
> >> ping?
> >
> > Woops, this one fell through the cracks (same for your minecraft
> > update).
> >
> > The update LGTM, ok jca@. The warnings are scary, though.
>
> Build-tested only.
>
>
> Index: patches/patch-geometry_c
> ===================================================================
> RCS file: patches/patch-geometry_c
> diff -N patches/patch-geometry_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-geometry_c 30 Aug 2018 16:18:09 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: geometry.c
> +--- geometry.c.orig
> ++++ geometry.c
> +@@ -615,7 +615,7 @@ int boxes_2d_intersect_p(BOX_2D * a, BOX_2D * b)
> + return 1;
> + }
> +
> +-int boxes_3d_intersect_p(BOX_2D * a, BOX_2D * b)
> ++int boxes_3d_intersect_p(BOX_3D * a, BOX_3D * b)
> + {
> + if (a->max[X] < b->min[X]) // a left of b
> + return 0;
> Index: patches/patch-geometry_h
> ===================================================================
> RCS file: patches/patch-geometry_h
> diff -N patches/patch-geometry_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-geometry_h 30 Aug 2018 16:19:08 -0000
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: geometry.h
> +--- geometry.h.orig
> ++++ geometry.h
> +@@ -237,7 +237,7 @@ void fold_min_max_polyline_3d(BOX_3D * b, POLYLINE_3D
> + void copy_box_2d(BOX_2D * r, BOX_2D * s);
> + void copy_box_3d(BOX_3D * r, BOX_3D * s);
> + int boxes_2d_intersect_p(BOX_2D * a, BOX_2D * b);
> +-int boxes_3d_intersect_p(BOX_2D * a, BOX_2D * b);
> ++int boxes_3d_intersect_p(BOX_3D * a, BOX_3D * b);
> +
> + // ---- transformations --------------------------------------------------------
> +

I commited the update with your patches. I tried with/without the patches to
run the examples and making the rendering with latex and I did not see any
differences.

update: sysutils/sec

Update to 2.8.0 release.

Changelog:

* added support for dynamic input files, and 'addinput' and 'dropinput'
actions for managing dynamic inputs.
* added support for signal emulation and 'sigemul' action.
* added support for 'setltime' action.
* starting from this version, the 'lcall' action supports the :>
* operator.
* added support for $+{_intcontext} match variable.
* improved input file rotation handling.
* improved action list parsing.
* bugfixes for 'setwpos' action.
* added support for creating dump files in JSON format, and
the --dumpfjson and --nodumpfjson command line options.

Note JSON is optional, thus I'm keeping it out as a dependency.

OK?

Thanks,
Okan

Index: Makefile
===================================================================
RCS file: /home/open/cvs/ports/sysutils/sec/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 19 Dec 2017 14:14:27 -0000 1.31
+++ Makefile 31 Aug 2018 12:18:05 -0000
@@ -2,7 +2,7 @@

COMMENT= simple event correlator

-V= 2.7.12
+V= 2.8.0
DISTNAME= sec-${V}
CATEGORIES= sysutils
MASTER_SITES= https://github.com/simple-evcorr/sec/releases/download/${V}/
Index: distinfo
===================================================================
RCS file: /home/open/cvs/ports/sysutils/sec/distinfo,v
retrieving revision 1.26
diff -u -p -r1.26 distinfo
--- distinfo 19 Dec 2017 14:14:27 -0000 1.26
+++ distinfo 31 Aug 2018 12:18:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (sec-2.7.12.tar.gz) = SrGfDpSZoHHB4H3d1FP6rSzeXn3i/xh/Dq+y0qYVqjg=
-SIZE (sec-2.7.12.tar.gz) = 134197
+SHA256 (sec-2.8.0.tar.gz) = v/qpeY1JWuuMFzdCDAPYdnUyqyaFFTeJ8hJYAOeELmE=
+SIZE (sec-2.8.0.tar.gz) = 143621

Re: Block TLD senders with opensmtpd

See this Scott:

http://www.OpenSMTPd.Org/list.html

Cheers,
--
Craig Skinner | http://linkd.in/yGqkv7

Re: isakmpd and iked on the same box

Am Donnerstag, August 30, 2018 17:39 CEST, Philipp Buehler <e1c1bac6253dc54a1e89ddc046585792@posteo.net> schrieb:

> Hi,
>
> Am 30.08.2018 10:27 schrieb Sebastian Reitenbach:
> > Hi,
> >
> > I'm wondering if it would be possible to add iked to my box already
> > running isakmpd.
> > I found this quite old thread:
> > http://openbsd-archive.7691.n7.nabble.com/iked-isakmpd-on-the-same-machine-td246610.html
>
> Why is it "always" my old threads in this area? :-)
>
> I was not following development too closely, but I think that on the
> kernel side
> things have not changed. Which means iked and isakmpd will happily "toe
> tap"
> on each others SADB in the kernel (even if there is *some* PID
> handling).
>
> Would like to hear if kernel side has "improved" lately, but the overall
> standpoint
> looks like: IKEv1 is dead (e.g. see the removal of IKEv1 stubs in iked
> some "months ago").
>
> [Still stuck with my ikev2 with strongswan on a different box solution]

isakmpd and iked on separate nodes still seems to be the way to go.

thanks everyone.

Sebastian

>
> HTH... wait, no:
> ciao
> --
> pb

Re: [UPDATE] audio/abcde 2.7.2 -> 2.9.2

On Fri, Aug 31, 2018 at 09:17:51AM +0200, Ingo Feinerer wrote:
> Hi,
>
> referencing the diff at
> https://marc.info/?l=openbsd-ports&m=153366674802202&w=2:
>
> I successfully used abcde to extract an audio disk on amd64, works as
> expected. Thanks for the update!
>
> OK feinerer@ if someone would like to commit the update.

Commited, thanks!

Re: isakmpd and iked on the same box

Tommy Nevtelen wrote on 30-8-2018 23:13:
> We use isakmpd to interconnect 30ish routers and I would like to switch
> to iked, but since there is no support to run both at the same time it
> makes it quite hard to migrate slowly. Will basically need to do it all
> at the same time and that is not very good for SLAs which complicates
> things. Or am I missing something?
Would it work for you to add a separate VPN gateway with iked next to
the VPN gateway running isakmpd?
If you do that you can then set routes to direct traffic for networks
that have migrated to ikev2 to the iked gateway.

Re: rm ports marked as BROKEN for years?

So here's an updated diff that's been tried and tested.
I placed a comment in both the Makefile and the DESCR so that both users
and future ports maintainers see that it might not work on every system.

OK?

martijn@

Index: Makefile
===================================================================
RCS file: /cvs/ports/games/fretsonfire/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile 29 Sep 2015 10:52:12 -0000 1.15
+++ Makefile 31 Aug 2018 08:37:30 -0000
@@ -1,6 +1,7 @@
# $OpenBSD: Makefile,v 1.15 2015/09/29 10:52:12 sthen Exp $

-BROKEN = fails at runtime "python2.7 in free(): error: modified chunk-pointer 0x..."
+# This port is known to generate errors on (some) radeon cards.
+# Intel cards appear to work fine.

V = 1.3.110
COMMENT = guitar hero clone
Index: patches/patch-src_Texture_py
===================================================================
RCS file: /cvs/ports/games/fretsonfire/patches/patch-src_Texture_py,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_Texture_py
--- patches/patch-src_Texture_py 6 Apr 2014 21:10:25 -0000 1.1
+++ patches/patch-src_Texture_py 31 Aug 2018 08:37:30 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-src_Texture_py,v 1.1 2014/04/06 21:10:25 sthen Exp $
---- src/Texture.py.orig Sun Apr 6 18:28:33 2014
-+++ src/Texture.py Sun Apr 6 18:29:48 2014
+Index: src/Texture.py
+--- src/Texture.py.orig
++++ src/Texture.py
@@ -24,10 +24,10 @@ from __future__ import division

import Log
@@ -14,3 +15,41 @@ $OpenBSD: patch-src_Texture_py,v 1.1 201
from OpenGL.GL import *
from OpenGL.GLU import *
from Queue import Queue, Empty
+@@ -210,13 +210,13 @@ class Texture:
+ """Load the texture from a PIL image"""
+ image = image.transpose(Image.FLIP_TOP_BOTTOM)
+ if image.mode == "RGBA":
+- string = image.tostring('raw', 'RGBA', 0, -1)
++ string = image.tobytes('raw', 'RGBA', 0, -1)
+ self.loadRaw(image.size, string, GL_RGBA, 4)
+ elif image.mode == "RGB":
+- string = image.tostring('raw', 'RGB', 0, -1)
++ string = image.tobytes('raw', 'RGB', 0, -1)
+ self.loadRaw(image.size, string, GL_RGB, 3)
+ elif image.mode == "L":
+- string = image.tostring('raw', 'L', 0, -1)
++ string = image.tobytes('raw', 'L', 0, -1)
+ self.loadRaw(image.size, string, GL_LUMINANCE, 1)
+ else:
+ raise TextureException("Unsupported image mode '%s'" % image.mode)
+@@ -254,16 +254,16 @@ class Texture:
+ if monochrome:
+ # pygame doesn't support monochrome, so the fastest way
+ # appears to be using PIL to do the conversion.
+- string = pygame.image.tostring(surface, "RGB")
++ string = pygame.image.tobytes(surface, "RGB")
+ image = Image.fromstring("RGB", surface.get_size(), string).convert("L")
+- string = image.tostring('raw', 'L', 0, -1)
++ string = image.tobytes('raw', 'L', 0, -1)
+ self.loadRaw(surface.get_size(), string, GL_LUMINANCE, GL_INTENSITY8)
+ else:
+ if alphaChannel:
+- string = pygame.image.tostring(surface, "RGBA", True)
++ string = pygame.image.tobytes(surface, "RGBA", True)
+ self.loadRaw(surface.get_size(), string, GL_RGBA, 4)
+ else:
+- string = pygame.image.tostring(surface, "RGB", True)
++ string = pygame.image.tobytes(surface, "RGB", True)
+ self.loadRaw(surface.get_size(), string, GL_RGB, 3)
+ self.size = (w / w2, h / h2)
+
Index: pkg/DESCR
===================================================================
RCS file: /cvs/ports/games/fretsonfire/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR 16 Oct 2009 23:11:38 -0000 1.1.1.1
+++ pkg/DESCR 31 Aug 2018 08:37:30 -0000
@@ -10,3 +10,5 @@ Features
* Supports importing Guitar Hero I and Guitar Hero II songs
* Multiplatform; runs on Windows, Linux, Mac OS X, OpenBSD and FreeBSD
* Open source, full Python source code available
+
+This game is known to crash on some (mostly radeon) graphics card.

Update: telephony/kamailio to 5.1.5

Index: Makefile
===================================================================
RCS file: /cvs/ports/telephony/kamailio/Makefile,v
retrieving revision 1.44
diff -u -p -u -p -r1.44 Makefile
--- Makefile 20 Mar 2018 22:03:35 -0000 1.44
+++ Makefile 31 Aug 2018 07:45:43 -0000
@@ -2,7 +2,7 @@

COMMENT-main = mature and flexible open source SIP server

-VERSION = 5.0.6
+VERSION = 5.1.5

DISTNAME = kamailio-${VERSION}_src

@@ -21,25 +21,26 @@ PKGNAME-radius = kamailio-radius-${VERSI
CATEGORIES = telephony
MAINTAINER = Roman Kravchuk <kravchuk.kp@gmail.com>

-HOMEPAGE = http://www.kamailio.org/
+HOMEPAGE = https://www.kamailio.org/

# GPLv2+
PERMIT_PACKAGE_CDROM = Yes

-SHARED_LIBS = srdb1 4.0 # 1.0
-SHARED_LIBS += srdb2 4.0 # 1.0
-SHARED_LIBS += trie 4.0 # 1.0
-SHARED_LIBS += srutils 3.0 # 1.0
+SHARED_LIBS = srdb1 5.0 # 1.0
+SHARED_LIBS += srdb2 5.0 # 1.0
+SHARED_LIBS += trie 5.0 # 1.0
+SHARED_LIBS += srutils 4.0 # 1.0

MAKE_ENV = CC="${CC}" \
CC_EXTRA_OPTS="${CFLAGS} -DOPENSSL_NO_BUF_FREELISTS -DHAVE_ARC4RANDOM -I${LOCALBASE}/include" \
LD_EXTRA_OPTS="${LDFLAGS} -pthread -L${LOCALBASE}/lib"

-MASTER_SITES = http://www.kamailio.org/pub/kamailio/${VERSION}/src/
+MASTER_SITES = https://www.kamailio.org/pub/kamailio/${VERSION}/src/
WRKDIST = ${WRKDIR}/kamailio-${VERSION}

-WANTLIB-main = c crypto curl expat event_core event_extra iconv m \
- pcre pthread ssl lzma xml2 curses readline unistring z
+WANTLIB-main = c crypto curl curses expat event_core event_extra iconv m \
+ pcre pthread ssl lzma xml2 ncurses readline unistring z \
+ ${COMPILER_LIBCXX}

LIB_DEPENDS-main = converters/libiconv \
converters/libunistring \
@@ -53,6 +54,7 @@ KAMAILIO_GROUPS = kstandard kcpl khttp_a
FLAVOR ?=
MULTI_PACKAGES = -main

+CONFIGURE_STYLE = No
USE_GMAKE = Yes
NO_TEST = Yes

@@ -62,15 +64,20 @@ MAKE_FLAGS = LIBDIR=lib \
cfg-prefix=${WRKINST} \
cfg_dir=share/examples/kamailio/ \
cfg_target=${SYSCONFDIR}/kamailio/ \
- run_target=${VARBASE}/run/kamailio/ \
+ run_target=${VARBASE}/run/kamailio \
QUIET=verbose \
RADCLI=1 \
SCTP=0 \
+ MEMPKG=sys \
group_include="${KAMAILIO_GROUPS}" \
LIBsrdb1_VERSION=${LIBsrdb1_VERSION} \
LIBsrdb2_VERSION=${LIBsrdb2_VERSION} \
LIBtrie_VERSION=${LIBtrie_VERSION} \
LIBsrutils_VERSION=${LIBsrutils_VERSION} \
+
+MODULES = lang/python
+MODPY_BUILDDEP = No
+MODPY_ADJ_FILES = utils/kamctl/dbtextdb/dbtextdb.py

PSEUDO_FLAVORS += no_berkeley
.if !${FLAVOR:Mno_berkeley}
Index: distinfo
===================================================================
RCS file: /cvs/ports/telephony/kamailio/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo 20 Mar 2018 22:03:35 -0000 1.10
+++ distinfo 31 Aug 2018 07:45:43 -0000
@@ -1,2 +1,2 @@
-SHA256 (kamailio-5.0.6_src.tar.gz) = yhYma1WYZtWMa3fyNfvPXwcfYnSSwo8z7PWY5B2V1Co=
-SIZE (kamailio-5.0.6_src.tar.gz) = 11724268
+SHA256 (kamailio-5.1.5_src.tar.gz) = 8YUpSwcMZRF+nn0x5skURvbHCulwo/pHlyVEcLpVua4=
+SIZE (kamailio-5.1.5_src.tar.gz) = 12058396
Index: patches/patch-etc_kamailio_cfg
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-etc_kamailio_cfg,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-etc_kamailio_cfg
--- patches/patch-etc_kamailio_cfg 3 Jul 2017 22:14:20 -0000 1.5
+++ patches/patch-etc_kamailio_cfg 31 Aug 2018 07:45:43 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-etc_kamailio_cfg,v 1.5 2017/07/03 22:14:20 sthen Exp $
---- etc/kamailio.cfg.orig Wed Apr 5 16:32:38 2017
-+++ etc/kamailio.cfg Mon May 15 21:48:56 2017
-@@ -160,6 +160,9 @@ log_facility=LOG_LOCAL0
+Index: etc/kamailio.cfg
+--- etc/kamailio.cfg.orig
++++ etc/kamailio.cfg
+@@ -161,6 +161,9 @@ log_prefix="{$mt $hdr(CSeq) $ci} "
/* number of SIP routing processes */
children=8

Index: patches/patch-src_core_msg_translator_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_core_msg_translator_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_core_msg_translator_c
--- patches/patch-src_core_msg_translator_c 21 Sep 2017 09:34:32 -0000 1.2
+++ patches/patch-src_core_msg_translator_c 31 Aug 2018 07:45:43 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_core_msg_translator_
Index: src/core/msg_translator.c
--- src/core/msg_translator.c.orig
+++ src/core/msg_translator.c
-@@ -522,7 +522,11 @@ static inline int lump_check_opt( struct lump *l,
+@@ -527,7 +527,11 @@ static inline int lump_check_opt( struct lump *l,
return 1;
}
case COND_IF_RAND:
@@ -14,7 +14,7 @@ Index: src/core/msg_translator.c
LUMP_SET_COND_TRUE(l);
return 1;
} else return 0;
-@@ -2320,6 +2324,7 @@ char * build_res_buf_from_sip_req( unsigned int code,
+@@ -2340,6 +2344,7 @@ char * build_res_buf_from_sip_req( unsigned int code,

body = 0;
buf=0;
Index: patches/patch-src_core_rand_fastrand_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_core_rand_fastrand_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_core_rand_fastrand_c
--- patches/patch-src_core_rand_fastrand_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_core_rand_fastrand_c 31 Aug 2018 07:45:43 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_core_rand_fastrand_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
---- src/core/rand/fastrand.c.orig Mon May 15 22:48:56 2017
-+++ src/core/rand/fastrand.c Mon May 15 22:50:19 2017
-@@ -25,6 +25,18 @@
+Index: src/core/rand/fastrand.c
+--- src/core/rand/fastrand.c.orig
++++ src/core/rand/fastrand.c
+@@ -23,6 +23,18 @@
#include "fastrand.h"

#include <stdlib.h>
@@ -20,7 +21,7 @@ $OpenBSD: patch-src_core_rand_fastrand_c
#include "isaac/rand.h"

#define FASTRAND_MAX ((unsigned int)(-1))
-@@ -54,3 +66,4 @@ unsigned int fastrand_max(unsigned int max)
+@@ -52,3 +64,4 @@ unsigned int fastrand_max(unsigned int max)
{
return fastrand()%(max+1);
}
Index: patches/patch-src_core_select_core_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_core_select_core_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_core_select_core_c
--- patches/patch-src_core_select_core_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_core_select_core_c 31 Aug 2018 07:45:43 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_core_select_core_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
---- src/core/select_core.c.orig Mon May 15 22:51:55 2017
-+++ src/core/select_core.c Mon May 15 22:53:45 2017
-@@ -1513,7 +1513,11 @@ int select_sys_unique(str* res, select_t* s, struct si
+Index: src/core/select_core.c
+--- src/core/select_core.c.orig
++++ src/core/select_core.c
+@@ -1504,7 +1504,11 @@ int select_sys_unique(str* res, select_t* s, struct si
for (i = UNIQUE_ID_FIX_LEN, cb = 0, x = 0; i < UNIQUE_ID_FIX_LEN+UNIQUE_ID_RAND_LEN; i++) {
if (!cb) {
cb = rb;
Index: patches/patch-src_core_tcp_read_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_core_tcp_read_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_core_tcp_read_c
--- patches/patch-src_core_tcp_read_c 20 Mar 2018 22:03:35 -0000 1.3
+++ patches/patch-src_core_tcp_read_c 31 Aug 2018 07:45:43 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_core_tcp_read_c,v 1.
Index: src/core/tcp_read.c
--- src/core/tcp_read.c.orig
+++ src/core/tcp_read.c
-@@ -1530,6 +1530,14 @@ void release_tcpconn(struct tcp_connection* c, long st
+@@ -1663,6 +1663,14 @@ void release_tcpconn(struct tcp_connection* c, long st
ip_addr2a(&c->rcv.src_ip), c->rcv.src_port,
ip_addr2a(&c->rcv.dst_ip), c->rcv.dst_port);
LM_DBG("extra_data %p\n", c->extra_data);
Index: patches/patch-src_main_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_main_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_main_c
--- patches/patch-src_main_c 21 Sep 2017 09:34:32 -0000 1.2
+++ patches/patch-src_main_c 31 Aug 2018 07:45:43 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-src_main_c,v 1.2 2017/09
Index: src/main.c
--- src/main.c.orig
+++ src/main.c
-@@ -1842,8 +1842,10 @@ int main(int argc, char** argv)
+@@ -1838,8 +1838,10 @@ int main(int argc, char** argv)
int proto;
char *options;
int ret;
@@ -13,7 +13,7 @@ Index: src/main.c
int debug_save, debug_flag;
int dont_fork_cnt;
struct name_lst* n_lst;
-@@ -2109,6 +2111,7 @@ int main(int argc, char** argv)
+@@ -2105,6 +2107,7 @@ int main(int argc, char** argv)
goto error;
}

@@ -21,7 +21,7 @@ Index: src/main.c
/* seed the prng */
/* try to use /dev/urandom if possible */
seed=0;
-@@ -2129,6 +2132,7 @@ try_again:
+@@ -2125,6 +2128,7 @@ try_again:
fastrand_seed(kam_rand());
srandom(kam_rand()+time(0));
LM_DBG("test random numbers %u %lu %u\n", kam_rand(), random(), fastrand());
Index: patches/patch-src_modules_app_jsdt_duk_config_h
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_app_jsdt_duk_config_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_app_jsdt_duk_config_h
--- patches/patch-src_modules_app_jsdt_duk_config_h 10 Aug 2017 18:40:21 -0000 1.1
+++ patches/patch-src_modules_app_jsdt_duk_config_h 31 Aug 2018 07:45:43 -0000
@@ -6,7 +6,7 @@ thus doesn't #define __STDC_VERSION__ 19
Index: src/modules/app_jsdt/duk_config.h
--- src/modules/app_jsdt/duk_config.h.orig
+++ src/modules/app_jsdt/duk_config.h
-@@ -1557,6 +1557,10 @@
+@@ -1600,6 +1600,10 @@
#define DUK_F_HAVE_INTTYPES
#endif

Index: patches/patch-src_modules_db_berkeley_bdb_lib_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_db_berkeley_bdb_lib_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_db_berkeley_bdb_lib_c
--- patches/patch-src_modules_db_berkeley_bdb_lib_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_modules_db_berkeley_bdb_lib_c 31 Aug 2018 07:45:43 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_modules_db_berkeley_bdb_lib_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
---- src/modules/db_berkeley/bdb_lib.c.orig Mon May 15 23:34:21 2017
-+++ src/modules/db_berkeley/bdb_lib.c Mon May 15 23:34:56 2017
-@@ -666,7 +666,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
+Index: src/modules/db_berkeley/bdb_lib.c
+--- src/modules/db_berkeley/bdb_lib.c.orig
++++ src/modules/db_berkeley/bdb_lib.c
+@@ -623,7 +623,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
{
char *s;
char fn[1024];
@@ -10,12 +11,12 @@ $OpenBSD: patch-src_modules_db_berkeley_
FILE *fp = NULL;
struct tm *t;
int bl;
-@@ -686,7 +686,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
- s+=_tp->name.len;
-
- t = localtime( &tim );
-- bl=strftime(d,128,"-%Y%m%d%H%M%S.jnl",t);
-+ bl=strftime(d,sizeof(d),"-%Y%m%d%H%M%S.jnl",t);
+@@ -645,7 +645,7 @@ int bdblib_create_journal(bdb_db_p _db_p, bdb_table_p
+ s += _tp->name.len;
+
+ t = localtime(&tim);
+- bl = strftime(d, 128, "-%Y%m%d%H%M%S.jnl", t);
++ bl = strftime(d, sizeof(d), "-%Y%m%d%H%M%S.jnl",t);
strncpy(s, d, bl);
- s+= bl;
+ s += bl;
*s = 0;
Index: patches/patch-src_modules_db_berkeley_km_bdb_lib_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_db_berkeley_km_bdb_lib_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_db_berkeley_km_bdb_lib_c
--- patches/patch-src_modules_db_berkeley_km_bdb_lib_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_modules_db_berkeley_km_bdb_lib_c 31 Aug 2018 07:45:43 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-src_modules_db_berkeley_km_bdb_lib_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
---- src/modules/db_berkeley/km_bdb_lib.c.orig Mon May 15 23:35:24 2017
-+++ src/modules/db_berkeley/km_bdb_lib.c Mon May 15 23:36:06 2017
-@@ -719,7 +719,7 @@ int km_bdblib_create_journal(table_p _tp)
+Index: src/modules/db_berkeley/km_bdb_lib.c
+--- src/modules/db_berkeley/km_bdb_lib.c.orig
++++ src/modules/db_berkeley/km_bdb_lib.c
+@@ -676,7 +676,7 @@ int km_bdblib_create_journal(table_p _tp)
{
char *s;
char fn[1024];
@@ -10,12 +11,12 @@ $OpenBSD: patch-src_modules_db_berkeley_
FILE *fp = NULL;
struct tm *t;
int bl;
-@@ -740,7 +740,7 @@ int km_bdblib_create_journal(table_p _tp)
- s+=_tp->name.len;
-
- t = localtime( &tim );
-- bl=strftime(d,128,"-%Y%m%d%H%M%S.jnl",t);
-+ bl=strftime(d,sizeof(d),"-%Y%m%d%H%M%S.jnl",t);
+@@ -699,7 +699,7 @@ int km_bdblib_create_journal(table_p _tp)
+ s += _tp->name.len;
+
+ t = localtime(&tim);
+- bl = strftime(d, 128, "-%Y%m%d%H%M%S.jnl", t);
++ bl = strftime(d, sizeof(d), "-%Y%m%d%H%M%S.jnl",t);
strncpy(s, d, bl);
- s+= bl;
+ s += bl;
*s = 0;
Index: patches/patch-src_modules_ipops_detailed_ip_type_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_ipops_detailed_ip_type_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_ipops_detailed_ip_type_c
--- patches/patch-src_modules_ipops_detailed_ip_type_c 3 Jul 2017 22:14:20 -0000 1.1
+++ patches/patch-src_modules_ipops_detailed_ip_type_c 31 Aug 2018 07:45:43 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_modules_ipops_detail
Index: src/modules/ipops/detailed_ip_type.c
--- src/modules/ipops/detailed_ip_type.c.orig
+++ src/modules/ipops/detailed_ip_type.c
-@@ -26,7 +26,7 @@
+@@ -24,7 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <arpa/inet.h>
Index: patches/patch-src_modules_nat_traversal_nat_traversal_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_nat_traversal_nat_traversal_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-src_modules_nat_traversal_nat_traversal_c
--- patches/patch-src_modules_nat_traversal_nat_traversal_c 20 Mar 2018 22:03:35 -0000 1.3
+++ patches/patch-src_modules_nat_traversal_nat_traversal_c 31 Aug 2018 07:45:43 -0000
@@ -3,12 +3,12 @@ $OpenBSD: patch-src_modules_nat_traversa
Index: src/modules/nat_traversal/nat_traversal.c
--- src/modules/nat_traversal/nat_traversal.c.orig
+++ src/modules/nat_traversal/nat_traversal.c
-@@ -1724,7 +1724,7 @@ restore_keepalive_state(void)
- res = fscanf(f, STATE_FILE_HEADER); // skip header
+@@ -1755,7 +1755,7 @@ static void restore_keepalive_state(void)
+ res = fscanf(f, STATE_FILE_HEADER); // skip header

- while (true) {
-- res = fscanf(f, "%63s %63s %ld %ld", uri, socket, &rtime, &stime);
-+ res = fscanf(f, "%63s %63s %lld %lld", uri, socket, &rtime, &stime);
- if (res == EOF) {
- if (ferror(f))
- LM_ERR("error while reading keepalive state file: %s\n", strerror(errno));
+ while(true) {
+- res = fscanf(f, "%63s %63s %ld %ld", uri, socket, &rtime, &stime);
++ res = fscanf(f, "%63s %63s %lld %lld", uri, socket, &rtime, &stime);
+ if(res == EOF) {
+ if(ferror(f))
+ LM_ERR("error while reading keepalive state file: %s\n",
Index: patches/patch-src_modules_rls_utils_c
===================================================================
RCS file: patches/patch-src_modules_rls_utils_c
diff -N patches/patch-src_modules_rls_utils_c
--- patches/patch-src_modules_rls_utils_c 21 Sep 2017 09:34:32 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$OpenBSD: patch-src_modules_rls_utils_c,v 1.2 2017/09/21 09:34:32 sthen Exp $
-
-Index: src/modules/rls/utils.c
---- src/modules/rls/utils.c.orig
-+++ src/modules/rls/utils.c
-@@ -26,14 +26,14 @@
- #define SIP_PREFIX "sip:"
- #define SIP_PREFIX_LEN sizeof(SIP_PREFIX)-1
-
--str* normalize_sip_uri(const str *uri)
-+str* normalize_sip_uri(str *uri)
- {
- static str normalized_uri;
- static str null_str = {NULL, 0};
- static char buf[MAX_URI_SIZE];
-
- normalized_uri.s = buf;
-- if (un_escape((str *)uri, &normalized_uri) < 0)
-+ if (un_escape(uri, &normalized_uri) < 0)
- {
- LM_ERR("un-escaping URI\n");
- return &null_str;
Index: patches/patch-src_modules_rls_utils_h
===================================================================
RCS file: patches/patch-src_modules_rls_utils_h
diff -N patches/patch-src_modules_rls_utils_h
--- patches/patch-src_modules_rls_utils_h 3 Jul 2017 22:14:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_modules_rls_utils_h,v 1.1 2017/07/03 22:14:20 sthen Exp $
-
-Index: src/modules/rls/utils.h
---- src/modules/rls/utils.h.orig
-+++ src/modules/rls/utils.h
-@@ -26,6 +26,6 @@
-
- #include "../../core/ut.h"
-
--extern str* normalize_sip_uri(const str *uri);
-+extern str* normalize_sip_uri(str *uri);
-
- #endif
Index: patches/patch-src_modules_tls_tls_bio_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_bio_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_modules_tls_tls_bio_c
--- patches/patch-src_modules_tls_tls_bio_c 20 Mar 2018 22:03:35 -0000 1.2
+++ patches/patch-src_modules_tls_tls_bio_c 31 Aug 2018 07:45:43 -0000
@@ -13,9 +13,9 @@ Index: src/modules/tls/tls_bio.c
static BIO_METHOD tls_mbuf_method = {
BIO_TYPE_TLS_MBUF, /* type */
"sr_tls_mbuf", /* name */
-@@ -98,6 +99,19 @@ static void BIO_set_init(BIO *b, int init)
- b->init = init;
- }
+@@ -102,6 +103,19 @@ static void BIO_set_init(BIO *b, int init)
+ #endif
+
#else
+#if defined(LIBRESSL_VERSION_NUMBER)
+/*
@@ -33,7 +33,7 @@ Index: src/modules/tls/tls_bio.c
static BIO_METHOD *tls_mbuf_method = NULL;
#endif

-@@ -105,7 +119,8 @@ static BIO_METHOD *tls_mbuf_method = NULL;
+@@ -109,7 +123,8 @@ static BIO_METHOD *tls_mbuf_method = NULL;
/** returns a custom tls_mbuf BIO. */
BIO_METHOD* tls_BIO_mbuf(void)
{
Index: patches/patch-src_modules_tls_tls_domain_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_domain_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_tls_tls_domain_c
--- patches/patch-src_modules_tls_tls_domain_c 21 Sep 2017 09:34:32 -0000 1.1
+++ patches/patch-src_modules_tls_tls_domain_c 31 Aug 2018 07:45:43 -0000
@@ -3,7 +3,17 @@ $OpenBSD: patch-src_modules_tls_tls_doma
Index: src/modules/tls/tls_domain.c
--- src/modules/tls/tls_domain.c.orig
+++ src/modules/tls/tls_domain.c
-@@ -734,7 +734,7 @@ static void sr_ssl_ctx_info_callback(const SSL *ssl, i
+@@ -124,7 +124,8 @@ static void setup_dh(SSL_CTX *ctx)
+ return;
+ }
+
+-#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) && !defined(LIBRESSL_VERSION_NUMBER)
++#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x2070000fL)
+ /* libssl >= v1.1.0 */
+ DH_set0_pqg(dh, p, NULL, g);
+ #else
+@@ -734,7 +735,7 @@ static void sr_ssl_ctx_info_callback(const SSL *ssl, i
if(data==0)
data = (struct tls_extra_data*)SSL_get_app_data(ssl);
LOG(tls_dbg, "SSL handshake done\n");
@@ -12,7 +22,7 @@ Index: src/modules/tls/tls_domain.c
/* CVE-2009-3555 - disable renegotiation */
if (ssl->s3) {
LOG(tls_dbg, "SSL disable renegotiation\n");
-@@ -858,7 +858,7 @@ static int tls_ssl_ctx_mode(SSL_CTX* ctx, long mode, v
+@@ -858,7 +859,7 @@ static int tls_ssl_ctx_mode(SSL_CTX* ctx, long mode, v
*/
static int tls_ssl_ctx_set_freelist(SSL_CTX* ctx, long val, void* unused)
{
@@ -21,12 +31,13 @@ Index: src/modules/tls/tls_domain.c
if (val >= 0)
#if OPENSSL_VERSION_NUMBER >= 0x01000000L
#ifndef OPENSSL_NO_BUF_FREELISTS
-@@ -997,7 +997,7 @@ static int fix_domain(tls_domain_t* d, tls_domain_t* d
+@@ -997,7 +998,8 @@ static int fix_domain(tls_domain_t* d, tls_domain_t* d
memset(d->ctx, 0, sizeof(SSL_CTX*) * procs_no);
for(i = 0; i < procs_no; i++) {

-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
/* libssl < 1.1.0 */
if(d->method>TLS_USE_TLSvRANGE) {
d->ctx[i] = SSL_CTX_new(SSLv23_method());
Index: patches/patch-src_modules_tls_tls_init_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_init_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_modules_tls_tls_init_c
--- patches/patch-src_modules_tls_tls_init_c 21 Sep 2017 09:34:32 -0000 1.2
+++ patches/patch-src_modules_tls_tls_init_c 31 Aug 2018 07:45:43 -0000
@@ -3,136 +3,23 @@ $OpenBSD: patch-src_modules_tls_tls_init
Index: src/modules/tls/tls_init.c
--- src/modules/tls/tls_init.c.orig
+++ src/modules/tls/tls_init.c
-@@ -119,7 +119,7 @@ to compile on the _target_ system)"
+@@ -119,7 +119,8 @@ static int tls_mod_initialized = 0;
int openssl_kssl_malloc_bug=0; /* is openssl bug #1467 present ? */
#endif

-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
const SSL_METHOD* ssl_methods[TLS_METHOD_MAX];
#else
sr_tls_methods_t sr_tls_methods[TLS_METHOD_MAX];
-@@ -143,7 +143,7 @@ sr_tls_methods_t sr_tls_methods[TLS_METHOD_MAX];
- */
-
-
--
-+#ifndef LIBRESSL_VERSION_NUMBER
- inline static char* buf_append(char* buf, char* end, char* str, int str_len)
- {
- if ( (buf+str_len)<end){
-@@ -321,6 +321,7 @@ static void ser_free(void *ptr, const char *fname, int
- }
- #endif
-
-+#endif /* LIBRESSL_VERSION_NUMBER */
-
- /*
- * Initialize TLS socket
-@@ -356,7 +357,7 @@ error:
+@@ -361,7 +362,8 @@ error:
*/
static void init_ssl_methods(void)
{
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
/* libssl < 1.1.0 */
memset(ssl_methods, 0, sizeof(ssl_methods));

-@@ -366,7 +367,7 @@ static void init_ssl_methods(void)
- ssl_methods[TLS_USE_SSLv23 - 1] = SSLv23_method();
-
- /* only specific SSL or TLS version */
--#if OPENSSL_VERSION_NUMBER < 0x010100000L
-+#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER)
- #ifndef OPENSSL_NO_SSL2
- ssl_methods[TLS_USE_SSLv2_cli - 1] = SSLv2_client_method();
- ssl_methods[TLS_USE_SSLv2_srv - 1] = SSLv2_server_method();
-@@ -384,13 +385,13 @@ static void init_ssl_methods(void)
- ssl_methods[TLS_USE_TLSv1_srv - 1] = TLSv1_server_method();
- ssl_methods[TLS_USE_TLSv1 - 1] = TLSv1_method();
-
--#if OPENSSL_VERSION_NUMBER >= 0x1000100fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(LIBRESSL_VERSION_NUMBER)
- ssl_methods[TLS_USE_TLSv1_1_cli - 1] = TLSv1_1_client_method();
- ssl_methods[TLS_USE_TLSv1_1_srv - 1] = TLSv1_1_server_method();
- ssl_methods[TLS_USE_TLSv1_1 - 1] = TLSv1_1_method();
- #endif
-
--#if OPENSSL_VERSION_NUMBER >= 0x1000105fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000105fL && !defined(LIBRESSL_VERSION_NUMBER)
- ssl_methods[TLS_USE_TLSv1_2_cli - 1] = TLSv1_2_client_method();
- ssl_methods[TLS_USE_TLSv1_2_srv - 1] = TLSv1_2_server_method();
- ssl_methods[TLS_USE_TLSv1_2 - 1] = TLSv1_2_method();
-@@ -399,11 +400,11 @@ static void init_ssl_methods(void)
- /* ranges of TLS versions (require a minimum TLS version) */
- ssl_methods[TLS_USE_TLSv1_PLUS - 1] = (void*)TLS_OP_TLSv1_PLUS;
-
--#if OPENSSL_VERSION_NUMBER >= 0x1000100fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000100fL && !defined(LIBRESSL_VERSION_NUMBER)
- ssl_methods[TLS_USE_TLSv1_1_PLUS - 1] = (void*)TLS_OP_TLSv1_1_PLUS;
- #endif
-
--#if OPENSSL_VERSION_NUMBER >= 0x1000105fL
-+#if OPENSSL_VERSION_NUMBER >= 0x1000105fL && !defined(LIBRESSL_VERSION_NUMBER)
- ssl_methods[TLS_USE_TLSv1_2_PLUS - 1] = (void*)TLS_OP_TLSv1_2_PLUS;
- #endif
-
-@@ -477,6 +478,7 @@ static void init_ssl_methods(void)
- */
- static int init_tls_compression(void)
- {
-+#ifndef LIBRESSL_VERSION_NUMBER
- #if OPENSSL_VERSION_NUMBER < 0x010100000L
- #if OPENSSL_VERSION_NUMBER >= 0x00908000L
- int n, r;
-@@ -563,6 +565,7 @@ static int init_tls_compression(void)
- end:
- #endif /* OPENSSL_VERSION_NUMBER >= 0.9.8 */
- #endif /* OPENSSL_VERSION_NUMBER < 1.1.0 */
-+#endif /* LIBRESSL_VERSION_NUMBER */
- return 0;
- }
-
-@@ -573,6 +576,7 @@ end:
- */
- int tls_pre_init(void)
- {
-+#ifndef LIBRESSL_VERSION_NUMBER
- #if OPENSSL_VERSION_NUMBER < 0x010100000L
- void *(*mf)(size_t) = NULL;
- void *(*rf)(void *, size_t) = NULL;
-@@ -599,6 +603,7 @@ int tls_pre_init(void)
- " (can be loaded first to be safe)\n");
- return -1;
- }
-+#endif /* LIBRESSL_VERSION_NUMBER */
-
- if (tls_init_locks()<0)
- return -1;
-@@ -632,7 +637,7 @@ int init_tls_h(void)
- {
- /*struct socket_info* si;*/
- long ssl_version;
--#if OPENSSL_VERSION_NUMBER < 0x010100000L
-+#if OPENSSL_VERSION_NUMBER < 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER)
- int lib_kerberos;
- int lib_zlib;
- int kerberos_support;
-@@ -676,7 +681,7 @@ int init_tls_h(void)
- }
-
- /* check kerberos support using compile flags only for version < 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x010100000L
-+#if OPENSSL_VERSION_NUMBER < 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER)
-
- #ifdef TLS_KERBEROS_SUPPORT
- kerberos_support=1;
-@@ -847,7 +852,7 @@ void destroy_tls_h(void)
- tls_destroy_cfg();
- tls_destroy_locks();
- tls_ct_wq_destroy();
--#if OPENSSL_VERSION_NUMBER >= 0x010100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER)
- /* explicit execution of libssl cleanup to avoid being executed again
- * by atexit(), when shm is gone */
- DBG("executing openssl v1.1+ cleanup\n");
Index: patches/patch-src_modules_tls_tls_init_h
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_init_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_tls_tls_init_h
--- patches/patch-src_modules_tls_tls_init_h 21 Sep 2017 09:34:32 -0000 1.1
+++ patches/patch-src_modules_tls_tls_init_h 31 Aug 2018 07:45:43 -0000
@@ -3,12 +3,13 @@ $OpenBSD: patch-src_modules_tls_tls_init
Index: src/modules/tls/tls_init.h
--- src/modules/tls/tls_init.h.orig
+++ src/modules/tls/tls_init.h
-@@ -45,7 +45,7 @@ extern int openssl_kssl_malloc_bug; /* is openssl bug
+@@ -45,7 +45,8 @@ extern int openssl_kssl_malloc_bug; /* is openssl bug
#endif


-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
extern const SSL_METHOD* ssl_methods[];
#else
typedef struct sr_tls_methods_s {
Index: patches/patch-src_modules_tls_tls_locking_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_tls_tls_locking_c,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_modules_tls_tls_locking_c
--- patches/patch-src_modules_tls_tls_locking_c 21 Sep 2017 09:34:32 -0000 1.1
+++ patches/patch-src_modules_tls_tls_locking_c 31 Aug 2018 07:45:43 -0000
@@ -3,21 +3,43 @@ $OpenBSD: patch-src_modules_tls_tls_lock
Index: src/modules/tls/tls_locking.c
--- src/modules/tls/tls_locking.c.orig
+++ src/modules/tls/tls_locking.c
-@@ -33,7 +33,7 @@ static int n_static_locks=0;
+@@ -33,7 +33,8 @@ static int n_static_locks=0;
static gen_lock_set_t* static_locks=0;

/* OpenSSL is thread-safe since 1.1.0 */
--#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)

/* "dynamic" locks */

-@@ -168,7 +168,7 @@ int tls_init_locks()
+@@ -94,8 +95,8 @@ static void dyn_destroy_f(struct CRYPTO_dynlock_value
+ shm_free(l);
+ }
+
++#endif /* openssl < 0x10100000L (1.1.0) or LibreSSL */
+
+-
+ /* normal locking callback */
+ static void locking_f(int mode, int n, const char* file, int line)
+ {
+@@ -118,9 +119,7 @@ static void locking_f(int mode, int n, const char* fil
+ }
+ }
+
+-#endif /* openssl < 0x10100000L (1.1.0) or LibreSSL */
+
+-
+ void tls_destroy_locks()
+ {
+ if (static_locks){
+@@ -168,7 +167,8 @@ int tls_init_locks()
}

/* OpenSSL is thread-safe since 1.1.0 */
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
++#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
++ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
/* set "dynamic" locks callbacks */
CRYPTO_set_dynlock_create_callback(dyn_create_f);
CRYPTO_set_dynlock_lock_callback(dyn_lock_f);
Index: patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_modules_xhttp_pi_xhttp_pi_fnc_c
--- patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c 21 Sep 2017 09:34:32 -0000 1.2
+++ patches/patch-src_modules_xhttp_pi_xhttp_pi_fnc_c 31 Aug 2018 07:45:43 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_modules_xhttp_pi_xht
Index: src/modules/xhttp_pi/xhttp_pi_fnc.c
--- src/modules/xhttp_pi/xhttp_pi_fnc.c.orig
+++ src/modules/xhttp_pi/xhttp_pi_fnc.c
-@@ -3193,7 +3193,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
+@@ -3186,7 +3186,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
val_str.len = max_page_len - ctx->reply.body.len;
if(db_time2str(values[j].val.time_val,
val_str.s, &val_str.len)!=0){
@@ -12,7 +12,7 @@ Index: src/modules/xhttp_pi/xhttp_pi_fnc
values[j].val.time_val);
goto error;
}
-@@ -3201,7 +3201,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
+@@ -3194,7 +3194,7 @@ int ph_run_pi_cmd(pi_ctx_t* ctx)
ctx->reply.body.len += val_str.len;
if(link_on) XHTTP_PI_COPY_2(p,XHTTP_PI_SQUOT_GT,val_str);
LM_DBG(" got %.*s[%d]=>"
Index: patches/patch-src_modules_xmlrpc_xmlrpc_c
===================================================================
RCS file: patches/patch-src_modules_xmlrpc_xmlrpc_c
diff -N patches/patch-src_modules_xmlrpc_xmlrpc_c
--- patches/patch-src_modules_xmlrpc_xmlrpc_c 3 Jul 2017 22:14:20 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-$OpenBSD: patch-src_modules_xmlrpc_xmlrpc_c,v 1.1 2017/07/03 22:14:20 sthen Exp $
-
-Index: src/modules/xmlrpc/xmlrpc.c
---- src/modules/xmlrpc/xmlrpc.c.orig
-+++ src/modules/xmlrpc/xmlrpc.c
-@@ -19,7 +19,7 @@
- * Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
- /*This define breaks on Solaris OS */
--#ifndef __OS_solaris
-+#if !defined (__OS_solaris) && !defined (__OpenBSD__)
- #define _XOPEN_SOURCE 4 /* strptime */
- #endif
- #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */
Index: patches/patch-utils_kamctl_kamctl_base
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-utils_kamctl_kamctl_base,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-utils_kamctl_kamctl_base
--- patches/patch-utils_kamctl_kamctl_base 3 Jul 2017 22:14:20 -0000 1.5
+++ patches/patch-utils_kamctl_kamctl_base 31 Aug 2018 07:45:43 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-utils_kamctl_kamctl_base,v 1.5 2017/07/03 22:14:20 sthen Exp $
---- utils/kamctl/kamctl.base.orig Wed Apr 5 16:32:39 2017
-+++ utils/kamctl/kamctl.base Mon May 15 21:48:56 2017
-@@ -556,7 +556,7 @@ USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ksr_srv"
+Index: utils/kamctl/kamctl.base
+--- utils/kamctl/kamctl.base.orig
++++ utils/kamctl/kamctl.base
+@@ -559,7 +559,7 @@ USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_ksr_srv"
mdbg() {
if [ "0$VERBOSE" -ne 0 ] ; then
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -10,7 +11,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "$1"
fi
-@@ -565,7 +565,7 @@ mdbg() {
+@@ -568,7 +568,7 @@ mdbg() {

mwarn() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -19,7 +20,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "** WARNING: $1"
fi
-@@ -573,7 +573,7 @@ mwarn() {
+@@ -576,7 +576,7 @@ mwarn() {

minfo() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -28,7 +29,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "** INFO: $1"
fi
-@@ -581,7 +581,7 @@ minfo() {
+@@ -584,7 +584,7 @@ minfo() {

mecho() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
@@ -37,7 +38,7 @@ $OpenBSD: patch-utils_kamctl_kamctl_base
else
echo "$1"
fi
-@@ -589,7 +589,7 @@ mecho() {
+@@ -592,7 +592,7 @@ mecho() {

merr() {
if [ -t 1 -a -z "$NOHLPRINT" ] ; then
Index: patches/patch-utils_kamctl_kamctlrc
===================================================================
RCS file: /cvs/ports/telephony/kamailio/patches/patch-utils_kamctl_kamctlrc,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-utils_kamctl_kamctlrc
--- patches/patch-utils_kamctl_kamctlrc 20 Mar 2018 22:03:35 -0000 1.5
+++ patches/patch-utils_kamctl_kamctlrc 31 Aug 2018 07:45:43 -0000
@@ -11,13 +11,7 @@ Index: utils/kamctl/kamctlrc

# awk tool
# AWK="awk"
-@@ -151,8 +151,11 @@
-
- ## Kamailio START Options
- ## PID file path - default is: /var/run/kamailio.pid
--# PID_FILE=/var/run/kamailio/kamailio.pid
-+PID_FILE=/var/run/kamailio/kamailio.pid
-
+@@ -160,3 +160,6 @@
## Extra start options - default is: not set
# example: start Kamailio with 64MB share memory: STARTOPTIONS="-m 64"
# STARTOPTIONS=
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/telephony/kamailio/pkg/PLIST-main,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST-main
--- pkg/PLIST-main 3 Jul 2017 22:14:20 -0000 1.6
+++ pkg/PLIST-main 31 Aug 2018 07:45:43 -0000
@@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST-main,v 1.6 2017/07/03 22:14:20 sthen Exp $
@newgroup _kamailio:628
@newuser _kamailio:628:628:daemon:Kamailio:/nonexistent:/sbin/nologin
+@rcscript ${RCDIR}/kamailio
lib/kamailio/
lib/kamailio/kamctl/
lib/kamailio/kamctl/dbtextdb/
@@ -19,8 +20,10 @@ lib/kamailio/kamctl/kamdbctl.dbtext
@lib lib/kamailio/libtrie.so.${LIBtrie_VERSION}
lib/kamailio/modules/
lib/kamailio/modules/acc.so
+lib/kamailio/modules/acc_diameter.so
lib/kamailio/modules/alias_db.so
lib/kamailio/modules/app_jsdt.so
+lib/kamailio/modules/app_sqlang.so
lib/kamailio/modules/async.so
lib/kamailio/modules/auth.so
lib/kamailio/modules/auth_db.so
@@ -32,6 +35,7 @@ lib/kamailio/modules/avpops.so
lib/kamailio/modules/benchmark.so
lib/kamailio/modules/blst.so
lib/kamailio/modules/call_control.so
+lib/kamailio/modules/call_obj.so
lib/kamailio/modules/cfg_db.so
lib/kamailio/modules/cfg_rpc.so
lib/kamailio/modules/cfgt.so
@@ -56,6 +60,7 @@ lib/kamailio/modules/domain.so
lib/kamailio/modules/domainpolicy.so
lib/kamailio/modules/drouting.so
lib/kamailio/modules/enum.so
+lib/kamailio/modules/evrexec.so
lib/kamailio/modules/exec.so
lib/kamailio/modules/group.so
lib/kamailio/modules/htable.so
@@ -64,6 +69,7 @@ lib/kamailio/modules/http_client.so
lib/kamailio/modules/imc.so
lib/kamailio/modules/ipops.so
lib/kamailio/modules/jsonrpcs.so
+lib/kamailio/modules/keepalive.so
lib/kamailio/modules/kex.so
lib/kamailio/modules/lcr.so
lib/kamailio/modules/log_custom.so
@@ -103,6 +109,7 @@ lib/kamailio/modules/sca.so
lib/kamailio/modules/sdpops.so
lib/kamailio/modules/seas.so
lib/kamailio/modules/sipcapture.so
+lib/kamailio/modules/sipdump.so
lib/kamailio/modules/sipt.so
lib/kamailio/modules/siptrace.so
lib/kamailio/modules/siputils.so
@@ -159,8 +166,10 @@ share/doc/kamailio/INSTALL
share/doc/kamailio/README
share/doc/kamailio/modules/
share/doc/kamailio/modules/README.acc
+share/doc/kamailio/modules/README.acc_diameter
share/doc/kamailio/modules/README.alias_db
share/doc/kamailio/modules/README.app_jsdt
+share/doc/kamailio/modules/README.app_sqlang
share/doc/kamailio/modules/README.async
share/doc/kamailio/modules/README.auth
share/doc/kamailio/modules/README.auth_db
@@ -172,6 +181,7 @@ share/doc/kamailio/modules/README.avpops
share/doc/kamailio/modules/README.benchmark
share/doc/kamailio/modules/README.blst
share/doc/kamailio/modules/README.call_control
+share/doc/kamailio/modules/README.call_obj
share/doc/kamailio/modules/README.cfg_db
share/doc/kamailio/modules/README.cfg_rpc
share/doc/kamailio/modules/README.cfgt
@@ -196,6 +206,7 @@ share/doc/kamailio/modules/README.domain
share/doc/kamailio/modules/README.domainpolicy
share/doc/kamailio/modules/README.drouting
share/doc/kamailio/modules/README.enum
+share/doc/kamailio/modules/README.evrexec
share/doc/kamailio/modules/README.exec
share/doc/kamailio/modules/README.group
share/doc/kamailio/modules/README.htable
@@ -204,6 +215,7 @@ share/doc/kamailio/modules/README.http_c
share/doc/kamailio/modules/README.imc
share/doc/kamailio/modules/README.ipops
share/doc/kamailio/modules/README.jsonrpcs
+share/doc/kamailio/modules/README.keepalive
share/doc/kamailio/modules/README.kex
share/doc/kamailio/modules/README.lcr
share/doc/kamailio/modules/README.log_custom
@@ -243,6 +255,7 @@ share/doc/kamailio/modules/README.sca
share/doc/kamailio/modules/README.sdpops
share/doc/kamailio/modules/README.seas
share/doc/kamailio/modules/README.sipcapture
+share/doc/kamailio/modules/README.sipdump
share/doc/kamailio/modules/README.sipt
share/doc/kamailio/modules/README.siptrace
share/doc/kamailio/modules/README.siputils
@@ -288,8 +301,6 @@ share/doc/kamailio/modules/README.xprint
share/examples/kamailio/
@sample ${SYSCONFDIR}/kamailio/
@comment share/examples/kamailio/dictionary.kamailio
-share/examples/kamailio/kamailio-advanced.cfg
-share/examples/kamailio/kamailio-basic.cfg
share/examples/kamailio/kamailio.cfg
@sample ${SYSCONFDIR}/kamailio/kamailio.cfg
share/examples/kamailio/kamctlrc
@@ -371,4 +382,3 @@ share/kamailio/dbtext/kamailio/watchers
share/kamailio/dbtext/kamailio/xcap
@comment share/snmp/
@comment share/snmp/mibs/
-@rcscript ${RCDIR}/kamailio
Hi ports@,

This is trivial update kamailio port to version 5.1.5 based on uncommited
update
http://openbsd-archive.7691.n7.nabble.com/Update-telephony-kamailio-to-5-1-2-td339563.html
.

Tested on current amd64.

Ok? Comments?