Up to 2.1.1

lxc-pld.patch removed, appliet upstream

diff --git a/lxc-pld.patch b/lxc-pld.patch
deleted file mode 100644 (file)
index 62636fc..0000000
--- a/lxc-pld.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- 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|sparclinux|altlinux|suse|opensuse*|plamo)
-+      redhat|centos|fedora|oracle|oracleserver|sparclinux|altlinux|suse|opensuse*|plamo|pld)
-               distroconf=default.conf.lxcbr
-               distrosysconf="$sysconfdir/sysconfig"
-               ;;
-@@ -108,6 +109,9 @@
-                       ubuntu)
-                               init_script=upstart,systemd
-                               ;;
-+                      pld)
-+                              init_script=sysvinit,upstart,systemd
-+                              ;;
-                       *)
-                               echo -n "Linux distribution init system unknown."
-                               init_script=
-@@ -168,7 +172,7 @@
- 
- if test "x$enable_doc" = "xyes" -o "x$enable_doc" = "xauto"; then
-       db2xman=""
--      dbparsers="docbook2x-man db2x_docbook2man docbook2man docbook-to-man"
-+      dbparsers="docbook2X2man docbook2x-man db2x_docbook2man docbook2man docbook-to-man"
- 
-       AC_MSG_CHECKING(for docbook2x-man)
-       for name in ${dbparsers}; do
-@@ -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/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 \

diff --git a/lxc.spec b/lxc.spec
index 47880cef4587b4a75bcef4c0d0e6dc591ae34bd0..7f1a974c069c962d6269fdd5a034f8235fca8d81 100644 (file)
--- a/lxc.spec
+++ b/lxc.spec
@@ -13,17 +13,16 @@
 Summary:       Linux Containers userspace tools
 Summary(pl.UTF-8):     Narzędzia do kontenerów linuksowych (LXC)
 Name:          lxc
 Summary:       Linux Containers userspace tools
 Summary(pl.UTF-8):     Narzędzia do kontenerów linuksowych (LXC)
 Name:          lxc

-Version:       2.0.8
-Release:       2
+Version:       2.1.1
+Release:       1

 License:       LGPL v2.1+
 Group:         Applications/System
 Source0:       https://linuxcontainers.org/downloads/lxc/%{name}-%{version}.tar.gz
 License:       LGPL v2.1+
 Group:         Applications/System
 Source0:       https://linuxcontainers.org/downloads/lxc/%{name}-%{version}.tar.gz

-# Source0-md5: 7bfd95280522d7936c0979dfea92cdb5
+# Source0-md5: 596f7c96ec78e361b057499dbe994703

 Source1:       %{name}-pld.in.sh
 # lxc-net based on bridge, macvlan is an alternative/supported lxc network
 Source2:       %{name}_macvlan.sysconfig
 Source3:       %{name}_macvlan
 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:                %{name}-net.patch
 Patch2:                x32.patch
 URL:           https://www.linuxcontainers.org/
 Patch1:                %{name}-net.patch
 Patch2:                x32.patch
 URL:           https://www.linuxcontainers.org/


@@ -159,7 +158,6 @@ bashowe uzupełnianie nazw dla LXC.
 
 %prep
 %setup -q
 
 %prep
 %setup -q

-%patch0 -p0

 %patch1 -p1
 %patch2 -p1
 
 %patch1 -p1
 %patch2 -p1
 


@@ -216,7 +214,7 @@ install -d $RPM_BUILD_ROOT{%{configpath},%{configpath}snap,/var/{cache,log}/lxc}
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/lxc-patch.py
 
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/lxc_macvlan
 %{__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%{_libdir}/%{name}/lxc_macvlan
+install -p %{SOURCE3} $RPM_BUILD_ROOT%{_libexecdir}/%{name}/lxc_macvlan

 
 %if %{with python}
 %py3_comp $RPM_BUILD_ROOT%{py3_sitedir}/lxc
 
 %if %{with python}
 %py3_comp $RPM_BUILD_ROOT%{py3_sitedir}/lxc


@@ -271,6 +269,7 @@ fi
 %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-stop
 %attr(755,root,root) %{_bindir}/lxc-unfreeze
 %attr(755,root,root) %{_bindir}/lxc-unshare

+%attr(755,root,root) %{_bindir}/lxc-update-config

 %attr(755,root,root) %{_bindir}/lxc-usernsexec
 %attr(755,root,root) %{_bindir}/lxc-wait
 %attr(755,root,root) %{_sbindir}/init.lxc
 %attr(755,root,root) %{_bindir}/lxc-usernsexec
 %attr(755,root,root) %{_bindir}/lxc-wait
 %attr(755,root,root) %{_sbindir}/init.lxc


@@ -283,12 +282,12 @@ fi
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/rootfs
 %{_libdir}/%{name}/rootfs/README
 %dir %{_libdir}/%{name}
 %dir %{_libdir}/%{name}/rootfs
 %{_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-monitord
-%attr(755,root,root) %{_libdir}/%{name}/lxc-net
-%attr(755,root,root) %{_libdir}/%{name}/lxc-user-nic
-%attr(755,root,root) %{_libdir}/%{name}/lxc_macvlan
+%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 %{_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
 %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


@@ -311,12 +310,16 @@ fi
 %{_datadir}/%{name}/config/openwrt.*.conf
 %{_datadir}/%{name}/config/oracle.*.conf
 %{_datadir}/%{name}/config/plamo.*.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/slackware.*.conf
 %{_datadir}/%{name}/config/sparclinux.*.conf
 %{_datadir}/%{name}/config/ubuntu-cloud.*.conf
 %{_datadir}/%{name}/config/ubuntu.*.conf
 %{_datadir}/%{name}/config/userns.conf

-%dir %{_libdir}/%{name}/hooks
+%{_datadir}/%{name}/config/voidlinux.common.conf
+%{_datadir}/%{name}/config/voidlinux.userns.conf
+%dir %{_libexecdir}/%{name}/hooks

 %dir %{_datadir}/%{name}/hooks
 %dir %{_datadir}/%{name}/selinux
 %{_datadir}/%{name}/selinux/*
 %dir %{_datadir}/%{name}/hooks
 %dir %{_datadir}/%{name}/selinux
 %{_datadir}/%{name}/selinux/*


@@ -326,7 +329,7 @@ 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) %{_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
+%attr(755,root,root) %{_libexecdir}/%{name}/hooks/unmount-namespace

 %{_mandir}/man1/lxc-attach.1*
 %{_mandir}/man1/lxc-autostart.1*
 %{_mandir}/man1/lxc-cgroup.1*
 %{_mandir}/man1/lxc-attach.1*
 %{_mandir}/man1/lxc-autostart.1*
 %{_mandir}/man1/lxc-cgroup.1*


@@ -346,6 +349,7 @@ fi
 %{_mandir}/man1/lxc-stop.1*
 %{_mandir}/man1/lxc-unfreeze.1*
 %{_mandir}/man1/lxc-unshare.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-usernsexec.1*
 %{_mandir}/man1/lxc-wait.1*
 %{_mandir}/man1/lxc-user-nic.1*
 %{_mandir}/man1/lxc-usernsexec.1*
 %{_mandir}/man1/lxc-wait.1*


@@ -416,7 +420,7 @@ fi
 %attr(755,root,root) %{_bindir}/lxc-ls
 %{py3_sitedir}/lxc
 %attr(755,root,root) %{py3_sitedir}/_lxc.cpython-*.so
 %attr(755,root,root) %{_bindir}/lxc-ls
 %{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*
 %lang(ja) %{_mandir}/ja/man1/lxc-device.1*
 %{_mandir}/man1/lxc-device.1*
 %{_mandir}/man1/lxc-ls.1*
 %lang(ja) %{_mandir}/ja/man1/lxc-device.1*

diff --git a/x32.patch b/x32.patch
index fd93b547510a51140d3ccbf2518a8d59cb17adb7..ae7db2066aed9af2372aa4793771a4d92b27168c 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -1,14 +1,15 @@
---- lxc-2.0.8/src/lxc/log.c~   2017-05-11 19:23:06.000000000 +0200
-+++ lxc-2.0.8/src/lxc/log.c    2017-05-27 21:36:35.137755023 +0200
-@@ -154,7 +154,11 @@
+diff -urN lxc-2.1.1-orig/src/lxc/log.c lxc-2.1.1/src/lxc/log.c
+--- lxc-2.1.1-orig/src/lxc/log.c       2017-10-19 19:08:34.000000000 +0200
++++ lxc-2.1.1/src/lxc/log.c    2018-03-24 13:42:08.659166630 +0100
+@@ -222,7 +222,11 @@

        seconds = (time->tv_sec - d_in_s - h_in_s - (minutes * 60));
  
        /* Make string from nanoseconds. */
        seconds = (time->tv_sec - d_in_s - h_in_s - (minutes * 60));
  
        /* Make string from nanoseconds. */

-+#ifdef __ILP32__
-+      ret = snprintf(nanosec, LXC_NUMSTRLEN64, "%lld", time->tv_nsec);
-+#else
-       ret = snprintf(nanosec, LXC_NUMSTRLEN64, "%ld", time->tv_nsec);
-+#endif
++      #ifdef __ILP32__
++      ret = snprintf(nanosec, LXC_NUMSTRLEN64, "%lld", (int64_t)time->tv_nsec);
++      #else
+       ret = snprintf(nanosec, LXC_NUMSTRLEN64, "%"PRId64, (int64_t)time->tv_nsec);
++      #endif

        if (ret < 0 || ret >= LXC_NUMSTRLEN64)
                return -1;
  
        if (ret < 0 || ret >= LXC_NUMSTRLEN64)
                return -1;