arm bulk build report
bulk build on armv7-0.ports.openbsd.org started on Fri Oct 12 02:05:12 MDT 2018 finished at Sun Oct 28 22:08:44 MDT 2018 lasted 17D13h03m done with kern.version=OpenBSD 6.4 (GENERIC) #70: Thu Oct 11 10:19:24 MDT 2018 built packages:8425 Oct 12:293 Oct 13:237 Oct 15:104 Oct 16:109 Oct 17:147 Oct 18:22 Oct 19:48 Oct 20:220 Oct 21:189 Oct 22:70 Oct 23:86 Oct 24:417 Oct 25:502 Oct 26:797 Oct 27:1442 Oct 28:3741 critical path missing pkgs: echo http://build-failures.rhaalovely.net/arm/2018-10-12/summary.log build failures: 67 http://build-failures.rhaalovely.net/arm/2018-10-12/audio/audacity.log http://build-failures.rhaalovely.net/arm/2018-10-12/audio/chromaprint.log http://build-failures.rhaalovely.net/arm/2018-10-12/audio/pulseaudio.log http://build-failures.rhaalovely.net/arm/2018-10-12/audio/solfege.log http://build-failures.rhaalovely.net/arm/2018-10-12/comms/lcdproc.log http://build-failures.rhaalovely.net/arm/2018-10-12/devel/bullet.log http://build-failures.rhaalovely.net/arm/2018-10-12/devel/liboil.log http://build-failures.rhaalovely.net/arm/2018-10-12/devel/llvm,-main.log http://build-failures.rhaalovely.net/arm/2018-10-12/devel/ocaml-dose.log http://build-failures.rhaalovely.net/arm/2018-10-12/devel/openmpi.log http://build-failures.rhaalovely.net/arm/2018-10-12/devel/p5-Module-Install.log http://build-failures.rhaalovely.net/arm/2018-10-12/devel/srecord.log http://build-failures.rhaalovely.net/arm/2018-10-12/devel/tbb.log http://build-failures.rhaalovely.net/arm/2018-10-12/editors/emacs21.log http://build-failures.rhaalovely.net/arm/2018-10-12/emulators/dgen-sdl.log http://build-failures.rhaalovely.net/arm/2018-10-12/emulators/dynamips.log http://build-failures.rhaalovely.net/arm/2018-10-12/emulators/ppsspp.log http://build-failures.rhaalovely.net/arm/2018-10-12/emulators/retroarch.log http://build-failures.rhaalovely.net/arm/2018-10-12/emulators/vbam.log http://build-failures.rhaalovely.net/arm/2018-10-12/emulators/vice.log http://build-failures.rhaalovely.net/arm/2018-10-12/games/barony.log http://build-failures.rhaalovely.net/arm/2018-10-12/games/dungeon-crawl.log http://build-failures.rhaalovely.net/arm/2018-10-12/games/fifengine.log http://build-failures.rhaalovely.net/arm/2018-10-12/games/frozen-bubble,-main.log http://build-failures.rhaalovely.net/arm/2018-10-12/games/hyperrogue.log http://build-failures.rhaalovely.net/arm/2018-10-12/games/pingus.log http://build-failures.rhaalovely.net/arm/2018-10-12/games/spacehulk.log http://build-failures.rhaalovely.net/arm/2018-10-12/games/stone-soup,no_x11.log http://build-failures.rhaalovely.net/arm/2018-10-12/games/vacuum.log http://build-failures.rhaalovely.net/arm/2018-10-12/games/valyriatear.log http://build-failures.rhaalovely.net/arm/2018-10-12/graphics/ImageMagick.log http://build-failures.rhaalovely.net/arm/2018-10-12/graphics/freeimage.log http://build-failures.rhaalovely.net/arm/2018-10-12/graphics/libmpeg2.log http://build-failures.rhaalovely.net/arm/2018-10-12/graphics/ufraw.log http://build-failures.rhaalovely.net/arm/2018-10-12/lang/STk.log http://build-failures.rhaalovely.net/arm/2018-10-12/lang/nqp.log http://build-failures.rhaalovely.net/arm/2018-10-12/lang/parrot.log http://build-failures.rhaalovely.net/arm/2018-10-12/lang/pfe.log http://build-failures.rhaalovely.net/arm/2018-10-12/lang/racket-minimal,no_jit.log http://build-failures.rhaalovely.net/arm/2018-10-12/lang/ruby/2.3,-gdbm.log http://build-failures.rhaalovely.net/arm/2018-10-12/lang/swi-prolog.log http://build-failures.rhaalovely.net/arm/2018-10-12/mail/bogofilter,db4.log http://build-failures.rhaalovely.net/arm/2018-10-12/mail/courier-unicode.log http://build-failures.rhaalovely.net/arm/2018-10-12/math/dieharder.log http://build-failures.rhaalovely.net/arm/2018-10-12/math/mathomatic.log http://build-failures.rhaalovely.net/arm/2018-10-12/math/netcdf.log http://build-failures.rhaalovely.net/arm/2018-10-12/math/plplot,-c++.log http://build-failures.rhaalovely.net/arm/2018-10-12/math/z3.log http://build-failures.rhaalovely.net/arm/2018-10-12/misc/openbabel.log http://build-failures.rhaalovely.net/arm/2018-10-12/misc/rocrail,-gui.log http://build-failures.rhaalovely.net/arm/2018-10-12/multimedia/gstreamer-0.10/plugins-ffmpeg.log http://build-failures.rhaalovely.net/arm/2018-10-12/multimedia/gstreamer1/plugins-libav.log http://build-failures.rhaalovely.net/arm/2018-10-12/net/bitcoin,no_x11.log http://build-failures.rhaalovely.net/arm/2018-10-12/net/filezilla.log http://build-failures.rhaalovely.net/arm/2018-10-12/net/hexchat.log http://build-failures.rhaalovely.net/arm/2018-10-12/net/utox.log http://build-failures.rhaalovely.net/arm/2018-10-12/print/foo2zjs.log http://build-failures.rhaalovely.net/arm/2018-10-12/productivity/ledger.log http://build-failures.rhaalovely.net/arm/2018-10-12/security/libnipper.log http://build-failures.rhaalovely.net/arm/2018-10-12/security/py-miasm.log http://build-failures.rhaalovely.net/arm/2018-10-12/www/nginx,-headers_more.log http://b
Re: [UPDATE] devel/ipython 5.3.0p0 -> 5.8.0 and devel/py-ipykernel 4.6.1p0 -> 4.9.0
On Thu 06/09/2018 13:17, Elias M. Mariani wrote:
> You are right, I forgot to attach the diff...
> Here is the change in py-ipykernel that you requested.
>
> Cheers.
> Elias.
>
> 2018-08-30 14:39 GMT-03:00 Elias M. Mariani :
> > 2018-08-30 6:09 GMT-03:00 Edd Barrett :
> >> Hi Elias,
> >>
> >> I've installed and ran ipython for Python 2 and 3. Seems to be working.
> >> I've not tested any QT stuff -- I'll take your word that that works.
> >>
> >> On Wed, Aug 29, 2018 at 11:37:35PM -0300, Elias M. Mariani wrote:
> >>> The self-test returns 1 error, I think that is related to
> >>> graphics/py-matplotlib.
> >>> (I added matplotlib to the test depends, it wasn't there before)
> >>
> >> And does that make the test pass?
> > Sorry, maybe I didn't explain this in the right way:
> > The test was running without grapchis/matplotlib, I added the
> > dependency to enable the full extent of the tests, before this the
> > test was skipped, so, this reveals a problem that most likely was
> > hidden by the lack of the test dependency.
> > The error was something like: "cannot write mode RGBA as JPEG" or
> > something of the sort, given by python-PIL, while running matplotlib
> > invoked by IPython, it doesn't look like a problem from IPython.
> >
> >>
> >>> I disabled the building of the docs, I will send in a later mail
> >>> devel/ipython-docs with the same content
> >>
> >> That's annoying, but I don't object in the interim. It would be nice to
> >> have the docs back soon after this goes in though.
> > I will commit that port as soon as this gets committed.
> >
> >>
> >>> Might generate some problem with the Qt version used by some consumer.
> >>
> >> Do we have any QT consumers in our tree? I didn't think so.
> >>
> >> By the way:
> >> ---8<---
> >> +RUN_DEPENDS += devel/ipython${MODPY_FLAVOR}>=4.0.0 \
> >> + devel/py-jupyter_client${MODPY_FLAVOR} \
> >> + devel/py-traitlets${MODPY_FLAVOR}>=4.1.0 \
> >> + www/py-tornado${MODPY_FLAVOR}>=4.0
> >>
> >> -RUN_DEPENDS += devel/py-jupyter_client${MODPY_FLAVOR}>=5.0.1 \
> >> - devel/py-traitlets${MODPY_FLAVOR} \
> >> - www/py-tornado${MODPY_FLAVOR}
> >> --->8---
> >>
> >> If you move the devel/ipython line you added to the end, then it will be
> >> easier to see what changed in the diff.
> > Note taken.
> >
> >>
> >> --
> >> Best Regards
> >> Edd Barrett
> >>
> >> http://www.theunixzoo.co.uk
OK bket@ for both py-ipykernel-4.9.0, and py-ipython-5.3.0.
Re: Mininet Topology
On Thu, Oct 25, 2018 at 11:31:42PM -0700, stephan wrote:
> For some reason I am having a hard time running mininet which produces the
> forwarding rules.
>
> Anyways here is my code:
>
> import java.io.File;
> import java.io.PrintWriter;
> import java.io.FileWriter;
> import java.util.Collections;
> import java.util.LinkedList;
>
> public class Forwarding {
> static void dieUsage() {
> System.err.println("Usage:");
> System.err.println("java Forwarding [dotfile]");
> System.err.println("(depth and fanout must be integers >= 1)");
> System.exit(1);
> }
>
> public static void main(String[] argv) {
> int depth = -1;
> int fanout = -1;
> String filename = null;
>
> if(argv.length >= 2) {
> depth = Integer.parseInt(argv[0]);
> fanout = Integer.parseInt(argv[1]);
> } else dieUsage();
>
> if(depth < 1 || fanout < 1) dieUsage();
>
> if(argv.length >= 3) {
> filename = argv[2];
> }
>
> TreeNode root = new TreeNode();
> root.build(depth, fanout);
> System.out.println(root);
>
> if(filename != null) {
> root.saveDOT(new File(filename));
> }
>
> LinkedList leaves = root.getLeaves(); // these are the
> HOSTS
>
> // TODO:
> // Go through each unique pair (src,dst) of leaves, and compute the
> path from src to dst.
> // For a single path, you can use the Interface class to store each
> hop on the path (iface can be used for
> // the input interface, and iface2 can be used for the output
> interface).
>
>
> System.out.println (sudo dpctl add-flow unix:/tmp/s2
> "idle_timeout=0,hard_timeout=0,in_port=1,ip,nw_src=10.0.0.1,nw_dst=10.0.0.3,actions=output:3"
> sudo dpctl add-flow unix:/tmp/s1
> "idle_timeout=0,hard_timeout=0,in_port=1,ip,nw_src=10.0.0.1,nw_dst=10.0.0.3,actions=output:2"
> sudo dpctl add-flow unix:/tmp/s3
> "idle_timeout=0,hard_timeout=0,in_port=3,ip,nw_src=10.0.0.1,nw_dst=10.0.0.3,actions=output:1"
>
> sudo dpctl add-flow unix:/tmp/s2
> "idle_timeout=0,hard_timeout=0,in_port=1,arp,nw_src=10.0.0.1,nw_dst=10.0.0.3,actions=output:3"
> sudo dpctl add-flow unix:/tmp/s1
> "idle_timeout=0,hard_timeout=0,in_port=1,arp,nw_src=10.0.0.1,nw_dst=10.0.0.3,actions=output:2"
> sudo dpctl add-flow unix:/tmp/s3
> "idle_timeout=0,hard_timeout=0,in_port=3,arp,nw_src=10.0.0.1,nw_dst=10.0.0.3,actions=output:1"
>
> sudo dpctl add-flow unix:/tmp/s3
> "idle_timeout=0,hard_timeout=0,in_port=1,ip,nw_src=10.0.0.3,nw_dst=10.0.0.1,actions=output:3"
> sudo dpctl add-flow unix:/tmp/s1
> "idle_timeout=0,hard_timeout=0,in_port=2,ip,nw_src=10.0.0.3,nw_dst=10.0.0.1,actions=output:1"
> sudo dpctl add-flow unix:/tmp/s2
> "idle_timeout=0,hard_timeout=0,in_port=3,ip,nw_src=10.0.0.3,nw_dst=10.0.0.1,actions=output:1"
>
> sudo dpctl add-flow unix:/tmp/s3
> "idle_timeout=0,hard_timeout=0,in_port=1,arp,nw_src=10.0.0.3,nw_dst=10.0.0.1,actions=output:3"
> sudo dpctl add-flow unix:/tmp/s1
> "idle_timeout=0,hard_timeout=0,in_port=2,arp,nw_src=10.0.0.3,nw_dst=10.0.0.1,actions=output:1"
> sudo dpctl add-flow unix:/tmp/s2
> "idle_timeout=0,hard_timeout=0,in_port=3,arp,nw_src=10.0.0.3,nw_dst=10.0.0.1,actions=output:1")
>
>public void printAllPaths(int src, int dst)
> {
> boolean[] isVisited = new boolean[v];
> ArrayList pathList = new ArrayList<>();
>
>
> pathList.add(s);
>
>
> printAllPathsUtil(src, dst, iface2);
>
>
> }
> }
>
> class Interface {
> int iface;
> TreeNode node;
>
> private int iface2 = 0;
>
> Interface(TreeNode node) {
> this(0, node);
> }
>
> Interface(int iface, TreeNode node) {
> this.iface = iface;
> this.node = node;
> }
>
> Interface(int iface1, TreeNode node, int iface2) {
> this.iface = iface1;
> this.iface2 = iface2;
> this.node = node;
> }
>
> int getIface2() {
> return iface2;
> }
>
> void setIface2(int iface2) {
> this.iface2 = iface2;
> }
>
> public String toString() {
> String s;
>
> if(iface2 == 0) s= String.format("(%d->%s)", iface, node.getName());
> else s = String.format("(%d->%s->%d)", iface, node.getName(),
> iface2);
>
> return s;
> }
> }
>
> class TreeNode {
> private Interface parent;
> int id;
> LinkedList children = new LinkedList();
> boolean isLeaf;
>
> private static int routerId;
> private static int hostId;
>
> TreeNode() {
> this.parent = null;
> this.id = 1;
> }
>
> TreeNode(TreeNode parent, int id) {
> this(parent, id, false);
> }
>
> TreeNode(TreeNode parent, int id, boolean isLeaf) {
> this.parent = new Interface(parent);
> this.id = id;
> this.isLeaf = isLeaf;
> updateParent();
> }
>
> int getChildInterface(TreeNode ch
Re: php 7.2 pool definition
Fixed in -current, the simplest way for php 7.1/7.2 in 6.4 is probably to use the sample php-fpm.conf from 7.0 (pkg_add php%7.0, it's in /usr/local/share/examples/php-7.0/php-fpm.conf). -- Sent from a phone, apologies for poor formatting. On 28 October 2018 21:32:00 wrote: I am trying to find a pool definition for www in php 7.2. Has it been moved to an include file?
Re: NEW: games/iortcw
On Sun, Oct 28, 2018 at 04:50:41PM -0400, Brian Callahan wrote:
>
>
> On 10/28/18 2:36 PM, Ryan Freeman wrote:
> >iortcw is an effort to provide a baseline RTCW (Return to Castle
> >Wolfenstein) engine with updated idtech3 engine-base from the ioquake3
> >project.
> >
> >There is a single player, multiplayer, and dedicated server binary.
> >
> >Tested single-player with my own ancient gamedata for this game, plus
> >the patch for 1.41 as indicated in the PKGREADME. Unfortunately my
> >physical disc and CD-Key have long since disappeared, and the CD-Key
> >is required for multiplayer, so I could not test that mode. The engine
> >seems to mention Steam, and GOG has the game for sale now as well:
> >
> >https://www.gog.com/game/return_to_castle_wolfenstein
> >
> >Tested on amd64-current with hours and hours of single-player game time
> >logged yesterday. Unlike ioquake3, the COPYDIR location for gamedata
> >does not have an effect on this codebase, thus wrappers are provided
> >to relocate to ${PREFIX}/share/iortcw before launching the game.
> >
> >Comments? OK?
> >
> >-Ryan
>
> Some quick eye-glances:
> A blank line between # $OpenBSD$ and ONLY_FOR_ARCHS would be nice.
>
> The GH_* variables imply DISTNAME and HOMEPAGE for you (but a real
> tarball would be better).
>
> License is GPLv3+
>
> The things in ${FILESDIR} should have their hardcoded /usr/local
> replaced and then ${SUBST_CMD} them during install.
>
> You have an -O3 floating around the build; should get rid of that.
>
> pkg/PLIST has lots of things like:
> share/iortcw/main/cgame.mp.amd64.so
> and other entries with amd64 in them (are you sure your SUBST_VARS
> line is right?).
>
> ~Brian
Thanks for the look, Brian! Attached update port:
- Added blank line between $OpenBSD$ marker and ONLY_FOR_ARCHS
- Removed HOMEPAGE, but kept DISTNAME to prevent poorly-named distfile
(no proper source release is available)
- Fixed license marker to GPLv3+
- Fixed hardcoded /usr/local in ${FILESDIR} scripts
- patched out -O3 from Makefiles (also removes -ffast-math as proposed
upstream in a current pull request)
- Fixed pkg/PLIST so it refers to ${MACHINE_ARCH} instead of hardcoded
amd64 appearing there
I added a remark to the PKGREADME as I don't believe we can play on the
multiplayer servers due to sv_pure 1 and our libs will likely never be
in the mp_bin.pk3 file used to designate a server pure or not.. However,
I was able to confirm using:
$ iowolfded +sv_pure 0 +map mp_beach
lets us run an OpenBSD server and iowolfmp will connect to it without
issue.
Also forgot in original post to thank @abieber as I stole some things
from his games/ioquake3 port in making this. :-)
-Ryan
iortcw.tar.gz
Description: application/tar-gz
php 7.2 pool definition
I am trying to find a pool definition for www in php 7.2. Has it been moved to an include file?
qt5.port.mk breaks security/xca
http://build-failures.rhaalovely.net/amd64/2018-10-25/security/xca.log
security/xca breaks because it uses "cc" to link C++ code. It also
uses "cc" to compile C++ code, but the compiler switches to C++
mode. The link command does not.
xca's build framework uses the CC variable to hold the name of the
compiler. configure correctly sets this to CC=c++.
Enter qt5.port.mk:
MAKE_FLAGS += ${_MODQT5_SETUP}
...
# useful?
_MODQT5_SETUP +=CC=${CC} CXX=${CXX}
This forces CC=cc into the build and breaks it.
Do we really need this forceful override in all ports that use Qt5?
There is no equivalent in qt4.port.mk.
We can work around it in the xca port, but working around a workaround
in the ports infrastructure feels silly.
--
Christian "naddy" Weisgerber na...@mips.inka.de
Re: NEW: games/iortcw
On 10/28/18 2:36 PM, Ryan Freeman wrote:
iortcw is an effort to provide a baseline RTCW (Return to Castle
Wolfenstein) engine with updated idtech3 engine-base from the ioquake3
project.
There is a single player, multiplayer, and dedicated server binary.
Tested single-player with my own ancient gamedata for this game, plus
the patch for 1.41 as indicated in the PKGREADME. Unfortunately my
physical disc and CD-Key have long since disappeared, and the CD-Key
is required for multiplayer, so I could not test that mode. The engine
seems to mention Steam, and GOG has the game for sale now as well:
https://www.gog.com/game/return_to_castle_wolfenstein
Tested on amd64-current with hours and hours of single-player game time
logged yesterday. Unlike ioquake3, the COPYDIR location for gamedata
does not have an effect on this codebase, thus wrappers are provided
to relocate to ${PREFIX}/share/iortcw before launching the game.
Comments? OK?
-Ryan
Some quick eye-glances:
A blank line between # $OpenBSD$ and ONLY_FOR_ARCHS would be nice.
The GH_* variables imply DISTNAME and HOMEPAGE for you (but a real
tarball would be better).
License is GPLv3+
The things in ${FILESDIR} should have their hardcoded /usr/local
replaced and then ${SUBST_CMD} them during install.
You have an -O3 floating around the build; should get rid of that.
pkg/PLIST has lots of things like:
share/iortcw/main/cgame.mp.amd64.so
and other entries with amd64 in them (are you sure your SUBST_VARS line
is right?).
~Brian
NEW: games/iortcw
iortcw is an effort to provide a baseline RTCW (Return to Castle
Wolfenstein) engine with updated idtech3 engine-base from the ioquake3
project.
There is a single player, multiplayer, and dedicated server binary.
Tested single-player with my own ancient gamedata for this game, plus
the patch for 1.41 as indicated in the PKGREADME. Unfortunately my
physical disc and CD-Key have long since disappeared, and the CD-Key
is required for multiplayer, so I could not test that mode. The engine
seems to mention Steam, and GOG has the game for sale now as well:
https://www.gog.com/game/return_to_castle_wolfenstein
Tested on amd64-current with hours and hours of single-player game time
logged yesterday. Unlike ioquake3, the COPYDIR location for gamedata
does not have an effect on this codebase, thus wrappers are provided
to relocate to ${PREFIX}/share/iortcw before launching the game.
Comments? OK?
-Ryan
iortcw.tar.gz
Description: application/tar-gz
Re: update: print/py-relatorio 0.8.1 (+ devel/py-magic)
Hi Sebastien --
On 10/28/18 2:18 AM, Sebastien Marie wrote:
ping.
On Sun, Sep 30, 2018 at 06:54:58PM +0200, Sebastien Marie wrote:
Hi,
Here an update for print/py-relatorio
ChangeLog 0.8.1 - 20180930
* Add support for Python 3.7
* Escape invalid XML characters
* Enforce closing tag to be the same directive as the opening
* Use compression for zip file
* Write mimetype as first file of the zip file
Several changes port-wise:
- taking maintainership
- switch from py-libmagic to py-magic - tarball attached (I am
ressurecting the old thread from 2018-06-28
https://marc.info/?l=openbsd-ports&m=153016881423341&w=2). bcallah@
are you still fine for this port ? when you proposed it, you proposed
to take maintainership). I added @conflict/@pkgpath markers to it.
Tested on amd64, py and py3.
Thanks.
--
Sebastien Marie
Index: Makefile
===
RCS file: /cvs/ports/print/py-relatorio/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile12 Dec 2017 01:45:10 - 1.8
+++ Makefile30 Sep 2018 14:32:50 -
@@ -2,7 +2,7 @@
COMMENT= templating library able to output odt and pdf files
-MODPY_EGG_VERSION= 0.8.0
+MODPY_EGG_VERSION= 0.8.1
DISTNAME= relatorio-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
@@ -10,6 +10,8 @@ CATEGORIES= print textproc
HOMEPAGE= http://relatorio.tryton.org/
+MAINTAINER = Sebastien Marie
+
# GPLv3
PERMIT_PACKAGE_CDROM= Yes
@@ -24,7 +26,7 @@ FLAVORS= python3
RUN_DEPENDS= www/py-genshi${MODPY_FLAVOR} \
textproc/py-lxml${MODPY_FLAVOR} \
- devel/py-libmagic${MODPY_FLAVOR}
+ devel/py-magic${MODPY_FLAVOR}
.if !${FLAVOR:Mpython3}
RUN_DEPENDS+= graphics/pycha \
Index: distinfo
===
RCS file: /cvs/ports/print/py-relatorio/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo12 Dec 2017 01:45:10 - 1.5
+++ distinfo30 Sep 2018 13:44:59 -
@@ -1,2 +1,2 @@
-SHA256 (relatorio-0.8.0.tar.gz) = vd+F0CnFyFoPl21zkH4U5MMJMGX+hScXDJGr8CGFRtk=
-SIZE (relatorio-0.8.0.tar.gz) = 1096794
+SHA256 (relatorio-0.8.1.tar.gz) = FJocTCo12bnmNP6AysQFvJtMA6QvgYMCNiGDUV5+g10=
+SIZE (relatorio-0.8.1.tar.gz) = 1099129
Could you resend me the py-magic tarball? I can give it a look over and
get it committed...
~Brian
Re: multimedia/mpv CVE-2018-6360
On Sun, Oct 28, 2018 at 06:35:23PM +0100, Ingo Feinerer wrote: > Is there a specific reason why FFmpeg is kept on the 2.8 branch? It's a non-trivial port and the configure script would run into endless loops during both of my update attempts. mpv is of similar nature - I pretty much stopped working on them because it was too frustrating.
multimedia/mpv CVE-2018-6360
Hi, multimedia/mpv is currently at 0.22.0 (from 2016) and seems to be affected by CVE-2018-6360 (https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6360). I tried to update to 0.29.1 but configure stops because FFmpeg 4.0 or newer is needed (we only have 2.8.15). Is there a specific reason why FFmpeg is kept on the 2.8 branch? Or should we try to backport the patch to the ancient 0.22.0 version? Best regards, Ingo
Re: UPDATE: x11/qt5
On Fri Oct 26, 2018 at 05:19:15PM +0200, Rafael Sadowski wrote:
> Update Qt to the latest 5.9 TLS. I removed almost all libressl patches
> and the backports patches from upstream.
>
> Can any of the libressl fallas look over it? According to the tickets,
> everything's closed.
>
> I know it's crazy these days. Maybe someone will find a free bulk build
> slot for the diff below.
>
> Rafael Sadowski
>
> Index: Makefile.version
> ===
> RCS file: /cvs/ports/x11/qt5/Makefile.version,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 Makefile.version
> --- Makefile.version 5 Jul 2018 09:49:13 - 1.6
> +++ Makefile.version 26 Oct 2018 15:05:44 -
> @@ -1,13 +1,13 @@
> # $OpenBSD: Makefile.version,v 1.6 2018/07/05 09:49:13 rsadowski Exp $
> # Common source for Qt5 version
>
> -QT5_VERSION =5.9.6
> -QT5_DIST_VERSION = 5.9.6
> +QT5_VERSION =5.9.7
> +QT5_DIST_VERSION = 5.9.7
> QT5_WEBKIT_VERSION = 5.9.0
>
> # This one is used for building dependencies for examples and documentation,
> # which obviously should be in sync with core packages.
> -QT5_NEXT_VERSION = 5.10
> +QT5_NEXT_VERSION = 5.12
>
It should stay that way for now. Note from Vadim. Thanks!
> RCS file: qtbase/patches/patch-config_tests_openssl_openssl_cpp
> diff -N qtbase/patches/patch-config_tests_openssl_openssl_cpp
> --- qtbase/patches/patch-config_tests_openssl_openssl_cpp 24 Oct 2017
> 10:12:19 - 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,22 +0,0 @@
> -$OpenBSD: patch-config_tests_openssl_openssl_cpp,v 1.1 2017/10/24 10:12:19
> rsadowski Exp $
> -LibreSSL _is_ fine.
> -Index: config.tests/openssl/openssl.cpp
> config.tests/openssl/openssl.cpp.orig
> -+++ config.tests/openssl/openssl.cpp
> -@@ -38,16 +38,7 @@
> -
> /
> -
> - #include
> --
> --#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 <
> 0x0090700fL
> --# error "OpenSSL >= 0.9.7 is required"
> --#endif
> --
> - #include
> --
> --#if OPENSSL_VERSION_NUMBER-0 >= 0x10002000L && !defined(OPENSSL_NO_EC) &&
> !defined(SSL_CTRL_SET_CURVES)
> --# error "OpenSSL was reported as >= 1.0.2 but is missing required
> features, possibly it's libressl which is unsupported"
> --#endif
> -
> - int main()
> - {
The deletion of the above was a mistake from me. Compile at configure
time will fail and thus define QT_NO_SSL which is not correct. Spotted
by landry@ Thanks!
New diff below:
Index: Makefile.version
===
RCS file: /cvs/ports/x11/qt5/Makefile.version,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile.version
--- Makefile.version5 Jul 2018 09:49:13 - 1.6
+++ Makefile.version28 Oct 2018 16:37:49 -
@@ -1,8 +1,8 @@
# $OpenBSD: Makefile.version,v 1.6 2018/07/05 09:49:13 rsadowski Exp $
# Common source for Qt5 version
-QT5_VERSION = 5.9.6
-QT5_DIST_VERSION = 5.9.6
+QT5_VERSION = 5.9.7
+QT5_DIST_VERSION = 5.9.7
QT5_WEBKIT_VERSION = 5.9.0
# This one is used for building dependencies for examples and documentation,
Index: docs/distinfo
===
RCS file: /cvs/ports/x11/qt5/docs/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- docs/distinfo 5 Jul 2018 09:49:13 - 1.5
+++ docs/distinfo 28 Oct 2018 16:37:49 -
@@ -1,66 +1,66 @@
-SHA256 (qt/qt3d-opensource-src-5.9.6.tar.xz) =
yJy8Ev3lonnlsSdlGhlMrnUAO6gRP55+eyTmdJXs/wk=
-SHA256 (qt/qtactiveqt-opensource-src-5.9.6.tar.xz) =
rSoEGrmKSbPH8B/Sk8N1q1tfcbzJPGt3NUTX8I6PvfE=
-SHA256 (qt/qtbase-opensource-src-5.9.6.tar.xz) =
7tYgyyaLGZvYOz/GpHHFHVHh3C27U3T8l6DMdfrL428=
-SHA256 (qt/qtcanvas3d-opensource-src-5.9.6.tar.xz) =
naRZkfYhUsLHaTGu2KYFk3X9zkQbOHUpkeGtLHdQfCI=
-SHA256 (qt/qtcharts-opensource-src-5.9.6.tar.xz) =
X9YPCLGBWw57gTx1oOxya//HzGhrFgvr8ecQ6ILOras=
-SHA256 (qt/qtconnectivity-opensource-src-5.9.6.tar.xz) =
bGloVcLU5jcJuoHSLIXKsw9mQY6sL7KBCgKktHpTHFc=
-SHA256 (qt/qtdatavis3d-opensource-src-5.9.6.tar.xz) =
vTTHylYU8XHWhYyJmvusdsRh1Wld+zQm4IOPSuznetA=
-SHA256 (qt/qtdeclarative-opensource-src-5.9.6.tar.xz) =
BY/ZmneadT/F9eiH8a+3mapTufAQ+qBjdLHPtvyLrYo=
-SHA256 (qt/qtdoc-opensource-src-5.9.6.tar.xz) =
sxDruVIb0HXYh82a2B7/3Ar1VeWJiL3rAtgScIPyMhQ=
-SHA256 (qt/qtgamepad-opensource-src-5.9.6.tar.xz) =
JS59zvgtxS+i8QPbtsslrZ1u9tzjJU5yVeHm5PPPaFw=
-SHA256 (qt/qtgraphicaleffects-opensource-src-5.9.6.tar.xz) =
X5i8Yujye9E4U+kDBufhD0f7BtfNOPLnvna9kH7zcVQ=
-SHA256 (qt/qtimageformats-opensource-src-5.9.6.tar.xz) =
FYJy2l5Jo4i0NCM5lZI3KWiYQyO/1UOlqZK71Gb/QGA=
-SHA256 (qt/qtlocation-opensource-src-5.9.6.tar.xz) =
fWXI4VXGF3GeL7VtOfEc8ryRGkPPZmfBJNhswaEmGck=
-SHA256 (qt/qtmultimedia-opensource-src-5.9.6.tar.xz) =
ntwR104Q5O+FerOKZnACWYKea1uqSrCzBlX1SdiTn/8=
-SHA256 (qt/qtnetw
Re: [update] osm2pgsql 0.96.0
On Sun, 28 Oct 2018 10:04:17 +0100, Landry Breuil wrote: > update & unbreak Yay! Thanks for looking into it. ok danj@
Re: update: devel/py-simpleeval
On Sun, 28 Oct 2018 07:16:01 +0100, Sebastien Marie wrote: > ping. Committed, merci :)
devel/py-dateutil : update to 2.7.4
Hi,
Here is a patch to update devel/py-dateutil to 2.7.4, it build and test well
on my amd64 system.
OK ?
Cheers,
wen
Index: Makefile
===
RCS file: /cvs/ports/devel/py-dateutil/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile7 Sep 2018 11:22:25 - 1.27
+++ Makefile28 Oct 2018 13:16:53 -
@@ -2,7 +2,7 @@
COMMENT = Python API for advanced date calculations
-MODPY_EGG_VERSION =2.7.3
+MODPY_EGG_VERSION =2.7.4
DISTNAME = python-dateutil-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:S/^python-/py-/}
CATEGORIES = devel
Index: distinfo
===
RCS file: /cvs/ports/devel/py-dateutil/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo7 Sep 2018 11:22:25 - 1.13
+++ distinfo28 Oct 2018 13:16:53 -
@@ -1,2 +1,2 @@
-SHA256 (python-dateutil-2.7.3.tar.gz) =
4nAB3jL2J8IjgKaIvMQ86DUEp7xdpHIgm0xw8Cgp8Lg=
-SIZE (python-dateutil-2.7.3.tar.gz) = 302871
+SHA256 (python-dateutil-2.7.4.tar.gz) =
LxPT6iNq6yN+cljVcpxG6v4VBv1/hQfzRzBzTtizdFQ=
+SIZE (python-dateutil-2.7.4.tar.gz) = 302229
Re: Possible fix for p5-Net-SSH-Perl on sparc64
On 2018-10-27, Charlene Wendling wrote: > The patch i propose here builds and works on sparc64 and amd64, and > simply reverts poly1305.c as it is in OpenSSH, but there are 2 > concerns: > > 1) Security implications, as the context is different than OpenSSH > itself. > > 2) It "reintroduces" the warning, and it appears it's overriding > Perl's own definition of the U8TO32_LE macro: It's tragicomical. Both Perl's internal hv_func.h and poly1305.c have a macro U8TO32_LE(). Both versions do the same thing. However, the one in hv_func.h that is chosen on sparc64 is poorly written: #define U8TO32_LE(ptr) (ptr[0]|ptr[1]<<8|ptr[2]<<16|ptr[3]<<24) It fails to parenthesize its argument, so U8TO32_LE(key+0) produces key+0[0] etc., which causes the syntax error. It also lacks casts to uint32_t, so the arithmetic is performed as int and we're shifting into the sign bit, which is undefined in C. Your patch is fine. Alternatively you could do #undef U8TO32_LE. I see that perl 5.28 has fixed U8TO32_LE(), so once we get a newer perl this patch could go away. This should be mentioned in the comment. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: UPDATE: mail/mdsort
OK
UPDATE: mail/mdsort
Hi,
Update mdsort from maintainer, complete changelog can be found here[1].
Most notably, mdsort can now act as a MDA reading messages from stdin.
Comments? OK?
[1] https://github.com/mptre/mdsort/releases/tag/v2.0.0
Index: Makefile
===
RCS file: /cvs/ports/mail/mdsort/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile30 Jul 2018 10:48:59 - 1.2
+++ Makefile27 Oct 2018 12:38:15 -
@@ -2,7 +2,7 @@
COMMENT = maildir sort
-V =1.1.0
+V =2.0.0
DISTNAME = mdsort-${V}
CATEGORIES = mail
Index: distinfo
===
RCS file: /cvs/ports/mail/mdsort/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo30 Jul 2018 10:48:59 - 1.2
+++ distinfo27 Oct 2018 12:38:15 -
@@ -1,2 +1,2 @@
-SHA256 (mdsort-1.1.0.tar.gz) = uWtd0YUJ5zFCbEJ5rTxaGJmIPHhr794PsMJSBX7iFls=
-SIZE (mdsort-1.1.0.tar.gz) = 26633
+SHA256 (mdsort-2.0.0.tar.gz) = 17sfQobEROU9WGbA6Cs3J9qG2XquHsrnjKT4Y0nsCds=
+SIZE (mdsort-2.0.0.tar.gz) = 30615
Re: NEW: textproc/apertium-separable
On Thu, Oct 4, 2018 at 5:19 AM Anthony J. Bentley wrote: > On Thu, Sep 27, 2018 at 2:14 AM Anthony J. Bentley wrote: > > apertium-separable is an lttoolbox module for reordering > > separable/discontiguous multiwords and processing them in the pipeline. > > Multiwords are manually written in an additional xml-format dictionary. > > > > Also attached is a diff to update apertium-fra-cat; this update requires > > apertium-separable. (New language pairs will start depending on it too.) > > > > ok? > > Anyone interested in reviewing this? The apertium-fra-cat update > provides an easy way to test that it works. Updated tarball that uses ports-gcc on GCC architectures. apertium-separable.tar.gz Description: application/gzip Index: cat/Makefile === RCS file: /cvs/ports/textproc/apertium-dicts/cat/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- cat/Makefile 31 Oct 2017 09:51:28 - 1.5 +++ cat/Makefile 4 Oct 2018 11:15:27 - @@ -2,7 +2,7 @@ L = cat LANG = Catalan -V = 2.3.1 +V = 2.4.0 USE_GMAKE = Yes Index: cat/distinfo === RCS file: /cvs/ports/textproc/apertium-dicts/cat/distinfo,v retrieving revision 1.5 diff -u -p -r1.5 distinfo --- cat/distinfo 31 Oct 2017 09:51:28 - 1.5 +++ cat/distinfo 4 Oct 2018 11:15:27 - @@ -1,2 +1,2 @@ -SHA256 (apertium-cat-2.3.1.tar.gz) = p3oytFqxdATx/ymGn75YO8IarAzxPqar5LTuKmQE5Wo= -SIZE (apertium-cat-2.3.1.tar.gz) = 739072 +SHA256 (apertium-cat-2.4.0.tar.gz) = zGzb1/e0/doy8YqOQMbaeBJNdc08aiKyMWHalj6ZDDU= +SIZE (apertium-cat-2.4.0.tar.gz) = 805987 Index: fra/Makefile === RCS file: /cvs/ports/textproc/apertium-dicts/fra/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- fra/Makefile 8 Aug 2017 07:19:22 - 1.1.1.1 +++ fra/Makefile 4 Oct 2018 11:15:27 - @@ -2,7 +2,7 @@ L = fra LANG = French -V = 1.1.0 +V = 1.2.0 USE_GMAKE = Yes Index: fra/distinfo === RCS file: /cvs/ports/textproc/apertium-dicts/fra/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- fra/distinfo 8 Aug 2017 07:19:22 - 1.1.1.1 +++ fra/distinfo 4 Oct 2018 11:15:27 - @@ -1,2 +1,2 @@ -SHA256 (apertium-fra-1.1.0.tar.gz) = oj5X3oMHO9ctArmN+ngF2TmPnDl//yqLBCh5X+YNry0= -SIZE (apertium-fra-1.1.0.tar.gz) = 348322 +SHA256 (apertium-fra-1.2.0.tar.gz) = Zbt1hu5+yYh2FjW0/tXeU8H4F8gys95H8LM1fKDRUv4= +SIZE (apertium-fra-1.2.0.tar.gz) = 506200 Index: fra-cat/Makefile === RCS file: /cvs/ports/textproc/apertium-dicts/fra-cat/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- fra-cat/Makefile 8 Aug 2017 07:20:03 - 1.1.1.1 +++ fra-cat/Makefile 4 Oct 2018 11:15:27 - @@ -2,13 +2,14 @@ L = fra-cat LANG = French/Catalan -V = 1.2.0 +V = 1.3.0 USE_GMAKE = Yes BUILD_DEPENDS += textproc/apertium-dicts/fra \ textproc/apertium-dicts/cat \ textproc/apertium-lex-tools \ + textproc/apertium-separable \ textproc/vislcg3 .include Index: fra-cat/distinfo === RCS file: /cvs/ports/textproc/apertium-dicts/fra-cat/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- fra-cat/distinfo 8 Aug 2017 07:20:03 - 1.1.1.1 +++ fra-cat/distinfo 4 Oct 2018 11:15:27 - @@ -1,2 +1,2 @@ -SHA256 (apertium-fra-cat-1.2.0.tar.gz) = KBPP5NjGvAo/5nH0yAmOx5VvFJig+7bBB0TmB5CD2Sg= -SIZE (apertium-fra-cat-1.2.0.tar.gz) = 273639 +SHA256 (apertium-fra-cat-1.3.0.tar.gz) = RLR7iIBSVYy7WKQTMuZRshX9n8UIJclzx/RFCF5DgQY= +SIZE (apertium-fra-cat-1.3.0.tar.gz) = 485108 Index: fra-cat/pkg/PLIST === RCS file: /cvs/ports/textproc/apertium-dicts/fra-cat/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- fra-cat/pkg/PLIST 8 Aug 2017 07:20:03 - 1.1.1.1 +++ fra-cat/pkg/PLIST 4 Oct 2018 11:15:27 - @@ -16,6 +16,7 @@ share/apertium/apertium-fra-cat/fra-cat. share/apertium/apertium-fra-cat/fra-cat.autolex.bin share/apertium/apertium-fra-cat/fra-cat.automorf.bin share/apertium/apertium-fra-cat/fra-cat.autopgen.bin +share/apertium/apertium-fra-cat/fra-cat.autosep.bin share/apertium/apertium-fra-cat/fra-cat.prob share/apertium/apertium-fra-cat/fra-cat.rlx.bin share/apertium/apertium-fra-cat/fra-cat.t1x.bin
mutt and gnupg in OpenBSD 6.4: "Could not decrypt PGP message'
My mutt/PGP config stopped working in the 6.4 release. I was unable to open encrypted mail sent to me. In case it saves anyone some trouble, I am sharing a workaround I have found: There's a new mutt option called pgp_check_gpg_decrypt_status_fd which is set to 'yes' by default. When set, mutt will try to find lines which begin with the string "[GNUPG:]" in gpg's output. No such lines are found in my case. If mutt does not see such lines, it will believe decryption has failed, and not display the messsage even though it was in fact decrypted correctly. Setting this option to 'no' made my setup work again.
[update] osm2pgsql 0.96.0
Hi,
update & unbreak now that it doesnt depend anymore on an ancient GEOS.
Tests seem to pass on i386 (the ones which fail are b/c the psql server
started for tests gets too many connections), also builds fine on amd64.
Will do some testing loading real datasetts.
Landry
Index: Makefile
===
RCS file: /cvs/ports/geo/osm2pgsql/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- Makefile16 Nov 2017 23:20:38 - 1.11
+++ Makefile28 Oct 2018 09:01:49 -
@@ -1,13 +1,10 @@
# $OpenBSD: Makefile,v 1.11 2017/11/16 23:20:38 naddy Exp $
COMMENT = OSM data to PostgreSQL converter
-#https://github.com/openstreetmap/osm2pgsql/issues/634
-BROKEN = doesnt build with geos 3.6 API
-GH_TAGNAME = 0.90.1
+GH_TAGNAME = 0.96.0
GH_PROJECT = osm2pgsql
GH_ACCOUNT = openstreetmap
-REVISION = 0
CATEGORIES = geo databases
@@ -19,7 +16,7 @@
USE_GMAKE =Yes
WANTLIB += boost_system-mt boost_filesystem-mt bz2 c expat
-WANTLIB += geos m pthread pq proj z ${MODLUA_WANTLIB} ${COMPILER_LIBCXX}
+WANTLIB += m pthread pq proj z ${MODLUA_WANTLIB} ${COMPILER_LIBCXX}
# postgresql needs to be first otherwise tests are done by cmake module
MODULES = databases/postgresql\
@@ -29,7 +26,6 @@
LIB_DEPENDS = databases/postgresql\
devel/proj \
- geo/geos\
devel/boost \
BUILD_DEPENDS =devel/libtool
Index: distinfo
===
RCS file: /cvs/ports/geo/osm2pgsql/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo30 Aug 2016 15:22:06 - 1.3
+++ distinfo28 Oct 2018 09:01:49 -
@@ -1,2 +1,2 @@
-SHA256 (osm2pgsql-0.90.1.tar.gz) = +boJcUYD2yUeSjV8GWhkDDULDKXJlxIAja3HHAw+iYs=
-SIZE (osm2pgsql-0.90.1.tar.gz) = 1326807
+SHA256 (osm2pgsql-0.96.0.tar.gz) = tgIOd9iHcpiSeaaa5GeOl4KYm2MGE3VOSDtRks05xyM=
+SIZE (osm2pgsql-0.96.0.tar.gz) = 1219163
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/geo/osm2pgsql/patches/patch-CMakeLists_txt,v
retrieving revision 1.1
diff -u -r1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt27 Apr 2016 17:02:34 - 1.1
+++ patches/patch-CMakeLists_txt28 Oct 2018 09:01:49 -
@@ -1,19 +1,20 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1 2016/04/27 17:02:34 danj Exp $
CMakeLists.txt.origWed Mar 2 15:06:44 2016
-+++ CMakeLists.txt Wed Apr 27 17:27:26 2016
-@@ -98,7 +98,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAK
- find_package(Osmium REQUIRED COMPONENTS io geos proj)
- include_directories(SYSTEM ${OSMIUM_INCLUDE_DIRS})
-
--find_package(Lua)
-+find_package(Lua ${MODLUA_VERSION})
- if (LUA_FOUND)
- include_directories(${LUA_INCLUDE_DIR})
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
CMakeLists.txt
+@@ -100,7 +100,7 @@ if (WITH_LUA)
+ include_directories(${LUAJIT_INCLUDE_DIR})
+ set(HAVE_LUAJIT 1)
+ else()
+-find_package(Lua REQUIRED)
++find_package(Lua ${MODLUA_VERSION} REQUIRED)
+ include_directories(${LUA_INCLUDE_DIR})
+ endif()
set(HAVE_LUA 1)
-@@ -257,5 +257,5 @@ endif()
+@@ -260,5 +260,5 @@ endif()
#
install(TARGETS osm2pgsql DESTINATION bin)
-install(FILES docs/osm2pgsql.1 DESTINATION share/man/man1)
+install(FILES docs/osm2pgsql.1 DESTINATION man/man1)
- install(FILES default.style empty.style 900913.sql DESTINATION
share/osm2pgsql)
+ install(FILES default.style empty.style DESTINATION share/osm2pgsql)
Index: patches/patch-contrib_libosmium_osmium_io_bzip2_compression_hpp
===
RCS file:
/cvs/ports/geo/osm2pgsql/patches/patch-contrib_libosmium_osmium_io_bzip2_compression_hpp,v
retrieving revision 1.1
diff -u -r1.1 patch-contrib_libosmium_osmium_io_bzip2_compression_hpp
--- patches/patch-contrib_libosmium_osmium_io_bzip2_compression_hpp 27 Apr
2016 17:02:34 - 1.1
+++ patches/patch-contrib_libosmium_osmium_io_bzip2_compression_hpp 28 Oct
2018 09:01:49 -
@@ -1,7 +1,8 @@
$OpenBSD: patch-contrib_libosmium_osmium_io_bzip2_compression_hpp,v 1.1
2016/04/27 17:02:34 danj Exp $
contrib/libosmium/osmium/io/bzip2_compression.hpp.orig Wed Apr 27
11:16:52 2016
-+++ contrib/libosmium/osmium/io/bzip2_compression.hpp Wed Apr 27 12:44:28 2016
-@@ -140,7 +140,7 @@ namespace osmium {
+Index: contrib/libosmium/osmium/io/bzip2_compression.hpp
+--- contrib/libosmium/osmium/io/bzip2_compression.hpp.orig
contrib/libosmium/osmium/io/bzip2_compression.hpp
+@@ -148,7 +148,7 @@ namespace osmium {
m_bzfile = nullptr;
if (m_
