summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorGoliathLabs2020-05-15 21:37:30 +0200
committerGoliathLabs2020-05-15 21:37:30 +0200
commit47bc965965bb5b5de5696a36eeb2663b963fb298 (patch)
treef796c8f7fe78fc22b05568c216ce882d9ac8b867
parent1e80f0db5af8766853746022a594aea745ad49de (diff)
downloadaur-47bc965965bb5b5de5696a36eeb2663b963fb298.tar.gz
Updated: 4.0.2
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD12
-rw-r--r--lxc-auto.service1
-rw-r--r--lxc.service3
4 files changed, 16 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cc184dccca2..08348cbf318 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
pkgbase = lxc-selinux
pkgdesc = Linux Containers
- pkgver = 3.1.0
+ pkgver = 4.0.2
pkgrel = 1
epoch = 1
- url = http://linuxcontainers.org
+ url = https://linuxcontainers.org
arch = x86_64
license = LGPL
makedepends = docbook2x
@@ -21,18 +21,18 @@ pkgbase = lxc-selinux
optdepends = lua
optdepends = lua-filesystem: lxc-top
optdepends = lua-alt-getopt: lxc-top
- provides = lxc=3.1.0-1
+ provides = lxc=4.0.2-1
conflicts = lxc
options = emptydirs
backup = etc/lxc/default.conf
backup = etc/default/lxc
- source = https://linuxcontainers.org/downloads/lxc-3.1.0.tar.gz
- source = https://linuxcontainers.org/downloads/lxc-3.1.0.tar.gz.asc
+ source = https://linuxcontainers.org/downloads/lxc-4.0.2.tar.gz
+ source = https://linuxcontainers.org/downloads/lxc-4.0.2.tar.gz.asc
source = lxc.tmpfiles.d
source = lxc.service
source = lxc-auto.service
validpgpkeys = 602F567663E593BCBD14F338C638974D64792D67
- sha256sums = 4d8772c25baeaea2c37a954902b88c05d1454c91c887cb6a0997258cfac3fdc5
+ sha256sums = ca336dcdf303fea5ff231d89a9b6278b061c4cffb14f0db0a71a15bdd95a5cb0
sha256sums = SKIP
sha256sums = 10e4f661872f773bf3122a2f9f2cb13344fea86a4ab72beecb4213be4325c479
sha256sums = 711fb84c87b143cb0098e095fdebb040b15f553a854efbe846a00100bdb9ae88
diff --git a/PKGBUILD b/PKGBUILD
index 29b9cdce4e3..e8dbe1ca089 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,19 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Felix Golatofski <contact@xdfr.de>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Andrea Zucchelli <zukka77@gmail.com>
# Contributor: Daniel Micay <danielmicay@gmail.com>
# Contributor: Jonathan Liu <net147@gmail.com>
# Contributor: Jon Nordby <jononor@gmail.com>
# SELinux Maintainer: Marc Mettke (marc@itmettke.de)
+# Based on the official PKGBUILD (https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/lxc)
pkgname=lxc-selinux
epoch=1
-pkgver=3.1.0
+pkgver=4.0.2
pkgrel=1
pkgdesc="Linux Containers"
arch=('x86_64')
-url="http://linuxcontainers.org"
+url="https://linuxcontainers.org"
depends=('bash' 'perl' 'libseccomp' 'libcap' 'python' 'rsync' 'wget' 'libselinux')
provides=("${pkgname/-selinux}=${pkgver}-${pkgrel}")
conflicts=("${pkgname/-selinux}")
@@ -29,7 +31,7 @@ source=("https://linuxcontainers.org/downloads/${pkgname/-selinux}-${pkgver}.tar
"lxc.tmpfiles.d"
"lxc.service"
"lxc-auto.service")
-sha256sums=('4d8772c25baeaea2c37a954902b88c05d1454c91c887cb6a0997258cfac3fdc5'
+sha256sums=('ca336dcdf303fea5ff231d89a9b6278b061c4cffb14f0db0a71a15bdd95a5cb0'
'SKIP'
'10e4f661872f773bf3122a2f9f2cb13344fea86a4ab72beecb4213be4325c479'
'711fb84c87b143cb0098e095fdebb040b15f553a854efbe846a00100bdb9ae88'
@@ -38,7 +40,7 @@ sha256sums=('4d8772c25baeaea2c37a954902b88c05d1454c91c887cb6a0997258cfac3fdc5'
prepare() {
cd "$srcdir/${pkgname/-selinux}-${pkgver/_/-}"
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' \
diff --git a/lxc-auto.service b/lxc-auto.service
index ac93e5603eb..01b9a6d8185 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 c82307a73cd..6feb68006ec 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