From 032a776e0311fe879dcf528a405776463bd46ed1 Mon Sep 17 00:00:00 2001 From: iaroki Date: Mon, 4 Jun 2018 13:20:06 +0300 Subject: [PATCH] lxc: update to 3.0.1 Closes #14897. Signed-off-by: Enno Boland --- srcpkgs/lxc/patches/musl-string.patch | 15 +++++++++++++++ srcpkgs/lxc/template | 19 +++++++++++-------- 2 files changed, 26 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/lxc/patches/musl-string.patch diff --git a/srcpkgs/lxc/patches/musl-string.patch b/srcpkgs/lxc/patches/musl-string.patch new file mode 100644 index 0000000000..7186db4289 --- /dev/null +++ b/srcpkgs/lxc/patches/musl-string.patch @@ -0,0 +1,15 @@ +--- src/lxc/parse.c 2018-03-28 04:48:26.000000000 +0300 ++++ src/lxc/parse.c 2018-05-07 21:07:45.737722549 +0300 +@@ -23,11 +23,11 @@ + + #define _GNU_SOURCE + #include ++#include + #undef _GNU_SOURCE + #include + #include + #include +-#include + #include + + #include "parse.h" diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template index 4bb43ac590..eb166c9f9f 100644 --- a/srcpkgs/lxc/template +++ b/srcpkgs/lxc/template @@ -2,21 +2,21 @@ _desc="Linux Containers" pkgname=lxc -version=2.1.1 -revision=3 +version=3.0.1 +revision=1 build_style=gnu-configure -configure_args="--enable-doc --enable-seccomp --enable-cgmanager +configure_args="--enable-doc --enable-seccomp --enable-capabilities --disable-apparmor --with-distro=none --with-rootfs-path=/var/lxc/containers --with-log-path=/var/lxc/log" -hostmakedepends="pkg-config docbook2x" -makedepends="libcap-devel libseccomp-devel gnutls-devel libcgmanager-devel" +hostmakedepends="automake libtool pkg-config docbook2x" +makedepends="libcap-devel libseccomp-devel gnutls-devel" depends="xz gnupg" short_desc="${_desc} - utilities" maintainer="Juan RP " homepage="https://linuxcontainers.org" license="LGPL-2.1" distfiles="https://linuxcontainers.org/downloads/lxc-${version}.tar.gz" -checksum=68663a67450a8d6734e137eac54cc7077209fb15c456eec401a2c26e6386eff6 +checksum=45986c49be1c048fa127bd3e7ea1bd3347e25765c008a09a2e4c233151a2d5db conf_files="/etc/lxc/default.conf" make_dirs=" @@ -25,9 +25,11 @@ make_dirs=" /var/lxc/log 0755 root root" pre_configure() { - sed -e 's|"\\"-//Davenport//DTD DocBook V3.0//EN\\""|"\\"-//OASIS//DTD DocBook XML\\" \\"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\\""|' -i configure - sed -e 's,docbook2x-man,docbook2man,g' -i configure + sed -e 's|"\\"-//Davenport//DTD DocBook V3.0//EN\\""|"\\"-//OASIS//DTD DocBook XML\\" \\"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd\\""|' -i configure.ac + sed -e 's,docbook2x-man,docbook2man,g' -i configure.ac + ./autogen.sh } + post_install() { vmkdir usr/share/bash-completion/completions mv ${DESTDIR}/etc/bash_completion.d/* ${DESTDIR}/usr/share/bash-completion/completions/ @@ -43,6 +45,7 @@ liblxc_package() { vmove "usr/lib/*.so.*" } } + lxc-devel_package() { depends="libcap-devel liblxc>=${version}_${revision}" short_desc="${_desc} - development files"