Skip to content

Commit d8d0ef9

Browse files
nfntynfnty
committed
Update
1 parent b5deec4 commit d8d0ef9

File tree

9 files changed

+847
-23
lines changed

9 files changed

+847
-23
lines changed

‎cadvisor/cadvisor/PKGBUILD‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
pkgname=('cadvisor')
33
_srcname='cadvisor'
44
pkgdesc='Analyzes resource usage and performance characteristics of running containers'
5-
pkgver='0.38.8'
6-
_commit='95fd3aff63650e37c3825c58fbf4db85f68b8c26'
5+
pkgver='0.39.3'
6+
_commit='899c56acc751a6055d22dca13e98418cea3c67b4'
77
pkgrel='1'
88
arch=('i686' 'x86_64')
99
url="https://github.com/google/${_srcname}"

‎docker/docker/PKGBUILD‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Maintainer: Morten Linderud <foxboron@archlinux.org>
33

44
pkgname=docker
5-
pkgver=20.10.12
5+
pkgver=20.10.17
66
pkgrel=1
77
epoch=1
88
pkgdesc='Pack, ship and run any application as a lightweight container'
@@ -17,9 +17,9 @@ optdepends=('btrfs-progs: btrfs backend support'
1717
'docker-scan: vulnerability scanner')
1818
# https://github.com/moby/moby/tree/v20.10.0/hack/dockerfile/install
1919
_TINI_COMMIT=de40ad007797e0dcd8b7126f27bb87401d224240
20-
_LIBNETWORK_COMMIT=64b7a4574d1426139437d20e81c0b6d391130ec8
20+
_LIBNETWORK_COMMIT=f6ccccb1c082a432c2a5814aaedaca56af33d9ea
2121
# TODO: Split into `docker-buildx` and make it a dependency
22-
_BUILDX_COMMIT=05846896d149da05f3d6fd1e7770da187b52a247
22+
_BUILDX_COMMIT=6224def4dd2c3d347eee19db595348c50d7cb491
2323
source=("git+https://github.com/docker/cli.git#tag=v$pkgver"
2424
"git+https://github.com/moby/moby.git#tag=v$pkgver"
2525
"git+https://github.com/docker/libnetwork.git#commit=$_LIBNETWORK_COMMIT"
@@ -66,7 +66,8 @@ build() {
6666
done
6767
local _commit _pkgbuild _dockerfile
6868
err=0
69-
for _commit in LIBNETWORK TINI; do
69+
# FIXME: Do not check TINI anymore, use tag instead of commit
70+
for _commit in LIBNETWORK; do
7071
_pkgbuild=_${_commit}_COMMIT
7172
_dockerfile=${_commit}_COMMIT
7273
if [[ ${!_pkgbuild} != ${!_dockerfile} ]]; then

‎docker/docker/capabilities.patch‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,27 @@
11
diff --git a/oci/oci.go b/oci/oci.go
2-
index 6c84ba3488..d931f92d27 100644
2+
index 60227c2680..2727ed38ce 100644
33
--- a/oci/oci.go
44
+++ b/oci/oci.go
5-
@@ -18,12 +18,6 @@ func SetCapabilities(s *specs.Spec, caplist []string) error {
6-
s.Process.Capabilities.Bounding = caplist
7-
s.Process.Capabilities.Permitted = caplist
8-
s.Process.Capabilities.Inheritable = caplist
9-
- // setUser has already been executed here
10-
- // if non root drop capabilities in the way execve does
11-
- if s.Process.User.UID != 0 {
12-
- s.Process.Capabilities.Effective = []string{}
13-
- s.Process.Capabilities.Permitted = []string{}
14-
- }
5+
@@ -20,18 +20,10 @@ var deviceCgroupRuleRegex = regexp.MustCompile("^([acb]) ([0-9]+|\\*):([0-9]+|\\
6+
// All capabilities are added if privileged is true.
7+
func SetCapabilities(s *specs.Spec, caplist []string) error {
8+
// setUser has already been executed here
9+
- if s.Process.User.UID == 0 {
10+
- s.Process.Capabilities = &specs.LinuxCapabilities{
11+
- Effective: caplist,
12+
- Bounding: caplist,
13+
- Permitted: caplist,
14+
- }
15+
- } else {
16+
- // Do not set Effective and Permitted capabilities for non-root users,
17+
- // to match what execve does.
18+
- s.Process.Capabilities = &specs.LinuxCapabilities{
19+
- Bounding: caplist,
20+
- }
21+
+ s.Process.Capabilities = &specs.LinuxCapabilities{
22+
+ Effective: caplist,
23+
+ Bounding: caplist,
24+
+ Permitted: caplist,
25+
}
1526
return nil
1627
}
17-

‎exim/PKGBUILD‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
# Contributor: judd <jvinet@zeroflux.org>
66

77
pkgname=exim
8-
pkgver=4.95
9-
pkgrel=2
8+
pkgver=4.96
9+
pkgrel=1
1010
pkgdesc='Message Transfer Agent'
1111
arch=('x86_64')
1212
url='https://www.exim.org/'
@@ -26,7 +26,7 @@ source=("https://ftp.exim.org/pub/exim/exim4/exim-$pkgver.tar.bz2"{,.asc}
2626
exim-submission.socket
2727
exim.sysusers
2828
exim.tmpfiles)
29-
sha512sums=('2ece1bf862553c747fda765698ae0d99ce1c37b6006576661580ec7671f6e25590d21fb2862058a276d8cc1862ecb703e8d72240e5395d8f00d67babbfc3dbbc'
29+
sha512sums=('675dcb13dac449edede61926e7af6dcc3ff3a455c053d413a35c873b926dfc4d63540ba7d52347516c6a9b4b60a3627b449685210ddfba0a4c61ec7a0a0b8333'
3030
'SKIP'
3131
'6494d9aae71a630935f3946a136855aadede54fd10b7b3cd7df47972d320ae142410076871e839f6caca8e02ec136604464b0b9c593721db243d8edf75c2f17f'
3232
'd8e3b466e0bba8175cfe762058dec49018495a260aa5efd139f4ef435284c305958cbd7fc514e81042146368b749ae38f0bf276fc0b4b91918ef33126900aa81'

‎exim/keys/pgp/A986F3A6BD6377D8730958DEBCE58C8CE41F32DF.asc‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
-----BEGIN PGP PUBLIC KEY BLOCK-----
2+
3+
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
44+
rg==
45+
=QTRL
46+
-----END PGP PUBLIC KEY BLOCK-----

0 commit comments

Comments
 (0)