Re: NEW: x11/qt6

2021-04-18 Thread Rafael Sadowski
On Tue Apr 06, 2021 at 07:34:57AM +0200, Rafael Sadowski wrote:
> On Tue Mar 23, 2021 at 06:45:28AM +0100, Rafael Sadowski wrote:
> > Hi ports@
> > 
> > please find a attached Qt 6.0.2 as tarball. Qt6 is at an early point.
> > There are just a handful applications and none of them are ported to
> > OpenBSD. The following modules are currently available:
> > 
> >  - qttranslations
> >  - qttools
> >  - qtsvg
> >  - qtshadertools
> >  - qtquicktimeline
> >  - qtquickcontrols2
> >  - qtquick3d
> >  - qtdeclarative
> >  - qtbase
> >  - qt5compat
> > 
> >  - qtwayland (not ported)
> >  - qtdoc (not ported)
> > 
> > 
> > Further modules will follow in later Qt versions. However I think the
> > 6.0.2 port is ready to import. Some patches come form x11/qt5. With
> > tb@'s help, I married QtBase with LibreSSL again. We are now on our own
> > again as Gentoo no longer follows this path. From the port perspective,
> > I have decided on the following points:
> > 
> > - Prefix all Qt6 ports with qt6-*. This way we don't run into any
> >   conflicts and I think it's better than the naming-mix with qt5.
> >   - qt6-qtbase-6.0.2.tgz
> >   - qt6-qt5compat-6.0.2.tgz
> >   - qt6-qtdeclarative-6.0.2.tgz
> >   - qt6-qtquick3d-6.0.2.tgz
> >   - qt6-qtquickcontrols2-6.0.2.tgz
> >   - qt6-qtquicktimeline-6.0.2.tgz
> >   - qt6-qtshadertools-6.0.2.tgz
> >   - qt6-qtsvg-6.0.2.tgz
> >   - qt6-qttools-6.0.2.tgz
> >   - qt6-qttranslations-6.0.2.tgz
> > 
> > - Rename all imported qt tools with the -qt6 suffix like we do with qt5.
> >   This makes it easier to use several versions at the same time.
> > - x11/qt6 is based on x11/qt5. I have tried to make many things simpler
> >   and cleaner.
> > - Qt6 switched to cmake as build system and needs help with *FLAGS. The
> >   interesting part:
> > 
> > CXXFLAGS += -I${LOCALBASE}/include
> > LDFLAGS +=  -L${LOCALBASE}/lib -lc
> > 
> > CONFIGURE_ARGS +=   -DCMAKE_EXE_LINKER_FLAGS_INIT="${LDFLAGS}" \
> > -DCMAKE_MODULE_LINKER_FLAGS_INIT="${LDFLAGS}" \
> > -DCMAKE_SHARED_LINKER_FLAGS_INIT="${LDFLAGS}"
> > 
> > *_INIT  should not overwrite existing flags.
> > 
> > I think those were the exciting parts. Reviews welcome!
> > 
> > As it does not yet have a consumer, I would like to import it.
> > 
> > Rafael Sadowski
> 
> FYI, survived an amd64 bulk build.
> 

Ping :)



Re: NEW: sysutils/openbsdisks2 - UDisks2 service implementation for OpenBSD

2021-04-18 Thread Rafael Sadowski
On Mon Apr 05, 2021 at 04:22:27PM +0200, Rafael Sadowski wrote:
> On Sun Mar 28, 2021 at 08:58:22PM +0200, Rafael Sadowski wrote:
> > On Sat Mar 27, 2021 at 09:29:14AM +0100, Rafael Sadowski wrote:
> > > Hi ports@,
> > > 
> > > I would like to introduce a small minimalist UDisks2 service
> > > implementation for OpenBSD to you. It is a more or less complete rework
> > > of FreeBSD's (bsdutils/bsdisks).
> > > 
> > > Basic functions are available. The goal was to be able to list block
> > > devices under applications like KDE dolphin.
> > > 
> > > Feeback, opinions, tests and OKs are welcome!
> > > 
> > > Rafael Sadowski
> > > 
> > > Information for inst:openbsdisks2-0.1b
> > > 
> > > Comment:
> > > UDisks2 service implementation for OpenBSD
> > > 
> > > Description:
> > > An UDisks2 service implementation for OpenBSD forked from FreeBSD
> > > (bsdutils/bsdisks).
> > > 
> > > OpenBSDisks2 provides a simple DBus org.freedesktop.UDisks2 service.
> > > It only provides reading information on UDisks2.Drive, UDisks2.Block and
> > > UDisks2.Filesystem.
> > > 
> > > UDisks2 is an abstraction for enumerating disk and storage devices and
> > > performing operations on them.
> > > 
> > > Maintainer: Rafael Sadowski 
> > > 
> > > WWW: https://github.com/sizeofvoid/openbsdisks2
> > 
> > 
> > New version 0.2-beta and new tarball attached.
> 
> I would like to see this in 6.9. OK?
> 

Would someone so kind and could review the port from the port
perspective? I would love to import that. (post-lock)



Re: UPDATE: security/knockpy (missing bs4 issue)

2021-04-18 Thread Rafael Sadowski
On Tue Apr 06, 2021 at 07:28:42AM +0200, Rafael Sadowski wrote:
> I try to update knockpy to 5.0.0. Does anyone have a clue why knockpy 5
> can't find bs4 aka beautifulsoup4?
> 

I pointed out a bogus requirement entry in setup.py. In the meantime,
upstream has also noticed it and fixed it in the next release.

New 5.1.0 version with new dependencies.

OK?

Index: Makefile
===
RCS file: /cvs/ports/security/knockpy/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- Makefile23 Feb 2021 19:39:38 -  1.6
+++ Makefile18 Apr 2021 19:57:33 -
@@ -2,15 +2,14 @@
 
 COMMENT =  subdomain scanner
 
-MODPY_EGG_VERSION =4.1
-VERSION =  4.1.0
-REVISION = 0
+VERSION =  5.1.0
+MODPY_EGG_VERSION =5.1
 
 DISTNAME = knockpy-${VERSION}
 
 GH_ACCOUNT =   guelfoweb
 GH_PROJECT =   knock
-GH_TAGNAME =   ${VERSION}
+GH_TAGNAME =   ${VERSION}
 
 CATEGORIES =   security
 
@@ -20,15 +19,14 @@ MAINTAINER =Rafael Sadowski 
Index: distinfo
===
RCS file: /cvs/ports/security/knockpy/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- distinfo3 Nov 2017 21:22:02 -   1.3
+++ distinfo18 Apr 2021 19:57:33 -
@@ -1,2 +1,2 @@
-SHA256 (knockpy-4.1.0.tar.gz) = PTeM5IK88LpXrOZemdzEduld6ZMO9uAaXsJZQlI9Ypw=
-SIZE (knockpy-4.1.0.tar.gz) = 14197
+SHA256 (knockpy-5.1.0.tar.gz) = 0RO27pgZIqa6aOk3KWew/zQQESxUy8E/h9z4QxI6Es8=
+SIZE (knockpy-5.1.0.tar.gz) = 27829
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/knockpy/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST   3 Nov 2017 21:22:02 -   1.3
+++ pkg/PLIST   18 Apr 2021 19:57:33 -
@@ -1,31 +1,17 @@
 @comment $OpenBSD: PLIST,v 1.3 2017/11/03 21:22:02 rsadowski Exp $
 bin/knockpy
 lib/python${MODPY_VERSION}/site-packages/knockpy/
-lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/knockpy-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/knockpy-5.1.0-py${MODPY_VERSION}.egg-info/
+lib/python${MODPY_VERSION}/site-packages/knockpy-5.1.0-py${MODPY_VERSION}.egg-info/PKG-INFO
+lib/python${MODPY_VERSION}/site-packages/knockpy-5.1.0-py${MODPY_VERSION}.egg-info/SOURCES.txt
+lib/python${MODPY_VERSION}/site-packages/knockpy-5.1.0-py${MODPY_VERSION}.egg-info/dependency_links.txt
+lib/python${MODPY_VERSION}/site-packages/knockpy-5.1.0-py${MODPY_VERSION}.egg-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/knockpy-5.1.0-py${MODPY_VERSION}.egg-info/requires.txt
+lib/python${MODPY_VERSION}/site-packages/knockpy-5.1.0-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/knockpy/__init__.py
-lib/python${MODPY_VERSION}/site-packages/knockpy/__init__.pyc
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/knockpy/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/knockpy/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/knockpy/${MODPY_PYCACHE}knockpy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/knockpy/config.json
 lib/python${MODPY_VERSION}/site-packages/knockpy/knockpy.py
-lib/python${MODPY_VERSION}/site-packages/knockpy/knockpy.pyc
-lib/python${MODPY_VERSION}/site-packages/knockpy/modules/
-lib/python${MODPY_VERSION}/site-packages/knockpy/modules/__init__.py
-lib/python${MODPY_VERSION}/site-packages/knockpy/modules/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/knockpy/modules/header.py
-lib/python${MODPY_VERSION}/site-packages/knockpy/modules/header.pyc
-lib/python${MODPY_VERSION}/site-packages/knockpy/modules/resolve.py
-lib/python${MODPY_VERSION}/site-packages/knockpy/modules/resolve.pyc
-lib/python${MODPY_VERSION}/site-packages/knockpy/modules/save_report.py
-lib/python${MODPY_VERSION}/site-packages/knockpy/modules/save_report.pyc
-lib/python${MODPY_VERSION}/site-packages/knockpy/modules/virustotal_subdomains.py
-lib/python${MODPY_VERSION}/site-packages/knockpy/modules/virustotal_subdomains.pyc
-lib/python${MODPY_VERSION}/site-packages/knockpy/modules/wildcard.py
-lib/python${MODPY_VERSION}/site-packages/knockpy/modules/wildcard.pyc
-lib/pytho

Re: unbreak games/supertux [Was: Re: games/supertux startup error]

2021-04-18 Thread Marcus MERIGHI
Hello!

Works for me, thank you!

I removed sthen@'s patches by removing games/supertux and running "cvs
up". Then I applied your patch and 
"make PKG_CREATE_NO_CHECKS=Yes package" 
got me a working package.

Marcus

n...@berkeley.edu (Nam Nguyen), 2021.04.17 (Sat) 15:08 (CEST):
> Here is a diff for unbreaking games/supertux, which segfaults on
> startup. I opened an issue explaining the bug here:
> https://github.com/SuperTux/supertux/issues/1726
> 
> I bisected and found a commit from 2.0.10 that caused this segfault:
> https://github.com/libsdl-org/SDL/commit/670f3d3327912b299e8e5ea9de4f01bd833414cc
> 
> It reads out of bounds memory due to usage of SIMD functions since SDL
> 2.0.10. My workaround is to make the resolution larger for the affected
> image. I get the same backtrace on startup.
> 
> Tests and feedback are welcome. OK? I would like to get this in to
> unbreak games/supertux, but it is almost ports lock.
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/supertux/Makefile,v
> retrieving revision 1.23
> diff -u -p -u -p -r1.23 Makefile
> --- Makefile  25 Feb 2021 22:26:02 -  1.23
> +++ Makefile  17 Apr 2021 12:34:44 -
> @@ -5,7 +5,10 @@ COMMENT =jump 'n' run game
>  V =  0.6.0
>  DISTNAME =   SuperTux-v${V}-Source
>  PKGNAME =supertux-$V
> -REVISION =   2
> +REVISION =   3
> +
> +DISTFILES += ${DISTNAME}${EXTRACT_SUFX}
> +DISTFILES += tux-statue${EXTRACT_SUFX}:0
>  
>  CATEGORIES = games
>  
> @@ -22,6 +25,7 @@ WANTLIB += c curl freetype m ogg openal 
>  WANTLIB += z
>  
>  MASTER_SITES =   
> https://github.com/SuperTux/supertux/releases/download/v${V}/
> +MASTER_SITES0 =  https://namtsui.com/source/
>  
>  FIX_CRLF_FILES = external/squirrel/CMakeLists.txt
>  
> @@ -46,5 +50,7 @@ NO_TEST =   Yes
>  
>  pre-configure:
>   ${SUBST_CMD} ${WRKSRC}/src/supertux/main.cpp
> +# fixes segfault. see: https://github.com/SuperTux/supertux/issues/1726
> + @mv ${WRKDIR}/tux-statue.png ${WRKSRC}/data/images/tiles/doodads
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/supertux/distinfo,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 distinfo
> --- distinfo  4 Feb 2019 10:02:07 -   1.4
> +++ distinfo  17 Apr 2021 12:34:44 -
> @@ -1,2 +1,4 @@
>  SHA256 (SuperTux-v0.6.0-Source.tar.gz) = 
> xMPl+m+Q6HuMWtayKheempg5v5l+fyGeIrvNHJciOsA=
> +SHA256 (tux-statue.tar.gz) = pklNyse27KSCvf8xR41Y4DQ8OCJQu36Z2PtooYJ1Ad4=
>  SIZE (SuperTux-v0.6.0-Source.tar.gz) = 131203604
> +SIZE (tux-statue.tar.gz) = 10385
> 



Re: dpb: Patch to suprress errors seen with dpb -I

2021-04-18 Thread Preben Guldberg
Marc Espie wrote:
> On Tue, Apr 06, 2021 at 08:49:10PM +0200, Marc Espie wrote:
> > On Sun, Apr 04, 2021 at 09:56:49PM +0200, Preben Guldberg wrote:
> > > Below is a patch that suppresses errors I get when running dpb with -I:

> > > Use of uninitialized value $ts in sprintf at 
> > > /usr/ports/infrastructure/lib/DPB/Util.pm line 58.
> > > DPB::Util::ts2string(DPB::Util, ) called at 
> > > /usr/ports/infrastructure/lib/DPB/Job/Port.pm line 1107
> > > 
> > > DPB::Job::BasePort::timings(DPB::Job::Port::Install=HASH(0xf3c120630d0)(sysutils/iwatch))
> > >  called at /usr/ports/infrastructure/lib/DPB/Job/Port.pm line 964
> > > 
> > > DPB::Job::BasePort::__ANON__(DPB::Core=HASH(0xf3c1203be38)(localhost:sysutils/iwatch))
> > >  called at /usr/ports/infrastructure/lib/DPB/Job.pm line 189
> > > 
> > > DPB::Job::Normal::finalize(DPB::Job::Port::Install=HASH(0xf3c120630d0)(sysutils/iwatch),
> > >  DPB::Core=HASH(0xf3c1203be38)(localhost:sysutils/iwatch)) called at /
> > > [... snip - longer example at the end ...]

> Previous patch was a brainfart, I had somehow refactored the code in
> the wrong base class (e.g., not a base class at all)

> Setting a watched uniformously in DPB::Job::BasePort looks like this:

FWIW, I tested on a freshly updated ports tree with and without the
patch below. The patch nicely makes the error message go away.

Thank you!
Preben

> Index: PortBuilder.pm
> ===
> RCS file: /cvs/ports/infrastructure/lib/DPB/PortBuilder.pm,v
> retrieving revision 1.88
> diff -u -p -r1.88 PortBuilder.pm
> --- PortBuilder.pm21 Mar 2021 19:17:34 -  1.88
> +++ PortBuilder.pm14 Apr 2021 15:19:18 -
> @@ -255,7 +255,6 @@ sub build
>   $self->report($v, $job, $core); 
>   &$final_sub($job->{failed});
>   });
> - $job->set_watch($self->logger, $v);
>   $core->start_job($job, $v);
>   # lonesome takes precedence for swallowing everything
>   if ($job->{lonesome}) {
> @@ -283,7 +282,6 @@ sub wipe
>   $self->report($v, $job, $core); 
>   &$final_sub($job->{failed});
>   });
> - $job->set_watch($self->logger, $v);
>   $core->start_job($job, $v);
>  }

> Index: Job/Port.pm
> ===
> RCS file: /cvs/ports/infrastructure/lib/DPB/Job/Port.pm,v
> retrieving revision 1.204
> diff -u -p -r1.204 Port.pm
> --- Job/Port.pm   21 Mar 2021 19:17:34 -  1.204
> +++ Job/Port.pm   14 Apr 2021 15:19:18 -
> @@ -969,6 +969,7 @@ sub new
>   $job->{current} = '';
>   # for stuff that doesn't really lock
>   $job->{lock} //= DPB::DummyLock->new;
> + $job->set_watch($job->{builder}->logger, $job->{v});

>   return $job;
>  }