From 1a003a8735dfbf011c1d658f2896673a043409e5 Mon Sep 17 00:00:00 2001
From: Luka Perkov <luka@openwrt.org>
Date: Wed, 25 Sep 2013 14:20:39 +0000
Subject: [PATCH] lxc: bump to latest git version

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38177
---
 utils/lxc/Makefile                  |  4 ++--
 utils/lxc/patches/010-compile.patch |  2 +-
 utils/lxc/patches/015-getline.patch | 25 +++++++++++++++++++++++++
 utils/lxc/patches/100-lxc-ps.patch  |  2 +-
 4 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 utils/lxc/patches/015-getline.patch

diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile
index e383e26ae..ee1713e34 100644
--- a/utils/lxc/Makefile
+++ b/utils/lxc/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lxc
-PKG_VERSION:=2013-05-16
+PKG_VERSION:=2013-09-24
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://github.com/lxc/lxc.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=e9831f83532184caa119f830eee54728084444ba
+PKG_SOURCE_VERSION:=9d0cda4f22f76d693e2ceef0f77f2ba24227433c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 
 PKG_BUILD_PARALLEL:=1
diff --git a/utils/lxc/patches/010-compile.patch b/utils/lxc/patches/010-compile.patch
index 381401383..ebc912f73 100644
--- a/utils/lxc/patches/010-compile.patch
+++ b/utils/lxc/patches/010-compile.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -11,29 +11,6 @@
+@@ -11,29 +11,6 @@ AC_CANONICAL_HOST
  AM_PROG_CC_C_O
  AC_GNU_SOURCE
  
diff --git a/utils/lxc/patches/015-getline.patch b/utils/lxc/patches/015-getline.patch
new file mode 100644
index 000000000..347929f8d
--- /dev/null
+++ b/utils/lxc/patches/015-getline.patch
@@ -0,0 +1,25 @@
+--- a/src/lxc/lxc_snapshot.c
++++ b/src/lxc/lxc_snapshot.c
+@@ -32,6 +32,8 @@
+ #include "arguments.h"
+ #include "utils.h"
+ 
++#include <../include/getline.h>
++
+ lxc_log_define(lxc_snapshot, lxc);
+ 
+ char *newname;
+--- a/src/lxc/lxc_user_nic.c
++++ b/src/lxc/lxc_user_nic.c
+@@ -43,11 +43,7 @@
+ #include <linux/sockios.h>
+ #include "config.h"
+ 
+-#ifndef HAVE_GETLINE
+-#ifdef HAVE_FGETLN
+ #include <../include/getline.h>
+-#endif
+-#endif
+ 
+ #if ISTEST
+ #define CONF_FILE "/tmp/lxc-usernet"
diff --git a/utils/lxc/patches/100-lxc-ps.patch b/utils/lxc/patches/100-lxc-ps.patch
index d12dd1713..0c1e8d434 100644
--- a/utils/lxc/patches/100-lxc-ps.patch
+++ b/utils/lxc/patches/100-lxc-ps.patch
@@ -1,6 +1,6 @@
 --- a/src/lxc/lxc-ps.in
 +++ b/src/lxc/lxc-ps.in
-@@ -91,7 +91,7 @@
+@@ -93,7 +93,7 @@ while true; do
  done
  
  if [ "$list_container_processes" -eq "1" ]; then
-- 
2.30.2