Date: Friday, February 13, 2015 @ 16:47:04
Author: spupykin
Revision: 127667
archrelease: copy trunk to community-i686, community-x86_64
Added:
vbindiff/repos/community-i686/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
(from rev 127666,
vbindiff/trunk/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch)
vbindiff/repos/community-i686/PKGBUILD
(from rev 127666, vbindiff/trunk/PKGBUILD)
vbindiff/repos/community-x86_64/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
(from rev 127666,
vbindiff/trunk/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch)
vbindiff/repos/community-x86_64/PKGBUILD
(from rev 127666, vbindiff/trunk/PKGBUILD)
Deleted:
vbindiff/repos/community-i686/PKGBUILD
vbindiff/repos/community-x86_64/PKGBUILD
----------------------------------------------------------------------------------+
/PKGBUILD
| 64 ++++++++++
community-i686/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
| 26 ++++
community-i686/PKGBUILD
| 25 ---
community-x86_64/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
| 26 ++++
community-x86_64/PKGBUILD
| 25 ---
5 files changed, 116 insertions(+), 50 deletions(-)
Copied:
vbindiff/repos/community-i686/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
(from rev 127666,
vbindiff/trunk/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch)
===================================================================
---
community-i686/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
(rev 0)
+++
community-i686/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
2015-02-13 15:47:04 UTC (rev 127667)
@@ -0,0 +1,26 @@
+From 879a63ac5f0ffdbe7350ccc7438692a6669d26f2 Mon Sep 17 00:00:00 2001
+From: Peter Ross <[email protected]>
+Date: Sat, 22 Feb 2014 22:50:54 +1100
+Subject: [PATCH] vbindiff: prevent segfault when comparing files of different
+ length
+
+---
+ vbindiff.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/vbindiff.cpp b/vbindiff.cpp
+index 116a037..a032bc6 100644
+--- a/vbindiff.cpp
++++ b/vbindiff.cpp
+@@ -487,6 +487,8 @@ void FileDisplay::display()
+
+ buf[index++] = displayTable[data->line[i][j]];
+ }
++ if (index < 0)
++ index = 0;
+ memset(buf + index, ' ', sizeof(buf) - index - 1);
+ memset(str, ' ', screenWidth - (str - buf2));
+
+--
+1.8.3.2
+
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2015-02-13 15:46:50 UTC (rev 127666)
+++ community-i686/PKGBUILD 2015-02-13 15:47:04 UTC (rev 127667)
@@ -1,25 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <[email protected]>
-# Contributor: tyr0 <[email protected]>
-
-pkgname=vbindiff
-pkgver=3.0_beta4
-pkgrel=4
-pkgdesc="displays files in hexadecimal and ASCII (or EBCDIC) and highlight the
differences between them"
-arch=('i686' 'x86_64')
-url="http://www.cjmweb.net/vbindiff/";
-license=('GPL')
-depends=('gcc-libs' 'ncurses')
-source=($url/$pkgname-$pkgver.tar.gz)
-md5sums=('dbda80ef580e1a0975ef50b9aaa5210e')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=$pkgdir/usr
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make install
-}
Copied: vbindiff/repos/community-i686/PKGBUILD (from rev 127666,
vbindiff/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2015-02-13 15:47:04 UTC (rev 127667)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Sergej Pupykin <[email protected]>
+# Contributor: tyr0 <[email protected]>
+
+pkgname=vbindiff
+pkgver=3.0_beta4
+pkgrel=5
+pkgdesc="displays files in hexadecimal and ASCII (or EBCDIC) and highlight the
differences between them"
+arch=('i686' 'x86_64')
+url="http://www.cjmweb.net/vbindiff/";
+license=('GPL')
+depends=('gcc-libs' 'ncurses')
+source=($url/$pkgname-$pkgver.tar.gz
+ 0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch)
+md5sums=('dbda80ef580e1a0975ef50b9aaa5210e'
+ 'aefbf59d36932019eda1efdbd8b50ea4')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+ patch -p1
<$srcdir/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
+}
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=$pkgdir/usr
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make install
+}
Copied:
vbindiff/repos/community-x86_64/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
(from rev 127666,
vbindiff/trunk/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch)
===================================================================
---
community-x86_64/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
(rev 0)
+++
community-x86_64/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
2015-02-13 15:47:04 UTC (rev 127667)
@@ -0,0 +1,26 @@
+From 879a63ac5f0ffdbe7350ccc7438692a6669d26f2 Mon Sep 17 00:00:00 2001
+From: Peter Ross <[email protected]>
+Date: Sat, 22 Feb 2014 22:50:54 +1100
+Subject: [PATCH] vbindiff: prevent segfault when comparing files of different
+ length
+
+---
+ vbindiff.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/vbindiff.cpp b/vbindiff.cpp
+index 116a037..a032bc6 100644
+--- a/vbindiff.cpp
++++ b/vbindiff.cpp
+@@ -487,6 +487,8 @@ void FileDisplay::display()
+
+ buf[index++] = displayTable[data->line[i][j]];
+ }
++ if (index < 0)
++ index = 0;
+ memset(buf + index, ' ', sizeof(buf) - index - 1);
+ memset(str, ' ', screenWidth - (str - buf2));
+
+--
+1.8.3.2
+
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2015-02-13 15:46:50 UTC (rev 127666)
+++ community-x86_64/PKGBUILD 2015-02-13 15:47:04 UTC (rev 127667)
@@ -1,25 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <[email protected]>
-# Contributor: tyr0 <[email protected]>
-
-pkgname=vbindiff
-pkgver=3.0_beta4
-pkgrel=4
-pkgdesc="displays files in hexadecimal and ASCII (or EBCDIC) and highlight the
differences between them"
-arch=('i686' 'x86_64')
-url="http://www.cjmweb.net/vbindiff/";
-license=('GPL')
-depends=('gcc-libs' 'ncurses')
-source=($url/$pkgname-$pkgver.tar.gz)
-md5sums=('dbda80ef580e1a0975ef50b9aaa5210e')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=$pkgdir/usr
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make install
-}
Copied: vbindiff/repos/community-x86_64/PKGBUILD (from rev 127666,
vbindiff/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2015-02-13 15:47:04 UTC (rev 127667)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: Sergej Pupykin <[email protected]>
+# Contributor: tyr0 <[email protected]>
+
+pkgname=vbindiff
+pkgver=3.0_beta4
+pkgrel=5
+pkgdesc="displays files in hexadecimal and ASCII (or EBCDIC) and highlight the
differences between them"
+arch=('i686' 'x86_64')
+url="http://www.cjmweb.net/vbindiff/";
+license=('GPL')
+depends=('gcc-libs' 'ncurses')
+source=($url/$pkgname-$pkgver.tar.gz
+ 0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch)
+md5sums=('dbda80ef580e1a0975ef50b9aaa5210e'
+ 'aefbf59d36932019eda1efdbd8b50ea4')
+
+prepare() {
+ cd $srcdir/$pkgname-$pkgver
+ patch -p1
<$srcdir/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
+}
+
+build() {
+ cd $srcdir/$pkgname-$pkgver
+ ./configure --prefix=$pkgdir/usr
+ make
+}
+
+package() {
+ cd $srcdir/$pkgname-$pkgver
+ make install
+}
