From: Sebastian Pipping <sping@gentoo.org>
Date: Mon, 9 Jan 2012 21:45:56 +0000 (+0000)
Subject: sys-process/atop: 1.26-r1
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=466f35497106a5d7976067b018623b997a64eb4a;p=gentoo.git

sys-process/atop: 1.26-r1

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64
---

diff --git a/sys-process/atop/ChangeLog b/sys-process/atop/ChangeLog
index d919e4fe0f0f..2f85381147e0 100644
--- a/sys-process/atop/ChangeLog
+++ b/sys-process/atop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/atop
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/atop/ChangeLog,v 1.36 2010/12/13 10:25:36 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/atop/ChangeLog,v 1.37 2012/01/09 21:45:56 sping Exp $
+
+*atop-1.26-r1 (09 Jan 2012)
+
+  09 Jan 2012; Sebastian Pipping <sping@gentoo.org> +atop-1.26-r1.ebuild,
+  +files/atop-1.26-cve-2011-3618.patch:
+  Integrate custom patch for CVE-2011-3618 (bug #363887)
 
 *atop-1.26 (13 Dec 2010)
 
diff --git a/sys-process/atop/Manifest b/sys-process/atop/Manifest
index 1272a95b524f..565997ec3bf2 100644
--- a/sys-process/atop/Manifest
+++ b/sys-process/atop/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
+AUX atop-1.26-cve-2011-3618.patch 971 RMD160 17b2df459b0212a2347abee7030d1e6006e19e79 SHA1 e2fe5af45c24bf2501269b55ba3e7b0f38f8f3d3 SHA256 2cfe007fcf425683b9df57d51c7da151938a93642e07019e2993edde62a46bb3
 AUX atop.rc 459 RMD160 c249ffb415fc3fd770fa751c50516e148552076a SHA1 42a06b6bff045d0400df47f917244bfed745d8de SHA256 99b1d6f13fb16fce81008d2e43315212d8c81645dacf29a04067b5c82c0d753a
 DIST atop-1.23.tar.gz 174352 RMD160 56165f13a24771a042ba0608bd6839a314446665 SHA1 9a1eb0e8d60e94e147a926ad684f5a35f9fe4463 SHA256 20fa6dc87d9c032dc550ed65314e20a0f12963ec89e8678a620d93a3f348cbc6
 DIST atop-1.25.tar.gz 223507 RMD160 4ad206c66633a230cfb7383757e2f72e91c34f0d SHA1 8c48599dba87ad6aefb9a4f8f9517460026ce2b2 SHA256 ddb857a57131f6ec15f01de09bed91fee59ed744ace2718ff0219a82d9b0393c
 DIST atop-1.26.tar.gz 233000 RMD160 45cb3bec1043768c12285df60c7a06b9f200c18a SHA1 fe4ad41a88eb0f80d0740f6f98b0c2b3621f8236 SHA256 4cb684388c52f0c90afa446fbc9558ba20a0ec98db8a0831382fe4b70d276939
 EBUILD atop-1.23.ebuild 781 RMD160 f2ac1a1077d4ecbfe01a0ee8d9b30943fb941f66 SHA1 ed23bb1266c35e5c635f74e608398ac0f35491a4 SHA256 d6c457ed1f995df18574abddc6d463ebae9c41d714f002aa3470bce637a4272e
 EBUILD atop-1.25-r1.ebuild 954 RMD160 48a341c0159c94263418be69dfb5cc92c8792679 SHA1 fce25a8b5becfdc575e65c23083bcbbdc86d4e23 SHA256 522aa74ada863955432691803fee7c6879eb2f3b5ac0c4c27c663ddae3f12cf9
+EBUILD atop-1.26-r1.ebuild 1007 RMD160 85ba0af13a1c6f1d6e83148c511318c811847b5f SHA1 423300f83223350bd5e31f7aad8828f24910b4eb SHA256 a9a351e34968b164f1aa8363880dd9158d796b749babdd9104cb9e5dd347ad1d
 EBUILD atop-1.26.ebuild 949 RMD160 bb44caa9ff3e5d7aa177fc44fc6593fdc80fffd9 SHA1 ab4a7fad414b88ede657d0b72d9e277d13800526 SHA256 884b6437997a5fc97b9031656ab2207e3afe7a057580fc3c1e530524599c97f6
-MISC ChangeLog 4971 RMD160 aa2706eb929e1c885d5fe956a67b04dd7ee3644c SHA1 69c420a2c39eb41b31908e6da633d407959d386a SHA256 9e1f012a468db6fe334d9ab8875308d074a1b44248a6a9032d19781885e99059
+MISC ChangeLog 5171 RMD160 98aa932ee0cd56bce25ae84b9b0be588f2d4b170 SHA1 86df2a5ef9aad7d7883b701a1aa1ed481c0c7790 SHA256 37198157f9c3a6b8e8fea229f65293236db7062ca97fbe976955f26ac56c6cc9
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk0F9IgACgkQTwhj9JtAlp5xpgD/YvbTYmfmgk6wGJNtd+Vx/WqQ
-4FQrvFkOivUkYPgiAFgA/22CSzL3R6Iz/t2D1z0nO+vu7r9YS70/yD4JzA7uh2X/
-=zU9c
+iEYEARECAAYFAk8LYAkACgkQsAvGakAaFgCINwCfRGOhArPuDvOduUuVWcHgsD4Y
+/DEAmwUDR13FE1dBHrIcTykoQs9JJv6g
+=sl7P
 -----END PGP SIGNATURE-----
diff --git a/sys-process/atop/atop-1.26-r1.ebuild b/sys-process/atop/atop-1.26-r1.ebuild
new file mode 100644
index 000000000000..3c4a1081d705
--- /dev/null
+++ b/sys-process/atop/atop-1.26-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-process/atop/atop-1.26-r1.ebuild,v 1.1 2012/01/09 21:45:56 sping Exp $
+
+EAPI="3"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Resource-specific view of processes"
+HOMEPAGE="http://www.atoptool.nl/"
+SRC_URI="http://www.atoptool.nl/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~x86"
+IUSE=""
+
+DEPEND="sys-process/acct"
+
+src_prepare() {
+	sed -i \
+		-e '/^CFLAGS/s: = -O : += :' \
+		-e '/^LDFLAGS/s: = : += :' \
+		-e 's:\<cc\>:$(CC):' \
+		Makefile
+	tc-export CC
+	cp "${FILESDIR}"/atop.rc atop.init
+	chmod a+rx atop.init
+	sed -i 's: root : :' atop.cron #191926
+
+	epatch "${FILESDIR}"/${P}-cve-2011-3618.patch  # bug 363887
+}
+
+src_install() {
+	emake DESTDIR="${D}" INIPATH=/etc/init.d install || die
+	# useless -${PV} copies ?
+	rm -f "${D}"/usr/bin/atop*-${PV}
+	dodoc README "${D}"/etc/cron.d/*
+	rm -r "${D}"/etc/cron.d || die
+}
diff --git a/sys-process/atop/files/atop-1.26-cve-2011-3618.patch b/sys-process/atop/files/atop-1.26-cve-2011-3618.patch
new file mode 100644
index 000000000000..de8ed10da167
--- /dev/null
+++ b/sys-process/atop/files/atop-1.26-cve-2011-3618.patch
@@ -0,0 +1,35 @@
+--- rawlog.c	2012-01-09 20:31:52.821352486 +0100
++++ rawlog.c	2012-01-09 22:32:48.218647541 +0100
+@@ -565,20 +565,25 @@
+ 		** compressed raw file to be decompressed via gunzip
+ 		*/
+ 		fprintf(stderr, "Decompressing logfile ....\n");
++		snprintf(tmpname2, sizeof tmpname2, "/tmp/atopwrkXXXXXX");
++		rawfd = mkstemp(tmpname2);
++		if (rawfd == -1)
++		{
++			fprintf(stderr, "%s - ", rawname);
++			perror("creating decompression temp file");
++			cleanstop(7);
++		}
+ 
+-		snprintf(tmpname2, sizeof tmpname2, "/tmp/atopwrk%d", getpid());
+ 		snprintf(command,  sizeof command, "gunzip -c %s > %s",
+ 							tmpname1, tmpname2);
+-		system (command);
++		const int system_res = system (command);
++		unlink(tmpname2);
+ 
+-		if ( (rawfd = open(tmpname2, O_RDONLY)) == -1)
++		if (system_res)
+ 		{
+-			fprintf(stderr, "%s - ", rawname);
+-			perror("open decompressed raw file");
++			fprintf(stderr, "%s - gunzip failed", rawname);
+ 			cleanstop(7);
+ 		}
+-
+-		unlink(tmpname2);
+ 	}
+ 
+ 	/*