- updated to 2.0.4

diff --git a/lxc-pld.patch b/lxc-pld.patch
index accf43733e640fd1aea84d86c1e35513ab822c13..62636fc09f2abec359c450c17552fd39169b10f5 100644 (file)
--- a/lxc-pld.patch
+++ b/lxc-pld.patch
@@ -1,26 +1,33 @@
-diff -durN -x '*~' -x '*.orig' lxc-1.1.1.orig/configure.ac lxc-1.1.1/configure.ac
---- lxc-1.1.1.orig/configure.ac        2015-03-16 20:57:47.000000000 +0100
-+++ lxc-1.1.1/configure.ac     2015-04-02 14:40:25.000000000 +0200
-@@ -63,7 +63,7 @@
+--- configure.ac.orig  2016-08-16 04:37:55.000000000 +0200
++++ configure.ac       2016-08-20 12:05:05.962758223 +0200
+@@ -57,6 +57,7 @@
+       AC_CHECK_FILE(/etc/mandriva-release,with_distro="openmandriva")
+       AC_CHECK_FILE(/etc/pardus-release,with_distro="pardus")
+       AC_CHECK_FILE(/etc/altlinux-release,with_distro="altlinux")
++      AC_CHECK_FILE(/etc/pld-release,with_distro="pld")
+ fi
+ with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]'`
+ 
+@@ -72,7 +73,7 @@
                distroconf=default.conf.lxcbr
                distrosysconf="$sysconfdir/default"
                ;;
--      redhat|centos|fedora|oracle|oracleserver|suse|opensuse*)
-+      redhat|centos|fedora|oracle|oracleserver|suse|opensuse*|pld)
+-      redhat|centos|fedora|oracle|oracleserver|sparclinux|altlinux|suse|opensuse*|plamo)
++      redhat|centos|fedora|oracle|oracleserver|sparclinux|altlinux|suse|opensuse*|plamo|pld)
                distroconf=default.conf.lxcbr
                distrosysconf="$sysconfdir/sysconfig"
                ;;
-@@ -99,6 +99,9 @@
+@@ -108,6 +109,9 @@
                        ubuntu)
                                init_script=upstart,systemd
                                ;;
 +                      pld)
-+                              init_script=upstart,systemd
++                              init_script=sysvinit,upstart,systemd
 +                              ;;
                        *)
                                echo -n "Linux distribution init system unknown."
                                init_script=
-@@ -152,7 +154,7 @@
+@@ -168,7 +172,7 @@
  
  if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then
        db2xman=""
@@ -29,22 +36,21 @@ diff -durN -x '*~' -x '*.orig' lxc-1.1.1.orig/configure.ac lxc-1.1.1/configure.a
  
        AC_MSG_CHECKING(for docbook2x-man)
        for name in ${dbparsers}; do
-@@ -756,6 +758,7 @@
+@@ -834,6 +838,7 @@
        templates/lxc-opensuse
        templates/lxc-oracle
        templates/lxc-plamo
 +      templates/lxc-pld
+       templates/lxc-slackware
        templates/lxc-sshd
        templates/lxc-ubuntu
-       templates/lxc-ubuntu-cloud
-diff -durN -x '*~' -x '*.orig' lxc-1.1.1.orig/templates/Makefile.am lxc-1.1.1/templates/Makefile.am
---- lxc-1.1.1.orig/templates/Makefile.am       2015-03-16 20:57:47.000000000 +0100
-+++ lxc-1.1.1/templates/Makefile.am    2015-04-02 14:38:17.000000000 +0200
+--- templates/Makefile.am.orig 2016-08-20 11:55:34.232752000 +0200
++++ templates/Makefile.am      2016-08-20 11:57:12.522753070 +0200
 @@ -15,6 +15,7 @@
        lxc-opensuse \
        lxc-oracle \
        lxc-plamo \
 +      lxc-pld \
+       lxc-slackware \
        lxc-sshd \
        lxc-ubuntu \
-       lxc-ubuntu-cloud

diff --git a/lxc.spec b/lxc.spec
index 63c3bc0ad27867ef23de4c1233b6258c4f1b1708..3b135c16c567c0b1f69e4d8fbfe0d24ee6585860 100644 (file)
--- a/lxc.spec
+++ b/lxc.spec
@@ -17,19 +17,18 @@
 Summary:       Linux Containers userspace tools
 Summary(pl.UTF-8):     Narzędzia do kontenerów linuksowych (LXC)
 Name:          lxc
-Version:       1.1.5
+Version:       2.0.4
 Release:       1
 License:       LGPL v2.1+
 Group:         Applications/System
 Source0:       https://linuxcontainers.org/downloads/lxc/%{name}-%{version}.tar.gz
-# Source0-md5: dd9684dde0a58ed13f4f49c855b79a1a
+# Source0-md5: 28db4dbacf860ae742138c0ed8dbf14c
 Source1:       %{name}-pld.in.sh
 # lxc-net based on bridge, macvlan is an alternative/supported lxc network
 Source2:       %{name}_macvlan.sysconfig
 Source3:       %{name}_macvlan
 Patch0:                %{name}-pld.patch
-Patch1:                x32.patch
-Patch2:                %{name}-net.patch
+Patch1:                %{name}-net.patch
 URL:           https://www.linuxcontainers.org/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
@@ -146,9 +145,8 @@ bashowe uzupełnianie nazw dla LXC.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p0
 %patch1 -p1
-%patch2 -p1
 
 cp -p %{SOURCE1} templates/lxc-pld.in
 
@@ -240,7 +238,7 @@ fi
 %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
@@ -269,7 +267,6 @@ fi
 %{_libdir}/%{name}/rootfs/README
 %attr(755,root,root) %{_libdir}/%{name}/lxc-apparmor-load
 %attr(755,root,root) %{_libdir}/%{name}/lxc-containers
-%attr(755,root,root) %{_libdir}/%{name}/lxc-devsetup
 %attr(755,root,root) %{_libdir}/%{name}/lxc-monitord
 %attr(755,root,root) %{_libdir}/%{name}/lxc-net
 %attr(755,root,root) %{_libdir}/%{name}/lxc-user-nic
@@ -300,6 +297,7 @@ fi
 %{_datadir}/%{name}/config/ubuntu-cloud.*.conf
 %{_datadir}/%{name}/config/ubuntu.*.conf
 %{_datadir}/%{name}/config/userns.conf
+%dir %{_libdir}/%{name}/hooks
 %dir %{_datadir}/%{name}/hooks
 %dir %{_datadir}/%{name}/selinux
 %{_datadir}/%{name}/selinux/*
@@ -309,12 +307,13 @@ fi
 %attr(755,root,root) %{_datadir}/%{name}/hooks/squid-deb-proxy-client
 %attr(755,root,root) %{_datadir}/%{name}/hooks/ubuntu-cloud-prep
 %attr(755,root,root) %{_datadir}/%{name}/templates/lxc-*
+%attr(755,root,root) %{_libdir}/%{name}/hooks/unmount-namespace
 %{_mandir}/man1/lxc-attach.1*
 %{_mandir}/man1/lxc-autostart.1*
 %{_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*
@@ -344,7 +343,6 @@ fi
 %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*
 
 
@@ -381,16 +379,13 @@ fi
 %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
 %{_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*
 %endif
 
 %files -n bash-completion-%{name}

diff --git a/x32.patch b/x32.patch
deleted file mode 100644 (file)
index 73de75f..0000000
--- a/x32.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- lxc-1.0.7/src/lxc/log.c.orig       2014-12-05 21:50:20.000000000 +0100
-+++ lxc-1.0.7/src/lxc/log.c    2015-03-13 21:30:29.354757660 +0100
-@@ -91,7 +91,11 @@
- 
-       ms = event->timestamp.tv_usec / 1000;
-       n = snprintf(buffer, sizeof(buffer),
-+#ifdef __ILP32__
-+                   "%15s %10lld.%03d %-8s %s - %s:%s:%d - ",
-+#else
-                    "%15s %10ld.%03d %-8s %s - %s:%s:%d - ",
-+#endif
-                    log_prefix,
-                    event->timestamp.tv_sec,
-                    ms,