[arch-commits] Commit in htop/repos (6 files)

Jan Steffens heftig at archlinux.org
Wed Dec 12 17:29:22 UTC 2012


    Date: Wednesday, December 12, 2012 @ 12:29:21
  Author: heftig
Revision: 173197

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  htop/repos/extra-i686/PKGBUILD
    (from rev 173196, htop/trunk/PKGBUILD)
  htop/repos/extra-i686/tree-crash.patch
    (from rev 173196, htop/trunk/tree-crash.patch)
  htop/repos/extra-x86_64/PKGBUILD
    (from rev 173196, htop/trunk/PKGBUILD)
  htop/repos/extra-x86_64/tree-crash.patch
    (from rev 173196, htop/trunk/tree-crash.patch)
Deleted:
  htop/repos/extra-i686/PKGBUILD
  htop/repos/extra-x86_64/PKGBUILD

-------------------------------+
 extra-i686/PKGBUILD           |   84 +++++++++++++++++++++-------------------
 extra-i686/tree-crash.patch   |   13 ++++++
 extra-x86_64/PKGBUILD         |   84 +++++++++++++++++++++-------------------
 extra-x86_64/tree-crash.patch |   13 ++++++
 4 files changed, 116 insertions(+), 78 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2012-12-12 17:28:09 UTC (rev 173196)
+++ extra-i686/PKGBUILD	2012-12-12 17:29:21 UTC (rev 173197)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez <angvp at archlinux.org> 
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=htop
-pkgver=1.0.2
-pkgrel=1
-pkgdesc="Interactive process viewer"
-arch=('i686' 'x86_64')
-url="http://htop.sourceforge.net/"
-license=('GPL')
-depends=('ncurses')
-makedepends=('python2')
-optdepends=('lsof: show files opened by a process'
-            'strace: attach to a running process')
-options=('!emptydirs')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('0d01cca8df3349c74569cefebbd9919e')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  sed -i 's|ncursesw/curses.h|curses.h|' RichString.[ch] configure
-  sed -i 's|python|python2|' scripts/MakeHeader.py
-
-  ./configure \
-      --prefix=/usr \
-      --enable-unicode \
-      --enable-openvz \
-      --enable-vserver \
-      --enable-cgroup
-
-  make
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-}

Copied: htop/repos/extra-i686/PKGBUILD (from rev 173196, htop/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2012-12-12 17:29:21 UTC (rev 173197)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org> 
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=htop
+pkgver=1.0.2
+pkgrel=2
+pkgdesc="Interactive process viewer"
+arch=('i686' 'x86_64')
+url="http://htop.sourceforge.net/"
+license=('GPL')
+depends=('ncurses')
+makedepends=('python2')
+optdepends=('lsof: show files opened by a process'
+            'strace: attach to a running process')
+options=('!emptydirs')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+        tree-crash.patch)
+md5sums=('0d01cca8df3349c74569cefebbd9919e'
+         '48eba3c0303bfd19d761b859bc69d713')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  sed -i 's|ncursesw/curses.h|curses.h|' RichString.[ch] configure
+  sed -i 's|python|python2|' scripts/MakeHeader.py
+
+  # Boost field buffer size - crashes when trying to draw very deep UTF-8 trees
+  # Test by nesting 30 shells
+  patch -N -i ../tree-crash.patch
+
+  ./configure \
+      --prefix=/usr \
+      --enable-unicode \
+      --enable-openvz \
+      --enable-vserver \
+      --enable-cgroup
+
+  make
+}
+
+package() {
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}

Copied: htop/repos/extra-i686/tree-crash.patch (from rev 173196, htop/trunk/tree-crash.patch)
===================================================================
--- extra-i686/tree-crash.patch	                        (rev 0)
+++ extra-i686/tree-crash.patch	2012-12-12 17:29:21 UTC (rev 173197)
@@ -0,0 +1,13 @@
+Index: Process.c
+===================================================================
+--- Process.c	(revision 302)
++++ Process.c	(working copy)
+@@ -371,7 +371,7 @@
+ }
+ 
+ static void Process_writeField(Process* this, RichString* str, ProcessField field) {
+-   char buffer[128]; buffer[127] = '\0';
++   char buffer[256]; buffer[255] = '\0';
+    int attr = CRT_colors[DEFAULT_COLOR];
+    int baseattr = CRT_colors[PROCESS_BASENAME];
+    int n = sizeof(buffer) - 1;

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2012-12-12 17:28:09 UTC (rev 173196)
+++ extra-x86_64/PKGBUILD	2012-12-12 17:29:21 UTC (rev 173197)
@@ -1,39 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez <angvp at archlinux.org> 
-# Contributor: Eric Belanger <eric at archlinux.org>
-# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
-
-pkgname=htop
-pkgver=1.0.2
-pkgrel=1
-pkgdesc="Interactive process viewer"
-arch=('i686' 'x86_64')
-url="http://htop.sourceforge.net/"
-license=('GPL')
-depends=('ncurses')
-makedepends=('python2')
-optdepends=('lsof: show files opened by a process'
-            'strace: attach to a running process')
-options=('!emptydirs')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('0d01cca8df3349c74569cefebbd9919e')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  sed -i 's|ncursesw/curses.h|curses.h|' RichString.[ch] configure
-  sed -i 's|python|python2|' scripts/MakeHeader.py
-
-  ./configure \
-      --prefix=/usr \
-      --enable-unicode \
-      --enable-openvz \
-      --enable-vserver \
-      --enable-cgroup
-
-  make
-}
-
-package() {
-  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-}

Copied: htop/repos/extra-x86_64/PKGBUILD (from rev 173196, htop/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2012-12-12 17:29:21 UTC (rev 173197)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org> 
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
+
+pkgname=htop
+pkgver=1.0.2
+pkgrel=2
+pkgdesc="Interactive process viewer"
+arch=('i686' 'x86_64')
+url="http://htop.sourceforge.net/"
+license=('GPL')
+depends=('ncurses')
+makedepends=('python2')
+optdepends=('lsof: show files opened by a process'
+            'strace: attach to a running process')
+options=('!emptydirs')
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
+        tree-crash.patch)
+md5sums=('0d01cca8df3349c74569cefebbd9919e'
+         '48eba3c0303bfd19d761b859bc69d713')
+
+build() {
+  cd "$pkgname-$pkgver"
+
+  sed -i 's|ncursesw/curses.h|curses.h|' RichString.[ch] configure
+  sed -i 's|python|python2|' scripts/MakeHeader.py
+
+  # Boost field buffer size - crashes when trying to draw very deep UTF-8 trees
+  # Test by nesting 30 shells
+  patch -N -i ../tree-crash.patch
+
+  ./configure \
+      --prefix=/usr \
+      --enable-unicode \
+      --enable-openvz \
+      --enable-vserver \
+      --enable-cgroup
+
+  make
+}
+
+package() {
+  make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}

Copied: htop/repos/extra-x86_64/tree-crash.patch (from rev 173196, htop/trunk/tree-crash.patch)
===================================================================
--- extra-x86_64/tree-crash.patch	                        (rev 0)
+++ extra-x86_64/tree-crash.patch	2012-12-12 17:29:21 UTC (rev 173197)
@@ -0,0 +1,13 @@
+Index: Process.c
+===================================================================
+--- Process.c	(revision 302)
++++ Process.c	(working copy)
+@@ -371,7 +371,7 @@
+ }
+ 
+ static void Process_writeField(Process* this, RichString* str, ProcessField field) {
+-   char buffer[128]; buffer[127] = '\0';
++   char buffer[256]; buffer[255] = '\0';
+    int attr = CRT_colors[DEFAULT_COLOR];
+    int baseattr = CRT_colors[PROCESS_BASENAME];
+    int n = sizeof(buffer) - 1;




More information about the arch-commits mailing list