OpenBSD Mail Box: November 2022

Wednesday, November 30, 2022

Re: bgp conditional advertisement

On Thu, Dec 01, 2022 at 01:01:16AM +0200, Gregory Edigarov wrote:
> Hello,
>
> Having two sites in different physical locations, siteA is connected
> via uplink1 and uplink2, siteB is connected via uplink3 and uplink4.
> I want to announce prefixes from siteB if ASn not found originating
> from siteA, and vice versa. I.e. a feature that will work alike 'enforce
> localas yes' but start announces when ASn is gone. I could done it with
> some scripting, but would prefer to have it in bgpd.
> Is this possible solely with OpenBGPD?

Run an ibgp session between siteA and siteB. Announce only your prefixes
on those sessions. Tag them with a community. Make sure that these
prefixes are more preferred than the one you put in as backup. Filter out
prefixes with the tag. More or less like this:

# backup route using low localpref to be less preferred
network 192.0.2.0/24 set { localpref 1 }

# send my networks to siteA tagged with community
deny to siteA
allow to siteA prefix-set mynetworks set community local-as:42
# filter out announcement originated from siteA
deny to any community local-as:42

--
:wq Claudio

update devel/abseil-cpp to latest LTS 20220623.1 (could use a bulk test)

https://github.com/abseil/abseil-cpp/releases/tag/20220623.1

Most #ifdef OpenBSD hunks were merged, rest of the patches remains the
same (with update churn).

make test on amd64:
98% tests passed, 3 tests failed out of 178

Total Test time (real) = 183.26 sec

The following tests FAILED:
132 - absl_charconv_test (Failed)
140 - absl_str_format_convert_test (Failed)
167 - absl_time_test (Failed)

I'll take a look at those tests tomorrow.

Can someone throw this into a bulk?

I have no way of testing all the consumers that came after net/tg_owt
and net/tdesktop.

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/abseil-cpp/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 11 Mar 2022 18:49:30 -0000 1.6
+++ Makefile 30 Nov 2022 23:24:26 -0000
@@ -1,10 +1,9 @@
COMMENT = abseil common libraries (c++)
-REVISION = 2
CATEGORIES = devel

GH_ACCOUNT = abseil
GH_PROJECT = ${GH_ACCOUNT}-cpp
-GH_TAGNAME = 20211102.0
+GH_TAGNAME = 20220623.1

HOMEPAGE = https://abseil.io/

@@ -14,78 +13,76 @@ MAINTAINER = Andrew Krasavin <noiseless-
# Apache 2.0
PERMIT_PACKAGE = Yes

-SHARED_LIBS += absl_bad_any_cast_impl 0.0 # 2103.0.1
-SHARED_LIBS += absl_bad_optional_access 0.0 # 2103.0.1
-SHARED_LIBS += absl_bad_variant_access 0.0 # 2103.0.1
-SHARED_LIBS += absl_base 0.0 # 2103.0.1
-SHARED_LIBS += absl_city 0.0 # 2103.0.1
-SHARED_LIBS += absl_civil_time 0.0 # 2103.0.1
-SHARED_LIBS += absl_cord 0.0 # 2103.0.1
-SHARED_LIBS += absl_cord_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_cordz_functions 0.0 # 2103.0.1
-SHARED_LIBS += absl_cordz_handle 0.0 # 2103.0.1
-SHARED_LIBS += absl_cordz_info 0.0 # 2103.0.1
-SHARED_LIBS += absl_cordz_sample_token 0.0 # 2103.0.1
-SHARED_LIBS += absl_debugging_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_demangle_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_examine_stack 0.0 # 2103.0.1
-SHARED_LIBS += absl_exponential_biased 0.0 # 2103.0.1
-SHARED_LIBS += absl_failure_signal_handler 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_commandlineflag 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_commandlineflag_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_config 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_marshalling 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_parse 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_private_handle_accessor 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_program_name 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_reflection 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_usage 0.0 # 2103.0.1
-SHARED_LIBS += absl_flags_usage_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_graphcycles_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_hash 0.0 # 2103.0.1
-SHARED_LIBS += absl_hashtablez_sampler 0.0 # 2103.0.1
-SHARED_LIBS += absl_int128 0.0 # 2103.0.1
-SHARED_LIBS += absl_leak_check 0.0 # 2103.0.1
-SHARED_LIBS += absl_leak_check_disable 0.0 # 2103.0.1
-SHARED_LIBS += absl_log_severity 0.0 # 2103.0.1
-SHARED_LIBS += absl_low_level_hash 0.0 # 2103.0.1
-SHARED_LIBS += absl_malloc_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_periodic_sampler 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_distributions 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_internal_distribution_test_util 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_internal_platform 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_internal_pool_urbg 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_internal_randen 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_internal_randen_hwaes 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_internal_randen_hwaes_impl 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_internal_randen_slow 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_internal_seed_material 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_seed_gen_exception 0.0 # 2103.0.1
-SHARED_LIBS += absl_random_seed_sequences 0.0 # 2103.0.1
-SHARED_LIBS += absl_raw_hash_set 0.0 # 2103.0.1
-SHARED_LIBS += absl_raw_logging_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_scoped_set_env 0.0 # 2103.0.1
-SHARED_LIBS += absl_spinlock_wait 0.0 # 2103.0.1
-SHARED_LIBS += absl_stacktrace 0.0 # 2103.0.1
-SHARED_LIBS += absl_status 0.0 # 2103.0.1
-SHARED_LIBS += absl_statusor 0.0 # 2103.0.1
-SHARED_LIBS += absl_str_format_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_strerror 0.0 # 2103.0.1
-SHARED_LIBS += absl_strings 0.0 # 2103.0.1
-SHARED_LIBS += absl_strings_internal 0.0 # 2103.0.1
-SHARED_LIBS += absl_symbolize 0.0 # 2103.0.1
-SHARED_LIBS += absl_synchronization 0.0 # 2103.0.1
-SHARED_LIBS += absl_throw_delegate 0.0 # 2103.0.1
-SHARED_LIBS += absl_time 0.0 # 2103.0.1
-SHARED_LIBS += absl_time_zone 0.0 # 2103.0.1
-SHARED_LIBS += absl_wyhash 0.0 # 2103.0.1
+SHARED_LIBS += absl_bad_any_cast_impl 1.0 # 2206.0.0
+SHARED_LIBS += absl_bad_optional_access 1.0 # 2206.0.0
+SHARED_LIBS += absl_bad_variant_access 1.0 # 2206.0.0
+SHARED_LIBS += absl_base 1.0 # 2206.0.0
+SHARED_LIBS += absl_city 1.0 # 2206.0.0
+SHARED_LIBS += absl_civil_time 1.0 # 2206.0.0
+SHARED_LIBS += absl_cord 1.0 # 2206.0.0
+SHARED_LIBS += absl_cord_internal 1.0 # 2206.0.0
+SHARED_LIBS += absl_cordz_functions 1.0 # 2206.0.0
+SHARED_LIBS += absl_cordz_handle 1.0 # 2206.0.0
+SHARED_LIBS += absl_cordz_info 1.0 # 2206.0.0
+SHARED_LIBS += absl_cordz_sample_token 1.0 # 2206.0.0
+SHARED_LIBS += absl_debugging_internal 1.0 # 2206.0.0
+SHARED_LIBS += absl_demangle_internal 1.0 # 2206.0.0
+SHARED_LIBS += absl_examine_stack 1.0 # 2206.0.0
+SHARED_LIBS += absl_exponential_biased 1.0 # 2206.0.0
+SHARED_LIBS += absl_failure_signal_handler 1.0 # 2206.0.0
+SHARED_LIBS += absl_flags 1.0 # 2206.0.0
+SHARED_LIBS += absl_flags_commandlineflag 1.0 # 2206.0.0
+SHARED_LIBS += absl_flags_commandlineflag_internal 1.0 # 2206.0.0
+SHARED_LIBS += absl_flags_config 1.0 # 2206.0.0
+SHARED_LIBS += absl_flags_internal 1.0 # 2206.0.0
+SHARED_LIBS += absl_flags_marshalling 1.0 # 2206.0.0
+SHARED_LIBS += absl_flags_parse 1.0 # 2206.0.0
+SHARED_LIBS += absl_flags_private_handle_accessor 1.0 # 2206.0.0
+SHARED_LIBS += absl_flags_program_name 1.0 # 2206.0.0
+SHARED_LIBS += absl_flags_reflection 1.0 # 2206.0.0
+SHARED_LIBS += absl_flags_usage 1.0 # 2206.0.0
+SHARED_LIBS += absl_flags_usage_internal 1.0 # 2206.0.0
+SHARED_LIBS += absl_graphcycles_internal 1.0 # 2206.0.0
+SHARED_LIBS += absl_hash 1.0 # 2206.0.0
+SHARED_LIBS += absl_hashtablez_sampler 1.0 # 2206.0.0
+SHARED_LIBS += absl_int128 1.0 # 2206.0.0
+SHARED_LIBS += absl_log_severity 1.0 # 2206.0.0
+SHARED_LIBS += absl_low_level_hash 1.0 # 2206.0.0
+SHARED_LIBS += absl_malloc_internal 1.0 # 2206.0.0
+SHARED_LIBS += absl_periodic_sampler 1.0 # 2206.0.0
+SHARED_LIBS += absl_random_distributions 1.0 # 2206.0.0
+SHARED_LIBS += absl_random_internal_distribution_test_util 1.0 # 2206.0.0
+SHARED_LIBS += absl_random_internal_platform 1.0 # 2206.0.0
+SHARED_LIBS += absl_random_internal_pool_urbg 1.0 # 2206.0.0
+SHARED_LIBS += absl_random_internal_randen 1.0 # 2206.0.0
+SHARED_LIBS += absl_random_internal_randen_hwaes 1.0 # 2206.0.0
+SHARED_LIBS += absl_random_internal_randen_hwaes_impl 1.0 # 2206.0.0
+SHARED_LIBS += absl_random_internal_randen_slow 1.0 # 2206.0.0
+SHARED_LIBS += absl_random_internal_seed_material 1.0 # 2206.0.0
+SHARED_LIBS += absl_random_seed_gen_exception 1.0 # 2206.0.0
+SHARED_LIBS += absl_random_seed_sequences 1.0 # 2206.0.0
+SHARED_LIBS += absl_raw_hash_set 1.0 # 2206.0.0
+SHARED_LIBS += absl_raw_logging_internal 1.0 # 2206.0.0
+SHARED_LIBS += absl_scoped_set_env 1.0 # 2206.0.0
+SHARED_LIBS += absl_spinlock_wait 1.0 # 2206.0.0
+SHARED_LIBS += absl_stacktrace 1.0 # 2206.0.0
+SHARED_LIBS += absl_status 1.0 # 2206.0.0
+SHARED_LIBS += absl_statusor 1.0 # 2206.0.0
+SHARED_LIBS += absl_str_format_internal 1.0 # 2206.0.0
+SHARED_LIBS += absl_strerror 1.0 # 2206.0.0
+SHARED_LIBS += absl_strings 1.0 # 2206.0.0
+SHARED_LIBS += absl_strings_internal 1.0 # 2206.0.0
+SHARED_LIBS += absl_symbolize 1.0 # 2206.0.0
+SHARED_LIBS += absl_synchronization 1.0 # 2206.0.0
+SHARED_LIBS += absl_throw_delegate 1.0 # 2206.0.0
+SHARED_LIBS += absl_time 1.0 # 2206.0.0
+SHARED_LIBS += absl_time_zone 1.0 # 2206.0.0
+SHARED_LIBS += absl_wyhash 1.0 # 2206.0.0

# C++17
COMPILER = base-clang ports-gcc
COMPILER_LANGS= c++
-WANTLIB = ${COMPILER_LIBCXX} m
+WANTLIB = ${COMPILER_LIBCXX} execinfo m
MODULES = devel/cmake

CONFIGURE_ARGS += -DBUILD_SHARED_LIBS:BOOL=ON
@@ -106,7 +103,8 @@ NO_TEST = Yes
# use googletest from ports
CONFIGURE_ARGS += -DABSL_USE_EXTERNAL_GOOGLETEST:BOOL=${LOCALBASE}/include/gtest
# turn on tests builds
-CONFIGURE_ARGS += -DBUILD_TESTING:BOOL=ON
+CONFIGURE_ARGS += -DBUILD_TESTING:BOOL=ON \
+ -DABSL_BUILD_TESTING:BOOL=ON

BUILD_DEPENDS += devel/gtest>=1.11.0pl20220208
TEST_DEPENDS += devel/gtest>=1.11.0pl20220208
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/abseil-cpp/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 18 Dec 2021 19:38:17 -0000 1.1.1.1
+++ distinfo 30 Nov 2022 23:20:48 -0000
@@ -1,2 +1,2 @@
-SHA256 (abseil-cpp-20211102.0.tar.gz) = 3PcbnLqNwMqZQMSzFqDHlr6Pq0KwcLtrfKtitI8OZsQ=
-SIZE (abseil-cpp-20211102.0.tar.gz) = 1884080
+SHA256 (abseil-cpp-20220623.1.tar.gz) = kayH0wzG15+auXTFGHSnBN6cJkfED2kyWXMpooIhe6g=
+SIZE (abseil-cpp-20220623.1.tar.gz) = 1957483
Index: patches/patch-absl_base_config_h
===================================================================
RCS file: patches/patch-absl_base_config_h
diff -N patches/patch-absl_base_config_h
--- patches/patch-absl_base_config_h 11 Mar 2022 18:49:30 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,24 +0,0 @@
-Adding OpenBSD to the list of platforms that have mmap(2) and
-pthread_(get|set)schedparam(3).
-
-Index: absl/base/config.h
---- absl/base/config.h.orig
-+++ absl/base/config.h
-@@ -414,7 +414,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
- defined(_AIX) || defined(__ros__) || defined(__native_client__) || \
- defined(__asmjs__) || defined(__wasm__) || defined(__Fuchsia__) || \
- defined(__sun) || defined(__ASYLO__) || defined(__myriad2__) || \
-- defined(__HAIKU__)
-+ defined(__HAIKU__) || defined(__OpenBSD__)
- #define ABSL_HAVE_MMAP 1
-

bgp conditional advertisement

Hello,

Having two sites in different physical locations, siteA is connected
via uplink1 and uplink2, siteB is connected via uplink3 and uplink4.
I want to announce prefixes from siteB if ASn not found originating
from siteA, and vice versa. I.e. a feature that will work alike 'enforce
localas yes' but start announces when ASn is gone. I could done it with
some scripting, but would prefer to have it in bgpd.
Is this possible solely with OpenBGPD?
Thank you.

--
With best regards,
Gregory Edigarov

Re: Documentation of wsconsctl keyboard.map format?

Le 30 novembre 2022 21:40:17 GMT+02:00, "Vlad Meșco" <vlad.mesco@gmail.com> a écrit :
>On Wed, Nov 30, 2022 at 06:17:40AM +0100, Mike Fischer wrote:
>>
>> Also the semantics of these is unclear to me:
>> #define KS_Cmd 0xf10d
>> #define KS_Cmd1 0xf10e
>> #define KS_Cmd2 0xf10f
>
>Deep down I was hoping someone more knowledgeable would intervene and
>explain them to me as well. I gave up.

I think I got it. The COMMAND* modifiers are only handled in wskbd.c internal_command. As in break into ddb, switch vtty...

If you have keys carryin Cmd1 and Cmd2, you need to hit both for the thing to happen (e.g. Ctrl Alt F5 to switch vtty). The single Cmd works by itself. So this is more of am FYI to the driver.

Multi_key is what X calls the Compose key (e.g. Compose+~+n should give ñ; I have not tried it myself).

Mode_switch is the layer above shift that gives you two more characters per key.

I guess Shift+Alt_R by themselves would put you in Compose mode. And if you hold them down they are Shift+AltGr+whateverkeyyoupressed.

I will probably forget this in 2 weeks' time.

Vlad

Re: Documentation of wsconsctl keyboard.map format?

On Wed, Nov 30, 2022 at 06:17:40AM +0100, Mike Fischer wrote:
>
> Hi Vlad,
>
> thanks and sorry for the late reply. I was dealing with other things and getting the Apple keyboard working like I expect is more of a hobby project…
>
>
> > Hey Mike,
> >
> > You can look at /usr/src/sbin/wsconsctl/map.parse.y
>
> Good idea! I'll take a look.
>
> One thing I did notice was that the keysym examples I saw in the (sparse) documentation did not work. For example:
> # wsconsctl keyboard.map+="keysym Alt_L = Alt_R"
> wsconsctl: keysym Alt_L not found
> #
> Actually none of the keyboard.map versions I have seen so far use keysym.

Mine uses `Caps_Lock'. I never thought of using anything else o_O

On my i386
keyboard.map+='keysym z = y'
keyboard.map+='keysym Alt_L = y'
...both work. At that precise moment I realized I needed Alt_L to get
back to X :-P

It would complain about Alt_L not being found if you've clobbered it via
keycode assignment. But I don't know what you did before you ran that
line. Maybe you did nothing wrong and that keyboard is weird.

>
>
> > As mentioned earlier, the keysyms and commands and groups are listed in
> > /usr/src/sys/dev/wscons/wsksymdef.h . Around line 485 you get into
> > modifiers, function keys, and command keys.
>
> I saw that. Most of the modifier keys are self-explanatory. However I have no idea what
> #define KS_Multi_key 0xf109
> #define KS_Mode_switch 0xf10a
> mean? And they are used in the keyboard maps for the definitions of the Alt keys:
> keycode 230 = Cmd2 Mode_switch Multi_key
> And my patch/setting to make the left Alt key behave the same as the right one:
> keycode 226 = Cmd2 Mode_switch Multi_key
>
> Also the semantics of these is unclear to me:
> #define KS_Cmd 0xf10d
> #define KS_Cmd1 0xf10e
> #define KS_Cmd2 0xf10f

Deep down I was hoping someone more knowledgeable would intervene and
explain them to me as well. I gave up.

>
>
> > For educational purposes, you can go check /usr/src/sbin/wsconsctl,
> > where e.g. util.c lists keyboard types. Another place is
> > /usr/include/dev/wscons/wsconsio.h which also lists what tokens
> > wsconsctl likes. The wscons driver is in /usr/src/sys/dev/wscons (also,
> > man 8 wskbd), and keyboard drivers are also thereabout (man -k kbd &&
> > man -k kbc). You can check `wsconsctl keyboard.type' to see what you
> > have, then check that driver for scancodes.
>
> Right. I have already looked at much of that.
>
>
> > Scancodes are keyboard specific.
>
> As witnessed by the difference between your solution for mapping the left Alt key to the same function as the right one, vs. mine.
>
>
> > If that's not enough, you can start assigning [0-9a-zA-Z] to sequential
> > keycodes from e.g. 0-255 and start noting down what's what. This might
> > help with random extra keys (e.g. a physical volume up/down pair of keys
> > which cannot be builtin as it's hard to predict what keys exist and what
> > what the silkscreen says). You probably want to run something stupid
> > like `sleep 300 && wsconsctl keyboard.encoding=us &' before doing that,
> > though, as you'll probably clobber uparrow, CTRL+R, vtty switch or any
> > other key that you could use to "get back" to a normal state. What I'm
> > saying is use a script that sets up a timed reset and does a batch of
> > mappings (e.g. 62 at a time).
>
> Good idea! I may try that. It would be too much to hope for a setting that logs keycodes to some log file or to the console I expect?

I mean you could add some printfs or log(9) in `wskbd.c', probably in
`wskbd_translate', assuming control flows through there on your setup.

I don't know of any utility on OpenBSD that can help here.

> (Misused that would be a potential security problem. But with proper access rights and no persistence across reboots it could help _map_ a keyboard.)
>
> Many of the keycodes are fairly easy to figure out, given the keyboard.map and the results of pressing the keys. Ambiguity remains for some keys where multiple keycodes lead to the same character. And other keys like the <fn> key on some Apple keyboards are complete mysteries right now. Your method could help solve that side of the problem.

I'm pretty sure the Fn key is tied to a pin on the keyboard's controller
that makes it do other stuff; the OS normally doesn't know of the
existance of a Fn key. Then again, laptop UEFI's tend to have a
setting to flip the logic related to F1-2-3 keys, so what do I know...

>
> To get back to a normal setting I think an ssh session may also work. My current working hypotheses is that the keyboard.map is only relevant when using a physically connected (or Bluetooth if OpenBSD supports that) keyboard. Otherwise ssh would need to send keycodes which I am fairly certain it doesn't.

Yeah, ssh would work. Though me, I'd rather set a timeout than run over
to some other machine to type !!.

I'm pretty sure OpenBSD doesn't have Bluetooth at this time.

However, keyboards that come with a dongle present themselves to the OS
as USB HID (same as wired ones). I don't think bluetooth keyboards are
actually that common... (I actually own one bluetooth keyboard, for an
Android tablet, and it required some searching) Oh, and I've also seen
enterprise grade wireless devices that had a bluetooth mode, but their
own dongle required a bespoke Windows driver to work. Wireless
connections are weird.

One last thing, if I understood how keyboards work in the console on
OpenBSD, I think if you have keyboards of multiple types and all of them
are connected, they all have their own settings and you need to tell the
system which one to use.

One last thing, if you have multiple keyboards, be aware that wsconsctl
has an -f flag to pick which keyboard to affect. I think
/etc/wsconsctl.conf operates on the first keyboard it detects. I could
be wrong.

Vlad

Re: some issues with sogo 5.7.1 in 7.2

Le Wed, Nov 30, 2022 at 12:26:37PM +0000, Stuart Henderson a écrit :
> On 2022/11/30 00:38, Giovanni Bechis wrote:
> > SCRIPTS = cas-proxy-validate.py sql-update-2.2.17_to_2.3.0.sh \
> > sql-update-3.2.10_to_4.0.0.sh sql-update-2.2.17_to_2.3.0-mysql.sh \
> > sql-update-3.2.10_to_4.0.0-mysql.sh sql-update-3.0.0-to-combined.sh \
> > - sql-update-3.0.0-to-combined-mysql.sh updates.php
> > + sql-update-3.0.0-to-combined-mysql.sh sql-update-5.5.1_to_5.6.0.sh updates.php
>
> I don't use sogo, but this doesn't seem the most sensible way to
> handle the scripts. In most cases it's better to use wildcards
> rather than try to maintain a list in the port Makefile, they nearly
> always get out of sync sooner or later.
>
> Also sql-update-5.5.1_to_5.6.0.sh has #!/bin/bash, this is patched
> in *some* of the other sql-update scripts, and the pkg-readme tells
> you to use bash in some cases but not others. It's very inconsistent.
>
> How about installing all of Scripts/sql-update-*.sh and run them
> through sed -i 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,'? If some of the
> old ones are not useful they could be @comment'ed to reduce mess, but
> that seems an easier way of keeping track of new files.

seems indeed much nicer and less error-prone for the future.

Landry

Re: chromium showing a blank window

On 2022/11/30 14:47, David Coppa wrote:
> Often, I'd say about half the attempts to start it, chromium shows me
> a blank window and nothing else.

Similar here on an intel machine. I saw a message about sig 11 once but
no core. No errors reported in dmesg.

> Chromium version is 107.0.5304.121 (latest one), but the same thing
> happened with previous versions as well (maybe less often?)

There's a 108 version in ports now, maybe worth trying that before poking
much further.

Re: chromium showing a blank window

On Wed, Nov 30, 2022 at 02:47:41PM +0100, David Coppa wrote:
> Often, I'd say about half the attempts to start it, chromium shows me
> a blank window and nothing else.
>
> Chromium version is 107.0.5304.121 (latest one), but the same thing
> happened with previous versions as well (maybe less often?)

Typical chrome issue. Kill the gpu-process for it to recover.
Using `pkill -f --type=gpu-process` is normally enough. Also if you wait
long enough chrome should do that automatically (since some time).

--
:wq Claudio

chromium showing a blank window

Often, I'd say about half the attempts to start it, chromium shows me
a blank window and nothing else.

Chromium version is 107.0.5304.121 (latest one), but the same thing
happened with previous versions as well (maybe less often?)

Attached you can find two screenshot, the good one and the bad one.

My laptop is a ThinkPad T14s (AMD based), here's the dmesg:

OpenBSD 7.2-current (GENERIC.MP) #859: Sat Nov 26 11:10:04 MST 2022
deraadt@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP
real mem = 15902117888 (15165MB)
avail mem = 15402758144 (14689MB)
random: good seed from bootblocks
mpath0 at root
scsibus0 at mpath0: 256 targets
mainbus0 at root
bios0 at mainbus0: SMBIOS rev. 3.3 @ 0xc7c59000 (68 entries)
bios0: vendor LENOVO version "R1NET54W (1.24)" date 10/27/2022
bios0: LENOVO 20XF006JGE
efi0 at bios0: UEFI 2.7
efi0: Lenovo rev 0x1180
acpi0 at bios0: ACPI 6.3
acpi0: sleep states S0 S3 S4 S5
acpi0: tables DSDT FACP SSDT SSDT SSDT IVRS SSDT SSDT TPM2 MSDM BATB
HPET APIC MCFG SBST WSMT VFCT SSDT CRAT CDIT FPDT SSDT SSDT SSDT SSDT
BGRT UEFI SSDT SSDT SSDT
acpi0: wakeup devices GPP0(S3) RESA(S3) GPP6(S4) GPP4(S4) GPP5(S3)
L850(S3) GPP7(S3) GP17(S3) XHC0(S3) XHC1(S3) LID_(S4) SLPB(S3)
acpitimer0 at acpi0: 3579545 Hz, 32 bits
acpihpet0 at acpi0: 14318180 Hz
acpimadt0 at acpi0 addr 0xfee00000: PC-AT compat
cpu0 at mainbus0: apid 0 (boot processor)
cpu0: AMD Ryzen 5 PRO 5650U with Radeon Graphics, 2300.00 MHz, 19-50-00
cpu0: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,TCE,TOPEXT,CPCTR,DBKP,PCTRL3,MWAITX,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,PQM,RDSEED,ADX,SMAP,CLFLUSHOPT,CLWB,SHA,UMIP,PKU,IBPB,IBRS,STIBP,SSBD,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
cpu0: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 512KB
64b/line 8-way L2 cache, 16MB 64b/line 16-way L3 cache
cpu0: smt 0, core 0, package 0
mtrr: Pentium Pro MTRR support, 8 var ranges, 88 fixed ranges
cpu0: apic clock running at 100MHz
cpu0: mwait min=64, max=64, C-substates=1.1, IBE
cpu1 at mainbus0: apid 1 (application processor)
cpu1: AMD Ryzen 5 PRO 5650U with Radeon Graphics, 2300.00 MHz, 19-50-00
cpu1: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,TCE,TOPEXT,CPCTR,DBKP,PCTRL3,MWAITX,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,PQM,RDSEED,ADX,SMAP,CLFLUSHOPT,CLWB,SHA,UMIP,PKU,IBPB,IBRS,STIBP,SSBD,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
cpu1: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 512KB
64b/line 8-way L2 cache, 16MB 64b/line 16-way L3 cache
cpu1: smt 1, core 0, package 0
cpu2 at mainbus0: apid 2 (application processor)
cpu2: AMD Ryzen 5 PRO 5650U with Radeon Graphics, 2300.00 MHz, 19-50-00
cpu2: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,TCE,TOPEXT,CPCTR,DBKP,PCTRL3,MWAITX,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,PQM,RDSEED,ADX,SMAP,CLFLUSHOPT,CLWB,SHA,UMIP,PKU,IBPB,IBRS,STIBP,SSBD,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
cpu2: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 512KB
64b/line 8-way L2 cache, 16MB 64b/line 16-way L3 cache
cpu2: smt 0, core 1, package 0
cpu3 at mainbus0: apid 3 (application processor)
cpu3: AMD Ryzen 5 PRO 5650U with Radeon Graphics, 2300.00 MHz, 19-50-00
cpu3: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,TCE,TOPEXT,CPCTR,DBKP,PCTRL3,MWAITX,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,PQM,RDSEED,ADX,SMAP,CLFLUSHOPT,CLWB,SHA,UMIP,PKU,IBPB,IBRS,STIBP,SSBD,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
cpu3: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 512KB
64b/line 8-way L2 cache, 16MB 64b/line 16-way L3 cache
cpu3: smt 1, core 1, package 0
cpu4 at mainbus0: apid 4 (application processor)
cpu4: AMD Ryzen 5 PRO 5650U with Radeon Graphics, 2300.00 MHz, 19-50-00
cpu4: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,TCE,TOPEXT,CPCTR,DBKP,PCTRL3,MWAITX,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,PQM,RDSEED,ADX,SMAP,CLFLUSHOPT,CLWB,SHA,UMIP,PKU,IBPB,IBRS,STIBP,SSBD,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
cpu4: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 512KB
64b/line 8-way L2 cache, 16MB 64b/line 16-way L3 cache
cpu4: smt 0, core 2, package 0
cpu5 at mainbus0: apid 5 (application processor)
cpu5: AMD Ryzen 5 PRO 5650U with Radeon Graphics, 2300.00 MHz, 19-50-00
cpu5: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,TCE,TOPEXT,CPCTR,DBKP,PCTRL3,MWAITX,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,PQM,RDSEED,ADX,SMAP,CLFLUSHOPT,CLWB,SHA,UMIP,PKU,IBPB,IBRS,STIBP,SSBD,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
cpu5: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 512KB
64b/line 8-way L2 cache, 16MB 64b/line 16-way L3 cache
cpu5: smt 1, core 2, package 0
cpu6 at mainbus0: apid 6 (application processor)
cpu6: AMD Ryzen 5 PRO 5650U with Radeon Graphics, 2300.00 MHz, 19-50-00
cpu6: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,TCE,TOPEXT,CPCTR,DBKP,PCTRL3,MWAITX,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,PQM,RDSEED,ADX,SMAP,CLFLUSHOPT,CLWB,SHA,UMIP,PKU,IBPB,IBRS,STIBP,SSBD,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
cpu6: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 512KB
64b/line 8-way L2 cache, 16MB 64b/line 16-way L3 cache
cpu6: smt 0, core 3, package 0
cpu7 at mainbus0: apid 7 (application processor)
cpu7: AMD Ryzen 5 PRO 5650U with Radeon Graphics, 2300.00 MHz, 19-50-00
cpu7: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,TCE,TOPEXT,CPCTR,DBKP,PCTRL3,MWAITX,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,PQM,RDSEED,ADX,SMAP,CLFLUSHOPT,CLWB,SHA,UMIP,PKU,IBPB,IBRS,STIBP,SSBD,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
cpu7: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 512KB
64b/line 8-way L2 cache, 16MB 64b/line 16-way L3 cache
cpu7: smt 1, core 3, package 0
cpu8 at mainbus0: apid 8 (application processor)
cpu8: AMD Ryzen 5 PRO 5650U with Radeon Graphics, 2300.00 MHz, 19-50-00
cpu8: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,TCE,TOPEXT,CPCTR,DBKP,PCTRL3,MWAITX,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,PQM,RDSEED,ADX,SMAP,CLFLUSHOPT,CLWB,SHA,UMIP,PKU,IBPB,IBRS,STIBP,SSBD,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
cpu8: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 512KB
64b/line 8-way L2 cache, 16MB 64b/line 16-way L3 cache
cpu8: smt 0, core 4, package 0
cpu9 at mainbus0: apid 9 (application processor)
cpu9: AMD Ryzen 5 PRO 5650U with Radeon Graphics, 2300.00 MHz, 19-50-00
cpu9: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,TCE,TOPEXT,CPCTR,DBKP,PCTRL3,MWAITX,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,PQM,RDSEED,ADX,SMAP,CLFLUSHOPT,CLWB,SHA,UMIP,PKU,IBPB,IBRS,STIBP,SSBD,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
cpu9: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 512KB
64b/line 8-way L2 cache, 16MB 64b/line 16-way L3 cache
cpu9: smt 1, core 4, package 0
cpu10 at mainbus0: apid 10 (application processor)
cpu10: AMD Ryzen 5 PRO 5650U with Radeon Graphics, 2300.00 MHz, 19-50-00
cpu10: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,TCE,TOPEXT,CPCTR,DBKP,PCTRL3,MWAITX,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,PQM,RDSEED,ADX,SMAP,CLFLUSHOPT,CLWB,SHA,UMIP,PKU,IBPB,IBRS,STIBP,SSBD,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
cpu10: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 512KB
64b/line 8-way L2 cache, 16MB 64b/line 16-way L3 cache
cpu10: smt 0, core 5, package 0
cpu11 at mainbus0: apid 11 (application processor)
cpu11: AMD Ryzen 5 PRO 5650U with Radeon Graphics, 2300.00 MHz, 19-50-00
cpu11: FPU,VME,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,CFLUSH,MMX,FXSR,SSE,SSE2,HTT,SSE3,PCLMUL,MWAIT,SSSE3,FMA3,CX16,SSE4.1,SSE4.2,MOVBE,POPCNT,AES,XSAVE,AVX,F16C,RDRAND,NXE,MMXX,FFXSR,PAGE1GB,RDTSCP,LONG,LAHF,CMPLEG,SVM,EAPICSP,AMCR8,ABM,SSE4A,MASSE,3DNOWP,OSVW,IBS,SKINIT,TCE,TOPEXT,CPCTR,DBKP,PCTRL3,MWAITX,ITSC,FSGSBASE,BMI1,AVX2,SMEP,BMI2,ERMS,INVPCID,PQM,RDSEED,ADX,SMAP,CLFLUSHOPT,CLWB,SHA,UMIP,PKU,IBPB,IBRS,STIBP,SSBD,XSAVEOPT,XSAVEC,XGETBV1,XSAVES
cpu11: 32KB 64b/line 8-way D-cache, 32KB 64b/line 8-way I-cache, 512KB
64b/line 8-way L2 cache, 16MB 64b/line 16-way L3 cache
cpu11: smt 1, core 5, package 0
ioapic0 at mainbus0: apid 32 pa 0xfec00000, version 21, 24 pins, can't remap
ioapic1 at mainbus0: apid 33 pa 0xfec01000, version 21, 32 pins, can't remap
acpimcfg0 at acpi0
acpimcfg0: addr 0xf8000000, bus 0-63
acpiprt0 at acpi0: bus 0 (PCI0)
acpiprt1 at acpi0: bus -1 (GPP0)
acpiprt2 at acpi0: bus 2 (GPP6)
acpiprt3 at acpi0: bus -1 (GPP4)
acpiprt4 at acpi0: bus 4 (GPP5)
acpiprt5 at acpi0: bus 3 (GPP7)
acpiprt6 at acpi0: bus 1 (GPP8)
acpiprt7 at acpi0: bus 5 (GP17)
acpiprt8 at acpi0: bus -1 (GP18)
acpiec0 at acpi0
"ACPI0010" at acpi0 not configured
acpicpu0 at acpi0: C3(0@350 io@0x415), C2(0@18 io@0x414), C1(0@1 mwait), PSS
acpicpu1 at acpi0: C3(0@350 io@0x415), C2(0@18 io@0x414), C1(0@1 mwait), PSS
acpicpu2 at acpi0: C3(0@350 io@0x415), C2(0@18 io@0x414), C1(0@1 mwait), PSS
acpicpu3 at acpi0: C3(0@350 io@0x415), C2(0@18 io@0x414), C1(0@1 mwait), PSS
acpicpu4 at acpi0: C3(0@350 io@0x415), C2(0@18 io@0x414), C1(0@1 mwait), PSS
acpicpu5 at acpi0: C3(0@350 io@0x415), C2(0@18 io@0x414), C1(0@1 mwait), PSS
acpicpu6 at acpi0: C3(0@350 io@0x415), C2(0@18 io@0x414), C1(0@1 mwait), PSS
acpicpu7 at acpi0: C3(0@350 io@0x415), C2(0@18 io@0x414), C1(0@1 mwait), PSS
acpicpu8 at acpi0: C3(0@350 io@0x415), C2(0@18 io@0x414), C1(0@1 mwait), PSS
acpicpu9 at acpi0: C3(0@350 io@0x415), C2(0@18 io@0x414), C1(0@1 mwait), PSS
acpicpu10 at acpi0: C3(0@350 io@0x415), C2(0@18 io@0x414), C1(0@1 mwait), PSS
acpicpu11 at acpi0: C3(0@350 io@0x415), C2(0@18 io@0x414), C1(0@1 mwait), PSS
acpicpu12 at acpi0: no cpu matching ACPI ID 12
acpicpu13 at acpi0: no cpu matching ACPI ID 13
acpicpu14 at acpi0: no cpu matching ACPI ID 14
acpicpu15 at acpi0: no cpu matching ACPI ID 15
acpibtn0 at acpi0: PWRB
acpipci0 at acpi0 PCI0: 0x00000010 0x00000011 0x00000000
acpicmos0 at acpi0
acpibat0 at acpi0: BAT0 model "5B10W13976" serial 1136 type LiP oem "LGC"
acpiac0 at acpi0: AC unit online
acpithinkpad0 at acpi0: version 2.0
"LEN0111" at acpi0 not configured
"LEN0100" at acpi0 not configured
"LEN0130" at acpi0 not configured
"PNP0C14" at acpi0 not configured
acpibtn1 at acpi0: LID_
acpibtn2 at acpi0: SLPB
"PNP0C14" at acpi0 not configured
"PNP0C14" at acpi0 not configured
"PNP0C14" at acpi0 not configured
"PNP0C14" at acpi0 not configured
"PNP0C14" at acpi0 not configured
"PNP0C14" at acpi0 not configured
"PNP0C14" at acpi0 not configured
"LDPR2020" at acpi0 not configured
amdgpio0 at acpi0 GPIO uid 0 addr 0xfed81500/0x400 irq 7, 184 pins
dwiic0 at acpi0 I2CA addr 0xfedc2000/0x1000 irq 10
iic0 at dwiic0
dwiic1 at acpi0 I2CB addr 0xfedc3000/0x1000 irq 11
iic1 at dwiic1
dwiic2 at acpi0 I2CC addr 0xfedc4000/0x1000 irq 4
iic2 at dwiic2
ihidev0 at iic2 addr 0x15 gpio 7, vendor 0x4f3 product 0x3195, ELAN0678
ihidev0: 92 report ids
imt0 at ihidev0: clickpad, 5 contacts
wsmouse0 at imt0 mux 0
ims0 at ihidev0 reportid 1: 2 buttons
wsmouse1 at ims0 mux 0
hid at ihidev0 reportid 5 not configured
hid at ihidev0 reportid 6 not configured
hid at ihidev0 reportid 7 not configured
hid at ihidev0 reportid 11 not configured
hid at ihidev0 reportid 12 not configured
hid at ihidev0 reportid 13 not configured
ims1 at ihidev0 reportid 14: 0 buttons
wsmouse2 at ims1 mux 0
hid at ihidev0 reportid 92 not configured
"USBC000" at acpi0 not configured
tpm0 at acpi0 TPM_ 2.0 (TIS) addr 0xfed40000/0x5000, device 0x0000104a rev 0x4e
"DRTM0001" at acpi0 not configured
acpipwrres0 at acpi0: P0U1, resource for RTL8
acpipwrres1 at acpi0: P3U1, resource for RTL8
acpipwrres2 at acpi0: WRST
acpipwrres3 at acpi0: P0NV, resource for NVME
acpitz0 at acpi0: critical temperature is 110 degC
acpivideo0 at acpi0: VGA_
acpivout0 at acpivideo0: LCD_
cpu0: 2300 MHz: speeds: 2300 1800 1600 MHz
pci0 at mainbus0 bus 0
ksmn0 at pci0 dev 0 function 0 "AMD 17h/6xh Root Complex" rev 0x00
"AMD 17h/6xh IOMMU" rev 0x00 at pci0 dev 0 function 2 not configured
pchb0 at pci0 dev 1 function 0 "AMD 17h/6xh Host" rev 0x00
pchb1 at pci0 dev 2 function 0 "AMD 17h/6xh Host" rev 0x00
ppb0 at pci0 dev 2 function 1 "AMD 17h/6xh PCIE" rev 0x00: msi
pci1 at ppb0 bus 1
nvme0 at pci1 dev 0 function 0 "Samsung SM981/PM981 NVMe" rev 0x00:
msix, NVMe 1.3
nvme0: SAMSUNG MZVLB512HBJQ-000L7, firmware 5M2QEXF7, serial S4ENNX1T188362
scsibus1 at nvme0: 2 targets, initiator 0
sd0 at scsibus1 targ 1 lun 0: <NVMe, SAMSUNG MZVLB512, 5M2Q>
sd0: 488386MB, 512 bytes/sector, 1000215216 sectors
ppb1 at pci0 dev 2 function 2 "AMD 17h/6xh PCIE" rev 0x00: msi
pci2 at ppb1 bus 2
re0 at pci2 dev 0 function 0 "Realtek 8168" rev 0x0e: RTL8168EP/8111EP
(0x5000), msi, address 88:a4:c2:61:a7:22
rgephy0 at re0 phy 7: RTL8251 PHY, rev. 0
ppb2 at pci0 dev 2 function 3 "AMD 17h/6xh PCIE" rev 0x00: msi
pci3 at ppb2 bus 3
iwx0 at pci3 dev 0 function 0 "Intel Wi-Fi 6 AX200" rev 0x1a, msix
ppb3 at pci0 dev 2 function 5 "AMD 17h/6xh PCIE" rev 0x00: msi
pci4 at ppb3 bus 4
"Quectel EM120R-GL" rev 0x00 at pci4 dev 0 function 0 not configured
pchb2 at pci0 dev 8 function 0 "AMD 17h/6xh Host" rev 0x00
ppb4 at pci0 dev 8 function 1 "AMD 17h/6xh PCIE" rev 0x00
pci5 at ppb4 bus 5
amdgpu0 at pci5 dev 0 function 0 "ATI Cezanne" rev 0xd2
drm0 at amdgpu0
amdgpu0: msi
azalia0 at pci5 dev 0 function 1 "ATI Renoir HD Audio" rev 0x00: msi
azalia0: no supported codecs
ccp0 at pci5 dev 0 function 2 "AMD 17h/1xh Crypto" rev 0x00
xhci0 at pci5 dev 0 function 3 "AMD 17h/6xh xHCI" rev 0x00: msi, xHCI 1.10
usb0 at xhci0: USB revision 3.0
uhub0 at usb0 configuration 1 interface 0 "AMD xHCI root hub" rev
3.00/1.00 addr 1
xhci1 at pci5 dev 0 function 4 "AMD 17h/6xh xHCI" rev 0x00: msi, xHCI 1.10
usb1 at xhci1: USB revision 3.0
uhub1 at usb1 configuration 1 interface 0 "AMD xHCI root hub" rev
3.00/1.00 addr 1
"AMD 17h/1xh I2S Audio" rev 0x01 at pci5 dev 0 function 5 not configured
azalia1 at pci5 dev 0 function 6 "AMD 17h/1xh HD Audio" rev 0x00: apic 33 int 12
azalia1: codecs: Realtek ALC257
audio0 at azalia1
piixpm0 at pci0 dev 20 function 0 "AMD FCH SMBus" rev 0x51: polling
iic3 at piixpm0
iic4 at piixpm0
pcib0 at pci0 dev 20 function 3 "AMD FCH LPC" rev 0x51
pchb3 at pci0 dev 24 function 0 "AMD 19h/5xh Data Fabric" rev 0x00
pchb4 at pci0 dev 24 function 1 "AMD 19h/5xh Data Fabric" rev 0x00
pchb5 at pci0 dev 24 function 2 "AMD 19h/5xh Data Fabric" rev 0x00
pchb6 at pci0 dev 24 function 3 "AMD 19h/5xh Data Fabric" rev 0x00
pchb7 at pci0 dev 24 function 4 "AMD 19h/5xh Data Fabric" rev 0x00
pchb8 at pci0 dev 24 function 5 "AMD 19h/5xh Data Fabric" rev 0x00
pchb9 at pci0 dev 24 function 6 "AMD 19h/5xh Data Fabric" rev 0x00
pchb10 at pci0 dev 24 function 7 "AMD 19h/5xh Data Fabric" rev 0x00
isa0 at pcib0
isadma0 at isa0
pckbc0 at isa0 port 0x60/5 irq 1 irq 12
pckbd0 at pckbc0 (kbd slot)
wskbd0 at pckbd0: console keyboard
pms0 at pckbc0 (aux slot)
wsmouse3 at pms0 mux 0
pcppi0 at isa0 port 0x61
spkr0 at pcppi0
vmm0 at mainbus0: SVM/RVI
efifb at mainbus0 not configured
uaudio0 at uhub0 port 2 configuration 1 interface 1 "GN Audio A/S
Jabra Evolve2 40" rev 2.00/1.20 addr 2
uaudio0: failed to get ranges for bass control
uaudio0: class v1, full-speed, sync, channels: 2 play, 1 rec, 6 ctls
audio1 at uaudio0
uhidev0 at uhub0 port 2 configuration 1 interface 3 "GN Audio A/S
Jabra Evolve2 40" rev 2.00/1.20 addr 2
uhidev0: iclass 3/0, 5 report ids
ucc0 at uhidev0 reportid 1: 8 usages, 6 keys, enum
wskbd1 at ucc0 mux 1
uhid0 at uhidev0 reportid 2: input=2, output=2, feature=0
uhid1 at uhidev0 reportid 4: input=2, output=2, feature=1
uhid2 at uhidev0 reportid 5: input=32, output=32, feature=0
ugen0 at uhub0 port 3 "Generic EMV Smartcard Reader" rev 2.01/1.20 addr 3
uhub2 at uhub1 port 2 configuration 1 interface 0 "Generic 4-Port USB
2.0 Hub" rev 2.10/1.17 addr 2
uhub3 at uhub2 port 1 configuration 1 interface 0 "Generic 4-Port USB
2.0 Hub" rev 2.10/1.17 addr 3
uhidev1 at uhub2 port 3 configuration 1 interface 0 "CSR
BT-USB-Bridge" rev 2.00/88.91 addr 4
uhidev1: iclass 3/1, 1 report id
ukbd0 at uhidev1 reportid 1: 8 variable keys, 6 key codes
wskbd2 at ukbd0 mux 1
uhidev2 at uhub2 port 3 configuration 1 interface 1 "CSR
BT-USB-Bridge" rev 2.00/88.91 addr 4
uhidev2: iclass 3/1
ums0 at uhidev2: 3 buttons, Z dir
wsmouse4 at ums0 mux 0
uhidev3 at uhub2 port 4 configuration 1 interface 0 "MOSART Semi.
Trust Wireless Mouse" rev 1.10/1.00 addr 5
uhidev3: iclass 3/1, 5 report ids
ums1 at uhidev3 reportid 3: 5 buttons, Z and W dir
wsmouse5 at ums1 mux 0
uhid3 at uhidev3 reportid 5: input=5, output=6, feature=0
ugen1 at uhub1 port 4 "Intel Bluetooth" rev 2.01/0.01 addr 6
uhub4 at uhub1 port 6 configuration 1 interface 0 "Generic 4-Port USB
3.0 Hub" rev 3.00/1.17 addr 7
uhub5 at uhub4 port 1 configuration 1 interface 0 "Generic 4-Port USB
3.0 Hub" rev 3.00/1.17 addr 8
uvideo0 at uhub5 port 1 configuration 1 interface 0 "Logitech Logitech
BRIO" rev 3.10/3.17 addr 9
video0 at uvideo0
uaudio1 at uhub5 port 1 configuration 1 interface 4 "Logitech Logitech
BRIO" rev 3.10/3.17 addr 9
uaudio1: class v1, high-speed, sync, channels: 0 play, 2 rec, 2 ctls
audio2 at uaudio1
uhidev4 at uhub5 port 1 configuration 1 interface 5 "Logitech Logitech
BRIO" rev 3.10/3.17 addr 9
uhidev4: iclass 3/0
ucc1 at uhidev4: 2 usages, 0 keys, enum
vscsi0 at root
scsibus2 at vscsi0: 256 targets
softraid0 at root
scsibus3 at softraid0: 256 targets
sd1 at scsibus3 targ 1 lun 0: <OPENBSD, SR CRYPTO, 006>
sd1: 258813MB, 512 bytes/sector, 530050545 sectors
root on sd1a (c5681cbe4e7ac742.a) swap on sd1b dump on sd1b
iwx0: hw rev 0x340, fw 67.8f59b80b.0, address 84:1b:77:ae:d1:43
amdgpu0: GREEN_SARDINE 7 CU rev 0x00
amdgpu0: 1920x1080, 32bpp
wsdisplay0 at amdgpu0 mux 1: console (std, vt100 emulation), using wskbd0
wskbd1: connecting to wsdisplay0
wskbd2: connecting to wsdisplay0
wsdisplay0: screen 1-5 added (std, vt100 emulation)

sparc64 bulk build report

Re: some issues with sogo 5.7.1 in 7.2

On 2022/11/30 00:38, Giovanni Bechis wrote:
> SCRIPTS = cas-proxy-validate.py sql-update-2.2.17_to_2.3.0.sh \
> sql-update-3.2.10_to_4.0.0.sh sql-update-2.2.17_to_2.3.0-mysql.sh \
> sql-update-3.2.10_to_4.0.0-mysql.sh sql-update-3.0.0-to-combined.sh \
> - sql-update-3.0.0-to-combined-mysql.sh updates.php
> + sql-update-3.0.0-to-combined-mysql.sh sql-update-5.5.1_to_5.6.0.sh updates.php

I don't use sogo, but this doesn't seem the most sensible way to
handle the scripts. In most cases it's better to use wildcards
rather than try to maintain a list in the port Makefile, they nearly
always get out of sync sooner or later.

Also sql-update-5.5.1_to_5.6.0.sh has #!/bin/bash, this is patched
in *some* of the other sql-update scripts, and the pkg-readme tells
you to use bash in some cases but not others. It's very inconsistent.

How about installing all of Scripts/sql-update-*.sh and run them
through sed -i 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,'? If some of the
old ones are not useful they could be @comment'ed to reduce mess, but
that seems an easier way of keeping track of new files.

Index: Makefile
===================================================================
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.102
diff -u -p -r1.102 Makefile
--- Makefile 8 Nov 2022 11:17:20 -0000 1.102
+++ Makefile 30 Nov 2022 12:25:23 -0000
@@ -1,7 +1,7 @@
COMMENT = web based groupware server

VERSION = 5.7.1
-REVISION = 1
+REVISION = 2
DISTNAME = SOGo-${VERSION}
PKGNAME = sogo-${VERSION}

@@ -35,7 +35,8 @@ LIB_DEPENDS += archivers/libzip \
security/oath-toolkit \
www/sope>=${VERSION}
RUN_DEPENDS += sope-postgres-*|sope-mysql-*:www/sope,-postgres \
- archivers/zip
+ archivers/zip \
+ shells/bash

CONFIGURE_STYLE = simple dest
CONFIGURE_ARGS += --gsmake=`gnustep-config --variable=GNUSTEP_MAKEFILES` \
@@ -49,17 +50,14 @@ MAKE_FLAGS += libGDLContentStore_INTERF
SOGOLIBDIR = lib/GNUstep/Frameworks/SOGo.framework/Versions/${LIBSOGo_VERSION}
SUBST_VARS += SOGOLIBDIR VARBASE

-SCRIPTS = cas-proxy-validate.py sql-update-2.2.17_to_2.3.0.sh \
- sql-update-3.2.10_to_4.0.0.sh sql-update-2.2.17_to_2.3.0-mysql.sh \
- sql-update-3.2.10_to_4.0.0-mysql.sh sql-update-3.0.0-to-combined.sh \
- sql-update-3.0.0-to-combined-mysql.sh updates.php
-
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sogo
-.for _s in ${SCRIPTS}
- ${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
- ${WRKSRC}/Scripts/${_s} ${PREFIX}/share/doc/sogo/${_s}
-.endfor
+ cd ${WRKSRC}/Scripts; ${INSTALL_SCRIPT} \
+ -c -o ${SHAREOWN} -g ${SHAREGRP} \
+ cas-proxy-validate.py updates.php sql-update*.sh \
+ ${PREFIX}/share/doc/sogo/
+ sed -i 's,#!/bin/bash,#!${LOCALBASE}/bin/bash,' \
+ ${PREFIX}/share/doc/sogo/sql-update*.sh

do-test:
cd ${WRKSRC}/Tests/Integration && ${MAKE_PROGRAM} && ./teststrings.sh
Index: patches/patch-Scripts_sql-update-2_2_17_to_2_3_0-mysql_sh
===================================================================
RCS file: patches/patch-Scripts_sql-update-2_2_17_to_2_3_0-mysql_sh
diff -N patches/patch-Scripts_sql-update-2_2_17_to_2_3_0-mysql_sh
--- patches/patch-Scripts_sql-update-2_2_17_to_2_3_0-mysql_sh 11 Mar 2022 20:11:01 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
---- Scripts/sql-update-2.2.17_to_2.3.0-mysql.sh.orig Wed Sep 16 20:41:29 2015
-+++ Scripts/sql-update-2.2.17_to_2.3.0-mysql.sh Fri Oct 23 09:40:35 2015
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- set -e
-
-@@ -11,15 +11,19 @@ set -e
- defaultusername=$USER
- defaulthostname=127.0.0.1
- defaultdatabase=$USER
--indextable=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSFolderInfoURL =/ {print $2}' | awk -F/ '{print $NF}')
-+if [ -f /etc/sogo/sogo.conf ];then
-+ indextable=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSFolderInfoURL =/ {print $2}' | awk -F/ '{print $NF}')
-+else
-+ indextable=$(sogo-tool dump-defaults | awk -F\" '/ OCSFolderInfoURL =/ {print $2}' | awk -F/ '{print $NF}')
-+fi
- if [ -z "$indextable" ]; then
- echo "Couldn't fetch OCSFolderInfoURL value, aborting" >&2
- exit 1
- fi
-
--read -p "Username ($defaultusername): " username
--read -p "Hostname ($defaulthostname): " hostname
--read -p "Database ($defaultdatabase): " database
-+read username?"Username ($defaultusername): "
-+read hostname?"Hostname ($defaulthostname): "
-+read database?"Database ($defaultdatabase): "
-
- if [ -z "$username" ]
- then
-@@ -38,7 +42,7 @@ then
-
- sqlscript=""
-
--function adjustSchema() {
-+adjustSchema() {
- oldIFS="$IFS"
- IFS=" "
- part1="`echo -e \"ALTER TABLE $table MODIFY c_partstates mediumtext;\\n\"`";
Index: patches/patch-Scripts_sql-update-2_2_17_to_2_3_0_sh
===================================================================
RCS file: patches/patch-Scripts_sql-update-2_2_17_to_2_3_0_sh
diff -N patches/patch-Scripts_sql-update-2_2_17_to_2_3_0_sh
--- patches/patch-Scripts_sql-update-2_2_17_to_2_3_0_sh 11 Mar 2022 20:11:01 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
---- Scripts/sql-update-2.2.17_to_2.3.0.sh.orig Wed Sep 16 20:41:29 2015
-+++ Scripts/sql-update-2.2.17_to_2.3.0.sh Fri Oct 23 09:40:24 2015
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- set -e
- # This script only works with PostgreSQL
-@@ -11,15 +11,19 @@ defaultusername=$USER
- defaulthostname=localhost
- defaultdatabase=$USER
- #indextable=sogo_folder_info
--indextable=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSFolderInfoURL =/ {print $2}' | awk -F/ '{print $NF}')
-+if [ -f /etc/sogo/sogo.conf ];then
-+ indextable=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSFolderInfoURL =/ {print $2}' | awk -F/ '{print $NF}')
-+else
-+ indextable=$(sogo-tool dump-defaults | awk -F\" '/ OCSFolderInfoURL =/ {print $2}' | awk -F/ '{print $NF}')
-+fi
- if [ -z "$indextable" ]; then
- echo "Couldn't fetch OCSFolderInfoURL value, aborting" >&2
- exit 1
- fi
-
--read -p "Username ($defaultusername): " username
--read -p "Hostname ($defaulthostname): " hostname
--read -p "Database ($defaultdatabase): " database
-+read username?"Username ($defaultusername): "
-+read hostname?"Hostname ($defaulthostname): "
-+read database?"Database ($defaultdatabase): "
-
- if [ -z "$username" ]
- then
-@@ -36,7 +40,7 @@ fi
-
- sqlscript=""
-
--function adjustSchema() {
-+adjustSchema() {
- oldIFS="$IFS"
- IFS=" "
- part1="`echo -e \"ALTER TABLE $table ALTER COLUMN c_partstates TYPE TEXT;\\n\"`";
Index: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
===================================================================
RCS file: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
diff -N patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
--- patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh 11 Mar 2022 20:11:01 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,66 +0,0 @@
-Index: Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh
---- Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh.orig
-+++ Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- set -e
-
-@@ -12,16 +12,24 @@ set -e
- defaultusername=$USER
- defaulthostname=127.0.0.1
- defaultdatabase=sogo
--indextable=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSFolderInfoURL =/ {print $2}' | awk -F/ '{print $NF}')
-+if [ -f /etc/sogo/sogo.conf ];then
-+ indextable=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSFolderInfoURL =/ {print $2}' | awk -F/ '{print $NF}')
-+else
-+ indextable=$(sogo-tool dump-defaults | awk -F\" '/ OCSFolderInfoURL =/ {print $2}' | awk -F/ '{print $NF}')
-+fi
- if [ -z "$indextable" ]; then
- echo "Couldn't fetch OCSFolderInfoURL value, aborting" >&2
- exit 1
- fi
--storeurl=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSStoreURL =/ {print $2}' | awk -F/ '{print $NF}')
-+if [ -f /etc/sogo/sogo.conf ];then
-+ storeurl=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSStoreURL =/ {print $2}' | awk -F/ '{print $NF}')
-+else
-+ storeurl=$(sogo-tool dump-defaults | awk -F\" '/ OCSStoreURL =/ {print $2}' | awk -F/ '{print $NF}')
-+fi
-
--read -p "Username ($defaultusername): " username
--read -p "Hostname ($defaulthostname): " hostname
--read -p "Database ($defaultdatabase): " database
-+read username?"Username ($defaultusername): "
-+read hostname?"Hostname ($defaulthostname): "
-+read database?"Database ($defaultdatabase): "
-
- if [ -z "$username" ]
- then
-@@ -40,7 +48,7 @@ fi
-
- sqlscript=""
-
--function growUserProfile() {
-+growUserProfile() {
- oldIFS="$IFS"
- IFS=" "
- part="`echo -e \"ALTER TABLE sogo_user_profile MODIFY c_defaults LONGTEXT;\\n\"`";
-@@ -50,7 +58,7 @@ function growUserProfile() {
- IFS="$oldIFS"
- }
-
--function growMailInContactsQuick() {
-+growMailInContactsQuick() {
- oldIFS="$IFS"
- IFS=" "
- part="`echo -e \"ALTER TABLE $table MODIFY c_mail text;\\n\"`";
-@@ -58,7 +66,7 @@ function growMailInContactsQuick() {
- IFS="$oldIFS"
- }
-
--function addCertificateInContactsQuick() {
-+addCertificateInContactsQuick() {
- oldIFS="$IFS"
- IFS=" "
- part="`echo -e \"ALTER TABLE $table ADD c_hascertificate INT4 DEFAULT 0;\\n\"`";
Index: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh
===================================================================
RCS file: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh
diff -N patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh
--- patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh 11 Mar 2022 20:11:01 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,57 +0,0 @@
-Index: Scripts/sql-update-3.2.10_to_4.0.0.sh
---- Scripts/sql-update-3.2.10_to_4.0.0.sh.orig
-+++ Scripts/sql-update-3.2.10_to_4.0.0.sh
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#!/bin/sh
-
- set -e
-
-@@ -10,16 +10,24 @@ set -e
- defaultusername=$USER
- defaulthostname=localhost
- defaultdatabase=sogo
--indextable=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSFolderInfoURL =/ {print $2}' | awk -F/ '{print $NF}')
-+if [ -f /etc/sogo/sogo.conf ];then
-+ indextable=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSFolderInfoURL =/ {print $2}' | awk -F/ '{print $NF}')
-+else
-+ indextable=$(sogo-tool dump-defaults | awk -F\" '/ OCSFolderInfoURL =/ {print $2}' | awk -F/ '{print $NF}')
-+fi
- if [ -z "$indextable" ]; then
- echo "Couldn't fetch OCSFolderInfoURL value, aborting" >&2
- exit 1
- fi
--storeurl=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSStoreURL =/ {print $2}' | awk -F/ '{print $NF}')
-+if [ -f /etc/sogo/sogo.conf ];then
-+ storeurl=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSStoreURL =/ {print $2}' | awk -F/ '{print $NF}')
-+else
-+ storeurl=$(sogo-tool dump-defaults | awk -F\" '/ OCSStoreURL =/ {print $2}' | awk -F/ '{print $NF}')
-+fi
-
--read -p "Username ($defaultusername): " username
--read -p "Hostname ($defaulthostname): " hostname
--read -p "Database ($defaultdatabase): " database
-+read username?"Username ($defaultusername): "
-+read hostname?"Hostname ($defaulthostname): "
-+read database?"Database ($defaultdatabase): "
-
- if [ -z "$username" ]
- then
-@@ -36,7 +44,7 @@ fi
-
- sqlscript=""
-
--function growMailInContactsQuick() {
-+growMailInContactsQuick() {
- oldIFS="$IFS"
- IFS=" "
- part="`echo -e \"ALTER TABLE $table ALTER COLUMN c_mail TYPE TEXT;\\n\"`";
-@@ -44,7 +52,7 @@ function growMailInContactsQuick() {
- IFS="$oldIFS"
- }
-
--function addCertificateInContactsQuick() {
-+addCertificateInContactsQuick() {
- oldIFS="$IFS"
- IFS=" "
- part="`echo -e \"ALTER TABLE $table ADD c_hascertificate INT4 DEFAULT 0;\\n\"`";
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/sogo/pkg/PLIST,v
retrieving revision 1.54
diff -u -p -r1.54 PLIST
--- pkg/PLIST 8 Nov 2022 11:17:20 -0000 1.54
+++ pkg/PLIST 30 Nov 2022 12:25:23 -0000
@@ -2869,12 +2869,26 @@ lib/sogo/
share/doc/pkg-readmes/${PKGSTEM}
share/doc/sogo/
share/doc/sogo/cas-proxy-validate.py
+share/doc/sogo/sql-update-1.2.2_to_1.3.0-mysql.sh
+share/doc/sogo/sql-update-1.2.2_to_1.3.0.sh
+share/doc/sogo/sql-update-1.3.11_to_1.3.12-mysql.sh
+share/doc/sogo/sql-update-1.3.11_to_1.3.12.sh
+share/doc/sogo/sql-update-1.3.16_to_1.3.17-mysql.sh
+share/doc/sogo/sql-update-1.3.16_to_1.3.17.sh
+share/doc/sogo/sql-update-1.3.3_to_1.3.4-mysql.sh
+share/doc/sogo/sql-update-1.3.3_to_1.3.4.sh
+share/doc/sogo/sql-update-101_to_102.sh
+share/doc/sogo/sql-update-2.0.4b_to_2.0.5-mysql.sh
share/doc/sogo/sql-update-2.2.17_to_2.3.0-mysql.sh
share/doc/sogo/sql-update-2.2.17_to_2.3.0.sh
+share/doc/sogo/sql-update-20070724.sh
+share/doc/sogo/sql-update-20070822.sh
+share/doc/sogo/sql-update-20080303.sh
share/doc/sogo/sql-update-3.0.0-to-combined-mysql.sh
share/doc/sogo/sql-update-3.0.0-to-combined.sh
share/doc/sogo/sql-update-3.2.10_to_4.0.0-mysql.sh
share/doc/sogo/sql-update-3.2.10_to_4.0.0.sh
+share/doc/sogo/sql-update-5.5.1_to_5.6.0.sh
share/doc/sogo/updates.php
share/examples/login.conf.d/sogod
@sample ${SYSCONFDIR}/login.conf.d/sogod
Index: pkg/README
===================================================================
RCS file: /cvs/ports/www/sogo/pkg/README,v
retrieving revision 1.25
diff -u -p -r1.25 README
--- pkg/README 19 Sep 2022 07:01:08 -0000 1.25
+++ pkg/README 30 Nov 2022 12:25:23 -0000
@@ -109,8 +109,8 @@ server {
proxy_connect_timeout 90;
proxy_send_timeout 90;
proxy_read_timeout 90;
- proxy_buffer_size 4k;
- proxy_buffers 4 32k;
+ proxy_buffer_size 64k;
+ proxy_buffers 8 64k;
proxy_busy_buffers_size 64k;
proxy_temp_file_write_size 64k;
client_max_body_size 50m;
@@ -221,8 +221,9 @@ Upgrade SOGo from < 2.3.0
==========================
With version 2.3.0, the database schema needs to be extended.

-Run one of the following scripts as the SOGo system user _sogo. Choose the
-script based on your database backend. The scripts will ask you for the database credentials.
+Run one of the following scripts as the SOGo system user _sogo.
+Choose the script based on your database backend.
+The scripts will ask you for the database credentials.

# su _sogo "${TRUEPREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0.sh"
# su _sogo "${TRUEPREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0-mysql.sh"
@@ -232,19 +233,19 @@ Upgrade SOGo from < 3.0.0
With version 3.X you can update the database schema to the optional
9-table model. The conversion is not required, and you should only do it
when you are sure you know what you are doing.
-The scripts require you have configured sogo via /etc/sogo/sogo.conf,
-as well as they have to run with bash. You might install bash manually.
+The scripts require you have configured sogo via /etc/sogo/sogo.conf.
Use at your own risk.

-# su _sogo "${TRUEPREFIX}/bin/bash ${TRUEPREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined.sh"
-# su _sogo "${TRUEPREFIX}/bin/bash ${TRUEPREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined-mysql.sh"
+# su _sogo "${TRUEPREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined.sh"
+# su _sogo "${TRUEPREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined-mysql.sh"

Upgrade SOGo from < 4.0.0
=========================
Updating SOGo from version 3.X to 4.X requires an update of the database schema.

-Run one of the following scripts as the SOGo system user _sogo. Choose the
-based on your database backend. The scripts will ask you for the database credentials.
+Run one of the following scripts as the SOGo system user _sogo.
+Choose the script based on your database backend.
+The scripts will ask you for the database credentials.

# su _sogo "${TRUEPREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0.sh"
# su _sogo "${TRUEPREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0-mysql.sh"

riscv64 bulk build report

Re: some issues with sogo 5.7.1 in 7.2

Le Wed, Nov 30, 2022 at 12:38:26AM +0100, Giovanni Bechis a écrit :
> On Mon, Nov 28, 2022 at 02:57:07PM +0100, Landry Breuil wrote:
> > Hi,
> >
> > finally upgraded my work sogo instance, hit two distinct issues
> > unrelated to the WOPort one, both seen when trying to login:
> >
> > [GCSSessionsFolder
> > writeRecordForEntryWithID:value:creationDate:lastSeenDate:]: cannot
> > write record: <PostgreSQL72Exception: 0x313372437c8>
> > NAME:PostgreSQL72FatalError REASON:fatal pgsql error
> > (channel=<0x0x31374da1608[PostgreSQL72Channel]:
> > connection=<0x0x3135d728468[PGConnection]:
> > connection=0x0x313651c3800>>): ERROR: value too long for type character
> > varying(255)
> >
> > found https://bugs.sogo.nu/view.php?id=5491 - from what i can see,
> > https://github.com/Alinto/sogo/blob/master/Scripts/sql-update-5.5.1_to_5.6.0.sh
> > isnt packaged in /usr/local/share/doc/sogo/. Maybe the PLIST should be
> > updated ? anyway, solved it locally with psql:
> >
> > sogo=> ALTER TABLE sogo_sessions_folder ALTER COLUMN c_value TYPE
> > VARCHAR(4096);
> >
> > but also 'upstream sent too big header while reading response header
> > from upstream' in nginx error logs, cf
> > https://www.sogo.nu/support/faq/errors-in-nginx-regarding-header-too-big.html#/faq
> >
> > i already had some proxy buffers config in nginx (coming from the
> > pkg-readme), had to bump them and could login just fine.
> >
> > so .. maybe also update the pkg-readme with the values recommended
> > upstream ?
> >
> this diff works for me with Mariadb (nginx part untested).

It reads good to me, you've tested running the
sql-update-5.5.1_to_5.6.0.sh script ?

> ok ? What about 7.2 ?

7.2 could benefit from it imo.

Landry

UPDATE: Suricata-6.0.9

Hello,

Update for Suricata to 6.0.9:

https://github.com/OISF/suricata/releases/tag/suricata-6.0.9

Tests are more than welcome :)

OK? Comments?

Cheer.-

Index: Makefile
===================================================================
RCS file: /cvs/ports/security/suricata/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- Makefile 28 Nov 2022 13:33:51 -0000 1.57
+++ Makefile 30 Nov 2022 09:09:45 -0000
@@ -3,13 +3,12 @@ NOT_FOR_ARCHS = powerpc64 riscv64

COMMENT = high performance network IDS, IPS and security monitoring

-SURICATA_V = 6.0.6
-SUPDATE_V = 1.2.4
+SURICATA_V = 6.0.9
+SUPDATE_V = 1.2.6

DISTNAME = suricata-${SURICATA_V}
CATEGORIES = security
SHARED_LIBS += htp 0.0 # 2.0
-REVISION = 2

HOMEPAGE = https://suricata-ids.org/

Index: distinfo
===================================================================
RCS file: /cvs/ports/security/suricata/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo 29 Aug 2022 15:28:17 -0000 1.18
+++ distinfo 30 Nov 2022 09:09:45 -0000
@@ -1,2 +1,2 @@
-SHA256 (suricata-6.0.6.tar.gz) = ABc2NPp2ruY244qQscAmFskD5CFzEH1HtBFJYLX76Dk=
-SIZE (suricata-6.0.6.tar.gz) = 32651139
+SHA256 (suricata-6.0.9.tar.gz) = MiXty9AndUW3Eo33txZS5oFvO0l4NH0vT+KX1V7QcOg=
+SIZE (suricata-6.0.9.tar.gz) = 27352128
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/suricata/pkg/PLIST,v
retrieving revision 1.23
diff -u -p -r1.23 PLIST
--- pkg/PLIST 8 Nov 2022 11:17:07 -0000 1.23
+++ pkg/PLIST 30 Nov 2022 09:09:45 -0000
@@ -32,104 +32,64 @@ include/suricata-plugin.h
lib/libhtp.la
@lib lib/libhtp.so.${LIBhtp_VERSION}
lib/pkgconfig/htp.pc
-lib/python${MODPY_VERSION}/site-packages/suricata-${SURICATA_V}-py${MODPY_VERSION}.egg
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/EGG-INFO/
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/EGG-INFO/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/EGG-INFO/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/EGG-INFO/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/EGG-INFO/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/EGG-INFO/scripts/
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/EGG-INFO/scripts/suricata-update
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/EGG-INFO/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}engine.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}extract.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}loghandler.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}maps.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}matchers.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}net.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}notes.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}osinfo.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}parsers.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}rule.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}sources.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/${MODPY_PYCACHE}addsource.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/${MODPY_PYCACHE}checkversions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/${MODPY_PYCACHE}disablesource.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/${MODPY_PYCACHE}enablesource.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/${MODPY_PYCACHE}listsources.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/${MODPY_PYCACHE}removesource.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/${MODPY_PYCACHE}updatesources.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/addsource.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/checkversions.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/disablesource.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/enablesource.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/listsources.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/removesource.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/commands/updatesources.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/compat/
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/compat/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/compat/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/compat/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/compat/${MODPY_PYCACHE}ordereddict.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/compat/argparse/
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/compat/argparse/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/compat/argparse/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/compat/argparse/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/compat/argparse/${MODPY_PYCACHE}argparse.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/compat/argparse/argparse.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/compat/ordereddict.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/config.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/configs/
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/configs/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/configs/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/configs/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/configs/disable.conf
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/configs/drop.conf
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/configs/enable.conf
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/configs/modify.conf
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/configs/threshold.in
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/configs/update.yaml
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/data/
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/data/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/data/${MODPY_PYCACHE}/
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/data/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/data/${MODPY_PYCACHE}index.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/data/${MODPY_PYCACHE}update.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/data/index.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/data/update.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/engine.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/exceptions.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/extract.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/loghandler.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/main.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/maps.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/matchers.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/net.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/notes.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/osinfo.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/parsers.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/rule.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/sources.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/util.py
-lib/python${MODPY_VERSION}/site-packages/suricata_update-${SUPDATE_V}-py${MODPY_VERSION}.egg/suricata/update/version.py
+lib/suricata/
+lib/suricata/python/
+lib/suricata/python/suricata/
+lib/suricata/python/suricata/__init__.py
+lib/suricata/python/suricata/config/
+lib/suricata/python/suricata/config/__init__.py
+lib/suricata/python/suricata/config/defaults.py
+lib/suricata/python/suricata/ctl/
+lib/suricata/python/suricata/ctl/__init__.py
+lib/suricata/python/suricata/ctl/filestore.py
+lib/suricata/python/suricata/ctl/loghandler.py
+lib/suricata/python/suricata/ctl/main.py
+lib/suricata/python/suricata/ctl/test_filestore.py
+lib/suricata/python/suricata/sc/
+lib/suricata/python/suricata/sc/__init__.py
+lib/suricata/python/suricata/sc/specs.py
+lib/suricata/python/suricata/sc/suricatasc.py
+lib/suricata/python/suricata/update/
+lib/suricata/python/suricata/update/__init__.py
+lib/suricata/python/suricata/update/commands/
+lib/suricata/python/suricata/update/commands/__init__.py
+lib/suricata/python/suricata/update/commands/addsource.py
+lib/suricata/python/suricata/update/commands/checkversions.py
+lib/suricata/python/suricata/update/commands/disablesource.py
+lib/suricata/python/suricata/update/commands/enablesource.py
+lib/suricata/python/suricata/update/commands/listsources.py
+lib/suricata/python/suricata/update/commands/removesource.py
+lib/suricata/python/suricata/update/commands/updatesources.py
+lib/suricata/python/suricata/update/compat/
+lib/suricata/python/suricata/update/compat/__init__.py
+lib/suricata/python/suricata/update/compat/argparse/
+lib/suricata/python/suricata/update/compat/argparse/__init__.py
+lib/suricata/python/suricata/update/compat/argparse/argparse.py
+lib/suricata/python/suricata/update/compat/ordereddict.py
+lib/suricata/python/suricata/update/config.py
+lib/suricata/python/suricata/update/configs/
+lib/suricata/python/suricata/update/configs/__init__.py
+lib/suricata/python/suricata/update/data/
+lib/suricata/python/suricata/update/data/__init__.py
+lib/suricata/python/suricata/update/data/index.py
+lib/suricata/python/suricata/update/data/update.py
+lib/suricata/python/suricata/update/engine.py
+lib/suricata/python/suricata/update/exceptions.py
+lib/suricata/python/suricata/update/extract.py
+lib/suricata/python/suricata/update/loghandler.py
+lib/suricata/python/suricata/update/main.py
+lib/suricata/python/suricata/update/maps.py
+lib/suricata/python/suricata/update/matchers.py
+lib/suricata/python/suricata/update/net.py
+lib/suricata/python/suricata/update/notes.py
+lib/suricata/python/suricata/update/osinfo.py
+lib/suricata/python/suricata/update/parsers.py
+lib/suricata/python/suricata/update/rule.py
+lib/suricata/python/suricata/update/sources.py
+lib/suricata/python/suricata/update/util.py
+lib/suricata/python/suricata/update/version.py
+lib/suricata/python/suricatasc/
+lib/suricata/python/suricatasc/__init__.py
@man man/man1/suricata.1
@man man/man1/suricatactl-filestore.1
@man man/man1/suricatactl.1
--

%gonzalo