Commit Graph

224 Commits

Author SHA1 Message Date
Tianling Shen
baaed4efd5
[HOTFIX] Merge Mainline
Signed-off-by: Tianling Shen <cnsztl@project-openwrt.eu.org>
2021-02-16 19:33:12 +08:00
Felix Fietkau
013ad0d613
build: reorder more BuildPackages lines to deal with ABI_VERSION
After the ABI version rework, packages need to be declared in the order of
their dependencies, so that dependent packages will use the right ABI version

Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Tianling Shen <cnsztl@project-openwrt.eu.org>
2021-02-16 19:30:48 +08:00
CN_SZTL
8204815728
Merge Mainline
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-02-07 16:59:21 +08:00
Daniel Golle
71d998011d
opkg: update to git HEAD
9bbc7ea pkg_hash: pkg_hash_check_unresolved: fix segfault

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-02-06 23:29:49 +08:00
AmadeusGhost
9d29451fe9 Merge Mainline 2021-02-06 18:50:03 +08:00
Daniel Golle
041b825af2 selinux-policy: update to version 0.6
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2021-02-06 12:05:18 +08:00
Tianling Shen
c9db1325f9
Merge Mainline
Signed-off-by: Tianling Shen <cnsztl@gmail.com>
2021-02-02 01:04:57 +08:00
Daniel Golle
60610ff4c6
selinux-policy: update to git tag v0.5
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Tianling Shen <cnsztl@gmail.com>
2021-02-02 01:02:47 +08:00
CN_SZTL
29412d2c82
Merge Mainline
Fixes: #272

Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-02-01 00:12:25 +08:00
Paul Menzel
e4f6c3948e ca-certicficates: Update to version 20210119
Update the ca-certificates and ca-bundle package from version 20200601 to
version 2021019.

This version uses Python 3 for the build, fixing a build issue on systems,
where `/usr/bin/python3` is a wrapper script [1].

[1]: https://github.molgen.mpg.de/mariux64/mxtools/issues/148
[2]: https://metadata.ftp-master.debian.org/changelogs//main/c/ca-certificates/ca-certificates_20210119_changelog

Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
2021-01-31 22:06:46 +08:00
CN_SZTL
c6b10aeb3f
Merge Mainline
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-01-29 23:01:13 +08:00
Adrian Schmutzler
f36ab2f662
treewide: drop shebang from non-executable lib files
This drops the shebang from another bunch of files in various /lib
folders, as these are sourced and the shebang is useless.

Fix execute bit in one case, too.

This should cover almost all trivial cases now, i.e. where /lib is
actually used for library files.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Signed-off-by: CN_SZTL <cnsztl@project-openwrt.eu.org>
2021-01-29 22:36:07 +08:00
CN_SZTL
dcc6c453da
Merge Mainline 2020-12-17 23:24:15 +08:00
Rui Salvaterra
28e0d20749 zram-swap: remove the compression streams settings
Zram switched to per-cpu compression streams since Linux 4.7 [1]. Drop the
irrelevant configuration (no-op).

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/block/zram?h=v4.7&id=43209ea2d17aae1540d4e28274e36404f72702f2

Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
2020-12-15 11:32:49 +08:00
CN_SZTL
f52579b1b7
Merge Mainline 2020-12-13 10:43:36 +08:00
Daniel Golle
6a0e400561
selinux-policy: update to version 0.4
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-12-13 10:09:54 +08:00
Paul Spooren
0fefa1d637 opkg: remove legacy dist and extra_data
efb26a3 libopkg: remove "extra_data" option
1d67ab7 libopkg: remove support for "dist" config

Reduces opkg size by about 400 Bytes.

Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-12-12 11:35:16 +08:00
CN_SZTL
0f7e04b681
Merge Mainline 2020-11-28 19:17:32 +08:00
Paul Spooren
a89334795c
opkg: cleanup man pages and md5 fixup
66f458d fix md5sum calculation
02eaf9c man: remove obsolete manual pages

Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-11-28 19:04:10 +08:00
Paul Spooren
36e74f8c13
opkg: purge package from cache on hash mismatch
61b3c62 opkg_verify_integrity: better logging and error conditions
f73d42f download: purge cached packages that have incorrect checksum
1c1480e download: factor out the logic for building cache filenames
293b1ce libopkg: factor out checksum and size verification
a786e25 download: remove compatibility with old cache naming scheme

Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-11-28 18:27:17 +08:00
CN_SZTL
ae691e2869
Merge Mainline 2020-11-24 23:28:43 +08:00
Daniel Golle
fb4ae7bd35
Revert "refpolicy: add variant that builds modular policy"
This reverts commit 9eb9943f82.
Building the 'modular' variant requires 'semodule_package' from
'selinux-python' to be installed on the buildhost.
Apart from that, this change also broke the monolithic refpolicy
'targeted' build.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-11-24 23:18:44 +08:00
CN_SZTL
d2489e6aeb
Merge Mainline 2020-11-15 00:49:56 +08:00
CN_SZTL
c0907ca3b7
Revert "ubus: prepare to run ubusd as non-root user"
This reverts commit 586b1c2c9a.
2020-11-14 23:08:55 +08:00
CN_SZTL
a351cbbe8b
Revert "ubus: bump to git HEAD"
This reverts commit d7b03a4aab.
2020-11-14 23:08:37 +08:00
Daniel Golle
d7b03a4aab
ubus: bump to git HEAD
ad0cd11 ubusd_acl: add support for wildcard in methods

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-11-14 15:00:34 +08:00
Daniel Golle
586b1c2c9a
ubus: prepare to run ubusd as non-root user
Move /var/run/ubus.sock to /var/run/ubus/ubus.sock in preparation for
having ubusd run as non-root user.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-11-14 14:59:56 +08:00
Daniel Golle
5b95295b41
procd: bump to git HEAD
b0de894 jail: fix capabilities

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-11-14 14:59:32 +08:00
Daniel Golle
2713a854d4
procd: bump to git HEAD
2f381fe jail: guard boolean blobmsg attributes
 602b8fa jail: add option for pidfile
 bba6de7 jail: handle mount propagation flags
 6963d50 jail: relax seccomp unknown syscall handling
 e1fcfdc jail: add support for absolute root path in OCI spec
 257f29b jail: don't fail if maskedPath cannot be found
 75f2374 uxc: mimic runc cmdline by using getopt_long

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-11-14 14:59:20 +08:00
Daniel Golle
5b85ab400f
procd: ujail fixes
ec461ff jail: mount more stuff read-only
33b799b ujail: elf: work around GCC bug on MIPS64

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-11-14 14:58:53 +08:00
Daniel Golle
41aebe0b99
procd: jail: clean up capability handling and non-root ubusd
Unify capability handling to only use OCI spec parsers even for ujail
slim containers which previously supposedly used their own format.

 80c9516 cgroups: restrict allowed keys in 'unified' section
 5ade567 cgroups: memory controller fixes
 3121467 early: run ubusd non-root as user ubus, group ubus
 12a5b97 jail: adapt to new ubus socket path
 788d144 instance: actually wire up capabilities filename
 ebc5a7f jail: nuke old capabilities code in favour of reusing OCI code
 6c5233a jail: capabilities: apply in two phases

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-11-14 14:57:55 +08:00
CN_SZTL
604ea1e87f
Merge Mainline 2020-11-14 13:55:18 +08:00
Jianhui Zhao
7c78b1bf2f
ca-certificates: canonical the build dir
The previous build directory "build_dir/target-xx/work/"
contaminated the entire build directory.

Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
2020-11-14 13:34:22 +08:00
CN_SZTL
38f7610841
Merge Mainline 2020-11-12 15:44:23 +08:00
W. Michael Petullo
6cfb0c0d1d
refpolicy: add variant that builds modular policy
This adds a variant of refpolicy that builds the modular form of the
policy. While this requires more memory on the target device, along with
some tricks to deal with OpenWrt's volatile /var directory, it is useful
for experiementing with SELinux policy.

Signed-off-by: W. Michael Petullo <mike@flyn.org>
2020-11-12 11:12:23 +08:00
Daniel Golle
6dc8e779b8
opkg: clean up and fix performance regression
da9746a libopkg: clean up handling of unresolved dependencies

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-11-08 02:30:39 +08:00
Daniel Golle
f773d4621a
opkg: clean up and fix performance regression
da9746a libopkg: clean up handling of unresolved dependencies

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Paul Spooren <mail@aparcar.org>
2020-11-08 02:04:37 +08:00
CN_SZTL
7e654c67ed
Merge Mainline 2020-11-08 00:19:27 +08:00
Daniel Golle
12ae7241dc opkg: fix yet another dependency resolution bug
The previous fix of a fix caused yet another problem leading to
`opkg show-upgradable` ending up in an infinite loop.
Fix that.

Fixes: 4a2b1ff7fb ("opkg: fix dependency resolution")
Reported-by: Huangbin Zhan <zhanhb88@gmail.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-11-03 12:04:23 +08:00
Daniel Golle
79da42ef25 opkg: fix dependency resolution
The previous commit broke opkg in a way that it would no longer
include dependencies when installing a package, effectively leading
to broken images and unusable systems.
Fix that by making sure dependencies are still going to be checked.
Also reduce size of struct abstract_pkg as suggested by @jow- while at
it.

Fixes: 1445d333aa ("opkg: bump to git HEAD")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-11-03 12:04:09 +08:00
Florian Eckert
2d76259720 zram-swap: use new extra_command wrapper
Use new `extra_command` wrapper to fix the alignement.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2020-11-03 12:03:00 +08:00
AmadeusGhost
f2a32978d6 Merge Mainline 2020-11-01 12:05:03 +08:00
Daniel Golle
93c6729871 opkg: bump to git HEAD
8769c75 pkg_hash: don't suggest incompatible packages

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-10-31 10:22:19 +08:00
CN_SZTL
85ae6bf98f
Merge Mainline 2020-10-30 23:58:20 +08:00
Hauke Mehrtens
13e1a94be3
uci: Backport security fixes
This packports two security fixes from master.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit f9005d4f80)
2020-10-29 21:57:03 +08:00
CN_SZTL
76d682c9d9
Merge Mainline 2020-10-22 22:57:05 +08:00
CN_SZTL
60a0a88809
Revert "procd: jail: clean up capability handling and non-root ubusd"
This reverts commit bfc67bcc16.
2020-10-22 22:54:49 +08:00
CN_SZTL
363add2f7c
Revert "ubus: prepare to run ubusd as non-root user"
This reverts commit 99f35613e7.
2020-10-22 22:54:26 +08:00
CN_SZTL
01fd1d168c
Merge Mainline 2020-10-22 12:48:04 +08:00
Daniel Golle
bfc67bcc16 procd: jail: clean up capability handling and non-root ubusd
Unify capability handling to only use OCI spec parsers even for ujail
slim containers which previously supposedly used their own format.

 80c9516 cgroups: restrict allowed keys in 'unified' section
 5ade567 cgroups: memory controller fixes
 3121467 early: run ubusd non-root as user ubus, group ubus
 12a5b97 jail: adapt to new ubus socket path
 788d144 instance: actually wire up capabilities filename
 ebc5a7f jail: nuke old capabilities code in favour of reusing OCI code
 6c5233a jail: capabilities: apply in two phases

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2020-10-22 11:37:50 +08:00