Imported Upstream version 2.0.3

diff --git a/config/apparmor/abstractions/container-base b/config/apparmor/abstractions/container-base
index 0aacb6a..06290de 100644 (file)
--- a/config/apparmor/abstractions/container-base
+++ b/config/apparmor/abstractions/container-base
@@ -94,14 +94,15 @@
   deny /sys/kernel/debug/{,**} rwklx,
 
   # allow paths to be made slave, shared, private or unbindable
-  mount options=(rw,make-slave) -> **,
-  mount options=(rw,make-rslave) -> **,
-  mount options=(rw,make-shared) -> **,
-  mount options=(rw,make-rshared) -> **,
-  mount options=(rw,make-private) -> **,
-  mount options=(rw,make-rprivate) -> **,
-  mount options=(rw,make-unbindable) -> **,
-  mount options=(rw,make-runbindable) -> **,
+  # FIXME: This currently doesn't work due to the apparmor parser treating those as allowing all mounts.
+#  mount options=(rw,make-slave) -> **,
+#  mount options=(rw,make-rslave) -> **,
+#  mount options=(rw,make-shared) -> **,
+#  mount options=(rw,make-rshared) -> **,
+#  mount options=(rw,make-private) -> **,
+#  mount options=(rw,make-rprivate) -> **,
+#  mount options=(rw,make-unbindable) -> **,
+#  mount options=(rw,make-runbindable) -> **,
 
   # allow bind-mounts of anything except /proc, /sys and /dev
   mount options=(rw,bind) /[^spd]*{,/**},

diff --git a/config/bash/Makefile.in b/config/bash/Makefile.in
index f1e6eb9..93150b4 100644 (file)
--- a/config/bash/Makefile.in
+++ b/config/bash/Makefile.in
@@ -392,8 +392,8 @@ distclean-generic:
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-@ENABLE_BASH_FALSE@uninstall-local:
 @ENABLE_BASH_FALSE@install-data-local:
+@ENABLE_BASH_FALSE@uninstall-local:
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am

diff --git a/configure b/configure
index 5cfe8f3..32af99d 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for lxc 2.0.2.
+# Generated by GNU Autoconf 2.69 for lxc 2.0.3.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='lxc'
 PACKAGE_TARNAME='lxc'
-PACKAGE_VERSION='2.0.2'
-PACKAGE_STRING='lxc 2.0.2'
+PACKAGE_VERSION='2.0.3'
+PACKAGE_STRING='lxc 2.0.3'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1453,7 +1453,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures lxc 2.0.2 to adapt to many kinds of systems.
+\`configure' configures lxc 2.0.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1524,7 +1524,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of lxc 2.0.2:";;
+     short | recursive ) echo "Configuration of lxc 2.0.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1685,7 +1685,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-lxc configure 2.0.2
+lxc configure 2.0.3
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2150,7 +2150,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by lxc $as_me 2.0.2, which was
+It was created by lxc $as_me 2.0.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2621,7 +2621,7 @@ $as_echo "no" >&6; }
        fi
 fi
 
-LXC_VERSION_BASE=2.0.2
+LXC_VERSION_BASE=2.0.3
 
 
 
@@ -2629,11 +2629,11 @@ LXC_VERSION_MAJOR=2
 
 LXC_VERSION_MINOR=0
 
-LXC_VERSION_MICRO=2
+LXC_VERSION_MICRO=3
 
 LXC_VERSION_ABI=1.2.0
 
-LXC_VERSION=2.0.2
+LXC_VERSION=2.0.3
 
 
 
@@ -3154,7 +3154,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='lxc'
- VERSION='2.0.2'
+ VERSION='2.0.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -10121,7 +10121,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by lxc $as_me 2.0.2, which was
+This file was extended by lxc $as_me 2.0.3, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10191,7 +10191,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-lxc config.status 2.0.2
+lxc config.status 2.0.3
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index ad7f7c0..cb7f641 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 m4_define([lxc_version_major], 2)
 m4_define([lxc_version_minor], 0)
-m4_define([lxc_version_micro], 2)
+m4_define([lxc_version_micro], 3)
 m4_define([lxc_version_beta], [])
 m4_define([lxc_version_abi], 1.2.0)
 

diff --git a/lxc.spec b/lxc.spec
index e718ff9..e2e0ac8 100644 (file)
--- a/lxc.spec
+++ b/lxc.spec
@@ -60,7 +60,7 @@ BuildRequires: systemd
 %endif
 
 Name: lxc
-Version: 2.0.2
+Version: 2.0.3
 Release: %{?beta_rel:0.1.%{beta_rel}}%{?!beta_rel:%{norm_rel}}%{?dist}
 URL: http://linuxcontainers.org
 Source: http://linuxcontainers.org/downloads/%{name}-%{version}%{?beta_dot}.tar.gz

diff --git a/src/lxc/version.h b/src/lxc/version.h
index b9aa9b6..9d1d6cc 100644 (file)
--- a/src/lxc/version.h
+++ b/src/lxc/version.h
@@ -25,8 +25,8 @@
 
 #define LXC_VERSION_MAJOR 2
 #define LXC_VERSION_MINOR 0
-#define LXC_VERSION_MICRO 2
+#define LXC_VERSION_MICRO 3
 #define LXC_VERSION_ABI "1.2.0"
-#define LXC_VERSION "2.0.2"
+#define LXC_VERSION "2.0.3"
 
 #endif