Commit Graph

141 Commits

Author SHA1 Message Date
CN_SZTL
96658e0cfd
Merge Mainline 2020-07-27 19:41:46 +08:00
Daniel Golle
57bb41d5bf
procd: jail: fix build on glibc and uclibc
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-07-27 19:39:38 +08:00
Daniel Golle
0787fed452
procd: update to git HEAD
48777de rcS: cast format string to int64_t
 a4df90f jail: fix wrong format for 32-bit
 c482c5d jail: add support for referencing existing namespaces

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-07-27 19:39:19 +08:00
CN_SZTL
9b62880d61
Merge Mainline 2020-07-20 22:56:18 +08:00
Daniel Golle
270b8f131c
procd: bump to git HEAD once again
Further complete OCI container support in ujail:
 f5f305e jail: move /tmp/resolv.conf.d to /dev/resolv.conf.d
 6f078ae jail: add support for defining devices
 686cf7a jail: actually apply filesystem-specific mount options
 f91009a jail: refactor default mounts into new structure
 66ae2d9 jail: re-implement /proc/sys/net read-write in netns hack

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-07-20 22:14:08 +08:00
Daniel Golle
74a1d0723b
procd: update to git HEAD
9eddf0f jail: fix hooks
 1b1286b jail: parse and apply OCI sysctl values
 c049047 jail: implement OCI user additionalGIDs
 0e1920c jail: read and apply umask from OCI if defined
 1c46cc3 jail: parse and apply POSIX rlimits
 76adac5 jail: /proc/$pid/oom_score_adj to OCI defined oomScoreAdj

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-07-20 22:13:42 +08:00
CN_SZTL
efb6f74258
Merge Mainline 2020-07-18 13:43:33 +08:00
Daniel Golle
520861c5dc
procd: bump to git HEAD
8d5208f jail: fix false return in case of nofail mount
 b41f76b procd: fix compile if procd-ujail is not selected
 86a5105 jail: fs: fix build on uClibc-ng
 bfce7d1 jail: fix some more mount options
 268126a jail: add support for maskedPaths and readonlyPaths

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-07-18 13:30:13 +08:00
CN_SZTL
dc78a80d9f
Merge Upstream 2020-07-16 20:36:17 +08:00
Adrian Schmutzler
ba7e451bc5
package: drop PKG_VERSION for purely local packages
In the package guidelines, PKG_VERSION is supposed to be used as
"The upstream version number that we're downloading", while
PKG_RELEASE is referred to as "The version of this package Makefile".
Thus, the variables in a strict interpretation provide a clear
distinction between "their" (upstream) version in PKG_VERSION and
"our" (local OpenWrt trunk) version in PKG_RELEASE.

For local (OpenWrt-only) packages, this implies that those will only
need PKG_RELEASE defined, while PKG_VERSION does not apply following
a strict interpretation. While the majority of "our" packages actually
follow that scheme, there are also some that mix both variables or
have one of them defined but keep them at "1".

This is misleading and confusing, which can be observed by the fact
that there typically either one of the variables is never bumped or
the choice of the variable to increase depends on the person doing the
change.

Consequently, this patch aims at clarifying the situation by
consistently using only PKG_RELEASE for "our" packages. To achieve
that, PKG_VERSION is removed there, bumping PKG_RELEASE where
necessary to ensure the resulting package version string is bigger
than before.

During adjustment, one has to make sure that the new resulting composite
package version will not be considered "older" than the previous one.

A useful tool for evaluating that is 'opkg compare-versions'. In
principle, there are the following cases:

1. Sole PKG_VERSION replaced by sole PKG_RELEASE:
   In this case, the resulting version string does not change, it's
   just the value of the variable put in the file. Consequently, we
   do not bump the number in these cases so nobody is tempted to
   install the same package again.

2. PKG_VERSION and PKG_RELEASE replaced by sole PKG_RELEASE:
   In this case, the resulting version string has been "version-release",
   e.g. 1-3 or 1.0-3. For this case, the new PKG_RELEASE will just
   need to be higher than the previous PKG_VERSION.
   For the cases where PKG_VERSION has always sticked to "1", and
   PKG_RELEASE has been incremented, we take the most recent value of
   PKG_RELEASE.

Apart from that, a few packages appear to have developed their own
complex versioning scheme, e.g. using x.y.z number for PKG_VERSION
_and_ a PKG_RELEASE (qos-scripts) or using dates for PKG_VERSION
(adb-enablemodem, wwan). I didn't touch these few in this patch.

Cc: Hans Dedecker <dedeckeh@gmail.com>
Cc: Felix Fietkau <nbd@nbd.name>
Cc: Andre Valentin <avalentin@marcant.net>
Cc: Matthias Schiffer <mschiffer@universe-factory.net>
Cc: Jo-Philipp Wich <jo@mein.io>
Cc: Steven Barth <steven@midlink.org>
Cc: Daniel Golle <dgolle@allnet.de>
Cc: John Crispin <john@phrozen.org>

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-07-16 20:15:59 +08:00
Daniel Bailey
10479fcd6d
procd: allow optional watchdog instance parameter
Optional instance watchdog timeout and watchdog mode can be set by
adding: procd_set_param $mode $timeout

$mode is an integer [0-1] representing instance watchdog mode of
operation:
0 = disabled
1 = passive mode, client must periodically poke watchdog via ubus

$timeout is an integer representing how often, in seconds, the watchdog must be poked.

Signed-off-by: Daniel Bailey <danielb@meshplusplus.com>
2020-07-16 20:11:05 +08:00
Daniel Golle
fb45025bc2
procd: update to git HEAD
639df57 uxc: fix build with uClibc-ng
 b2230e4 procd: add service instance watchdog

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-07-16 20:10:42 +08:00
Daniel Golle
658b8ba5f4
procd: update to git HEAD
aed7fb3 procd: fix compilation with uClibc-ng
 9d0f831 jail: fix segfault with len(uidmap/gidmap) > 1
 42a6217 jail: consider PATH for argv in OCI container
 83f4b72 jail: actually chdir into OCI defined CWD
 fc9f614 jail: parse and run OCI hooks
 02eec92 jail: memory allocation fixes
 71e75f4 jail: refactor mount support to cover OCI spec
 b586e7d jail: don't make mount source read-only
 dacab12 uxc: fix 'stop' command

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-07-14 01:13:37 +08:00
AmadeusGhost
c3991c204a Merge Mainline 2020-07-12 18:15:13 +08:00
Rui Salvaterra
f4aec13ba4 zram-swap: correctly express the required dependencies
The block-mount swapon implementation doesn't support discard, so make zram-swap
depend only on the default BusyBox implementation or, when unavailable, on the
one present in the swap-utils package.

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
2020-07-12 12:11:14 +08:00
Rui Salvaterra
002cabbae2 zram-swap: enable swap discard
Zram block devices have supported trim/discard for over six years, let's
enable it. This allows the zram device to actually free up allocated memory
when it's marked as unused in the filesystem metadata, as explained in more
detail in the original commit message [1].

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/block/zram/zram_drv.c?h=linux-4.14.y&id=f4659d8e620d08bd1a84a8aec5d2f5294a242764

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
2020-07-12 12:03:45 +08:00
AmadeusGhost
01ff13c79f Merge Mainline 2020-07-07 12:02:51 +08:00
AmadeusGhost
4ef0a8f886 Revert "rpcd: update to latest snapshot version"
Revert this commit due to it relies on a changed libiwinfo API, and will broke the compilation.
2020-07-07 11:50:16 +08:00
coolsnowwolf
0c494e6b73
uci: add uci_add_list method 2020-07-07 10:19:43 +08:00
CN_SZTL
c4faaf2a74
rpcd/ubox/procd: sync with upstream source 2020-07-07 10:08:43 +08:00
CN_SZTL
e139ce8eb2
uci: roll back to 2019-05-17 2020-07-06 12:36:52 +08:00
CN_SZTL
9df7545904
uci: roll back to 2019-05-17 2020-07-06 12:01:34 +08:00
AmadeusGhost
9de0e1582f Merge Mainline 2020-07-05 21:36:02 +08:00
coolsnowwolf
43a19e02d8 ubox/ubus/uci: bump version 2020-07-05 21:21:00 +08:00
AmadeusGhost
5600477a3d Merge Mainline 2020-07-02 18:39:46 +08:00
Rui Salvaterra
72dfb98714 zram-swap: init: replace backticks with $()
This replaces deprecated backticks by more versatile $(...) syntax.

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
[add commit description]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
2020-07-01 12:15:48 +08:00
AmadeusGhost
a006bbea67 Merge Mainline 2020-06-16 18:20:13 +08:00
Stijn Tintel
e64de3da65 mtd: enable wrgg support for ath79
This is required for the D-Link DAP-2695-A1.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
2020-06-12 12:16:34 +08:00
Christian Lamparter
6b2a906332 ca-certificates: update to version 20200601
This patch updates the ca-certificates and ca-bundle package.
This version changed the files directory again, to work/, so
PKG_BUILD_DIR was brought back.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
2020-06-11 11:59:07 +08:00
AmadeusGhost
db3b7c767b Merge Mainline 2020-06-04 18:38:04 +08:00
AmadeusGhost
50f3cf27ef mtd: sync upstream source code 2020-05-31 20:01:05 +08:00
AmadeusGhost
72671ce4e7 Merge Mainline 2020-05-30 21:26:11 +08:00
Jo-Philipp Wich
28e2d9aa83
rpcd: update to latest openwrt-18.06 Git HEAD
7be1f17 file: exec: properly free memory on error
313964c file: avoid closing stdio descriptors in rpc_file_exec_run
cd09c5f file: patch process stdin to /dev/null
efbcedb file: remove unused members from struct rpc_file_exec_context
71b00ab file: rpc_file_exec_run: fix potential memory leak and integer overflow
c7bb956 plugin: fix double free in finish callback
16de3fa plugin: do not free method name separately
29c9c11 exec: properly free memory on rpc_exec() error
5cd4f4e plugin: exec: properly free memory on parse error
d80f70e plugin: fix leaking invoked method name for exec plugins
53a0952 session: deny access if password login is disabled
662d034 uci: reset uci_ptr flags when merging options during section add
dd46d6d uci: free configs list memory on return
abbc302 uci: reset uci_ptr flags when merging set operations

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-05-30 18:25:44 +08:00
AmadeusGhost
a273d13857 Merge Lean's source 2020-05-30 12:25:05 +08:00
AmadeusGhost
6105915786
Wireless: rollback with mac80211 (#4683)
mt76: fix build
ath10k-ct: rollback to 4.19
Revert "iw/iwinfo/mwlwifi: bump version"
Revert "mac80211/5.4: fix build on kernel 4.9"
Revert "mac80211: switch to upstream owl-loader driver"
2020-05-27 11:45:56 +08:00
CN_SZTL
917cc30ade
Merge Mainline 2020-05-24 22:41:44 +08:00
Matthias Schiffer
30bb3cb5f0
usign: update to latest git HEAD
f1f65026a941 Always pad fingerprints to 16 characters

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2020-05-24 20:43:42 +08:00
CN_SZTL
462b2e1b36
Merge Lean's source 2020-05-24 20:29:02 +08:00
AmadeusGhost
396ebfaa33 ramips: sync upstream source code
Also fix commit b3cf46c550
2020-05-24 15:00:03 +08:00
NivalXer
5ae70efb04
ramips: add support for Linksys EA7500 v2 (#4646)
* ramips: add support for Linksys EA7500 v2

* fix build

* fix build

* update build config
2020-05-22 10:53:12 +08:00
CN_SZTL
40637f9479
Merge Mainline 2020-05-10 14:45:51 +08:00
Jo-Philipp Wich
93aaa021e1
opkg: update to latest Git HEAD
f2166a8 libopkg: implement lightweight package listing logic
cf4554d libopkg: support passing callbacks to feed parsing functions
2a0210f opkg-cl: don't read feeds on opkg update
b6f1967 libopkg: use xsystem() to spawn opkg-key
60b9af2 file_util.c: refactor and fix checksum_hex2bin()
206ebae file_util.c: fix possible bad memory access in file_read_line_alloc()

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
2020-05-10 12:06:43 +08:00
CN_SZTL
5104595381
Merge Mainline 2020-04-20 18:52:54 +08:00
CN_SZTL
7613a26543
procd: fix jail when running on glibc 2020-04-20 18:46:46 +08:00
AmadeusGhost
6577d6ae05 bcm47xx/63xx: add kernel 5.4 support 2020-04-20 08:30:18 +08:00
CN_SZTL
12a818201e
rpcd: bump version 2020-04-09 14:17:36 +08:00
CN_SZTL
019f5cfeed
Merge Lean's source 2020-03-26 00:40:44 +08:00
lean
1f040092ce procd: update to latest git HEAD 2020-03-25 22:23:34 +08:00
CN_SZTL
289aa4b958
Merge Lean's source 2020-03-25 21:42:25 +08:00
CN_SZTL
3589c240de
ubus: fix ABI_VERSION 2020-03-25 21:29:44 +08:00