Re: Sympa's wwsympa Fails "Can't locate CGI/Fast.pm in @INC"
On Tue, 17 Mar 2020 11:25:35 +0100 Jeremie Courreges-Anglas wrote: > On Mon, Mar 16 2020, Ian McWilliam > wrote: > > You'll actually need to add CGI::Fast as a package as it is missing. > > > > pkg_add p5-CGI-Fast > > FastCGI is indeed optional in this release of sympa, later releases > make it mandatory[0]. The README already describes a FastCGI setup, > and I suspect most users use FastCGI for sp33d these days, so the port > could help the user a bit more. What about adding p5-CGI-Fast to > RUN_DEPENDS? > > I'll note that our sympa port is out of date, 6.2.16 vs 6.2.54, and > that it's probably affected by CVE-2018-1000550[1]. > > [0] > https://sympa-community.github.io/manual/upgrade/notes.html#from-versions-prior-to-6224 > [1] https://sympa-community.github.io/security/index.html > Thank you for letting me know about the CVE. I'll explore options for limiting access to the site as a mitigation, since users have the option to send commands via email anyway and only a couple admins really need access to the webportal. I am actually stuck on a newer problem where I'm at a loss of how to troubleshoot it. The Sympa web portal seems responsive on the main page, but when I try to set my login for admin through "First Login" the page appears to just refresh to the main page without taking me to the requested page. I checked nginx logs: 2020/03/18 18:49:33 [error] 24697#0: *1 kevent() reported that connect() failed (61: Connection refused) while connecting to upstream, client: 11.11.11.11, server: domain.com, request: "GET / HTTP/2.0", upstream: "fastcgi://127.0.0.1:1026", host: "domain.com" 2020/03/18 18:49:33 [error] 24697#0: *1 kevent() reported that connect() failed (61: Connection refused) while connecting to upstream, client: 11.11.11.11, server: domain.com, request: "GET / HTTP/2.0", upstream: "fastcgi://[::1]:1026", host: "domain.com" 2020/03/18 18:49:47 [error] 24697#0: *1 kevent() reported that connect() failed (61: Connection refused) while connecting to upstream, client: 11.11.11.11, server: domain.com, request: "GET /HTTP/2.0", upstream: "fastcgi://[::1]:1026", host: "domain.com" I checked /var/log/messages for wwsympa and got the following: /var/log/messages:Mar 17 03:46:55 o wwsympa[82960]: err main::#1279 > main::get_parameters#2370 [robot domain.com] [client 11.11.11.11] Syntax error for parameter POSTDATA value "\^BB" not conform to regexp:[\\w\\-\\.]+; dumped vars in /var/spool/sympa/tmp/sympa_dump.1584442015.82960 /var/log/messages:Mar 17 03:46:55 o wwsympa[82960]: err main::#1279 > main::get_parameters#2370 [robot domain.com] [client 11.11.11.11] Syntax error for parameter POSTDATA value "\^\\^P\^Q" not conform to regexp:[\\w\\-\\.]+; dumped vars in /var/spool/sympa/tmp/sympa_dump.1584442015.82960 /var/log/messages:Mar 18 00:24:04 o wwsympa[82960]: err main::#1279 > main::get_parameters#2370 [robot domain.com] [client 22.22.22.22] Syntax error for parameter s value "/Index/\\think\\app/invokefunction" not conform to regexp:[\\w\\-\\.]+; dumped vars in /var/spool/sympa/tmp/sympa_dump.1584516244.80 Your help is very much appareciated. Thank you.
[update] tor-0.4.1.6 -> 0.4.1.9
Tor v0.4.1.9 fixes a high-severity security issue, CVE-2020-10592. This is intended for 6.6-stable. Index: Makefile === RCS file: /cvs/ports/net/tor/Makefile,v retrieving revision 1.126 diff -u -p -r1.126 Makefile --- Makefile23 Sep 2019 13:52:05 - 1.126 +++ Makefile19 Mar 2020 02:04:00 - @@ -2,7 +2,7 @@ COMMENT= anonymity service using onion routing -DISTNAME= tor-0.4.1.6 +DISTNAME= tor-0.4.1.9 CATEGORIES=net HOMEPAGE= https://www.torproject.org/ Index: distinfo === RCS file: /cvs/ports/net/tor/distinfo,v retrieving revision 1.103 diff -u -p -r1.103 distinfo --- distinfo23 Sep 2019 13:52:05 - 1.103 +++ distinfo19 Mar 2020 02:04:00 - @@ -1,2 +1,2 @@ -SHA256 (tor-0.4.1.6.tar.gz) = KohSTOQmB5+5uCi8G3ifLIrePtU8EwhREC3rw1GL7XE= -SIZE (tor-0.4.1.6.tar.gz) = 7390096 +SHA256 (tor-0.4.1.9.tar.gz) = p2PCQ2LGIg6tNF+iMtWzQ/zl4awKSVSdCjoiU9YP0oo= +SIZE (tor-0.4.1.9.tar.gz) = 7516581
Re: [PATCH] devel/libgit2/py-git2 - pygit2 is now Python3-only
On Wed, Mar 18, 2020 at 10:23:00PM GMT, Klemens Nanni wrote:
> On Wed, Mar 18, 2020 at 10:08:27PM +, Raf Czlonka wrote:
> > - as per the project name, I removed the hyphen (well, minus)
> > - it is now Python 3.5+
> Changing DESCR changes the package and therefore needs a REVISION bump.
Yes, I wasn't sure about that - perhaps I should've double-checked :^)
> OK kn with that
Updated diff below.
Regards,
Raf
Index: devel/libgit2/py-git2/Makefile
===
RCS file: /cvs/ports/devel/libgit2/py-git2/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- devel/libgit2/py-git2/Makefile 31 Dec 2019 15:32:04 - 1.33
+++ devel/libgit2/py-git2/Makefile 18 Mar 2020 22:49:00 -
@@ -4,7 +4,7 @@ COMMENT=libgit2 bindings in Python
DISTNAME= pygit2-${MODPY_EGG_VERSION}
PKGNAME= ${MODPY_PY_PREFIX}git2-${MODPY_EGG_VERSION}
-REVISION = 0
+REVISION = 1
MODULES= lang/python
MODPY_EGG_VERSION= 1.0.1
Index: devel/libgit2/py-git2/pkg/DESCR
===
RCS file: /cvs/ports/devel/libgit2/py-git2/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- devel/libgit2/py-git2/pkg/DESCR 30 Jun 2011 12:07:32 - 1.1.1.1
+++ devel/libgit2/py-git2/pkg/DESCR 18 Mar 2020 22:49:00 -
@@ -1,2 +1,2 @@
-py-git2 is a set of Python 2.5+ bindings to the libgit2 linkable C Git
+pygit2 is a set of Python 3.5+ bindings to the libgit2 linkable C Git
library.
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.904
diff -u -p -r1.904 Quirks.pm
--- devel/quirks/files/Quirks.pm18 Mar 2020 18:11:26 - 1.904
+++ devel/quirks/files/Quirks.pm18 Mar 2020 22:49:49 -
@@ -388,6 +388,7 @@ my $stem_extensions = {
'py-elasticsearch' => 'py3-elasticsearch',
'py-vmomi' => 'py3-vmomi',
'py-nbconvert' => 'py3-nbconvert',
+ 'py-git2' => 'py3-git2',
};
my $obsolete_reason = {
Re: [PATCH] devel/libgit2/py-git2 - pygit2 is now Python3-only
On Wed, Mar 18, 2020 at 10:08:27PM +, Raf Czlonka wrote: > - as per the project name, I removed the hyphen (well, minus) > - it is now Python 3.5+ Changing DESCR changes the package and therefore needs a REVISION bump. OK kn with that
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/03/18 16:22:25 Modified files: net/wiresep: Makefile distinfo net/wiresep/patches: patch-ifn_c patch-util_c Log message: Update to wiresep 0.9.0. ok kn
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/03/18 16:19:28 Removed files: net/wiresep/patches: patch-ifn_c.orig patch-util_c.orig Log message: oops
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/03/18 16:18:37 Modified files: net/wiresep: Makefile Added files: net/wiresep/patches: patch-ifn_c patch-ifn_c.orig patch-util_c patch-util_c.orig Log message: Fix build on base-gcc archs. Add a signed char fix and avoid an undefined left shift on archs with 32 bit longs. ok kn
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2020/03/18 16:18:53 Modified files: devel/glib2: Makefile distinfo devel/glib2/pkg: PLIST Log message: Update to glib2-2.62.6.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/03/18 16:14:51 ports/net/wiresep/patches Update of /cvs/ports/net/wiresep/patches In directory cvs.openbsd.org:/tmp/cvs-serv21766/patches Log Message: Directory /cvs/ports/net/wiresep/patches added to the repository
[PATCH] devel/libgit2/py-git2 - pygit2 is now Python3-only
Hi all,
A small update to pygit2:
- as per the project name, I removed the hyphen (well, minus)
- it is now Python 3.5+
I have already suggested it in a reply to Remi's email, but including
a diff to quirks just in case.
Regards,
Raf
Index: devel/libgit2/py-git2/pkg/DESCR
===
RCS file: /cvs/ports/devel/libgit2/py-git2/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 DESCR
--- devel/libgit2/py-git2/pkg/DESCR 30 Jun 2011 12:07:32 - 1.1.1.1
+++ devel/libgit2/py-git2/pkg/DESCR 18 Mar 2020 21:57:21 -
@@ -1,2 +1,2 @@
-py-git2 is a set of Python 2.5+ bindings to the libgit2 linkable C Git
+pygit2 is a set of Python 3.5+ bindings to the libgit2 linkable C Git
library.
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.886
diff -u -p -r1.886 Makefile
--- devel/quirks/Makefile 18 Mar 2020 18:11:26 - 1.886
+++ devel/quirks/Makefile 18 Mar 2020 22:07:09 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.277
+PKGNAME = quirks-3.278
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.904
diff -u -p -r1.904 Quirks.pm
--- devel/quirks/files/Quirks.pm18 Mar 2020 18:11:26 - 1.904
+++ devel/quirks/files/Quirks.pm18 Mar 2020 22:07:09 -
@@ -388,6 +388,7 @@ my $stem_extensions = {
'py-elasticsearch' => 'py3-elasticsearch',
'py-vmomi' => 'py3-vmomi',
'py-nbconvert' => 'py3-nbconvert',
+ 'py-git2' => 'py3-git2',
};
my $obsolete_reason = {
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/03/18 16:05:41 Modified files: x11: Makefile Added files: x11/polkit-qt : Makefile distinfo x11/polkit-qt/patches: patch-PolkitQt-1Config_cmake_in x11/polkit-qt/pkg: DESCR PLIST Log message: polkit-qt is still used in kde4 land rsadowski@ has been a tad too eager. Spotted by naddy@
Re: plaso & quirks
Hi Remi et al.,
First of all, apologies for hijacking the thread but I was about
to send a similar proposal for py-git2 -> py3-git2.
Not sure if I should send a diff regardless or whether an extra
line can simply be added should the below get OKs?
Ta,
Raf
On Wed, Mar 18, 2020 at 08:53:22PM GMT, Remi Pointel wrote:
> Hi,
>
> it seems that the update of plaso & its dependencies needs the update of
> quirks.
>
> Ok?
>
> Cheers,
>
> Remi.
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.886
> diff -u -p -u -p -r1.886 Makefile
> --- Makefile 18 Mar 2020 18:11:26 - 1.886
> +++ Makefile 18 Mar 2020 19:43:26 -
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME =quirks-3.277
> +PKGNAME =quirks-3.278
> PKG_ARCH = *
> MAINTAINER = Marc Espie
>
> Index: files/Quirks.pm
> ===
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.904
> diff -u -p -u -p -r1.904 Quirks.pm
> --- files/Quirks.pm 18 Mar 2020 18:11:26 - 1.904
> +++ files/Quirks.pm 18 Mar 2020 19:43:26 -
> @@ -388,6 +388,11 @@ my $stem_extensions = {
> 'py-elasticsearch' => 'py3-elasticsearch',
> 'py-vmomi' => 'py3-vmomi',
> 'py-nbconvert' => 'py3-nbconvert',
> + 'py-bencode' => 'py3-bencode',
> + 'py-dfwinreg' => 'py3-dfwinreg',
> + 'py-dfvfs' => 'py3-dfvfs',
> + 'py-dfdatetime' => 'py3-dfdatetime',
> + 'py-artifacts' => 'py3-artifacts',
> };
>
> my $obsolete_reason = {
Re: neomutt-20200313-gpgme-sasl error sending from command line
On Thu, Mar 19 '20 at 08.14 NZDT, myportslist20190...@nym.hush.com wrote: > Synopsis: neomutt-20200313-gpgme-sasl error sending command line email Looks like it's a known bug, see https://github.com/neomutt/neomutt/issues/2176 (caused by commit 331702b with comment "abort if run without a terminal" heh; quality control not quite as good as mainline mutt yet). Fixed a couple of days ago but not included in a release yet.
Re: llvm: -python: adjust RDEP
On Wed, Mar 18, 2020 at 03:40:47PM +0100, Jeremie Courreges-Anglas wrote:
> I got curious about which problems could result from the current deps
> layout. So here's an attempt to switch all the llvm subpackages to
> python3.
Thanks a lot!
> While here:
> - also byte-compile the .py files in the lldb subpackage. compileall.py
> tripped up over symbolication.py so process this file with 2to3
> - drop gtest from PLIST and rdeps. To be committed seperately, but
> might as well ride this change.
OK for gtest removal now, the rest I'd like to build and run through
fake/update-plist/etc. myself first (build takes long!)
> make update works fine with a py-llvm->py3-llvm quirks entry.
> import lldb, lldb.formatters, lldb.runtime, lldb.utils, clang and
> clang.cindex don't explode in flight, scan-view also works
> fine, hmaptool and git-clang-formatter *seem* to be happy.
Sounds very good, I'll try some runtime tests as well.
> post-build:
> - cd ${WRKSRC}/docs && make -f Makefile.sphinx man
> - cd ${WRKSRC}/tools/clang/docs && make -f Makefile.sphinx man
> + cd ${WRKSRC}/docs && \
> + make -f Makefile.sphinx man
> SPHINXBUILD="sphinx-build${MODPY_BIN_SUFFIX}"
> + cd ${WRKSRC}/tools/clang/docs && \
> + make -f Makefile.sphinx man
> SPHINXBUILD="sphinx-build${MODPY_BIN_SUFFIX}"
s/make/${MAKE_PROGRAM}/ I guess, also there's -C instead of cd.
plaso & quirks
Hi,
it seems that the update of plaso & its dependencies needs the update of
quirks.
Ok?
Cheers,
Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.886
diff -u -p -u -p -r1.886 Makefile
--- Makefile 18 Mar 2020 18:11:26 - 1.886
+++ Makefile 18 Mar 2020 19:43:26 -
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-3.277
+PKGNAME = quirks-3.278
PKG_ARCH = *
MAINTAINER = Marc Espie
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.904
diff -u -p -u -p -r1.904 Quirks.pm
--- files/Quirks.pm 18 Mar 2020 18:11:26 - 1.904
+++ files/Quirks.pm 18 Mar 2020 19:43:26 -
@@ -388,6 +388,11 @@ my $stem_extensions = {
'py-elasticsearch' => 'py3-elasticsearch',
'py-vmomi' => 'py3-vmomi',
'py-nbconvert' => 'py3-nbconvert',
+ 'py-bencode' => 'py3-bencode',
+ 'py-dfwinreg' => 'py3-dfwinreg',
+ 'py-dfvfs' => 'py3-dfvfs',
+ 'py-dfdatetime' => 'py3-dfdatetime',
+ 'py-artifacts' => 'py3-artifacts',
};
my $obsolete_reason = {
neomutt-20200313-gpgme-sasl error sending from command line
Synopsis: neomutt-20200313-gpgme-sasl error sending command line email Environment: System : OpenBSD 6.6 Details : OpenBSD 6.6-current (GENERIC.MP) #56: Sun Mar 15 12:44:04 MDT 2020 dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP Architecture: OpenBSD.amd64 Machine : amd64 Description: Sending email from the command line with neomutt-20200313-gpgme-sasl gives error "Error initializing terminal" This started with this version. neomutt-20191207-gpgme-sasl worked fine. This happens for me on several different machines running amd64 -current. Something perhaps goes wrong with initscr in main.c in the neomutt port. I think line 214 and/or 1001. Installed from packages, but I will build and look more also. How-To-Repeat: mutt -s "hi" anyemailaddress < somefile
Migrate ipython/py-ipykernel/py-jupyter_*/py-nbformat/py-traitlets to py3-only
Newer versions of py-jupyter_client and ipython are python3-only. In
preparation of updating these two ports I have been slowly migrating
their consumers away from python2. rpointel@ recently committed an
update of plaso (consumer of ipython), which has been switched to
python3 as well.
What remains are a couple of ports that need to be migrated at the same
time. Rationale is that these ports all depend upon each other.
Splitting up the diff below therefore doesn't make sense.
Ports:
- devel/ipython
- devel/py-ipykernel
- devel/py-jupyter_client
- devel/py-jupyter_core
- devel/py-nbformat
- devel/py-traitlets
Consumers of the above are already python3-only.
Other changes:
- switch HOMEPAGE devel/ipython to https
Testing:
- Build tested ports and their consumers
Comments/OK?
diff --git devel/Makefile devel/Makefile
index 429e62f65f0..849ed5cdcef 100644
--- devel/Makefile
+++ devel/Makefile
@@ -277,7 +277,6 @@
SUBDIR += include-what-you-use
SUBDIR += iniparser
SUBDIR += intellij
- SUBDIR += ipython
SUBDIR += ipython,python3
SUBDIR += iso-codes
SUBDIR += itcl
@@ -1494,7 +1493,6 @@
SUBDIR += py-iniparse
SUBDIR += py-intervaltree
SUBDIR += py-intervaltree,python3
- SUBDIR += py-ipykernel
SUBDIR += py-ipykernel,python3
SUBDIR += py-ipython_genutils
SUBDIR += py-ipython_genutils,python3
@@ -1515,9 +1513,7 @@
SUBDIR += py-jsonrpclib
SUBDIR += py-jsonschema
SUBDIR += py-jsonschema,python3
- SUBDIR += py-jupyter_client
SUBDIR += py-jupyter_client,python3
- SUBDIR += py-jupyter_core
SUBDIR += py-jupyter_core,python3
SUBDIR += py-kitchen,python3
SUBDIR += py-kiwisolver
@@ -1551,7 +1547,6 @@
SUBDIR += py-munch,python3
SUBDIR += py-mxDateTime
SUBDIR += py-nbconvert,python3
- SUBDIR += py-nbformat
SUBDIR += py-nbformat,python3
SUBDIR += py-nbval,python3
SUBDIR += py-nose
@@ -1710,7 +1705,6 @@
SUBDIR += py-tox
SUBDIR += py-tox,python3
SUBDIR += py-traceback2
- SUBDIR += py-traitlets
SUBDIR += py-traitlets,python3
SUBDIR += py-trollius
SUBDIR += py-twisted
diff --git devel/ipython/Makefile devel/ipython/Makefile
index 18f71bf9154..03029eb6934 100644
--- devel/ipython/Makefile
+++ devel/ipython/Makefile
@@ -3,8 +3,9 @@
COMMENT= enhanced interactive Python shell
MODPY_EGG_VERSION =5.8.0
-REVISION = 2
+REVISION = 3
DISTNAME= ipython-${MODPY_EGG_VERSION}
+PKGNAME = ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
CATEGORIES=devel
HOMEPAGE= https://ipython.org/
@@ -20,6 +21,7 @@ RUN_DEPENDS = devel/py-decorator${MODPY_FLAVOR} \
devel/desktop-file-utils \
devel/py-pexpect${MODPY_FLAVOR} \
devel/py-prompt_toolkit${MODPY_FLAVOR} \
+ math/py-numpy${MODPY_FLAVOR} \
textproc/py-pygments${MODPY_FLAVOR}
# Note that if you have pdb++ installed, tests will fail.
@@ -41,16 +43,7 @@ PERMIT_PACKAGE= Yes
MODPY_PI = Yes
FLAVORS = python3
-FLAVOR ?=
-
-.if ${FLAVOR:Mpython3}
-PKGNAME = ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
-RUN_DEPENDS += math/py-numpy,python3
-.else
-RUN_DEPENDS += devel/py-backports-shutil-get-terminal-size \
- devel/py-pathlib2
-TEST_DEPENDS +=devel/py-mock
-.endif
+FLAVOR = python3
# Despite the fact that setupbase.py defines paths for examples to
# be installed into, we still have to do it manually for some reason.
diff --git devel/ipython/pkg/PLIST devel/ipython/pkg/PLIST
index 4146be3c30e..c5c48c97f01 100644
--- devel/ipython/pkg/PLIST
+++ devel/ipython/pkg/PLIST
@@ -1,4 +1,6 @@
@comment $OpenBSD: PLIST,v 1.24 2018/10/31 12:37:34 bket Exp $
+@conflict ipython-*
+@pkgpath devel/ipython
bin/iptest${MODPY_BIN_SUFFIX}
@comment bin/iptest2
@comment bin/iptest3
diff --git devel/py-ipykernel/Makefile devel/py-ipykernel/Makefile
index 0dc6baf6a5a..81f69643b64 100644
--- devel/py-ipykernel/Makefile
+++ devel/py-ipykernel/Makefile
@@ -5,7 +5,7 @@ COMMENT = IPython kernel for Jupyter
MODPY_EGG_VERSION =4.10.0
DISTNAME = ipykernel-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
-REVISION = 1
+REVISION = 2
PORTROACH= limit:^4
@@ -32,11 +32,7 @@ MODULES =lang/python
MODPY_PI = Yes
FLAVORS = python3
-FLAVOR ?=
-
-.if !${FLAVOR:Mpython3}
-TEST_DEPENDS +=devel/py-mock
-.endif
+FLAVOR = python3
do-test:
cd ${WRKSRC} && ${LOCALBASE}/bin/nosetests${MODPY_BIN_SUFFIX} ipykernel
diff --git devel/py-ipykernel/pkg/PLIST devel/py-ipykernel/pkg/PLIST
index ab3ccabcd1e..5019fbcc1c1 100644
---
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/03/18 12:57:46 Modified files: games/supertuxkart: Makefile games/supertuxkart/patches: patch-lib_irrlicht_CMakeLists_txt Added files: games/supertuxkart/patches: patch-CMakeLists_txt patch-lib_irrlicht_include_IrrCompileConfig_h patch-lib_irrlicht_source_Irrlicht_CIrrDeviceSDL_cpp Log message: Add support for game controllers. To do that, the irrlicht backend had to be switched from X11 to SDL, since the X11 backend joystick support is Linux specific, and there is no way to combine SDL joystick support with Linux graphics backend. Test reports by Raf Czlonka. OK pascal@ (MAINTAINER)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/03/18 12:55:24 Modified files: games/witchblast: Makefile games/witchblast/patches: patch-src_WitchBlastGame_cpp Log message: to properly make use of the joystick support, witchblast needed some help in the joystick configuration menu, i.e. ignore button release and limit input for the axis to the HAT. Test reports by Raf Czlonka. OK pascal@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/03/18 12:53:45 Modified files: multimedia/sfml: Makefile multimedia/sfml/patches: patch-src_SFML_Window_CMakeLists_txt patch-src_SFML_Window_JoystickImpl_hpp Added files: multimedia/sfml/files: JoystickImpl.cpp JoystickImpl.hpp multimedia/sfml/patches: patch-cmake_Modules_FindSFML_cmake Log message: Add support for game controllers, i.e. joysticks and gamepads. The FreeBSD implementation was used as template file, with some logic to get the devices supported inspired by SDL2 game controller support. Works for me with Logitech F310, tested with witchblast and extremetuxracer. Test reports by Raf Czlonka as well. OK pascal@ (MAINTAINER)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/03/18 12:39:17 Modified files: sysutils/ruby-puppet/5: Makefile distinfo sysutils/ruby-puppet/5/patches: patch-lib_puppet_defaults_rb patch-lib_puppet_provider_package_openbsd_rb Removed files: sysutils/ruby-puppet/5/patches: patch-lib_puppet_type_package_rb Log message: update 5.5.18 -> 5.5.19
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/03/18 12:35:54 Modified files: databases/puppetdb5: Makefile distinfo Log message: update 5.2.12 -> 5.2.13
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2020/03/18 12:35:06 Modified files: sysutils/facter: Makefile distinfo Log message: update 3.14.8 -> 3.14.9
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2020/03/18 12:11:26 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Add quirk for py-nbconvert
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2020/03/18 12:08:13 Modified files: devel : Makefile devel/py-nbconvert: Makefile distinfo devel/py-nbconvert/patches: patch-nbconvert_exporters_html_py patch-nbconvert_filters_markdown_mistune_py devel/py-nbconvert/pkg: PLIST Log message: Update to py-nbconvert-5.3.1 Changes: https://github.com/jupyter/nbconvert/blob/5.3.1/docs/source/changelog.rst Noticeable change is that this ports has been migrated to py3-only. While here switch HOMEPAGE to https. OK paco@, tb@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: mar...@cvs.openbsd.org 2020/03/18 11:58:52 Modified files: math/py-cftime : Makefile Log message: promote py-numpy from TDEP to BDEP build failure noted by naddy and aja
Re: UPDATE devel/py-nbconvert-5.3.1
On Fri, Mar 06, 2020 at 07:17:18PM +0100, Bjorn Ketelaars wrote: > Diff below updates py-nbconvert to 5.3.1. Changes: > https://github.com/jupyter/nbconvert/blob/5.3.1/docs/source/changelog.rst. > > Newer versions of py-nbconvert are available, which require several > dependencies to be updated. This is something for another day. > > Changes to the port: > - python2 flavor has been dropped, migrated to python3-only > - switch HOMEPAGE to https > > Testing: > - 'make test' runs successfully > - run tested in combination with jupyter-notebook > > Consumers are already python3-only. > > OK? I ran tests on amd64, powerpc and sparc64 multiple times and they pass. The machines all have PORTS_PRIVSEP=Yes set. I am sure I saw a failure that looked like cwen's log, but I am no longer able to reproduce it. In any case, I think this can and should go in. ok tb
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rsadow...@cvs.openbsd.org 2020/03/18 10:15:25 Modified files: x11: Makefile Removed files: x11/polkit-qt : Makefile distinfo x11/polkit-qt/patches: patch-PolkitQt-1Config_cmake_in x11/polkit-qt/pkg: DESCR PLIST Log message: Remove qt4 polkit-qt Dead pice of software with no consumers. Let's safe build time. OK ajacoutot@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/03/18 09:46:44 Modified files: www/mozilla-firefox: Makefile www/mozilla-firefox/files: unveil.main Log message: Now that reyk's changes are fully merged upstream, make /dev/fido available so they can be used out of the box. >From Greg Steuck, "fine with it" landry
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/03/18 09:20:48 Modified files: sysutils/rancid: Makefile distinfo Log message: Update rancid 3.10 -> 3.12 Changelog: https://github.com/haussli/rancid/blob/436612ee9fe9f8f1b140fc274ad14b82a893085f/CHANGES
Re: UPDATE devel/py-nbconvert-5.3.1
On Fri, 06 Mar 2020, Bjorn Ketelaars wrote: > Diff below updates py-nbconvert to 5.3.1. Changes: > https://github.com/jupyter/nbconvert/blob/5.3.1/docs/source/changelog.rst. > > Newer versions of py-nbconvert are available, which require several > dependencies to be updated. This is something for another day. > > Changes to the port: > - python2 flavor has been dropped, migrated to python3-only > - switch HOMEPAGE to https > > Testing: > - 'make test' runs successfully > - run tested in combination with jupyter-notebook > > Consumers are already python3-only. > > OK? All tests pass for me on amd64. I also tested its consumers before and after the update. Results are exactly the same: * www/py-bokeh: 84 failed, 4004 passed, 4 skipped, 27 warnings, 136 error * www/jupyter-notebook: all tests pass * devel/spyder/spyder: cannot run tests. It crashes before start. ok paco@ -- Paco Esteban. 0x5818130B8A6DBC03
Re: llvm: -python: adjust RDEP
On Mon, Mar 16 2020, Jeremie Courreges-Anglas wrote:
[...]
> I took a look some days/weeks ago, sadly I didn't note down
> why the switch wasn't straightforward. Maybe I was just busy with
> something else. Looks like a bunch of python files import __future__ so
> this looks promising.
I got curious about which problems could result from the current deps
layout. So here's an attempt to switch all the llvm subpackages to
python3.
While here:
- also byte-compile the .py files in the lldb subpackage. compileall.py
tripped up over symbolication.py so process this file with 2to3
- drop gtest from PLIST and rdeps. To be committed seperately, but
might as well ride this change.
make update works fine with a py-llvm->py3-llvm quirks entry.
import lldb, lldb.formatters, lldb.runtime, lldb.utils, clang and
clang.cindex don't explode in flight, scan-view also works
fine, hmaptool and git-clang-formatter *seem* to be happy.
Feedback / oks welcome.
Index: Makefile
===
RCS file: /cvs/ports/devel/llvm/Makefile,v
retrieving revision 1.245
diff -u -p -r1.245 Makefile
--- Makefile15 Mar 2020 19:33:32 - 1.245
+++ Makefile18 Mar 2020 13:28:06 -
@@ -16,11 +16,11 @@ DISTNAME = llvm-${LLVM_V}.src
PKGNAME = llvm-${LLVM_V}
PKGSPEC-main = llvm-=${LLVM_V}
PKGNAME-main = llvm-${LLVM_V}
-PKGNAME-python = py-llvm-${LLVM_V}
+PKGNAME-python = py3-llvm-${LLVM_V}
PKGNAME-lldb = lldb-${LLVM_V}
-REVISION-main =8
-REVISION-python = 0
-REVISION-lldb =1
+REVISION-main =9
+REVISION-python = 1
+REVISION-lldb =2
CATEGORIES = devel
@@ -49,13 +49,13 @@ MULTI_PACKAGES = -main -python -lldb
COMPILER = base-clang ports-gcc
MODULES = devel/cmake \
lang/python
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
TEST_DEPENDS = devel/dejagnu \
shells/bash
BUILD_DEPENDS += devel/swig \
- textproc/py-sphinx \
- textproc/py-recommonmark
-RUN_DEPENDS += devel/gtest
+ textproc/py-sphinx${MODPY_FLAVOR} \
+ textproc/py-recommonmark${MODPY_FLAVOR}
.include
@@ -79,7 +79,7 @@ WANTLIB-lldb += curses edit form panel
# XXX linked against libLLVM-x.so, should be LIB_DEPENDS
RUN_DEPENDS-lldb = ${BUILD_PKGPATH},-main
RUN_DEPENDS-lldb +=${MODPY_RUN_DEPENDS} \
- devel/py-six
+ devel/py-six${MODPY_FLAVOR}
LIB_DEPENDS-lldb = ${LIB_DEPENDS}
CONFIGURE_STYLE = cmake
@@ -127,6 +127,7 @@ post-extract:
mv ${WRKDIR}/cfe-${LLVM_V}.src ${WRKSRC}/tools/clang
mv ${WRKDIR}/lld-${LLVM_V}.src ${WRKSRC}/tools/lld
mv ${WRKDIR}/lldb-${LLVM_V}.src ${WRKSRC}/tools/lldb
+ ${LOCALBASE}/bin/2to3 -w
${WRKSRC}/tools/lldb/examples/python/symbolication.py
pre-configure:
@${SUBST_CMD} ${WRKSRC}/tools/clang/lib/Driver/ToolChains/OpenBSD.cpp \
@@ -134,8 +135,10 @@ pre-configure:
-@ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
post-build:
- cd ${WRKSRC}/docs && make -f Makefile.sphinx man
- cd ${WRKSRC}/tools/clang/docs && make -f Makefile.sphinx man
+ cd ${WRKSRC}/docs && \
+ make -f Makefile.sphinx man
SPHINXBUILD="sphinx-build${MODPY_BIN_SUFFIX}"
+ cd ${WRKSRC}/tools/clang/docs && \
+ make -f Makefile.sphinx man
SPHINXBUILD="sphinx-build${MODPY_BIN_SUFFIX}"
post-install:
${INSTALL_DATA_DIR} \
@@ -143,7 +146,7 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/tools/clang/bindings/python/clang/* \
${PREFIX}/lib/python${MODPY_VERSION}/site-packages/clang
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
- ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/clang
+ ${PREFIX}/lib/python${MODPY_VERSION}/site-packages/
${INSTALL_DATA} ${WRKSRC}/docs/_build/man/* \
${PREFIX}/man/man1
${INSTALL_DATA} ${WRKSRC}/tools/clang/docs/_build/man/clang.1 \
Index: pkg/PLIST-lldb
===
RCS file: /cvs/ports/devel/llvm/pkg/PLIST-lldb,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-lldb
--- pkg/PLIST-lldb 6 Mar 2020 14:39:57 - 1.4
+++ pkg/PLIST-lldb 18 Mar 2020 13:28:06 -
@@ -608,15 +608,29 @@ include/lldb/lldb-versioning.h
@static-lib lib/liblldbUtilityHelpers.a
lib/python${MODPY_VERSION}/site-packages/lldb/
lib/python${MODPY_VERSION}/site-packages/lldb/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/lldb/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/lldb/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/lldb/${MODPY_PYCACHE}embedded_interpreter.${MODPY_PYC_MAGIC_TAG}pyc
@so lib/python${MODPY_VERSION}/site-packages/lldb/_lldb.so
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: t...@cvs.openbsd.org2020/03/18 08:31:20 Modified files: x11/kde4/libs : Makefile Added files: x11/kde4/libs/patches: patch-kio_kssl_kopenssl_cpp patch-kio_kssl_kopenssl_h patch-kio_kssl_ksslcertificate_cpp Log message: The X509_get_notBefore() and X509_get_notAfter() macros were changed in rev 1.70 to reference the functions X509_getm_notBefore() and X509_getm_notAfter(), so these need to be resolved at runtime. This fixes a linking failure on ld.bfd architectures and a likely runtime failure on other architectures. ok jca rsadowski
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2020/03/18 07:51:25 Modified files: devel/xtensa-lx106-elf/gdb: Makefile Log message: xtensa-lx106-elf/gdb: use nopie on i386 to unbreak build, ok tracey@ can't create dynamic relocation R_386_32 against local symbol in readonly segment
Re: CVS: cvs.openbsd.org: ports
On Wed, Mar 18 2020, Jeremie Courreges-Anglas wrote: > CVSROOT: /cvs > Module name: ports > Changes by: j...@cvs.openbsd.org2020/03/18 07:45:04 > > Modified files: > sysutils/sleuthkit: Makefile > > Log message: > Switch HOMEPAGE to https, and zap bogus whitespace That was ok rpointel@ (maintainer) -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2020/03/18 07:45:04 Modified files: sysutils/sleuthkit: Makefile Log message: Switch HOMEPAGE to https, and zap bogus whitespace
Re: x11/kde4/libs X509_getm_notBefore fix
On Wed, Mar 18 2020, Rafael Sadowski wrote: > On Tue Mar 17, 2020 at 06:09:20PM +0100, Theo Buehler wrote: >> X509_getm_notBefore(), aka the gift that keeps on giving... >> >> jca pointed out to me that kde/libs failed to build on ld.bfd >> architectures due to a linking error in libkio [1]: >> >> /usr/obj/ports/kdelibs-4.14.10/build-sparc64/lib/libkio.so.50.3: undefined >> reference to `X509_getm_notBefore' >> /usr/obj/ports/kdelibs-4.14.10/build-sparc64/lib/libkio.so.50.3: undefined >> reference to `X509_getm_notAfter' >> >> This started happening after I fixed a qt4 SSL-related runtime failure >> that rsadowski@ showed me during p2k19. >> >> Before that fix, it linked, but only by accident. This was defintely >> broken on all architectures since August 2018. >> >> This is what happened (the notAfter case is the same): >> >> X509_get_notBefore(x) used to be a macro that reached inside the X509 x. >> In OpenSSL, this macro was replaced with a function, >> X509_getm_notBefore(), and openssl/x509.h now contains >> >> #define X509_get_notBefore X509_getm_notBefore >> >> so when an linking a program that uses X509_get_notBefore() this means >> ld.bfd will look up X509_getm_notBefore(). >> >> When trying to adapt the Qt4 openssl symbols sausage factory to this, I >> accidentally exposed a bogus symbol X509_getm_notBefore() in QtNetwork, >> which was enough to make ld.bfd happy. The Qt symbol lookup madness got >> rightfully confused by this, and this led to the segfault rsadowski >> showed me. The Qt4 side was fixed last November (although there should >> have been a major bump for QtNetwork and some other Qt libraries). >> >> The diff below fixes libkio by adding a symbol lookup similar to other >> libcrypto symbols and using it in ksslcertificate.cpp in place of the >> macro. Note that this is internal only, so no library bump required. >> >> check_sym shows the expected removal of the two external references to >> X509_getm_notBefore and X509_getm_notAfter for libkio. >> >> I have build tested this on amd64 and sparc64. > > With some meaningful comments in the new patches, ok with me but please > wait for jca@' feedback. Thanks tb Wait, I'm no expert in how to run an OpenSSL sausage factory! That being said, thank you Theo for your thorough analysis. Your fixes seem to fit properly in the existing code. ok jca@ -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: [UPDATE] net/xl2tpd (1.3.14 -> 1.3.15)
On Sat, Feb 22, 2020 at 10:18 PM Alex Naumov wrote: > This patch updates xl2tpd to version 1.3.15. > > 'portcheck' reports some problems for 1.3.14 version: > * trailing whitespace in pkg/README > * 2 line(s) longer than 80 chars in pkg/README > > It's fixed now. > ok? > Cheers, > Alex > > >
Re: [UPDATE] devel/libev (4.27 -> 4.31)
On Wed, Mar 18, 2020 at 10:55 AM Stuart Henderson
wrote:
> On 2020/03/18 10:02, Alex Naumov wrote:
> > this patche updates GNU libev to version 4.31.
>
> Around 350 ports depend on this, what testing has been done?
>
>
Only ports itself stuff that described on
https://www.openbsd.org/faq/ports/testing.html
make test
/usr/ports/infrastructure/bin/portcheck
make port-lib-depends-check
No combinations with new packages/ports was tested.
> Also note the "p5-EV should probably be kept in sync" comment - the two
> ports use the same distfile and most of the changelog entries you show
> only relate to p5-EV (the "EV only" ones) ... (actually the word
> "probably" should probably be removed from the comment)
>
>
> > Changelog:
> >
> > 4.31 Fri Dec 20 21:58:29 CET 2019
> > - handle backends with minimum wait time a bit better by not
> > waiting in the presence of already-expired timers
> > (behaviour reported by Felipe Gasper).
> > - new feature: use timerfd to detect timejumps quickly,
> > can be disabled with the new EVFLAG_NOTIMERFD loop flag.
> > - document EV_USE_SIGNALFD feature macro.
> >
> > 4.30 (EV only)
> > - change non-autoconf test for __kernel_rwf_t by testing
> > LINUX_VERSION_CODE, the most direct test I could find.
> > - fix a bug in the io_uring backend that polled the wrong
> > backend fd, causing it to not work in many cases.
> >
> > 4.29 (EV only)
> > - add io uring autoconf and non-autoconf detection.
> > - disable io_uring when some header files are too old.
> >
> > 4.28 (EV only)
> > - linuxaio backend resulted in random memory corruption
> > when loop is forked.
> > - linuxaio backend might have tried to cancel an iocb
> > multiple times (was unable to trigger this).
> > - linuxaio backend now employs a generation counter to
> > avoid handling spurious events from cancelled requests.
> > - io_cancel can return EINTR, deal with it. also, assume
> > io_submit also returns EINTR.
> > - fix some other minor bugs in linuxaio backend.
> > - ev_tstamp type can now be overriden by defining EV_TSTAMP_T.
> > - cleanup: replace expect_true/false and noinline by their
> > libecb counterparts.
> > - move syscall infrastructure from ev_linuxaio.c to ev.c.
> > - prepare io_uring integration.
> > - tweak ev_floor.
> > - epoll, poll, win32 Sleep and other places that use millisecond
> > reslution now all try to round up times.
> > - solaris port backend didn't compile.
> > - abstract time constants into their macros, for more
> flexibility.
> >
> >
> >
> > Cheers,
> > Alex
>
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/devel/libev/Makefile,v
> > retrieving revision 1.25
> > diff -u -p -u -p -r1.25 Makefile
> > --- Makefile 31 Aug 2019 17:21:33 - 1.25
> > +++ Makefile 18 Mar 2020 08:57:17 -
> > @@ -3,7 +3,7 @@
> > COMMENT =high-performance event loop library
> >
> > # p5-EV should probably be kept in sync
> > -DISTNAME = libev-4.27
> > +DISTNAME = libev-4.31
> > CATEGORIES = devel
> >
> > SHARED_LIBS= ev 3.1 # 4.0
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/devel/libev/distinfo,v
> > retrieving revision 1.13
> > diff -u -p -u -p -r1.13 distinfo
> > --- distinfo 31 Aug 2019 17:21:33 - 1.13
> > +++ distinfo 18 Mar 2020 08:57:17 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (libev-4.27.tar.gz) =
> LVUm/I2k8HLdXHPhj7sWZvXvjteLc7uhLhlc/dgQNE4=
> > -SIZE (libev-4.27.tar.gz) = 556658
> > +SHA256 (libev-4.31.tar.gz) =
> 7YVdK1IRjjLAwaajK9GMl/nmcRylEfXuEt47nszGblo=
> > +SIZE (libev-4.31.tar.gz) = 565540
> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/devel/libev/pkg/PLIST,v
> > retrieving revision 1.3
> > diff -u -p -u -p -r1.3 PLIST
> > --- pkg/PLIST 23 Apr 2013 18:59:53 - 1.3
> > +++ pkg/PLIST 18 Mar 2020 08:57:17 -
> > @@ -1,7 +1,7 @@
> > @comment $OpenBSD: PLIST,v 1.3 2013/04/23 18:59:53 dcoppa Exp $
> > include/ev++.h
> > include/ev.h
> > -lib/libev.a
> > +@static-lib lib/libev.a
> > lib/libev.la
> > @lib lib/libev.so.${LIBev_VERSION}
> > @man man/man3/ev.3
>
>
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/03/18 05:58:11 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: Add quirk for py-vmomi
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/03/18 05:54:51 Modified files: sysutils : Makefile Log message: Remove py-vmomi
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/03/18 05:53:15 Modified files: sysutils/py-vmomi: Makefile Log message: Remove python2 flavor
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/03/18 05:44:42 Modified files: devel/quirks : Makefile Log message: Add quirk for py-elasticsearch
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/03/18 05:42:37 Modified files: devel/quirks/files: Quirks.pm Log message: Add quirk for py-elasticsearch
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/03/18 05:41:14 Modified files: textproc : Makefile Log message: Remove py-elasticsearch
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/03/18 05:40:34 Modified files: textproc/py-elasticsearch: Makefile Log message: Remove python2 flavor
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: p...@cvs.openbsd.org2020/03/18 04:13:45 Modified files: net/mattermost-server: Makefile distinfo net/mattermost-server/pkg: PLIST Log message: Update mattermost-server 5.20.1 -> 5.21.0 Changelog: https://docs.mattermost.com/administration/changelog.html
Re: [UPDATE] devel/libev (4.27 -> 4.31)
On 2020/03/18 10:02, Alex Naumov wrote:
> this patche updates GNU libev to version 4.31.
Around 350 ports depend on this, what testing has been done?
Also note the "p5-EV should probably be kept in sync" comment - the two
ports use the same distfile and most of the changelog entries you show
only relate to p5-EV (the "EV only" ones) ... (actually the word
"probably" should probably be removed from the comment)
> Changelog:
>
> 4.31 Fri Dec 20 21:58:29 CET 2019
> - handle backends with minimum wait time a bit better by not
> waiting in the presence of already-expired timers
> (behaviour reported by Felipe Gasper).
> - new feature: use timerfd to detect timejumps quickly,
> can be disabled with the new EVFLAG_NOTIMERFD loop flag.
> - document EV_USE_SIGNALFD feature macro.
>
> 4.30 (EV only)
> - change non-autoconf test for __kernel_rwf_t by testing
> LINUX_VERSION_CODE, the most direct test I could find.
> - fix a bug in the io_uring backend that polled the wrong
> backend fd, causing it to not work in many cases.
>
> 4.29 (EV only)
> - add io uring autoconf and non-autoconf detection.
> - disable io_uring when some header files are too old.
>
> 4.28 (EV only)
> - linuxaio backend resulted in random memory corruption
> when loop is forked.
> - linuxaio backend might have tried to cancel an iocb
> multiple times (was unable to trigger this).
> - linuxaio backend now employs a generation counter to
> avoid handling spurious events from cancelled requests.
> - io_cancel can return EINTR, deal with it. also, assume
> io_submit also returns EINTR.
> - fix some other minor bugs in linuxaio backend.
> - ev_tstamp type can now be overriden by defining EV_TSTAMP_T.
> - cleanup: replace expect_true/false and noinline by their
> libecb counterparts.
> - move syscall infrastructure from ev_linuxaio.c to ev.c.
> - prepare io_uring integration.
> - tweak ev_floor.
> - epoll, poll, win32 Sleep and other places that use millisecond
> reslution now all try to round up times.
> - solaris port backend didn't compile.
> - abstract time constants into their macros, for more flexibility.
>
>
>
> Cheers,
> Alex
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/libev/Makefile,v
> retrieving revision 1.25
> diff -u -p -u -p -r1.25 Makefile
> --- Makefile 31 Aug 2019 17:21:33 - 1.25
> +++ Makefile 18 Mar 2020 08:57:17 -
> @@ -3,7 +3,7 @@
> COMMENT =high-performance event loop library
>
> # p5-EV should probably be kept in sync
> -DISTNAME = libev-4.27
> +DISTNAME = libev-4.31
> CATEGORIES = devel
>
> SHARED_LIBS= ev 3.1 # 4.0
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/libev/distinfo,v
> retrieving revision 1.13
> diff -u -p -u -p -r1.13 distinfo
> --- distinfo 31 Aug 2019 17:21:33 - 1.13
> +++ distinfo 18 Mar 2020 08:57:17 -
> @@ -1,2 +1,2 @@
> -SHA256 (libev-4.27.tar.gz) = LVUm/I2k8HLdXHPhj7sWZvXvjteLc7uhLhlc/dgQNE4=
> -SIZE (libev-4.27.tar.gz) = 556658
> +SHA256 (libev-4.31.tar.gz) = 7YVdK1IRjjLAwaajK9GMl/nmcRylEfXuEt47nszGblo=
> +SIZE (libev-4.31.tar.gz) = 565540
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/libev/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 PLIST
> --- pkg/PLIST 23 Apr 2013 18:59:53 - 1.3
> +++ pkg/PLIST 18 Mar 2020 08:57:17 -
> @@ -1,7 +1,7 @@
> @comment $OpenBSD: PLIST,v 1.3 2013/04/23 18:59:53 dcoppa Exp $
> include/ev++.h
> include/ev.h
> -lib/libev.a
> +@static-lib lib/libev.a
> lib/libev.la
> @lib lib/libev.so.${LIBev_VERSION}
> @man man/man3/ev.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rpoin...@cvs.openbsd.org2020/03/18 03:22:56 Modified files: devel/libbfio : Makefile distinfo devel/libbfio/pkg: PLIST Log message: updte libbfio to 20191230.
[UPDATE] devel/libev (4.27 -> 4.31)
this patche updates GNU libev to version 4.31.
Changelog:
4.31 Fri Dec 20 21:58:29 CET 2019
- handle backends with minimum wait time a bit better by not
waiting in the presence of already-expired timers
(behaviour reported by Felipe Gasper).
- new feature: use timerfd to detect timejumps quickly,
can be disabled with the new EVFLAG_NOTIMERFD loop flag.
- document EV_USE_SIGNALFD feature macro.
4.30 (EV only)
- change non-autoconf test for __kernel_rwf_t by testing
LINUX_VERSION_CODE, the most direct test I could find.
- fix a bug in the io_uring backend that polled the wrong
backend fd, causing it to not work in many cases.
4.29 (EV only)
- add io uring autoconf and non-autoconf detection.
- disable io_uring when some header files are too old.
4.28 (EV only)
- linuxaio backend resulted in random memory corruption
when loop is forked.
- linuxaio backend might have tried to cancel an iocb
multiple times (was unable to trigger this).
- linuxaio backend now employs a generation counter to
avoid handling spurious events from cancelled requests.
- io_cancel can return EINTR, deal with it. also, assume
io_submit also returns EINTR.
- fix some other minor bugs in linuxaio backend.
- ev_tstamp type can now be overriden by defining EV_TSTAMP_T.
- cleanup: replace expect_true/false and noinline by their
libecb counterparts.
- move syscall infrastructure from ev_linuxaio.c to ev.c.
- prepare io_uring integration.
- tweak ev_floor.
- epoll, poll, win32 Sleep and other places that use millisecond
reslution now all try to round up times.
- solaris port backend didn't compile.
- abstract time constants into their macros, for more flexibility.
Cheers,
Alex
Index: Makefile
===
RCS file: /cvs/ports/devel/libev/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- Makefile 31 Aug 2019 17:21:33 - 1.25
+++ Makefile 18 Mar 2020 08:57:17 -
@@ -3,7 +3,7 @@
COMMENT = high-performance event loop library
# p5-EV should probably be kept in sync
-DISTNAME = libev-4.27
+DISTNAME = libev-4.31
CATEGORIES = devel
SHARED_LIBS= ev 3.1 # 4.0
Index: distinfo
===
RCS file: /cvs/ports/devel/libev/distinfo,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 distinfo
--- distinfo 31 Aug 2019 17:21:33 - 1.13
+++ distinfo 18 Mar 2020 08:57:17 -
@@ -1,2 +1,2 @@
-SHA256 (libev-4.27.tar.gz) = LVUm/I2k8HLdXHPhj7sWZvXvjteLc7uhLhlc/dgQNE4=
-SIZE (libev-4.27.tar.gz) = 556658
+SHA256 (libev-4.31.tar.gz) = 7YVdK1IRjjLAwaajK9GMl/nmcRylEfXuEt47nszGblo=
+SIZE (libev-4.31.tar.gz) = 565540
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/libev/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST 23 Apr 2013 18:59:53 - 1.3
+++ pkg/PLIST 18 Mar 2020 08:57:17 -
@@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.3 2013/04/23 18:59:53 dcoppa Exp $
include/ev++.h
include/ev.h
-lib/libev.a
+@static-lib lib/libev.a
lib/libev.la
@lib lib/libev.so.${LIBev_VERSION}
@man man/man3/ev.3
[UPDATE] devel/help2man (1.47.12 -> 1.47.13)
Hey,
this patch updates GNU help2man to version 1.47.13.
Changelog since 1.47.12 says:
help2man (1.47.13) unstable; urgency=medium
* Merge change from Po-Chuan Hsieh to suppress creation of an empty
pkglibdir when nls is disabled.
* Remove install_dirs target entirely, add explicit $(MKINSTALLDIRS)
before each $(INSTALL_{DATA,PROGRAM}) call.
* Update parsing of --version to allow multi-word programs when
constructing the placeholder NAME paragraph (thanks to Jarno Suni).
Cheers,
Alex
Index: Makefile
===
RCS file: /cvs/ports/devel/help2man/Makefile,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 Makefile
--- Makefile 21 Jan 2020 08:15:19 - 1.29
+++ Makefile 18 Mar 2020 08:06:00 -
@@ -2,7 +2,7 @@
COMMENT= generates simple manual pages from program output
-DISTNAME= help2man-1.47.12
+DISTNAME= help2man-1.47.13
EXTRACT_SUFX= .tar.xz
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU:=help2man/}
Index: distinfo
===
RCS file: /cvs/ports/devel/help2man/distinfo,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 distinfo
--- distinfo 21 Jan 2020 08:15:19 - 1.18
+++ distinfo 18 Mar 2020 08:06:00 -
@@ -1,2 +1,2 @@
-SHA256 (help2man-1.47.12.tar.xz) = fQumTPnRbsl8wRqvtlm1Wqe97JkHL/Kuxfzs8PvqsWA=
-SIZE (help2man-1.47.12.tar.xz) = 202252
+SHA256 (help2man-1.47.13.tar.xz) = t/i7rR8sQF23R+P1pNXh7dxjs2AiHIJL95dI8ntWBSM=
+SIZE (help2man-1.47.13.tar.xz) = 202480
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2020/03/18 02:09:18 Modified files: devel/git : Makefile distinfo Log message: Update to git-2.25.2.
Re: x11/kde4/libs X509_getm_notBefore fix
On Wed, Mar 18, 2020 at 07:20:00AM +0100, Rafael Sadowski wrote:
> On Tue Mar 17, 2020 at 06:09:20PM +0100, Theo Buehler wrote:
> > X509_getm_notBefore(), aka the gift that keeps on giving...
> >
> > jca pointed out to me that kde/libs failed to build on ld.bfd
> > architectures due to a linking error in libkio [1]:
> >
> > /usr/obj/ports/kdelibs-4.14.10/build-sparc64/lib/libkio.so.50.3: undefined
> > reference to `X509_getm_notBefore'
> > /usr/obj/ports/kdelibs-4.14.10/build-sparc64/lib/libkio.so.50.3: undefined
> > reference to `X509_getm_notAfter'
> >
> > This started happening after I fixed a qt4 SSL-related runtime failure
> > that rsadowski@ showed me during p2k19.
> >
> > Before that fix, it linked, but only by accident. This was defintely
> > broken on all architectures since August 2018.
> >
> > This is what happened (the notAfter case is the same):
> >
> > X509_get_notBefore(x) used to be a macro that reached inside the X509 x.
> > In OpenSSL, this macro was replaced with a function,
> > X509_getm_notBefore(), and openssl/x509.h now contains
> >
> > #define X509_get_notBefore X509_getm_notBefore
> >
> > so when an linking a program that uses X509_get_notBefore() this means
> > ld.bfd will look up X509_getm_notBefore().
> >
> > When trying to adapt the Qt4 openssl symbols sausage factory to this, I
> > accidentally exposed a bogus symbol X509_getm_notBefore() in QtNetwork,
> > which was enough to make ld.bfd happy. The Qt symbol lookup madness got
> > rightfully confused by this, and this led to the segfault rsadowski
> > showed me. The Qt4 side was fixed last November (although there should
> > have been a major bump for QtNetwork and some other Qt libraries).
> >
> > The diff below fixes libkio by adding a symbol lookup similar to other
> > libcrypto symbols and using it in ksslcertificate.cpp in place of the
> > macro. Note that this is internal only, so no library bump required.
> >
> > check_sym shows the expected removal of the two external references to
> > X509_getm_notBefore and X509_getm_notAfter for libkio.
> >
> > I have build tested this on amd64 and sparc64.
>
> With some meaningful comments in the new patches, ok with me but please
> wait for jca@' feedback. Thanks tb
Thanks. I added comments to the patches and fixed a copy-paste error in
a code comment for kio/kssl/kopenssl.h.
Index: Makefile
===
RCS file: /var/cvs/ports/x11/kde4/libs/Makefile,v
retrieving revision 1.93
diff -u -p -r1.93 Makefile
--- Makefile23 Nov 2019 15:25:31 - 1.93
+++ Makefile18 Mar 2020 07:18:08 -
@@ -12,7 +12,7 @@ PKGNAME-langlist =kde4-langlist-$V
PKG_ARCH-en_US = *
PKG_ARCH-langlist =*
PKGSPEC-main = kdelibs-${MODKDE4_SPEC}
-REVISION-main =19
+REVISION-main =20
REVISION-en_US = 0
REVISION-langlist =0
Index: patches/patch-kio_kssl_kopenssl_cpp
===
RCS file: patches/patch-kio_kssl_kopenssl_cpp
diff -N patches/patch-kio_kssl_kopenssl_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-kio_kssl_kopenssl_cpp 18 Mar 2020 07:09:42 -
@@ -0,0 +1,46 @@
+$OpenBSD$
+
+Resolve X509_getm_notBefore() and X509_getm_notAfter() at runtime
+to fix use of X509_get_notBefore() and X509_get_notAfter() in
+kio/kssl/ksslcertificate.cpp after openssl/x509.h rev 1.70.
+
+Index: kio/kssl/kopenssl.cpp
+--- kio/kssl/kopenssl.cpp.orig
kio/kssl/kopenssl.cpp
+@@ -80,6 +80,8 @@ static void (*K_X509_free) (X509 *) = 0L;
+ static char *(*K_X509_NAME_oneline) (X509_NAME *,char *,int) = 0L;
+ static X509_NAME *(*K_X509_get_subject_name) (X509 *) = 0L;
+ static X509_NAME *(*K_X509_get_issuer_name) (X509 *) = 0L;
++static ASN1_TIME *(*K_X509_getm_notBefore) (const X509 *) = 0L;
++static ASN1_TIME *(*K_X509_getm_notAfter) (const X509 *) = 0L;
+ static X509_LOOKUP *(*K_X509_STORE_add_lookup) (X509_STORE *,
X509_LOOKUP_METHOD *) = 0L;
+ static X509_LOOKUP_METHOD *(*K_X509_LOOKUP_file)(void) = 0L;
+ static void (*K_X509_LOOKUP_free)(X509_LOOKUP *) = 0L;
+@@ -422,6 +424,8 @@ KOpenSSLProxy::KOpenSSLProxy()
+ K_X509_NAME_oneline = (char * (*) (X509_NAME *,char *,int))
d->cryptoLib->resolveFunction("X509_NAME_oneline");
+ K_X509_get_subject_name = (X509_NAME * (*) (X509 *))
d->cryptoLib->resolveFunction("X509_get_subject_name");
+ K_X509_get_issuer_name = (X509_NAME * (*) (X509 *))
d->cryptoLib->resolveFunction("X509_get_issuer_name");
++ K_X509_getm_notBefore = (ASN1_TIME * (*) (const X509 *))
d->cryptoLib->resolveFunction("X509_getm_notBefore");
++ K_X509_getm_notAfter = (ASN1_TIME * (*) (const X509 *))
d->cryptoLib->resolveFunction("X509_getm_notAfter");
+ K_X509_STORE_add_lookup = (X509_LOOKUP *(*) (X509_STORE *,
X509_LOOKUP_METHOD *)) d->cryptoLib->resolveFunction("X509_STORE_add_lookup");
+ K_X509_LOOKUP_file = (X509_LOOKUP_METHOD
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2020/03/18 01:01:12 Modified files: audio/cantata : Makefile distinfo Log message: Update to cantata 2.4.1
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rpoin...@cvs.openbsd.org2020/03/18 00:43:48 Modified files: sysutils : Makefile Log message: + SUBDIR += libluksde
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: rpoin...@cvs.openbsd.org2020/03/18 00:40:13 Log message: import libluksde, a library to access LUKS Disk Encryption encrypted volumes. needed by plaso. Status: Vendor Tag: rpointel Release Tags: rpointel_20200318 N ports/sysutils/libluksde/Makefile N ports/sysutils/libluksde/distinfo N ports/sysutils/libluksde/pkg/DESCR N ports/sysutils/libluksde/pkg/PLIST No conflicts created by this import
Re: x11/kde4/libs X509_getm_notBefore fix
On Tue Mar 17, 2020 at 06:09:20PM +0100, Theo Buehler wrote:
> X509_getm_notBefore(), aka the gift that keeps on giving...
>
> jca pointed out to me that kde/libs failed to build on ld.bfd
> architectures due to a linking error in libkio [1]:
>
> /usr/obj/ports/kdelibs-4.14.10/build-sparc64/lib/libkio.so.50.3: undefined
> reference to `X509_getm_notBefore'
> /usr/obj/ports/kdelibs-4.14.10/build-sparc64/lib/libkio.so.50.3: undefined
> reference to `X509_getm_notAfter'
>
> This started happening after I fixed a qt4 SSL-related runtime failure
> that rsadowski@ showed me during p2k19.
>
> Before that fix, it linked, but only by accident. This was defintely
> broken on all architectures since August 2018.
>
> This is what happened (the notAfter case is the same):
>
> X509_get_notBefore(x) used to be a macro that reached inside the X509 x.
> In OpenSSL, this macro was replaced with a function,
> X509_getm_notBefore(), and openssl/x509.h now contains
>
> #define X509_get_notBefore X509_getm_notBefore
>
> so when an linking a program that uses X509_get_notBefore() this means
> ld.bfd will look up X509_getm_notBefore().
>
> When trying to adapt the Qt4 openssl symbols sausage factory to this, I
> accidentally exposed a bogus symbol X509_getm_notBefore() in QtNetwork,
> which was enough to make ld.bfd happy. The Qt symbol lookup madness got
> rightfully confused by this, and this led to the segfault rsadowski
> showed me. The Qt4 side was fixed last November (although there should
> have been a major bump for QtNetwork and some other Qt libraries).
>
> The diff below fixes libkio by adding a symbol lookup similar to other
> libcrypto symbols and using it in ksslcertificate.cpp in place of the
> macro. Note that this is internal only, so no library bump required.
>
> check_sym shows the expected removal of the two external references to
> X509_getm_notBefore and X509_getm_notAfter for libkio.
>
> I have build tested this on amd64 and sparc64.
With some meaningful comments in the new patches, ok with me but please
wait for jca@' feedback. Thanks tb
>
> [1]:
> http://build-failures.rhaalovely.net/sparc64/2020-03-08/x11/kde4/libs,,-en_US.log
>
> Index: Makefile
> ===
> RCS file: /var/cvs/ports/x11/kde4/libs/Makefile,v
> retrieving revision 1.93
> diff -u -p -r1.93 Makefile
> --- Makefile 23 Nov 2019 15:25:31 - 1.93
> +++ Makefile 17 Mar 2020 12:40:02 -
> @@ -12,7 +12,7 @@ PKGNAME-langlist = kde4-langlist-$V
> PKG_ARCH-en_US = *
> PKG_ARCH-langlist = *
> PKGSPEC-main = kdelibs-${MODKDE4_SPEC}
> -REVISION-main = 19
> +REVISION-main = 20
> REVISION-en_US = 0
> REVISION-langlist = 0
>
> Index: patches/patch-kio_kssl_kopenssl_cpp
> ===
> RCS file: patches/patch-kio_kssl_kopenssl_cpp
> diff -N patches/patch-kio_kssl_kopenssl_cpp
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-kio_kssl_kopenssl_cpp 17 Mar 2020 11:54:08 -
> @@ -0,0 +1,42 @@
> +$OpenBSD$
> +
> +Index: kio/kssl/kopenssl.cpp
> +--- kio/kssl/kopenssl.cpp.orig
> kio/kssl/kopenssl.cpp
> +@@ -80,6 +80,8 @@ static void (*K_X509_free) (X509 *) = 0L;
> + static char *(*K_X509_NAME_oneline) (X509_NAME *,char *,int) = 0L;
> + static X509_NAME *(*K_X509_get_subject_name) (X509 *) = 0L;
> + static X509_NAME *(*K_X509_get_issuer_name) (X509 *) = 0L;
> ++static ASN1_TIME *(*K_X509_getm_notBefore) (const X509 *) = 0L;
> ++static ASN1_TIME *(*K_X509_getm_notAfter) (const X509 *) = 0L;
> + static X509_LOOKUP *(*K_X509_STORE_add_lookup) (X509_STORE *,
> X509_LOOKUP_METHOD *) = 0L;
> + static X509_LOOKUP_METHOD *(*K_X509_LOOKUP_file)(void) = 0L;
> + static void (*K_X509_LOOKUP_free)(X509_LOOKUP *) = 0L;
> +@@ -422,6 +424,8 @@ KOpenSSLProxy::KOpenSSLProxy()
> + K_X509_NAME_oneline = (char * (*) (X509_NAME *,char *,int))
> d->cryptoLib->resolveFunction("X509_NAME_oneline");
> + K_X509_get_subject_name = (X509_NAME * (*) (X509 *))
> d->cryptoLib->resolveFunction("X509_get_subject_name");
> + K_X509_get_issuer_name = (X509_NAME * (*) (X509 *))
> d->cryptoLib->resolveFunction("X509_get_issuer_name");
> ++ K_X509_getm_notBefore = (ASN1_TIME * (*) (const X509 *))
> d->cryptoLib->resolveFunction("X509_getm_notBefore");
> ++ K_X509_getm_notAfter = (ASN1_TIME * (*) (const X509 *))
> d->cryptoLib->resolveFunction("X509_getm_notAfter");
> + K_X509_STORE_add_lookup = (X509_LOOKUP *(*) (X509_STORE *,
> X509_LOOKUP_METHOD *)) d->cryptoLib->resolveFunction("X509_STORE_add_lookup");
> + K_X509_LOOKUP_file = (X509_LOOKUP_METHOD *(*)(void))
> d->cryptoLib->resolveFunction("X509_LOOKUP_file");
> + K_X509_LOOKUP_free = (void (*)(X509_LOOKUP *))
> d->cryptoLib->resolveFunction("X509_LOOKUP_free");
> +@@ -902,6 +906,18 @@ X509_NAME *KOpenSSLProxy::X509_get_subject_name(X509 *
> +
> + X509_NAME
