diff options
| -rw-r--r-- | app-emulation/lxc/ChangeLog | 11 | ||||
| -rw-r--r-- | app-emulation/lxc/Manifest | 18 | ||||
| -rw-r--r-- | app-emulation/lxc/files/lxc-0.6.4-fix-full-system.patch | 44 | ||||
| -rw-r--r-- | app-emulation/lxc/files/lxc-0.6.4-lxc.network.pair.patch | 103 | ||||
| -rw-r--r-- | app-emulation/lxc/files/lxc-0.6.4-move-rcfile.patch | 305 | ||||
| -rw-r--r-- | app-emulation/lxc/files/lxc-0.6.4-tty-malloc.patch | 25 | ||||
| -rw-r--r-- | app-emulation/lxc/lxc-0.7.0.ebuild | 80 | ||||
| -rw-r--r-- | app-emulation/lxc/lxc-0.7.1.ebuild (renamed from app-emulation/lxc/lxc-0.6.5.ebuild) | 2 |
8 files changed, 17 insertions, 571 deletions
diff --git a/app-emulation/lxc/ChangeLog b/app-emulation/lxc/ChangeLog index 4c88baa09876..c578f0bb562b 100644 --- a/app-emulation/lxc/ChangeLog +++ b/app-emulation/lxc/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for app-emulation/lxc # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.12 2010/06/20 20:29:21 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/ChangeLog,v 1.13 2010/06/28 00:00:08 flameeyes Exp $ + +*lxc-0.7.1 (28 Jun 2010) + + 28 Jun 2010; Diego E. Pettenò <flameeyes@gentoo.org> + -files/lxc-0.6.4-fix-full-system.patch, + -files/lxc-0.6.4-lxc.network.pair.patch, + -files/lxc-0.6.4-move-rcfile.patch, -files/lxc-0.6.4-tty-malloc.patch, + -lxc-0.6.5.ebuild, -lxc-0.7.0.ebuild, +lxc-0.7.1.ebuild: + Version bump, remove old versions, remove stray patch files. *lxc-0.7.0 (20 Jun 2010) diff --git a/app-emulation/lxc/Manifest b/app-emulation/lxc/Manifest index c7732410827d..011bf86d493b 100644 --- a/app-emulation/lxc/Manifest +++ b/app-emulation/lxc/Manifest @@ -1,20 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX lxc-0.6.4-fix-full-system.patch 1741 RMD160 049dea2e10d4df6abf758bf70bd18ea571648e74 SHA1 a1431cbb18eefffa42ca6f22920f38d8b5fdb25b SHA256 7e2f3609dd9c84d555ebd772ffad521fc19ca2f712d49fe1fa3ffa0fa1350339 -AUX lxc-0.6.4-lxc.network.pair.patch 3787 RMD160 79dcc4b4e6e8c8710d295e2b6b9273d9764160df SHA1 24c75f18bee91fe797e8242d0b0e80ed6cf494eb SHA256 aa3e64248ae37b1d1eb1e74499641cff06cab71dcc3b4a985dec2345998a2f19 -AUX lxc-0.6.4-move-rcfile.patch 8502 RMD160 594a72a5f8272302492a5467de0d1854d81a1dea SHA1 03ae85bcdb2d8951647d539cee16bdf9fe336489 SHA256 52d570bb1feaedf88a643899bd64408da7e8803f88479e4549abe5e7cd1ffec2 -AUX lxc-0.6.4-tty-malloc.patch 946 RMD160 9128f04a383c58c5c3851b2be6db03532194d2f8 SHA1 f2b3c19e656766686aad7733ecb07f4a5beb5851 SHA256 40734c9afac0f84553965f756617a7cff6f525307bf664e6bf708c810be50330 -DIST lxc-0.6.5.tar.gz 275144 RMD160 ee16852d56e0afefa19d0c9fc9a29567c6f9e703 SHA1 6eaf8c029c48635f8ef7a00207089e330a28451f SHA256 60f203a196a58c7ded1c68790a2d3abacb98acdb7b96fab2f9c3d8574557f21d -DIST lxc-0.7.0.tar.gz 261763 RMD160 09c1598d1ac8bed12be1948222a010fe80c13b94 SHA1 f7b95379a6abb8de8f84cb658218ead38d0e5124 SHA256 bd30e435a468774a71a49b2cfe1218b7f37ea00c6c467ac0c6d1e44cf4c8b84a -EBUILD lxc-0.6.5.ebuild 2155 RMD160 55cd709b72ec1778c2d1777e44b6a50adf843bb7 SHA1 3ccb98b7a910375c4617a752fae15298079bf7d3 SHA256 ad0b172f81d06ccddaed6d8806e84e21de1ee6457d5418d1eefc0232797a61da -EBUILD lxc-0.7.0.ebuild 2155 RMD160 45812e78a0cb34584a6235cdacd9f0dfd75585f4 SHA1 7b10ee0103f194abf65054bef811373ec7576770 SHA256 f7f90cee929dae6c7a7910ff20a1845562dd444f5eab1e9dbbb39d4c23e2d8c1 -MISC ChangeLog 2821 RMD160 a9e3056456dee0edd4daa8201f443f548a9d2ced SHA1 3759a50e28e7959482f966ad692e10233b0c6ed5 SHA256 23a3a3041dffd2267d636c8b80e391f24c867db87a621f3ef9c983640ecd08a2 +DIST lxc-0.7.1.tar.gz 264376 RMD160 a57c978b50f2f6df15d526d4d5d25c8cd438e9cf SHA1 06dab217dd67b10acc57e2566f80b0673f0261f2 SHA256 da7a0b4f684a0d1d9d982c8423f1143a59798a0fab6c30e0c1aae752c578a642 +EBUILD lxc-0.7.1.ebuild 2155 RMD160 4dd61fc556387bcc1d1017bb8a6a18b4f3199437 SHA1 aea867f6771006d9cbed10e1949046d654a4007c SHA256 a4d7a27f6902f826704738ccb8dac2139b9c64a92735fcdc3868229493764bec +MISC ChangeLog 3184 RMD160 a58f7175a864db044be80dd231acb7f3da43692a SHA1 80c9d43867814c10dae407e809d823b90fd9da91 SHA256 17b6b1864dd90401386a6d774a671f566e02946f2bab5309fcc190e69c091cdd MISC metadata.xml 310 RMD160 a4aeb0a359704671f8128ef15d4e5140d66e198f SHA1 eec47e2b6feb72b1aa448155708756521cf8d082 SHA256 255ba2a5412f475edbc07ba230222a616e045cf3d95d819915c19ce2edb210dd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.15 (GNU/Linux) -iEYEARECAAYFAkweeX4ACgkQAiZjviIA2XiTcQCdFfZOO0dccSumsmnkQ2wjaDwl -dKwAn3VAKjX4+AugjOqxw1zBMlDno3FB -=gu9u +iEYEARECAAYFAkwn5hYACgkQAiZjviIA2Xj+7QCgsv0rdyjGizGDmDPP0rF02iZg +lHwAoJuPAeJfWVTeKHLltTvK8vGWLjK5 +=JGf4 -----END PGP SIGNATURE----- diff --git a/app-emulation/lxc/files/lxc-0.6.4-fix-full-system.patch b/app-emulation/lxc/files/lxc-0.6.4-fix-full-system.patch deleted file mode 100644 index 553bf20e08bd..000000000000 --- a/app-emulation/lxc/files/lxc-0.6.4-fix-full-system.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f2ae79a04567fb8c1181f4d3331d2b7a48889cf3 Mon Sep 17 00:00:00 2001 -From: Andrian Nord <nightnord@gmail.com> -Date: Thu, 26 Nov 2009 15:46:25 +0000 -Subject: "Default" configuration may destroy host system - -If you're running (by mistake or typo) (via lxc-start) container that does not -exists it will run with lxc.rootfs=/, meaning that /sbin/init will -restart initialization procedure, efficiently messing host's system, -that may lead to unpredictable results or even destroy (make inaccessible) host -system (by reseting network configuration or something like that). - -(Actually, it _did_ destroy system of everyone who tested this). - -Actually, I finally lost any meaning of having such a feature for -full-system containers. You may not use hosts's FS - it's described at -above. You may not use some temporary directory - that's nonsense. - -This patch forbinds starting container via lxc-start without rcfile and -custom start program, but probably it fixes only small part of problem. -I really don't see much sense in such a feature without ability of -overriding 'default' setting with command line switches. Anyway, default -behaviour should be as save as possible. - -Signed-off-by: Andrian Nord <NightNord@gmail.com> -Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com> ---- -diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c -index b8d03e8..d2471eb 100644 ---- a/src/lxc/lxc_start.c -+++ b/src/lxc/lxc_start.c -@@ -173,6 +173,11 @@ int main(int argc, char *argv[]) - return err; - } - -+ if (!rcfile && !strcmp("/sbin/init", args[0])) { -+ ERROR("no configuration file for '/sbin/init' (may crash the host)"); -+ return err; -+ } -+ - if (my_args.daemonize) { - - /* do not chdir as we want to open the log file, --- -cgit v0.8.3 diff --git a/app-emulation/lxc/files/lxc-0.6.4-lxc.network.pair.patch b/app-emulation/lxc/files/lxc-0.6.4-lxc.network.pair.patch deleted file mode 100644 index 9c7ab1ab2158..000000000000 --- a/app-emulation/lxc/files/lxc-0.6.4-lxc.network.pair.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 8634bc197f742267b2eabd8543265ba93177b529 Mon Sep 17 00:00:00 2001 -From: Michael Tokarev <mjt@tls.msk.ru> -Date: Thu, 26 Nov 2009 15:46:23 +0000 -Subject: allow lxc.network.pair to specify host-side name for veth interface - -Currently we allocate veth device with random name on host side, -so that things like firewall rules or accounting does not work -at all. Fix this by recognizing yet anothe keyword to specify -the host-side device name: lxc.network.pair, and use it instead -of random name if specified. - -Signed-off-by: Michael Tokarev <mjt@tls.msk.ru> -Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com> ---- -diff --git a/src/lxc/conf.c b/src/lxc/conf.c -index 9c3a558..523270e 100644 ---- a/src/lxc/conf.c -+++ b/src/lxc/conf.c -@@ -829,14 +829,19 @@ int lxc_conf_init(struct lxc_conf *conf) - - static int instanciate_veth(struct lxc_netdev *netdev) - { -- char veth1[IFNAMSIZ]; -+ char veth1buf[IFNAMSIZ], *veth1; - char veth2[IFNAMSIZ]; - int ret = -1; - -- snprintf(veth1, sizeof(veth1), "vethXXXXXX"); -- snprintf(veth2, sizeof(veth2), "vethXXXXXX"); -+ if (netdev->pair) -+ veth1 = netdev->pair; -+ else { -+ snprintf(veth1buf, sizeof(veth1buf), "vethXXXXXX"); -+ mktemp(veth1buf); -+ veth1 = veth1buf; -+ } - -- mktemp(veth1); -+ snprintf(veth2, sizeof(veth2), "vethXXXXXX"); - mktemp(veth2); - - if (!strlen(veth1) || !strlen(veth2)) { -diff --git a/src/lxc/conf.h b/src/lxc/conf.h -index 0b8d732..bb38206 100644 ---- a/src/lxc/conf.h -+++ b/src/lxc/conf.h -@@ -73,6 +73,7 @@ struct lxc_route6 { - * Defines a structure to configure a network device - * @link : lxc.network.link, name of bridge or host iface to attach if any - * @name : lxc.network.name, name of iface on the container side -+ * @pair : lxc.network.pair, name of host-side iface in case of veth etc - * @flags : flag of the network device (IFF_UP, ... ) - * @ipv4 : a list of ipv4 addresses to be set on the network device - * @ipv6 : a list of ipv6 addresses to be set on the network device -@@ -83,6 +84,7 @@ struct lxc_netdev { - int ifindex; - char *link; - char *name; -+ char *pair; - char *hwaddr; - char *mtu; - struct lxc_list ipv4; -diff --git a/src/lxc/confile.c b/src/lxc/confile.c -index 39a8e2c..3a9a86d 100644 ---- a/src/lxc/confile.c -+++ b/src/lxc/confile.c -@@ -49,6 +49,7 @@ static int config_network_type(const char *, char *, struct lxc_conf *); - static int config_network_flags(const char *, char *, struct lxc_conf *); - static int config_network_link(const char *, char *, struct lxc_conf *); - static int config_network_name(const char *, char *, struct lxc_conf *); -+static int config_network_pair(const char *, char *, struct lxc_conf *); - static int config_network_hwaddr(const char *, char *, struct lxc_conf *); - static int config_network_mtu(const char *, char *, struct lxc_conf *); - static int config_network_ipv4(const char *, char *, struct lxc_conf *); -@@ -73,6 +74,7 @@ static struct config config[] = { - { "lxc.network.flags", config_network_flags }, - { "lxc.network.link", config_network_link }, - { "lxc.network.name", config_network_name }, -+ { "lxc.network.pair", config_network_pair }, - { "lxc.network.hwaddr", config_network_hwaddr }, - { "lxc.network.mtu", config_network_mtu }, - { "lxc.network.ipv4", config_network_ipv4 }, -@@ -221,6 +223,18 @@ static int config_network_name(const char *key, char *value, - return network_ifname(&netdev->name, value); - } - -+static int config_network_pair(const char *key, char *value, -+ struct lxc_conf *lxc_conf) -+{ -+ struct lxc_netdev *netdev; -+ -+ netdev = network_netdev(key, value, &lxc_conf->network); -+ if (!netdev) -+ return -1; -+ -+ return network_ifname(&netdev->pair, value); -+} -+ - static int config_network_hwaddr(const char *key, char *value, - struct lxc_conf *lxc_conf) - { --- -cgit v0.8.3 diff --git a/app-emulation/lxc/files/lxc-0.6.4-move-rcfile.patch b/app-emulation/lxc/files/lxc-0.6.4-move-rcfile.patch deleted file mode 100644 index 6d2bb09843ea..000000000000 --- a/app-emulation/lxc/files/lxc-0.6.4-move-rcfile.patch +++ /dev/null @@ -1,305 +0,0 @@ -From fae349da89b9ad063f0080970558b7f02ce233c2 Mon Sep 17 00:00:00 2001 -From: Daniel Lezcano <daniel.lezcano@free.fr> -Date: Thu, 26 Nov 2009 15:46:24 +0000 -Subject: pass lxc_conf to the lxc_start function instead of the rcfile - -The rcfile is parsed in the lxc_start function. This is not the place -to do that. Let's the caller to do that. - -In the meantime, we have the lxc_conf structure filled right before -calling the lxc_start function so we can do some sanity check on the -configuration to not break the system when we launch the container. - -Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com> ---- -diff --git a/src/lxc/commands.c b/src/lxc/commands.c -index 02239e5..4c48571 100644 ---- a/src/lxc/commands.c -+++ b/src/lxc/commands.c -@@ -135,7 +135,7 @@ static int trigger_command(int fd, struct lxc_request *request, - static void command_fd_cleanup(int fd, struct lxc_handler *handler, - struct lxc_epoll_descr *descr) - { -- lxc_console_remove_fd(fd, &handler->conf.tty_info); -+ lxc_console_remove_fd(fd, &handler->conf->tty_info); - lxc_mainloop_del_handler(descr, fd); - close(fd); - } -diff --git a/src/lxc/console.c b/src/lxc/console.c -index 52f6cec..96a6edd 100644 ---- a/src/lxc/console.c -+++ b/src/lxc/console.c -@@ -98,7 +98,7 @@ extern int lxc_console_callback(int fd, struct lxc_request *request, - struct lxc_handler *handler) - { - int ttynum = request->data; -- struct lxc_tty_info *tty_info = &handler->conf.tty_info; -+ struct lxc_tty_info *tty_info = &handler->conf->tty_info; - - if (ttynum > 0) { - if (ttynum > tty_info->nbtty) -diff --git a/src/lxc/lxc.h b/src/lxc/lxc.h -index 66cb3b8..8cf21c1 100644 ---- a/src/lxc/lxc.h -+++ b/src/lxc/lxc.h -@@ -31,6 +31,7 @@ extern "C" { - #include <lxc/state.h> - - struct lxc_msg; -+struct lxc_conf; - - /** - Following code is for liblxc. -@@ -44,7 +45,7 @@ struct lxc_msg; - * @argv : an array of char * corresponding to the commande line - * Returns 0 on sucess, < 0 otherwise - */ --extern int lxc_start(const char *name, char *const argv[], const char *rcfile); -+extern int lxc_start(const char *name, char *const argv[], struct lxc_conf *); - - /* - * Stop the container previously started with lxc_start, all -diff --git a/src/lxc/lxc_execute.c b/src/lxc/lxc_execute.c -index 846a96f..40a4b93 100644 ---- a/src/lxc/lxc_execute.c -+++ b/src/lxc/lxc_execute.c -@@ -31,10 +31,11 @@ - #include <sys/stat.h> - #include <sys/param.h> - --#include <lxc/log.h> --#include <lxc/confile.h> --#include <lxc/lxc.h> - -+#include "lxc.h" -+#include "log.h" -+#include "conf.h" -+#include "confile.h" - #include "arguments.h" - #include "config.h" - -@@ -83,6 +84,7 @@ int main(int argc, char *argv[]) - { - static char **args; - char *rcfile; -+ struct lxc_conf conf; - - if (lxc_arguments_parse(&my_args, argc, argv)) - return -1; -@@ -111,6 +113,16 @@ int main(int argc, char *argv[]) - } - } - -- return lxc_start(my_args.name, args, my_args.rcfile); -+ if (lxc_conf_init(&conf)) { -+ ERROR("failed to initialze configuration"); -+ return -1; -+ } -+ -+ if (rcfile && lxc_config_read(rcfile, &conf)) { -+ ERROR("failed to read configuration file"); -+ return -1; -+ } -+ -+ return lxc_start(my_args.name, args, &conf); - } - -diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c -index cf87abf..b8d03e8 100644 ---- a/src/lxc/lxc_start.c -+++ b/src/lxc/lxc_start.c -@@ -40,12 +40,13 @@ - #include <netinet/in.h> - #include <net/if.h> - --#include <lxc/lxc.h> --#include <lxc/log.h> --#include <lxc/utils.h> -- --#include "arguments.h" -+#include "log.h" -+#include "lxc.h" -+#include "conf.h" -+#include "utils.h" - #include "config.h" -+#include "confile.h" -+#include "arguments.h" - - lxc_log_define(lxc_start, lxc); - -@@ -132,6 +133,7 @@ int main(int argc, char *argv[]) - }; - - char *rcfile = NULL; -+ struct lxc_conf conf; - - if (lxc_arguments_parse(&my_args, argc, argv)) - return err; -@@ -161,6 +163,16 @@ int main(int argc, char *argv[]) - } - } - -+ if (lxc_conf_init(&conf)) { -+ ERROR("failed to initialze configuration"); -+ return err; -+ } -+ -+ if (rcfile && lxc_config_read(rcfile, &conf)) { -+ ERROR("failed to read configuration file"); -+ return err; -+ } -+ - if (my_args.daemonize) { - - /* do not chdir as we want to open the log file, -@@ -187,7 +199,7 @@ int main(int argc, char *argv[]) - - save_tty(&tios); - -- err = lxc_start(my_args.name, args, rcfile); -+ err = lxc_start(my_args.name, args, &conf); - - restore_tty(&tios); - -diff --git a/src/lxc/start.c b/src/lxc/start.c -index 7143421..7e9d924 100644 ---- a/src/lxc/start.c -+++ b/src/lxc/start.c -@@ -230,7 +230,7 @@ static int console_init(char *console, size_t size) - return 0; - } - --struct lxc_handler *lxc_init(const char *name, const char *rcfile) -+struct lxc_handler *lxc_init(const char *name, struct lxc_conf *conf) - { - struct lxc_handler *handler; - -@@ -240,36 +240,20 @@ struct lxc_handler *lxc_init(const char *name, const char *rcfile) - - memset(handler, 0, sizeof(*handler)); - -+ handler->conf = conf; -+ - /* Begin the set the state to STARTING*/ - if (lxc_set_state(name, handler, STARTING)) { - ERROR("failed to set state '%s'", lxc_state2str(STARTING)); - goto out_free; - } - -- if (lxc_conf_init(&handler->conf)) { -- ERROR("failed to initialize the configuration"); -- goto out_aborting; -- } -- -- if (rcfile) { -- if (access(rcfile, F_OK)) { -- ERROR("failed to access '%s'", rcfile); -- goto out_aborting; -- } -- -- if (lxc_config_read(rcfile, &handler->conf)) { -- ERROR("failed to read '%s'", rcfile); -- goto out_aborting; -- } -- } -- -- if (console_init(handler->conf.console, -- sizeof(handler->conf.console))) { -+ if (console_init(conf->console, sizeof(conf->console))) { - ERROR("failed to initialize the console"); - goto out_aborting; - } - -- if (lxc_create_tty(name, &handler->conf)) { -+ if (lxc_create_tty(name, conf)) { - ERROR("failed to create the ttys"); - goto out_aborting; - } -@@ -294,7 +278,7 @@ out: - return handler; - - out_delete_tty: -- lxc_delete_tty(&handler->conf.tty_info); -+ lxc_delete_tty(&conf->tty_info); - out_aborting: - lxc_set_state(name, handler, ABORTING); - out_free: -@@ -313,7 +297,7 @@ void lxc_fini(const char *name, struct lxc_handler *handler) - lxc_unlink_nsgroup(name); - - if (handler) { -- lxc_delete_tty(&handler->conf.tty_info); -+ lxc_delete_tty(&handler->conf->tty_info); - free(handler); - } - -@@ -366,7 +350,7 @@ static int do_start(void *arg) - } - - /* Setup the container, ip, names, utsname, ... */ -- if (lxc_setup(name, &handler->conf)) { -+ if (lxc_setup(name, handler->conf)) { - ERROR("failed to setup the container"); - goto out_warn_father; - } -@@ -414,14 +398,14 @@ int lxc_spawn(const char *name, struct lxc_handler *handler, char *const argv[]) - } - - clone_flags = CLONE_NEWUTS|CLONE_NEWPID|CLONE_NEWIPC|CLONE_NEWNS; -- if (!lxc_list_empty(&handler->conf.network)) { -+ if (!lxc_list_empty(&handler->conf->network)) { - - clone_flags |= CLONE_NEWNET; - - /* that should be done before the clone because we will - * fill the netdev index and use them in the child - */ -- if (lxc_create_network(&handler->conf.network)) { -+ if (lxc_create_network(&handler->conf->network)) { - ERROR("failed to create the network"); - goto out_close; - } -@@ -447,7 +431,7 @@ int lxc_spawn(const char *name, struct lxc_handler *handler, char *const argv[]) - - /* Create the network configuration */ - if (clone_flags & CLONE_NEWNET) { -- if (lxc_assign_network(&handler->conf.network, handler->pid)) { -+ if (lxc_assign_network(&handler->conf->network, handler->pid)) { - ERROR("failed to create the configured network"); - goto out_abort; - } -@@ -486,13 +470,13 @@ out_abort: - goto out_close; - } - --int lxc_start(const char *name, char *const argv[], const char *rcfile) -+int lxc_start(const char *name, char *const argv[], struct lxc_conf *conf) - { - struct lxc_handler *handler; - int err = -1; - int status; - -- handler = lxc_init(name, rcfile); -+ handler = lxc_init(name, conf); - if (!handler) { - ERROR("failed to initialize the container"); - return -1; -diff --git a/src/lxc/start.h b/src/lxc/start.h -index 3390411..ba55562 100644 ---- a/src/lxc/start.h -+++ b/src/lxc/start.h -@@ -34,10 +34,10 @@ struct lxc_handler { - int sigfd; - char nsgroup[MAXPATHLEN]; - sigset_t oldmask; -- struct lxc_conf conf; -+ struct lxc_conf *conf; - }; - --extern struct lxc_handler *lxc_init(const char *name, const char *rcfile); -+extern struct lxc_handler *lxc_init(const char *name, struct lxc_conf *); - extern int lxc_spawn(const char *name, struct lxc_handler *handler, - char *const argv[]); - --- -cgit v0.8.3 diff --git a/app-emulation/lxc/files/lxc-0.6.4-tty-malloc.patch b/app-emulation/lxc/files/lxc-0.6.4-tty-malloc.patch deleted file mode 100644 index c445f1928c69..000000000000 --- a/app-emulation/lxc/files/lxc-0.6.4-tty-malloc.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e4e7d59db88478186188024c78f76066dad1e733 Mon Sep 17 00:00:00 2001 -From: Sven Wegener <sven.wegener@stealer.net> -Date: Thu, 26 Nov 2009 16:46:23 +0100 -Subject: [PATCH] use correct number of ttys during setup - -commit 985d15b106c8959ff130ba5425c2abbe36dc2cca "fix fdleak and errors -in lxc_create_tty()" created a zero-sized malloc(), causing memory -corruption. use config->tty like all the other code does. - -Signed-off-by: Sven Wegener <sven.wegener@stealer.net> -Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com> - -diff --git a/src/lxc/conf.c b/src/lxc/conf.c -index 0ce51aa..81bc470 100644 ---- a/src/lxc/conf.c -+++ b/src/lxc/conf.c -@@ -999,7 +999,7 @@ int lxc_create_tty(const char *name, struct lxc_conf *conf) - return 0; - - tty_info->pty_info = -- malloc(sizeof(*tty_info->pty_info)*tty_info->nbtty); -+ malloc(sizeof(*tty_info->pty_info)*conf->tty); - if (!tty_info->pty_info) { - SYSERROR("failed to allocate pty_info"); - return -1; diff --git a/app-emulation/lxc/lxc-0.7.0.ebuild b/app-emulation/lxc/lxc-0.7.0.ebuild deleted file mode 100644 index b6af9ce99ce9..000000000000 --- a/app-emulation/lxc/lxc-0.7.0.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.7.0.ebuild,v 1.1 2010/06/20 20:29:21 flameeyes Exp $ - -EAPI="2" - -inherit eutils linux-info versionator base - -DESCRIPTION="LinuX Containers userspace utilities" -HOMEPAGE="http://lxc.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -KEYWORDS="~amd64 ~x86" - -LICENSE="LGPL-3" -SLOT="0" -IUSE="doc examples" - -RDEPEND="sys-libs/libcap" - -DEPEND="${RDEPEND} - doc? ( app-text/docbook-sgml-utils ) - >=sys-kernel/linux-headers-2.6.29" - -CONFIG_CHECK="~CGROUPS - ~CGROUP_NS ~CPUSETS ~CGROUP_CPUACCT - ~RESOURCE_COUNTERS ~CGROUP_MEM_RES_CTLR - ~CGROUP_SCHED - - ~NAMESPACES - ~IPC_NS ~USER_NS ~PID_NS - - ~DEVPTS_MULTIPLE_INSTANCES - ~CGROUP_FREEZER - ~UTS_NS ~NET_NS - ~VETH ~MACVLAN" - -ERROR_DEVPTS_MULTIPLE_INSTANCES="CONFIG_DEVPTS_MULTIPLE_INSTANCES: needed for pts inside container" - -ERROR_CGROUP_FREEZER="CONFIG_CGROUP_FREEZER: needed to freeze containers" - -ERROR_UTS_NS="CONFIG_UTS_NS: needed to unshare hostnames and uname info" -ERROR_NET_NS="CONFIG_NET_NS: needed for unshared network" - -ERROR_VETH="CONFIG_VETH: needed for internal (inter-container) networking" -ERROR_MACVLAN="CONFIG_MACVLAN: needed for internal (inter-container) networking" - -src_configure() { - econf \ - --localstatedir=/var \ - --bindir=/usr/sbin \ - --docdir=/usr/share/doc/${PF} \ - --with-config-path=/etc/lxc \ - $(use_enable doc) \ - $(use_enable examples) \ - || die "configure failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "install failed" - - dodoc AUTHORS CONTRIBUTING MAINTAINERS \ - NEWS TODO README doc/FAQ.txt || die "dodoc failed" - - # If the documentation is going to be rebuilt, the Makefiles will - # install the man pages themselves; if we're not going to, we - # still need to install them, as they are provided with the - # tarball in recent versions. - if ! use doc; then - doman doc/*.{1,5,7} || die - fi - - rm -r "${D}"/usr/sbin/lxc-{setcap,ls} \ - "${D}"/usr/share/man/man1/lxc-ls.1 \ - || die "unable to remove extraenous content" - - keepdir /etc/lxc - - find "${D}" -name '*.la' -delete -} diff --git a/app-emulation/lxc/lxc-0.6.5.ebuild b/app-emulation/lxc/lxc-0.7.1.ebuild index f68e876d48d8..b9595cc0ad4b 100644 --- a/app-emulation/lxc/lxc-0.6.5.ebuild +++ b/app-emulation/lxc/lxc-0.7.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.6.5.ebuild,v 1.4 2010/03/16 16:40:03 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/lxc/lxc-0.7.1.ebuild,v 1.1 2010/06/28 00:00:08 flameeyes Exp $ EAPI="2" |