Re: [Re: XSS vuln in cvsweb]

[Andrew Hewus Fresh]

On Fri, Mar 15, 2019 at 02:25:35PM +0100, Peter J. Philipp wrote:
> I have have created a patch for cvsweb port that needs review and help in 
> getting it into the port itself.  I'd like to apologize to Marc Espie for
> contacting him regarding this port based on his last check-in on this port,  
> and thanks to Stuart Henderson for directing me here.
> 
> The patch changed since my last submission to misc@ and since I am a complete
> newbie in perl this would need a pro to look at it whether it's correct.
>
> I have produced the patch with 'diff -u cvsweb.orig cvsweb' directly in the
> /var/www/cgi-bin directory.  Credit goes to Ezio Paglia for finding this XSS
> vuln.  Also the cvsweb at openbsd.org is affected and can be checked with:

I looked this over and updated the patch to be against the port.  It
seems to be good and I only found a couple other places that needed to
be escaped, the "stickyvars" section and the tr1/tr2 inputs in doLog,
although r1, r2, tr1 and tr2 are part of "unsafevars" so their content
is pretty limited already.

It was a pretty quick look so I don't doubt that there are more, and I
didn't actually get a chance to test it out, so hopefully someone else
can.

> https://cvsweb.openbsd.org/src/sbin/clri/clri.c?f=%22%3E%3Cscript%3Ealert(%27XSS%27)%3C/script%3E
> 
> in chrome the XSS check activates immediately, I don't know what firefox does.

With NoScript it throws up a big error saying there was an attempted
XSS, without NoScript it throws up an alert box saying "XSS".
Index: Makefile
===
RCS file: /cvs/ports/devel/cvsweb/Makefile,v
retrieving revision 1.60
diff -u -p -r1.60 Makefile
--- Makefile4 Sep 2018 12:46:10 -   1.60
+++ Makefile16 Mar 2019 00:17:58 -
@@ -3,7 +3,7 @@
 COMMENT=   CGI script to browse CVS repository trees
 
 DISTNAME=  cvsweb-2.0.6
-REVISION=  26
+REVISION=  27
 CATEGORIES=devel www
 HOMEPAGE=  http://www.freebsd.org/projects/cvsweb.html
 
Index: patches/patch-cvsweb_cgi
===
RCS file: /cvs/ports/devel/cvsweb/patches/patch-cvsweb_cgi,v
retrieving revision 1.13
diff -u -p -r1.13 patch-cvsweb_cgi
--- patches/patch-cvsweb_cgi7 Apr 2013 20:07:24 -   1.13
+++ patches/patch-cvsweb_cgi16 Mar 2019 00:17:58 -
@@ -1,6 +1,7 @@
 $OpenBSD: patch-cvsweb_cgi,v 1.13 2013/04/07 20:07:24 naddy Exp $
 cvsweb.cgi.origThu Sep 26 22:56:05 2002
-+++ cvsweb.cgi Sun Apr  7 14:15:55 2013
+Index: cvsweb.cgi
+--- cvsweb.cgi.orig
 cvsweb.cgi
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl -wT
 +#!/usr/bin/perl -w
@@ -37,7 +38,18 @@ $OpenBSD: patch-cvsweb_cgi,v 1.13 2013/0
  );
  
  @LOGSORTKEYS = qw(cvs date rev);
-@@ -2014,20 +2009,6 @@ sub doDiff($$) {
+@@ -1003,8 +998,9 @@ if (-d $fullname) {
+   if (scalar %tags || $input{only_with_tag}) {
+   print "\n";
+   foreach my $var (@stickyvars) {
++  my $tmpvar = htmlquote($input{$var});
+   print
+-  "\n"
++  "\n"
+   if (defined($input{$var})
+   && (!defined($DEFAULTVALUE{$var})
+   || $input{$var} ne $DEFAULTVALUE{$var})
+@@ -2014,20 +2010,6 @@ sub doDiff($$) {
my @difftype   = @{$difftype->{'opts'}};
my $human_readable = $difftype->{'colored'};
  
@@ -58,7 +70,25 @@ $OpenBSD: patch-cvsweb_cgi,v 1.13 2013/0
if ($human_readable) {
if ($hr_ignwhite) {
push @difftype, '-w';
-@@ -2658,7 +2639,7 @@ sub printLog($;$) {
+@@ -2631,7 +2613,7 @@ sub printLog($;$) {
+   sprintf(
+   '%s/%s?annotate=%s%s', $scriptname,
+   urlencode($where), $_,
+-  $barequery
++  htmlquote($barequery)
+   )
+   );
+   }
+@@ -2644,7 +2626,7 @@ sub printLog($;$) {
+   '[select for diffs]',
+   sprintf(
+   '%s?r1=%s%s', $scriptwhere,
+-  $_,   $barequery
++  $_,   
htmlquote($barequery)
+   )
+   );
+   } else {
+@@ -2658,7 +2640,7 @@ sub printLog($;$) {
if (/^1\.1\.1\.\d+$/) {
print " (vendor branch)";
}
@@ -67,3 +97,57 @@ $OpenBSD: patch-cvsweb_cgi,v 1.13 2013/0
my ($est) = $mytz[(localtime($date{$_}))[8]];
print ", ", scalar localtime($date{$_}), " $est (";
} else {
+@@ -2847,7 +2829,7 @@ sub doLog($) {
+ 
+  

[NEW]: p5-Mojolicious-Plugin-AccessLog

[Olivier Cherrier]

Hi,

Here a new port for p5-Mojolicious-Plugin-AccessLog,

$ cat pkg/DESCR 
Mojolicious plugin to easily generate an access log.
$


-- 
Olivier Cherrier
mailto:o...@symacx.com


p5-Mojolicious-Plugin-AccessLog.tgz
Description: application/tar-gz

Re: terminus-font: update and build raw fonts for wscons(4)

[Stuart Henderson]

On 2019/03/15 19:45, Frederic Cambus wrote:
> This looks good to me, a few nitpicks inline below.
> With those addressed, OK fcambus@.
> 
> > +For consoles on a drm(4) device, a font may only be loaded if it matches
> > +the size of the current console font. For displays with a width above
> > +1920 and belove 3840 pixels, rasops(9) will select a 16x32 font which
> ^^
> You have a typo here: s/belove/below.

Thanks, fixed in my tree.

> > +can be replaced with one of the "ter-132*" fonts. (Terminus does not
> > +have a 32x64 font to match the size used by default on wider displays).
> > +
> > +This can be loaded and configured like so:
> > +
> > +$ wsfontload -N ter-132n -w 16 -h 32 
> > /usr/local/share/misc/pcvtfonts/ter-132n
> ^^
> portcheck complains about an hardcoded path here :)

And this.

> > +$ wsconsctl display.font=ter-132n
> > +
> > +To return to the default console font:
> > +
> > +$ wsconsctl display.font="Spleen 16x32"
> 
> Both wsfontload and wsconsctl must be run as root, so maybe we should
> change $ to # for the prompts?

That isn't currently the case. If the kernel is changed to require
this I'll happily switch it over.

What do you think Daniel, is this ok with you?

Hanging builds

[Christian Weisgerber]

Sometimes during amd64 bulk builds, an individual port just hangs
until dpb kills off a process...

KILLED: build stuck at  13% frozen for 60mn

... although other processes related to that port continue to hang
around.

I'm starting to see a pattern.  The remaining processes are a
parent-child chain that inevitably ends with a gmake process that
is parent to two zombies.

Ports that get stuck like this from time to time include lang/node,
x11/qt4, and editors/libreoffice.  I have been unable to trigger
this on a local machine.

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

Re: UPDATE: games/freedink/game and games/freedink/data && NEW: games/freedink/dfarc

[Brian Callahan]

On 3/15/19 5:03 PM, Brian Callahan wrote:

Hi ports --

Big update for FreeDink to update to the latest engine and data releases.
Also, a new subport for dfarc which is a game and D-Mod frontend for 
FreeDink.


OK?

~Brian



MAINTAINER email bounced. I'd like to take MAINTAINER too.

~Brian

UPDATE: games/freedink/game and games/freedink/data && NEW: games/freedink/dfarc

[Brian Callahan]

Hi ports --

Big update for FreeDink to update to the latest engine and data releases.
Also, a new subport for dfarc which is a game and D-Mod frontend for 
FreeDink.


OK?

~Brian

Index: Makefile
===
RCS file: /cvs/ports/games/freedink/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile	29 Jul 2018 03:48:43 -	1.1.1.1
+++ Makefile	15 Mar 2019 20:59:50 -
@@ -2,6 +2,7 @@
 
 SUBDIR =
 SUBDIR += data
+SUBDIR += dfarc
 SUBDIR += game
 
 .include 
Index: data/Makefile
===
RCS file: /cvs/ports/games/freedink/data/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- data/Makefile	29 Jul 2018 03:48:43 -	1.1.1.1
+++ data/Makefile	15 Mar 2019 20:59:50 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2018/07/29 03:48:43 bcallah Exp $
 
 COMMENT =	game data for FreeDink
-DISTNAME =	freedink-data-1.08.20170409
+DISTNAME =	freedink-data-1.08.20190120
 
 # various free-distribution licenses
 # see README.txt and README-REPLACEMENTS.txt in the distribution
Index: data/distinfo
===
RCS file: /cvs/ports/games/freedink/data/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- data/distinfo	29 Jul 2018 03:48:43 -	1.1.1.1
+++ data/distinfo	15 Mar 2019 20:59:50 -
@@ -1,2 +1,2 @@
-SHA256 (freedink-data-1.08.20170409.tar.gz) = 4fHiPHhGvHRHlhCmXMAWmQboRMUZPw2DummszFSjvfU=
-SIZE (freedink-data-1.08.20170409.tar.gz) = 53030350
+SHA256 (freedink-data-1.08.20190120.tar.gz) = cV9EdzsFtzqeybYrDhUvPygb4aFRL7qqOGF22pTP+50=
+SIZE (freedink-data-1.08.20190120.tar.gz) = 71473728
Index: data/patches/patch-Makefile
===
RCS file: data/patches/patch-Makefile
diff -N data/patches/patch-Makefile
--- data/patches/patch-Makefile	29 Jul 2018 03:48:43 -	1.1.1.1
+++ /dev/null	1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2018/07/29 03:48:43 bcallah Exp $
-
-Index: Makefile
 Makefile.orig
-+++ Makefile
-@@ -21,7 +21,7 @@ install:
- #	a few duplicate musics. Use a .zip archive for woe releases,
- #	it will duplicate files but avoid creating empty files instead
- #	of symlinks.
--	cp -a dink $(DESTDIR)$(DATADIR)/dink/
-+	cp -R dink $(DESTDIR)$(DATADIR)/dink/
- 
- #	Tidy permissions
- 	find $(DESTDIR)$(DATADIR)/dink/dink/ -type d -print0 | xargs -0r chmod 755
Index: data/pkg/PLIST
===
RCS file: /cvs/ports/games/freedink/data/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- data/pkg/PLIST	29 Jul 2018 03:48:43 -	1.1.1.1
+++ data/pkg/PLIST	15 Mar 2019 20:59:50 -
@@ -18,9 +18,11 @@ share/dink/dink/Sound/2.mid
 share/dink/dink/Sound/5.ogg
 share/dink/dink/Sound/7.mid
 share/dink/dink/Sound/arrow.wav
+share/dink/dink/Sound/axe.wav
 share/dink/dink/Sound/bhit.wav
 share/dink/dink/Sound/bird1.wav
 share/dink/dink/Sound/bow1.wav
+share/dink/dink/Sound/burn.wav
 share/dink/dink/Sound/dance.mid
 share/dink/dink/Sound/denube.ogg
 share/dink/dink/Sound/fire.wav
@@ -33,8 +35,10 @@ share/dink/dink/Sound/intro.wav
 share/dink/dink/Sound/lively.mid
 share/dink/dink/Sound/love.mid
 share/dink/dink/Sound/lovin.ogg
+share/dink/dink/Sound/nono.wav
 share/dink/dink/Sound/open.wav
 share/dink/dink/Sound/punch.wav
+share/dink/dink/Sound/save.wav
 share/dink/dink/Sound/secret.wav
 share/dink/dink/Sound/sel1.wav
 share/dink/dink/Sound/stairs.wav
@@ -990,4 +994,8 @@ share/dink/dink/l10n/sv/
 share/dink/dink/l10n/sv.po
 share/dink/dink/l10n/sv/LC_MESSAGES/
 share/dink/dink/l10n/sv/LC_MESSAGES/dink.mo
+share/dink/dink/l10n/tr/
+share/dink/dink/l10n/tr.po
+share/dink/dink/l10n/tr/LC_MESSAGES/
+share/dink/dink/l10n/tr/LC_MESSAGES/dink.mo
 share/dink/dink/preview.bmp
Index: game/Makefile
===
RCS file: /cvs/ports/games/freedink/game/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- game/Makefile	29 Jul 2018 03:48:43 -	1.1.1.1
+++ game/Makefile	15 Mar 2019 20:59:50 -
@@ -1,27 +1,27 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2018/07/29 03:48:43 bcallah Exp $
 
 COMMENT =	free clone of Dink Smallwood game
-DISTNAME =	freedink-108.4
-PKGNAME =	freedink-1.08.4
+DISTNAME =	freedink-109.6
 
-WANTLIB += SDL SDL_gfx SDL_image SDL_mixer SDL_ttf c fontconfig
-WANTLIB += freetype iconv intl m pthread z zip zzip
+WANTLIB += ${COMPILER_LIBCXX} SDL2 SDL2_gfx-1.0 SDL2_image SDL2_mixer
+WANTLIB += SDL2_ttf c fontconfig freetype iconv intl m z
 
 BUILD_DEPENDS =	archivers/zip \
 		devel/help2man \
 		devel/check
 
-LIB_DEPENDS =	archivers/libzip \
-		archivers/zziplib \
-		devel/gettext \
-		devel/sdl-image \
-		devel/sdl-mixer \
-		devel/sdl-gfx \
-		devel/sdl-ttf
+LIB_DEPENDS =	devel/gettext \
+		devel/sdl2-image \
+		devel/sdl2-mixer \
+		

CVS: cvs.openbsd.org: ports

[Jeremy Evans]

CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2019/03/15 14:44:32

Modified files:
lang/ruby/2.4  : Tag: OPENBSD_6_4 Makefile distinfo 
lang/ruby/2.4/pkg: Tag: OPENBSD_6_4 PLIST-ri_docs 

Log message:
Use upstream patch to fix the following vulnerabilities in rubygems:

CVE-2019-8320: Delete directory using symlink when decompressing tar
CVE-2019-8321: Escape sequence injection vulnerability in verbose
CVE-2019-8322: Escape sequence injection vulnerability in gem owner
CVE-2019-8323: Escape sequence injection vulnerability in API response handling
CVE-2019-8324: Installing a malicious gem may lead to arbitrary code execution
CVE-2019-8325: Escape sequence injection vulnerability in errors

CVS: cvs.openbsd.org: ports

[Jeremy Evans]

CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2019/03/15 14:43:54

Modified files:
lang/ruby/2.5  : Tag: OPENBSD_6_4 Makefile distinfo 
lang/ruby/2.5/pkg: Tag: OPENBSD_6_4 PLIST-ri_docs 

Log message:
Update to ruby 2.5.5

Fixes the following vulnerabilities in rubygems:

CVE-2019-8320: Delete directory using symlink when decompressing tar
CVE-2019-8321: Escape sequence injection vulnerability in verbose
CVE-2019-8322: Escape sequence injection vulnerability in gem owner
CVE-2019-8323: Escape sequence injection vulnerability in API response handling
CVE-2019-8324: Installing a malicious gem may lead to arbitrary code execution
CVE-2019-8325: Escape sequence injection vulnerability in errors

Chrome in snapshots - crash on launch

[Bryan Everly]

Hi Ports@,

Below is the terminal output I get when I try to launch the chromium build 
(latest & greatest package from snapshots) on the latest snapshot:

$ chrome
[40668:1870462320:0315/155107.446613:ERROR:process_metrics_openbsd.cc(126)] Not 
implemented reached in bool base::GetSystemMemoryInfo(base::SystemMemoryInfoKB 
*)
[40668:1870462320:0315/155107.464615:ERROR:process_posix.cc(388)] Not 
implemented reached in base::Time base::Process::CreationTime() const
Abort trap (core dumped)

Any suggestions?

Thanks!

Re: terminus-font: update and build raw fonts for wscons(4)

[Frederic Cambus]

On Fri, Mar 15, 2019 at 03:01:41PM +, Stuart Henderson wrote:
> Contrary to the advice in faq 7, it is possible to load a new font if
> you have console on a drm device, but there are restrictions on font
> size that must be followed.
> 
> This builds raw variants of some of the Terminus fonts and adds a readme
> showing how to use them. I've updated to a newer version of Terminus
> while there (I could split into two commits if preferred but it's simple
> enough that it doesn't seem necessary).
> 
> Thanks to fcambus@ for clues on this!

This looks good to me, a few nitpicks inline below.

With those addressed, OK fcambus@.

> Index: pkg/README
> ===
> RCS file: pkg/README
> diff -N pkg/README
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ pkg/README15 Mar 2019 14:59:57 -
> @@ -0,0 +1,28 @@
> +$OpenBSD: README.template,v 1.6 2018/09/04 13:40:26 ajacoutot Exp $
> +
> ++---
> +| Running ${PKGSTEM} on OpenBSD
> ++---
> +
> +Use with wscons(4)
> +==
> +Raw versions of some Terminus fonts are included; these can be loaded with
> +wsfontload(8) for use in OpenBSD's wscons(4) text-mode console.
> +
> +For consoles on a drm(4) device, a font may only be loaded if it matches
> +the size of the current console font. For displays with a width above
> +1920 and belove 3840 pixels, rasops(9) will select a 16x32 font which
^^

You have a typo here: s/belove/below.

> +can be replaced with one of the "ter-132*" fonts. (Terminus does not
> +have a 32x64 font to match the size used by default on wider displays).
> +
> +This can be loaded and configured like so:
> +
> +$ wsfontload -N ter-132n -w 16 -h 32 /usr/local/share/misc/pcvtfonts/ter-132n
^^

portcheck complains about an hardcoded path here :)

> +$ wsconsctl display.font=ter-132n
> +
> +To return to the default console font:
> +
> +$ wsconsctl display.font="Spleen 16x32"

Both wsfontload and wsconsctl must be run as root, so maybe we should
change $ to # for the prompts?

Re: UPDATE: emulators/ppsspp

[Charlene Wendling]

Hi,

On Fri, 15 Mar 2019 01:30:57 -0600
"Anthony J. Bentley"  wrote:

> Test reports greatly appreciated.

Thanks for this update.

I've tested on amd64 (Radeon HD7450 fwiw). I've played various games
this afternoon (Wipeout Pure/Pulse, Final Fantasy I and VII:Crisis Core,
Burnout Legends, Tekken 6 and some homebrews), and everything was fine.

Well, excepted an unreproducable radeondrm related kernel panic [1],
but imvho not related to ppsspp.


Charlène.


[1] https://bsd.network/web/statuses/101755008759216858

Re: Qt 5.12 LTS

[Stuart Henderson]

On 2019/03/15 17:02, Bryan Everly wrote:
> Hi,
> 
> I'm guessing that the big work would be making everything else in the
> ports tree that has dependencies on QtWebKit work with QtWebEngine? Or
> is QtWebKit still present in 5.12? I do have some time on my hands and
> would be willing to pitch in if I can help.
> 
> On Fri, 2019-03-15 at 10:47 +0300, Vadim Zhukov wrote:
> I'm slowly working on Qt 5.12.
> 
> BUT
> 
> There will be no QtWebEngine yet, sorry. I don't have time for
> fighting with it. Look at www/chromium port - this one would be the
> same, only with few extra patches.

>
> Anyone willing to do real work there, be guest of Rafael and me.

$ cd /usr/ports/www/chromium/patches; diffstat *
 BUILD.gn   
   |   22
 apps/ui/views/app_window_frame_view.cc 
   |2
 ash/display/mirror_window_controller.cc
   |4
 base/BUILD.gn  
   |   29
 base/allocator/allocator_shim.cc   
   |2
 base/atomicops.h   
   |4
 base/debug/debugger_posix.cc   
   |   27
 base/debug/elf_reader_linux.cc 
   |2
 base/debug/proc_maps_linux.cc  
   |2
 base/debug/stack_trace.h   
   |1
 base/debug/stack_trace_posix.cc
   |9
 base/debug/thread_heap_usage_tracker.cc
   |2
 base/files/file_path_watcher_kqueue.h  
   |1
 base/files/file_path_watcher_stub.cc   
   |   26
 base/files/file_util_posix.cc  
   |   32
 base/files/memory_mapped_file_posix.cc 
   |2
 base/i18n/icu_util.cc  
   |4
 base/linux_util.cc 
   |6
 base/native_library_posix.cc   
   |2
 base/posix/can_lower_nice_to.cc
   |2
 base/posix/unix_domain_socket.cc   
   |   13
 base/process/kill.h
   |2
 base/process/kill_posix.cc 
   |2
 base/process/launch.h  
   |2
 base/process/memory.cc 
   |4
 base/process/process_handle.cc 
   |2
 base/process/process_handle.h  
   |2
 base/process/process_handle_openbsd.cc 
   |   52
 base/process/process_iterator_openbsd.cc   
   |8
 base/process/process_metrics.h 
   |   18
 base/process/process_metrics_openbsd.cc
   |  112
 base/process/process_metrics_posix.cc  
   |4
 base/process/process_posix.cc  
   |   34
 base/rand_util.h   
   |2
 base/rand_util_posix.cc
   |8
 base/system/sys_info_openbsd.cc
   |   26
 base/system/sys_info_posix.cc  
   |2
 base/test/launcher/test_launcher.cc
   |1
 base/test/test_file_util_linux.cc  
   |2
 base/third_party/libevent/event-config.h   
   |2
 base/third_party/libevent/openbsd/config.h 
   |  276 +
 base/third_party/libevent/openbsd/event-config.h   
   |  284 +
 base/third_party/symbolize/symbolize.cc
 

Re: Qt 5.12 LTS

[Bryan Everly]

Hi,

I'm guessing that the big work would be making everything else in the ports 
tree that has dependencies on QtWebKit work with QtWebEngine? Or is QtWebKit 
still present in 5.12? I do have some time on my hands and would be willing to 
pitch in if I can help.

Thanks.

On Fri, 2019-03-15 at 10:47 +0300, Vadim Zhukov wrote:
I'm slowly working on Qt 5.12.

BUT

There will be no QtWebEngine yet, sorry. I don't have time for fighting with 
it. Look at www/chromium port - this one would be the same, only with few extra 
patches.

Anyone willing to do real work there, be guest of Rafael and me.

пт, 15 мар. 2019 г., 4:49 Bryan Everly 
mailto:br...@theeverlys.com>>:
Hi @ports,

Is anyone aware of plans to bump up our qt5 support for 5.9 to 5.12?  I ask 
because I would like to add the NextCloud desktop client as a port but they 
have already taken the time to move fro QtWebKit to QtWebEngine.

Thanks.

Get Outlook for iOS

CVS: cvs.openbsd.org: ports

[Jeremy Evans]

CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2019/03/15 10:51:47

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

Log message:
cve quirk for ruby 2.4, 2.5, 2.6

CVS: cvs.openbsd.org: ports

[Jeremy Evans]

CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2019/03/15 10:46:41

Modified files:
lang/ruby/2.4  : Makefile distinfo 
lang/ruby/2.4/pkg: PLIST-ri_docs 

Log message:
Use upstream patch to fix the following vulnerabilities in rubygems:

CVE-2019-8320: Delete directory using symlink when decompressing tar
CVE-2019-8321: Escape sequence injection vulnerability in verbose
CVE-2019-8322: Escape sequence injection vulnerability in gem owner
CVE-2019-8323: Escape sequence injection vulnerability in API response handling
CVE-2019-8324: Installing a malicious gem may lead to arbitrary code execution
CVE-2019-8325: Escape sequence injection vulnerability in errors

CVS: cvs.openbsd.org: ports

[Jeremy Evans]

CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2019/03/15 10:45:36

Modified files:
lang/ruby/2.5  : Makefile distinfo 
lang/ruby/2.5/pkg: PLIST-ri_docs 

Log message:
Update to ruby 2.5.5

Fixes the following vulnerabilities in rubygems:

CVE-2019-8320: Delete directory using symlink when decompressing tar
CVE-2019-8321: Escape sequence injection vulnerability in verbose
CVE-2019-8322: Escape sequence injection vulnerability in gem owner
CVE-2019-8323: Escape sequence injection vulnerability in API response handling
CVE-2019-8324: Installing a malicious gem may lead to arbitrary code execution
CVE-2019-8325: Escape sequence injection vulnerability in errors

CVS: cvs.openbsd.org: ports

[Jeremy Evans]

CVSROOT:/cvs
Module name:ports
Changes by: jer...@cvs.openbsd.org  2019/03/15 10:44:50

Modified files:
lang/ruby/2.6  : Makefile distinfo 
lang/ruby/2.6/pkg: PLIST-main PLIST-ri_docs 

Log message:
Update to ruby 2.6.2

Fixes the following vulnerabilities in rubygems:

CVE-2019-8320: Delete directory using symlink when decompressing tar
CVE-2019-8321: Escape sequence injection vulnerability in verbose
CVE-2019-8322: Escape sequence injection vulnerability in gem owner
CVE-2019-8323: Escape sequence injection vulnerability in API response handling
CVE-2019-8324: Installing a malicious gem may lead to arbitrary code execution
CVE-2019-8325: Escape sequence injection vulnerability in errors

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2019/03/15 10:38:14

Modified files:
games/wtf  : Makefile distinfo 

Log message:
Update to wtf-20190308

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2019/03/15 10:36:23

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

Log message:
Update to seed7-20190303

Re: remove devel/{cudf,omake,ounit,ocaml-{cmdliner,cppo,dose,extlib,jsonm,re}} ?

[Kenneth R Westerback]

On Mon, Mar 11, 2019 at 05:08:45PM -0400, Kenneth R Westerback wrote:
> On Mon, Mar 11, 2019 at 09:55:53PM +0100, Christopher Zimmermann wrote:
> > Hi,
> > 
> > switching sysutils/opam to a source distribution including all
> > (partly patched) dependencies, the following OCaml libraries are no
> > longer used by other ports. Since active OCaml users will use opam
> > instead of OpenBSD ports I would suggest to remove them from the ports
> > tree.
> > The following diff obviously just disables them as a first step.
> > 
> > objections, oks ?
> > 
> > Christopher
> > 
> 
> I like this, but I am slightly confused -- did I miss the commit to
> switch opam to -full? I would assume we'd want to do that first, no?
> 
>  Ken

Not sure if you're waiting for anything, but just to clarify, this is
ok krw@.

 Ken

Re: [Re: XSS vuln in cvsweb]

[Stuart Henderson]

On 2019/03/15 16:28, Peter J. Philipp wrote:
> would this help any?
> 
> https://people.freebsd.org/~scop/cvsweb/
> 
> There is subsequent versions.

Those are the 13 year old ones that Ingo mentioned.

> Regards,
> 
> -peter
> 
> On 3/15/19 4:05 PM, Ingo Schwarze wrote:
> > Hi,
> > 
> > the trouble with cvsweb is that it is important OpenBSD project
> > infrastructure (consider cvsweb.openbsd.org) that has been abandoned
> > upstream 13 years ago, our version is 16 years old, and the port
> > has no maintainer.  Does anybody consider it funny to run a software
> > in production that is closely related to version control, but
> > (according to my knowledge) is not currently under version control
> > itself?
> > 
> > Given that i'm still using it on bsd.lv, too, i'm willing to host
> > a CVS repo for it and the release tarballs (historic and future)
> > on bsd.lv, pick up upstream maintenance, and also maintain the port.
> > 
> > Does that sound reasonable to people round here?
> > If so, does anyone know whether a copy of the original CVS repository
> > that it resided in still exists somewhere?  It seems to have vanished
> > from https://svnweb.freebsd.org/base/projects/ ...
> > 
> > I don't consider the XSS urgent, but it would of course get fixed
> > in the process.  If people wanted, they could test and commit patches
> > to the port beforehand, but i'm not sure it's needed.
> > 
> > Yours,
> >Ingo

Re: [Re: XSS vuln in cvsweb]

[Peter J. Philipp]

would this help any?

https://people.freebsd.org/~scop/cvsweb/

There is subsequent versions.

Regards,

-peter

On 3/15/19 4:05 PM, Ingo Schwarze wrote:

Hi,

the trouble with cvsweb is that it is important OpenBSD project
infrastructure (consider cvsweb.openbsd.org) that has been abandoned
upstream 13 years ago, our version is 16 years old, and the port
has no maintainer.  Does anybody consider it funny to run a software
in production that is closely related to version control, but
(according to my knowledge) is not currently under version control
itself?

Given that i'm still using it on bsd.lv, too, i'm willing to host
a CVS repo for it and the release tarballs (historic and future)
on bsd.lv, pick up upstream maintenance, and also maintain the port.

Does that sound reasonable to people round here?
If so, does anyone know whether a copy of the original CVS repository
that it resided in still exists somewhere?  It seems to have vanished
from https://svnweb.freebsd.org/base/projects/ ...

I don't consider the XSS urgent, but it would of course get fixed
in the process.  If people wanted, they could test and commit patches
to the port beforehand, but i'm not sure it's needed.

Yours,
   Ingo

Re: [Re: XSS vuln in cvsweb]

[Stuart Henderson]

On 2019/03/15 16:05, Ingo Schwarze wrote:
> Hi,
> 
> the trouble with cvsweb is that it is important OpenBSD project
> infrastructure (consider cvsweb.openbsd.org) that has been abandoned
> upstream 13 years ago, our version is 16 years old, and the port
> has no maintainer.  Does anybody consider it funny to run a software
> in production that is closely related to version control, but
> (according to my knowledge) is not currently under version control
> itself?
> 
> Given that i'm still using it on bsd.lv, too, i'm willing to host
> a CVS repo for it and the release tarballs (historic and future)
> on bsd.lv, pick up upstream maintenance, and also maintain the port.
> 
> Does that sound reasonable to people round here?
> If so, does anyone know whether a copy of the original CVS repository
> that it resided in still exists somewhere?  It seems to have vanished
> from https://svnweb.freebsd.org/base/projects/ ...

Definitely.

> I don't consider the XSS urgent, but it would of course get fixed
> in the process.  If people wanted, they could test and commit patches
> to the port beforehand, but i'm not sure it's needed.

I wondered about doing something like this. Untested (I don't have an
installation handy) but it should disable inline scripts and some other
types of content, while still permitting inline css that cvsweb needs.

Index: cvsweb.cgi
--- cvsweb.cgi.orig
+++ cvsweb.cgi
@@ -3572,8 +3572,11 @@ sub http_header(;$) {
 
if ($is_mod_perl) {
Apache->request->content_type($content_type);
+   Apache->request->header_out(
+   "Content-Security-Policy" => "default-src 'self'; 
style-src 'self' 'unsafe-inline';");
} else {
print "Content-Type: $content_type\r\n";
+   print "Content-Security-Policy: default-src 'self'; style-src 
'self' 'unsafe-inline';\r\n";
}
 
if ($allow_compress && $maycompress) {

Re: [Re: XSS vuln in cvsweb]

[Ingo Schwarze]

Hi,

the trouble with cvsweb is that it is important OpenBSD project
infrastructure (consider cvsweb.openbsd.org) that has been abandoned
upstream 13 years ago, our version is 16 years old, and the port
has no maintainer.  Does anybody consider it funny to run a software
in production that is closely related to version control, but
(according to my knowledge) is not currently under version control
itself?

Given that i'm still using it on bsd.lv, too, i'm willing to host
a CVS repo for it and the release tarballs (historic and future)
on bsd.lv, pick up upstream maintenance, and also maintain the port.

Does that sound reasonable to people round here?
If so, does anyone know whether a copy of the original CVS repository
that it resided in still exists somewhere?  It seems to have vanished
from https://svnweb.freebsd.org/base/projects/ ...

I don't consider the XSS urgent, but it would of course get fixed
in the process.  If people wanted, they could test and commit patches
to the port beforehand, but i'm not sure it's needed.

Yours,
  Ingo

terminus-font: update and build raw fonts for wscons(4)

[Stuart Henderson]

Contrary to the advice in faq 7, it is possible to load a new font if
you have console on a drm device, but there are restrictions on font
size that must be followed.

This builds raw variants of some of the Terminus fonts and adds a readme
showing how to use them. I've updated to a newer version of Terminus
while there (I could split into two commits if preferred but it's simple
enough that it doesn't seem necessary).

Thanks to fcambus@ for clues on this!

Index: Makefile
===
RCS file: /cvs/ports/fonts/terminus-font/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile16 Nov 2017 03:33:09 -  1.13
+++ Makefile15 Mar 2019 14:59:57 -
@@ -2,7 +2,7 @@
 
 COMMENT =  fixed width fonts especially for long hacking sessions
 
-DISTNAME = terminus-font-4.46
+DISTNAME = terminus-font-4.47
 CATEGORIES =   fonts x11
 
 HOMEPAGE = http://terminus-font.sourceforge.net/
@@ -23,7 +23,7 @@ CONFIGURE_STYLE = simple
 NO_TEST =  Yes
 USE_X11 =  Yes
 
-ALL_TARGET =   pcf pcf-8bit
+ALL_TARGET =   pcf pcf-8bit raw
 
 FONTDIR =  ${PREFIX}/share/fonts/terminus
 
@@ -50,5 +50,11 @@ do-install:
${INSTALL_DATA_DIR} ${FONTDIR}
${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
${INSTALL_DATA} ${WRKBUILD}/fonts.alias ${FONTDIR}/fonts.alias-terminus
+
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/misc/pcvtfonts
+   ${INSTALL_DATA} ${WRKBUILD}/fonts.alias ${FONTDIR}/fonts.alias-terminus
+   cd ${WRKSRC}; for i in *.raw; do \
+   ${INSTALL_DATA} $$i ${PREFIX}/share/misc/pcvtfonts/$${i%.raw}; \
+   done
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/fonts/terminus-font/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo4 Aug 2017 16:59:39 -   1.6
+++ distinfo15 Mar 2019 14:59:57 -
@@ -1,2 +1,2 @@
-SHA256 (terminus-font-4.46.tar.gz) = 
TilDPlaZt23x9cmpbxIozM+OqKFnkc/vBj8rhQbHW80=
-SIZE (terminus-font-4.46.tar.gz) = 590210
+SHA256 (terminus-font-4.47.tar.gz) = 
DxsgWIjk4mqUh490a4Vmplw+N0KzPPmk5lF2RtVlEpc=
+SIZE (terminus-font-4.47.tar.gz) = 620344
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile  15 Mar 2019 14:59:57 -
@@ -0,0 +1,46 @@
+$OpenBSD$
+
+Build raw files for wsfontload.
+
+Index: Makefile
+--- Makefile.orig
 Makefile
+@@ -4,6 +4,7 @@ BIN = ./bin
+ 
+ UCS2ANY = $(INT) $(BIN)/ucstoany.$(EXT)
+ BDF2PSF = $(INT) $(BIN)/bdftopsf.$(EXT)
++BDF2RAW = $(INT) $(BIN)/bdftopsf.$(EXT) -r
+ UCS2X11   = $(INT) $(BIN)/ucstoany.$(EXT) -f
+ BDF2PCF   = bdftopcf
+ 
+@@ -56,6 +57,11 @@ PSF_VGAW_KOI8_UV = ter-u14v.psf ter-u16v.psf
+ PSF_VGAW_XOS4_2  = ter-v14v.psf ter-v16v.psf
+ PSF_VGAW = $(PSF_VGAW_8859_1) $(PSF_VGAW_8859_2) $(PSF_VGAW_8859_7) 
$(PSF_VGAW_8859_9) $(PSF_VGAW_MS_1251) $(PSF_VGAW_8859_13) $(PSF_VGAW_8859_16) 
$(PSF_VGAW_IBM_437) $(PSF_VGAW_KOI8_RV) $(PSF_VGAW_BG_MIK) $(PSF_VGAW_PT_154) 
$(PSF_VGAW_KOI8_UV) $(PSF_VGAW_XOS4_2)
+ 
++RAW_8859_1  = $(subst .psf,.raw,$(PSF_8859_1))
++RAW_VGAW_8859_1  = $(subst .psf,.raw,$(PSF_VGAW_8859_1))
++RAW = $(RAW_8859_1)
++RAW_VGAW = $(RAW_VGAW_8859_1)
++
+ PCF_8859_1  = ter-112n.pcf ter-112b.pcf ter-114n.pcf ter-114b.pcf 
ter-116n.pcf ter-116b.pcf ter-118n.pcf ter-118b.pcf ter-120n.pcf ter-120b.pcf 
ter-122n.pcf ter-122b.pcf ter-124n.pcf ter-124b.pcf ter-128n.pcf ter-128b.pcf 
ter-132n.pcf ter-132b.pcf
+ PCF_8859_2  = ter-212n.pcf ter-212b.pcf ter-214n.pcf ter-214b.pcf 
ter-216n.pcf ter-216b.pcf ter-218n.pcf ter-218b.pcf ter-220n.pcf ter-220b.pcf 
ter-222n.pcf ter-222b.pcf ter-224n.pcf ter-224b.pcf ter-228n.pcf ter-228b.pcf 
ter-232n.pcf ter-232b.pcf
+ PCF_8859_5  = ter-512n.pcf ter-512b.pcf ter-514n.pcf ter-514b.pcf 
ter-516n.pcf ter-516b.pcf ter-518n.pcf ter-518b.pcf ter-520n.pcf ter-520b.pcf 
ter-522n.pcf ter-522b.pcf ter-524n.pcf ter-524b.pcf ter-528n.pcf ter-528b.pcf 
ter-532n.pcf ter-532b.pcf
+@@ -131,6 +137,9 @@ DUP_KOI8_UV = dup/cntrl.dup dup/ascii-h.dup dup/koi8.d
+ DUP_KOI8_U  = dup/cntrl.dup dup/ascii-h.dup dup/koi8.dup
+ DUP_XOS4_2  = dup/vgagr.dup dup/xos4-2.dup
+ 
++$(RAW_8859_1) $(RAW_VGAW_8859_1): ter-1%.raw : ter-u%.bdf $(VGA_8859_1) 
$(DUP_8859_1)
++  $(UCS2ANY) $< $(REG_8859_1) $(VGA_8859_1) | $(BDF2RAW) -o $@ 
$(DUP_8859_1)
++
+ $(PSF_8859_1) $(PSF_VGAW_8859_1): ter-1%.psf : ter-u%.bdf $(VGA_8859_1) 
$(DUP_8859_1)
+   $(UCS2ANY) $< $(REG_8859_1) $(VGA_8859_1) | $(BDF2PSF) -o $@ 
$(DUP_8859_1)
+ 
+@@ -202,6 +211,8 @@ install-psf-ref: README
+ 
+ uninstall-psf-ref:
+   rm -f $(DESTDIR)$(psfref)
++
++raw: $(RAW) $(RAW_VGAW)
+ 
+ # X11 Window System
+ 
Index: pkg/PLIST

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2019/03/15 08:56:48

ports/fonts/terminus-font/patches

Update of /cvs/ports/fonts/terminus-font/patches
In directory cvs.openbsd.org:/tmp/cvs-serv83857/patches

Log Message:
Directory /cvs/ports/fonts/terminus-font/patches added to the repository

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2019/03/15 08:53:43

Modified files:
graphics/drawpile: Makefile distinfo 
graphics/drawpile/pkg: PLIST 
Removed files:
graphics/drawpile/patches: patch-desktop_CMakeLists_txt 

Log message:
Update to drawpile-2.1.2, the first release of the new 2.1 series.
NOTE: 2.0 clients cannot connect to 2.1 servers and vice-versa.
Lots of new changes, changelog: https://drawpile.net/news/release-2.1.2/

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2019/03/15 07:28:14

Modified files:
x11/kde-applications/dolphin: Makefile 
x11/kde-applications/dolphin/pkg: PLIST 

Log message:
remove conflict-tag with kde-baseapps-*

There a no conflicts with kde-baseapps- anymore

[Re: XSS vuln in cvsweb]

[Peter J. Philipp]

Hi,

I have have created a patch for cvsweb port that needs review and help in 
getting it into the port itself.  I'd like to apologize to Marc Espie for
contacting him regarding this port based on his last check-in on this port,  
and thanks to Stuart Henderson for directing me here.

The patch changed since my last submission to misc@ and since I am a complete
newbie in perl this would need a pro to look at it whether it's correct.

I have produced the patch with 'diff -u cvsweb.orig cvsweb' directly in the
/var/www/cgi-bin directory.  Credit goes to Ezio Paglia for finding this XSS
vuln.  Also the cvsweb at openbsd.org is affected and can be checked with:

https://cvsweb.openbsd.org/src/sbin/clri/clri.c?f=%22%3E%3Cscript%3Ealert(%27XSS%27)%3C/script%3E

in chrome the XSS check activates immediately, I don't know what firefox does.

Patch after end of signature and forwarded message:

-peter

- Forwarded message from Stuart Henderson  -

Date: Fri, 15 Mar 2019 12:16:06 - (UTC)
From: Stuart Henderson 
To: m...@openbsd.org
Subject: Re: XSS vuln in cvsweb
User-Agent: slrn/1.0.2 (OpenBSD)

On 2019-03-15, Peter J. Philipp  wrote:
> Hi all,
>
> I have been notified by a wonderful security researcher that my site was
> vulnerable to XSS attacks.  The first one was on software I wrote, and the
> second one was on software I got from OpenBSD ports.  Not sure if I should
> be writing this to the ports mailing list though.
> 
> I have written Marc Espie with a patch that I produced for cvsweb, but
> haven't heard from him in 11 hours so I want to get this out to everyone.

Yes, it should go to the ports mailing list. Check the "maintainer" line
in "pkg_info cvsweb". I don't know why you would send it to espie@.

- End forwarded message -

--- cvsweb.orig Thu Mar 14 18:30:06 2019
+++ cvsweb  Fri Mar 15 10:23:05 2019
@@ -998,8 +998,9 @@
if (scalar %tags || $input{only_with_tag}) {
print "\n";
foreach my $var (@stickyvars) {
+   my $tmpvar = htmlquote($input{$var});
print
-   "\n"
+   "\n"
if (defined($input{$var})
&& (!defined($DEFAULTVALUE{$var})
|| $input{$var} ne $DEFAULTVALUE{$var})
@@ -2612,7 +2613,7 @@
sprintf(
'%s/%s?annotate=%s%s', $scriptname,
urlencode($where), $_,
-   $barequery
+   htmlquote($barequery)
)
);
}
@@ -2625,7 +2626,7 @@
'[select for diffs]',
sprintf(
'%s?r1=%s%s', $scriptwhere,
-   $_,   $barequery
+   $_,   
htmlquote($barequery)
)
);
} else {
@@ -2828,7 +2829,7 @@
 
foreach (@stickyvars) {
printf('', $_,
-   $input{$_})
+   htmlquote($input{$_}))
if (defined($input{$_})
&& ((!defined($DEFAULTVALUE{$_})
|| $input{$_} ne $DEFAULTVALUE{$_}) && $input{$_} ne ""));
@@ -3267,7 +3268,7 @@
join ('', $scriptname,
urlencode($wherepath),
(!$last || $lastslash ? '/' : ''),
-   $query,
+   htmlquote($query),
(!$last || $lastslash ? "#dirlist" : "")
));
} else {# do not make a link to the current dir
@@ -3508,6 +3509,7 @@
# Special Characters; RFC 1866
s/&//g;
s/\"//g;
+   s/%22//g;
s///g;
 

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2019/03/15 05:29:53

Modified files:
databases/sqlports: Makefile 
databases/sqlports/files: Inserter.pm mksqlitedb rebuild_schema 

Log message:
Fix bug in argument order, strenghten argument parsing to avoid that.

Add a "meta" table that just contains a schema version and a hash.

So that some clients (e.g., portroach) can automatically figure out
whether a rebuild is required.

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2019/03/15 04:49:42

Modified files:
devel/apktool  : Makefile distinfo 

Log message:
update apktool to 2.4.0.

Re: Adding TEST_ENV/UTF-8 to various ports

[Antoine Jacoutot]

On Fri, Mar 15, 2019 at 10:43:39AM +, Stuart Henderson wrote:
> On 2019/03/15 11:25, Antoine Jacoutot wrote:
> > On Fri, Mar 15, 2019 at 09:48:39AM +, Stuart Henderson wrote:
> > > I'd really like if this could be factored into the module so we can get 
> > > rid
> > > of copies all over the tree.. perhaps behind a MODPY_PYTEST=Yes and using
> > > something like MODPY_PYTEST_FLAGS for those that need more than just -m
> > > pytest?
> > 
> > Why don't we add it by default for lang/python module ports?
> > I mean, would it hurt anything?
> 
> We already have a different default test target for python that uses
> setup.py.. It's annoying, there are about 3 common methods.

I mean adding a default TEST_ENV in the module.

-- 
Antoine

Re: Adding TEST_ENV/UTF-8 to various ports

[Stuart Henderson]

On 2019/03/15 11:25, Antoine Jacoutot wrote:
> On Fri, Mar 15, 2019 at 09:48:39AM +, Stuart Henderson wrote:
> > I'd really like if this could be factored into the module so we can get rid
> > of copies all over the tree.. perhaps behind a MODPY_PYTEST=Yes and using
> > something like MODPY_PYTEST_FLAGS for those that need more than just -m
> > pytest?
> 
> Why don't we add it by default for lang/python module ports?
> I mean, would it hurt anything?

We already have a different default test target for python that uses
setup.py.. It's annoying, there are about 3 common methods.

Re: Adding TEST_ENV/UTF-8 to various ports

[Antoine Jacoutot]

On Fri, Mar 15, 2019 at 09:48:39AM +, Stuart Henderson wrote:
> I'd really like if this could be factored into the module so we can get rid
> of copies all over the tree.. perhaps behind a MODPY_PYTEST=Yes and using
> something like MODPY_PYTEST_FLAGS for those that need more than just -m
> pytest?

Why don't we add it by default for lang/python module ports?
I mean, would it hurt anything?

> --
> Sent from a phone, apologies for poor formatting.
> 
> On 15 March 2019 05:38:44 Kurt Mosiejczuk  wrote:
> 
> > After sending my diff for productivity/khal that added UTF-8 via a
> > new TEST_DEPENDS and modified do-test target I decided I would look
> > throughout the ports tree rather than doing it as I stumbled across it
> > in individual ports as I worked.
> > 
> > 
> > I went through all the python ports I found with a do-test that had a
> > pytest construct in them. Many of the ports had no tests that failed
> > because of unicode reasons so I skipped those. The ones that had
> > failures because of unicode complaints about ascii versus UTF-8 I added
> > a TEST_ENV and modified the do-test target. I verified that doing this
> > improved test results in each case.
> > 
> > 
> > From there I found python ports that already had UTF-8 factored in but
> > did so via a direct inclusion in the test invocation. I abstracted those
> > out and brought in the full SETENV, MAKE_ENV, and TEST_ENV variables
> > in the invocation. Each of those I tested again and the tests came out
> > identically.
> > 
> > 
> > The latter part is more trying to normalize python ports doing this to a
> > common construct. I do have a version that skips those and just does the
> > ports where it improves test results if that is preferred.
> > 
> > 
> > Whereas none of this work touches things outside of tests, I did not
> > bump the revision on any of these.
> > 
> > 
> > cc'ing shadchin@ sebastia@ and remi@ since one or more of the ports this
> > touches are theirs.
> > 
> > 
> > --Kurt
> > 
> > 
> > Index: devel/py-cairocffi/Makefile
> > ===
> > RCS file: /cvs/ports/devel/py-cairocffi/Makefile,v
> > retrieving revision 1.1.1.1
> > diff -u -p -r1.1.1.1 Makefile
> > --- devel/py-cairocffi/Makefile 19 Feb 2017 19:11:58 - 1.1.1.1
> > +++ devel/py-cairocffi/Makefile 15 Mar 2019 04:43:01 -
> > @@ -27,7 +27,10 @@ MODPY_SETUPTOOLS = Yes
> > FLAVORS = python3
> > FLAVOR ?=
> > 
> > +TEST_ENV += LC_CTYPE=en_US.UTF-8
> > +
> > do-test:
> > - cd ${WRKSRC}/lib && LC_CTYPE=en_US.UTF-8 ${MODPY_BIN} -m pytest cairocffi
> > + cd ${WRKSRC}/lib && exec ${SETENV} ${MAKE_ENV} ${TEST_ENV} \
> > + ${MODPY_BIN} -m pytest cairocffi
> > 
> > .include 
> > Index: devel/py-click/Makefile
> > ===
> > RCS file: /cvs/ports/devel/py-click/Makefile,v
> > retrieving revision 1.5
> > diff -u -p -r1.5 Makefile
> > --- devel/py-click/Makefile 15 Apr 2017 17:25:39 - 1.5
> > +++ devel/py-click/Makefile 15 Mar 2019 04:43:01 -
> > @@ -25,8 +25,10 @@ FLAVORS= python3
> > FLAVOR?=
> > 
> > TEST_DEPENDS= devel/py-test${MODPY_FLAVOR}
> > +TEST_ENV += LC_CTYPE=C.UTF-8
> > 
> > do-test:
> > - @cd ${WRKSRC} && ${MODPY_BIN} -m pytest
> > + @cd ${WRKSRC} && exec ${SETENV} ${MAKE_ENV} ${TEST_ENV} \
> > + ${MODPY_BIN} -m pytest
> > 
> > .include 
> > Index: devel/py-lazy-object-proxy/Makefile
> > ===
> > RCS file: /cvs/ports/devel/py-lazy-object-proxy/Makefile,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 Makefile
> > --- devel/py-lazy-object-proxy/Makefile 11 May 2017 18:45:11 - 1.3
> > +++ devel/py-lazy-object-proxy/Makefile 15 Mar 2019 04:43:02 -
> > @@ -27,7 +27,10 @@ TEST_DEPENDS = devel/py-test${MODPY_FLA
> > FLAVORS = python3
> > FLAVOR ?=
> > 
> > +TEST_ENV += LC_CTYPE=C.UTF-8
> > +
> > do-test:
> > - @cd ${WRKSRC} && LC_CTYPE=C.UTF-8 ${MODPY_BIN} -m pytest --ignore=src
> > + @cd ${WRKSRC} && exec ${SETENV} ${MAKE_ENV} ${TEST_ENV} \
> > + ${MODPY_BIN} -m pytest --ignore=src
> > 
> > .include 
> > Index: devel/py-nbconvert/Makefile
> > ===
> > RCS file: /cvs/ports/devel/py-nbconvert/Makefile,v
> > retrieving revision 1.6
> > diff -u -p -r1.6 Makefile
> > --- devel/py-nbconvert/Makefile 25 May 2017 11:45:25 - 1.6
> > +++ devel/py-nbconvert/Makefile 15 Mar 2019 04:43:02 -
> > @@ -45,7 +45,10 @@ TEST_DEPENDS = ${BASE_PKGPATH}=${MODPY_
> > post-install:
> >  mv ${PREFIX}/bin/jupyter-nbconvert{,${MODPY_BIN_SUFFIX}}
> > 
> > +TEST_ENV += LC_CTYPE=en_US.UTF-8
> > +
> > do-test:
> > - cd ${WRKSRC} && LC_CTYPE=en_US.UTF-8 ${MODPY_BIN} -m pytest nbconvert
> > + cd ${WRKSRC} && exec ${SETENV} ${MAKE_ENV} ${TEST_ENV} \
> > + ${MODPY_BIN} -m pytest nbconvert
> > 
> > .include 
> > Index: devel/py-nbformat/Makefile
> > ===
> > RCS file: 

Re: Adding TEST_ENV/UTF-8 to various ports

[Stuart Henderson]

I'd really like if this could be factored into the module so we can get rid 
of copies all over the tree.. perhaps behind a MODPY_PYTEST=Yes and using 
something like MODPY_PYTEST_FLAGS for those that need more than just -m pytest?


--
Sent from a phone, apologies for poor formatting.

On 15 March 2019 05:38:44 Kurt Mosiejczuk  wrote:


After sending my diff for productivity/khal that added UTF-8 via a
new TEST_DEPENDS and modified do-test target I decided I would look
throughout the ports tree rather than doing it as I stumbled across it
in individual ports as I worked.


I went through all the python ports I found with a do-test that had a
pytest construct in them. Many of the ports had no tests that failed
because of unicode reasons so I skipped those. The ones that had
failures because of unicode complaints about ascii versus UTF-8 I added
a TEST_ENV and modified the do-test target. I verified that doing this
improved test results in each case.


From there I found python ports that already had UTF-8 factored in but
did so via a direct inclusion in the test invocation. I abstracted those
out and brought in the full SETENV, MAKE_ENV, and TEST_ENV variables
in the invocation. Each of those I tested again and the tests came out
identically.


The latter part is more trying to normalize python ports doing this to a
common construct. I do have a version that skips those and just does the
ports where it improves test results if that is preferred.


Whereas none of this work touches things outside of tests, I did not
bump the revision on any of these.


cc'ing shadchin@ sebastia@ and remi@ since one or more of the ports this
touches are theirs.


--Kurt


Index: devel/py-cairocffi/Makefile
===
RCS file: /cvs/ports/devel/py-cairocffi/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- devel/py-cairocffi/Makefile 19 Feb 2017 19:11:58 - 1.1.1.1
+++ devel/py-cairocffi/Makefile 15 Mar 2019 04:43:01 -
@@ -27,7 +27,10 @@ MODPY_SETUPTOOLS = Yes
FLAVORS = python3
FLAVOR ?=

+TEST_ENV += LC_CTYPE=en_US.UTF-8
+
do-test:
- cd ${WRKSRC}/lib && LC_CTYPE=en_US.UTF-8 ${MODPY_BIN} -m pytest cairocffi
+ cd ${WRKSRC}/lib && exec ${SETENV} ${MAKE_ENV} ${TEST_ENV} \
+ ${MODPY_BIN} -m pytest cairocffi

.include 
Index: devel/py-click/Makefile
===
RCS file: /cvs/ports/devel/py-click/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- devel/py-click/Makefile 15 Apr 2017 17:25:39 - 1.5
+++ devel/py-click/Makefile 15 Mar 2019 04:43:01 -
@@ -25,8 +25,10 @@ FLAVORS= python3
FLAVOR?=

TEST_DEPENDS= devel/py-test${MODPY_FLAVOR}
+TEST_ENV += LC_CTYPE=C.UTF-8

do-test:
- @cd ${WRKSRC} && ${MODPY_BIN} -m pytest
+ @cd ${WRKSRC} && exec ${SETENV} ${MAKE_ENV} ${TEST_ENV} \
+ ${MODPY_BIN} -m pytest

.include 
Index: devel/py-lazy-object-proxy/Makefile
===
RCS file: /cvs/ports/devel/py-lazy-object-proxy/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- devel/py-lazy-object-proxy/Makefile 11 May 2017 18:45:11 - 1.3
+++ devel/py-lazy-object-proxy/Makefile 15 Mar 2019 04:43:02 -
@@ -27,7 +27,10 @@ TEST_DEPENDS = devel/py-test${MODPY_FLA
FLAVORS = python3
FLAVOR ?=

+TEST_ENV += LC_CTYPE=C.UTF-8
+
do-test:
- @cd ${WRKSRC} && LC_CTYPE=C.UTF-8 ${MODPY_BIN} -m pytest --ignore=src
+ @cd ${WRKSRC} && exec ${SETENV} ${MAKE_ENV} ${TEST_ENV} \
+ ${MODPY_BIN} -m pytest --ignore=src

.include 
Index: devel/py-nbconvert/Makefile
===
RCS file: /cvs/ports/devel/py-nbconvert/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- devel/py-nbconvert/Makefile 25 May 2017 11:45:25 - 1.6
+++ devel/py-nbconvert/Makefile 15 Mar 2019 04:43:02 -
@@ -45,7 +45,10 @@ TEST_DEPENDS = ${BASE_PKGPATH}=${MODPY_
post-install:
 mv ${PREFIX}/bin/jupyter-nbconvert{,${MODPY_BIN_SUFFIX}}

+TEST_ENV += LC_CTYPE=en_US.UTF-8
+
do-test:
- cd ${WRKSRC} && LC_CTYPE=en_US.UTF-8 ${MODPY_BIN} -m pytest nbconvert
+ cd ${WRKSRC} && exec ${SETENV} ${MAKE_ENV} ${TEST_ENV} \
+ ${MODPY_BIN} -m pytest nbconvert

.include 
Index: devel/py-nbformat/Makefile
===
RCS file: /cvs/ports/devel/py-nbformat/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- devel/py-nbformat/Makefile 23 Feb 2017 11:52:00 - 1.4
+++ devel/py-nbformat/Makefile 15 Mar 2019 04:43:02 -
@@ -29,10 +29,13 @@ MODPY_PI = Yes
FLAVORS = python3
FLAVOR ?=

+TEST_ENV += LC_CTYPE=en_US.UTF-8
+
post-install:
 mv ${PREFIX}/bin/jupyter-trust ${PREFIX}/bin/jupyter-trust${MODPY_BIN_SUFFIX}

do-test:
- cd ${WRKSRC} && LC_CTYPE=en_US.UTF-8 ${MODPY_BIN} -m pytest nbformat
+ cd ${WRKSRC} && exec ${SETENV} ${MAKE_ENV} ${TEST_ENV} \
+ ${MODPY_BIN} -m pytest nbformat

.include 
Index: devel/py-path.py/Makefile

net/zabbix 4.0.5

[Mark Patruck]

The following diff updates net/zabbix to 4.0.5. Runs fine on
amd64.

Details: https://www.zabbix.com/rn/rn4.0.5


Index: Makefile
===
RCS file: /cvs/ports/net/zabbix/Makefile,v
retrieving revision 1.156
diff -u -p -r1.156 Makefile
--- Makefile12 Dec 2018 13:34:31 -  1.156
+++ Makefile14 Mar 2019 14:15:48 -
@@ -5,7 +5,7 @@ COMMENT-server =network and application
 COMMENT-proxy =network and application monitoring - proxy
 COMMENT-web =  network and application monitoring - web frontend
 
-VERSION =  4.0.0
+VERSION =  4.0.5
 DISTNAME = zabbix-${VERSION}
 FULLPKGNAME-main = zabbix-agent-${VERSION}
 FULLPKGPATH-main = net/zabbix,-main
@@ -15,8 +15,6 @@ FULLPKGPATH-proxy =   net/zabbix,-proxy
 FULLPKGNAME-web =  zabbix-web-${VERSION}
 FULLPKGPATH-web =  net/zabbix,-web
 CATEGORIES =   net
-REVISION-main =0
-REVISION-web = 0
 
 MAJV = ${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 
Index: distinfo
===
RCS file: /cvs/ports/net/zabbix/distinfo,v
retrieving revision 1.45
diff -u -p -r1.45 distinfo
--- distinfo26 Oct 2018 06:57:21 -  1.45
+++ distinfo14 Mar 2019 14:15:48 -
@@ -1,2 +1,2 @@
-SHA256 (zabbix-4.0.0.tar.gz) = VnPhBhVhAq/4xngaiQ2mzt/Jdc8T2W2HSbTHEm9Ca8c=
-SIZE (zabbix-4.0.0.tar.gz) = 17984379
+SHA256 (zabbix-4.0.5.tar.gz) = VefiGOFw3Qha4dZC1OkNw1dgEfo85yQHQly3MAPDGQY=
+SIZE (zabbix-4.0.5.tar.gz) = 17098529
Index: patches/patch-conf_zabbix_server_conf
===
RCS file: /cvs/ports/net/zabbix/patches/patch-conf_zabbix_server_conf,v
retrieving revision 1.10
diff -u -p -r1.10 patch-conf_zabbix_server_conf
--- patches/patch-conf_zabbix_server_conf   26 Oct 2018 06:57:21 -  
1.10
+++ patches/patch-conf_zabbix_server_conf   14 Mar 2019 14:15:48 -
@@ -12,15 +12,15 @@ Index: conf/zabbix_server.conf
  
  ### Option: LogFileSize
  # Maximum size of log file in MB.
-@@ -124,6 +124,7 @@ DBUser=zabbix
+@@ -123,6 +123,7 @@ DBUser=zabbix
  # Mandatory: no
  # Default:
  # DBSocket=
 +DBSocket=/var/www/var/run/mysql/mysql.sock
  
  ### Option: DBPort
- # Database port when not using local socket. Ignored for SQLite.
-@@ -506,6 +507,7 @@ Timeout=4
+ # Database port when not using local socket.
+@@ -504,6 +505,7 @@ Timeout=4
  # Mandatory: no
  # Default:
  # AlertScriptsPath=${datadir}/zabbix/alertscripts
@@ -28,7 +28,7 @@ Index: conf/zabbix_server.conf
  
  ### Option: ExternalScripts
  # Full path to location of external scripts.
-@@ -523,6 +525,7 @@ Timeout=4
+@@ -521,6 +523,7 @@ Timeout=4
  # Mandatory: no
  # Default:
  # FpingLocation=/usr/sbin/fping
@@ -36,7 +36,7 @@ Index: conf/zabbix_server.conf
  
  ### Option: Fping6Location
  # Location of fping6.
-@@ -532,6 +535,7 @@ Timeout=4
+@@ -530,6 +533,7 @@ Timeout=4
  # Mandatory: no
  # Default:
  # Fping6Location=/usr/sbin/fping6
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/zabbix/patches/patch-configure,v
retrieving revision 1.23
diff -u -p -r1.23 patch-configure
--- patches/patch-configure 26 Oct 2018 06:57:21 -  1.23
+++ patches/patch-configure 14 Mar 2019 14:15:48 -
@@ -28,7 +28,7 @@ Index: configure
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
  $as_echo "yes" >&6; }
 else
-@@ -12500,12 +12501,12 @@ LIBS="$LIBS $ICONV_LIBS"
+@@ -12512,12 +12513,12 @@ LIBS="$LIBS $ICONV_LIBS"
  RANLIB="ranlib"
  
  
Index: patches/patch-src_libs_zbxcrypto_tls_c
===
RCS file: /cvs/ports/net/zabbix/patches/patch-src_libs_zbxcrypto_tls_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_libs_zbxcrypto_tls_c
--- patches/patch-src_libs_zbxcrypto_tls_c  12 Aug 2018 13:25:53 -  
1.1
+++ patches/patch-src_libs_zbxcrypto_tls_c  14 Mar 2019 14:15:48 -
@@ -36,7 +36,17 @@ Index: src/libs/zbxcrypto/tls.c
  
  static void   OPENSSL_cleanup(void)
  {
-@@ -1419,6 +1422,7 @@ static unsigned int  zbx_psk_client_cb(SSL *ssl, 
const 
+@@ -229,7 +232,9 @@ ZBX_THREAD_LOCAL static size_t 
psk_len_for_cb  = 0;
+ static intinit_done   = 0;
+ /* variables for capturing PSK identity from server callback function */
+ ZBX_THREAD_LOCAL static int   incoming_connection_has_psk = 0;
++#ifndef OPENSSL_NO_PSK
+ ZBX_THREAD_LOCAL static char  
incoming_connection_psk_id[PSK_MAX_IDENTITY_LEN + 1];
++#endif
+ /* buffer for messages produced by zbx_openssl_info_cb() */
+ ZBX_THREAD_LOCAL char info_buf[256];
+ #endif
+@@ -1442,6 +1447,7 @@ static unsigned int  

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2019/03/15 02:27:00

Modified files:
games/tbftss   : Makefile distinfo 
games/tbftss/pkg: PLIST 
Removed files:
games/tbftss/patches: patch-src_battle_hud_c 

Log message:
Update to tbftss-1.5.0.

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2019/03/15 02:22:47

Modified files:
net/ruby-msgpack: Makefile distinfo 

Log message:
Update to 1.2.9

Re: [wip] graphics/tiff: enable more compression formats

[Landry Breuil]

On Mon, Feb 25, 2019 at 10:12:43PM +0100, Landry Breuil wrote:
> On Sun, Feb 24, 2019 at 10:41:15PM +0100, Landry Breuil wrote:
> > Hi,
> > 
> > for various gis toolchain wip i have @work, i need to experiment with
> > webp, lzma & zstd compression in the geotiff container (see the various
> > COMPRESS options in https://www.gdal.org/frmt_gtiff.html) - and either i
> > need to make gdal use its internal tiff copy (where all options are
> > enabled) or enable those options on the systemwide tiff.
> > 
> > im not pushing for this diff, but i'd like to start a discussion on the
> > rationale - i looked, and xz/libwebp/zstd build fine on all the archs we
> > build pkgs on (aarch64, amd64, arm, i386, mips64, mips64el, powerpc,
> > sparc64) and the options are all enabled by default in upstream libtiff
> > (development is driven by gdal developers anyway those days).
> > 
> > of course this would impact wantlib for all graphics/tiff consumers,
> > which is 186 ports according to sqlports, and require a bulk as 7300
> > ports indirectly depend on it according to show-reverse-deps.
> 
> Disregarde for now, as graphics/libwebp depends on tiff this creates a
> cyclic dependency. enabling xz & zstd might work though.

And here's a diff which just enables xz & zstd. Opinions ?

? tiff-4.0.10-libtiff.so.40.3
? tiff-4.0.10-libtiff.so.40.3.slim
? tiff-4.0.10-libtiffxx.so.40.2
? tiff-4.0.10-libtiffxx.so.40.2.slim
Index: Makefile
===
RCS file: /cvs/ports/graphics/tiff/Makefile,v
retrieving revision 1.87
diff -u -r1.87 Makefile
--- Makefile5 Dec 2018 20:35:25 -   1.87
+++ Makefile15 Mar 2019 08:09:34 -
@@ -3,7 +3,7 @@
 COMMENT=   tools and library routines for working with TIFF images
 
 DISTNAME=  tiff-4.0.10
-SHARED_LIBS=   tiff40.3# 9.0
+SHARED_LIBS=   tiff40.4# 9.0
 SHARED_LIBS+=  tiffxx  40.2# 9.0
 CATEGORIES=graphics
 
@@ -11,8 +11,11 @@
 
 HOMEPAGE=  http://www.simplesystems.org/libtiff/
 
-LIB_DEPENDS=   graphics/jpeg
-WANTLIB=   c m ${COMPILER_LIBCXX} z jpeg
+LIB_DEPENDS=   graphics/jpeg \
+   archivers/zstd \
+   archivers/xz
+
+WANTLIB=   c m ${COMPILER_LIBCXX} z jpeg lzma zstd
 
 COMPILER = base-clang ports-gcc base-gcc
 
@@ -21,9 +24,7 @@
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=--disable-jbig \
-   --disable-lzma \
--disable-webp \
-   --disable-zstd \
--with-docdir="${PREFIX}/share/doc/tiff" \
--with-jpeg-include-dir="${LOCALBASE}/include" \
--with-jpeg-lib-dir="${LOCALBASE}/lib" \

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2019/03/15 01:49:43

Modified files:
geo/postgis: Makefile distinfo 
geo/postgis/pkg: PLIST 

Log message:
Update to postgis 2.5.2.

Re: Qt 5.12 LTS

[Vadim Zhukov]

I'm slowly working on Qt 5.12.

BUT

There will be no QtWebEngine yet, sorry. I don't have time for fighting
with it. Look at www/chromium port - this one would be the same, only with
few extra patches.

Anyone willing to do real work there, be guest of Rafael and me.

пт, 15 мар. 2019 г., 4:49 Bryan Everly :

> Hi @ports,
>
> Is anyone aware of plans to bump up our qt5 support for 5.9 to 5.12?  I
> ask because I would like to add the NextCloud desktop client as a port but
> they have already taken the time to move fro QtWebKit to QtWebEngine.
>
> Thanks.
>
> Get Outlook for iOS
>

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2019/03/15 01:44:49

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

Log message:
Update to buildbot/worker 2.1.0.

See 
https://docs.buildbot.net/current/relnotes/index.html#buildbot-2-1-0-2019-03-09

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2019/03/15 01:33:16

Modified files:
textproc/ruby-nokogiri: Makefile distinfo 
textproc/ruby-nokogiri/patches: patch-_metadata 
textproc/ruby-nokogiri/pkg: PLIST 

Log message:
Update to 1.10.1

test and OK jeremy@

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2019/03/15 01:32:16

Modified files:
www/ruby-addressable: Makefile distinfo 
www/ruby-addressable/pkg: PLIST 

Log message:
now that there is ruby-public_suffix, update to 2.6.0

test and OK jeremy@

UPDATE: emulators/ppsspp

[Anthony J. Bentley]

Hi,

Here's an update to ppsspp-1.8.0.

Release notes visible on the homepage:
https://ppsspp.org/

A couple of patch changes:
 - Upstream added an option to disable discord so we no longer have to
   patch it out
 - Remove -O3

Test reports greatly appreciated.


Index: Makefile
===
RCS file: /cvs/ports/emulators/ppsspp/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile7 Mar 2019 07:22:19 -   1.7
+++ Makefile15 Mar 2019 07:23:54 -
@@ -4,12 +4,12 @@ COMMENT = Sony PlayStation Portable emul
 
 GH_ACCOUNT =   hrydgard
 GH_PROJECT =   ppsspp
-GH_TAGNAME =   v1.7.1
+GH_TAGNAME =   v1.8.0
 
-GLSLANG =  29619b2312f7bc862221749f3f4d37c3e6a0dee2
-PPSSPP_LANG =  f60be494a43a49fd7ff61603e132c1e24c160d88
+GLSLANG =  9983f99e87ab0b6608b236ea59bcf873f90e1435
+PPSSPP_LANG =  18e0d460e187556e9510e2e9b5ae85fa435cefd9
 SPIRV_CROSS =  be7425ef70231ab82930331959ab487d605d0482
-ARMIPS =   9efe3367284d2d1eeb14fc302a2c12c36e3e255e
+ARMIPS =   7885552b208493a6a0f21663770c446c3ba65576
 
 MASTER_SITES0 =https://github.com/hrydgard/glslang/archive/
 MASTER_SITES1 =https://github.com/hrydgard/ppsspp-lang/archive/
@@ -50,6 +50,7 @@ CONFIGURE_ARGS =  -DCMAKE_CXX_FLAGS="-I${
-DUSE_SYSTEM_FFMPEG=ON \
-DUSE_SYSTEM_LIBZIP=ON \
-DUSE_SYSTEM_SNAPPY=ON \
+   -DUSE_DISCORD=OFF \
-DUSING_EGL=OFF
 
 NO_TEST =  Yes
Index: distinfo
===
RCS file: /cvs/ports/emulators/ppsspp/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo10 Nov 2018 17:55:30 -  1.5
+++ distinfo15 Mar 2019 07:23:54 -
@@ -1,10 +1,10 @@
-SHA256 (ppsspp/29619b2312f7bc862221749f3f4d37c3e6a0dee2.tar.gz) = 
USViBSDSX5o5xtYt/NPgh/1hDcXRY93/Y3c2UBHIsT8=
-SHA256 (ppsspp/9efe3367284d2d1eeb14fc302a2c12c36e3e255e.tar.gz) = 
c7Nm8w6POGNQFyPhPrXcr21CS4A4LRfCdjVWe3lwXKM=
+SHA256 (ppsspp/18e0d460e187556e9510e2e9b5ae85fa435cefd9.tar.gz) = 
PTExcLs4fUZuK/Jnsj3VaJF0NVU39yi0Kpn56nevDTc=
+SHA256 (ppsspp/7885552b208493a6a0f21663770c446c3ba65576.tar.gz) = 
+KA5BhNftvKTK4C371mR85zKxGs27DaQd2+zjGl3XD0=
+SHA256 (ppsspp/9983f99e87ab0b6608b236ea59bcf873f90e1435.tar.gz) = 
6lw8oQG5Y1UIBS4PUpZjA+j8lO31ZOz9D9oUe3RiXJo=
 SHA256 (ppsspp/be7425ef70231ab82930331959ab487d605d0482.tar.gz) = 
Ia+g4y3S117lHE9cDRYzCp2A1DXWrJkA0ME7/9/XtoI=
-SHA256 (ppsspp/f60be494a43a49fd7ff61603e132c1e24c160d88.tar.gz) = 
rBG2iPT9Nbcwc2ryUoKa5hvOK0CcdGL0h8bIiBV+dJs=
-SHA256 (ppsspp/ppsspp-1.7.1.tar.gz) = 
TDJdWFQH9lt7QBLEB+Pi8kblfoIfeAw68Sqih0NW8r0=
-SIZE (ppsspp/29619b2312f7bc862221749f3f4d37c3e6a0dee2.tar.gz) = 2355082
-SIZE (ppsspp/9efe3367284d2d1eeb14fc302a2c12c36e3e255e.tar.gz) = 197127
+SHA256 (ppsspp/ppsspp-1.8.0.tar.gz) = 
pwEf6wSAo1LWDmo8k52I1NLjoudmIIhrGDqiyzb5EN4=
+SIZE (ppsspp/18e0d460e187556e9510e2e9b5ae85fa435cefd9.tar.gz) = 538330
+SIZE (ppsspp/7885552b208493a6a0f21663770c446c3ba65576.tar.gz) = 197263
+SIZE (ppsspp/9983f99e87ab0b6608b236ea59bcf873f90e1435.tar.gz) = 2497419
 SIZE (ppsspp/be7425ef70231ab82930331959ab487d605d0482.tar.gz) = 537422
-SIZE (ppsspp/f60be494a43a49fd7ff61603e132c1e24c160d88.tar.gz) = 535225
-SIZE (ppsspp/ppsspp-1.7.1.tar.gz) = 19484840
+SIZE (ppsspp/ppsspp-1.8.0.tar.gz) = 19636576
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/emulators/ppsspp/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt30 Oct 2018 06:35:23 -  1.2
+++ patches/patch-CMakeLists_txt15 Mar 2019 07:23:54 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.2 201
 Index: CMakeLists.txt
 --- CMakeLists.txt.orig
 +++ CMakeLists.txt
-@@ -194,6 +194,8 @@ if(NOT OPENGL_LIBRARIES)
+@@ -182,6 +182,8 @@ if(USING_EGL)
  endif()
  
  find_package(SDL2)
@@ -12,15 +12,33 @@ Index: CMakeLists.txt
  include(FindThreads)
  
  if(APPLE)
-@@ -307,7 +309,6 @@ if(NOT MSVC)
-   if (NOT ${CMAKE_C_COMPILER_ID} STREQUAL "Intel" AND NOT 
${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
+@@ -247,13 +249,13 @@ if(NOT MSVC)
+   add_definitions(-DUSE_ADDRESS_SANITIZER)
+   endif()
+ 
+-  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -D_DEBUG")
++  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
+   set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -Os 
-D_NDEBUG")
+-  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -D_NDEBUG")
++  set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_NDEBUG")
+   set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} 
-O2 -g -D_NDEBUG")
+-  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -D_DEBUG")
++  set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} 

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2019/03/15 01:30:54

Modified files:
net: Makefile 

Log message:
hook up ruby-public_suffix

CVS: cvs.openbsd.org: ports

[Sebastian Reitenbach]

CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2019/03/15 01:29:48

Log message:
Import  ruby-public_suffix

PublicSuffix can parse and decompose a domain name into top level
domain, domain and subdomains.

test and OK jeremy@

Status:

Vendor Tag: sebastia
Release Tags:   sebastia_20190315

N ports/net/ruby-public_suffix/Makefile
N ports/net/ruby-public_suffix/distinfo
N ports/net/ruby-public_suffix/pkg/DESCR
N ports/net/ruby-public_suffix/pkg/PLIST

No conflicts created by this import

New apertium languages: swe-nor, swe-dan, oci-fra, pol-szl

[Anthony J. Bentley]

Hi,

Here are additional dictionaries that apertium can use for translating
between languages: Swedish/Norwegian, Swedish/Danish, Occitan/French,
and Polish/Silesian.

Extract the attached tarball from /usr/ports/textproc/apertium-dicts.
They're simple to review; the Makefiles are less than 10 lines each and
are just like all the others.

ok to import?

-- 
Anthony J. Bentley


new-apertium-dicts.tar.gz
Description: new-apertium-dicts.tar.gz

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/03/15 01:22:13

Modified files:
mail/cyrus-imapd: Makefile distinfo 
mail/cyrus-imapd/patches: patch-configure patch-imap_mbexamine_c 
  patch-lib_imapoptions 
  patch-man_imapd_conf_5 
mail/cyrus-imapd/pkg: PLIST 

Log message:
Update to cyrus-imapd-3.0.9.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2019/03/15 00:11:51

Modified files:
multimedia/dav1d: Makefile 
Added files:
multimedia/dav1d/patches: patch-meson_build 
  patch-tools_output_md5_c 

Log message:
Merge in a bug fix to fix the MD5 muxer on big endian systems.

from Brad (maintainer)