Date: Tuesday, February 16, 2016 @ 13:31:29
Author: dreisner
Revision: 259567
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
htop/repos/extra-i686/0001-Fix-buffer-reuse.patch
(from rev 259566, htop/trunk/0001-Fix-buffer-reuse.patch)
htop/repos/extra-i686/PKGBUILD
(from rev 259566, htop/trunk/PKGBUILD)
htop/repos/extra-x86_64/0001-Fix-buffer-reuse.patch
(from rev 259566, htop/trunk/0001-Fix-buffer-reuse.patch)
htop/repos/extra-x86_64/PKGBUILD
(from rev 259566, htop/trunk/PKGBUILD)
Deleted:
htop/repos/extra-i686/PKGBUILD
htop/repos/extra-x86_64/PKGBUILD
------------------------------------------+
/PKGBUILD | 90 +++++++++++++++++++++++++++++
extra-i686/0001-Fix-buffer-reuse.patch | 25 ++++++++
extra-i686/PKGBUILD | 37 -----------
extra-x86_64/0001-Fix-buffer-reuse.patch | 25 ++++++++
extra-x86_64/PKGBUILD | 37 -----------
5 files changed, 140 insertions(+), 74 deletions(-)
Copied: htop/repos/extra-i686/0001-Fix-buffer-reuse.patch (from rev 259566,
htop/trunk/0001-Fix-buffer-reuse.patch)
===================================================================
--- extra-i686/0001-Fix-buffer-reuse.patch (rev 0)
+++ extra-i686/0001-Fix-buffer-reuse.patch 2016-02-16 12:31:29 UTC (rev
259567)
@@ -0,0 +1,25 @@
+From 0b70439316b4e4608c0916317ded7e6e56982de6 Mon Sep 17 00:00:00 2001
+From: Hisham <his...@gobolinux.org>
+Date: Sat, 13 Feb 2016 02:18:28 -0200
+Subject: [PATCH] Fix buffer reuse.
+
+---
+ linux/LinuxProcessList.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
+index 591210e..ec643ab 100644
+--- a/linux/LinuxProcessList.c
++++ b/linux/LinuxProcessList.c
+@@ -446,7 +446,7 @@ static void LinuxProcessList_readOomData(LinuxProcess*
process, const char* dirn
+ }
+
+ static void setCommand(Process* process, const char* command, int len) {
+- if (process->comm && process->commLen <= len) {
++ if (process->comm && process->commLen >= len) {
+ strncpy(process->comm, command, len + 1);
+ } else {
+ free(process->comm);
+--
+2.7.1
+
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2016-02-16 12:31:02 UTC (rev 259566)
+++ extra-i686/PKGBUILD 2016-02-16 12:31:29 UTC (rev 259567)
@@ -1,37 +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=2.0.0
-pkgrel=1
-pkgdesc="Interactive process viewer"
-arch=('i686' 'x86_64')
-url="http://hisham.hm/htop/";
-license=('GPL')
-depends=('ncurses')
-makedepends=('python2')
-optdepends=('lsof: show files opened by a process'
- 'strace: attach to a running process')
-options=('!emptydirs')
-source=("http://hisham.hm/$pkgname/releases/$pkgver/$pkgname-$pkgver.tar.gz";)
-md5sums=('06f76c7d644ce8ae611c9feb10439a30')
-
-build() {
- cd "$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --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 259566, htop/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2016-02-16 12:31:29 UTC (rev 259567)
@@ -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=2.0.0
+pkgrel=2
+pkgdesc="Interactive process viewer"
+arch=('i686' 'x86_64')
+url="http://hisham.hm/htop/";
+license=('GPL')
+depends=('ncurses')
+makedepends=('python')
+optdepends=('lsof: show files opened by a process'
+ 'strace: attach to a running process')
+options=('!emptydirs')
+source=("http://hisham.hm/$pkgname/releases/$pkgver/$pkgname-$pkgver.tar.gz";
+ "0001-Fix-buffer-reuse.patch")
+md5sums=('06f76c7d644ce8ae611c9feb10439a30'
+ '487c286d714139dca6f27bf5f79a0e1f')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 <../0001-Fix-buffer-reuse.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-unicode \
+ --enable-openvz \
+ --enable-vserver \
+ --enable-cgroup
+
+ make
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}
Copied: htop/repos/extra-x86_64/0001-Fix-buffer-reuse.patch (from rev 259566,
htop/trunk/0001-Fix-buffer-reuse.patch)
===================================================================
--- extra-x86_64/0001-Fix-buffer-reuse.patch (rev 0)
+++ extra-x86_64/0001-Fix-buffer-reuse.patch 2016-02-16 12:31:29 UTC (rev
259567)
@@ -0,0 +1,25 @@
+From 0b70439316b4e4608c0916317ded7e6e56982de6 Mon Sep 17 00:00:00 2001
+From: Hisham <his...@gobolinux.org>
+Date: Sat, 13 Feb 2016 02:18:28 -0200
+Subject: [PATCH] Fix buffer reuse.
+
+---
+ linux/LinuxProcessList.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
+index 591210e..ec643ab 100644
+--- a/linux/LinuxProcessList.c
++++ b/linux/LinuxProcessList.c
+@@ -446,7 +446,7 @@ static void LinuxProcessList_readOomData(LinuxProcess*
process, const char* dirn
+ }
+
+ static void setCommand(Process* process, const char* command, int len) {
+- if (process->comm && process->commLen <= len) {
++ if (process->comm && process->commLen >= len) {
+ strncpy(process->comm, command, len + 1);
+ } else {
+ free(process->comm);
+--
+2.7.1
+
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2016-02-16 12:31:02 UTC (rev 259566)
+++ extra-x86_64/PKGBUILD 2016-02-16 12:31:29 UTC (rev 259567)
@@ -1,37 +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=2.0.0
-pkgrel=1
-pkgdesc="Interactive process viewer"
-arch=('i686' 'x86_64')
-url="http://hisham.hm/htop/";
-license=('GPL')
-depends=('ncurses')
-makedepends=('python2')
-optdepends=('lsof: show files opened by a process'
- 'strace: attach to a running process')
-options=('!emptydirs')
-source=("http://hisham.hm/$pkgname/releases/$pkgver/$pkgname-$pkgver.tar.gz";)
-md5sums=('06f76c7d644ce8ae611c9feb10439a30')
-
-build() {
- cd "$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --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 259566, htop/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2016-02-16 12:31:29 UTC (rev 259567)
@@ -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=2.0.0
+pkgrel=2
+pkgdesc="Interactive process viewer"
+arch=('i686' 'x86_64')
+url="http://hisham.hm/htop/";
+license=('GPL')
+depends=('ncurses')
+makedepends=('python')
+optdepends=('lsof: show files opened by a process'
+ 'strace: attach to a running process')
+options=('!emptydirs')
+source=("http://hisham.hm/$pkgname/releases/$pkgver/$pkgname-$pkgver.tar.gz";
+ "0001-Fix-buffer-reuse.patch")
+md5sums=('06f76c7d644ce8ae611c9feb10439a30'
+ '487c286d714139dca6f27bf5f79a0e1f')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+
+ patch -Np1 <../0001-Fix-buffer-reuse.patch
+}
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ ./configure \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --enable-unicode \
+ --enable-openvz \
+ --enable-vserver \
+ --enable-cgroup
+
+ make
+}
+
+package() {
+ make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
+}
