[gentoo-commits] repo/gentoo:master commit in: app-emulation/lxc/files/

[Pacho Ramos]

commit:     59d319d160b3d02d6ab0845bec8823589927f232
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 24 10:30:12 2016 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Aug 24 10:37:46 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d319d1

app-emulation/lxc: Drop old

Package-Manager: portage-2.3.0

 .../lxc/files/lxc-1.1.0-fix-gentoo-template.patch  |  35 ------
 app-emulation/lxc/files/lxc-1.1.1-shm-tmpfs.patch  |  31 ------
 .../lxc-1.1.2-fix-gentoo-moresecure-template.patch |  33 ------
 .../lxc/files/lxc-1.1.3-bash-completion.patch      |  35 ------
 .../lxc/files/lxc-2.0.1-bash-completion.patch      |  31 ------
 .../lxc/files/lxc-2.0.1-omit-sysconfig.patch       |   5 -
 app-emulation/lxc/files/lxc.initd.4                | 119 ---------------------
 app-emulation/lxc/files/lxc_at.service.2           |  14 ---
 app-emulation/lxc/files/lxc_at.service.3           |  15 ---
 9 files changed, 318 deletions(-)

diff --git a/app-emulation/lxc/files/lxc-1.1.0-fix-gentoo-template.patch b/app-emulation/lxc/files/lxc-1.1.0-fix-gentoo-template.patch
deleted file mode 100644
index 3514186..00000000
--- a/app-emulation/lxc/files/lxc-1.1.0-fix-gentoo-template.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 425aa66d33e1833cfa47b988785def8b42b72f1a Mon Sep 17 00:00:00 2001
-From: Markos Chandras <hwoarang@g.o>
-Date: Sun, 22 Feb 2015 01:25:36 +0200
-Subject: [PATCH] templates/lxc-gentoo.in: Fix stage3 autodetection code
-
-The latest-stage3-$variant.txt files list both the tarball name
-and the released date but we only need to pass the stage3 tarball
-name to the subsequent wget command otherwise we end up with 404
-errors.
-
-Signed-off-by: Markos Chandras <hwoarang@g.o>
----
-Different patches have been posted to the mailing lists or github so this is
-likely to be fixed upstream really soon
----
- templates/lxc-gentoo.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/templates/lxc-gentoo.in b/templates/lxc-gentoo.in
-index 5a87866..464c948 100644
---- a/templates/lxc-gentoo.in
-+++ b/templates/lxc-gentoo.in
-@@ -160,7 +160,8 @@ cache_stage3()
-         printf "Determining path to latest Gentoo %s (%s) stage3 archive...\n" "${arch}" "${variant}"
-         printf " => downloading and processing %s\n" "${stage3_pointer}"
- 
--        local stage3_latest_tarball=$(wget -q -O - "${stage3_pointer}" | tail -n1 ) \
-+        local stage3_latest_tarball=$(wget -q -O - "${stage3_pointer}" | \
-+			tail -n1 | cut -d " " -f 1) \
-             || die 6 "Error: unable to fetch\n"
- 
-         printf " => Got: %s\n" "${stage3_latest_tarball}"
--- 
-2.3.0
-

diff --git a/app-emulation/lxc/files/lxc-1.1.1-shm-tmpfs.patch b/app-emulation/lxc/files/lxc-1.1.1-shm-tmpfs.patch
deleted file mode 100644
index 7c8f595..00000000
--- a/app-emulation/lxc/files/lxc-1.1.1-shm-tmpfs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 7ed54c6155982bd8376fdb88bed79c664d5e111f Mon Sep 17 00:00:00 2001
-From: Markos Chandras <hwoarang@g.o>
-Date: Thu, 12 Mar 2015 20:52:11 +0000
-Subject: [PATCH] templates: gentoo.common: Add /dev/shm tmpfs mount entry
-
-/dev/shm needs to be mounted as tmpfs. It's needed by python
-and possibly other packages.
-
-Signed-off-by: Markos Chandras <hwoarang@g.o>
----
-Applied in master but not in 1.1.1. It will probably make it
-to 1.1.2
----
- config/templates/gentoo.common.conf.in | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/config/templates/gentoo.common.conf.in b/config/templates/gentoo.common.conf.in
-index ca3ffc1..49cd411 100644
---- a/config/templates/gentoo.common.conf.in
-+++ b/config/templates/gentoo.common.conf.in
-@@ -21,3 +21,7 @@ lxc.cgroup.devices.allow = c 10:232 rwm
- ## To use loop devices, copy the following line to the container's
- ## configuration file (uncommented).
- #lxc.cgroup.devices.allow = b 7:* rwm
-+
-+# /dev/shm needs to be mounted as tmpfs. It's needed by python (bug #496328)
-+# and possibly other packages.
-+lxc.mount.entry = none dev/shm tmpfs rw,nosuid,nodev,create=dir
--- 
-2.3.2
-

diff --git a/app-emulation/lxc/files/lxc-1.1.2-fix-gentoo-moresecure-template.patch b/app-emulation/lxc/files/lxc-1.1.2-fix-gentoo-moresecure-template.patch
deleted file mode 100644
index 86a4144..00000000
--- a/app-emulation/lxc/files/lxc-1.1.2-fix-gentoo-moresecure-template.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Patch from https://github.com/lxc/lxc/pull/563 didn't make it to stable-1.1
-yes so lets just include it here in case it doesn't end up in 1.1.X in the
-future.
-
-Signed-off-by: Markos Chandras <hwoarang@g.o>
-
-From bc19636d587fbabfbc2252f1bf4887fee87bb247 Mon Sep 17 00:00:00 2001
-From: Dennis Schridde <devurandom@×××.net>
-Date: Thu, 11 Jun 2015 15:21:19 +0200
-Subject: [PATCH] Fix creation of dev/mqueue and dev/shm on Gentoo
-
-The dev/mqueue and dev/shm directories do not exist when using lxc.autodev, thus they have to be created upon mount.
-
-Signed-off-by: Dennis Schridde <devurandom@×××.net>
----
- config/templates/gentoo.moresecure.conf.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/config/templates/gentoo.moresecure.conf.in b/config/templates/gentoo.moresecure.conf.in
-index 270e9df..f827ad2 100644
---- a/config/templates/gentoo.moresecure.conf.in
-+++ b/config/templates/gentoo.moresecure.conf.in
-@@ -8,8 +8,8 @@ lxc.include = @LXCTEMPLATECONFIG@/common.conf
- # Container user ? see gentoo.common.conf
- 
- # do not mount sysfs, see http://blog.bofh.it/debian/id_413
--lxc.mount.entry=mqueue dev/mqueue mqueue rw,nodev,noexec,nosuid 0 0
--lxc.mount.entry=shm dev/shm tmpfs rw,nosuid,nodev,noexec,relatime 0 0
-+lxc.mount.entry=mqueue dev/mqueue mqueue rw,nodev,noexec,nosuid,create=dir 0 0
-+lxc.mount.entry=shm dev/shm tmpfs rw,nosuid,nodev,noexec,relatime,create=dir 0 0
- lxc.mount.entry=run run tmpfs rw,nosuid,nodev,relatime,mode=755 0 0
- 
- # this part is based on 'linux capabilities', see: man 7 capabilities

diff --git a/app-emulation/lxc/files/lxc-1.1.3-bash-completion.patch b/app-emulation/lxc/files/lxc-1.1.3-bash-completion.patch
deleted file mode 100644
index 3bcb40c..00000000
--- a/app-emulation/lxc/files/lxc-1.1.3-bash-completion.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Index: lxc-lxc-1.1.3/config/bash/Makefile.am
-===================================================================
---- lxc-lxc-1.1.3.orig/config/bash/Makefile.am
-+++ lxc-lxc-1.1.3/config/bash/Makefile.am
-@@ -2,12 +2,12 @@ EXTRA_DIST = lxc
- 
- if ENABLE_BASH
- install-bash:
--	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/
--	$(INSTALL_DATA) lxc $(DESTDIR)$(sysconfdir)/bash_completion.d/
-+	$(MKDIR_P) $(DESTDIR)$(datarootdir)/bash-completion/completions//
-+	$(INSTALL_DATA) lxc $(DESTDIR)$(datarootdir)/bash-completion/completions/
- 
- uninstall-bash:
--	rm -f $(DESTDIR)$(sysconfdir)/bash_completion.d/lxc
--	rmdir $(DESTDIR)$(sysconfdir)/bash_completion.d/ || :
-+	rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/lxc
-+	rmdir $(DESTDIR)$(datarootdir)/bash-completion/ || :
- 
- install-data-local: install-bash
- uninstall-local: uninstall-bash
-Index: lxc-lxc-1.1.3/config/bash/lxc.in
-===================================================================
---- lxc-lxc-1.1.3.orig/config/bash/lxc.in
-+++ lxc-lxc-1.1.3/config/bash/lxc.in
-@@ -1,4 +1,3 @@
--have lxc-start && {
-     _lxc_names() {
-         COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) )
-     }
-@@ -100,4 +99,3 @@ have lxc-start && {
- 
-     complete -o default -F _lxc_generic_o lxc-clone
-     complete -o default -F _lxc_generic_o lxc-start-ephemeral
--}

diff --git a/app-emulation/lxc/files/lxc-2.0.1-bash-completion.patch b/app-emulation/lxc/files/lxc-2.0.1-bash-completion.patch
deleted file mode 100644
index 9ef6013..00000000
--- a/app-emulation/lxc/files/lxc-2.0.1-bash-completion.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- lxc-lxc-2.0.1/config/bash/Makefile.am.orig	2016-05-18 20:40:42.238487678 +0000
-+++ lxc-lxc-2.0.1/config/bash/Makefile.am	2016-05-18 20:43:02.163497779 +0000
-@@ -2,12 +2,12 @@
- 
- if ENABLE_BASH
- install-bash:
--	$(MKDIR_P) $(DESTDIR)$(sysconfdir)/bash_completion.d/
--	$(INSTALL_DATA) lxc $(DESTDIR)$(sysconfdir)/bash_completion.d/
-+	$(MKDIR_P) $(DESTDIR)$(datarootdir)/bash-completion/completions/
-+	$(INSTALL_DATA) lxc $(DESTDIR)$(datarootdir)/bash-completion/completions/
- 
- uninstall-bash:
--	rm -f $(DESTDIR)$(sysconfdir)/bash_completion.d/lxc
--	rmdir $(DESTDIR)$(sysconfdir)/bash_completion.d/ || :
-+	rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/lxc
-+	rmdir $(DESTDIR)$(datarootdir)/bash-completion/completions/ || :
- 
- install-data-local: install-bash
- uninstall-local: uninstall-bash
---- lxc-lxc-2.0.1/config/bash/lxc.in.orig	2016-05-18 20:40:51.079488316 +0000
-+++ lxc-lxc-2.0.1/config/bash/lxc.in	2016-05-18 20:45:03.506506538 +0000
-@@ -1,4 +1,3 @@
--_have lxc-start && {
-     _lxc_names() {
-         COMPREPLY=( $( compgen -W "$( lxc-ls )" "$cur" ) )
-     }
-@@ -100,4 +99,3 @@
- 
-     complete -o default -F _lxc_generic_o lxc-copy
-     complete -o default -F _lxc_generic_o lxc-start-ephemeral
--}

diff --git a/app-emulation/lxc/files/lxc-2.0.1-omit-sysconfig.patch b/app-emulation/lxc/files/lxc-2.0.1-omit-sysconfig.patch
deleted file mode 100644
index 9b83a3b..00000000
--- a/app-emulation/lxc/files/lxc-2.0.1-omit-sysconfig.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- lxc-lxc-2.0.1/config/Makefile.am.orig	2016-05-19 02:56:11.891113982 +0000
-+++ lxc-lxc-2.0.1/config/Makefile.am	2016-05-19 02:56:32.596115476 +0000
-@@ -1 +1 @@
--SUBDIRS = apparmor bash etc init selinux templates yum sysconfig
-+SUBDIRS = apparmor bash etc init selinux templates yum

diff --git a/app-emulation/lxc/files/lxc.initd.4 b/app-emulation/lxc/files/lxc.initd.4
deleted file mode 100644
index c8325bc..00000000
--- a/app-emulation/lxc/files/lxc.initd.4
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-CONTAINER=${SVCNAME#*.}
-
-LXC_PATH=`lxc-config lxc.lxcpath`
-
-lxc_get_configfile() {
-	if [ -f "${LXC_PATH}/${CONTAINER}.conf" ]; then
-		echo "${LXC_PATH}/${CONTAINER}.conf"
-	elif [ -f "${LXC_PATH}/${CONTAINER}/config" ]; then
-		echo "${LXC_PATH}/${CONTAINER}/config"
-	else
-		eerror "Unable to find a suitable configuration file."
-		eerror "If you set up the container in a non-standard"
-		eerror "location, please set the CONFIGFILE variable."
-		return 1
-	fi
-}
-
-[ $CONTAINER != $SVCNAME ] && CONFIGFILE=${CONFIGFILE:-$(lxc_get_configfile)}
-
-lxc_get_var() {
-	awk 'BEGIN { FS="[ \t]*=[ \t]*" } $1 == "'$1'" { print $2; exit }' ${CONFIGFILE}
-}
-
-lxc_get_net_link_type() {
-	awk 'BEGIN { FS="[ \t]*=[ \t]*"; _link=""; _type="" }
-		$1 == "lxc.network.type" {_type=$2;}
-		$1 == "lxc.network.link" {_link=$2;}
-		{if(_link != "" && _type != ""){
-			printf("%s:%s\n", _link, _type );
-			_link=""; _type="";
-		}; }' <${CONFIGFILE}
-}
-
-checkconfig() {
-	if [ ${CONTAINER} = ${SVCNAME} ]; then
-		eerror "You have to create an init script for each container:"
-		eerror " ln -s lxc /etc/init.d/lxc.container"
-		return 1
-	fi
-
-	# no need to output anything, the function takes care of that.
-	[ -z "${CONFIGFILE}" ] && return 1
-
-	utsname=$(lxc_get_var lxc.utsname)
-	if [ ${CONTAINER} != ${utsname} ]; then
-	    eerror "You should use the same name for the service and the"
-	    eerror "container. Right now the container is called ${utsname}"
-	    return 1
-	fi
-}
-
-depend() {
-	# be quiet, since we have to run depend() also for the
-	# non-muxed init script, unfortunately.
-	checkconfig 2>/dev/null || return 0
-
-	config ${CONFIGFILE}
-	need localmount
-	use lxcfs
-
-	local _x _if
-	for _x in $(lxc_get_net_link_type); do
-		_if=${_x%:*}
-		case "${_x##*:}" in
-			# when the network type is set to phys, we can make use of a
-			# network service (for instance to set it up before we disable
-			# the net_admin capability), but we might also not set it up
-			# at all on the host and leave the net_admin capable service
-			# to take care of it.
-			phys)	use net.${_if} ;;
-			*)	need net.${_if} ;;
-		esac
-	done
-}
-
-start() {
-	checkconfig || return 1
-	rm -f /var/log/lxc/${CONTAINER}.log
-
-	rootpath=$(lxc_get_var lxc.rootfs)
-
-	# Check the format of our init and the chroot's init, to see
-	# if we have to use linux32 or linux64; always use setarch
-	# when required, as that makes it easier to deal with
-	# x32-based containers.
-	case $(scanelf -BF '%a#f' ${rootpath}/sbin/init) in
-		EM_X86_64)	setarch=linux64;;
-		EM_386)		setarch=linux32;;
-	esac
-
-	ebegin "Starting ${CONTAINER}"
-	env -i ${setarch} $(which lxc-start) -l WARN -n ${CONTAINER} -f ${CONFIGFILE} -d -o /var/log/lxc/${CONTAINER}.log
-	sleep 0.5
-
-	# lxc-start -d will _always_ report a correct startup, even if it
-	# failed, so rather than trust that, check that the cgroup exists.
-	[ -d /sys/fs/cgroup/cpuset/lxc/${CONTAINER} ]
-	eend $?
-}
-
-stop() {
-	checkconfig || return 1
-
-
-	if ! [ -d /sys/fs/cgroup/cpuset/lxc/${CONTAINER} ]; then
-	    ewarn "${CONTAINER} doesn't seem to be started."
-	    return 0
-	fi
-
-	# 10s should be enough to shut everything down
-	ebegin "Stopping ${CONTAINER}"
-	lxc-stop -t 10 -n ${CONTAINER}
-	eend $?
-}

diff --git a/app-emulation/lxc/files/lxc_at.service.2 b/app-emulation/lxc/files/lxc_at.service.2
deleted file mode 100644
index 82306a0..00000000
--- a/app-emulation/lxc/files/lxc_at.service.2
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=Linux Container %I
-After=network.target
-
-[Service]
-Restart=always
-ExecStartPre=/usr/libexec/lxc/lxc-devsetup
-ExecStart=/usr/bin/lxc-start -n %i -F
-ExecReload=/usr/bin/lxc-restart -n %i
-ExecStop=/usr/bin/lxc-stop -n %i
-Delegate=yes
-
-[Install]
-WantedBy=multi-user.target

diff --git a/app-emulation/lxc/files/lxc_at.service.3 b/app-emulation/lxc/files/lxc_at.service.3
deleted file mode 100644
index 6726414..00000000
--- a/app-emulation/lxc/files/lxc_at.service.3
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Linux Container %I
-After=network.target
-Wants=lxcfs.service
-
-[Service]
-Restart=always
-ExecStartPre=/usr/libexec/lxc/lxc-devsetup
-ExecStart=/usr/bin/lxc-start -n %i -F
-ExecReload=/usr/bin/lxc-restart -n %i
-ExecStop=/usr/bin/lxc-stop -n %i
-Delegate=yes
-
-[Install]
-WantedBy=multi-user.target