lxc: update to version 1.1.5

diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile
index de9cecf1de4d5106e78361bfb8d9968bbddf14fc..4189eb0dd9507f45aa99b05d2c15dfcc51e143a5 100644 (file)
--- a/utils/lxc/Makefile
+++ b/utils/lxc/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lxc
-PKG_VERSION:=1.1.3
+PKG_VERSION:=1.1.5
 PKG_RELEASE:=1
 
 PKG_LICENSE:=LGPL-2.1+ BSD-2-Clause GPL-2.0
@@ -16,7 +16,7 @@ PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://linuxcontainers.org/downloads/lxc/
-PKG_MD5SUM:=197abb5a28ab0b689c737eb1951023fb
+PKG_MD5SUM:=dd9684dde0a58ed13f4f49c855b79a1a
 
 PKG_BUILD_DEPENDS:=lua
 PKG_BUILD_PARALLEL:=1

diff --git a/utils/lxc/patches/015-getline.patch b/utils/lxc/patches/015-getline.patch
index e2f002af99f91d58338da003b6d6bce709975ffe..2dfaa9bea5a652cc708604ce3658bbd66828ed50 100644 (file)
--- a/utils/lxc/patches/015-getline.patch
+++ b/utils/lxc/patches/015-getline.patch
@@ -1,7 +1,7 @@
 --- a/src/lxc/utils.h
 +++ b/src/lxc/utils.h
-@@ -44,11 +44,7 @@ extern char *get_rundir(void);
- extern const char *lxc_global_config_value(const char *option_name);
+@@ -41,11 +41,7 @@ extern int mkdir_p(const char *dir, mode
+ extern char *get_rundir(void);
  
  /* Define getline() if missing from the C library */
 -#ifndef HAVE_GETLINE

diff --git a/utils/lxc/patches/035-fix-undefined-lfd.patch b/utils/lxc/patches/035-fix-undefined-lfd.patch
index 6b57e2690235b0d5c10344240db49ac0a54dbe18..42e194c33f3961d42f8c927fb6f18e61168af410 100644 (file)
--- a/utils/lxc/patches/035-fix-undefined-lfd.patch
+++ b/utils/lxc/patches/035-fix-undefined-lfd.patch
@@ -1,12 +1,20 @@
 --- a/src/lxc/bdev.c
 +++ b/src/lxc/bdev.c
-@@ -1936,3 +1936,3 @@ static int loop_mount(struct bdev *bdev)
+@@ -1939,7 +1939,7 @@ static int find_free_loopdev(int *retfd,
+ 
+ static int loop_mount(struct bdev *bdev)
  {
 -      int lfd, ffd = -1, ret = -1;
 +      int lfd = -1, ffd = -1, ret = -1;
        struct loop_info64 lo;
-@@ -1974,3 +1974,3 @@ out:
+       char loname[100];
+ 
+@@ -1977,7 +1977,7 @@ out:
+       if (ffd > -1)
+               close(ffd);
        if (ret < 0) {
 -              close(lfd);
 +              if (lfd > -1) close(lfd);
                bdev->lofd = -1;
+       }
+       return ret;