CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2018/04/11 22:40:41

Modified files:
net/libtorrent-rasterbar: Makefile distinfo 
net/libtorrent-rasterbar/pkg: PLIST 
Added files:
net/libtorrent-rasterbar/patches: 
  patch-src_kademlia_dht_tracker_cpp 

Log message:
Update to libtorrent-rasterbar-1.1.7.

Include a patch to fix the build with clang 6.

UPDATE: graphics/farbfeld 3 -> 4

[Kaashif Hymabaccus]

Hello ports@

This is an update to graphics/farbfeld. The main change to the port is
that USE_GMAKE isn't needed any more.

Works fine for me on amd64 (converted some images to ff and back,
still seems to work).

diff --git Makefile Makefile
index 8d499d1ad33..1b49fcc3fa1 100644
--- Makefile
+++ Makefile
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
 
 COMMENT =  lossless, uncompressed graphics format
-DISTNAME = farbfeld-3
+DISTNAME = farbfeld-4
 CATEGORIES =   graphics converters
 
 HOMEPAGE = https://tools.suckless.org/farbfeld
@@ -19,7 +19,6 @@ LIB_DEPENDS = graphics/png \
 
 RUN_DEPENDS =  graphics/ImageMagick
 
-USE_GMAKE =Yes
 MAKE_ENV = CC="${CC}"
 
 NO_TEST =  Yes
diff --git distinfo distinfo
index c632a202e9e..a5f2d6668be 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (farbfeld-3.tar.gz) = W5U7hqctP+rt9iaYUyyIiOX24vY2MZOkzIzuDjjDeK0=
-SIZE (farbfeld-3.tar.gz) = 10169
+SHA256 (farbfeld-4.tar.gz) = x99ZIe3RIcpdWxz2+wHkMK/5sxJCJi5PaQ069yzL5yo=
+SIZE (farbfeld-4.tar.gz) = 10340
diff --git patches/patch-Makefile patches/patch-Makefile
index c42275f1f20..bb3b6daad0e 100644
--- patches/patch-Makefile
+++ patches/patch-Makefile
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah 
Exp $
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -38,15 +38,12 @@ dist:
+@@ -51,15 +51,12 @@ dist:
rm -rf "farbfeld-$(VERSION)"
  
  install: all
diff --git patches/patch-config_mk patches/patch-config_mk
index b27e187cb51..f660d82096f 100644
--- patches/patch-config_mk
+++ patches/patch-config_mk
@@ -3,13 +3,14 @@ $OpenBSD: patch-config_mk,v 1.1.1.1 2017/10/23 21:39:20 
bcallah Exp $
 Index: config.mk
 --- config.mk.orig
 +++ config.mk
-@@ -4,15 +4,15 @@ VERSION = 3
+@@ -4,15 +4,15 @@ VERSION = 4
  # Customize below to fit your system
  
  # paths
 -PREFIX = /usr/local
+-MANPREFIX = $(PREFIX)/share/man
 +PREFIX ?= /usr/local
- MANPREFIX = ${PREFIX}/man
++MANPREFIX = $(PREFIX)/man
  
  # flags
  CPPFLAGS = -D_DEFAULT_SOURCE
@@ -17,8 +18,8 @@ Index: config.mk
 -LDFLAGS  = -s
 +CFLAGS   += -std=c99 -pedantic -Wall -Wextra -I${LOCALBASE}/include
 +LDFLAGS  += -s -L${LOCALBASE}/lib
- PNG-LDFLAGS = -lpng
- JPG-LDFLAGS = -ljpeg
+ PNG-LDLIBS = -lpng
+ JPG-LDLIBS = -ljpeg
  
  # compiler and linker
 -CC = cc

Re: new: wapptclsh

[James Turner]

On Fri, Apr 06, 2018 at 09:40:05AM -0400, James Turner wrote:
> Attached is a new port for wapptcl a minimal TCL web applications
> framework wrapped in a statically linked tcl shell.
> 
> Information for inst:wapptclsh-20180330
> 
> Comment:
> minimal TCL web applications framework
> 
> Description:
> Wapp is a new framework for writing web applications in TCL. It has a
> very small API and is resistant to attacks and exploits. It can also be
> compiled as a statically linked interpreter (like we do in this port)
> that is easilly copied into chrooted environments and includes a bundled
> SQLite.
> 
> Maintainer: James Turner 
> 
> WWW: http://wapp.tcl.tk/
> 
> -- 
> James Turner

What no one interested in some old school tcl web development?

-- 
James Turner

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 16:49:40

Added files:
devel/openmpi/patches: 
   
patch-ompi_contrib_vt_vt_tools_compwrap_compwrap_cc 

Log message:
clang6 space around constants; from David CARLIER

update devel/openmpi clang6 fix

[David CARLIER]

Hi,

fix for openmpi here.

Regards.


patch-devel-openmpi.diff
Description: Binary data

Re: [PATCH] www/goaccess: drop Tokyo Cabinet storage support

[Daniel Jakots]

On Wed, 11 Apr 2018 22:32:35 +0100, Stuart Henderson
 wrote:

> > > I'm not a fan of unnecessary flavours in ports, but I think this
> > > might be a case where it makes sense?  
> > 
> > I would like it if there was a non-tokyo flavor. It has only ever
> > caused problems for me. That said, I am not a very heavy user of
> > it!  
> 
> I would suggest using a flavour to _enable_ tokyocabinet rather than
> on-by-default. Maybe with a quick explanation why one might want to
> use it in DESCR.

Yes please!

A couple of times I looked at goaccess and I've never installed it
because of this dep.

Re: py-test and friends

[Stuart Henderson]

On 2018/04/11 17:17, Pavel Korovin wrote:
> Dear all,
> Please see attached diffs for updates to current devel/py-test and
> related modules:
> 
> devel/py-attrs
> devel/py-hypothesis
> devel/py-pluggy
> devel/py-py
> devel/py-setuptools_scm
> devel/py-six
> devel/py-test
> 
> The new one, devel/py-more-itertools is a new RUN_DEPENDS for py-test
> 
> Added shells/bash as a new TEST_DEPENDS for py-test.
> Removed py-test-xdist and py-twisted from TEST_DEPENDS for py-test, leaving
> only essential modules, hope that's OK; otherwise we'll end up adding
> py-coverage, numpy and other stuff for testing.
> 
> Tested on amd64. Tests are OK except several py-py tests which also fail
> with in-tree py-py.
> 
> On 02/10, Stuart Henderson wrote:
> > py-cryptography needs a bit of work, but the test suite now needs newer
> > py-test than we have, and that in turn needs some other updates.
> > 
> > can anyone help testing / getting these in please? i don't have time to
> > test the wider dep chain at the moment.
> 
> -- 
> With best regards,
> Pavel Korovin


Great, thanks very much for looking at this!

For py-more-itertools you have "TEST_DEPENDS=${RUN_DEPENS}"
(missing 'D' in RUN_DEPENDS), with that fixed it's OK sthen@ to import.

For the update diffs, one thing I noticed while reading through, there's
a doubled ${MODPY_COMMENT} in py-hypothesis' pkg/PLIST:

> -${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/hypothesis/utils/${MODPY_PYCACHE}/
> +${MODPY_COMMENT}${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/hypothesis/utils/${MODPY_PYCACHE}/

Other than that it reads well but for ease of testing would you mind
sending a new diff from a common parent directory so it can be applied in
one go please? They're all in devel/, so this would work:

cd /usr/ports/devel
cvs diff py-attrs py-hypothesis py-pluggy py-py py-setuptools_scm py-six py-test

update geo/gpstk

[Stuart Henderson]

This version builds with clang 6. It's a major update.

No ports in-tree use this, but it doesn't build with the test suite
enabled, and I have no idea how to test at runtime, so can't really say
if it actually works.

Does anyone actually use this? If so could you have a look please?

If not, any objections to just updating it? at least it's a better
starting point.

I rolled in -devel to the main package, there's not a lot of point in
separating headers.

Index: Makefile
===
RCS file: /cvs/ports/geo/gpstk/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile26 Jul 2017 22:45:22 -  1.21
+++ Makefile11 Apr 2018 21:58:25 -
@@ -1,62 +1,34 @@
 # $OpenBSD: Makefile,v 1.21 2017/07/26 22:45:22 sthen Exp $
 
-COMMENT-main=  GPS processing toolkit
-COMMENT-devel= GPStk development libraries and headers
+COMMENT=   GPS processing toolkit
+
+V= 2.10
+GH_ACCOUNT=SGL-UT
+GH_PROJECT=GPSTk
+GH_TAGNAME=v$V
+PKGNAME=   gpstk-$V
 
-V= 1.5
-DISTNAME=  gpstk${V}
-PKGNAME-main=  gpstk-${V}
-REVISION-main= 7
-PKGNAME-devel= gpstk-devel-${V}
-REVISION-devel=9
 CATEGORIES=geo devel
-SHARED_LIBS=   base 15.0 \
-   geomatics 15.0 \
-   gpstk 15.0 \
-   mdplib 15.0 \
-   procframe 15.0 \
-   rlib 15.0 \
-   rxio 15.0 \
-   simlib 15.0 \
-   toolslib 15.0 \
-   vplot 15.0
+
+SHARED_LIBS=   gpstk 16.0
 
 HOMEPAGE=  http://www.gpstk.org/
 
-# LGPL
+# LGPLv3.0+
 PERMIT_PACKAGE_CDROM=  Yes
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gpstk/}
-DISTFILES= ${DISTNAME}.src.tar.gz
+WANTLIB=   ${COMPILER_LIBCXX} c m
 
-AUTOCONF_VERSION=  2.60
-AUTOMAKE_VERSION=  1.9
-CONFIGURE_STYLE=   gnu
+MODULES=   devel/cmake
 
 NO_TEST=   Yes
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64"
-# way faster than -O0, a bit slower than -O2, but doesn't need 800M to compile
-CFLAGS+=   -O1 -g
-CXXFLAGS+= -O1 -g
-.else
-# ...but -O1 is still too much for most build machines, so just use it on the
-# fastest ones.
-CFLAGS+=   -O0 -g
-CXXFLAGS+= -O0 -g
+.if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "amd64" && ${MACHINE_ARCH} 
!= "aarch64"
+# ...higher opt levels are too much for smaller/slower build machines
+CFLAGS+=   -O0
+CXXFLAGS+= -O0
 .endif
 
-BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
-   devel/libtool \
-   ${MODGNU_AUTOMAKE_DEPENDS}
-MULTI_PACKAGES=-main -devel
-WANTLIB-main=  m c ${COMPILER_LIBCXX} curses
-WANTLIB-devel=
-RUN_DEPENDS-devel= ${PKGNAME-main}:geo/gpstk
-
-pre-configure:
-   cd ${WRKDIST} && sh autogen.sh
-
-post-install:
-   @mv ${PREFIX}/bin/tracker ${PREFIX}/bin/gpstracker
+COMPILER=  base-clang ports-gcc
+CONFIGURE_ARGS=-DBUILD_EXT=on
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/geo/gpstk/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo18 Jan 2015 03:14:06 -  1.2
+++ distinfo11 Apr 2018 21:58:25 -
@@ -1,2 +1,2 @@
-SHA256 (gpstk1.5.src.tar.gz) = K8aZ2euNl3T6amNeD3XaLzjADhtwCXT+kZe4unyGcnc=
-SIZE (gpstk1.5.src.tar.gz) = 7050592
+SHA256 (GPSTk-2.10.tar.gz) = daoEE3sXuQoRZwBDG0Fw0NQj3KMjdLTv+8/r57HAYBc=
+SIZE (GPSTk-2.10.tar.gz) = 123291552
Index: patches/patch-BuildSetup_cmake
===
RCS file: patches/patch-BuildSetup_cmake
diff -N patches/patch-BuildSetup_cmake
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-BuildSetup_cmake  11 Apr 2018 21:58:25 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: BuildSetup.cmake
+--- BuildSetup.cmake.orig
 BuildSetup.cmake
+@@ -40,6 +40,8 @@ elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
+ set( CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS} -O2" )
+ set( CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS} -O2" )
+ set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -shared" )
++elseif( ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD" )
++set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -shared" )
+ elseif( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
+ else()
+ message( ERROR "CMAKE_SYSTEM_NAME = ${CMAKE_SYSTEM_NAME}, not supported. 
Currently supported: Linux, Darwin, SunOS, Windows" )
Index: patches/patch-apps_reszilla_CycleSlipList_hpp
===
RCS file: 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 15:35:58

Modified files:
security/clamav: Makefile distinfo 
security/clamav/patches: patch-clamd_Makefile_in 
 patch-database_Makefile_in 
 patch-etc_clamd_conf_sample 
 patch-etc_freshclam_conf_sample 
 patch-libclamav_Makefile_in 
 patch-libclamav_clamav_h 
 patch-libclamav_ole2_extract_c 
 patch-libclamav_str_c 
 patch-unit_tests_Makefile_in 
security/clamav/pkg: PLIST 

Log message:
update to clamav-0.100.0

Re: [PATCH] www/goaccess: drop Tokyo Cabinet storage support

[Stuart Henderson]

On 2018/04/11 15:29, Aaron Bieber wrote:
> On Wed, Apr 11, 2018 at 10:09:12PM +0100, Stuart Henderson wrote:
> > On 2018/04/11 22:39, Frederic Cambus wrote:
> > > Hi ports@,
> > >
> > > Here is a diff to drop Tokyo Cabinet storage support, this greatly
> > > speeds up processing time, more than 10 times actually.
> > >
> > > With the current version:
> > >
> > > - Total Requests: 1,347,757
> > > - Log Size:  282.49 MiB
> > > - Init. Proc. Time: 712 secs
> > >
> > > With the diff applied:
> > >
> > > - Total Requests: 1,347,757
> > > - Log Size:  282.49 MiB
> > > - Init. Proc. Time:  67 secs
> > >
> > > While there, switch HOMEPAGE and MASTER_SITES to HTTPS and update
> > > license marker to specify the MIT license, which goaccess switched
> > > to since the 1.0 release.
> > >
> > > Comments? OK?
> >
> > It is expected that goaccess is slower with Tokyo Cabinet (it's clear
> > in the manpage), but it allows it to process larger files, and to keep
> > data in persistent storage.
> >
> > I'm not a fan of unnecessary flavours in ports, but I think this might
> > be a case where it makes sense?
> 
> I would like it if there was a non-tokyo flavor. It has only ever
> caused problems for me. That said, I am not a very heavy user of it!

I would suggest using a flavour to _enable_ tokyocabinet rather than
on-by-default. Maybe with a quick explanation why one might want to
use it in DESCR.

Re: [PATCH] www/goaccess: drop Tokyo Cabinet storage support

[Aaron Bieber]

On Wed, Apr 11, 2018 at 10:09:12PM +0100, Stuart Henderson wrote:
> On 2018/04/11 22:39, Frederic Cambus wrote:
> > Hi ports@,
> >
> > Here is a diff to drop Tokyo Cabinet storage support, this greatly
> > speeds up processing time, more than 10 times actually.
> >
> > With the current version:
> >
> > - Total Requests: 1,347,757
> > - Log Size:  282.49 MiB
> > - Init. Proc. Time: 712 secs
> >
> > With the diff applied:
> >
> > - Total Requests: 1,347,757
> > - Log Size:  282.49 MiB
> > - Init. Proc. Time:  67 secs
> >
> > While there, switch HOMEPAGE and MASTER_SITES to HTTPS and update
> > license marker to specify the MIT license, which goaccess switched
> > to since the 1.0 release.
> >
> > Comments? OK?
>
> It is expected that goaccess is slower with Tokyo Cabinet (it's clear
> in the manpage), but it allows it to process larger files, and to keep
> data in persistent storage.
>
> I'm not a fan of unnecessary flavours in ports, but I think this might
> be a case where it makes sense?

I would like it if there was a non-tokyo flavor. It has only ever
caused problems for me. That said, I am not a very heavy user of it!

--
PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A  4AF0 1F81 112D 62A9 ADCE

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 15:28:56

Modified files:
mail/roundcubemail: Tag: OPENBSD_6_3 Makefile distinfo 
mail/roundcubemail/pkg: Tag: OPENBSD_6_3 README 

Log message:
MFC update to Roundcube 1.3.6, a couple of fixes, the main one being:

"In Roundcube from versions 1.2.0 to 1.3.5, with the archive
plugin enabled and configured, it's possible to exploit the
unsanitized, user-controlled "_uid" parameter (in an archive.php
_task=mail&_mbox=INBOX&_action=plugin.move2archive request) to perform
an MX (IMAP) injection attack by placing an IMAP command after a %0d%0a
sequence. NOTE: this is less easily exploitable in 1.3.4 and later
because of a Same Origin Policy protection mechanism."

https://github.com/roundcube/roundcubemail/releases/tag/1.3.6

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 15:20:40

Modified files:
mail/roundcubemail: Makefile distinfo 

Log message:
update to Roundcube 1.3.6, a couple of fixes, the main one being:

"In Roundcube from versions 1.2.0 to 1.3.5, with the archive
plugin enabled and configured, it's possible to exploit the
unsanitized, user-controlled "_uid" parameter (in an archive.php
_task=mail&_mbox=INBOX&_action=plugin.move2archive request) to perform
an MX (IMAP) injection attack by placing an IMAP command after a %0d%0a
sequence. NOTE: this is less easily exploitable in 1.3.4 and later
because of a Same Origin Policy protection mechanism."

https://github.com/roundcube/roundcubemail/releases/tag/1.3.6

Re: [PATCH] www/goaccess: drop Tokyo Cabinet storage support

[Stuart Henderson]

On 2018/04/11 22:39, Frederic Cambus wrote:
> Hi ports@,
> 
> Here is a diff to drop Tokyo Cabinet storage support, this greatly
> speeds up processing time, more than 10 times actually.
> 
> With the current version:
> 
> - Total Requests: 1,347,757
> - Log Size:  282.49 MiB
> - Init. Proc. Time: 712 secs
> 
> With the diff applied:
> 
> - Total Requests: 1,347,757
> - Log Size:  282.49 MiB
> - Init. Proc. Time:  67 secs
> 
> While there, switch HOMEPAGE and MASTER_SITES to HTTPS and update
> license marker to specify the MIT license, which goaccess switched
> to since the 1.0 release.
> 
> Comments? OK?

It is expected that goaccess is slower with Tokyo Cabinet (it's clear
in the manpage), but it allows it to process larger files, and to keep
data in persistent storage.

I'm not a fan of unnecessary flavours in ports, but I think this might
be a case where it makes sense?

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/11 14:50:42

Modified files:
games/burgerspace/patches: patch-Makefile_in 
Added files:
games/burgerspace/patches: patch-src_server_cpp 

Log message:
fix build with clang6: disambiguate call to bind(2) from std::bind

[PATCH] www/goaccess: drop Tokyo Cabinet storage support

[Frederic Cambus]

Hi ports@,

Here is a diff to drop Tokyo Cabinet storage support, this greatly
speeds up processing time, more than 10 times actually.

With the current version:

- Total Requests: 1,347,757
- Log Size:  282.49 MiB
- Init. Proc. Time: 712 secs

With the diff applied:

- Total Requests: 1,347,757
- Log Size:  282.49 MiB
- Init. Proc. Time:  67 secs

While there, switch HOMEPAGE and MASTER_SITES to HTTPS and update
license marker to specify the MIT license, which goaccess switched
to since the 1.0 release.

Comments? OK?

Index: Makefile
===
RCS file: /cvs/ports/www/goaccess/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile15 Nov 2017 21:28:05 -  1.17
+++ Makefile11 Apr 2018 20:28:48 -
@@ -3,28 +3,26 @@
 COMMENT =  realtime console web log analyzer
 
 DISTNAME = goaccess-1.2
-REVISION = 0
+REVISION = 1
 
 CATEGORIES =   www
 
-HOMEPAGE = http://goaccess.io/
+HOMEPAGE = https://goaccess.io/
 
 MAINTAINER =   Kirill Bychkov 
 
-# GPLv2
+# MIT
 PERMIT_PACKAGE_CDROM = Yes
 
-WANTLIB += GeoIP bz2 c ncursesw pthread tokyocabinet z
+WANTLIB += GeoIP c curses pthread
 
-MASTER_SITES = http://tar.goaccess.io/
+MASTER_SITES = https://tar.goaccess.io/
 
-LIB_DEPENDS =  databases/tokyocabinet \
-   net/GeoIP
+LIB_DEPENDS =  net/GeoIP
 
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS =   --enable-geoip=legacy \
-   --enable-utf8 \
-   --enable-tcb=btree
+   --enable-utf8
 
 CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/11 14:30:32

Added files:
education/drgeo/patches: patch-geo_drgeo_postscriptdrawable_cc 

Log message:
fix build with clang6

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/11 13:34:40

Modified files:
databases/mariadb: Makefile 

Log message:
do not try to build Java component (which fails with jdk 1.8)

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/11 12:57:59

Modified files:
sysutils/py-ghmi: Makefile distinfo 

Log message:
update to py-ghmi-1.0.44

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/11 12:56:06

Modified files:
textproc/py-textfsm: Makefile distinfo 

Log message:
update to py-textfsm-0.4.1

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/11 12:52:57

Added files:
devel/bouml/patches: patch-src_ProjectControl_BrowserNode_cpp 

Log message:
fix build with clang6

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/11 12:47:48

Added files:
devel/mysql++/patches: patch-Makefile_in 

Log message:
missed patch

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/11 12:47:26

Modified files:
devel/mysql++  : Makefile distinfo 
devel/mysql++/pkg: PLIST 

Log message:
- update to mysql++-3.2.3
- switch HOMEPAGE to https
- stop building examples that weren't installed (fixes build with clang6; from 
freebsd)

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/11 12:15:59

Modified files:
games/xmoto/patches: patch-src_GameInit_cpp 
Added files:
games/xmoto/patches: patch-src_WWW_cpp 

Log message:
fix build with clang6

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/11 12:07:39

Added files:
devel/tclcl/patches: patch-tclcl_h 

Log message:
fix build with clang6

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/11 12:01:24

Added files:
comms/gpsk31/patches: patch-src_main_screen_C patch-src_menu_C 

Log message:
fix build with clang6

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/11 11:59:54

Added files:
audio/audacity/patches: patch-src_Project_cpp 
patch-src_import_ImportFLAC_cpp 

Log message:
fix build with clang6

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2018/04/11 11:56:47

Modified files:
mail/kopano: Makefile.inc 
mail/kopano/core: distinfo 
mail/kopano/core/patches: patch-ECtools_monitor_monitor_cpp 
  patch-provider_server_ECServer_cpp 
  patch-spooler_DAgent_cpp 
  patch-spooler_Spooler_cpp 

Log message:
update to 8.6.80.538

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/11 11:51:52

Added files:
math/openfst/patches: patch-src_script_text-io_cc 

Log message:
fix build with clang6; from David CARLIER

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/04/11 11:44:21

Modified files:
audio/mp3blaster/patches: patch-nmixer_nmixer_h 
Added files:
audio/mp3blaster/patches: patch-mpegsound_huffmantable_cc 

Log message:
fix build with clang6

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 11:03:12

Added files:
devel/jdk/1.8/patches: 
   
patch-hotspot_src_cpu_x86_vm_vtableStubs_x86_32_cpp 

Log message:
more whitespace around constants for clang6, in an i386-only file

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/11 10:43:50

Added files:
audio/gogglesmm/patches: patch-src_GMAbout_cpp 
 patch-src_GMAudioScrobbler_cpp 

Log message:
whitespace fixes required by clang6

CVS: cvs.openbsd.org: ports

[Jeremy Evans]

CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2018/04/11 10:28:10

Modified files:
lang/ruby/2.3  : Tag: OPENBSD_6_3 Makefile distinfo 
lang/ruby/2.3/patches: Tag: OPENBSD_6_3 patch-configure 
   patch-ext_etc_etc_c 
lang/ruby/2.3/pkg: Tag: OPENBSD_6_3 PLIST-ri_docs 
lang/ruby/2.4  : Tag: OPENBSD_6_3 Makefile distinfo 
lang/ruby/2.4/patches: Tag: OPENBSD_6_3 patch-configure 
   patch-ext_etc_etc_c 
   patch-include_ruby_ruby_h 
lang/ruby/2.4/pkg: Tag: OPENBSD_6_3 PLIST-main PLIST-ri_docs 
lang/ruby/2.5  : Tag: OPENBSD_6_3 Makefile distinfo 
lang/ruby/2.5/patches: Tag: OPENBSD_6_3 patch-compile_c 
   patch-configure patch-include_ruby_ruby_h 
lang/ruby/2.5/pkg: Tag: OPENBSD_6_3 PLIST-ri_docs 
Removed files:
lang/ruby/2.5/patches: Tag: OPENBSD_6_3 patch-prelude_c 

Log message:
Update to the latest versions of ruby: 2.5.1, 2.4.4, and 2.3.7.

This fixes the following CVEs: 2017-17742, 2018-6914, 2018-8777,
2018-8778, 2018-8779, and 2018-8780.

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/11 09:26:18

Added files:
lang/jruby/patches: patch-jruby-launcher_argparser_cpp 

Log message:
fix build with clang6

update math/openfst clang6 fix

[David CARLIER]

Hi,

Here a little fix for openfst.

Regards.
Index: patches/patch-src_script_text-io_cc
===
RCS file: patches/patch-src_script_text-io_cc
diff -N patches/patch-src_script_text-io_cc
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-src_script_text-io_cc	11 Apr 2018 15:19:54 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/script/text-io.cc
+--- src/script/text-io.cc.orig
 src/script/text-io.cc
+@@ -84,7 +84,7 @@ bool WritePotentials(const string& filename,
+   if (!*strm)
+ LOG(ERROR) << "WritePotentials: Write failed: "
+<< (filename.empty() ? "standard output" : filename);
+-  bool ret = *strm;
++  bool ret = !(!*strm);
+   if (strm != ::cout)
+ delete strm;
+   return ret;

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 09:13:20

Added files:
net/amule/patches: patch-src_webserver_src_php_amule_lib_cpp 
   patch-src_webserver_src_php_core_lib_cpp 
   patch-src_webserver_src_php_syntree_cpp 

Log message:
c++ whitespace fixes for clang6, from David CARLIER, ok dcoppa@

Re: update net/amule clang6 fix

[David Coppa]

On Wed, Apr 11, 2018 at 4:52 PM, David CARLIER  wrote:
> Hi,
>
> Here a small fix for amule.
>
> Regards.

Ok with me.

Thanks,
David

Re: SMPlayer -> MPV

[Gonzalo L. Rodriguez]

On [11/04/18] [02:58P], Marc Espie wrote:

On Wed, Apr 11, 2018 at 04:53:23PM +0200, Gonzalo L. Rodriguez wrote:

On [11/04/18] [02:01P], Vadim Zhukov wrote:
>2018-04-11 16:46 GMT+03:00 Giovanni Bechis :
>>On 04/11/18 15:31, Gonzalo L. Rodriguez wrote:
>>>Hello,
>>>
>>>Moving SMPlayer from mplayer to mpv.
>>>
>>at least I would change COMMENT accordingly
>
>If SMPlayer can use any of mplayer and mpv, why not to use some Ports
>black magic?
>
>RUN_DEPENDS = mpv-*|mplayer-*:multimedia/mpv
>
>--
> WBR,
> Vadim Zhukov
>

New diff with black magic and mplayer love.

OK?

--
Sending from my toaster.



Index: Makefile
===
RCS file: /cvs/ports/x11/smplayer/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile4 Apr 2018 07:14:15 -   1.47
+++ Makefile11 Apr 2018 14:50:28 -
@@ -3,7 +3,7 @@
 COMMENT =  complete front-end for MPlayer

 DISTNAME = smplayer-18.3.0
-
+REVISION = 0
 CATEGORIES =   multimedia x11

 HOMEPAGE = http://smplayer.sourceforge.net/
@@ -22,7 +22,7 @@ MASTER_SITES =${MASTER_SITE_SOURCEFORG
 EXTRACT_SUFX = .tar.bz2

 MODULES =  x11/qt5
-RUN_DEPENDS =  x11/mplayer>=20090708 \
+RUN_DEPENDS =  mpv-*|mplayer>=20090708:multimedia/mpv \
devel/desktop-file-utils \
x11/gtk+3,-guic


No. Read on package specs.
You want mplayer->=20090708

then it's okay.



whoops, ok, also with the COMMENT modification suggested by Giovanni

--
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/x11/smplayer/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile4 Apr 2018 07:14:15 -   1.47
+++ Makefile11 Apr 2018 15:03:56 -
@@ -1,9 +1,9 @@
 # $OpenBSD: Makefile,v 1.47 2018/04/04 07:14:15 gonzalo Exp $
 
-COMMENT =  complete front-end for MPlayer
+COMMENT =  complete front-end for MPlayer and MPV
 
 DISTNAME = smplayer-18.3.0
-
+REVISION = 0
 CATEGORIES =   multimedia x11
 
 HOMEPAGE = http://smplayer.sourceforge.net/
@@ -22,7 +22,7 @@ MASTER_SITES =${MASTER_SITE_SOURCEFORG
 EXTRACT_SUFX = .tar.bz2
 
 MODULES =  x11/qt5
-RUN_DEPENDS =  x11/mplayer>=20090708 \
+RUN_DEPENDS =  mpv-*|mplayer->=20090708:multimedia/mpv \
devel/desktop-file-utils \
x11/gtk+3,-guic
 

Re: SMPlayer -> MPV

[Marc Espie]

On Wed, Apr 11, 2018 at 04:53:23PM +0200, Gonzalo L. Rodriguez wrote:
> On [11/04/18] [02:01P], Vadim Zhukov wrote:
> >2018-04-11 16:46 GMT+03:00 Giovanni Bechis :
> >>On 04/11/18 15:31, Gonzalo L. Rodriguez wrote:
> >>>Hello,
> >>>
> >>>Moving SMPlayer from mplayer to mpv.
> >>>
> >>at least I would change COMMENT accordingly
> >
> >If SMPlayer can use any of mplayer and mpv, why not to use some Ports
> >black magic?
> >
> >RUN_DEPENDS = mpv-*|mplayer-*:multimedia/mpv
> >
> >--
> > WBR,
> > Vadim Zhukov
> >
> 
> New diff with black magic and mplayer love.
> 
> OK?
> 
> -- 
> Sending from my toaster.

> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/smplayer/Makefile,v
> retrieving revision 1.47
> diff -u -p -r1.47 Makefile
> --- Makefile  4 Apr 2018 07:14:15 -   1.47
> +++ Makefile  11 Apr 2018 14:50:28 -
> @@ -3,7 +3,7 @@
>  COMMENT =complete front-end for MPlayer
>  
>  DISTNAME =   smplayer-18.3.0
> -
> +REVISION =   0
>  CATEGORIES = multimedia x11
>  
>  HOMEPAGE =   http://smplayer.sourceforge.net/
> @@ -22,7 +22,7 @@ MASTER_SITES =  ${MASTER_SITE_SOURCEFORG
>  EXTRACT_SUFX =   .tar.bz2
>  
>  MODULES =x11/qt5
> -RUN_DEPENDS =x11/mplayer>=20090708 \
> +RUN_DEPENDS =mpv-*|mplayer>=20090708:multimedia/mpv \
>   devel/desktop-file-utils \
>   x11/gtk+3,-guic
>  
No. Read on package specs.
You want mplayer->=20090708

then it's okay.

Re: SMPlayer -> MPV

[Gonzalo L. Rodriguez]

On [11/04/18] [02:01P], Vadim Zhukov wrote:

2018-04-11 16:46 GMT+03:00 Giovanni Bechis :

On 04/11/18 15:31, Gonzalo L. Rodriguez wrote:

Hello,

Moving SMPlayer from mplayer to mpv.


at least I would change COMMENT accordingly


If SMPlayer can use any of mplayer and mpv, why not to use some Ports
black magic?

RUN_DEPENDS = mpv-*|mplayer-*:multimedia/mpv

--
 WBR,
 Vadim Zhukov



New diff with black magic and mplayer love.

OK?

--
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/x11/smplayer/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile4 Apr 2018 07:14:15 -   1.47
+++ Makefile11 Apr 2018 14:50:28 -
@@ -3,7 +3,7 @@
 COMMENT =  complete front-end for MPlayer
 
 DISTNAME = smplayer-18.3.0
-
+REVISION = 0
 CATEGORIES =   multimedia x11
 
 HOMEPAGE = http://smplayer.sourceforge.net/
@@ -22,7 +22,7 @@ MASTER_SITES =${MASTER_SITE_SOURCEFORG
 EXTRACT_SUFX = .tar.bz2
 
 MODULES =  x11/qt5
-RUN_DEPENDS =  x11/mplayer>=20090708 \
+RUN_DEPENDS =  mpv-*|mplayer>=20090708:multimedia/mpv \
devel/desktop-file-utils \
x11/gtk+3,-guic
 

update net/amule clang6 fix

[David CARLIER]

Hi,

Here a small fix for amule.

Regards.
Index: patches/patch-src_webserver_src_php_amule_lib_cpp
===
RCS file: patches/patch-src_webserver_src_php_amule_lib_cpp
diff -N patches/patch-src_webserver_src_php_amule_lib_cpp
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-src_webserver_src_php_amule_lib_cpp	11 Apr 2018 14:52:04 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/webserver/src/php_amule_lib.cpp
+--- src/webserver/src/php_amule_lib.cpp.orig
 src/webserver/src/php_amule_lib.cpp
+@@ -564,7 +564,7 @@ void php_native_search_start_cmd(PHP_VALUE_NODE *)
+ 		case 1: search_type = EC_SEARCH_GLOBAL; break;
+ 		case 2: search_type = EC_SEARCH_KAD; break;
+ 		default:
+-			php_report_error(PHP_ERROR, "Invalid search type %"PRIu64, si->var->value.int_val);
++			php_report_error(PHP_ERROR, "Invalid search type %" PRIu64, si->var->value.int_val);
+ 			return;
+ 	}
+ 
Index: patches/patch-src_webserver_src_php_core_lib_cpp
===
RCS file: patches/patch-src_webserver_src_php_core_lib_cpp
diff -N patches/patch-src_webserver_src_php_core_lib_cpp
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-src_webserver_src_php_core_lib_cpp	11 Apr 2018 14:52:04 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/webserver/src/php_core_lib.cpp
+--- src/webserver/src/php_core_lib.cpp.orig
 src/webserver/src/php_core_lib.cpp
+@@ -71,7 +71,7 @@ void php_var_dump(PHP_VALUE_NODE *node, int ident, int
+ 	if ( ref ) printf("&");
+ 	switch(node->type) {
+ 		case PHP_VAL_BOOL: printf("bool(%s)\n", node->int_val ? "true" : "false"); break;
+-		case PHP_VAL_INT: printf("int(%"PRIu64")\n", node->int_val); break;
++		case PHP_VAL_INT: printf("int(%" PRIu64 ")\n", node->int_val); break;
+ 		case PHP_VAL_FLOAT: printf("float(%f)\n", node->float_val); break;
+ 		case PHP_VAL_STRING: printf("string(%d) \"%s\"\n", (int)strlen(node->str_val), node->str_val); break;
+ 		case PHP_VAL_OBJECT: printf("Object(%s)\n", node->obj_val.class_name); break;
Index: patches/patch-src_webserver_src_php_syntree_cpp
===
RCS file: patches/patch-src_webserver_src_php_syntree_cpp
diff -N patches/patch-src_webserver_src_php_syntree_cpp
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-src_webserver_src_php_syntree_cpp	11 Apr 2018 14:52:04 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/webserver/src/php_syntree.cpp
+--- src/webserver/src/php_syntree.cpp.orig
 src/webserver/src/php_syntree.cpp
+@@ -926,7 +926,7 @@ void cast_value_str(PHP_VALUE_NODE *val)
+ 	switch(val->type) {
+ 		case PHP_VAL_NONE: buff[0] = 0; break;
+ 		case PHP_VAL_BOOL:
+-		case PHP_VAL_INT: snprintf(buff, sizeof(buff), "%"PRIu64, val->int_val); break;
++		case PHP_VAL_INT: snprintf(buff, sizeof(buff), "%" PRIu64, val->int_val); break;
+ 		case PHP_VAL_FLOAT: snprintf(buff, sizeof(buff), "%.02f", val->float_val); break;
+ 		case PHP_VAL_STRING: return;
+ 		case PHP_VAL_ARRAY: {

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 08:47:16

Modified files:
comms/conserver: Makefile 

Log message:
conserver upstream has moved to github (and is providing stable uploaded
tarballs rather than relying on the auto-generated ones), so switch
MASTER_SITES, and use https for HOMEPAGE while there

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 08:43:21

Modified files:
net/ntopng : Makefile 
Added files:
net/ntopng/patches: patch-src_AddressResolution_cpp 
patch-src_DivertInterface_cpp 
patch-third-party_mongoose_mongoose_c 
patch-third-party_snmp_net_c 

Log message:
clang6 c++ fixes from upstream repo

CVS: cvs.openbsd.org: ports

[Edd Barrett]

CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2018/04/11 08:36:14

Added files:
math/minisat/patches: patch-minisat_core_Solver_cc 
  patch-minisat_utils_Options_h 

Log message:
math/minisat: Fix for clang 6.

OK sthen@, thanks.

Re: Fix minisat for clang 6

[Edd Barrett]

On Wed, Apr 11, 2018 at 03:28:36PM +0100, Stuart Henderson wrote:
> I wonder if anyone actually bothered looking at existing code when they
> started requiring spaces for these...

Thanks.

I reckon this particular error should have been a warning.

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: Fix minisat for clang 6

[Stuart Henderson]

On 2018/04/11 15:21, Edd Barrett wrote:
> Here's the fix for minisat and clang 6.
> 
> OK?

OK.

I wonder if anyone actually bothered looking at existing code when they
started requiring spaces for these...


> Index: patches/patch-minisat_core_Solver_cc
> ===
> RCS file: patches/patch-minisat_core_Solver_cc
> diff -N patches/patch-minisat_core_Solver_cc
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-minisat_core_Solver_cc  11 Apr 2018 14:18:17 -
> @@ -0,0 +1,24 @@
> +$OpenBSD$
> +
> +C++11 fixes.
> +
> +Index: minisat/core/Solver.cc
> +--- minisat/core/Solver.cc.orig
>  minisat/core/Solver.cc
> +@@ -992,11 +992,11 @@ void Solver::printStats() const
> + {
> + double cpu_time = cpuTime();
> + double mem_used = memUsedPeak();
> +-printf("restarts  : %"PRIu64"\n", starts);
> +-printf("conflicts : %-12"PRIu64"   (%.0f /sec)\n", 
> conflicts   , conflicts   /cpu_time);
> +-printf("decisions : %-12"PRIu64"   (%4.2f %% random) (%.0f 
> /sec)\n", decisions, (float)rnd_decisions*100 / (float)decisions, decisions   
> /cpu_time);
> +-printf("propagations  : %-12"PRIu64"   (%.0f /sec)\n", 
> propagations, propagations/cpu_time);
> +-printf("conflict literals : %-12"PRIu64"   (%4.2f %% deleted)\n", 
> tot_literals, (max_literals - tot_literals)*100 / (double)max_literals);
> ++printf("restarts  : %" PRIu64 "\n", starts);
> ++printf("conflicts : %-12" PRIu64 "   (%.0f /sec)\n", 
> conflicts   , conflicts   /cpu_time);
> ++printf("decisions : %-12" PRIu64 "   (%4.2f %% random) 
> (%.0f /sec)\n", decisions, (float)rnd_decisions*100 / (float)decisions, 
> decisions   /cpu_time);
> ++printf("propagations  : %-12" PRIu64 "   (%.0f /sec)\n", 
> propagations, propagations/cpu_time);
> ++printf("conflict literals : %-12" PRIu64 "   (%4.2f %% deleted)\n", 
> tot_literals, (max_literals - tot_literals)*100 / (double)max_literals);
> + if (mem_used != 0) printf("Memory used   : %.2f MB\n", 
> mem_used);
> + printf("CPU time  : %g s\n", cpu_time);
> + }
> Index: patches/patch-minisat_utils_Options_h
> ===
> RCS file: patches/patch-minisat_utils_Options_h
> diff -N patches/patch-minisat_utils_Options_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-minisat_utils_Options_h 11 Apr 2018 14:18:23 -
> @@ -0,0 +1,26 @@
> +$OpenBSD$
> +
> +C++11 fixes.
> +
> +Index: minisat/utils/Options.h
> +--- minisat/utils/Options.h.orig
>  minisat/utils/Options.h
> +@@ -282,15 +282,15 @@ class Int64Option : public Option
> + if (range.begin == INT64_MIN)
> + fprintf(stderr, "imin");
> + else
> +-fprintf(stderr, "%4"PRIi64, range.begin);
> ++fprintf(stderr, "%4" PRIi64 , range.begin);
> + 
> + fprintf(stderr, " .. ");
> + if (range.end == INT64_MAX)
> + fprintf(stderr, "imax");
> + else
> +-fprintf(stderr, "%4"PRIi64, range.end);
> ++fprintf(stderr, "%4" PRIi64 , range.end);
> + 
> +-fprintf(stderr, "] (default: %"PRIi64")\n", value);
> ++fprintf(stderr, "] (default: %" PRIi64 ")\n", value);
> + if (verbose){
> + fprintf(stderr, "\n%s\n", description);
> + fprintf(stderr, "\n");
> 
> -- 
> Best Regards
> Edd Barrett
> 
> http://www.theunixzoo.co.uk
> 

Fix minisat for clang 6

[Edd Barrett]

Here's the fix for minisat and clang 6.

OK?

Index: patches/patch-minisat_core_Solver_cc
===
RCS file: patches/patch-minisat_core_Solver_cc
diff -N patches/patch-minisat_core_Solver_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-minisat_core_Solver_cc11 Apr 2018 14:18:17 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+C++11 fixes.
+
+Index: minisat/core/Solver.cc
+--- minisat/core/Solver.cc.orig
 minisat/core/Solver.cc
+@@ -992,11 +992,11 @@ void Solver::printStats() const
+ {
+ double cpu_time = cpuTime();
+ double mem_used = memUsedPeak();
+-printf("restarts  : %"PRIu64"\n", starts);
+-printf("conflicts : %-12"PRIu64"   (%.0f /sec)\n", conflicts  
 , conflicts   /cpu_time);
+-printf("decisions : %-12"PRIu64"   (%4.2f %% random) (%.0f 
/sec)\n", decisions, (float)rnd_decisions*100 / (float)decisions, decisions   
/cpu_time);
+-printf("propagations  : %-12"PRIu64"   (%.0f /sec)\n", 
propagations, propagations/cpu_time);
+-printf("conflict literals : %-12"PRIu64"   (%4.2f %% deleted)\n", 
tot_literals, (max_literals - tot_literals)*100 / (double)max_literals);
++printf("restarts  : %" PRIu64 "\n", starts);
++printf("conflicts : %-12" PRIu64 "   (%.0f /sec)\n", 
conflicts   , conflicts   /cpu_time);
++printf("decisions : %-12" PRIu64 "   (%4.2f %% random) (%.0f 
/sec)\n", decisions, (float)rnd_decisions*100 / (float)decisions, decisions   
/cpu_time);
++printf("propagations  : %-12" PRIu64 "   (%.0f /sec)\n", 
propagations, propagations/cpu_time);
++printf("conflict literals : %-12" PRIu64 "   (%4.2f %% deleted)\n", 
tot_literals, (max_literals - tot_literals)*100 / (double)max_literals);
+ if (mem_used != 0) printf("Memory used   : %.2f MB\n", mem_used);
+ printf("CPU time  : %g s\n", cpu_time);
+ }
Index: patches/patch-minisat_utils_Options_h
===
RCS file: patches/patch-minisat_utils_Options_h
diff -N patches/patch-minisat_utils_Options_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-minisat_utils_Options_h   11 Apr 2018 14:18:23 -
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+C++11 fixes.
+
+Index: minisat/utils/Options.h
+--- minisat/utils/Options.h.orig
 minisat/utils/Options.h
+@@ -282,15 +282,15 @@ class Int64Option : public Option
+ if (range.begin == INT64_MIN)
+ fprintf(stderr, "imin");
+ else
+-fprintf(stderr, "%4"PRIi64, range.begin);
++fprintf(stderr, "%4" PRIi64 , range.begin);
+ 
+ fprintf(stderr, " .. ");
+ if (range.end == INT64_MAX)
+ fprintf(stderr, "imax");
+ else
+-fprintf(stderr, "%4"PRIi64, range.end);
++fprintf(stderr, "%4" PRIi64 , range.end);
+ 
+-fprintf(stderr, "] (default: %"PRIi64")\n", value);
++fprintf(stderr, "] (default: %" PRIi64 ")\n", value);
+ if (verbose){
+ fprintf(stderr, "\n%s\n", description);
+ fprintf(stderr, "\n");

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: MPlayer is gone?

[Christian Weisgerber]

On 2018-04-10, mazocomp  wrote:

> Is this happening because of Clang 6 fallout?

Yes, now fixed.  The next amd64 package snapshot will have mplayer
again.  Should be on the mirrors in a few hours.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

Re: py-test and friends

[Pavel Korovin]

Dear all,
Please see attached diffs for updates to current devel/py-test and
related modules:

devel/py-attrs
devel/py-hypothesis
devel/py-pluggy
devel/py-py
devel/py-setuptools_scm
devel/py-six
devel/py-test

The new one, devel/py-more-itertools is a new RUN_DEPENDS for py-test

Added shells/bash as a new TEST_DEPENDS for py-test.
Removed py-test-xdist and py-twisted from TEST_DEPENDS for py-test, leaving
only essential modules, hope that's OK; otherwise we'll end up adding
py-coverage, numpy and other stuff for testing.

Tested on amd64. Tests are OK except several py-py tests which also fail
with in-tree py-py.

On 02/10, Stuart Henderson wrote:
> py-cryptography needs a bit of work, but the test suite now needs newer
> py-test than we have, and that in turn needs some other updates.
> 
> can anyone help testing / getting these in please? i don't have time to
> test the wider dep chain at the moment.

-- 
With best regards,
Pavel Korovin
Index: Makefile
===
RCS file: /cvs/ports/devel/py-attrs/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile6 May 2017 09:43:59 -   1.1.1.1
+++ Makefile11 Apr 2018 10:47:09 -
@@ -2,7 +2,7 @@
 
 COMMENT =  classes without boilerplate
 
-MODPY_EGG_VERSION =16.3.0
+MODPY_EGG_VERSION =17.4.0
 
 DISTNAME = attrs-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
@@ -19,14 +19,12 @@ MODPY_PI =  Yes
 MODPY_SETUPTOOLS = Yes
 
 TEST_DEPENDS = devel/py-hypothesis${MODPY_FLAVOR} \
-   devel/py-test${MODPY_FLAVOR}
+   devel/py-six${MODPY_FLAVOR} \
+   devel/py-test${MODPY_FLAVOR} \
+   devel/py-zopeinterface${MODPY_FLAVOR}
 
 FLAVORS =  python3
 FLAVOR ?=
-
-.if ${FLAVOR:Mpython3}
-TEST_DEPENDS +=devel/py-zopeinterface${MODPY_FLAVOR}
-.endif
 
 TEST_ENV +=PYTHONPATH=${WRKSRC}/lib
 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-attrs/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo6 May 2017 09:43:59 -   1.1.1.1
+++ distinfo11 Apr 2018 10:47:09 -
@@ -1,2 +1,2 @@
-SHA256 (attrs-16.3.0.tar.gz) = gCAxd3I+NvO74VqoVT2m6A1Hv+U2RyIMyqmtel5HPMw=
-SIZE (attrs-16.3.0.tar.gz) = 57512
+SHA256 (attrs-17.4.0.tar.gz) = HHlgzP1qAFzZ97qITmMWteQwo/Gmw3xfh9i0P4O1Tsk=
+SIZE (attrs-17.4.0.tar.gz) = 97071
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-attrs/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   6 May 2017 09:43:59 -   1.1.1.1
+++ pkg/PLIST   11 Apr 2018 10:47:09 -
@@ -7,6 +7,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_config.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_funcs.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}_make.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}converters.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}filters.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/attr/${MODPY_PYCACHE}validators.${MODPY_PYC_MAGIC_TAG}pyc
@@ -14,6 +15,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/attr/_config.py
 lib/python${MODPY_VERSION}/site-packages/attr/_funcs.py
 lib/python${MODPY_VERSION}/site-packages/attr/_make.py
+lib/python${MODPY_VERSION}/site-packages/attr/converters.py
 lib/python${MODPY_VERSION}/site-packages/attr/exceptions.py
 lib/python${MODPY_VERSION}/site-packages/attr/filters.py
 lib/python${MODPY_VERSION}/site-packages/attr/validators.py
@@ -22,4 +24,5 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 
lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
 
lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
+lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 
lib/python${MODPY_VERSION}/site-packages/attrs-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
Index: Makefile
===
RCS file: /cvs/ports/devel/py-hypothesis/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile24 Jun 2017 07:48:34 -  1.15
+++ Makefile11 Apr 2018 14:06:46 -
@@ -2,7 +2,7 @@
 
 COMMENT 

Re: [Update] Gnupg 2.2.6

[Edd Barrett]

On Tue, Apr 10, 2018 at 10:43:49AM +0200, Pierre-Emmanuel André wrote:
> Hi,
> 
> Small diff to update Gnupg 2 to it's latest version.
> Tested on @amd64.

The first time I ran the tests I got a couple of test failures:

---8<---
60 tests run, 58 succeeded, 2 failed, 0 failed expectedly, 0 succeeded 
unexpectedly, 0 skipped. 
Failed tests: tests/openpgp/sigs-dsa.scm tests/openpgp/sigs.scm 
--->8---

But, I'm unable to reproduce it again, even with MALLOC_OPTIONS=S.

Other than that, seems to work fine, including with yubikey fine.

P.S.

Have you guys seen: https://neopg.io/ ?

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk

Re: clang6 fallout

[Christian Weisgerber]

Updated list as of Apr 11, 14:00 UTC.  Error logs at:
http://build-failures.rhaalovely.net/amd64/2018-04-10/

audio/audacity
audio/caps-plugins
audio/gogglesmm
audio/mp3blaster
cad/kicad
comms/gpsk31
comms/hylafax
databases/mysqlcc
databases/pgadmin3
devel/avr/gcc
devel/bouml
devel/mysql++
devel/openmpi
devel/ptlib
devel/qt-creator
devel/tclcl
education/drgeo
emulators/BasiliskII
emulators/desmume
emulators/dgen-sdl
emulators/fceux
emulators/frodo
emulators/nestopia
games/alephone/alephone
games/amoebax
games/blobby
games/burgerspace
games/dangerdeep
games/enigma
games/f1spirit
games/hex-a-hop
games/ja2-stracciatella
games/lostpixels
games/meandmyshadow
games/oilwar
games/roadfighter
games/stepmania
games/sumwars
games/vegastrike/engine
games/warmux
games/xminehunter
games/xmoto
geo/gpstk
graphics/animorph
graphics/discwrapper
graphics/rawstudio
inputmethods/scim-anthy
japanese/groff
java/jlint
lang/jruby
math/libqalculate
math/minisat
math/openfst
misc/openbabel
misc/xnc
multimedia/libmp4v2
multimedia/swfmill
net/amule
net/dxpc
net/kismet
net/libtorrent-rasterbar
net/mldonkey
net/mutella
net/nepenthes
net/ntopng
net/tcpreen
news/pan
security/steghide
sysutils/facter
textproc/arabica
textproc/wkhtmltopdf
www/mongrel2
x11/kde/libs3
x11/qt4

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de

Re: SMPlayer -> MPV

[Marc Espie]

On Wed, Apr 11, 2018 at 05:01:20PM +0300, Vadim Zhukov wrote:
> 2018-04-11 16:46 GMT+03:00 Giovanni Bechis :
> > On 04/11/18 15:31, Gonzalo L. Rodriguez wrote:
> >> Hello,
> >>
> >> Moving SMPlayer from mplayer to mpv.
> >>
> > at least I would change COMMENT accordingly
> 
> If SMPlayer can use any of mplayer and mpv, why not to use some Ports
> black magic?
> 
> RUN_DEPENDS = mpv-*|mplayer-*:multimedia/mpv
> 
> --
>   WBR,
>   Vadim Zhukov

Indeed, but don't lose the >= version for mplayer.

Re: SMPlayer -> MPV

[Landry Breuil]

On Wed, Apr 11, 2018 at 05:01:20PM +0300, Vadim Zhukov wrote:
> 2018-04-11 16:46 GMT+03:00 Giovanni Bechis :
> > On 04/11/18 15:31, Gonzalo L. Rodriguez wrote:
> >> Hello,
> >>
> >> Moving SMPlayer from mplayer to mpv.
> >>
> > at least I would change COMMENT accordingly
> 
> If SMPlayer can use any of mplayer and mpv, why not to use some Ports
> black magic?
> 
> RUN_DEPENDS = mpv-*|mplayer-*:multimedia/mpv

Yes, this would definitely be preferred imo :)

Re: SMPlayer -> MPV

[Vadim Zhukov]

2018-04-11 16:46 GMT+03:00 Giovanni Bechis :
> On 04/11/18 15:31, Gonzalo L. Rodriguez wrote:
>> Hello,
>>
>> Moving SMPlayer from mplayer to mpv.
>>
> at least I would change COMMENT accordingly

If SMPlayer can use any of mplayer and mpv, why not to use some Ports
black magic?

RUN_DEPENDS = mpv-*|mplayer-*:multimedia/mpv

--
  WBR,
  Vadim Zhukov

Re: SMPlayer -> MPV

[Giovanni Bechis]

On 04/11/18 15:31, Gonzalo L. Rodriguez wrote:
> Hello,
> 
> Moving SMPlayer from mplayer to mpv.
> 
at least I would change COMMENT accordingly

 Giovanni

CVS: cvs.openbsd.org: ports

[Edd Barrett]

CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2018/04/11 07:40:54

Modified files:
print/texlive/texmf: Makefile 
print/texlive/texmf/files: mk_plists.py 
print/texlive/texmf/pkg: PLIST-buildset PLIST-context PLIST-docs 
 PLIST-full PLIST-main 
books/tex-by-topic: Makefile 
devel/coccinelle: Makefile 
Added files:
print/texlive/texmf/files: which_subset.py 

Log message:
Move TeX deps for tex-by-topic and cocinelle into the buildset to avoid 
depending on texmf-full.

Also add a script for finding which subsets a tex file uses.

OK sthen@, thanks.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 07:39:45

Modified files:
net/lldpd  : Makefile distinfo 

Log message:
udpate to lldpd-1.0.1

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 07:31:53

Modified files:
devel/ccache   : Makefile distinfo 
Added files:
devel/ccache/patches: patch-Makefile_in 

Log message:
update to ccache-3.4.2

SMPlayer -> MPV

[Gonzalo L. Rodriguez]

Hello,

Moving SMPlayer from mplayer to mpv.

OK? Comments?

Cheers.-

--
Sending from my toaster.
Index: Makefile
===
RCS file: /cvs/ports/x11/smplayer/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- Makefile4 Apr 2018 07:14:15 -   1.47
+++ Makefile11 Apr 2018 13:28:58 -
@@ -3,7 +3,7 @@
 COMMENT =  complete front-end for MPlayer
 
 DISTNAME = smplayer-18.3.0
-
+REVISION = 0
 CATEGORIES =   multimedia x11
 
 HOMEPAGE = http://smplayer.sourceforge.net/
@@ -22,7 +22,7 @@ MASTER_SITES =${MASTER_SITE_SOURCEFORG
 EXTRACT_SUFX = .tar.bz2
 
 MODULES =  x11/qt5
-RUN_DEPENDS =  x11/mplayer>=20090708 \
+RUN_DEPENDS =  multimedia/mpv \
devel/desktop-file-utils \
x11/gtk+3,-guic
 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 07:31:08

Modified files:
sysutils/moreutils: Makefile distinfo 
sysutils/moreutils/patches: patch-Makefile 
Added files:
sysutils/moreutils/patches: patch-pee_c 

Log message:
update to moreutils-0.62

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 07:25:31

Modified files:
x11/xsettingsd : Makefile distinfo 

Log message:
update to xsettingsd-1.0.0

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 07:23:08

Modified files:
net/libupnp: Makefile distinfo 
Removed files:
net/libupnp/patches: patch-upnp_src_genlib_net_http_webserver_c 

Log message:
update to libupnp-1.6.22

Re: japanese/Wnn: remove jgroff dependency

[Ingo Schwarze]

Hi Anthony,

almost identical comments like for canna:

 - Somebody please check whether installing EUC is *really* still
   important.  As soon as it is confirmed that it is not, stop
   doing so.  But don't let that delay this cleanup.
 - In the Makefile, i suggest to prefer "mandoc -Tutf8"
   over "LC_CTYPE=en_US.UTF-8 mandoc".
 - make update-plist tells me that you may want to consider
   something like the patch below, to be applied on top of what
   you already have.

Unless you hear objections, i think you should go ahead.

Yours,
  Ingo


--- PLIST-main.orig Wed Apr 11 14:56:29 2018
+++ PLIST-main  Wed Apr 11 15:03:41 2018
@@ -1,21 +1,21 @@
 @comment $OpenBSD: PLIST-main,v 1.2 2012/01/26 08:03:56 ajacoutot Exp $
-@newuser _wnn:517:bin:daemon:Wnn server:/nonexistent:/sbin/nologin
 @pkgpath japanese/Wnn
-bin/atod
-bin/atof
-bin/dtoa
-bin/jserver
-bin/oldatonewa
+@newuser _wnn:517:bin:daemon:Wnn server:/nonexistent:/sbin/nologin
+@bin bin/atod
+@bin bin/atof
+@bin bin/dtoa
+@bin bin/jserver
+@bin bin/oldatonewa
 @mode u+s
 @owner root
-bin/uum
+@bin bin/uum
 @mode
 @owner
-bin/wddel
-bin/wdreg
-bin/wnnkill
-bin/wnnstat
-bin/wnntouch
+@bin bin/wddel
+@bin bin/wdreg
+@bin bin/wnnkill
+@bin bin/wnnstat
+@bin bin/wnntouch
 include/wnn/
 include/wnn/commonhd.h
 include/wnn/config.h
@@ -87,6 +87,8 @@
 lib/wnn/lt_LN/uumkey
 lib/wnn/lt_LN/uumkey_e
 lib/wnn/lt_LN/uumrc
+man/ja/
+man/ja/man1/
 @man man/ja/man1/atod.1
 @man man/ja/man1/atof.1
 @man man/ja/man1/dtoa.1
@@ -98,6 +100,7 @@
 @man man/ja/man1/wnnkill.1
 @man man/ja/man1/wnnstat.1
 @man man/ja/man1/wnntouch.1
+man/ja/man3/
 @man man/ja/man3/jl_bun_suu.3
 @man man/ja/man3/jl_c_zenkouho.3
 @man man/ja/man3/jl_close.3
@@ -256,6 +259,7 @@
 @man man/ja/man3/romkan_init.3
 @man man/ja/man3/romkan_next.3
 @man man/ja/man3/romkan_ungetc.3
+man/ja/man4/
 @man man/ja/man4/2a_ctrl.4
 @man man/ja/man4/2b_romkana.4
 @man man/ja/man4/cvt_key_tbl.4
@@ -269,6 +273,7 @@
 @man man/ja/man4/uumkey.4
 @man man/ja/man4/uumrc.4
 @man man/ja/man4/wnnenvrc.4
+man/ja/man5/
 @man man/ja/man5/pubdic.5
 @man man/ja/man5/usr_dic.5
 @man man/ja_JP.EUC/cat1/atod.0
@@ -708,6 +713,8 @@
 share/doc/ja-Wnn/manual/7.Protocol/
 share/doc/ja-Wnn/manual/7.Protocol/KKTP
 share/doc/ja-Wnn/manual/intro
+@comment share/doc/ja-Wnn/manual/intro.orig
 share/doc/ja-Wnn/manual/v3tov4/
 share/doc/ja-Wnn/manual/v3tov4/v3tov4
+@comment share/doc/ja-Wnn/manual/v3tov4/v3tov4.orig
 @exec ${WNNBASE}/lib/wnn/install-script
--- PLIST-xwnmo.origWed Apr 11 14:56:29 2018
+++ PLIST-xwnmo Wed Apr 11 15:00:20 2018
@@ -1,7 +1,7 @@
 @comment $OpenBSD: PLIST-xwnmo,v 1.2 2004/08/05 14:11:10 espie Exp $
-bin/killxwnmo
-bin/xjutil
-bin/xwnmo
+@bin bin/killxwnmo
+@bin bin/xjutil
+@bin bin/xwnmo
 lib/X11/app-defaults/Xwnmo
 lib/wnn/cvt_xim_tbl
 lib/wnn/ja_JP/uumkey.xim
--- PLIST-zh.orig   Wed Apr 11 14:56:29 2018
+++ PLIST-zhWed Apr 11 15:00:20 2018
@@ -1,19 +1,19 @@
 @comment $OpenBSD: PLIST-zh,v 1.10 2004/09/15 00:53:48 espie Exp $
-bin/catod
-bin/catof
-bin/cdtoa
-bin/cserver
+@bin bin/catod
+@bin bin/catof
+@bin bin/cdtoa
+@bin bin/cserver
 @mode u+s
 @owner root
-bin/cuum
+@bin bin/cuum
 @mode
 @owner
-bin/cwddel
-bin/cwdreg
-bin/cwnnkill
-bin/cwnnstat
-bin/cwnntouch
-bin/tserver
+@bin bin/cwddel
+@bin bin/cwdreg
+@bin bin/cwnnkill
+@bin bin/cwnnstat
+@bin bin/cwnntouch
+@bin bin/tserver
 include/cwnn/
 include/cwnn/commonhd.h
 include/cwnn/cplib.h

Re: clang 6 fix devel/jdk/1.8

[Kurt Miller]

On Wed, 2018-04-11 at 08:00 -0500, Matthew Martin wrote:
> On Wed, Apr 11, 2018 at 08:27:34AM -0400, Kurt Miller wrote:
> > 
> > On Tue, 2018-04-10 at 21:23 -0500, Matthew Martin wrote:
> > > 
> > > Add lots of whitespace and change a few types from signed to
> > > unsigned.
> > > Probably should get a REVISION bump, but I'm not sure where that
> > > goes
> > > for subpackages.
> > > 
> > > Is anyone already an OpenJDK contributor or know someone upstream
> > > with
> > > whom I could work?
> > Hey Matthew,
> > 
> > I'm both upstream and the port maintainer here. Thanks for working
> > on
> > this. There are some aspects of the OpenJDK project that are
> > particular
> > to it. In order for me to accept patches for upstream I need to
> > respect
> > Oracle's policies. Unless things have changed recently, they
> > require
> > authors of patches to sign their contribution agreement (ugh, yea I
> > know that sucks). For example getting the bsd-port project accepted
> > by
> > Oracle required an review of all the bsd-port changes, who wrote
> > them
> > and confirmation they had signed the SCSL (Sun's old agreement) or
> > Oracle's current one. Some patches needed to be dropped and
> > recreated
> > from scratch in that process.
> > 
> > Several times I have received small fixes for OpenJDK for things
> > where
> > I simply did not look at the patch, recreated the problems and
> > authored
> > an independent fix so I can push it upstream. I believe I'm in one
> > of
> > of those cases now unless all of authors (including the ones taken
> > from
> > FreeBSD) have signed the contribution agreement.
> > 
> > I suggest you finish the work and I'll have to avoid participating
> > now.
> > When I have time I can recreate the compilation issues using the
> > upstream repo and fix independently so I can get them upstream.
> > 
> > Best,
> > -Kurt
> Morning Kurt,
> 
> I was looking at the OCA last night; and although I'm generally not
> fond
> of giving up moral rights, in this case the patches are largely just
> adding whitespace and I don't think are (or at least should not be)
> copyrightable in the first place. If it would make things easier,
> I wouldn't mind signing it. The patches I sent are solely my own work
> and not taken from FreeBSD.
> 
> - Matthew Martin

Hi Matthew,

Either way is fine. I'm comfortable with c++ and can recreate them or
if you prefer go ahead and sign the OCA and I can credit your changes
in the upstream commits. Oracle takes a few weeks to process the OCA
but there's no rush to get this upstream so that's not a problem for
me. Let me know what you decide to do.

I am of the same opinion that changes of this nature are not
copyrightable. I usually think about such changes as how an editor
corrects the grammar of an author's book. The editor does not gain
copyright rights over those changes, so bug fixes in programs should
not as well. I guess the problem is that there is a gray area between
bug fixes and writing enough to claim rights. While I don't agree with
Oracle's policy, I do follow it so that I can keep the jdk running on
OpenBSD.

Best,
-Kurt

Re: clang 6 fix devel/jdk/1.8

[Matthew Martin]

On Wed, Apr 11, 2018 at 08:27:34AM -0400, Kurt Miller wrote:
> On Tue, 2018-04-10 at 21:23 -0500, Matthew Martin wrote:
> > Add lots of whitespace and change a few types from signed to
> > unsigned.
> > Probably should get a REVISION bump, but I'm not sure where that goes
> > for subpackages.
> > 
> > Is anyone already an OpenJDK contributor or know someone upstream
> > with
> > whom I could work?
> 
> Hey Matthew,
> 
> I'm both upstream and the port maintainer here. Thanks for working on
> this. There are some aspects of the OpenJDK project that are particular
> to it. In order for me to accept patches for upstream I need to respect
> Oracle's policies. Unless things have changed recently, they require
> authors of patches to sign their contribution agreement (ugh, yea I
> know that sucks). For example getting the bsd-port project accepted by
> Oracle required an review of all the bsd-port changes, who wrote them
> and confirmation they had signed the SCSL (Sun's old agreement) or
> Oracle's current one. Some patches needed to be dropped and recreated
> from scratch in that process.
> 
> Several times I have received small fixes for OpenJDK for things where
> I simply did not look at the patch, recreated the problems and authored
> an independent fix so I can push it upstream. I believe I'm in one of
> of those cases now unless all of authors (including the ones taken from
> FreeBSD) have signed the contribution agreement.
> 
> I suggest you finish the work and I'll have to avoid participating now.
> When I have time I can recreate the compilation issues using the
> upstream repo and fix independently so I can get them upstream.
> 
> Best,
> -Kurt

Morning Kurt,

I was looking at the OCA last night; and although I'm generally not fond
of giving up moral rights, in this case the patches are largely just
adding whitespace and I don't think are (or at least should not be)
copyrightable in the first place. If it would make things easier,
I wouldn't mind signing it. The patches I sent are solely my own work
and not taken from FreeBSD.

- Matthew Martin

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 06:59:00

Modified files:
net/synergy: Makefile distinfo 
net/synergy/patches: patch-CMakeLists_txt 

Log message:
update to synergy-1.7.6, move to new upstream location (different github
account) and add a dumb build fix with --std=c++03 on clang arches.

upstream has much newer branches (e.g. 1.9.1 released yesterday, 2.0.0
released a few months ago) but too much churn for a quick fix, and at
least they'll now be on the portroach radar.

Re: clang 6 fix security/steghide

[Matthew Martin]

On Wed, Apr 11, 2018 at 01:48:29PM +0200, Jeremie Courreges-Anglas wrote:
> On Wed, Apr 11 2018, Giovanni Bechis  wrote:
> > On 04/11/18 05:16, Matthew Martin wrote:
> >> On Tue, Apr 10, 2018 at 04:44:56PM +0200, Giovanni Bechis wrote:
> >>> test.log run on 6.3 attached, does it differs from yours ?
> >>>  Cheers
> >>>   Giovanni
> >> 
> >> Not meaningfully. Thanks for the log.
> >> 
> >> - Matthew Martin
> >> 
> > Ok for me if it still works then.
> > I cannot commit nor switch to clang6 before next week.
> 
> I would gladly commit it, but as-is the diff would break non-clang
> platforms.  Maybe an ifdef check would be enough.

How about this then? Just tell clang to compile as c++03.

- Matthew Martin


diff --git Makefile Makefile
index 78a8c328b25..b1135d6771e 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,7 @@
 COMMENT =  software able to hide data in various kind of files
 
 DISTNAME = steghide-0.5.1
-REVISION = 4
+REVISION = 5
 CATEGORIES =   security
 HOMEPAGE = http://steghide.sf.net/
 
@@ -20,9 +20,14 @@ LIB_DEPENDS =devel/gettext \
security/mhash \
graphics/jpeg
 WANTLIB =  c iconv intl jpeg m mhash mcrypt ${COMPILER_LIBCXX} z
-CONFIGURE_STYLE =  gnu
+CONFIGURE_STYLE =  autoconf
+AUTOCONF_VERSION = 2.57
 CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -liconv -lintl"
 
+.include 
+.if ${PROPERTIES:Mclang}
+CONFIGURE_ENV += CXXFLAGS=-std=c++03
+.endif
 
 .include 
diff --git patches/patch-configure_in patches/patch-configure_in
new file mode 100644
index 000..b68f1db01ee
--- /dev/null
+++ patches/patch-configure_in
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: configure.in
+--- configure.in.orig
 configure.in
+@@ -22,14 +22,14 @@ AC_ARG_ENABLE(debug,[  --enable-debug  enable 
+   then
+   AC_MSG_RESULT([yes])
+   AC_DEFINE(DEBUG,1,[enable code used only for debugging])
+-  CXXFLAGS="-O2 -Wall -g"
++  CXXFLAGS="$CXXFLAGS -O2 -Wall -g"
+   else
+   AC_MSG_RESULT([no])
+-  CXXFLAGS="-O2 -Wall"
++  CXXFLAGS="$CXXFLAGS -O2 -Wall"
+   fi
+   ,
+   AC_MSG_RESULT([no])
+-  CXXFLAGS="-O2 -Wall"
++  CXXFLAGS="$CXXFLAGS -O2 -Wall"
+ )
+ 
+ dnl check if randomness should be disabled

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 06:30:41

Modified files:
games/einstein : Makefile 
games/einstein/patches: patch-utils_cpp 

Log message:
reinstate old patch accidentally removed

Re: clang 6 fix devel/jdk/1.8

[Kurt Miller]

On Tue, 2018-04-10 at 21:23 -0500, Matthew Martin wrote:
> Add lots of whitespace and change a few types from signed to
> unsigned.
> Probably should get a REVISION bump, but I'm not sure where that goes
> for subpackages.
> 
> Is anyone already an OpenJDK contributor or know someone upstream
> with
> whom I could work?

Hey Matthew,

I'm both upstream and the port maintainer here. Thanks for working on
this. There are some aspects of the OpenJDK project that are particular
to it. In order for me to accept patches for upstream I need to respect
Oracle's policies. Unless things have changed recently, they require
authors of patches to sign their contribution agreement (ugh, yea I
know that sucks). For example getting the bsd-port project accepted by
Oracle required an review of all the bsd-port changes, who wrote them
and confirmation they had signed the SCSL (Sun's old agreement) or
Oracle's current one. Some patches needed to be dropped and recreated
from scratch in that process.

Several times I have received small fixes for OpenJDK for things where
I simply did not look at the patch, recreated the problems and authored
an independent fix so I can push it upstream. I believe I'm in one of
of those cases now unless all of authors (including the ones taken from
FreeBSD) have signed the contribution agreement.

I suggest you finish the work and I'll have to avoid participating now.
When I have time I can recreate the compilation issues using the
upstream repo and fix independently so I can get them upstream.

Best,
-Kurt

Re: japanese/canna: remove jgroff dependency

[Ingo Schwarze]

Hi Anthony,

Anthony J. Bentley wrote on Tue, Apr 10, 2018 at 11:42:03PM -0600:

> Currently canna installs formatted English manuals (generated with groff)
> and formatted Japanese/EUC-JP manuals (generated with jgroff).
> 
> Here's a diff that installs unformatted English manuals, unformatted
> Japanese/UTF-8 manuals, and formatted Japanese/EUC-JP manuals (generated
> with nkf+mandoc).

Even though installing anything into /usr/local/man/ja_JP.EUC/
violates the basic policy outlined on

  https://www.openbsd.org/faq/ports/specialtopics.html#Mandoc

below "Non-English manual pages", keeping them until somebody comes
round to check whether it still makes sense seems acceptable, if
espie@ specifically requests that, even though i would really prefer
to stop installing anything non-UTF-8 on OpenBSD.  So it would be
quite welcome if somebody understanding these matters could check.

> You can view the formatted pages in kterm the same way as before:
> PAGER=jless LESSCHARSET=euc man -M /usr/local/man/ja_JP.EUC ...
> 
> And the unformatted pages in a UTF-8 xterm with:
> man -M /usr/local/man/ja ...

Confirmed, though i can't check whether the rendering of the Japanese
text is actually correct.


In the Makefile below "post-install:", i'd suggest using

  mandoc -Tutf8

rather than

  LC_CTYPE=en_US.UTF-8 mandoc

It ought to do the same and is shorter, more explicit, and hence
easier to understand and more robust.


In patches/patch-Canna_conf, are you sure that this part is still
needed:

+#define JNeqnCmd   jneqn -Tnippon
+#define JNroffCmd  jnroff -Tnippon
+#define JEqnCmdjeqn -Tnippon -Tps
+#define JTroffCmd  jgroff -Tnippon -Tps
+#define JColCmdcat 
+#define JTblCmdjtbl -Tnippon
+
+   JTROFF = JTroffCmd
+   JNROFF = JNroffCmd
+ JTBL = JTblCmd
+ JEQN = JEqnCmd
+JNEQN = JNeqnCmd
+ JCOL = JColCmd

It doesn't seem to do harm, but it may be obsolete.


I failed trying to understand what the imake stuff is doing,
but the end result appears to be what we want.


You might wish to re-run "make update-plist" before commit, it
does a few cleanups:

 * in PLIST-main:
- add
man/ja/
man/ja/man1/
man/ja/man3/
  which seems required
  because these are not in /etc/mtree/4.4BSD.dist
- move man/man3/*.3 after man/ja_JP.EUC/*
  (alphabetic ordering)
 * in PLIST-server:
- missing @bin before bin/cannaserver
- move man/man1/*.1 to the end (alphabet)
 * in PLIST_dict:
- drop canna/group/ and canna/user/ which do not exist in
  /usr/ports/pobj/Canna35b2/fake-amd64/var/dict/canna/
  (By the way, -dict installing to /var/dict/canna/canna/
   seems very messy, but that is unrelated to this patch.)


So, i agree with the general direction and think you should
go ahead if nobody objects.

Yours,
  Ingo


> Index: Makefile
> ===
> RCS file: /cvs/ports/japanese/canna/Makefile,v
> retrieving revision 1.39
> diff -u -p -r1.39 Makefile
> --- Makefile  14 May 2017 19:53:58 -  1.39
> +++ Makefile  11 Apr 2018 05:34:45 -
> @@ -10,9 +10,9 @@ PKGNAME-main=   cannalib-3.5b2
>  PKGNAME-dict=cannadict-3.5b2
>  PKGNAME-server=  cannaserver-3.5b2
>  
> -REVISION-main =  5
> +REVISION-main =  6
>  REVISION-dict =  0
> -REVISION-server = 7
> +REVISION-server = 8
[...]

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 06:26:56

Modified files:
devel/jdk/1.8  : Makefile 
Added files:
devel/jdk/1.8/patches: 
   
patch-hotspot_src_share_vm_services_memTracker_cpp 

Log message:
runtime fix for jdk with clang6, found by me, then forgotten about and
re-found by dcoppa@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 06:25:59

Added files:
devel/jdk/1.8/patches: 
   
patch-hotspot_src_cpu_x86_vm_interp_masm_x86_64_cpp 
   
patch-hotspot_src_cpu_x86_vm_interpreterRT_x86_64_cpp 
   
patch-hotspot_src_cpu_x86_vm_vtableStubs_x86_64_cpp 
   patch-hotspot_src_os_bsd_vm_os_bsd_cpp 
   
patch-hotspot_src_os_cpu_bsd_x86_vm_os_bsd_x86_cpp 
   patch-hotspot_src_share_vm_code_compiledIC_cpp 
   
patch-hotspot_src_share_vm_code_exceptionHandlerTable_cpp 
   patch-hotspot_src_share_vm_code_nmethod_cpp 
   
patch-hotspot_src_share_vm_compiler_disassembler_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_concurrentMarkSweep_concurrentMarkSweepGeneration_cpp
 
   
patch-hotspot_src_share_vm_gc_implementation_g1_concurrentMark_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_concurrentMark_inline_hpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_g1AllocRegion_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_g1BiasedArray_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_g1BlockOffsetTable_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_g1CardCounts_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_g1CodeCacheRemSet_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_g1CollectedHeap_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_g1CollectorPolicy_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_g1GCPhaseTimes_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_g1HRPrinter_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_g1OopClosures_inline_hpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_g1RemSetSummary_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_g1RemSet_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_g1StringDedupQueue_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_g1StringDedupStat_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_g1StringDedupTable_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_heapRegionManager_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_heapRegionRemSet_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_heapRegionSet_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_heapRegion_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_g1_satbQueue_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_parallelScavenge_psMarkSweep_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_parallelScavenge_psParallelCompact_cpp
 
   
patch-hotspot_src_share_vm_gc_implementation_shared_mutableNUMASpace_cpp 
   
patch-hotspot_src_share_vm_gc_implementation_shared_parGCAllocBuffer_cpp 
   
patch-hotspot_src_share_vm_memory_genCollectedHeap_cpp 
   patch-hotspot_src_share_vm_memory_generation_cpp 
   
patch-hotspot_src_share_vm_memory_referenceProcessor_cpp 
   
patch-hotspot_src_share_vm_memory_tenuredGeneration_cpp 
   patch-hotspot_src_share_vm_memory_universe_cpp 
   patch-hotspot_src_share_vm_oops_constantPool_cpp 
   patch-hotspot_src_share_vm_oops_cpCache_cpp 
   patch-hotspot_src_share_vm_oops_markOop_cpp 
   
patch-hotspot_src_share_vm_oops_objArrayKlass_cpp 
   patch-hotspot_src_share_vm_oops_oop_cpp 
   patch-hotspot_src_share_vm_opto_type_hpp 
   
patch-hotspot_src_share_vm_prims_methodHandles_cpp 
   patch-hotspot_src_share_vm_prims_perf_cpp 
   patch-hotspot_src_share_vm_prims_unsafe_cpp 
   patch-hotspot_src_share_vm_prims_whitebox_cpp 
   patch-hotspot_src_share_vm_runtime_safepoint_cpp 
   

Re: clang 6 fix devel/jdk/1.8

[Stuart Henderson]

On 2018/04/11 12:19, Stuart Henderson wrote:
> Yes, this runs, but I get this warning with unifi:
> 
> java:/tmp/snappy-1.1.4-7916cbab-fd53-455f-80bc-de026ba1d38b-libsnappyjava.so: 
> /usr/lib/libc++abi.so.0.0 : WARNING: 
> symbol(_ZTVN10__cxxabiv121__vmi_class_type_infoE) size mismatch, relink your 
> program
> 
> ...so it looks like we may need to rebuild native code modules, and possibly 
> bump c++abi.
> 

Ignore this last bit, this is not new.

Since jdk seems to be running ok with this jumbo patchset I'm going to
commit it to unbreak things, can always undo if we want to change to a
different approach.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 06:21:47

Modified files:
games/einstein : Makefile 
games/einstein/patches: patch-utils_cpp 
Added files:
games/einstein/patches: patch-font_cpp patch-game_cpp 
patch-screen_cpp patch-topscores_cpp 
patch-widgets_cpp 

Log message:
clang6 fixes, from Timo Myyrä, plus regen wantlib

Update to py-setuptools-39.0.1v0

[Daniel Jakots]

Hi,

I need a newer setuptools for new ports. I'd like to get it in next
week to have p2k18 in case of fallout. I know there is already plenty
of fallout due to the clang update but AFAICS, there's no python port
broken.

Changelog: https://github.com/pypa/setuptools/blob/master/CHANGES.rst

It already went in a bulk a month ago thanks to Landry, so the diff
includes fixes for a 3 ports.


Can someone put it in a bulk and review it please? The diff is not
outstanding. I just patched to not to install windows stuff by default.

Diff is also available there
https://chown.me/iota/ports/setuptools3901.diff

Cheers,
Daniel


Index: devel/py-protocols/Makefile
===
RCS file: /cvs/ports/devel/py-protocols/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- devel/py-protocols/Makefile 6 Jan 2016 17:01:54 -   1.25
+++ devel/py-protocols/Makefile 11 Apr 2018 12:04:57 -
@@ -2,10 +2,10 @@
 
 COMMENT=   protocol definition, declaration and adaptation
 
-MODPY_EGG_VERSION =1.0a0dev_r0
+MODPY_EGG_VERSION =1.0a0.dev0
 DISTNAME=  PyProtocols-1.0a0dev_r2306
 PKGNAME=   py-protocols-1.0r2306
-REVISION=  4
+REVISION=  5
 EPOCH= 0
 
 WRKSRC =   ${WRKDIR}/PyProtocols
Index: devel/py-ruledispatch/Makefile
===
RCS file: /cvs/ports/devel/py-ruledispatch/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- devel/py-ruledispatch/Makefile  6 Jan 2016 17:01:54 -   1.25
+++ devel/py-ruledispatch/Makefile  11 Apr 2018 12:04:57 -
@@ -2,10 +2,10 @@
 
 COMMENT=   rule-based dispatching and generic functions
 
-MODPY_EGG_VERSION =RuleDispatch-0.5a0.dev_r0
+MODPY_EGG_VERSION =RuleDispatch-0.5a0.dev0
 DISTNAME=  RuleDispatch-0.5a0.dev-r2306
 PKGNAME=   py-ruledispatch-0.5r2306
-REVISION=  4
+REVISION=  5
 EPOCH= 0
 
 WRKDIST =  ${WRKDIR}/RuleDispatch
Index: devel/py-setuptools/Makefile
===
RCS file: /cvs/ports/devel/py-setuptools/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- devel/py-setuptools/Makefile3 Jan 2017 19:19:49 -   1.30
+++ devel/py-setuptools/Makefile11 Apr 2018 12:04:57 -
@@ -2,14 +2,13 @@
 
 COMMENT=   simplified packaging system for Python modules
 
-MODPY_EGG_VERSION= 28.6.1
+MODPY_EGG_VERSION= 39.0.1
 DISTNAME=  setuptools-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME:S/c/./}
-EPOCH =0
+EPOCH= 0
 CATEGORIES=devel
 PKG_ARCH=  *
-REVISION=  0
-
+EXTRACT_SUFX=  .zip
 
 HOMEPAGE=  https://setuptools.readthedocs.io/en/latest/
 
@@ -18,7 +17,7 @@ PERMIT_PACKAGE_CDROM= Yes
 
 MODULES=   lang/python
 
-MODPY_PI = Yes
+MODPY_PI=  Yes
 MODPY_SETUPTOOLS=  Yes
 
 FLAVORS =  python3
Index: devel/py-setuptools/distinfo
===
RCS file: /cvs/ports/devel/py-setuptools/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- devel/py-setuptools/distinfo29 Oct 2016 18:24:07 -  1.11
+++ devel/py-setuptools/distinfo11 Apr 2018 12:04:57 -
@@ -1,2 +1,2 @@
-SHA256 (setuptools-28.6.1.tar.gz) = 
4IxjsoXDSGabXPadRbhtENOi0ikVYnlJ1a8JBSSpBwU=
-SIZE (setuptools-28.6.1.tar.gz) = 644746
+SHA256 (setuptools-39.0.1.zip) = vse63w9g5/yBU/rEeDbtxBt05dVB12kuYU5jVyDWp8c=
+SIZE (setuptools-39.0.1.zip) = 844940
Index: devel/py-setuptools/patches/patch-setup_py
===
RCS file: /cvs/ports/devel/py-setuptools/patches/patch-setup_py,v
retrieving revision 1.5
diff -u -p -r1.5 patch-setup_py
--- devel/py-setuptools/patches/patch-setup_py  29 Oct 2016 18:24:07 -  
1.5
+++ devel/py-setuptools/patches/patch-setup_py  11 Apr 2018 12:04:57 -
@@ -1,7 +1,17 @@
 $OpenBSD: patch-setup_py,v 1.5 2016/10/29 18:24:07 danj Exp $
 setup.py.orig  Wed Oct 19 17:39:12 2016
-+++ setup.py   Thu Oct 27 18:43:33 2016
-@@ -97,7 +97,7 @@ setup_params = dict(
+Index: setup.py
+--- setup.py.orig
 setup.py
+@@ -58,7 +58,7 @@ package_data = dict(
+ )
+ 
+ force_windows_specific_files = (
+-os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES", "1").lower()
++os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES", "0").lower()
+ not in ("", "0", "false", "no")
+ )
+ 
+@@ -107,7 +107,7 @@ setup_params = dict(
  packages=setuptools.find_packages(exclude=['*.tests']),
  package_data=package_data,
  py_modules=['easy_install'],
Index: devel/py-setuptools/pkg/PLIST
===
RCS 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/04/11 06:16:19

Modified files:
games/amph : Makefile 
games/amph/pkg : PLIST 
Added files:
games/amph/patches: patch-src_Element_cpp 

Log message:
clang6 from Timo Myyrä, plus a bit of port cleanup from me

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2018/04/11 06:01:23

Added files:
x11/mplayer/patches: patch-stream_stream_h 

Log message:
fix build with clang6

Re: clang 6 fix security/steghide

[Jeremie Courreges-Anglas]

On Wed, Apr 11 2018, Giovanni Bechis  wrote:
> On 04/11/18 05:16, Matthew Martin wrote:
>> On Tue, Apr 10, 2018 at 04:44:56PM +0200, Giovanni Bechis wrote:
>>> test.log run on 6.3 attached, does it differs from yours ?
>>>  Cheers
>>>   Giovanni
>> 
>> Not meaningfully. Thanks for the log.
>> 
>> - Matthew Martin
>> 
> Ok for me if it still works then.
> I cannot commit nor switch to clang6 before next week.

I would gladly commit it, but as-is the diff would break non-clang
platforms.  Maybe an ifdef check would be enough.

===>  Building for steghide-0.5.1p5
make  all-recursive
Making all in m4
Making all in intl
Making all in po
rm -f es.gmo && /usr/local/bin/msgfmt -c --statistics -o es.gmo es.po
es.po:6: warning: header field 'Language' missing in header
185 translated messages.
rm -f de.gmo && /usr/local/bin/msgfmt -c --statistics -o de.gmo de.po
de.po:7: warning: header field 'Language' missing in header
185 translated messages.
rm -f fr.gmo && /usr/local/bin/msgfmt -c --statistics -o fr.gmo fr.po
fr.po:8: warning: header field 'Language' missing in header
185 translated messages.
rm -f ro.gmo && /usr/local/bin/msgfmt -c --statistics -o ro.gmo ro.po
ro.po:6: warning: header field 'Language' missing in header
185 translated messages.
Making all in doc
Making all in src
if g++ -DHAVE_CONFIG_H -I. -I. -I..   -DLOCALEDIR=\"/usr/local/share/locale\" 
-I/usr/local/include  -O2 -Wall -MT Arg.o -MD -MP -MF ".deps/Arg.Tpo"  -c -o 
Arg.o `test -f 'Arg.cc' || echo './'`Arg.cc;  then mv ".deps/Arg.Tpo" 
".deps/Arg.Po";  else rm -f ".deps/Arg.Tpo"; exit 1;  fi
if g++ -DHAVE_CONFIG_H -I. -I. -I..   -DLOCALEDIR=\"/usr/local/share/locale\" 
-I/usr/local/include  -O2 -Wall -MT Arguments.o -MD -MP -MF 
".deps/Arguments.Tpo"  -c -o Arguments.o `test -f 'Arguments.cc' || echo 
'./'`Arguments.cc;  then mv ".deps/Arguments.Tpo" ".deps/Arguments.Po";  else 
rm -f ".deps/Arguments.Tpo"; exit 1;  fi
In file included from common.h:101,
 from MCryptPP.h:21,
 from Arguments.cc:25:
Arguments.h:103: error: ISO C++ forbids declaration of 'constexpr' with no type
Arguments.h:103: error: expected ';' before 'float'
Arguments.cc: In member function 'void Arguments::setDefaults()':
Arguments.cc:809: error: 'Default_Goal' was not declared in this scope
*** Error 1 in src (Makefile:399 'Arguments.o')
*** Error 1 in . (Makefile:268 'all-recursive')
*** Error 1 in /usr/ports/pobj/steghide-0.5.1/steghide-0.5.1 (Makefile:190 
'all')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2740 
'/usr/ports/pobj/steghide-0.5.1/.build_done')
*** Error 1 in /usr/ports/security/steghide 
(/usr/ports/infrastructure/mk/bsd.port.mk:2417 'all')
russell /usr/ports/security/steghide$


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

Re: NEW: devel/csmith

[Jeremie Courreges-Anglas]

On Wed, Apr 11 2018, "Anthony J. Bentley"  wrote:
> Hi,
>
> Csmith is a tool that can generate random C programs that statically and
> dynamically conform to the C99 standard. It is useful for stress-testing
> compilers, static analyzers, and other tools that process C code. Csmith
> has found bugs in every tool that it has tested, and has been used to find
> and report more than 400 previously unknown compiler bugs.
>
>
> ok?

Nope.  We already have ports/devel/csmith; maybe you should coordinate
with Daniel (cc'ed) instead.  eg we are now at csmith-2.2.0, and our
port could use https instead of http.

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

Re: clang 6 fix devel/jdk/1.8

[Stuart Henderson]

Yes, this runs, but I get this warning with unifi:

java:/tmp/snappy-1.1.4-7916cbab-fd53-455f-80bc-de026ba1d38b-libsnappyjava.so: 
/usr/lib/libc++abi.so.0.0 : WARNING: 
symbol(_ZTVN10__cxxabiv121__vmi_class_type_infoE) size mismatch, relink your 
program

...so it looks like we may need to rebuild native code modules, and possibly 
bump c++abi.

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2018/04/11 04:49:57

Modified files:
mail/kopano/webapp: Makefile distinfo 
mail/kopano/webapp/pkg: PLIST 

Log message:
update to 3.4.11.1363

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/11 04:49:59

Modified files:
productivity/gnucash: Makefile distinfo 
productivity/gnucash/pkg: PLIST 

Log message:
Update to gnucash-2.6.21.

Re: clang 6 fix devel/jdk/1.8

[Stuart Henderson]

Ah that one yes.. Trying it now.

On 2018/04/11 12:38, David Coppa wrote:
> On Wed, Apr 11, 2018 at 12:21 PM, Stuart Henderson  
> wrote:
> > On 2018/04/11 10:02, David Coppa wrote:
> >> Hi,
> >>
> >> Does it work at runtime?
> >>
> >
> > It doesn't work for me. Here's a backtrace from a standard build, I'll try
> > again and see if I can get it with symbols.
> >
> > (gdb) bt
> > #0  0x08908ee471c6 in NativeCallStack::NativeCallStack ()
> >from /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
> > #1  0x08908ee0268e in MemTracker::init_tracking_level () from 
> > /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
> > #2  0x08908e912880 in ResourceObj::operator new () from 
> > /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
> > #3  0x08908eee12fb in _GLOBAL__sub_I_reflectionUtils.cpp ()
> >from /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
> > #4  0x08908e8401c3 in pthread_atfork () from 
> > /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
> > #5  0x08908e83f359 in _init () from 
> > /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
> > #6  0x7f7f6120 in ?? ()
> > #7  0x0890a7a0bc94 in _dl_call_init_recurse (object=0x890c178c800, 
> > initfirst=0)
> > at /usr/src/libexec/ld.so/loader.c:722
> > #8  0x0890a7a02b50 in dlopen (libname=0x7f7f6a30 
> > "/usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so",
> > flags=Variable "flags" is not available.
> > ) at /usr/src/libexec/ld.so/dlfcn.c:126
> > #9  0x088dcb805eef in LoadJavaVM () from /usr/local/jdk-1.8.0/bin/java
> > #10 0x088dcb8016b2 in JLI_Launch () from /usr/local/jdk-1.8.0/bin/java
> > #11 0x088dcb8084cd in main () from /usr/local/jdk-1.8.0/bin/java
> >
> 
> Ok, so we also need this patch from FreeBSD:
> 
> https://svnweb.freebsd.org/ports/head/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp?view=markup
> 
> https://svnweb.freebsd.org/ports/head/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp?revision=459368=co
> 
> Ciao!
> David

Re: clang 6 fix devel/jdk/1.8

[David Coppa]

On Wed, Apr 11, 2018 at 12:21 PM, Stuart Henderson  wrote:
> On 2018/04/11 10:02, David Coppa wrote:
>> Hi,
>>
>> Does it work at runtime?
>>
>
> It doesn't work for me. Here's a backtrace from a standard build, I'll try
> again and see if I can get it with symbols.
>
> (gdb) bt
> #0  0x08908ee471c6 in NativeCallStack::NativeCallStack ()
>from /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
> #1  0x08908ee0268e in MemTracker::init_tracking_level () from 
> /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
> #2  0x08908e912880 in ResourceObj::operator new () from 
> /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
> #3  0x08908eee12fb in _GLOBAL__sub_I_reflectionUtils.cpp ()
>from /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
> #4  0x08908e8401c3 in pthread_atfork () from 
> /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
> #5  0x08908e83f359 in _init () from 
> /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
> #6  0x7f7f6120 in ?? ()
> #7  0x0890a7a0bc94 in _dl_call_init_recurse (object=0x890c178c800, 
> initfirst=0)
> at /usr/src/libexec/ld.so/loader.c:722
> #8  0x0890a7a02b50 in dlopen (libname=0x7f7f6a30 
> "/usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so",
> flags=Variable "flags" is not available.
> ) at /usr/src/libexec/ld.so/dlfcn.c:126
> #9  0x088dcb805eef in LoadJavaVM () from /usr/local/jdk-1.8.0/bin/java
> #10 0x088dcb8016b2 in JLI_Launch () from /usr/local/jdk-1.8.0/bin/java
> #11 0x088dcb8084cd in main () from /usr/local/jdk-1.8.0/bin/java
>

Ok, so we also need this patch from FreeBSD:

https://svnweb.freebsd.org/ports/head/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp?view=markup

https://svnweb.freebsd.org/ports/head/java/openjdk8/files/patch-hotspot_src_share_vm_services_memTracker.cpp?revision=459368=co

Ciao!
David

Re: clang 6 fix devel/jdk/1.8

[Stuart Henderson]

On 2018/04/11 10:02, David Coppa wrote:
> On Wed, Apr 11, 2018 at 4:23 AM, Matthew Martin  wrote:
> > Add lots of whitespace and change a few types from signed to unsigned.
> > Probably should get a REVISION bump, but I'm not sure where that goes
> > for subpackages.

Since every package is subject to change due to the newer compiler,
when we're in better shape with the fallout we're going to bump
_SYSTEM_VERSION for the clang arches to trigger updates for all
packages.

> > Is anyone already an OpenJDK contributor or know someone upstream with
> > whom I could work?

One thing I noticed when I looked at this is that FreeBSD doesn't have
a similar set of patches in their ports tree. It's possible that they've
done it and rolled into the large (downloaded) patch though I also wonder
if upstream has picked this up in newer versions already (we are a bit
behind on these at the moment, there's not much knowledge around about how
to update the jdk port).

> Hi,
> 
> Does it work at runtime?
> 

It doesn't work for me. Here's a backtrace from a standard build, I'll try
again and see if I can get it with symbols.

(gdb) bt
#0  0x08908ee471c6 in NativeCallStack::NativeCallStack ()
   from /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
#1  0x08908ee0268e in MemTracker::init_tracking_level () from 
/usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
#2  0x08908e912880 in ResourceObj::operator new () from 
/usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
#3  0x08908eee12fb in _GLOBAL__sub_I_reflectionUtils.cpp ()
   from /usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
#4  0x08908e8401c3 in pthread_atfork () from 
/usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
#5  0x08908e83f359 in _init () from 
/usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so
#6  0x7f7f6120 in ?? ()
#7  0x0890a7a0bc94 in _dl_call_init_recurse (object=0x890c178c800, 
initfirst=0)
at /usr/src/libexec/ld.so/loader.c:722
#8  0x0890a7a02b50 in dlopen (libname=0x7f7f6a30 
"/usr/local/jdk-1.8.0/jre/lib/amd64/server/libjvm.so",
flags=Variable "flags" is not available.
) at /usr/src/libexec/ld.so/dlfcn.c:126
#9  0x088dcb805eef in LoadJavaVM () from /usr/local/jdk-1.8.0/bin/java
#10 0x088dcb8016b2 in JLI_Launch () from /usr/local/jdk-1.8.0/bin/java
#11 0x088dcb8084cd in main () from /usr/local/jdk-1.8.0/bin/java

CVS: cvs.openbsd.org: ports

[Gonzalo L . Rodriguez]

CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2018/04/11 04:14:43

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
bye centerim

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/11 04:06:49

Modified files:
net/py-botocore: Makefile distinfo 

Log message:
Update to py-botocore-1.10.4.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/11 04:07:02

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.15.4.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/11 04:06:33

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py-boto3-1.7.4.

CVS: cvs.openbsd.org: ports

[Gonzalo L . Rodriguez]

CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2018/04/11 03:54:18

Modified files:
net: Makefile 

Log message:
unhook centerim

CVS: cvs.openbsd.org: ports

[Gonzalo L . Rodriguez]

CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2018/04/11 03:53:52

Removed files:
net/centerim   : Makefile distinfo 
net/centerim/patches: patch-configure_ac 
  patch-libicq2000_src_ContactTree_cpp 
  patch-libjabber_jconn_c 
  patch-m4_gettext_m4 patch-m4_iconv_m4 
  patch-src_hooks_abstracthook_h 
net/centerim/pkg: DESCR PLIST 

Log message:
Tschüss Centerim.

People is using skype and fb messenger now.

CVS: cvs.openbsd.org: ports

[Edd Barrett]

CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2018/04/11 02:42:51

Modified files:
emulators/fs-uae: Makefile 

Log message:
emulators/fs-uae: Make it build with clang 6.

OK sthen@, jca@, thanks!

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/11 02:15:45

Modified files:
sysutils/terraform/terraform: Makefile distinfo 

Log message:
Update to terraform-0.11.7.

Re: clang 6 fix devel/jdk/1.8

[David Coppa]

On Wed, Apr 11, 2018 at 4:23 AM, Matthew Martin  wrote:
> Add lots of whitespace and change a few types from signed to unsigned.
> Probably should get a REVISION bump, but I'm not sure where that goes
> for subpackages.
>
> Is anyone already an OpenJDK contributor or know someone upstream with
> whom I could work?

Hi,

Does it work at runtime?

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/11 01:47:09

Modified files:
geo/pdal   : Makefile distinfo 
geo/pdal/patches: patch-dimbuilder_CMakeLists_txt 
  patch-pdal_util_CMakeLists_txt 
geo/pdal/pkg   : PLIST 
Added files:
geo/pdal/patches: patch-cmake_unix_compiler_options_cmake 
  patch-pdal_PluginDirectory_cpp 
  patch-pdal_util_Utils_cpp 
  patch-plugins_sqlite_io_SQLiteCommon_hpp 
Removed files:
geo/pdal/patches: patch-dimbuilder_DimBuilder_cpp 
  patch-pdal_PluginManager_cpp 

Log message:
Update to pdal 1.7.1.

See https://github.com/PDAL/PDAL/releases/tag/1.7.1
Switch to use real source tarballs, and patch out detection/support for
libexecinfo/backtrace(). To be revisited when libexecinfo is removed..?

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/11 01:47:54

Modified files:
x11/xfce4/xfce4-whiskermenu: Makefile distinfo 

Log message:
xfce4-whiskermenu 2.1.6

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/04/11 01:41:51

Modified files:
print/gutenprint: Makefile distinfo 
print/gutenprint/patches: patch-configure 
  patch-src_cups_backend_common_h 
  patch-src_main_print-olympus_c 
print/gutenprint/pkg: PLIST 

Log message:
Update to gutenprint-5.2.14.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/04/11 01:41:45

Modified files:
geo/postgis: Makefile distinfo 
geo/postgis/pkg: PLIST 
Removed files:
geo/postgis/patches: patch-liblwgeom_lwin_geojson_c 

Log message:
Update to postgis 2.4.4.

Re: clang 6 fix security/steghide

[Giovanni Bechis]

On 04/11/18 05:16, Matthew Martin wrote:
> On Tue, Apr 10, 2018 at 04:44:56PM +0200, Giovanni Bechis wrote:
>> test.log run on 6.3 attached, does it differs from yours ?
>>  Cheers
>>   Giovanni
> 
> Not meaningfully. Thanks for the log.
> 
> - Matthew Martin
> 
Ok for me if it still works then.
I cannot commit nor switch to clang6 before next week.
 Cheers
  Giovanni

NEW: devel/csmith

[Anthony J. Bentley]

Hi,

Csmith is a tool that can generate random C programs that statically and
dynamically conform to the C99 standard. It is useful for stress-testing
compilers, static analyzers, and other tools that process C code. Csmith
has found bugs in every tool that it has tested, and has been used to find
and report more than 400 previously unknown compiler bugs.


ok?

-- 
Anthony J. Bentley


csmith.tar.gz
Description: csmith.tar.gz