CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2018/01/22 00:45:37

Modified files:
graphics/geeqie: Makefile distinfo 
graphics/geeqie/pkg: PLIST 
Added files:
graphics/geeqie/patches: patch-Makefile_am 
 patch-src_layout_util_c 

Log message:
update to geeqie-14
- switch to gtk+3
- fix COMMENT
- update license marker
ok landry@

CVS: cvs.openbsd.org: ports

[Giovanni Bechis]

CVSROOT:/cvs
Module name:ports
Changes by: giova...@cvs.openbsd.org2018/01/22 00:40:27

Modified files:
textproc   : Makefile 

Log message:
+p5-PerlIO-utf8_strict

Re: CVS: cvs.openbsd.org: ports

[Giovanni Bechis]

On 01/22/18 08:30, Giovanni Bechis wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   giova...@cvs.openbsd.org2018/01/22 00:30:26
> 
> Log message:
> Import p5-Clone-PP
> hints and ok sthen@
> 

This was ok fcambus@, sorry.
 Giovanni

CVS: cvs.openbsd.org: ports

[Giovanni Bechis]

CVSROOT:/cvs
Module name:ports
Changes by: giova...@cvs.openbsd.org2018/01/22 00:38:40

Modified files:
devel  : Makefile 

Log message:
+p5-Clone-PP
+p5-Data-Printer

CVS: cvs.openbsd.org: ports

[Giovanni Bechis]

CVSROOT:/cvs
Module name:ports
Changes by: giova...@cvs.openbsd.org2018/01/22 00:35:46

Log message:
Import devel/p5-Data-Printer, a tool to display Perl variables
and objects on screen.
hints and ok sthen@

pkg/DESCR:
Data::Printer is a tool to display Perl variables and objects on screen.
Unlike Data::Dumper, which outputs a format suitable for use with eval,
Data::Printer's format is intended for human inspection.

- Human-friendly output, with array index and custom separators
- Full object dumps including methods, inheritance and internals
- Exposes extra information such as tainted data and weak references
- Ability to easily create filters for objects and regular structures

Status:

Vendor Tag: giovanni
Release Tags:   giovanni_20180122

N ports/devel/p5-Data-Printer/Makefile
N ports/devel/p5-Data-Printer/distinfo
N ports/devel/p5-Data-Printer/pkg/PLIST
N ports/devel/p5-Data-Printer/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Giovanni Bechis]

CVSROOT:/cvs
Module name:ports
Changes by: giova...@cvs.openbsd.org2018/01/22 00:33:34

Log message:
Import textproc/p5-PerlIO-utf8-strict.
hints and ok sthen@

pkg/DESCR:
This module provides a fast and correct UTF-8 PerlIO layer. Unlike
perl's default :utf8 layer it checks the input for correctness.

Status:

Vendor Tag: giovanni
Release Tags:   giovanni_20180122

N ports/textproc/p5-PerlIO-utf8_strict/Makefile
N ports/textproc/p5-PerlIO-utf8_strict/distinfo
N ports/textproc/p5-PerlIO-utf8_strict/pkg/PLIST
N ports/textproc/p5-PerlIO-utf8_strict/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Giovanni Bechis]

CVSROOT:/cvs
Module name:ports
Changes by: giova...@cvs.openbsd.org2018/01/22 00:30:26

Log message:
Import p5-Clone-PP
hints and ok sthen@

pkg/DESCR:
This module provides a general-purpose clone function to make deep
copies of Perl data structures. It calls itself recursively to copy
nested hash, array, scalar and reference types, including tied variables
and objects.

Status:

Vendor Tag: giovanni
Release Tags:   giovanni_20180122

N ports/devel/p5-Clone-PP/Makefile
N ports/devel/p5-Clone-PP/distinfo
N ports/devel/p5-Clone-PP/pkg/PLIST
N ports/devel/p5-Clone-PP/pkg/DESCR

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2018/01/21 23:28:00

Modified files:
devel/libffi   : Makefile 
devel/libffi/patches: patch-configure patch-src_arm_ffi_c 
Added files:
devel/libffi/patches: patch-src_arm_sysv_S 

Log message:
Fix libffi on arm when building with clang. Patches come from upstream and
FreeBSD. Idea to tweak the configure script and WANTLIB changes from jca@.
Thanks to phessler@ for getting the gears moving on this.
ok jca@ jasper@ (MAINTAINER), makes sense to jsg@

NEW: libtheoraplay & libtheorafile - ports for videoplayback in FNA games

[Thomas Frohwein]

Hi ports@,

Attached are two ports that fulfill the same function in FNA games, but are used
in different products: libtheoraplay and libtheorafile. Both are essentially
small libraries that are called by those games for Ogg Theora videoplayback.

I've found the following FNA games than use these libraries and tested that they
run with them:

libtheoraplay - A Virus Named TOM, Bleed, Capsized, FEZ, HackNet, Overdriven
Reloaded, Paladin, Skulls of the Shogun, and Towerfall:
Ascension

libtheorafile - Bleed 2, Dust: An Elysian Tail, Hidden in Plain Sight, Owlboy

Both ports come with a test folder with a script or target to compile a binary
that can play Ogg Theora files (.ogv) for testing purposes. Since this is
interactive and no example .ogv files are provided, I set NO_TEST = Yes.
Instructions on how to test are as comment in the Makefile above the NO_TEST
line.

With these 2 ports (+ SDL2 + vorbis), almost all FNA games that have a DRM-free
version can be played on OpenBSD, with the only barrier being the mono port that
must be manually compiled at the moment. There is a script on
https://github.com/thfrwn/fnaify that can configure the games for you to find
the proper libraries and move packaged mono dll's out of the way.


libtheoraplay.tgz
Description: Binary data


libtheorafile.tgz
Description: Binary data

Re: FIX: devel/libffi on armv7/clang

[Jonathan Gray]

On Sun, Jan 21, 2018 at 09:45:53PM +0100, Jeremie Courreges-Anglas wrote:
> 
> +cc maintainer
> 
> On Sun, Jan 21 2018, Brian Callahan  wrote:
> > On 01/21/18 08:13, Peter Hessler wrote:
> >> On 2018 Jan 21 (Sun) at 02:06:52 -0500 (-0500), Brian Callahan wrote:
> >> :Finally, it looks like libffi needs libc++abi on arm for at least some
> >> :functions, as
> >> :experienced with lang/snobol4, its configure script didn't pick up libffi 
> >> and
> >> :instead
> >> :complained about this:
> >> :/usr/local/lib/libffi.so.1.2: undefined reference to 
> >> `__aeabi_unwind_cpp_pr0'
> >> :/usr/local/lib/libffi.so.1.2: undefined reference to 
> >> `__aeabi_unwind_cpp_pr1'
> >> :Those functions are in libc++abi.
> >> :
> >>
> >> Did you mean to include a patch to libffi.pc to address these issues?
> >>
> >>
> >
> > Ugh. No more 2am diffs more me.
> >
> > We just want this to be for arm, of course, to avoid breaking all gcc
> > archs. Attached diff deals.
> 
> I think it would be better to link libffi against -lc++abi, inter-libs deps
> would be enough and would ensure that consumers don't need to use
> pkg-config.  static builds would still need the pkg-config goo, but we
> don't have static archs any more.  Do we have such ports?

Linking libffi against c++abi makes sense and matches how a similiar
situation is handled with devel/luajit.

> 
> The diff below also adds c++abi to WANTLIB.
> 
> Test summary:
>   # of expected passes1845
>   # of unexpected failures15
> 
> Now testing some consumer ports.
> 
> 
> Index: Makefile
> ===
> RCS file: /d/cvs/ports/devel/libffi/Makefile,v
> retrieving revision 1.35
> diff -u -p -r1.35 Makefile
> --- Makefile  26 May 2016 20:48:50 -  1.35
> +++ Makefile  21 Jan 2018 19:41:05 -
> @@ -3,7 +3,7 @@
>  COMMENT= Foreign Function Interface
>  
>  DISTNAME=libffi-3.2.1
> -REVISION=2
> +REVISION=3
>  SHARED_LIBS +=  ffi  1.2  # .6.4
>  CATEGORIES=  devel
>  
> @@ -15,6 +15,10 @@ HOMEPAGE=  http://sourceware.org/libffi/
>  PERMIT_PACKAGE_CDROM=Yes
>  
>  WANTLIB += pthread
> +# needed for unwind symbols
> +.if ${MACHINE_ARCH} == "arm"
> +WANTLIB += c++abi
> +.endif
>  
>  MASTER_SITES=ftp://sourceware.org/pub/libffi/
>  
> Index: patches/patch-configure
> ===
> RCS file: /d/cvs/ports/devel/libffi/patches/patch-configure,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-configure
> --- patches/patch-configure   28 Jan 2016 08:40:47 -  1.7
> +++ patches/patch-configure   21 Jan 2018 19:34:49 -
> @@ -1,14 +1,19 @@
>  $OpenBSD: patch-configure,v 1.7 2016/01/28 08:40:47 jasper Exp $
>  
> -- Always link with -pthread for libffi
> +- Always link with -pthread for libffi (XXX not needed any more?)
> +- Link with libc++abi on arm (to access unwind symbols)
>  
>  configure.orig   Tue Jan 26 18:55:54 2016
> -+++ configureTue Jan 26 18:56:20 2016
> -@@ -18522,6 +18522,12 @@ $as_echo "#define SYMBOL_UNDERSCORE 1" >>confdefs.h
> +Index: configure
> +--- configure.orig
>  configure
> +@@ -18522,6 +18522,15 @@ $as_echo "#define SYMBOL_UNDERSCORE 1" >>confdefs.h
>   
>   fi
>   
>  +case "$target" in
> ++arm-*-openbsd*)
> ++  LDFLAGS="-lpthread -lc++abi $LDFLAGS"
> ++;;
>  +*-*-openbsd*)
>  +  LDFLAGS="-lpthread $LDFLAGS"
>  +;;
> Index: patches/patch-src_arm_ffi_c
> ===
> RCS file: /d/cvs/ports/devel/libffi/patches/patch-src_arm_ffi_c,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-src_arm_ffi_c
> --- patches/patch-src_arm_ffi_c   15 Jul 2015 17:06:48 -  1.7
> +++ patches/patch-src_arm_ffi_c   21 Jan 2018 19:34:49 -
> @@ -1,15 +1,36 @@
>  $OpenBSD: patch-src_arm_ffi_c,v 1.7 2015/07/15 17:06:48 jasper Exp $
>  
> -Fix warning: implicit declaration of function '__clear_cache'
> +https://svnweb.freebsd.org/ports/head/devel/libffi/files/patch-src__arm__ffi.c?revision=337118=markup
>  
>  src/arm/ffi.c.orig   Fri Apr 25 19:45:13 2014
> -+++ src/arm/ffi.cMon Sep 15 22:00:37 2014
> -@@ -37,6 +37,8 @@
> +Index: src/arm/ffi.c
> +--- src/arm/ffi.c.orig
>  src/arm/ffi.c
> +@@ -33,6 +33,11 @@
> + 
> + #include 
> + 
> ++#ifdef __arm__
> ++#include 
> ++#include 
> ++#endif
> ++
> + /* Forward declares. */
>   static int vfp_type_p (ffi_type *);
>   static void layout_vfp_args (ffi_cif *);
> +@@ -750,6 +755,16 @@ ffi_closure_free (void *ptr)
> + }
>   
> -+extern void __clear_cache(char *beg, char *end);
> + #else
>  +
> - int ffi_prep_args_SYSV(char *stack, extended_cif *ecif, float *vfp_space);
> - int ffi_prep_args_VFP(char *stack, extended_cif *ecif, float *vfp_space);
> ++#ifdef __arm__
> ++#define __clear_cache(start, end) do {  
> 

UPDATE: textproc/py-markdown 2.6.9 -> 2.6.11

[Klemens Nanni]

Simple update, tests pass for py2 and py3 on amd64.

I included the NOOP diff for PFRAG.no-python3 as done by `update-plist'
so further runs won't change it.

Feedback?

diff --git a/textproc/py-markdown/Makefile b/textproc/py-markdown/Makefile
index 96dc570c7d0..a4b4cadaf4e 100644
--- a/textproc/py-markdown/Makefile
+++ b/textproc/py-markdown/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   text-to-HTML conversion tool
 
-MODPY_EGG_VERSION= 2.6.9
+MODPY_EGG_VERSION= 2.6.11
 DISTNAME=  Markdown-${MODPY_EGG_VERSION}
 PKGNAME=   py-markdown-${MODPY_EGG_VERSION}
 CATEGORIES=textproc
@@ -14,6 +14,7 @@ PERMIT_PACKAGE_CDROM= Yes
 
 MODULES=   lang/python
 MODPY_PI=  Yes
+MODPY_SETUPTOOLS=  Yes
 
 FLAVORS=   python3
 FLAVOR?=
diff --git a/textproc/py-markdown/distinfo b/textproc/py-markdown/distinfo
index 8d5fa55b6b9..4ed3133c0a2 100644
--- a/textproc/py-markdown/distinfo
+++ b/textproc/py-markdown/distinfo
@@ -1,2 +1,2 @@
-SHA256 (Markdown-2.6.9.tar.gz) = c695cji5V2izqbb+YnDiUOXAnZiLjlsiP9XvpOBvr4E=
-SIZE (Markdown-2.6.9.tar.gz) = 271564
+SHA256 (Markdown-2.6.11.tar.gz) = qFaGnH/wea2Eo+Gc2HpkmYNQwrlOngjkQnD67zNAD4E=
+SIZE (Markdown-2.6.11.tar.gz) = 274132
diff --git a/textproc/py-markdown/pkg/PFRAG.no-python3 
b/textproc/py-markdown/pkg/PFRAG.no-python3
index bb99a9348db..25ef9ae0134 100644
--- a/textproc/py-markdown/pkg/PFRAG.no-python3
+++ b/textproc/py-markdown/pkg/PFRAG.no-python3
@@ -1,3 +1,3 @@
 @comment $OpenBSD: PFRAG.no-python3,v 1.1.1.1 2017/02/10 21:42:33 danj Exp $
-@pkgpath textproc/markdown
 @conflict markdown-*
+@pkgpath textproc/markdown
diff --git a/textproc/py-markdown/pkg/PLIST b/textproc/py-markdown/pkg/PLIST
index cfe7537594d..a5db307758b 100644
--- a/textproc/py-markdown/pkg/PLIST
+++ b/textproc/py-markdown/pkg/PLIST
@@ -1,7 +1,12 @@
 @comment $OpenBSD: PLIST,v 1.3 2017/02/10 22:25:20 danj Exp $
 !%%python3%%
 bin/markdown_py${MODPY_BIN_SUFFIX}
-lib/python${MODPY_VERSION}/site-packages/Markdown-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/Markdown-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/Markdown-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/Markdown-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/Markdown-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/Markdown-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/Markdown-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/markdown/
 lib/python${MODPY_VERSION}/site-packages/markdown/__init__.py
 lib/python${MODPY_VERSION}/site-packages/markdown/__main__.py

CVS: cvs.openbsd.org: ports

[Matthias Kilian]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2018/01/21 17:42:30

Modified files:
lang/ghc   : Makefile distinfo ghc.port.mk 
lang/ghc/patches: patch-compiler_main_SysTools_hs 
  patch-configure patch-ghc_mk 
  patch-iserv_ghc_mk 
  
patch-libraries_Cabal_Cabal_Distribution_Simple_Program_Strip_hs 
  patch-libraries_process_include_runProcess_h 
  patch-mk_config_mk_in 
  patch-testsuite_driver_testlib_py 
  patch-testsuite_mk_test_mk 
  patch-testsuite_tests_cabal_ghcpkg01_stdout 
  patch-testsuite_tests_codeGen_should_run_all_T 
  patch-utils_ghc-pkg_Main_hs 
lang/ghc/pkg   : PLIST 
Added files:
lang/ghc/patches: 
  
patch-libraries_Cabal_Cabal_Distribution_Simple_Compiler_hs 
  patch-rts_linker_Elf_c 
Removed files:
lang/ghc/patches: patch-rts_Linker_c 

Log message:
Update to ghc-8.2.2,
but mark it as broken for a few days.

UPDATE devel/sdl2 - add ability to change gamecontroller mapping with environment variable

[Thomas Frohwein]

Hi,

The way that SDL2's gamecontroller API was enabled with the 2.0.7 upgrade
hardcoded one controller mapping at compile time (which was an upgrade from 
not being able to use it all in FNA games, reportedly also PPSSPP before that).

SDL2 *should* however be able to map the controller layout at runtime based on
1) the SDL_GAMECONTROLLERCONFIG environment variable, and 2) files with
controller layout specifications, in several applications called
gamecontrollerdb.txt.

The below diff adds the ability to assign controller mapping at runtime via the
SDL_GAMECONTROLLERCONFIG env variable. It is a workaround because it is not
clear yet where the upstream SDL2 code fails to achieve this. Reading mapping
from file is not (yet) possible.

The diff only changes a handful of lines (see below). I tested it completely
remapping a Logitech Dual Action gamepad, including D-pad. The first 2 parts of
the string (guid and device name) don't have any functional impact at this
point when passed via the SDL_GAMECONTROLLERCONFIG.

My suggested approach at the moment is using the port sdl-jstest to display the
mapping string with 'sdl2-jstest -l', adjusting the buttons, axes, and dpad
from there and pass it into the SDL_GAMECONTROLLERCONfIG environment variable.

Empty SDL_GAMECONTROLLERCONFIG keeps default mappings. An invalid mapping
string seems to disable the gamepad in the application based on my testing.

Thanks.

Index: Makefile
===
RCS file: /cvs/ports/devel/sdl2/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile12 Jan 2018 19:32:54 -  1.20
+++ Makefile21 Jan 2018 23:40:12 -
@@ -9,7 +9,7 @@ DISTNAME=   SDL2-${V}
 PKGNAME=   sdl2-${V}
 CATEGORIES=devel
 MASTER_SITES=  https://www.libsdl.org/release/
-REVISION=  0
+REVISION=  1
 
 SHARED_LIBS=   SDL20.4 # 0.7
 
Index: patches/patch-src_joystick_SDL_gamecontroller_c
===
RCS file: 
/cvs/ports/devel/sdl2/patches/patch-src_joystick_SDL_gamecontroller_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_joystick_SDL_gamecontroller_c
--- patches/patch-src_joystick_SDL_gamecontroller_c 7 Jan 2018 22:56:46 
-   1.1
+++ patches/patch-src_joystick_SDL_gamecontroller_c 21 Jan 2018 23:40:12 
-
@@ -5,11 +5,12 @@ also disable checking string "Xbox 360 W
 everything will be Xbox360 controller (works with generic joysticks)
 - note: the actual Xbox360 controller has buttons and axes messed up on
  openbsd with these mappings
+map to SDL_GAMECONTROLLERCONFIG envvar if available
 
 Index: src/joystick/SDL_gamecontroller.c
 --- src/joystick/SDL_gamecontroller.c.orig
 +++ src/joystick/SDL_gamecontroller.c
-@@ -884,15 +884,15 @@ static ControllerMapping_t *SDL_PrivateGetControllerMa
+@@ -884,15 +884,21 @@ static ControllerMapping_t *SDL_PrivateGetControllerMa
  #else
  (void) s_pEmscriptenMapping;  /* pacify ARMCC */
  #endif
@@ -20,10 +21,17 @@ Index: src/joystick/SDL_gamecontroller.c
 +//if (SDL_strstr(name, "Xbox 360 Wireless Receiver")) {
  /* The Linux driver xpad.c maps the wireless dpad to buttons */
  SDL_bool existing;
- mapping = SDL_PrivateAddMappingForGUID(guid,
+-mapping = SDL_PrivateAddMappingForGUID(guid,
++  char guid_str[1024];
++SDL_JoystickGetGUIDString(guid, guid_str, sizeof(guid_str));
++  if (SDL_GetHint(SDL_HINT_GAMECONTROLLERCONFIG) == NULL) {
++  mapping = SDL_PrivateAddMappingForGUID(guid,
  "none,X360 Wireless 
Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
, SDL_CONTROLLER_MAPPING_PRIORITY_DEFAULT);
 -}
++  } else {
++  mapping = SDL_PrivateAddMappingForGUID(guid, 
SDL_GetHint(SDL_HINT_GAMECONTROLLERCONFIG), , 
SDL_CONTROLLER_MAPPING_PRIORITY_DEFAULT);
++  }
 +//}
  }
  #endif /* __LINUX__ */

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2018/01/21 16:49:25

Modified files:
devel/flake8   : Makefile distinfo 
devel/flake8/pkg: PLIST 
Added files:
devel/flake8/patches: patch-setup_py 

Log message:
Update to flake8-3.5.0 and move to py3

ok Bertrand Janin (maintainer)

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/01/21 16:41:42

Modified files:
sysutils/firmware/intel: Makefile 
sysutils/firmware/intel/pkg: PLIST 

Log message:
Skip installing microcode for skylake (family 06, models 4e and 5e,
stepping 03, i.e. files 06-4e-03 and 06-5e-03) for now.

Even with the older files from 20171117 we are still seeing some
problems when these are loaded.

CVS: cvs.openbsd.org: ports

[Joerg Jung]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2018/01/21 16:20:10

Modified files:
www/py-requests: Makefile distinfo 
www/py-requests/pkg: PLIST 

Log message:
update py-requests to 2.18.4

tested in a SUBDIRLIST build for all 53 victims with requests in run depends

ok remi shadchin (maintainer)

Re: UPDATE net/sslh

[Klemens Nanni]

On Sun, Jan 21, 2018 at 09:47:44PM +, Stuart Henderson wrote:
> On 2018/01/21 12:25, Daniel Jakots wrote:
> > 
> > sslh supports OpenVPN. Our OpenVPN README says
> > (tail -n1 /usr/ports/net/openvpn/pkg/README):
> > chroot /var/empty
> > 
> > So it's possible that users may run two software both
> > chrooting /var/empty. Can't it be a security 'imperfectness'?
> 
> And about 12 things in base. Not a problem afaik, it is
> definitely not supposed to be writable..
> 
> 
> On 2018/01/21 19:10, Klemens Nanni wrote:
> > Instead of removing all the conditionals from the Makefile and passing
> > default values through make's `-D', USE_GMAKE is all you need.
> 
> Either way works for me there. It's nice to have less patching, but
> it's also nice to avoid using gmake.
> 
> > Combined this reduces a lot of noise; and if we can live with "v1.19"
> > instead of "1.19" in sslh's output and manpage, even the now introduced
> > genver.sh patch can be dropped.
> 
> I think it's preferable not to patch genver.sh, just leave it how upstream
> wrote it.
I agree.

Updated diff without patch-genver_sh, moving NO_TEST down according to
template and also using INSTALL_MAN not INSTALL_DATA for sshl.8.

diff --git a/net/sslh/Makefile b/net/sslh/Makefile
index 5196ad1f3f6..7415f79f097 100644
--- a/net/sslh/Makefile
+++ b/net/sslh/Makefile
@@ -2,14 +2,11 @@
 
 COMMENT =  SSL/SSH multiplexer
 
-GH_ACCOUNT =   yrutschle
-GH_PROJECT =   sslh
-V =1.18
-GH_TAGNAME =   v$V
+DISTNAME = sslh-v1.19
+PKGNAME =  ${DISTNAME:S/-v/-/}
 CATEGORIES =   security net
-REVISION = 0
 
-HOMEPAGE = http://www.rutschle.net/tech/sslh.shtml
+HOMEPAGE = https://www.rutschle.net/tech/sslh.shtml
 
 MAINTAINER =   Bjorn Ketelaars 
 
@@ -17,21 +14,24 @@ MAINTAINER =Bjorn Ketelaars 

 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB =  c config pcre
+
+MASTER_SITES = https://www.rutschle.net/tech/sslh/
+
 LIB_DEPENDS =  devel/libconfig \
devel/pcre
 
-MAKE_FLAGS =   CFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-   -DENABLE_REGEX -DLIBCONFIG -DLIBPCRE" \
-   LIBS="-L${LOCALBASE}/lib -lconfig -lpcre" VERSION=$V
-NO_TEST =  Yes
+MAKE_FLAGS =   CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+   LIBS="-L${LOCALBASE}/lib -lconfig -lpcre" \
+   MAN=sslh.8
 
-do-configure:
-   printf '#ifndef _VERSION_H_\n#define _VERSION_H_\n#define VERSION 
"$V"\n#endif\n' > ${WRKSRC}/version.h
+USE_GMAKE =Yes
+
+NO_TEST =  Yes
 
 do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sslh
${INSTALL_DATA} ${WRKSRC}/README.md ${PREFIX}/share/doc/sslh
-   ${INSTALL_DATA} ${WRKSRC}/sslh.8 ${PREFIX}/man/man8
+   ${INSTALL_MAN} ${WRKSRC}/sslh.8 ${PREFIX}/man/man8
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sslh
 .for p in basic.cfg example.cfg
${INSTALL_DATA} ${WRKSRC}/$p ${PREFIX}/share/examples/sslh
diff --git a/net/sslh/distinfo b/net/sslh/distinfo
index c18daca89f9..e4dae567aea 100644
--- a/net/sslh/distinfo
+++ b/net/sslh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sslh-1.18.tar.gz) = 9sq/DgxXWu0g0d4j09aT85IcIeJw2F/suhrSpI86/O8=
-SIZE (sslh-1.18.tar.gz) = 53175
+SHA256 (sslh-v1.19.tar.gz) = 75yxg5baQEu3BbLEzUViql/rVU3m+b0HSyTnrEcTZpw=
+SIZE (sslh-v1.19.tar.gz) = 57352
diff --git a/net/sslh/patches/patch-Makefile b/net/sslh/patches/patch-Makefile
index 452232e7c77..3b31f4322c5 100644
--- a/net/sslh/patches/patch-Makefile
+++ b/net/sslh/patches/patch-Makefile
@@ -1,67 +1,9 @@
-$OpenBSD: patch-Makefile,v 1.5 2016/04/17 09:14:26 landry Exp $
 Makefile.orig  Fri Feb  5 16:46:47 2016
-+++ Makefile   Sat Mar 19 20:27:50 2016
-@@ -12,58 +12,23 @@ PREFIX?=/usr
- BINDIR?=$(PREFIX)/sbin
- MANDIR?=$(PREFIX)/share/man/man8
- 
--MAN=sslh.8.gz # man page name
-+MAN=sslh.8# man page name
- 
- # End of configuration -- the rest should take care of
- # itself
- 
--ifneq ($(strip $(COV_TEST)),)
--CFLAGS_COV=-fprofile-arcs -ftest-coverage
--endif
--
- CC ?= gcc
- CFLAGS ?=-Wall -g $(CFLAGS_COV)
- 
- LIBS=
- OBJS=common.o sslh-main.o probe.o tls.o
- 
--ifneq ($(strip $(USELIBWRAP)),)
--  LIBS:=$(LIBS) -lwrap
--  CPPFLAGS+=-DLIBWRAP
--endif
--
--ifneq ($(strip $(ENABLE_REGEX)),)
--  CPPFLAGS+=-DENABLE_REGEX
--endif
--
--ifneq ($(strip $(USELIBPCRE)),)
--  CPPFLAGS+=-DLIBPCRE
--  LIBS:=$(LIBS) -lpcre
--endif
--
--ifneq ($(strip $(USELIBCONFIG)),)
--  LIBS:=$(LIBS) -lconfig
--  CPPFLAGS+=-DLIBCONFIG
--endif
--
--ifneq ($(strip $(USELIBCAP)),)
--  LIBS:=$(LIBS) -lcap
--  CPPFLAGS+=-DLIBCAP
--endif
--
--ifneq ($(strip $(USESYSTEMD)),)
--LIBS:=$(LIBS) -lsystemd
--CPPFLAGS+=-DSYSTEMD
--endif
--
--
- all: sslh $(MAN) echosrv
- 
- .c.o: *.h
-   $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
- 
- version.h:
--  ./genver.sh >version.h
- 
- sslh: sslh-fork sslh-select
- 
-@@ -82,7 +47,7 @@ echosrv: $(OBJS) echosrv.o
+$OpenBSD$
+
+Index: Makefile
+--- 

Re: UPDATE net/sslh

[Stuart Henderson]

On 2018/01/21 12:25, Daniel Jakots wrote:
> 
> sslh supports OpenVPN. Our OpenVPN README says
> (tail -n1 /usr/ports/net/openvpn/pkg/README):
> chroot /var/empty
> 
> So it's possible that users may run two software both
> chrooting /var/empty. Can't it be a security 'imperfectness'?

And about 12 things in base. Not a problem afaik, it is
definitely not supposed to be writable..


On 2018/01/21 19:10, Klemens Nanni wrote:
> Instead of removing all the conditionals from the Makefile and passing
> default values through make's `-D', USE_GMAKE is all you need.

Either way works for me there. It's nice to have less patching, but
it's also nice to avoid using gmake.

> Combined this reduces a lot of noise; and if we can live with "v1.19"
> instead of "1.19" in sslh's output and manpage, even the now introduced
> genver.sh patch can be dropped.

I think it's preferable not to patch genver.sh, just leave it how upstream
wrote it.

Re: UPDATE net/sslh

[Björn Ketelaars]

On Sun 21/01/2018 19:10, Klemens Nanni wrote:
> On Sun, Jan 21, 2018 at 05:59:26PM +0100, Björn Ketelaars wrote:
> > Enclosed a diff for bringing net/sslh to the latest version. From the 
> > release
> > announcement:
> > 
> >   - Added 'syslog_facility' configuration option to specify where to log
> >   - TLS now supports SNI and ALPN, including support for Let's Encrypt
> > challenges
> >   - ADB probe
> >   - Added per-protocol 'fork' option
> >   - Added chroot option
> >   - A truckload of bug fixes and documentation improvements
> > 
> > I'm running this version, in an existing sslh setup, without any issues.
> > 
> > Comments?
> Haven't run tested this properly yet but here are some portwise
> improvements to consider:
> 
> The dance around VERSION with and without "v" prefix can be reduced to
> simply patching genver.sh. This completely avoids the ugly do-configure
> and version string passing.
> 
> Instead of removing all the conditionals from the Makefile and passing
> default values through make's `-D', USE_GMAKE is all you need.
> 
> Combined this reduces a lot of noise; and if we can live with "v1.19"
> instead of "1.19" in sslh's output and manpage, even the now introduced
> genver.sh patch can be dropped.

I prefer your diff, including the genver.sh patch. The overall result is
better for the eyes.

While here I would like to propose to add "--chroot=/var/empty" to the
rc.d-scripts. As long as nothing is placed in this directory there should be
no security implication, even if this chroot is shared with for example
OpenVPN (or any of the other ports that chroot to /var/empty).

Diff below is based on your work, and contains the chroot bit in the rc.d
scripts.


diff --git net/sslh/Makefile net/sslh/Makefile
index 5196ad1f3f6..ed1dec969c6 100644
--- net/sslh/Makefile
+++ net/sslh/Makefile
@@ -2,14 +2,11 @@
 
 COMMENT =  SSL/SSH multiplexer
 
-GH_ACCOUNT =   yrutschle
-GH_PROJECT =   sslh
-V =1.18
-GH_TAGNAME =   v$V
+DISTNAME = sslh-v1.19
+PKGNAME =  ${DISTNAME:S/-v/-/}
 CATEGORIES =   security net
-REVISION = 0
 
-HOMEPAGE = http://www.rutschle.net/tech/sslh.shtml
+HOMEPAGE = https://www.rutschle.net/tech/sslh.shtml
 
 MAINTAINER =   Bjorn Ketelaars 
 
@@ -17,16 +14,18 @@ MAINTAINER =Bjorn Ketelaars 

 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB =  c config pcre
+
+MASTER_SITES = https://www.rutschle.net/tech/sslh/
+
 LIB_DEPENDS =  devel/libconfig \
devel/pcre
 
-MAKE_FLAGS =   CFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-   -DENABLE_REGEX -DLIBCONFIG -DLIBPCRE" \
-   LIBS="-L${LOCALBASE}/lib -lconfig -lpcre" VERSION=$V
+MAKE_FLAGS =   CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+   LIBS="-L${LOCALBASE}/lib -lconfig -lpcre" \
+   MAN=sslh.8
 NO_TEST =  Yes
 
-do-configure:
-   printf '#ifndef _VERSION_H_\n#define _VERSION_H_\n#define VERSION 
"$V"\n#endif\n' > ${WRKSRC}/version.h
+USE_GMAKE =Yes
 
 do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sslh
diff --git net/sslh/distinfo net/sslh/distinfo
index c18daca89f9..e4dae567aea 100644
--- net/sslh/distinfo
+++ net/sslh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sslh-1.18.tar.gz) = 9sq/DgxXWu0g0d4j09aT85IcIeJw2F/suhrSpI86/O8=
-SIZE (sslh-1.18.tar.gz) = 53175
+SHA256 (sslh-v1.19.tar.gz) = 75yxg5baQEu3BbLEzUViql/rVU3m+b0HSyTnrEcTZpw=
+SIZE (sslh-v1.19.tar.gz) = 57352
diff --git net/sslh/patches/patch-Makefile net/sslh/patches/patch-Makefile
index 452232e7c77..c8be2213f5c 100644
--- net/sslh/patches/patch-Makefile
+++ net/sslh/patches/patch-Makefile
@@ -1,67 +1,8 @@
 $OpenBSD: patch-Makefile,v 1.5 2016/04/17 09:14:26 landry Exp $
 Makefile.orig  Fri Feb  5 16:46:47 2016
-+++ Makefile   Sat Mar 19 20:27:50 2016
-@@ -12,58 +12,23 @@ PREFIX?=/usr
- BINDIR?=$(PREFIX)/sbin
- MANDIR?=$(PREFIX)/share/man/man8
- 
--MAN=sslh.8.gz # man page name
-+MAN=sslh.8# man page name
- 
- # End of configuration -- the rest should take care of
- # itself
- 
--ifneq ($(strip $(COV_TEST)),)
--CFLAGS_COV=-fprofile-arcs -ftest-coverage
--endif
--
- CC ?= gcc
- CFLAGS ?=-Wall -g $(CFLAGS_COV)
- 
- LIBS=
- OBJS=common.o sslh-main.o probe.o tls.o
- 
--ifneq ($(strip $(USELIBWRAP)),)
--  LIBS:=$(LIBS) -lwrap
--  CPPFLAGS+=-DLIBWRAP
--endif
--
--ifneq ($(strip $(ENABLE_REGEX)),)
--  CPPFLAGS+=-DENABLE_REGEX
--endif
--
--ifneq ($(strip $(USELIBPCRE)),)
--  CPPFLAGS+=-DLIBPCRE
--  LIBS:=$(LIBS) -lpcre
--endif
--
--ifneq ($(strip $(USELIBCONFIG)),)
--  LIBS:=$(LIBS) -lconfig
--  CPPFLAGS+=-DLIBCONFIG
--endif
--
--ifneq ($(strip $(USELIBCAP)),)
--  LIBS:=$(LIBS) -lcap
--  CPPFLAGS+=-DLIBCAP
--endif
--
--ifneq ($(strip $(USESYSTEMD)),)
--LIBS:=$(LIBS) -lsystemd
--CPPFLAGS+=-DSYSTEMD
--endif
--
--
- all: sslh $(MAN) echosrv
- 
- .c.o: *.h
-   $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
- 
- version.h:
--  ./genver.sh >version.h
- 
- 

Re: FIX: devel/libffi on armv7/clang

[Peter Hessler]

On 2018 Jan 21 (Sun) at 22:18:21 +0100 (+0100), Jeremie Courreges-Anglas wrote:
:On Sun, Jan 21 2018, Peter Hessler  wrote:
:> On 2018 Jan 21 (Sun) at 21:45:53 +0100 (+0100), Jeremie Courreges-Anglas 
wrote:
:> :On Sun, Jan 21 2018, Brian Callahan  wrote:
:> :> On 01/21/18 08:13, Peter Hessler wrote:
:> :>> On 2018 Jan 21 (Sun) at 02:06:52 -0500 (-0500), Brian Callahan wrote:
:> :>> :Finally, it looks like libffi needs libc++abi on arm for at least some
:> :>> :functions, as
:> :>> :experienced with lang/snobol4, its configure script didn't pick up 
libffi and
:> :>> :instead
:> :>> :complained about this:
:> :>> :/usr/local/lib/libffi.so.1.2: undefined reference to 
`__aeabi_unwind_cpp_pr0'
:> :>> :/usr/local/lib/libffi.so.1.2: undefined reference to 
`__aeabi_unwind_cpp_pr1'
:> :>> :Those functions are in libc++abi.
:> :>> :
:> :>>
:> :>> Did you mean to include a patch to libffi.pc to address these issues?
:> :>>
:> :>>
:> :>
:> :> Ugh. No more 2am diffs more me.
:> :>
:> :> We just want this to be for arm, of course, to avoid breaking all gcc
:> :> archs. Attached diff deals.
:> :
:> :I think it would be better to link libffi against -lc++abi, inter-libs deps
:> :would be enough and would ensure that consumers don't need to use
:> :pkg-config.  static builds would still need the pkg-config goo, but we
:> :don't have static archs any more.  Do we have such ports?
:> :
:>
:> iirc, lld doesn't do inter-lib deps so we would still need pkg-config
:> help.  while this isn't a problem *yet*, I'd like to avoid it being a
:> problem in the (hopefully near) future.
:
:lld's behavior is a bit more convoluted: say your program links against
:libfoo, and libfoo in turn links against libbar.  As long as your
:program only uses symbols from libfoo, you're fine.  If the program also
:use symbols from libbar, you must tell lld to link your program against
:libfoo *and* libbar*.
:
:This is not the case here, linking libffi against libc++abi should be
:enough.   If a port uses libffi and also needs functions from
:libc++abi/libunwind, it should specify so.
:
:* There's probably a more formal, better wording for the difference in
:  behavior between our old ld(1) and lld.
:

Ahh, then I misunderstood some of the details.  Thanks for the
explanation!


-- 
The other day I put instant coffee in my microwave oven ... I almost
went back in time.
-- Steven Wright

Re: FIX: devel/libffi on armv7/clang

[Jeremie Courreges-Anglas]

On Sun, Jan 21 2018, Peter Hessler  wrote:
> On 2018 Jan 21 (Sun) at 21:45:53 +0100 (+0100), Jeremie Courreges-Anglas 
> wrote:
> :On Sun, Jan 21 2018, Brian Callahan  wrote:
> :> On 01/21/18 08:13, Peter Hessler wrote:
> :>> On 2018 Jan 21 (Sun) at 02:06:52 -0500 (-0500), Brian Callahan wrote:
> :>> :Finally, it looks like libffi needs libc++abi on arm for at least some
> :>> :functions, as
> :>> :experienced with lang/snobol4, its configure script didn't pick up 
> libffi and
> :>> :instead
> :>> :complained about this:
> :>> :/usr/local/lib/libffi.so.1.2: undefined reference to 
> `__aeabi_unwind_cpp_pr0'
> :>> :/usr/local/lib/libffi.so.1.2: undefined reference to 
> `__aeabi_unwind_cpp_pr1'
> :>> :Those functions are in libc++abi.
> :>> :
> :>>
> :>> Did you mean to include a patch to libffi.pc to address these issues?
> :>>
> :>>
> :>
> :> Ugh. No more 2am diffs more me.
> :>
> :> We just want this to be for arm, of course, to avoid breaking all gcc
> :> archs. Attached diff deals.
> :
> :I think it would be better to link libffi against -lc++abi, inter-libs deps
> :would be enough and would ensure that consumers don't need to use
> :pkg-config.  static builds would still need the pkg-config goo, but we
> :don't have static archs any more.  Do we have such ports?
> :
>
> iirc, lld doesn't do inter-lib deps so we would still need pkg-config
> help.  while this isn't a problem *yet*, I'd like to avoid it being a
> problem in the (hopefully near) future.

lld's behavior is a bit more convoluted: say your program links against
libfoo, and libfoo in turn links against libbar.  As long as your
program only uses symbols from libfoo, you're fine.  If the program also
use symbols from libbar, you must tell lld to link your program against
libfoo *and* libbar*.

This is not the case here, linking libffi against libc++abi should be
enough.   If a port uses libffi and also needs functions from
libc++abi/libunwind, it should specify so.

* There's probably a more formal, better wording for the difference in
  behavior between our old ld(1) and lld.

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

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2018/01/21 13:59:19

Modified files:
telephony/asterisk: Makefile 
telephony/asterisk/files: extensions.conf.sample 

Log message:
Fix a bad subst in the simplified sample of extensions.conf.

Fix #! line for bash in astversion. Not forced in RUN_DEPENDS because in all
the time this has been present only one person noticed, so the script doesn't
seem too popular. (Script also makes some assumptions about library versions
which don't apply here but I don't think it's worth poking at this too far).

Reported by landry@

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2018/01/21 13:58:29

Modified files:
lang/racket-minimal: Makefile 
lang/racket-minimal/pkg: README 
Added files:
lang/racket-minimal/patches: patch-src_racket_sconfig_h 

Log message:
Unbreak racket on aarch64.

Re: FIX: devel/libffi on armv7/clang

[Peter Hessler]

On 2018 Jan 21 (Sun) at 21:45:53 +0100 (+0100), Jeremie Courreges-Anglas wrote:
:On Sun, Jan 21 2018, Brian Callahan  wrote:
:> On 01/21/18 08:13, Peter Hessler wrote:
:>> On 2018 Jan 21 (Sun) at 02:06:52 -0500 (-0500), Brian Callahan wrote:
:>> :Finally, it looks like libffi needs libc++abi on arm for at least some
:>> :functions, as
:>> :experienced with lang/snobol4, its configure script didn't pick up libffi 
and
:>> :instead
:>> :complained about this:
:>> :/usr/local/lib/libffi.so.1.2: undefined reference to 
`__aeabi_unwind_cpp_pr0'
:>> :/usr/local/lib/libffi.so.1.2: undefined reference to 
`__aeabi_unwind_cpp_pr1'
:>> :Those functions are in libc++abi.
:>> :
:>>
:>> Did you mean to include a patch to libffi.pc to address these issues?
:>>
:>>
:>
:> Ugh. No more 2am diffs more me.
:>
:> We just want this to be for arm, of course, to avoid breaking all gcc
:> archs. Attached diff deals.
:
:I think it would be better to link libffi against -lc++abi, inter-libs deps
:would be enough and would ensure that consumers don't need to use
:pkg-config.  static builds would still need the pkg-config goo, but we
:don't have static archs any more.  Do we have such ports?
:

iirc, lld doesn't do inter-lib deps so we would still need pkg-config
help.  while this isn't a problem *yet*, I'd like to avoid it being a
problem in the (hopefully near) future.


-- 
Corruption is not the #1 priority of the Police Commissioner.  His job
is to enforce the law and fight crime.
-- P.B.A. President E. J. Kiernan

Re: FIX: devel/libffi on armv7/clang

[Jeremie Courreges-Anglas]

+cc maintainer

On Sun, Jan 21 2018, Brian Callahan  wrote:
> On 01/21/18 08:13, Peter Hessler wrote:
>> On 2018 Jan 21 (Sun) at 02:06:52 -0500 (-0500), Brian Callahan wrote:
>> :Finally, it looks like libffi needs libc++abi on arm for at least some
>> :functions, as
>> :experienced with lang/snobol4, its configure script didn't pick up libffi 
>> and
>> :instead
>> :complained about this:
>> :/usr/local/lib/libffi.so.1.2: undefined reference to 
>> `__aeabi_unwind_cpp_pr0'
>> :/usr/local/lib/libffi.so.1.2: undefined reference to 
>> `__aeabi_unwind_cpp_pr1'
>> :Those functions are in libc++abi.
>> :
>>
>> Did you mean to include a patch to libffi.pc to address these issues?
>>
>>
>
> Ugh. No more 2am diffs more me.
>
> We just want this to be for arm, of course, to avoid breaking all gcc
> archs. Attached diff deals.

I think it would be better to link libffi against -lc++abi, inter-libs deps
would be enough and would ensure that consumers don't need to use
pkg-config.  static builds would still need the pkg-config goo, but we
don't have static archs any more.  Do we have such ports?

The diff below also adds c++abi to WANTLIB.

Test summary:
  # of expected passes1845
  # of unexpected failures15

Now testing some consumer ports.


Index: Makefile
===
RCS file: /d/cvs/ports/devel/libffi/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile26 May 2016 20:48:50 -  1.35
+++ Makefile21 Jan 2018 19:41:05 -
@@ -3,7 +3,7 @@
 COMMENT=   Foreign Function Interface
 
 DISTNAME=  libffi-3.2.1
-REVISION=  2
+REVISION=  3
 SHARED_LIBS +=  ffi  1.2  # .6.4
 CATEGORIES=devel
 
@@ -15,6 +15,10 @@ HOMEPAGE=http://sourceware.org/libffi/
 PERMIT_PACKAGE_CDROM=  Yes
 
 WANTLIB += pthread
+# needed for unwind symbols
+.if ${MACHINE_ARCH} == "arm"
+WANTLIB += c++abi
+.endif
 
 MASTER_SITES=  ftp://sourceware.org/pub/libffi/
 
Index: patches/patch-configure
===
RCS file: /d/cvs/ports/devel/libffi/patches/patch-configure,v
retrieving revision 1.7
diff -u -p -r1.7 patch-configure
--- patches/patch-configure 28 Jan 2016 08:40:47 -  1.7
+++ patches/patch-configure 21 Jan 2018 19:34:49 -
@@ -1,14 +1,19 @@
 $OpenBSD: patch-configure,v 1.7 2016/01/28 08:40:47 jasper Exp $
 
-- Always link with -pthread for libffi
+- Always link with -pthread for libffi (XXX not needed any more?)
+- Link with libc++abi on arm (to access unwind symbols)
 
 configure.orig Tue Jan 26 18:55:54 2016
-+++ configure  Tue Jan 26 18:56:20 2016
-@@ -18522,6 +18522,12 @@ $as_echo "#define SYMBOL_UNDERSCORE 1" >>confdefs.h
+Index: configure
+--- configure.orig
 configure
+@@ -18522,6 +18522,15 @@ $as_echo "#define SYMBOL_UNDERSCORE 1" >>confdefs.h
  
  fi
  
 +case "$target" in
++arm-*-openbsd*)
++  LDFLAGS="-lpthread -lc++abi $LDFLAGS"
++;;
 +*-*-openbsd*)
 +  LDFLAGS="-lpthread $LDFLAGS"
 +;;
Index: patches/patch-src_arm_ffi_c
===
RCS file: /d/cvs/ports/devel/libffi/patches/patch-src_arm_ffi_c,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_arm_ffi_c
--- patches/patch-src_arm_ffi_c 15 Jul 2015 17:06:48 -  1.7
+++ patches/patch-src_arm_ffi_c 21 Jan 2018 19:34:49 -
@@ -1,15 +1,36 @@
 $OpenBSD: patch-src_arm_ffi_c,v 1.7 2015/07/15 17:06:48 jasper Exp $
 
-Fix warning: implicit declaration of function '__clear_cache'
+https://svnweb.freebsd.org/ports/head/devel/libffi/files/patch-src__arm__ffi.c?revision=337118=markup
 
 src/arm/ffi.c.orig Fri Apr 25 19:45:13 2014
-+++ src/arm/ffi.c  Mon Sep 15 22:00:37 2014
-@@ -37,6 +37,8 @@
+Index: src/arm/ffi.c
+--- src/arm/ffi.c.orig
 src/arm/ffi.c
+@@ -33,6 +33,11 @@
+ 
+ #include 
+ 
++#ifdef __arm__
++#include 
++#include 
++#endif
++
+ /* Forward declares. */
  static int vfp_type_p (ffi_type *);
  static void layout_vfp_args (ffi_cif *);
+@@ -750,6 +755,16 @@ ffi_closure_free (void *ptr)
+ }
  
-+extern void __clear_cache(char *beg, char *end);
+ #else
 +
- int ffi_prep_args_SYSV(char *stack, extended_cif *ecif, float *vfp_space);
- int ffi_prep_args_VFP(char *stack, extended_cif *ecif, float *vfp_space);
++#ifdef __arm__
++#define __clear_cache(start, end) do {
\
++  struct arm_sync_icache_args ua; \
++  \
++  ua.addr = (uintptr_t)(start);   \
++  ua.len = (char *)(end) - (char *)start; \
++  sysarch(ARM_SYNC_ICACHE, );  \
++  } while (0);
++#endif
  
+ #define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX)\
+ 

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2018/01/21 13:25:49

Modified files:
devel/cryptopp : Makefile 
devel/cryptopp/patches: patch-config_h 
net/amule  : Makefile 

Log message:
Unbreak cryptopp on i386. Tested with a long session of amule.
Maintainer timeout.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/01/21 12:42:55

Modified files:
sysutils/borgmatic: Makefile distinfo 

Log message:
update to borgmatic-1.1.14

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/01/21 12:40:58

Modified files:
lang/elixir: Makefile distinfo 
lang/elixir/pkg: PLIST 

Log message:
update to elixir-1.6.0

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/01/21 12:28:28

Modified files:
x11/gnome/gjs  : Makefile distinfo 

Log message:
update to gjs-1.50.3

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2018/01/21 12:27:46

Modified files:
x11/gnome/calendar: Makefile distinfo 
x11/gnome/calendar/pkg: PLIST 
Removed files:
x11/gnome/calendar/patches: patch-src_gcal-utils_c 

Log message:
update to gnome-calendar-3.26.3

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2018/01/21 12:24:41

Modified files:
mail/claws-mail: Makefile distinfo 
mail/claws-mail/patches: patch-configure_ac 
mail/claws-mail/pkg: DESCR-main PLIST-main 
Removed files:
mail/claws-mail/patches: 
 patch-src_plugins_vcalendar_vcal_manager_c 
 patch-src_plugins_vcalendar_vcal_meeting_gtk_c 
 patch-src_plugins_vcalendar_vcalendar_c 

Log message:
Update to claws-mail-3.16.0

New features, new bugfixes: http://claws-mail.org/NEWS

while there remove trailing whitespaces in DESCR-main

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2018/01/21 11:21:55

Modified files:
math/veusz : Makefile 

Log message:
update HOMEPAGE and MASTER_SITES. gna.org was shutdown in Jan 2017.

Re: UPDATE net/sslh

[Klemens Nanni]

On Sun, Jan 21, 2018 at 05:59:26PM +0100, Björn Ketelaars wrote:
> Enclosed a diff for bringing net/sslh to the latest version. From the release
> announcement:
> 
>   - Added 'syslog_facility' configuration option to specify where to log
>   - TLS now supports SNI and ALPN, including support for Let's Encrypt
> challenges
>   - ADB probe
>   - Added per-protocol 'fork' option
>   - Added chroot option
>   - A truckload of bug fixes and documentation improvements
> 
> I'm running this version, in an existing sslh setup, without any issues.
> 
> Comments?
Haven't run tested this properly yet but here are some portwise
improvements to consider:

The dance around VERSION with and without "v" prefix can be reduced to
simply patching genver.sh. This completely avoids the ugly do-configure
and version string passing.

Instead of removing all the conditionals from the Makefile and passing
default values through make's `-D', USE_GMAKE is all you need.

Combined this reduces a lot of noise; and if we can live with "v1.19"
instead of "1.19" in sslh's output and manpage, even the now introduced
genver.sh patch can be dropped.

Updated diff below.

diff --git a/net/sslh/Makefile b/net/sslh/Makefile
index 5196ad1f3f6..ed1dec969c6 100644
--- a/net/sslh/Makefile
+++ b/net/sslh/Makefile
@@ -2,14 +2,11 @@
 
 COMMENT =  SSL/SSH multiplexer
 
-GH_ACCOUNT =   yrutschle
-GH_PROJECT =   sslh
-V =1.18
-GH_TAGNAME =   v$V
+DISTNAME = sslh-v1.19
+PKGNAME =  ${DISTNAME:S/-v/-/}
 CATEGORIES =   security net
-REVISION = 0
 
-HOMEPAGE = http://www.rutschle.net/tech/sslh.shtml
+HOMEPAGE = https://www.rutschle.net/tech/sslh.shtml
 
 MAINTAINER =   Bjorn Ketelaars 
 
@@ -17,16 +14,18 @@ MAINTAINER =Bjorn Ketelaars 

 PERMIT_PACKAGE_CDROM = Yes
 
 WANTLIB =  c config pcre
+
+MASTER_SITES = https://www.rutschle.net/tech/sslh/
+
 LIB_DEPENDS =  devel/libconfig \
devel/pcre
 
-MAKE_FLAGS =   CFLAGS="${CFLAGS} -I${LOCALBASE}/include \
-   -DENABLE_REGEX -DLIBCONFIG -DLIBPCRE" \
-   LIBS="-L${LOCALBASE}/lib -lconfig -lpcre" VERSION=$V
+MAKE_FLAGS =   CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+   LIBS="-L${LOCALBASE}/lib -lconfig -lpcre" \
+   MAN=sslh.8
 NO_TEST =  Yes
 
-do-configure:
-   printf '#ifndef _VERSION_H_\n#define _VERSION_H_\n#define VERSION 
"$V"\n#endif\n' > ${WRKSRC}/version.h
+USE_GMAKE =Yes
 
 do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sslh
diff --git a/net/sslh/distinfo b/net/sslh/distinfo
index c18daca89f9..e4dae567aea 100644
--- a/net/sslh/distinfo
+++ b/net/sslh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sslh-1.18.tar.gz) = 9sq/DgxXWu0g0d4j09aT85IcIeJw2F/suhrSpI86/O8=
-SIZE (sslh-1.18.tar.gz) = 53175
+SHA256 (sslh-v1.19.tar.gz) = 75yxg5baQEu3BbLEzUViql/rVU3m+b0HSyTnrEcTZpw=
+SIZE (sslh-v1.19.tar.gz) = 57352
diff --git a/net/sslh/patches/patch-Makefile b/net/sslh/patches/patch-Makefile
index 452232e7c77..3b31f4322c5 100644
--- a/net/sslh/patches/patch-Makefile
+++ b/net/sslh/patches/patch-Makefile
@@ -1,67 +1,9 @@
-$OpenBSD: patch-Makefile,v 1.5 2016/04/17 09:14:26 landry Exp $
 Makefile.orig  Fri Feb  5 16:46:47 2016
-+++ Makefile   Sat Mar 19 20:27:50 2016
-@@ -12,58 +12,23 @@ PREFIX?=/usr
- BINDIR?=$(PREFIX)/sbin
- MANDIR?=$(PREFIX)/share/man/man8
- 
--MAN=sslh.8.gz # man page name
-+MAN=sslh.8# man page name
- 
- # End of configuration -- the rest should take care of
- # itself
- 
--ifneq ($(strip $(COV_TEST)),)
--CFLAGS_COV=-fprofile-arcs -ftest-coverage
--endif
--
- CC ?= gcc
- CFLAGS ?=-Wall -g $(CFLAGS_COV)
- 
- LIBS=
- OBJS=common.o sslh-main.o probe.o tls.o
- 
--ifneq ($(strip $(USELIBWRAP)),)
--  LIBS:=$(LIBS) -lwrap
--  CPPFLAGS+=-DLIBWRAP
--endif
--
--ifneq ($(strip $(ENABLE_REGEX)),)
--  CPPFLAGS+=-DENABLE_REGEX
--endif
--
--ifneq ($(strip $(USELIBPCRE)),)
--  CPPFLAGS+=-DLIBPCRE
--  LIBS:=$(LIBS) -lpcre
--endif
--
--ifneq ($(strip $(USELIBCONFIG)),)
--  LIBS:=$(LIBS) -lconfig
--  CPPFLAGS+=-DLIBCONFIG
--endif
--
--ifneq ($(strip $(USELIBCAP)),)
--  LIBS:=$(LIBS) -lcap
--  CPPFLAGS+=-DLIBCAP
--endif
--
--ifneq ($(strip $(USESYSTEMD)),)
--LIBS:=$(LIBS) -lsystemd
--CPPFLAGS+=-DSYSTEMD
--endif
--
--
- all: sslh $(MAN) echosrv
- 
- .c.o: *.h
-   $(CC) $(CFLAGS) $(CPPFLAGS) -c $<
- 
- version.h:
--  ./genver.sh >version.h
- 
- sslh: sslh-fork sslh-select
- 
-@@ -82,7 +47,7 @@ echosrv: $(OBJS) echosrv.o
+$OpenBSD$
+
+Index: Makefile
+--- Makefile.orig
 Makefile
+@@ -87,7 +83,7 @@ echosrv: version.h $(OBJS) echosrv.o
$(CC) $(CFLAGS) $(LDFLAGS) -o echosrv echosrv.o probe.o common.o tls.o 
$(LIBS)
  
  $(MAN): sslh.pod Makefile
diff --git a/net/sslh/patches/patch-basic_cfg b/net/sslh/patches/patch-basic_cfg
index b2971871443..bd0f31b1bad 100644
--- a/net/sslh/patches/patch-basic_cfg
+++ b/net/sslh/patches/patch-basic_cfg
@@ -1,6 +1,7 @@

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2018/01/21 10:48:39

Modified files:
sysutils/duplicity: Makefile distinfo 

Log message:
Update to duplicity-0.7.16

Re: cmake.port.mk and DEBUG

[Jeremie Courreges-Anglas]

On Sun, Jan 21 2018, Landry Breuil  wrote:
> On Sun, Jan 21, 2018 at 06:00:24PM +0100, Jeremie Courreges-Anglas wrote:
>> On Sat, Jan 20 2018, Stuart Henderson  wrote:
>> 
>> [...]
>> 
>> > How about making the cmake debug-build stuff dependent on a
>> > flavour (like "CMAKE_DEBUG") rather than making DEBUG do
>> > double-duty as a compiler flag option *and* a cmake knob?
>> >
>> > (We already removed some other cases where DEBUG turned on
>> > port-specific debug options..)
>> 
>> Looks like several people agree with this direction, so here's a diff
>> that adds MODCMAKE_DEBUG.
>> 
>> Comments/oks?

[...]

> missing verb ? And i think, since ppl wont understand what it means

Yep, sorry.  Do you suggest deleting the whole sentence?


Index: share/man/man5/port-modules.5
===
RCS file: /d/cvs/src/share/man/man5/port-modules.5,v
retrieving revision 1.225
diff -u -p -r1.225 port-modules.5
--- share/man/man5/port-modules.5   2 Dec 2017 09:31:52 -   1.225
+++ share/man/man5/port-modules.5   21 Jan 2018 17:33:29 -
@@ -569,6 +569,12 @@ If set to `Yes', CMake will print detail
 stages about exact command being run, etc.
 Should not be used in ports Makefiles.
 Default value is `Yes'.
+.It MODCMAKE_DEBUG
+If set to `Yes', CMake will produce a debug build instead of a release
+build.
+The exact effects on the build process depend on settings specified in
+the CMake config files.
+Default value is `No'.
 .El
 Also,
 .Sq nojunk
Index: devel/cmake/cmake.port.mk
===
RCS file: /d/cvs/ports/devel/cmake/cmake.port.mk,v
retrieving revision 1.62
diff -u -p -r1.62 cmake.port.mk
--- devel/cmake/cmake.port.mk   28 Nov 2017 10:26:00 -  1.62
+++ devel/cmake/cmake.port.mk   21 Jan 2018 16:51:31 -
@@ -65,6 +65,8 @@ CONFIGURE_ENV +=  MODJAVA_VER=${MODJAVA_V
MODTCL_LIB=${MODTCL_LIB} \
MODTK_LIB=${MODTK_LIB}
 
+MODCMAKE_DEBUG ?=  No
+
 .if empty(CONFIGURE_STYLE)
 CONFIGURE_STYLE=   cmake
 .endif
@@ -76,7 +78,7 @@ MODCMAKE_configure=   cd ${WRKBUILD} && ${
-G ${_MODCMAKE_GEN} ${CONFIGURE_ARGS} ${WRKSRC}
 
 .if !defined(CONFIGURE_ARGS) || ! ${CONFIGURE_ARGS:M*CMAKE_BUILD_TYPE*}
-.  if defined(DEBUG)
+.  if ${MODCMAKE_DEBUG:L} == "yes"
 CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=Debug
 MODCMAKE_BUILD_SUFFIX =-debug.cmake
 .  else


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

Assorted libassuan tweaks

[Jeremie Courreges-Anglas]

- drop unneeded dep on intltool/gettext-tools
- don't force -fPIC, libtool adds it for objects in shared libs
- add HOMEPAGE
- tweaks DESCR, the extra comma looked weird
- move EXTRACT_SUFX below MASTER_SITES, as per Makefile.template

ok?


Index: Makefile
===
RCS file: /d/cvs/ports/security/libassuan/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile10 Jan 2018 10:59:50 -  1.20
+++ Makefile20 Jan 2018 17:58:25 -
@@ -3,25 +3,24 @@
 COMMENT=   IPC library used by GnuPG and gpgme
 
 DISTNAME=  libassuan-2.5.1
-EXTRACT_SUFX=  .tar.bz2
+REVISION=  0
 
 SHARED_LIBS +=  assuan2.1  # 8.1
 
 CATEGORIES=security devel
 
+HOMEPAGE=  https://www.gnupg.org/software/libassuan/index.html
+
 # LGPLv3+
 PERMIT_PACKAGE_CDROM=  Yes
 
 WANTLIB += gpg-error iconv intl
 
 MASTER_SITES=  ${MASTER_SITE_GNUPG:=libassuan/}
-
-MODULES=   textproc/intltool
+EXTRACT_SUFX=  .tar.bz2
 
 LIB_DEPENDS=   security/libgpg-error
 
 CONFIGURE_STYLE=   gnu
-
-CFLAGS +=  -fPIC
 
 .include 
Index: pkg/DESCR
===
RCS file: /d/cvs/ports/security/libassuan/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- pkg/DESCR   4 Apr 2010 16:03:52 -   1.1.1.1
+++ pkg/DESCR   20 Jan 2018 17:58:25 -
@@ -1,3 +1,3 @@
 Libassuan is a small library implementing the so-called Assuan protocol.
-This protocol is used for IPC between most newer GnuPG components. Both,
-server and client side functions are provided.
+This protocol is used for IPC between most newer GnuPG components.
+Both server and client side functions are provided.


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

Re: UPDATE net/sslh

[Daniel Jakots]

On Sun, 21 Jan 2018 17:59:26 +0100, Björn Ketelaars
 wrote:

> diff --git net/sslh/patches/patch-basic_cfg
> net/sslh/patches/patch-basic_cfg index b2971871443..bd0f31b1bad 100644
> --- net/sslh/patches/patch-basic_cfg
> +++ net/sslh/patches/patch-basic_cfg
> @@ -1,6 +1,7 @@
>  $OpenBSD: patch-basic_cfg,v 1.4 2016/04/17 09:14:26 landry Exp $
>  basic.cfg.orig   Fri Feb  5 16:46:47 2016
> -+++ basic.cfgSat Mar 19 20:28:39 2016
> +Index: basic.cfg
> +--- basic.cfg.orig
>  basic.cfg
>  @@ -7,7 +7,7 @@ inetd: false;
>   numeric: false;
>   transparent: false;
> @@ -8,5 +9,5 @@ $OpenBSD: patch-basic_cfg,v 1.4 2016/04/17 09:14:26
> landry Exp $ -user: "nobody";
>  +user: "_sslh";
>   pidfile: "/var/run/sslh.pid";
> - 
> + chroot: "/var/empty";


sslh supports OpenVPN. Our OpenVPN README says
(tail -n1 /usr/ports/net/openvpn/pkg/README):
chroot /var/empty

So it's possible that users may run two software both
chrooting /var/empty. Can't it be a security 'imperfectness'?


Cheers,
Daniel

Re: UPDATE: net/irssi 1.0.6 -> 1.1.0

[Landry Breuil]

On Tue, Jan 16, 2018 at 08:33:40PM +0100, Klemens Nanni wrote:
> Quick update fixing a bunch of issues, please see
> https://github.com/irssi/irssi/releases for the full list.
> 
> Build and run tested successfully on amd64, all tests pass, FLAVOR=socks
> and net/irssi-{icb,otr,xmpp} build tested successfully as well.

Running fine on 6.1 (yeah, i know..) connecting to 3 irc servers, icb
and xmpp, the last one connecting to a muc room.

Landry

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2018/01/21 10:17:25

Modified files:
graphics/pqiv  : Makefile distinfo 

Log message:
Update to pqiv-2.10.2

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2018/01/21 10:14:08

Modified files:
net/haproxy: Makefile distinfo 

Log message:
Update to haproxy-1.7.10

Re: cmake.port.mk and DEBUG

[Jeremie Courreges-Anglas]

On Sat, Jan 20 2018, Stuart Henderson  wrote:

[...]

> How about making the cmake debug-build stuff dependent on a
> flavour (like "CMAKE_DEBUG") rather than making DEBUG do
> double-duty as a compiler flag option *and* a cmake knob?
>
> (We already removed some other cases where DEBUG turned on
> port-specific debug options..)

Looks like several people agree with this direction, so here's a diff
that adds MODCMAKE_DEBUG.

Comments/oks?


Index: share/man/man5/port-modules.5
===
RCS file: /d/cvs/src/share/man/man5/port-modules.5,v
retrieving revision 1.225
diff -u -p -r1.225 port-modules.5
--- share/man/man5/port-modules.5   2 Dec 2017 09:31:52 -   1.225
+++ share/man/man5/port-modules.5   21 Jan 2018 16:58:03 -
@@ -569,6 +569,13 @@ If set to `Yes', CMake will print detail
 stages about exact command being run, etc.
 Should not be used in ports Makefiles.
 Default value is `Yes'.
+.It MODCMAKE_DEBUG
+If set to `Yes', CMake will produce a debug build instead of a release
+build.
+The exact effects on the build process depend on settings specified in
+the CMake config files.
+Also files in the resulting package might named differently.
+Default value is `No'.
 .El
 Also,
 .Sq nojunk
Index: devel/cmake/cmake.port.mk
===
RCS file: /d/cvs/ports/devel/cmake/cmake.port.mk,v
retrieving revision 1.62
diff -u -p -r1.62 cmake.port.mk
--- devel/cmake/cmake.port.mk   28 Nov 2017 10:26:00 -  1.62
+++ devel/cmake/cmake.port.mk   21 Jan 2018 16:51:31 -
@@ -65,6 +65,8 @@ CONFIGURE_ENV +=  MODJAVA_VER=${MODJAVA_V
MODTCL_LIB=${MODTCL_LIB} \
MODTK_LIB=${MODTK_LIB}
 
+MODCMAKE_DEBUG ?=  No
+
 .if empty(CONFIGURE_STYLE)
 CONFIGURE_STYLE=   cmake
 .endif
@@ -76,7 +78,7 @@ MODCMAKE_configure=   cd ${WRKBUILD} && ${
-G ${_MODCMAKE_GEN} ${CONFIGURE_ARGS} ${WRKSRC}
 
 .if !defined(CONFIGURE_ARGS) || ! ${CONFIGURE_ARGS:M*CMAKE_BUILD_TYPE*}
-.  if defined(DEBUG)
+.  if ${MODCMAKE_DEBUG:L} == "yes"
 CONFIGURE_ARGS += -DCMAKE_BUILD_TYPE:String=Debug
 MODCMAKE_BUILD_SUFFIX =-debug.cmake
 .  else

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

UPDATE net/sslh

[Björn Ketelaars]

Enclosed a diff for bringing net/sslh to the latest version. From the release
announcement:

  - Added 'syslog_facility' configuration option to specify where to log
  - TLS now supports SNI and ALPN, including support for Let's Encrypt
challenges
  - ADB probe
  - Added per-protocol 'fork' option
  - Added chroot option
  - A truckload of bug fixes and documentation improvements

I'm running this version, in an existing sslh setup, without any issues.

Comments?

-- 
Björn Ketelaars
GPG key: 0x4F0E5F21


diff --git net/sslh/Makefile net/sslh/Makefile
index 5196ad1f3f6..d0aa1621bdd 100644
--- net/sslh/Makefile
+++ net/sslh/Makefile
@@ -2,20 +2,20 @@
 
 COMMENT =  SSL/SSH multiplexer
 
-GH_ACCOUNT =   yrutschle
-GH_PROJECT =   sslh
-V =1.18
-GH_TAGNAME =   v$V
+V =1.19
+DISTNAME = sslh-v${V}
+PKGNAME =  ${DISTNAME:S/-v/-/}
 CATEGORIES =   security net
-REVISION = 0
 
-HOMEPAGE = http://www.rutschle.net/tech/sslh.shtml
+HOMEPAGE = https://www.rutschle.net/tech/sslh.shtml
 
 MAINTAINER =   Bjorn Ketelaars 
 
 # GPLv2+
 PERMIT_PACKAGE_CDROM = Yes
 
+MASTER_SITES = https://www.rutschle.net/tech/sslh/
+
 WANTLIB =  c config pcre
 LIB_DEPENDS =  devel/libconfig \
devel/pcre
diff --git net/sslh/distinfo net/sslh/distinfo
index c18daca89f9..e4dae567aea 100644
--- net/sslh/distinfo
+++ net/sslh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sslh-1.18.tar.gz) = 9sq/DgxXWu0g0d4j09aT85IcIeJw2F/suhrSpI86/O8=
-SIZE (sslh-1.18.tar.gz) = 53175
+SHA256 (sslh-v1.19.tar.gz) = 75yxg5baQEu3BbLEzUViql/rVU3m+b0HSyTnrEcTZpw=
+SIZE (sslh-v1.19.tar.gz) = 57352
diff --git net/sslh/patches/patch-Makefile net/sslh/patches/patch-Makefile
index 452232e7c77..6cef706941c 100644
--- net/sslh/patches/patch-Makefile
+++ net/sslh/patches/patch-Makefile
@@ -1,7 +1,8 @@
 $OpenBSD: patch-Makefile,v 1.5 2016/04/17 09:14:26 landry Exp $
 Makefile.orig  Fri Feb  5 16:46:47 2016
-+++ Makefile   Sat Mar 19 20:27:50 2016
-@@ -12,58 +12,23 @@ PREFIX?=/usr
+Index: Makefile
+--- Makefile.orig
 Makefile
+@@ -12,15 +12,11 @@ PREFIX?=/usr
  BINDIR?=$(PREFIX)/sbin
  MANDIR?=$(PREFIX)/share/man/man8
  
@@ -18,8 +19,9 @@ $OpenBSD: patch-Makefile,v 1.5 2016/04/17 09:14:26 landry Exp 
$
  CC ?= gcc
  CFLAGS ?=-Wall -g $(CFLAGS_COV)
  
- LIBS=
- OBJS=common.o sslh-main.o probe.o tls.o
+@@ -29,44 +25,12 @@ OBJS=common.o sslh-main.o probe.o tls.o
+ 
+ CONDITIONAL_TARGETS=
  
 -ifneq ($(strip $(USELIBWRAP)),)
 -  LIBS:=$(LIBS) -lwrap
@@ -32,7 +34,7 @@ $OpenBSD: patch-Makefile,v 1.5 2016/04/17 09:14:26 landry Exp 
$
 -
 -ifneq ($(strip $(USELIBPCRE)),)
 -  CPPFLAGS+=-DLIBPCRE
--  LIBS:=$(LIBS) -lpcre
+-  LIBS:=$(LIBS) -lpcreposix
 -endif
 -
 -ifneq ($(strip $(USELIBCONFIG)),)
@@ -48,12 +50,13 @@ $OpenBSD: patch-Makefile,v 1.5 2016/04/17 09:14:26 landry 
Exp $
 -ifneq ($(strip $(USESYSTEMD)),)
 -LIBS:=$(LIBS) -lsystemd
 -CPPFLAGS+=-DSYSTEMD
+-  CONDITIONAL_TARGETS+=systemd-sslh-generator
 -endif
 -
 -
- all: sslh $(MAN) echosrv
+ all: sslh $(MAN) echosrv $(CONDITIONAL_TARGETS)
  
- .c.o: *.h
+ .c.o: *.h version.h
$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
  
  version.h:
@@ -61,7 +64,7 @@ $OpenBSD: patch-Makefile,v 1.5 2016/04/17 09:14:26 landry Exp 
$
  
  sslh: sslh-fork sslh-select
  
-@@ -82,7 +47,7 @@ echosrv: $(OBJS) echosrv.o
+@@ -87,7 +51,7 @@ echosrv: version.h $(OBJS) echosrv.o
$(CC) $(CFLAGS) $(LDFLAGS) -o echosrv echosrv.o probe.o common.o tls.o 
$(LIBS)
  
  $(MAN): sslh.pod Makefile
diff --git net/sslh/patches/patch-basic_cfg net/sslh/patches/patch-basic_cfg
index b2971871443..bd0f31b1bad 100644
--- net/sslh/patches/patch-basic_cfg
+++ net/sslh/patches/patch-basic_cfg
@@ -1,6 +1,7 @@
 $OpenBSD: patch-basic_cfg,v 1.4 2016/04/17 09:14:26 landry Exp $
 basic.cfg.orig Fri Feb  5 16:46:47 2016
-+++ basic.cfg  Sat Mar 19 20:28:39 2016
+Index: basic.cfg
+--- basic.cfg.orig
 basic.cfg
 @@ -7,7 +7,7 @@ inetd: false;
  numeric: false;
  transparent: false;
@@ -8,5 +9,5 @@ $OpenBSD: patch-basic_cfg,v 1.4 2016/04/17 09:14:26 landry Exp $
 -user: "nobody";
 +user: "_sslh";
  pidfile: "/var/run/sslh.pid";
- 
+ chroot: "/var/empty";
  
diff --git net/sslh/patches/patch-example_cfg net/sslh/patches/patch-example_cfg
index 6598c8a75e4..9c21b041f55 100644
--- net/sslh/patches/patch-example_cfg
+++ net/sslh/patches/patch-example_cfg
@@ -1,6 +1,7 @@
 $OpenBSD: patch-example_cfg,v 1.4 2016/04/17 09:14:26 landry Exp $
 example.cfg.orig   Fri Feb  5 16:46:47 2016
-+++ example.cfgSat Mar 19 20:28:56 2016
+Index: example.cfg
+--- example.cfg.orig
 example.cfg
 @@ -9,7 +9,7 @@ inetd: false;
  numeric: false;
  transparent: false;
@@ -8,5 +9,5 @@ $OpenBSD: patch-example_cfg,v 1.4 2016/04/17 09:14:26 landry 
Exp $
 -user: "nobody";
 +user: "_sslh";
  pidfile: "/var/run/sslh.pid";
- 
+ chroot: "/var/empty";
  
diff --git net/sslh/patches/patch-sslh_pod net/sslh/patches/patch-sslh_pod
index 5a84aba561d..97c97bc746e 

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2018/01/21 09:53:26

Modified files:
devel/py-greenlet: Makefile 

Log message:
Unbreak on aarch64. Passes the tests.

Re: [update] dunst-1.3.0

[Timo Myyrä]

Klemens Nanni  writes:

> On Sat, Jan 13, 2018 at 05:21:56PM +0200, Timo Myyrä wrote:
>> As mentioned, here's update to dunst to bring it to latest version.
>> Also includes pledge tweak to fix the port when using icons in notifications.
>> 
>> Quickly tested on amd64 where icons work. More tests would be welcome.
> The update works but needs further work as indicated by
> `make port-lib-depends-check'.
>
> 1.3.0 installs systemd files only if systemctl is present so we can drop
> the @comment lines in PLIST.
>
> Paths in the example dunst.rc need to be adjusted so copying it over
> will work without manually fixing them.
>
> diff --git a/x11/dunst/Makefile b/x11/dunst/Makefile
> index 04fce54839a..40568fe1b36 100644
> --- a/x11/dunst/Makefile
> +++ b/x11/dunst/Makefile
> @@ -4,23 +4,21 @@ COMMENT=customizable and lightweight notification-daemon
>  
>  GH_ACCOUNT = dunst-project
>  GH_PROJECT = dunst
> -GH_TAGNAME = v1.2.0
> +GH_TAGNAME = v1.3.0
>  
>  CATEGORIES = x11
>  
>  HOMEPAGE=https://dunst-project.org/
>  
> -MAINTAINER = Timo Myyra 
> +MAINTAINER = Timo Myyra 
>  
>  # BSD
>  PERMIT_PACKAGE_CDROM=Yes
>  
>  # uses pledge()
> -WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> -WANTLIB += Xrandr Xrender Xss c cairo dbus-1 fontconfig freetype
> -WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
> -WANTLIB += intl m pango-1.0 pangocairo-1.0 pthread xdg-basedir
> -WANTLIB += z
> +WANTLIB +=   X11 Xinerama Xrandr Xss c cairo dbus-1 gdk_pixbuf-2.0
> +WANTLIB +=   gio-2.0 glib-2.0 gobject-2.0 intl m pango-1.0
> +WANTLIB +=   pangocairo-1.0 pthread xdg-basedir
>  
>  USE_GMAKE =  Yes
>  
> @@ -29,12 +27,14 @@ LIB_DEPENDS +=  devel/gettext \
>   devel/pango \
>   graphics/cairo \
>   graphics/gdk-pixbuf2 \
> - x11/gtk+2 \
> - x11/libxdg-basedir \
> - x11/dbus
> + x11/dbus \
> + x11/libxdg-basedir
>  
>  MAKE_FLAGS = V=1 PREFIX="${PREFIX}" MANPREFIX="${PREFIX}/man"
>  
> +pre-configure:
> + ${SUBST_CMD} ${WRKSRC}/docs/dunst.pod
> +
>  post-install:
>   mv ${PREFIX}/share/dunst ${PREFIX}/share/examples/dunst
>  
> diff --git a/x11/dunst/distinfo b/x11/dunst/distinfo
> index c4ce11f412d..538648e5292 100644
> --- a/x11/dunst/distinfo
> +++ b/x11/dunst/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (dunst-1.2.0.tar.gz) = o8BbXvh+iHBKYgcjbkJ3PfvPUMsjx89R5JSnI2t1xa0=
> -SIZE (dunst-1.2.0.tar.gz) = 110628
> +SHA256 (dunst-1.3.0.tar.gz) = dMCxFlz3qccfVivZdpeXBSjq5iXTTIcU+LmVG9XKW+Y=
> +SIZE (dunst-1.3.0.tar.gz) = 121499
> diff --git a/x11/dunst/patches/patch-config_mk 
> b/x11/dunst/patches/patch-config_mk
> index d65ac67549d..367fbe15450 100644
> --- a/x11/dunst/patches/patch-config_mk
> +++ b/x11/dunst/patches/patch-config_mk
> @@ -2,12 +2,12 @@ $OpenBSD: patch-config_mk,v 1.2 2017/08/31 20:57:00 sthen 
> Exp $
>  Index: config.mk
>  --- config.mk.orig
>  +++ config.mk
> -@@ -28,7 +28,7 @@ endif
> +@@ -12,7 +12,7 @@ MANPREFIX = ${PREFIX}/share/man
>   
>   # flags
>   CPPFLAGS += -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
>  -CFLAGS   += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os 
> ${STATIC} ${CPPFLAGS}
>  +CFLAGS   += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings 
> ${STATIC} ${CPPFLAGS}
> + LDFLAGS  += -lm -L${X11LIB}
>   
> - pkg_config_packs := dbus-1 x11 xscrnsaver \
> - "glib-2.0 >= 2.36" gio-2.0 \
> + CPPFLAGS_DEBUG := -DDEBUG_BUILD
> diff --git a/x11/dunst/patches/patch-docs_dunst_pod 
> b/x11/dunst/patches/patch-docs_dunst_pod
> new file mode 100644
> index 000..f0749ca680c
> --- /dev/null
> +++ b/x11/dunst/patches/patch-docs_dunst_pod
> @@ -0,0 +1,38 @@
> +$OpenBSD$
> +
> +Index: docs/dunst.pod
> +--- docs/dunst.pod.orig
>  docs/dunst.pod
> +@@ -35,7 +35,7 @@ rules or using the output in other scripts.
> + 
> + =head1 CONFIGURATION
> + 
> +-An example configuration file is included (usually 
> /usr/share/dunst/dunstrc).
> ++An example configuration file is included at 
> ${PREFIX}/share/examples/dunst/dunstrc.
> + To change the configuration, copy this file to ~/.config/dunst/dunstrc and 
> edit
> + it accordingly.
> + 
> +@@ -395,7 +395,7 @@ Set to 0 to disable icon scaling. (default)
> + 
> + If B is set to off, this setting is ignored.
> + 
> +-=item B (default: 
> "/usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/")
> ++=item B (default: 
> "${LOCALBASE}/share/icons/gnome/16x16/status/:${LOCALBASE}/share/icons/gnome/16x16/devices/")
> + 
> + Can be set to a colon-separated list of paths to search for icons to use 
> with
> + notifications.
> +@@ -414,12 +414,12 @@ Maximum number of notifications that will be kept in h
> + is reached, older notifications will be deleted once a new one arrives. See
> + HISTORY.
> + 
> +-=item B (default: "/usr/bin/dmenu")
> ++=item B (default: "${LOCALBASE}/bin/dmenu")
> + 
> 

Re: [update] kawa-3.0

[Timo Myyrä]

Klemens Nanni  writes:

> On Sat, Jan 13, 2018 at 12:08:25AM +0200, Timo Myyrä wrote:
>>  pre-patch:
>>  find ${WRKSRC} -type f | \
>> -xargs sed -i 's,^JAR =.*,JAR = ${JAVA_HOME}/bin/jar,g'
>> +xargs fgrep -l "JAR =" | \
>> +xargs sed -i 's,^JAR =.*,JAR = ${JAVA_HOME}/bin/jar,g'; \
> That seems overly complicated to me. find can do what xargs does here,
> running two xargs just makes it worse and after all there's no need for
> grep. Since you'll encounter only one "JAR =..." assignment per line,
> sed's `g' flag can be dropped as well.
>
> Might be nitpicking but how about this (untested):
>
>   find ${WRKSRC} -type f -exec \
>   sed -i '/^JAR =/s,=.*,= ${JAVA_HOME}/bin/jar,' {} +

I recall that there was some build issue which was solved this. The previous
version was similar than you have.

timo

Re: [PATCH] x11/mate/libmatemixer: switch backend from pulseaudio to oss

[Lari Rasku]

One more ping.  Am I the only one using MATE/annoyed by this?

On 01/07/18 00:09, Lari Rasku wrote:
> Ping.  Any chance to get this merged?
> 
> On 12/25/17 16:14, Lari Rasku wrote:
>> On MATE, the system and MATE mixers are distinct, and it's easy
>> to get them out of sync: the volume control applet's slider
>> controls only the MATE mixer, mixerctl controls only the system
>> mixer, and the volume up/down keys control both (thanks to
>> handlers in mate-settings-daemon).  This gets confusing very
>> fast, as the volume slider naturally only reflects the state of
>> the MATE mixer, but audio playback volume is also affected by
>> the (invisible without mixerctl) system mixer.
>>
>> The distinct mixers are due to libmatemixer using pulseaudio as
>> its backend, which in turn uses sndio(7), which doesn't touch
>> mixer(4).  This patch makes libmatemixer use OSS as its backend
>> instead, which does use mixer(4).
>>
>> This probably costs some pulseaudio-specific functionality, but
>> I don't know enough about it to tell what.  Anyone know better?
>> Is it worth keeping the current confusing mixer behavior?
>>
>> I expect a similar problem affects other desktop environments
>> using pulseaudio as their audio backend.  A more comprehensive
>> fix would thus be to change pulseaudio to use mixer(4) (directly
>> or indirectly) to control the volume, but I don't know how this
>> might best be done.
>>
>> diff --git Makefile Makefile
>> index f24450972..d4a4344c4 100644
>> --- Makefile
>> +++ Makefile
>> @@ -3,7 +3,7 @@
>>  COMMENT=mixer library for MATE desktop
>>  
>>  MATE_PROJECT=   libmatemixer
>> -REVISION=   2
>> +REVISION=   3
>>  
>>  SHARED_LIBS +=  matemixer 0.0 # 0.0
>>  
>> @@ -12,15 +12,15 @@ CATEGORIES=  audio
>>  # LGPLv2
>>  PERMIT_PACKAGE_CDROM=   Yes
>>  
>> -WANTLIB += ICE SM X11 X11-xcb Xext Xi Xtst m pthread xcb pulse
>> -WANTLIB += FLAC dbus-1 execinfo ffi glib-2.0 gmodule-2.0
>> -WANTLIB += gobject-2.0 iconv intl ogg pcre pulse-mainloop-glib
>> -WANTLIB += sndfile vorbis vorbisenc
>> +WANTLIB += ICE SM X11 X11-xcb Xext Xi Xtst m pthread xcb ossaudio
>> +WANTLIB += ffi glib-2.0 gmodule-2.0 gobject-2.0 iconv intl pcre
>>  
>>  MODULES=x11/gnome
>>  
>> -LIB_DEPENDS=audio/pulseaudio
>> +LIB_DEPENDS=devel/glib2
>>  
>>  CONFIGURE_STYLE=gnu
>>  
>> +CONFIGURE_ARGS+=--disable-pulseaudio --enable-oss
>> +
>>  .include 
>> diff --git pkg/PLIST pkg/PLIST
>> index ec80aa410..18a4fc892 100644
>> --- pkg/PLIST
>> +++ pkg/PLIST
>> @@ -24,9 +24,9 @@ lib/libmatemixer.la
>>  @comment lib/libmatemixer/libmatemixer-null.a
>>  @comment lib/libmatemixer/libmatemixer-null.la
>>  lib/libmatemixer/libmatemixer-null.so
>> -@comment lib/libmatemixer/libmatemixer-pulse.a
>> -@comment lib/libmatemixer/libmatemixer-pulse.la
>> -lib/libmatemixer/libmatemixer-pulse.so
>> +@comment lib/libmatemixer/libmatemixer-oss.a
>> +@comment lib/libmatemixer/libmatemixer-oss.la
>> +lib/libmatemixer/libmatemixer-oss.so
>>  lib/pkgconfig/libmatemixer.pc
>>  share/gtk-doc/html/libmatemixer/
>>  share/gtk-doc/html/libmatemixer/MateMixerAppInfo.html
>>
> 

Re: [update] kawa-3.0

[Klemens Nanni]

On Sat, Jan 13, 2018 at 12:08:25AM +0200, Timo Myyrä wrote:
>  pre-patch:
>   find ${WRKSRC} -type f | \
> - xargs sed -i 's,^JAR =.*,JAR = ${JAVA_HOME}/bin/jar,g'
> + xargs fgrep -l "JAR =" | \
> + xargs sed -i 's,^JAR =.*,JAR = ${JAVA_HOME}/bin/jar,g'; \
That seems overly complicated to me. find can do what xargs does here,
running two xargs just makes it worse and after all there's no need for
grep. Since you'll encounter only one "JAR =..." assignment per line,
sed's `g' flag can be dropped as well.

Might be nitpicking but how about this (untested):

find ${WRKSRC} -type f -exec \
sed -i '/^JAR =/s,=.*,= ${JAVA_HOME}/bin/jar,' {} +

pmacct update / bugfix?

[David Higgs]

Hello ports@,

I started playing w/ pflow and pmacct in a -current amd64 VM, and noticed a
few things:
- (bug) Time-based format strings in "print_output_file" always seem to
print the UNIX epoch.
- The default flavor isn't compiled w/ Jansson so cannot emit JSON output.
- The project has released 1.7.0 (with features I don't personally care
about).

Apologies that I haven't looked into the time bug, or tried to see if 1.7.0
fixes it.

Thanks.

--david

(not subscribed)

Re: FIX: devel/libffi on armv7/clang

[Brian Callahan]

On 01/21/18 08:13, Peter Hessler wrote:

On 2018 Jan 21 (Sun) at 02:06:52 -0500 (-0500), Brian Callahan wrote:
:Finally, it looks like libffi needs libc++abi on arm for at least some
:functions, as
:experienced with lang/snobol4, its configure script didn't pick up libffi and
:instead
:complained about this:
:/usr/local/lib/libffi.so.1.2: undefined reference to `__aeabi_unwind_cpp_pr0'
:/usr/local/lib/libffi.so.1.2: undefined reference to `__aeabi_unwind_cpp_pr1'
:Those functions are in libc++abi.
:

Did you mean to include a patch to libffi.pc to address these issues?




Ugh. No more 2am diffs more me.

We just want this to be for arm, of course, to avoid breaking all gcc 
archs. Attached diff deals.


~Brian

Index: Makefile
===
RCS file: /cvs/ports/devel/libffi/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile	26 May 2016 20:48:50 -	1.35
+++ Makefile	21 Jan 2018 15:05:34 -
@@ -3,7 +3,7 @@
 COMMENT=		Foreign Function Interface
 
 DISTNAME=		libffi-3.2.1
-REVISION=		2
+REVISION=		3
 SHARED_LIBS +=  ffi  1.2  # .6.4
 CATEGORIES=		devel
 
@@ -23,5 +23,10 @@ TEST_DEPENDS=		devel/dejagnu
 CONFIGURE_STYLE=	gnu
 
 FAKE_FLAGS+=		includesdir="${PREFIX}/include"
+
+.if ${MACHINE_ARCH:Marm}
+pre-configure:
+	sed -i 's,-lffi,-lffi -lc++abi,g' ${WRKSRC}/libffi.pc.in
+.endif
 
 .include 
Index: patches/patch-src_arm_ffi_c
===
RCS file: /cvs/ports/devel/libffi/patches/patch-src_arm_ffi_c,v
retrieving revision 1.7
diff -u -p -r1.7 patch-src_arm_ffi_c
--- patches/patch-src_arm_ffi_c	15 Jul 2015 17:06:48 -	1.7
+++ patches/patch-src_arm_ffi_c	21 Jan 2018 15:05:34 -
@@ -1,15 +1,36 @@
 $OpenBSD: patch-src_arm_ffi_c,v 1.7 2015/07/15 17:06:48 jasper Exp $
 
-Fix warning: implicit declaration of function '__clear_cache'
+https://svnweb.freebsd.org/ports/head/devel/libffi/files/patch-src__arm__ffi.c?revision=337118=markup
 
 src/arm/ffi.c.orig	Fri Apr 25 19:45:13 2014
-+++ src/arm/ffi.c	Mon Sep 15 22:00:37 2014
-@@ -37,6 +37,8 @@
+Index: src/arm/ffi.c
+--- src/arm/ffi.c.orig
 src/arm/ffi.c
+@@ -33,6 +33,11 @@
+ 
+ #include 
+ 
++#ifdef __arm__
++#include 
++#include 
++#endif
++
+ /* Forward declares. */
  static int vfp_type_p (ffi_type *);
  static void layout_vfp_args (ffi_cif *);
+@@ -750,6 +755,16 @@ ffi_closure_free (void *ptr)
+ }
  
-+extern void __clear_cache(char *beg, char *end);
+ #else
 +
- int ffi_prep_args_SYSV(char *stack, extended_cif *ecif, float *vfp_space);
- int ffi_prep_args_VFP(char *stack, extended_cif *ecif, float *vfp_space);
++#ifdef __arm__
++#define __clear_cache(start, end) do {	\
++		struct arm_sync_icache_args ua;\
++	\
++		ua.addr = (uintptr_t)(start);\
++		ua.len = (char *)(end) - (char *)start;			\
++		sysarch(ARM_SYNC_ICACHE, );\
++	} while (0);
++#endif
  
+ #define FFI_INIT_TRAMPOLINE(TRAMP,FUN,CTX)\
+ ({ unsigned char *__tramp = (unsigned char*)(TRAMP);			\
Index: patches/patch-src_arm_sysv_S
===
RCS file: patches/patch-src_arm_sysv_S
diff -N patches/patch-src_arm_sysv_S
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-src_arm_sysv_S	21 Jan 2018 15:05:34 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+https://github.com/libffi/libffi/issues/162
+
+Index: src/arm/sysv.S
+--- src/arm/sysv.S.orig
 src/arm/sysv.S
+@@ -396,7 +396,7 @@ LSYM(Lbase_args):
+ 	beq	LSYM(Lepilogue_vfp)
+ 
+ 	cmp	r3, #FFI_TYPE_SINT64
+-	stmeqia	r2, {r0, r1}
++	stmiaeq	r2, {r0, r1}
+ 	beq	LSYM(Lepilogue_vfp)
+ 
+ 	cmp	r3, #FFI_TYPE_FLOAT

Re: [update] dunst-1.3.0

[Klemens Nanni]

On Sat, Jan 13, 2018 at 05:21:56PM +0200, Timo Myyrä wrote:
> As mentioned, here's update to dunst to bring it to latest version.
> Also includes pledge tweak to fix the port when using icons in notifications.
> 
> Quickly tested on amd64 where icons work. More tests would be welcome.
The update works but needs further work as indicated by
`make port-lib-depends-check'.

1.3.0 installs systemd files only if systemctl is present so we can drop
the @comment lines in PLIST.

Paths in the example dunst.rc need to be adjusted so copying it over
will work without manually fixing them.

diff --git a/x11/dunst/Makefile b/x11/dunst/Makefile
index 04fce54839a..40568fe1b36 100644
--- a/x11/dunst/Makefile
+++ b/x11/dunst/Makefile
@@ -4,23 +4,21 @@ COMMENT=  customizable and lightweight notification-daemon
 
 GH_ACCOUNT =   dunst-project
 GH_PROJECT =   dunst
-GH_TAGNAME =   v1.2.0
+GH_TAGNAME =   v1.3.0
 
 CATEGORIES =   x11
 
 HOMEPAGE=  https://dunst-project.org/
 
-MAINTAINER =   Timo Myyra 
+MAINTAINER =   Timo Myyra 
 
 # BSD
 PERMIT_PACKAGE_CDROM=  Yes
 
 # uses pledge()
-WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender Xss c cairo dbus-1 fontconfig freetype
-WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += intl m pango-1.0 pangocairo-1.0 pthread xdg-basedir
-WANTLIB += z
+WANTLIB += X11 Xinerama Xrandr Xss c cairo dbus-1 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gobject-2.0 intl m pango-1.0
+WANTLIB += pangocairo-1.0 pthread xdg-basedir
 
 USE_GMAKE =Yes
 
@@ -29,12 +27,14 @@ LIB_DEPENDS +=  devel/gettext \
devel/pango \
graphics/cairo \
graphics/gdk-pixbuf2 \
-   x11/gtk+2 \
-   x11/libxdg-basedir \
-   x11/dbus
+   x11/dbus \
+   x11/libxdg-basedir
 
 MAKE_FLAGS =   V=1 PREFIX="${PREFIX}" MANPREFIX="${PREFIX}/man"
 
+pre-configure:
+   ${SUBST_CMD} ${WRKSRC}/docs/dunst.pod
+
 post-install:
mv ${PREFIX}/share/dunst ${PREFIX}/share/examples/dunst
 
diff --git a/x11/dunst/distinfo b/x11/dunst/distinfo
index c4ce11f412d..538648e5292 100644
--- a/x11/dunst/distinfo
+++ b/x11/dunst/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dunst-1.2.0.tar.gz) = o8BbXvh+iHBKYgcjbkJ3PfvPUMsjx89R5JSnI2t1xa0=
-SIZE (dunst-1.2.0.tar.gz) = 110628
+SHA256 (dunst-1.3.0.tar.gz) = dMCxFlz3qccfVivZdpeXBSjq5iXTTIcU+LmVG9XKW+Y=
+SIZE (dunst-1.3.0.tar.gz) = 121499
diff --git a/x11/dunst/patches/patch-config_mk 
b/x11/dunst/patches/patch-config_mk
index d65ac67549d..367fbe15450 100644
--- a/x11/dunst/patches/patch-config_mk
+++ b/x11/dunst/patches/patch-config_mk
@@ -2,12 +2,12 @@ $OpenBSD: patch-config_mk,v 1.2 2017/08/31 20:57:00 sthen Exp 
$
 Index: config.mk
 --- config.mk.orig
 +++ config.mk
-@@ -28,7 +28,7 @@ endif
+@@ -12,7 +12,7 @@ MANPREFIX = ${PREFIX}/share/man
  
  # flags
  CPPFLAGS += -D_DEFAULT_SOURCE -DVERSION=\"${VERSION}\"
 -CFLAGS   += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings -Os 
${STATIC} ${CPPFLAGS}
 +CFLAGS   += -g --std=gnu99 -pedantic -Wall -Wno-overlength-strings ${STATIC} 
${CPPFLAGS}
+ LDFLAGS  += -lm -L${X11LIB}
  
- pkg_config_packs := dbus-1 x11 xscrnsaver \
- "glib-2.0 >= 2.36" gio-2.0 \
+ CPPFLAGS_DEBUG := -DDEBUG_BUILD
diff --git a/x11/dunst/patches/patch-docs_dunst_pod 
b/x11/dunst/patches/patch-docs_dunst_pod
new file mode 100644
index 000..f0749ca680c
--- /dev/null
+++ b/x11/dunst/patches/patch-docs_dunst_pod
@@ -0,0 +1,38 @@
+$OpenBSD$
+
+Index: docs/dunst.pod
+--- docs/dunst.pod.orig
 docs/dunst.pod
+@@ -35,7 +35,7 @@ rules or using the output in other scripts.
+ 
+ =head1 CONFIGURATION
+ 
+-An example configuration file is included (usually /usr/share/dunst/dunstrc).
++An example configuration file is included at 
${PREFIX}/share/examples/dunst/dunstrc.
+ To change the configuration, copy this file to ~/.config/dunst/dunstrc and 
edit
+ it accordingly.
+ 
+@@ -395,7 +395,7 @@ Set to 0 to disable icon scaling. (default)
+ 
+ If B is set to off, this setting is ignored.
+ 
+-=item B (default: 
"/usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/")
++=item B (default: 
"${LOCALBASE}/share/icons/gnome/16x16/status/:${LOCALBASE}/share/icons/gnome/16x16/devices/")
+ 
+ Can be set to a colon-separated list of paths to search for icons to use with
+ notifications.
+@@ -414,12 +414,12 @@ Maximum number of notifications that will be kept in h
+ is reached, older notifications will be deleted once a new one arrives. See
+ HISTORY.
+ 
+-=item B (default: "/usr/bin/dmenu")
++=item B (default: "${LOCALBASE}/bin/dmenu")
+ 
+ The command that will be run when opening the context menu. Should be either
+ a dmenu command or a dmenu-compatible menu.
+ 
+-=item B (default: "/usr/bin/firefox")
++=item B (default: "${LOCALBASE}/bin/firefox")
+ 
+ The command that will be run when opening a URL. The URL 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2018/01/21 07:49:16

Modified files:
x11/mate/atril : Makefile 
x11/mate/atril/pkg: PLIST 

Log message:
Uncomment the atril-backends to be able to recognize PDF and PS documents.
My previous commit was a bit too wild :-)

from Lari Rasku, thanks!

Re: [PATCH] x11/mate/atril: enable PDF & PS

[Antoine Jacoutot]

On Sun, Jan 21, 2018 at 01:22:13PM +, Lari Rasku wrote:
> Bump.  Also cc'ing ajacoutot@ since his patch was the one that
> commented these out [1].  Was it by mistake?

I intended to comment the static archives and libtool files, *not* the backends.
So yeah, my mistake.


> [1]: 
> https://github.com/openbsd/ports/commit/b41f11ac6fae14b2670123a8387c8871c7b174c1#diff-b2b85cfae4cfe317d5b08ffe41b9bc42R84
> 
> On 01/07/18 00:58, Lari Rasku wrote:
> > Tried to ask the maintainer about this first, but he hasn't
> > responded in a few weeks, so falling back to ports@.
> > 
> > Is there a reason {pdf,ps}document.atril-backend have been
> > commented out in PLIST?  Without the two, atril doesn't
> > recognize PDF and PS documents.  With the below patch,
> > both work fine on my machine.
> > 
> > diff --git x11/mate/atril/Makefile x11/mate/atril/Makefile
> > index b26be3929..f051a70ae 100644
> > --- x11/mate/atril/Makefile
> > +++ x11/mate/atril/Makefile
> > @@ -10,7 +10,7 @@ SHARED_LIBS +=  atrildocument 3.0 # 3.0
> >  SHARED_LIBS +=  atrilview 3.0 # 3.0
> >  
> >  MATE_PROJECT=  atril
> > -REVISION=  7
> > +REVISION=  8
> >  
> >  # GPLv2
> >  PERMIT_PACKAGE_CDROM=  Yes
> > diff --git x11/mate/atril/pkg/PLIST x11/mate/atril/pkg/PLIST
> > index 6761508ee..c96547d66 100644
> > --- x11/mate/atril/pkg/PLIST
> > +++ x11/mate/atril/pkg/PLIST
> > @@ -81,8 +81,8 @@ lib/atril/3/backends/libtiffdocument.so
> >  @comment lib/atril/3/backends/libxpsdocument.a
> >  @comment lib/atril/3/backends/libxpsdocument.la
> >  lib/atril/3/backends/libxpsdocument.so
> > -@comment lib/atril/3/backends/pdfdocument.atril-backend
> > -@comment lib/atril/3/backends/psdocument.atril-backend
> > +lib/atril/3/backends/pdfdocument.atril-backend
> > +lib/atril/3/backends/psdocument.atril-backend
> >  lib/atril/3/backends/tiffdocument.atril-backend
> >  lib/atril/3/backends/xpsdocument.atril-backend
> >  lib/caja/
> > 

-- 
Antoine

Re: [PATCH] x11/mate/atril: enable PDF & PS

[Lari Rasku]

Bump.  Also cc'ing ajacoutot@ since his patch was the one that
commented these out [1].  Was it by mistake?

[1]: 
https://github.com/openbsd/ports/commit/b41f11ac6fae14b2670123a8387c8871c7b174c1#diff-b2b85cfae4cfe317d5b08ffe41b9bc42R84

On 01/07/18 00:58, Lari Rasku wrote:
> Tried to ask the maintainer about this first, but he hasn't
> responded in a few weeks, so falling back to ports@.
> 
> Is there a reason {pdf,ps}document.atril-backend have been
> commented out in PLIST?  Without the two, atril doesn't
> recognize PDF and PS documents.  With the below patch,
> both work fine on my machine.
> 
> diff --git x11/mate/atril/Makefile x11/mate/atril/Makefile
> index b26be3929..f051a70ae 100644
> --- x11/mate/atril/Makefile
> +++ x11/mate/atril/Makefile
> @@ -10,7 +10,7 @@ SHARED_LIBS +=  atrildocument 3.0 # 3.0
>  SHARED_LIBS +=  atrilview 3.0 # 3.0
>  
>  MATE_PROJECT=atril
> -REVISION=7
> +REVISION=8
>  
>  # GPLv2
>  PERMIT_PACKAGE_CDROM=Yes
> diff --git x11/mate/atril/pkg/PLIST x11/mate/atril/pkg/PLIST
> index 6761508ee..c96547d66 100644
> --- x11/mate/atril/pkg/PLIST
> +++ x11/mate/atril/pkg/PLIST
> @@ -81,8 +81,8 @@ lib/atril/3/backends/libtiffdocument.so
>  @comment lib/atril/3/backends/libxpsdocument.a
>  @comment lib/atril/3/backends/libxpsdocument.la
>  lib/atril/3/backends/libxpsdocument.so
> -@comment lib/atril/3/backends/pdfdocument.atril-backend
> -@comment lib/atril/3/backends/psdocument.atril-backend
> +lib/atril/3/backends/pdfdocument.atril-backend
> +lib/atril/3/backends/psdocument.atril-backend
>  lib/atril/3/backends/tiffdocument.atril-backend
>  lib/atril/3/backends/xpsdocument.atril-backend
>  lib/caja/
> 

Re: pure-ftpd config file

[Landry Breuil]

On Sun, Jan 21, 2018 at 01:02:31PM +0100, Torsten Boese wrote:
> Hi,
> 
> I'm using OpenBSD 6.2 and I want to use pure-fptd as a daemon. I activated 
> via 
> 
> # rcctl enable pureftpd 
> 
> the daemon ans its starts as expected. The problem is that pure-ftpd ignors 
> the config file.
> As written in /usr/local/share/doc/pure-ftpd/README.Configuration-File I 
> copied the pure-ftpd.conf in 
> 
> # /etc 
> as well as in 
> 
> # /usr/local/etc/
> . But pure-ftpd ignors the config. If I do  
> 
> # pure-ftpd /etc/etc/pure-ftpd.conf
> 
> the config works.
> 
> Where I have to store the config or what is to do to enable using the config 
> file for the daemon?

Iirc, pure-ftpd upstream didnt support a configuration file itself, you
configure it via flags passed on the commandline... by default the rc
script uses -A -B -H -u1000 (see /etc/rc.d/pure_ftpd) and you can
override it via

# rcctl set pure_ftpd flags 

(note that the rc script has an underscore - i dout your 'rcctl enable
pureftpd' did anythingat all)

I know debian has/had a perl script which parses a config directory with
one file by option, which are translated to commandline switches at
startup, but that wasnt upstream. I looked at the doc you mention, and
maybe it'd work if you set the path to where you installed the config
file (which i suppose you copied/adapted from the provided one in
share/examples?) as a startup flag:

# rcctl set pure_ftpd flags /path/to/config

The fact that the doc shows a 'double' /etc makes me think there's a
substitution error somewhere.

cc'ing ports@ as it's more relevant to a pure port issue..

Landry

fix ajaxterm output

[Antoine Jacoutot]

Hi.

Currently ajaxterm output is unreadable.
See https://github.com/antonylesuisse/qweb/pull/15

This diff fixes the issue for me.
OK?

Index: Makefile
===
RCS file: /cvs/ports/www/ajaxterm/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile11 Jan 2018 19:27:11 -  1.21
+++ Makefile21 Jan 2018 13:35:30 -
@@ -4,7 +4,7 @@ COMMENT =   web-based SSH client
 
 DISTNAME = Ajaxterm-0.10
 PKGNAME =  ajaxterm-0.10
-REVISION = 11
+REVISION = 12
 
 CATEGORIES =   net security www
 PKG_ARCH = *
Index: patches/patch-ajaxterm_css
===
RCS file: patches/patch-ajaxterm_css
diff -N patches/patch-ajaxterm_css
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-ajaxterm_css  21 Jan 2018 13:35:30 -
@@ -0,0 +1,74 @@
+$OpenBSD$
+
+https://github.com/antonylesuisse/qweb/pull/15
+
+Index: ajaxterm.css
+--- ajaxterm.css.orig
 ajaxterm.css
+@@ -23,7 +23,8 @@ pre.stat .off {
+   color: white;
+   cursor: pointer;
+ }
+-pre.term {
++#term {
++  float: left;
+   margin: 0px;
+   padding: 4px;
+   display: block;
+@@ -33,32 +34,29 @@ pre.term {
+   border-top: 1px solid white;
+   color: #eee;
+ }
+-pre.term span.f0  { color: #000; }
+-pre.term span.f1  { color: #b00; }
+-pre.term span.f2  { color: #0b0; }
+-pre.term span.f3  { color: #bb0; }
+-pre.term span.f4  { color: #00b; }
+-pre.term span.f5  { color: #b0b; }
+-pre.term span.f6  { color: #0bb; }
+-pre.term span.f7  { color: #bbb; }
+-pre.term span.f8  { color: #666; }
+-pre.term span.f9  { color: #f00; }
+-pre.term span.f10 { color: #0f0; }
+-pre.term span.f11 { color: #ff0; }
+-pre.term span.f12 { color: #00f; }
+-pre.term span.f13 { color: #f0f; }
+-pre.term span.f14 { color: #0ff; }
+-pre.term span.f15 { color: #fff; }
+-pre.term span.b0  { background-color: #000; }
+-pre.term span.b1  { background-color: #b00; }
+-pre.term span.b2  { background-color: #0b0; }
+-pre.term span.b3  { background-color: #bb0; }
+-pre.term span.b4  { background-color: #00b; }
+-pre.term span.b5  { background-color: #b0b; }
+-pre.term span.b6  { background-color: #0bb; }
+-pre.term span.b7  { background-color: #bbb; }
++span.f0  { color: #000; }
++span.f1  { color: #b00; }
++span.f2  { color: #0b0; }
++span.f3  { color: #bb0; }
++span.f4  { color: #00b; }
++span.f5  { color: #b0b; }
++span.f6  { color: #0bb; }
++span.f7  { color: #bbb; }
++span.f8  { color: #666; }
++span.f9  { color: #f00; }
++span.f10 { color: #0f0; }
++span.f11 { color: #ff0; }
++span.f12 { color: #00f; }
++span.f13 { color: #f0f; }
++span.f14 { color: #0ff; }
++span.f15 { color: #fff; }
++span.b0  { background-color: #000; }
++span.b1  { background-color: #b00; }
++span.b2  { background-color: #0b0; }
++span.b3  { background-color: #bb0; }
++span.b4  { background-color: #00b; }
++span.b5  { background-color: #b0b; }
++span.b6  { background-color: #0bb; }
++span.b7  { background-color: #bbb; }
+ 
+ body { background-color: #888; }
+-#term {
+-  float: left;
+-}

-- 
Antoine

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/21 06:15:28

Modified files:
devel/kf5  : Makefile 

Log message:
hook qqc2-desktop-style and kirigami2 test results

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

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

Log message:
Import qqc2-desktop-style

qqc2-desktop-style is new since KDE Fameworks 5.39.0

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.

CVS tag tweak from and ok landry@

Status:

Vendor Tag: rsadowski
Release Tags:   rsadowski_20180121

N ports/devel/kf5/qqc2-desktop-style/Makefile
N ports/devel/kf5/qqc2-desktop-style/distinfo
N ports/devel/kf5/qqc2-desktop-style/pkg/DESCR
N ports/devel/kf5/qqc2-desktop-style/pkg/PLIST

No conflicts created by this import

Re: FIX: devel/libffi on armv7/clang

[Peter Hessler]

On 2018 Jan 21 (Sun) at 02:06:52 -0500 (-0500), Brian Callahan wrote:
:Finally, it looks like libffi needs libc++abi on arm for at least some
:functions, as
:experienced with lang/snobol4, its configure script didn't pick up libffi and
:instead
:complained about this:
:/usr/local/lib/libffi.so.1.2: undefined reference to `__aeabi_unwind_cpp_pr0'
:/usr/local/lib/libffi.so.1.2: undefined reference to `__aeabi_unwind_cpp_pr1'
:Those functions are in libc++abi.
:

Did you mean to include a patch to libffi.pc to address these issues?


-- 
Idaho state law makes it illegal for a man to give his sweetheart a box
of candy weighing less than fifty pounds.

Re: NEW: devel/kf5/qqc2-desktop-style

[Landry Breuil]

On Sun, Jan 21, 2018 at 11:53:27AM +0100, Rafael Sadowski wrote:
> I would like to continue my work on KDE Releases Frameworks 5.42.0
> update but first I need the following port in the tree. Could someone
> review it and say a short ok?

One minor nit:

 # $OpenBSD: $

I think the cvs tag isnt expanded in that case, should be $OpenBSD$
iirc. Other than that okay.

Re: NEW: devel/kf5/qqc2-desktop-style

[Rafael Sadowski]

I would like to continue my work on KDE Releases Frameworks 5.42.0
update but first I need the following port in the tree. Could someone
review it and say a short ok?

Have a nice Sunday, Rafael

On Sun Jan 14, 2018 at 03:01:03PM +0100, Rafael Sadowski wrote:
> 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
> --- Makefile  9 Jan 2018 21:10:38 -   1.7
> +++ Makefile  14 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

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/21 03:41:16

Removed files:
lang/gawk/patches: patch-getopt_c 

Log message:
remove empty patch

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2018/01/21 03:33:04

Modified files:
devel/doxygen  : Makefile distinfo 
devel/doxygen/patches: patch-doc_CMakeLists_txt 
devel/doxygen-gui: Makefile distinfo 
Removed files:
devel/doxygen/patches: patch-src_dirdef_cpp 

Log message:
Update doxygen and doxygen-gui to 1.8.14

- Remove the DOXYGEN_ENCODE_PATH_STRIP hack diff. No port uses it anymore
- Change MAINTAINER email address
- CONFIGURE_ARGS and BUILD_DEPENDS tweaks

Re: UPDATE graphics/geeqie

[Landry Breuil]

On Sun, Jan 21, 2018 at 11:04:39AM +0100, Landry Breuil wrote:
> On Sun, Jan 21, 2018 at 12:07:06AM +0300, Kirill Bychkov wrote:
> 
> Either way, 1.4 brings one year and a half of improvements, so i think
> this minor annoyance should prevent us upgrading it :) So okay for me.

should *NOT*, dammit :)

Re: UPDATE graphics/geeqie

[Landry Breuil]

On Sun, Jan 21, 2018 at 12:07:06AM +0300, Kirill Bychkov wrote:
> On Tue, January 16, 2018 22:55, Landry Breuil wrote:
> > On Tue, Jan 16, 2018 at 05:27:51PM +0300, Kirill Bychkov wrote:
> >> On Tue, January 16, 2018 11:28, Landry Breuil wrote:
> >> > On Tue, Jan 16, 2018 at 10:33:07AM +0300, Kirill Bychkov wrote:
> >> >> Hi,
> >> >> Here is an update to geeqie-1.4.
> >> >> Notable port changes:
> >> >>  - update license marker
> >> >>  - actually switch it to gtk3 and tweak COMMENT
> >> >>(gtk3 as a dependency was introduced some time ago [1], but
> >> >> geeqie was still building against gtk2)
> >> >>
> >> >> Works fine on macppc and amd64. OK to commit?
> >> >
> >> > I think your mailer mangled the diff:
> >> >
> >> > patch:  malformed patch at line 84: README.html ChangeLog.html
> >> >
> >> > It builds and updates fine, runtime seems ok but there's a weird
> >> > behaviour on the left side of the app, it's as if there was an inactive
> >> > scrollbar, and not all the content of the sidebar is visible - see
> >> > screenshot.
> >>
> >> Hi,
> >> You mean this shortcut sidebar? I've moved  the tree sidebar and completely
> >>  hide shortcuts sidebar which I'm not going to use. You can make this
> >> sidebar wider if you need to.
> >> Scrollbar for shortcuts appears when one have lots of them or made his
> >> filelist sidebar big enough. So nothing weird. See screenshots attached.
> >
> > The issue i saw at work was that whatever i tried to resize the width of
> > the sidebar, it wouldnt display its left side, as if content (ie the
> > thumb, or the arrow icon, or the plus icon) would stay displayed 'out of
> > the viewport'. On my shot, you dont see the file menu in the top bar,
> > nor /home in the path, nor the thumbs..
> >
> 
> I'm able to make sidebar narrow so it's left side also gets hidden. But
> making it wider returns all hidden parts of sidebar back. Not sure if
> this a feature or a bug.
> Probably we should switch back to gtk2? See screenchots attcahed.

Did a bit more testing on another desktop, and i've seen
https://github.com/BestImageViewer/geeqie/issues/562 upstream which
seems to match the problem we're both seeing. To me, it's a gtk3 bug
that wasnt there in 1.3 (maybe?) because a new menu item was added
(plugins), i'm not sure the left-side of 'tools' (with
homedir/desktop/collections) was here in 1.3 too. Or my local config had
it hidden/collapsed, and i cant unhide/uncollapse it.
Changing layouts allows to view the full width of the tools widget if it
doesnt 'start' on the left of the window.
While here there's a bunch of gtk3 warnings on the console which *seems*
related:

(geeqie:69264): Gtk-WARNING **: Allocating size to GtkBox 0x1b712b50a10
without calling gtk_widget_get_preferred_width/height(). How does the
code know the size to allocate?

(geeqie:69264): Gtk-WARNING **: Allocating size to GtkWindow
0x1b7327de280 without calling gtk_widget_get_preferred_width/height().
How does the code know the size to allocate?

Either way, 1.4 brings one year and a half of improvements, so i think
this minor annoyance should prevent us upgrading it :) So okay for me.

Landry

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2018/01/21 02:34:39

Modified files:
sysutils/logtail: Makefile distinfo 

Log message:
Update to logtail 1.3.8, from Björn Ketelaars

CVS: cvs.openbsd.org: ports

[Robert Peichaer]

CVSROOT:/cvs
Module name:ports
Changes by: r...@cvs.openbsd.org2018/01/21 02:27:25

Modified files:
www/sarg   : Makefile distinfo 

Log message:
update www/sarg to 2.3.11

OK sthen@

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2018/01/21 01:36:51

Modified files:
games/allegro  : Makefile 

Log message:
remove dead  MASTER_SITES

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2018/01/21 01:27:30

Modified files:
editors/subtitleeditor: Makefile 

Log message:
update HOMEPAGE and MASTER_SITES

Re: UPDATE: TeX Live 2017

[Jan Stary]

On Jan 21 09:14:09, h...@stare.cz wrote:
> > Here's an initial TeX Live 2017 diff. If you rely on TeX stuff, please
> > give it a spin and report breakage!
> 
> it built overnight on my current/amd64.

(I have the full script(1) if it's of any interest.)

Re: UPDATE: TeX Live 2017

[Jan Stary]

Hi Edd,

> Here's an initial TeX Live 2017 diff. If you rely on TeX stuff, please
> give it a spin and report breakage!

it built overnight on my current/amd64.

Every TeX file I cared to compile does compile.

> Remember that the tug.org FTP server flaky with our ftp(1)
> implementation, so you will probably need to retry the fetch a few
> times.

I eventually gave up re-fetching 
and downloaded it with wget.

> gzipped diff attached.

Thank you for the massive effort!

Jan