Date: Wednesday, October 19, 2011 @ 06:00:03
Author: andrea
Revision: 140790
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
htop/repos/extra-i686/ChangeLog
(from rev 140789, htop/trunk/ChangeLog)
htop/repos/extra-i686/PKGBUILD
(from rev 140789, htop/trunk/PKGBUILD)
htop/repos/extra-i686/fix-segfault-small-terminal.patch
(from rev 140789, htop/trunk/fix-segfault-small-terminal.patch)
htop/repos/extra-i686/fix-sort-key-bug.patch
(from rev 140789, htop/trunk/fix-sort-key-bug.patch)
htop/repos/extra-x86_64/ChangeLog
(from rev 140789, htop/trunk/ChangeLog)
htop/repos/extra-x86_64/PKGBUILD
(from rev 140789, htop/trunk/PKGBUILD)
htop/repos/extra-x86_64/fix-segfault-small-terminal.patch
(from rev 140789, htop/trunk/fix-segfault-small-terminal.patch)
htop/repos/extra-x86_64/fix-sort-key-bug.patch
(from rev 140789, htop/trunk/fix-sort-key-bug.patch)
Deleted:
htop/repos/extra-i686/ChangeLog
htop/repos/extra-i686/PKGBUILD
htop/repos/extra-i686/htop.c.patch
htop/repos/extra-x86_64/ChangeLog
htop/repos/extra-x86_64/PKGBUILD
htop/repos/extra-x86_64/htop.c.patch
------------------------------------------------+
extra-i686/ChangeLog | 39 ++++++-----
extra-i686/PKGBUILD | 80 ++++++++++++-----------
extra-i686/fix-segfault-small-terminal.patch | 24 ++++++
extra-i686/fix-sort-key-bug.patch | 15 ++++
extra-i686/htop.c.patch | 15 ----
extra-x86_64/ChangeLog | 39 ++++++-----
extra-x86_64/PKGBUILD | 80 ++++++++++++-----------
extra-x86_64/fix-segfault-small-terminal.patch | 24 ++++++
extra-x86_64/fix-sort-key-bug.patch | 15 ++++
extra-x86_64/htop.c.patch | 15 ----
10 files changed, 212 insertions(+), 134 deletions(-)
Deleted: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog 2011-10-19 09:58:29 UTC (rev 140789)
+++ extra-i686/ChangeLog 2011-10-19 10:00:03 UTC (rev 140790)
@@ -1,17 +0,0 @@
-2011-05-17 Angel Velasquez <an...@archlinux.org>
- * Added patch to fix --sort-key (closes FS#23224)
-
-2009-09-21 Eric Belanger <e...@archlinux.org>
-
- * htop 0.8.3-1
- * Upstream update
- * Built with vserver and openvz support (close FS#12755)
-
-2008-12-09 Alexander Fehr <pizzapunk gmail com>
-
- * htop-0.8.1-1:
- * New upstream release
- * New maintainer
- * Added patch to fix FS#12235
- * Enabled Unicode support
- * Added ChangeLog
Copied: htop/repos/extra-i686/ChangeLog (from rev 140789, htop/trunk/ChangeLog)
===================================================================
--- extra-i686/ChangeLog (rev 0)
+++ extra-i686/ChangeLog 2011-10-19 10:00:03 UTC (rev 140790)
@@ -0,0 +1,22 @@
+2011-10-19 Andrea Scarpino <and...@archlinux.org>
+ * Enable cgroup support (FS#26155)
+ * Add lsof and strace optional depends (FS#25778)
+ * Fix crash when column is less than 40 (closes FS#25823)
+
+2011-05-17 Angel Velasquez <an...@archlinux.org>
+ * Added patch to fix --sort-key (closes FS#23224)
+
+2009-09-21 Eric Belanger <e...@archlinux.org>
+
+ * htop 0.8.3-1
+ * Upstream update
+ * Built with vserver and openvz support (close FS#12755)
+
+2008-12-09 Alexander Fehr <pizzapunk gmail com>
+
+ * htop-0.8.1-1:
+ * New upstream release
+ * New maintainer
+ * Added patch to fix FS#12235
+ * Enabled Unicode support
+ * Added ChangeLog
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2011-10-19 09:58:29 UTC (rev 140789)
+++ extra-i686/PKGBUILD 2011-10-19 10:00:03 UTC (rev 140790)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez <an...@archlinux.org>
-# Contributor: Eric Belanger <e...@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1...@archlinux.us>
-
-pkgname=htop
-pkgver=0.9
-pkgrel=2
-pkgdesc="Interactive process viewer"
-arch=('i686' 'x86_64')
-url="http://htop.sourceforge.net/";
-license=('GPL')
-depends=('ncurses')
-makedepends=('python2')
-options=('!emptydirs')
-changelog=ChangeLog
-source=(http://downloads.sourceforge.net/htop/${pkgname}-${pkgver}.tar.gz
- htop.c.patch)
-md5sums=('7c5507f35f363f3f40183a2ba3c561f8'
- '750e8ad8476c5d9738da2a2bc7a7c2b6')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c
configure
- sed -i 's|python|python2|' scripts/MakeHeader.py
- patch -Np0 -i $srcdir/htop.c.patch
- ./configure --prefix=/usr --enable-unicode --enable-openvz \
- --enable-vserver
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
Copied: htop/repos/extra-i686/PKGBUILD (from rev 140789, htop/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2011-10-19 10:00:03 UTC (rev 140790)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Angel Velasquez <an...@archlinux.org>
+# Contributor: Eric Belanger <e...@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1...@archlinux.us>
+
+pkgname=htop
+pkgver=0.9
+pkgrel=3
+pkgdesc="Interactive process viewer"
+arch=('i686' 'x86_64')
+url="http://htop.sourceforge.net/";
+license=('GPL')
+depends=('ncurses')
+makedepends=('python2')
+optdepends=('lsof' 'strace')
+options=('!emptydirs')
+changelog=ChangeLog
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+ 'fix-sort-key-bug.patch'
+ 'fix-segfault-small-terminal.patch')
+md5sums=('7c5507f35f363f3f40183a2ba3c561f8'
+ '750e8ad8476c5d9738da2a2bc7a7c2b6'
+ 'd93e39c9662522367dc3a73cc3057039')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c
configure
+ sed -i 's|python|python2|' scripts/MakeHeader.py
+
+ patch -Np0 -i "${srcdir}/fix-sort-key-bug.patch"
+ patch -p1 -i "${srcdir}/fix-segfault-small-terminal.patch"
+
+ ./configure --prefix=/usr \
+ --enable-unicode \
+ --enable-openvz \
+ --enable-vserver \
+ --enable-cgroup
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: htop/repos/extra-i686/fix-segfault-small-terminal.patch (from rev
140789, htop/trunk/fix-segfault-small-terminal.patch)
===================================================================
--- extra-i686/fix-segfault-small-terminal.patch
(rev 0)
+++ extra-i686/fix-segfault-small-terminal.patch 2011-10-19 10:00:03 UTC
(rev 140790)
@@ -0,0 +1,24 @@
+--- trunk/Meter.c 2011/08/26 20:52:35 229
++++ trunk/Meter.c 2011/08/26 20:55:09 230
+@@ -264,13 +264,19 @@
+
+ w--;
+ x++;
+- char bar[w];
++
++ if (w < 1) {
++ attrset(CRT_colors[RESET_COLOR]);
++ return;
++ }
++ char bar[w + 1];
+
+ int blockSizes[10];
+ for (int i = 0; i < w; i++)
+ bar[i] = ' ';
+
+- sprintf(bar + (w-strlen(buffer)), "%s", buffer);
++ const size_t barOffset = w - MIN(strlen(buffer), w);
++ snprintf(bar + barOffset, w - barOffset + 1, "%s", buffer);
+
+ // First draw in the bar[] buffer...
+ double total = 0.0;
Copied: htop/repos/extra-i686/fix-sort-key-bug.patch (from rev 140789,
htop/trunk/fix-sort-key-bug.patch)
===================================================================
--- extra-i686/fix-sort-key-bug.patch (rev 0)
+++ extra-i686/fix-sort-key-bug.patch 2011-10-19 10:00:03 UTC (rev 140790)
@@ -0,0 +1,15 @@
+From: Roman Kosenko <madk...@gmail.com>
+Date: Thu, 10 Mar 2011 16:23:53 +0200
+Subject: [PATCH] Fix stupid bug with --sort-key
+
+--- htop.c.old 2010-11-24 20:45:38.000000000 +0200
++++ htop.c 2011-03-10 16:32:18.473716667 +0200
+@@ -282,7 +282,7 @@
+ printVersionFlag();
+ break;
+ case 's':
+- if (strcmp(optarg, "help")) {
++ if (!strcmp(optarg, "help")) {
+ for (int j = 1; j < LAST_PROCESSFIELD; j++)
+ printf ("%s\n", Process_fieldNames[j]);
+ exit(0);
Deleted: extra-i686/htop.c.patch
===================================================================
--- extra-i686/htop.c.patch 2011-10-19 09:58:29 UTC (rev 140789)
+++ extra-i686/htop.c.patch 2011-10-19 10:00:03 UTC (rev 140790)
@@ -1,15 +0,0 @@
-From: Roman Kosenko <madk...@gmail.com>
-Date: Thu, 10 Mar 2011 16:23:53 +0200
-Subject: [PATCH] Fix stupid bug with --sort-key
-
---- htop.c.old 2010-11-24 20:45:38.000000000 +0200
-+++ htop.c 2011-03-10 16:32:18.473716667 +0200
-@@ -282,7 +282,7 @@
- printVersionFlag();
- break;
- case 's':
-- if (strcmp(optarg, "help")) {
-+ if (!strcmp(optarg, "help")) {
- for (int j = 1; j < LAST_PROCESSFIELD; j++)
- printf ("%s\n", Process_fieldNames[j]);
- exit(0);
Deleted: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog 2011-10-19 09:58:29 UTC (rev 140789)
+++ extra-x86_64/ChangeLog 2011-10-19 10:00:03 UTC (rev 140790)
@@ -1,17 +0,0 @@
-2011-05-17 Angel Velasquez <an...@archlinux.org>
- * Added patch to fix --sort-key (closes FS#23224)
-
-2009-09-21 Eric Belanger <e...@archlinux.org>
-
- * htop 0.8.3-1
- * Upstream update
- * Built with vserver and openvz support (close FS#12755)
-
-2008-12-09 Alexander Fehr <pizzapunk gmail com>
-
- * htop-0.8.1-1:
- * New upstream release
- * New maintainer
- * Added patch to fix FS#12235
- * Enabled Unicode support
- * Added ChangeLog
Copied: htop/repos/extra-x86_64/ChangeLog (from rev 140789,
htop/trunk/ChangeLog)
===================================================================
--- extra-x86_64/ChangeLog (rev 0)
+++ extra-x86_64/ChangeLog 2011-10-19 10:00:03 UTC (rev 140790)
@@ -0,0 +1,22 @@
+2011-10-19 Andrea Scarpino <and...@archlinux.org>
+ * Enable cgroup support (FS#26155)
+ * Add lsof and strace optional depends (FS#25778)
+ * Fix crash when column is less than 40 (closes FS#25823)
+
+2011-05-17 Angel Velasquez <an...@archlinux.org>
+ * Added patch to fix --sort-key (closes FS#23224)
+
+2009-09-21 Eric Belanger <e...@archlinux.org>
+
+ * htop 0.8.3-1
+ * Upstream update
+ * Built with vserver and openvz support (close FS#12755)
+
+2008-12-09 Alexander Fehr <pizzapunk gmail com>
+
+ * htop-0.8.1-1:
+ * New upstream release
+ * New maintainer
+ * Added patch to fix FS#12235
+ * Enabled Unicode support
+ * Added ChangeLog
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2011-10-19 09:58:29 UTC (rev 140789)
+++ extra-x86_64/PKGBUILD 2011-10-19 10:00:03 UTC (rev 140790)
@@ -1,35 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez <an...@archlinux.org>
-# Contributor: Eric Belanger <e...@archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1...@archlinux.us>
-
-pkgname=htop
-pkgver=0.9
-pkgrel=2
-pkgdesc="Interactive process viewer"
-arch=('i686' 'x86_64')
-url="http://htop.sourceforge.net/";
-license=('GPL')
-depends=('ncurses')
-makedepends=('python2')
-options=('!emptydirs')
-changelog=ChangeLog
-source=(http://downloads.sourceforge.net/htop/${pkgname}-${pkgver}.tar.gz
- htop.c.patch)
-md5sums=('7c5507f35f363f3f40183a2ba3c561f8'
- '750e8ad8476c5d9738da2a2bc7a7c2b6')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c
configure
- sed -i 's|python|python2|' scripts/MakeHeader.py
- patch -Np0 -i $srcdir/htop.c.patch
- ./configure --prefix=/usr --enable-unicode --enable-openvz \
- --enable-vserver
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
Copied: htop/repos/extra-x86_64/PKGBUILD (from rev 140789, htop/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2011-10-19 10:00:03 UTC (rev 140790)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Angel Velasquez <an...@archlinux.org>
+# Contributor: Eric Belanger <e...@archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1...@archlinux.us>
+
+pkgname=htop
+pkgver=0.9
+pkgrel=3
+pkgdesc="Interactive process viewer"
+arch=('i686' 'x86_64')
+url="http://htop.sourceforge.net/";
+license=('GPL')
+depends=('ncurses')
+makedepends=('python2')
+optdepends=('lsof' 'strace')
+options=('!emptydirs')
+changelog=ChangeLog
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+ 'fix-sort-key-bug.patch'
+ 'fix-segfault-small-terminal.patch')
+md5sums=('7c5507f35f363f3f40183a2ba3c561f8'
+ '750e8ad8476c5d9738da2a2bc7a7c2b6'
+ 'd93e39c9662522367dc3a73cc3057039')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+
+ sed -i 's|ncursesw/curses.h|curses.h|' RichString.h RichString.c
configure
+ sed -i 's|python|python2|' scripts/MakeHeader.py
+
+ patch -Np0 -i "${srcdir}/fix-sort-key-bug.patch"
+ patch -p1 -i "${srcdir}/fix-segfault-small-terminal.patch"
+
+ ./configure --prefix=/usr \
+ --enable-unicode \
+ --enable-openvz \
+ --enable-vserver \
+ --enable-cgroup
+ make
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
Copied: htop/repos/extra-x86_64/fix-segfault-small-terminal.patch (from rev
140789, htop/trunk/fix-segfault-small-terminal.patch)
===================================================================
--- extra-x86_64/fix-segfault-small-terminal.patch
(rev 0)
+++ extra-x86_64/fix-segfault-small-terminal.patch 2011-10-19 10:00:03 UTC
(rev 140790)
@@ -0,0 +1,24 @@
+--- trunk/Meter.c 2011/08/26 20:52:35 229
++++ trunk/Meter.c 2011/08/26 20:55:09 230
+@@ -264,13 +264,19 @@
+
+ w--;
+ x++;
+- char bar[w];
++
++ if (w < 1) {
++ attrset(CRT_colors[RESET_COLOR]);
++ return;
++ }
++ char bar[w + 1];
+
+ int blockSizes[10];
+ for (int i = 0; i < w; i++)
+ bar[i] = ' ';
+
+- sprintf(bar + (w-strlen(buffer)), "%s", buffer);
++ const size_t barOffset = w - MIN(strlen(buffer), w);
++ snprintf(bar + barOffset, w - barOffset + 1, "%s", buffer);
+
+ // First draw in the bar[] buffer...
+ double total = 0.0;
Copied: htop/repos/extra-x86_64/fix-sort-key-bug.patch (from rev 140789,
htop/trunk/fix-sort-key-bug.patch)
===================================================================
--- extra-x86_64/fix-sort-key-bug.patch (rev 0)
+++ extra-x86_64/fix-sort-key-bug.patch 2011-10-19 10:00:03 UTC (rev 140790)
@@ -0,0 +1,15 @@
+From: Roman Kosenko <madk...@gmail.com>
+Date: Thu, 10 Mar 2011 16:23:53 +0200
+Subject: [PATCH] Fix stupid bug with --sort-key
+
+--- htop.c.old 2010-11-24 20:45:38.000000000 +0200
++++ htop.c 2011-03-10 16:32:18.473716667 +0200
+@@ -282,7 +282,7 @@
+ printVersionFlag();
+ break;
+ case 's':
+- if (strcmp(optarg, "help")) {
++ if (!strcmp(optarg, "help")) {
+ for (int j = 1; j < LAST_PROCESSFIELD; j++)
+ printf ("%s\n", Process_fieldNames[j]);
+ exit(0);
Deleted: extra-x86_64/htop.c.patch
===================================================================
--- extra-x86_64/htop.c.patch 2011-10-19 09:58:29 UTC (rev 140789)
+++ extra-x86_64/htop.c.patch 2011-10-19 10:00:03 UTC (rev 140790)
@@ -1,15 +0,0 @@
-From: Roman Kosenko <madk...@gmail.com>
-Date: Thu, 10 Mar 2011 16:23:53 +0200
-Subject: [PATCH] Fix stupid bug with --sort-key
-
---- htop.c.old 2010-11-24 20:45:38.000000000 +0200
-+++ htop.c 2011-03-10 16:32:18.473716667 +0200
-@@ -282,7 +282,7 @@
- printVersionFlag();
- break;
- case 's':
-- if (strcmp(optarg, "help")) {
-+ if (!strcmp(optarg, "help")) {
- for (int j = 1; j < LAST_PROCESSFIELD; j++)
- printf ("%s\n", Process_fieldNames[j]);
- exit(0);
