On 8/31/21 10:22 PM, Leon Fischer wrote:
>> From: gwes <gwes@oat.com>
>> Date: Tue, 31 Aug 2021 19:47:28 -0400
>>
>> Where to declare local variables used in a small subordinate scope?
>> Specifically at the top of a routine or at the beginning of the
>> context where they're used?
>> I don't see it in style(9)
> style(9) used to advise against it, but now it's been removed.
> More discussion: https://marc.info/?l=openbsd-tech&m=158063913531253&w=2
Thanks for the pointer! Both sides have good points.
I like locals declared where used whenever reasonably possible.
Even really good compilers can get tired trying to optimize 1000 line
functions.
Liveness tracking breaks down. Keeping variables local can make
everyone's job easier.
Agreed: verifying cleaned up code is exhausting.
thanks again!
geoff steckel
Tuesday, August 31, 2021
Re: nit-picking knf question
> From: gwes <gwes@oat.com>
> Date: Tue, 31 Aug 2021 19:47:28 -0400
>
> Where to declare local variables used in a small subordinate scope?
> Specifically at the top of a routine or at the beginning of the
> context where they're used?
> I don't see it in style(9)
style(9) used to advise against it, but now it's been removed.
More discussion: https://marc.info/?l=openbsd-tech&m=158063913531253&w=2
> Date: Tue, 31 Aug 2021 19:47:28 -0400
>
> Where to declare local variables used in a small subordinate scope?
> Specifically at the top of a routine or at the beginning of the
> context where they're used?
> I don't see it in style(9)
style(9) used to advise against it, but now it's been removed.
More discussion: https://marc.info/?l=openbsd-tech&m=158063913531253&w=2
nit-picking knf question
Where to declare local variables used in a small subordinate scope?
Specifically at the top of a routine or at the beginning of the
context where they're used?
I don't see it in style(9)
i.e.
extern int fum;
int
foo()
{
here 1> int a_local;
while (condition()) {
if (another_condition()) {
here 2> int a_local;
a_local = fum;
IIRC #1 is traditional and can be very clear but doesn't limit scope.
Most of the time the clarity & convenience are most important.
#2 has some advantages but not necessarily enough to outweigh #1.
Is the placement defined or is it up to the programmer?
thanks
geoff steckel
Specifically at the top of a routine or at the beginning of the
context where they're used?
I don't see it in style(9)
i.e.
extern int fum;
int
foo()
{
here 1> int a_local;
while (condition()) {
if (another_condition()) {
here 2> int a_local;
a_local = fum;
IIRC #1 is traditional and can be very clear but doesn't limit scope.
Most of the time the clarity & convenience are most important.
#2 has some advantages but not necessarily enough to outweigh #1.
Is the placement defined or is it up to the programmer?
thanks
geoff steckel
[patch] www/luakit fix printf("%n")
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()<return>"
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 -0000 1.29
+++ www/luakit/Makefile 31 Aug 2021 21:53:30 -0000
@@ -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 -0000
+++ www/luakit/patches/patch-common_luautil_c 31 Aug 2021 21:53:30 -0000
@@ -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, "");
+ }
+
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()<return>"
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 -0000 1.29
+++ www/luakit/Makefile 31 Aug 2021 21:53:30 -0000
@@ -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 -0000
+++ www/luakit/patches/patch-common_luautil_c 31 Aug 2021 21:53:30 -0000
@@ -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, "");
+ }
+
[update] lang/node to 12.22.6
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
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
Re: Accessing LAN behind gateway from Road Warrior on wg(4) based tunnel
On Mon, Aug 30, 2021 at 07:42:43AM -0000, Stuart Henderson wrote:
> On 2021-08-29, Erling Westenvik <erling.westenvik@gmail.com> wrote:
> > On Fri, Aug 27, 2021 at 07:36:21PM -0000, Stuart Henderson wrote:
> >>
> >> Make sure you have set wgaip to allow traffic from the machines on the
> >> subnet on the other side of the tunnel.
> >
> > That was it. Thank you so much. Not directly intuitive to me that
> > "access" to a remote subnet must be specified on the connecting client,
> > but I think I understand the mechanisms a little better now.
> >
> > I can now access my home/office LAN which was my primary goal but I just
> > found out that traffic to everything else leaves egress untunneled.
> > However - trying something like:
> >
> > route change default 10.0.0.1
> >
> > leaves the laptop dead in the water. Again a routing problem of some
> > kind I guess. Any hints on where to start digging?
>
> Changing the default route means that wg won't be able to reach the
> endpoint because the route to it is over the wg interface itself. If you
> want to tunnel all traffic, the easiest way is:
>
> - set your physical interface in a different routing domain, e.g.
> add "rdomain 2" to hostname.em0
>
> - set wg to use the route table associated with that routing domain
> when sending the encapsulated packets, e.g. add "wgrtable 2" to the wg
> interface itself.
>
> - set your physical interface in a different routing domain, e.g.
> add "rdomain 2" to hostname.em0
>
> - set wg to use the route table assocoated with that routing domain
> when sending the encapsulated packets, e.g. add "wgrtable 2" to
> hostname.wg0
>
> - on the machine you're connecting wg to, unless you use externally
> routable IPs directly on the wg interface, you'll probably want
> something like "match out on em0 received-on wg0 nat-to (em0)"
>
> - and because now you'll be receiving traffic from anywhere over the
> wg interface you'll need wgaip 0.0.0.0/0
>
> I think that covers everything but if not then tcpdump on various
> interfaces and both wg endpoints to figure out where packets are
> getting to, and that they have the expected address.
Thanks again. I'll look into that information and compare and combine it
with Matthieu Herrb's page "Setting up a WireGuard client with routing
domains on OpenBSD" at https://codimd.laas.fr/s/NMc3qt5PQ#. (My father
passed away the day after my initial post which was motivated by the
need to access my LAN while watching over him at the nursery home.
Thanks for putting time and effort into your answers despite my late
replies.)
Erling
>
> --
> Please keep replies on the mailing list.
>
> On 2021-08-29, Erling Westenvik <erling.westenvik@gmail.com> wrote:
> > On Fri, Aug 27, 2021 at 07:36:21PM -0000, Stuart Henderson wrote:
> >>
> >> Make sure you have set wgaip to allow traffic from the machines on the
> >> subnet on the other side of the tunnel.
> >
> > That was it. Thank you so much. Not directly intuitive to me that
> > "access" to a remote subnet must be specified on the connecting client,
> > but I think I understand the mechanisms a little better now.
> >
> > I can now access my home/office LAN which was my primary goal but I just
> > found out that traffic to everything else leaves egress untunneled.
> > However - trying something like:
> >
> > route change default 10.0.0.1
> >
> > leaves the laptop dead in the water. Again a routing problem of some
> > kind I guess. Any hints on where to start digging?
>
> Changing the default route means that wg won't be able to reach the
> endpoint because the route to it is over the wg interface itself. If you
> want to tunnel all traffic, the easiest way is:
>
> - set your physical interface in a different routing domain, e.g.
> add "rdomain 2" to hostname.em0
>
> - set wg to use the route table associated with that routing domain
> when sending the encapsulated packets, e.g. add "wgrtable 2" to the wg
> interface itself.
>
> - set your physical interface in a different routing domain, e.g.
> add "rdomain 2" to hostname.em0
>
> - set wg to use the route table assocoated with that routing domain
> when sending the encapsulated packets, e.g. add "wgrtable 2" to
> hostname.wg0
>
> - on the machine you're connecting wg to, unless you use externally
> routable IPs directly on the wg interface, you'll probably want
> something like "match out on em0 received-on wg0 nat-to (em0)"
>
> - and because now you'll be receiving traffic from anywhere over the
> wg interface you'll need wgaip 0.0.0.0/0
>
> I think that covers everything but if not then tcpdump on various
> interfaces and both wg endpoints to figure out where packets are
> getting to, and that they have the expected address.
Thanks again. I'll look into that information and compare and combine it
with Matthieu Herrb's page "Setting up a WireGuard client with routing
domains on OpenBSD" at https://codimd.laas.fr/s/NMc3qt5PQ#. (My father
passed away the day after my initial post which was motivated by the
need to access my LAN while watching over him at the nursery home.
Thanks for putting time and effort into your answers despite my late
replies.)
Erling
>
> --
> Please keep replies on the mailing list.
>
Bounty for net/ejabberd port
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
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
Re: [PATCH] devel/cabal-install: reduce brittleness through minor ghc upgrades
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..00000000000
> --- 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","package":"network-uri","source":"hackage","revision":0,"cabal_sha256":"d2d9ff3a80d9b2d1ff317a354bc0c56cc109c69a4c2449e5fc712d3ddce83ede"},{"flags":["-conduit10","-mtl1","+network-uri","-warn-as-error","-warp-tests"],"src_sha256":"0d6b368e43001c046660e0e209bf9795dc990cb45016447fcf92e822c22e1594","version":"4000.3.15","package":"HTTP","source":"hackage","revision":2,"cabal_sha256":"2ba9cfc40afbb231326c4ff685ae678c4454e449fd41672e5ca75fd757fe6ae6"},{"flags":[],"src_sha256":"525689679d5cc80fa532c1d5cfeace0f62bbb54134fad514f1ba00d0e7fe69ba","version":"0.1.1.7","package":"base16-bytestring","source":"hackage","revision":3,"cabal_sha256":"0021256a9628971c08da95cb8f4d0d72192f3bb8a7b30b55c080562d17c43dd3"},{"flags":[],"src_sha256":"af09b17d072eb1391d91e30b4186dd1797330647ef79268ecd7fcce8f5afc638","version":"1.2.0.1","package":"base64-bytestring","source":"hackage","revision":0,"cabal_sha256":"f4f998235fc0825ab636ca9241b827de5805b336625eb1c7822f1798a238b6ac"},{"flags":["-exe"],"src_sha256":"52756435dbea248e344fbcbcc5df5307f60dfacf337dfd11ae30f1c7a4da05dd","version":"0.11.101.0","package":"cryptohash-sha256","source":"hackage","revision":4,"cabal_sha256":"b963d6308db096362d73d9c603b331cf188aa69310195f479dfedf6045d7e602"},{"flags":["-example"],"src_sha256":"704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef","version":"0.1.3","package":"echo","source":"hackage","revision":1,"cabal_sha256":"5490be9cfbea95e14a7a68b7d055ae8d295822e0b146d2ac8285b3e5a3e3282f"},{"flags":[],"src_sha256":"3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a","version":"0.2.2.1","package":"edit-distance","source":"hackage","revision":1,"cabal_sha256":"4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee"},{"flags":["+no-donna","+test-doctests","+test-hlint","+test-properties"],"src_sha256":"d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d","version":"0.0.5.0","package":"ed25519","source":"hackage","revision":3,"cabal_sha256":"fb98b08de467d51f788f8bd9391f0e9ab9bd4d8dfc264296b895ffea0d822dfa"},{"flags":["+ofd-locking"],"src_sha256":"8a79d113dc0ccef16c24d83379cc457485943027e777529c46362fecc06607d2","version":"0.1.1.2","package":"lukko","source":"hackage","revision":0,"cabal_sha256":"c9d3fa30fb6ab2ba16e037586ca79be6e57ec5f00381b6ee5f293400dbdf5515"},{"flags":["-bundled-c-zlib","-non-blocking-ffi","-pkg-config"],"src_sha256":"04b5890dd69e992f8cd09570d81e9d5ecab19db8e82cbe47ba8e02c31c0631ba","version":"0.6.2.2","package":"zlib","source":"hackage","revision":0,"cabal_sha256":"eae95cb0cc80ff259de236b812072c4a74c6de398cb277ff0fba1148edc0253d"},{"flags":["+base48","+lukko","-mtl21","-old-directory","+use-network-uri"],"src_sha256":"9162b473af5a21c1ff32a50b972b9acf51f4c901604a22cf08a2dccac2f82f17","version":"0.6.0.1","package":"hackage-security","source":"hackage","revision":4,"cabal_sha256":"25e49fa21996bb3db92e2a978fc01586e6f4053fe86a5069d7312b7c2beea419"},{"flags":[],"src_sha256":"c41f82f5fc1157c961a4cbdc0cd5561e5aa44f339ce6e706d978d97e0ca6b914","version":"0.94.0.0","package":"regex-base","source":"hackage","revision":1,"cabal_sha256":"44aa95ca762294ffbb28cf0af9c567d93b5d2c56e4f38ce5385a257d899f968e"},{"flags":["-_regex-posix-clib"],"src_sha256":"251300f1a6bb2e91abb8bf513a21981f8fab79c98a65acea2bb6d6a524414521","version":"0.96.0.0","package":"regex-posix","source":"hackage","revision":1,"cabal_sha256":"690d1366e9ea6df71ded3daf49ca3d53c63eda3f95937962299b2391824dc3b3"},{"flags":[],"src_sha256":"81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671","version":"0.1.2.0","package":"resolv","source":"hackage","revision":0,"cabal_sha256":"0a9a6dd29706258ae60a5c22aecc140a40743b8f08fc324fd9984e7dfbf3a80d"},{"flags":["-debug-conflict-sets","-debug-expensive-assertions","-debug-tracetree","+lukko","+native-dns"],"src_sha256":null,"version":"3.4.0.0","package":"cabal-install","source":"local","revision":null,"cabal_sha256":null}]}
> diff --git a/devel/cabal-install/files/openbsd.json b/devel/cabal-install/files/openbsd.json
> new file mode 100644
> index 00000000000..9f410e7fc6f
> --- /dev/null
> +++ b/devel/cabal-install/files/openbsd.json
> @@ -0,0 +1,260 @@
> +{
> + "_comment": [
> + "This file uses the same fixed versions of packages as _MANIFEST in Makefile. ",
> + "The contents was first generated by following cabal bootstrap instructions. ",
> + "Then builtin section got emptied out to reduce brittleness (while ",
> + "losing some safety) through GHC upgrades."
> + ],
> + "builtin": [],
> + "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",
> + "package": "network-uri",
> + "source": "hackage",
> + "revision": 0,
> + "cabal_sha256": "d2d9ff3a80d9b2d1ff317a354bc0c56cc109c69a4c2449e5fc712d3ddce83ede"
> + },
> + {
> + "flags": [
> + "-conduit10",
> + "-mtl1",
> + "+network-uri",
> + "-warn-as-error",
> + "-warp-tests"
> + ],
> + "src_sha256": "0d6b368e43001c046660e0e209bf9795dc990cb45016447fcf92e822c22e1594",
> + "version": "4000.3.15",
> + "package": "HTTP",
> + "source": "hackage",
> + "revision": 2,
> + "cabal_sha256": "2ba9cfc40afbb231326c4ff685ae678c4454e449fd41672e5ca75fd757fe6ae6"
> + },
> + {
> + "flags": [],
> + "src_sha256": "525689679d5cc80fa532c1d5cfeace0f62bbb54134fad514f1ba00d0e7fe69ba",
> + "version": "0.1.1.7",
> + "package": "base16-bytestring",
> + "source": "hackage",
> + "revision": 3,
> + "cabal_sha256": "0021256a9628971c08da95cb8f4d0d72192f3bb8a7b30b55c080562d17c43dd3"
> + },
> + {
> + "flags": [],
> + "src_sha256": "af09b17d072eb1391d91e30b4186dd1797330647ef79268ecd7fcce8f5afc638",
> + "version": "1.2.0.1",
> + "package": "base64-bytestring",
> + "source": "hackage",
> + "revision": 0,
> + "cabal_sha256": "f4f998235fc0825ab636ca9241b827de5805b336625eb1c7822f1798a238b6ac"
> + },
> + {
> + "flags": [
> + "-exe"
> + ],
> + "src_sha256": "52756435dbea248e344fbcbcc5df5307f60dfacf337dfd11ae30f1c7a4da05dd",
> + "version": "0.11.101.0",
> + "package": "cryptohash-sha256",
> + "source": "hackage",
> + "revision": 4,
> + "cabal_sha256": "b963d6308db096362d73d9c603b331cf188aa69310195f479dfedf6045d7e602"
> + },
> + {
> + "flags": [
> + "-example"
> + ],
> + "src_sha256": "704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef",
> + "version": "0.1.3",
> + "package": "echo",
> + "source": "hackage",
> + "revision": 1,
> + "cabal_sha256": "5490be9cfbea95e14a7a68b7d055ae8d295822e0b146d2ac8285b3e5a3e3282f"
> + },
> + {
> + "flags": [],
> + "src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a",
> + "version": "0.2.2.1",
> + "package": "edit-distance",
> + "source": "hackage",
> + "revision": 1,
> + "cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee"
> + },
> + {
> + "flags": [
> + "+no-donna",
> + "+test-doctests",
> + "+test-hlint",
> + "+test-properties"
> + ],
> + "src_sha256": "d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d",
> + "version": "0.0.5.0",
> + "package": "ed25519",
> + "source": "hackage",
> + "revision": 3,
> + "cabal_sha256": "fb98b08de467d51f788f8bd9391f0e9ab9bd4d8dfc264296b895ffea0d822dfa"
> + },
> + {
> + "flags": [
> + "+ofd-locking"
> + ],
> + "src_sha256": "8a79d113dc0ccef16c24d83379cc457485943027e777529c46362fecc06607d2",
> + "version": "0.1.1.2",
> + "package": "lukko",
> + "source": "hackage",
> + "revision": 0,
> + "cabal_sha256": "c9d3fa30fb6ab2ba16e037586ca79be6e57ec5f00381b6ee5f293400dbdf5515"
> + },
> + {
> + "flags": [
> + "-bundled-c-zlib",
> + "-non-blocking-ffi",
> + "-pkg-config"
> + ],
> + "src_sha256": "04b5890dd69e992f8cd09570d81e9d5ecab19db8e82cbe47ba8e02c31c0631ba",
> + "version": "0.6.2.2",
> + "package": "zlib",
> + "source": "hackage",
> + "revision": 0,
> + "cabal_sha256": "eae95cb0cc80ff259de236b812072c4a74c6de398cb277ff0fba1148edc0253d"
> + },
> + {
> + "flags": [
> + "+base48",
> + "+lukko",
> + "-mtl21",
> + "-old-directory",
> + "+use-network-uri"
> + ],
> + "src_sha256": "9162b473af5a21c1ff32a50b972b9acf51f4c901604a22cf08a2dccac2f82f17",
> + "version": "0.6.0.1",
> + "package": "hackage-security",
> + "source": "hackage",
> + "revision": 4,
> + "cabal_sha256": "25e49fa21996bb3db92e2a978fc01586e6f4053fe86a5069d7312b7c2beea419"
> + },
> + {
> + "flags": [],
> + "src_sha256": "c41f82f5fc1157c961a4cbdc0cd5561e5aa44f339ce6e706d978d97e0ca6b914",
> + "version": "0.94.0.0",
> + "package": "regex-base",
> + "source": "hackage",
> + "revision": 1,
> + "cabal_sha256": "44aa95ca762294ffbb28cf0af9c567d93b5d2c56e4f38ce5385a257d899f968e"
> + },
> + {
> + "flags": [
> + "-_regex-posix-clib"
> + ],
> + "src_sha256": "251300f1a6bb2e91abb8bf513a21981f8fab79c98a65acea2bb6d6a524414521",
> + "version": "0.96.0.0",
> + "package": "regex-posix",
> + "source": "hackage",
> + "revision": 1,
> + "cabal_sha256": "690d1366e9ea6df71ded3daf49ca3d53c63eda3f95937962299b2391824dc3b3"
> + },
> + {
> + "flags": [],
> + "src_sha256": "81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671",
> + "version": "0.1.2.0",
> + "package": "resolv",
> + "source": "hackage",
> + "revision": 0,
> + "cabal_sha256": "0a9a6dd29706258ae60a5c22aecc140a40743b8f08fc324fd9984e7dfbf3a80d"
> + },
> + {
> + "flags": [
> + "-debug-conflict-sets",
> + "-debug-expensive-assertions",
> + "-debug-tracetree",
> + "+lukko",
> + "+native-dns"
> + ],
> + "src_sha256": null,
> + "version": "3.4.0.0",
> + "package": "cabal-install",
> + "source": "local",
> + "revision": null,
> + "cabal_sha256": null
> + }
> + ]
> +}
> --
> 2.32.0
>
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..00000000000
> --- 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","package":"network-uri","source":"hackage","revision":0,"cabal_sha256":"d2d9ff3a80d9b2d1ff317a354bc0c56cc109c69a4c2449e5fc712d3ddce83ede"},{"flags":["-conduit10","-mtl1","+network-uri","-warn-as-error","-warp-tests"],"src_sha256":"0d6b368e43001c046660e0e209bf9795dc990cb45016447fcf92e822c22e1594","version":"4000.3.15","package":"HTTP","source":"hackage","revision":2,"cabal_sha256":"2ba9cfc40afbb231326c4ff685ae678c4454e449fd41672e5ca75fd757fe6ae6"},{"flags":[],"src_sha256":"525689679d5cc80fa532c1d5cfeace0f62bbb54134fad514f1ba00d0e7fe69ba","version":"0.1.1.7","package":"base16-bytestring","source":"hackage","revision":3,"cabal_sha256":"0021256a9628971c08da95cb8f4d0d72192f3bb8a7b30b55c080562d17c43dd3"},{"flags":[],"src_sha256":"af09b17d072eb1391d91e30b4186dd1797330647ef79268ecd7fcce8f5afc638","version":"1.2.0.1","package":"base64-bytestring","source":"hackage","revision":0,"cabal_sha256":"f4f998235fc0825ab636ca9241b827de5805b336625eb1c7822f1798a238b6ac"},{"flags":["-exe"],"src_sha256":"52756435dbea248e344fbcbcc5df5307f60dfacf337dfd11ae30f1c7a4da05dd","version":"0.11.101.0","package":"cryptohash-sha256","source":"hackage","revision":4,"cabal_sha256":"b963d6308db096362d73d9c603b331cf188aa69310195f479dfedf6045d7e602"},{"flags":["-example"],"src_sha256":"704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef","version":"0.1.3","package":"echo","source":"hackage","revision":1,"cabal_sha256":"5490be9cfbea95e14a7a68b7d055ae8d295822e0b146d2ac8285b3e5a3e3282f"},{"flags":[],"src_sha256":"3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a","version":"0.2.2.1","package":"edit-distance","source":"hackage","revision":1,"cabal_sha256":"4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee"},{"flags":["+no-donna","+test-doctests","+test-hlint","+test-properties"],"src_sha256":"d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d","version":"0.0.5.0","package":"ed25519","source":"hackage","revision":3,"cabal_sha256":"fb98b08de467d51f788f8bd9391f0e9ab9bd4d8dfc264296b895ffea0d822dfa"},{"flags":["+ofd-locking"],"src_sha256":"8a79d113dc0ccef16c24d83379cc457485943027e777529c46362fecc06607d2","version":"0.1.1.2","package":"lukko","source":"hackage","revision":0,"cabal_sha256":"c9d3fa30fb6ab2ba16e037586ca79be6e57ec5f00381b6ee5f293400dbdf5515"},{"flags":["-bundled-c-zlib","-non-blocking-ffi","-pkg-config"],"src_sha256":"04b5890dd69e992f8cd09570d81e9d5ecab19db8e82cbe47ba8e02c31c0631ba","version":"0.6.2.2","package":"zlib","source":"hackage","revision":0,"cabal_sha256":"eae95cb0cc80ff259de236b812072c4a74c6de398cb277ff0fba1148edc0253d"},{"flags":["+base48","+lukko","-mtl21","-old-directory","+use-network-uri"],"src_sha256":"9162b473af5a21c1ff32a50b972b9acf51f4c901604a22cf08a2dccac2f82f17","version":"0.6.0.1","package":"hackage-security","source":"hackage","revision":4,"cabal_sha256":"25e49fa21996bb3db92e2a978fc01586e6f4053fe86a5069d7312b7c2beea419"},{"flags":[],"src_sha256":"c41f82f5fc1157c961a4cbdc0cd5561e5aa44f339ce6e706d978d97e0ca6b914","version":"0.94.0.0","package":"regex-base","source":"hackage","revision":1,"cabal_sha256":"44aa95ca762294ffbb28cf0af9c567d93b5d2c56e4f38ce5385a257d899f968e"},{"flags":["-_regex-posix-clib"],"src_sha256":"251300f1a6bb2e91abb8bf513a21981f8fab79c98a65acea2bb6d6a524414521","version":"0.96.0.0","package":"regex-posix","source":"hackage","revision":1,"cabal_sha256":"690d1366e9ea6df71ded3daf49ca3d53c63eda3f95937962299b2391824dc3b3"},{"flags":[],"src_sha256":"81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671","version":"0.1.2.0","package":"resolv","source":"hackage","revision":0,"cabal_sha256":"0a9a6dd29706258ae60a5c22aecc140a40743b8f08fc324fd9984e7dfbf3a80d"},{"flags":["-debug-conflict-sets","-debug-expensive-assertions","-debug-tracetree","+lukko","+native-dns"],"src_sha256":null,"version":"3.4.0.0","package":"cabal-install","source":"local","revision":null,"cabal_sha256":null}]}
> diff --git a/devel/cabal-install/files/openbsd.json b/devel/cabal-install/files/openbsd.json
> new file mode 100644
> index 00000000000..9f410e7fc6f
> --- /dev/null
> +++ b/devel/cabal-install/files/openbsd.json
> @@ -0,0 +1,260 @@
> +{
> + "_comment": [
> + "This file uses the same fixed versions of packages as _MANIFEST in Makefile. ",
> + "The contents was first generated by following cabal bootstrap instructions. ",
> + "Then builtin section got emptied out to reduce brittleness (while ",
> + "losing some safety) through GHC upgrades."
> + ],
> + "builtin": [],
> + "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",
> + "package": "network-uri",
> + "source": "hackage",
> + "revision": 0,
> + "cabal_sha256": "d2d9ff3a80d9b2d1ff317a354bc0c56cc109c69a4c2449e5fc712d3ddce83ede"
> + },
> + {
> + "flags": [
> + "-conduit10",
> + "-mtl1",
> + "+network-uri",
> + "-warn-as-error",
> + "-warp-tests"
> + ],
> + "src_sha256": "0d6b368e43001c046660e0e209bf9795dc990cb45016447fcf92e822c22e1594",
> + "version": "4000.3.15",
> + "package": "HTTP",
> + "source": "hackage",
> + "revision": 2,
> + "cabal_sha256": "2ba9cfc40afbb231326c4ff685ae678c4454e449fd41672e5ca75fd757fe6ae6"
> + },
> + {
> + "flags": [],
> + "src_sha256": "525689679d5cc80fa532c1d5cfeace0f62bbb54134fad514f1ba00d0e7fe69ba",
> + "version": "0.1.1.7",
> + "package": "base16-bytestring",
> + "source": "hackage",
> + "revision": 3,
> + "cabal_sha256": "0021256a9628971c08da95cb8f4d0d72192f3bb8a7b30b55c080562d17c43dd3"
> + },
> + {
> + "flags": [],
> + "src_sha256": "af09b17d072eb1391d91e30b4186dd1797330647ef79268ecd7fcce8f5afc638",
> + "version": "1.2.0.1",
> + "package": "base64-bytestring",
> + "source": "hackage",
> + "revision": 0,
> + "cabal_sha256": "f4f998235fc0825ab636ca9241b827de5805b336625eb1c7822f1798a238b6ac"
> + },
> + {
> + "flags": [
> + "-exe"
> + ],
> + "src_sha256": "52756435dbea248e344fbcbcc5df5307f60dfacf337dfd11ae30f1c7a4da05dd",
> + "version": "0.11.101.0",
> + "package": "cryptohash-sha256",
> + "source": "hackage",
> + "revision": 4,
> + "cabal_sha256": "b963d6308db096362d73d9c603b331cf188aa69310195f479dfedf6045d7e602"
> + },
> + {
> + "flags": [
> + "-example"
> + ],
> + "src_sha256": "704f07310f8272d170f8ab7fb2a2c13f15d8501ef8310801e36964c8eff485ef",
> + "version": "0.1.3",
> + "package": "echo",
> + "source": "hackage",
> + "revision": 1,
> + "cabal_sha256": "5490be9cfbea95e14a7a68b7d055ae8d295822e0b146d2ac8285b3e5a3e3282f"
> + },
> + {
> + "flags": [],
> + "src_sha256": "3e8885ee2f56ad4da940f043ae8f981ee2fe336b5e8e4ba3f7436cff4f526c4a",
> + "version": "0.2.2.1",
> + "package": "edit-distance",
> + "source": "hackage",
> + "revision": 1,
> + "cabal_sha256": "4d33a49cd383d50af090f1b888642d10116e43809f9da6023d9fc6f67d2656ee"
> + },
> + {
> + "flags": [
> + "+no-donna",
> + "+test-doctests",
> + "+test-hlint",
> + "+test-properties"
> + ],
> + "src_sha256": "d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d",
> + "version": "0.0.5.0",
> + "package": "ed25519",
> + "source": "hackage",
> + "revision": 3,
> + "cabal_sha256": "fb98b08de467d51f788f8bd9391f0e9ab9bd4d8dfc264296b895ffea0d822dfa"
> + },
> + {
> + "flags": [
> + "+ofd-locking"
> + ],
> + "src_sha256": "8a79d113dc0ccef16c24d83379cc457485943027e777529c46362fecc06607d2",
> + "version": "0.1.1.2",
> + "package": "lukko",
> + "source": "hackage",
> + "revision": 0,
> + "cabal_sha256": "c9d3fa30fb6ab2ba16e037586ca79be6e57ec5f00381b6ee5f293400dbdf5515"
> + },
> + {
> + "flags": [
> + "-bundled-c-zlib",
> + "-non-blocking-ffi",
> + "-pkg-config"
> + ],
> + "src_sha256": "04b5890dd69e992f8cd09570d81e9d5ecab19db8e82cbe47ba8e02c31c0631ba",
> + "version": "0.6.2.2",
> + "package": "zlib",
> + "source": "hackage",
> + "revision": 0,
> + "cabal_sha256": "eae95cb0cc80ff259de236b812072c4a74c6de398cb277ff0fba1148edc0253d"
> + },
> + {
> + "flags": [
> + "+base48",
> + "+lukko",
> + "-mtl21",
> + "-old-directory",
> + "+use-network-uri"
> + ],
> + "src_sha256": "9162b473af5a21c1ff32a50b972b9acf51f4c901604a22cf08a2dccac2f82f17",
> + "version": "0.6.0.1",
> + "package": "hackage-security",
> + "source": "hackage",
> + "revision": 4,
> + "cabal_sha256": "25e49fa21996bb3db92e2a978fc01586e6f4053fe86a5069d7312b7c2beea419"
> + },
> + {
> + "flags": [],
> + "src_sha256": "c41f82f5fc1157c961a4cbdc0cd5561e5aa44f339ce6e706d978d97e0ca6b914",
> + "version": "0.94.0.0",
> + "package": "regex-base",
> + "source": "hackage",
> + "revision": 1,
> + "cabal_sha256": "44aa95ca762294ffbb28cf0af9c567d93b5d2c56e4f38ce5385a257d899f968e"
> + },
> + {
> + "flags": [
> + "-_regex-posix-clib"
> + ],
> + "src_sha256": "251300f1a6bb2e91abb8bf513a21981f8fab79c98a65acea2bb6d6a524414521",
> + "version": "0.96.0.0",
> + "package": "regex-posix",
> + "source": "hackage",
> + "revision": 1,
> + "cabal_sha256": "690d1366e9ea6df71ded3daf49ca3d53c63eda3f95937962299b2391824dc3b3"
> + },
> + {
> + "flags": [],
> + "src_sha256": "81a2bafad484db123cf8d17a02d98bb388a127fd0f822fa022589468a0e64671",
> + "version": "0.1.2.0",
> + "package": "resolv",
> + "source": "hackage",
> + "revision": 0,
> + "cabal_sha256": "0a9a6dd29706258ae60a5c22aecc140a40743b8f08fc324fd9984e7dfbf3a80d"
> + },
> + {
> + "flags": [
> + "-debug-conflict-sets",
> + "-debug-expensive-assertions",
> + "-debug-tracetree",
> + "+lukko",
> + "+native-dns"
> + ],
> + "src_sha256": null,
> + "version": "3.4.0.0",
> + "package": "cabal-install",
> + "source": "local",
> + "revision": null,
> + "cabal_sha256": null
> + }
> + ]
> +}
> --
> 2.32.0
>
Re: ports and printf("%n")
On Tue, Aug 31 2021, Jeremie Courreges-Anglas <jca@wxcvbn.org> wrote:
> On Tue, Aug 31 2021, "Theo de Raadt" <deraadt@openbsd.org> wrote:
>> Christian Weisgerber <naddy@mips.inka.de> 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
> On Tue, Aug 31 2021, "Theo de Raadt" <deraadt@openbsd.org> wrote:
>> Christian Weisgerber <naddy@mips.inka.de> 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
Re: ports and printf("%n")
On Tue, Aug 31 2021, "Theo de Raadt" <deraadt@openbsd.org> wrote:
> Christian Weisgerber <naddy@mips.inka.de> 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
> Christian Weisgerber <naddy@mips.inka.de> 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")
Christian Weisgerber <naddy@mips.inka.de> 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?
> 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: sim7600 4g modem
On 2021-08-30, Cord <openbsdml@protonmail.com> wrote:
> Hello,
> did anyone try to use the 4g modem sim7600 that should work with umb driver ?
> The toy is the following:
> https://usa.banggood.com/Waveshare-SIM7600G-H-4G-DONGLE-Module-Single-Antenna-Digital-Transmission-Industrial-Grade-4G-Communication-And-GNSS-Positioning-Peripheral-Global-Universal-p-1813354.html
> Is it working ?
> And where can I see the signal strength ?
>
> Thank you
> Cord.
>
>
It looks like it is probably a Qualcomm-based device. It seems likely
that as things are now, it will attach to umsm. I can't say for sure if
it will work or not though I think there is a *fairly* good chance.
But unless you are lucky and somebody already used the same device,
you will need to buy one to find out for sure.
If it does work, while attached to umsm there should be several com
interfaces presented, one of which is likely to accept AT commands
so you can find strength that way. For umsm, you will need to mess
about with pppd to get it to connect to the internet.
The device would probably support working with umb(4) but would need
some extra work (maybe as simple as moving the vendor/product ID to umb(4),
but it may need more...so far I have a success rate of about 33% with umb
devices, including some devices which are even listed in the manpage -
the firmware on the device matters too, not just the chipset).
There is no support for displaying signal strength directly via umb,
and the other com ports are only available via umsm, so in that case you
can't send AT commands to find it either..
This device is cat4 only (no MIMO, no channel aggregation) so speed won't
be amazing.
--
Please keep replies on the mailing list.
> Hello,
> did anyone try to use the 4g modem sim7600 that should work with umb driver ?
> The toy is the following:
> https://usa.banggood.com/Waveshare-SIM7600G-H-4G-DONGLE-Module-Single-Antenna-Digital-Transmission-Industrial-Grade-4G-Communication-And-GNSS-Positioning-Peripheral-Global-Universal-p-1813354.html
> Is it working ?
> And where can I see the signal strength ?
>
> Thank you
> Cord.
>
>
It looks like it is probably a Qualcomm-based device. It seems likely
that as things are now, it will attach to umsm. I can't say for sure if
it will work or not though I think there is a *fairly* good chance.
But unless you are lucky and somebody already used the same device,
you will need to buy one to find out for sure.
If it does work, while attached to umsm there should be several com
interfaces presented, one of which is likely to accept AT commands
so you can find strength that way. For umsm, you will need to mess
about with pppd to get it to connect to the internet.
The device would probably support working with umb(4) but would need
some extra work (maybe as simple as moving the vendor/product ID to umb(4),
but it may need more...so far I have a success rate of about 33% with umb
devices, including some devices which are even listed in the manpage -
the firmware on the device matters too, not just the chipset).
There is no support for displaying signal strength directly via umb,
and the other com ports are only available via umsm, so in that case you
can't send AT commands to find it either..
This device is cat4 only (no MIMO, no channel aggregation) so speed won't
be amazing.
--
Please keep replies on the mailing list.
Re: ports and printf("%n")
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 naddy@mips.inka.de
> 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 naddy@mips.inka.de
Re: resolvd recongizing unbound
On 2021-08-31, Paul de Weerd <weerd@weirdnet.nl> wrote:
> 2. echo ::1 > /etc/resolv.conf
I think it is a good idea to list a second nameserver, in case unbound
dies or isn't running for some reason (for one, booting bsd.rd for an upgrade).
--
Please keep replies on the mailing list.
> 2. echo ::1 > /etc/resolv.conf
I think it is a good idea to list a second nameserver, in case unbound
dies or isn't running for some reason (for one, booting bsd.rd for an upgrade).
--
Please keep replies on the mailing list.
Re: resolvd recongizing unbound
On Aug 31 16:32:23, weerd@weirdnet.nl wrote:
> On Tue, Aug 31, 2021 at 03:31:18PM +0200, Jan Stary wrote:
> | The running resolvd recognizes if unwind is running,
> | and places 127.0.0.1 at the top of resolv.conf accordingly.
> |
> | Could we have the same for unbound please?
> | I run unbound insted of unwind to also serve some
> | local names the machines around the office (beside resolution).
> |
> | But resolvd only recognizes unwind, not unbound;
> | so resolv.conf lists just the external (dhcp) nameservers
> | who don't know my local names of course.
> |
> | Or is there a reason resolvd only honors unwind
> | but not unbound?
>
> In this case, why would you not simply disable resolvd and put ::1 in
> /etc/resolv.conf yourself?
>
> resolvd is great for when the contents of resolv.conf change as you
> move from network to network and you may want to use different
> resolvers as you do. But if you're using unbound on the local system,
> why would you still run resolvd?
>
> 1. rcctl disable resolvd
> 2. echo ::1 > /etc/resolv.conf
> 3. ...
> 4. profit
>
> Just because there's a shiny new tool, doesn't mean you MUST use it.
Right. Disabling resolvd seems the simplest way on this machine.
Thanks,
Jan
> On Tue, Aug 31, 2021 at 03:31:18PM +0200, Jan Stary wrote:
> | The running resolvd recognizes if unwind is running,
> | and places 127.0.0.1 at the top of resolv.conf accordingly.
> |
> | Could we have the same for unbound please?
> | I run unbound insted of unwind to also serve some
> | local names the machines around the office (beside resolution).
> |
> | But resolvd only recognizes unwind, not unbound;
> | so resolv.conf lists just the external (dhcp) nameservers
> | who don't know my local names of course.
> |
> | Or is there a reason resolvd only honors unwind
> | but not unbound?
>
> In this case, why would you not simply disable resolvd and put ::1 in
> /etc/resolv.conf yourself?
>
> resolvd is great for when the contents of resolv.conf change as you
> move from network to network and you may want to use different
> resolvers as you do. But if you're using unbound on the local system,
> why would you still run resolvd?
>
> 1. rcctl disable resolvd
> 2. echo ::1 > /etc/resolv.conf
> 3. ...
> 4. profit
>
> Just because there's a shiny new tool, doesn't mean you MUST use it.
Right. Disabling resolvd seems the simplest way on this machine.
Thanks,
Jan
Re: [New] devel/luaffi
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
> 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: resolvd recongizing unbound
On Tue, Aug 31, 2021 at 03:31:18PM +0200, Jan Stary wrote:
| The running resolvd recognizes if unwind is running,
| and places 127.0.0.1 at the top of resolv.conf accordingly.
|
| Could we have the same for unbound please?
| I run unbound insted of unwind to also serve some
| local names the machines around the office (beside resolution).
|
| But resolvd only recognizes unwind, not unbound;
| so resolv.conf lists just the external (dhcp) nameservers
| who don't know my local names of course.
|
| Or is there a reason resolvd only honors unwind
| but not unbound?
In this case, why would you not simply disable resolvd and put ::1 in
/etc/resolv.conf yourself?
resolvd is great for when the contents of resolv.conf change as you
move from network to network and you may want to use different
resolvers as you do. But if you're using unbound on the local system,
why would you still run resolvd?
1. rcctl disable resolvd
2. echo ::1 > /etc/resolv.conf
3. ...
4. profit
Just because there's a shiny new tool, doesn't mean you MUST use it.
Cheers,
Paul
--
>++++++++[<++++++++++>-]<+++++++.>+++[<------>-]<.>+++[<+
+++++++++++>-]<.>++[<------------>-]<+.--------------.[-]
http://www.weirdnet.nl/
| The running resolvd recognizes if unwind is running,
| and places 127.0.0.1 at the top of resolv.conf accordingly.
|
| Could we have the same for unbound please?
| I run unbound insted of unwind to also serve some
| local names the machines around the office (beside resolution).
|
| But resolvd only recognizes unwind, not unbound;
| so resolv.conf lists just the external (dhcp) nameservers
| who don't know my local names of course.
|
| Or is there a reason resolvd only honors unwind
| but not unbound?
In this case, why would you not simply disable resolvd and put ::1 in
/etc/resolv.conf yourself?
resolvd is great for when the contents of resolv.conf change as you
move from network to network and you may want to use different
resolvers as you do. But if you're using unbound on the local system,
why would you still run resolvd?
1. rcctl disable resolvd
2. echo ::1 > /etc/resolv.conf
3. ...
4. profit
Just because there's a shiny new tool, doesn't mean you MUST use it.
Cheers,
Paul
--
>++++++++[<++++++++++>-]<+++++++.>+++[<------>-]<.>+++[<+
+++++++++++>-]<.>++[<------------>-]<+.--------------.[-]
http://www.weirdnet.nl/
Re: resolvd recongizing unbound
Sebastien Marie <semarie@online.fr> wrote:
> On Tue, Aug 31, 2021 at 03:31:18PM +0200, Jan Stary wrote:
> > The running resolvd recognizes if unwind is running,
> > and places 127.0.0.1 at the top of resolv.conf accordingly.
> >
> > Could we have the same for unbound please?
> > I run unbound insted of unwind to also serve some
> > local names the machines around the office (beside resolution).
>
> you could use the following:
>
> # route nameserver 127.0.0.1
>
> it will tell resolvd(8) to use this particular nameserver.
not the same. if resolvd is restarted, that nameserver is lost.
the unwind thing is special; we don't think unbound configurations
should receive the same treatment -- because unwind follows a different
design principle which we believe makes it a higher class citizen.
> On Tue, Aug 31, 2021 at 03:31:18PM +0200, Jan Stary wrote:
> > The running resolvd recognizes if unwind is running,
> > and places 127.0.0.1 at the top of resolv.conf accordingly.
> >
> > Could we have the same for unbound please?
> > I run unbound insted of unwind to also serve some
> > local names the machines around the office (beside resolution).
>
> you could use the following:
>
> # route nameserver 127.0.0.1
>
> it will tell resolvd(8) to use this particular nameserver.
not the same. if resolvd is restarted, that nameserver is lost.
the unwind thing is special; we don't think unbound configurations
should receive the same treatment -- because unwind follows a different
design principle which we believe makes it a higher class citizen.
Re: resolvd recongizing unbound
On Tue, Aug 31, 2021 at 03:31:18PM +0200, Jan Stary wrote:
> The running resolvd recognizes if unwind is running,
> and places 127.0.0.1 at the top of resolv.conf accordingly.
>
> Could we have the same for unbound please?
> I run unbound insted of unwind to also serve some
> local names the machines around the office (beside resolution).
you could use the following:
# route nameserver 127.0.0.1
it will tell resolvd(8) to use this particular nameserver.
Thanks.
--
Sebastien Marie
> The running resolvd recognizes if unwind is running,
> and places 127.0.0.1 at the top of resolv.conf accordingly.
>
> Could we have the same for unbound please?
> I run unbound insted of unwind to also serve some
> local names the machines around the office (beside resolution).
you could use the following:
# route nameserver 127.0.0.1
it will tell resolvd(8) to use this particular nameserver.
Thanks.
--
Sebastien Marie
Re: resolvd recongizing unbound
On Tue, 31 Aug 2021, Jan Stary wrote:
> The running resolvd recognizes if unwind is running,
> and places 127.0.0.1 at the top of resolv.conf accordingly.
>
> Could we have the same for unbound please?
> I run unbound insted of unwind to also serve some
> local names the machines around the office (beside resolution).
>
> But resolvd only recognizes unwind, not unbound;
> so resolv.conf lists just the external (dhcp) nameservers
> who don't know my local names of course.
>
> Or is there a reason resolvd only honors unwind
> but not unbound?
Pretty sure that won't happen.
You may want to take a look at unwind.conf(5), specially the `force`
config option. That may do what you want if I understand correctly.
Cheers,
--
Paco Esteban.
0x5818130B8A6DBC03
> The running resolvd recognizes if unwind is running,
> and places 127.0.0.1 at the top of resolv.conf accordingly.
>
> Could we have the same for unbound please?
> I run unbound insted of unwind to also serve some
> local names the machines around the office (beside resolution).
>
> But resolvd only recognizes unwind, not unbound;
> so resolv.conf lists just the external (dhcp) nameservers
> who don't know my local names of course.
>
> Or is there a reason resolvd only honors unwind
> but not unbound?
Pretty sure that won't happen.
You may want to take a look at unwind.conf(5), specially the `force`
config option. That may do what you want if I understand correctly.
Cheers,
--
Paco Esteban.
0x5818130B8A6DBC03
[security update] net/synapse -> 1.41.1
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 -0000 1.23
+++ Makefile 31 Aug 2021 13:28:47 -0000
@@ -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 <bsd.port.mk>
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 -0000 1.19
+++ distinfo 31 Aug 2021 13:28:47 -0000
@@ -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 -0000 1.18
+++ pkg/PLIST 31 Aug 2021 13:28:47 -0000
@@ -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_PYCACHE}room_list.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}room_member.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}room_member_worker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}room_summary.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}saml.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}search.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}send_email.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}set_password.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}space_summary.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}sso.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}state_deltas.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}stats.${MODPY_PYC_MAGIC_TAG}pyc
@@ -330,11 +340,11 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/room_list.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/room_member.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/room_member_worker.py
+lib/python${MODPY_VERSION}/site-packages/synapse/handlers/room_summary.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/saml.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/search.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/send_email.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/set_password.py
-lib/python${MODPY_VERSION}/site-packages/synapse/handlers/space_summary.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/sso.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/state_deltas.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/stats.py
@@ -506,7 +516,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/${MODPY_PYCACHE}pushers.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/${MODPY_PYCACHE}receipts.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/${MODPY_PYCACHE}registration.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/${MODPY_PYCACHE}room.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/_base.py
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/_slaved_id_tracker.py
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/account_data.py
@@ -524,7 +533,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/pushers.py
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/receipts.py
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/registration.py
-lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/room.py
lib/python${MODPY_VERSION}/site-packages/synapse/replication/tcp/
lib/python${MODPY_VERSION}/site-packages/synapse/replication/tcp/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/replication/tcp/${MODPY_PYCACHE}/
@@ -618,6 +626,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}rooms.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}server_notice_servlet.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}statistics.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}username_available.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}users.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/_base.py
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/devices.py
@@ -628,101 +637,96 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/rooms.py
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/server_notice_servlet.py
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/statistics.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/username_available.py
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/users.py
lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/
lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}account.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}account_data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}account_validity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}capabilities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}devices.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}directory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}filter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}groups.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}initial_sync.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}keys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}knock.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}login.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}logout.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}notifications.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}openid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}password_policy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}presence.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}profile.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}push_rule.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}pusher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}read_marker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}receipts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}register.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}relations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}report_event.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}room.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}room_batch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}room_keys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}room_upgrade_rest_servlet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}sendtodevice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}shared_rooms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}sync.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}tags.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}thirdparty.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}tokenrefresh.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}transactions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}user_directory.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}versions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}voip.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/_base.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/account.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/account_data.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/account_validity.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/auth.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/capabilities.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/devices.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/directory.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/events.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/filter.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/groups.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/initial_sync.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/keys.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/knock.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/login.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/logout.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/notifications.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/openid.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/password_policy.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/presence.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/profile.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/push_rule.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/pusher.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/read_marker.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/receipts.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/register.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/relations.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/report_event.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/room.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/room_batch.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/room_keys.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/room_upgrade_rest_servlet.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/sendtodevice.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/shared_rooms.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/sync.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/tags.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/thirdparty.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/tokenrefresh.py
lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/transactions.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}directory.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}initial_sync.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}login.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}logout.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}presence.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}profile.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}push_rule.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}pusher.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}room.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}voip.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/directory.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/events.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/initial_sync.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/login.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/logout.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/presence.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/profile.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/push_rule.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/pusher.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/room.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/voip.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}account.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}account_data.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}account_validity.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}capabilities.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}devices.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}filter.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}groups.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}keys.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}knock.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}notifications.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}openid.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}password_policy.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}read_marker.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}receipts.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}register.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}relations.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}report_event.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}room_keys.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}room_upgrade_rest_servlet.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}sendtodevice.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}shared_rooms.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}sync.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}tags.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}thirdparty.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}tokenrefresh.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}user_directory.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/_base.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/account.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/account_data.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/account_validity.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/auth.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/capabilities.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/devices.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/filter.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/groups.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/keys.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/knock.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/notifications.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/openid.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/password_policy.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/read_marker.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/receipts.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/register.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/relations.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/report_event.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/room_keys.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/room_upgrade_rest_servlet.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/sendtodevice.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/shared_rooms.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/sync.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/tags.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/thirdparty.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/tokenrefresh.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/user_directory.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/user_directory.py
lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/versions.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/voip.py
lib/python${MODPY_VERSION}/site-packages/synapse/rest/consent/
lib/python${MODPY_VERSION}/site-packages/synapse/rest/consent/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/rest/consent/${MODPY_PYCACHE}/
@@ -1354,6 +1358,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/61/03recreate_min_depth.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/61/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/61/${MODPY_PYCACHE}03recreate_min_depth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/62/
+lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/62/01insertion_event_extremities.sql
lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/full_schemas/
lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/full_schemas/16/
lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/full_schemas/16/application_services.sql
@@ -1430,7 +1436,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/util/${MODPY_PYCACHE}hash.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/util/${MODPY_PYCACHE}httpresourcetree.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/util/${MODPY_PYCACHE}iterutils.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/util/${MODPY_PYCACHE}jsonobject.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/util/${MODPY_PYCACHE}linked_list.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/util/${MODPY_PYCACHE}logcontext.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/util/${MODPY_PYCACHE}logformatter.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1481,7 +1486,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/util/hash.py
lib/python${MODPY_VERSION}/site-packages/synapse/util/httpresourcetree.py
lib/python${MODPY_VERSION}/site-packages/synapse/util/iterutils.py
-lib/python${MODPY_VERSION}/site-packages/synapse/util/jsonobject.py
lib/python${MODPY_VERSION}/site-packages/synapse/util/linked_list.py
lib/python${MODPY_VERSION}/site-packages/synapse/util/logcontext.py
lib/python${MODPY_VERSION}/site-packages/synapse/util/logformatter.py
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
===================================================================
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 -0000 1.23
+++ Makefile 31 Aug 2021 13:28:47 -0000
@@ -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 <bsd.port.mk>
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 -0000 1.19
+++ distinfo 31 Aug 2021 13:28:47 -0000
@@ -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 -0000 1.18
+++ pkg/PLIST 31 Aug 2021 13:28:47 -0000
@@ -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_PYCACHE}room_list.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}room_member.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}room_member_worker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}room_summary.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}saml.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}search.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}send_email.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}set_password.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}space_summary.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}sso.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}state_deltas.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/${MODPY_PYCACHE}stats.${MODPY_PYC_MAGIC_TAG}pyc
@@ -330,11 +340,11 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/room_list.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/room_member.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/room_member_worker.py
+lib/python${MODPY_VERSION}/site-packages/synapse/handlers/room_summary.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/saml.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/search.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/send_email.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/set_password.py
-lib/python${MODPY_VERSION}/site-packages/synapse/handlers/space_summary.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/sso.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/state_deltas.py
lib/python${MODPY_VERSION}/site-packages/synapse/handlers/stats.py
@@ -506,7 +516,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/${MODPY_PYCACHE}pushers.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/${MODPY_PYCACHE}receipts.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/${MODPY_PYCACHE}registration.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/${MODPY_PYCACHE}room.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/_base.py
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/_slaved_id_tracker.py
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/account_data.py
@@ -524,7 +533,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/pushers.py
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/receipts.py
lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/registration.py
-lib/python${MODPY_VERSION}/site-packages/synapse/replication/slave/storage/room.py
lib/python${MODPY_VERSION}/site-packages/synapse/replication/tcp/
lib/python${MODPY_VERSION}/site-packages/synapse/replication/tcp/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/replication/tcp/${MODPY_PYCACHE}/
@@ -618,6 +626,7 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}rooms.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}server_notice_servlet.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}statistics.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}username_available.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/${MODPY_PYCACHE}users.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/_base.py
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/devices.py
@@ -628,101 +637,96 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/rooms.py
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/server_notice_servlet.py
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/statistics.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/username_available.py
lib/python${MODPY_VERSION}/site-packages/synapse/rest/admin/users.py
lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/
lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}account.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}account_data.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}account_validity.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}capabilities.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}devices.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}directory.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}filter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}groups.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}initial_sync.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}keys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}knock.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}login.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}logout.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}notifications.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}openid.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}password_policy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}presence.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}profile.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}push_rule.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}pusher.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}read_marker.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}receipts.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}register.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}relations.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}report_event.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}room.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}room_batch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}room_keys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}room_upgrade_rest_servlet.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}sendtodevice.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}shared_rooms.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}sync.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}tags.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}thirdparty.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}tokenrefresh.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}transactions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}user_directory.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}versions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/${MODPY_PYCACHE}voip.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/_base.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/account.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/account_data.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/account_validity.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/auth.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/capabilities.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/devices.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/directory.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/events.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/filter.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/groups.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/initial_sync.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/keys.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/knock.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/login.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/logout.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/notifications.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/openid.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/password_policy.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/presence.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/profile.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/push_rule.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/pusher.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/read_marker.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/receipts.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/register.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/relations.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/report_event.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/room.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/room_batch.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/room_keys.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/room_upgrade_rest_servlet.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/sendtodevice.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/shared_rooms.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/sync.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/tags.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/thirdparty.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/tokenrefresh.py
lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/transactions.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}directory.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}initial_sync.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}login.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}logout.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}presence.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}profile.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}push_rule.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}pusher.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}room.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/${MODPY_PYCACHE}voip.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/directory.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/events.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/initial_sync.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/login.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/logout.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/presence.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/profile.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/push_rule.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/pusher.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/room.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v1/voip.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}_base.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}account.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}account_data.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}account_validity.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}capabilities.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}devices.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}filter.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}groups.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}keys.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}knock.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}notifications.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}openid.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}password_policy.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}read_marker.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}receipts.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}register.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}relations.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}report_event.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}room_keys.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}room_upgrade_rest_servlet.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}sendtodevice.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}shared_rooms.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}sync.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}tags.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}thirdparty.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}tokenrefresh.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/${MODPY_PYCACHE}user_directory.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/_base.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/account.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/account_data.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/account_validity.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/auth.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/capabilities.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/devices.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/filter.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/groups.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/keys.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/knock.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/notifications.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/openid.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/password_policy.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/read_marker.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/receipts.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/register.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/relations.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/report_event.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/room_keys.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/room_upgrade_rest_servlet.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/sendtodevice.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/shared_rooms.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/sync.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/tags.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/thirdparty.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/tokenrefresh.py
-lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/v2_alpha/user_directory.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/user_directory.py
lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/versions.py
+lib/python${MODPY_VERSION}/site-packages/synapse/rest/client/voip.py
lib/python${MODPY_VERSION}/site-packages/synapse/rest/consent/
lib/python${MODPY_VERSION}/site-packages/synapse/rest/consent/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/rest/consent/${MODPY_PYCACHE}/
@@ -1354,6 +1358,8 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/61/03recreate_min_depth.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/61/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/61/${MODPY_PYCACHE}03recreate_min_depth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/62/
+lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/delta/62/01insertion_event_extremities.sql
lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/full_schemas/
lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/full_schemas/16/
lib/python${MODPY_VERSION}/site-packages/synapse/storage/schema/main/full_schemas/16/application_services.sql
@@ -1430,7 +1436,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/util/${MODPY_PYCACHE}hash.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/util/${MODPY_PYCACHE}httpresourcetree.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/util/${MODPY_PYCACHE}iterutils.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/synapse/util/${MODPY_PYCACHE}jsonobject.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/util/${MODPY_PYCACHE}linked_list.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/util/${MODPY_PYCACHE}logcontext.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/synapse/util/${MODPY_PYCACHE}logformatter.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1481,7 +1486,6 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/synapse/util/hash.py
lib/python${MODPY_VERSION}/site-packages/synapse/util/httpresourcetree.py
lib/python${MODPY_VERSION}/site-packages/synapse/util/iterutils.py
-lib/python${MODPY_VERSION}/site-packages/synapse/util/jsonobject.py
lib/python${MODPY_VERSION}/site-packages/synapse/util/linked_list.py
lib/python${MODPY_VERSION}/site-packages/synapse/util/logcontext.py
lib/python${MODPY_VERSION}/site-packages/synapse/util/logformatter.py
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
resolvd recongizing unbound
The running resolvd recognizes if unwind is running,
and places 127.0.0.1 at the top of resolv.conf accordingly.
Could we have the same for unbound please?
I run unbound insted of unwind to also serve some
local names the machines around the office (beside resolution).
But resolvd only recognizes unwind, not unbound;
so resolv.conf lists just the external (dhcp) nameservers
who don't know my local names of course.
Or is there a reason resolvd only honors unwind
but not unbound?
Jan
and places 127.0.0.1 at the top of resolv.conf accordingly.
Could we have the same for unbound please?
I run unbound insted of unwind to also serve some
local names the machines around the office (beside resolution).
But resolvd only recognizes unwind, not unbound;
so resolv.conf lists just the external (dhcp) nameservers
who don't know my local names of course.
Or is there a reason resolvd only honors unwind
but not unbound?
Jan
Re: [Update} Python 3.8.11 -> 3.8.12
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.
> 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.
Re: [MAINTAINER UPDATE] www/qutebrowser -> 2.3.1
Dimitri Karamazov wrote:
> On Thu, Aug 26, 2021 at 05:03:52PM +0000, 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 <module>
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
> On Thu, Aug 26, 2021 at 05:03:52PM +0000, 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 <module>
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
Re: [new] sysutils/czkawka 3.2.0
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 <tb@openbsd.org>
>
> WWW: https://github.com/qarmin/czkawka
>
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 <tb@openbsd.org>
>
> WWW: https://github.com/qarmin/czkawka
>
[Update] awstats 7.7 -> 7.8
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 -0000 1.20
+++ Makefile 31 Aug 2021 09:04:21 -0000
@@ -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 -0000 1.9
+++ distinfo 31 Aug 2021 09:04:21 -0000
@@ -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 -0000 1.8
+++ pkg/PLIST 31 Aug 2021 09:04:21 -0000
@@ -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
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.
===================================================================
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 -0000 1.20
+++ Makefile 31 Aug 2021 09:04:21 -0000
@@ -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 -0000 1.9
+++ distinfo 31 Aug 2021 09:04:21 -0000
@@ -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 -0000 1.8
+++ pkg/PLIST 31 Aug 2021 09:04:21 -0000
@@ -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
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.
Re: [MAINTAINER UPDATE] www/qutebrowser -> 2.3.1
Dimitri Karamazov <deserter666@danwin1210.me> writes:
> On Thu, Aug 26, 2021 at 05:03:52PM +0000, 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
> On Thu, Aug 26, 2021 at 05:03:52PM +0000, 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
Monday, August 30, 2021
games/openttd 12.0-beta2 to try
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
--- Makefile 4 May 2021 21:33:46 -0000 1.72
+++ Makefile 20 Aug 2021 06:52:29 -0000
@@ -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
--- distinfo 4 May 2021 21:33:46 -0000 1.39
+++ distinfo 20 Aug 2021 06:54:22 -0000
@@ -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
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
--- Makefile 4 May 2021 21:33:46 -0000 1.72
+++ Makefile 20 Aug 2021 06:52:29 -0000
@@ -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
--- distinfo 4 May 2021 21:33:46 -0000 1.39
+++ distinfo 20 Aug 2021 06:54:22 -0000
@@ -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
[Update] Python 3.9.6 -> 3.9.7
A handful of security fixes and various other fixes.
https://docs.python.org/release/3.9.7/whatsnew/changelog.html#changelog
Tests pass as before
Patches regenerated
ok?
(cc maintainer)
--Kurt
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/python/3.9/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 18 Aug 2021 19:08:05 -0000 1.8
+++ Makefile 31 Aug 2021 04:14:20 -0000
@@ -6,12 +6,11 @@
# Python itself.
VERSION = 3.9
-PATCHLEVEL = .6
+PATCHLEVEL = .7
SHARED_LIBS = python3.9 0.0
VERSION_SPEC = >=3.9,<3.10
#PSUBDIR = python/3.9.0
-REVISION-main = 0
CONFIGURE_ARGS += --with-ensurepip=no
CONFIGURE_ARGS += --enable-loadable-sqlite-extensions
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/python/3.9/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 15 Jul 2021 13:45:06 -0000 1.5
+++ distinfo 31 Aug 2021 04:14:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (Python-3.9.6.tgz) = 0KNRguGeQW/I6uJaPc1NAtSZczPkrR8u7mAQqtw/6GY=
-SIZE (Python-3.9.6.tgz) = 25640094
+SHA256 (Python-3.9.7.tgz) = qDjT+TYNFXBAFCtxXbNPAhjlNTM2lqVWncb4VGBOudE=
+SIZE (Python-3.9.7.tgz) = 25755357
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/lang/python/3.9/patches/patch-configure_ac,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure_ac
--- patches/patch-configure_ac 12 Jun 2021 04:00:22 -0000 1.3
+++ patches/patch-configure_ac 31 Aug 2021 04:14:20 -0000
@@ -15,7 +15,7 @@ Index: configure.ac
# The later defininition of _XOPEN_SOURCE disables certain features
# on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
-@@ -2855,18 +2855,7 @@ AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/S
+@@ -2858,18 +2858,7 @@ AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/S
AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX
# checks for uuid.h location
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/lang/python/3.9/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_py
--- patches/patch-setup_py 28 Dec 2020 22:28:14 -0000 1.2
+++ patches/patch-setup_py 31 Aug 2021 04:14:20 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-setup_py,v 1.2 2020/12/2
Index: setup.py
--- setup.py.orig
+++ setup.py
-@@ -1043,6 +1043,8 @@ class PyBuildExt(build_ext):
+@@ -1046,6 +1046,8 @@ class PyBuildExt(build_ext):
'termcap'):
readline_libs.append('termcap')
self.add(Extension('readline', ['readline.c'],
@@ -12,7 +12,7 @@ Index: setup.py
library_dirs=['/usr/lib/termcap'],
extra_link_args=readline_extra_link_args,
libraries=readline_libs))
-@@ -1765,7 +1767,7 @@ class PyBuildExt(build_ext):
+@@ -1770,7 +1772,7 @@ class PyBuildExt(build_ext):
# Build the _uuid module if possible
uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"])
if uuid_incs is not None:
@@ -21,7 +21,7 @@ Index: setup.py
uuid_libs = ['uuid']
else:
uuid_libs = []
-@@ -1988,8 +1990,7 @@ class PyBuildExt(build_ext):
+@@ -1993,8 +1995,7 @@ class PyBuildExt(build_ext):
# The versions with dots are used on Unix, and the versions without
# dots on Windows, for detection by cygwin.
tcllib = tklib = tcl_includes = tk_includes = None
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/3.9/pkg/PLIST-main,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST-main
--- pkg/PLIST-main 30 Jul 2021 20:04:55 -0000 1.8
+++ pkg/PLIST-main 31 Aug 2021 04:14:20 -0000
@@ -1853,8 +1853,8 @@ lib/python3.9/ensurepip/_bundled/__pycac
lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.opt-1.pyc
lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.opt-2.pyc
lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.pyc
-lib/python3.9/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl
-lib/python3.9/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl
+lib/python3.9/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl
+lib/python3.9/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl
lib/python3.9/ensurepip/_uninstall.py
lib/python3.9/enum.py
lib/python3.9/filecmp.py
@@ -2053,9 +2053,9 @@ lib/python3.9/lib-dynload/
@so lib/python3.9/lib-dynload/zlib.cpython-39.so
lib/python3.9/lib2to3/
lib/python3.9/lib2to3/Grammar.txt
-lib/python3.9/lib2to3/Grammar3.9.6.final.0.pickle
+lib/python3.9/lib2to3/Grammar3.9.7.final.0.pickle
lib/python3.9/lib2to3/PatternGrammar.txt
-lib/python3.9/lib2to3/PatternGrammar3.9.6.final.0.pickle
+lib/python3.9/lib2to3/PatternGrammar3.9.7.final.0.pickle
lib/python3.9/lib2to3/__init__.py
lib/python3.9/lib2to3/__main__.py
lib/python3.9/lib2to3/__pycache__/
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/lang/python/3.9/pkg/PLIST-tests,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-tests
--- pkg/PLIST-tests 12 Jun 2021 04:00:22 -0000 1.4
+++ pkg/PLIST-tests 31 Aug 2021 04:14:21 -0000
@@ -519,6 +519,9 @@ lib/python3.9/test/__pycache__/__main__.
lib/python3.9/test/__pycache__/_test_multiprocessing.cpython-39.opt-1.pyc
lib/python3.9/test/__pycache__/_test_multiprocessing.cpython-39.opt-2.pyc
lib/python3.9/test/__pycache__/_test_multiprocessing.cpython-39.pyc
+lib/python3.9/test/__pycache__/_typed_dict_helper.cpython-39.opt-1.pyc
+lib/python3.9/test/__pycache__/_typed_dict_helper.cpython-39.opt-2.pyc
+lib/python3.9/test/__pycache__/_typed_dict_helper.cpython-39.pyc
lib/python3.9/test/__pycache__/ann_module.cpython-39.opt-1.pyc
lib/python3.9/test/__pycache__/ann_module.cpython-39.opt-2.pyc
lib/python3.9/test/__pycache__/ann_module.cpython-39.pyc
@@ -1963,6 +1966,7 @@ lib/python3.9/test/__pycache__/xmltests.
lib/python3.9/test/__pycache__/xmltests.cpython-39.opt-2.pyc
lib/python3.9/test/__pycache__/xmltests.cpython-39.pyc
lib/python3.9/test/_test_multiprocessing.py
+lib/python3.9/test/_typed_dict_helper.py
lib/python3.9/test/allsans.pem
lib/python3.9/test/ann_module.py
lib/python3.9/test/ann_module2.py
@@ -2444,12 +2448,16 @@ lib/python3.9/test/support/__pycache__/s
lib/python3.9/test/support/__pycache__/testresult.cpython-39.opt-1.pyc
lib/python3.9/test/support/__pycache__/testresult.cpython-39.opt-2.pyc
lib/python3.9/test/support/__pycache__/testresult.cpython-39.pyc
+lib/python3.9/test/support/__pycache__/warnings_helper.cpython-39.opt-1.pyc
+lib/python3.9/test/support/__pycache__/warnings_helper.cpython-39.opt-2.pyc
+lib/python3.9/test/support/__pycache__/warnings_helper.cpython-39.pyc
lib/python3.9/test/support/bytecode_helper.py
lib/python3.9/test/support/hashlib_helper.py
lib/python3.9/test/support/logging_helper.py
lib/python3.9/test/support/script_helper.py
lib/python3.9/test/support/socket_helper.py
lib/python3.9/test/support/testresult.py
+lib/python3.9/test/support/warnings_helper.py
lib/python3.9/test/talos-2019-0758.pem
lib/python3.9/test/test___all__.py
lib/python3.9/test/test___future__.py
https://docs.python.org/release/3.9.7/whatsnew/changelog.html#changelog
Tests pass as before
Patches regenerated
ok?
(cc maintainer)
--Kurt
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/python/3.9/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 18 Aug 2021 19:08:05 -0000 1.8
+++ Makefile 31 Aug 2021 04:14:20 -0000
@@ -6,12 +6,11 @@
# Python itself.
VERSION = 3.9
-PATCHLEVEL = .6
+PATCHLEVEL = .7
SHARED_LIBS = python3.9 0.0
VERSION_SPEC = >=3.9,<3.10
#PSUBDIR = python/3.9.0
-REVISION-main = 0
CONFIGURE_ARGS += --with-ensurepip=no
CONFIGURE_ARGS += --enable-loadable-sqlite-extensions
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/python/3.9/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 15 Jul 2021 13:45:06 -0000 1.5
+++ distinfo 31 Aug 2021 04:14:20 -0000
@@ -1,2 +1,2 @@
-SHA256 (Python-3.9.6.tgz) = 0KNRguGeQW/I6uJaPc1NAtSZczPkrR8u7mAQqtw/6GY=
-SIZE (Python-3.9.6.tgz) = 25640094
+SHA256 (Python-3.9.7.tgz) = qDjT+TYNFXBAFCtxXbNPAhjlNTM2lqVWncb4VGBOudE=
+SIZE (Python-3.9.7.tgz) = 25755357
Index: patches/patch-configure_ac
===================================================================
RCS file: /cvs/ports/lang/python/3.9/patches/patch-configure_ac,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure_ac
--- patches/patch-configure_ac 12 Jun 2021 04:00:22 -0000 1.3
+++ patches/patch-configure_ac 31 Aug 2021 04:14:20 -0000
@@ -15,7 +15,7 @@ Index: configure.ac
# The later defininition of _XOPEN_SOURCE disables certain features
# on Linux, so we need _GNU_SOURCE to re-enable them (makedev, tm_zone).
-@@ -2855,18 +2855,7 @@ AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/S
+@@ -2858,18 +2858,7 @@ AC_CHECK_LIB(dl, dlopen) # Dynamic linking for SunOS/S
AC_CHECK_LIB(dld, shl_load) # Dynamic linking for HP-UX
# checks for uuid.h location
Index: patches/patch-setup_py
===================================================================
RCS file: /cvs/ports/lang/python/3.9/patches/patch-setup_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-setup_py
--- patches/patch-setup_py 28 Dec 2020 22:28:14 -0000 1.2
+++ patches/patch-setup_py 31 Aug 2021 04:14:20 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-setup_py,v 1.2 2020/12/2
Index: setup.py
--- setup.py.orig
+++ setup.py
-@@ -1043,6 +1043,8 @@ class PyBuildExt(build_ext):
+@@ -1046,6 +1046,8 @@ class PyBuildExt(build_ext):
'termcap'):
readline_libs.append('termcap')
self.add(Extension('readline', ['readline.c'],
@@ -12,7 +12,7 @@ Index: setup.py
library_dirs=['/usr/lib/termcap'],
extra_link_args=readline_extra_link_args,
libraries=readline_libs))
-@@ -1765,7 +1767,7 @@ class PyBuildExt(build_ext):
+@@ -1770,7 +1772,7 @@ class PyBuildExt(build_ext):
# Build the _uuid module if possible
uuid_incs = find_file("uuid.h", self.inc_dirs, ["/usr/include/uuid"])
if uuid_incs is not None:
@@ -21,7 +21,7 @@ Index: setup.py
uuid_libs = ['uuid']
else:
uuid_libs = []
-@@ -1988,8 +1990,7 @@ class PyBuildExt(build_ext):
+@@ -1993,8 +1995,7 @@ class PyBuildExt(build_ext):
# The versions with dots are used on Unix, and the versions without
# dots on Windows, for detection by cygwin.
tcllib = tklib = tcl_includes = tk_includes = None
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/python/3.9/pkg/PLIST-main,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST-main
--- pkg/PLIST-main 30 Jul 2021 20:04:55 -0000 1.8
+++ pkg/PLIST-main 31 Aug 2021 04:14:20 -0000
@@ -1853,8 +1853,8 @@ lib/python3.9/ensurepip/_bundled/__pycac
lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.opt-1.pyc
lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.opt-2.pyc
lib/python3.9/ensurepip/_bundled/__pycache__/__init__.cpython-39.pyc
-lib/python3.9/ensurepip/_bundled/pip-21.1.3-py3-none-any.whl
-lib/python3.9/ensurepip/_bundled/setuptools-56.0.0-py3-none-any.whl
+lib/python3.9/ensurepip/_bundled/pip-21.2.3-py3-none-any.whl
+lib/python3.9/ensurepip/_bundled/setuptools-57.4.0-py3-none-any.whl
lib/python3.9/ensurepip/_uninstall.py
lib/python3.9/enum.py
lib/python3.9/filecmp.py
@@ -2053,9 +2053,9 @@ lib/python3.9/lib-dynload/
@so lib/python3.9/lib-dynload/zlib.cpython-39.so
lib/python3.9/lib2to3/
lib/python3.9/lib2to3/Grammar.txt
-lib/python3.9/lib2to3/Grammar3.9.6.final.0.pickle
+lib/python3.9/lib2to3/Grammar3.9.7.final.0.pickle
lib/python3.9/lib2to3/PatternGrammar.txt
-lib/python3.9/lib2to3/PatternGrammar3.9.6.final.0.pickle
+lib/python3.9/lib2to3/PatternGrammar3.9.7.final.0.pickle
lib/python3.9/lib2to3/__init__.py
lib/python3.9/lib2to3/__main__.py
lib/python3.9/lib2to3/__pycache__/
Index: pkg/PLIST-tests
===================================================================
RCS file: /cvs/ports/lang/python/3.9/pkg/PLIST-tests,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-tests
--- pkg/PLIST-tests 12 Jun 2021 04:00:22 -0000 1.4
+++ pkg/PLIST-tests 31 Aug 2021 04:14:21 -0000
@@ -519,6 +519,9 @@ lib/python3.9/test/__pycache__/__main__.
lib/python3.9/test/__pycache__/_test_multiprocessing.cpython-39.opt-1.pyc
lib/python3.9/test/__pycache__/_test_multiprocessing.cpython-39.opt-2.pyc
lib/python3.9/test/__pycache__/_test_multiprocessing.cpython-39.pyc
+lib/python3.9/test/__pycache__/_typed_dict_helper.cpython-39.opt-1.pyc
+lib/python3.9/test/__pycache__/_typed_dict_helper.cpython-39.opt-2.pyc
+lib/python3.9/test/__pycache__/_typed_dict_helper.cpython-39.pyc
lib/python3.9/test/__pycache__/ann_module.cpython-39.opt-1.pyc
lib/python3.9/test/__pycache__/ann_module.cpython-39.opt-2.pyc
lib/python3.9/test/__pycache__/ann_module.cpython-39.pyc
@@ -1963,6 +1966,7 @@ lib/python3.9/test/__pycache__/xmltests.
lib/python3.9/test/__pycache__/xmltests.cpython-39.opt-2.pyc
lib/python3.9/test/__pycache__/xmltests.cpython-39.pyc
lib/python3.9/test/_test_multiprocessing.py
+lib/python3.9/test/_typed_dict_helper.py
lib/python3.9/test/allsans.pem
lib/python3.9/test/ann_module.py
lib/python3.9/test/ann_module2.py
@@ -2444,12 +2448,16 @@ lib/python3.9/test/support/__pycache__/s
lib/python3.9/test/support/__pycache__/testresult.cpython-39.opt-1.pyc
lib/python3.9/test/support/__pycache__/testresult.cpython-39.opt-2.pyc
lib/python3.9/test/support/__pycache__/testresult.cpython-39.pyc
+lib/python3.9/test/support/__pycache__/warnings_helper.cpython-39.opt-1.pyc
+lib/python3.9/test/support/__pycache__/warnings_helper.cpython-39.opt-2.pyc
+lib/python3.9/test/support/__pycache__/warnings_helper.cpython-39.pyc
lib/python3.9/test/support/bytecode_helper.py
lib/python3.9/test/support/hashlib_helper.py
lib/python3.9/test/support/logging_helper.py
lib/python3.9/test/support/script_helper.py
lib/python3.9/test/support/socket_helper.py
lib/python3.9/test/support/testresult.py
+lib/python3.9/test/support/warnings_helper.py
lib/python3.9/test/talos-2019-0758.pem
lib/python3.9/test/test___all__.py
lib/python3.9/test/test___future__.py
Subscribe to:
Posts (Atom)