From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QurCx-0007lM-1y for garchives@archives.gentoo.org; Sat, 20 Aug 2011 19:27:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4996B21C114; Sat, 20 Aug 2011 19:26:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A37BD21C114 for ; Sat, 20 Aug 2011 19:26:38 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B93FC1B404F for ; Sat, 20 Aug 2011 19:26:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id DA73C80040 for ; Sat, 20 Aug 2011 19:26:36 +0000 (UTC) From: "Vikraman Choudhury" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Vikraman Choudhury" Message-ID: <287df17a00eaf4349d7bb04ccc12b060f37255eb.vikraman@gentoo> Subject: [gentoo-commits] proj/gentoostats:master commit in: overlay/app-portage/gentoostats/ X-VCS-Repository: proj/gentoostats X-VCS-Files: overlay/app-portage/gentoostats/Manifest overlay/app-portage/gentoostats/gentoostats-9999.ebuild X-VCS-Directories: overlay/app-portage/gentoostats/ X-VCS-Committer: vikraman X-VCS-Committer-Name: Vikraman Choudhury X-VCS-Revision: 287df17a00eaf4349d7bb04ccc12b060f37255eb Date: Sat, 20 Aug 2011 19:26:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: ff4345321ae9e07497d6d8dd6770cef1 commit: 287df17a00eaf4349d7bb04ccc12b060f37255eb Author: Vikraman Choudhury gmail com> AuthorDate: Thu Aug 18 19:43:34 2011 +0000 Commit: Vikraman Choudhury gmail com> CommitDate: Thu Aug 18 19:43:34 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gentoostats.g= it;a=3Dcommit;h=3D287df17a fixes by antarus --- overlay/app-portage/gentoostats/Manifest | 2 +- .../gentoostats/gentoostats-9999.ebuild | 19 ++++++++++++++= ++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/overlay/app-portage/gentoostats/Manifest b/overlay/app-porta= ge/gentoostats/Manifest index 1fc6430..b9d8459 100644 --- a/overlay/app-portage/gentoostats/Manifest +++ b/overlay/app-portage/gentoostats/Manifest @@ -1 +1 @@ -EBUILD gentoostats-9999.ebuild 1319 RMD160 e6dabb21e90207c85c12a3140fb22= 7602f7b6911 SHA1 8d9ee7a60453a09529e6f7f7d2866987fdf1494f SHA256 cae18e0b= 8b29eb3c374be5ff313593ffecc0f9e4bad07be174dd3fb9fdc3afb2 +EBUILD gentoostats-9999.ebuild 1745 RMD160 b166ed97e35be943cab17d9a232ab= 0322fa52d36 SHA1 e7727aa3c58d7713f20b0787e5c5544fbaaae880 SHA256 01c3bb3a= 9cfc6dbc25d20a4b1b4ec223cf6a428ba38a5a98f6d7779a3b1c1927 diff --git a/overlay/app-portage/gentoostats/gentoostats-9999.ebuild b/ov= erlay/app-portage/gentoostats/gentoostats-9999.ebuild index 30892e9..2a3c666 100644 --- a/overlay/app-portage/gentoostats/gentoostats-9999.ebuild +++ b/overlay/app-portage/gentoostats/gentoostats-9999.ebuild @@ -25,12 +25,12 @@ RDEPEND=3D"${DEPEND} dev-python/simplejson" =20 src_compile() { - cd "client" + pushd "client" distutils_src_compile } =20 src_install() { - cd "client" + pushd "client" distutils_src_install =20 dodir /etc/gentoostats || die @@ -42,6 +42,19 @@ src_install() { fperms 0640 /etc/gentoostats/payload.cfg || die } =20 +generate_uuid() { + if [[ -e /proc/sys/kernel/random/uuid ]]; then + cat /proc/sys/kernel/random/uuid + else + AUTH1=3D$(< /dev/urandom tr -dc a-zA-Z0-9 | head -c8) + AUTH2=3D$(< /dev/urandom tr -dc a-zA-Z0-9 | head -c4) + AUTH3=3D$(< /dev/urandom tr -dc a-zA-Z0-9 | head -c4) + AUTH4=3D$(< /dev/urandom tr -dc a-zA-Z0-9 | head -c4) + AUTH5=3D$(< /dev/urandom tr -dc a-zA-Z0-9 | head -c12) + echo "${AUTH1}-${AUTH2}-${AUTH3}-${AUTH4}-${AUTH5}" + fi +} + pkg_postinst() { distutils_pkg_postinst =20 @@ -51,7 +64,7 @@ pkg_postinst() { touch "${AUTHFILE}" echo "[AUTH]" >> "${AUTHFILE}" echo -n "UUID : " >> "${AUTHFILE}" - cat /proc/sys/kernel/random/uuid >> "${AUTHFILE}" + generate_uuid >> "${AUTHFILE}" echo -n "PASSWD : " >> "${AUTHFILE}" < /dev/urandom tr -dc a-zA-Z0-9 | head -c16 >> "${AUTHFILE}" fi