File project.diff of Package lxc
--- lxc.changes.orig
+++ lxc.changes
@@ -1,4 +1,39 @@
-------------------------------------------------------------------
+Mon Jan 22 17:10:00 UTC 2018 - Led <ledest@gmail.com>
+
+- update patches:
+ * lxc-2.0.9-opensuse.patch
+
+-------------------------------------------------------------------
+Mon Jan 22 15:21:00 UTC 2018 - Led <ledest@gmail.com>
+
+- update patches:
+ * lxc-2.0.9-opensuse.patch
+
+-------------------------------------------------------------------
+Mon Jan 22 15:02:00 UTC 2018 - Led <ledest@gmail.com>
+
+- update patches:
+ * lxc-2.0.9-opensuse.patch
+
+-------------------------------------------------------------------
+Mon Jan 22 14:42:00 UTC 2018 - Led <ledest@gmail.com>
+
+- update patches:
+ * lxc-2.0.9-opensuse.patch
+
+-------------------------------------------------------------------
+Mon Jan 22 10:54:00 UTC 2018 - Led <ledest@gmail.com>
+
+- add patches:
+ * lxc-2.0.9-opensuse.patch
+
+-------------------------------------------------------------------
+Sat Nov 04 18:52:00 UTC 2017 - Led <ledest@gmail.com>
+
+- git 3feb871
+
+-------------------------------------------------------------------
Tue Oct 31 19:42:13 UTC 2017 - opensuse_buildservice@ojkastl.de
- update to version 2.0.9
@@ -276,11 +311,21 @@ Tue Oct 31 19:42:13 UTC 2017 - opensuse_
* utils: Use access instead of stat
-------------------------------------------------------------------
+Tue Sep 12 22:02:00 UTC 2017 - Led <ledest@gmail.com>
+
+- git 44a43f5
+
+-------------------------------------------------------------------
Tue Sep 12 06:19:25 UTC 2017 - opensuse_buildservice@ojkastl.de
- removed ldconfig from lxc %post section
-------------------------------------------------------------------
+Mon Sep 04 19:24:00 UTC 2017 - Led <ledest@gmail.com>
+
+- git d3e7b8a
+
+-------------------------------------------------------------------
Fri Sep 1 09:39:30 UTC 2017 - mchandras@suse.de
- Fix libcap-progs dependency. The 'setcap' binary is located in /sbin
@@ -303,11 +348,21 @@ Wed Aug 30 17:49:47 UTC 2017 - opensuse_
- added correct reload of apparmor to %post
-------------------------------------------------------------------
+Sun Jul 16 23:33:00 UTC 2017 - Led <ledest@gmail.com>
+
+- git fabc141
+
+-------------------------------------------------------------------
Tue Jul 4 19:41:07 UTC 2017 - opensuse_buildservice@ojkastl.de
- added workaround for #bsc1041291 to allow builds on Tumbleweed with gcc7, until this bug in gcc7 is fixed...
-------------------------------------------------------------------
+Sat May 20 17:53:00 UTC 2017 - Led <ledest@gmail.com>
+
+- git e13ca52
+
+-------------------------------------------------------------------
Tue May 16 16:47:47 UTC 2017 - opensuse_buildservice@ojkastl.de
- Update to version 2.0.8
@@ -423,11 +478,27 @@ Tue May 16 16:47:47 UTC 2017 - opensuse_
- added signature verification
-------------------------------------------------------------------
+Thu May 09 21:53:00 UTC 2017 - Led <ledest@gmail.com>
+
+- git 2e6347d
+- remove patches:
+ + lxc-2.0.0-ubuntu.patch
+
+-------------------------------------------------------------------
Fri Apr 7 19:23:33 UTC 2017 - jengelh@inai.de
- Replace %__cp by cp
-------------------------------------------------------------------
+Thu Mar 30 22:27:00 UTC 2017 - Led <ledest@gmail.com>
+
+- git 20f3261
+- remove patches:
+ * 0001-tree-wide-include-sys-sysmacros.h-directly.patch
+ * 0002-tree-wide-include-sys-sysmacros.h-directly.patch
+ * 0003-CVE-2017-5985-Ensure-target-netns-is-caller-owned.patch
+
+-------------------------------------------------------------------
Thu Mar 30 06:31:37 UTC 2017 - opensuse_buildservice@ojkastl.de
- fix for boo#1028264
@@ -442,6 +513,17 @@ Wed Mar 29 20:01:55 UTC 2017 - opensuse_
0002-tree-wide-include-sys-sysmacros.h-directly.patch
-------------------------------------------------------------------
+Sun Mar 19 20:12:00 UTC 2017 - Led <ledest@gmail.com>
+
+- git d512bd5
+
+-------------------------------------------------------------------
+Tue Feb 07 21:22:00 UTC 2017 - Led <ledest@gmail.com>
+
+- remove patches:
+ * lxc-1.1.2-opensuse.patch
+
+-------------------------------------------------------------------
Fri Jan 27 19:10:11 UTC 2017 - opensuse_buildservice@ojkastl.de
- all patches (00*.patch) are upstream already, thus deleted; patch lxc-aa_allow_incomplete-default.patch is now reworked and added as a drop-in file in /usr/share/lxc/config/common.conf.d/
@@ -540,12 +622,42 @@ Tue Jan 24 15:51:26 UTC 2017 - opensuse_
- commented out the patches, as they no longer apply cleanly
-------------------------------------------------------------------
+Sun Dec 11 22:56:00 UTC 2016 - Led <ledest@gmail.com>
+
+- git 9045b0d
+
+-------------------------------------------------------------------
Tue Dec 6 16:54:24 UTC 2016 - cbosdonnat@suse.com
- CVE-2016-8649: lxc: guest escape via ptrace of lxc-attach (bsc#1010933).
0001-attach-do-not-send-procfd-to-attached-process.patch
-------------------------------------------------------------------
+Sun Dec 04 19:24:00 UTC 2016 - Led <ledest@gmail.com>
+
+- git d686e93
+
+-------------------------------------------------------------------
+Mon Nov 28 02:38:00 UTC 2016 - Led <ledest@gmail.com>
+
+- 2.0.6
+
+-------------------------------------------------------------------
+Sun Nov 20 23:00:00 UTC 2016 - Led <ledest@gmail.com>
+
+- git d3795ab
+
+-------------------------------------------------------------------
+Thu Oct 06 21:33:00 UTC 2016 - Led <ledest@gmail.com>
+
+- update BuildRequires
+
+-------------------------------------------------------------------
+Wed Oct 05 21:15:00 UTC 2016 - Led <ledest@gmail.com>
+
+- 2.0.5
+
+-------------------------------------------------------------------
Mon Sep 19 15:09:41 UTC 2016 - schwab@suse.de
- setcap has been moved to /usr/sbin (boo#998326).
@@ -583,12 +695,22 @@ Wed Aug 31 11:16:59 UTC 2016 - cbrauner@
- add 0027-cleanup-replace-tabs-wth-spaces-in-usage-strings.patch
-------------------------------------------------------------------
+Mon Aug 29 21:50:00 UTC 2016 - Led <ledest@gmail.com>
+
+- 2.0.4
+
+-------------------------------------------------------------------
Sat Jul 23 07:49:02 UTC 2016 - jengelh@inai.de
- Abolish old macro use. Remove ancient %clean section.
Avoid sh invocation for simple ldconfig calls.
-------------------------------------------------------------------
+Tue Jul 19 23:41:00 UTC 2016 - Led <ledest@gmail.com>
+
+- 2.0.3
+
+-------------------------------------------------------------------
Sat Jul 9 11:38:48 UTC 2016 - cbrauner@suse.de
- add lxcfs dependency: lxc relies on lxcfs for a long time now to provide
@@ -628,6 +750,11 @@ Thu Jul 7 21:57:24 UTC 2016 - cbrauner@
* upstart: Force lxc-instance to behave like a good Upstart client
-------------------------------------------------------------------
+Mon Jun 20 00:32:00 UTC 2016 - Led <ledest@gmail.com>
+
+- git 0cd7f6f
+
+-------------------------------------------------------------------
Fri Jun 10 17:16:42 CEST 2016 - tiwai@suse.de
- Update to 2.0.1:
@@ -639,11 +766,38 @@ Fri Jun 10 17:16:42 CEST 2016 - tiwai@su
- Drop obsoleted patch:
lxc-1.0.7-fix-bashisms.patch
-------------------------------------------------------------------
+Fri Jun 03 10:18:00 UTC 2016 - Led <ledest@gmail.com>
+
+- 2.0.1
+- remove patches:
+ * lxc-2.0.0-fix-bashisms.patch
+
+-------------------------------------------------------------------
+Sun Apr 10 00:26:00 UTC 2016 - Led <ledest@gmail.com>
+
+- 2.0.0
+- update patches:
+ * lxc-2.0.0-fix-bashisms.patch
+ * lxc-2.0.0-ubuntu.patch
+- disable patches:
+ * lxc-1.1.3-alpine.patch
+
+-------------------------------------------------------------------
+Tue Nov 17 10:58:00 UTC 2015 - Led <ledest@gmail.com>
+
+- git ce4f39c
+
+-------------------------------------------------------------------
Tue Nov 17 09:52:17 UTC 2015 - t1loc@opensuse.org
- Update to 1.1.5
-------------------------------------------------------------------
+Sat Oct 10 19:19:00 UTC 2015 - Led <ledest@gmail.com>
+
+- 1.1.4
+
+-------------------------------------------------------------------
Wed Oct 7 09:25:41 UTC 2015 - t1loc@opensuse.org
- Remove attach-mount-a-sane-prox-for-LSM-setup.patch
@@ -659,12 +813,70 @@ Wed Oct 7 07:51:52 UTC 2015 - t1loc@ope
Now integrated into the current version
-------------------------------------------------------------------
+Mon Oct 05 20:37:00 UTC 2015 - Led <ledest@gmail.com>
+
+- git b7a1093
+
+--------------------------------------------------------------------
+Fri Oct 02 19:37:00 UTC 2015 - Led <ledest@gmail.com>
+
+- git dbcb844
+- remove patches:
+ * CVE-2015-1335-Protecti-container-mounts-against-symlinks.patch
+- add patches:
+ * lxc-1.1.3-git.patch
+
+-------------------------------------------------------------------
Thu Oct 1 12:37:11 UTC 2015 - cbosdonnat@suse.com
- Added CVE-2015-1335-Protecti-container-mounts-against-symlinks.patch
(bsc#946744)
-------------------------------------------------------------------
+Thu Aug 18 22:52:00 UTC 2015 - Led <ledest@gmail.com>
+
+- 1.1.3
+- update BuildRequires
+- remove patches:
+ * CVE-2015-1331-lxclock-use-run-lxc-lock-rather-than-r.patch
+ * attach-mount-a-sane-prox-for-LSM-setup.patch
+ * CVE-2015-1334-Don-t-use-the-container-s-proc-during-.patch
+ * templates-lxc-opensuse-use-rpm-to-determine-build-ve.patch
+- update patches:
+ * lxc-1.1.3-alpine.patch
+
+-------------------------------------------------------------------
+Wed Aug 13 00:08:00 UTC 2015 - Led <ledest@gmail.com>
+
+- fix template for openSUSE:
+ * use 13.2 as default release
+- add patches:
+ * lxc-1.1.2-opensuse.patch
+
+-------------------------------------------------------------------
+Tue Aug 12 23:24:00 UTC 2015 - Led <ledest@gmail.com>
+
+- fix template for Ubuntu:
+ * use Trusty as default release
+- add patches:
+ * lxc-1.1.2-ubuntu.patch
+
+-------------------------------------------------------------------
+Tue Aug 12 23:21:00 UTC 2015 - Led <ledest@gmail.com>
+
+- fix template for CentOS:
+ * use fedora.common.conf for CentOS 7
+- add patches:
+ * lxc-1.1.2-centos.patch
+
+-------------------------------------------------------------------
+Tue Aug 12 22:56:00 UTC 2015 - Led <ledest@gmail.com>
+
+- fix config and template for alpine
+- add patches:
+ * lxc-1.1.2-alpine.patch
+
+-------------------------------------------------------------------
Wed Aug 5 08:17:01 UTC 2015 - jslaby@suse.com
- Added templates-lxc-opensuse-use-rpm-to-determine-build-ve.patch
--- lxc.spec.orig
+++ lxc.spec
@@ -19,7 +19,7 @@
%define shlib_version 1
Name: lxc
Version: 2.0.9
-Release: 0
+Release: 7
Url: http://linuxcontainers.org/
Summary: Userspace tools for Linux kernel containers
License: LGPL-2.1+
@@ -30,17 +30,22 @@ Source2: %{name}.keyring
Source3: lxc-createconfig.in
Source4: README.SUSE
Source5: openSUSE_apparmor_mount.conf
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+#Patch0: %name-%version-git.patch
+Patch101: lxc-2.0.9-opensuse.patch
+Patch102: lxc-1.1.3-alpine.patch
+Patch103: lxc-1.1.2-centos.patch
+
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: libtool
BuildRequires: docbook-utils
BuildRequires: docbook2x
BuildRequires: fdupes
BuildRequires: git
BuildRequires: libapparmor-devel
BuildRequires: libcap-devel
-%ifarch %ix86 x86_64
BuildRequires: libseccomp-devel
-%endif
BuildRequires: libxslt
BuildRequires: linux-glibc-devel
BuildRequires: lsb-release
@@ -97,10 +102,15 @@ Requires: liblxc%{shlib_version} =
Provides the LXC container runtime library development files
%prep
-%setup
+%setup -q
+#patch0 -p1
+
+%patch101 -p1
+#patch102 -p1
+%patch103 -p1
%build
-chmod 755 configure
+autoreconf -fisv
%if 0%{?suse_version} >= 1320
sed -i 's/-Werror"/-Werror -Wno-error=format-truncation"/g' configure.ac
%define _configure ./autogen.sh
@@ -145,7 +155,8 @@ systemctl is-active -q apparmor && syste
%postun
%service_del_postun lxc@.service lxc.service lxc-net.service
-%post -n liblxc%{shlib_version} -p /sbin/ldconfig
+%post -n liblxc%{shlib_version} -p /sbin/ldconfig
+
%postun -n liblxc%{shlib_version} -p /sbin/ldconfig
%files
@@ -178,10 +189,8 @@ systemctl is-active -q apparmor && syste
%{_sbindir}/rclxc
%{_sbindir}/rclxc-net
%{_mandir}/man[^3]/*
-%_unitdir/%{name}.service
-%_unitdir/%{name}-net.service
-%_unitdir/%{name}@.service
-%python3_sitearch/%{name}/
+%_unitdir/*
+%python3_sitearch/%{name}
%python3_sitearch/_%{name}*
%config %{_sysconfdir}/bash_completion.d/%{name}
@@ -193,14 +202,10 @@ systemctl is-active -q apparmor && syste
%dir %{_sysconfdir}/apparmor.d
%dir %{_sysconfdir}/apparmor.d/abstractions
%dir %{_sysconfdir}/apparmor.d/abstractions/lxc
-%config %{_sysconfdir}/apparmor.d/abstractions/lxc/container-base
-%config %{_sysconfdir}/apparmor.d/abstractions/lxc/start-container
+%config %{_sysconfdir}/apparmor.d/abstractions/lxc/*
%config %{_sysconfdir}/apparmor.d/lxc-containers
%dir %{_sysconfdir}/apparmor.d/lxc
-%config %{_sysconfdir}/apparmor.d/lxc/lxc-default
-%config %{_sysconfdir}/apparmor.d/lxc/lxc-default-cgns
-%config %{_sysconfdir}/apparmor.d/lxc/lxc-default-with-mounting
-%config %{_sysconfdir}/apparmor.d/lxc/lxc-default-with-nesting
+%config %{_sysconfdir}/apparmor.d/lxc/*
%config %{_sysconfdir}/apparmor.d/usr.bin.lxc-start
%{_libexecdir}/%{name}/lxc-apparmor-load
%{_libexecdir}/%{name}/lxc-monitord
