Re: fix GCC 8.4.0 to unbreak -static linking

[Brad Smith]

On Wed, Sep 09, 2020 at 11:42:27AM -0700, j...@bitminer.ca wrote:
> As recommended by Brad, I've updated the fixes
> for all necessary platforms so that -static
> works.
> 
> Some platforms already had something like this so this
> set of patches is for a subset of all platforms.
> 
> Only tested on amd64.
> 
> John

I had a similar diff as to yours. I also added keeping the PowerPC config in 
sync
which I noticed had not been kept in sync with the rest.

I was just waiting for George to do some testing on PowerPC.


Index: Makefile
===
RCS file: /home/cvs/ports/lang/gcc/8/Makefile,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 Makefile
--- Makefile4 Sep 2020 09:55:34 -   1.34
+++ Makefile13 Sep 2020 00:55:40 -
@@ -18,6 +18,7 @@ DPB_PROPERTIES = parallel
 V = 8.4.0
 FULL_VERSION = $V
 FULL_PKGVERSION = $V
+REVISION = 0
 
 ADASTRAP-amd64 = adastrap-amd64-8.3.0-2.tar.xz
 ADASTRAP-arm = adastrap-arm-4.9.4-0.tar.xz
Index: patches/patch-gcc_config_aarch64_openbsd_h
===
RCS file: 
/home/cvs/ports/lang/gcc/8/patches/patch-gcc_config_aarch64_openbsd_h,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-gcc_config_aarch64_openbsd_h
--- patches/patch-gcc_config_aarch64_openbsd_h  20 May 2019 14:59:05 -  
1.2
+++ patches/patch-gcc_config_aarch64_openbsd_h  4 Sep 2020 20:18:32 -
@@ -57,7 +57,7 @@ Index: gcc/config/aarch64/openbsd.h
 +   %{!static:-Bdynamic} \
 +   %{rdynamic:-export-dynamic} \
 +   %{assert*} \
-+   %{!shared:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}} \
++   %{!shared:%{!static:%{!-dynamic-linker:-dynamic-linker 
/usr/libexec/ld.so}}} \
 +   -L/usr/lib"
 +
 +#define OPENBSD_ENTRY_POINT "__start"
Index: patches/patch-gcc_config_alpha_openbsd_h
===
RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-gcc_config_alpha_openbsd_h,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-gcc_config_alpha_openbsd_h
--- patches/patch-gcc_config_alpha_openbsd_h20 May 2019 14:59:05 -  
1.2
+++ patches/patch-gcc_config_alpha_openbsd_h13 Sep 2020 00:52:52 -
@@ -17,7 +17,7 @@ Index: gcc/config/alpha/openbsd.h
 +   %{!static:-Bdynamic} \
 +   %{rdynamic:-export-dynamic} \
 +   %{assert*} \
-+   %{!shared:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}}"
++   %{!shared:%{!static:%{!dynamic-linker:-dynamic-linker 
/usr/libexec/ld.so}}}"
 +
 +/* As an elf system, we need crtbegin/crtend stuff.  */
 +#undef STARTFILE_SPEC
Index: patches/patch-gcc_config_arm_openbsd_h
===
RCS file: /home/cvs/ports/lang/gcc/8/patches/patch-gcc_config_arm_openbsd_h,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-gcc_config_arm_openbsd_h
--- patches/patch-gcc_config_arm_openbsd_h  20 May 2019 14:59:05 -  
1.2
+++ patches/patch-gcc_config_arm_openbsd_h  4 Sep 2020 20:18:32 -
@@ -82,7 +82,7 @@ Index: gcc/config/arm/openbsd.h
 +   %{!static:-Bdynamic} \
 +   %{rdynamic:-export-dynamic} \
 +   %{assert*} \
-+   %{!shared:%{!dynamic-linker:-dynamic-linker /usr/libexec/ld.so}} \
++   %{!shared:%{!static:%{!-dynamic-linker:-dynamic-linker 
/usr/libexec/ld.so}}} \
 +   %{!nostdlib:-L/usr/lib}"
 +#endif
 +
Index: patches/patch-gcc_config_i386_openbsdelf_h
===
RCS file: 
/home/cvs/ports/lang/gcc/8/patches/patch-gcc_config_i386_openbsdelf_h,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-gcc_config_i386_openbsdelf_h
--- patches/patch-gcc_config_i386_openbsdelf_h  8 Aug 2020 16:48:48 -   
1.3
+++ patches/patch-gcc_config_i386_openbsdelf_h  9 Sep 2020 22:21:06 -
@@ -3,26 +3,28 @@ $OpenBSD: patch-gcc_config_i386_openbsde
 Index: gcc/config/i386/openbsdelf.h
 --- gcc/config/i386/openbsdelf.h.orig
 +++ gcc/config/i386/openbsdelf.h
-@@ -97,14 +97,18 @@ along with GCC; see the file COPYING3.  If not see
+@@ -97,16 +97,20 @@ along with GCC; see the file COPYING3.  If not see
 %{shared:-shared} %{R*} \
 %{static:-Bstatic} \
 %{!static:-Bdynamic} \
 +   %{rdynamic:-export-dynamic} \
 %{assert*} \
 -   -dynamic-linker /usr/libexec/ld.so"
-+   %{!shared:%{!-dynamic-linker:-dynamic-linker /usr/libexec/ld.so}} \
++   %{!shared:%{!static:%{!-dynamic-linker:-dynamic-linker 
/usr/libexec/ld.so}}} \
 +   -L/usr/lib"
  
  #undef STARTFILE_SPEC
--#define STARTFILE_SPEC "\
+ #define STARTFILE_SPEC "\
 -  %{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} %{!p:crt0%O%s}} \
 -  crtbegin%O%s} %{shared:crtbeginS%O%s}"
- 
-+#define SUBTARGET32_DEFAULT_CPU "i586"
-+#define STARTFILE_SPEC "\
+-
 +  %{!shared: %{pg:gcrt0%O%s} %{!pg:%{p:gcrt0%O%s} \
 +  %{!p:%{!static:crt0%O%s} %{static:%{nopie:crt0%O%s} \
 +  %{!nopie:rcrt0%O%s crtbegin%O%s} %{shared:crtbeginS%O%s}"
  #undef ENDFILE_SPEC
  #define ENDFILE_SPEC 

CVS: cvs.openbsd.org: ports

[Pamela Mosiejczuk]

CVSROOT:/cvs
Module name:ports
Changes by: pam...@cvs.openbsd.org  2020/09/12 21:18:23

Modified files:
graphics   : Makefile 

Log message:
+py-blurhash

CVS: cvs.openbsd.org: ports

[Pamela Mosiejczuk]

CVSROOT:/cvs
Module name:ports
Changes by: pam...@cvs.openbsd.org  2020/09/12 21:15:53

Log message:
Import py-blurhash, a python implementation of the blurhash algorithm,
used by the mastodon software to hide sensitive images using compact
placeholders.

OK kmos phessler

Status:

Vendor Tag: pamela
Release Tags:   pamela_20200912

N ports/graphics/py-blurhash/Makefile
N ports/graphics/py-blurhash/distinfo
N ports/graphics/py-blurhash/pkg/DESCR
N ports/graphics/py-blurhash/pkg/PLIST
N ports/graphics/py-blurhash/patches/patch-setup_cfg

No conflicts created by this import

UPDATE: www/qutebrowser 1.12.0 -> 1.13.1

[Dimitri Karamazov]

An update to qutebrowser - 1.13.1
I'll like to take Maintainer if no one minds

Any comments/OK?

Changelog:https://github.com/qutebrowser/qutebrowser/releases

Index: Makefile
===
RCS file: /cvs/ports/www/qutebrowser/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile3 Jul 2020 21:13:21 -   1.20
+++ Makefile12 Sep 2020 20:55:45 -
@@ -2,13 +2,14 @@

 COMMENT =  keyboard-focused browser with a minimal GUI

-MODPY_EGG_VERSION =1.12.0
+MODPY_EGG_VERSION =1.13.1
 DISTNAME = qutebrowser-${MODPY_EGG_VERSION}
-REVISION = 0

 HOMEPAGE = https://www.qutebrowser.org/

 CATEGORIES =   www
+
+MAINTAINER =   Dimitri Karamazov 

 # GPLv3
 PERMIT_PACKAGE =   Yes
Index: distinfo
===
RCS file: /cvs/ports/www/qutebrowser/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo18 Jun 2020 18:17:08 -  1.10
+++ distinfo12 Sep 2020 20:55:45 -
@@ -1,2 +1,2 @@
-SHA256 (qutebrowser-1.12.0.tar.gz) = 
QbvV7eK6dNxpHg47WarVndWnQm45v4Ls7dWbTSL03F8=
-SIZE (qutebrowser-1.12.0.tar.gz) = 3979851
+SHA256 (qutebrowser-1.13.1.tar.gz) = 
KJaFHwfGJYz4mRl17tIAyoR3rjk6anpAJJA1svNu4tg=
+SIZE (qutebrowser-1.13.1.tar.gz) = 4027485
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/qutebrowser/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST   22 May 2020 07:53:20 -  1.9
+++ pkg/PLIST   12 Sep 2020 20:55:46 -
@@ -292,6 +292,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/caret.js
 
lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/global_wrapper.js
+lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/globalthis_quirk.user.js
 
lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/greasemonkey_wrapper.js
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/history.js
 lib/python${MODPY_VERSION}/site-packages/qutebrowser/javascript/pac_utils.js


diff
Description: Binary data

Re: Update: devel/py-wcwidth 0.1.9 -> 0.2.5

[Ingo Schwarze]

Hi Kurt,

Kurt Mosiejczuk wrote on Sat, Sep 12, 2020 at 06:28:30PM -0400:

> Update py-wcwidth from 0.1.9 to 0.2.5

This library is a very bad idea, it should better not exist.
Python should use native wcwidth(3) instead.

PKG-INFO says:

  This library attempts to determine the printable width [...]
  using the very latest Unicode specification.
  [...]
  The libc version of `wcwidth(3)`_ is often several unicode releases
  behind, and therefor several levels of support lower than this
  python library.

That's just not true on OpenBSD where wcwidth(3) is very diligently
maintained by afresh1@ in a timely manner.  Even on systems
where libc *is* behind, using a newer version on the application
level is a very bad idea because the goal must be to have consistent
data between the application program and the terminal emulator.
Now the terminal emulator is (hopefully) using libc and certainly
not using this Python library, so using the latest and greatest on the
application level achieves nothing but inconsistency and hence
misformatting in the terminal, whereas using the same native libc
function in both Python and the terminal emulator would yield better
results, even if the Unicode data data were slightly outdated.

Not sure this observation should stand in the way of a routine
update - but it might potentially make sense to deliver a dummy
version on OpenBSD instead that merely calls through to libc and
does not attempt to do any work whatsoever on its own.

Yours,
  Ingo

Update: devel/py-wcwidth 0.1.9 -> 0.2.5

[Kurt Mosiejczuk]

Update py-wcwidth from 0.1.9 to 0.2.5

All consumer regression tests pass with this update.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/devel/py-wcwidth/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile3 Jul 2020 21:12:52 -   1.10
+++ Makefile12 Sep 2020 22:25:47 -
@@ -2,10 +2,9 @@
 
 COMMENT=   measures number of terminal column cells of wide-char 
code
 
-MODPY_EGG_VERSION= 0.1.9
+MODPY_EGG_VERSION= 0.2.5
 DISTNAME=  wcwidth-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
-REVISION=  0
 
 CATEGORIES=devel
 
@@ -19,7 +18,6 @@ MODULES=  lang/python
 MODPY_PI=  Yes
 MODPY_SETUPTOOLS=  Yes
 MODPY_PYTEST = Yes
-MODPY_PYTEST_ARGS =wcwidth
 
 FLAVORS=   python3
 FLAVOR =   python3
Index: distinfo
===
RCS file: /cvs/ports/devel/py-wcwidth/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo30 Mar 2020 13:18:41 -  1.5
+++ distinfo12 Sep 2020 22:25:47 -
@@ -1,2 +1,2 @@
-SHA256 (wcwidth-0.1.9.tar.gz) = 7nOGKGKhVr93/5KwkDT8SCXdOvnPgbxbNgZo1CXzxfE=
-SIZE (wcwidth-0.1.9.tar.gz) = 24764
+SHA256 (wcwidth-0.2.5.tar.gz) = xNZHuZhykp/be9yqT75/AUE+09mAd995hTDlsE8RbIM=
+SIZE (wcwidth-0.2.5.tar.gz) = 34755
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-wcwidth/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   29 Mar 2020 18:46:23 -  1.2
+++ pkg/PLIST   12 Sep 2020 22:25:47 -
@@ -6,6 +6,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 
lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
 
lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 
lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 
lib/python${MODPY_VERSION}/site-packages/wcwidth-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/zip-safe
 lib/python${MODPY_VERSION}/site-packages/wcwidth/__init__.py
@@ -13,13 +14,9 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSIO
 
lib/python${MODPY_VERSION}/site-packages/wcwidth/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/wcwidth/${MODPY_PYCACHE}table_wide.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/wcwidth/${MODPY_PYCACHE}table_zero.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/wcwidth/${MODPY_PYCACHE}unicode_versions.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/wcwidth/${MODPY_PYCACHE}wcwidth.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/wcwidth/table_wide.py
 lib/python${MODPY_VERSION}/site-packages/wcwidth/table_zero.py
-lib/python${MODPY_VERSION}/site-packages/wcwidth/tests/
-lib/python${MODPY_VERSION}/site-packages/wcwidth/tests/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/wcwidth/tests/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/wcwidth/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/wcwidth/tests/${MODPY_PYCACHE}test_core.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/wcwidth/tests/test_core.py
+lib/python${MODPY_VERSION}/site-packages/wcwidth/unicode_versions.py
 lib/python${MODPY_VERSION}/site-packages/wcwidth/wcwidth.py

Re: [UPDATE] audio/picard 2.3.1 -> 2.4.2

[Kurt Mosiejczuk]

On Mon, Aug 24, 2020 at 08:02:01AM +0200, Stefan Hagen wrote:
> Hello,

> this an udapte for audio/piacard from version 2.3.1 to 2.4.2.

> Port changes:
> - update port version
> - removed revision
> - added new dependency devel/py-dateutil

> Application changes:
> - https://picard.musicbrainz.org/changelog/

> portcheck: ok
> port-lib-depends-check: ok
> manual test (amd64): ok

> OK?

Committed. Thanks!

--Kurt

CVS: cvs.openbsd.org: ports

[Kurt Mosiejczuk]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/09/12 16:10:09

Modified files:
audio/picard   : Makefile distinfo 
audio/picard/pkg: PLIST 

Log message:
Update audio/picard 2.3.1 -> 2.4.2

>From Stefan Hagen - Thanks!

Fix text-to-speech in Qt5, x11/qt5/qtspeech

[Rafael Sadowski]

The following diff fix text-to-speech again in all consumers. I think
for the very first time. You can simply test it with
x11/kde-applications/kmouth for example.

Tested in the hackroom, bluhm@ is my witness ;)

Feedback, OK?

Rafael

Index: Makefile
===
RCS file: /cvs/ports/x11/qt5/qtspeech/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- Makefile13 Mar 2020 16:53:52 -  1.9
+++ Makefile12 Sep 2020 20:58:00 -
@@ -2,15 +2,17 @@
 
 QT5NAME =  QtSpeech
 COMMENT-main = Qt5 text-to-speech components
+REVISION-main =0
 
 MULTI_PACKAGES =   -main -examples
 
 SHARED_LIBS +=  Qt5TextToSpeech 1.0 # 5.9
 
-WANTLIB += ${COMPILER_LIBCXX} Qt5Core m
+WANTLIB += ${COMPILER_LIBCXX} Qt5Core glib-2.0 intl m speechd
 
 BUILD_DEPENDS =
x11/qt5/qtmultimedia>=${QT5_VERSION:R},<${QT5_NEXT_VERSION}
 RUN_DEPENDS =  
x11/qt5/qtmultimedia>=${QT5_VERSION:R},<${QT5_NEXT_VERSION}
+LIB_DEPENDS =  audio/speech-dispatcher
 
 FLAVORS =  debug
 
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/x11/qt5/qtspeech/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST-main
--- pkg/PLIST-main  13 Mar 2020 16:53:52 -  1.3
+++ pkg/PLIST-main  12 Sep 2020 20:58:00 -
@@ -23,10 +23,12 @@ lib/pkgconfig/Qt5TextToSpeech.pc
 lib/qt5/cmake/Qt5TextToSpeech/
 lib/qt5/cmake/Qt5TextToSpeech/Qt5TextToSpeechConfig.cmake
 lib/qt5/cmake/Qt5TextToSpeech/Qt5TextToSpeechConfigVersion.cmake
-lib/qt5/examples/
+lib/qt5/cmake/Qt5TextToSpeech/Qt5TextToSpeech_QTextToSpeechPluginSpeechd.cmake
 lib/qt5/libQt5TextToSpeech.la
 lib/qt5/libQt5TextToSpeech.prl
 @lib lib/qt5/libQt5TextToSpeech.so.${LIBQt5TextToSpeech_VERSION}
 lib/qt5/mkspecs/modules/qt_lib_texttospeech.pri
 lib/qt5/mkspecs/modules/qt_lib_texttospeech_private.pri
 lib/qt5/pkgconfig/Qt5TextToSpeech.pc
+lib/qt5/plugins/texttospeech/
+@so lib/qt5/plugins/texttospeech/libqtexttospeech_speechd.so

CVS: cvs.openbsd.org: ports

[Pamela Mosiejczuk]

CVSROOT:/cvs
Module name:ports
Changes by: pam...@cvs.openbsd.org  2020/09/12 15:01:13

Modified files:
graphics   : Makefile 

Log message:
+mypaint

CVS: cvs.openbsd.org: ports

[Pamela Mosiejczuk]

CVSROOT:/cvs
Module name:ports
Changes by: pam...@cvs.openbsd.org  2020/09/12 14:57:21

Log message:
Import MyPaint 2.0.1

MyPaint is a simple drawing and painting program that works well
with Wacom-style graphics tablets. Its brush engine is versatile and
configurable, and it provides useful, productive tools. The standard
brushes can emulate traditional media like charcoal, pencils, ink, or
paint.

with and OK phessler, OK sthen

Status:

Vendor Tag: pamela
Release Tags:   pamela_20200912

N ports/graphics/mypaint/Makefile
N ports/graphics/mypaint/distinfo
N ports/graphics/mypaint/pkg/DESCR
N ports/graphics/mypaint/pkg/PLIST
N ports/graphics/mypaint/patches/patch-setup_py

No conflicts created by this import

Re: [NEW] textproc/py-regex

[Kurt Mosiejczuk]

On Tue, Sep 08, 2020 at 03:03:29AM +, wen heping wrote:
> Hi,

>Here is a patch to create new port textproc/py-regex, which is required
> by the update of textproc/py-black.
>It build well, all tests passed but one failed on amd64-current system.

Here's a version moved to use the current FLAVOR=python3 paradigm and use
MODPY_PYTEST. 

ok to import?

--Kurt


py-regex.tar.gz
Description: application/tar-gz

Re: New: graphics/py-blurhash

[Kurt Mosiejczuk]

On Fri, Sep 11, 2020 at 04:33:48PM -0400, Pamela Mosiejczuk wrote:
> This a python implementation of the blurhash algorithm, used by the
> mastodon software to hide sensitive images using compact placeholders.
> It is needed for an update to mastodon.py to support newer mastodon
> versions.

> Patched so that tests will run, but currently they're not included in
> the source distribution. All tests do pass and upstream merged my request to
> include them in the future. 

> OK to import?
> -Pamela

ok kmos

--Kurt

CVS: cvs.openbsd.org: ports

[Kurt Mosiejczuk]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/09/12 14:39:31

Modified files:
archivers  : Makefile 

Log message:
Hook py-brotli up to build

CVS: cvs.openbsd.org: ports

[Kurt Mosiejczuk]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/09/12 14:38:14

Log message:
python bindings for Brotli, a generic-purpose lossless compression
algorithm that compresses data using a combination of a modern
variant of the LZ77 algorithm, Huffman coding and 2nd order context
modeling, with a compression ratio comparable to the best currently
available general-purpose compression methods. It is similar in
speed with deflate but offers more dense compression.

Original version by thfr. Moved to current python port standards by
me. Typo fix pointed out by sthen.

ok sthen

Status:

Vendor Tag: kmos
Release Tags:   kmos_20200912

N ports/archivers/py-brotli/Makefile
N ports/archivers/py-brotli/distinfo
N ports/archivers/py-brotli/pkg/DESCR
N ports/archivers/py-brotli/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Kurt Mosiejczuk]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/09/12 14:35:56

Modified files:
archivers  : Makefile 

Log message:
Hook py-lz4 up to build

CVS: cvs.openbsd.org: ports

[Kurt Mosiejczuk]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/09/12 14:35:13

Log message:
This package provides python bindings for the LZ4 compression library.
The bindings provided in this package cover the frame format, the
block format, and the streaming format specifications. The frame
format bindings are the recommended ones to use, as this guarantees
interoperability with other implementations and language bindings.

Needed for thfr's pending py-unitypy port and another port I have in 
progress

Some details picked up from thfr's version. Tweak from sthen.

ok sthen

Status:

Vendor Tag: kmos
Release Tags:   kmos_20200912

N ports/archivers/py-lz4/Makefile
N ports/archivers/py-lz4/distinfo
N ports/archivers/py-lz4/pkg/DESCR
N ports/archivers/py-lz4/pkg/PLIST
N ports/archivers/py-lz4/patches/patch-setup_py

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Pamela Mosiejczuk]

CVSROOT:/cvs
Module name:ports
Changes by: pam...@cvs.openbsd.org  2020/09/12 14:34:46

Modified files:
graphics   : Makefile 

Log message:
+mypaint-brushes2

CVS: cvs.openbsd.org: ports

[Pamela Mosiejczuk]

CVSROOT:/cvs
Module name:ports
Changes by: pam...@cvs.openbsd.org  2020/09/12 14:33:11

Log message:
Import 2.x branch of mypaint-brushes.
Brushes used by MyPaint and other software using libmypaint.

Tweaks and OK sthen, OK phessler

Status:

Vendor Tag: pamela
Release Tags:   pamela_20200912

N ports/graphics/mypaint-brushes2/Makefile
N ports/graphics/mypaint-brushes2/distinfo
N ports/graphics/mypaint-brushes2/pkg/DESCR
N ports/graphics/mypaint-brushes2/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/09/12 14:29:00

Modified files:
net/unifi/testing: Makefile distinfo 
net/unifi/testing/pkg: PLIST 

Log message:
update unifi/testing to 6.0.20-rc

Re: New: graphics/mypaint

[Stuart Henderson]

On 2020/09/11 15:56, Pamela Mosiejczuk wrote:
> MyPaint is a simple drawing and painting program that works well
> with Wacom-style graphics tablets. Its brush engine is versatile and
> configurable, and it provides useful, productive tools. The standard
> brushes can emulate traditional media like charcoal, pencils, ink, or
> paint.
> 
> Uses mypaint-brushes2, preceding.
> 
> OK to import?
> 
> -Pamela
> 

yep.

Re: New: graphics/mypaint-brushes2

[Stuart Henderson]

On 2020/09/11 15:53, Pamela Mosiejczuk wrote:
> This is needed for the new port mypaint, which follows. (Gimp depends on the
> 1.x branch of this port, currently in the tree, while MyPaint itself needs
> the 2.x).
> 
> "Brushes used by MyPaint and other software using libmypaint."
> 
> OK to import?
> 
> -Pamela
> 

License marker should be "Public Domain/CC0 1.0", otherwise OK.

I'm not sure what cvs does if you try to import something that includes
CVS directories, might be safer to remove them beforehand.

(This _could_ just be named mypaint-brushes-$V and set the packages to
not conflict with each, like is done for different versions of python,
though hopefully gimp will move to the newer mypaint-brushes sometime
so it will be temporary anyway, so probably easier to leave as-is).

CVS: cvs.openbsd.org: ports

[Peter Hessler]

CVSROOT:/cvs
Module name:ports
Changes by: phess...@cvs.openbsd.org2020/09/12 13:44:11

Modified files:
x11/gtk+2  : Makefile 
x11/gtk+3  : Makefile 
x11/gtk+4  : Makefile 

Log message:
gtk+2 and gtk+3 are in the dep chain for huge amounts of the ports tree,
so add a parallel flag so they use multiple CPUs while building.  this
is noticably faster at unlocking lots of buildable ports on aarch64
keep gtk+4 in sync with them

has been in arm64 package snaps for at least a year

OK ajacoutot@ (a while ago)

CVS: cvs.openbsd.org: ports

[Peter Hessler]

CVSROOT:/cvs
Module name:ports
Changes by: phess...@cvs.openbsd.org2020/09/12 13:36:59

Modified files:
multimedia/gnome-twitch: Makefile 

Log message:
twich dot tv changed their api, so this app no longer works
mark as BROKEN

OK bcallah@ (MAINTAINER)

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/09/12 13:35:37

Modified files:
telephony/asterisk: Makefile 
telephony/asterisk/patches: patch-Makefile 
Added files:
telephony/asterisk/patches: patch-autoconf_ast_check_raii_m4 

Log message:
asterisk: update the description around -fblocks failing on clang arches,
patch and tweak the port Makefile to make it easier to test this

CVS: cvs.openbsd.org: ports

[Peter Hessler]

CVSROOT:/cvs
Module name:ports
Changes by: phess...@cvs.openbsd.org2020/09/12 13:30:08

Modified files:
games/alephone/scenarios/marathon: Makefile distinfo 
games/alephone/scenarios/marathon/pkg: PLIST 
games/alephone/scenarios/marathon2: Makefile distinfo 
games/alephone/scenarios/marathon2/pkg: PLIST 
games/alephone/scenarios/marathoninfinity: Makefile distinfo 
games/alephone/scenarios/marathoninfinity/pkg: PLIST 

Log message:
Update Alephone engine to 1.3.1, after 5 years of development.

see https://github.com/Aleph-One-Marathon/alephone/releases/tag/release-20200904
and https://github.com/Aleph-One-Marathon/alephone/releases/tag/release-20200830
for more detail

pew pew pew testing by myself (solo games), and pamela@ and kmos@ in multiplayer

OK pamela@

CVS: cvs.openbsd.org: ports

[Peter Hessler]

CVSROOT:/cvs
Module name:ports
Changes by: phess...@cvs.openbsd.org2020/09/12 13:29:40

Modified files:
games/alephone/alephone: Makefile distinfo 
games/alephone/alephone/patches: 
 
patch-Source_Files_Misc_sdl_dialogs_cpp 
 
patch-Source_Files_Misc_sdl_widgets_cpp 
 patch-Source_Files_Misc_sdl_widgets_h 
 
patch-Source_Files_Network_network_dialogs_cpp 
games/alephone/alephone/pkg: PLIST 
Removed files:
games/alephone/alephone/patches: 
 patch-Source_Files_FFmpeg_Movie_cpp 
 patch-Source_Files_FFmpeg_SDL_ffmpeg_c 

Log message:
Update Alephone engine to 1.3.1, after 5 years of development.

see https://github.com/Aleph-One-Marathon/alephone/releases/tag/release-20200904
and https://github.com/Aleph-One-Marathon/alephone/releases/tag/release-20200830
for more detail

pew pew pew testing by myself (solo games), and pamela@ and kmos@ in multiplayer

OK pamela@

Re: update alephone and marathon game files

[Pamela Mosiejczuk]

Sound, normal/windowed mode, gameplay all fine. Tested local network 
play with kmos@ (pew pew pew!)


OK pamela@

On 2020-09-11 16:22, Peter Hessler wrote:

Update for AlephOne and the Marathon game files to the recent 1.3.1 release.

Major Changes:
 Uses SDL 2 for much-improved compatibility with new operating systems
 Better support for game controllers
 Better performance for the software renderer
 Improved mouse control options, with settings for Classic and Modern
 mouse control
 Better support for high-dpi displays
 New controls dialog, which allows simultaneous key, mouse, and
 controller bindings
 More authentic static effect when using OpenGL
 Adds a stash for sharing info between Lua states
 Better support for Unicode characters in Windows (should fix Rubicon X)
 Better support for original Marathon scenarios including Trojan,
 which now works fully
 A separate 64-bit Windows build is available
 Better master volume and music volume controls
 Video export bitrate depends on the video resolution, which leads to
 much improved export at 1080p with default settings
 Mac apps are now notarized by Apple
 Original games now default to more authentic settings on first
 install; high res plugins are still included but are not enabled by 
default

Plays well for me on amd64

OK?


Index: games/alephone/alephone/Makefile
===
RCS file: /home/cvs/openbsd/ports/games/alephone/alephone/Makefile,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 Makefile
--- games/alephone/alephone/Makefile12 Jul 2019 20:46:14 -  1.30
+++ games/alephone/alephone/Makefile11 Sep 2020 18:06:10 -
@@ -1,12 +1,13 @@
  # $OpenBSD: Makefile,v 1.30 2019/07/12 20:46:14 sthen Exp $
  
+DPB_PROPERTIES =	parallel

+
  DIST_SUBDIR ?=alephone
  COMMENT = open source game engine based on Marathon 2: Durandal
  
-DATE =			20150620

+DATE = 20200904
  DISTNAME =AlephOne-${DATE}
-PKGNAME =  alephone-1.2.1
-REVISION = 6
+PKGNAME =  alephone-1.3.1
  
  EXTRACT_SUFX =		.tar.bz2

  CATEGORIES =  games x11
@@ -20,10 +21,10 @@ PERMIT_PACKAGE =Yes
  
  MASTER_SITES =		https://github.com/Aleph-One-Marathon/alephone/releases/download/release-${DATE}/
  
-WANTLIB +=		GL GLU c m pthread ${COMPILER_LIBCXX} z

-WANTLIB += SDL SDL_net SDL_image SDL_ttf mad png sndfile
-WANTLIB += smpeg speex speexdsp vorbisfile zzip
-WANTLIB += avcodec avformat avutil swscale boost_filesystem boost_system curl
+WANTLIB += ${COMPILER_LIBCXX} GL GLU SDL2 SDL2_image SDL2_net
+WANTLIB += SDL2_ttf avcodec avformat avutil boost_filesystem boost_system
+WANTLIB += c curl expat m mad png sndfile speex speexdsp swscale
+WANTLIB += vorbisfile z zzip
  
  COMPILER =		base-clang ports-gcc base-gcc
  
@@ -31,10 +32,9 @@ BUILD_DEPENDS =		devel/automake/${AUTOMA

devel/autoconf/${AUTOCONF_VER}
  LIB_DEPENDS = archivers/zziplib \
devel/boost \
-   devel/sdl-net \
-   devel/sdl-image \
-   devel/sdl-ttf \
-   devel/smpeg \
+   devel/sdl2-net \
+   devel/sdl2-image \
+   devel/sdl2-ttf \
audio/libmad \
audio/libsndfile \
audio/speex \
@@ -42,11 +42,15 @@ LIB_DEPENDS =   archivers/zziplib \
graphics/ffmpeg \
net/curl
  
+RUN_DEPENDS =		devel/desktop-file-utils \

+   x11/gtk+3,-guic \
+   misc/shared-mime-info
+
  USE_BZIP2 =   Yes
  USE_GMAKE =   Yes
  CONFIGURE_STYLE = gnu
-AUTOCONF_VER = 2.61
-AUTOMAKE_VER = 1.9
+AUTOCONF_VER = 2.65
+AUTOMAKE_VER = 1.16
  CONFIGURE_ENV =   AUTOCONF_VERSION=${AUTOCONF_VER} \
AUTOMAKE_VERSION=${AUTOMAKE_VER} \
CPPFLAGS=-I${LOCALBASE}/include
Index: games/alephone/alephone/distinfo
===
RCS file: /home/cvs/openbsd/ports/games/alephone/alephone/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- games/alephone/alephone/distinfo2 Feb 2016 10:17:44 -   1.10
+++ games/alephone/alephone/distinfo11 Sep 2020 13:08:40 -
@@ -1,2 +1,2 @@
-SHA256 (alephone/AlephOne-20150620.tar.bz2) = 
wPNg37dKYmT5XTdRA6dAAJMM8EOf+wRk+RX1N5RD4TM=
-SIZE (alephone/AlephOne-20150620.tar.bz2) = 5031898
+SHA256 (alephone/AlephOne-20200904.tar.bz2) = 
kCJ6tt2shq+LGO7uIt/Etm6+CDl5829wnLc0nG4dk40=
+SIZE (alephone/AlephOne-20200904.tar.bz2) = 5567722
Index: 

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/09/12 12:39:59

Modified files:
games/nethack/3.4/pkg: PFRAG.no-no_x11 PLIST 
games/nethack/3.6/pkg: PFRAG.no-no_x11 PLIST 
Removed files:
games/nethack/3.4/pkg: PFRAG.no-qt-no-no_x11 
games/nethack/3.6/pkg: PFRAG.no-qt-no-no_x11 

Log message:
Unbreak nethack

- Move lib/X11/app-defaults/NetHack-${V} to PFRAG.no-no_x11.
- Remove lib/X11/app-defaults/NetHack-${V} from PLIST
(My fault in the last commit).
- Remove PFRAG.no-qt-no-no_x11.

Checked: nethack-3.4.3p16 installs lib/X11/app-defaults/NetHack-3.4.3 an
nethack-3.4.3p16-no_x11 not.

Input form espie, Spotted by naddy, jasper, sorry for the noise.

Remove textproc/py-termcolor?

[Kurt Mosiejczuk]

py-termcolor has no consumers. There hasn't been a release since 2011 and
it's homepage is the PyPI page.

Anyone object to removing it?

--Kurt

UPDATE mail/mblaze 1.0 from MAINTAINER

[Lucas]

Hello ports@,

1.0 release of mblaze is out, with a bunch of stuff (taken from
NEWS.md):

* Caution! Backwards incompatible changes:
  * As a message name, `-` now refers to the message on the standard
input, and not the the previous message anymore.  Use `.-` to refer
to the previous message in a short way. The tools will print a
warning if you use `-` and the standard input comes from a TTY.
  * mpick: use the -F flag to read script files.
  * mpick: remove msglist support, use plain mmsg(7) arguments.
* Many mblaze tools now make use of pledge(2) on OpenBSD.
* add contrib/mcount, a tool to count mails
* mrep: use Reply-From configuration to find From header
* Many bug fixes.

Passes all the tests and I haven't ran into any pledge violations yet,
althought I haven't tested every individual command in the package.

-Lucas


Index: Makefile
===
RCS file: /home/cvs/ports/mail/mblaze/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile16 May 2020 22:16:40 -  1.11
+++ Makefile12 Sep 2020 16:39:13 -
@@ -2,7 +2,7 @@
 
 COMMENT =  set of Maildir utilities
 
-DISTNAME = mblaze-0.7
+DISTNAME = mblaze-1.0
 CATEGORIES =   mail
 
 HOMEPAGE = https://git.vuxu.org/mblaze/
Index: distinfo
===
RCS file: /home/cvs/ports/mail/mblaze/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo16 May 2020 22:16:40 -  1.7
+++ distinfo12 Sep 2020 16:39:23 -
@@ -1,2 +1,2 @@
-SHA256 (mblaze-0.7.tar.gz) = gE/rYlUaZFdLvxuA+t7nUavlZXyUIF+WyohPc509M/w=
-SIZE (mblaze-0.7.tar.gz) = 94775
+SHA256 (mblaze-1.0.tar.gz) = MWBh6NbPZFWpEQXFUGaWOPbgKIxTxxhfskKcVOgPIzU=
+SIZE (mblaze-1.0.tar.gz) = 95676

Re: UPDATE: sysutils/htop 2.2.0 => 3.0.0

[Ian Sutton]

On Sat, Sep 05, 2020 at 08:08:36AM +0200, Rafael Sadowski wrote:
> On Tue Sep 01, 2020 at 02:44:43PM +1000, Stephen Gregoratto wrote:
> > A fork[1] of htop has appeared, with blessings[2] from the original
> > developer. Downsides are that it uses GitHub archives, so GH_* stuff is
> > addded. I took the time to modify the patches to work on this release,
> > but since there were some substantial rewrites[3] I wonder if we should
> > drop them altogether.
> > 
> > [1] https://github.com/htop-dev/htop
> > [2] https://github.com/hishamhm/htop/issues/992#issuecomment-683286672
> > [3] The shortlog:
> > 
> > b92f62f Remove trailing whitespaces
> > dd33444 Clean up existing whitespace
> > 909bb86 Show N/A on unsupported platforms instead of 0KHz
> > 27fe307 Remove a few unnecessary #includes
> > 9197adf Fix CPU usage on OpenBSD
> > c34be41 Widen ST_UID (UID) column to 5 chars to allow UIDs > 
> > without breaking alignment Issue Github #841, Debian bug
> > #910492
> > ca1cce4 OpenBSD: make the STARTTIME column display correctly (#815)
> > c1fb585 OpenBSD: add environment reading support (#819)
> > 060aa2b remove wrongfix
> > 3d79c72 Update OpenBSD maximum PID
> > c005ffc Fix zero-index array bounds issue
> > 48b807b Fix CPU meters
> > -- 
> > Stephen Gregoratto
> 
> OK with a small trailing whitespace zap after "-g". Any maintainer
> feedback?
> 
> Rafael Sadowski
> 

whoops, missed this. everything looks good. i was wondering why my
patches from 2 years ago were suddenly getting merged upstream. good to
see someone has taken over the project. thanks for the bump

there's 3.0.1 now


Index: ports/sysutils/htop//Makefile
===
RCS file: /cvs/ports/sysutils/htop/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- ports/sysutils/htop//Makefile   11 Sep 2020 12:34:28 -  1.22
+++ ports/sysutils/htop//Makefile   12 Sep 2020 16:55:34 -
@@ -4,7 +4,7 @@ COMMENT =   interactive process viewer
 
 GH_ACCOUNT =   htop-dev
 GH_PROJECT =   htop
-GH_TAGNAME =   3.0.0
+GH_TAGNAME =   3.0.1
 
 CATEGORIES =   sysutils
 
@@ -35,6 +35,6 @@ MODPY_VERSION =   ${MODPY_DEFAULT_VERSION
 # htop has some bugs which take hours or days to reach.
 # Keep the symbols to give a chance to the user to get an useful coredump.
 MAKE_FLAGS =   AM_CPPFLAGS="-DDEBUG"
-DEBUG =-g 
+DEBUG =-g
 
 .include 
Index: ports/sysutils/htop//distinfo
===
RCS file: /cvs/ports/sysutils/htop/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- ports/sysutils/htop//distinfo   11 Sep 2020 12:34:28 -  1.4
+++ ports/sysutils/htop//distinfo   12 Sep 2020 16:55:34 -
@@ -1,2 +1,2 @@
-SHA256 (htop-3.0.0.tar.gz) = HAZh8K5fTih02iULYM1RXkrEwEFYMiGt/pXxDhjRpOY=
-SIZE (htop-3.0.0.tar.gz) = 179371
+SHA256 (htop-3.0.1.tar.gz) = hGUWS8CF9fGBPh0/bEubVr9MlcwSImpTZ+ZXlJSbAco=
+SIZE (htop-3.0.1.tar.gz) = 179925

ok ?

CVS: cvs.openbsd.org: ports

[Ian Sutton]

CVSROOT:/cvs
Module name:ports
Changes by: i...@cvs.openbsd.org2020/09/12 11:25:21

Modified files:
sysutils/htop  : Makefile distinfo 

Log message:
update to htop-3.0.1

ok rsadowski

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2020/09/12 11:12:41

Modified files:
x11/kde-applications/spectacle: Makefile 

Log message:
and bump for actual WANTLIB change

New: audio/py-fsb5 (was Re: NEW: py-unitypy - extractor for Unity projects, with deps)

[Kurt Mosiejczuk]

On Sat, Sep 05, 2020 at 05:45:09PM -0600, Thomas Frohwein wrote:

> I started using UnityPy for a project and it would be useful to see
> about adding it to ports. It essentially allows accessing the assets of
> Unity projects. I've included 4 of the 5 dependencies in the
> attachments: py-brotli, py-lz4, py-fsb5, py-texture2ddecoder. The last
> one is py-Pillow and is already in ports.

Here's a tweaked py-fsb5 that has my ok to import. A little formatting work,
but mostly having it use the proper FLAVOR=python3 paradigm.

--Kurt


py-fsb5.tgz
Description: application/tar-gz

Re: New: archivers/py-brotli (was Re: NEW: py-unitypy - extractor for Unity projects, with deps)

[Kurt Mosiejczuk]

On Sat, Sep 12, 2020 at 12:57:41PM -0400, Kurt Mosiejczuk wrote:
> On Sat, Sep 05, 2020 at 05:45:09PM -0600, Thomas Frohwein wrote:

> > I started using UnityPy for a project and it would be useful to see
> > about adding it to ports. It essentially allows accessing the assets of
> > Unity projects. I've included 4 of the 5 dependencies in the
> > attachments: py-brotli, py-lz4, py-fsb5, py-texture2ddecoder. The last
> > one is py-Pillow and is already in ports.

> > A relatively simple example is on the project GitHub page:
> > https://github.com/K0lb3/UnityPy#example

> > I've tested this and it works, and will probably be using it regularly
> > in the near future.

> > Some notes on the ports:
> > - py-brotli build a bundled version and doesn't provide a way that I
> >   could find to link to system libs from archivers/brotli.

> Here's a version of archivers/py-brotli I'm happier with. It's got a better
> DESCR, and can run the tests if they are copied into place. (I've opened a
> pull request upstream to include them in future).

A quick correction on this, it didn't have a HOMEPAGE before. I've added
one now.

--Kurt


py-brotli.tgz
Description: application/tar-gz

New: archivers/py-brotli (was Re: NEW: py-unitypy - extractor for Unity projects, with deps)

[Kurt Mosiejczuk]

On Sat, Sep 05, 2020 at 05:45:09PM -0600, Thomas Frohwein wrote:

> I started using UnityPy for a project and it would be useful to see
> about adding it to ports. It essentially allows accessing the assets of
> Unity projects. I've included 4 of the 5 dependencies in the
> attachments: py-brotli, py-lz4, py-fsb5, py-texture2ddecoder. The last
> one is py-Pillow and is already in ports.

> A relatively simple example is on the project GitHub page:
> https://github.com/K0lb3/UnityPy#example

> I've tested this and it works, and will probably be using it regularly
> in the near future.

> Some notes on the ports:
> - py-brotli build a bundled version and doesn't provide a way that I
>   could find to link to system libs from archivers/brotli.

Here's a version of archivers/py-brotli I'm happier with. It's got a better
DESCR, and can run the tests if they are copied into place. (I've opened a
pull request upstream to include them in future).

--Kurt



py-brotli.tgz
Description: application/tar-gz

Re: NEW: kitty - a GPU-accelerated terminal emulator

[bijan]

On 9/6/20 1:39 AM, Thomas Frohwein wrote:

Hi,

Please find attached a new port of kitty. Kitty is a terminal emulator
for X11. The main distinguishing feature from others in ports is that
it uses OpenGL acceleration. It's written in C11 and python. I've been
using it for a few days without any issues.

Notes about the port:
- configuration: https://sw.kovidgoyal.net/kitty/conf.html
- When I ran it a few months ago on radeon (with HD 6870), selecting
   text with the mouse didn't work correctly. It would only select a few
   characters and not extend the selection beyond that. I'm now running
   it on an Intel Coffeelake without any such issues.
- I couldn't get the use of audio/libcanberra via dlopen(3) to work.
   Therefore, a patch that reverts it to dynamically linking to the
   library is included.
- Otherwise, patches are just dealing with routine stuff - working
   around procfs, and disabling hardcoded optimization flags.

ok to import? comments?



Hi,

I am using the port for a few days and I just loved it. Actually 
switched from st{,-term} to kitty for my daily routines and it works 
pretty good. Hope it will gets into the ports very soon.


Thank you for your work

Cheers,

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2020/09/12 10:11:24

Modified files:
x11/kde-applications/spectacle: Makefile 

Log message:
Restore REVISION.  Spectacle has its own VERSION, independent of the
KDE Applications update.

[New] archivers/py-lz4

[Kurt Mosiejczuk]

This package provides python bindings for the LZ4 compression library.
The bindings provided in this package cover the frame format, the
block format, and the streaming format specifications. The frame
format bindings are the recommended ones to use, as this guarantees
interoperability with other implementations and language bindings.

All but one of some almost 30k tests pass. The one that fails tries to
allocate a massive amount of memory.

While I had this pending (trying to figure out which port I needed this
for) I was reviewing ports and saw that thfr had a version of this for
his py-unitypy port. I integrated his patch to eliminate -O3 and the
call for py-pkgconfig, but kept my cleaned up version. (His used
MODPY_DEFAULT_VERSION_3 and missed a BUILD_DEPENDS on py-setuptools_scm).

ok to import?

--Kurt


py-lz4.tgz
Description: application/tar-gz

Re: [Update] devel/py-pathspec : Update to 0.8.0

[Kurt Mosiejczuk]

On Tue, Sep 08, 2020 at 08:36:46AM +, wen heping wrote:
> Hi, ports@:

>Here is a simple patch for devel/py-pathspec to update to 0.8.0.
> It build well and pass all tests on amd64-current system.
>One port depends on it : devel/py-yamllint. It build well and pass
> all tests too.

> Cheers !
> wen

Committed with tweaks to have it use MODPY_PYTEST

Thanks!

--Kurt

> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/py-pathspec/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile  3 Jul 2020 21:12:47 -   1.5
> +++ Makefile  8 Sep 2020 08:33:07 -
> @@ -2,10 +2,9 @@
>  
>  COMMENT =utility for gitignore style pattern matching of file paths
>  
> -MODPY_EGG_VERSION = 0.5.9
> +MODPY_EGG_VERSION = 0.8.0
>  DISTNAME =   pathspec-${MODPY_EGG_VERSION}
>  PKGNAME =py-${DISTNAME}
> -REVISION =   1
>  
>  CATEGORIES = devel
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/py-pathspec/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo  22 Jan 2019 11:18:53 -  1.2
> +++ distinfo  8 Sep 2020 08:33:07 -
> @@ -1,2 +1,2 @@
> -SHA256 (pathspec-0.5.9.tar.gz) = VKXquJXYnzQrUror/+cJMO+fjZbjmMzPUw0h+gUWqHM=
> -SIZE (pathspec-0.5.9.tar.gz) = 25473
> +SHA256 (pathspec-0.8.0.tar.gz) = 2kUXPrOm8qWkh++6IfBQrytBlIvmq1K2oeP/IruLcGE=
> +SIZE (pathspec-0.8.0.tar.gz) = 26256

CVS: cvs.openbsd.org: ports

[Kurt Mosiejczuk]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/09/12 09:50:11

Modified files:
devel/py-pathspec: Makefile distinfo 

Log message:
Update devel/py-pathspec 0.5.9 -> 0.8.0

>From Wen Heping - thanks again

With tweaks by me to have it use MODPY_PYTEST

Re: Update: textproc/py-emoji to 0.6.0

[Kurt Mosiejczuk]

On Tue, Aug 11, 2020 at 05:24:24PM -0400, Pamela Mosiejczuk wrote:
> On Tue, Aug 11, 2020 at 04:48:49PM -0400, Pamela Mosiejczuk wrote:

> > Update for multiple minor fixes and removal of consumerless python 2 flavor.
> > This version adds a "variant" selector, allowing specification of text or 
> > emoji
> > variant form (VS15 or VS16).

> > The removed patches have since been upstreamed. Passes all tests.

> > OK?
> > Pamela

> Oops, now with plist tweaking for flavor removal. (Hopefully).

ok kmos

--Kurt

> Index: Makefile
> ===
> RCS file: /home/cvs/ports/textproc/py-emoji/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile  3 Jul 2020 21:13:14 -   1.7
> +++ Makefile  9 Aug 2020 00:47:29 -
> @@ -2,10 +2,9 @@
>  
>  COMMENT =emoji for Python
>  
> -MODPY_EGG_VERSION =  0.5.4
> +MODPY_EGG_VERSION =  0.6.0
>  DISTNAME =   emoji-${MODPY_EGG_VERSION}
>  PKGNAME =py-${DISTNAME}
> -REVISION =   0
>  
>  CATEGORIES = textproc
>  
> @@ -22,6 +21,6 @@ MODPY_PI =  Yes
>  MODPY_PYTEST =   Yes
>  
>  FLAVORS =python3
> -FLAVOR ?=
> +FLAVOR = python3
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/textproc/py-emoji/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo  7 Nov 2019 09:23:53 -   1.3
> +++ distinfo  9 Aug 2020 00:16:04 -
> @@ -1,2 +1,2 @@
> -SHA256 (emoji-0.5.4.tar.gz) = YGUtOi3O5bivissJfDF3b7bYCAJ663Ihgw9yza/vwXQ=
> -SIZE (emoji-0.5.4.tar.gz) = 43402
> +SHA256 (emoji-0.6.0.tar.gz) = 5C2k+NZI+O8QaRvCRvaCoexrGDc6v9m+EOwLOYgjvRE=
> +SIZE (emoji-0.6.0.tar.gz) = 51003
> Index: patches/patch-setup_cfg
> ===
> RCS file: patches/patch-setup_cfg
> diff -N patches/patch-setup_cfg
> --- patches/patch-setup_cfg   11 Nov 2019 00:40:45 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,16 +0,0 @@
> -$OpenBSD: patch-setup_cfg,v 1.1 2019/11/11 00:40:45 kmos Exp $
> -
> -Remove unneeded py-nose
> -
> -Index: setup.cfg
>  setup.cfg.orig
> -+++ setup.cfg
> -@@ -1,8 +1,3 @@
> --[nosetests]
> --verbosity = 3
> --cover-package = emoji
> --cover-erase = 1
> --
> - [egg_info]
> - tag_build = 
> - tag_date = 0
> Index: patches/patch-setup_py
> ===
> RCS file: patches/patch-setup_py
> diff -N patches/patch-setup_py
> --- patches/patch-setup_py11 Nov 2019 00:40:45 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-setup_py,v 1.1 2019/11/11 00:40:45 kmos Exp $
> -
> -Remove unneeded py-nose
> -
> -Index: setup.py
>  setup.py.orig
> -+++ setup.py
> -@@ -59,7 +59,6 @@ setup(
> - keywords=['emoji'],
> - extras_require={
> - 'dev': [
> --'nose',
> - 'coverage',
> - 'coveralls'
> - ]
> Index: patches/patch-tests_test_core_py
> ===
> RCS file: patches/patch-tests_test_core_py
> diff -N patches/patch-tests_test_core_py
> --- patches/patch-tests_test_core_py  11 Nov 2019 00:40:45 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,15 +0,0 @@
> -$OpenBSD: patch-tests_test_core_py,v 1.1 2019/11/11 00:40:45 kmos Exp $
> -
> -Remove unneeded py-nose
> -
> -Index: tests/test_core.py
>  tests/test_core.py.orig
> -+++ tests/test_core.py
> -@@ -9,7 +9,6 @@ Unittests for emoji.core
> - from __future__ import unicode_literals
> - 
> - import emoji
> --from nose.tools import assert_raises
> - 
> - 
> - def test_emojize_name_only():
> Index: pkg/PLIST
> ===
> RCS file: /home/cvs/ports/textproc/py-emoji/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST 26 Apr 2019 18:25:54 -  1.1.1.1
> +++ pkg/PLIST 11 Aug 2020 21:15:52 -
> @@ -1,4 +1,6 @@
>  @comment $OpenBSD: PLIST,v 1.1.1.1 2019/04/26 18:25:54 kmos Exp $
> +@pkgpath textproc/py-emoji
> +@conflict py-emoji-*
>  lib/python${MODPY_VERSION}/site-packages/emoji/
>  
> lib/python${MODPY_VERSION}/site-packages/emoji-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>  
> lib/python${MODPY_VERSION}/site-packages/emoji-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> 

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 09:33:31

Modified files:
net: Makefile 
Removed files:
net/apache-activemq: Makefile distinfo 
net/apache-activemq/files: activemq.conf 
net/apache-activemq/patches: patch-bin_activemq 
net/apache-activemq/pkg: DESCR PLIST activemq.rc 

Log message:
remove apache-activemq; it's not directly used by any ports, it's not been
updated in 3 years and as such there are a bunch of unfixed security issues.
do everyone a service and just drop it. rabbitmq can be used as an alternative.

ok kmos@

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 09:33:51

Modified files:
infrastructure/db: user.list 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
mop up after apache-activemq removal

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 09:30:02

Modified files:
sysutils/ruby-puppet/5: Makefile 
sysutils/ruby-puppet/6: Makefile 
sysutils/ruby-puppet/pkg: README 

Log message:
remove mentions of the activemq package from the readme for it's going away.

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 08:37:23

Modified files:
security   : Makefile 

Log message:
+tls-attacker

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 08:36:14

Log message:
import tls-attacker-3.5.0

TLS-Attacker is a Java-based framework for analyzing TLS libraries.

with and ok tb@

Status:

Vendor Tag: jasper
Release Tags:   jasper_20201209

N ports/security/tls-attacker/Makefile
N ports/security/tls-attacker/distinfo
N ports/security/tls-attacker/pkg/README
N ports/security/tls-attacker/pkg/DESCR
N ports/security/tls-attacker/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Brian Callahan]

CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2020/09/12 08:01:22

Modified files:
sysutils/diffoscope: Makefile distinfo 
sysutils/diffoscope/pkg: PLIST 

Log message:
Update to diffoscope-160

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 06:47:01

Modified files:
net/zabbix : Makefile distinfo 
net/zabbix/patches: patch-configure 
patch-src_zabbix_agent_cpustat_c 

Log message:
bugfix update to zabbix-5.0.3

https://www.zabbix.com/rn/rn5.0.3

ok robert@ (MAINTAINER)

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 06:45:52

Modified files:
devel/pkgconfig: Makefile 

Log message:
switch homepage and master_sites to https

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/09/12 06:40:10

Modified files:
x11/kde-applications/kitinerary/patches: 
 patch-src_pdf_pdfdocument_cpp 
 
patch-src_pdf_pdfextractoroutputdevice_cpp 
 patch-src_pdf_pdfimage_cpp 
 
patch-src_pdf_popplerglobalparams_cpp 
 patch-src_pdf_popplertypes_p_h 
 patch-src_pdf_popplerutils_cpp 

Log message:
Unbreak kitinerary patches from kili@

Broken by the 20.08.1 update

Spotted by sthen@, Thanks!

CVS: cvs.openbsd.org: ports

[Martijn van Duren]

CVSROOT:/cvs
Module name:ports
Changes by: mart...@cvs.openbsd.org 2020/09/12 06:27:56

Modified files:
mail/opensmtpd-filters/dkimsign: Makefile distinfo 

Log message:
Add support for multiple domains by looking at the first mailbox from the
"from" mailheader.

Tested by me and Uwe Werler (uwe  werler  retiolum  eu)
"Go for it!" jasper@

Re: CVS: cvs.openbsd.org: ports

[Stuart Henderson]

On 2020/09/11 05:23, Rafael Sadowski wrote:
>   x11/kde-applications/kitinerary: distinfo 

Please, check your commits for extra/missing files, just
running "cvs -d cvs.openbsd.org:/cvs up -PdA" after committing
should make it obvious

--
Patching file src/pdf/popplerglobalparams.cpp using Plan A...
Hunk #1 succeeded at 22 (offset -11 lines).
done
===>   Applying OpenBSD patch patch-src_pdf_popplertypes_p_h
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-src_pdf_popplertypes_p_h,v 1.1 2020/09/09 20:13:27 kili Exp $
|
|Starting with poppler-20, POPPLER_VERSION no longer is numeric -- it's
|what POPPLER_VERSION_STRING was in earlier releases.
|
|Index: src/pdf/popplertypes_p.h
|--- src/pdf/popplertypes_p.h.orig
|+++ src/pdf/popplertypes_p.h
--
Patching file src/pdf/popplertypes_p.h using Plan A...
No such line 22 in input file, ignoring
Hunk #1 failed at 21.
1 out of 1 hunks failed--saving rejects to src/pdf/popplertypes_p.h.rej
done
***>   patch-src_pdf_popplertypes_p_h did not apply cleanly
===>   Applying OpenBSD patch patch-src_pdf_popplerutils_cpp
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-src_pdf_popplerutils_cpp,v 1.1 2020/09/09 20:13:27 kili Exp $
|
|Starting with poppler-20, POPPLER_VERSION no longer is numeric -- it's
|what POPPLER_VERSION_STRING was in earlier releases.
|
|Index: src/pdf/popplerutils.cpp
|--- src/pdf/popplerutils.cpp.orig
|+++ src/pdf/popplerutils.cpp
--
Patching file src/pdf/popplerutils.cpp using Plan A...
Hunk #1 succeeded at 75 (offset -11 lines).
done
===>   Failed patches: 
patch-src_pdf_pdfdocument_cpp
patch-src_pdf_popplertypes_p_h

*** Error 1 in x11/kde-applications/kitinerary 
(/usr/ports/infrastructure/mk/bsd.port.mk:2800 
'/pobj/kitinerary-20.08.0/.patch_done': @if cd...)
*** Error 2 in x11/kde-applications/kitinerary 
(/usr/ports/infrastructure/mk/bsd.port.mk:2584 'patch': 
@lock=kitinerary-20.08.0;  export _LO...)
===> Exiting x11/kde-applications/kitinerary with an error
*** Error 1 in /usr/ports (infrastructure/mk/bsd.port.subdir.mk:137 'patch': @: 
${echo_msg:=echo};  : ${target:=patch};  for i in ; do  eval...)
>>> Ended at 1599878868.49
max_stuck=4.03/depends=4.12/show-prepare-results=1.75/patch=0.53
Error: job failed with 512 on i386-3 at 1599878868

Re: ncmpcpp dumps core when fetching lyrics

[Stuart Henderson]

On 2020/09/12 12:36, Erling Westenvik wrote:
> On Fri, Sep 11, 2020 at 10:09:25PM +0100, Stuart Henderson wrote:
> > [moving to ports@openbsd.org list]
> > On 2020-09-11, Ashlen  wrote:
> > > Sorry Stuart, I think I accidentally replied to you directly the first
> > > time I sent this. I'm still getting used to neomutt.
> > 
> > No problem, for mailing lists you usually want 'group-reply'
> > (by default this is bound to 'g' in mutt/neomutt).
> 
> And I accidentally sent my previous reply as 'list-reply' ('L') to @misc..
> 
> > This is likely a bug in ncmpcpp. Not sure if it's the same
> > thing but I found https://github.com/ncmpcpp/ncmpcpp/issues/394
> > which referenced https://github.com/ncmpcpp/ncmpcpp/issues/396
> > so I think the first step is to try a newer version.
> > Here's a ports diff to update it to git head, it builds OK but
> > I don't have any mpd setup so no idea how well/if it works.
> 
> Thanks for the diff. Ncmpcpp still crashes when trying to fetch lyrics though.
> Gdb output with last version and after rebuilding with debug flags:

Since the problem still exists in git head, I think it would be worth
reporting this upstream.

> [...]
> Program terminated with signal SIGBUS, Bus error.
> #0  _libc_pthread_mutex_unlock (mutexp=) at 
> /usr/src/lib/libc/thread/rthread_mutex.c:246
> 246 (void *)mutex->owner);
> (gdb) bt
> #0  _libc_pthread_mutex_unlock (mutexp=) at 
> /usr/src/lib/libc/thread/rthread_mutex.c:246
> #1  0x0f7389525277 in std::__1::__libcpp_mutex_unlock (__m=0xf73b8ff2d18) 
> at /usr/src/lib/libcxx/include/__threading_support:266
> #2  std::__1::mutex::unlock (this=0xf73b8ff2d18) at 
> /usr/src/lib/libcxx/src/mutex.cpp:45
> #3  0x0f713119422d in 
> std::__1::unique_lock::~unique_lock (this=) 
> at /usr/include/c++/v1/__mutex_base:153
> #4  Shared >::Resource::~Resource (this= out>) at ./utility/shared_resource.h:29
> #5  Lyrics::update (this=0xf740afb5c00) at screens/lyrics.cpp:236
> #6  0x0f71311f2215 in std::__1::__function::__value_func (BaseScreen*)>::operator()(BaseScreen*&&) const (this=0x7f7d4500,
> __args=) at /usr/include/c++/v1/functional:1799
> #7  std::__1::function::operator()(BaseScreen*) const 
> (this=0x7f7d4500, __arg=0xf740afb5c00) at 
> /usr/include/c++/v1/functional:2347
> #8  applyToVisibleWindows(std::__1::function) (f=...) at 
> screens/screen.cpp:135
> #9  0x0f71312d8ad8 in Status::trace (update_timer=, 
> update_window_timeout=) at status.cpp:236
> #10 0x0f7131249a13 in Actions::UpdateEnvironment::run 
> (this=0x7f7d48c8, update_timer=24, refresh_window=, 
> mpd_sync=)
> at actions.cpp:338
> #11 0x0f71312ae220 in main (argc=, argv=) 
> at ncmpcpp.cpp:217
> (gdb)
> 
> Erling

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/09/12 05:13:47

Modified files:
sysutils/consul: Makefile distinfo 

Log message:
Update to consul-1.8.4.

Re: ncmpcpp dumps core when fetching lyrics

[Erling Westenvik]

On Fri, Sep 11, 2020 at 10:09:25PM +0100, Stuart Henderson wrote:
> [moving to ports@openbsd.org list]
> On 2020-09-11, Ashlen  wrote:
> > Sorry Stuart, I think I accidentally replied to you directly the first
> > time I sent this. I'm still getting used to neomutt.
> 
> No problem, for mailing lists you usually want 'group-reply'
> (by default this is bound to 'g' in mutt/neomutt).

And I accidentally sent my previous reply as 'list-reply' ('L') to @misc..

> This is likely a bug in ncmpcpp. Not sure if it's the same
> thing but I found https://github.com/ncmpcpp/ncmpcpp/issues/394
> which referenced https://github.com/ncmpcpp/ncmpcpp/issues/396
> so I think the first step is to try a newer version.
> Here's a ports diff to update it to git head, it builds OK but
> I don't have any mpd setup so no idea how well/if it works.

Thanks for the diff. Ncmpcpp still crashes when trying to fetch lyrics though.
Gdb output with last version and after rebuilding with debug flags:

[...]
Program terminated with signal SIGBUS, Bus error.
#0  _libc_pthread_mutex_unlock (mutexp=) at 
/usr/src/lib/libc/thread/rthread_mutex.c:246
246 (void *)mutex->owner);
(gdb) bt
#0  _libc_pthread_mutex_unlock (mutexp=) at 
/usr/src/lib/libc/thread/rthread_mutex.c:246
#1  0x0f7389525277 in std::__1::__libcpp_mutex_unlock (__m=0xf73b8ff2d18) 
at /usr/src/lib/libcxx/include/__threading_support:266
#2  std::__1::mutex::unlock (this=0xf73b8ff2d18) at 
/usr/src/lib/libcxx/src/mutex.cpp:45
#3  0x0f713119422d in std::__1::unique_lock::~unique_lock 
(this=) at /usr/include/c++/v1/__mutex_base:153
#4  Shared >::Resource::~Resource (this=) 
at ./utility/shared_resource.h:29
#5  Lyrics::update (this=0xf740afb5c00) at screens/lyrics.cpp:236
#6  0x0f71311f2215 in std::__1::__function::__value_func::operator()(BaseScreen*&&) const (this=0x7f7d4500,
__args=) at /usr/include/c++/v1/functional:1799
#7  std::__1::function::operator()(BaseScreen*) const 
(this=0x7f7d4500, __arg=0xf740afb5c00) at 
/usr/include/c++/v1/functional:2347
#8  applyToVisibleWindows(std::__1::function) (f=...) at 
screens/screen.cpp:135
#9  0x0f71312d8ad8 in Status::trace (update_timer=, 
update_window_timeout=) at status.cpp:236
#10 0x0f7131249a13 in Actions::UpdateEnvironment::run (this=0x7f7d48c8, 
update_timer=24, refresh_window=, mpd_sync=)
at actions.cpp:338
#11 0x0f71312ae220 in main (argc=, argv=) at 
ncmpcpp.cpp:217
(gdb)

Erling

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/09/12 04:17:57

Modified files:
sysutils/awscli: Makefile distinfo 
sysutils/awscli/pkg: PLIST 

Log message:
Update to awscli-1.18.137.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/09/12 04:17:37

Modified files:
net/py-botocore: Makefile distinfo 
net/py-botocore/pkg: PLIST 

Log message:
Update to py3-botocore-1.17.60.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/09/12 04:17:20

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py3-boto3-1.14.60.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/09/12 04:08:46

Modified files:
devel/meson: Makefile distinfo meson.port.mk 

Log message:
Update to meson-0.55.3.

Fix thread stack base detection in devel/kf5/kjs

[Rafael Sadowski]

I think our current patch to unbreak currentThreadStackBase() is wrong.

pthread_stackseg_np(3):

 The pthread_stackseg_np() function returns information about the given
 thread's stack.  A stack_t is the same as a struct sigaltstack (see
 sigaltstack(2)) except the ss_sp variable points to the top of the stack
 instead of the base.

The old patch points to the TOP and not to the base(end) of the thread stack.

I see no regressions: 100% tests passed, 0 tests failed out of 1

Feedback, OK?

Rafael


Index: Makefile
===
RCS file: /cvs/ports/devel/kf5/kjs/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile23 Mar 2020 18:01:09 -  1.12
+++ Makefile12 Sep 2020 09:51:18 -
@@ -2,6 +2,7 @@
 
 COMMENT =  JavaScript/ECMAScript engine for KDE
 DISTNAME = kjs-${VERSION}
+REVISION = 0
 
 SHARED_LIBS =  KF5JS   5.0
 SHARED_LIBS += KF5JSApi5.0
Index: patches/patch-src_kjs_collector_cpp
===
RCS file: /cvs/ports/devel/kf5/kjs/patches/patch-src_kjs_collector_cpp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_kjs_collector_cpp
--- patches/patch-src_kjs_collector_cpp 7 Jun 2017 17:03:38 -   1.2
+++ patches/patch-src_kjs_collector_cpp 12 Sep 2020 09:51:18 -
@@ -8,9 +8,9 @@ Index: src/kjs/collector.cpp
  pthread_t thread = pthread_self();
  if (stackBase == nullptr || thread != stackThread) {
 +#if defined(__OpenBSD__)
-+stack_t sinfo;
-+pthread_stackseg_np(thread, );
-+stackBase = sinfo.ss_sp;
++stack_t ss;
++pthread_stackseg_np(thread, );
++stackBase = (void*)((size_t) ss.ss_sp - ss.ss_size);
 +#else
  pthread_attr_t sattr;
  #if HAVE_PTHREAD_NP_H || defined(__NetBSD__)

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 03:30:00

Modified files:
devel/maven: Makefile distinfo 
devel/maven/pkg: PLIST 

Log message:
update to maven-3.6.3

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/09/12 03:28:26

Modified files:
x11/gnome/librsvg: Makefile distinfo 

Log message:
Update to librsvg-2.50.0.

CVS: cvs.openbsd.org: ports

[Anton Lindqvist]

CVSROOT:/cvs
Module name:ports
Changes by: an...@cvs.openbsd.org   2020/09/12 02:58:27

Modified files:
mail/mdsort: Makefile distinfo 

Log message:
update to mdsort-6.0.0

- unfold header values into a single space separated line, according to
RFC 2822
- add support for macros to configuration

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 02:47:38

Modified files:
devel/radare2/main: Makefile distinfo 
devel/radare2/main/patches: patch-libr_Makefile 

Log message:
update to radare2-4.5.1

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 02:47:43

Modified files:
devel/cutter   : Makefile distinfo 

Log message:
update to cutter-1.12.0

Fix cmGeneratorTarget_cxx in devel/cmake

[Rafael Sadowski]

There is a mistake in the cmGeneratorTarget_cxx patch (Surely from me).
This creates a wrong scope. "this->IsFrameworkOnApple()" is present
twice and the first one adds a wrong bracket which creates a scope to
the end of the whole function. THIS IS WRONG.

Maybe this triggers our random issues with cmake, maybe not but this
should go in?

Rafael

Index: Makefile
===
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.185
diff -u -p -u -p -r1.185 Makefile
--- Makefile26 May 2020 15:15:09 -  1.185
+++ Makefile12 Sep 2020 08:01:09 -
@@ -8,7 +8,7 @@ VER =   3.17.2
 EPOCH =0
 DISTNAME = cmake-${VER}
 CATEGORIES =   devel
-REVISION = 0
+REVISION = 1
 
 HOMEPAGE = https://www.cmake.org/
 
Index: patches/patch-Source_cmGeneratorTarget_cxx
===
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 patch-Source_cmGeneratorTarget_cxx
--- patches/patch-Source_cmGeneratorTarget_cxx  25 May 2020 05:12:00 -  
1.13
+++ patches/patch-Source_cmGeneratorTarget_cxx  12 Sep 2020 08:01:09 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-Source_cmGeneratorTarget
 Index: Source/cmGeneratorTarget.cxx
 --- Source/cmGeneratorTarget.cxx.orig
 +++ Source/cmGeneratorTarget.cxx
-@@ -4154,9 +4154,16 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
+@@ -4154,9 +4154,15 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
// Check for library version properties.
const char* version = this->GetProperty("VERSION");
const char* soversion = this->GetProperty("SOVERSION");
@@ -13,14 +13,14 @@ Index: Source/cmGeneratorTarget.cxx
 +#else
if (!this->HasSOName(config) ||
this->Makefile->IsOn("CMAKE_PLATFORM_NO_VERSIONED_SONAME") ||
-   this->IsFrameworkOnApple()) {
+-  this->IsFrameworkOnApple()) {
 +  this->IsFrameworkOnApple())
 +#endif
 +  {
  // Versioning is supported only for shared libraries and modules,
  // and then only when the platform supports an soname flag.
  version = nullptr;
-@@ -4180,6 +4187,35 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
+@@ -4180,6 +4186,35 @@ cmGeneratorTarget::Names cmGeneratorTarget::GetLibrary
  
// The library name.
targetNames.Output = prefix + targetNames.Base + suffix;

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 02:24:45

Modified files:
x11/gnome/mutter: Makefile distinfo 

Log message:
update to mutter-3.36.6

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 02:24:46

Modified files:
x11/gnome/shell: Makefile distinfo 

Log message:
update to gnome-shell-3.36.6

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 02:16:39

Modified files:
x11/xkbcommon  : Makefile distinfo 
x11/xkbcommon/pkg: PLIST 
Removed files:
x11/xkbcommon/patches: patch-src_xkbcomp_parser_y 

Log message:
update to libxkbcommon-1.0.1

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 02:00:36

Modified files:
sysutils/py-pynetbox: Makefile distinfo 

Log message:
update to pynetbox-5.0.8

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 01:59:05

Modified files:
sysutils/py-ghmi: Makefile distinfo 

Log message:
update to py3-ghmi-1.5.18

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 01:57:05

Modified files:
sysutils/rofi  : Makefile distinfo 
sysutils/rofi/pkg: PLIST 
Removed files:
sysutils/rofi/patches: patch-source_dialogs_combi_c 
   patch-source_dialogs_script_c 

Log message:
update to rofi-1.6.0

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 01:43:27

Modified files:
net/zeromq : Tag: OPENBSD_6_7 Makefile 
Added files:
net/zeromq/patches: Tag: OPENBSD_6_7 
patch-src_decoder_allocators_hpp 

Log message:
apply fix for CVE-2020-15166

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 01:43:14

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

Log message:
add cvs entry for zeromq/CVE-2020-15166

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/09/12 01:42:52

Modified files:
net/zeromq : Makefile distinfo 
net/zeromq/pkg : PLIST 
Added files:
net/zeromq/patches: patch-tests_testutil_hpp 

Log message:
update to zeromq-4.3.3

among other changes, this addresses CVE-2020-15166
https://github.com/zeromq/libzmq/security/advisories/GHSA-fc3w-qxf5-7hp6