diff --git a/pkgs/os-specific/linux/lxc/default.nix b/pkgs/os-specific/linux/lxc/default.nix index 8f60ff2554bf..c2a9deaa11f2 100644 --- a/pkgs/os-specific/linux/lxc/default.nix +++ b/pkgs/os-specific/linux/lxc/default.nix @@ -1,34 +1,33 @@ { stdenv, fetchurl, libcap, apparmor, perl, docbook2x, docbook_xml_dtd_45 }: stdenv.mkDerivation rec { - name = "lxc-0.8.0"; + name = "lxc-0.9.0"; src = fetchurl { url = "http://lxc.sf.net/download/lxc/${name}.tar.gz"; - sha256 = "0b3912mal1n56i1v5f3aplm7shqnlz24p0znpva27r4l1drk7j7a"; + sha256 = "0821clxymkgp71n720xj5ngs22s2v8jks68f5j4vypycwvm6f5qy"; }; buildInputs = [ libcap apparmor perl docbook2x ]; patches = [ - ./dont-run-ldconfig.patch - ./fix-documentation-build.patch - ./fix-sgml-documentation.patch + ./dont-run-ldconfig.patch + ./install-localstatedir-in-store.patch + ./support-db2x.patch ]; preConfigure = "export XML_CATALOG_FILES=${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; - configureFlags = "--localstatedir=/var"; - - postInstall = '' - cd "$out/lib" - lib=liblxc.so.?.* - ln -s $lib $(echo $lib | sed -re 's/(liblxc[.]so[.].)[.].*/\1/') - ''; + configureFlags = [ + "--localstatedir=/var" + "--enable-doc" + "--enable-tests" + "--enable-apparmor" + ]; meta = { homepage = "http://lxc.sourceforge.net"; - description = "lightweight virtual system mechanism"; + description = "userspace tools for Linux Containers, a lightweight virtualization system"; license = stdenv.lib.licenses.lgpl21Plus; longDescription = '' diff --git a/pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch b/pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch index e72ac0250f51..6904eec5175a 100644 --- a/pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch +++ b/pkgs/os-specific/linux/lxc/dont-run-ldconfig.patch @@ -1,24 +1,22 @@ -diff -ubr lxc-0.7.5-orig/src/lxc/Makefile.am lxc-0.7.5/src/lxc/Makefile.am ---- lxc-0.7.5-orig/src/lxc/Makefile.am 2011-07-25 00:27:10.000000000 +0200 -+++ lxc-0.7.5/src/lxc/Makefile.am 2011-09-26 09:58:03.479916848 +0200 -@@ -115,7 +115,7 @@ - - install-exec-local: install-soPROGRAMS +diff -ubr lxc-0.9.0-orig/src/lxc/Makefile.am lxc-0.9.0/src/lxc/Makefile.am +--- lxc-0.9.0-orig/src/lxc/Makefile.am 2013-04-15 10:50:22.898102973 +0200 ++++ lxc-0.9.0/src/lxc/Makefile.am 2013-04-15 10:50:44.264862808 +0200 +@@ -193,7 +193,6 @@ + mkdir -p $(DESTDIR)$(datadir)/lxc + install -c -m 644 lxc.functions $(DESTDIR)$(datadir)/lxc mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) - /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) -+ : /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) cd $(DESTDIR)$(libdir); \ + ln -sf liblxc.so.$(VERSION) liblxc.so.$(firstword $(subst ., ,$(VERSION))); \ ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so - -diff -ubr lxc-0.7.5-orig/src/lxc/Makefile.in lxc-0.7.5/src/lxc/Makefile.in ---- lxc-0.7.5-orig/src/lxc/Makefile.in 2011-08-11 19:02:19.000000000 +0200 -+++ lxc-0.7.5/src/lxc/Makefile.in 2011-09-26 09:58:18.812685181 +0200 -@@ -1322,7 +1322,7 @@ - - install-exec-local: install-soPROGRAMS +diff -ubr lxc-0.9.0-orig/src/lxc/Makefile.in lxc-0.9.0/src/lxc/Makefile.in +--- lxc-0.9.0-orig/src/lxc/Makefile.in 2013-04-15 10:50:22.898102973 +0200 ++++ lxc-0.9.0/src/lxc/Makefile.in 2013-04-15 10:51:08.755810177 +0200 +@@ -1519,7 +1519,6 @@ + mkdir -p $(DESTDIR)$(datadir)/lxc + install -c -m 644 lxc.functions $(DESTDIR)$(datadir)/lxc mv $(DESTDIR)$(libdir)/liblxc.so $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) - /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) -+ : /sbin/ldconfig -l $(DESTDIR)$(libdir)/liblxc.so.$(VERSION) cd $(DESTDIR)$(libdir); \ + ln -sf liblxc.so.$(VERSION) liblxc.so.$(firstword $(subst ., ,$(VERSION))); \ ln -sf liblxc.so.$(firstword $(subst ., ,$(VERSION))) liblxc.so - diff --git a/pkgs/os-specific/linux/lxc/fix-documentation-build.patch b/pkgs/os-specific/linux/lxc/fix-documentation-build.patch deleted file mode 100644 index 0189b35a33e9..000000000000 --- a/pkgs/os-specific/linux/lxc/fix-documentation-build.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff -ubr '--exclude=*sgml*' lxc-0.7.5-orig/doc/Makefile.am lxc-0.7.5/doc/Makefile.am ---- lxc-0.7.5-orig/doc/Makefile.am 2011-02-14 09:14:07.000000000 +0100 -+++ lxc-0.7.5/doc/Makefile.am 2011-09-26 09:53:02.192817940 +0200 -@@ -30,13 +30,13 @@ - - - %.1 : %.sgml -- docbook2man -w all $< -+ docbook2man $< - - %.5 : %.sgml -- docbook2man -w all $< -+ docbook2man $< - - %.7 : %.sgml -- docbook2man -w all $< -+ docbook2man $< - - lxc-%.sgml : common_options.sgml see_also.sgml - -diff -ubr '--exclude=*sgml*' lxc-0.7.5-orig/doc/Makefile.in lxc-0.7.5/doc/Makefile.in ---- lxc-0.7.5-orig/doc/Makefile.in 2011-08-11 19:02:18.000000000 +0200 -+++ lxc-0.7.5/doc/Makefile.in 2011-09-26 09:53:13.835401448 +0200 -@@ -786,13 +786,13 @@ - - - @ENABLE_DOCBOOK_TRUE@%.1 : %.sgml --@ENABLE_DOCBOOK_TRUE@ docbook2man -w all $< -+@ENABLE_DOCBOOK_TRUE@ docbook2man $< - - @ENABLE_DOCBOOK_TRUE@%.5 : %.sgml --@ENABLE_DOCBOOK_TRUE@ docbook2man -w all $< -+@ENABLE_DOCBOOK_TRUE@ docbook2man $< - - @ENABLE_DOCBOOK_TRUE@%.7 : %.sgml --@ENABLE_DOCBOOK_TRUE@ docbook2man -w all $< -+@ENABLE_DOCBOOK_TRUE@ docbook2man $< - - @ENABLE_DOCBOOK_TRUE@lxc-%.sgml : common_options.sgml see_also.sgml - diff --git a/pkgs/os-specific/linux/lxc/fix-sgml-documentation.patch b/pkgs/os-specific/linux/lxc/fix-sgml-documentation.patch deleted file mode 100644 index 60c9027cca5c..000000000000 --- a/pkgs/os-specific/linux/lxc/fix-sgml-documentation.patch +++ /dev/null @@ -1,291 +0,0 @@ -diff --git a/doc/lxc-attach.sgml.in b/doc/lxc-attach.sgml.in -index 7092f16..021da41 100644 ---- a/doc/lxc-attach.sgml.in -+++ b/doc/lxc-attach.sgml.in -@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - -diff --git a/doc/lxc-cgroup.sgml.in b/doc/lxc-cgroup.sgml.in -index 5acd313..856a544 100644 ---- a/doc/lxc-cgroup.sgml.in -+++ b/doc/lxc-cgroup.sgml.in -@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - -diff --git a/doc/lxc-checkpoint.sgml.in b/doc/lxc-checkpoint.sgml.in -index bf0efd9..eeb0039 100644 ---- a/doc/lxc-checkpoint.sgml.in -+++ b/doc/lxc-checkpoint.sgml.in -@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - -diff --git a/doc/lxc-console.sgml.in b/doc/lxc-console.sgml.in -index 606c868..62f9e07 100644 ---- a/doc/lxc-console.sgml.in -+++ b/doc/lxc-console.sgml.in -@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - -diff --git a/doc/lxc-create.sgml.in b/doc/lxc-create.sgml.in -index a3cca83..d59106d 100644 ---- a/doc/lxc-create.sgml.in -+++ b/doc/lxc-create.sgml.in -@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - -@@ -141,6 +141,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - filesystem) of size SIZE rather than the default, which is 1G. - - -+ - - - -diff --git a/doc/lxc-destroy.sgml.in b/doc/lxc-destroy.sgml.in -index e75de57..05f53d6 100644 ---- a/doc/lxc-destroy.sgml.in -+++ b/doc/lxc-destroy.sgml.in -@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - -diff --git a/doc/lxc-execute.sgml.in b/doc/lxc-execute.sgml.in -index 77d132a..1e58bef 100644 ---- a/doc/lxc-execute.sgml.in -+++ b/doc/lxc-execute.sgml.in -@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - -diff --git a/doc/lxc-freeze.sgml.in b/doc/lxc-freeze.sgml.in -index 798ccf4..f0d0485 100644 ---- a/doc/lxc-freeze.sgml.in -+++ b/doc/lxc-freeze.sgml.in -@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - -diff --git a/doc/lxc-kill.sgml.in b/doc/lxc-kill.sgml.in -index 5bec922..1f48820 100644 ---- a/doc/lxc-kill.sgml.in -+++ b/doc/lxc-kill.sgml.in -@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - -diff --git a/doc/lxc-ls.sgml.in b/doc/lxc-ls.sgml.in -index 3ffd4f8..b11d211 100644 ---- a/doc/lxc-ls.sgml.in -+++ b/doc/lxc-ls.sgml.in -@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - ]> -diff --git a/doc/lxc-monitor.sgml.in b/doc/lxc-monitor.sgml.in -index 9d8711c..b492968 100644 ---- a/doc/lxc-monitor.sgml.in -+++ b/doc/lxc-monitor.sgml.in -@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - -diff --git a/doc/lxc-ps.sgml.in b/doc/lxc-ps.sgml.in -index bb7b5a6..05ed59f 100644 ---- a/doc/lxc-ps.sgml.in -+++ b/doc/lxc-ps.sgml.in -@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - ]> -diff --git a/doc/lxc-restart.sgml.in b/doc/lxc-restart.sgml.in -index eb556d9..d158cc7 100644 ---- a/doc/lxc-restart.sgml.in -+++ b/doc/lxc-restart.sgml.in -@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - -diff --git a/doc/lxc-start.sgml.in b/doc/lxc-start.sgml.in -index 4504d58..f268185 100644 ---- a/doc/lxc-start.sgml.in -+++ b/doc/lxc-start.sgml.in -@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - -diff --git a/doc/lxc-stop.sgml.in b/doc/lxc-stop.sgml.in -index d15e649..51179c4 100644 ---- a/doc/lxc-stop.sgml.in -+++ b/doc/lxc-stop.sgml.in -@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - -diff --git a/doc/lxc-unfreeze.sgml.in b/doc/lxc-unfreeze.sgml.in -index bb00d85..3f8f59b 100644 ---- a/doc/lxc-unfreeze.sgml.in -+++ b/doc/lxc-unfreeze.sgml.in -@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - -diff --git a/doc/lxc-wait.sgml.in b/doc/lxc-wait.sgml.in -index 97a4c39..0c7c589 100644 ---- a/doc/lxc-wait.sgml.in -+++ b/doc/lxc-wait.sgml.in -@@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - -diff --git a/doc/lxc.conf.sgml.in b/doc/lxc.conf.sgml.in -index 9edabf8..daa2ff8 100644 ---- a/doc/lxc.conf.sgml.in -+++ b/doc/lxc.conf.sgml.in -@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - ]> -diff --git a/doc/lxc.sgml.in b/doc/lxc.sgml.in -index 1b30fed..d98ca21 100644 ---- a/doc/lxc.sgml.in -+++ b/doc/lxc.sgml.in -@@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - --> - -- - ]> -@@ -280,7 +280,7 @@ rootfs - - - -- -+ - - - -@@ -570,7 +570,7 @@ rootfs - to the background. - - -- -+ - - - diff --git a/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch b/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch new file mode 100644 index 000000000000..061875aa3b6f --- /dev/null +++ b/pkgs/os-specific/linux/lxc/install-localstatedir-in-store.patch @@ -0,0 +1,28 @@ +diff -ubr lxc-0.9.0-orig/Makefile.am lxc-0.9.0/Makefile.am +--- lxc-0.9.0-orig/Makefile.am 2013-04-15 10:50:22.899103057 +0200 ++++ lxc-0.9.0/Makefile.am 2013-04-15 10:58:41.189504254 +0200 +@@ -25,8 +25,8 @@ + pcdata_DATA = lxc.pc + + install-data-local: +- $(MKDIR_P) $(DESTDIR)$(LXCPATH) +- $(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/lxc ++ $(MKDIR_P) $(out)$(LXCPATH) ++ $(MKDIR_P) $(out)$(localstatedir)/cache/lxc + + ChangeLog:: + @touch ChangeLog +diff -ubr lxc-0.9.0-orig/Makefile.in lxc-0.9.0/Makefile.in +--- lxc-0.9.0-orig/Makefile.in 2013-04-15 10:50:22.899103057 +0200 ++++ lxc-0.9.0/Makefile.in 2013-04-15 10:58:58.817870957 +0200 +@@ -805,8 +805,8 @@ + + + install-data-local: +- $(MKDIR_P) $(DESTDIR)$(LXCPATH) +- $(MKDIR_P) $(DESTDIR)$(localstatedir)/cache/lxc ++ $(MKDIR_P) $(out)$(LXCPATH) ++ $(MKDIR_P) $(out)$(localstatedir)/cache/lxc + + ChangeLog:: + @touch ChangeLog diff --git a/pkgs/os-specific/linux/lxc/support-db2x.patch b/pkgs/os-specific/linux/lxc/support-db2x.patch new file mode 100644 index 000000000000..8be7f5f0a92b --- /dev/null +++ b/pkgs/os-specific/linux/lxc/support-db2x.patch @@ -0,0 +1,29 @@ +diff -ubr lxc-0.9.0-orig/configure lxc-0.9.0/configure +--- lxc-0.9.0-orig/configure 2013-04-15 10:50:22.899103057 +0200 ++++ lxc-0.9.0/configure 2013-04-15 11:08:08.696539776 +0200 +@@ -4792,7 +4792,7 @@ + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for docbook2x-man" >&5 + $as_echo_n "checking for docbook2x-man... " >&6; } +- for name in docbook2x-man db2x_docbook2man; do ++ for name in docbook2x-man db2x_docbook2man docbook2man; do + if "$name" --help >/dev/null 2>&1; then + db2xman="$name" + break; +@@ -8353,4 +8353,3 @@ + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 + $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + fi +- +diff -ubr lxc-0.9.0-orig/configure.ac lxc-0.9.0/configure.ac +--- lxc-0.9.0-orig/configure.ac 2013-04-15 10:50:22.896102806 +0200 ++++ lxc-0.9.0/configure.ac 2013-04-15 11:07:52.399582819 +0200 +@@ -67,7 +67,7 @@ + db2xman="" + + AC_MSG_CHECKING(for docbook2x-man) +- for name in docbook2x-man db2x_docbook2man; do ++ for name in docbook2x-man db2x_docbook2man docbook2man; do + if "$name" --help >/dev/null 2>&1; then + db2xman="$name" + break;