[update] lang/node to 12.22.6

2021-08-31 Thread vlkrs
Hi,

attached is an updated patch to update lang/node to the latest LTS version 
12.22.6

This removes patches/patch-configure_py (included upstream), and fixes a 
plethora of security issues since 12.16.1 as currently found in ports, the most 
recent of which can be found here:

https://nodejs.org/en/blog/release/v12.22.6/

Anyone willing to review and (hopefully) commit?

Volker



patch-node-v12.22.6
Description: Binary data


Bounty for net/ejabberd port

2021-08-31 Thread georgeorwell
Moin!

Unfortunately I don't have the know-how nor the time to work on it
myself, but therefore I would like to sponsor a port for net/ejabberd
and would pay 100€ to the new maintainer.

--georgeorwell



[patch] www/luakit fix printf("%n")

2021-08-31 Thread Stefan Hagen
Hi,

This fixes:
Aug 31 23:37:50 x230 luakit: *printf used %n: %s:%d%n

It can be tested:
1. start luakit
2. type: ":lua foobar()"

An error text with a Traceback occurs. The text + alignment is created
with the fixed function.

OK?

Best regards,
Stefan

Index: www/luakit/Makefile
===
RCS file: /cvs/ports/www/luakit/Makefile,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 Makefile
--- www/luakit/Makefile 21 Mar 2021 14:16:21 -  1.29
+++ www/luakit/Makefile 31 Aug 2021 21:53:30 -
@@ -5,6 +5,7 @@ COMMENT =   fast, small, webkit based brow
 GH_ACCOUNT =   luakit
 GH_PROJECT =   luakit
 GH_TAGNAME =   2.3
+REVISION = 0
 
 EPOCH =1
 
Index: www/luakit/patches/patch-common_luautil_c
===
RCS file: www/luakit/patches/patch-common_luautil_c
diff -N www/luakit/patches/patch-common_luautil_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ www/luakit/patches/patch-common_luautil_c   31 Aug 2021 21:53:30 -
@@ -0,0 +1,19 @@
+$OpenBSD$
+
+Fix printf '%n'
+
+Index: common/luautil.c
+--- common/luautil.c.orig
 common/luautil.c
+@@ -72,7 +72,10 @@ luaH_traceback(lua_State *L, lua_State *T, gint min_le
+ } else {
+ const char *src = AR_SRC(ar);
+ int n;
+-g_string_append_printf(tb, "%s:%d%n", src, ar.currentline, &n);
++char tmp[10] = "";
++sprintf(tmp, "%d", ar.currentline);
++n = strlen(src) + strlen(tmp) + 1;
++g_string_append_printf(tb, "%s:%d", src, ar.currentline);
+ g_string_append_printf(tb, "%*.*s", loc_pad-n, loc_pad-n, "");
+ }
+ 



Re: [PATCH] devel/cabal-install: reduce brittleness through minor ghc upgrades

2021-08-31 Thread Matthias Kilian
Hi Greg,

On Tue, Aug 17, 2021 at 11:34:01AM -0700, Greg Steuck wrote:
> While strict version checks for built-in ghc packages in cabal-install
> build procedure provide a modicum of extra safety, in practice for the
> ports tree they impose extra version tracking burden. The ports tree
> is already self-consistent. Cross-checks of version numbers cause
> false positives and add more toil.
> 
> OK?

Yes, let's try it. (and sorry for the delay)

Ciao,
Kili

> ---
>  devel/cabal-install/Makefile  |   7 +-
>  devel/cabal-install/files/openbsd-8.10.3.json |   1 -
>  devel/cabal-install/files/openbsd.json| 260 ++
>  3 files changed, 262 insertions(+), 6 deletions(-)
>  delete mode 100644 devel/cabal-install/files/openbsd-8.10.3.json
>  create mode 100644 devel/cabal-install/files/openbsd.json
> 
> diff --git a/devel/cabal-install/Makefile b/devel/cabal-install/Makefile
> index a75c7957aa4..9446b82f7c2 100644
> --- a/devel/cabal-install/Makefile
> +++ b/devel/cabal-install/Makefile
> @@ -4,7 +4,7 @@ COMMENT = command-line interface for Cabal and Hackage
>  
>  DISTNAME =   cabal-install-3.4.0.0
>  CATEGORIES = devel
> -REVISION =   1
> +REVISION =   2
>  
>  GH_ACCOUNT = haskell
>  GH_TAGNAME = ${DISTNAME}
> @@ -75,11 +75,8 @@ post-extract:
>   @ln -s ${FULLDISTDIR}/${_package}-${_version}_${_revision}.cabal 
> ${WRKBUILD}/_build/tarballs/${_package}.cabal
>  .endfor
>  
> -# Uses the same fixed versions of packages as in _MANIFEST. The
> -# distributed package currently doesn't have a 8.10.3 variant.  The
> -# json file is generated by following cabal bootstrap instructions.
>  do-build:
> - @cd ${WRKBUILD} && ${MODPY_BIN} bootstrap/bootstrap.py -d 
> ${FILESDIR}/openbsd-8.10.3.json
> + @cd ${WRKBUILD} && ${MODPY_BIN} bootstrap/bootstrap.py -d 
> ${FILESDIR}/openbsd.json
>  
>  do-install:
>   @install -m755 ${WRKBUILD}/_build/bin/cabal ${PREFIX}/bin
> diff --git a/devel/cabal-install/files/openbsd-8.10.3.json 
> b/devel/cabal-install/files/openbsd-8.10.3.json
> deleted file mode 100644
> index 6949634f9e6..000
> --- a/devel/cabal-install/files/openbsd-8.10.3.json
> +++ /dev/null
> @@ -1 +0,0 @@
> -{"builtin":[{"version":"1.0.1","package":"rts"},{"version":"0.6.1","package":"ghc-prim"},{"version":"1.0.3.0","package":"integer-gmp"},{"version":"4.14.3.0","package":"base"},{"version":"0.5.4.0","package":"array"},{"version":"1.4.4.0","package":"deepseq"},{"version":"0.10.12.0","package":"bytestring"},{"version":"0.6.5.1","package":"containers"},{"version":"0.8.8.0","package":"binary"},{"version":"1.4.2.1","package":"filepath"},{"version":"1.9.3","package":"time"},{"version":"2.7.2.2","package":"unix"},{"version":"1.3.6.0","package":"directory"},{"version":"0.5.6.2","package":"transformers"},{"version":"2.2.2","package":"mtl"},{"version":"8.10.6","package":"ghc-boot-th"},{"version":"1.1.3.6","package":"pretty"},{"version":"2.16.0.0","package":"template-haskell"},{"version":"1.2.4.1","package":"text"},{"version":"3.1.14.0","package":"parsec"},{"version":"1.6.13.2","package":"process"},{"version":"2.5.0.1","package":"stm"}],"dependencies":[{"flags":["-bundled-binary-generic"],"src_sha256":null,"version":"3.4.0.0","package":"Cabal","source":"local","revision":null,"cabal_sha256":null},{"flags":["-examples","+integer-gmp","+sse2","-sse41"],"src_sha256":"822e5413fbccca6ae884d3aba4066422c8b5d58d23d18b9ecb5c03273bb19ab4","version":"1.3.0.0","package":"hashable","source":"hackage","revision":2,"cabal_sha256":"d60cad00223d46172020c136e68acef0481a47d0302b2e74b1805b4f3a446a9b"},{"flags":["-bench"],"src_sha256":"4b4ab1ac82c45144d82c6daf6cb6ba45eab9957dad44787fa5e869e23d73bbff","version":"2.2.2","package":"async","source":"hackage","revision":1,"cabal_sha256":"a178c166856da7ff22fe4500337b54812e94fd2059409452187d72e057ede9cd"},{"flags":["-optimised-mixer"],"src_sha256":"46009f4b000c9e6613377767b8718bf38476469f2a8e2162d98cc246882d5a35","version":"0.1.0.3","package":"splitmix","source":"hackage","revision":0,"cabal_sha256":"fc3aae74c467f4b608050bef53aec17904a618731df9407e655d8f3bf8c32d5c"},{"flags":[],"src_sha256":"e4519cf7c058bfd5bdbe4acc782284acc9e25e74487208619ca83cbcd63fb9de","version":"1.2.0","package":"random","source":"hackage","revision":3,"cabal_sha256":"1e8140229d21489228aa79b820c23259f3c3a1b86e13e6f9c2ad0c48d86d1912"},{"flags":["-old-bytestring","-old-time"],"src_sha256":"b384449f62b2b0aa3e6d2cb1004b8060b01f21ec93e7b63e7af6d8fad8a9f1de","version":"0.5.1.1","package":"tar","source":"hackage","revision":2,"cabal_sha256":"7a715414c4d494c9048cfb6d7634e07e7732ca154cb8938dc85f6ea192192e8c"},{"flags":["-devel"],"src_sha256":"fcaa954445cb575ff04d088e719452e356324b6acb98c5aefd2541a069439d4a","version":"3.1.2.1","package":"network","source":"hackage","revision":1,"cabal_sha256":"188d6daea8cd91bc3553efd5a90a1e7c6d0425fa66a53baa74db5b6d9fd75c8b"},{"flags":[],"src_sha256":"a01c1389f15d2cc2e847914737f706133bb11f0c5f8ee89711a36a25b7afa723","version":"2.6.3.0","

Re: ports and printf("%n")

2021-08-31 Thread Jeremie Courreges-Anglas
On Tue, Aug 31 2021, Jeremie Courreges-Anglas  wrote:
> On Tue, Aug 31 2021, "Theo de Raadt"  wrote:
>> Christian Weisgerber  wrote:
>>
>>> Jeremie Courreges-Anglas:
>>> 
>>> > Ports may suffer from this at build time *and* runtime.  Regarding
>>> > issues at build time we can ease the debugging with the diff below.
>>> 
>>> I've been running with this for months, but nobody asked me for
>>> results and I didn't push the issue.  Grepping /var/log/messages.*
>>> and deduplicating the results shows this:
>>> 
>>> devel/bison conftest: *printf used %n: %d %n
>>> devel/gettext,-runtime conftest: *printf used %n: %d %n
>>> devel/grcs conftest: *printf used %n: %d %n
>>> devel/m4 conftest: *printf used %n: %d %n
>>> editors/poke conftest: *printf used %n: %d %n
>>> editors/zile conftest: *printf used %n: %d %n
>>> lang/gpc genmodes: *printf used %n:   %s,%n
>>> lang/gpc genmodes: *printf used %n:   %smode,%n
>>> math/pspp conftest: *printf used %n: %d %n
>>> net/lftp conftest: *printf used %n: %d %n
>>> security/gnupg mkdefsinc: *printf used %n: %d %n%s %d
>>> security/gpgme,-main mkdefsinc: *printf used %n: %d %n%s %d
>>> sysutils/coreutils conftest: *printf used %n: %d %n
>>> textproc/groff conftest: *printf used %n: %d %n
>>> textproc/recutils conftest: *printf used %n: %d %n
>>
>> Ouch.  I was under the impression the %n problem was finished.
>
> From the list above I feel that most of them aren't an issue,
> specifically the ones showing "conftest: *printf used %n: %d %n".
> Those are autoconf tests that attempt to detect whether %n is usable,
> usually without the software actually using the result of the test.
>
> textproc/recutils is new to me, I can fix it easily.
> lang/gpc isn't new to me, I forgot about it.
> security/gnupg is fixed already
> security/gpgme,-main is the most important one that needs a fix.
>
>> Backout required until those get fixed?
>
> Unless my analysis above proves to be wrong, I don't think it needs to
> be backed out.  The port listed above that need fixing will probably be
> fixed by the time you push out a new snapshot.

Done, please update to the very latest before starting your build.

Hotfix in case your build has already started:

cd /usr/ports && for d in security/gpgme textproc/recutils lang/gpc math/pspp; 
do (cd "$d" && cvs up -A); done

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



[security update] net/synapse -> 1.41.1

2021-08-31 Thread Renaud Allard

Hello,

Here is an update for net/synapse to 1.41.1. This solve 2 security issues:


GHSA-3x4c-pq33-4w3q / CVE-2021-39164: Enumerating a private room's list 
of members and their display names.


If an unauthorized user both knows the Room ID of a private room and 
that room's history visibility is set to shared, then they may be able 
to enumerate the room's members, including their display names.


The unauthorized user must be on the same homeserver as a user who is a 
member of the target room.


Fixed by 52c7a51cf.

GHSA-jj53-8fmw-f2w2 / CVE-2021-39163: Disclosing a private room's name, 
avatar, topic, and number of members.


If an unauthorized user knows the Room ID of a private room, then its 
name, avatar, topic, and number of members may be disclosed through 
Group / Community features.


The unauthorized user must be on the same homeserver as a user who is a 
member of the target room, and their homeserver must allow 
non-administrators to create groups (enable_group_creation in the 
Synapse configuration; off by default).


Best Regards
Index: Makefile
===
RCS file: /cvs/ports/net/synapse/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile	17 Aug 2021 13:51:32 -	1.23
+++ Makefile	31 Aug 2021 13:28:47 -
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.23 2021/08/17 13:51:32 abieber Exp $
+# $OpenBSD: Makefile,v 1.20.2.1 2021/05/14 17:49:19 solene Exp $
 
 COMMENT =	open network for secure, decentralized communication
 
-MODPY_EGG_VERSION =	1.40.0
+MODPY_EGG_VERSION =	1.41.1
 
 GH_ACCOUNT =	matrix-org
 GH_PROJECT =	synapse
@@ -66,6 +66,6 @@ TEST_DEPENDS =	${RUN_DEPENDS} \
 		www/py-jwt${MODPY_FLAVOR}
 
 do-test:
-	cd ${WRKSRC} && ${SETENV} PYTHONPATH=. ${LOCALBASE}/bin/trial tests
+	cd ${WRKSRC} && ${SETENV} PYTHONPATH=. ${LOCALBASE}/bin/trial-3 tests
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/net/synapse/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo	17 Aug 2021 13:51:32 -	1.19
+++ distinfo	31 Aug 2021 13:28:47 -
@@ -1,2 +1,2 @@
-SHA256 (synapse-1.40.0.tar.gz) = D708mem1tKNP87xW3bdUPe4DayLaRkMDzGun75FgCBg=
-SIZE (synapse-1.40.0.tar.gz) = 7409547
+SHA256 (synapse-1.41.1.tar.gz) = 6+vIEMAfa8/JcKUyfzFJll2mBiGrkXMN2X+EnT0znv4=
+SIZE (synapse-1.41.1.tar.gz) = 7436053
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/synapse/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST
--- pkg/PLIST	17 Aug 2021 13:51:32 -	1.18
+++ pkg/PLIST	31 Aug 2021 13:28:47 -
@@ -239,9 +239,19 @@ lib/python${MODPY_VERSION}/site-packages
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/${MODPY_PYCACHE}/
 lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/${MODPY_PYCACHE}server.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/client.py
-lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/server.py
+lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/server/
+lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/server/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/server/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/server/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/server/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/server/${MODPY_PYCACHE}federation.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/server/${MODPY_PYCACHE}groups_local.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/server/${MODPY_PYCACHE}groups_server.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/server/_base.py
+lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/server/federation.py
+lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/server/groups_local.py
+lib/python${MODPY_VERSION}/site-packages/synapse/federation/transport/server/groups_server.py
 lib/python${MODPY_VERSION}/site-packages/synapse/federation/units.py
 lib/python${MODPY_VERSION}/site-packages/synapse/groups/
 lib/python${MODPY_VERSION}/site-packages/synapse/groups/__init__.py
@@ -287,11 +297,11 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY

Re: ports and printf("%n")

2021-08-31 Thread Jeremie Courreges-Anglas
On Tue, Aug 31 2021, "Theo de Raadt"  wrote:
> Christian Weisgerber  wrote:
>
>> Jeremie Courreges-Anglas:
>> 
>> > Ports may suffer from this at build time *and* runtime.  Regarding
>> > issues at build time we can ease the debugging with the diff below.
>> 
>> I've been running with this for months, but nobody asked me for
>> results and I didn't push the issue.  Grepping /var/log/messages.*
>> and deduplicating the results shows this:
>> 
>> devel/bison conftest: *printf used %n: %d %n
>> devel/gettext,-runtime conftest: *printf used %n: %d %n
>> devel/grcs conftest: *printf used %n: %d %n
>> devel/m4 conftest: *printf used %n: %d %n
>> editors/poke conftest: *printf used %n: %d %n
>> editors/zile conftest: *printf used %n: %d %n
>> lang/gpc genmodes: *printf used %n:   %s,%n
>> lang/gpc genmodes: *printf used %n:   %smode,%n
>> math/pspp conftest: *printf used %n: %d %n
>> net/lftp conftest: *printf used %n: %d %n
>> security/gnupg mkdefsinc: *printf used %n: %d %n%s %d
>> security/gpgme,-main mkdefsinc: *printf used %n: %d %n%s %d
>> sysutils/coreutils conftest: *printf used %n: %d %n
>> textproc/groff conftest: *printf used %n: %d %n
>> textproc/recutils conftest: *printf used %n: %d %n
>
> Ouch.  I was under the impression the %n problem was finished.

>From the list above I feel that most of them aren't an issue,
specifically the ones showing "conftest: *printf used %n: %d %n".
Those are autoconf tests that attempt to detect whether %n is usable,
usually without the software actually using the result of the test.

textproc/recutils is new to me, I can fix it easily.
lang/gpc isn't new to me, I forgot about it.
security/gnupg is fixed already
security/gpgme,-main is the most important one that needs a fix.

> Backout required until those get fixed?

Unless my analysis above proves to be wrong, I don't think it needs to
be backed out.  The port listed above that need fixing will probably be
fixed by the time you push out a new snapshot.

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



Re: ports and printf("%n")

2021-08-31 Thread Theo de Raadt
Christian Weisgerber  wrote:

> Jeremie Courreges-Anglas:
> 
> > Ports may suffer from this at build time *and* runtime.  Regarding
> > issues at build time we can ease the debugging with the diff below.
> 
> I've been running with this for months, but nobody asked me for
> results and I didn't push the issue.  Grepping /var/log/messages.*
> and deduplicating the results shows this:
> 
> devel/bison conftest: *printf used %n: %d %n
> devel/gettext,-runtime conftest: *printf used %n: %d %n
> devel/grcs conftest: *printf used %n: %d %n
> devel/m4 conftest: *printf used %n: %d %n
> editors/poke conftest: *printf used %n: %d %n
> editors/zile conftest: *printf used %n: %d %n
> lang/gpc genmodes: *printf used %n:   %s,%n
> lang/gpc genmodes: *printf used %n:   %smode,%n
> math/pspp conftest: *printf used %n: %d %n
> net/lftp conftest: *printf used %n: %d %n
> security/gnupg mkdefsinc: *printf used %n: %d %n%s %d
> security/gpgme,-main mkdefsinc: *printf used %n: %d %n%s %d
> sysutils/coreutils conftest: *printf used %n: %d %n
> textproc/groff conftest: *printf used %n: %d %n
> textproc/recutils conftest: *printf used %n: %d %n

Ouch.  I was under the impression the %n problem was finished.

Backout required until those get fixed?



Re: ports and printf("%n")

2021-08-31 Thread Christian Weisgerber
Jeremie Courreges-Anglas:

> Ports may suffer from this at build time *and* runtime.  Regarding
> issues at build time we can ease the debugging with the diff below.

I've been running with this for months, but nobody asked me for
results and I didn't push the issue.  Grepping /var/log/messages.*
and deduplicating the results shows this:

devel/bison conftest: *printf used %n: %d %n
devel/gettext,-runtime conftest: *printf used %n: %d %n
devel/grcs conftest: *printf used %n: %d %n
devel/m4 conftest: *printf used %n: %d %n
editors/poke conftest: *printf used %n: %d %n
editors/zile conftest: *printf used %n: %d %n
lang/gpc genmodes: *printf used %n:   %s,%n
lang/gpc genmodes: *printf used %n:   %smode,%n
math/pspp conftest: *printf used %n: %d %n
net/lftp conftest: *printf used %n: %d %n
security/gnupg mkdefsinc: *printf used %n: %d %n%s %d
security/gpgme,-main mkdefsinc: *printf used %n: %d %n%s %d
sysutils/coreutils conftest: *printf used %n: %d %n
textproc/groff conftest: *printf used %n: %d %n
textproc/recutils conftest: *printf used %n: %d %n

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



Re: [New] devel/luaffi

2021-08-31 Thread Edd Barrett
On Tue, Aug 24, 2021 at 03:06:02PM +0100, Laurence Tratt wrote:
> Please find attached a new port of LuaFFI:
>
> ...
> 
> The main reason I've ported this (along with some help from edd@) is because
> neovim is meant to be run with LuaJIT (which includes the FFI module as
> standard) whereas we run it with normal Lua (which doesn't).

I have no objection to this going in.

In case anyone is wondering why we don't just build Neovim with LuaJIT:

 - LuaJIT isn't as portable, although we could use it only for certain
   arches.

 - We'd have to add a LuaJIT FLAVOR to every Lua dependency. I looked at
   that in the past when I was first porting Neovim and it looked
   non-trivial. I don't really have the motivation for it, but I won't
   object if someone else wants to try.

-- 
Best Regards
Edd Barrett

https://www.theunixzoo.co.uk



Re: [Update} Python 3.8.11 -> 3.8.12

2021-08-31 Thread Rémi Pointel

Le 31/08/2021 à 07:21, Kurt Mosiejczuk a écrit :

Various security fixes:

https://docs.python.org/release/3.8.12/whatsnew/changelog.html#changelog

Test pass as before.

Patches regenerated

Should also be committed to -stable

ok?

(cc maintainer)


Hello,

sounds good to me, thanks.

You could take the maintainership on the Python ports if you want.

Best regards,

Remi.



games/openttd 12.0-beta2 to try

2021-08-31 Thread Solene Rapenne
hello, if some people want to try the next openttd version in its
beta state, here is a diff.

openttd changed there version numbering, current version
is 1.11.1 but next will be 12.0.

Index: Makefile
===
RCS file: /home/reposync/ports/games/openttd/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- Makefile4 May 2021 21:33:46 -   1.72
+++ Makefile20 Aug 2021 06:52:29 -
@@ -2,7 +2,7 @@
 
 COMMENT=   open source clone of the game Transport Tycoon Deluxe
 
-V =1.11.2
+V =12.0-beta2
 DISTNAME = openttd-$V-source
 PKGNAME =  openttd-$V
 
Index: distinfo
===
RCS file: /home/reposync/ports/games/openttd/distinfo,v
retrieving revision 1.39
diff -u -p -r1.39 distinfo
--- distinfo4 May 2021 21:33:46 -   1.39
+++ distinfo20 Aug 2021 06:54:22 -
@@ -1,2 +1,2 @@
-SHA256 (openttd/openttd-1.11.2-source.tar.xz) = 
D7qTWiqBX0/ozW3C4q4z9ydpU4cxIo+EimOzpulILm0=
-SIZE (openttd/openttd-1.11.2-source.tar.xz) = 6783972
+SHA256 (openttd/openttd-12.0-beta2-source.tar.xz) = 
rbNROb9p2yPzFswtdzUUnWuDxvF6Jz51PmvvAvBhOLc=
+SIZE (openttd/openttd-12.0-beta2-source.tar.xz) = 7006700



Re: [MAINTAINER UPDATE] www/qutebrowser -> 2.3.1

2021-08-31 Thread Stefan Hagen
Dimitri Karamazov wrote:
> On Thu, Aug 26, 2021 at 05:03:52PM +, Dimitri Karamazov wrote:
> > Simple update for www/qutebrowser to 2.3.1
> > 
> > Changelog:https://www.qutebrowser.org/doc/changelog.html
> > 
> > Build & Run tested on amd64

Same here. Builds and runs and passes the usual checks on amd64.

Have you ever attempted to make the test suite run? It fails currently.

The test suite sais tox should be used. But also with tox, it fails
to run, but differently.

I tested with:

+TEST_DEPENDS = devel/py-tox${MODPY_FLAVOR}
+
+do-test:
+   cd ${WRKSRC} && tox

And got:
[500 lines of output that looks okay]
creating '.tox/dist/qutebrowser-2.3.1.zip' and adding 'qutebrowser-2.3.1' to it
adding 'qutebrowser-2.3.1'
adding 'qutebrowser-2.3.1/doc'
adding 'qutebrowser-2.3.1/icons'
adding 'qutebrowser-2.3.1/misc'
adding 'qutebrowser-2.3.1/qutebrowser'
adding 'qutebrowser-2.3.1/qutebrowser.egg-info'
adding 'qutebrowser-2.3.1/scripts'
adding 'qutebrowser-2.3.1/tests'
Traceback (most recent call last):
  File "setup.py", line 68, in 
setuptools.setup(
  File "/usr/local/lib/python3.8/site-packages/setuptools/__init__.py", line 
153, in setup
return distutils.core.setup(**attrs)
  File "/usr/local/lib/python3.8/distutils/core.py", line 148, in setup
dist.run_commands()
  File "/usr/local/lib/python3.8/distutils/dist.py", line 966, in run_commands
self.run_command(cmd)
  File "/usr/local/lib/python3.8/distutils/dist.py", line 985, in run_command
cmd_obj.run()
  File "/usr/local/lib/python3.8/site-packages/setuptools/command/sdist.py", 
line 52, in run
self.make_distribution()
  File "/usr/local/lib/python3.8/site-packages/setuptools/command/sdist.py", 
line 76, in make_distribution
orig.sdist.make_distribution(self)
  File "/usr/local/lib/python3.8/distutils/command/sdist.py", line 480, in 
make_distribution
file = self.make_archive(base_name, fmt, base_dir=base_dir,
  File "/usr/local/lib/python3.8/distutils/cmd.py", line 369, in make_archive
return archive_util.make_archive(base_name, format, root_dir, base_dir,
  File "/usr/local/lib/python3.8/distutils/archive_util.py", line 250, in 
make_archive
filename = func(base_name, base_dir, **kwargs)
  File "/usr/local/lib/python3.8/distutils/archive_util.py", line 182, in 
make_zipfile
zip.write(path, path)
  File "/usr/local/lib/python3.8/zipfile.py", line 1741, in write
zinfo = ZipInfo.from_file(filename, arcname,
  File "/usr/local/lib/python3.8/zipfile.py", line 539, in from_file
zinfo = cls(arcname, date_time)
  File "/usr/local/lib/python3.8/zipfile.py", line 362, in __init__
raise ValueError('ZIP does not support timestamps before 1980')
ValueError: ZIP does not support timestamps before 1980

ERROR: FAIL could not package project - v = 
InvocationError('/usr/local/bin/python3.8 
/usr/ports/pobj/qutebrowser-2.3.1/qutebrowser-2.3.1/setup.py sdist 
--formats=zip --dist-dir 
/usr/ports/pobj/qutebrowser-2.3.1/qutebrowser-2.3.1/.tox/dist (see 
/usr/ports/pobj/qutebrowser-2.3.1/qutebrowser-2.3.1/.tox/log/tox-0.log)', 1)
*** Error 2 in . (Makefile:33 'do-test')
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2976 
'/usr/ports/pobj/qutebrowser-2.3.1/.test_done': @cd /usr/ports/www/qutebrows...)
*** Error 2 in /usr/ports/www/qutebrowser 
(/usr/ports/infrastructure/mk/bsd.port.mk:2602 'test': @lock=qutebrowser-2.3.1; 
 export _LOCKS_HEL...)

As far as I understand no test has been run at this stage. It's still 
preparing files for the tests.

I don't have much python or tox knowledge. But maybe this can be fixed?
If not, adding NO_TEST=Yes with a comment that states the reason would
be good to indicate that this has been looked at already.

Besides that, LGTM.

Best regards,
Stefan



[Update] awstats 7.7 -> 7.8

2021-08-31 Thread Joel Carnat

Hello,

This is a diff to upgrade Awstats to the latest stable version: 7.8.
Changelog is available here:
https://www.awstats.org/docs/awstats_changelog.txt

I upgraded to be able to use the GeoIP2 framework.
GeoIP does not work well with what's available in the ports.

Tested on 6.9/amd64. Upgraded from 7.7. Build from OPENBSD_6_9 branch.
Everything seem to work properly.

Regards,
Joel C.
Index: Makefile
===
RCS file: /cvs/ports/www/awstats/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile	22 Mar 2020 18:13:36 -	1.20
+++ Makefile	31 Aug 2021 09:04:21 -
@@ -2,8 +2,7 @@
 
 COMMENT=		free real-time logfile analyzer
 
-DISTNAME=		awstats-7.7
-REVISION=		2
+DISTNAME=		awstats-7.8
 
 CATEGORIES=		www
 
Index: distinfo
===
RCS file: /cvs/ports/www/awstats/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo	11 Jan 2018 19:40:29 -	1.9
+++ distinfo	31 Aug 2021 09:04:21 -
@@ -1,2 +1,2 @@
-SHA256 (awstats-7.7.tar.gz) = Qo5t0BgHxgLXWxfmTbF8oQtFO8oHbZ+0VDTKa+U5d3w=
-SIZE (awstats-7.7.tar.gz) = 2956851
+SHA256 (awstats-7.8.tar.gz) = SmWGfgG+9qm9uj6eQR+yoODYe8TIX/AuPL/KABoE1Lg=
+SIZE (awstats-7.8.tar.gz) = 2938878
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/awstats/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 PLIST
--- pkg/PLIST	4 Sep 2018 12:46:24 -	1.8
+++ pkg/PLIST	31 Aug 2021 09:04:21 -
@@ -236,6 +236,8 @@ awstats/wwwroot/cgi-bin/plugins/example/
 awstats/wwwroot/cgi-bin/plugins/example/example.pm
 awstats/wwwroot/cgi-bin/plugins/export_to_csv.pm
 awstats/wwwroot/cgi-bin/plugins/geoip.pm
+awstats/wwwroot/cgi-bin/plugins/geoip2_city.pm
+awstats/wwwroot/cgi-bin/plugins/geoip2_country.pm
 awstats/wwwroot/cgi-bin/plugins/geoip6.pm
 awstats/wwwroot/cgi-bin/plugins/geoip_asn_maxmind.pm
 awstats/wwwroot/cgi-bin/plugins/geoip_city_maxmind.pm
@@ -554,6 +556,7 @@ awstats/wwwroot/icon/flags/ma.png
 awstats/wwwroot/icon/flags/mc.png
 awstats/wwwroot/icon/flags/md.png
 awstats/wwwroot/icon/flags/me.png
+awstats/wwwroot/icon/flags/mf.png
 awstats/wwwroot/icon/flags/mg.png
 awstats/wwwroot/icon/flags/mil.png
 awstats/wwwroot/icon/flags/mk.png
@@ -625,6 +628,7 @@ awstats/wwwroot/icon/flags/sr.png
 awstats/wwwroot/icon/flags/st.png
 awstats/wwwroot/icon/flags/su.png
 awstats/wwwroot/icon/flags/sv.png
+awstats/wwwroot/icon/flags/sx.png
 awstats/wwwroot/icon/flags/sy.png
 awstats/wwwroot/icon/flags/sz.png
 awstats/wwwroot/icon/flags/tc.png
@@ -717,6 +721,22 @@ awstats/wwwroot/icon/mime/xsl.png
 awstats/wwwroot/icon/os/
 awstats/wwwroot/icon/os/aix.png
 awstats/wwwroot/icon/os/amigaos.png
+awstats/wwwroot/icon/os/android.png
+awstats/wwwroot/icon/os/android10.png
+awstats/wwwroot/icon/os/androidcupcake.png
+awstats/wwwroot/icon/os/androiddonut.png
+awstats/wwwroot/icon/os/androideclair.png
+awstats/wwwroot/icon/os/androidfroyo.png
+awstats/wwwroot/icon/os/androidgingerbread.png
+awstats/wwwroot/icon/os/androidhoneycomb.png
+awstats/wwwroot/icon/os/androidics.png
+awstats/wwwroot/icon/os/androidjellybean.png
+awstats/wwwroot/icon/os/androidkitkat.png
+awstats/wwwroot/icon/os/androidlollipop.png
+awstats/wwwroot/icon/os/androidmarshmallow.png
+awstats/wwwroot/icon/os/androidnougat.png
+awstats/wwwroot/icon/os/androidoreo.png
+awstats/wwwroot/icon/os/androidpie.png
 awstats/wwwroot/icon/os/apple.png
 awstats/wwwroot/icon/os/atari.png
 awstats/wwwroot/icon/os/beos.png
@@ -768,6 +788,9 @@ awstats/wwwroot/icon/os/macosx.png
 awstats/wwwroot/icon/os/macosx10.png
 awstats/wwwroot/icon/os/macosx11.png
 awstats/wwwroot/icon/os/macosx12.png
+awstats/wwwroot/icon/os/macosx13.png
+awstats/wwwroot/icon/os/macosx14.png
+awstats/wwwroot/icon/os/macosx15.png
 awstats/wwwroot/icon/os/macosx4.png
 awstats/wwwroot/icon/os/macosx5.png
 awstats/wwwroot/icon/os/macosx6.png


Re: [new] sysutils/czkawka 3.2.0

2021-08-31 Thread Theo Buehler
Anyone interested?

On Thu, Aug 12, 2021 at 04:11:45PM +0200, Theo Buehler wrote:
> This is a simple tool that allows finding and removing duplicate files,
> big files, broken symlinks, empty directories, similar images and other
> things you may want to clean up when going through the cruft that tends
> to accumulate on a machine over the years.
> 
> I split the port into MULTI_PACKAGES since the command line utility can
> run without any dependencies.  It is written in Rust, so it takes a
> while to compile, especially the glib2/gtk bindings...
> 
> I've tested this on amd64 and sparc64 (command line only). Tests pass.
> 
> ---
> 
> Comment:
> remove unnecessary files
> 
> Description:
> Find duplicate files based on file name, size, or hash. Find huge files,
> empty files or directories, or broken symlinks. Find image files with
> similar contents or music files with the same metadata.
> 
> Maintainer: Theo Buehler 
> 
> WWW: https://github.com/qarmin/czkawka
> 



czkawka.tgz
Description: application/tar-gz


Re: [MAINTAINER UPDATE] www/qutebrowser -> 2.3.1

2021-08-31 Thread Omar Polo


Dimitri Karamazov  writes:

> On Thu, Aug 26, 2021 at 05:03:52PM +, Dimitri Karamazov wrote:
>> Simple update for www/qutebrowser to 2.3.1
>> 
>> Changelog:https://www.qutebrowser.org/doc/changelog.html
>> 
>> Build & Run tested on amd64
>> 
>> regards,
>>   Dimitri
>> 

builds and runs fine here too.

At startup it says

> amdgpu: os_same_file_description couldn't determine if two DRM fds
> reference the same file description.  If they do, bad things may
> happen!

but that's already the case with the current version and no "bad things"
have happened by casually browsing a couple of websites.

Cheers