diff options
author | graysky | 2020-11-16 10:29:47 -0500 |
---|---|---|
committer | graysky | 2020-11-16 10:29:47 -0500 |
commit | 2cfc917076154a752893cdc0ee202b634dee8796 (patch) | |
tree | e7d385ee99fc819443366476e31aac5cd2db7489 | |
parent | c5c0c0d8dc1a73c8bbb1bf91237797c130d5f0b6 (diff) | |
download | aur-2cfc917076154a752893cdc0ee202b634dee8796.tar.gz |
Update to 4.0.0.r475.g59c6b0661-1
-rw-r--r-- | .SRCINFO | 11 | ||||
-rw-r--r-- | PKGBUILD | 34 | ||||
-rw-r--r-- | lxc-auto.service | 1 | ||||
-rw-r--r-- | lxc.service | 3 |
4 files changed, 21 insertions, 28 deletions
@@ -1,11 +1,8 @@ -# Generated by mksrcinfo v8 -# Mon Jun 11 20:08:44 UTC 2018 pkgbase = lxc-git pkgdesc = Linux Containers git version - pkgver = 3.0.0.r278.gc6d0d3cb + pkgver = 4.0.0.r475.g59c6b0661 pkgrel = 1 - epoch = 1 - url = http://linuxcontainers.org + url = https://linuxcontainers.org arch = x86_64 arch = armv6h arch = armv7h @@ -38,8 +35,8 @@ pkgbase = lxc-git source = lxc-auto.service sha256sums = SKIP sha256sums = 10e4f661872f773bf3122a2f9f2cb13344fea86a4ab72beecb4213be4325c479 - sha256sums = 711fb84c87b143cb0098e095fdebb040b15f553a854efbe846a00100bdb9ae88 - sha256sums = 4174fcc0a664108f1884920930a3dbec0aeceed1fc24f00c200a583c06d447d0 + sha256sums = bbe7e0447bc3bf5f75f312c34d647f5218024731628a5e8633b1ea1801ebe16b + sha256sums = b31f8d6b301ab9901b43f2696bcd0babb32b96e4a59fab63a2d642e43bf26bb3 pkgname = lxc-git @@ -7,32 +7,32 @@ pkgname=lxc-git _pkgname=lxc -pkgver=3.0.0.r278.gc6d0d3cb +pkgver=4.0.0.r475.g59c6b0661 pkgrel=1 -epoch=1 pkgdesc="Linux Containers git version" arch=('x86_64' 'armv6h' 'armv7h' 'aarch64') -url="http://linuxcontainers.org" +url="https://linuxcontainers.org" depends=('bash' 'perl' 'libseccomp' 'libcap' 'python' 'rsync' 'wget') makedepends=('docbook2x' 'lua' 'python-setuptools' 'git') optdepends=('dnsmasq: lxc-net.service' - 'lua' - 'lua-filesystem: lxc-top' - 'lua-alt-getopt: lxc-top') + 'lua' + 'lua-filesystem: lxc-top' + 'lua-alt-getopt: lxc-top') license=('LGPL') options=('emptydirs') backup=('etc/lxc/default.conf' 'etc/default/lxc') provides=($_pkgname) conflicts=($_pkgname lxc-git) -source=("git://github.com/lxc/lxc" - "lxc.tmpfiles.d" - "lxc.service" - "lxc-auto.service") +source=( + git://github.com/lxc/lxc + lxc.tmpfiles.d + lxc.service + lxc-auto.service) sha256sums=('SKIP' '10e4f661872f773bf3122a2f9f2cb13344fea86a4ab72beecb4213be4325c479' - '711fb84c87b143cb0098e095fdebb040b15f553a854efbe846a00100bdb9ae88' - '4174fcc0a664108f1884920930a3dbec0aeceed1fc24f00c200a583c06d447d0') + 'bbe7e0447bc3bf5f75f312c34d647f5218024731628a5e8633b1ea1801ebe16b' + 'b31f8d6b301ab9901b43f2696bcd0babb32b96e4a59fab63a2d642e43bf26bb3') pkgver() { @@ -43,14 +43,8 @@ pkgver() { prepare() { cd "$_pkgname" sed -i \ - -e 's|"\\"-//Davenport//DTD DocBook V3.0//EN\\""|"\\"-//OASIS//DTD DocBook XML\\" \\"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\\""|' \ + -e 's|"\\"-//Davenport//DTD DocBook V3.0//EN\\""|"\\"-//OASIS//DTD DocBook XML\\" \\"https://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\\""|' \ configure.ac - sed -i \ - -e 's|\${prefix}/||g' \ - lxc.pc.in - sed -i \ - -e 's|dirlen,|dirlen=0,|' \ - src/lxc/storage/overlay.c } build() { @@ -63,7 +57,7 @@ build() { --libexecdir=/usr/lib \ --libdir=/usr/lib \ --sysconfdir=/etc \ - --disable-apparmor \ + --enable-apparmor \ --enable-seccomp \ --enable-capabilities \ --with-init-script=systemd \ diff --git a/lxc-auto.service b/lxc-auto.service index ac93e5603eba..01b9a6d81857 100644 --- a/lxc-auto.service +++ b/lxc-auto.service @@ -8,6 +8,7 @@ ExecStart=/usr/bin/lxc-autostart ExecStop=/usr/bin/lxc-autostart -s Delegate=true TasksMax=32768 +RemainAfterExit=true [Install] WantedBy=multi-user.target diff --git a/lxc.service b/lxc.service index c82307a73cd1..6feb68006ec5 100644 --- a/lxc.service +++ b/lxc.service @@ -4,7 +4,8 @@ After=network.target [Service] Type=forking -ExecStart=/usr/bin/lxc-start -d -n %i +ExecStart=/usr/bin/lxc-start -d -n %i -p /run/lxc-%i.pid +PIDFile=/run/lxc-%i.pid ExecStop=/usr/bin/lxc-stop -n %i Delegate=true TasksMax=32768 |