Commit graph

24414 commits

Author SHA1 Message Date
Jeffery To
c7f25b25df python3: Update to 3.9.10, refresh patches
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2022-01-20 20:48:55 -08:00
Nick Hainke
b9bfe1ef15 wg-installer: remove unused dependency
Remove the dependency "coreutils-realpath" from
wg-installer-server-hotplug-olsrd.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit fab86eb626)
2022-01-20 22:22:53 +01:00
Nick Hainke
9a836f4307 wg-installer: create wireguard key if it does not exist
Check if the key exists which is given by
    option wg_key '/etc/wgserver/wg.key'

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 324fa79d7c)
2022-01-20 15:12:22 +01:00
Nick Hainke
317ba6a43e wg-installer: install cronjob
Install a cronjob that removes unused wireguard interfaces every 10
minutes.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 432a965689)
2022-01-20 13:57:46 +01:00
Nick Hainke
a430932a7d wg-installer: check if a key is already inserted
Check if a peer is already existing with a given public key. Introduce a
response code for signaling why the server rejected the request.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit da48bc3792)
2022-01-20 13:57:46 +01:00
Nick Hainke
0aaa90629c wg-installer: rework code
Use shellcheck to rework the code. Use "export" to return variables from
a function call. Further, fix typos.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 69c81790d1)
2022-01-20 13:57:46 +01:00
Nick Hainke
dea64c08ea wg-installer: cosmetic changes
Use "ip addr" instead of "ip addres" or "ip a".

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 38a9a3e0dc)
2022-01-20 13:57:46 +01:00
Josef Schlehofer
444b64e36c
cryptsetup: update to version 2.4.3
Fixes: CVE-2021-4122

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit a2427edf76)
2022-01-19 11:20:07 +01:00
Josef Schlehofer
a259a4aaaa
git: update to version 2.34.1
- Refreshed patches

- Release notes 2.34.0:
2ae0a9cb82/Documentation/RelNotes/2.34.0.txt

- Release notes 2.34.1:
2ae0a9cb82/Documentation/RelNotes/2.34.1.txt

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit 042bf16072)
2022-01-19 11:20:01 +01:00
Kerma Gérald
0cdffbaf95 crowdsec: update from upstream latest release 1.2.3
update from latest upstream release 1.2.3
updated copyright

(cherry picked from commit de41b63ca4)
Signed-off-by: Kerma Gérald <gandalf@gk2.net>
2022-01-18 18:06:54 -08:00
Moritz Warning
031fbb16a3 smcroute: update to 2.5.5
Signed-off-by: Moritz Warning <moritzwarning@web.de>
2022-01-17 21:08:50 -08:00
Moritz Warning
fcf1633351 smcroute: update to 2.5.4
Signed-off-by: Moritz Warning <moritzwarning@web.de>
2022-01-17 21:08:50 -08:00
Jeffery To
0a250df810
Merge pull request #17619 from erdoukki/21.02-2to3
[21.02] 2to3: add package host tool
2022-01-17 19:10:26 +08:00
Nick Hainke
c7470d1d8e wg-installer: switch to ubus call for olsrd hotplug
Use ubus ipc calls to add and remove interfaces.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit b89eb0115f)
2022-01-17 09:42:06 +01:00
Nick Hainke
8c3ce87fd2 wg-installer: rework iproute2 commands
- Use ip address add instead of ip a a
- Directly add broadcast address

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit fea27cec05)
2022-01-17 09:42:06 +01:00
Kerma Gérald
3f88edfa54 2to3: add package host tool
2to3 is a Python program that reads Python 2.x source code and applies a
  series of fixers to transform it into valid Python 3.x code. The standard
  library contains a rich set of fixers that will handle almost all code. 2to3
  supporting library lib2to3 is, however, a flexible and generic library, so it
  is possible to write your own fixers for 2to3. lib2to3 could also be adapted
  to custom applications in which Python code needs to be edited automatically.

This tool is necessary for fail2ban package because of issue
  https://github.com/openwrt/packages/issues/17311
  https://github.com/openwrt/packages/pull/17341

Simple 2to3.py script from Debian, thanks to Matthias Klose <doko@ubuntu.com>
From: https://salsa.debian.org/cpython-team/python3-defaults

(cherry picked from commit 2f91e1c9c5)
Co-authored-by: Jeffery To <jeffery.to@gmail.com>
Signed-off-by: Kerma Gérald <gandalf@gk2.net>
2022-01-15 20:53:30 +01:00
Paul Spooren
bb09bc37b2 CI: fix runtime testing for non master branch
The runtime testing always ran on master branch aka snapshots since the
branch wasn't passed over to the container execution!

Signed-off-by: Paul Spooren <mail@aparcar.org>
(cherry picked from commit f535d77090)
2022-01-15 11:30:59 +01:00
R4SAS I2P
bbd3d70cd4
i2pd: Update to 2.40.0 and update package sources
* Updating i2pd package to 2.40.0
* Rewrite Makefile
* Remove usage of PKG_INSTALL (package's make install)
* Rewrite init.rc configuration and script
* Remove '--service' option from init, which only sets datadir to /var/lib/i2pd
* Use '--datadir' option in init, otherwise datadir changing via uci is not works
* Update patch for i2pd.conf

Signed-off-by: R4SAS I2P <r4sas@i2pmail.org>
(cherry picked from commit ac27fffff9)
2022-01-15 09:02:21 +01:00
Dirk Neukirchen
19d32003c2
i2pd: remove unneeded functions.sh
its included via rc.common, see
https://openwrt.org/docs/guide-developer/config-scripting

Signed-off-by: Dirk Neukirchen <plntyk.lede@plntyk.name>
(cherry picked from commit 266deb5866)
2022-01-15 09:02:15 +01:00
R4SAS I2P
8d150985c4
i2pd: Update to 2.38.0
Remove USE_AVX and USE_AESNI make options as it is correclty handled by
internal code.

Signed-off-by: R4SAS I2P <r4sas@i2pmail.org>
(cherry picked from commit 1025dd7c76)
2022-01-15 08:59:38 +01:00
Dirk Neukirchen
5ee9fb98dd
i2pd: update to 2.36
remove AVX patches as upstream has integrated and closed
all AVX issues

compiled on :  x86-64, i386 generic
tested on : x86-64 VM, i386 VM

Signed-off-by: Dirk Neukirchen <plntyk.lede@plntyk.name>
(cherry picked from commit fc7d710e62)
2022-01-15 08:59:34 +01:00
Michal Hrusecky
d0bb487412
mariadb: Add sudo dependency
During update we use sudo to start an instance. It probably could be
workarounded, but given the MariaDB size, dependency on sudo shouldn't
be an issue.

Signed-off-by: Michal Hrusecky <michal.hrusecky@turris.com>
(cherry picked from commit 0ffec9bd4b)
2022-01-14 16:30:25 +01:00
Michal Hrusecky
f4d8f9c98f
mariadb: Check and fix datadir owner issues during upgrade
If you are migrating to MariaDB package, you might have old datadir
stored somewhere using different setup with different users. If you
trust us enough to enable autoupgrade, you probably trust us enough to
chown your datadir as well. This can prevent some potential issues.

Signed-off-by: Michal Hrusecky <michal.hrusecky@turris.com>
(cherry picked from commit b41525cef4)
2022-01-14 16:28:29 +01:00
Josef Schlehofer
e86528676b
Merge pull request #17603 from BKPepe/mariadb-bump
mariadb: update to version 10.4.22
2022-01-14 13:14:53 +01:00
Josef Schlehofer
7a3f41af4d
mariadb: update to version 10.4.22
Fixes: CVE-2021-35604

Removed two patches:
130-c11_atomics.patch - included in upstream now [1]
140-mips-connect-unaligned.patch - included in upstream, too. [2]

[1] f502ccbcb5 (diff-6ef8fc82162068daeab927be94e246b202eb39323a102273b9448219da24172f)
[2] a33c1082da (diff-821e2c7a49184a660339b094f437fcd1e9aea997a86391467a657088234ebca0)

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
2022-01-13 14:52:05 +01:00
Hirokazu MORIKAWA
d3e6dc51ee mg: bump to 7.0
This is mg as it appears in OpenBSD 7.0.

Signed-off-by: Hirokazu MORIKAWA <morikw2@gmail.com>
2022-01-13 10:41:20 +01:00
Jo-Philipp Wich
15b41a6751
zerotier: add configuration reload trigger
Ensure that the zerotier service is automatically restarted when the uci
configuration is modified.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 04d0e45da1)
2022-01-13 10:40:32 +01:00
James White
2bca94d83e
netdata: Update init script to use -D rather than -nd
The current init script is using the deprecated -nd flag. This updates netdata to be started with -D.

Signed-off-by: James White <james@jmwhite.co.uk>
(cherry picked from commit cf9d5a8870)
2022-01-13 10:39:28 +01:00
Josef Schlehofer
c7fef6db56
atlas-probe: update to version 2.4.1
Removed patches:
001-fix-stime-glibc-remove.patch - it is included in upstream
003-Fix-compilation-with-gcc11.patch - no longer necessary

Updated patches:
002-Avoid-problems-with-64-bit-time_t.patch

Refreshed patches:
004-Comment-out-librt-testing.patch

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit cf65ca2db0)
2022-01-13 10:18:10 +01:00
Josef Schlehofer
98c1fe435c
atlas-sw-probe: update to version 5040
Update copyright

Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
(cherry picked from commit ec767eb499)
2022-01-13 10:17:53 +01:00
Kerma Gérald
1a40e3c89c crowdsec-firewall-bouncer: update to 0.0.21
Update crowdsec-firewall-bouncer to latest upstream release version 0.0.21

Makefile rework
- use tagged version for download

Fixes
- set API_KEY in firewall bouncer config file

(cherry picked from commit b4f48b5c23)
Signed-off-by: Kerma Gérald <gandalf@gk2.net>
2022-01-13 10:15:11 +01:00
Kerma Gérald
432140a36e crowdsec: update to 1.2.2
Update crowdsec to latest upstream release version 1.2.2

Makefile rework
- use tagged version for download

(cherry picked from commit 2a34e4987b)
Signed-off-by: Kerma Gérald <gandalf@gk2.net>
2022-01-13 10:15:01 +01:00
Sebastian Kemper
b5443ccdf0
apache: fixup apxs
apxs is used to get information about the apache installation when
building external modules. Currently there are issues:

1.

./staging_dir/target-mips_24kc_musl/usr/bin/apxs -q TARGET
apache2
apxs:Error: ./staging_dir/target-mips_24kc_musl/home/sk/tmp/openwrt/staging_dir/target-mips_24kc_musl/usr/bin/apr-1-config not found!.

This error is fixed by sed script #2.

2.

./staging_dir/target-mips_24kc_musl/usr/bin/apxs -q TARGET
cannot open ./staging_dir/target-mips_24kc_musl/home/sk/tmp/openwrt/staging_dir/target-mips_24kc_musl/usr/share/apache2/build/config_vars.mk: No such file or directory at ./staging_dir/target-mips_24kc_musl/usr/bin/apxs line 213.

This error is fixed by sed scipt #1.

Both sed scripts taken from buildroot (see [1]).

[1] https://github.com/buildroot/buildroot/blob/master/package/apache/apache.mk

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
(cherry picked from commit 83d1cdaf3f)
2022-01-13 10:10:49 +01:00
Sebastian Kemper
19451ec864
apache: security bump to 2.4.51
Fixes (see [1] for details):

  CVE-2021-33193
  CVE-2021-41524
  CVE-2021-41773
  CVE-2021-42013

[1] https://httpd.apache.org/security/vulnerabilities_24.html

Patch 020-openssl-deprecated.patch refreshed.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>
(cherry picked from commit da4b1ca8d6)
2022-01-13 10:10:45 +01:00
Nick Hainke
6fe1b64e7a wg-installer: fix shell typo
Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 53503c4a3a)
2022-01-12 22:43:41 +01:00
Nick Hainke
f21f39cfd8 wg-installer: allow defining link costs for hotplugs
Add options to set link costs in mesh routing daemons.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit ee879d3747)
2022-01-12 18:28:12 +01:00
Nick Hainke
9952517460 wg-installer: private key as parameter
Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 6a59d41fbf)
2022-01-12 09:13:29 +01:00
Nick Hainke
652ebf1a33 wg-installer: generate new keys for every connection
Generate new keys on every new connection.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 8ab044712a)
2022-01-12 09:13:29 +01:00
Jeffery To
5f517cc584 golang: Update to 1.17.6
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
(cherry picked from commit 45208db29bd22238d355f4f8fdcc02fd2045c78a)
2022-01-11 16:23:10 -08:00
Nick Hainke
92e357ebd8 wg-installer: fix using symlinks for conf files
It is useful to symlink babeld and olsrd to /tmp/ if we frequently
write to those config files.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 5e8301d7dc)
2022-01-11 00:52:40 +01:00
Kerma Gérald
caa72e5c54 fail2ban: fix 2to3 error
Issue: 2to3 support has been removed in setuptools since version 58.0.0.

Fix: openwrt/packages#17311

Requirements: 2to3/host openwrt/packages#17429

Add upstream patch: 196c55e931

To install/build for python3 from source, it is necessary to convert to py3
codebase before setup (invoke 2to3 or ./fail2ban-2to3 firstly).
> ./fail2ban-2to3
> python3 setup.py build

(cherry picked from commit ad0e1a1c3c)
Signed-off-by: Kerma Gérald <gandalf@gk2.net>
2022-01-10 21:54:33 +01:00
Nick Hainke
b3764db33c wg-installer: fix cleanup script
The wrong function was called.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit e6afcf8f3c)
2022-01-10 14:15:28 +01:00
Hannu Nyman
1e179f92a3 haveged: update to 1.9.17
Update havged to version 1.9.17.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit e065ccda94)
2022-01-09 19:01:45 +02:00
Nick Hainke
d364552774 wg-installer: fix get_usage function
The get_usage function always returns 0. The shell syntax was wrong.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit f7cb8b20e1)
2022-01-09 14:13:06 +01:00
Nick Hainke
49f898044c wg-installer: delete old interfaces
Add "wg_check_interfaces" and specify a timeout in the config file.
This allows to delete not used wireguard-interfaces automatically.

For example a cronjob can be installed that calls:
  . /usr/share/wginstaller/wg_functions.sh && wg_check_interfaces

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 36dc9b3f79)
2022-01-09 14:13:06 +01:00
Nick Hainke
335ad2a4d7 wg-installer: fix dependencies
Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 62cc627aba)
2022-01-09 14:13:06 +01:00
Nick Hainke
f2745c85a2 wg-installer: fix typo in cleanup function
The delete variable was misspelled leading to devices always being
removed although they had connected neighbors.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 0e416dadd1)
2022-01-09 13:49:19 +01:00
Nick Hainke
1de352b603 wg-installer: fix ipv4 meshing via olsr
The ipv4 address space was not allowed.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 4302bfd3c8)
2022-01-09 12:20:18 +01:00
Nick Hainke
efb5bdf073 wg-installer: add link-local to client interface
Wireguard has no link-local address on an interface automatically.
Add a link-local to the interface. The server has fe80::1/64 and
the client fe80::2/64.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 625f3c8302)
2022-01-09 12:20:18 +01:00
Nick Hainke
bf1c780af4 wg-installer: add cleanup script
Add script to cleanup unused wireguard interfaces.

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 714b51c630)
2022-01-09 10:43:34 +01:00