Kevin Darbyshire-Bryant [Fri, 16 Jun 2017 19:06:50 +0000 (20:06 +0100)]
kmod-sched-cake: drop maintainer
Drop myself from maintainership of 'cake'.
Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
(cherry picked from commit
c7f8bcede6be73d0c07e058d57b55e4efc746440)
Stijn Tintel [Sat, 11 Mar 2017 08:32:19 +0000 (09:32 +0100)]
zlib: use default Build/Configure rule
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit
462ca4e059dbead678163da26fb4e14748f3021e)
Stijn Tintel [Sat, 11 Mar 2017 08:18:22 +0000 (09:18 +0100)]
lzo: use default Build/Configure rule
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit
b3cba687a447478253f95febf17fa9376c98105d)
Alin Nastac [Fri, 16 Jun 2017 12:16:07 +0000 (14:16 +0200)]
netfilter: add iptables-mod-rpfilter package
Unlike /proc/sys/net/ipv4/conf/INTF/rp_filter flag, rule iptables -t raw
-I PREROUTING -m rpfilter --invert -j DROP prevents conntrack table to
become full when a packet flood with randomly selected source IP addresses
is received from the lan side.
Signed-off-by: Alin Nastac <alin.nastac@gmail.com>
(cherry picked from commit
d8748e537f11ab5f2b5e2ed25d94baa5ce353984)
Daniel Golle [Wed, 5 Jul 2017 14:25:23 +0000 (16:25 +0200)]
bzip2: add symlink to binary
Other distributions incl. the OpenWrt ImageBuilder and SDK
expect to find the bzip2 executable in /bin.
Create a symlink at that location for compatibility.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit
eb7c14d512482e18d05f61afa44205167ea094c0)
Stijn Tintel [Tue, 27 Jun 2017 20:30:01 +0000 (22:30 +0200)]
dropbear: add option to set max auth tries
Add a uci option to set the new max auth tries paramater in dropbear.
Set the default to 3, as 10 seems excessive.
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit
6371159b4ae8b4dd94d6319ac805b0c26962bb14)
Kevin Darbyshire-Bryant [Sun, 25 Jun 2017 20:40:43 +0000 (21:40 +0100)]
dropbear: server support option '-T' max auth tries
Add support for '-T n' for a run-time specification for maximum number
of authentication attempts where 'n' is between 1 and compile time
option MAX_AUTH_TRIES.
A default number of tries can be specified at compile time using
'DEFAULT_AUTH_TRIES' which itself defaults to MAX_AUTH_TRIES for
backwards compatibility.
Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
(cherry picked from commit
9aaf3d3501642640c9ec74268e671171c8de6103)
Yury Shvedov [Tue, 27 Jun 2017 08:43:54 +0000 (11:43 +0300)]
hostapd: configure NAS ID regardless of encryption
RADIUS protocol could be used not only for authentication but for
accounting too. Accounting could be configured for any type of networks.
However there is no way to configure NAS Identifier for non-WPA
networks without this patch.
Signed-off-by: Yury Shvedov <yshvedov@wimarksystems.com>
[cleanup commit message]
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit
37c1513b1f98c93bf84bbcedd9782568e7d4abba)
Yury Shvedov [Tue, 27 Jun 2017 07:34:49 +0000 (10:34 +0300)]
hostapd: add acct_interval option
Make an ability to configure Accounting-Interim-Interval via UCI
Signed-off-by: Yury Shvedov <yshvedov@wimarksystems.com>
[add hostapd prefix, cleanup commit message]
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit
0e7bbcd43b6f4b54ecc5c40130b5f86cbc9f1c07)
Luiz Angelo Daros de Luca [Sat, 17 Jun 2017 03:54:45 +0000 (00:54 -0300)]
valgrind: bump to 3.13.0
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
(cherry picked from commit
991899cc5449d8595593a66c0130fdcaa088b36a)
Stefan Tomanek [Mon, 19 Jun 2017 10:41:11 +0000 (12:41 +0200)]
busybox: backport 'ip rule suppress_{prefixlength, ifgroup}'
This is a backport from the busybox repository
(
192dce4b84fb32346ebc5194de7daa5da3b8d1b4); it enables the use of the
suppress_{prefixlength,ifgroup} flags for policy routing rules.
Signed-off-by: Stefan Tomanek <stefan.tomanek@wertarbyte.de>
(cherry picked from commit
de6ff1512955953e56735896c044c7aac97e14d9)
Yousong Zhou [Mon, 19 Jun 2017 06:41:47 +0000 (14:41 +0800)]
libunwind: update to version 1.2.1
Changes since 1.2
a77b0cd Bump version to v1.2.1
5f354cb mips/tilegx: Add missing unwind_i.h header file
620d1c3 Add aarch64 getcontext functionality.
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit
77dc6a2ae7c94ac3d496ebab589d4574ac7169d0)
Daniel Golle [Fri, 16 Jun 2017 23:24:43 +0000 (01:24 +0200)]
imagebuilder: don't rewrite package list output
No longer rewrite opkg list output in package_list function, remove
the awk call in the pipe (which was intended for a single specific
use-case).
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit
d80d1b6c42aa663e6104f817daa5ea29d2e7073d)
Daniel Golle [Fri, 16 Jun 2017 22:54:46 +0000 (00:54 +0200)]
imagebuilder: clean package_list
commit
19ac879954 (imagebuilder: add package_list function) introduced
a new function 'package_list' to the imagebuilder Makefile.
Unfortunately the package list was poluted by stdout noise of the
Makefile itself as well as opkg. Redirect those outputs to stderr to
make sure that the package_list returned doesn't contain progress
info output but really only packages.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit
1b555e1d2b1cb2ae3dd1832225e6c9d2c5df0a37)
Felix Fietkau [Fri, 16 Jun 2017 13:15:37 +0000 (15:15 +0200)]
build: remove old kernel-headers build directories
Saves space after updating kernel versions
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit
76b62e602233d1a2e1f8ef1c0833bd22ebaaf832)
Paul Spooren [Tue, 13 Jun 2017 19:59:14 +0000 (21:59 +0200)]
imagebuilder: add package_list function
The imagebuilder can now list all available packages by using make
package_list. This is usefull for scripts to retrieve a list of all
packages with versions (and size)
Signed-off-by: Paul Spooren <paul@spooren.de>
[daniel@makrotopia.org: fixed commit message]
(cherry picked from commit
19ac879954210df3c6a010990bef42ad5c7fd967)
Jonas Gorski [Sun, 11 Jun 2017 10:50:14 +0000 (12:50 +0200)]
base-files: board.json's switch reset means existence, not argument
Don't pass the value unconditionally to swconfig as a parameter but
instead only call reset if it is 1.
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
(cherry picked from commit
fd952c7a83e5357f5dcab28c0bcaca756e27eaa0)
Alexandru Ardelean [Fri, 12 May 2017 08:50:05 +0000 (11:50 +0300)]
gdb: remove Build/Compile rule ; default one works
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit
ab485383fa4d60d6342cd5a4eb6b5429afba6b97)
Felix Fietkau [Thu, 1 Jun 2017 09:17:13 +0000 (11:17 +0200)]
rb532: enable high-res timers, refresh kernel config
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit
2dc23a7576614181e35a0bf6444fc55144dd711b)
Felix Fietkau [Thu, 1 Jun 2017 09:15:39 +0000 (11:15 +0200)]
xburst: enable high-res timers, refresh kernel config
Helps with system performance
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit
f859a7b696d79fae8dd98859a3451a6f9d77570f)
Felix Fietkau [Thu, 1 Jun 2017 09:10:21 +0000 (11:10 +0200)]
kernel: add CONFIG_SCHED_HRTICK=y to the generic config
It is used by pretty much every target
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(backported from commit
b47fd7656336162360ebf66147326763ddae3f8d)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
Alif M. Ahmad [Sat, 20 May 2017 07:11:16 +0000 (14:11 +0700)]
package/grub2: update to 2.02
Update to version 2.02
Signed-off-by: Alif M. Ahmad <alive4ever@live.com>
(cherry picked from commit
415c47de79ada7496c39f435df0b0523472aee58)
Sergey Ryazanov [Tue, 6 Jun 2017 22:25:32 +0000 (01:25 +0300)]
ip17xx: correct aneg_done return value
PHY core treats any positive return value as the auto-negotiation done
indication. Since we do not actually check any device register in this
callback then update it to return positive value with a neutral meaning
instead of the register flag to avoid confusing for future readers.
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
(cherry picked from commit
2cc61e6e8e951b1480a024fdb66bc539aa163bbc)
Sergey Ryazanov [Tue, 6 Jun 2017 22:25:31 +0000 (01:25 +0300)]
mvswitch: fix autonegotiation issue
The Marvel
88E6060 switch has an MDIO interface, but does not emulate
regular PHY behavior for the host. The network core can not detect using
the generic code, whether the connection via the attached PHY can be
used or not. The PHY's state machine is stuck in a state of
auto-negotiation and does not go any further so the Ethernet interface
of the router stay forever in the not-runing state.
Fix this issue by implementing the aneg_done callback to be able to
inform the network core that the Ethernet interface link to which the
switch is connected can be marked as RUNNING.
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
(cherry picked from commit
913b2290caad437bb523d6f1ee5a70707f7f7ef4)
Hans Dedecker [Wed, 31 May 2017 14:24:11 +0000 (16:24 +0200)]
ppp: propagate master firewall zone to dynamic slave interface
Assign the virtual DHCPv6 interface the firewall zone of the parent interface
so fw3 knows the zone to which the virtual DHCPv6 interface belongs.
This guarantees the firewall settings are applied correctly for the virtual
DHCPv6 interface and allows to query the zone to which the virtual DHCPv6
interface belongs via the fw3 network option.
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit
21f25bc4a325b3075d6426047640e9cf6176894c)
Julian Labus [Wed, 24 May 2017 14:32:18 +0000 (16:32 +0200)]
usbmode: remove devices with unsupported modes
remove files which include the following mode options
BlackberryMode OptionMode PantechMode QuantaMode
Signed-off-by: Julian Labus <julian@labus-online.de>
(cherry picked from commit
b757de65b3c3aa210022c65445df1d6dbbf9eadd)
Felix Fietkau [Tue, 30 May 2017 13:37:10 +0000 (15:37 +0200)]
tar: override symlink permissions
On Linux, symlink permissions cannot be altered and are always 0777.
On Mac OS X they can be 0755. Force 0777 here to keep tarballs
reproducible across systems
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit
e25cedd0b5621dc02e47eea674006578ac062c9f)
Daniel Engberg [Wed, 10 May 2017 09:34:10 +0000 (11:34 +0200)]
tools/sparse: Update to snapshot 2017-03-31
Update sparse to snapshot 2017-03-31
Switch to HTTPS
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
(cherry picked from commit
9235a29e1a9764361940d4b38f4fce0358d8d9ee)
Florian Fainelli [Mon, 22 May 2017 23:08:57 +0000 (16:08 -0700)]
elfutils: Pass -Wno-unused-result to silence warnings as errors
elfutils turns on -Werror by default, and patch 100-musl-compat.patch
changes how strerror_r is used and we no longer use the function's
return value. This causes the following build error/warning to occur
with glibc-based toolchains:
dwfl_error.c: In function 'dwfl_errmsg':
dwfl_error.c:158:18: error: ignoring return value of 'strerror_r',
declared with attribute warn_unused_result [-Werror=unused-result]
strerror_r (error & 0xffff, s, sizeof(s));
^
cc1: all warnings being treated as errors
Fixing this would be tricky as there are two possible signatures for
strerror_r (XSI and GNU), just turn off unused-result warnings instead.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
(cherry picked from commit
484f768dfa295d9fccd82c57cae00458f32b7182)
Felix Fietkau [Wed, 10 May 2017 12:01:54 +0000 (14:01 +0200)]
gcc: fix documentation entries added by 910-mbsd_multi.patch
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit
8851a18a88aff548ae2648e26deb7595ebb45733)
Felix Fietkau [Tue, 9 May 2017 13:20:42 +0000 (15:20 +0200)]
scripts/download.pl: print the command used to download files
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit
cbe0a7ecc0b76f4d97d87ca59a0ff8074b8946f4)
Hannu Nyman [Sun, 7 May 2017 17:52:32 +0000 (20:52 +0300)]
tools/libressl: update to 2.5.4
Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit
d7a3120cdcc1aeed5a95636803d250e35ba8706e)
Syrone Wong [Sun, 7 May 2017 11:39:12 +0000 (19:39 +0800)]
tools/isl: update to 0.18
Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
(cherry picked from commit
a0f4b4b3a2cd4db1a2b9bab3c06970361192368f)
Stijn Tintel [Wed, 24 May 2017 12:56:22 +0000 (14:56 +0200)]
lldpd: bump to 0.9.7
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit
423a7a6b752d4780f7f61722443ed5f4f50e3bda)
Yousong Zhou [Mon, 22 May 2017 02:35:10 +0000 (10:35 +0800)]
libunwind: update to 1.2
Addresses CVE-2015-3239: Off-by-one error in the dwarf_to_unw_regnum
function in include/dwarf_i.h in libunwind 1.1 allows local users to
have unspecified impact via invalid dwarf opcodes.
Upstream stable-v1.2 fixed the missing unwind_i.h issue but no new
tarball is released yet
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
(cherry picked from commit
5d48dc1146171520445c43ee894d9dfce09ae4e2)
Hauke Mehrtens [Sun, 21 May 2017 19:20:44 +0000 (21:20 +0200)]
lantiq: spi: double time out tolerance
The generic SPI code calculates how long the issued transfer would take
and adds 100ms in addition to the timeout as tolerance. On my 500 MHz
Lantiq Mips SoC I am getting timeouts from the SPI like this when the
system boots up:
m25p80 spi32766.4: SPI transfer timed out
blk_update_request: I/O error, dev mtdblock3, sector 2
SQUASHFS error: squashfs_read_data failed to read block 0x6e
After increasing the tolerance for the timeout to 200ms I haven't seen
these SPI transfer time outs any more.
The Lantiq SPI driver in use here has an extra work queue in between,
which gets triggered when the controller send the last word and the
hardware FIFOs used for reading and writing are only 8 words long.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit
6153248052b2e067df9596c2d619345261b1d3f7)
Alexandru Ardelean [Fri, 19 May 2017 13:19:20 +0000 (16:19 +0300)]
base-files: fix default procd reload
Bug introduced with
6713694.
I did not count on procd handling reload as mentioned
in this doc:
https://wiki.openwrt.org/inbox/procd-init-scripts
```
procd_set_param file /var/etc/your_service.conf # /etc/init.d/your_service reload will restart the daemon if these files have changed
procd_set_param netdev dev # likewise, except if dev's ifindex changes.
procd_set_param data name=value ... # likewise, except if this data changes.
```
The service would be restarted regardless of any of those params.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit
c7ee30d53af12ea725296cc323f68e8fe04e532c)
Michael Lee [Thu, 27 Apr 2017 01:04:31 +0000 (09:04 +0800)]
ramips: support jumbo frame on mt7621 up to 2k
Signed-off-by: Michael Lee <igvtee@gmail.com>
(cherry picked from commit
eee09bfe01e8cc2db1501f82dde7b9b6bb424faf)
Alexandru Ardelean [Thu, 4 May 2017 11:13:40 +0000 (14:13 +0300)]
lldpd: drop specific respawn params [use system-wide]
I think I added these respawn params [a while back],
when I did the conversion to procd init script format.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit
ce8bfa9407bc1518107a99edc8568a59fe269fa5)
Luiz Angelo Daros de Luca [Fri, 5 May 2017 23:05:56 +0000 (20:05 -0300)]
elfutils: bump to 0.169
Removed patches (now upstream):
- 004-maybe-uninitialized.patch
- 007-fix_TEMP_FAILURE_RETRY.patch
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
(cherry picked from commit
ccc54b29352a7d30762b84761414aa1798ce1183)
Daniel Engberg [Wed, 10 May 2017 09:19:46 +0000 (11:19 +0200)]
devel/trace-cmd: Update to 2.6.1
Update trace-cmd to version 2.6.1
Switch to tarball download
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
(cherry picked from commit
b295966f8767ff84b55e547ae5c2967772c3ede2)
Giuseppe Lippolis [Tue, 9 May 2017 18:23:35 +0000 (20:23 +0200)]
comgt-3g: enable modem before to setpin
some modems needs to be enabled with CFUN=1 before to set the pin
Signed-off-by: Giuseppe Lippolis <giu.lippolis@gmail.com>
(cherry picked from commit
db776c01e1202307b78a4bb757f78db5ea48e27e)
Daniel Engberg [Sat, 13 May 2017 11:21:11 +0000 (13:21 +0200)]
devel/strace: Update to 4.16
Update strace to 4.16
Refresh patch
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
(cherry picked from commit
4b0a2ca9a47ce30f08161b5b12991f15d590938c)
Daniel Engberg [Sat, 13 May 2017 11:25:16 +0000 (13:25 +0200)]
network/utils/ipset: Update to 6.32
Update ipset to 6.32
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
(cherry picked from commit
ea2927e1eaa321033b28f08db0ec59e7df5f7806)
Jo-Philipp Wich [Sun, 14 May 2017 17:47:07 +0000 (19:47 +0200)]
mac80211: gracefully handle preexisting VIF
Gracefully handle cases where the to-be-created wireless interface already
exists on the system which might commonly happen with non-multi-SSID capable
wireless drivers.
This fixes commit
8301e613655c2d95fa5430a1a57d92d966fdc70b which caused
previously ignored "Too many open files in system (-23)" errors to fail the
wireless setup procedure.
With the updated approach we'll still try recreating the vif after one
second if the first attempt to do so failed with ENFILE but we will now
consider the operation successfull if a second attempt still yields ENFILE
with the requested ifname already existing on the system.
Fixes FS#664, FS#704.
Suggested-by: Vittorio Gambaletta <openwrt@vittgam.net>
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
4a033475453b63d0d5ae41489e7c395882567698)
Florian Fainelli [Tue, 4 Apr 2017 02:04:24 +0000 (19:04 -0700)]
scripts: Probe external toolchains for libthread-db
libthread-db is a package that can be configured for external
toolchains, so let's have the script probe for it.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
(cherry picked from commit
6704410b158b47aecf507971ad2ee5e3db840e3a)
Sergey Ryazanov [Sun, 7 May 2017 17:19:13 +0000 (20:19 +0300)]
build: new fixes for symlinked .config handling
When running "make {config|defconfig|oldconfig}" with symlinked .config
(e.g. to env/.config) it renames symlink to .config.old, creates new
.config file, and writes the updated configuration into it.
This breaks the desired workflow when changes in the configuration can
be checked using "scripts/env diff" and commited using "scripts/env
save". Since the env/.config file is not updated.
The things become even worse when working with feeds, since feeds script
quite often silently invokes "make {oldconfig|defconfig}" and breaks the
symlink.
Fix this issue by exporting KCONFIG_OVERWRITECONFIG=1, which forces
mconf to overwrite the .config content, instead of renaming it and
creating a new file. This variable is set only if .config is a symlink,
otherwise the variable is not exported and the old behaviour is
preserved.
This change uses the same behaviour as "make menucofig", which has
already been fixed in commit
5bf98b1acc3b6b178f8954c5075a58e1e6a99d6a.
Also make a tiny cosmetic update to the "make menuconfig" target code
layout to make it look like other config handling targets.
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
(cherry picked from commit
e06d8f0f6f041c8ac1acba810eea96c32dc983e4)
Felix Fietkau [Fri, 5 May 2017 11:12:23 +0000 (13:12 +0200)]
build: allow val.% targets to bypass the prepare steps
Significantly reduces time spent processing those targets and should
also silence some log clutter which could confuse buildbot
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit
ddbb036bbb8a1030dd8f6fae0004d390b5f2b8a5)
Daniel Golle [Fri, 5 May 2017 03:56:10 +0000 (05:56 +0200)]
x86: keep /boot mounted for kexec
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit
63571cb56c7ff2692b5c9aa78133c3f4996e2ac5)
Abhilash Tuse [Thu, 23 Mar 2017 06:04:32 +0000 (11:34 +0530)]
hostapd: fix reload frequency change patch
When sta is configured, hostapd receives 'stop' and 'update' command from
wpa_supplicant. In the update command, hostapd gets sta parameters with
which it configures ap.
Problem is, with the default wireless configuration:
mode:11g freq:2.4GHz channel:1
If sta is connected to 5GHz network, then ap does not work. Ideally with
340-reload_freq_change.patch hostapd should reload the frequency changes
and start ap in 5GHz, but ap becomes invisible in the network.
This issue can be reproduced with following /etc/config/wireless:
config wifi-device radio0
option type mac80211
option channel 1
option hwmode 11g
option path 'virtual/uccp420/uccwlan'
option htmode 'none'
config wifi-iface 'ap'
option device 'radio0'
option encryption 'none'
option mode 'ap'
option network 'ap'
option ssid 'MyTestNet'
option encryption none
config wifi-iface 'sta'
option device radio0
option network sta
option mode sta
option ssid TestNet-5G
option encryption psk2
option key 12345
This change updates current_mode structure based on configured hw_mode
received from wpa_supplicant. Also prepare rates table after frequency
selection.
Signed-off-by: Abhilash Tuse <Abhilash.Tuse@imgtec.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name> [cleanup, patch refresh]
(cherry picked from commit
41feba8c4aa33ca3c6fa7c1a6c3224aae02440a7)
Bastian Köcher [Mon, 27 Mar 2017 15:21:12 +0000 (17:21 +0200)]
build: remove absolute path to perl and replace with /usr/bin/env perl
Signed-off-by: Bastian Köcher <git@kchr.de>
(cherry picked from commit
5378c856779c590e26910639e28b95a22aa2b9f5)
Felix Fietkau [Wed, 12 Apr 2017 07:15:38 +0000 (09:15 +0200)]
kernel: allow selecting RTC drivers on targets without explicit RTC support
Keep them disabled by default to avoid pulling in extra kernel bloat
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit
5afe9a054cbcb1630a42200f3ac799432522a87d)
Hans Dedecker [Wed, 26 Apr 2017 14:44:02 +0000 (16:44 +0200)]
dropbear: fix procd interface trigger install
Install procd interface triggers only for interfaces which are enabled
so dropbear instances running on (an) enabled interface(s) are not
restarted due to an interface trigger of an interface which is disabled.
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit
e5bbead1a83944293fccc27679ba9846d133374e)
Daniel Engberg [Fri, 21 Apr 2017 08:23:20 +0000 (10:23 +0200)]
include/packages-defaults.mk: Remove LARGEFILE option
Remove LARGEFILE option, support was removed back in 2011 (OpenWrt rev 25208).
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
(cherry picked from commit
edda8ecd79b181e338e82331ecb45eaeff0f57af)
Hans Dedecker [Fri, 21 Apr 2017 09:44:57 +0000 (11:44 +0200)]
netifd: return error status in reload_service
Based on a patch by Alexandru Ardelean.
netifd ubus reload call returns the actual reload error status;
return error status as well in reload_service
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit
4b195a611fe146969e813ce77ecf74ce5f9c176b)
Alif M. Ahmad [Wed, 22 Mar 2017 14:29:12 +0000 (21:29 +0700)]
grub2: update to 2.02~rc2
Update to version 2.02~rc2.
Signed-off-by: Alif M. Ahmad <alive4ever@live.com>
(cherry picked from commit
ffd055d5bbc1a223c80eb5bbc03a6465d0ac0bb4)
Alexandru Ardelean [Fri, 31 Mar 2017 06:44:19 +0000 (09:44 +0300)]
base-files: use restart if no reload hook for service
This was also working before, with a slightly
different semantic.
[ Original semantic ]
If no reload hooks was implemented, the default one would
kick in, it would return fail, and restart would happen.
This would happen also in the case where a reload hook
would be implemented, it would fail, and it would restart
the service.
[ New semantic ]
The default reload hook calls restart.
Services can implement their own reload.
If reload fails, then the '/etc/init.d/<service> reload'
would return a non-zero code, and the caller can choose
a way to handle this.
Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
(cherry picked from commit
6713694fe4377f0988e2d558a6cd9b05ca9b18f1)
Hans Dedecker [Sat, 8 Apr 2017 18:40:56 +0000 (20:40 +0200)]
iproute2: add libgenl.h and ll_map.h to InstallDev section
Commit
f4e312ddf855375667f43c842c7187934b8aca92 adds libnetlink to
staging dir but did not add the header files libgenl.h and ll_map.h
which define functions belonging to libnetlink lib
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit
fc859fb44b4e7a38a1f1825b05b72b81e80f82a8)
Felix Fietkau [Tue, 4 Apr 2017 13:05:11 +0000 (15:05 +0200)]
busybox: fix installation of cron and ntpd scripts in the default config
Fixes:
0b24850e9778 ("busybox: don't install NTP scripts if NTP isn't configured")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit
3169a6a7ada17e2ea8ef4641edee68134c04b92b)
Rafał Miłecki [Mon, 27 Mar 2017 09:03:01 +0000 (11:03 +0200)]
kernel: move initramfs's init script out of base-files
Keeping it in base-files was resulting in adding it to the base-files
package. This file is meant to be included manually for initramfs
images only.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit
f6433eede79db4f6276b68e815bb17a9364292c7)
Philip Prindeville [Wed, 4 Jan 2017 01:15:15 +0000 (18:15 -0700)]
target.mk: check that CPU_TYPE has known CPU_CFLAGS mapping
If someone creates a target and indicates a CPU_TYPE, but there's
no corresponding support for that CPU_TYPE's flags in include/target.mk
then that should probably be indicated rather than silently ignored.
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit
d3bc11857af788e185e8a3ece26ce40757cf3965)
Felix Fietkau [Tue, 4 Apr 2017 09:44:22 +0000 (11:44 +0200)]
scripts/download.pl: fix error message on hash mismatch
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit
2fd15033783a9dfa84d2a43fb81ff222ab865407)
Hans Dedecker [Sun, 2 Apr 2017 19:13:08 +0000 (21:13 +0200)]
netifd: fix fw3 warnings in dhcp script
Fix fw3 warnings in dhcp script in case fw3 is not enabled
Signed-off-by: Hans Dedecker <dedeckeh@gmail.com>
(cherry picked from commit
20e40db524fb6c391f47619b18bf36bf7932478a)
Philip Prindeville [Tue, 7 Feb 2017 03:33:36 +0000 (20:33 -0700)]
build: allow specifying flow-control to grub on serial console
On the more sophisticated (i.e. deeper FIFO) serial controllers,
flow-control might be needed to avoid dropping output.
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit
7fe5963be023fd59a11652ecfb065d3405a91c48)
Philip Prindeville [Wed, 22 Mar 2017 03:55:23 +0000 (21:55 -0600)]
kexec-tools: get kexec running on MUSL and x86 hardware
Couple of important upstream patches (slated for 2.0.15) that
are necessary for kexec to run on MUSL and on x86 hardware.
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit
dfacdc6a99757fcf7804b38784fc24f9fad30650)
Philip Prindeville [Mon, 6 Feb 2017 22:26:49 +0000 (15:26 -0700)]
busybox: don't install NTP scripts if NTP isn't configured
If you're using Chrony or NTPD you don't want the busybox NTP server
as well. Make it's installation truly conditional.
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name> [simplify]
(cherry picked from commit
0b24850e97789818fadcbce4b8de4abc429fd9f2)
Vittorio Gambaletta [Sun, 26 Mar 2017 08:08:20 +0000 (10:08 +0200)]
ar8327: Add workarounds for AR8337 switch.
RGMII RX delay setting needs to be always specified for AR8337 to
avoid port 5 RX hang on high traffic / flood conditions.
Also, the HOL registers that set per-port and per-packet-priority
buffer sizes are updated with the reduced values suggested by the
QCA switch team.
Finally, AR8327 reserved register fixups are disabled for the AR8337.
This patch is adapted from the Code Aurora QSDK, but with magic
values mapped to proper defines.
Signed-off-by: Vittorio Gambaletta <openwrt@vittgam.net>
(cherry picked from commit
967b6be118e3217e8d6a28df9c615d3255e7b1ae)
Felix Fietkau [Wed, 22 Mar 2017 19:16:15 +0000 (20:16 +0100)]
build: fix STAMP_PREPARED with quilt
quilt.mk needs to be included first, to ensure that STAMP_PREPARED does
not include the hash if quilt is used.
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit
89118da865a34ed9537a088196d81ca9e37cb983)
Felix Fietkau [Fri, 17 Mar 2017 15:21:49 +0000 (16:21 +0100)]
lantiq: remove lantiq_board_model, it is unused
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit
fd93f81fd85e964a697a5f550f7f162e3ec1ca05)
Felix Fietkau [Fri, 17 Mar 2017 15:21:30 +0000 (16:21 +0100)]
lantiq: remove lantiq_board_name, use the generic function instead
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit
7e798dab56546d6f8e2fe0f913ff41e8f010af51)
Felix Fietkau [Fri, 17 Mar 2017 15:17:42 +0000 (16:17 +0100)]
lantiq: move lantiq_board_detect() to 03_preinit_board.sh
It is only used there
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit
aa95d6cd20f7e08420562b9747c197c2eac1d2e2)
Felix Fietkau [Fri, 17 Mar 2017 15:12:27 +0000 (16:12 +0100)]
base-files: add generic board_name function to functions.sh
This will be used to replace all those nasty board specific scripts
that do basically the same thing
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit
ec991424749b9eed37d01bc8adb9fb22fb0c98a7)
Vittorio Gambaletta [Tue, 14 Mar 2017 13:45:15 +0000 (14:45 +0100)]
mac80211: Fix race condition leading to wifi interfaces not coming up at boot sometimes.
In the drv_mac80211_setup function, mac80211_interface_cleanup
is called to ask the kernel to delete all existing interfaces
for the phy that is being configured via netlink.
Later in the first function, mac80211_prepare_vif is called to
set up the new interfaces as required.
But sometimes, when mac80211_prepare_vif (and so the relevant
`iw phy x interface add y` command) runs, the kernel might still
be cleaning up the old interface with the same ifname. It usually
takes very few time to do that; possibly a few milliseconds of
sleep in the script after detecting this error condition could be
enough, but the busybox sh does not support sub-second sleep
intervals.
When this happens, iw obviously fails to create the new interface;
and the following message is printed in the system log, followed by
subsequent failure messages from hostapd in case this would have been
an AP interface.
Tue Mar 14 04:21:57 2017 daemon.notice netifd: radio1 (2767): command failed: Too many open files in system (-23)
This was a long-standing issue existing since at least OpenWrt Backfire,
and today I finally managed to debug and (hopefully) solve it.
It was happening very few times on most devices; but it was happening
a lot more frequently on fast platforms with multiple radios, such as
the powerpc-based dual-ath9k-radio tl-wdr4900-v1.
Signed-off-by: Vittorio Gambaletta <openwrt@vittgam.net>
(cherry picked from commit
8301e613655c2d95fa5430a1a57d92d966fdc70b)
Hauke Mehrtens [Tue, 14 Mar 2017 17:55:02 +0000 (18:55 +0100)]
scripts: only generate config from feature flag if fully match
Without this change the code checked if the string was contained in the
feature option and not if the string matches the complete word. This only
removes the nand option from the omap24xx target, the other changes are
only removing options which were added twice.
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
(cherry picked from commit
d5a770f2c139a335e7602bec60dbeabd4add1e8b)
Daniel Engberg [Sun, 12 Mar 2017 18:43:50 +0000 (19:43 +0100)]
lzo: Update to 2.10
Update lzo to 2.10
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
(cherry picked from commit
cc5721c3b8e399126a270fd46f5ac4dffc9b3319)
Daniel Engberg [Tue, 14 Mar 2017 06:53:38 +0000 (07:53 +0100)]
tools/coreutils: Update to 8.27
Update coreutils to 8.27
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
(cherry picked from commit
80246ce67ec2a30dda51e3e4e135eab2ff249ccb)
Daniel Engberg [Tue, 14 Mar 2017 06:46:39 +0000 (07:46 +0100)]
tools/libressl: Update to 2.5.1
Update libressl to 2.5.1
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
(cherry picked from commit
e45ee66149688747a337a470a19beb182ce4dd61)
Daniel Engberg [Tue, 14 Mar 2017 07:23:10 +0000 (08:23 +0100)]
tools/dosfstools: Update to 4.1
Update to 4.1
Remove 0001-mkfs-Default-to-64-32-heads-sectors-for-targets-smal.patch
as it's included in upstream repo.
Refresh patch
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
(cherry picked from commit
49ded28027e5bba3ce623a8205aac0e8e70e250a)
Daniel Engberg [Wed, 15 Mar 2017 07:52:29 +0000 (08:52 +0100)]
tools/sed: Update to 4.4
Update sed to 4.4
Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
(cherry picked from commit
65d2800bd648a73a6814de2d42c074db1d290521)
Stijn Tintel [Wed, 15 Mar 2017 07:30:26 +0000 (08:30 +0100)]
lldpd: bump to 0.9.6
Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
(cherry picked from commit
b03b293079ef3e6cd5488ea7f58a43a1b545c3ef)
Rafał Miłecki [Sun, 12 Mar 2017 17:46:59 +0000 (18:46 +0100)]
x86: image: drop duplicated copy of bzImage into vmlinuz
It's already done once few lines earlier in the Image/Build/iso.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit
425f958830428f989d7381ddda3a8f503e587c5c)
Alexey Brodkin [Mon, 13 Mar 2017 09:47:45 +0000 (12:47 +0300)]
libnl: Fix building with uClibc
uClibc doesn't implement strerror_l() and thus libnl starting from
3.2.29 couldn't be compiled with it any longer, see
https://github.com/thom311/libnl/commit/
6c2d111177e91184073c44f83d4a6182aaba06d7
To work-around that problem we'll just do a check on strerror_l()
availability during configuration and if it's not there just fall back
to locale-less strerror().
Patch for libnl is alreadfy merged upstream, see
https://github.com/thom311/libnl/commit/
e15966ac7f3b43df2acf869f98089762807d0568
and once the next libnl release happens this one must be removed from
Lede/OpenWrt.
Signed-off-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Cc: Felix Fietkau <nbd@nbd.name>
Cc: John Crispin <john@phrozen.org>
Cc: Daniel Engberg <daniel.engberg.lists@pyret.net>
(cherry picked from commit
51d9ac61c711e7e00f8f2eaf5b3503238864508a)
Hauke Mehrtens [Tue, 14 Mar 2017 18:18:57 +0000 (19:18 +0100)]
toolchain: add musl libc.so to external toolchain
musl provides a /lib/libc.so file which should be integrated into the libc
package when the external toolchain with musl is used.
Signed-off-by: Hauke Mehrtens <hauke.mehrtens@intel.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit
b6a8b43dd2771d4d237256417218bed862545ef4)
Felix Fietkau [Thu, 9 Mar 2017 07:53:52 +0000 (08:53 +0100)]
iwcap: fix handling kill signal during dump
Do not run another loop iteration before checking the stop flag
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit
2f09a1e3c950c9b2993ae52d1b0e78317c344470)
Rafał Miłecki [Sat, 11 Mar 2017 22:03:12 +0000 (23:03 +0100)]
x86: image: drop unneeded grub call
It appears there isn't any Image/Build/grub/* define so this step looks
redundant.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit
f5d403488ed62bb7f0e0017b02890b4d72240a55)
Rafał Miłecki [Sat, 11 Mar 2017 22:03:11 +0000 (23:03 +0100)]
x86: image: drop unused ROOTDELAY variable
It's unused since commit
742700719303 ("x86: remove the olpc subtarget,
it has been unmaintained for a long time").
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit
9a267e6a4b08d1fa2a98523e5eb9f2325c9506e2)
Kevin Darbyshire-Bryant [Fri, 3 Mar 2017 11:49:06 +0000 (11:49 +0000)]
ccache: update to 3.3.4
Update from 3.3.2 to 3.3.4 & refresh patches.
Remove 110-disable-assembler-support as ccache now understands the
'.incbin' directive.
Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
(cherry picked from commit
2cf00b640dce3ee9b09b41f2f1486a6a50bca45b)
Lucian Cristian [Sat, 4 Mar 2017 13:24:44 +0000 (15:24 +0200)]
base-files: add submission service port
prevent postfix start failure fatal: 0.0.0.0:submission: Unrecognized service
Signed-off-by: Lucian Cristian <lucian.cristian@gmail.com>
(cherry picked from commit
8e75efc0fb52d02a0cdc13a5ad819b380de6f3da)
Claudiu Brasovean [Tue, 28 Feb 2017 09:51:01 +0000 (11:51 +0200)]
procd.sh: use parameterized respawn values
continue work started here: http://patchwork.ozlabs.org/patch/520859
Extend /etc/config/system with parameters to set the default respawn treshold and respawn timeout
for procd launched services that have respawn enabled.
This results in cleaner init scripts, while making sure services have respawn parameters set.
Signed-off-by: Claudiu Brasovean <cbrasho@gmail.com>
(cherry picked from commit
c70c6ac070223114ee8c9f33e5e416edb005ca83)
Florian Fainelli [Thu, 2 Mar 2017 19:37:29 +0000 (11:37 -0800)]
toolchain: Allow external toolchains to specify libthread-db
We need to let external toolchains be able to specify the path and
specification file to the libthread-db POSIX thread debugging shared
libraries.
This fixes GDB not being able to be installed because it is depending on
libthread-db:
Collected errors:
* satisfy_dependencies_for: Cannot satisfy the following dependencies
* for gdb:
* libthread-db *
* opkg_install_cmd: Cannot install package gdb.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
(cherry picked from commit
7f0c95a7dfff8aa0b6f5e3e78263cab108245e4c)
Florian Fainelli [Mon, 13 Feb 2017 02:34:53 +0000 (18:34 -0800)]
rssileds: Fix build with external toolchains
Pass down TARGET_CPPFLAGS for path to header files, and append the
libraries we depend on in TARGET_LDFLAGS. Put TARGET_LDFLAGS at the end
of the command line as is required by modern GCC/binutils.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
(cherry picked from commit
30159b3886849f94cd065ecece7ac988bfb89548)
Florian Fainelli [Mon, 13 Feb 2017 02:29:53 +0000 (18:29 -0800)]
adb: Also pass TARGET_CPPFLAGS
Fixes build issues with external toolchains that do not have STAGING_DIR
in their default search path.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
(cherry picked from commit
4aa1560de3ce7e1ce813f450025ee0c55ab868eb)
Florian Fainelli [Sun, 12 Feb 2017 22:10:12 +0000 (14:10 -0800)]
swconfig: Link with libubox
Fixes linking failures observed with external toolchains:
/home/florian/dev/toolchains/stbgcc-4.8-1.5/bin/../lib/gcc/mipsel-linux-gnu/4.8.5/../../../../mipsel-linux-gnu/bin/ld:
warning: libubox.so, needed by
/home/florian/dev/openwrt/trunk/staging_dir/target-mipsel-unknown-linux-gnu_glibc/usr/lib/libuci.so,
not found (try using -rpath or -rpath-link)
/home/florian/dev/openwrt/trunk/staging_dir/target-mipsel-unknown-linux-gnu_glibc/usr/lib/libuci.so:
undefined reference to `blobmsg_open_nested'
/home/florian/dev/openwrt/trunk/staging_dir/target-mipsel-unknown-linux-gnu_glibc/usr/lib/libuci.so:
undefined reference to `blobmsg_parse'
/home/florian/dev/openwrt/trunk/staging_dir/target-mipsel-unknown-linux-gnu_glibc/usr/lib/libuci.so:
undefined reference to `blob_nest_end'
/home/florian/dev/openwrt/trunk/staging_dir/target-mipsel-unknown-linux-gnu_glibc/usr/lib/libuci.so:
undefined reference to `blobmsg_add_field'
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
(cherry picked from commit
fe8618a8fe0db1bc8f343c0f75082ff96e9991ab)
Florian Fainelli [Sun, 12 Feb 2017 22:07:36 +0000 (14:07 -0800)]
px5g: Fix TARGET_LDFLAGS and add TARGET_CPPFLAGS
Make sure we pass down TARGET_CPPFLAGS to let toolchains with no default
search paths to find the mbdetls headers, and override TARGET_LDFLAGS to
include libraries we are linking against.
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
(cherry picked from commit
306ee6436170d4c3c0c677653e9a20a8ee116cf7)
Florian Fainelli [Sun, 12 Feb 2017 22:05:17 +0000 (14:05 -0800)]
omcproxy: Update to latest HEAD
Brings the following change:
1fe6f48f8a50 Cmake: Find libubox/list.h
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
(cherry picked from commit
4c02435b9b985a10d33bc195acddd31c8545a277)
Florian Fainelli [Sun, 12 Feb 2017 21:21:01 +0000 (13:21 -0800)]
bsdiff: Also pass down TARGET_CPPFLAGS
Fixes build with external toolchains not having STAGING_DIR in their
default search path(s).
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
(cherry picked from commit
562ebe798255a2bb71c6a621d6a70662dfbd63c4)
Florian Fainelli [Sun, 5 Feb 2017 04:57:34 +0000 (20:57 -0800)]
thc-ipv6: Allow overriding CFLAGS
thc-ipv6 did not allow an external environment to override CFLAGS, which
would lead to our CFLAGS not being passed properly (relro,
optimizations, etc...)
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
(cherry picked from commit
9b2321f42d075a12e73a81b89bd49b8696d3700f)
Etienne Haarsma [Sun, 12 Feb 2017 15:50:07 +0000 (16:50 +0100)]
tools/m4: update 1.4.18
Patch 100-fix-gets-removal.patch is removed because it's included in the new version.
Signed-off-by: Etienne Haarsma <bladeoner112@gmail.com>
(cherry picked from commit
d90abebd06bbb004fc7957c39fe89202fbdca9f2)
Felix Fietkau [Mon, 20 Feb 2017 12:03:49 +0000 (13:03 +0100)]
build: get rid of FIND_L from host.mk
This was added for Mac OS X many years ago, but recent versions also
support find -L
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit
be206eba3a57128695a00f490767e5c136e43ab7)
Thomas Reifferscheid [Mon, 20 Feb 2017 16:48:50 +0000 (17:48 +0100)]
build: unsilence move command
The @ sign in front of the "mv" command was significantly suppressing
output to stdout. When reviewing the make/build logs it was tricking
me a whole lot and it mad me lose time. Removing the @ sign will get
stdout and logs right about what happened when.
Signed-off-by: Thomas Reifferscheid <thomas@reifferscheid.org>
(cherry picked from commit
1d49b534f5b74676f30f2ee1ba78d9e02d59f0bc)