X-Git-Url: https://git.pld-linux.org/?p=packages%2Flxc.git;a=blobdiff_plain;f=lxc.spec;h=556d205b9ec88125cb16f7c93b270b49b468d940;hp=09be6616ee0e29f1f565725dfac39ba556fd7ea1;hb=377ff7f;hpb=7e4c14a6662dee870f79c78c46e4d989d784dd5a diff --git a/lxc.spec b/lxc.spec index 09be661..556d205 100644 --- a/lxc.spec +++ b/lxc.spec @@ -1,43 +1,69 @@ -# +# TODO +# - package apparmor stuff +# - update (cut down, include /usr/share/lxc/config/common.conf) default pld container config + # Conditional build: -%bcond_without seccomp # SecComp syscall filter -%bcond_without apparmor # apparmor -%bcond_without lua # Lua binding -%bcond_without python # Python binding -%bcond_with selinux # SELinux - -%define subver beta2 -%define rel 0.1 +%bcond_without seccomp # SecComp syscall filter +%bcond_without apparmor # apparmor support +%bcond_without lua # Lua binding +%bcond_without python # Python binding +%bcond_with selinux # SELinux support +%bcond_with cgmanager # cgmanager support + Summary: Linux Containers userspace tools Summary(pl.UTF-8): Narzędzia do kontenerów linuksowych (LXC) Name: lxc -Version: 1.0.0 -Release: 0.%{subver}.%{rel} +Version: 2.1.1 +Release: 3 License: LGPL v2.1+ Group: Applications/System -Source0: https://github.com/lxc/lxc/archive/%{name}-%{version}.%{subver}.tar.gz -# Source0-md5: cdb6b00594ae3423c0745e4e24d807c7 +Source0: https://linuxcontainers.org/downloads/lxc/%{name}-%{version}.tar.gz +# Source0-md5: 596f7c96ec78e361b057499dbe994703 Source1: %{name}-pld.in.sh -Patch1: %{name}-pld.patch -Patch4: checkconfig-vserver-config.patch -URL: http://linuxcontainers.org/ +# lxc-net based on bridge, macvlan is an alternative/supported lxc network +Source2: %{name}_macvlan.sysconfig +Source3: %{name}_macvlan +Patch1: %{name}-net.patch +Patch2: x32.patch +URL: https://www.linuxcontainers.org/ BuildRequires: autoconf >= 2.50 BuildRequires: automake -BuildRequires: docbook-dtd30-sgml -BuildRequires: docbook-utils -BuildRequires: docbook2X +%{?with_cgmanager:BuildRequires: cgmanager-devel} +%{?with_cgmanager:BuildRequires: dbus-devel >= 1.2.16} +BuildRequires: docbook-dtd45-xml +BuildRequires: docbook2X >= 0.8 +BuildRequires: doxygen BuildRequires: gnutls-devel %{?with_apparmor:BuildRequires: libapparmor-devel} BuildRequires: libcap-devel +%{?with_cgmanager:BuildRequires: libnih-devel >= 1.0.2} %{?with_seccomp:BuildRequires: libseccomp-devel} +BuildRequires: libxslt-progs %{?with_lua:BuildRequires: lua51-devel >= 5.1} BuildRequires: pkgconfig -%{?with_python:BuildRequires: python3-devel >= 3.2} -BuildRequires: rpmbuild(macros) >= 1.612 +%{?with_python:BuildRequires: python3-devel >= 1:3.2} +%{?with_python:BuildRequires: python3-modules >= 1:3.2} +BuildRequires: rpm-pythonprov +BuildRequires: rpmbuild(macros) >= 1.671 BuildRequires: sed >= 4.0 +Requires(post): /sbin/ldconfig +Requires(post,preun): /sbin/chkconfig +Requires: %{name}-libs = %{version}-%{release} +# lxc_macvlan script +Requires: gawk +# used in lxc-net script to set bridge nat +Requires: iproute2 +Requires: iptables Requires: rc-scripts >= 0.4.6 +Requires: systemd-units >= 38 Requires: which +# used in lxc-net script, but not all cases, may break working setups +Suggests: dnsmasq +Suggests: gnupg +Suggests: gnupg-plugin-keys_curl +Suggests: gnupg-plugin-keys_hkp Suggests: net-tools +Suggests: python3-lxc Suggests: rsync BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -55,7 +81,7 @@ applications like bash or sshd. %description -l pl.UTF-8 Narzędzia do tworzenia i zarządzania kontenerami. System ten obejmuje -w pełni funkcjonalne kontenery z ilozacją/wirtualizacją pidów, ipc, +w pełni funkcjonalne kontenery z izolacją/wirtualizacją pidów, ipc, utsname, punktów montowania, /proc, /sys, sieci oraz uwzględniające grupy kontrolne. Jest bardzo lekki, elastyczny i udostępnia narzędzia do czynności związanych z kontenerami, takich jak monitorowanie z @@ -63,11 +89,23 @@ asynchronicznym powiadamianiem o zdarzeniach czy zamrażanie. Ten pakiet jest przydatny do tworzenia wirtualnych serwerów prywatnych oraz uruchamiania izolowanych aplikacji, takich jak bash czy sshd. +%package libs +Summary: liblxc library +Summary(pl.UTF-8): Biblioteka liblxc +Group: Libraries +Conflicts: lxc < 2.0.4-2 + +%description libs +liblxc library. + +%description libs -l pl.UTF-8 +Biblioteka liblxc. + %package devel Summary: Header files for lxc library Summary(pl.UTF-8): Pliki nagłówkowe biblioteki lxc Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-libs = %{version}-%{release} %description devel Header files for lxc library. @@ -93,8 +131,8 @@ Summary: Python (3.x) binding for LXC Summary(pl.UTF-8): Wiązanie Pythona (3.x) do LXC Group: Libraries Requires: %{name} = %{version}-%{release} -Requires: python3-libs >= 3.2 -Requires: python3-modules +Requires: python3-libs >= 1:3.2 +Requires: python3-modules >= 1:3.2 %description -n python3-lxc Python (3.x) binding for LXC. @@ -102,30 +140,51 @@ Python (3.x) binding for LXC. %description -n python3-lxc -l pl.UTF-8 Wiązanie Pythona (3.x) do LXC. +%package -n bash-completion-%{name} +Summary: bash-completion for LXC +Summary(pl.UTF-8): bashowe uzupełnianie nazw dla LXC +Group: Applications/Shells +Requires: %{name} = %{version}-%{release} +Requires: bash-completion +%if "%{_rpmversion}" >= "5" +BuildArch: noarch +%endif + +%description -n bash-completion-%{name} +bash-completion for LXC. + +%description -n bash-completion-%{name} -l pl.UTF-8 +bashowe uzupełnianie nazw dla LXC. + %prep -%setup -q -n %{name}-%{name}-%{version}%{?subver:.%{subver}} +%setup -q %patch1 -p1 -%patch4 -p1 +%patch2 -p1 cp -p %{SOURCE1} templates/lxc-pld.in %build +%{__libtoolize} %{__aclocal} -I config %{__autoconf} %{__autoheader} %{__automake} %configure \ + bashcompdir=%{bash_compdir} \ db2xman=docbook2X2man \ --disable-rpath \ + --enable-bash \ --enable-doc \ --enable-examples \ %{__enable_disable apparmor} \ + %{__enable_disable cgmanager} \ %{__enable_disable lua} %{?with_lua:--with-lua-pc=lua51} \ %{__enable_disable python} \ %{__enable_disable seccomp} \ %{__enable_disable selinux} \ --with-config-path=%{configpath} \ - --with-init-script=sysv,systemd \ + --with-init-script=sysvinit,systemd \ + --with-runtime-path=/var/run \ --with-distro=pld %{__make} @@ -133,7 +192,9 @@ cp -p %{SOURCE1} templates/lxc-pld.in %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{configpath},/var/{cache,log}/lxc} +install -d $RPM_BUILD_ROOT{%{configpath},%{configpath}snap,/var/{cache,log}/lxc} \ + -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig} + %{__make} install \ SYSTEMD_UNIT_DIR=%{systemdunitdir} \ pcdatadir=%{_pkgconfigdir} \ @@ -142,31 +203,59 @@ install -d $RPM_BUILD_ROOT{%{configpath},/var/{cache,log}/lxc} %{__make} -C doc install \ DESTDIR=$RPM_BUILD_ROOT +%{__rm} $RPM_BUILD_ROOT%{_libdir}/liblxc.la + %{__rm} -r $RPM_BUILD_ROOT%{_docdir} +# apparmor profiles are not packaged, remove to avoid packagers confusion +%{__rm} -r $RPM_BUILD_ROOT/etc/apparmor.d + +# yum plugin, no idea where to package this +%{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/lxc-patch.py + +install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/lxc_macvlan +install -p %{SOURCE3} $RPM_BUILD_ROOT%{_libexecdir}/%{name}/lxc_macvlan + %if %{with python} %py3_comp $RPM_BUILD_ROOT%{py3_sitedir}/lxc %py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}/lxc %endif %if %{with lua} -%{__sed} -i -e '1s,#!/usr/bin/env lua,#!/usr/bin/lua51,' $RPM_BUILD_ROOT%{_bindir}/lxc-top +%{__sed} -i -e '1s,#!/usr/bin/env lua,#!/usr/bin/lua5.1,' $RPM_BUILD_ROOT%{_bindir}/lxc-top %endif %clean rm -rf $RPM_BUILD_ROOT -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post +/sbin/chkconfig --add lxc +/sbin/chkconfig --add lxc-net +%systemd_post lxc.service lxc-net.service + +%preun +if [ "$1" = "0" ]; then + %service lxc stop + /sbin/chkconfig --del lxc + %service lxc-net stop + /sbin/chkconfig --del lxc-net +fi +%systemd_preun lxc.service lxc-net.service + +%postun +%systemd_reload + +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %files %defattr(644,root,root,755) -%doc AUTHORS CONTRIBUTING MAINTAINERS README TODO doc/FAQ.txt doc/examples/*.conf +%doc AUTHORS CONTRIBUTING MAINTAINERS README doc/FAQ.txt doc/examples/*.conf %attr(755,root,root) %{_bindir}/lxc-attach %attr(755,root,root) %{_bindir}/lxc-autostart %attr(755,root,root) %{_bindir}/lxc-cgroup %attr(755,root,root) %{_bindir}/lxc-checkconfig %attr(755,root,root) %{_bindir}/lxc-checkpoint -%attr(755,root,root) %{_bindir}/lxc-clone +%attr(755,root,root) %{_bindir}/lxc-copy %attr(755,root,root) %{_bindir}/lxc-config %attr(755,root,root) %{_bindir}/lxc-console %attr(755,root,root) %{_bindir}/lxc-create @@ -174,40 +263,68 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/lxc-execute %attr(755,root,root) %{_bindir}/lxc-freeze %attr(755,root,root) %{_bindir}/lxc-info -%attr(755,root,root) %{_bindir}/lxc-kill %attr(755,root,root) %{_bindir}/lxc-monitor -%attr(755,root,root) %{_bindir}/lxc-monitord -%attr(755,root,root) %{_bindir}/lxc-netstat -%attr(755,root,root) %{_bindir}/lxc-ps -%attr(755,root,root) %{_bindir}/lxc-restart %attr(755,root,root) %{_bindir}/lxc-snapshot %attr(755,root,root) %{_bindir}/lxc-start %attr(755,root,root) %{_bindir}/lxc-stop %attr(755,root,root) %{_bindir}/lxc-unfreeze %attr(755,root,root) %{_bindir}/lxc-unshare -%attr(755,root,root) %{_bindir}/lxc-user-nic +%attr(755,root,root) %{_bindir}/lxc-update-config %attr(755,root,root) %{_bindir}/lxc-usernsexec -%attr(755,root,root) %{_bindir}/lxc-version %attr(755,root,root) %{_bindir}/lxc-wait -%attr(755,root,root) %{_libdir}/liblxc.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/liblxc.so.1 +%attr(755,root,root) %{_sbindir}/init.lxc %attr(754,root,root) /etc/rc.d/init.d/lxc +%attr(754,root,root) /etc/rc.d/init.d/lxc-net + %{systemdunitdir}/lxc.service -%dir %{_libdir}/lxc -%dir %{_libdir}/lxc/rootfs -%{_libdir}/lxc/rootfs/README -%attr(755,root,root) %{_libdir}/lxc/lxc-devsetup -%attr(755,root,root) %{_libdir}/lxc/lxc-init +%{systemdunitdir}/lxc@.service +%{systemdunitdir}/lxc-net.service +%dir %{_libdir}/%{name} +%dir %{_libdir}/%{name}/rootfs +%{_libdir}/%{name}/rootfs/README +%dir %{_libexecdir}/%{name} +%attr(755,root,root) %{_libexecdir}/%{name}/lxc-apparmor-load +%attr(755,root,root) %{_libexecdir}/%{name}/lxc-containers +%attr(755,root,root) %{_libexecdir}/%{name}/lxc-monitord +%attr(755,root,root) %{_libexecdir}/%{name}/lxc-net +%attr(755,root,root) %{_libexecdir}/%{name}/lxc-user-nic +%attr(755,root,root) %{_libexecdir}/%{name}/lxc_macvlan +%dir %{_libexecdir}/%{name}/hooks +%attr(755,root,root) %{_libexecdir}/%{name}/hooks/unmount-namespace %dir %{_sysconfdir}/lxc +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/lxc_macvlan +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/lxc %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/lxc/default.conf %dir %{_datadir}/%{name} %{_datadir}/%{name}/lxc.functions %dir %{_datadir}/%{name}/config -%{_datadir}/%{name}/config/debian*.conf -%{_datadir}/%{name}/config/oracle*.conf -%{_datadir}/%{name}/config/plamo*.conf -%{_datadir}/%{name}/config/ubuntu*.conf +%{_datadir}/%{name}/config/archlinux.*.conf +%{_datadir}/%{name}/config/centos.*.conf +%{_datadir}/%{name}/config/common.conf +%dir %{_datadir}/%{name}/config/common.conf.d +%{_datadir}/%{name}/config/common.conf.d/README +%{_datadir}/%{name}/config/common.seccomp +%{_datadir}/%{name}/config/alpine.*.conf +%{_datadir}/%{name}/config/debian.*.conf +%{_datadir}/%{name}/config/fedora.*.conf +%{_datadir}/%{name}/config/gentoo.*.conf +%{_datadir}/%{name}/config/nesting.conf +%{_datadir}/%{name}/config/opensuse.*.conf +%{_datadir}/%{name}/config/openwrt.*.conf +%{_datadir}/%{name}/config/oracle.*.conf +%{_datadir}/%{name}/config/plamo.*.conf +%{_datadir}/%{name}/config/sabayon.common.conf +%{_datadir}/%{name}/config/sabayon.userns.conf +%{_datadir}/%{name}/config/slackware.*.conf +%{_datadir}/%{name}/config/sparclinux.*.conf +%{_datadir}/%{name}/config/ubuntu-cloud.*.conf +%{_datadir}/%{name}/config/ubuntu.*.conf +%{_datadir}/%{name}/config/userns.conf +%{_datadir}/%{name}/config/voidlinux.common.conf +%{_datadir}/%{name}/config/voidlinux.userns.conf %dir %{_datadir}/%{name}/hooks +%dir %{_datadir}/%{name}/selinux +%{_datadir}/%{name}/selinux/* %dir %{_datadir}/%{name}/templates %attr(755,root,root) %{_datadir}/%{name}/hooks/clonehostname %attr(755,root,root) %{_datadir}/%{name}/hooks/mount* @@ -219,48 +336,66 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/lxc-cgroup.1* %{_mandir}/man1/lxc-checkconfig.1* %{_mandir}/man1/lxc-checkpoint.1* -%{_mandir}/man1/lxc-clone.1* +%{_mandir}/man1/lxc-copy.1* +%{_mandir}/man1/lxc-config.1* %{_mandir}/man1/lxc-console.1* %{_mandir}/man1/lxc-create.1* %{_mandir}/man1/lxc-destroy.1* %{_mandir}/man1/lxc-execute.1* %{_mandir}/man1/lxc-freeze.1* %{_mandir}/man1/lxc-info.1* -%{_mandir}/man1/lxc-kill.1* %{_mandir}/man1/lxc-monitor.1* -%{_mandir}/man1/lxc-netstat.1* -%{_mandir}/man1/lxc-ps.1* -%{_mandir}/man1/lxc-restart.1* %{_mandir}/man1/lxc-snapshot.1* %{_mandir}/man1/lxc-start.1* %{_mandir}/man1/lxc-stop.1* %{_mandir}/man1/lxc-unfreeze.1* %{_mandir}/man1/lxc-unshare.1* +%{_mandir}/man1/lxc-update-config.1* %{_mandir}/man1/lxc-user-nic.1* -%{_mandir}/man1/lxc-version.1* +%{_mandir}/man1/lxc-usernsexec.1* %{_mandir}/man1/lxc-wait.1* %{_mandir}/man5/lxc-usernet.5* %{_mandir}/man5/lxc.conf.5* +%{_mandir}/man5/lxc.container.conf.5* +%{_mandir}/man5/lxc.system.conf.5* %{_mandir}/man7/lxc.7* %lang(ja) %{_mandir}/ja/man1/lxc*.1* %lang(ja) %{_mandir}/ja/man5/lxc-usernet.5* %lang(ja) %{_mandir}/ja/man5/lxc.conf.5* +%lang(ja) %{_mandir}/ja/man5/lxc.container.conf.5* +%lang(ja) %{_mandir}/ja/man5/lxc.system.conf.5* %lang(ja) %{_mandir}/ja/man7/lxc.7* %exclude %{_mandir}/ja/man1/lxc-device.1* %exclude %{_mandir}/ja/man1/lxc-ls.1* -%exclude %{_mandir}/ja/man1/lxc-start-ephemeral.1* %exclude %{_mandir}/ja/man1/lxc-top.1* +%lang(ko) %{_mandir}/ko/man1/lxc*.1* +%lang(ko) %{_mandir}/ko/man5/lxc-usernet.5* +%lang(ko) %{_mandir}/ko/man5/lxc.conf.5* +%lang(ko) %{_mandir}/ko/man5/lxc.container.conf.5* +%lang(ko) %{_mandir}/ko/man5/lxc.system.conf.5* +%lang(ko) %{_mandir}/ko/man7/lxc.7* +%exclude %{_mandir}/ko/man1/lxc-device.1* +%exclude %{_mandir}/ko/man1/lxc-ls.1* +%exclude %{_mandir}/ko/man1/lxc-top.1* %if %{without python} # legacy version %attr(755,root,root) %{_bindir}/lxc-ls %{_mandir}/man1/lxc-ls.1* +%lang(ja) %{_mandir}/ja/man1/lxc-ls.1* +%lang(ko) %{_mandir}/ko/man1/lxc-ls.1* %endif %dir %{configpath} +%dir %{configpath}snap %dir %attr(750,root,root) /var/log/lxc %dir %attr(750,root,root) /var/cache/lxc +%files libs +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/liblxc.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/liblxc.so.1 + %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/liblxc.so @@ -276,6 +411,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/lua/lxc.lua %{_mandir}/man1/lxc-top.1* %lang(ja) %{_mandir}/ja/man1/lxc-top.1* +%lang(ko) %{_mandir}/ko/man1/lxc-top.1* %endif %if %{with python} @@ -283,14 +419,17 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/lxc-device %attr(755,root,root) %{_bindir}/lxc-ls -%attr(755,root,root) %{_bindir}/lxc-start-ephemeral %{py3_sitedir}/lxc %attr(755,root,root) %{py3_sitedir}/_lxc.cpython-*.so -%{py3_sitedir}/_lxc-0.1-py*.egg-info +%{py3_sitedir}/lxc-0.1-py*.egg-info %{_mandir}/man1/lxc-device.1* %{_mandir}/man1/lxc-ls.1* -%{_mandir}/man1/lxc-start-ephemeral.1* %lang(ja) %{_mandir}/ja/man1/lxc-device.1* %lang(ja) %{_mandir}/ja/man1/lxc-ls.1* -%lang(ja) %{_mandir}/ja/man1/lxc-start-ephemeral.1* +%lang(ko) %{_mandir}/ko/man1/lxc-device.1* +%lang(ko) %{_mandir}/ko/man1/lxc-ls.1* %endif + +%files -n bash-completion-%{name} +%defattr(644,root,root,755) +%{bash_compdir}/lxc