Re: gdb for arm64

[Pascal Stumpf]

On Tue, 10 Jul 2018 12:00:54 +0200 (CEST), Mark Kettenis wrote:
> Here is a cleaned-up version of a diff that Dale made to support
> OpenBSD/arm64 in gdb.  Single-stepping doesn't work yet, which means
> that stepping through the code doesn't really work.  But setting
> breakpoints and inspecting state or looking at core files should work.
> 
> I'm not sure what to do with the lang/ocaml comment in the Makefile.
> 
> ok?

This works fine for me.  OK in coordination with the ocaml diff.

> Index: devel/gdb/Makefile
> ===
> RCS file: /cvs/ports/devel/gdb/Makefile,v
> retrieving revision 1.54
> diff -u -p -r1.54 Makefile
> --- devel/gdb/Makefile18 Jun 2018 14:53:12 -  1.54
> +++ devel/gdb/Makefile10 Jul 2018 09:44:47 -
> @@ -1,13 +1,12 @@
>  # $OpenBSD: Makefile,v 1.54 2018/06/18 14:53:12 kettenis Exp $
>  
>  # adjust lang/ocaml if gdb is ported to aarch64
> -NOT_FOR_ARCHS=   aarch64
>  
>  COMMENT= GNU debugger
>  CATEGORIES=  devel
>  
>  DISTNAME=gdb-7.12.1
> -REVISION=2
> +REVISION=3
>  
>  HOMEPAGE=https://www.gnu.org/software/gdb/
>  
> Index: devel/gdb/patches/patch-bfd_config_bfd
> ===
> RCS file: devel/gdb/patches/patch-bfd_config_bfd
> diff -N devel/gdb/patches/patch-bfd_config_bfd
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ devel/gdb/patches/patch-bfd_config_bfd10 Jul 2018 09:44:47 -
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +--- bfd/config.bfd.orig  Sat Jan 21 05:48:42 2017
>  bfd/config.bfd   Tue Mar  7 22:55:11 2017
> +@@ -202,6 +202,11 @@ case "${targ}" in
> + targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec 
> aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec"
> + want64=true
> + ;;
> ++  aarch64-*-openbsd*)
> ++targ_defvec=aarch64_elf64_le_vec
> ++targ_selvecs="aarch64_elf32_le_vec arm_elf32_le_vec"
> ++want64=true
> ++;;
> +   aarch64_be-*-linux*)
> + targ_defvec=aarch64_elf64_be_vec
> + targ_selvecs="aarch64_elf64_le_vec aarch64_elf32_le_vec 
> aarch64_elf32_be_vec arm_elf32_be_vec arm_elf32_le_vec"
> Index: devel/gdb/patches/patch-gdb_Makefile_in
> ===
> RCS file: devel/gdb/patches/patch-gdb_Makefile_in
> diff -N devel/gdb/patches/patch-gdb_Makefile_in
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ devel/gdb/patches/patch-gdb_Makefile_in   10 Jul 2018 09:44:47 -
> @@ -0,0 +1,24 @@
> +$OpenBSD$
> +Index: gdb/Makefile.in
> +--- gdb/Makefile.in.orig
>  gdb/Makefile.in
> +@@ -644,7 +644,8 @@ TARGET_OBS = @TARGET_OBS@
> + # All target-dependent objects files that require 64-bit CORE_ADDR
> + # (used with --enable-targets=all --enable-64-bit-bfd).
> + ALL_64_TARGET_OBS = \
> +-aarch64-tdep.o aarch64-linux-tdep.o aarch64-newlib-tdep.o 
> aarch64-insn.o \
> ++aarch64-tdep.o aarch64-linux-tdep.o \
> ++aarch64-newlib-tdep.o aarch64obsd-tdep.o aarch64-insn.o \
> + alphabsd-tdep.o alphafbsd-tdep.o alpha-linux-tdep.o alpha-mdebug-tdep.o 
> \
> + alphanbsd-tdep.o alphaobsd-tdep.o alpha-tdep.o \
> + amd64fbsd-tdep.o amd64-darwin-tdep.o amd64-dicos-tdep.o \
> +@@ -1663,7 +1664,8 @@ MAKEOVERRIDES=
> + 
> + ALLDEPFILES = \
> + aarch64-tdep.c aarch64-linux-tdep.c aarch64-newlib-tdep.c \
> +-aarch64-linux-nat.c \
> ++aarch64obsd-tdep.c \
> ++aarch64-linux-nat.c aarch64obsd-nat.c \
> + aix-thread.c \
> + alphabsd-nat.c alpha-linux-nat.c \
> + alpha-tdep.c alpha-mdebug-tdep.c \
> Index: devel/gdb/patches/patch-gdb_aarch64obsd-nat_c
> ===
> RCS file: devel/gdb/patches/patch-gdb_aarch64obsd-nat_c
> diff -N devel/gdb/patches/patch-gdb_aarch64obsd-nat_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ devel/gdb/patches/patch-gdb_aarch64obsd-nat_c 10 Jul 2018 09:44:47 
> -
> @@ -0,0 +1,210 @@
> +$OpenBSD$
> +Index: gdb/aarch64obsd-nat.c
> +--- gdb/aarch64obsd-nat.c.orig
>  gdb/aarch64obsd-nat.c
> +@@ -0,0 +1,205 @@
> ++/* Native-dependent code for OpenBSD/arm64 (AArch64)
> ++
> ++   Copyright (C) 2011-2017 Free Software Foundation, Inc.
> ++
> ++   This file is part of GDB.
> ++
> ++   This program is free software; you can redistribute it and/or modify
> ++   it under the terms of the GNU General Public License as published by
> ++   the Free Software Foundation; either version 3 of the License, or
> ++   (at your option) any later version.
> ++
> ++   This program is distributed in the hope that it will be useful,
> ++   but WITHOUT ANY WARRANTY; without even the implied warranty of
> ++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> ++   GNU General Public License for more details.
> ++
> ++   You should have received a copy of the GNU General Public License
> ++   along with this program.  If not, see .  */
> ++
> ++#include "defs.

[patch] security/libnipper on aarch64

[Matthew Martin]

Two signed char fixes.

- Matthew Martin

diff --git patches/patch-device_crypto_crypto-base64_cpp 
patches/patch-device_crypto_crypto-base64_cpp
index 081341a572d..68abdfc8951 100644
--- patches/patch-device_crypto_crypto-base64_cpp
+++ patches/patch-device_crypto_crypto-base64_cpp
@@ -1,8 +1,27 @@
 let it build with base gcc
 
 $OpenBSD: patch-device_crypto_crypto-base64_cpp,v 1.1.1.1 2008/09/20 20:26:05 
steven Exp $
 device/crypto/crypto-base64.cpp.orig   Sun Sep  7 23:03:17 2008
-+++ device/crypto/crypto-base64.cppSun Sep  7 23:03:17 2008
+Index: device/crypto/crypto-base64.cpp
+--- device/crypto/crypto-base64.cpp.orig
 device/crypto/crypto-base64.cpp
+@@ -36,7 +36,7 @@
+ 
+ // See RFC3548 for details of Base64 Encode / Decode standards
+ 
+-static const char base64string[] = {62, -1, -1, -1, 63, 52, 53, 54, 55, 56, 
57, 58, 59, 60, 61, -1, -1, -1, 0, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 
10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, 
-1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 
44, 45, 46, 47, 48, 49, 50, 51};
++static const signed char base64string[] = {62, -1, -1, -1, 63, 52, 53, 54, 
55, 56, 57, 58, 59, 60, 61, -1, -1, -1, 0, -1, -1, -1, 0, 1, 2, 3, 4, 5, 6, 7, 
8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, 
-1, -1, -1, -1, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 
42, 43, 44, 45, 46, 47, 48, 49, 50, 51};
+ 
+ 
+ // Base64 character check
+@@ -57,7 +57,7 @@ const char *Device::base64Decode(const char *encodedSt
+   // Variables...
+   string encoded(encodedString);
+   int offset = 0;
+-  char inter1, inter2, inter3, inter4 = 0;
++  signed char inter1, inter2, inter3, inter4 = 0;
+   base64TempString.assign("");
+ 
+   // Strip unwanted characters from the end of the string
 @@ -110,9 +110,9 @@ const char *Device::base64Decode(const char *encodedSt
offset++;
  

[patch] games/spacehulk on aarch64

[Matthew Martin]

A signed char fix and fix two obvious typos pointed out by clang.

- Matthew Martin


diff --git Makefile Makefile
index 13dda6c9e91..8cc6733b52f 100644
--- Makefile
+++ Makefile
@@ -4,7 +4,7 @@ COMMENT=total conversion of the Space Hulk board game
 
 DISTNAME=  spacehulk-1.5-beta1
 PKGNAME=   spacehulk-1.5beta1
-REVISION = 8
+REVISION = 9
 CATEGORIES=games x11
 
 HOMEPAGE=  http://r.vinot.free.fr/spacehulk/
diff --git patches/patch-src_levelfct_cpp patches/patch-src_levelfct_cpp
new file mode 100644
index 000..eaab180a1f4
--- /dev/null
+++ patches/patch-src_levelfct_cpp
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Index: src/levelfct.cpp
+--- src/levelfct.cpp.orig
 src/levelfct.cpp
+@@ -191,11 +191,11 @@ LvlFctAP::LvlFctAP(QDomElement fct, Level *l)
+ {
+   op = LvlFctAP::mean;
+ }
+-  else if(str_op = "sum")
++  else if(str_op == "sum")
+ {
+   op = LvlFctAP::sum;
+ }
+-  else if(str_op = "prod")
++  else if(str_op == "prod")
+ {
+   op = LvlFctAP::max;
+ }
diff --git patches/patch-src_smtp_cpp patches/patch-src_smtp_cpp
new file mode 100644
index 000..f497978ba88
--- /dev/null
+++ patches/patch-src_smtp_cpp
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/smtp.cpp
+--- src/smtp.cpp.orig
 src/smtp.cpp
+@@ -279,7 +279,7 @@ void Smtp::receivedAuth(QString &responseLine)
+ static const char base64char[65] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ 
+-static const char base64val[128] = {
++static const signed char base64val[128] = {
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+   -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 62, -1, -1, -1, 63,

Re: [patch] devel/bullet on aarch64

[Matthew Martin]

ping

On Mon, Jun 25, 2018 at 10:13:10PM -0500, Matthew Martin wrote:
> I don't use bullet, but fixes the build with CXXFLAGS=3D-funsigned-char
>=20
> - Matthew Martin
>=20
>=20
> diff --git patches/patch-examples_ThirdPartyLibs_Gwen_Renderers_FontData_=
h patches/patch-examples_ThirdPartyLibs_Gwen_Renderers_FontData_h
> new file mode 100644
> index 000..9b91b0d1a3c
> --- /dev/null
> +++ patches/patch-examples_ThirdPartyLibs_Gwen_Renderers_FontData_h
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: examples/ThirdPartyLibs/Gwen/Renderers/FontData.h
> +--- examples/ThirdPartyLibs/Gwen/Renderers/FontData.h.orig
>  examples/ThirdPartyLibs/Gwen/Renderers/FontData.h
> +@@ -259,7 +259,7 @@ unsigned char sGwenFontData[] =3D=20
> + 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,=
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0=
,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,=
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0=
,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,=
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0=
,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
> + };
> +=20
> +-static const char sGwenDebugFontSpacing[]=3D
> ++static const signed char sGwenDebugFontSpacing[]=3D
> + {
> + 0,0,0,0,0,0,0,0,0,12,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,4=
,6,6,9,8,3,4,4,4,6,3,7,3,3,6,6,6,6,6,6,6,6,6,6,3,3,6,5,6,6,11,7,7,8,8,7,6,8=
,8,3,5,7,6,9,8,8,7,8,7,7,5,8,7,9,7,7,7,3,3,3,6,6,3,5,6,5,6,5,4,6,6,2,2,5,2,=
8,6,6,6,6,4,5,4,5,6,8,6,5,5,3,3,3,7,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0=
,0,0,0,0,0,0,0,0,0,0,0,0,0,3,3,6,6,5,6,3,6,3,9,4,6,7,4,9,3,4,6,3,3,3,5,6,3,=
3,3,4,6,9,9,9,6,7,7,7,7,7,7,10,8,7,7,7,7,3,3,3,3,8,8,8,8,8,8,8,6,8,8,8,8,8,=
7,7,5,5,5,5,5,5,5,8,5,5,5,5,5,2,2,2,2,6,5,6,6,6,6,6,6,6,5,5,5,5,5,6,5,116,1=
12,61,0,0,0,0,-96,-48,96,80,-64,0,64,-96,16,0,0,0,98,99,0,16,0,-96,-48,96,8=
0,-64,0,-16,-128,16,98,99,0,-80,32,16,-16,16,112,-64,-64,-32,-16,-48,16,-48=
,0,64,-128,-64,32,-48,-64,-48,-16,96,32,64,96,96,32,32,-96,-64,-96,80,64,-8=
0,16,-48,16,-80,-16,48,112,80,-80,-16,64,80,-112,-48,16,80,48,96,16,16,16,-=
112,-16,-16,0,96,48,48,-112,112,-80,-32,-48,-96,-112,16,80,80,48,-64,-80,-1=
12,96,80,64,96,48,80,73,65,32,84,82,84,0,92,103,32,101,120,92,114,102,105,1=
08,117,32,92,105,117,120,108,0,115,114,32,114,114,116,101,110,0,92,103,32,1=
01,120,92,114,102,105,108,117,32,92,105,117,108,0,92,103,32,101,120,92,114,=
102,105,108,117,32,92,105,117,120,101,110,105,114,101,0,100,84,60,115,116,9=
5,116,97,60,115,119,58,116,115,97,42,114,32,58,115,108,32,110,111,111,58,10=
1,44,115,116,97,99,114,97,71,58,110,108,66,32,48,58,110,105,97,58,101,111,6=
1,83,100,32,32,114,101,110,105,114,101,44,0,112,116,101,111,105,109,105,0,1=
15,110,116,101,111,117,100,97,0,115,111,64,80,-112,34,32,114,101,0,100,105,=
99,115,101,67,114,58,115,44,115,116,97,99,114,97,71,58,110,108,66,32,62,67,=
116,101,111,62,112,116,42,83,100,32,32,114,101,117,102,110,44,0,115,116,116=
,110,100,102,110,108,0,100,105,99,115,101,67,114,58,115,44,115,116,97,99,11=
4,97,71,58,110,108,66,32,62,67,116,101,111,62,112,116,43,0,115,116,116,110,=
105,101,116,101,60,108,0,112,116,97,105,97,32,115,32,103,0,100,105,99,115,1=
01,67,114,58,115,44,115,116,97,99,114,97,71,58,110,108,66,32,62,67,116,101,=
111,62,67,97,108,32,114,114,110,112,98,0,100,84,60,115,116,95,116,97,60,115=
,119,58,116,115,97,42,114,32,58,115,108,32,110,111,111,58,101,44,115,116,97=
,99,114,97,71,58,110,108,66,32,48,58,110,105,97,58,101,0,112,116,101,111,11=
1,101,109,97,0,100,84,60,115,116,95,116,97,60,115,119,58,116,115,97,42,114,=
32,58,115,108,32,110,111,111,58,101,44,115,116,97,99,114,97,71,58,110,108,6=
6,32,48,58,110,105,97,58,110,0,112,116,101,111,111,110,109,97,0,118,100,101=
,111,16,-26,100,105,99,115,101,67,114,58,115,44,115,116,97,99,114,97,71,58,=
110,108,66,32,62,67,116,101,111,62,112,116,45,0,115,116,116,110,100,101,116=
,101,97,111,0,0,0,0,97,111,48,48,-96,-112,-48,16,-64,0,-16,-128,16,0,-103,9=
7,111,58,110,105,33,-128,32,-64,-16,16,112,-64,-64,-32,-16,-48,16,-48,0,64,=
-128,-64,32,-48,-64,-48,-16,96,32,112,96,96,32,-96,-96,-64,-96,80,64,-80,16=
,-48,16,-80,-16,48,112,80,-80,-16,64,80,-112,-48,16,80,48,96,16,16,16,-112,=
32,-16,0,96,48,48,-112,112,-80,-32,-48,-96,-112,16,80,80,48,-64,-124,-96,-1=
12,64,-110,-128,0,80,112,0,100,84,60,115,116,95,112,97,60,115,116,98,99,114=
,60,97,44,117,115,58,114,97,60,97,62,97,115,58,111,111,99,95,62,97,71,58,10=
1,58,108,42,114,32,58,115,108,32,58,115,115,110,99,95,116,116,100,104,116,1=
16,99,95,99,115,100,108,97,60,97,62,62,97,115,58,111,111,116,116,100,97,99,=
115,100,97,95,105,119,114,115,99,116,99,95,105,119,114,44,115,116,97,99,114=
,104,116,32,115,99,115,101,69,116,97,114,32,62,58,115,116,116,58,114,114,0,=
100,84,60,115,116,95,112,97,60,115,116,98,99,114,60,97,44,117,115,58,114,97=
,60,97,62,97,115,58,111,111,99,95,62,97,71,58,101,58,108,42

Re: new: lang/brainfuck

[Brian Callahan]

Hi Nayden --

On 07/10/18 16:21, Nayden Markatchev wrote:

Hi ports@,

Here is a port of a brainfuck interpreter.

from pkg/DESCR:
---
Brainfuck is a programming language created in 1993 by Urban Muller and
notable for its extreme minimalism.

Brainfuck programs are composed as a series of characters. The language
specification defines eight characters/commands and four areas of
memory: code, code pointer, memory, and data pointer.

Although the language is Turing complete, the prohibitively long execution
time makes brainfuck programs impractical.
---

Comments? OKs?

Thanks,
Nayden


How about this version?

~Brian



brainfuck.tgz
Description: Binary data

Re: [update]: devel/physfs 3.0.1

[David CARLIER]

Here the dpb output

Elapsed time=00:54:19

I=1 B=0 Q=0 T=306 F=0 !=0

E=devel/spidermonkey52:firefox-52.8.1esr.source.tar.xz
x11/ogre,-main:ogre-1.9.0.tar.gz
games/sumwars:sumwars-0.5.8-src.tar.bz2
devel/boost:boost_1_66_0.tar.bz2
databases/mariadb,-tests:mariadb-10.0.34.tar.gz
games/warzone2100:warzone2100-3.2.3.tar.xz
print/foomatic-db:foomatic-db-4.0-20180228.tar.gz
textproc/mupdf:mupdf-1.13.0-source.tar.gz
graphics/cairo:cairo-1.14.12.tar.xz
games/lincity-ng:lincity-ng-2.0.tar.bz2
x11/irrlicht:irrlicht-1.8.4.zip
print/ghostscript/gnu:ghostscript-9.07.tar.gz
databases/postgresql:postgresql-10.4.tar.gz
databases/postgresql-previous:postgresql-9.6.6.tar.gz
textproc/icu4c,-wwwdata:icu4c-58_2-src.tgz
archivers/brotli:brotli-1.0.4.tar.gz
games/dxx-rebirth:dxx-rebirth_v0.60-weekly-11-08-17-src.tar.gz
lang/python/3.6,-tkinter:Python-3.6.6.tgz
x11/gnome/adwaita-icon-theme:gnome/adwaita-icon-theme-3.28.0.tar.xz
x11/gtk+3,-cups:gtk+-3.22.30.tar.xz
graphics/openexr,-main:openexr-2.2.1.tar.gz
x11/gnome/icon-theme:gnome/gnome-icon-theme-3.12.0.tar.xz
x11/cegui:cegui-0.8.7.tar.bz2 x11/gtk+2,-main:gtk+-2.24.32.tar.xz
lang/python/2.7,-bsddb:Python-2.7.15.tgz
lang/php/7.0,-pgsql:php-7.0.30.tar.bz2 graphics/lcms2:lcms2-2.9.tar.gz
databases/db/v4,bootstrap,no_java,no_tcl,-java:db-4.6.21.tar.gz
devel/gettext:gettext-0.19.8.1.tar.xz
print/cups,-libs:cups-2.2.8.tar.gz
www/apache-httpd,-common:httpd-2.4.33.tar.gz
devel/sdl2-image:SDL2_image-2.0.3.tar.gz print/qpdf:qpdf-8.1.0.tar.gz
devel/glib2:glib-2.56.1.tar.xz devel/cmake:cmake-3.10.2.tar.gz
security/gnutls:gnutls-3.5.18.tar.xz
security/py-cryptodome,python3:pycryptodome-3.6.2.tar.gz
x11/p5-Tk:Tk-804.033.tar.gz devel/py-babel:Babel-2.4.0.tar.gz
sysutils/e2fsprogs:e2fsprogs-1.42.12.tar.gz
net/net-snmp,-main:net-snmp-5.8.rc4.tar.gz
graphics/gdk-pixbuf2:gdk-pixbuf-2.36.12.tar.xz
archivers/libarchive:libarchive-3.3.2.tar.gz
databases/openldap:openldap-2.4.46.tgz
textproc/libxml,-python:libxml2-2.9.8.tar.gz
devel/sdl2:SDL2-2.0.8.tar.gz math/py-numpy:numpy-1.14.5.zip
mail/alpine,-pilot:alpine-2.21.tar.xz
graphics/freeimage:FreeImage3152.zip
databases/freetds:freetds-0.95.95.tar.gz
textproc/py-sphinx:Sphinx-1.4.8.tar.gz
audio/libsamplerate:libsamplerate-0.1.9.tar.gz
graphics/graphite2:graphite2-1.3.11.tgz
devel/sdl2-ttf:SDL2_ttf-2.0.14.tar.gz
converters/libunistring:libunistring-0.9.7.tar.gz
x11/tk/8.5:tk8.5.19-src.tar.gz devel/sdl-ttf:SDL_ttf-2.0.11.tar.gz
graphics/libwebp:libwebp-0.6.1.tar.gz devel/sdl:SDL-1.2.15.tar.gz
devel/harfbuzz,-main:harfbuzz-1.8.2.tar.bz2
graphics/glm:glm-0.9.8.5.tar.gz
devel/sdl-mixer:SDL_mixer-1.2.12.tar.gz
security/libgcrypt:libgcrypt-1.8.3.tar.gz
textproc/libxslt,-main:libxslt-1.1.32.tar.gz
graphics/DevIL:DevIL-1.7.8.zip lang/vala:vala-0.40.7.tar.xz
devel/bison:bison-3.0.4.tar.gz
devel/libtool,-ltdl:libtool-2.4.2.tar.gz
games/solarus/solarus:solarus-1.5.3-src.tar.gz
databases/sqlite3:sqlite-autoconf-324.tar.gz
www/lynx:lynx2.8.9dev.19.tar.bz2 net/curl:curl-7.60.0.tar.xz
graphics/tiff:tiff-4.0.9.tar.gz
devel/sdl-image:SDL_image-1.2.12.tar.gz devel/gmp:gmp-6.1.2.tar.xz
graphics/openjp2:openjp2-2.3.0.tar.gz devel/pcre2:pcre2-10.31.tar.gz
textproc/py-pygments:Pygments-2.1.3.tar.gz
devel/fribidi:fribidi-1.0.4.tar.gz x11/dbus,-suid:dbus-1.12.8.tar.gz
security/libnettle:nettle-3.4.tar.gz
devel/autoconf/2.69:autoconf-2.69.tar.gz
devel/autoconf/2.68:autoconf-2.68.tar.gz
multimedia/libtheora:libtheora-1.1.1.tar.bz2
print/cups-filters:cups-filters-1.20.3.tar.gz
devel/autoconf/2.67:autoconf-2.67.tar.gz
devel/libsoup:libsoup-2.62.2.tar.xz
devel/autoconf/2.65:autoconf-2.65.tar.gz
x11/gnome/librsvg:gnome/librsvg-2.40.20.tar.xz
devel/sdl-gfx:SDL_gfx-2.0.25.tar.gz
graphics/jasper:jasper-2.0.14.tar.gz
print/poppler,-main:poppler-0.59.0.tar.xz
graphics/jpeg:libjpeg-turbo-1.5.3.tar.gz
devel/automake/1.11:automake-1.11.6.tar.gz
audio/pulseaudio:pulseaudio-12.0.tar.xz
devel/autoconf/2.63:autoconf-2.63.tar.gz
textproc/py-docutils:docutils-0.12.tar.gz
textproc/docbook-xsl:docbook-xsl-1.68.1.tar.gz
sysutils/polkit:polkit-0.114.tar.gz
devel/automake/1.15:automake-1.15.1.tar.xz
devel/automake/1.14:automake-1.14.1.tar.xz
devel/meson:meson-0.46.1.tar.gz devel/gmake:make-4.2.1.tar.bz2
devel/autoconf/2.61:autoconf-2.61.tar.gz
devel/gobject-introspection:gobject-introspection-1.56.1.tar.xz
textproc/py-sphinx_rtd_theme:sphinx_rtd_theme-0.2.4.tar.gz
devel/autoconf/2.60:autoconf-2.60.tar.gz
misc/gpsd,-php:gpsd-2.95.tar.gz
graphics/openjpeg:openjpeg-version.1.5.2.tar.gz
devel/automake/1.10:automake-1.10.3.tar.gz
graphics/jbig2dec:jb2streams.zip graphics/colord:colord-1.3.5.tar.xz
devel/libidn2:libidn2-2.0.0.tar.xz devel/m4:m4-1.4.18.tar.xz
devel/autoconf/2.59:autoconf-2.59.tar.gz
audio/libsndfile:libsndfile-1.0.28.tar.gz
audio/libvorbis:libvorbis-1.3.6.tar.xz
devel/libuv:libuv-v1.19.1.tar.gz
databases/iodbc:libiodbc-3.52.12.tar.gz devel/nspr:nspr-4.19.tar.gz
devel/apr:apr-1.6.3.tar.gz audio/speex:speex-1.2.0.tar.gz
games/love:love-0.8.0-linux-src.tar.gz
security/p11-kit:p11-kit-0.

new: lang/brainfuck

[Nayden Markatchev]

Hi ports@,

Here is a port of a brainfuck interpreter.

from pkg/DESCR:
---
Brainfuck is a programming language created in 1993 by Urban Muller and
notable for its extreme minimalism.

Brainfuck programs are composed as a series of characters. The language
specification defines eight characters/commands and four areas of
memory: code, code pointer, memory, and data pointer.

Although the language is Turing complete, the prohibitively long execution
time makes brainfuck programs impractical.
---

Comments? OKs?

Thanks,
Nayden


brainfuck.tar.gz
Description: application/gzip

Re: NEW: devel/creduce

[Brian Callahan]

On 07/03/18 11:57, Brian Callahan wrote:


On 06/03/18 19:23, Brian Callahan wrote:


On 04/15/18 04:01, Stuart Henderson wrote:

On 2018/04/15 02:27, Brian Callahan wrote:
Works well on amd64 following the user guide on the HOMEPAGE. Note 
that this
links libLLVM-6.0.so from devel/llvm, though that does not get 
reflected in

WANTLIB (I left a comment saying such in the Makefile).
You need to have a WANTLIB entry associated with the LIB_DEPENDS 
otherwise

the LIB_DEPENDS is stripped.

One way around it might be to use RUN_DEPENDS only and set PKGSPEC in
devel/llvm to force a tight dependency on the version but it's not 
correct

use of the infrastructure.

This is exactly what I was worried about here:

- Forwarded message from Stuart Henderson  
-


From: Stuart Henderson 
Date: Tue, 6 Mar 2018 12:47:07 +
To: Jonathan Gray 
Cc: Brian Callahan , ports@openbsd.org, 
b...@comstyle.com

User-Agent: Mutt/1.9.3 (2018-01-21)
Subject: Re: build libLLVM.so in devel/llvm
Mail-Followup-To: Jonathan Gray , Brian Callahan
, ports@openbsd.org, b...@comstyle.com

On 2018/03/06 21:32, Jonathan Gray wrote:

On Sat, Feb 17, 2018 at 11:12:44PM +1100, Jonathan Gray wrote:

On Thu, Feb 15, 2018 at 05:08:56PM +, Stuart Henderson wrote:

On 2018/02/15 11:19, Brian Callahan wrote:

On 02/15/18 10:02, Jonathan Gray wrote:

Build libLLVM.so and link tools with it.

This seems to be the way almost all Linux distributions and BSDs
ship LLVM and is what Mesa expects.

Use the documented cmake var for RTTI while here.
Any reason not to use the SHARED_LIBS facility of ports for 
libLLVM, like

libclang and libLTO already do in the LLVM port?
agreed, it's a bit non-obvious that it might be needed because 
unlike
other build systems (which normally use a default value if not 
passed
via SHARED_LIBS) the way we've got cmake setup it just skips the 
library

version in that case..


Trying to use SHARED_LIBS breaks and isn't so useful as the name
of the library includes the major/minor llvm version with the abi
unlikely to change on new release based from the same branch.

The intent seems to be to allow multiple versions to be installed
concurrently as llvm breaks abi/api between most releases.

Warning: symlink(s) point to non-existent 
/usr/ports/pobj/llvm-5.0.1/fake-amd64/usr/local/lib/libLLVM-5.0.so

/usr/ports/pobj/llvm-5.0.1/fake-amd64/usr/local/lib/libLLVM-5.0.1.so
/usr/ports/pobj/llvm-5.0.1/fake-amd64/usr/local/lib/libLLVM.so

$ ls -l /usr/local/lib/libLLVM*.so*
lrwxr-xr-x  1 root  wheel    14 Feb 17 22:55 
/usr/local/lib/libLLVM-5.0.1.so -> libLLVM-5.0.so
-rw-r--r--  1 root  bin    61453686 Feb 17 22:47 
/usr/local/lib/libLLVM-5.0.so.0.0
lrwxr-xr-x  1 root  wheel    14 Feb 17 22:55 
/usr/local/lib/libLLVM.so -> libLLVM-5.0.so


$ llvm-config --link-shared
llvm-config: error: libLLVM-5.0.so is missing
$ llvm-config --shared-mode
static

So would anyone be opposed to the first diff in this thread going in?

The potential issue with this is that if things in ports start linking
to it, we'll run into problems with updates.

That said I don't really have a better idea and I don't want to get in
the way of your work on Mesa, so OK sthen@ but think we will need to 
keep

an eye on it.


- End forwarded message -


Tarball reattached with some tweaks.
Now this will break immediately on a version update of devel/llvm, 
but that's ok for me; it'll force me to check to make sure everything 
still works.


~Brian



New tarball. Relax llvm check slightly--checking between 6.0 and 6.1 
instead of 6.0.0 and 6.0.1


OK?

~Brian



Ping. Still would like to commit this :)

~Brian

Re: Crystal requires libLLVM-6.0.so

[Brian Callahan]

On 07/10/18 13:51, James Turner wrote:

I require the attached diff in order to use crystal otherwise I get the
following when trying to run crystal hello.cr.

ld.so: crystal: can't load library 'libLLVM-6.0.so'
Killed



This has come up before, in my port of C-Reduce:
https://marc.info/?l=openbsd-ports&m=152377935312657&w=2

Though it doesn't seem like we've reached any sort of standard operating 
procedure about it, sthen@'s solution (make it an RDEP and tightly 
couple the version number via PKGSPEC) works well enough for my mind, at 
least for now.


~Brian

Crystal requires libLLVM-6.0.so

[James Turner]

I require the attached diff in order to use crystal otherwise I get the
following when trying to run crystal hello.cr.

ld.so: crystal: can't load library 'libLLVM-6.0.so'
Killed

-- 
James Turner

Index: Makefile
===
RCS file: /cvs/ports/lang/crystal/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile8 Jul 2018 14:27:07 -   1.1.1.1
+++ Makefile10 Jul 2018 17:49:20 -
@@ -7,6 +7,7 @@ V = 0.25.1
 V_SHARDS = 0.8.1
 COMMENT =  statically typed object oriented language
 DISTNAME = crystal-${V}
+REVISION = 0
 CATEGORIES =   lang
 
 HOMEPAGE = https://crystal-lang.org/
@@ -37,6 +38,7 @@ BUILD_DEPENDS =   devel/llvm
 LIB_DEPENDS =  converters/libiconv \
devel/boehm-gc \
devel/libevent2 \
+   devel/llvm \
devel/pcre \
devel/libyaml
 

Re: remmina dumps core

[Bryan Vyhmeister]

On Mon, Jul 09, 2018 at 11:20:43PM +0100, Stuart Henderson wrote:
> No idea about a fix but here are some more details,

Thanks for taking the time to look at it further. Hopefully someone who
might have an idea can chime in.

Bryan

[NEW] devel/p5-MooX-StrictConstructor

[Frederic Cambus]

Hi ports@,

Here is a new port: devel/p5-MooX-StrictConstructor

This is another dependency required for p5-MaxMind-DB-Reader.

>From DESCR:

Simply loading this module makes your constructors "strict". If your
constructor is called with an attribute init argument that your class
does not declare, then it dies. This is a great way to catch small typos.

Comments? OK?


p5-MooX-StrictConstructor.tar.gz
Description: application/tar-gz

UPDATE: feh-2.27

[Gonzalo L. Rodriguez]

Hallo,

Update for feh to 2.27:

https://feh.finalrewind.org/

OK? Comments?

Cheers.-

--
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/graphics/feh/Makefile,v
retrieving revision 1.92
diff -u -p -r1.92 Makefile
--- Makefile29 Jun 2018 22:16:16 -  1.92
+++ Makefile10 Jul 2018 17:00:35 -
@@ -2,11 +2,10 @@
 
 COMMENT=   lightweight image viewer
 
-DISTNAME=  feh-2.26
+DISTNAME=  feh-2.27
 EXTRACT_SUFX=  .tar.bz2
 CATEGORIES=graphics
 FIX_EXTRACT_PERMISSIONS=Yes
-REVISION=  1
 
 HOMEPAGE=  https://feh.finalrewind.org/
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/feh/distinfo,v
retrieving revision 1.57
diff -u -p -r1.57 distinfo
--- distinfo6 May 2018 15:22:12 -   1.57
+++ distinfo10 Jul 2018 17:00:35 -
@@ -1,2 +1,2 @@
-SHA256 (feh-2.26.tar.bz2) = sda/3XkGDYZLjv8FuRYVO+BIAZmBSGIBJeOsMfmfbIY=
-SIZE (feh-2.26.tar.bz2) = 2131837
+SHA256 (feh-2.27.tar.bz2) = rzJoRe90g+y//eaX/a2zkpimgGnXlkTiScacmtRkxk4=
+SIZE (feh-2.27.tar.bz2) = 2131975
Index: patches/patch-man_feh_pre
===
RCS file: /cvs/ports/graphics/feh/patches/patch-man_feh_pre,v
retrieving revision 1.42
diff -u -p -r1.42 patch-man_feh_pre
--- patches/patch-man_feh_pre   6 May 2018 15:22:12 -   1.42
+++ patches/patch-man_feh_pre   10 Jul 2018 17:00:35 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-man_feh_pre,v 1.42 2018/
 Index: man/feh.pre
 --- man/feh.pre.orig
 +++ man/feh.pre
-@@ -1186,7 +1186,7 @@ which
+@@ -1177,7 +1177,7 @@ which
  defaults to
  .Pa ~/.config/feh/ .
  If the files are not found in that directory, it will also try

Re: Update textproc/wkhtmltopdf-0.12.4

[Frank Groeneveld]

Thanks for committing the update and thanks for the hints Stuart!
I got version 0.12.5 to compile and run correctly by undoing two patches of 
upstream:
https://github.com/wkhtmltopdf/qt/commit/4d3f24547b2e6d43f6af766411a810343b8e3c31
https://github.com/wkhtmltopdf/qt/commit/b612c88a5f214bf35e0748c330aa855a1b90ce81

Attached a diff to update to 0.12.5, the latest release!

--
Frank

On Tue, Jul 10, 2018, at 14:25, Jeremie Courreges-Anglas wrote:
> On Tue, Jul 10 2018, Frank Groeneveld  wrote:
> > Attached a patch to update textproc/wkhtmltopdf to version 0.12.4. This 
> > release fixes some small bugs, a full release log can be found at: 
> > https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.4
> 
> Committed, thanks, worked fine in my limited testing.
> 
> > Unfortunately this is not the latest version yet, I'm still trying to
> > get 0.12.5 to work with HTTPS sites (errors about not being able to
> > resolve some OpenSSL symbols during runtime). As soon as I fix that I'll
> > send an update for it.
> 
> Same question as Stuart, which symbols?  Have fun... :)
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> 
? patches/patch-qt_src_network_ssl_qsslcertificate_cpp
? patches/patch-qt_src_network_ssl_qsslkey_cpp
? patches/patch-qt_src_network_ssl_qsslsocket_openssl_p_h
? patches/patch-qt_src_network_ssl_qsslsocket_openssl_symbols_p_h
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile	10 Jul 2018 12:24:24 -	1.19
+++ Makefile	10 Jul 2018 16:40:53 -
@@ -9,8 +9,8 @@ COMMENT =		convert HTML to PDF using Web
 
 GH_ACCOUNT =		wkhtmltopdf
 GH_PROJECT =		wkhtmltopdf
-GH_TAGNAME =		0.12.4
-QT_COMMIT =		c0cfa03a072789550d8ff5724b2e5e58436e02d1
+GH_TAGNAME =		0.12.5
+QT_COMMIT =		5db36ec76b29712eb2c5bd0625c2c77d7468b3fc
 MASTER_SITES0 =		https://github.com/wkhtmltopdf/qt/archive/
 DISTFILES =		${DISTNAME}.tar.gz \
 			wkhtmltopdf-qt-${QT_COMMIT}_1{${QT_COMMIT}}.tar.gz:0
Index: distinfo
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo	10 Jul 2018 12:24:24 -	1.5
+++ distinfo	10 Jul 2018 16:40:53 -
@@ -1,4 +1,4 @@
-SHA256 (wkhtmltopdf-0.12.4.tar.gz) = 3UZvXCUEZwRZ87gmXeVpe5BU8Hfi8+OS5RcrUTMIDt8=
-SHA256 (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = OOl9+XrQB4R5QCStoAY5YXXT7Gszs8IenyFjiX8tLiI=
-SIZE (wkhtmltopdf-0.12.4.tar.gz) = 128695
-SIZE (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = 173053875
+SHA256 (wkhtmltopdf-0.12.5.tar.gz) = hh1uYeL1vrLY2qreLNWoW4QGXun6wNbYUADYp3EqRiE=
+SHA256 (wkhtmltopdf-qt-5db36ec76b29712eb2c5bd0625c2c77d7468b3fc_1.tar.gz) = tD6GRyvKy0seNzXfnJr9CQ+gEWl0oD8BqScf8CkRU2w=
+SIZE (wkhtmltopdf-0.12.5.tar.gz) = 511181
+SIZE (wkhtmltopdf-qt-5db36ec76b29712eb2c5bd0625c2c77d7468b3fc_1.tar.gz) = 173051127
Index: patches/patch-qt_configure
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-qt_configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qt_configure
--- patches/patch-qt_configure	2 Mar 2017 10:12:02 -	1.1
+++ patches/patch-qt_configure	10 Jul 2018 16:40:53 -
@@ -1,7 +1,8 @@
 $OpenBSD: patch-qt_configure,v 1.1 2017/03/02 10:12:02 sthen Exp $
 qt/configure.orig	Wed Mar  1 20:53:04 2017
-+++ qt/configure	Wed Mar  1 20:53:19 2017
-@@ -3411,7 +3411,7 @@ else
+Index: qt/configure
+--- qt/configure.orig
 qt/configure
+@@ -3427,7 +3427,7 @@ else
  CFG_FRAMEWORK=no
  fi
  
Index: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
===
RCS file: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
diff -N patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
--- patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp	10 Jul 2018 12:24:25 -	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp,v 1.2 2018/07/10 12:24:25 jca Exp $
-
-Index: qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
 qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig
-+++ qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
-@@ -74,7 +74,7 @@ PassRefPtr HTMLImageElement::createF
- RefPtr image = adoptRef(new HTMLImageElement(imgTag, document));
- if (optionalWidth)
- image->setWidth(*optionalWidth);
--if (optionalHeight > 0)
-+if (optionalHeight)
- image->setHeight(*optionalHeight);
- return image.release();
- }
Index: patches/patch-qt_src_network_ssl_qsslsocket_openssl_cpp
=

UPDATES: Net-OpenSSH and Test-TCP

[Gonzalo L. Rodriguez]

Hello,

Small update for Net-OpenSSH and Test-TCP

OK? Comments?

Cheers.-

--
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/net/p5-Test-TCP/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile20 Mar 2016 19:56:57 -  1.7
+++ Makefile8 Jul 2018 17:10:14 -
@@ -4,7 +4,7 @@ COMMENT =   testing TCP program
 
 MODULES =  cpan
 PKG_ARCH = *
-DISTNAME = Test-TCP-2.14
+DISTNAME = Test-TCP-2.19
 CATEGORIES =   net
 MAINTAINER =   Abel Abraham Camarillo Ojeda 
 
Index: distinfo
===
RCS file: /cvs/ports/net/p5-Test-TCP/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo5 Nov 2015 09:57:26 -   1.4
+++ distinfo8 Jul 2018 17:10:14 -
@@ -1,2 +1,2 @@
-SHA256 (Test-TCP-2.14.tar.gz) = uWo/NkdIKAFG+jChKccsEEEz9naIcniLaI6ojU99fQE=
-SIZE (Test-TCP-2.14.tar.gz) = 23591
+SHA256 (Test-TCP-2.19.tar.gz) = 3QEtnVlrKk4m/rXgF+2ANb93n2Ntp4uK5PX1gen8UJE=
+SIZE (Test-TCP-2.19.tar.gz) = 26003
Index: Makefile
===
RCS file: /cvs/ports/net/p5-Net-OpenSSH/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile20 Mar 2016 19:56:54 -  1.7
+++ Makefile10 Jul 2018 16:14:06 -
@@ -2,7 +2,7 @@
 
 COMMENT =  perl SSH client package implemented on top of OpenSSH
 
-DISTNAME = Net-OpenSSH-0.68
+DISTNAME = Net-OpenSSH-0.78
 CATEGORIES =   net security
 MODULES =  cpan
 PKG_ARCH = *
@@ -13,7 +13,7 @@ MAINTAINER =  Abel Abraham Camarillo Ojed
 PERMIT_PACKAGE_CDROM = Yes
 
 MODCPAN_EXAMPLES = Yes
-MODCPAN_EXAMPLES_DIST =sample
+MODCPAN_EXAMPLES_DIST =examples
 
 TEST_IS_INTERACTIVE = Yes
 
Index: distinfo
===
RCS file: /cvs/ports/net/p5-Net-OpenSSH/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo7 Jan 2016 08:51:37 -   1.4
+++ distinfo10 Jul 2018 16:14:06 -
@@ -1,2 +1,2 @@
-SHA256 (Net-OpenSSH-0.68.tar.gz) = 9J2g1cC4K55vBhx+B6BWpZsooxrRQJG43xXz2+pj2s0=
-SIZE (Net-OpenSSH-0.68.tar.gz) = 72200
+SHA256 (Net-OpenSSH-0.78.tar.gz) = jxCERUKigkOJ3s247ex1YdgZncXwJQ6Emgu1b3ruiAw=
+SIZE (Net-OpenSSH-0.78.tar.gz) = 75505
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/p5-Net-OpenSSH/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   7 Jan 2016 08:51:37 -   1.3
+++ pkg/PLIST   10 Jul 2018 16:14:06 -
@@ -15,6 +15,7 @@ ${P5SITE}/Net/OpenSSH/ShellQuoter/MSCmd.
 ${P5SITE}/Net/OpenSSH/ShellQuoter/MSWin.pm
 ${P5SITE}/Net/OpenSSH/ShellQuoter/POSIX.pm
 ${P5SITE}/Net/OpenSSH/ShellQuoter/csh.pm
+${P5SITE}/Net/OpenSSH/ShellQuoter/fish.pm
 @man man/man3p/Net::OpenSSH.3p
 @man man/man3p/Net::OpenSSH::ConnectionCache.3p
 @man man/man3p/Net::OpenSSH::Constants.3p

lang/rust: update to 1.27.1 + fix

[Sebastien Marie]

Hi,

The following diff updates rust to 1.27.1:
https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1271-2018-07-10

It contains also a fix need for updating librsvg port (which have parts
in Rust). I changed the way libcompiler_rt.a is included by rustc in
order to avoid duplicated symbols in a .a library (some symbols from
system libcompiler_rt.a, others from Rust itself).

Thanks.
-- 
Sebastien Marie


Index: Makefile
===
RCS file: /cvs/ports/lang/rust/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile29 Jun 2018 06:25:55 -  1.71
+++ Makefile10 Jul 2018 15:57:07 -
@@ -12,7 +12,7 @@ DPB_PROPERTIES =  parallel
 COMMENT-main = compiler for Rust Language
 COMMENT-doc =  html documentation for rustc
 
-V =1.27.0
+V =1.27.1
 CARGO_V =  0.28.0
 DISTNAME = rustc-${V}-src
 
Index: distinfo
===
RCS file: /cvs/ports/lang/rust/distinfo,v
retrieving revision 1.37
diff -u -p -r1.37 distinfo
--- distinfo29 Jun 2018 05:19:47 -  1.37
+++ distinfo10 Jul 2018 15:57:07 -
@@ -1,8 +1,8 @@
-SHA256 (rust/rustc-1.27.0-src.tar.xz) = 
hmt0CaZ/+DJKc9nFzsrCRY4jTRJcw/ImhkEuNbPXULQ=
+SHA256 (rust/rustc-1.27.1-src.tar.xz) = 
lI4mRQV5YO4cA9nw6PeBM6X3PZypokvFYSbjlaIS0lw=
 SHA256 (rust/rustc-bootstrap-aarch64-1.27.0-20180622.tar.xz) = 
KvznQPB3IGDiLyXiYn0z8660z9pzIIB+FJhH10kWuZI=
 SHA256 (rust/rustc-bootstrap-amd64-1.27.0-20180619.tar.xz) = 
xsSrF88f8sOV2olsWWqgs5zzCCrjAlVloiMZxJbG2wc=
 SHA256 (rust/rustc-bootstrap-i386-1.27.0-20180619.tar.xz) = 
lNinRfIwy5fHHk+NJbbtO8hiy0693MN7lpvd/QN/PfU=
-SIZE (rust/rustc-1.27.0-src.tar.xz) = 55455772
+SIZE (rust/rustc-1.27.1-src.tar.xz) = 55458892
 SIZE (rust/rustc-bootstrap-aarch64-1.27.0-20180622.tar.xz) = 63103156
 SIZE (rust/rustc-bootstrap-amd64-1.27.0-20180619.tar.xz) = 66376352
 SIZE (rust/rustc-bootstrap-i386-1.27.0-20180619.tar.xz) = 66734544
Index: patches/patch-src_libcompiler_builtins_build_rs
===
RCS file: /cvs/ports/lang/rust/patches/patch-src_libcompiler_builtins_build_rs,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_libcompiler_builtins_build_rs
--- patches/patch-src_libcompiler_builtins_build_rs 22 May 2018 06:04:33 
-  1.2
+++ patches/patch-src_libcompiler_builtins_build_rs 10 Jul 2018 15:57:07 
-
@@ -10,7 +10,7 @@ Index: src/libcompiler_builtins/build.rs
  
 +if target.contains("openbsd") {
 +println!("cargo:rustc-link-search=native=/usr/lib");
-+println!("cargo:rustc-link-lib=static=compiler_rt");
++println!("cargo:rustc-link-lib=compiler_rt");
 +return;
 +}
 +
Index: pkg/PFRAG.aarch64-main
===
RCS file: /cvs/ports/lang/rust/pkg/PFRAG.aarch64-main,v
retrieving revision 1.3
diff -u -p -r1.3 PFRAG.aarch64-main
--- pkg/PFRAG.aarch64-main  29 Jun 2018 05:19:47 -  1.3
+++ pkg/PFRAG.aarch64-main  10 Jul 2018 15:57:07 -
@@ -1,119 +1,119 @@
 @comment $OpenBSD: PFRAG.aarch64-main,v 1.3 2018/06/29 05:19:47 landry Exp $
-lib/libarena-612b86e475f92f64.so
-lib/libfmt_macros-4ff6d84bacc56f81.so
-lib/libgraphviz-9aeaf9ef48ed44d4.so
-lib/libproc_macro-a84c554cc9440371.so
-lib/librustc-e373156d5fe9e79c.so
-lib/librustc_allocator-b03b315dc2093f9e.so
-lib/librustc_borrowck-d944cdcb673398d1.so
-lib/librustc_cratesio_shim-f670807fdf3c815b.so
-lib/librustc_data_structures-373db97cef823974.so
-lib/librustc_driver-13de6915f8169672.so
-lib/librustc_errors-0b830ece4c0623ea.so
-lib/librustc_incremental-581db0e96128cbad.so
-lib/librustc_lint-361121fc50c1d41b.so
-lib/librustc_metadata-c9fa84866b72b6f8.so
-lib/librustc_mir-ff585743f26a4c07.so
-lib/librustc_passes-efe17668e25185b6.so
-lib/librustc_platform_intrinsics-6fab2dcb9545f6a8.so
-lib/librustc_plugin-37da7e6b67322ed8.so
-lib/librustc_privacy-1f0a4e56acf15ae4.so
-lib/librustc_resolve-8e7b074f09ae204d.so
-lib/librustc_save_analysis-5288b26bee868077.so
-lib/librustc_target-cbf87a577cf9af7a.so
-lib/librustc_traits-8dc64892a10e2b16.so
-lib/librustc_trans_utils-a80f59ce6fea22b8.so
-lib/librustc_typeck-9df5a57cfbef82c3.so
-lib/libserialize-a1c8099a51733622.so
-lib/libstd-13c8417f7f3d7371.so
-lib/libsyntax-aab0aa4f1dc73f60.so
-lib/libsyntax_ext-4bc3a3819d9fa5f7.so
-lib/libsyntax_pos-ea9172cdeb516e82.so
-lib/libterm-2adad3cfaab502b0.so
-lib/libtest-bd34ae473f1e393e.so
+lib/libarena-2ca22f4465b4ffe0.so
+lib/libfmt_macros-e2804a0dbc4cc307.so
+lib/libgraphviz-884cbe192015e845.so
+lib/libproc_macro-5d7c1f7484a81362.so
+lib/librustc-c7531c14c018f796.so
+lib/librustc_allocator-b2f9ceb0ec2e3258.so
+lib/librustc_borrowck-0a8f394c27a1d41b.so
+lib/librustc_cratesio_shim-735482c265969a7e.so
+lib/librustc_data_structures-58557c6f8fe7f6ae.so
+lib/librustc_driver-745793a2f889b21a.

Re: NEW: games/openomf

[Brian Callahan]

On 07/10/18 05:14, Tom Murphy wrote:
The game went Freeware in 1999 and its files are free to download. 
There's nothing to purchase.

OpenOMF uses a MIT license.



Yes, OpenOMF uses the MIT license. The game assets are still not open 
source, even if freeware. I could not find language saying that it would 
be OK for us to distribute the game assets ourselves (maybe that 
language exists but if it does I couldn't find it).


Anyhow, I reworded pkg/DESCR and pkg/README to point the user to the 
game assets distributed by archive.org. They seemed both the most 
neutral and most likely to be around in 100 years out of all the places 
that had a copy.


I did the initial port work on it and have been in contact with the 
developers of openomf.
They've make several fixes to cmake to make it more portable, however 
there's some bits of the game
that don't work 100% yet like tournament mode, and there's some bugs 
in the network code that need fixing, but single and two player modes 
work.




Yes, they've been good. They responded right away to a problem I found 
where the game locked up if you tried to remap the player's keys.


The libdumb submodule was there because the libdumb code got taken 
over by a new developer (https://github.com/kode54/dumb) so I'm fairly 
sure we could update audio/dumb to 2.0.3. I'm not completely certain 
but I believe the old allegro stuff has been dropped.




I decided to use libxmp instead of dumb. Upstream supports that, so I 
don't feel much of a reason to use dumb at this point.


Thanks to Brian Callahan for sorting out the submodules. Those were 
doing my head in! :)




Hence the self-hosted tarball :)

Updated tarball attached.

~Brian



openomf.tgz
Description: Binary data

[PATCH] net/libmaxminddb

[Frederic Cambus]

Hi ports@,

The combination of -fms-extensions -std=c99 means libmaxminddb couldn't be
built with base GCC, so the library and headers were patched. This worked
when the only consumer was the mmdblookup bundled tool.

However, this is causing issues with new consumers. For example, I cannot
build the MaxMind::DB::Reader::XS Perl module because of this.

Instead of patching all consumers, stop modifying the library and header
file, and switch to using COMPILER directives instead, as it builds fine
with base-clang and ports-gcc.

Comments? OK?

Index: Makefile
===
RCS file: /cvs/ports/net/libmaxminddb/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- Makefile4 Jul 2018 20:07:17 -   1.30
+++ Makefile10 Jul 2018 14:54:38 -
@@ -9,6 +9,7 @@ V = 1.3.2
 D =20180704
 DISTNAME = libmaxminddb-${V}
 PKGNAME-main = libmaxminddb-${V}
+REVISION-main =0
 PKGNAME-db =   geolite2-country-${D}
 PKGNAME-city = geolite2-city-${D}
 PKGNAME-asn =  geolite2-asn-${D}
@@ -33,6 +34,9 @@ MASTER_SITES =${HOMEPAGE}/releases/down
 MASTER_SITES0 =https://www.distfiles.pl/
 
 MULTI_PACKAGES = -main -db -city -asn
+
+COMPILER = base-clang ports-gcc
+
 RUN_DEPENDS-main = net/libmaxminddb,-db
 
 TEST_DEPENDS = devel/p5-IPC-Run3
Index: patches/patch-include_maxminddb_h
===
RCS file: patches/patch-include_maxminddb_h
diff -N patches/patch-include_maxminddb_h
--- patches/patch-include_maxminddb_h   23 Jan 2018 10:07:43 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,24 +0,0 @@
-$OpenBSD: patch-include_maxminddb_h,v 1.2 2018/01/23 10:07:43 fcambus Exp $
-
-Index: include/maxminddb.h
 include/maxminddb.h.orig
-+++ include/maxminddb.h
-@@ -123,7 +123,17 @@ typedef struct MMDB_entry_data_s {
- #endif
- bool boolean;
- float float_value;
--};
-+} u;
-+#define pointer u.pointer
-+#define utf8_string u.utf8_string
-+#define double_value u.double_value
-+#define uint16 u.uint16
-+#define uint32 u.uint32
-+#define int32 u.int32
-+#define uint64 u.uint64
-+#define uint128 u.uint128
-+#define boolean u.boolean
-+#define float_value u.float_value
- /* This is a 0 if a given entry cannot be found. This can only happen
-  * when a call to MMDB_(v)get_value() asks for hash keys or array
-  * indices that don't exist. */
Index: patches/patch-src_maxminddb_c
===
RCS file: patches/patch-src_maxminddb_c
diff -N patches/patch-src_maxminddb_c
--- patches/patch-src_maxminddb_c   23 Jan 2018 10:07:43 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_maxminddb_c,v 1.3 2018/01/23 10:07:43 fcambus Exp $
-
-Index: src/maxminddb.c
 src/maxminddb.c.orig
-+++ src/maxminddb.c
-@@ -1600,7 +1600,7 @@ LOCAL int decode_one(MMDB_s *mmdb, uint32_t offset,
- free(string);
- #endif
- } else if (type == MMDB_DATA_TYPE_BYTES) {
--entry_data->bytes = &mem[offset];
-+entry_data->u.bytes = &mem[offset];
- entry_data->data_size = size;
- }
- 
-@@ -2035,7 +2035,7 @@ LOCAL MMDB_entry_data_list_s *dump_entry_data_list(
- case MMDB_DATA_TYPE_BYTES:
- {
- char *hex_string =
--bytes_to_hex((uint8_t *)entry_data_list->entry_data.bytes,
-+bytes_to_hex((uint8_t *)entry_data_list->entry_data.u.bytes,
-  entry_data_list->entry_data.data_size);
- if (NULL == hex_string) {
- *status = MMDB_OUT_OF_MEMORY_ERROR;

Re: UPDATE: www/dokuwiki

[Pierre-Emmanuel Andre]

On Sun, Jul 08, 2018 at 09:34:27PM +0200, Rafael Sadowski wrote:
> On Thu May 17, 2018 at 08:44:40PM +0200, Pierre-Emmanuel Andre wrote:
> > On Tue, May 15, 2018 at 10:19:41PM +0200, Rafael Sadowski wrote:
> > > Simple update to the latest stable version. Switch to HTTPS and switch
> > > to pecl-libsodium. We free dokuwiki from php 5.6!
> > 
> > It seems to have unecessary @owner in PLIST
> > Will look at it.
> > Thanks.
> > 
> 
> New version and new diff below.
>

Looks good to me.
Ok pea@


> Index: Makefile
> ===
> RCS file: /cvs/ports/www/dokuwiki/Makefile,v
> retrieving revision 1.29
> diff -u -p -u -p -r1.29 Makefile
> --- Makefile  1 Jun 2018 20:43:14 -   1.29
> +++ Makefile  8 Jul 2018 19:32:41 -
> @@ -2,19 +2,18 @@
>  
>  COMMENT =standards compliant, simple to use Wiki
>  
> -VERSION =2017-02-19e
> -REVISION =   3
> +VERSION =2018-04-22a
>  DISTNAME =   dokuwiki-${VERSION}
>  PKGNAME =dokuwiki-${VERSION:S/-/./g}
>  CATEGORIES = www
> -HOMEPAGE =   http://www.dokuwiki.org/dokuwiki
> +HOMEPAGE =   https://www.dokuwiki.org/dokuwiki
>  
>  MAINTAINER = Pierre-Emmanuel Andre 
>  
>  # GPLv2
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> -MASTER_SITES =   http://download.dokuwiki.org/src/dokuwiki/
> +MASTER_SITES =   https://download.dokuwiki.org/src/dokuwiki/
>  
>  EXTRACT_SUFX =   .tgz
>  NO_BUILD =   Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/dokuwiki/distinfo,v
> retrieving revision 1.15
> diff -u -p -u -p -r1.15 distinfo
> --- distinfo  5 Dec 2017 10:54:15 -   1.15
> +++ distinfo  8 Jul 2018 19:32:41 -
> @@ -1,2 +1,2 @@
> -SHA256 (dokuwiki-2017-02-19e.tgz) = 
> kxcqKKuIEHqKusHmo0+mzvVLbkB80DqMwU0qYEpj6Ig=
> -SIZE (dokuwiki-2017-02-19e.tgz) = 3505643
> +SHA256 (dokuwiki-2018-04-22a.tgz) = 
> KE4TKfJzItqLQSD2kXGuj6EsYTRFP803ANKRTEenAgQ=
> +SIZE (dokuwiki-2018-04-22a.tgz) = 3749191
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/www/dokuwiki/pkg/PLIST,v
> retrieving revision 1.13
> diff -u -p -u -p -r1.13 PLIST
> --- pkg/PLIST 10 May 2017 12:32:48 -  1.13
> +++ pkg/PLIST 8 Jul 2018 19:32:41 -
> @@ -10,6 +10,7 @@ dokuwiki/bin/.htaccess
>  dokuwiki/bin/dwpage.php
>  dokuwiki/bin/gittool.php
>  dokuwiki/bin/indexer.php
> +dokuwiki/bin/plugin.php
>  dokuwiki/bin/render.php
>  dokuwiki/bin/striplangs.php
>  dokuwiki/bin/wantedpages.php
> @@ -24,6 +25,7 @@ dokuwiki/conf/entities.conf
>  dokuwiki/conf/interwiki.conf
>  dokuwiki/conf/license.php
>  dokuwiki/conf/local.php.dist
> +dokuwiki/conf/manifest.json
>  dokuwiki/conf/mediameta.php
>  dokuwiki/conf/mime.conf
>  dokuwiki/conf/mysql.conf.php.example
> @@ -42,6 +44,8 @@ dokuwiki/data/attic/_dummy
>  dokuwiki/data/cache/
>  dokuwiki/data/cache/_dummy
>  dokuwiki/data/deleted.files
> +dokuwiki/data/dont-panic-if-you-see-this-in-your-logs-it-means-your-directory-permissions-are-correct.png
> +dokuwiki/data/dont-panic-if-you-see-this-in-your-logs-it-means-your-directory-permissions-are-correct.xcf
>  dokuwiki/data/index/
>  dokuwiki/data/index/_dummy
>  dokuwiki/data/locks/
> @@ -49,6 +53,7 @@ dokuwiki/data/locks/_dummy
>  dokuwiki/data/media/
>  dokuwiki/data/media/wiki/
>  dokuwiki/data/media/wiki/dokuwiki-128.png
> +dokuwiki/data/media/wiki/dokuwiki.svg
>  dokuwiki/data/media_attic/
>  dokuwiki/data/media_attic/_dummy
>  dokuwiki/data/media_meta/
> @@ -62,8 +67,6 @@ dokuwiki/data/pages/wiki/
>  dokuwiki/data/pages/wiki/dokuwiki.txt
>  dokuwiki/data/pages/wiki/syntax.txt
>  dokuwiki/data/pages/wiki/welcome.txt
> -dokuwiki/data/security.png
> -dokuwiki/data/security.xcf
>  dokuwiki/data/tmp/
>  dokuwiki/data/tmp/_dummy
>  @owner
> @@ -71,8 +74,55 @@ dokuwiki/doku.php
>  dokuwiki/feed.php
>  dokuwiki/inc/
>  dokuwiki/inc/.htaccess
> +dokuwiki/inc/Action/
> +dokuwiki/inc/Action/AbstractAclAction.php
> +dokuwiki/inc/Action/AbstractAction.php
> +dokuwiki/inc/Action/AbstractAliasAction.php
> +dokuwiki/inc/Action/AbstractUserAction.php
> +dokuwiki/inc/Action/Admin.php
> +dokuwiki/inc/Action/Backlink.php
> +dokuwiki/inc/Action/Cancel.php
> +dokuwiki/inc/Action/Check.php
> +dokuwiki/inc/Action/Conflict.php
> +dokuwiki/inc/Action/Denied.php
> +dokuwiki/inc/Action/Diff.php
> +dokuwiki/inc/Action/Draft.php
> +dokuwiki/inc/Action/Draftdel.php
> +dokuwiki/inc/Action/Edit.php
> +dokuwiki/inc/Action/Exception/
> +dokuwiki/inc/Action/Exception/ActionAbort.php
> +dokuwiki/inc/Action/Exception/ActionAclRequiredException.php
> +dokuwiki/inc/Action/Exception/ActionDisabledException.php
> +dokuwiki/inc/Action/Exception/ActionException.php
> +dokuwiki/inc/Action/Exception/ActionUserRequiredException.php
> +dokuwiki/inc/Action/Exception/FatalException.php
> +dokuwiki/inc/Action/Exception/NoActionException.php
> +dokuwiki/inc/Action/Export.php
> +dokuwiki/inc/Action/Index.php
> +dokuwiki/inc/Action/Locked.php
> +dokuwiki/i

Re: gdb for arm64

[Jeremie Courreges-Anglas]

On Tue, Jul 10 2018, Jeremie Courreges-Anglas  wrote:
> On Tue, Jul 10 2018, Mark Kettenis  wrote:
>>> From: Jeremie Courreges-Anglas 
>>> Date: Tue, 10 Jul 2018 12:23:30 +0200
>>> 
>>> On Tue, Jul 10 2018, Mark Kettenis  wrote:
>>> > Here is a cleaned-up version of a diff that Dale made to support
>>> > OpenBSD/arm64 in gdb.  Single-stepping doesn't work yet, which means
>>> > that stepping through the code doesn't really work.  But setting
>>> > breakpoints and inspecting state or looking at core files should work.
>>> >
>>> > I'm not sure what to do with the lang/ocaml comment in the Makefile.
>>> 
>>> Please give this diff a try.
>>
>> Builds.  Dun't know how to tell if it actually works ;).
>
> You could try:
>
>   ocamlobjinfo /usr/local/lib/ocaml/unix.cmxs
>
> If BFD was not detected/used properly,
> /usr/local/lib/ocaml/objinfo_helper would print something like this:
>
> "BFD library unavailable, cannot print info on .cmxs files"

No .cmxs files on arm64 so no easy way to test
/usr/local/lib/ocaml/objinfo_helper , but Mark's tests confirms that BFD
support is indeed compiled in.

I'm not sure there is much point in adding BFD support when OCaml itself
isn't built with .cmxs support on arm64, but this is already what is
done on other architectures that don't support .cmxs, with no known
issue that I know of.  So I'd propose the diff below which properly
registers the bdep and WANTLIB entries.

Another alternative would be to force-disable the use of BFD on
non-native-dynlink architectures, if BFD is indeed only useful for .cmxs
files.


Index: lang/ocaml/Makefile
===
RCS file: /d/cvs/ports/lang/ocaml/Makefile,v
retrieving revision 1.79
diff -u -p -r1.79 Makefile
--- lang/ocaml/Makefile 15 Sep 2017 09:23:12 -  1.79
+++ lang/ocaml/Makefile 10 Jul 2018 13:33:45 -
@@ -9,7 +9,7 @@ COMMENT-graphics = OCaml Graphics librar
 # Do check that the ports that depend on it still work, or repair them.
 # Don't forget to bump version in ocaml.port.mk, too!
 VERSION=   4.03.0
-REVISION=  2
+REVISION=  3
 
 PKGNAME-main = ocaml-${VERSION}
 PKGNAME-graphics = ocaml-graphics-${VERSION}
@@ -45,11 +45,9 @@ RUN_DEPENDS-graphics +=  lang/ocaml
 WANTLIB-main = c curses m pthread
 WANTLIB-graphics = X11
 
-.if ${MACHINE_ARCH} != aarch64
-# for libbfd; devel/gdb doesn't build on aarch64 yet.
+# for libbfd (used by ocamlobjinfo on .cmxs files)
 BUILD_DEPENDS +=   devel/gdb
 WANTLIB-main +=iberty z
-.endif
 
 .include 
 

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

Re: [update] samba-4.8.3

[Vijay Sankar]

Quoting Jeremie Courreges-Anglas :


On Tue, Jul 10 2018, Vijay Sankar  wrote:

Quoting Jeremie Courreges-Anglas :

On Tue, Jul 10 2018, Ian McWilliam  
 wrote:

Ouch, that's a new lock order problem. The one I encountered with
4.8.2 was with the vfs/acl_tdb module.


They are not the same thing: you hit a locking problem in samba code,
the log from Vijay shows a lock ordering problem in the OpenBSD kernel.


[...]


2) When samba 4.8.3 starts, the following is logged

lock order reversal:
1st 0xff07811695c0 vmmaplk (&map->lock) @
/usr/src/sys/uvm/uvm_map.c:4433
2nd 0xff087c37bf80 inode (&ip->i_lock) @
/usr/src/sys/ufs/ufs/ufs_vnops.c:1555
lock order "&ip->i_lock"(rrwlock) -> "&map->lock"(rwlock) first seen at:
#0  witness_checkorder+0x4c0
#1  _rw_enter_read+0x49
#2  uvmfault_lookup+0x8d
#3  uvm_fault+0x72
#4  pageflttrap+0x14c
#5  trap+0x319
#6  alltraps_kern+0x7e
#7  copyout+0x48
#8  ffs_read+0x1f0
#9  VOP_READ+0x49
#10 vn_read+0xca
#11 dofilereadv+0x216
#12 sys_read+0x82
#13 syscall+0x32a
#14 Xsyscall_untramp+0xe4
lock order "&map->lock"(rwlock) -> "&ip->i_lock"(rrwlock) first seen at:
#0  witness_checkorder+0x4c0
#1  _rw_enter+0x68
#2  _rrw_enter+0x3e
#3  VOP_LOCK+0x3d
#4  vn_lock+0x34
#5  uvn_io+0x1b8
#6  uvm_pager_put+0x109
#7  uvn_flush+0x424
#8  uvm_map_clean+0x3e7
#9  syscall+0x32a
#10 Xsyscall_untramp+0xe4

Is this to be expected or is there a problem here?

If there are any other tests that will be helpful please let me know.

Thanks very much,

Vijay


Vijay Sankar, M.Eng., P.Eng.
ForeTell Technologies Limited
vsan...@foretell.ca




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


I will do the tests again on a set of clean machines with
a newer  -current. I am also wondering if testing with bsd.sp instead of
bsd.mp  is a valid approach.


I'm not sure that using bsd.sp would avoid those log entries, but that's
not the point: those witness(4) traces are here to help kernel
developers track down lock ordering issues.  Please try a fresh -current
and if that message appears again please report it on bugs@.

Those witness(4) traces may point out a problem that could affect samba,
but they don't *look* samba-specific to me.  There's a good chance that
samba will keep working correctly, whether those warnings appear or not.

btw,

[...]


So I installed samba 4.8.3 on a different box (desktop computer with
gnome) thinking that the problem was due to my test setup.
Unfortunately starting samba with the default smb.conf (not a domain
member) resulted in the following:

error: [drm:pid48841:intel_pipe_update_start] *ERROR* Potential atomic
update failure on pipe A
lock order reversal:
  1st 0x81df30b0 &sched_lock (&sched_lock) @
/usr/src/sys/kern/kern_synch.c:444
  2nd 0x800ff9f0 &dev_priv->uncore.lock
(&dev_priv->uncore.lock) @
/usr/src/sys/dev/pci/drm/i915/intel_uncore.c:811
lock order "&dev_priv->uncore.lock"(mutex) ->  "&sched_lock"(sched_lock)
first seen at:
#0  witness_checkorder+0x4c0
#1  ___mp_lock+0x70
#2  schedclock+0x30
#3  hardclock+0xe3
#4  lapic_clockintr+0x3d
#5  Xresume_lapic_ltimer+0x22
#6  x86_bus_space_mem_read_4+0x14
#7  gen6_read32+0x184
#8  drm_update_vblank_count+0x65
#9  drm_handle_vblank+0xee
#10 ironlake_irq_handler+0x4e4
#11 intr_handler+0x74
#12 Xintr_ioapic_edge18_untramp+0x161
#13 ___mp_lock+0xca
#14 solock+0x50
#15 sosend+0x117
#16 sendit+0x3fb
#17 sys_sendmsg+0x15a
#18 syscall+0x32a
lock order "&sched_lock"(sched_lock) ->  "&dev_priv->uncore.lock"(mutex)
first seen at:
#0  witness_checkorder+0x4c0
#1  _mtx_enter+0x31
#2  gen6_read32+0x8f
#3  gen6_ring_get_seqno+0x3a
#4  __i915_wait_request+0x232
#5  i915_gem_object_wait_rendering__nonblocking+0x1d6
#6  i915_gem_set_domain_ioctl+0xdb
#7  drm_do_ioctl+0x221
#8  drmioctl+0xf9
#9  VOP_IOCTL+0x5a
#10 vn_ioctl+0x6b
#11 sys_ioctl+0x477
#12 syscall+0x32a
#13 Xsyscall_untramp+0xe4
lock order reversal:
  1st 0x81df30b0 &sched_lock (&sched_lock) @
/usr/src/sys/kern/kern_synch.c:444
  2nd 0x80106270 &dev_priv->irq_lock (&dev_priv->irq_lock) @
/usr/src/sys/dev/pci/drm/i915/intel_ringbuffer.c:1787
lock order "&dev_priv->irq_lock"(mutex) -> "&sched_lock"(sched_lock)
first seen at:
#0  witness_checkorder+0x4c0
#1  ___mp_lock+0x70
#2  wakeup_n+0x39
#3  task_add+0x93
#4  gen6_rps_boost+0x129
#5  __i915_wait_request+0x155
#6  i915_gem_object_wait_rendering__nonblocking+0x1d6
#7  i915_gem_set_domain_ioctl+0xdb
#8  drm_do_ioctl+0x221
#9  drmioctl+0xf9
#10 VOP_IOCTL+0x5a
#11 vn_ioctl+0x6b
#12 sys_ioctl+0x477
#13 syscall+0x32a
#14 Xsyscall_untramp+0xe4
lock order "&sched_lock"(sched_lock) -> "&dev_priv->irq_lock"(mutex)
first seen at:
#0  witness_checkorder+0x4c0
#1  _mtx_enter+0x31
#2  gen6_ring_put_irq+0x36
#3  __i915_wait_request+0x367
#4  i915_gem_object_wait_rendering__nonblocking+0x1d6
#5  i915_gem_set_domain_ioctl+0xdb
#6  drm_do_ioctl+0x221
#7  drmioctl+0xf9
#8  VOP_IOCTL+0x5a
#9  vn_ioctl+0x6b
#10 sys_ioctl+0x477
#11 syscall+0x32a
#12 Xsyscall_untramp+0xe4


T

Re: [update] samba-4.8.3

[Jeremie Courreges-Anglas]

On Tue, Jul 10 2018, Vijay Sankar  wrote:
> Quoting Jeremie Courreges-Anglas :
>
>> On Tue, Jul 10 2018, Ian McWilliam  wrote:
>>> Ouch, that's a new lock order problem. The one I encountered with
>>> 4.8.2 was with the vfs/acl_tdb module.
>>
>> They are not the same thing: you hit a locking problem in samba code,
>> the log from Vijay shows a lock ordering problem in the OpenBSD kernel.

[...]

>>> 2) When samba 4.8.3 starts, the following is logged
>>>
>>> lock order reversal:
>>> 1st 0xff07811695c0 vmmaplk (&map->lock) @
>>> /usr/src/sys/uvm/uvm_map.c:4433
>>> 2nd 0xff087c37bf80 inode (&ip->i_lock) @
>>> /usr/src/sys/ufs/ufs/ufs_vnops.c:1555
>>> lock order "&ip->i_lock"(rrwlock) -> "&map->lock"(rwlock) first seen at:
>>> #0  witness_checkorder+0x4c0
>>> #1  _rw_enter_read+0x49
>>> #2  uvmfault_lookup+0x8d
>>> #3  uvm_fault+0x72
>>> #4  pageflttrap+0x14c
>>> #5  trap+0x319
>>> #6  alltraps_kern+0x7e
>>> #7  copyout+0x48
>>> #8  ffs_read+0x1f0
>>> #9  VOP_READ+0x49
>>> #10 vn_read+0xca
>>> #11 dofilereadv+0x216
>>> #12 sys_read+0x82
>>> #13 syscall+0x32a
>>> #14 Xsyscall_untramp+0xe4
>>> lock order "&map->lock"(rwlock) -> "&ip->i_lock"(rrwlock) first seen at:
>>> #0  witness_checkorder+0x4c0
>>> #1  _rw_enter+0x68
>>> #2  _rrw_enter+0x3e
>>> #3  VOP_LOCK+0x3d
>>> #4  vn_lock+0x34
>>> #5  uvn_io+0x1b8
>>> #6  uvm_pager_put+0x109
>>> #7  uvn_flush+0x424
>>> #8  uvm_map_clean+0x3e7
>>> #9  syscall+0x32a
>>> #10 Xsyscall_untramp+0xe4
>>>
>>> Is this to be expected or is there a problem here?
>>>
>>> If there are any other tests that will be helpful please let me know.
>>>
>>> Thanks very much,
>>>
>>> Vijay
>>>
>>>
>>> Vijay Sankar, M.Eng., P.Eng.
>>> ForeTell Technologies Limited
>>> vsan...@foretell.ca
>>>
>>
>>
>> --
>> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
>
> I will do the tests again on a set of clean machines with
> a newer  -current. I am also wondering if testing with bsd.sp instead of
> bsd.mp  is a valid approach.

I'm not sure that using bsd.sp would avoid those log entries, but that's
not the point: those witness(4) traces are here to help kernel
developers track down lock ordering issues.  Please try a fresh -current
and if that message appears again please report it on bugs@.

Those witness(4) traces may point out a problem that could affect samba,
but they don't *look* samba-specific to me.  There's a good chance that
samba will keep working correctly, whether those warnings appear or not.

btw,

[...]

> So I installed samba 4.8.3 on a different box (desktop computer with
> gnome) thinking that the problem was due to my test setup.
> Unfortunately starting samba with the default smb.conf (not a domain
> member) resulted in the following:
>
> error: [drm:pid48841:intel_pipe_update_start] *ERROR* Potential atomic
> update failure on pipe A
> lock order reversal:
>   1st 0x81df30b0 &sched_lock (&sched_lock) @
> /usr/src/sys/kern/kern_synch.c:444
>   2nd 0x800ff9f0 &dev_priv->uncore.lock
> (&dev_priv->uncore.lock) @
> /usr/src/sys/dev/pci/drm/i915/intel_uncore.c:811
> lock order "&dev_priv->uncore.lock"(mutex) ->  "&sched_lock"(sched_lock)
> first seen at:
> #0  witness_checkorder+0x4c0
> #1  ___mp_lock+0x70
> #2  schedclock+0x30
> #3  hardclock+0xe3
> #4  lapic_clockintr+0x3d
> #5  Xresume_lapic_ltimer+0x22
> #6  x86_bus_space_mem_read_4+0x14
> #7  gen6_read32+0x184
> #8  drm_update_vblank_count+0x65
> #9  drm_handle_vblank+0xee
> #10 ironlake_irq_handler+0x4e4
> #11 intr_handler+0x74
> #12 Xintr_ioapic_edge18_untramp+0x161
> #13 ___mp_lock+0xca
> #14 solock+0x50
> #15 sosend+0x117
> #16 sendit+0x3fb
> #17 sys_sendmsg+0x15a
> #18 syscall+0x32a
> lock order "&sched_lock"(sched_lock) ->  "&dev_priv->uncore.lock"(mutex)
> first seen at:
> #0  witness_checkorder+0x4c0
> #1  _mtx_enter+0x31
> #2  gen6_read32+0x8f
> #3  gen6_ring_get_seqno+0x3a
> #4  __i915_wait_request+0x232
> #5  i915_gem_object_wait_rendering__nonblocking+0x1d6
> #6  i915_gem_set_domain_ioctl+0xdb
> #7  drm_do_ioctl+0x221
> #8  drmioctl+0xf9
> #9  VOP_IOCTL+0x5a
> #10 vn_ioctl+0x6b
> #11 sys_ioctl+0x477
> #12 syscall+0x32a
> #13 Xsyscall_untramp+0xe4
> lock order reversal:
>   1st 0x81df30b0 &sched_lock (&sched_lock) @
> /usr/src/sys/kern/kern_synch.c:444
>   2nd 0x80106270 &dev_priv->irq_lock (&dev_priv->irq_lock) @
> /usr/src/sys/dev/pci/drm/i915/intel_ringbuffer.c:1787
> lock order "&dev_priv->irq_lock"(mutex) -> "&sched_lock"(sched_lock)
> first seen at:
> #0  witness_checkorder+0x4c0
> #1  ___mp_lock+0x70
> #2  wakeup_n+0x39
> #3  task_add+0x93
> #4  gen6_rps_boost+0x129
> #5  __i915_wait_request+0x155
> #6  i915_gem_object_wait_rendering__nonblocking+0x1d6
> #7  i915_gem_set_domain_ioctl+0xdb
> #8  drm_do_ioctl+0x221
> #9  drmioctl+0xf9
> #10 VOP_IOCTL+0x5a
> #11 vn_ioctl+0x6b
> #12 sys_ioctl+0x477
> #13 syscall+0x32a
> #14 Xsyscall_untramp+0xe4
> lock order "&sched_lock"(sched_lock) -> "&dev_priv->irq_lock"(mutex)
> first seen at:
> #0  witness_che

Re: Update textproc/wkhtmltopdf-0.12.4

[Jeremie Courreges-Anglas]

On Tue, Jul 10 2018, Frank Groeneveld  wrote:
> Attached a patch to update textproc/wkhtmltopdf to version 0.12.4. This 
> release fixes some small bugs, a full release log can be found at: 
> https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.4

Committed, thanks, worked fine in my limited testing.

> Unfortunately this is not the latest version yet, I'm still trying to
> get 0.12.5 to work with HTTPS sites (errors about not being able to
> resolve some OpenSSL symbols during runtime). As soon as I fix that I'll
> send an update for it.

Same question as Stuart, which symbols?  Have fun... :)

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

Re: gdb for arm64

[Jeremie Courreges-Anglas]

On Tue, Jul 10 2018, Mark Kettenis  wrote:
>> From: Jeremie Courreges-Anglas 
>> Date: Tue, 10 Jul 2018 12:23:30 +0200
>> 
>> On Tue, Jul 10 2018, Mark Kettenis  wrote:
>> > Here is a cleaned-up version of a diff that Dale made to support
>> > OpenBSD/arm64 in gdb.  Single-stepping doesn't work yet, which means
>> > that stepping through the code doesn't really work.  But setting
>> > breakpoints and inspecting state or looking at core files should work.
>> >
>> > I'm not sure what to do with the lang/ocaml comment in the Makefile.
>> 
>> Please give this diff a try.
>
> Builds.  Dun't know how to tell if it actually works ;).

You could try:

  ocamlobjinfo /usr/local/lib/ocaml/unix.cmxs

If BFD was not detected/used properly,
/usr/local/lib/ocaml/objinfo_helper would print something like this:

"BFD library unavailable, cannot print info on .cmxs files"

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

Re: [update] samba-4.8.3

[Vijay Sankar]

Quoting Jeremie Courreges-Anglas :


On Tue, Jul 10 2018, Ian McWilliam  wrote:
Ouch, that's a new lock order problem. The one I encountered with  
4.8.2 was with the vfs/acl_tdb module.


They are not the same thing: you hit a locking problem in samba code,
the log from Vijay shows a lock ordering problem in the OpenBSD kernel.


Ian McWilliam



From: owner-po...@openbsd.org  on behalf  
of Vijay Sankar 

Sent: Tuesday, 10 July 2018 9:55 AM
To: ports@openbsd.org
Subject: Re: [update] samba-4.8.3


Quoting Jeremie Courreges-Anglas :


Bugfix release: https://www.samba.org/samba/history/samba-4.8.3.html
Samba 4.8.3 - Release  
Notes

www.samba.org
Samba 4.8.3 Available for Download. Samba 4.8.3 (gzipped) Signature.
Patch (gzipped) against Samba 4.8.2 Signature = Release Notes for
Samba 4.8.3 June 26, 2018 = This is the latest stable release of the
Samba 4.8 release series.





I don't see any change in vfs_virusfilter, which was new (and apparently
broken) in 4.8.2.

Test reports welcome!


Index: Makefile
===
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.254
diff -u -p -r1.254 Makefile
--- Makefile  11 Jun 2018 11:59:51 -  1.254
+++ Makefile  9 Jul 2018 13:10:02 -
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.254 2018/06/11 11:59:51 jca Exp $

-VERSION =4.8.2
+VERSION =4.8.3
DISTNAME =samba-${VERSION}

COMMENT-main =SMB and CIFS client and server for UNIX
@@ -17,9 +17,11 @@ PKGNAME-docs = samba-docs-${VERSION}

PKG_ARCH-docs =   *

-LDB_V =  1.3.3
+LDB_V =  1.3.4
TEVENT_V =0.9.36

+REVISION-tevent =0
+
SHARED_LIBS = asn1-samba4 0.0 \
 com_err-samba4  0.0 \
 dcerpc  0.0 \
@@ -34,30 +36,30 @@ SHARED_LIBS = asn1-samba4 0.0 \
 hx509-samba40.0 \
 kdc-samba4  0.0 \
 krb5-samba4 0.1 \
- ldb 0.6 \
+ ldb 0.7 \
 ndr 0.3 \
 ndr-krb5pac 0.1 \
 ndr-nbt 0.1 \
 ndr-standard3.0 \
 netapi  2.1 \
- pyldb-util  0.3 \
+ pyldb-util  0.4 \
 roken-samba40.0 \
 samba-credentials   0.2 \
 samba-errors1.0 \
 samba-hostconfig4.0 \
 samba-passdb2.0 \
 samba-policy0.0 \
- samba-util  3.1 \
+ samba-util  3.2 \
 samdb   0.1 \
 smbclient   4.2 \
- smbconf 4.0 \
+ smbconf 4.1 \
 smbldap 0.1 \
 tevent  0.4 \
 tevent-util 1.0 \
 wbclient3.2 \
 wind-samba4 0.0 \
- replace 5.0 \
- util-setid  5.0
+ replace 6.0 \
+ util-setid  6.0

CATEGORIES =  net sysutils security

Index: distinfo
===
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.68
diff -u -p -r1.68 distinfo
--- distinfo  11 Jun 2018 11:59:51 -  1.68
+++ distinfo  9 Jul 2018 09:35:30 -
@@ -1,2 +1,2 @@
-SHA256 (samba-4.8.2.tar.gz) = YuVSKW1J5qtEu4fRIKKIgT+lLkJDXVOh9xt3WWUSvyI=
-SIZE (samba-4.8.2.tar.gz) = 17675145
+SHA256 (samba-4.8.3.tar.gz) = 4FaaimBdXftJ8f3RHbeW9NNv4DUcSn8hOH7yUwELgu0=
+SIZE (samba-4.8.3.tar.gz) = 17680660
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/samba/pkg/PLIST-main,v
retrieving revision 1.41
diff -u -p -r1.41 PLIST-main
--- pkg/PLIST-main11 Jun 2018 11:59:51 -  1.41
+++ pkg/PLIST-main9 Jul 2018 11:35:53 -
@@ -2,6 +2,11 @@
@pkgpath net/samba,ldap,-main
@pkgpath net/samba,ads,-main
@pkgpath net/samba,,-main
+@rcscript ${RCDIR}/nmbd
+@rcscript ${RCDIR}/samba
+@rcscript ${RCDIR}/samba_ad_dc
+@rcscript ${RCDIR}/smbd
+@rcscript ${RCDIR}/winbindd
@sample ${SYSCONFDIR}/samba/
@bin bin/cifsdd
@bin bin/dbwrap_tool
@@ -1358,8 +1363,3 @@ share/samba/setup/ypServ30.ldif
@sample /var/

Re: Update textproc/wkhtmltopdf-0.12.4

[Stuart Henderson]

On 2018/07/10 11:17, Frank Groeneveld wrote:
> Unfortunately this is not the latest version yet, I'm still trying to get 
> 0.12.5 to work with HTTPS sites (errors about not being able to resolve some 
> OpenSSL symbols during runtime). As soon as I fix that I'll send an update 
> for it.

Which symbols? Are there any related patches in the qt5 port that need carrying
across? Look for patches containing the string OPENSSL_VERSION_NUMBER in
x11/qt5/qtbase/patches.

Re: gdb for arm64

[Mark Kettenis]

> From: Jeremie Courreges-Anglas 
> Date: Tue, 10 Jul 2018 12:23:30 +0200
> 
> On Tue, Jul 10 2018, Mark Kettenis  wrote:
> > Here is a cleaned-up version of a diff that Dale made to support
> > OpenBSD/arm64 in gdb.  Single-stepping doesn't work yet, which means
> > that stepping through the code doesn't really work.  But setting
> > breakpoints and inspecting state or looking at core files should work.
> >
> > I'm not sure what to do with the lang/ocaml comment in the Makefile.
> 
> Please give this diff a try.

Builds.  Dun't know how to tell if it actually works ;).

> Index: lang/ocaml/Makefile
> ===
> RCS file: /d/cvs/ports/lang/ocaml/Makefile,v
> retrieving revision 1.79
> diff -u -p -r1.79 Makefile
> --- lang/ocaml/Makefile   15 Sep 2017 09:23:12 -  1.79
> +++ lang/ocaml/Makefile   10 Jul 2018 10:21:47 -
> @@ -9,7 +9,7 @@ COMMENT-graphics = OCaml Graphics librar
>  # Do check that the ports that depend on it still work, or repair them.
>  # Don't forget to bump version in ocaml.port.mk, too!
>  VERSION= 4.03.0
> -REVISION=2
> +REVISION=3
>  
>  PKGNAME-main =   ocaml-${VERSION}
>  PKGNAME-graphics =   ocaml-graphics-${VERSION}
> @@ -45,11 +45,9 @@ RUN_DEPENDS-graphics +=lang/ocaml
>  WANTLIB-main =   c curses m pthread
>  WANTLIB-graphics =   X11
>  
> -.if ${MACHINE_ARCH} != aarch64
> -# for libbfd; devel/gdb doesn't build on aarch64 yet.
> +# for libbfd
>  BUILD_DEPENDS += devel/gdb
>  WANTLIB-main +=  iberty z
> -.endif
>  
>  .include 
>  
> 
> 
> > ok?
> 
> Your diff only adds arm64 stuff and doesn't modify architectures that
> already work, so it should be pretty safe and afaik you don't even need
> the REVISION bump.  No arm64 hw to test with but ok jca@ anyway
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> 

Re: gdb for arm64

[Peter Hessler]

Looks fully self-contained to an arch that isn't built right now, OK


On 2018 Jul 10 (Tue) at 12:00:54 +0200 (+0200), Mark Kettenis wrote:
:Here is a cleaned-up version of a diff that Dale made to support
:OpenBSD/arm64 in gdb.  Single-stepping doesn't work yet, which means
:that stepping through the code doesn't really work.  But setting
:breakpoints and inspecting state or looking at core files should work.
:
:I'm not sure what to do with the lang/ocaml comment in the Makefile.
:
:ok?
:
:
:Index: devel/gdb/Makefile
:===
:RCS file: /cvs/ports/devel/gdb/Makefile,v
:retrieving revision 1.54
:diff -u -p -r1.54 Makefile
:--- devel/gdb/Makefile 18 Jun 2018 14:53:12 -  1.54
:+++ devel/gdb/Makefile 10 Jul 2018 09:44:47 -
:@@ -1,13 +1,12 @@
: # $OpenBSD: Makefile,v 1.54 2018/06/18 14:53:12 kettenis Exp $
: 
: # adjust lang/ocaml if gdb is ported to aarch64
:-NOT_FOR_ARCHS=aarch64
: 
: COMMENT=  GNU debugger
: CATEGORIES=   devel
: 
: DISTNAME= gdb-7.12.1
:-REVISION= 2
:+REVISION= 3
: 
: HOMEPAGE= https://www.gnu.org/software/gdb/
: 
:Index: devel/gdb/patches/patch-bfd_config_bfd
:===
:RCS file: devel/gdb/patches/patch-bfd_config_bfd
:diff -N devel/gdb/patches/patch-bfd_config_bfd
:--- /dev/null  1 Jan 1970 00:00:00 -
:+++ devel/gdb/patches/patch-bfd_config_bfd 10 Jul 2018 09:44:47 -
:@@ -0,0 +1,15 @@
:+$OpenBSD$
:+--- bfd/config.bfd.orig   Sat Jan 21 05:48:42 2017
: bfd/config.bfdTue Mar  7 22:55:11 2017
:+@@ -202,6 +202,11 @@ case "${targ}" in
:+ targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec 
aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec"
:+ want64=true
:+ ;;
:++  aarch64-*-openbsd*)
:++targ_defvec=aarch64_elf64_le_vec
:++targ_selvecs="aarch64_elf32_le_vec arm_elf32_le_vec"
:++want64=true
:++;;
:+   aarch64_be-*-linux*)
:+ targ_defvec=aarch64_elf64_be_vec
:+ targ_selvecs="aarch64_elf64_le_vec aarch64_elf32_le_vec 
aarch64_elf32_be_vec arm_elf32_be_vec arm_elf32_le_vec"
:Index: devel/gdb/patches/patch-gdb_Makefile_in
:===
:RCS file: devel/gdb/patches/patch-gdb_Makefile_in
:diff -N devel/gdb/patches/patch-gdb_Makefile_in
:--- /dev/null  1 Jan 1970 00:00:00 -
:+++ devel/gdb/patches/patch-gdb_Makefile_in10 Jul 2018 09:44:47 -
:@@ -0,0 +1,24 @@
:+$OpenBSD$
:+Index: gdb/Makefile.in
:+--- gdb/Makefile.in.orig
: gdb/Makefile.in
:+@@ -644,7 +644,8 @@ TARGET_OBS = @TARGET_OBS@
:+ # All target-dependent objects files that require 64-bit CORE_ADDR
:+ # (used with --enable-targets=all --enable-64-bit-bfd).
:+ ALL_64_TARGET_OBS = \
:+- aarch64-tdep.o aarch64-linux-tdep.o aarch64-newlib-tdep.o 
aarch64-insn.o \
:++ aarch64-tdep.o aarch64-linux-tdep.o \
:++ aarch64-newlib-tdep.o aarch64obsd-tdep.o aarch64-insn.o \
:+  alphabsd-tdep.o alphafbsd-tdep.o alpha-linux-tdep.o alpha-mdebug-tdep.o 
\
:+  alphanbsd-tdep.o alphaobsd-tdep.o alpha-tdep.o \
:+  amd64fbsd-tdep.o amd64-darwin-tdep.o amd64-dicos-tdep.o \
:+@@ -1663,7 +1664,8 @@ MAKEOVERRIDES=
:+ 
:+ ALLDEPFILES = \
:+  aarch64-tdep.c aarch64-linux-tdep.c aarch64-newlib-tdep.c \
:+- aarch64-linux-nat.c \
:++ aarch64obsd-tdep.c \
:++ aarch64-linux-nat.c aarch64obsd-nat.c \
:+  aix-thread.c \
:+  alphabsd-nat.c alpha-linux-nat.c \
:+  alpha-tdep.c alpha-mdebug-tdep.c \
:Index: devel/gdb/patches/patch-gdb_aarch64obsd-nat_c
:===
:RCS file: devel/gdb/patches/patch-gdb_aarch64obsd-nat_c
:diff -N devel/gdb/patches/patch-gdb_aarch64obsd-nat_c
:--- /dev/null  1 Jan 1970 00:00:00 -
:+++ devel/gdb/patches/patch-gdb_aarch64obsd-nat_c  10 Jul 2018 09:44:47 
-
:@@ -0,0 +1,210 @@
:+$OpenBSD$
:+Index: gdb/aarch64obsd-nat.c
:+--- gdb/aarch64obsd-nat.c.orig
: gdb/aarch64obsd-nat.c
:+@@ -0,0 +1,205 @@
:++/* Native-dependent code for OpenBSD/arm64 (AArch64)
:++
:++   Copyright (C) 2011-2017 Free Software Foundation, Inc.
:++
:++   This file is part of GDB.
:++
:++   This program is free software; you can redistribute it and/or modify
:++   it under the terms of the GNU General Public License as published by
:++   the Free Software Foundation; either version 3 of the License, or
:++   (at your option) any later version.
:++
:++   This program is distributed in the hope that it will be useful,
:++   but WITHOUT ANY WARRANTY; without even the implied warranty of
:++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
:++   GNU General Public License for more details.
:++
:++   You should have received a copy of the GNU General Public License
:++   along with this program.  If not, see .  */
:++
:++#include "defs.h"
:++#include "gdbcore.h"
:++#include "inferior.h"
:++#include "regcache.h"
:++#include 
:++#incl

Re: gdb for arm64

[Jeremie Courreges-Anglas]

On Tue, Jul 10 2018, Mark Kettenis  wrote:
> Here is a cleaned-up version of a diff that Dale made to support
> OpenBSD/arm64 in gdb.  Single-stepping doesn't work yet, which means
> that stepping through the code doesn't really work.  But setting
> breakpoints and inspecting state or looking at core files should work.
>
> I'm not sure what to do with the lang/ocaml comment in the Makefile.

Please give this diff a try.

Index: lang/ocaml/Makefile
===
RCS file: /d/cvs/ports/lang/ocaml/Makefile,v
retrieving revision 1.79
diff -u -p -r1.79 Makefile
--- lang/ocaml/Makefile 15 Sep 2017 09:23:12 -  1.79
+++ lang/ocaml/Makefile 10 Jul 2018 10:21:47 -
@@ -9,7 +9,7 @@ COMMENT-graphics = OCaml Graphics librar
 # Do check that the ports that depend on it still work, or repair them.
 # Don't forget to bump version in ocaml.port.mk, too!
 VERSION=   4.03.0
-REVISION=  2
+REVISION=  3
 
 PKGNAME-main = ocaml-${VERSION}
 PKGNAME-graphics = ocaml-graphics-${VERSION}
@@ -45,11 +45,9 @@ RUN_DEPENDS-graphics +=  lang/ocaml
 WANTLIB-main = c curses m pthread
 WANTLIB-graphics = X11
 
-.if ${MACHINE_ARCH} != aarch64
-# for libbfd; devel/gdb doesn't build on aarch64 yet.
+# for libbfd
 BUILD_DEPENDS +=   devel/gdb
 WANTLIB-main +=iberty z
-.endif
 
 .include 
 


> ok?

Your diff only adds arm64 stuff and doesn't modify architectures that
already work, so it should be pretty safe and afaik you don't even need
the REVISION bump.  No arm64 hw to test with but ok jca@ anyway

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

Re: update devel/protobuf to 3.6.0?

[Jeremie Courreges-Anglas]

On Tue, Jul 10 2018, Jeremie Courreges-Anglas  wrote:
> On Thu, Jun 21 2018, Theo Buehler  wrote:
>> At work we need protobuf 3 instead of the old protobuf 2 we have in the
>> ports tree.  It would be great if we could update the in-tree version
>> from 2.4.1 to something more recent.
>>
>> protobuf 3.6.0 was released a couple of days ago.  The diff below is
>> based on the protobuf 3.5.1 port in openbsd-wip plus an attempt at
>> updating the fixes for the regression tests from the in-tree port.
>>
>> devel/protobuf-c would need to be bumped to 1.3.0 since that is the
>> first version with proto3 support. I'll send an update for that in a
>> separate mail.
>>
>> The diff for protobuf 3.6.0 below is obviously not yet perfect.  Even
>> with my best efforts to port the relevant parts of Greg Steuck's fixes
>> sthen committed for the 2.4.1 tests, there are a few that abort with
>> this trace:
>>
>> #0  thrkill () at -:3
>> #1  0x0ff87f07adde in _libc_abort () at 
>> /usr/src/lib/libc/stdlib/abort.c:51
>> #2  0x0ff8ff9f8e97 in testing::internal::GTestLog::~GTestLog() () from 
>> /usr/local/lib/libgtest.so.1.0
>> #3  0x0ff95858c8ea in 
>> testing::internal::ThreadLocal::~ThreadLocal() ()
>>from /usr/local/lib/libgmock.so.0.0
>> #4  0x0ff87f00c39c in _libc___cxa_finalize (dso=0x0) at 
>> /usr/src/lib/libc/stdlib/atexit.c:177
>> #5  0x0ff87f078c61 in _libc_exit (status=0) at 
>> /usr/src/lib/libc/stdlib/exit.c:54
>> #6  0x0ff67e6025fd in _start ()
>>
>> As a result, 4 out of 7 tests report failures. Does that ring a bell for
>> anyone?
>>
>>
>> I checked sqlports for direct dependents of protobuf and protobuf-c and
>> found these:
>>
>>  audio/clementine
>>  audio/mumble
>>  audio/umurmur
>>  games/pokerth
>>  net/dnsdist
>>  net/mosh
>>  net/ocserv
>>  sysutils/collectd,-prometheus
>>  sysutils/riemann-c-client
>>  x11/kde4/marble
>>
>> Except for mumble and pokerth, the above ports build, their 'make test'
>> (if applicable) looks fine and they pass light runtime testing as well,
>> so I think I'm in good shape.
>>
>> audio/mumble:
>>
>>  In file included from Mumble.pb.cc:4:
>>  In file included from ./Mumble.pb.h:25:
>>  In file included from 
>> /usr/local/include/google/protobuf/generated_message_table_driven.h:34:
>>  In file included from /usr/local/include/google/protobuf/map.h:49:
>>  In file included from 
>> /usr/local/include/google/protobuf/map_type_handler.h:35:
>>  In file included from 
>> /usr/local/include/google/protobuf/wire_format_lite_inl.h:43:
>>  /usr/local/include/google/protobuf/message_lite.h:117:3: fatal error: 
>> unknown type name 'constexpr'
>>constexpr const T& get() const { return reinterpret_cast> T&>(union_); }
>>^
>>
>> games/pokerth:
>>
>>  ===>  Configuring for pokerth-1.1.2
>>  cd /usr/ports/pobj/pokerth-1.1.2/pokerth-1.1.2-rc &&  protoc 
>> --cpp_out=src/third_party/protobuf chatcleaner.proto &&  protoc 
>> --cpp_out=src/third_party/protobuf pokerth.proto
>>  [libprotobuf WARNING 
>> /usr/ports/pobj/protobuf-3.6.0/protobuf-3.6.0/src/google/protobuf/compiler/parser.cc:562]
>>  No syntax specified for the proto file: chatcleaner.proto. Please use 
>> 'syntax = "proto2";' or 'syntax = "proto3";' to specify a syntax version. 
>> (Defaulted to proto2 syntax.)
>>  [libprotobuf WARNING 
>> /usr/ports/pobj/protobuf-3.6.0/protobuf-3.6.0/src/google/protobuf/compiler/parser.cc:562]
>>  No syntax specified for the proto file: pokerth.proto. Please use 
>> 'syntax = "proto2";' or 'syntax = "proto3";' to specify a syntax version. 
>> (Defaulted to proto2 syntax.)
>>  pokerth.proto:704:26: Expected enum value or number range.
>>  *** Error 1 in . (Makefile:59 'pre-configure')
>>
>>
>> And finally, here's my diff for protobuf 3.6.0:
>
> All consumers build-tested on sparc64 (except for x11/kde4/marble).
> The updated diff below is needed, mostly because the protobuf headers
> now require C++11 support.  The diff includes a slightly tweaked version
> of your pokerth and mumble diffs.
>
> As far as I'm concerned this is ready to go in, ok jca@

fwiw I know that ports-gcc can't build this updated protobuf version on
powerpc.  Well, tough luck.

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

gdb for arm64

[Mark Kettenis]

Here is a cleaned-up version of a diff that Dale made to support
OpenBSD/arm64 in gdb.  Single-stepping doesn't work yet, which means
that stepping through the code doesn't really work.  But setting
breakpoints and inspecting state or looking at core files should work.

I'm not sure what to do with the lang/ocaml comment in the Makefile.

ok?


Index: devel/gdb/Makefile
===
RCS file: /cvs/ports/devel/gdb/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- devel/gdb/Makefile  18 Jun 2018 14:53:12 -  1.54
+++ devel/gdb/Makefile  10 Jul 2018 09:44:47 -
@@ -1,13 +1,12 @@
 # $OpenBSD: Makefile,v 1.54 2018/06/18 14:53:12 kettenis Exp $
 
 # adjust lang/ocaml if gdb is ported to aarch64
-NOT_FOR_ARCHS= aarch64
 
 COMMENT=   GNU debugger
 CATEGORIES=devel
 
 DISTNAME=  gdb-7.12.1
-REVISION=  2
+REVISION=  3
 
 HOMEPAGE=  https://www.gnu.org/software/gdb/
 
Index: devel/gdb/patches/patch-bfd_config_bfd
===
RCS file: devel/gdb/patches/patch-bfd_config_bfd
diff -N devel/gdb/patches/patch-bfd_config_bfd
--- /dev/null   1 Jan 1970 00:00:00 -
+++ devel/gdb/patches/patch-bfd_config_bfd  10 Jul 2018 09:44:47 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+--- bfd/config.bfd.origSat Jan 21 05:48:42 2017
 bfd/config.bfd Tue Mar  7 22:55:11 2017
+@@ -202,6 +202,11 @@ case "${targ}" in
+ targ_selvecs="aarch64_elf64_be_vec aarch64_elf32_le_vec 
aarch64_elf32_be_vec arm_elf32_le_vec arm_elf32_be_vec"
+ want64=true
+ ;;
++  aarch64-*-openbsd*)
++targ_defvec=aarch64_elf64_le_vec
++targ_selvecs="aarch64_elf32_le_vec arm_elf32_le_vec"
++want64=true
++;;
+   aarch64_be-*-linux*)
+ targ_defvec=aarch64_elf64_be_vec
+ targ_selvecs="aarch64_elf64_le_vec aarch64_elf32_le_vec 
aarch64_elf32_be_vec arm_elf32_be_vec arm_elf32_le_vec"
Index: devel/gdb/patches/patch-gdb_Makefile_in
===
RCS file: devel/gdb/patches/patch-gdb_Makefile_in
diff -N devel/gdb/patches/patch-gdb_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -
+++ devel/gdb/patches/patch-gdb_Makefile_in 10 Jul 2018 09:44:47 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+Index: gdb/Makefile.in
+--- gdb/Makefile.in.orig
 gdb/Makefile.in
+@@ -644,7 +644,8 @@ TARGET_OBS = @TARGET_OBS@
+ # All target-dependent objects files that require 64-bit CORE_ADDR
+ # (used with --enable-targets=all --enable-64-bit-bfd).
+ ALL_64_TARGET_OBS = \
+-  aarch64-tdep.o aarch64-linux-tdep.o aarch64-newlib-tdep.o 
aarch64-insn.o \
++  aarch64-tdep.o aarch64-linux-tdep.o \
++  aarch64-newlib-tdep.o aarch64obsd-tdep.o aarch64-insn.o \
+   alphabsd-tdep.o alphafbsd-tdep.o alpha-linux-tdep.o alpha-mdebug-tdep.o 
\
+   alphanbsd-tdep.o alphaobsd-tdep.o alpha-tdep.o \
+   amd64fbsd-tdep.o amd64-darwin-tdep.o amd64-dicos-tdep.o \
+@@ -1663,7 +1664,8 @@ MAKEOVERRIDES=
+ 
+ ALLDEPFILES = \
+   aarch64-tdep.c aarch64-linux-tdep.c aarch64-newlib-tdep.c \
+-  aarch64-linux-nat.c \
++  aarch64obsd-tdep.c \
++  aarch64-linux-nat.c aarch64obsd-nat.c \
+   aix-thread.c \
+   alphabsd-nat.c alpha-linux-nat.c \
+   alpha-tdep.c alpha-mdebug-tdep.c \
Index: devel/gdb/patches/patch-gdb_aarch64obsd-nat_c
===
RCS file: devel/gdb/patches/patch-gdb_aarch64obsd-nat_c
diff -N devel/gdb/patches/patch-gdb_aarch64obsd-nat_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ devel/gdb/patches/patch-gdb_aarch64obsd-nat_c   10 Jul 2018 09:44:47 
-
@@ -0,0 +1,210 @@
+$OpenBSD$
+Index: gdb/aarch64obsd-nat.c
+--- gdb/aarch64obsd-nat.c.orig
 gdb/aarch64obsd-nat.c
+@@ -0,0 +1,205 @@
++/* Native-dependent code for OpenBSD/arm64 (AArch64)
++
++   Copyright (C) 2011-2017 Free Software Foundation, Inc.
++
++   This file is part of GDB.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; either version 3 of the License, or
++   (at your option) any later version.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program.  If not, see .  */
++
++#include "defs.h"
++#include "gdbcore.h"
++#include "inferior.h"
++#include "regcache.h"
++#include 
++#include 
++#include 
++
++#include "aarch64-tdep.h"
++#include "inf-ptrace.h"
++
++/* Fill GDB's register array with the general-purpose register values
++   from the current thread.  */
++
++static void
++fetch_gregs_from_thread (struct regcac

Re: update devel/protobuf to 3.6.0?

[Jeremie Courreges-Anglas]

On Thu, Jun 21 2018, Theo Buehler  wrote:
> At work we need protobuf 3 instead of the old protobuf 2 we have in the
> ports tree.  It would be great if we could update the in-tree version
> from 2.4.1 to something more recent.
>
> protobuf 3.6.0 was released a couple of days ago.  The diff below is
> based on the protobuf 3.5.1 port in openbsd-wip plus an attempt at
> updating the fixes for the regression tests from the in-tree port.
>
> devel/protobuf-c would need to be bumped to 1.3.0 since that is the
> first version with proto3 support. I'll send an update for that in a
> separate mail.
>
> The diff for protobuf 3.6.0 below is obviously not yet perfect.  Even
> with my best efforts to port the relevant parts of Greg Steuck's fixes
> sthen committed for the 2.4.1 tests, there are a few that abort with
> this trace:
>
> #0  thrkill () at -:3
> #1  0x0ff87f07adde in _libc_abort () at 
> /usr/src/lib/libc/stdlib/abort.c:51
> #2  0x0ff8ff9f8e97 in testing::internal::GTestLog::~GTestLog() () from 
> /usr/local/lib/libgtest.so.1.0
> #3  0x0ff95858c8ea in 
> testing::internal::ThreadLocal::~ThreadLocal() ()
>from /usr/local/lib/libgmock.so.0.0
> #4  0x0ff87f00c39c in _libc___cxa_finalize (dso=0x0) at 
> /usr/src/lib/libc/stdlib/atexit.c:177
> #5  0x0ff87f078c61 in _libc_exit (status=0) at 
> /usr/src/lib/libc/stdlib/exit.c:54
> #6  0x0ff67e6025fd in _start ()
>
> As a result, 4 out of 7 tests report failures. Does that ring a bell for
> anyone?
>
>
> I checked sqlports for direct dependents of protobuf and protobuf-c and
> found these:
>
>   audio/clementine
>   audio/mumble
>   audio/umurmur
>   games/pokerth
>   net/dnsdist
>   net/mosh
>   net/ocserv
>   sysutils/collectd,-prometheus
>   sysutils/riemann-c-client
>   x11/kde4/marble
>
> Except for mumble and pokerth, the above ports build, their 'make test'
> (if applicable) looks fine and they pass light runtime testing as well,
> so I think I'm in good shape.
>
> audio/mumble:
>
>   In file included from Mumble.pb.cc:4:
>   In file included from ./Mumble.pb.h:25:
>   In file included from 
> /usr/local/include/google/protobuf/generated_message_table_driven.h:34:
>   In file included from /usr/local/include/google/protobuf/map.h:49:
>   In file included from 
> /usr/local/include/google/protobuf/map_type_handler.h:35:
>   In file included from 
> /usr/local/include/google/protobuf/wire_format_lite_inl.h:43:
>   /usr/local/include/google/protobuf/message_lite.h:117:3: fatal error: 
> unknown type name 'constexpr'
> constexpr const T& get() const { return reinterpret_cast T&>(union_); }
> ^
>
> games/pokerth:
>
>   ===>  Configuring for pokerth-1.1.2
>   cd /usr/ports/pobj/pokerth-1.1.2/pokerth-1.1.2-rc &&  protoc 
> --cpp_out=src/third_party/protobuf chatcleaner.proto &&  protoc 
> --cpp_out=src/third_party/protobuf pokerth.proto
>   [libprotobuf WARNING 
> /usr/ports/pobj/protobuf-3.6.0/protobuf-3.6.0/src/google/protobuf/compiler/parser.cc:562]
>   No syntax specified for the proto file: chatcleaner.proto. Please use 
> 'syntax = "proto2";' or 'syntax = "proto3";' to specify a syntax version. 
> (Defaulted to proto2 syntax.)
>   [libprotobuf WARNING 
> /usr/ports/pobj/protobuf-3.6.0/protobuf-3.6.0/src/google/protobuf/compiler/parser.cc:562]
>   No syntax specified for the proto file: pokerth.proto. Please use 
> 'syntax = "proto2";' or 'syntax = "proto3";' to specify a syntax version. 
> (Defaulted to proto2 syntax.)
>   pokerth.proto:704:26: Expected enum value or number range.
>   *** Error 1 in . (Makefile:59 'pre-configure')
>
>
> And finally, here's my diff for protobuf 3.6.0:

All consumers build-tested on sparc64 (except for x11/kde4/marble).
The updated diff below is needed, mostly because the protobuf headers
now require C++11 support.  The diff includes a slightly tweaked version
of your pokerth and mumble diffs.

As far as I'm concerned this is ready to go in, ok jca@


Index: net/mosh/Makefile
===
RCS file: /cvs/ports/net/mosh/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- net/mosh/Makefile   26 Jul 2017 22:45:28 -  1.15
+++ net/mosh/Makefile   10 Jul 2018 09:40:22 -
@@ -3,7 +3,7 @@
 COMMENT =  mobile shell
 
 DISTNAME = mosh-1.3.2
-REVISION = 0
+REVISION = 1
 
 CATEGORIES =   net
 
@@ -19,6 +19,10 @@ WANTLIB +=   c crypto m ncursesw protobuf
 WANTLIB += z
 
 MASTER_SITES = ${HOMEPAGE}
+
+# C++11 needed by protobuf
+COMPILER = base-clang ports-gcc
+CXXFLAGS +=-std=gnu++11
 
 LIB_DEPENDS =  devel/protobuf
 
Index: games/pokerth/Makefile
===
RCS file: /cvs/ports/games/pokerth/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makef

Re: [NEW] devel/p5-multidimensional

[Frederic Cambus]

On Mon, Jul 09, 2018 at 02:07:05PM +0200, Frederic Cambus wrote:

> Here is a new port: devel/p5-multidimensional
> 
> This is another dependency required for p5-MaxMind-DB-Reader.

Please disregard this port for now, will ping if actually required.

Update textproc/wkhtmltopdf-0.12.4

[Frank Groeneveld]

Attached a patch to update textproc/wkhtmltopdf to version 0.12.4. This release 
fixes some small bugs, a full release log can be found at: 
https://github.com/wkhtmltopdf/wkhtmltopdf/releases/tag/0.12.4

Unfortunately this is not the latest version yet, I'm still trying to get 
0.12.5 to work with HTTPS sites (errors about not being able to resolve some 
OpenSSL symbols during runtime). As soon as I fix that I'll send an update for 
it.

--
Frank
Index: Makefile
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile	16 Apr 2018 12:00:40 -	1.18
+++ Makefile	10 Jul 2018 09:11:30 -
@@ -9,9 +9,8 @@ COMMENT =		convert HTML to PDF using Web
 
 GH_ACCOUNT =		wkhtmltopdf
 GH_PROJECT =		wkhtmltopdf
-GH_TAGNAME =		0.12.3.2
-REVISION =		3
-QT_COMMIT =		8dae19a82231e87366d81c683bafcb025aea9c1d
+GH_TAGNAME =		0.12.4
+QT_COMMIT =		c0cfa03a072789550d8ff5724b2e5e58436e02d1
 MASTER_SITES0 =		https://github.com/wkhtmltopdf/qt/archive/
 DISTFILES =		${DISTNAME}.tar.gz \
 			wkhtmltopdf-qt-${QT_COMMIT}_1{${QT_COMMIT}}.tar.gz:0
Index: distinfo
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo	16 Apr 2018 12:00:40 -	1.4
+++ distinfo	10 Jul 2018 09:11:30 -
@@ -1,4 +1,4 @@
-SHA256 (wkhtmltopdf-0.12.3.2.tar.gz) = chUj74fMuTe/NxSt4ZsRL0y4os2EDjSzDybuJixB/hY=
-SHA256 (wkhtmltopdf-qt-8dae19a82231e87366d81c683bafcb025aea9c1d_1.tar.gz) = SxuN/mRu2mum6lTDfBmcTYbt9f2D6w5Hmk3nD1MQaiU=
-SIZE (wkhtmltopdf-0.12.3.2.tar.gz) = 128050
-SIZE (wkhtmltopdf-qt-8dae19a82231e87366d81c683bafcb025aea9c1d_1.tar.gz) = 173053203
+SHA256 (wkhtmltopdf-0.12.4.tar.gz) = 3UZvXCUEZwRZ87gmXeVpe5BU8Hfi8+OS5RcrUTMIDt8=
+SHA256 (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = OOl9+XrQB4R5QCStoAY5YXXT7Gszs8IenyFjiX8tLiI=
+SIZE (wkhtmltopdf-0.12.4.tar.gz) = 128695
+SIZE (wkhtmltopdf-qt-c0cfa03a072789550d8ff5724b2e5e58436e02d1_1.tar.gz) = 173053875
Index: patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp
--- patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp	27 Apr 2017 16:23:14 -	1.1
+++ patches/patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp	10 Jul 2018 09:11:30 -
@@ -1,6 +1,8 @@
-$OpenBSD: patch-qt_src_3rdparty_webkit_Source_WebCore_html_HTMLImageElement_cpp,v 1.1 2017/04/27 16:23:14 espie Exp $
 qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig	Thu Apr 27 17:13:35 2017
-+++ qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp	Thu Apr 27 17:13:49 2017
+$OpenBSD$
+
+Index: qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
+--- qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp.orig
 qt/src/3rdparty/webkit/Source/WebCore/html/HTMLImageElement.cpp
 @@ -74,7 +74,7 @@ PassRefPtr HTMLImageElement::createF
  RefPtr image = adoptRef(new HTMLImageElement(imgTag, document));
  if (optionalWidth)
Index: patches/patch-src_image_image_pro
===
RCS file: /cvs/ports/textproc/wkhtmltopdf/patches/patch-src_image_image_pro,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_image_image_pro
--- patches/patch-src_image_image_pro	6 Jan 2016 16:50:35 -	1.2
+++ patches/patch-src_image_image_pro	10 Jul 2018 09:11:30 -
@@ -1,14 +1,15 @@
 $OpenBSD: patch-src_image_image_pro,v 1.2 2016/01/06 16:50:35 sthen Exp $
 src/image/image.pro.orig	Sun Jul 12 07:34:52 2015
-+++ src/image/image.pro	Sun Dec 27 11:11:46 2015
+Index: src/image/image.pro
+--- src/image/image.pro.orig
 src/image/image.pro
 @@ -24,8 +24,8 @@ DEPENDPATH += . ../shared
  INCLUDEPATH += . ../shared
  
  unix {
 -man.path=$$INSTALLBASE/share/man/man1
--man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $(INSTALL_ROOT)/share/man/man1/wkhtmltoimage.1.gz
+-man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage | gzip > $(INSTALL_ROOT)$$INSTALLBASE/share/man/man1/wkhtmltoimage.1.gz
 +man.path=$$INSTALLBASE/man/man1
-+man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage > $(INSTALL_ROOT)/man/man1/wkhtmltoimage.1
++man.extra=LD_LIBRARY_PATH=../../bin/ ../../bin/wkhtmltoimage --manpage > $(INSTALL_ROOT)$$INSTALLBASE/man/man1/wkhtmltoimage.1
  
  QMAKE_EXTRA_TARGETS += man
  INSTALLS += man
Index: patches/patch-src_pdf_pdf_pro
===
RCS file: /cvs/ports/textp

Re: NEW: games/openomf

[Tom Murphy]

The game went Freeware in 1999 and its files are free to download. 
There's nothing to purchase.

OpenOMF uses a MIT license.

I did the initial port work on it and have been in contact with the 
developers of openomf.
They've make several fixes to cmake to make it more portable, however 
there's some bits of the game
that don't work 100% yet like tournament mode, and there's some bugs in 
the network code that need fixing, but single and two player modes work.


The libdumb submodule was there because the libdumb code got taken over 
by a new developer (https://github.com/kode54/dumb) so I'm fairly sure 
we could update audio/dumb to 2.0.3. I'm not completely certain but I 
believe the old allegro stuff has been dropped.


Thanks to Brian Callahan for sorting out the submodules. Those were 
doing my head in! :)


Thanks,
Tom

Re: [update] samba-4.8.3

[Jeremie Courreges-Anglas]

On Tue, Jul 10 2018, Ian McWilliam  wrote:
> Ouch, that's a new lock order problem. The one I encountered with 4.8.2 was 
> with the vfs/acl_tdb module.

They are not the same thing: you hit a locking problem in samba code,
the log from Vijay shows a lock ordering problem in the OpenBSD kernel.

> Ian McWilliam
>
>
> 
> From: owner-po...@openbsd.org  on behalf of Vijay 
> Sankar 
> Sent: Tuesday, 10 July 2018 9:55 AM
> To: ports@openbsd.org
> Subject: Re: [update] samba-4.8.3
>
>
> Quoting Jeremie Courreges-Anglas :
>
>> Bugfix release: https://www.samba.org/samba/history/samba-4.8.3.html
> Samba 4.8.3 - Release 
> Notes
> www.samba.org
> Samba 4.8.3 Available for Download. Samba 4.8.3 (gzipped) Signature.
> Patch (gzipped) against Samba 4.8.2 Signature = Release Notes for
> Samba 4.8.3 June 26, 2018 = This is the latest stable release of the
> Samba 4.8 release series.
>
>
>
>>
>> I don't see any change in vfs_virusfilter, which was new (and apparently
>> broken) in 4.8.2.
>>
>> Test reports welcome!
>>
>>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/net/samba/Makefile,v
>> retrieving revision 1.254
>> diff -u -p -r1.254 Makefile
>> --- Makefile  11 Jun 2018 11:59:51 -  1.254
>> +++ Makefile  9 Jul 2018 13:10:02 -
>> @@ -1,6 +1,6 @@
>> # $OpenBSD: Makefile,v 1.254 2018/06/11 11:59:51 jca Exp $
>>
>> -VERSION =4.8.2
>> +VERSION =4.8.3
>> DISTNAME =samba-${VERSION}
>>
>> COMMENT-main =SMB and CIFS client and server for UNIX
>> @@ -17,9 +17,11 @@ PKGNAME-docs = samba-docs-${VERSION}
>>
>> PKG_ARCH-docs =   *
>>
>> -LDB_V =  1.3.3
>> +LDB_V =  1.3.4
>> TEVENT_V =0.9.36
>>
>> +REVISION-tevent =0
>> +
>> SHARED_LIBS = asn1-samba4 0.0 \
>>com_err-samba4  0.0 \
>>dcerpc  0.0 \
>> @@ -34,30 +36,30 @@ SHARED_LIBS = asn1-samba4 0.0 \
>>hx509-samba40.0 \
>>kdc-samba4  0.0 \
>>krb5-samba4 0.1 \
>> - ldb 0.6 \
>> + ldb 0.7 \
>>ndr 0.3 \
>>ndr-krb5pac 0.1 \
>>ndr-nbt 0.1 \
>>ndr-standard3.0 \
>>netapi  2.1 \
>> - pyldb-util  0.3 \
>> + pyldb-util  0.4 \
>>roken-samba40.0 \
>>samba-credentials   0.2 \
>>samba-errors1.0 \
>>samba-hostconfig4.0 \
>>samba-passdb2.0 \
>>samba-policy0.0 \
>> - samba-util  3.1 \
>> + samba-util  3.2 \
>>samdb   0.1 \
>>smbclient   4.2 \
>> - smbconf 4.0 \
>> + smbconf 4.1 \
>>smbldap 0.1 \
>>tevent  0.4 \
>>tevent-util 1.0 \
>>wbclient3.2 \
>>wind-samba4 0.0 \
>> - replace 5.0 \
>> - util-setid  5.0
>> + replace 6.0 \
>> + util-setid  6.0
>>
>> CATEGORIES =  net sysutils security
>>
>> Index: distinfo
>> ===
>> RCS file: /cvs/ports/net/samba/distinfo,v
>> retrieving revision 1.68
>> diff -u -p -r1.68 distinfo
>> --- distinfo  11 Jun 2018 11:59:51 -  1.68
>> +++ distinfo  9 Jul 2018 09:35:30 -
>> @@ -1,2 +1,2 @@
>> -SHA256 (samba-4.8.2.tar.gz) = YuVSKW1J5qtEu4fRIKKIgT+lLkJDXVOh9xt3WWUSvyI=
>> -SIZE (samba-4.8.2.tar.gz) = 17675145
>> +SHA256 (samba-4.8.3.tar.gz) = 4FaaimBdXftJ8f3RHbeW9NNv4DUcSn8hOH7yUwELgu0=
>> +SIZE (samba-4.8.3.tar.gz) = 17680660
>> Index: pkg/PLIST-main
>> ===
>> RCS file: /cvs/ports/net/samba/pkg/PLIST-main,v
>> retrieving revision 1.41
>> diff -u -p -r1.41 PLIST-main
>> --- pkg/PLIST-main11 Jun 2018 11:59:51 -  1.41
>> +++ pkg/PLIST-main9 Jul 2018 11:35:53 -
>> @@ -2,6 +2,11 @@
>> @pkgpath net/samba,ldap,-main
>> @pkgpath net

UPDATE: kcaldav-0.1.7

[Gonzalo L. Rodriguez]

Hello,

Update for kcaldav to 0.1.7:

https://kristaps.bsd.lv/kcaldav/

OK? Comments?

Cheers.-

--
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/www/kcaldav/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile8 Apr 2018 08:30:37 -   1.11
+++ Makefile10 Jul 2018 07:53:19 -
@@ -2,7 +2,7 @@
 
 COMMENT =  a simple, safe, and minimal CalDAV server
 
-DISTNAME = kcaldav-0.1.6
+DISTNAME = kcaldav-0.1.7
 CATEGORIES =   www
 
 HOMEPAGE = https://kristaps.bsd.lv/kcaldav/
Index: distinfo
===
RCS file: /cvs/ports/www/kcaldav/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo8 Apr 2018 08:29:22 -   1.3
+++ distinfo10 Jul 2018 07:53:19 -
@@ -1,2 +1,2 @@
-SHA256 (kcaldav-0.1.6.tgz) = dZ6USl4bFFyBq0kP0UWm+s2+8xRzpeAbo4kXO7FB/1s=
-SIZE (kcaldav-0.1.6.tgz) = 81944
+SHA256 (kcaldav-0.1.7.tgz) = nwC4bWH+CXNHQloAjFWfm9M+Go7BxuPF697VmX+DeiY=
+SIZE (kcaldav-0.1.7.tgz) = 82157
Index: patches/patch-kcaldav_c
===
RCS file: patches/patch-kcaldav_c
diff -N patches/patch-kcaldav_c
--- patches/patch-kcaldav_c 8 Apr 2018 08:29:22 -   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-kcaldav_c,v 1.1 2018/04/08 08:29:22 stsp Exp $
-
-Index: kcaldav.c
 kcaldav.c.orig
-+++ kcaldav.c
-@@ -313,7 +313,9 @@ main(void)
-   char*np;
-   size_t   i, sz;
- 
-+#if defined LOGFILE && defined DEBUG && DEBUG > 0
-   kutil_openlog(LOGFILE);
-+#endif
- 
-   st = NULL;
- #if defined DEBUG && DEBUG > 1