From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-844355-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
by finch.gentoo.org (Postfix) with ESMTP id E051B1384B4
for <garchives@archives.gentoo.org>; Fri, 6 Nov 2015 04:23:32 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 22CF1E07F5;
Fri, 6 Nov 2015 04:23:28 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id A7FCFE07F5
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Nov 2015 04:23:27 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 464073406AA
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Nov 2015 04:23:25 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 8EB5D2193
for <gentoo-commits@lists.gentoo.org>; Fri, 6 Nov 2015 04:23:23 +0000 (UTC)
From: "Erik Mackdanz" <stasibear@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Erik Mackdanz" <stasibear@gentoo.org>
Message-ID: <1446783797.e833cac3c3b73acdf7de3ed468b8c90f3f209779.stasibear@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-emulation/lxd/, app-emulation/lxd/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-emulation/lxd/Manifest app-emulation/lxd/files/lxd-0.21-dont-go-get.patch app-emulation/lxd/files/lxd-0.21-nc-binary-name.patch app-emulation/lxd/files/lxd-0.21.confd app-emulation/lxd/files/lxd-0.21.initd app-emulation/lxd/lxd-0.21.ebuild
X-VCS-Directories: app-emulation/lxd/ app-emulation/lxd/files/
X-VCS-Committer: stasibear
X-VCS-Committer-Name: Erik Mackdanz
X-VCS-Revision: e833cac3c3b73acdf7de3ed468b8c90f3f209779
X-VCS-Branch: master
Date: Fri, 6 Nov 2015 04:23:23 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: ba877937-f205-45c4-95e7-0b8f559ad2d6
X-Archives-Hash: 2260c25cea075b75b3e07a9e4370c587
commit: e833cac3c3b73acdf7de3ed468b8c90f3f209779
Author: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 6 04:22:26 2015 +0000
Commit: Erik Mackdanz <stasibear <AT> gentoo <DOT> org>
CommitDate: Fri Nov 6 04:23:17 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e833cac3
app-emulation/lxd: version bump to 0.21
Package-Manager: portage-2.2.23
app-emulation/lxd/Manifest | 1 +
app-emulation/lxd/files/lxd-0.21-dont-go-get.patch | 18 +++
.../lxd/files/lxd-0.21-nc-binary-name.patch | 11 ++
app-emulation/lxd/files/lxd-0.21.confd | 27 ++++
app-emulation/lxd/files/lxd-0.21.initd | 32 ++++
app-emulation/lxd/lxd-0.21.ebuild | 169 +++++++++++++++++++++
6 files changed, 258 insertions(+)
diff --git a/app-emulation/lxd/Manifest b/app-emulation/lxd/Manifest
index 12e2ace..59cbdef 100644
--- a/app-emulation/lxd/Manifest
+++ b/app-emulation/lxd/Manifest
@@ -1,3 +1,4 @@
DIST lxd-0.16.tar.bz2 2660683 SHA256 bbe2b7542af34c93c7509e9638016a420bfc1daf1f1f45a33fa3d379ae10f14f SHA512 856e5ea1920ec3025cbd308a8e2ef656393a149111a38188f749e7d42a41032d762009d85316815c3f18ac0907fa9380758ca48666b13e900c9bbdf809d57f1c WHIRLPOOL f4bbea69073f2cc0dce65e39d88cdf1a0fadd4629b5b42bdee7ab385df459f78a2e36619c40ace687be124fb8d59c0da043cb1a8195630b2d0a051ab53297b89
DIST lxd-0.18.tar.bz2 2674919 SHA256 cb9c4823fb19ccef4827ee4dc3a105b60d3549b5023f4517d1471487469ea395 SHA512 5bbaae6eef27a0b14f8fee41d113afeea61de5414e5f7ed5011819eb6823a11dff647ac3f9781357304f7c5b04c618d05e4a04197cae6c6e4845cad5476d22ff WHIRLPOOL ca73e587f19491d79b03af2d205ab9f234b5acb1ff1f2d68a05be053cbd1ec89f6b9bc0fc64113980d7f2d6e3c7ece01d7d0c431c08a87b2b0ec555c6ff97914
DIST lxd-0.20.tar.bz2 2687718 SHA256 a071b92015f676746137e1ffeab1886d90297d0d5832bbf5ee6aff081acc4840 SHA512 2064daa7d1aeb4764a15d559e3d4178918942d82dbba31e964d713aab48d2ee30ce6a63632701c41b13de4aea541acd76d55b52f12de10a99ffeaa3cb945ad44 WHIRLPOOL 1ffa9d6bf1cb7132b82e731002eae7b7ff3544fb03958827916c2e00e02a0bdd10bbadd2401f7799187c2c0338987f24b46d8e138131f7df888162e56b3f4fe5
+DIST lxd-0.21.tar.bz2 2683517 SHA256 06e9ed72d1d45af532664e47d9772a886dc1d757e83d673498b05798249c66c8 SHA512 588225ed77cd8a86b34579ee3f3b2b3ba8166ce9d85872e6076fa5075bc5a3846c82255dee6e701a6d51bdd9bf8280bbd5fab08ca4438de5320de8f0388685eb WHIRLPOOL c85f103e38f44c4cd859faf330764c3d076cede6d09f976b4686d7f91b6ca233e09721df418493fed19cb8bf3118b2a0a6723f3084da532bba4a5344de8a4b9c
diff --git a/app-emulation/lxd/files/lxd-0.21-dont-go-get.patch b/app-emulation/lxd/files/lxd-0.21-dont-go-get.patch
new file mode 100644
index 0000000..1b229ea
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.21-dont-go-get.patch
@@ -0,0 +1,18 @@
+--- Makefile.orig 2015-09-17 20:37:16.481867339 -0500
++++ Makefile 2015-09-17 20:53:27.715800926 -0500
+@@ -12,15 +12,11 @@
+
+ .PHONY: default
+ default:
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v ./...
+ @echo "LXD built succesfuly"
+
+ .PHONY: client
+ client:
+- -go get -t -v -d ./...
+- -go get -t -v -d ./...
+ go install -v ./lxc
+ @echo "LXD client built succesfuly"
+
diff --git a/app-emulation/lxd/files/lxd-0.21-nc-binary-name.patch b/app-emulation/lxd/files/lxd-0.21-nc-binary-name.patch
new file mode 100644
index 0000000..b88b7f7
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.21-nc-binary-name.patch
@@ -0,0 +1,11 @@
+--- lxd/rsync.go.orig 2015-09-17 21:00:29.290772099 -0500
++++ lxd/rsync.go 2015-09-17 21:00:54.737770359 -0500
+@@ -73,7 +73,7 @@
+ * command (i.e. the command to run on --server). However, we're
+ * hardcoding that at the other end, so we can just ignore it.
+ */
+- rsyncCmd := fmt.Sprintf("sh -c \"nc -U %s\"", f.Name())
++ rsyncCmd := fmt.Sprintf("sh -c \"nc.openbsd -U %s\"", f.Name())
+ cmd := exec.Command("rsync", "-arvP", "--devices", "--partial", path, "localhost:/tmp/foo", "-e", rsyncCmd)
+ if err := cmd.Start(); err != nil {
+ return nil, nil, err
diff --git a/app-emulation/lxd/files/lxd-0.21.confd b/app-emulation/lxd/files/lxd-0.21.confd
new file mode 100644
index 0000000..3d55327
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.21.confd
@@ -0,0 +1,27 @@
+# Group which owns the shared socket
+LXD_OPTIONS+=" --group lxd"
+
+
+
+# Enable cpu profiling into the specified file
+#LXD_OPTIONS+=" --cpuprofile /tmp/lxc_cpu_profile"
+
+# Enable memory profiling into the specified file
+#LXD_OPTIONS+=" --memprofile /tmp/lxc_mem_profile"
+
+
+
+# Enables debug mode
+#LXD_OPTIONS+=" --debug"
+
+# For debugging, print a complete stack trace every n seconds
+#LXD_OPTIONS+=" --print-goroutines-every 5"
+
+# Enables verbose mode
+#LXD_OPTIONS+=" -v"
+
+# Logfile to log to
+#LXD_OPTIONS+=" --logfile /var/log/lxd/lxd.log"
+
+# Enables syslog logging
+#LXD_OPTIONS+=" --syslog"
diff --git a/app-emulation/lxd/files/lxd-0.21.initd b/app-emulation/lxd/files/lxd-0.21.initd
new file mode 100644
index 0000000..2b75e51
--- /dev/null
+++ b/app-emulation/lxd/files/lxd-0.21.initd
@@ -0,0 +1,32 @@
+#!/sbin/runscript
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DAEMON=/usr/sbin/lxd
+PIDFILE=/run/lxd.pid
+
+depend() {
+ need cgmanager
+ need net
+}
+
+start() {
+ ebegin "Starting lxd server"
+
+ start-stop-daemon --start \
+ --pidfile ${PIDFILE} \
+ --exec ${DAEMON} \
+ --background \
+ --make-pidfile \
+ -- \
+ ${LXD_OPTIONS}
+
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping lxd server"
+ start-stop-daemon --stop --quiet -R TERM/45 -p ${PIDFILE}
+ eend $?
+}
diff --git a/app-emulation/lxd/lxd-0.21.ebuild b/app-emulation/lxd/lxd-0.21.ebuild
new file mode 100644
index 0000000..dd67b7b
--- /dev/null
+++ b/app-emulation/lxd/lxd-0.21.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Fast, dense and secure container management"
+HOMEPAGE="https://linuxcontainers.org/lxd/introduction/"
+EGO_PN_PARENT="github.com/lxc"
+EGO_PN="${EGO_PN_PARENT}/lxd"
+SRC_URI="https://dev.gentoo.org/~stasibear/distfiles/${P}.tar.bz2"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+PLOCALES="de fr ja"
+IUSE="+daemon nls test"
+
+# IUSE and PLOCALES must be defined before l10n inherited
+inherit bash-completion-r1 eutils golang-build l10n systemd user vcs-snapshot
+
+DEPEND="
+ dev-go/go-crypto
+ >=dev-lang/go-1.4.2:=
+ dev-libs/protobuf
+ dev-vcs/git
+ nls? ( sys-devel/gettext )
+ test? (
+ app-misc/jq
+ dev-db/sqlite
+ net-misc/curl
+ sys-devel/gettext
+ )
+"
+
+RDEPEND="
+ daemon? (
+ app-admin/cgmanager
+ app-arch/xz-utils
+ app-emulation/lxc[cgmanager,seccomp]
+ net-analyzer/openbsd-netcat
+ net-misc/bridge-utils
+ net-misc/rsync[xattr]
+ sys-apps/iproute2
+ virtual/acl
+ )
+"
+
+# KNOWN ISSUES:
+# - Translations may not work. I've been unsuccessful in forcing
+# localized output. Anyway, upstream (Canonical) doesn't install the
+# message files.
+
+# TODO:
+# - since 0.15 gccgo is a supported compiler ('make gccgo'). It would
+# be preferable for that support to go into the golang-build eclass not
+# this package directly.
+# - integrate "lxd shutdown" into initscript as custom action (default "stop"
+# action should _not_ stop containers amirite?)
+# "Perform a clean shutdown of LXD and all running containers"
+
+src_prepare() {
+ cd "${S}/src/${EGO_PN}"
+
+ epatch "${FILESDIR}/${P}-dont-go-get.patch"
+
+ # Upstream requires the openbsd flavor of netcat (with -U), but
+ # Gentoo installs that with a renamed binary
+ epatch "${FILESDIR}/${P}-nc-binary-name.patch"
+
+ # Warn on unhandled locale changes
+ l10n_find_plocales_changes po "" .po
+}
+
+src_compile() {
+ golang-build_src_compile
+
+ cd "${S}/src/${EGO_PN}"
+
+ if use daemon; then
+ # Build binaries
+ GOPATH="${S}:$(get_golibdir_gopath)" emake
+ else
+ # build client tool
+ GOPATH="${S}:$(get_golibdir_gopath)" emake client
+ fi
+
+ use nls && emake build-mo
+}
+
+src_test() {
+ if use daemon; then
+ # Go native tests should succeed
+ golang-build_src_test
+ fi
+}
+
+src_install() {
+ # Installs all src,pkg to /usr/lib/go-gentoo
+ golang-build_src_install
+
+ cd "${S}"
+ dobin bin/lxc
+ if use daemon; then
+ dobin bin/fuidshift
+
+ dosbin bin/lxd
+ fi
+
+ cd "src/${EGO_PN}"
+
+ if use nls; then
+ for lingua in ${PLOCALES}; do
+ if use linguas_${lingua}; then
+ domo po/${lingua}.mo
+ fi
+ done
+ fi
+
+ if use daemon; then
+ newinitd "${FILESDIR}"/${P}.initd lxd
+ newconfd "${FILESDIR}"/${P}.confd lxd
+
+ systemd_dounit "${FILESDIR}"/lxd.service
+ fi
+
+ newbashcomp config/bash/lxc.in lxc
+
+ dodoc AUTHORS CONTRIBUTING.md README.md
+
+ docinto specs
+ dodoc specs/*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Consult https://wiki.gentoo.org/wiki/LXD for more information,"
+ einfo "including a Quick Start."
+
+ # The messaging below only applies to daemon installs
+ use daemon || return 0
+
+ # The control socket will be owned by (and writeable by) this group.
+ enewgroup lxd
+
+ # Ubuntu also defines an lxd user but it appears unused (the daemon
+ # must run as root)
+
+ einfo
+ einfo "Though not strictly required, some features are enabled at run-time"
+ einfo "when the relevant helper programs are detected:"
+ einfo "- sys-apps/apparmor"
+ einfo "- sys-fs/btrfs-progs"
+ einfo "- sys-fs/lvm2"
+ einfo "- sys-fs/zfs"
+ einfo "- sys-process/criu"
+ einfo
+ einfo "Since these features can't be disabled at build-time they are"
+ einfo "not USE-conditional."
+
+ if test -n "${REPLACING_VERSIONS}"; then
+ einfo
+ einfo "If you are upgrading from version 0.14 or older, note that the --tcp"
+ einfo "is no longer available in /etc/conf.d/lxd. Instead, configure the"
+ einfo "listen address/port by setting the core.https_address server option."
+ fi
+
+ einfo
+}