Re: update: x11/freerdp (and x11/remmina, and x11/gnome/vinagre) - vinagre status

[Landry Breuil]

On Mon, Jan 15, 2018 at 08:25:48AM +0100, Sebastien Marie wrote:
> > 
> > I should be able to try it today.
> > 
> 
> after several tries to fix it or port some patches, it seems that
> vinagre isn't functional with freerdp2. it seems that lot of internals
> inside freerdp2 changed (callbacks).
> 
> Additionally, vinagre seems in maintenance-mode only. latest commits on
> past year are mostly translations (there is only 2 fixes, and no new code).
> 
> - vinagre git log:
>   https://git.gnome.org/browse/vinagre/log/
> 
> - vinagre commits per year
>   https://git.gnome.org/browse/vinagre/stats/?period=y=10
> 
> so I doubt vinagre will have support for freerdp2 at any time.
> 
> what direction should we take ?
> 
> it could be possible to make x11/freerdp to provide only libfreerdp
> libraries for vinagre, and have x11/freerdp2 ? or just plan to remove
> vinagre ?

I can speak for vinagre, but i've tested rdp and it works fine with
remmina. with vnc it crashes:

(gdb) bt
#0  thrkill () at -:3
#1  0x1bbc1c05d9ee in _libc_abort () at /usr/src/lib/libc/stdlib/abort.c:51
#2  0x1bbc1c0285d2 in _rthread_mutex_timedlock (mutexp=Variable "mutexp" is 
not available.
) at /usr/src/lib/libc/thread/rthread_mutex.c:118
#3  0x1bbc5892be58 in remmina_plugin_vnc_update_scale () from 
/usr/local/lib/remmina/plugins/remmina-plugin-vnc.so
#4  0x1bbc5892af64 in remmina_plugin_vnc_rfb_allocfb () from 
/usr/local/lib/remmina/plugins/remmina-plugin-vnc.so
#5  0x1bbb9a011e9a in rfbInitClient () from 
/usr/local/lib/libvncclient.so.0.0
#6  0x1bbc5892a663 in remmina_plugin_vnc_main () from 
/usr/local/lib/remmina/plugins/remmina-plugin-vnc.so
#7  0x1bbc5892a05c in remmina_plugin_vnc_main_thread () from 
/usr/local/lib/remmina/plugins/remmina-plugin-vnc.so
#8  0x1bbc26e99c5e in _rthread_start (v=Variable "v" is not available.
) at /usr/src/lib/librthread/rthread.c:96
#9  0x1bbc1c06ce3b in __tfork_thread () at 
/usr/src/lib/libc/arch/amd64/sys/tfork_thread.S:75
#10 0x in ?? ()

the ssh plugin works (in the sense that it opens a vte term on the remote 
server)

havent tested NX.

Re: update: x11/freerdp (and x11/remmina, and x11/gnome/vinagre) - vinagre status

[Sebastien Marie]

> 
> I should be able to try it today.
> 

after several tries to fix it or port some patches, it seems that
vinagre isn't functional with freerdp2. it seems that lot of internals
inside freerdp2 changed (callbacks).

Additionally, vinagre seems in maintenance-mode only. latest commits on
past year are mostly translations (there is only 2 fixes, and no new code).

- vinagre git log:
  https://git.gnome.org/browse/vinagre/log/

- vinagre commits per year
  https://git.gnome.org/browse/vinagre/stats/?period=y=10

so I doubt vinagre will have support for freerdp2 at any time.

what direction should we take ?

it could be possible to make x11/freerdp to provide only libfreerdp
libraries for vinagre, and have x11/freerdp2 ? or just plan to remove
vinagre ?

I dunno.

Thanks.
-- 
Sebastien Marie

Re: NEW: fs2open - source port of FreeSpace 2 space sim

[Thomas Frohwein]

New tarball, streamlining version handling and removing a few hardcoded
"-O2" flags after feedback from bcallah@ - thanks! (tested and it still
builds and runs as before)


fs2open.tgz
Description: Binary data

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2018/01/14 15:04:45

Modified files:
games/sdl-jstest: Makefile distinfo 

Log message:
Update to a newer sdl-jstest commit with manpage improvements.

ok Thomas Frohwein (maintainer)

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/01/14 14:49:30

Modified files:
graphics   : Makefile 

Log message:
+piglit

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/01/14 14:49:14

Log message:
import ports/graphics/piglit, from Thomas Frohwein, ok landry@

Piglit is a collection of automated tests for OpenGL and OpenCL
implementations.

The goal of Piglit is to help improve the quality of open source
OpenGL and OpenCL drivers by providing developers with a simple means to
perform regression tests.

The original tests have been taken from
- Glean ( http://glean.sf.net/ ) and
- Mesa ( http://www.mesa3d.org/ )

Status:

Vendor Tag: sthen
Release Tags:   sthen_20180114

N ports/graphics/piglit/Makefile
N ports/graphics/piglit/distinfo
N ports/graphics/piglit/patches/patch-CMakeLists_txt
N ports/graphics/piglit/patches/patch-piglit
N ports/graphics/piglit/patches/patch-tests_egl_CMakeLists_gl_txt
N 
ports/graphics/piglit/patches/patch-tests_spec_oes_geometry_shader_sso_validation_user-defined-gs-input-in-block_shader_test
N 
ports/graphics/piglit/patches/patch-tests_spec_oes_geometry_shader_sso_validation_user-defined-gs-input-not-in-block_shader_test
N ports/graphics/piglit/patches/patch-tests_util_CMakeLists_txt
N ports/graphics/piglit/patches/patch-tests_util_piglit-util_h
N ports/graphics/piglit/pkg/DESCR
N ports/graphics/piglit/pkg/PLIST

No conflicts created by this import

Re: NEW: piglit - testing suite for OpenGL

[Stuart Henderson]

On 2018/01/14 22:23, Landry Breuil wrote:
> On Sat, Jan 13, 2018 at 01:06:12PM +, Stuart Henderson wrote:
> > On 2018/01/12 14:40, Thomas Frohwein wrote:
> > > Hi,
> > > 
> > > Attached is a port of piglit. Piglit is a freedesktop.org testing suite 
> > > for
> > > OpenGL calls. It may be of use in trying to troubleshoot regressions with 
> > > mesa,
> > > OpenGL, and the graphics stack in general.
> > > 
> > > I've done some tests with different configurations myself since I have 
> > > one of
> > > the x230 affected by the recent mesa17 issues. The results can be 
> > > downloaded
> > > from https://thfr.info/piglit/openbsd-mesa17/. Note that those were done 
> > > with
> > > piglit compiled from FreeBSD's separate github repository 
> > > (https://github.com/
> > > dumbbell/piglit/) while this port is from the mesa3d github repo. Runs, 
> > > passes
> > > sanity check.
> > > 
> > > License includes a 3Dlabs license that doesn't comment on selling, so I 
> > > set
> > > 
> > > PERMIT_PACKAGE_CDROM =  No comment on selling by 3Dlabs license
> > > PERMIT_PACKAGE_FTP =Yes
> > > 
> > > A word of warning - the PLIST is huge - greater than 5M.
> > > 
> > > I'd prefer to not take maintainer on this one because the actually working
> > > with the results is a little beyond my capabilities.
> > > 
> > > Original idea from Matthieu Herrb. Input included from sthen@, awolk@,
> > > bcallah@. Advice received from medfly and joshe (on #metabug).
> > 
> > Minor nit, _MODPY_BUILD_DEPENDS is meant to be internal to python.port.mk
> > (typically variables starting _ are for internal use) and is added
> > to BUILD_DEPENDS automatically, no need to add it separately.
> > 
> > Other than that I think this is good to go, any OKs to import?
> 
> Looks okay to me too. Ugh the PLIST with 50k files..
> 

Thanks.

The PLIST is only likely to be a problem because of the bug introduced in the
flow control change in gnu/usr.bin/cvs/src/server.c r1.37, I'll commit it
directly and avoid ssh to hopefully avoid that.

Re: UPDATE: productivity/kmymoney

[Vadim Zhukov]

2018-01-14 20:39 GMT+03:00 Rafael Sadowski :
> Hi ports@, Hi Vadim,
>
> simple update to the latest stable version. I've freed SHARED_LIBS from
> tabs and add cmake in MODULES.
>
> Runs fine on amd64. Ok, Comments?

Please go ahead. I'll fix things if something will break here eventually. :)

> Index: Makefile
> ===
> RCS file: /cvs/ports/productivity/kmymoney/Makefile,v
> retrieving revision 1.17
> diff -u -p -u -p -r1.17 Makefile
> --- Makefile2 Dec 2017 12:44:33 -   1.17
> +++ Makefile14 Jan 2018 17:37:18 -
> @@ -3,17 +3,17 @@ COMMENT = accounting for KDE 4
>  CATEGORIES =   productivity x11
>  HOMEPAGE = https://kmymoney.org/
>  MAINTAINER =   Vadim Zhukov 
> -VERSION =  4.8.0
> +VERSION =  4.8.1.1
>  DISTNAME = kmymoney-${VERSION}
> -REVISION = 4
>
> -SHARED_LIBS =  kmm_kdchart 1.1
> -SHARED_LIBS += kmm_mymoney 1.1
> -SHARED_LIBS += kmm_plugin  1.1
> -SHARED_LIBS += kmm_widgets 1.1
> -SHARED_LIBS += payeeidentifier_iban_bic0.0 # 4.14
> -SHARED_LIBS += payeeidentifier_iban_bic_widgets0.0 # 4.14
> -SHARED_LIBS += payeeidentifier_nationalAccount 0.0 # 4.14
> +SHARED_LIBS += kmm_kdchart  1.1 # 0.0
> +SHARED_LIBS += kmm_mymoney  1.1 # 0.0
> +SHARED_LIBS += kmm_payeeidentifier  0.0 # 0.0
> +SHARED_LIBS += kmm_plugin   1.1 # 0.0
> +SHARED_LIBS += kmm_widgets  1.1 # 0.0
> +SHARED_LIBS += payeeidentifier_iban_bic 0.0 # 4.14
> +SHARED_LIBS += payeeidentifier_iban_bic_widgets 0.0 # 4.14
> +SHARED_LIBS += payeeidentifier_nationalAccount  0.0 # 4.14
>
>  # GPLv2+
>  PERMIT_PACKAGE_CDROM = Yes
> @@ -32,13 +32,16 @@ WANTLIB += ${KDE4LIB}/akonadi-contact ${
>  WANTLIB += ${KDE4LIB}/kcalcore ${KDE4LIB}/kmime
>  WANTLIB += ${KDE4LIB}/kpimidentities ${KDE4LIB}/kpimutils
>  WANTLIB += alkimia assuan gmp gpg-error gpgme++-pthread gpgme
> -WANTLIB += ical icalss iconv intl ofx osp qgpgme soprano
> +WANTLIB += ical icalss ofx osp qgpgme soprano
>  WANTLIB += aqbanking gwengui-cpp gwengui-qt4 gwenhywfar
>  WANTLIB += QtDeclarative QtScript krosscore
>
>  MASTER_SITES = ${MASTER_SITE_KDE:=stable/kmymoney/${VERSION}/src/}
>
> -MODULES =  x11/kde4 lang/python multimedia/phonon
> +MODULES =  devel/cmake \
> +   x11/kde4 \
> +   lang/python \
> +   multimedia/phonon
>  MODKDE4_USE =  pim
>
>  BUILD_DEPENDS =devel/boost \
> @@ -67,6 +70,7 @@ CONFIGURE_ARGS =  -DENABLE_KBANKING:Bool=
>  TEST_IS_INTERACTIVE =  X11
>
>  post-install:
> -   ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py 
> ${PREFIX}/share/apps/kmm_weboob/weboob.py
> +   ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
> +   ${PREFIX}/share/apps/kmm_weboob/weboob.py
>
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/productivity/kmymoney/distinfo,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 distinfo
> --- distinfo14 Jan 2017 11:19:04 -  1.3
> +++ distinfo14 Jan 2018 17:37:18 -
> @@ -1,2 +1,2 @@
> -SHA256 (kmymoney-4.8.0.tar.xz) = wqY1cQqvppJaSYA8SA4EPgv0vFtiQwaJql65Vhn0isI=
> -SIZE (kmymoney-4.8.0.tar.xz) = 20785888
> +SHA256 (kmymoney-4.8.1.1.tar.xz) = 
> Kxy9FB1Ro/QUfDDADH0hAi52HYEh9aIGCSzzVI+AWjQ=
> +SIZE (kmymoney-4.8.1.1.tar.xz) = 20963444
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: /cvs/ports/productivity/kmymoney/patches/patch-CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt14 Jan 2017 11:19:04 -  1.1
> +++ patches/patch-CMakeLists_txt14 Jan 2018 17:37:18 -
> @@ -1,8 +1,9 @@
>  $OpenBSD: patch-CMakeLists_txt,v 1.1 2017/01/14 11:19:04 zhuk Exp $
>  Unbreak configuring: there is no separate gwengui-cpp CMake config.
>  CMakeLists.txt.origTue Jun 14 22:17:54 2016
> -+++ CMakeLists.txt Thu Jan 12 19:42:47 2017
> -@@ -177,11 +177,11 @@ option(ENABLE_KBANKING "Enable KBanking plugin" ON)
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
>  CMakeLists.txt
> +@@ -198,11 +198,11 @@ option(ENABLE_KBANKING "Enable KBanking plugin" ON)
>   if(ENABLE_KBANKING)
> find_package(GWENHYWFAR CONFIG "4.13.0")
> find_package(gwengui-qt4 CONFIG "4.13.0")
> Index: patches/patch-kmymoney_dialogs_settings_CMakeLists_txt
> ===
> RCS file: patches/patch-kmymoney_dialogs_settings_CMakeLists_txt
> diff -N patches/patch-kmymoney_dialogs_settings_CMakeLists_txt

Re: NEW: piglit - testing suite for OpenGL

[Landry Breuil]

On Sat, Jan 13, 2018 at 01:06:12PM +, Stuart Henderson wrote:
> On 2018/01/12 14:40, Thomas Frohwein wrote:
> > Hi,
> > 
> > Attached is a port of piglit. Piglit is a freedesktop.org testing suite for
> > OpenGL calls. It may be of use in trying to troubleshoot regressions with 
> > mesa,
> > OpenGL, and the graphics stack in general.
> > 
> > I've done some tests with different configurations myself since I have one 
> > of
> > the x230 affected by the recent mesa17 issues. The results can be downloaded
> > from https://thfr.info/piglit/openbsd-mesa17/. Note that those were done 
> > with
> > piglit compiled from FreeBSD's separate github repository 
> > (https://github.com/
> > dumbbell/piglit/) while this port is from the mesa3d github repo. Runs, 
> > passes
> > sanity check.
> > 
> > License includes a 3Dlabs license that doesn't comment on selling, so I set
> > 
> > PERMIT_PACKAGE_CDROM =  No comment on selling by 3Dlabs license
> > PERMIT_PACKAGE_FTP =Yes
> > 
> > A word of warning - the PLIST is huge - greater than 5M.
> > 
> > I'd prefer to not take maintainer on this one because the actually working
> > with the results is a little beyond my capabilities.
> > 
> > Original idea from Matthieu Herrb. Input included from sthen@, awolk@,
> > bcallah@. Advice received from medfly and joshe (on #metabug).
> 
> Minor nit, _MODPY_BUILD_DEPENDS is meant to be internal to python.port.mk
> (typically variables starting _ are for internal use) and is added
> to BUILD_DEPENDS automatically, no need to add it separately.
> 
> Other than that I think this is good to go, any OKs to import?

Looks okay to me too. Ugh the PLIST with 50k files..

CVS: cvs.openbsd.org: ports

[Frederic Cambus]

CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2018/01/14 14:11:16

Modified files:
emulators/snes9x: Makefile distinfo 
emulators/snes9x/patches: patch-gtk_configure 

Log message:
Update snes9x to 1.55.

Notable changes:

- Switch to GTK+ 3 and regenerate WANTLIB
- Remove --without-opengl, the port builds fine without it
- Remove now useless pre-configure target
- Fix PERMIT_PACKAGE_CDROM marker
- Take MAINTAINER

OK bentley@

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/14 13:56:23

Modified files:
security/botan2: Makefile 

Log message:
Remove pthread from WANTLIB

"pthread is included in COMPILER_LIBCXX in all cases." spotted by sthen@

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/14 13:40:18

Modified files:
security/botan2: Makefile distinfo 
security/botan2/patches: patch-src_build-data_cc_gcc_txt 
 patch-src_tests_main_cpp 
security/botan2/pkg: PLIST 
Added files:
security/botan2/patches: patch-src_build-data_cc_clang_txt 
Removed files:
security/botan2/patches: 
 patch-src_lib_prov_openssl_openssl_rsa_cpp 
 patch-src_lib_utils_os_utils_cpp 

Log message:
Update botan2 to 2.4.0

Tweaks and input from bluhm@ and sthen@. Manual page hint by kn

OK bluhm@ (maintainer)

Re: UPDATE: security/botan2

[Alexander Bluhm]

On Sat, Jan 13, 2018 at 03:12:27PM +0100, Rafael Sadowski wrote:
> Changes to the previous diff
> 
> - fixed changes above
> - regen WANTLIB

This seems wrong.  lld shows that libbotan-2.so.4.0 and botan-test
depend on libpthread.

> I run into the following GCC compile error. Any ideas?

I have compiled it on sparc64.  Build passes, but regress fails
with some C++ exceptions.  I remember that this happend also with
the previous version.  So this is not a show stopper.

> Index: Makefile
> ===
> RCS file: /cvs/ports/security/botan2/Makefile,v
> retrieving revision 1.11
> diff -u -p -u -p -r1.11 Makefile
> --- Makefile  16 Nov 2017 23:20:40 -  1.11
> +++ Makefile  13 Jan 2018 13:57:07 -
> @@ -2,11 +2,11 @@
>  
>  COMMENT =crypto and TLS for C++11
>  
> -VERSION =2.3.0
> +VERSION =2.4.0
>  DISTNAME =   Botan-${VERSION}
>  PKGNAME =botan2-${VERSION}
>  
> -SHARED_LIBS =botan-2 3.0
> +SHARED_LIBS =botan-2 4.0
>  
>  CATEGORIES = security
>  
> @@ -17,8 +17,7 @@ MAINTAINER =Alexander Bluhm   # BSD 2-Clause
>  PERMIT_PACKAGE_CDROM =   Yes
>  
> -WANTLIB =bz2 c crypto m lzma pthread z
> -WANTLIB +=   ${COMPILER_LIBCXX}
> +WANTLIB += ${COMPILER_LIBCXX} bz2 c crypto lzma m z
>  
>  MASTER_SITES =   ${HOMEPAGE}releases/
>  

Please leave the wantlib as it was.  OK bluhm@ with this chunk removed.

> @@ -53,7 +52,7 @@ PKG_ARGS =  -Dx86=0
>  SUBST_VARS = CXX CXXFLAGS LIBbotan-2_VERSION
>  
>  pre-configure:
> - ${SUBST_CMD} ${WRKSRC}/src/build-data/cc/gcc.txt
> + ${SUBST_CMD} ${WRKSRC}/src/build-data/cc/{clang,gcc}.txt
>   ${SUBST_CMD} ${WRKSRC}/src/build-data/os/openbsd.txt
>   ${SUBST_CMD} ${WRKSRC}/src/tests/main.cpp
>   ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
> Index: distinfo
> ===
> RCS file: /cvs/ports/security/botan2/distinfo,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 distinfo
> --- distinfo  9 Oct 2017 20:05:07 -   1.4
> +++ distinfo  13 Jan 2018 13:57:07 -
> @@ -1,4 +1,4 @@
> -SHA256 (Botan-2.3.0.tgz) = Oflw/uWYakw+QlAwrvUKwoTaGFlsAE0anM52iMTm1Hw=
> -SHA256 (Botan-2.3.0.tgz.asc) = rBepmkNJSGvNpHthTWx+iKNioryjL57ilCAv0WPNTjU=
> -SIZE (Botan-2.3.0.tgz) = 5947072
> -SIZE (Botan-2.3.0.tgz.asc) = 488
> +SHA256 (Botan-2.4.0.tgz) = 7ZRk4qXP7kzT2b16j4BnO0XIoHGNshgac/VGWmBmCKU=
> +SHA256 (Botan-2.4.0.tgz.asc) = WArU/IbE+ZLiC7SODpCyO8ObUrS/JauY+zghPXRAUSk=
> +SIZE (Botan-2.4.0.tgz) = 6530714
> +SIZE (Botan-2.4.0.tgz.asc) = 488
> Index: patches/patch-configure_py
> ===
> RCS file: /cvs/ports/security/botan2/patches/patch-configure_py,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 patch-configure_py
> --- patches/patch-configure_py9 Oct 2017 20:05:07 -   1.5
> +++ patches/patch-configure_py13 Jan 2018 13:57:07 -
> @@ -2,7 +2,16 @@ $OpenBSD: patch-configure_py,v 1.5 2017/
>  Index: configure.py
>  --- configure.py.orig
>  +++ configure.py
> -@@ -2916,10 +2916,6 @@ def set_defaults_for_unset_options(options, info_arch,
> +@@ -1284,7 +1284,7 @@ class OsInfo(InfoObject): # pylint: disable=too-many-i
> + 'bin_dir': 'bin',
> + 'lib_dir': 'lib',
> + 'doc_dir': 'share/doc',
> +-'man_dir': 'share/man',
> ++'man_dir': 'man',
> + 'use_stack_protector': 'true',
> + 'so_post_link_command': '',
> + 'cli_exe_name': 'botan',
> +@@ -2664,10 +2664,6 @@ def set_defaults_for_unset_options(options, info_arch,
>   if have_program('clang++'):
>   options.compiler = 'clang'
>   elif options.os == 'openbsd':
> Index: patches/patch-src_build-data_cc_clang_txt
> ===
> RCS file: patches/patch-src_build-data_cc_clang_txt
> diff -N patches/patch-src_build-data_cc_clang_txt
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_build-data_cc_clang_txt 13 Jan 2018 13:57:07 -
> @@ -0,0 +1,21 @@
> +$OpenBSD$
> +
> +Index: src/build-data/cc/clang.txt
> +--- src/build-data/cc/clang.txt.orig
>  src/build-data/cc/clang.txt
> +@@ -1,13 +1,13 @@
> + macro_name CLANG
> + 
> +-binary_name clang++
> ++binary_name ${CXX}
> + 
> + lang_flags "-std=c++11 -D_REENTRANT"
> + 
> + warning_flags "-Wall -Wextra -Wpedantic -Wshadow -Wstrict-aliasing 
> -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith 
> -Wcast-qual"
> + maintainer_warning_flags "-Wunreachable-code -Wdocumentation 
> -Qunused-arguments -Werror -Wno-error=unused-parameter 
> -Wno-error=unreachable-code -Wno-error=deprecated-declarations"
> + 
> +-optimization_flags "-O3"
> ++optimization_flags "${CXXFLAGS}"
> + size_optimization_flags "-Os"

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/01/14 13:18:40

Modified files:
mail/roundcubemail: Makefile distinfo 
mail/roundcubemail/pkg: PLIST 

Log message:
update to roundcubemail-1.3.4

Re: UPDATE: mail/mairix

[Stuart Henderson]

On 2018/01/14 20:19, Klemens Nanni wrote:
> On Tue, Jan 02, 2018 at 04:16:25PM +0100, Rafael Sadowski wrote:
> > Simple update to the latest stable version. Comments? Ok?
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/mail/mairix/Makefile,v
> > retrieving revision 1.15
> > diff -u -p -u -p -r1.15 Makefile
> > --- Makefile1 Nov 2014 17:17:53 -   1.15
> > +++ Makefile2 Jan 2018 15:14:49 -
> > @@ -2,7 +2,7 @@
> >  
> >  COMMENT=   program for indexing & searching email
> >  
> > -DISTNAME=  mairix-0.23
> > +DISTNAME=  mairix-0.24
> >  CATEGORIES=mail
> >  HOMEPAGE=  http://www.rpcurnow.force9.co.uk/mairix/
> >  
> > @@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM= Yes
> >  MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=mairix/} \
> > http://www.rpcurnow.force9.co.uk/mairix/
> >  
> > -WANTLIB=   c z bz2
> > +WANTLIB += bz2 c crypto ssl z
> >  
> >  BUILD_DEPENDS= devel/bison
> >  LIB_DEPENDS=   archivers/bzip2
> > @@ -20,7 +20,5 @@ LIB_DEPENDS=  archivers/bzip2
> >  CONFIGURE_STYLE=   simple
> >  CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include" \
> > LDFLAGS="-L${PREFIX}/lib"
> > -
> > -NO_TEST=   Yes
> It seems you didn't run the tests. TEST_TARGET is still incorrectly set
> to "test". When run, it errors out immediately:
> 
>   $ make TEST_TARGET=check test
>   ===>  Regression tests for mairix-0.24
>   if [ -d test ]; then cd test ; make CC="cc" CFLAGS="-O2 -pipe  
> -DHAS_STDINT_H -DHAS_INTTYPES_H -DUSE_GZIP_MBOX -DUSE_BZIP_MBOX 
> -DUSE_OPENSSL" check ; else echo "No test subdirectory?" ; exit 1 ; fi
>   scripts/print_test_statistics.sh
>   scripts/print_test_statistics.sh: not found
>   *** Error 1 in test (Makefile:74 'check')
>   *** Error 2 in /usr/obj/ports/mairix-0.24/mairix-0.24 (Makefile:115 
> 'check')
>   *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2777 
> '/usr/obj/ports/mairix-0.24/.test_done')
>   *** Error 1 in /usr/ports/mail/mairix 
> (/usr/ports/infrastructure/mk/bsd.port.mk:2419 'test')
> 

That should be easy to fix, bad #! line (/bin/bash).

It does need bash, we don't have the string chopping stuff:

$ checkbashisms -f test/scripts/print_test_statistics.sh
possible bashism in test/scripts/print_test_statistics.sh line 41 
(${foo:3[:1]}):
NAME_START=${NAME_STUB:0:1}

Re: UPDATE: mail/mairix

[Klemens Nanni]

On Tue, Jan 02, 2018 at 04:16:25PM +0100, Rafael Sadowski wrote:
> Simple update to the latest stable version. Comments? Ok?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/mairix/Makefile,v
> retrieving revision 1.15
> diff -u -p -u -p -r1.15 Makefile
> --- Makefile  1 Nov 2014 17:17:53 -   1.15
> +++ Makefile  2 Jan 2018 15:14:49 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT= program for indexing & searching email
>  
> -DISTNAME=mairix-0.23
> +DISTNAME=mairix-0.24
>  CATEGORIES=  mail
>  HOMEPAGE=http://www.rpcurnow.force9.co.uk/mairix/
>  
> @@ -12,7 +12,7 @@ PERMIT_PACKAGE_CDROM=   Yes
>  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=mairix/} \
>   http://www.rpcurnow.force9.co.uk/mairix/
>  
> -WANTLIB= c z bz2
> +WANTLIB += bz2 c crypto ssl z
>  
>  BUILD_DEPENDS=   devel/bison
>  LIB_DEPENDS= archivers/bzip2
> @@ -20,7 +20,5 @@ LIB_DEPENDS=archivers/bzip2
>  CONFIGURE_STYLE= simple
>  CONFIGURE_ENV=   CPPFLAGS="-I${PREFIX}/include" \
>   LDFLAGS="-L${PREFIX}/lib"
> -
> -NO_TEST= Yes
It seems you didn't run the tests. TEST_TARGET is still incorrectly set
to "test". When run, it errors out immediately:

$ make TEST_TARGET=check test
===>  Regression tests for mairix-0.24
if [ -d test ]; then cd test ; make CC="cc" CFLAGS="-O2 -pipe  
-DHAS_STDINT_H -DHAS_INTTYPES_H -DUSE_GZIP_MBOX -DUSE_BZIP_MBOX -DUSE_OPENSSL" 
check ; else echo "No test subdirectory?" ; exit 1 ; fi
scripts/print_test_statistics.sh
scripts/print_test_statistics.sh: not found
*** Error 1 in test (Makefile:74 'check')
*** Error 2 in /usr/obj/ports/mairix-0.24/mairix-0.24 (Makefile:115 
'check')
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2777 
'/usr/obj/ports/mairix-0.24/.test_done')
*** Error 1 in /usr/ports/mail/mairix 
(/usr/ports/infrastructure/mk/bsd.port.mk:2419 'test')

CVS: cvs.openbsd.org: ports

[Landry Breuil]

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

Modified files:
audio/puddletag: Makefile distinfo 
audio/puddletag/pkg: PLIST 
Removed files:
audio/puddletag/patches: patch-puddlestuff_puddleobjects_py 
 patch-setup_py 

Log message:
Update to puddletag 1.2.0.

>From Klemens Nanni, thanks!

[CVE pending] security patch for net/transmission

[Josh Grosse]

The attached patch against transmission 2.92 has been tested
on amd64, but could use additional testing.  It mitigates a DNS
rebinding attack against transmission-daemon.

Upstream is aware of the security issue but has not yet taken
action to date.
Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.120
diff -u -p -r1.120 Makefile
--- Makefile16 Nov 2017 23:20:39 -  1.120
+++ Makefile13 Jan 2018 00:37:25 -
@@ -9,7 +9,7 @@ DISTNAME=   transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
 PKGNAME-qt=transmission-qt-${VER}
-REVISION=  5
+REVISION=  6
 CATEGORIES=net
 HOMEPAGE=  http://www.transmissionbt.com/
 MAINTAINER=Josh Grosse 
Index: patches/patch-libtransmission_quark_c
===
RCS file: patches/patch-libtransmission_quark_c
diff -N patches/patch-libtransmission_quark_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-libtransmission_quark_c   13 Jan 2018 00:56:42 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Mitigate dns rebinding attacks against daemon.  CVE pends.
+https://github.com/transmission/transmission/pull/468
+2.92 patches posted by https://github.com/lfam
+
+Index: libtransmission/quark.c
+--- libtransmission/quark.c.orig
 libtransmission/quark.c
+@@ -289,6 +289,8 @@ static const struct tr_key_struct my_static[] =
+   { "rpc-authentication-required", 27 },
+   { "rpc-bind-address", 16 },
+   { "rpc-enabled", 11 },
++  { "rpc-host-whitelist", 18 },
++  { "rpc-host-whitelist-enabled", 26 },
+   { "rpc-password", 12 },
+   { "rpc-port", 8 },
+   { "rpc-url", 7 },
Index: patches/patch-libtransmission_quark_h
===
RCS file: patches/patch-libtransmission_quark_h
diff -N patches/patch-libtransmission_quark_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-libtransmission_quark_h   13 Jan 2018 00:56:47 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Mitigate dns rebinding attacks against daemon.  CVE pends.
+https://github.com/transmission/transmission/pull/468
+2.92 patches posted by https://github.com/lfam
+
+Index: libtransmission/quark.h
+--- libtransmission/quark.h.orig
 libtransmission/quark.h
+@@ -291,6 +291,8 @@ enum
+   TR_KEY_rpc_authentication_required,
+   TR_KEY_rpc_bind_address,
+   TR_KEY_rpc_enabled,
++  TR_KEY_rpc_host_whitelist,
++  TR_KEY_rpc_host_whitelist_enabled,
+   TR_KEY_rpc_password,
+   TR_KEY_rpc_port,
+   TR_KEY_rpc_url,
Index: patches/patch-libtransmission_rpc-server_c
===
RCS file: patches/patch-libtransmission_rpc-server_c
diff -N patches/patch-libtransmission_rpc-server_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-libtransmission_rpc-server_c  13 Jan 2018 00:56:55 -
@@ -0,0 +1,203 @@
+$OpenBSD$
+
+Mitigate dns rebinding attacks against daemon.  CVE pends.
+https://github.com/transmission/transmission/pull/468
+2.92 patches posted by https://github.com/lfam
+
+Index: libtransmission/rpc-server.c
+--- libtransmission/rpc-server.c.orig
 libtransmission/rpc-server.c
+@@ -52,6 +52,7 @@ struct tr_rpc_server
+ bool   isEnabled;
+ bool   isPasswordEnabled;
+ bool   isWhitelistEnabled;
++bool   isHostWhitelistEnabled;
+ tr_portport;
+ char * url;
+ struct in_addr bindAddress;
+@@ -63,6 +64,7 @@ struct tr_rpc_server
+ char * password;
+ char * whitelistStr;
+ tr_list  * whitelist;
++tr_list  * hostWhitelist;
+ 
+ char * sessionId;
+ time_t sessionIdExpiresAt;
+@@ -588,6 +590,49 @@ isAddressAllowed (const tr_rpc_server * server, const 
+   return false;
+ }
+ 
++static bool isHostnameAllowed(tr_rpc_server const* server, struct 
evhttp_request* req)
++{
++/* If password auth is enabled, any hostname is permitted. */
++if (server->isPasswordEnabled)
++{
++return true;
++}
++
++char const* const host = evhttp_find_header(req->input_headers, "Host");
++
++// If whitelist is disabled, no restrictions.
++if (!server->isHostWhitelistEnabled)
++return true;
++
++/* No host header, invalid request. */
++if (host == NULL)
++{
++return false;
++}
++
++/* Host header might include the port. */
++char* const hostname = tr_strndup(host, strcspn(host, ":"));
++
++/* localhost or ipaddress is always acceptable. */
++if (strcmp(hostname, "localhost") == 0 || strcmp(hostname, "localhost.") 
== 0 || tr_addressIsIP(hostname))
++{
++tr_free(hostname);
++return true;
++}
++
++/* Otherwise, hostname must be whitelisted. */
++for (tr_list* l = 

UPDATE: productivity/kmymoney

[Rafael Sadowski]

Hi ports@, Hi Vadim,

simple update to the latest stable version. I've freed SHARED_LIBS from
tabs and add cmake in MODULES.

Runs fine on amd64. Ok, Comments?

Rafael

Index: Makefile
===
RCS file: /cvs/ports/productivity/kmymoney/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- Makefile2 Dec 2017 12:44:33 -   1.17
+++ Makefile14 Jan 2018 17:37:18 -
@@ -3,17 +3,17 @@ COMMENT = accounting for KDE 4
 CATEGORIES =   productivity x11
 HOMEPAGE = https://kmymoney.org/
 MAINTAINER =   Vadim Zhukov 
-VERSION =  4.8.0
+VERSION =  4.8.1.1
 DISTNAME = kmymoney-${VERSION}
-REVISION = 4
 
-SHARED_LIBS =  kmm_kdchart 1.1
-SHARED_LIBS += kmm_mymoney 1.1
-SHARED_LIBS += kmm_plugin  1.1
-SHARED_LIBS += kmm_widgets 1.1
-SHARED_LIBS += payeeidentifier_iban_bic0.0 # 4.14
-SHARED_LIBS += payeeidentifier_iban_bic_widgets0.0 # 4.14
-SHARED_LIBS += payeeidentifier_nationalAccount 0.0 # 4.14
+SHARED_LIBS += kmm_kdchart  1.1 # 0.0
+SHARED_LIBS += kmm_mymoney  1.1 # 0.0
+SHARED_LIBS += kmm_payeeidentifier  0.0 # 0.0
+SHARED_LIBS += kmm_plugin   1.1 # 0.0
+SHARED_LIBS += kmm_widgets  1.1 # 0.0
+SHARED_LIBS += payeeidentifier_iban_bic 0.0 # 4.14
+SHARED_LIBS += payeeidentifier_iban_bic_widgets 0.0 # 4.14
+SHARED_LIBS += payeeidentifier_nationalAccount  0.0 # 4.14
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
@@ -32,13 +32,16 @@ WANTLIB += ${KDE4LIB}/akonadi-contact ${
 WANTLIB += ${KDE4LIB}/kcalcore ${KDE4LIB}/kmime
 WANTLIB += ${KDE4LIB}/kpimidentities ${KDE4LIB}/kpimutils
 WANTLIB += alkimia assuan gmp gpg-error gpgme++-pthread gpgme
-WANTLIB += ical icalss iconv intl ofx osp qgpgme soprano
+WANTLIB += ical icalss ofx osp qgpgme soprano
 WANTLIB += aqbanking gwengui-cpp gwengui-qt4 gwenhywfar
 WANTLIB += QtDeclarative QtScript krosscore
 
 MASTER_SITES = ${MASTER_SITE_KDE:=stable/kmymoney/${VERSION}/src/}
 
-MODULES =  x11/kde4 lang/python multimedia/phonon
+MODULES =  devel/cmake \
+   x11/kde4 \
+   lang/python \
+   multimedia/phonon
 MODKDE4_USE =  pim
 
 BUILD_DEPENDS =devel/boost \
@@ -67,6 +70,7 @@ CONFIGURE_ARGS =  -DENABLE_KBANKING:Bool=
 TEST_IS_INTERACTIVE =  X11
 
 post-install:
-   ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py 
${PREFIX}/share/apps/kmm_weboob/weboob.py
+   ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+   ${PREFIX}/share/apps/kmm_weboob/weboob.py
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/productivity/kmymoney/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo14 Jan 2017 11:19:04 -  1.3
+++ distinfo14 Jan 2018 17:37:18 -
@@ -1,2 +1,2 @@
-SHA256 (kmymoney-4.8.0.tar.xz) = wqY1cQqvppJaSYA8SA4EPgv0vFtiQwaJql65Vhn0isI=
-SIZE (kmymoney-4.8.0.tar.xz) = 20785888
+SHA256 (kmymoney-4.8.1.1.tar.xz) = Kxy9FB1Ro/QUfDDADH0hAi52HYEh9aIGCSzzVI+AWjQ=
+SIZE (kmymoney-4.8.1.1.tar.xz) = 20963444
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/productivity/kmymoney/patches/patch-CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt14 Jan 2017 11:19:04 -  1.1
+++ patches/patch-CMakeLists_txt14 Jan 2018 17:37:18 -
@@ -1,8 +1,9 @@
 $OpenBSD: patch-CMakeLists_txt,v 1.1 2017/01/14 11:19:04 zhuk Exp $
 Unbreak configuring: there is no separate gwengui-cpp CMake config.
 CMakeLists.txt.origTue Jun 14 22:17:54 2016
-+++ CMakeLists.txt Thu Jan 12 19:42:47 2017
-@@ -177,11 +177,11 @@ option(ENABLE_KBANKING "Enable KBanking plugin" ON)
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
 CMakeLists.txt
+@@ -198,11 +198,11 @@ option(ENABLE_KBANKING "Enable KBanking plugin" ON)
  if(ENABLE_KBANKING)
find_package(GWENHYWFAR CONFIG "4.13.0")
find_package(gwengui-qt4 CONFIG "4.13.0")
Index: patches/patch-kmymoney_dialogs_settings_CMakeLists_txt
===
RCS file: patches/patch-kmymoney_dialogs_settings_CMakeLists_txt
diff -N patches/patch-kmymoney_dialogs_settings_CMakeLists_txt
--- patches/patch-kmymoney_dialogs_settings_CMakeLists_txt  24 Aug 2017 
09:31:35 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,33 +0,0 @@
-$OpenBSD: patch-kmymoney_dialogs_settings_CMakeLists_txt,v 1.1 2017/08/24 
09:31:35 dcoppa Exp $
-
-commit b0a68ca075928aa29ee1e0007bfb14d714f5a948
-Author: Ralf Habacker 

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/01/14 10:12:10

Modified files:
devel/py-buildslave: Makefile distinfo 
devel/py-buildslave/pkg: PLIST 
devel/py-buildbot: Makefile.inc 
devel/py-buildbot/buildbot: Makefile distinfo 
devel/py-buildbot/buildbot/pkg: PLIST 
devel/py-buildbot/console-view: distinfo 
devel/py-buildbot/grid-view: distinfo 
devel/py-buildbot/pkg: distinfo 
devel/py-buildbot/waterfall-view: distinfo 
devel/py-buildbot/www: distinfo 
devel/py-buildbot/www/pkg: PLIST 

Log message:
Update to buildbot/buildworker 0.9.15.post1.

See https://github.com/buildbot/buildbot/releases/tag/v0.9.15 and
https://github.com/buildbot/buildbot/releases/tag/v0.9.15.post1 for details.

I've finally updated my mozbsd buildbot... now to upgrade the
slaves^Wworkers.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/01/14 08:36:40

Modified files:
databases/luadbi: Makefile distinfo 
databases/luadbi/pkg: PLIST-main PLIST-mysql PLIST-pgsql 
Removed files:
databases/luadbi/patches: patch-dbd_sqlite3_connection_c 
  patch-dbd_sqlite3_dbd_sqlite3_h 
  patch-dbd_sqlite3_statement_c 

Log message:
Update to luadbi 0.6, and switch to a new upstream github maintained by a
prosody developer. The original upstream is long dead anyway.

Tested working fine with basic lua code connecting to a pgsql db, and
also tested by vic with prosody using postgresql as backend (thanks!)

CVS: cvs.openbsd.org: ports

[Remi Locherer]

CVSROOT:/cvs
Module name:ports
Changes by: r...@cvs.openbsd.org2018/01/14 08:16:15

Modified files:
mail/offlineimap: Makefile distinfo 

Log message:
update to OfflineIMAP v7.1.5

ok danj@

Re: [update] OfflineIMAP v7.1.5

[Remi Locherer]

On Sat, Jan 13, 2018 at 04:20:26PM -0500, Daniel Jakots wrote:
> On Sat, 13 Jan 2018 22:05:43 +0100, Remi Locherer
>  wrote:
> 
> > +REVISION = 0
> 
> Why? :p

I usually build a package few days before a new version comes out using
GH_COMMIT and REVISION. Now I forgot to remove it.

Thanks for noticing!

> 
> without the rev bump, ok danj@

CVS: cvs.openbsd.org: ports

[Robert Peichaer]

CVSROOT:/cvs
Module name:ports
Changes by: r...@cvs.openbsd.org2018/01/14 07:53:25

Modified files:
sysutils/google-compute-engine/pkg: google_compute_engine.rc 

Log message:
missed one test

CVS: cvs.openbsd.org: ports

[Robert Peichaer]

CVSROOT:/cvs
Module name:ports
Changes by: r...@cvs.openbsd.org2018/01/14 07:42:18

Modified files:
mail/exim  : Makefile 
mail/exim/pkg  : exim.rc 
mail/kopano/core: Makefile 
mail/kopano/core/pkg: kopano.rc 
net/kea: Makefile 
net/kea/pkg: kea.rc 
net/netatalk   : Makefile 
net/netatalk/pkg: netatalk.rc 
net/samba  : Makefile 
net/samba/pkg  : samba.rc 
net/xl2tpd : Makefile 
net/xl2tpd/pkg : xl2tpd.rc 
print/cups : Makefile 
print/cups/pkg : cupsd.rc 
security/spiped: Makefile 
security/spiped/pkg: spiped.rc 
sysutils/bacula: Makefile 
sysutils/bacula/pkg: bacula.rc 
sysutils/cfengine: Makefile 
sysutils/cfengine/pkg: cfengine.rc 
sysutils/google-compute-engine: Makefile 
sysutils/google-compute-engine/pkg: google_compute_engine.rc 
sysutils/nut   : Makefile 
sysutils/nut/pkg: nut.rc 
x11/gnome/gdm  : Makefile 
x11/gnome/gdm/pkg: gdm.rc 
x11/kde/base3  : Makefile 
x11/kde/base3/pkg: kdm.rc 
x11/kde4/workspace: Makefile 
x11/kde4/workspace/pkg: kdm.rc 

Log message:
Now that all ports rc.* scripts are using #!/bin/ksh

- change [] tests to [[]]
- change arithmetic [] tests to (())
- change = to == inside [[]]
- remove unecessary quoting inside [[]]

OK aja@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/01/14 07:30:02

Modified files:
devel/ccache   : Makefile distinfo 
devel/ccache/patches: patch-configure 

Log message:
update to ccache-3.3.5

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/01/14 07:29:35

Modified files:
multimedia/get_iplayer: Makefile distinfo 

Log message:
update to get_iplayer-3.12

NEW: devel/kf5/qqc2-desktop-style

[Rafael Sadowski]

Hi All,

please finde attached a new KF5 module.

qqc2-desktop-style:

QtQuickControls 2 style that uses QWidget's QStyle for
painting This makes it possible to achieve an higher deree of
consistency between QWidget-based and QML-based apps.

qqc2-desktop-style is new since KDE Fameworks 5.39.0 and and I ignored
it on the last port update.

ok to import? (A quick review would be enough, it's a really simple port
without consumers)

Best reagrds,

Rafael

Index: Makefile
===
RCS file: /cvs/ports/devel/kf5/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile9 Jan 2018 21:10:38 -   1.7
+++ Makefile14 Jan 2018 13:55:54 -
@@ -30,7 +30,8 @@ SUBDIR += sonnet  # 100% tests passed, 0
 SUBDIR += threadweaver # 100% tests passed, 0 tests failed out of 7
 SUBDIR += syntax-highlighting  # 100% tests passed, 0 tests failed out of 8
 SUBDIR += prison   # 100% tests passed, 0 tests failed out of 2
-SUBDIR += kirigami2# 
+SUBDIR += kirigami2# 0% tests passed, 1 tests failed out of 1
+SUBDIR += qqc2-desktop-style   # NO_TEST
 
 # tier 2
 SUBDIR += kauth# 100% tests passed, 0 tests failed out 
of 2


qqc2-desktop-style.tar.gz
Description: Binary data

Re: luadbi update (needs testing with prosody)

[viq]

On 18-01-05 22:29:07, Landry Breuil wrote:
> Hi,
> 
> while playing with lua & nginx, i stumbled upon
> https://github.com/mwild1/luadbi which is an updated fork of the dead
> upstream luadbi on code.google.com - this one is maintained by a prosody
> developer, and he even released a 0.6 version. $SEARCHENGINE will prefer
> to show you https://github.com/snatchev/Luadbi when loooking for luadbi
> but this one saw no commits...
> 
> builds fine here, and it still seems to connect fine to a postgresql
> database i have lying around. Testing with prosody (backed by a database
> ofc) would be very much welcome.

 Prosody with PostgreSQL, everything (user auth, MAM) still working
 fine.
 
> Landry

> Index: Makefile
> ===
> RCS file: /cvs/ports/databases/luadbi/Makefile,v
> retrieving revision 1.11
> diff -u -r1.11 Makefile
> --- Makefile  21 Aug 2017 18:49:30 -  1.11
> +++ Makefile  5 Jan 2018 21:25:22 -
> @@ -4,22 +4,19 @@
>  COMMENT-mysql=   MySQL driver for luadbi
>  COMMENT-pgsql=   PostgreSQL driver for luadbi
>  
> -V=   0.5
> -DISTNAME=luadbi.$V
> -PKGNAME-main=luadbi-$V
> -PKGNAME-mysql=   luadbi-mysql-$V
> -PKGNAME-pgsql=   luadbi-pgsql-$V
> -REVISION-main=   2
> -REVISION-mysql=  4
> -REVISION-pgsql=  1
> +GH_ACCOUNT=  mwild1
> +GH_PROJECT=  luadbi
> +V=   0.6
> +GH_TAGNAME=  v${V}
> +PKGNAME-main=${GH_PROJECT}-${V}
> +PKGNAME-mysql=   ${GH_PROJECT}-mysql-$V
> +PKGNAME-pgsql=   ${GH_PROJECT}-pgsql-$V
>  
>  CATEGORIES=  databases
>  
>  # MIT
>  PERMIT_PACKAGE_CDROM=Yes
>  
> -MASTER_SITES=https://distfiles.nl/
> -
>  MULTI_PACKAGES=  -main -mysql -pgsql
>  
>  WANTLIB-main=sqlite3
> @@ -40,20 +37,18 @@
>  USE_GMAKE=   Yes
>  
>  ALL_TARGET=  free # == sqlite3 mysql postgresql
> +INSTALL_TARGET=  install_free
> +# requires luarocks
>  NO_TEST= Yes
>  
>  MAKE_FLAGS=  CC="${CC}" \
>   COMMON_LDFLAGS="-L${LOCALBASE}/lib" \
> - CFLAGS="${CFLAGS} -I${MODLUA_INCL_DIR} -I${LOCALBASE}/include 
> -I${LOCALBASE}/include/mysql \
> - -I${LOCALBASE}/include/postgresql/ 
> -I${LOCALBASE}/include/postgresql/server \
> - -I. -fpic -shared"
> -
> -WRKDIST= ${WRKDIR}
> -
> -do-install:
> - ${INSTALL_DATA_DIR} ${MODLUA_LIBDIR} ${MODLUA_DATADIR}
> - ${INSTALL_DATA} ${WRKSRC}/DBI.lua ${MODLUA_DATADIR}
> -# XXX: Not using INSTALL_PROGRAM, it strips the library.
> - ${INSTALL_SCRIPT} ${WRKSRC}/*.so ${MODLUA_LIBDIR}
> + LUA_INC="-I${MODLUA_INCL_DIR}" \
> + MYSQL_INC="-I${LOCALBASE}/include/mysql" \
> + SQLITE3_INC="-I${LOCALBASE}/include" \
> + PSQL_INC="-I${LOCALBASE}/include/postgresql"
> +
> +FAKE_FLAGS=  LUA_LDIR=${MODLUA_DATADIR} \
> + LUA_CDIR=${MODLUA_LIBDIR}
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/databases/luadbi/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -r1.1.1.1 distinfo
> --- distinfo  16 Aug 2012 15:21:30 -  1.1.1.1
> +++ distinfo  5 Jan 2018 21:25:22 -
> @@ -1,2 +1,2 @@
> -SHA256 (luadbi.0.5.tar.gz) = SRFkWN2ABSU2v11+KyofWg+kKmcc538ctzVe9/rrMx4=
> -SIZE (luadbi.0.5.tar.gz) = 22454
> +SHA256 (luadbi-0.6.tar.gz) = QyiaVdlF4AzRkN9RX2CUgq9G7VkookzOZuppJfS30lU=
> +SIZE (luadbi-0.6.tar.gz) = 28621
> Index: patches/patch-dbd_sqlite3_connection_c
> ===
> RCS file: patches/patch-dbd_sqlite3_connection_c
> diff -N patches/patch-dbd_sqlite3_connection_c
> --- patches/patch-dbd_sqlite3_connection_c16 Aug 2012 15:21:30 -  
> 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,111 +0,0 @@
> -$OpenBSD: patch-dbd_sqlite3_connection_c,v 1.1.1.1 2012/08/16 15:21:30 
> jasper Exp $
> -
> -Fix DBD.SQLite3 transaction handling
> -From upstream svn rev 75
> -
>  dbd/sqlite3/connection.c.origSat May  1 06:25:12 2010
> -+++ dbd/sqlite3/connection.c Sun Jul 22 22:23:54 2012
> -@@ -9,20 +9,37 @@ static int run(connection_t *conn, const char *command
> - }
> - 
> - static int commit(connection_t *conn) {
> --return run(conn, "COMMIT");
> -+conn->txn_in_progress = 0;
> -+return run(conn, "COMMIT TRANSACTION");
> - }
> - 
> - 
> - static int begin(connection_t *conn) {
> --return run(conn, "BEGIN");
> --}
> -+int err = 0;
> - 
> -+if (conn->txn_in_progress) {
> -+err = 0;
> -+} else {
> -+conn->txn_in_progress = 1;
> -+err = run(conn, "BEGIN TRANSACTION");
> -+}
> - 
> -+return err;
> -+}
> -+
> - static int rollback(connection_t *conn) {
> --return run(conn, "ROLLBACK");
> -+conn->txn_in_progress = 0;
> -+return run(conn, "ROLLBACK TRANSACTION");
> - }
> - 
> -+int 

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/14 06:42:33

Modified files:
devel/kf5/kirigami2: Makefile 
devel/kf5/kirigami2/pkg: PLIST 

Log message:
fix SHARED_LIBS, WANTLIB and PLIST

It may have been lost in the last update.

Re: UPDATE editors/joe

[Jeremie Courreges-Anglas]

On Sun, Jan 14 2018, Stuart Henderson  wrote:
> On 2018/01/14 11:14, Landry Breuil wrote:
>> On Sun, Jan 14, 2018 at 11:09:05AM +0100, Björn Ketelaars wrote:
>> > On Sun 14/01/2018 10:10, Landry Breuil wrote:
>> > > On Sun, Jan 14, 2018 at 08:41:34AM +0100, Björn Ketelaars wrote:
>> > > > Enclosed a diff for bringing joe to the latest version (4.6), which 
>> > > > fixes
>> > > > a couple of bugs. Changelog can be found at
>> > > > https://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md
>> > > > 
>> > > > Output of 'make lib-depends-check' indicates that curses should be 
>> > > > included as
>> > > > WANTLIB instead of ncurses.
>> > > > 
>> > > > Comments?
>> > > 
>> > > Maybe portcheck warns about it, but if somehonw files are added into
>> > > share/applications; then you need to run depends on desktop-file-utils,
>> > > update the plist so that the share/applications dir is removed from it,
>> > > and add the corresponding @exec @unexec-delete goos as found in many
>> > > other ports. Or if you dont want to add the dependency, @comment the
>> > > entries so that they're not installed.
>> > 
>> > Yes...portcheck warns about files in share/applications, and about
>> > desktop-file-utils. My mistake.
>> > 
>> > New diff:
>> 
>> this one is okay for me if someone wants to commit it.
>> 
>
> The .desktop files are broken, "Exec=/usr/bin/joe %F"
>
> Easy to patch, but do we really want an X dependency for a simple text
> editor? It's the sort of thing you might install on a firewall for
> someone who isn't comfortable with vi/mg.

+1 to avoid the extra dep.

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

tdbc-postgres

[Stuart Cassoff]

Dangit! I always miss one detail. Apologies and thanks.

Stu


CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/01/14 06:12:26 
Modified files:
 databases  : Makefile 
Log message: unbreak
 - SUBDIR += tdbc-postres 
+ SUBDIR += tdbc-postgres

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/01/14 06:12:26

Modified files:
databases  : Makefile 

Log message:
unbreak

- SUBDIR += tdbc-postres
+ SUBDIR += tdbc-postgres

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/01/14 06:11:48

Modified files:
telephony/asterisk: Makefile distinfo 
telephony/asterisk/patches: 

patch-configs_samples_ast_debug_tools_conf_sample 
patch-configs_samples_asterisk_conf_sample 
patch-configure_ac 
patch-contrib_scripts_ast_coredumper 

patch-third-party_pjproject_source_pjlib_src_pj_ssl_sock_ossl_c 
telephony/asterisk/pkg: PLIST-main 

Log message:
update to asterisk-13.19.0

Re: UPDATE editors/joe

[Stuart Henderson]

On 2018/01/14 11:14, Landry Breuil wrote:
> On Sun, Jan 14, 2018 at 11:09:05AM +0100, Björn Ketelaars wrote:
> > On Sun 14/01/2018 10:10, Landry Breuil wrote:
> > > On Sun, Jan 14, 2018 at 08:41:34AM +0100, Björn Ketelaars wrote:
> > > > Enclosed a diff for bringing joe to the latest version (4.6), which 
> > > > fixes
> > > > a couple of bugs. Changelog can be found at
> > > > https://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md
> > > > 
> > > > Output of 'make lib-depends-check' indicates that curses should be 
> > > > included as
> > > > WANTLIB instead of ncurses.
> > > > 
> > > > Comments?
> > > 
> > > Maybe portcheck warns about it, but if somehonw files are added into
> > > share/applications; then you need to run depends on desktop-file-utils,
> > > update the plist so that the share/applications dir is removed from it,
> > > and add the corresponding @exec @unexec-delete goos as found in many
> > > other ports. Or if you dont want to add the dependency, @comment the
> > > entries so that they're not installed.
> > 
> > Yes...portcheck warns about files in share/applications, and about
> > desktop-file-utils. My mistake.
> > 
> > New diff:
> 
> this one is okay for me if someone wants to commit it.
> 

The .desktop files are broken, "Exec=/usr/bin/joe %F"

Easy to patch, but do we really want an X dependency for a simple text
editor? It's the sort of thing you might install on a firewall for
someone who isn't comfortable with vi/mg.

Re: [NEW] textproc/pup

[Stuart Henderson]

On 2018/01/14 03:11, Anthony J. Bentley wrote:
> Stuart Henderson writes:
> > >   $ pkg_info pup
> > >   Information for inst:pup-0.4.0
> > > 
> > >   Comment:
> > >   Parsing HTML at the command line
> >
> > Lowercase start of COMMENT. It could be more informative, maybe
> > "shell tool to filter HTML: CSS selectors, HTML/JSON output"?
> 
> That crams in a lot of detail for a COMMENT. How about just the first
> part, "shell tool to filter HTML"? When casually browsing packages I'm
> much more interested in the fact that it filters HTML than that it uses
> CSS selectors to do so.
> 

I don't think it's a bad thing for COMMENT to have a high signal:noise
ratio..

"to filter HTML" doesn't give much idea what this does. It makes me think
of something that strips out HTML and converts to text or similar?

If you know what you want to do and that a program exists to do it,
but you can't remember it because it has a name that is neither memorable
nor relates to what it does, at least grepping www/*/Makefile for 'CSS
selector' will find it then. And if you don't know that such a program
exists but know what a CSS selector is, it gives you a very good idea
what it does without looking in DESCR.

As an alternative "command line tool to filter HTML using CSS selectors"
is a bit easier-reading, though it does lose information.

Re: [NEW] textproc/pup

[Klemens Nanni]

On Sun, Jan 14, 2018 at 03:11:29AM -0700, Anthony J. Bentley wrote:
> Stuart Henderson writes:
> > >   $ pkg_info pup
> > >   Information for inst:pup-0.4.0
> > > 
> > >   Comment:
> > >   Parsing HTML at the command line
> >
> > Lowercase start of COMMENT. It could be more informative, maybe
> > "shell tool to filter HTML: CSS selectors, HTML/JSON output"?
> 
> That crams in a lot of detail for a COMMENT. How about just the first
> part, "shell tool to filter HTML"? When casually browsing packages I'm
> much more interested in the fact that it filters HTML than that it uses
> CSS selectors to do so.
> 
"command line tool for parsing HTML with CSS selectors"?


pup.tgz
Description: Binary data

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/01/14 05:27:14

Modified files:
archivers/lz4  : Makefile 
Added files:
archivers/lz4/patches: patch-lib_lz4_h 

Log message:
strip high-bit crap from lz4's installed header. fixes with borgbackup's crappy
version detection which causes python to vomit a "UnicodeDecodeError: 'ascii'
codec can't decode byte 0xc2 in position 1" error. reported by aja, thanks!

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2018/01/14 03:30:28

Modified files:
archivers/zstd : Makefile 

Log message:
Remove the patents comment. rsadowski@ wanted to remove the comment in
a previous update but I objected because I thought there was still a
PATENT file in the repo.

Re: CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

On Sat, Jan 13, 2018 at 02:39:00PM +, Stuart Henderson wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   st...@cvs.openbsd.org   2018/01/13 07:38:59
> 
> Modified files:
>   archivers/lz4  : Makefile distinfo 
>   archivers/lz4/patches: patch-lib_Makefile 
> Removed files:
>   archivers/lz4/patches: patch-examples_frameCompress_c 
> 
> Log message:
> update to lz4-1.8.1

This broke sysutils/borgbackup

===>  Compiler link: clang -> /usr/bin/clang
===>  Compiler link: clang++ -> /usr/bin/clang++
===>  Compiler link: cc -> /usr/bin/cc
===>  Compiler link: c++ -> /usr/bin/c++
===>  Configuring for borgbackup-1.1.4p0
===>  Building for borgbackup-1.1.4p0
Traceback (most recent call last):
  File "./setup.py", line 172, in 
liblz4_prefix = setup_lz4.lz4_system_prefix(possible_liblz4_prefixes)
  File "/exopi-obj/pobj/borgbackup-1.1.4/borgbackup-1.1.4/setup_lz4.py", line 
28, in lz4_system_prefix
if 'LZ4_compress_default' in fd.read():  # requires lz4 >= 1.7.0 (r129)
  File "/usr/local/lib/python3.6/encodings/ascii.py", line 26, in decode
return codecs.ascii_decode(input, self.errors)[0]
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 1: 
ordinal not in range(128)
Traceback (most recent call last):
  File "./setup.py", line 172, in 
liblz4_prefix = setup_lz4.lz4_system_prefix(possible_liblz4_prefixes)
  File "/exopi-obj/pobj/borgbackup-1.1.4/borgbackup-1.1.4/setup_lz4.py", line 
28, in lz4_system_prefix
if 'LZ4_compress_default' in fd.read():  # requires lz4 >= 1.7.0 (r129)
  File "/usr/local/lib/python3.6/encodings/ascii.py", line 26, in decode
return codecs.ascii_decode(input, self.errors)[0]
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc2 in position 1: 
ordinal not in range(128)


> 

-- 
Antoine

Re: UPDATE editors/joe

[Landry Breuil]

On Sun, Jan 14, 2018 at 11:09:05AM +0100, Björn Ketelaars wrote:
> On Sun 14/01/2018 10:10, Landry Breuil wrote:
> > On Sun, Jan 14, 2018 at 08:41:34AM +0100, Björn Ketelaars wrote:
> > > Enclosed a diff for bringing joe to the latest version (4.6), which fixes
> > > a couple of bugs. Changelog can be found at
> > > https://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md
> > > 
> > > Output of 'make lib-depends-check' indicates that curses should be 
> > > included as
> > > WANTLIB instead of ncurses.
> > > 
> > > Comments?
> > 
> > Maybe portcheck warns about it, but if somehonw files are added into
> > share/applications; then you need to run depends on desktop-file-utils,
> > update the plist so that the share/applications dir is removed from it,
> > and add the corresponding @exec @unexec-delete goos as found in many
> > other ports. Or if you dont want to add the dependency, @comment the
> > entries so that they're not installed.
> 
> Yes...portcheck warns about files in share/applications, and about
> desktop-file-utils. My mistake.
> 
> New diff:

this one is okay for me if someone wants to commit it.

Re: UPDATE: devel/doxygen, devel/doxygen-gui

[Rafael Sadowski]

Any objections?

On Mon Jan 01, 2018 at 03:21:37PM +0100, Rafael Sadowski wrote:
> Hi All,
> 
> please find below a simple diff to update doxygen. There are a three
> notables changes:
> 
> - Remove the DOXYGEN_ENCODE_PATH_STRIP hack diff. No port uses it anymore
> - Change MAINTAINER email address
> - CONFIGURE_ARGS and BUILD_DEPENDS tweaks
> 
> The only one consumer opencv builds fine and generate no PLIST changes.
> 
> Ok? Comments?
> 
> Rafael
> 
> 
> Index: devel/doxygen/Makefile
> ===
> RCS file: /cvs/ports/devel/doxygen/Makefile,v
> retrieving revision 1.44
> diff -u -p -u -p -r1.44 Makefile
> --- devel/doxygen/Makefile17 Aug 2017 14:31:37 -  1.44
> +++ devel/doxygen/Makefile1 Jan 2018 14:12:43 -
> @@ -7,16 +7,15 @@ BROKEN-alpha=   .got subsegment exceeds 64
>  
>  COMMENT= source code documentation generator tool
>  
> -VERSION= 1.8.13
> +VERSION= 1.8.14
>  DISTNAME=doxygen-${VERSION}.src
>  PKGNAME= doxygen-${VERSION}
> -REVISION=0
>  
>  CATEGORIES=  devel textproc
>  
>  HOMEPAGE=http://www.doxygen.org/
>  
> -MAINTAINER=  Rafael Sadowski 
> +MAINTAINER=  Rafael Sadowski 
>  
>  # GPLv2
>  PERMIT_PACKAGE_CDROM=Yes
> @@ -43,9 +42,9 @@ BUILD_DEPENDS+= devel/bison
>  RUN_DEPENDS+=print/ghostscript/gnu \
>   math/graphviz
>  
> -CONFIGURE_ARGS+=-Dbuild_doc:Bool=ON
> -CONFIGURE_ARGS+=-Dbuild_app:Bool=ON
> -CONFIGURE_ARGS+=-Dbuild_search:Bool=ON
> +CONFIGURE_ARGS+=-Dbuild_doc:Bool=ON \
> + -Dbuild_app:Bool=ON \
> + -Dbuild_search:Bool=ON
>  
>  WRKDIST= ${WRKDIR}/doxygen-${VERSION}
>  
> Index: devel/doxygen/distinfo
> ===
> RCS file: /cvs/ports/devel/doxygen/distinfo,v
> retrieving revision 1.11
> diff -u -p -u -p -r1.11 distinfo
> --- devel/doxygen/distinfo21 Apr 2017 19:43:38 -  1.11
> +++ devel/doxygen/distinfo1 Jan 2018 14:12:43 -
> @@ -1,2 +1,2 @@
> -SHA256 (doxygen-1.8.13.src.tar.gz) = 
> r2Z4h716h9wNv5rI2GyWtVLfuMqceQ7Ry/+qYTFXP2s=
> -SIZE (doxygen-1.8.13.src.tar.gz) = 4893912
> +SHA256 (doxygen-1.8.14.src.tar.gz) = 
> 0XV+AnVe9vVv1F8fQ5hZi5IDgZSNb8+lj1ymqlb1nU0=
> +SIZE (doxygen-1.8.14.src.tar.gz) = 4877980
> Index: devel/doxygen/patches/patch-doc_CMakeLists_txt
> ===
> RCS file: /cvs/ports/devel/doxygen/patches/patch-doc_CMakeLists_txt,v
> retrieving revision 1.2
> diff -u -p -u -p -r1.2 patch-doc_CMakeLists_txt
> --- devel/doxygen/patches/patch-doc_CMakeLists_txt23 Dec 2016 15:23:11 
> -  1.2
> +++ devel/doxygen/patches/patch-doc_CMakeLists_txt1 Jan 2018 14:12:43 
> -
> @@ -4,29 +4,30 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.2
>  - remove doxywizard.1, see devel/doxygen-gui
>  
>  
>  doc/CMakeLists.txt.orig  Sun Sep  4 19:06:42 2016
> -+++ doc/CMakeLists.txt   Fri Dec  9 22:52:29 2016
> -@@ -153,33 +153,15 @@ add_custom_target(doxygen_pdf
> +Index: doc/CMakeLists.txt
> +--- doc/CMakeLists.txt.orig
>  doc/CMakeLists.txt
> +@@ -152,12 +152,7 @@ add_custom_target(doxygen_pdf
>   WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/latex
>   )
>   add_custom_target(docs
>  -COMMAND ${CMAKE_COMMAND} -E copy 
> ${CMAKE_SOURCE_DIR}/doc/doxygen_logo.gif  ${PROJECT_BINARY_DIR}/html/
>  -COMMAND ${CMAKE_COMMAND} -E copy 
> ${CMAKE_SOURCE_DIR}/doc/doxygen_logo_low.gif  ${PROJECT_BINARY_DIR}/html/
>   DEPENDS ${PROJECT_BINARY_DIR}/man/doxygen.1
> - ${PROJECT_BINARY_DIR}/man/doxywizard.1
> +-${PROJECT_BINARY_DIR}/man/doxywizard.1
>  -${PROJECT_BINARY_DIR}/man/doxysearch.1
>  -${PROJECT_BINARY_DIR}/man/doxyindexer.1
> --doxygen_pdf
> + doxygen_pdf
>   VERBATIM
>   )
> - 
> +@@ -165,18 +160,5 @@ add_custom_target(docs
>   
> 
>   install(FILES
>   "${PROJECT_BINARY_DIR}/man/doxygen.1"
>  -"${PROJECT_BINARY_DIR}/man/doxywizard.1"
>  -"${PROJECT_BINARY_DIR}/man/doxysearch.1"
>  -"${PROJECT_BINARY_DIR}/man/doxyindexer.1"
> --DESTINATION share/man/man1
> + DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
>  -)
>  -
>  -install(FILES
> @@ -37,7 +38,4 @@ $OpenBSD: patch-doc_CMakeLists_txt,v 1.2
>  -install(DIRECTORY
>  -"${PROJECT_BINARY_DIR}/html"
>  -DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
> -+DESTINATION man/man1
>   )
> - 
> - endif(build_doc)
> Index: devel/doxygen/patches/patch-src_dirdef_cpp
> ===
> RCS file: devel/doxygen/patches/patch-src_dirdef_cpp
> diff -N devel/doxygen/patches/patch-src_dirdef_cpp
> --- devel/doxygen/patches/patch-src_dirdef_cpp

Re: [NEW] textproc/pup

[Anthony J. Bentley]

Stuart Henderson writes:
> > $ pkg_info pup
> > Information for inst:pup-0.4.0
> > 
> > Comment:
> > Parsing HTML at the command line
>
> Lowercase start of COMMENT. It could be more informative, maybe
> "shell tool to filter HTML: CSS selectors, HTML/JSON output"?

That crams in a lot of detail for a COMMENT. How about just the first
part, "shell tool to filter HTML"? When casually browsing packages I'm
much more interested in the fact that it filters HTML than that it uses
CSS selectors to do so.

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/14 03:10:09

Modified files:
devel/dlib : Makefile distinfo 
devel/dlib/patches: patch-examples_CMakeLists_txt 
devel/dlib/pkg : PLIST 

Log message:
Update dlib to 19.8

Change log: http://dlib.net/change_log.html

Re: UPDATE editors/joe

[Björn Ketelaars]

On Sun 14/01/2018 10:10, Landry Breuil wrote:
> On Sun, Jan 14, 2018 at 08:41:34AM +0100, Björn Ketelaars wrote:
> > Enclosed a diff for bringing joe to the latest version (4.6), which fixes
> > a couple of bugs. Changelog can be found at
> > https://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md
> > 
> > Output of 'make lib-depends-check' indicates that curses should be included 
> > as
> > WANTLIB instead of ncurses.
> > 
> > Comments?
> 
> Maybe portcheck warns about it, but if somehonw files are added into
> share/applications; then you need to run depends on desktop-file-utils,
> update the plist so that the share/applications dir is removed from it,
> and add the corresponding @exec @unexec-delete goos as found in many
> other ports. Or if you dont want to add the dependency, @comment the
> entries so that they're not installed.

Yes...portcheck warns about files in share/applications, and about
desktop-file-utils. My mistake.

New diff:


diff --git editors/joe/Makefile editors/joe/Makefile
index 2e0b050fe74..6926504071b 100644
--- editors/joe/Makefile
+++ editors/joe/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   Joe's Own Editor
 
-DISTNAME=  joe-4.5
+DISTNAME=  joe-4.6
 CATEGORIES=editors
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=joe-editor/}
 
@@ -11,9 +11,10 @@ HOMEPAGE=http://joe-editor.sourceforge.net/
 # GPLv2 only
 PERMIT_PACKAGE_CDROM=  Yes
 
-WANTLIB=   c ncurses m util
+WANTLIB=   c curses m util
 
 BUILD_DEPENDS= converters/libiconv
+RUN_DEPENDS=   devel/desktop-file-utils
 
 CONFIGURE_STYLE=   gnu
 
diff --git editors/joe/distinfo editors/joe/distinfo
index 6c37e9ba4e8..efbad7ef60a 100644
--- editors/joe/distinfo
+++ editors/joe/distinfo
@@ -1,2 +1,2 @@
-SHA256 (joe-4.5.tar.gz) = URBKo02GUL4/pJ8iBGcqUXaIyebsR+aPHqhd6I42yt8=
-SIZE (joe-4.5.tar.gz) = 1275486
+SHA256 (joe-4.6.tar.gz) = SVoKYfJkBAcP6KcZ2AQG3H8zdiN4jkRbkqn23lEqud4=
+SIZE (joe-4.6.tar.gz) = 1895046
diff --git editors/joe/pkg/PLIST editors/joe/pkg/PLIST
index 9d337f09bf0..b42373727c7 100644
--- editors/joe/pkg/PLIST
+++ editors/joe/pkg/PLIST
@@ -8,6 +8,10 @@ bin/rjoe
 man/ru/
 man/ru/man1/
 @man man/ru/man1/joe.1
+share/applications/jmacs.desktop
+share/applications/joe.desktop
+share/applications/jpico.desktop
+share/applications/jstar.desktop
 share/doc/joe/
 share/doc/joe/ChangeLog
 share/doc/joe/NEWS.md
@@ -221,3 +225,5 @@ share/joe/syntax/xml.jsf
 @sample ${SYSCONFDIR}/joe/syntax/xml.jsf
 share/joe/syntax/yaml.jsf
 @sample ${SYSCONFDIR}/joe/syntax/yaml.jsf
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/14 03:07:48

Modified files:
devel/qt-creator: Makefile distinfo 
devel/qt-creator/patches: 
  
patch-src_plugins_projectexplorer_gcctoolchain_cpp 
  
patch-src_plugins_qmakeprojectmanager_qmakebuildconfiguration_cpp 
  
patch-src_shared_qbs_src_lib_corelib_tools_tools_pri 
devel/qt-creator/pkg: PLIST 

Log message:
Update qt-creator from 4.4.1 to 4.5.0.

Release announcement:
http://blog.qt.io/blog/2017/12/07/qt-creator-4-5-0-released/

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/14 03:05:03

Modified files:
graphics/krita : Makefile distinfo 
graphics/krita/pkg: PLIST 

Log message:
Update krita to 3.3.2.1

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/14 03:03:54

Modified files:
lang/gawk  : Makefile distinfo 
lang/gawk/patches: patch-getopt_c 
lang/gawk/pkg  : PLIST 

Log message:
Update gawk to 4.2.0

PLIST tweak and ok jca@

Re: [NEW] textproc/pup

[Stuart Henderson]

On 2018/01/14 02:55, Klemens Nanni wrote:
> On Sat, Nov 18, 2017 at 12:01:12PM +0100, Klemens Nanni wrote:
> > On Fri, Nov 10, 2017 at 11:28:54PM +0100, Klemens Nanni wrote:
> > > Hey,
> > > 
> > > here's pup, a small but very helpful utility written in Go; pkg/DESCR:
> > > 
> > >   pup is a command line tool for processing HTML. It reads from
> > >   stdin, prints to stdout, and allows the user to filter parts of
> > >   the page using CSS selectors:
> > >   
> > >   
> > > https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_started/Selectors
> > >   
> > >   Inspired by http://stedolan.github.io/jq/, pup aims to be a fast
> > >   and flexible way of exploring HTML from the terminal.
> > > 
> > > Running just fine on my amd64 machine, tests pass.
> > > 
> > > The port is really simple and only packages the actual binary (no
> > > upstream manual page).
> > > 
> > > Feedback, comments?
> > Any takers?
> Second bump, port reattached. DESCR now without URLs:
> 
>   $ pkg_info pup
>   Information for inst:pup-0.4.0
> 
>   Comment:
>   Parsing HTML at the command line

Lowercase start of COMMENT. It could be more informative, maybe
"shell tool to filter HTML: CSS selectors, HTML/JSON output"?

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2018/01/14 02:46:18

Modified files:
graphics/blender: Makefile 

Log message:
Switch homepage/master_sites to https.

Re: update: x11/freerdp (and x11/remmina, and x11/gnome/vinagre)

[Alexandre Ratchov]

On Sat, Jan 13, 2018 at 10:37:06PM +, Stuart Henderson wrote:
> 
> > > > +WANTLIB += ossaudio
> > > 
> > > I don't _think_ we don't want that.. -DWITH_OSS=OFF ?
> > 
> > I am unsure... ossaudio is hardcoded for OpenBSD in CMakeLists.txt (see
> > client/common/CMakeLists.txt file). I did few tests, but I couldn't get
> > audio (with or without using ossaudio).
> 
> There was a big effort to remove ossaudio across as much of the ports
> tree as possible (exceptions mostly for mixer use IIRC). It doesn't seem
> to be used for anything here and isn't required to build, so I think we
> should just patch it away.
> 

btw, audio bits were removed from -lossaudio, it contains the
mixer "ioctls" only

Re: UPDATE editors/joe

[Landry Breuil]

On Sun, Jan 14, 2018 at 08:41:34AM +0100, Björn Ketelaars wrote:
> Enclosed a diff for bringing joe to the latest version (4.6), which fixes
> a couple of bugs. Changelog can be found at
> https://sourceforge.net/p/joe-editor/mercurial/ci/default/tree/NEWS.md
> 
> Output of 'make lib-depends-check' indicates that curses should be included as
> WANTLIB instead of ncurses.
> 
> Comments?

Maybe portcheck warns about it, but if somehonw files are added into
share/applications; then you need to run depends on desktop-file-utils,
update the plist so that the share/applications dir is removed from it,
and add the corresponding @exec @unexec-delete goos as found in many
other ports. Or if you dont want to add the dependency, @comment the
entries so that they're not installed.

Re: UPDATE: www/uget 2.0.10 => 2.2.0

[Anthony J. Bentley]

Brian Callahan writes:
> Hi ports --
>
> Here's a routine diff to update www/uget to its new version. Upstream 
> doesn't seem to have announced this new version yet but it's been 
> released so I'd like to put it in.
>
> Changelog:
> 1. mega plug-in: create new plug-in for MEGA site.
> 2. all plug-in: avoid crash if plug-in failed to start.
> 3. Fix: some category/status doesn't refresh it's download list.
> 4. update translation files.
>
> OK?

It crashes when I try Mega links.

uget-gtk(23066) in free(): modified chunk-pointer 0x8cfc8cbc0d2
Abort trap (core dumped) 

(gdb) bt
#0  thrkill () at -:3
#1  0x08cfd3f8c29e in _libc_abort () at /usr/src/lib/libc/stdlib/abort.c:61
#2  0x08cfd3f4c0b2 in _rthread_mutex_trylock (mutex=, 
trywait=0, abs=)
at /usr/src/lib/libc/thread/rthread_mutex.c:118
#3  _rthread_mutex_timedlock (mutexp=, trywait=0, abs=0x0, 
timed=) at /usr/src/lib/libc/thread/rthread_mutex.c:168
#4  0x08cfd3f52656 in malloc (size=24)
at /usr/src/lib/libc/stdlib/malloc.c:1264
#5  0x08cf81c0aef8 in append_pending_request ()
   from /usr/X11R6/lib/libX11.so.16.1
#6  0x08cf81c0b332 in _XReply () from /usr/X11R6/lib/libX11.so.16.1
#7  0x08cf81beed51 in XGetWindowProperty ()
   from /usr/X11R6/lib/libX11.so.16.1
#8  0x08cfd673d9b9 in gdk_x11_window_get_frame_extents (
window=, rect=0x7f7d2de0) at gdkwindow-x11.c:3241
#9  0x08d02be49134 in gtk_window_get_position (window=0x8d02a58aa70, 
root_x=0x7f7d2e34, root_y=0x7f7d2e30) at gtkwindow.c:5807
#10 0x08cd4671b2e7 in ugtk_app_get_window_setting (app=0x8cfb6314460, 
setting=0x8cfb6314880) at UgtkApp.c:214
#11 0x08cd4671b209 in ugtk_app_quit (app=0x8cfb6314460) at UgtkApp.c:184
#12 0x08cd46720a33 in sys_signal_handler (sig=)
at UgtkApp-main.c:206
#13 
#14 thrkill () at -:3
#15 0x08cfd3f8c26e in _libc_abort () at /usr/src/lib/libc/stdlib/abort.c:51
#16 0x08cfd3f53119 in wrterror (d=0x8cf80bfd7d0, 
msg=0x8cfd40f761c "modified chunk-pointer %p")
at /usr/src/lib/libc/stdlib/malloc.c:291
#17 0x08cfd3f55eb7 in find_chunknum (d=0x0, info=, ptr=0x0, 
check=-185144) at /usr/src/lib/libc/stdlib/malloc.c:1070
#18 0x08cfd3f536ba in ofree (argpool=, p=0x8cfc8cbc0d2, 
clear=0, check=0, argsz=0) at /usr/src/lib/libc/stdlib/malloc.c:1386
#19 0x08cfd3f531f9 in free (ptr=0x8cfc8cbc0d2)
at /usr/src/lib/libc/stdlib/malloc.c:1445
#20 0x08cd467303d3 in plugin_final (plugin=0x8d0157f3d00)
at UgetPluginMega.c:148
#21 0x08cd4672a79f in uget_plugin_unref (plugin=0x8d0157f3d00)
at UgetPlugin.c:149
#22 0x08cd46726c6d in uget_task_add (task=0x8cfb63147c8, 
node=0x8d01a0c2360, info=0x8cd469655c8 )
at UgetTask.c:119
#23 0x08cd4672945f in uget_app_activate_download (app=0x8cfb6314460, 
dnode=0x8d01a0c2360) at UgetApp.c:970
#24 0x08cd46727e59 in uget_app_queuing (app=, 
cnode=, category=) at UgetApp.c:248
#25 uget_app_grow (app=0x8cfb6314460, no_queuing=0) at UgetApp.c:272
#26 0x08cd4671fadd in ugtk_app_timeout_queuing (app=0x8cfb6314460)
at UgtkApp-timeout.c:199
#27 0x08cfbf0e4145 in g_timeout_dispatch (source=0x8cf881c2780, 
callback=0x6, user_data=0x0) at gmain.c:4633
#28 0x08cfbf0e7df8 in g_main_dispatch (context=)
at gmain.c:3148
#29 g_main_context_dispatch (context=) at gmain.c:3813
#30 0x08cfbf0e81e5 in g_main_context_iterate (context=, 
block=, dispatch=, self=)
at gmain.c:3886
#31 0x08cfbf0e854f in g_main_loop_run (loop=0x8d00ad7b320) at gmain.c:4082
#32 0x08d02bcbf73b in gtk_main () at gtkmain.c:1322
#33 0x08cd4672092a in main (argc=1, argv=0x7f7d38a8)
at UgtkApp-main.c:313

Re: update: x11/freerdp (and x11/remmina, and x11/gnome/vinagre)

[Sebastien Marie]

On Sat, Jan 13, 2018 at 10:37:06PM +, Stuart Henderson wrote:
> On 2018/01/13 20:02, Sebastien Marie wrote:
> > On Sat, Jan 13, 2018 at 02:00:50PM +, Stuart Henderson wrote:
> > > On 2018/01/13 14:11, Sebastien Marie wrote:
> > > > I didn't check RUN_DEPENDS, as I didn't expect command-line change.
> > > 
> > > I wouldn't put it past them to chage command-line again ;)
> 
> OK, I've compared the help output from old and new, diff is a bit hard
> to read but it seems pretty close so I don't think there will be a problem.

thanks.

> > > > +WANTLIB += ossaudio
> > > 
> > > I don't _think_ we don't want that.. -DWITH_OSS=OFF ?
> > 
> > I am unsure... ossaudio is hardcoded for OpenBSD in CMakeLists.txt (see
> > client/common/CMakeLists.txt file). I did few tests, but I couldn't get
> > audio (with or without using ossaudio).
> 
> There was a big effort to remove ossaudio across as much of the ports
> tree as possible (exceptions mostly for mixer use IIRC). It doesn't seem
> to be used for anything here and isn't required to build, so I think we
> should just patch it away.

I removed ossaudio.

> It might not be all that hard to port to sndio, if somebody actually
> wants audio over this..

I agree.

> xfreerdp itself still works for me.
> 
> remmina needs cvs rm patch-* then it builds, but doesn't work
> properly for me (displays the window, but doesn't do anything if
> I enter a hostname and try to connect).

Same behaviour at runtime. Diff updated to link as Freebsd with
-rdynamic (Gtk error messages asked for it) in CMakeLists.txt.

I am able to connect via RDP (sole protocol tested).

I have also cvs rm old patches.

> I haven't tried vinagre.

I should be able to try it today.

Thanks.
-- 
Sebastien Marie


Index: x11/freerdp/Makefile
===
RCS file: /cvs/ports/x11/freerdp/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- x11/freerdp/Makefile9 Nov 2017 16:50:39 -   1.29
+++ x11/freerdp/Makefile14 Jan 2018 08:14:58 -
@@ -5,18 +5,17 @@ BROKEN-arm =  unrecognized option -mfpu=
 BROKEN-hppa =  undefined reference to __sync_val_compare_and_swap_4
 
 COMMENT =  open source client for Windows Terminal Server
-DISTNAME = freerdp-1.2.0beta1
+DISTNAME = freerdp-2.0.0rc1
 CATEGORIES =   x11 net
-REVISION = 2
 
 GH_ACCOUNT =   FreeRDP
 GH_PROJECT =   FreeRDP
-GH_COMMIT =f5ff6e1bd819a347aa532c1ef1a9cf0c67387507
+GH_TAGNAME =   2.0.0-rc1
 
-SHARED_LIBS +=  freerdp-client0.0 # 1.2
-SHARED_LIBS +=  freerdp   0.0 # 1.2
-SHARED_LIBS +=  winpr 0.0 # 1.1
-SHARED_LIBS +=  xfreerdp-client   0.0 # 1.2
+SHARED_LIBS +=  freerdp-client2   0.0 # 2.0
+SHARED_LIBS +=  freerdp2  0.0 # 2.0
+SHARED_LIBS +=  winpr-tools2  0.0 # 2.0
+SHARED_LIBS +=  winpr20.0 # 2.0
 
 HOMEPAGE = http://www.freerdp.com/
 
@@ -25,7 +24,6 @@ PERMIT_PACKAGE_CDROM =Yes
 
 WANTLIB += X11 Xcursor Xext Xfixes Xi Xinerama Xrender Xv avcodec
 WANTLIB += avutil c crypto cups execinfo m pthread ssl xkbfile
-WANTLIB += z
 
 MODULES =  devel/cmake
 
@@ -38,20 +36,14 @@ LIB_DEPENDS =   devel/libexecinfo \
print/cups,-libs \
graphics/ffmpeg
 
-CONFIGURE_ARGS +=  -DWITH_ALSA=OFF \
-   -DWITH_CUPS=ON \
+CONFIGURE_ARGS +=  -DWITH_CUPS=ON \
-DWITH_DIRECTFB=OFF \
-DWITH_GSTREAMER_0_10=OFF \
-DWITH_GSTREAMER_1_0=OFF \
-DWITH_OPENSLES=OFF \
-DWITH_PCSC=ON \
-   -DWITH_PULSE=OFF
-
-# XXX does not build
-CONFIGURE_ARGS +=  -DCHANNEL_DRIVE=OFF
-
-# -msse3 requires a newer gcc
-CONFIGURE_ARGS +=  -DWITH_SSE2=OFF
+   -DWITH_LIBSYSTEMD=OFF \
+   -DWITH_OSS=OFF
 
 NO_TEST =  Yes
 
Index: x11/freerdp/distinfo
===
RCS file: /cvs/ports/x11/freerdp/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- x11/freerdp/distinfo6 May 2017 15:10:18 -   1.7
+++ x11/freerdp/distinfo14 Jan 2018 08:14:58 -
@@ -1,2 +1,2 @@
-SHA256 (freerdp-1.2.0beta1-f5ff6e1b.tar.gz) = 
/LC7jfaSVy4Bmye9sljZvhOW/pOAerJ3Ld4vC7JqxVY=
-SIZE (freerdp-1.2.0beta1-f5ff6e1b.tar.gz) = 6036392
+SHA256 (freerdp-2.0.0rc1.tar.gz) = osHIMHJInVbaeLvnbClykCL1w1o+w6HOJs6ogj3gQ8I=
+SIZE (freerdp-2.0.0rc1.tar.gz) = 6530403
Index: x11/freerdp/patches/patch-CMakeLists_txt
===
RCS file: x11/freerdp/patches/patch-CMakeLists_txt
diff -N x11/freerdp/patches/patch-CMakeLists_txt
--- x11/freerdp/patches/patch-CMakeLists_txt7 Nov 2015