date:20200221

Re: [net/zabbix] PSK support?

2020-02-21 Thread Robert Nagy

On 21/02/20 09:19 +0100, Mark Patruck wrote:
> On 2020-02-19 22:17, William Leuschner wrote:
> > Hello porters,
> > 
> > I'm trying to set up Zabbix with pre-shared keys so that:
> > * connections are encrypted, and
> > * the agent will reject connections from anyone without the key.
> > The configuration that should work currently fails with a library error.
> > 
> > According to this note from 2017[1], PSK support was removed from
> > LibreSSL, and the best choice would be building against gnutls. Has
> > anything changed since then, or is gnutls still the best option? If
> > gnutls is the best bet, would a gnutls flavor be welcome?
> 
>   Though i'm using zabbix mostly in larger setups where only
>   certificates make sense (handling, security), i see the
>   advantage of having PSK support when only few monitored
>   systems are involved (or for testing purposes).
> 

I concur. I don't see the point in using PSK, nor switching the port
to use gnutls. Sorry.

Remove security/keepassx

2020-02-21 Thread Rafael Sadowski

What do you think about the idea of deleting keepassx and set a pkgpath
in keepassxc?

Here is a quote from the keepassxc FAQ:

Q: Why KeePassXC instead of KeePassX?
A: KeePassX is an amazing password manager, but hasn't seen much active
development for quite a while. Many good pull requests were never merged
and the original project is missing some features which users can expect
from a modern password manager. Hence, we decided to fork KeePassX to
continue its development and provide you with everything you love about
KeePassX plus many new features and bugfixes.

-- https://keepassxc.org/docs/#faq-keepassx


Everything keepassx can do, so can keepassxc and more. "File format
compatibility with KeePass2, KeePassX, MacPass, KeeWeb and many others
(KDBX 3.1 and 4.0)"

It feels so right!

RS


Index: Makefile
===
RCS file: /cvs/ports/security/keepassxc/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- Makefile20 Jan 2020 06:28:12 -  1.27
+++ Makefile22 Feb 2020 06:33:57 -
@@ -4,6 +4,7 @@ COMMENT =   management tool for password a
 
 V =2.5.3
 DISTNAME = keepassxc-${V}
+REVISION = 0
 
 CATEGORIES =   security
 
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/keepassxc/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 PLIST
--- pkg/PLIST   20 Jan 2020 06:28:12 -  1.18
+++ pkg/PLIST   22 Feb 2020 06:33:57 -
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.18 2020/01/20 06:28:12 rsadowski Exp $
+@pkgpath security/keepassx
 @bin bin/keepassxc
 @bin bin/keepassxc-cli
 %%browser%%

Switch Qt4 to Qt5 editors/qscintilla

2020-02-21 Thread Rafael Sadowski

Set editors/qscintilla,qt5 as default.

All our consumers only use the qt5 FLAVOR so here is an update diff
which removes the the qt4 pieces. Added @pkgpath,@conflict and bump
all consumers. I also changed the HOMEPAGE so I bumped qscintilla
itself.

Comments, OK?

RS


Index: cad/openscad/Makefile
===
RCS file: /cvs/ports/cad/openscad/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- cad/openscad/Makefile   4 Feb 2020 06:09:13 -   1.34
+++ cad/openscad/Makefile   22 Feb 2020 06:19:16 -
@@ -5,7 +5,7 @@ BROKEN-sparc64= SIGILL on src/cgalutils.
 
 V =2019.05
 DISTNAME = openscad-${V}
-REVISION = 1
+REVISION = 3
 
 CATEGORIES =   cad
 
@@ -35,7 +35,7 @@ LIB_DEPENDS = devel/boost \
devel/gmp \
devel/harfbuzz \
devel/mpfr \
-   editors/qscintilla,qt5 \
+   editors/qscintilla \
graphics/glew \
graphics/opencsg \
math/cgal \
Index: databases/sqlitebrowser/Makefile
===
RCS file: /cvs/ports/databases/sqlitebrowser/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- databases/sqlitebrowser/Makefile24 Aug 2019 07:46:57 -  1.29
+++ databases/sqlitebrowser/Makefile22 Feb 2020 06:19:18 -
@@ -5,6 +5,7 @@ COMMENT =   graphical interface to sqlite 
 GH_ACCOUNT =   sqlitebrowser
 GH_PROJECT =   sqlitebrowser
 GH_TAGNAME =   v3.11.2
+REVISION = 0
 
 CATEGORIES =   databases x11
 
@@ -21,7 +22,7 @@ MODULES = x11/qt5 \
devel/cmake
 
 LIB_DEPENDS =  databases/sqlite3 \
-   editors/qscintilla,qt5>=2.10.2
+   editors/qscintilla
 
 RUN_DEPENDS =  x11/gtk+3,-guic \
devel/desktop-file-utils
Index: editors/Makefile
===
RCS file: /cvs/ports/editors/Makefile,v
retrieving revision 1.137
diff -u -p -r1.137 Makefile
--- editors/Makefile19 Feb 2020 17:35:36 -  1.137
+++ editors/Makefile22 Feb 2020 06:19:24 -
@@ -51,7 +51,6 @@
  SUBDIR += py-qscintilla
  SUBDIR += py-qscintilla,python3
  SUBDIR += qscintilla
- SUBDIR += qscintilla,qt5
  SUBDIR += scintilla
  SUBDIR += scite
  SUBDIR += se
Index: editors/py-qscintilla/Makefile
===
RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- editors/py-qscintilla/Makefile  20 Feb 2020 16:10:07 -  1.23
+++ editors/py-qscintilla/Makefile  22 Feb 2020 06:19:25 -
@@ -4,7 +4,7 @@ COMMENT-main =  Python binding for the S
 COMMENT-common =   common files for py-qscintilla
 
 VERSION =  2.11.4
-REVISION = 0
+REVISION = 1
 MODPY_EGG_VERSION =${VERSION}
 DISTNAME = QScintilla-${VERSION}
 
@@ -48,7 +48,7 @@ RUN_DEPENDS = devel/py-sip${MODPY_FLAVO
x11/py-qt5${MODPY_FLAVOR}
 RUN_DEPENDS-main = ${RUN_DEPENDS} \
editors/py-qscintilla,-common
-LIB_DEPENDS-main = editors/qscintilla,qt5=${VERSION}
+LIB_DEPENDS-main = editors/qscintilla=${VERSION}
 
 RUN_DEPENDS-common =
 LIB_DEPENDS-common =
Index: editors/qscintilla/Makefile
===
RCS file: /cvs/ports/editors/qscintilla/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- editors/qscintilla/Makefile 19 Feb 2020 17:35:36 -  1.25
+++ editors/qscintilla/Makefile 22 Feb 2020 06:19:25 -
@@ -6,42 +6,24 @@ COMMENT = Qt port of the Scintilla sourc
 VERSION =  2.11.4
 DISTNAME = QScintilla-${VERSION}
 PKGNAME =  ${DISTNAME:L}
+REVISION = 0
+
 CATEGORIES =   editors x11
 
+SHARED_LIBS +=  qscintilla2_qt5  1.0 # 15.0
 
-HOMEPAGE = http://www.riverbankcomputing.com/software/qscintilla/
+HOMEPAGE = https://www.riverbankcomputing.com/software/qscintilla/
 
 # GPLv2/GPLv3
 PERMIT_PACKAGE =   Yes
 
-MASTER_SITES =  
https://www.riverbankcomputing.com/static/Downloads/QScintilla/${VERSION}/
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5PrintSupport
+WANTLIB += Qt5Widgets m
 
-WANTLIB =  ${COMPILER_LIBCXX} m
-MODULES =  devel/qmake
-FLAVORS = qt5
-FLAVOR?=
-
-# C++11 (at least)
-COMPILER=  base-clang ports-clang ports-gcc
-CXXFLAGS +=-std=c++11
-
-.if ${FLAVOR} == "qt5"
-FULLPKGNAME =  qscintilla-qt5-${VERSION}
-QTVER =qt5
-MODULES += x11/qt5
-SHARED_LIBS =  qscintilla2_qt5 1.0 # 15.0
-
-WANTLIB += GL Qt5Core Qt5Gui Qt5PrintSupport Qt5Widgets
-.else
-QTVER =qt4
-MODULES += x11/qt4
-SHARED_LIBS =  qscintilla2_qt4 1.0 # 15.0

Re: Looking for cmake/qt5 experts for graphics/drawpile update

2020-02-21 Thread Rafael Sadowski

On Sun Feb 16, 2020 at 02:35:13PM -0500, Brian Callahan wrote:
> Hi ports --
> 
> Attached is an update to graphics/drawpile.
> However, I'm looking for cmake/qt5 experts for help with the update.
> Something in the configure stage isn't quite right.
> 
> I get the following CMake warning:
> ---
> CMake Warning (dev) at src/desktop/CMakeLists.txt:243 (add_executable):
>   Policy CMP0028 is not set: Double colon in target name means ALIAS or
>   IMPORTED target.  Run "cmake --help-policy CMP0028" for policy details.
>   Use the cmake_policy command to set the policy and suppress this warning.
> 
>   Target "drawpile" links to target "Qt5::DBus" but the target was not
> found.
>   Perhaps a find_package() call is missing for an IMPORTED target, or an
>   ALIAS target is missing?
> This warning is for project developers.  Use -Wno-dev to suppress it.
> ---
> 
> This can be worked around with the post-configure target in the patch, but
> it would be better to fix whatever this warning is.
> 
> ~Brian
> 

The issue comes from qtkeychain. In Qt5KeychainLibraryDepends-release.cmake you 
can find
following lines:

set_target_properties(qt5keychain PROPERTIES
  IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE "Qt5::Core;Qt5::DBus"
  IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libqt5keychain.so.1.0"
  IMPORTED_SONAME_RELEASE "libqt5keychain.so.1.0"
  )

I think "Qt5::Core;Qt5::DBus" is not a valid libname. Anyway the diff below fix
the target properties for qt5keychain and your drawpile issue. I see debian  is
doing something similar.

BTW, you can drop cmake from the MODULES line in drawpile, kf5 does it for you.


Index: Makefile
===
RCS file: /cvs/ports/security/qtkeychain/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- Makefile7 Feb 2020 07:13:40 -   1.14
+++ Makefile22 Feb 2020 05:07:39 -
@@ -5,7 +5,7 @@ COMMENT =   Qt API to store passwords and
 GH_ACCOUNT =   frankosterfeld
 GH_PROJECT =   qtkeychain
 GH_TAGNAME =   v0.7.0
-REVISION = 4
+REVISION = 5
 
 SHARED_LIBS += qt5keychain 1.0 # 0.4
 
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt22 Feb 2020 05:07:39 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -149,7 +149,7 @@ set(QTKEYCHAIN_TARGET_NAME qt${QTKEYCHAIN_VERSION_INFI
+ if(NOT QTKEYCHAIN_STATIC)
+ add_library(${QTKEYCHAIN_TARGET_NAME} SHARED ${qtkeychain_SOURCES} 
${qtkeychain_MOC_OUTFILES} ${qtkeychain_QM_FILES})
+ set_target_properties(${QTKEYCHAIN_TARGET_NAME} PROPERTIES 
COMPILE_DEFINITIONS QKEYCHAIN_BUILD_QKEYCHAIN_LIB)
+-target_link_libraries(${QTKEYCHAIN_TARGET_NAME} ${qtkeychain_LIBRARIES})
++target_link_libraries(${QTKEYCHAIN_TARGET_NAME} PUBLIC 
${QTCORE_LIBRARIES} PRIVATE ${QTDBUS_LIBRARIES})
+ else()
+ add_library(${QTKEYCHAIN_TARGET_NAME} STATIC ${qtkeychain_SOURCES} 
${qtkeychain_MOC_OUTFILES} ${qtkeychain_QM_FILES})
+ set_target_properties(${QTKEYCHAIN_TARGET_NAME} PROPERTIES 
COMPILE_DEFINITIONS QKEYCHAIN_STATICLIB)

Re: move geo/py-* to python3 only ?

2020-02-21 Thread Kurt Mosiejczuk

On Fri, Feb 21, 2020 at 08:21:12PM +0100, Landry Breuil wrote:
> Hi,

> here's a rather large but mechanical diff (with updates in it..) to move
> those python ports to py3 only.

> - updated py-planet to 1.4.5, all tests (fetched manually from github) pass
> - updated pyproj to 2.4.2.post1, 2.5.0 isnt yet on pypi, and a future
>   version will require proj 7 which is due next week
> - for the others, dropped the py2 specific bits, added the
>   @conflict/@pkgpath markers, bumped REVISIONs, etc.
> - to my knowledge there are no py2 consumers for all of those but more
>   eyes could triplecheck ..

I checked again. The only python2 consumers are done away with by 
this patch :)

> cc'ed maintainers for py-rasterio & py-proj :)

I don't see them cc'd. I've added them to this reply.

Assuming they are ok with the changes, ok kmos

--Kurt

> i *think* i got the upgrade paths right, because with the following
> quirks diff :
> 
> +   'py-cligj' => 'py3-cligj',
> +   'py-fiona' => 'py3-fiona',
> +   'py-laspy' => 'py3-laspy',
> 'py-owslib' => 'py3-owslib',
> +   'py-proj' => 'py3-proj',
> +   'py-planet' => 'py3-planet',
> +   'py-rasterio' => 'py3-rasterio',
> +   'py-rio-cogeo' => 'py3-rio-cogeo',
> +   'py-shapely' => 'py3-shapely',
> 
> i got this:
> $doas env TRUSTED_PKG_PATH=/tmp/pkg pkg_add -u
> py-cligj+py3-cligj-0.5.0p0->py3-cligj-0.5.0p1: ok
> py-proj-2.1.3->py3-proj-2.4.2pl1: ok
> py-rasterio+py3-rasterio-1.1.2->py3-rasterio-1.1.2p0: ok
> py-shapely+py3-shapely-1.6.4p1->py3-shapely-1.6.4p2: ok
> py-fiona-1.8.11p1->py3-fiona-1.8.11p2: ok
> py-laspy-1.6.0->py3-laspy-1.6.0p0: ok
> py-planet-1.2.2p0->py3-planet-1.4.5: ok
> py-rio-cogeo-1.0pre8p0+py3-rio-cogeo-1.1.8->py3-rio-cogeo-1.0pre8p1: ok
> 
> looking for scrutinizing eyes .. and oks :)
> 
> Landry

> ? py-rio-cogeo/1.1.8.diff
> Index: Makefile
> ===
> RCS file: /cvs/ports/geo/Makefile,v
> retrieving revision 1.71
> diff -u -r1.71 Makefile
> --- Makefile  21 Feb 2020 12:36:59 -  1.71
> +++ Makefile  21 Feb 2020 19:18:39 -
> @@ -51,22 +51,14 @@
>   SUBDIR += pgpointcloud
>   SUBDIR += pgrouting
>   SUBDIR += postgis
> - SUBDIR += py-cligj
>   SUBDIR += py-cligj,python3
> - SUBDIR += py-fiona
>   SUBDIR += py-fiona,python3
> - SUBDIR += py-laspy
>   SUBDIR += py-laspy,python3
>   SUBDIR += py-owslib,python3
> - SUBDIR += py-planet
>   SUBDIR += py-planet,python3
> - SUBDIR += py-proj
>   SUBDIR += py-proj,python3
> - SUBDIR += py-rasterio
>   SUBDIR += py-rasterio,python3
> - SUBDIR += py-rio-cogeo
>   SUBDIR += py-rio-cogeo,python3
> - SUBDIR += py-shapely
>   SUBDIR += py-shapely,python3
>   SUBDIR += pygeoapi
>   SUBDIR += qgis
> Index: py-cligj/Makefile
> ===
> RCS file: /cvs/ports/geo/py-cligj/Makefile,v
> retrieving revision 1.4
> diff -u -r1.4 Makefile
> --- py-cligj/Makefile 12 Jul 2019 20:46:55 -  1.4
> +++ py-cligj/Makefile 21 Feb 2020 19:18:39 -
> @@ -5,7 +5,7 @@
>  MODPY_EGG_VERSION =  0.5.0
>  DISTNAME =   cligj-${MODPY_EGG_VERSION}
>  PKGNAME =py-${DISTNAME}
> -REVISION =   0
> +REVISION =   1
>  
>  CATEGORIES = geo
>  
> @@ -17,7 +17,7 @@
>  MODULES =lang/python
>  
>  FLAVORS =python3
> -FLAVOR ?=
> +FLAVOR = python3
>  
>  RUN_DEPENDS =devel/py-click${MODPY_FLAVOR}
>  
> Index: py-cligj/pkg/PLIST
> ===
> RCS file: /cvs/ports/geo/py-cligj/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -r1.2 PLIST
> --- py-cligj/pkg/PLIST22 Jan 2019 20:19:37 -  1.2
> +++ py-cligj/pkg/PLIST21 Feb 2020 19:18:39 -
> @@ -1,4 +1,6 @@
>  @comment $OpenBSD: PLIST,v 1.2 2019/01/22 20:19:37 landry Exp $
> +@conflict py-cligj-*
> +@pkgpath geo/py-cligj
>  lib/python${MODPY_VERSION}/site-packages/cligj/
>  
> lib/python${MODPY_VERSION}/site-packages/cligj-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>  
> lib/python${MODPY_VERSION}/site-packages/cligj-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> Index: py-fiona/Makefile
> ===
> RCS file: /cvs/ports/geo/py-fiona/Makefile,v
> retrieving revision 1.17
> diff -u -r1.17 Makefile
> --- py-fiona/Makefile 21 Jan 2020 10:22:24 -  1.17
> +++ py-fiona/Makefile 21 Feb 2020 19:18:39 -
> @@ -5,7 +5,7 @@
>  MODPY_EGG_VERSION =  1.8.11
>  DISTNAME =   Fiona-${MODPY_EGG_VERSION:S/post/pl/}
>  PKGNAME =${MODPY_PY_PREFIX}${DISTNAME:L}
> -REVISION =   1
> +REVISION =   2
>  
>  CATEGORIES = geo
>  
> @@ -17,7 +17,7 @@
>  MODULES =lang/python
>  
>  FLAVORS =python3
> -FLAVOR ?=
> +FLAVOR = python3
>  
>  COMPILER =   base-clang ports-gcc
>  
> @@ -

UPDATE: games/vitetris 0.57.0 -> 0.58.0

2020-02-21 Thread Micah Muer

This patch updates games/vitetris from 0.57.0 to 0.58.0. This is the
changelog:

* Fix insecure use of printf
* netplay.c: add missing includes generating warnings on compile
* Update README
* Remove old game server
* Update INSTALL
* Update configure script

Ports-wise, I switched the Makefile to use github and updated the
homepage.

I've tested this on amd64 for a few weeks.

Thanks,

Micah

Index: Makefile
===
RCS file: /cvs/ports/games/vitetris/Makefile,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 Makefile
--- Makefile12 Jul 2019 20:46:26 -  1.10
+++ Makefile22 Feb 2020 03:47:14 -
@@ -1,11 +1,13 @@
 # $OpenBSD: Makefile,v 1.10 2019/07/12 20:46:26 sthen Exp $
 
 COMMENT =  terminal-based tetris clone in vein of nintendo tetris
-DISTNAME = vitetris-0.57
 CATEGORIES =   games
-REVISION = 3
 
-HOMEPAGE = http://victornils.net/tetris/
+GH_TAGNAME =   v0.58.0
+GH_ACCOUNT =   vicgeralds
+GH_PROJECT =   vitetris
+
+HOMEPAGE = https://www.victornils.net/tetris/
 
 MAINTAINER =   Ryan Freeman 
 
@@ -13,8 +15,6 @@ MAINTAINER =  Ryan Freeman http://victornils.net/tetris/
 
 RUN_DEPENDS =  devel/desktop-file-utils
 
Index: distinfo
===
RCS file: /cvs/ports/games/vitetris/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo14 Jul 2013 07:12:22 -  1.2
+++ distinfo22 Feb 2020 03:47:14 -
@@ -1,2 +1,2 @@
-SHA256 (vitetris-0.57.tar.gz) = DJ+myLFuL4lo9l4WqH8bzTm4J9UQxu+wdx8EAKuRzcI=
-SIZE (vitetris-0.57.tar.gz) = 100660
+SHA256 (vitetris-0.58.0.tar.gz) = 5+fLdLuBS5/sgP5O3jw/BBNNghfWMOCSoJcjgkjWBPk=
+SIZE (vitetris-0.58.0.tar.gz) = 96957

[NEW] lang/hashlink - virtual machine for Haxe

2020-02-21 Thread Thomas Frohwein

Hi,

Please find attached a new port of hashlink. HashLink as a format is a bytecode
target for Haxe. The HashLink virtual machine (this port) provides a runtime
for the bytecode, along with a set of libraries in the haxe .hdll format to
allow use of OpenAL, SDL2, MySQL, SSL, libui, libuv, and libfmt.

Basic functionality can be tested by building the bytecode target of the Haxe
helloworld example [1], hosted for convenience at [2].

Create the HashLink bytecode target:
$ haxe -hl helloworld.hl -main Main

Run in the virtual machine:
$ hl helloworld.hl

There are a few games that are distributed in HashLink bytecode format. The
most prominent example is the indie game Dead Cells. Here instructions on how
to run the GOG.com version [3] (Linux files) with this HashLink port:

Download the game files from GOG.com and unzip(1) the dead_cells_*.sh file.
$ cd data/noarch/game
$ rm *.so{,.*} # move any linux shared object files out of the way
$ rm *.hdll # move any .hdll binaries out of the way
$ hl

This can show that SDL/OpenAL also work. Another game distributed as HashLink
is Northgard, however it doesn't launch so far without a client for Steam.

I thought this would depend on Haxe being present somewhere, but it turns out
the HashLink virtual machine is perfectly happy to run without Haxe installed.

make port-lib-depends-check and portcheck are both happy, and the Hello World
example, as well as Dead Cells run on my testing.

A few notes about the port:

- needs USE_WXNEEDED
- port adds SO versioning to hl.so. The .hdll files also behave like shared
  object files, but I've stayed away from versioning them to avoid breaking
  compatibility.
- string.c needs a workaround to not error when a nullptr is passed to
  hl_ucs2length().

pkg/DESCR:

HashLink is a virtual machine for Haxe.

HashLink runtime includes the following features:
* Fully compatible with Haxe specification
* Support file I/O, regular expressions, network, etc.
* Unicode strings by default
* Mark-and-not-sweep Garbage Collector
* x86 and x86-64 HL/C compilation
* x86 and x86-64 HL/JIT compilation

ok?

[1] https://haxe.org/manual/introduction-hello-world.html
[2] https://thfr.info/pub/Main.hx
[3] https://www.gog.com/game/dead_cells


hashlink.tgz
Description: Binary data

Re: UPDATE: textproc/lowdown 0.4.6 -> 0.5.4

2020-02-21 Thread Micah Muer

I think the lines were mangled in my last email. Sorry about that!
Here's the patch with proper formatting, I hope.

Thanks,

Micah

Index: Makefile
===
RCS file: /cvs/ports/textproc/lowdown/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile3 Nov 2019 20:18:17 -   1.18
+++ Makefile22 Feb 2020 01:17:37 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.18 2019/11/03 20:18:17 sthen Exp $
 
 COMMENT =  simple markdown translator
-DISTNAME = lowdown-0.4.6
+DISTNAME = lowdown-0.5.4
 CATEGORIES =   textproc
 
 HOMEPAGE = https://kristaps.bsd.lv/lowdown/
Index: distinfo
===
RCS file: /cvs/ports/textproc/lowdown/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo3 Nov 2019 20:18:17 -   1.15
+++ distinfo22 Feb 2020 01:17:37 -
@@ -1,2 +1,2 @@
-SHA256 (lowdown-0.4.6.tar.gz) = 0Pc2dywEC0a1pxR5RGsphSj4Z1HjQvdr16rT/Tlvg48=
-SIZE (lowdown-0.4.6.tar.gz) = 103959
+SHA256 (lowdown-0.5.4.tar.gz) = VbTDlqP9IOljqb94kau0EgArpfVX5+iVmp0aFiAyVQo=
+SIZE (lowdown-0.5.4.tar.gz) = 119029
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/lowdown/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST   3 Sep 2018 18:24:33 -   1.6
+++ pkg/PLIST   22 Feb 2020 01:17:37 -
@@ -2,7 +2,7 @@
 @bin bin/lowdown
 @bin bin/lowdown-diff
 include/lowdown.h
-lib/liblowdown.a
+@static-lib lib/liblowdown.a
 @man man/man1/lowdown.1
 @man man/man3/lowdown.3
 @man man/man3/lowdown_buf.3
@@ -10,7 +10,6 @@ lib/liblowdown.a
 @man man/man3/lowdown_doc_free.3
 @man man/man3/lowdown_doc_new.3
 @man man/man3/lowdown_doc_parse.3
-@man man/man3/lowdown_errstr.3
 @man man/man3/lowdown_file.3
 @man man/man3/lowdown_file_diff.3
 @man man/man3/lowdown_html_free.3
@@ -19,6 +18,9 @@ lib/liblowdown.a
 @man man/man3/lowdown_nroff_free.3
 @man man/man3/lowdown_nroff_new.3
 @man man/man3/lowdown_nroff_rndr.3
+@man man/man3/lowdown_term_free.3
+@man man/man3/lowdown_term_new.3
+@man man/man3/lowdown_term_rndr.3
 @man man/man3/lowdown_tree_free.3
 @man man/man3/lowdown_tree_new.3
 @man man/man3/lowdown_tree_rndr.3

UPDATE: textproc/lowdown 0.4.6 -> 0.5.4

2020-02-21 Thread Micah Muer

Here is a simple update of textproc/lowdown from 0.4.6 to 0.5.4. Changes
are detailed here: https://kristaps.bsd.lv/lowdown/archive.html

Thanks,

Micah

Index: Makefile
===
RCS file: /cvs/ports/textproc/lowdown/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile3 Nov 2019 20:18:17 -   1.18
+++ Makefile22 Feb 2020 01:17:37 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.18 2019/11/03 20:18:17 sthen Exp $
 
 COMMENT =  simple markdown translator
-DISTNAME = lowdown-0.4.6
+DISTNAME = lowdown-0.5.4
 CATEGORIES =   textproc
 
 HOMEPAGE = https://kristaps.bsd.lv/lowdown/
Index: distinfo
===
RCS file: /cvs/ports/textproc/lowdown/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo3 Nov 2019 20:18:17 -   1.15
+++ distinfo22 Feb 2020 01:17:37 -
@@ -1,2 +1,2 @@
-SHA256 (lowdown-0.4.6.tar.gz) =
0Pc2dywEC0a1pxR5RGsphSj4Z1HjQvdr16rT/Tlvg48= -SIZE
(lowdown-0.4.6.tar.gz) = 103959 +SHA256 (lowdown-0.5.4.tar.gz) =
VbTDlqP9IOljqb94kau0EgArpfVX5+iVmp0aFiAyVQo= +SIZE
(lowdown-0.5.4.tar.gz) = 119029 Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/lowdown/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 PLIST
--- pkg/PLIST   3 Sep 2018 18:24:33 -   1.6
+++ pkg/PLIST   22 Feb 2020 01:17:37 -
@@ -2,7 +2,7 @@
 @bin bin/lowdown
 @bin bin/lowdown-diff
 include/lowdown.h
-lib/liblowdown.a
+@static-lib lib/liblowdown.a
 @man man/man1/lowdown.1
 @man man/man3/lowdown.3
 @man man/man3/lowdown_buf.3
@@ -10,7 +10,6 @@ lib/liblowdown.a
 @man man/man3/lowdown_doc_free.3
 @man man/man3/lowdown_doc_new.3
 @man man/man3/lowdown_doc_parse.3
-@man man/man3/lowdown_errstr.3
 @man man/man3/lowdown_file.3
 @man man/man3/lowdown_file_diff.3
 @man man/man3/lowdown_html_free.3
@@ -19,6 +18,9 @@ lib/liblowdown.a
 @man man/man3/lowdown_nroff_free.3
 @man man/man3/lowdown_nroff_new.3
 @man man/man3/lowdown_nroff_rndr.3
+@man man/man3/lowdown_term_free.3
+@man man/man3/lowdown_term_new.3
+@man man/man3/lowdown_term_rndr.3
 @man man/man3/lowdown_tree_free.3
 @man man/man3/lowdown_tree_new.3
 @man man/man3/lowdown_tree_rndr.3

update www/privoxy to 3.0.28

2020-02-21 Thread David Goerger

I noticed 3.0.28 was released about a year ago, and figured it was 
time for an update. Tested on amd64.

The full changelog from 3.0.26 is available here:

https://www.privoxy.org/announce.txt

Most of the noise in the patch is from (1) patching out sgml from 
configure.in to match what we do for jade and man2html, and (2) 
regenerating pkg/PLIST with 'make update-plist'.

Thanks!
David


Index: Makefile
===
RCS file: /cvs/ports/www/privoxy/Makefile,v
retrieving revision 1.36
diff -u -p -u -r1.36 Makefile
--- Makefile12 Jul 2019 20:51:00 -  1.36
+++ Makefile22 Feb 2020 02:18:05 -
@@ -2,11 +2,10 @@
 
 COMMENT=   web proxy with advanced filtering capabilities
 
-V= 3.0.26
+V= 3.0.28
 DISTNAME=  privoxy-${V}-stable
 PKGNAME=   privoxy-${V}
 CATEGORIES=www
-REVISION=  0
 
 HOMEPAGE=  http://www.privoxy.org/
 
Index: distinfo
===
RCS file: /cvs/ports/www/privoxy/distinfo,v
retrieving revision 1.16
diff -u -p -u -r1.16 distinfo
--- distinfo21 Jan 2017 22:55:01 -  1.16
+++ distinfo22 Feb 2020 02:18:05 -
@@ -1,2 +1,2 @@
-SHA256 (privoxy-3.0.26-stable-src.tar.gz) = 
V+QVtD7l39ynRoXMA0BT6q6WKVL9q9CGFxVRqGq/nNg=
-SIZE (privoxy-3.0.26-stable-src.tar.gz) = 1741772
+SHA256 (privoxy-3.0.28-stable-src.tar.gz) = 
tdeMwDaqrbO3z4YOnVmNczKvRokmom4tVhZ/HLbygko=
+SIZE (privoxy-3.0.28-stable-src.tar.gz) = 1753809
Index: patches/patch-configure_in
===
RCS file: /cvs/ports/www/privoxy/patches/patch-configure_in,v
retrieving revision 1.8
diff -u -p -u -r1.8 patch-configure_in
--- patches/patch-configure_in  21 Jan 2017 22:55:01 -  1.8
+++ patches/patch-configure_in  22 Feb 2020 02:18:05 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure_in,v 1.8 2017/01/21 22:55:01 danj Exp $
 configure.in.orig  Fri Aug 26 14:26:43 2016
-+++ configure.in   Fri Jan 20 17:52:07 2017
-@@ -333,24 +333,6 @@ fi
+--- configure.in.orig  Sun Dec 30 13:40:13 2018
 configure.in   Fri Feb 21 21:00:59 2020
+@@ -339,30 +339,6 @@
  AC_SUBST(W3M)
  AC_SUBST(DB2HTML)
  
@@ -15,10 +15,16 @@ $OpenBSD: patch-configure_in,v 1.8 2017/
 -fi
 -AC_SUBST(RPM_BASE)
 -
+-dnl prefer openjade to jade
 -dnl Check for jade, so we can build the documentation
--AC_CHECK_PROGS(JADEBIN,jade openjade,false)
+-AC_CHECK_PROGS(JADEBIN,openjade jade,false)
 -AC_SUBST(JADEBIN)
 -
+-dnl Prefer OpenSP to SP
+-dnl   ref: 
https://lists.privoxy.org/pipermail/privoxy-devel/2018-November/000293.html
+-AC_CHECK_PROGS(NSGMLS,onsgmls nsgmls,false)
+-AC_SUBST(NSGMLS)
+-
 -dnl Check for man2html for docs.
 -AC_CHECK_PROGS(MAN2HTML,man2html,false)
 -AC_SUBST(MAN2HTML)
@@ -26,7 +32,7 @@ $OpenBSD: patch-configure_in,v 1.8 2017/
  dnl Set doc status flag for conditional content inclusions
  DOC_STATUS=p-not-stable
  if  test $CODE_STATUS = stable; then
-@@ -1077,7 +1059,7 @@ if test $have_pcre = "yes"; then
+@@ -1092,7 +1068,7 @@
pcre_dyn=yes
AC_DEFINE(FEATURE_DYNAMIC_PCRE,1,[Define to dynamically link to pcre.])
STATIC_PCRE_ONLY=#
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/privoxy/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -u -r1.12 PLIST
--- pkg/PLIST   21 Jan 2017 22:55:01 -  1.12
+++ pkg/PLIST   22 Feb 2020 02:18:05 -
@@ -1,6 +1,7 @@
 @comment $OpenBSD: PLIST,v 1.12 2017/01/21 22:55:01 danj Exp $
 @newgroup _privoxy:516
 @newuser _privoxy:516:_privoxy:daemon:Privoxy 
Account:/var/privoxy:/sbin/nologin
+@rcscript ${RCDIR}/privoxy
 bin/privoxy-log-parser.pl
 bin/privoxy-regression-test.pl
 bin/uagen.pl
@@ -121,8 +122,6 @@ share/examples/privoxy/templates/connect
 @group _privoxy
 @sample ${SYSCONFDIR}/privoxy/templates/connection-timeout
 share/examples/privoxy/templates/default
-@owner _privoxy
-@group _privoxy
 @sample ${SYSCONFDIR}/privoxy/templates/default
 @owner
 @group
@@ -215,8 +214,6 @@ share/examples/privoxy/templates/no-serv
 @group _privoxy
 @sample ${SYSCONFDIR}/privoxy/templates/no-server-data
 share/examples/privoxy/templates/no-such-domain
-@owner _privoxy
-@group _privoxy
 @sample ${SYSCONFDIR}/privoxy/templates/no-such-domain
 @owner
 @group
@@ -244,12 +241,6 @@ share/examples/privoxy/templates/show-ur
 @sample ${SYSCONFDIR}/privoxy/templates/show-url-info
 @owner
 @group
-share/examples/privoxy/templates/show-version
-@owner _privoxy
-@group _privoxy
-@sample ${SYSCONFDIR}/privoxy/templates/show-version
-@owner
-@group
 share/examples/privoxy/templates/toggle
 @owner _privoxy
 @group _privoxy
@@ -273,8 +264,6 @@ share/examples/privoxy/templates/url-inf
 @group _privoxy
 @sample ${SYSCONFDIR}/privoxy/templates/url-info-osd.xml
 share/examples/privoxy/user.action
-@owner _privoxy
-@group _privoxy
 @sample ${SYSCONFDIR}/privoxy/user.action
 @owner
 @group
@@ -287,6 +276,3 @@ share/examples/privo

Re: UPDATE: editors/tiled

2020-02-21 Thread Jeremie Courreges-Anglas

On Fri, Feb 21 2020, Rafael Sadowski  wrote:
> On Fri Feb 21, 2020 at 06:17:20PM +0100, Jeremie Courreges-Anglas wrote:
>> On Fri, Feb 21 2020, Rafael Sadowski  wrote:
>> > Update tiled to 1.3.1 (Qt4 to Qt5).
>> >
>> > Notable changes:
>> >
>> > - Move to GH_*
>> > - s/http/https/
>> > - Tests are no longer build. I didn't get a good look at it. tiled works
>> >   fine for me in a simple run-time test.
>> > - Set MODPY_DEFAULT_VERSION_3
>> >
>> > OK?
>> 
>> I only played with tiles and tiled for a uni course (!) years ago, but
>> figured I'd give this a try anyway.  Runtime looks good after I install
>> qtdeclarative, because of a missing dep on libQt5Qml.so.
>> 
>> --8<--
>> ritchie ~$ tiled
>> ld.so: tiled: can't load library 'libQt5Qml.so.2.2'
>> Killed
>> -->8--
>> 
>> --8<--
>> russell /usr/ports/editors/tiled$ make port-lib-depends-check
>> 
>> tiled-1.3.1(editors/tiled):
>> Missing lib: Qt5Qml.2 (/usr/local/bin/tiled) (NOT REACHABLE)
>> *** Error 1 in target 'port-lib-depends-check' (ignored)
>> -->8--
>> 
>> This needs adjusting, portcheck also says:
>> 
>>   missing RDEP on misc/shared-mime-info
>> 
>> and...
>> 
>
> Thanks for the input here is a new diff which converts all your points.
> I also reorder the DPB_PROPERTIES and indented GH;
>
> OK to nuke the creepy Qt4 stuff?

Should qtquickcontrols be added to BUILD_DEPENDS as well?  Other ports
using that in RUN_DEPENDS also seem to add it to BUILD_DEPENDS (though
not all of them).

If it's not needed, ok jca@

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

Re: UPDATE: security/zaproxy to 2.9.0

2020-02-21 Thread Jeremie Courreges-Anglas

On Fri, Feb 21 2020, Asher Pasha  wrote:
> Hi,
> Thank you for the suggestions. How about now?

Committed, thanks.

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

Re: incorrect use of SUBDIR

2020-02-21 Thread Marc Espie

On Fri, Feb 21, 2020 at 09:34:59PM +0100, Christian Weisgerber wrote:
> Marc Espie:
> 
> > --- bin/portbump27 Jun 2018 16:20:08 -  1.22
> > +++ bin/portbump19 Feb 2020 15:52:58 -
> > @@ -98,6 +98,18 @@ my @_REV_NEIGHBORS_WEAK = qw(
> >  );
> >  my $_rev_neighbors_plain_all = join('|', @_REV_NEIGHBORS, 
> > @_REV_NEIGHBORS_WEAK);
> >  
> > +sub run_make
> > +{
> > +   my $dir = shift;
> > +   my $pid = open(my $pipe, "-|");
> > +   if ($pid == 0) {
> > +   $ENV{SUBDIR}=$dir;
> > +   exec {'make'} ('make', @_);
> > +   exit(1);
> > +   }
> > +   return $pipe;
> > +}
> > +
> >  sub new {
> > my ($class, $dir, $tweak_wantlib, $lib_depends_tgt) = @_;
> > die "lib depends target specified without WANTLIB tweaking"
> > @@ -117,8 +129,8 @@ sub new {
> > # Get actual information about subpackages (including their
> > # REVISIONs) and shared libraries.
> > #
> > -   open (my $dumpvars, '-|', "make", "SUBDIR=$dir", "dump-vars") or
> > -   die "cannot run make dump-vars: $!";
> > +
> > +   my $dumpvars = run_make($dir, 'dump-vars');
> 
> Hmm, no error handling?

Right... How do you handle errors from a pipe ?

Not when you open it, anyway.

All the open(... "-|", ...) or die ... 
are bogus in that file.  They will only happen if fork fails (fat chance)
or you run out of file descriptors. The proper way to handle the error would
be at the close point.

Actually, I will probably do a "better" function for that program, because
the pipes have fairly small output, and so encapsulating the whole pipe run
and returning an array of lines will be just as efficient.

> > --- bin/portcheck   12 Nov 2019 06:01:04 -  1.130
> > +++ bin/portcheck   19 Feb 2020 15:52:58 -
> > @@ -1481,7 +1481,7 @@ check_lib_depends() {
> > # TODO cache print-plist-libs output?
> > cd -- /usr/ports# XXX "$portsdir" fails for openbsd-wip and like
> > unset FLAVOR SUBPACKAGE
> > -   make "${make_args[@]}" SUBDIR="${pure_lib_deps[*]}" \
> > +   SUBDIR="${pure_lib_deps[*]}" make "${make_args[@]}" 
> 
> Missing line continuation.

Gotcha

Re: UPDATE: security/zaproxy to 2.9.0

2020-02-21 Thread Asher Pasha

Hi,
Thank you for the suggestions. How about now?
Asher

On Fri, Feb 21, 2020 at 12:00 PM Jeremie Courreges-Anglas
 wrote:
>
> On Fri, Feb 21 2020, Asher Pasha  wrote:
> > Hi Ports,
>
> Hi,
>
> > I am learning OpenBSD. This updates zaproxy to 2.9.0. It works on
> > amd64.
>
> Nice to see a new contributor.  I' not sure I'll be able to handle this
> proposal, but I can point out three things:
> - don't copy/paste diffs, it mangles newlines and generally whitespace,
>   making the patch unusable for patch(1).  Either send your diff as an
>   attachment or use a mail client that won't mangle an inline diff.
> - REVISION should be dropped for updates
>
> > OK?
>
> - asking for oks is mostly a committer thing, getting an ok won't help
>   you much if you don't have the magic commit bit.
>
>
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/security/zaproxy/Makefile,v
> > retrieving revision 1.9
> > diff -u -p -r1.9 Makefile
> > --- Makefile 12 Jul 2019 20:49:38 - 1.9
> > +++ Makefile 21 Feb 2020 05:45:08 -
> > @@ -2,8 +2,8 @@
> >
> >  COMMENT = web application security tool
> >
> > -VERSION = 2.7.0
> > -REVISION = 2
> > +VERSION = 2.9.0
> > +REVISION = 1
> >  DISTNAME = ZAP_${VERSION}_Linux
> >  PKGNAME = zaproxy-${VERSION}
> >
> > @@ -14,8 +14,7 @@ HOMEPAGE = https://www.owasp.org/index.
> >  # Apache v2.0 License
> >  PERMIT_PACKAGE = Yes
> >
> > -MASTER_SITES =
> > https://github.com/zaproxy/zaproxy/releases/download/${VERSION}/
> > -MASTER_SITES += ${MASTER_SITE_PACKETSTORM:=web/}
> > +MASTER_SITES =
> > https://github.com/zaproxy/zaproxy/releases/download/v${VERSION}/
> >
> >  MODULES =   java
> >  MODJAVA_VER =   1.8+
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/security/zaproxy/distinfo,v
> > retrieving revision 1.4
> > diff -u -p -r1.4 distinfo
> > --- distinfo 16 Feb 2018 19:36:55 - 1.4
> > +++ distinfo 21 Feb 2020 05:45:08 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (ZAP_2.7.0_Linux.tar.gz) =
> > t0HDwhBoh/HQQJblO+Nf7XErt6heGYYVIyg7t23vtZ0=
> > -SIZE (ZAP_2.7.0_Linux.tar.gz) = 130903023
> > +SHA256 (ZAP_2.9.0_Linux.tar.gz) =
> > THK6nZumD1jcfrJsWBjPmKOLpYub8jE6rdaYMthenLE=
> > +SIZE (ZAP_2.9.0_Linux.tar.gz) = 96873657
> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/security/zaproxy/pkg/PLIST,v
> > retrieving revision 1.4
> > diff -u -p -r1.4 PLIST
> > --- pkg/PLIST 16 Feb 2018 19:36:55 - 1.4
> > +++ pkg/PLIST 21 Feb 2020 05:45:08 -
> > @@ -15,6 +15,7 @@ share/zaproxy/lang/Messages_ar_SA.proper
> >  share/zaproxy/lang/Messages_az_AZ.properties
> >  share/zaproxy/lang/Messages_bn_BD.properties
> >  share/zaproxy/lang/Messages_bs_BA.properties
> > +share/zaproxy/lang/Messages_ceb_PH.properties
> >  share/zaproxy/lang/Messages_da_DK.properties
> >  share/zaproxy/lang/Messages_de_DE.properties
> >  share/zaproxy/lang/Messages_el_GR.properties
> > @@ -22,6 +23,7 @@ share/zaproxy/lang/Messages_es_ES.proper
> >  share/zaproxy/lang/Messages_fa_IR.properties
> >  share/zaproxy/lang/Messages_fil_PH.properties
> >  share/zaproxy/lang/Messages_fr_FR.properties
> > +share/zaproxy/lang/Messages_ha_HG.properties
> >  share/zaproxy/lang/Messages_he_IL.properties
> >  share/zaproxy/lang/Messages_hi_IN.properties
> >  share/zaproxy/lang/Messages_hr_HR.properties
> > @@ -34,8 +36,10 @@ share/zaproxy/lang/Messages_mk_MK.proper
> >  share/zaproxy/lang/Messages_ms_MY.properties
> >  share/zaproxy/lang/Messages_nb_NO.properties
> >  share/zaproxy/lang/Messages_nl_NL.properties
> > +share/zaproxy/lang/Messages_pcm_NG.properties
> >  share/zaproxy/lang/Messages_pl_PL.properties
> >  share/zaproxy/lang/Messages_pt_BR.properties
> > +share/zaproxy/lang/Messages_pt_PT.properties
> >  share/zaproxy/lang/Messages_ro_RO.properties
> >  share/zaproxy/lang/Messages_ru_RU.properties
> >  share/zaproxy/lang/Messages_si_LK.properties
> > @@ -48,12 +52,14 @@ share/zaproxy/lang/Messages_tr_TR.proper
> >  share/zaproxy/lang/Messages_uk_UA.properties
> >  share/zaproxy/lang/Messages_ur_PK.properties
> >  share/zaproxy/lang/Messages_vi_VN.properties
> > +share/zaproxy/lang/Messages_yo_NG.properties
> >  share/zaproxy/lang/Messages_zh_CN.properties
> >  share/zaproxy/lang/vulnerabilities.xml
> >  share/zaproxy/lang/vulnerabilities_ar_SA.xml
> >  share/zaproxy/lang/vulnerabilities_az_AZ.xml
> >  share/zaproxy/lang/vulnerabilities_bn_BD.xml
> >  share/zaproxy/lang/vulnerabilities_bs_BA.xml
> > +share/zaproxy/lang/vulnerabilities_ceb_PH.xml
> >  share/zaproxy/lang/vulnerabilities_da_DK.xml
> >  share/zaproxy/lang/vulnerabilities_de_DE.xml
> >  share/zaproxy/lang/vulnerabilities_el_GR.xml
> > @@ -61,6 +67,7 @@ share/zaproxy/lang/vulnerabilities_es_ES
> >  share/zaproxy/lang/vulnerabilities_fa_IR.xml
> >  share/zaproxy/lang/vulnerabilities_fil_PH.xml
> >  share/zaproxy/lang/vulnerabilities_fr_FR.xml
> > +share

Re: UPDATE: lang/quickjs 2019.10.27 => 2020.01.19

2020-02-21 Thread George Koehler

On Fri, 21 Feb 2020 12:53:20 -0500
George Koehler  wrote:

> I almost fixed it by adding at the bottom of the port Makefile,
> after bsd.port.mk sets CHOSEN_COMPILER,
> 
> .if ${CHOSEN_COMPILER} == "ports-gcc"
> CC =  egcc
> RUN_DEPENDS +=${MODGCC4_CPPLIBDEP:S/,-libs//}
> .endif
> 
> This fixes qjsc at runtime on macppc, but it is _wrong_ because
> RUN_DEPENDS gets ignored...

Someone pointed me at how devel/llvm uses bsd.arch.port.mk and
PROPERTIES.  I fixed lang/quickjs/Makefile to be almost the same; see
the chunk after MAKE_FLAGS in the diff below.  "pkg_info -S quickjs"
now includes @gcc-8.3.0p4 on macppc and omits gcc on amd64, as I want.

This version of the diff is ok gkoehler@

Index: Makefile
===
RCS file: /cvs/ports/lang/quickjs/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile15 Jan 2020 14:30:50 -  1.4
+++ Makefile21 Feb 2020 20:23:51 -
@@ -2,8 +2,7 @@
 
 COMMENT =  small, embeddable JavaScript engine in C
 
-V =2019.10.27
-REVISION = 0
+V =2020.01.19
 DISTNAME = quickjs-${V:S/./-/g}
 PKGNAME =  quickjs-${V}
 
@@ -26,9 +25,19 @@ COMPILER =   base-clang ports-gcc
 USE_GMAKE =Yes
 MAKE_FLAGS =   CC="${CC}"
 
+.include 
+
+# Tell qjsc to run ports-gcc
+.if !${PROPERTIES:Mclang}
+CC =   egcc
+RUN_DEPENDS =  lang/gcc/${MODGCC4_VERSION}
+.endif
+
 # Fix "undefined reference to `__atomic_store_8'"
+# Pass -DLINK_ATOMIC to patch_qjsc_c
 .if ${MACHINE_ARCH:Mpowerpc} || ${MACHINE_ARCH:Mhppa}
 WANTLIB += atomic
+CFLAGS +=  -DLINK_ATOMIC
 MAKE_FLAGS +=  LDFLAGS="${LDFLAGS} -latomic"
 .endif
 
Index: distinfo
===
RCS file: /cvs/ports/lang/quickjs/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo21 Dec 2019 14:24:03 -  1.1.1.1
+++ distinfo21 Feb 2020 20:23:51 -
@@ -1,2 +1,2 @@
-SHA256 (quickjs-2019-10-27.tar.xz) = 
Uc3KTreFHS64so1ELfqjYhOSAXGgzw68BGgCNpQ0oXY=
-SIZE (quickjs-2019-10-27.tar.xz) = 763012
+SHA256 (quickjs-2020-01-19.tar.xz) = 
SuTCDE7XwgHXLCKNXodoMUlQkUumDXWfPfI9WQN/K4U=
+SIZE (quickjs-2020-01-19.tar.xz) = 735868
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/lang/quickjs/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile  21 Dec 2019 14:24:03 -  1.1.1.1
+++ patches/patch-Makefile  21 Feb 2020 20:23:51 -
@@ -23,7 +23,7 @@ Index: Makefile
  
  ifdef CONFIG_DARWIN
  # use clang instead of gcc
-@@ -81,8 +82,8 @@ ifdef CONFIG_CLANG
+@@ -83,8 +84,8 @@ ifdef CONFIG_CLANG
  else
HOST_CC=gcc
CC=$(CROSS_PREFIX)gcc
@@ -34,7 +34,7 @@ Index: Makefile
ifdef CONFIG_LTO
  AR=$(CROSS_PREFIX)gcc-ar
else
-@@ -97,7 +98,7 @@ DEFINES:=-D_GNU_SOURCE -DCONFIG_VERSION=\"$(shell cat 
+@@ -102,7 +103,7 @@ endif
  CFLAGS+=$(DEFINES)
  CFLAGS_DEBUG=$(CFLAGS) -O0
  CFLAGS_SMALL=$(CFLAGS) -Os
@@ -43,7 +43,7 @@ Index: Makefile
  CFLAGS_NOLTO:=$(CFLAGS_OPT)
  LDFLAGS=-g
  ifdef CONFIG_LTO
-@@ -165,7 +166,7 @@ QJSBN_OBJS=$(OBJDIR)/qjs.bn.o $(OBJDIR)/repl-bn.bn.o $
+@@ -168,7 +169,7 @@ endif
  
  LIBS=-lm
  ifndef CONFIG_WIN32
Index: patches/patch-qjsc_c
===
RCS file: /cvs/ports/lang/quickjs/patches/patch-qjsc_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-qjsc_c
--- patches/patch-qjsc_c21 Dec 2019 14:24:03 -  1.1.1.1
+++ patches/patch-qjsc_c21 Feb 2020 20:23:51 -
@@ -2,14 +2,19 @@ $OpenBSD: patch-qjsc_c,v 1.1.1.1 2019/12
 
 Remove -ldl
 
+Add -latomic if the ports Makefile passes -DLINK_ATOMIC
+
 Index: qjsc.c
 --- qjsc.c.orig
 +++ qjsc.c
-@@ -450,7 +450,6 @@ static int output_executable(const char *out_filename,
+@@ -446,7 +446,9 @@ static int output_executable(const char *out_filename,
   lib_dir, bn_suffix, lto_suffix);
  *arg++ = libjsname;
  *arg++ = "-lm";
 -*arg++ = "-ldl";
++#ifdef LINK_ATOMIC
++*arg++ = "-latomic";
++#endif
  *arg = NULL;
  
  if (verbose) {
Index: patches/patch-quickjs_c
===
RCS file: /cvs/ports/lang/quickjs/patches/patch-quickjs_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-quickjs_c
--- patches/patch-quickjs_c 21 Dec 2019 14:24:03 -  1.1.1.1
+++ patches/patch-quickjs_c 21 Feb 2020 20:23:51 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-quickjs_c,v 1.1.1.1 2019
 Index: quickjs.c
 --- quickjs.c.orig
 +++ quickjs.c
-@@ -1349,7 +1349,7 @@ static inline size_t js_def_malloc_usable_size(void *p
+@@ -1550,7 +1550,7 @@ static inline size_t js_def_malloc_usable_size(void *p
  return malloc_usable_size(ptr);
  #else
  /* change this to `return 0;` if compilation fails */
@@ -12,7 +12,7 @@ Index: quickjs.c
  #

Re: incorrect use of SUBDIR

2020-02-21 Thread Christian Weisgerber

Marc Espie:

> --- bin/portbump  27 Jun 2018 16:20:08 -  1.22
> +++ bin/portbump  19 Feb 2020 15:52:58 -
> @@ -98,6 +98,18 @@ my @_REV_NEIGHBORS_WEAK = qw(
>  );
>  my $_rev_neighbors_plain_all = join('|', @_REV_NEIGHBORS, 
> @_REV_NEIGHBORS_WEAK);
>  
> +sub run_make
> +{
> + my $dir = shift;
> + my $pid = open(my $pipe, "-|");
> + if ($pid == 0) {
> + $ENV{SUBDIR}=$dir;
> + exec {'make'} ('make', @_);
> + exit(1);
> + }
> + return $pipe;
> +}
> +
>  sub new {
>   my ($class, $dir, $tweak_wantlib, $lib_depends_tgt) = @_;
>   die "lib depends target specified without WANTLIB tweaking"
> @@ -117,8 +129,8 @@ sub new {
>   # Get actual information about subpackages (including their
>   # REVISIONs) and shared libraries.
>   #
> - open (my $dumpvars, '-|', "make", "SUBDIR=$dir", "dump-vars") or
> - die "cannot run make dump-vars: $!";
> +
> + my $dumpvars = run_make($dir, 'dump-vars');

Hmm, no error handling?

> --- bin/portcheck 12 Nov 2019 06:01:04 -  1.130
> +++ bin/portcheck 19 Feb 2020 15:52:58 -
> @@ -1481,7 +1481,7 @@ check_lib_depends() {
>   # TODO cache print-plist-libs output?
>   cd -- /usr/ports# XXX "$portsdir" fails for openbsd-wip and like
>   unset FLAVOR SUBPACKAGE
> - make "${make_args[@]}" SUBDIR="${pure_lib_deps[*]}" \
> + SUBDIR="${pure_lib_deps[*]}" make "${make_args[@]}" 

Missing line continuation.

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

move geo/py-* to python3 only ?

2020-02-21 Thread Landry Breuil

Hi,

here's a rather large but mechanical diff (with updates in it..) to move
those python ports to py3 only.

- updated py-planet to 1.4.5, all tests (fetched manually from github) pass
- updated pyproj to 2.4.2.post1, 2.5.0 isnt yet on pypi, and a future
  version will require proj 7 which is due next week
- for the others, dropped the py2 specific bits, added the
  @conflict/@pkgpath markers, bumped REVISIONs, etc.
- to my knowledge there are no py2 consumers for all of those but more
  eyes could triplecheck ..

cc'ed maintainers for py-rasterio & py-proj :)

i *think* i got the upgrade paths right, because with the following
quirks diff :

+   'py-cligj' => 'py3-cligj',
+   'py-fiona' => 'py3-fiona',
+   'py-laspy' => 'py3-laspy',
'py-owslib' => 'py3-owslib',
+   'py-proj' => 'py3-proj',
+   'py-planet' => 'py3-planet',
+   'py-rasterio' => 'py3-rasterio',
+   'py-rio-cogeo' => 'py3-rio-cogeo',
+   'py-shapely' => 'py3-shapely',

i got this:
$doas env TRUSTED_PKG_PATH=/tmp/pkg pkg_add -u
py-cligj+py3-cligj-0.5.0p0->py3-cligj-0.5.0p1: ok
py-proj-2.1.3->py3-proj-2.4.2pl1: ok
py-rasterio+py3-rasterio-1.1.2->py3-rasterio-1.1.2p0: ok
py-shapely+py3-shapely-1.6.4p1->py3-shapely-1.6.4p2: ok
py-fiona-1.8.11p1->py3-fiona-1.8.11p2: ok
py-laspy-1.6.0->py3-laspy-1.6.0p0: ok
py-planet-1.2.2p0->py3-planet-1.4.5: ok
py-rio-cogeo-1.0pre8p0+py3-rio-cogeo-1.1.8->py3-rio-cogeo-1.0pre8p1: ok

looking for scrutinizing eyes .. and oks :)

Landry
? py-rio-cogeo/1.1.8.diff
Index: Makefile
===
RCS file: /cvs/ports/geo/Makefile,v
retrieving revision 1.71
diff -u -r1.71 Makefile
--- Makefile21 Feb 2020 12:36:59 -  1.71
+++ Makefile21 Feb 2020 19:18:39 -
@@ -51,22 +51,14 @@
  SUBDIR += pgpointcloud
  SUBDIR += pgrouting
  SUBDIR += postgis
- SUBDIR += py-cligj
  SUBDIR += py-cligj,python3
- SUBDIR += py-fiona
  SUBDIR += py-fiona,python3
- SUBDIR += py-laspy
  SUBDIR += py-laspy,python3
  SUBDIR += py-owslib,python3
- SUBDIR += py-planet
  SUBDIR += py-planet,python3
- SUBDIR += py-proj
  SUBDIR += py-proj,python3
- SUBDIR += py-rasterio
  SUBDIR += py-rasterio,python3
- SUBDIR += py-rio-cogeo
  SUBDIR += py-rio-cogeo,python3
- SUBDIR += py-shapely
  SUBDIR += py-shapely,python3
  SUBDIR += pygeoapi
  SUBDIR += qgis
Index: py-cligj/Makefile
===
RCS file: /cvs/ports/geo/py-cligj/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- py-cligj/Makefile   12 Jul 2019 20:46:55 -  1.4
+++ py-cligj/Makefile   21 Feb 2020 19:18:39 -
@@ -5,7 +5,7 @@
 MODPY_EGG_VERSION =0.5.0
 DISTNAME = cligj-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 0
+REVISION = 1
 
 CATEGORIES =   geo
 
@@ -17,7 +17,7 @@
 MODULES =  lang/python
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 RUN_DEPENDS =  devel/py-click${MODPY_FLAVOR}
 
Index: py-cligj/pkg/PLIST
===
RCS file: /cvs/ports/geo/py-cligj/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- py-cligj/pkg/PLIST  22 Jan 2019 20:19:37 -  1.2
+++ py-cligj/pkg/PLIST  21 Feb 2020 19:18:39 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.2 2019/01/22 20:19:37 landry Exp $
+@conflict py-cligj-*
+@pkgpath geo/py-cligj
 lib/python${MODPY_VERSION}/site-packages/cligj/
 
lib/python${MODPY_VERSION}/site-packages/cligj-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/cligj-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: py-fiona/Makefile
===
RCS file: /cvs/ports/geo/py-fiona/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- py-fiona/Makefile   21 Jan 2020 10:22:24 -  1.17
+++ py-fiona/Makefile   21 Feb 2020 19:18:39 -
@@ -5,7 +5,7 @@
 MODPY_EGG_VERSION =1.8.11
 DISTNAME = Fiona-${MODPY_EGG_VERSION:S/post/pl/}
 PKGNAME =  ${MODPY_PY_PREFIX}${DISTNAME:L}
-REVISION = 1
+REVISION = 2
 
 CATEGORIES =   geo
 
@@ -17,7 +17,7 @@
 MODULES =  lang/python
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 COMPILER = base-clang ports-gcc
 
@@ -43,23 +43,7 @@
 
 WANTLIB += ${COMPILER_LIBCXX} gdal m ${MODPY_WANTLIB}
 
-.if !${FLAVOR:Mpython3}
-RUN_DEPENDS += devel/py-enum34
-TEST_DEPENDS +=devel/py-mock
-.endif
-
-# @conflict markers only for py2 flavour
-SUBST_VARS += MODPY_2ONLY
-.if ${FLAVOR} == python3
-MODPY_2ONLY = "@comment "
-.else
-MODPY_2ONLY =
-.endif
-
 TESTLIBDIR =   ${WRKSRC}/lib.openbsd-${OSREV}-${ARCH}-${MODPY_VERSION}
-
-post-install:
-   mv ${PREFIX}/bin/fio{,${MODPY_BIN_SUFFIX}}
 
 pre-test:
cp

Re: UPDATE: editors/tiled

2020-02-21 Thread Rafael Sadowski

On Fri Feb 21, 2020 at 06:17:20PM +0100, Jeremie Courreges-Anglas wrote:
> On Fri, Feb 21 2020, Rafael Sadowski  wrote:
> > Update tiled to 1.3.1 (Qt4 to Qt5).
> >
> > Notable changes:
> >
> > - Move to GH_*
> > - s/http/https/
> > - Tests are no longer build. I didn't get a good look at it. tiled works
> >   fine for me in a simple run-time test.
> > - Set MODPY_DEFAULT_VERSION_3
> >
> > OK?
> 
> I only played with tiles and tiled for a uni course (!) years ago, but
> figured I'd give this a try anyway.  Runtime looks good after I install
> qtdeclarative, because of a missing dep on libQt5Qml.so.
> 
> --8<--
> ritchie ~$ tiled
> ld.so: tiled: can't load library 'libQt5Qml.so.2.2'
> Killed
> -->8--
> 
> --8<--
> russell /usr/ports/editors/tiled$ make port-lib-depends-check
> 
> tiled-1.3.1(editors/tiled):
> Missing lib: Qt5Qml.2 (/usr/local/bin/tiled) (NOT REACHABLE)
> *** Error 1 in target 'port-lib-depends-check' (ignored)
> -->8--
> 
> This needs adjusting, portcheck also says:
> 
>   missing RDEP on misc/shared-mime-info
> 
> and...
> 

Thanks for the input here is a new diff which converts all your points.
I also reorder the DPB_PROPERTIES and indented GH;

OK to nuke the creepy Qt4 stuff?

RS

Index: Makefile
===
RCS file: /cvs/ports/editors/tiled/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile12 Jul 2019 20:46:06 -  1.15
+++ Makefile21 Feb 2020 19:13:44 -
@@ -1,37 +1,39 @@
 # $OpenBSD: Makefile,v 1.15 2019/07/12 20:46:06 sthen Exp $
 
+# XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused
+DPB_PROPERTIES =   nojunk
+
 COMMENT =  tile map editor
 
-V =0.9.1
-DISTNAME = tiled-qt-${V}
-PKGNAME =  tiled-${V}
-REVISION = 6
+GH_ACCOUNT =   bjorn
+GH_PROJECT =   tiled
+GH_TAGNAME =   v1.3.1
 
-SHARED_LIBS += tiled 0.0 # 1.0
+SHARED_LIBS += tiled 1.0 # 1.0
 
 CATEGORIES =   editors games
 
-HOMEPAGE = http://www.mapeditor.org/
+HOMEPAGE = https://www.mapeditor.org/
 
 # GPLv2+
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += GL ICE QtGui QtOpenGL SM X11 Xext Xi Xinerama Xrender
-WANTLIB += c fontconfig freetype m pthread ${COMPILER_LIBCXX} z
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Qml
+WANTLIB += Qt5Widgets c m ${MODPY_WANTLIB} z
 
-COMPILER = base-clang ports-gcc base-gcc
+MODULES =  devel/qmake \
+   lang/python \
+   x11/qt5
 
-MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=tiled/}
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
 
-RUN_DEPENDS =  devel/desktop-file-utils \
-   x11/gtk+3,-guic
-MODULES =  devel/qmake x11/qt4
+LIB_DEPENDS =  x11/qt5/qtdeclarative
 
-# XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused
-DPB_PROPERTIES =   nojunk
+RUN_DEPENDS =  devel/desktop-file-utils \
+   misc/shared-mime-info \
+   x11/gtk+3,-guic \
+   x11/qt5/qtquickcontrols
 
-do-test:
-   cd ${WRKSRC}/tests/staggeredrenderer && ./staggeredrenderer && \
-   cd ${WRKSRC}/tests/mapreader && ./mapreader
+NO_TEST=   Yes
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/editors/tiled/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo28 Apr 2014 09:48:54 -  1.2
+++ distinfo21 Feb 2020 19:13:44 -
@@ -1,2 +1,2 @@
-SHA256 (tiled-qt-0.9.1.tar.gz) = aGj4MzuMZoNTAXkgUaduf8aEZ2GbbpeoW1h/U3w2tSc=
-SIZE (tiled-qt-0.9.1.tar.gz) = 1436286
+SHA256 (tiled-1.3.1.tar.gz) = s3Mh41vdt7yW+QaO3AYmiz8OuGMv5iBq7ilsjWw7pyI=
+SIZE (tiled-1.3.1.tar.gz) = 15728903
Index: patches/patch-src_automappingconverter_automappingconverter_pro
===
RCS file: patches/patch-src_automappingconverter_automappingconverter_pro
diff -N patches/patch-src_automappingconverter_automappingconverter_pro
--- patches/patch-src_automappingconverter_automappingconverter_pro 28 Apr 
2014 09:48:54 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_automappingconverter_automappingconverter_pro,v 1.1 
2014/04/28 09:48:54 bentley Exp $
 src/automappingconverter/automappingconverter.pro.orig Mon Apr 28 
02:32:11 2014
-+++ src/automappingconverter/automappingconverter.pro  Mon Apr 28 02:32:17 2014
-@@ -48,7 +48,7 @@ HEADERS  += \
- FORMS+= \
- converterwindow.ui
- 
--manpage.path = $${PREFIX}/share/man/man1/
-+manpage.path = $${PREFIX}/man/man1/
- manpage.files += ../../docs/automappingconverter.1
- INSTALLS += manpage
- 
Index: patches/patch-src_tiled_tiled_pro

UPDATE: www/gitea

2020-02-21 Thread Pavel Korovin

Dear all,

I'm going to update www/gitea to the latest. Gitea team has stopped shipping
css/js files, these are now generated during the build, this requires node.js
which downloads its requirements from the Internet which doesn't play
well with OpenBSD porting practices.

So I decided the best approach is to provide additional archive with
generated public web files. Can anybody review/test the attached diff?

-- 
With best regards,
Pavel Korovin
Index: Makefile
===
RCS file: /cvs/ports/www/gitea/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile18 Jan 2020 15:04:50 -  1.31
+++ Makefile21 Feb 2020 18:27:11 -
@@ -2,10 +2,15 @@
 
 COMMENT =  compact self-hosted Git service
 
-VERSION =  1.10.3
+VERSION =  1.11.1
 GH_ACCOUNT =   go-gitea
 GH_PROJECT =   gitea
 GH_TAGNAME =   v${VERSION}
+
+MASTER_SITES0 =https://distfiles.tristero.se/
+
+DISTFILES =${GH_PROJECT}-${VERSION}${EXTRACT_SUFX} \
+   ${GH_PROJECT}-${VERSION}-public${EXTRACT_SUFX}:0
 
 CATEGORIES =   www devel
 
Index: distinfo
===
RCS file: /cvs/ports/www/gitea/distinfo,v
retrieving revision 1.23
diff -u -p -r1.23 distinfo
--- distinfo18 Jan 2020 15:04:50 -  1.23
+++ distinfo21 Feb 2020 18:27:11 -
@@ -1,2 +1,4 @@
-SHA256 (gitea-1.10.3.tar.gz) = VktnYWMHffwsHQF1yXZs8Ri4/JF/Sefn4uWysz2LZTk=
-SIZE (gitea-1.10.3.tar.gz) = 30145162
+SHA256 (gitea-1.11.1-public.tar.gz) = 
uhAiPX8eKIl76HWbG8miOlAeAu6YMAPj/QMqVopE2xY=
+SHA256 (gitea-1.11.1.tar.gz) = WC4KVfkdErrlDGV0elTeEMM30UKzUk/GRH3vhleOQeQ=
+SIZE (gitea-1.11.1-public.tar.gz) = 303255
+SIZE (gitea-1.11.1.tar.gz) = 28723305
Index: patches/patch-custom_conf_app_ini_sample
===
RCS file: /cvs/ports/www/gitea/patches/patch-custom_conf_app_ini_sample,v
retrieving revision 1.7
diff -u -p -r1.7 patch-custom_conf_app_ini_sample
--- patches/patch-custom_conf_app_ini_sample19 Nov 2019 06:42:46 -  
1.7
+++ patches/patch-custom_conf_app_ini_sample21 Feb 2020 18:27:11 -
@@ -45,7 +45,7 @@ Index: custom/conf/app.ini.sample
  ; Disable the ability to interact with repositories using the HTTP protocol
  DISABLE_HTTP_GIT = false
  ; Value for Access-Control-Allow-Origin header, default is not to present
-@@ -50,15 +45,15 @@ PREVIEWABLE_FILE_MODES = markdown
+@@ -53,15 +48,15 @@ PREVIEWABLE_FILE_MODES = markdown
  
  [repository.local]
  ; Path for local repository copy. Defaults to `tmp/local-repo`
@@ -64,7 +64,7 @@ Index: custom/conf/app.ini.sample
  ; One or more allowed types, e.g. image/jpeg|image/png. Nothing means any 
file type
  ALLOWED_TYPES =
  ; Max size of each file in megabytes. Defaults to 3MB
-@@ -109,7 +104,7 @@ THEME_COLOR_META_TAG = `#6cc644`
+@@ -158,7 +153,7 @@ THEME_COLOR_META_TAG = `#6cc644`
  ; Max size of files to be displayed (default is 8MiB)
  MAX_DISPLAY_FILE_SIZE = 8388608
  ; Whether the email of the user should be shown in the Explore Users page
@@ -73,7 +73,7 @@ Index: custom/conf/app.ini.sample
  ; Set the default theme for the Gitea install
  DEFAULT_THEME = gitea
  ; All available themes. Allow users select personalized themes regardless of 
the value of `DEFAULT_THEME`.
-@@ -180,7 +175,7 @@ SSH_DOMAIN = %(DOMAIN)s
+@@ -237,7 +232,7 @@ SSH_DOMAIN = %(DOMAIN)s
  ; The network interface the builtin SSH server should listen on
  SSH_LISTEN_HOST =
  ; Port number to be exposed in clone URL
@@ -82,7 +82,7 @@ Index: custom/conf/app.ini.sample
  ; The port number the builtin SSH server should listen on
  SSH_LISTEN_PORT = %(SSH_PORT)s
  ; Root path of SSH directory, default is '~/.ssh', but you have to use 
'/home/git/.ssh'.
-@@ -209,7 +204,7 @@ SSH_EXPOSE_ANONYMOUS = false
+@@ -266,7 +261,7 @@ SSH_EXPOSE_ANONYMOUS = false
  ; Indicate whether to check minimum key size with corresponding type
  MINIMUM_KEY_SIZE_CHECK = false
  ; Disable CDN even in "prod" mode
@@ -91,12 +91,12 @@ Index: custom/conf/app.ini.sample
  DISABLE_ROUTER_LOG = false
  ; Generate steps:
  ; $ ./gitea cert -ca=true -duration=8760h0m0s -host=myhost.example.com
-@@ -218,13 +213,13 @@ DISABLE_ROUTER_LOG = false
- ; not forget to export the private key):
+@@ -276,13 +271,13 @@ DISABLE_ROUTER_LOG = false
  ; $ openssl pkcs12 -in cert.pfx -out cert.pem -nokeys
  ; $ openssl pkcs12 -in cert.pfx -out key.pem -nocerts -nodes
--CERT_FILE = custom/https/cert.pem
--KEY_FILE = custom/https/key.pem
+ ; Paths are relative to CUSTOM_PATH
+-CERT_FILE = https/cert.pem
+-KEY_FILE = https/key.pem
 +CERT_FILE = ${LOCALSTATEDIR}/gitea/custom/https/cert.pem
 +KEY_FILE = ${LOCALSTATEDIR}/gitea/custom/https/key.pem
  ; Root directory containing templates and static files.
@@ -108,13 +108,14 @@ Index: custom/conf/app.ini.sample
  ; Application level GZIP support

Re: New port: JetBrainsMono fonts

2020-02-21 Thread George Koehler

On Sun, 2 Feb 2020 12:30:33 -0800
Greg Steuck  wrote:

> Thanks for the comments Stuart & George. I believe I addressed all
> your comments.
> 
> I further stole from espie@'s port which simplified things a bit more.

The fonts/jetbrains-mono from Greg Steuck on 2 Feb [1]
is ok gkoehler@ for someone else to import.

[1] https://marc.info/?l=openbsd-ports&m=158067551105582&w=2

Re: UPDATE: audio/hydrogen-1.0.0-beta1

2020-02-21 Thread Rafael Sadowski

On Fri Feb 21, 2020 at 04:55:27PM +, Stuart Henderson wrote:
> On 2020/02/21 17:46, Raphael Graf wrote:
> > This version uses Qt5 and adds support for midi output. 
> > Here is a list of new features: 
> > https://github.com/hydrogen-music/hydrogen/releases 
> > 
> > (The OSC support is disabled for now as it needs audio/liblo, see
> > https://marc.info/?l=openbsd-ports-cvs&m=150971570107043)
> > 
> > Comments, ok?
> > 
> > 
> 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/audio/hydrogen/Makefile,v
> > retrieving revision 1.27
> > diff -u -p -u -p -r1.27 Makefile
> > --- Makefile12 Jul 2019 20:43:34 -  1.27
> > +++ Makefile21 Feb 2020 16:24:00 -
> > @@ -2,55 +2,59 @@
> >  
> >  COMMENT=   software drum machine
> >  
> > -DISTNAME=  hydrogen-0.9.7
> > +DISTNAME=  hydrogen-1.0.0-beta1
> 
> that produces a bad PKGNAME, use e.g.
> 
> DISTNAME= hydrogen-1.0.0-beta1
> PKGNAME=  ${DISTNAME:S/-beta/beta/}
> 
> The rest reads OK but untested
> 

I was able to test this a little earlier. With sthen's tewak, ok
rsadowsk@. Thanks for making it happen.

Re: UPDATE: lang/quickjs 2019.10.27 => 2020.01.19

2020-02-21 Thread George Koehler

On Fri, 21 Feb 2020 00:48:36 -0500
George Koehler  wrote:

> Bad news: my macppc qjsc needs /usr/ports/pobj/quickjs-2020.01.19/bin
> in PATH, so it works during the build, but not after the install.

I almost fixed it by adding at the bottom of the port Makefile,
after bsd.port.mk sets CHOSEN_COMPILER,

.if ${CHOSEN_COMPILER} == "ports-gcc"
CC =egcc
RUN_DEPENDS +=  ${MODGCC4_CPPLIBDEP:S/,-libs//}
.endif

This fixes qjsc at runtime on macppc, but it is _wrong_ because
RUN_DEPENDS gets ignored, so "pkg_info -S quickjs" is missing the
dependency on ports-gcc.  I guess that after bsd.port.mk sets
CHOSEN_COMPILER, it is too late to set RUN_DEPENDS.

qjsc works like this:

$ cat example.js   
import {printf} from "std";
printf("2 + 3 = %d\n", 2 + 3);
$ qjsc -o example example.js
... (linker warnings)
$ ./example
2 + 3 = 5

The diff below is Brian's update plus all of my local changes
(including the wrong RUN_DEPENDS), as I was copying them from my
macppc to my amd64.  (My patch-quickjs_h was empty because I forgot
to remove it.)

Index: Makefile
===
RCS file: /cvs/ports/lang/quickjs/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile15 Jan 2020 14:30:50 -  1.4
+++ Makefile21 Feb 2020 17:29:36 -
@@ -2,8 +2,7 @@
 
 COMMENT =  small, embeddable JavaScript engine in C
 
-V =2019.10.27
-REVISION = 0
+V =2020.01.19
 DISTNAME = quickjs-${V:S/./-/g}
 PKGNAME =  quickjs-${V}
 
@@ -29,7 +28,13 @@ MAKE_FLAGS = CC="${CC}"
 # Fix "undefined reference to `__atomic_store_8'"
 .if ${MACHINE_ARCH:Mpowerpc} || ${MACHINE_ARCH:Mhppa}
 WANTLIB += atomic
+CFLAGS +=  -DLINK_ATOMIC # for patch-qjsc_c
 MAKE_FLAGS +=  LDFLAGS="${LDFLAGS} -latomic"
 .endif
 
 .include 
+
+.if ${CHOSEN_COMPILER} == "ports-gcc"
+CC =   egcc
+RUN_DEPENDS += ${MODGCC4_CPPLIBDEP:S/,-libs//}
+.endif
Index: distinfo
===
RCS file: /cvs/ports/lang/quickjs/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo21 Dec 2019 14:24:03 -  1.1.1.1
+++ distinfo21 Feb 2020 17:29:36 -
@@ -1,2 +1,2 @@
-SHA256 (quickjs-2019-10-27.tar.xz) = 
Uc3KTreFHS64so1ELfqjYhOSAXGgzw68BGgCNpQ0oXY=
-SIZE (quickjs-2019-10-27.tar.xz) = 763012
+SHA256 (quickjs-2020-01-19.tar.xz) = 
SuTCDE7XwgHXLCKNXodoMUlQkUumDXWfPfI9WQN/K4U=
+SIZE (quickjs-2020-01-19.tar.xz) = 735868
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/lang/quickjs/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile  21 Dec 2019 14:24:03 -  1.1.1.1
+++ patches/patch-Makefile  21 Feb 2020 17:29:36 -
@@ -23,7 +23,7 @@ Index: Makefile
  
  ifdef CONFIG_DARWIN
  # use clang instead of gcc
-@@ -81,8 +82,8 @@ ifdef CONFIG_CLANG
+@@ -83,8 +84,8 @@ ifdef CONFIG_CLANG
  else
HOST_CC=gcc
CC=$(CROSS_PREFIX)gcc
@@ -34,7 +34,7 @@ Index: Makefile
ifdef CONFIG_LTO
  AR=$(CROSS_PREFIX)gcc-ar
else
-@@ -97,7 +98,7 @@ DEFINES:=-D_GNU_SOURCE -DCONFIG_VERSION=\"$(shell cat 
+@@ -102,7 +103,7 @@ endif
  CFLAGS+=$(DEFINES)
  CFLAGS_DEBUG=$(CFLAGS) -O0
  CFLAGS_SMALL=$(CFLAGS) -Os
@@ -43,7 +43,7 @@ Index: Makefile
  CFLAGS_NOLTO:=$(CFLAGS_OPT)
  LDFLAGS=-g
  ifdef CONFIG_LTO
-@@ -165,7 +166,7 @@ QJSBN_OBJS=$(OBJDIR)/qjs.bn.o $(OBJDIR)/repl-bn.bn.o $
+@@ -168,7 +169,7 @@ endif
  
  LIBS=-lm
  ifndef CONFIG_WIN32
Index: patches/patch-qjsc_c
===
RCS file: /cvs/ports/lang/quickjs/patches/patch-qjsc_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-qjsc_c
--- patches/patch-qjsc_c21 Dec 2019 14:24:03 -  1.1.1.1
+++ patches/patch-qjsc_c21 Feb 2020 17:29:36 -
@@ -2,14 +2,19 @@ $OpenBSD: patch-qjsc_c,v 1.1.1.1 2019/12
 
 Remove -ldl
 
+Add -latomic if the ports Makefile passes -DLINK_ATOMIC
+
 Index: qjsc.c
 --- qjsc.c.orig
 +++ qjsc.c
-@@ -450,7 +450,6 @@ static int output_executable(const char *out_filename,
+@@ -446,7 +446,9 @@ static int output_executable(const char *out_filename,
   lib_dir, bn_suffix, lto_suffix);
  *arg++ = libjsname;
  *arg++ = "-lm";
 -*arg++ = "-ldl";
++#ifdef LINK_ATOMIC
++*arg++ = "-latomic";
++#endif
  *arg = NULL;
  
  if (verbose) {
Index: patches/patch-quickjs_c
===
RCS file: /cvs/ports/lang/quickjs/patches/patch-quickjs_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-quickjs_c
--- patches/patch-quickjs_c 21 Dec 2019 14:24:03 -  1.1.1.1
+++ patches/patch-quickjs_c 21 Feb 2020 17:29:36 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-quickjs_c,v 1.1.1.1 2019
 Index: quickjs.c
 --- quickjs.c.orig
 +++ quickjs.c
-@

Re: UPDATE: editors/tiled

2020-02-21 Thread Jeremie Courreges-Anglas

On Fri, Feb 21 2020, Rafael Sadowski  wrote:
> Update tiled to 1.3.1 (Qt4 to Qt5).
>
> Notable changes:
>
> - Move to GH_*
> - s/http/https/
> - Tests are no longer build. I didn't get a good look at it. tiled works
>   fine for me in a simple run-time test.
> - Set MODPY_DEFAULT_VERSION_3
>
> OK?

I only played with tiles and tiled for a uni course (!) years ago, but
figured I'd give this a try anyway.  Runtime looks good after I install
qtdeclarative, because of a missing dep on libQt5Qml.so.

--8<--
ritchie ~$ tiled
ld.so: tiled: can't load library 'libQt5Qml.so.2.2'
Killed
-->8--

--8<--
russell /usr/ports/editors/tiled$ make port-lib-depends-check

tiled-1.3.1(editors/tiled):
Missing lib: Qt5Qml.2 (/usr/local/bin/tiled) (NOT REACHABLE)
*** Error 1 in target 'port-lib-depends-check' (ignored)
-->8--

This needs adjusting, portcheck also says:

  missing RDEP on misc/shared-mime-info

and...

> Index: Makefile
> ===
> RCS file: /cvs/ports/editors/tiled/Makefile,v
> retrieving revision 1.15
> diff -u -p -u -p -r1.15 Makefile
> --- Makefile  12 Jul 2019 20:46:06 -  1.15
> +++ Makefile  21 Feb 2020 07:10:16 -
> @@ -2,36 +2,32 @@
>  
>  COMMENT =tile map editor
>  
> -V =  0.9.1
> -DISTNAME =   tiled-qt-${V}
> -PKGNAME =tiled-${V}
> -REVISION =   6
> +GH_ACCOUNT = bjorn
> +GH_PROJECT = tiled
> +GH_TAGNAME = v1.3.1
>  
> -SHARED_LIBS +=   tiled 0.0 # 1.0
> +SHARED_LIBS +=   tiled 1.0 # 1.0
>  
>  CATEGORIES = editors games
>  
> -HOMEPAGE =   http://www.mapeditor.org/
> +HOMEPAGE =   https://www.mapeditor.org/
>  
>  # GPLv2+
>  PERMIT_PACKAGE = Yes
>  
> -WANTLIB += GL ICE QtGui QtOpenGL SM X11 Xext Xi Xinerama Xrender
> -WANTLIB += c fontconfig freetype m pthread ${COMPILER_LIBCXX} z
> +WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Network Qt5Widgets
> +WANTLIB += c m ${MODPY_WANTLIB} z
>  
> -COMPILER =   base-clang ports-gcc base-gcc
> +MODULES =devel/qmake \
> + lang/python \
> + x11/qt5
>  
> -MASTER_SITES =   ${MASTER_SITE_SOURCEFORGE:=tiled/}
> +MODPY_VERSION =  ${MODPY_DEFAULT_VERSION_3}
>  
>  RUN_DEPENDS =devel/desktop-file-utils \
>   x11/gtk+3,-guic
> -MODULES =devel/qmake x11/qt4
>  
>  # XXX qmake picks up Cocoa/Cocoa.h even though it's apparently unused
>  DPB_PROPERTIES = nojunk
> -
> -do-test:
> - cd ${WRKSRC}/tests/staggeredrenderer && ./staggeredrenderer && \
> - cd ${WRKSRC}/tests/mapreader && ./mapreader

... make test now spews:

  ===>  Regression tests for tiled-1.3.1
  make: don't know how to make test
  Stop in /usr/ports/pobj/tiled-1.3.1/tiled-1.3.1/build-amd64

So this needs an updated test target or NO_TEST=Yes.

>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/editors/tiled/distinfo,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 distinfo
> --- distinfo  28 Apr 2014 09:48:54 -  1.2
> +++ distinfo  21 Feb 2020 07:10:16 -
> @@ -1,2 +1,2 @@
> -SHA256 (tiled-qt-0.9.1.tar.gz) = aGj4MzuMZoNTAXkgUaduf8aEZ2GbbpeoW1h/U3w2tSc=
> -SIZE (tiled-qt-0.9.1.tar.gz) = 1436286
> +SHA256 (tiled-1.3.1.tar.gz) = s3Mh41vdt7yW+QaO3AYmiz8OuGMv5iBq7ilsjWw7pyI=
> +SIZE (tiled-1.3.1.tar.gz) = 15728903
> Index: patches/patch-src_automappingconverter_automappingconverter_pro
> ===
> RCS file: patches/patch-src_automappingconverter_automappingconverter_pro
> diff -N patches/patch-src_automappingconverter_automappingconverter_pro
> --- patches/patch-src_automappingconverter_automappingconverter_pro   28 Apr 
> 2014 09:48:54 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-src_automappingconverter_automappingconverter_pro,v 1.1 
> 2014/04/28 09:48:54 bentley Exp $
>  src/automappingconverter/automappingconverter.pro.orig   Mon Apr 28 
> 02:32:11 2014
> -+++ src/automappingconverter/automappingconverter.proMon Apr 28 
> 02:32:17 2014
> -@@ -48,7 +48,7 @@ HEADERS  += \
> - FORMS+= \
> - converterwindow.ui
> - 
> --manpage.path = $${PREFIX}/share/man/man1/
> -+manpage.path = $${PREFIX}/man/man1/
> - manpage.files += ../../docs/automappingconverter.1
> - INSTALLS += manpage
> - 
> Index: patches/patch-src_tiled_tiled_pro
> ===
> RCS file: /cvs/ports/editors/tiled/patches/patch-src_tiled_tiled_pro,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-src_tiled_tiled_pro
> --- patches/patch-src_tiled_tiled_pro 28 Apr 2014 09:48:54 -  1.2
> +++ patches/patch-src_tiled_tiled_pro 21 Feb 2020 07:10:16 -
> @@ -1,12 +1,13 @@
>  $OpenBSD: patch-src_tiled_tiled

Re: UPDATE: security/zaproxy to 2.9.0

2020-02-21 Thread Jeremie Courreges-Anglas

On Fri, Feb 21 2020, Asher Pasha  wrote:
> Hi Ports,

Hi,

> I am learning OpenBSD. This updates zaproxy to 2.9.0. It works on
> amd64.

Nice to see a new contributor.  I' not sure I'll be able to handle this
proposal, but I can point out three things:
- don't copy/paste diffs, it mangles newlines and generally whitespace,
  making the patch unusable for patch(1).  Either send your diff as an
  attachment or use a mail client that won't mangle an inline diff.
- REVISION should be dropped for updates

> OK?

- asking for oks is mostly a committer thing, getting an ok won't help
  you much if you don't have the magic commit bit.


> Index: Makefile
> ===
> RCS file: /cvs/ports/security/zaproxy/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile 12 Jul 2019 20:49:38 - 1.9
> +++ Makefile 21 Feb 2020 05:45:08 -
> @@ -2,8 +2,8 @@
>
>  COMMENT = web application security tool
>
> -VERSION = 2.7.0
> -REVISION = 2
> +VERSION = 2.9.0
> +REVISION = 1
>  DISTNAME = ZAP_${VERSION}_Linux
>  PKGNAME = zaproxy-${VERSION}
>
> @@ -14,8 +14,7 @@ HOMEPAGE = https://www.owasp.org/index.
>  # Apache v2.0 License
>  PERMIT_PACKAGE = Yes
>
> -MASTER_SITES =
> https://github.com/zaproxy/zaproxy/releases/download/${VERSION}/
> -MASTER_SITES += ${MASTER_SITE_PACKETSTORM:=web/}
> +MASTER_SITES =
> https://github.com/zaproxy/zaproxy/releases/download/v${VERSION}/
>
>  MODULES =   java
>  MODJAVA_VER =   1.8+
> Index: distinfo
> ===
> RCS file: /cvs/ports/security/zaproxy/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo 16 Feb 2018 19:36:55 - 1.4
> +++ distinfo 21 Feb 2020 05:45:08 -
> @@ -1,2 +1,2 @@
> -SHA256 (ZAP_2.7.0_Linux.tar.gz) =
> t0HDwhBoh/HQQJblO+Nf7XErt6heGYYVIyg7t23vtZ0=
> -SIZE (ZAP_2.7.0_Linux.tar.gz) = 130903023
> +SHA256 (ZAP_2.9.0_Linux.tar.gz) =
> THK6nZumD1jcfrJsWBjPmKOLpYub8jE6rdaYMthenLE=
> +SIZE (ZAP_2.9.0_Linux.tar.gz) = 96873657
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/security/zaproxy/pkg/PLIST,v
> retrieving revision 1.4
> diff -u -p -r1.4 PLIST
> --- pkg/PLIST 16 Feb 2018 19:36:55 - 1.4
> +++ pkg/PLIST 21 Feb 2020 05:45:08 -
> @@ -15,6 +15,7 @@ share/zaproxy/lang/Messages_ar_SA.proper
>  share/zaproxy/lang/Messages_az_AZ.properties
>  share/zaproxy/lang/Messages_bn_BD.properties
>  share/zaproxy/lang/Messages_bs_BA.properties
> +share/zaproxy/lang/Messages_ceb_PH.properties
>  share/zaproxy/lang/Messages_da_DK.properties
>  share/zaproxy/lang/Messages_de_DE.properties
>  share/zaproxy/lang/Messages_el_GR.properties
> @@ -22,6 +23,7 @@ share/zaproxy/lang/Messages_es_ES.proper
>  share/zaproxy/lang/Messages_fa_IR.properties
>  share/zaproxy/lang/Messages_fil_PH.properties
>  share/zaproxy/lang/Messages_fr_FR.properties
> +share/zaproxy/lang/Messages_ha_HG.properties
>  share/zaproxy/lang/Messages_he_IL.properties
>  share/zaproxy/lang/Messages_hi_IN.properties
>  share/zaproxy/lang/Messages_hr_HR.properties
> @@ -34,8 +36,10 @@ share/zaproxy/lang/Messages_mk_MK.proper
>  share/zaproxy/lang/Messages_ms_MY.properties
>  share/zaproxy/lang/Messages_nb_NO.properties
>  share/zaproxy/lang/Messages_nl_NL.properties
> +share/zaproxy/lang/Messages_pcm_NG.properties
>  share/zaproxy/lang/Messages_pl_PL.properties
>  share/zaproxy/lang/Messages_pt_BR.properties
> +share/zaproxy/lang/Messages_pt_PT.properties
>  share/zaproxy/lang/Messages_ro_RO.properties
>  share/zaproxy/lang/Messages_ru_RU.properties
>  share/zaproxy/lang/Messages_si_LK.properties
> @@ -48,12 +52,14 @@ share/zaproxy/lang/Messages_tr_TR.proper
>  share/zaproxy/lang/Messages_uk_UA.properties
>  share/zaproxy/lang/Messages_ur_PK.properties
>  share/zaproxy/lang/Messages_vi_VN.properties
> +share/zaproxy/lang/Messages_yo_NG.properties
>  share/zaproxy/lang/Messages_zh_CN.properties
>  share/zaproxy/lang/vulnerabilities.xml
>  share/zaproxy/lang/vulnerabilities_ar_SA.xml
>  share/zaproxy/lang/vulnerabilities_az_AZ.xml
>  share/zaproxy/lang/vulnerabilities_bn_BD.xml
>  share/zaproxy/lang/vulnerabilities_bs_BA.xml
> +share/zaproxy/lang/vulnerabilities_ceb_PH.xml
>  share/zaproxy/lang/vulnerabilities_da_DK.xml
>  share/zaproxy/lang/vulnerabilities_de_DE.xml
>  share/zaproxy/lang/vulnerabilities_el_GR.xml
> @@ -61,6 +67,7 @@ share/zaproxy/lang/vulnerabilities_es_ES
>  share/zaproxy/lang/vulnerabilities_fa_IR.xml
>  share/zaproxy/lang/vulnerabilities_fil_PH.xml
>  share/zaproxy/lang/vulnerabilities_fr_FR.xml
> +share/zaproxy/lang/vulnerabilities_ha_HG.xml
>  share/zaproxy/lang/vulnerabilities_he_IL.xml
>  share/zaproxy/lang/vulnerabilities_hi_IN.xml
>  share/zaproxy/lang/vulnerabilities_hr_HR.xml
> @@ -73,8 +80,10 @@ share/zaproxy/lang/vulnerabilities_mk_MK
>  share/zaproxy/lang/vulnerabilities_ms_MY.xml
>  share/zaproxy/lang/vulnerabilities_nb_NO.xml
>  share/zapro

Re: Qt4 to Qt5 switch in graphics/djview4

2020-02-21 Thread Jeremie Courreges-Anglas

On Fri, Feb 21 2020, Rafael Sadowski  wrote:
> Simple switch form qt4 to qt5. Tested on amd64, OK?

Works fine with my usual .djvu files.  ok jca@

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

Re: UPDATE: audio/hydrogen-1.0.0-beta1

2020-02-21 Thread Stuart Henderson

On 2020/02/21 17:46, Raphael Graf wrote:
> This version uses Qt5 and adds support for midi output. 
> Here is a list of new features: 
> https://github.com/hydrogen-music/hydrogen/releases 
> 
> (The OSC support is disabled for now as it needs audio/liblo, see
> https://marc.info/?l=openbsd-ports-cvs&m=150971570107043)
> 
> Comments, ok?
> 
> 

> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/hydrogen/Makefile,v
> retrieving revision 1.27
> diff -u -p -u -p -r1.27 Makefile
> --- Makefile  12 Jul 2019 20:43:34 -  1.27
> +++ Makefile  21 Feb 2020 16:24:00 -
> @@ -2,55 +2,59 @@
>  
>  COMMENT= software drum machine
>  
> -DISTNAME=hydrogen-0.9.7
> +DISTNAME=hydrogen-1.0.0-beta1

that produces a bad PKGNAME, use e.g.

DISTNAME=   hydrogen-1.0.0-beta1
PKGNAME=${DISTNAME:S/-beta/beta/}

The rest reads OK but untested

UPDATE: audio/hydrogen-1.0.0-beta1

2020-02-21 Thread Raphael Graf

This version uses Qt5 and adds support for midi output. 
Here is a list of new features: 
https://github.com/hydrogen-music/hydrogen/releases 

(The OSC support is disabled for now as it needs audio/liblo, see
https://marc.info/?l=openbsd-ports-cvs&m=150971570107043)

Comments, ok?


Index: Makefile
===
RCS file: /cvs/ports/audio/hydrogen/Makefile,v
retrieving revision 1.27
diff -u -p -u -p -r1.27 Makefile
--- Makefile12 Jul 2019 20:43:34 -  1.27
+++ Makefile21 Feb 2020 16:24:00 -
@@ -2,55 +2,59 @@
 
 COMMENT=   software drum machine
 
-DISTNAME=  hydrogen-0.9.7
+DISTNAME=  hydrogen-1.0.0-beta1
 CATEGORIES=audio
 
 HOMEPAGE=  http://www.hydrogen-music.org/
 
-SHARED_LIBS=   hydrogen-core-0.9.7 0.0
+SHARED_LIBS=   hydrogen-core-1.0.0 0.0
 
 # GPLv2
 PERMIT_PACKAGE=Yes
 
-WANTLIB += ${COMPILER_LIBCXX} QtGui QtNetwork QtXml QtXmlPatterns archive c
-WANTLIB += lrdf m sndfile sndio z
+WANTLIB += ${COMPILER_LIBCXX} archive c
+WANTLIB += Qt5Core Qt5Gui Qt5Network Qt5Widgets Qt5Xml Qt5XmlPatterns
+WANTLIB += lrdf m rubberband sndfile sndio z
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=hydrogen/}
 
-COMPILER = base-clang ports-gcc base-gcc
-
 LIB_DEPENDS=   audio/libsndfile \
+   audio/rubberband \
archivers/libarchive \
-   textproc/liblrdf
+   textproc/liblrdf \
+   x11/qt5/qtxmlpatterns
 
-BUILD_DEPENDS= audio/ladspa
+BUILD_DEPENDS= audio/ladspa \
+   devel/cppunit
 
 RUN_DEPENDS=   devel/desktop-file-utils
 
 MODULES=   devel/cmake \
-   x11/qt4
+   x11/qt5
 
 CONFIGURE_ENV= LADSPA_PATH=${LOCALBASE}/lib/ladspa
 
 CONFIGURE_ARGS=-DWANT_ALSA=OFF \
-   -DWANT_CPPUNIT=OFF \
+   -DWANT_CPPUNIT=ON \
-DWANT_DEBUG=OFF \
-DWANT_JACK=OFF \
-DWANT_JACKSESSION=OFF \
-DWANT_LADSPA=ON \
-DWANT_LRDF=ON \
-   -DWANT_NSMSESSION=OFF \
+   -DWANT_OSC=OFF \
-DWANT_PORTAUDIO=OFF \
-DWANT_PORTMIDI=OFF \
-DWANT_PULSEAUDIO=OFF \
+   -DWANT_RUBBERBAND=ON \
-DWANT_SNDIO=ON
 
-NO_TEST=   Yes
-
 post-extract:
cp ${FILESDIR}/Sndio{Audio,Midi}Driver.h \
${WRKSRC}/src/core/include/hydrogen/IO
cp ${FILESDIR}/sndio_{audio,midi}_driver.cpp \
${WRKSRC}/src/core/src/IO
+
+do-test:
+   cd ${WRKSRC} && ${WRKBUILD}/src/tests/tests
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/audio/hydrogen/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo8 Jun 2019 18:42:32 -   1.6
+++ distinfo21 Feb 2020 16:24:00 -
@@ -1,2 +1,2 @@
-SHA256 (hydrogen-0.9.7.tar.gz) = zYNV6Qk9AwGDDmJf45+OI4usrdk+WlVsF1yLUG7UOCI=
-SIZE (hydrogen-0.9.7.tar.gz) = 6420359
+SHA256 (hydrogen-1.0.0-beta1.tar.gz) = 
G2eNj1bvrARejfFeL6H6lRJ5lyvZtvGWcvv+vpBOlBo=
+SIZE (hydrogen-1.0.0-beta1.tar.gz) = 13744583
Index: files/SndioMidiDriver.h
===
RCS file: /cvs/ports/audio/hydrogen/files/SndioMidiDriver.h,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 SndioMidiDriver.h
--- files/SndioMidiDriver.h 8 Jun 2019 18:42:32 -   1.2
+++ files/SndioMidiDriver.h 21 Feb 2020 16:24:00 -
@@ -18,6 +18,7 @@
 #define SNDIO_MIDI_DRIVER_H
 
 #include 
+#include 
 
 #ifdef H2CORE_HAVE_SNDIO
 
@@ -26,7 +27,7 @@
 namespace H2Core
 {
 
-class SndioMidiDriver : public virtual MidiInput
+class SndioMidiDriver : public virtual MidiInput, public virtual MidiOutput
 {
H2_OBJECT
 public:
@@ -39,6 +40,11 @@ public:
virtual void open();
virtual void close();
virtual std::vector getOutputPortList();
+
+   virtual void handleQueueNote( Note* pNote );
+   virtual void handleQueueNoteOff( int channel, int key, int velocity );
+   virtual void handleQueueAllNoteOff();
+   virtual void handleOutgoingControlChange( int param, int value, int 
channel );
 
 private:
 
Index: files/sndio_audio_driver.cpp
===
RCS file: /cvs/ports/audio/hydrogen/files/sndio_audio_driver.cpp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 sndio_audio_driver.cpp
--- files/sndio_audio_driver.cpp8 Jun 2019 18:42:32 -   1.2
+++ files/sndio_audio_driver.cpp21 Feb 2020 16:24:00 -
@@ -91,15 +91,13 @@ int SndioAudioDriver::connect

Re: update request: net/mlvpn

2020-02-21 Thread ed


On 21.02.2020 01:33, Stuart Henderson wrote:

I've reworked this stuff now you provide proper tar.gz files rather
than the github auto-generated ones (thanks :-)


Oh yes, that's better indeed.

You are right for --disable-filters, sorry for the mistake.

Thank you,

--
Laurent Coustet

Re: Remove: databases/sqliteman

2020-02-21 Thread Jeremie Courreges-Anglas

On Fri, Feb 21 2020, Rafael Sadowski  wrote:
> I would like to see sqliteman gone. My arguments:
>
> - Upstream dead, last update 2010
> - Qt4
> - editors/qscintilla (Qt4) consumer -- Which should also disappear soon!
> - Better alterntives in tree like databases/{sqlitebrowser,kexi} and
>   maybe more.
>
> OK to remove with a suggestions line in quirks?

Sure.

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

UPDATE: security/zaproxy to 2.9.0

2020-02-21 Thread Asher Pasha

Hi Ports,
I am learning OpenBSD. This updates zaproxy to 2.9.0. It works on
amd64.

OK?


Index: Makefile
===
RCS file: /cvs/ports/security/zaproxy/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 12 Jul 2019 20:49:38 - 1.9
+++ Makefile 21 Feb 2020 05:45:08 -
@@ -2,8 +2,8 @@

 COMMENT = web application security tool

-VERSION = 2.7.0
-REVISION = 2
+VERSION = 2.9.0
+REVISION = 1
 DISTNAME = ZAP_${VERSION}_Linux
 PKGNAME = zaproxy-${VERSION}

@@ -14,8 +14,7 @@ HOMEPAGE = https://www.owasp.org/index.
 # Apache v2.0 License
 PERMIT_PACKAGE = Yes

-MASTER_SITES =
https://github.com/zaproxy/zaproxy/releases/download/${VERSION}/
-MASTER_SITES += ${MASTER_SITE_PACKETSTORM:=web/}
+MASTER_SITES =
https://github.com/zaproxy/zaproxy/releases/download/v${VERSION}/

 MODULES =   java
 MODJAVA_VER =   1.8+
Index: distinfo
===
RCS file: /cvs/ports/security/zaproxy/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 16 Feb 2018 19:36:55 - 1.4
+++ distinfo 21 Feb 2020 05:45:08 -
@@ -1,2 +1,2 @@
-SHA256 (ZAP_2.7.0_Linux.tar.gz) =
t0HDwhBoh/HQQJblO+Nf7XErt6heGYYVIyg7t23vtZ0=
-SIZE (ZAP_2.7.0_Linux.tar.gz) = 130903023
+SHA256 (ZAP_2.9.0_Linux.tar.gz) =
THK6nZumD1jcfrJsWBjPmKOLpYub8jE6rdaYMthenLE=
+SIZE (ZAP_2.9.0_Linux.tar.gz) = 96873657
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/zaproxy/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 16 Feb 2018 19:36:55 - 1.4
+++ pkg/PLIST 21 Feb 2020 05:45:08 -
@@ -15,6 +15,7 @@ share/zaproxy/lang/Messages_ar_SA.proper
 share/zaproxy/lang/Messages_az_AZ.properties
 share/zaproxy/lang/Messages_bn_BD.properties
 share/zaproxy/lang/Messages_bs_BA.properties
+share/zaproxy/lang/Messages_ceb_PH.properties
 share/zaproxy/lang/Messages_da_DK.properties
 share/zaproxy/lang/Messages_de_DE.properties
 share/zaproxy/lang/Messages_el_GR.properties
@@ -22,6 +23,7 @@ share/zaproxy/lang/Messages_es_ES.proper
 share/zaproxy/lang/Messages_fa_IR.properties
 share/zaproxy/lang/Messages_fil_PH.properties
 share/zaproxy/lang/Messages_fr_FR.properties
+share/zaproxy/lang/Messages_ha_HG.properties
 share/zaproxy/lang/Messages_he_IL.properties
 share/zaproxy/lang/Messages_hi_IN.properties
 share/zaproxy/lang/Messages_hr_HR.properties
@@ -34,8 +36,10 @@ share/zaproxy/lang/Messages_mk_MK.proper
 share/zaproxy/lang/Messages_ms_MY.properties
 share/zaproxy/lang/Messages_nb_NO.properties
 share/zaproxy/lang/Messages_nl_NL.properties
+share/zaproxy/lang/Messages_pcm_NG.properties
 share/zaproxy/lang/Messages_pl_PL.properties
 share/zaproxy/lang/Messages_pt_BR.properties
+share/zaproxy/lang/Messages_pt_PT.properties
 share/zaproxy/lang/Messages_ro_RO.properties
 share/zaproxy/lang/Messages_ru_RU.properties
 share/zaproxy/lang/Messages_si_LK.properties
@@ -48,12 +52,14 @@ share/zaproxy/lang/Messages_tr_TR.proper
 share/zaproxy/lang/Messages_uk_UA.properties
 share/zaproxy/lang/Messages_ur_PK.properties
 share/zaproxy/lang/Messages_vi_VN.properties
+share/zaproxy/lang/Messages_yo_NG.properties
 share/zaproxy/lang/Messages_zh_CN.properties
 share/zaproxy/lang/vulnerabilities.xml
 share/zaproxy/lang/vulnerabilities_ar_SA.xml
 share/zaproxy/lang/vulnerabilities_az_AZ.xml
 share/zaproxy/lang/vulnerabilities_bn_BD.xml
 share/zaproxy/lang/vulnerabilities_bs_BA.xml
+share/zaproxy/lang/vulnerabilities_ceb_PH.xml
 share/zaproxy/lang/vulnerabilities_da_DK.xml
 share/zaproxy/lang/vulnerabilities_de_DE.xml
 share/zaproxy/lang/vulnerabilities_el_GR.xml
@@ -61,6 +67,7 @@ share/zaproxy/lang/vulnerabilities_es_ES
 share/zaproxy/lang/vulnerabilities_fa_IR.xml
 share/zaproxy/lang/vulnerabilities_fil_PH.xml
 share/zaproxy/lang/vulnerabilities_fr_FR.xml
+share/zaproxy/lang/vulnerabilities_ha_HG.xml
 share/zaproxy/lang/vulnerabilities_he_IL.xml
 share/zaproxy/lang/vulnerabilities_hi_IN.xml
 share/zaproxy/lang/vulnerabilities_hr_HR.xml
@@ -73,8 +80,10 @@ share/zaproxy/lang/vulnerabilities_mk_MK
 share/zaproxy/lang/vulnerabilities_ms_MY.xml
 share/zaproxy/lang/vulnerabilities_nb_NO.xml
 share/zaproxy/lang/vulnerabilities_nl_NL.xml
+share/zaproxy/lang/vulnerabilities_pcm_NG.xml
 share/zaproxy/lang/vulnerabilities_pl_PL.xml
 share/zaproxy/lang/vulnerabilities_pt_BR.xml
+share/zaproxy/lang/vulnerabilities_pt_PT.xml
 share/zaproxy/lang/vulnerabilities_ro_RO.xml
 share/zaproxy/lang/vulnerabilities_ru_RU.xml
 share/zaproxy/lang/vulnerabilities_si_LK.xml
@@ -87,43 +96,45 @@ share/zaproxy/lang/vulnerabilities_tr_TR
 share/zaproxy/lang/vulnerabilities_uk_UA.xml
 share/zaproxy/lang/vulnerabilities_ur_PK.xml
 share/zaproxy/lang/vulnerabilities_vi_VN.xml
+share/zaproxy/lang/vulnerabilities_yo_NG.xml
 share/zaproxy/lang/vulnerabilities_zh_CN.xml
 share/zaproxy/lib/
-share/zaproxy/lib/BrowserLauncher2-1_3.jar
-share/zaproxy/lib/bcmail-jdk15on-152.ja

Re: UPDATE: net/weechat

2020-02-21 Thread Daniel Jakots

On Fri, 21 Feb 2020 06:23:02 +0100, Rafael Sadowski
 wrote:

> Update weechat to 2.7.1 (security release)
> 
> This update fix three security problems.
> 
> - CVE-2020-8955
>   Buffer overflow when receiving a malformed IRC message 324 (channel
>   mode).
> - Buffer overflow when a new IRC message 005 is received with longer
>   nick prefixes.
> - Crash when receiving a malformed IRC message 352 (WHO).
> 
> OK? 

Thanks for the quick update!
ok dan@ for -current

Cheers,
Daniel

Re: pledge net/ngircd

2020-02-21 Thread Michael

On Fri, Feb 14, 2020 at 06:31:50PM +0100, Solene Rapenne wrote:
> [...]
> I'm ok with the last patch, it's harmless (no special configuration
> required) and will improve security.
> 
> I CC maintainer, it's up to tsg now
> 

Ping?

While we are there, mentioned pledge() in the Makefile, new patch below:


Index: Makefile
===
RCS file: /cvs/ports/net/ngircd/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile12 Jul 2019 20:48:34 -  1.18
+++ Makefile21 Feb 2020 12:36:53 -
@@ -4,6 +4,8 @@ COMMENT =   lightweight irc server
 
 DISTNAME = ngircd-25
 
+REVISION = 0
+
 CATEGORIES =   net
 
 HOMEPAGE = https://ngircd.barton.de/
@@ -13,6 +15,7 @@ MAINTAINER =  Giannis Tsaraias http://ngircd.barton.de/pub/ngircd/ \
Index: patches/patch-src_ngircd_ngircd_c
===
RCS file: /cvs/ports/net/ngircd/patches/patch-src_ngircd_ngircd_c,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_ngircd_ngircd_c
--- patches/patch-src_ngircd_ngircd_c   3 Dec 2014 10:32:18 -   1.4
+++ patches/patch-src_ngircd_ngircd_c   21 Feb 2020 12:36:53 -
@@ -1,7 +1,25 @@
 $OpenBSD: patch-src_ngircd_ngircd_c,v 1.4 2014/12/03 10:32:18 jasper Exp $
 src/ngircd/ngircd.c.orig   Mon Jul 14 13:26:07 2014
-+++ src/ngircd/ngircd.cTue Dec  2 20:05:31 2014
-@@ -563,7 +563,7 @@ Setup_FDStreams(int fd)
+Index: src/ngircd/ngircd.c
+--- src/ngircd/ngircd.c.orig
 src/ngircd/ngircd.c
+@@ -259,6 +259,16 @@ main(int argc, const char *argv[])
+   exit(1);
+   }
+ 
++  /* XXX using a PID file needs cpath to unlink() later */
++  if(Conf_PidFile[0]) {
++  if ( pledge("stdio inet dns rpath proc getpw cpath", 
NULL) == -1)
++  err(1, "pledge");
++  }
++  else {
++  if ( pledge("stdio inet dns rpath proc getpw", NULL) == 
-1)
++  err(1, "pledge");
++  }
++
+   /* Initialize modules, part II: these functions are eventually
+* called with already dropped privileges ... */
+   Channel_Init();
+@@ -563,7 +573,7 @@ Setup_FDStreams(int fd)
  #if !defined(SINGLE_USER_OS)
  
  /**
@@ -10,7 +28,7 @@ $OpenBSD: patch-src_ngircd_ngircd_c,v 1.
   *
   * @param uid User ID
   * @param gid Group ID
-@@ -587,7 +587,7 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
+@@ -587,7 +597,7 @@ NGIRCd_getNobodyID(uid_t *uid, gid_t *gid )
}
  #endif
  
@@ -19,7 +37,7 @@ $OpenBSD: patch-src_ngircd_ngircd_c,v 1.
if (!pwd)
return false;
  
-@@ -703,11 +703,11 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
+@@ -703,11 +713,11 @@ NGIRCd_Init(bool NGIRCd_NoDaemon)
if (Conf_UID == 0) {
pwd = getpwuid(0);
Log(LOG_INFO,
Index: patches/patch-src_ngircd_proc_c
===
RCS file: patches/patch-src_ngircd_proc_c
diff -N patches/patch-src_ngircd_proc_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_ngircd_proc_c 21 Feb 2020 12:36:53 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: src/ngircd/proc.c
+--- src/ngircd/proc.c.orig
 src/ngircd/proc.c
+@@ -76,6 +76,9 @@ Proc_Fork(PROC_STAT *proc, int *pipefds, void (*cbfunc
+   return -1;
+   case 0:
+   /* New child process: */
++  /* XXX no PAM, fork only for DNS */
++  if (pledge("stdio dns", NULL) == -1)   
++  err(1, "pledge"); 
+ #ifdef HAVE_ARC4RANDOM_STIR
+   arc4random_stir();
+ #endif

Re: UPDATE: editors/teaqt

2020-02-21 Thread Stuart Henderson

On 2020/02/21 07:26, Rafael Sadowski wrote:
> Update tea-qt 50.0.4. Just another Qt5 update.
>  
>  COMMENT =powerful and simple qt4 editor

COMMENT needs updating too ;)   just "powerful and simple Qt editor"
without the version is probably best. (Wrong capitalisation in DESCR
as well, s/QT/Qt/).

Re: UPDATE: editors/teaqt

2020-02-21 Thread Stuart Henderson

On 2020/02/21 07:26, Rafael Sadowski wrote:
> Update tea-qt 50.0.4. Just another Qt5 update.
> 
> CC maintainer from homepage http://semiletov.org/tea/#downloads :-D
> 
> OK?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/editors/teaqt/Makefile,v
> retrieving revision 1.26
> diff -u -p -u -p -r1.26 Makefile
> --- Makefile  12 Jul 2019 20:46:06 -  1.26
> +++ Makefile  21 Feb 2020 06:23:14 -
> @@ -2,32 +2,41 @@
>  
>  COMMENT =powerful and simple qt4 editor
>  
> -V =  33.3.0
> -REVISION =   2
> -DISTNAME =   tea-${V}
> -PKGNAME =teaqt-${V}
> +GH_ACCOUNT = psemiletov
> +GH_PROJECT = tea-qt
> +GH_TAGNAME = 50.0.4
> +
> +PKGNAME =teaqt-${GH_TAGNAME}

You don't need to set PKGNAME here, the same thing is set automatically by GH_*.

Re: UPDATE: editors/teaqt

2020-02-21 Thread Rafael Sadowski

On Fri Feb 21, 2020 at 09:46:44AM +0100, Landry Breuil wrote:
> On Fri, Feb 21, 2020 at 07:26:11AM +0100, Rafael Sadowski wrote:
> > Update tea-qt 50.0.4. Just another Qt5 update.
> > 
> > CC maintainer from homepage http://semiletov.org/tea/#downloads :-D
> 
> if it builds & starts ok for me :) update plist again, i think some dirs
> should go away..
> 

Good point, new diff (for the protocol) with fixed icons/desktop dirs.
I'll commit it if no ones yells.

RS


Index: Makefile
===
RCS file: /cvs/ports/editors/teaqt/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- Makefile12 Jul 2019 20:46:06 -  1.26
+++ Makefile21 Feb 2020 10:18:45 -
@@ -2,32 +2,41 @@
 
 COMMENT =  powerful and simple qt4 editor
 
-V =33.3.0
-REVISION = 2
-DISTNAME = tea-${V}
-PKGNAME =  teaqt-${V}
+GH_ACCOUNT =   psemiletov
+GH_PROJECT =   tea-qt
+GH_TAGNAME =   50.0.4
+
+PKGNAME =  teaqt-${GH_TAGNAME}
+
 CATEGORIES =   editors x11
-MASTER_SITES = http://semiletov.org/tea/dloads/ \
-   ${MASTER_SITE_SOURCEFORGE:=tea-editor/}
-EXTRACT_SUFX = .tar.bz2
 
 HOMEPAGE = http://semiletov.org/tea/
 
 # GPLv3
 PERMIT_PACKAGE =   Yes
 
-LIB_DEPENDS =  textproc/aspell/core
-WANTLIB += c m pthread ${COMPILER_LIBCXX} z QtGui QtXml aspell
-WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender fontconfig freetype
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core Qt5Gui Qt5PrintSupport Qt5Widgets
+WANTLIB += aspell c djvulibre hunspell-1.6 m poppler-qt5 z
 
-COMPILER = base-clang ports-gcc base-gcc
+MODULES =  devel/cmake \
+   x11/qt5
 
-MODULES =  devel/qmake x11/qt4
-CONFIGURE_ENV =USE_ASPELL=true USE_HUNSPELL=false
+LIB_DEPENDS =  graphics/djvulibre \
+   print/poppler,-qt5 \
+   textproc/aspell/core \
+   textproc/hunspell
+
+RUN_DEPENDS =  devel/desktop-file-utils \
+   x11/gtk+3,-guic
+
+
+CONFIGURE_ARGS +=  -DCMAKE_C_FLAGS="${CFLAGS} \
+   -I${LOCALBASE}/include" \
+   -DCMAKE_CXX_FLAGS="${CXXFLAGS} \
+   -I${LOCALBASE}/include" \
+   -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} \
+   -L${LOCALBASE}/lib"
 
 NO_TEST =  Yes
-
-do-install:
-   ${INSTALL_PROGRAM} ${WRKBUILD}/bin/tea ${PREFIX}/bin/tea
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/editors/teaqt/distinfo,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 distinfo
--- distinfo22 Nov 2012 10:45:46 -  1.12
+++ distinfo21 Feb 2020 10:18:45 -
@@ -1,2 +1,2 @@
-SHA256 (tea-33.3.0.tar.bz2) = FNVAzWgluUvSLmVbJiZFj9XGEefEzDEk/X2a8+t/Xqg=
-SIZE (tea-33.3.0.tar.bz2) = 310901
+SHA256 (tea-qt-50.0.4.tar.gz) = INH/whj203ijOvrExOtlIDYwWnI8O0Ce4q+8Tum9Hs4=
+SIZE (tea-qt-50.0.4.tar.gz) = 504276
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt21 Feb 2020 10:18:45 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+Fix install path
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -181,11 +181,11 @@ endif()
+ 
+ 
+ install (TARGETS tea DESTINATION bin)
+-install (FILES ${tea_ICONSVG} DESTINATION share/icons/hicolor/scalable/apps)
+-install (FILES ${tea_ICONPNG32} DESTINATION share/icons/hicolor/32x32/apps)
+-install (FILES ${tea_ICONPNG48} DESTINATION share/icons/hicolor/48x48/apps)
+-install (FILES ${tea_ICONPNG64} DESTINATION share/icons/hicolor/64x64/apps)
+-install (FILES ${tea_ICONPNG128} DESTINATION share/icons/hicolor/128x128/apps)
++install (FILES ${tea_ICONSVG} DESTINATION 
${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps)
++install (FILES ${tea_ICONPNG32} DESTINATION 
${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/32x32/apps)
++install (FILES ${tea_ICONPNG48} DESTINATION 
${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/48x48/apps)
++install (FILES ${tea_ICONPNG64} DESTINATION 
${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/64x64/apps)
++install (FILES ${tea_ICONPNG128} DESTINATION 
${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/128x128/apps)
+ 
+-install (FILES ${tea_DESKTOP} DESTINATION share/applications)
++install (FILES ${tea_DESKTOP} DESTINATION 
${CMAKE_INSTALL_PREFIX}/share/applications)
+ 
Index: patches/patch-spellchecker_cpp
===
RCS file: patches/patch-spellchecker_cpp
diff -N patches/patch-spellchecker_cpp
--- patches/patch-spellchecker_cpp  22 Nov 2012 10:45:46 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-spellchecker_cpp,v 1.3 2012/11/22 10:45:46 landry Exp $
 spellchecker.cpp.orig  Tue Aug 28 21:01:31 2012

Re: UPDATE: editors/teaqt

2020-02-21 Thread Landry Breuil

On Fri, Feb 21, 2020 at 07:26:11AM +0100, Rafael Sadowski wrote:
> Update tea-qt 50.0.4. Just another Qt5 update.
> 
> CC maintainer from homepage http://semiletov.org/tea/#downloads :-D

if it builds & starts ok for me :) update plist again, i think some dirs
should go away..

Re: [net/zabbix] PSK support?

2020-02-21 Thread Mark Patruck


On 2020-02-19 22:17, William Leuschner wrote:

Hello porters,

I'm trying to set up Zabbix with pre-shared keys so that:
* connections are encrypted, and
* the agent will reject connections from anyone without the key.
The configuration that should work currently fails with a library error.

According to this note from 2017[1], PSK support was removed from LibreSSL, and the best choice 
would be building against gnutls. Has anything changed since then, or is gnutls still the best 
option? If gnutls is the best bet, would a gnutls flavor be welcome?


Though i'm using zabbix mostly in larger setups where only
certificates make sense (handling, security), i see the
advantage of having PSK support when only few monitored
systems are involved (or for testing purposes).

That said, i'd also switch completely to gnutls, instead
of having another FLAVOR.

-Mark   


Thanks,
William Leuschner


[1]: https://marc.info/?l=openbsd-ports&m=148465399628705&w=2



--
Mark Patruck ( mark at wrapped.cx )
GPG key 0xF2865E51 / 187F F6D3 EE04 1DCE 1C74  F644 0D3C F66F F286 5E51

https://www.wrapped.cx

Re: new: www/p5-Test-LWP-UserAgent

2020-02-21 Thread Benoit Lecocq





On 21/02/2020 02:20, Jeremie Courreges-Anglas wrote:

On Fri, Feb 21 2020, Paco Esteban  wrote:

Hi ports@

This is a slightly modified version of a port I sent a long time ago:

https://marc.info/?l=openbsd-ports&m=154246569216247&w=2

That even got an ok:

https://marc.info/?l=openbsd-ports&m=154843970711942&w=2

About the port:

  This module is a subclass of LWP::UserAgent which overrides a few
  key low-level methods that are concerned with actually sending your
  request over the network, allowing an interception of that request and
  simulating a particular response.  This greatly facilitates testing of
  client networking code where the server follows a known protocol.

All test pass for me on amd64.

comments and/or ok appreciated.


With Makefile following the order of Makefile.template, ok jca@.
Having a consistent order helps when you're looking at lots of ports.
Updated tarball attached.





ok benoit@

38 matches

Mail list logo