From fd9020fe6dccbd84e1453800890883c9ed69c905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Thu, 10 Oct 2013 09:33:30 +0300 Subject: main/lxc: fix uclibc build after musl fix --- main/lxc/APKBUILD | 8 +- main/lxc/lxc-fix-headers.patch | 265 +++++++++++++++++++++++++++-------------- 2 files changed, 178 insertions(+), 95 deletions(-) diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD index 4d59192ef..40e0636a9 100644 --- a/main/lxc/APKBUILD +++ b/main/lxc/APKBUILD @@ -3,7 +3,7 @@ pkgname=lxc pkgver=0.9.0 _mypkgver=${pkgver/_rc/-rc} -pkgrel=3 +pkgrel=4 pkgdesc="linux containers - tools" url="http://lxc.sourceforge.net/" arch="all" @@ -62,7 +62,7 @@ e96514860ee34b62d1b208ab03c569bc bb-shutdown.patch 25dd200bd158d16a05bb3e7aaef84697 alpine-template-backport.patch e08b77b3b35adac290b49b9c9e04754c 0001-lxc-alpine-create-dev-zero.patch 181c01649399b2c2dbadab9713381358 0002-lxc-alpine-add-arm.patch -bcd59a1ca21bf83cb902b7ebe6cbced5 lxc-fix-headers.patch +24e7ae51da3c8c483d5228b821cc7244 lxc-fix-headers.patch f3c6998798b13425b8d0647bad0834a8 lxc.initd" sha256sums="1e1767eae6cc5fbf892c0e193d25da420ba19f2db203716c38f7cdea3b654120 lxc-0.9.0.tar.gz c9caea06b87baf5e335821c7e9ce3caca849b33f8176fbd48126c605583e78fc bb-rm.patch @@ -70,7 +70,7 @@ c9caea06b87baf5e335821c7e9ce3caca849b33f8176fbd48126c605583e78fc bb-rm.patch df193c4cf08e171c23b0b472750b7b1e0e7a66971c03201a0523e4039909f33b alpine-template-backport.patch 8b3b314d99209ae27d78cd4e9469638a945d68d03beefaec499bad373a7cb8cd 0001-lxc-alpine-create-dev-zero.patch 415e28eae4d0611c899509835c70e82a06b2bae0b8f380b40de6eb0b5a039684 0002-lxc-alpine-add-arm.patch -9e51ceb970e83b300f7dc6cded724f88da54a5ceb6ed71171144151bc9ac5138 lxc-fix-headers.patch +82d584e30b1963bd638b5a640b2788d8ac3757b480f61fd2ab55a09b9a6f4ccd lxc-fix-headers.patch 77c64e6137457be89c150b82d681a3eb5c7c1f06af142a321703fc9a43bff200 lxc.initd" sha512sums="a96133660ca6ea45dc4b8d167267120328577339e933ff9510f03e9d368ca5db77031dc1e7e4529b3e506f63f79c2ce3f8f72571a7dfdbeb2a8799777782a606 lxc-0.9.0.tar.gz b8fe47af6b1341ca472b6337c304f52402c53d400fc1d13895f2f568dd4d81b9ff281efc70bc1ddc221ac457db3bed4a199491059a15f66755deddc93ce91bf1 bb-rm.patch @@ -78,5 +78,5 @@ b8fe47af6b1341ca472b6337c304f52402c53d400fc1d13895f2f568dd4d81b9ff281efc70bc1ddc d10e25aeee0aba61a4c3420fe1b2bfd9213e7ef10f399ed5f0ba5d978a97a49fd23044b098f73f6d9651c23b1bb025f30d81deb6aec9edf4d2267afc22a09d60 alpine-template-backport.patch 0304aabfac3280cbc18347f1168b2289a98e03b9f6a3134770e43bb914978a64a108a0b0ec709856db161e98366c06c8a65d5a30e730add4cee2968718cdc93a 0001-lxc-alpine-create-dev-zero.patch d1860b5a47303762ec82d65c2f2c6feaac0115aeb2ddaaf6c052085e9b8dc1d8f6bd05af1c8596c7c978391af75cbe97b38f98f37dd036d61bd9cea9b81226dd 0002-lxc-alpine-add-arm.patch -9f33cd349cca920221b73c07714607e15cd3c4a873ce44600d745c42df1214000448776244c787d14127c4e05645ad8d33dd4d4604193a9e41ec6655f0da1f9e lxc-fix-headers.patch +2c4138e57021714d66bd4d30cfedd768965a0ec11776363b83db7d4efa8c06901c42ee1ad13dff68fd8e3e6a1c34034c529c1f8995d9d3a57a318bc7023fbc05 lxc-fix-headers.patch 4e56f7b869345f936df54c4359abdd3b8d0244c0fd71a9a787bc2393c4caabca22ca8417f16da47f02c86294750986fd674d0d2e7c1b1d096076873b22c07a29 lxc.initd" diff --git a/main/lxc/lxc-fix-headers.patch b/main/lxc/lxc-fix-headers.patch index 229f3aade..bc7f8e59c 100644 --- a/main/lxc/lxc-fix-headers.patch +++ b/main/lxc/lxc-fix-headers.patch @@ -1,6 +1,6 @@ -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lua-lxc/core.c lxc-0.9.0/src/lua-lxc/core.c ---- lxc-0.9.0.orig/src/lua-lxc/core.c 2013-03-18 22:17:00.000000000 +0000 -+++ lxc-0.9.0/src/lua-lxc/core.c 2013-09-10 12:07:34.069998459 +0000 +diff -ru lxc-0.9.0.orig/src/lua-lxc/core.c lxc-0.9.0/src/lua-lxc/core.c +--- lxc-0.9.0.orig/src/lua-lxc/core.c 2013-10-10 09:22:58.841387605 +0300 ++++ lxc-0.9.0/src/lua-lxc/core.c 2013-10-10 09:23:13.847971218 +0300 @@ -21,7 +21,6 @@ */ @@ -9,9 +9,9 @@ diff -x '*.Po' -ru lxc-0.9.0.orig/src/lua-lxc/core.c lxc-0.9.0/src/lua-lxc/core. #include #include #include -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/attach.c lxc-0.9.0/src/lxc/attach.c ---- lxc-0.9.0.orig/src/lxc/attach.c 2013-04-05 09:45:22.000000000 +0000 -+++ lxc-0.9.0/src/lxc/attach.c 2013-09-10 12:18:59.499998326 +0000 +diff -ru lxc-0.9.0.orig/src/lxc/attach.c lxc-0.9.0/src/lxc/attach.c +--- lxc-0.9.0.orig/src/lxc/attach.c 2013-10-10 09:22:58.841387605 +0300 ++++ lxc-0.9.0/src/lxc/attach.c 2013-10-10 09:23:13.847971218 +0300 @@ -21,13 +21,14 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -36,9 +36,9 @@ diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/attach.c lxc-0.9.0/src/lxc/attach.c #include "apparmor.h" lxc_log_define(lxc_attach, lxc); -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/caps.c lxc-0.9.0/src/lxc/caps.c ---- lxc-0.9.0.orig/src/lxc/caps.c 2013-03-19 10:17:26.000000000 +0000 -+++ lxc-0.9.0/src/lxc/caps.c 2013-09-10 12:19:34.019998319 +0000 +diff -ru lxc-0.9.0.orig/src/lxc/caps.c lxc-0.9.0/src/lxc/caps.c +--- lxc-0.9.0.orig/src/lxc/caps.c 2013-10-10 09:22:58.841387605 +0300 ++++ lxc-0.9.0/src/lxc/caps.c 2013-10-10 09:23:13.847971218 +0300 @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -56,22 +56,31 @@ diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/caps.c lxc-0.9.0/src/lxc/caps.c #include "log.h" lxc_log_define(lxc_caps, lxc); -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/cgroup.c lxc-0.9.0/src/lxc/cgroup.c ---- lxc-0.9.0.orig/src/lxc/cgroup.c 2013-03-19 10:17:26.000000000 +0000 -+++ lxc-0.9.0/src/lxc/cgroup.c 2013-09-10 12:07:34.149998459 +0000 -@@ -20,9 +20,7 @@ +diff -ru lxc-0.9.0.orig/src/lxc/cgroup.c lxc-0.9.0/src/lxc/cgroup.c +--- lxc-0.9.0.orig/src/lxc/cgroup.c 2013-10-10 09:22:58.841387605 +0300 ++++ lxc-0.9.0/src/lxc/cgroup.c 2013-10-10 09:28:10.249698806 +0300 +@@ -20,9 +20,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define _GNU_SOURCE ++#include "config.h" #include -#undef _GNU_SOURCE #include #include #include -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/commands.c lxc-0.9.0/src/lxc/commands.c ---- lxc-0.9.0.orig/src/lxc/commands.c 2013-03-19 10:17:26.000000000 +0000 -+++ lxc-0.9.0/src/lxc/commands.c 2013-09-10 12:10:17.479998427 +0000 +@@ -37,7 +36,6 @@ + #include + + #include "error.h" +-#include "config.h" + #include "commands.h" + + #include +diff -ru lxc-0.9.0.orig/src/lxc/commands.c lxc-0.9.0/src/lxc/commands.c +--- lxc-0.9.0.orig/src/lxc/commands.c 2013-10-10 09:22:58.841387605 +0300 ++++ lxc-0.9.0/src/lxc/commands.c 2013-10-10 09:23:13.851304534 +0300 @@ -28,7 +28,7 @@ #include #include @@ -81,69 +90,105 @@ diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/commands.c lxc-0.9.0/src/lxc/commands. #include #include #include -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/conf.c lxc-0.9.0/src/lxc/conf.c ---- lxc-0.9.0.orig/src/lxc/conf.c 2013-04-05 09:45:22.000000000 +0000 -+++ lxc-0.9.0/src/lxc/conf.c 2013-09-10 12:07:34.239998459 +0000 -@@ -20,9 +20,7 @@ +diff -ru lxc-0.9.0.orig/src/lxc/conf.c lxc-0.9.0/src/lxc/conf.c +--- lxc-0.9.0.orig/src/lxc/conf.c 2013-10-10 09:22:58.844720784 +0300 ++++ lxc-0.9.0/src/lxc/conf.c 2013-10-10 09:28:30.296256871 +0300 +@@ -20,9 +20,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define _GNU_SOURCE ++#include "config.h" #include -#undef _GNU_SOURCE #include #include #include -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/confile.c lxc-0.9.0/src/lxc/confile.c ---- lxc-0.9.0.orig/src/lxc/confile.c 2013-04-05 09:45:22.000000000 +0000 -+++ lxc-0.9.0/src/lxc/confile.c 2013-09-10 12:07:34.299998459 +0000 -@@ -20,7 +20,6 @@ +@@ -58,7 +57,6 @@ + #include "network.h" + #include "error.h" + #include "parse.h" +-#include "config.h" + #include "utils.h" + #include "conf.h" + #include "log.h" +diff -ru lxc-0.9.0.orig/src/lxc/confile.c lxc-0.9.0/src/lxc/confile.c +--- lxc-0.9.0.orig/src/lxc/confile.c 2013-10-10 09:22:58.844720784 +0300 ++++ lxc-0.9.0/src/lxc/confile.c 2013-10-10 09:28:45.472841319 +0300 +@@ -20,7 +20,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define _GNU_SOURCE ++#include "config.h" #include #include #include -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/freezer.c lxc-0.9.0/src/lxc/freezer.c ---- lxc-0.9.0.orig/src/lxc/freezer.c 2013-03-19 10:17:26.000000000 +0000 -+++ lxc-0.9.0/src/lxc/freezer.c 2013-09-10 12:07:34.329998459 +0000 -@@ -20,9 +20,7 @@ +@@ -38,7 +38,6 @@ + #include + + #include "parse.h" +-#include "config.h" + #include "confile.h" + #include "utils.h" + +diff -ru lxc-0.9.0.orig/src/lxc/freezer.c lxc-0.9.0/src/lxc/freezer.c +--- lxc-0.9.0.orig/src/lxc/freezer.c 2013-10-10 09:22:58.844720784 +0300 ++++ lxc-0.9.0/src/lxc/freezer.c 2013-10-10 09:29:01.486087901 +0300 +@@ -20,9 +20,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define _GNU_SOURCE ++#include "config.h" #include -#undef _GNU_SOURCE #include #include #include -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/lxc_attach.c lxc-0.9.0/src/lxc/lxc_attach.c ---- lxc-0.9.0.orig/src/lxc/lxc_attach.c 2013-04-05 09:45:22.000000000 +0000 -+++ lxc-0.9.0/src/lxc/lxc_attach.c 2013-09-10 12:07:34.379998459 +0000 -@@ -21,7 +21,6 @@ +diff -ru lxc-0.9.0.orig/src/lxc/lxc_attach.c lxc-0.9.0/src/lxc/lxc_attach.c +--- lxc-0.9.0.orig/src/lxc/lxc_attach.c 2013-10-10 09:22:58.844720784 +0300 ++++ lxc-0.9.0/src/lxc/lxc_attach.c 2013-10-10 09:29:19.079325924 +0300 +@@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define _GNU_SOURCE ++#include "config.h" #include #include #include -Binary files lxc-0.9.0.orig/src/lxc/lxc_attach.o and lxc-0.9.0/src/lxc/lxc_attach.o differ -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/lxc_checkpoint.c lxc-0.9.0/src/lxc/lxc_checkpoint.c ---- lxc-0.9.0.orig/src/lxc/lxc_checkpoint.c 2013-03-19 10:17:26.000000000 +0000 -+++ lxc-0.9.0/src/lxc/lxc_checkpoint.c 2013-09-10 12:07:34.379998459 +0000 -@@ -20,7 +20,6 @@ +@@ -36,7 +36,6 @@ + #include "arguments.h" + #include "caps.h" + #include "cgroup.h" +-#include "config.h" + #include "confile.h" + #include "start.h" + #include "sync.h" +diff -ru lxc-0.9.0.orig/src/lxc/lxc_checkpoint.c lxc-0.9.0/src/lxc/lxc_checkpoint.c +--- lxc-0.9.0.orig/src/lxc/lxc_checkpoint.c 2013-10-10 09:22:58.844720784 +0300 ++++ lxc-0.9.0/src/lxc/lxc_checkpoint.c 2013-10-10 09:25:41.587170847 +0300 +@@ -20,7 +20,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define _GNU_SOURCE ++#include "config.h" #include #include #include -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/lxc_console.c lxc-0.9.0/src/lxc/lxc_console.c ---- lxc-0.9.0.orig/src/lxc/lxc_console.c 2013-03-19 10:17:26.000000000 +0000 -+++ lxc-0.9.0/src/lxc/lxc_console.c 2013-09-10 12:10:46.179998421 +0000 +@@ -35,7 +35,6 @@ + #include + + #include "arguments.h" +-#include "config.h" + #include "caps.h" + + lxc_log_define(lxc_checkpoint_ui, lxc_checkpoint); +diff -ru lxc-0.9.0.orig/src/lxc/lxc_console.c lxc-0.9.0/src/lxc/lxc_console.c +--- lxc-0.9.0.orig/src/lxc/lxc_console.c 2013-10-10 09:22:58.844720784 +0300 ++++ lxc-0.9.0/src/lxc/lxc_console.c 2013-10-10 09:23:13.854637849 +0300 @@ -21,9 +21,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -163,20 +208,29 @@ diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/lxc_console.c lxc-0.9.0/src/lxc/lxc_co #include #include "error.h" -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/lxc_execute.c lxc-0.9.0/src/lxc/lxc_execute.c ---- lxc-0.9.0.orig/src/lxc/lxc_execute.c 2013-03-19 10:17:26.000000000 +0000 -+++ lxc-0.9.0/src/lxc/lxc_execute.c 2013-09-10 12:07:34.399998459 +0000 -@@ -20,7 +20,6 @@ +diff -ru lxc-0.9.0.orig/src/lxc/lxc_execute.c lxc-0.9.0/src/lxc/lxc_execute.c +--- lxc-0.9.0.orig/src/lxc/lxc_execute.c 2013-10-10 09:22:58.848053921 +0300 ++++ lxc-0.9.0/src/lxc/lxc_execute.c 2013-10-10 09:25:21.023948914 +0300 +@@ -20,7 +20,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define _GNU_SOURCE ++#include "config.h" #include #include #include -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/lxc_init.c lxc-0.9.0/src/lxc/lxc_init.c ---- lxc-0.9.0.orig/src/lxc/lxc_init.c 2013-03-19 10:17:26.000000000 +0000 -+++ lxc-0.9.0/src/lxc/lxc_init.c 2013-09-10 12:07:34.409998459 +0000 +@@ -37,7 +37,6 @@ + #include "conf.h" + #include "confile.h" + #include "arguments.h" +-#include "config.h" + #include "start.h" + #include "utils.h" + +diff -ru lxc-0.9.0.orig/src/lxc/lxc_init.c lxc-0.9.0/src/lxc/lxc_init.c +--- lxc-0.9.0.orig/src/lxc/lxc_init.c 2013-10-10 09:22:58.848053921 +0300 ++++ lxc-0.9.0/src/lxc/lxc_init.c 2013-10-10 09:23:13.854637849 +0300 @@ -30,7 +30,6 @@ #include #include @@ -185,35 +239,53 @@ diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/lxc_init.c lxc-0.9.0/src/lxc/lxc_init. #include #include "log.h" -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/lxc_restart.c lxc-0.9.0/src/lxc/lxc_restart.c ---- lxc-0.9.0.orig/src/lxc/lxc_restart.c 2013-03-19 10:17:26.000000000 +0000 -+++ lxc-0.9.0/src/lxc/lxc_restart.c 2013-09-10 12:07:34.419998459 +0000 -@@ -20,9 +20,7 @@ +diff -ru lxc-0.9.0.orig/src/lxc/lxc_restart.c lxc-0.9.0/src/lxc/lxc_restart.c +--- lxc-0.9.0.orig/src/lxc/lxc_restart.c 2013-10-10 09:22:58.848053921 +0300 ++++ lxc-0.9.0/src/lxc/lxc_restart.c 2013-10-10 09:25:59.123742508 +0300 +@@ -20,9 +20,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define _GNU_SOURCE ++#include "config.h" #include -#undef _GNU_SOURCE #include #include #include -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/lxc_start.c lxc-0.9.0/src/lxc/lxc_start.c ---- lxc-0.9.0.orig/src/lxc/lxc_start.c 2013-03-19 10:17:26.000000000 +0000 -+++ lxc-0.9.0/src/lxc/lxc_start.c 2013-09-10 12:07:34.429998459 +0000 -@@ -20,9 +20,7 @@ +@@ -33,7 +32,6 @@ + #include "lxc.h" + #include "caps.h" + #include "conf.h" +-#include "config.h" + #include "confile.h" + #include "arguments.h" + #include "utils.h" +diff -ru lxc-0.9.0.orig/src/lxc/lxc_start.c lxc-0.9.0/src/lxc/lxc_start.c +--- lxc-0.9.0.orig/src/lxc/lxc_start.c 2013-10-10 09:22:58.848053921 +0300 ++++ lxc-0.9.0/src/lxc/lxc_start.c 2013-10-10 09:24:30.684221628 +0300 +@@ -20,9 +20,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define _GNU_SOURCE ++#include "config.h" #include -#undef _GNU_SOURCE #include #include #include -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/lxc_unshare.c lxc-0.9.0/src/lxc/lxc_unshare.c ---- lxc-0.9.0.orig/src/lxc/lxc_unshare.c 2013-03-19 10:17:27.000000000 +0000 -+++ lxc-0.9.0/src/lxc/lxc_unshare.c 2013-09-10 12:07:34.439998459 +0000 +@@ -46,7 +45,6 @@ + #include "conf.h" + #include "cgroup.h" + #include "utils.h" +-#include "config.h" + #include "confile.h" + #include "arguments.h" + +diff -ru lxc-0.9.0.orig/src/lxc/lxc_unshare.c lxc-0.9.0/src/lxc/lxc_unshare.c +--- lxc-0.9.0.orig/src/lxc/lxc_unshare.c 2013-10-10 09:22:58.848053921 +0300 ++++ lxc-0.9.0/src/lxc/lxc_unshare.c 2013-10-10 09:23:13.854637849 +0300 @@ -20,9 +20,7 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA @@ -224,9 +296,9 @@ diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/lxc_unshare.c lxc-0.9.0/src/lxc/lxc_un #include #include #include -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/lxccontainer.c lxc-0.9.0/src/lxc/lxccontainer.c ---- lxc-0.9.0.orig/src/lxc/lxccontainer.c 2013-04-05 09:45:22.000000000 +0000 -+++ lxc-0.9.0/src/lxc/lxccontainer.c 2013-09-10 12:21:27.039998297 +0000 +diff -ru lxc-0.9.0.orig/src/lxc/lxccontainer.c lxc-0.9.0/src/lxc/lxccontainer.c +--- lxc-0.9.0.orig/src/lxc/lxccontainer.c 2013-10-10 09:22:58.848053921 +0300 ++++ lxc-0.9.0/src/lxc/lxccontainer.c 2013-10-10 09:23:13.854637849 +0300 @@ -800,7 +800,7 @@ if (pid < 0) return false; @@ -236,9 +308,9 @@ diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/lxccontainer.c lxc-0.9.0/src/lxc/lxcco perror("execl"); exit(1); } -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/lxclock.c lxc-0.9.0/src/lxc/lxclock.c ---- lxc-0.9.0.orig/src/lxc/lxclock.c 2013-03-19 10:17:26.000000000 +0000 -+++ lxc-0.9.0/src/lxc/lxclock.c 2013-09-10 12:20:50.019998304 +0000 +diff -ru lxc-0.9.0.orig/src/lxc/lxclock.c lxc-0.9.0/src/lxc/lxclock.c +--- lxc-0.9.0.orig/src/lxc/lxclock.c 2013-10-10 09:22:58.848053921 +0300 ++++ lxc-0.9.0/src/lxc/lxclock.c 2013-10-10 09:23:13.854637849 +0300 @@ -18,8 +18,8 @@ */ @@ -249,9 +321,9 @@ diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/lxclock.c lxc-0.9.0/src/lxc/lxclock.c #define OFLAG (O_CREAT | O_RDWR) #define SEMMODE 0660 -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/lxcutmp.c lxc-0.9.0/src/lxc/lxcutmp.c ---- lxc-0.9.0.orig/src/lxc/lxcutmp.c 2013-03-19 10:17:28.000000000 +0000 -+++ lxc-0.9.0/src/lxc/lxcutmp.c 2013-09-10 12:29:25.499998205 +0000 +diff -ru lxc-0.9.0.orig/src/lxc/lxcutmp.c lxc-0.9.0/src/lxc/lxcutmp.c +--- lxc-0.9.0.orig/src/lxc/lxcutmp.c 2013-10-10 09:22:58.848053921 +0300 ++++ lxc-0.9.0/src/lxc/lxcutmp.c 2013-10-10 09:23:13.854637849 +0300 @@ -63,6 +63,8 @@ #include "lxc.h" #include "log.h" @@ -261,33 +333,44 @@ diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/lxcutmp.c lxc-0.9.0/src/lxc/lxcutmp.c #ifndef __USE_GNU #define __USE_GNU #endif -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/network.c lxc-0.9.0/src/lxc/network.c ---- lxc-0.9.0.orig/src/lxc/network.c 2013-03-19 10:17:28.000000000 +0000 -+++ lxc-0.9.0/src/lxc/network.c 2013-09-10 12:07:34.539998459 +0000 -@@ -20,7 +20,6 @@ +diff -ru lxc-0.9.0.orig/src/lxc/network.c lxc-0.9.0/src/lxc/network.c +--- lxc-0.9.0.orig/src/lxc/network.c 2013-10-10 09:22:58.848053921 +0300 ++++ lxc-0.9.0/src/lxc/network.c 2013-10-10 09:30:26.518960572 +0300 +@@ -20,9 +20,8 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define _GNU_SOURCE ++#include "config.h" #include - #undef _GNU_SOURCe +-#undef _GNU_SOURCe #include -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/parse.c lxc-0.9.0/src/lxc/parse.c ---- lxc-0.9.0.orig/src/lxc/parse.c 2013-03-19 10:17:28.000000000 +0000 -+++ lxc-0.9.0/src/lxc/parse.c 2013-09-10 12:07:34.559998459 +0000 -@@ -20,9 +20,7 @@ + #include + #include +diff -ru lxc-0.9.0.orig/src/lxc/parse.c lxc-0.9.0/src/lxc/parse.c +--- lxc-0.9.0.orig/src/lxc/parse.c 2013-10-10 09:22:58.848053921 +0300 ++++ lxc-0.9.0/src/lxc/parse.c 2013-10-10 09:23:30.724546457 +0300 +@@ -20,16 +20,14 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define _GNU_SOURCE ++#include "config.h" #include -#undef _GNU_SOURCE #include #include #include -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/restart.c lxc-0.9.0/src/lxc/restart.c ---- lxc-0.9.0.orig/src/lxc/restart.c 2013-03-19 10:17:28.000000000 +0000 -+++ lxc-0.9.0/src/lxc/restart.c 2013-09-10 12:07:34.559998459 +0000 + #include + + #include "parse.h" +-#include "config.h" + #include + + /* Define getline() if missing from the C library */ +diff -ru lxc-0.9.0.orig/src/lxc/restart.c lxc-0.9.0/src/lxc/restart.c +--- lxc-0.9.0.orig/src/lxc/restart.c 2013-10-10 09:22:58.851387051 +0300 ++++ lxc-0.9.0/src/lxc/restart.c 2013-10-10 09:23:13.857971164 +0300 @@ -24,7 +24,6 @@ #include "config.h" @@ -296,9 +379,9 @@ diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/restart.c lxc-0.9.0/src/lxc/restart.c #include #include #include -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/seccomp.c lxc-0.9.0/src/lxc/seccomp.c ---- lxc-0.9.0.orig/src/lxc/seccomp.c 2013-03-19 10:17:28.000000000 +0000 -+++ lxc-0.9.0/src/lxc/seccomp.c 2013-09-10 12:07:34.579998459 +0000 +diff -ru lxc-0.9.0.orig/src/lxc/seccomp.c lxc-0.9.0/src/lxc/seccomp.c +--- lxc-0.9.0.orig/src/lxc/seccomp.c 2013-10-10 09:22:58.851387051 +0300 ++++ lxc-0.9.0/src/lxc/seccomp.c 2013-10-10 09:23:13.857971164 +0300 @@ -21,7 +21,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -307,9 +390,9 @@ diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/seccomp.c lxc-0.9.0/src/lxc/seccomp.c #include #include #include -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/start.c lxc-0.9.0/src/lxc/start.c ---- lxc-0.9.0.orig/src/lxc/start.c 2013-04-05 09:45:22.000000000 +0000 -+++ lxc-0.9.0/src/lxc/start.c 2013-09-10 12:10:30.929998424 +0000 +diff -ru lxc-0.9.0.orig/src/lxc/start.c lxc-0.9.0/src/lxc/start.c +--- lxc-0.9.0.orig/src/lxc/start.c 2013-10-10 09:22:58.851387051 +0300 ++++ lxc-0.9.0/src/lxc/start.c 2013-10-10 09:23:13.857971164 +0300 @@ -24,7 +24,6 @@ #include "config.h" @@ -327,9 +410,9 @@ diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/start.c lxc-0.9.0/src/lxc/start.c #include #if HAVE_SYS_CAPABILITY_H -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/utils.c lxc-0.9.0/src/lxc/utils.c ---- lxc-0.9.0.orig/src/lxc/utils.c 2013-03-19 10:17:28.000000000 +0000 -+++ lxc-0.9.0/src/lxc/utils.c 2013-09-10 12:07:34.629998459 +0000 +diff -ru lxc-0.9.0.orig/src/lxc/utils.c lxc-0.9.0/src/lxc/utils.c +--- lxc-0.9.0.orig/src/lxc/utils.c 2013-10-10 09:22:58.851387051 +0300 ++++ lxc-0.9.0/src/lxc/utils.c 2013-10-10 09:23:13.857971164 +0300 @@ -21,7 +21,6 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -338,9 +421,9 @@ diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/utils.c lxc-0.9.0/src/lxc/utils.c #include #include #include -diff -x '*.Po' -ru lxc-0.9.0.orig/src/lxc/utils.h lxc-0.9.0/src/lxc/utils.h ---- lxc-0.9.0.orig/src/lxc/utils.h 2013-03-19 10:17:28.000000000 +0000 -+++ lxc-0.9.0/src/lxc/utils.h 2013-09-10 12:17:15.499998346 +0000 +diff -ru lxc-0.9.0.orig/src/lxc/utils.h lxc-0.9.0/src/lxc/utils.h +--- lxc-0.9.0.orig/src/lxc/utils.h 2013-10-10 09:22:58.851387051 +0300 ++++ lxc-0.9.0/src/lxc/utils.h 2013-10-10 09:23:13.857971164 +0300 @@ -23,6 +23,8 @@ #ifndef _utils_h #define _utils_h -- cgit v1.2.3