Michal Hrusecky authored 3 years ago and Karel Koci committed 3 years ago

SFP interface is now called SFP, no longer eth1. Switch to DHCP client
only if we have no WAN port - only one module device. If we have a switch,
set WAN as bridge between SFP and eth0.

Fixes issue with GitHub Actions (CI):
Dirty patches detected, please refresh and review the diff

The LAN ports are on Turris 1.x in reverse order compared to switch
physical ports. We have to map them in reverse.

The unterminated VLANs were not previously migrated as they are not
terminated in CPU. This adds support for them as one user reported that
it is a setup he is using.

The `vid` is in default set by LuCI but if user configures stuff
directly it can use only `vlan` and in default that is used as `vid`.
This is probably a common way most of the advanced users configured
switch. We need to read vlan and use that as default to vid.

We missed this and of course we read the value so we need to have pin as
input not as output.

Fixes:
CVE-2021-2372
CVE-2021-2389

It seems that mirror returns HTML 404 and thus makes it not available to
download.

Some of our Turris packages does not provide a way to check version via
parameters --version, -version, etc.

Also, for now, we can not use packages which depends on meson as the
path for meson was changed, which was done as patch for turris-build
repository. Unfortunately, for us, we are using OpenWrt SDK and our
packages if it builds.

There is some issue while building this package and it could be
reproduced locally. It was sufficient to drop the row responsible for
l18n.

Let's see if our CI can build it as well.

Output:
Collecting l18n
  Using cached l18n-2021.3.tar.gz (50 kB)
    ERROR: Command errored out with exit status 1:
     command: /hbk/staging_dir/hostpkg/bin/python3.7 -c 'import sys, setuptools, tokenize; sys.argv[0] = '"'"'/hbk/tmp/pip-install-uup06pus/l18n/setup.py'"'"'; __file__='"'"'/hbk/tmp/pip-install-uup06pus/l18n/setup.py'"'"';f=getattr(tokenize, '"'"'open'"'"', open)(__file__);code=f.read().replace('"'"'\r\n'"'"', '"'"'\n'"'"');f.close();exec(compile(code, __file__, '"'"'exec'"'"'))' egg_info --egg-base /hbk/tmp/pip-pip-egg-info-jvy2c1hf
         cwd: /hbk/tmp/pip-install-uup06pus/l18n/
    Complete output (5 lines):
    Traceback (most recent call last):
      File "<string>", line 1, in <module>
      File "/hbk/tmp/pip-install-uup06pus/l18n/setup.py", line 88, in <module>
        cmd_module = getattr(__import__(module, fromlist=[cmd]), cmd)
    ModuleNotFoundError: No module named 'wheel'
    ----------------------------------------
ERROR: Command errored out with exit status 1: python setup.py egg_info Check the logs for full command output.
make[2]: *** [Makefile:46: /hbk/build_dir/target-aarch64_cortex-a53_musl/turris-timezone-v0.2.1/.built] Error 1
make[2]: Leaving directory '/hbk/feeds/turrispackages/utils/turris-timezone'

The commit 43c14e4c updated defintions
but not pacakge version.

This fixes issue with l18n as there is missing timezone - Pacific/Kanton

Add external link to UserOptions
Improve intro description of Packages
Provide info whether user is logged in to JS
Add & update translations
Add light/dark favicon switch
backend.py: new linter version requires encoding
Fix python linting f-string errors
Rename Data Collection card to Threat Detection
Don't set socket when starting WSGIServer
Respond with 401 and rename the file
NPM audit fix

(cherry picked from commit 76693330)

We have two services that indicate boot finish. Those are
start-indicator and rainbow. They have start level 99 but these services
have it set as well and thus sometimes start after indicator. The result
is that tests relying on indicator can initially fail because they just
start too early.
It is also a good idea to just not keep 99 level for use like
start-indicator so this moves all services to earlier level rather than
just affected ones.

The dependency on create_notification includes gettext-tools that
conflicts with gettext and prevents continuation of migration.

There is probably not other solution than just removing this dependency.
We can't use trick with virtual package as we are using old updater at
that moment that considers it as error.

Glenn Strauss authored 3 years ago and Michal Vasilek committed 3 years ago

* add a patch to fix fix use-after-free bug in mod_alias
* refresh patches
* remove an upstreamed meson-zstd patch

* refresh patches
* remove disabling kres_gen_test - this was disabled because it broke
  cross compilation in 5.4.0, but is now fixed.

this bug resulted in crontab -e failing when $EDITOR was not set because
the configure script detected vi path from the host system which is
probably /usr/bin/vi, but OpenWrt has vi in /bin/vi

Compile and run tested on Turris 1.1, powerpc8540

Remove PKG_MAINTAINER line as this package is in our repository and thus
we maintain it. Also, this version was not in OpenWrt. There is a newer
version for OpenWrt 21.02+

In the past the tos3to4-early was installed alongside of updater but
that wasn't ideal so it was moved to be installed later with latest
version of updater after the first replan. This created issue that
script that should allow newest updater to run wasn't installed and
executed. At the same time we do not want to install tos3to4-early due
to its dependencies that we can't simply overcome in the old updater.
The alternative is to simply introduce tos3to4-earliest that contains
the simple localrepo removal script. This is going to be dependency of
updater and thus installed before the new version is installed.

Nor-update is provided by package turris-nor-update, which installs
nor-update into /usr/sbin

The original check was that master can be pushed only with develop
branch. It is what we mostly want but there are cases when we do not
update develop and only master that are valid as well. The example of
such operation is merge of develop to master, which is always
fast-forward due to our workflow.

This halts push only if master commit is not ancestor of develop instead
of halting it always when develop is not being updated.

This reverts commit 14abc044.

This reverts Foris part as well. The reForis part was reverted in
33ab8eff.
It turns out that my assumption that both Foris and reForis behave the
same that lead to only partial revert was invalid and Foris as it seems
it all right. This matches the behavior of reForis.

The second patch is fix. This backports patch that fixes issues with
scripts terminating but not correctly closing all outputs results into
hang.

The first patch is a feature. The turris-build repository contains
second part of it and it is already merged. It is not desirable to
release new version of updater because of other changes thus backporting
only this patch is a good solution.