[arch-commits] Commit in vbindiff/repos/community-x86_64 (4 files)

[Sergej Pupykin]

    Date: Friday, November 17, 2017 @ 10:58:19
  Author: spupykin
Revision: 267078

archrelease: copy trunk to community-x86_64

Added:
  vbindiff/repos/community-x86_64/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
    (from rev 267077, vbindiff/trunk/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch)
  vbindiff/repos/community-x86_64/PKGBUILD
    (from rev 267077, vbindiff/trunk/PKGBUILD)
Deleted:
  vbindiff/repos/community-x86_64/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
  vbindiff/repos/community-x86_64/PKGBUILD

-----------------------------------------------------------------+
 0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch |   52 ++++-----
 PKGBUILD                                                        |   57 ++++------
 2 files changed, 51 insertions(+), 58 deletions(-)

Deleted: 0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch
===================================================================
--- 0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch	2017-11-17 10:58:06 UTC (rev 267077)
+++ 0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch	2017-11-17 10:58:19 UTC (rev 267078)
@@ -1,26 +0,0 @@
-From 879a63ac5f0ffdbe7350ccc7438692a6669d26f2 Mon Sep 17 00:00:00 2001
-From: Peter Ross <pross at xvid.org>
-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
-

Copied: vbindiff/repos/community-x86_64/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch (from rev 267077, vbindiff/trunk/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch)
===================================================================
--- 0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch	                        (rev 0)
+++ 0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch	2017-11-17 10:58:19 UTC (rev 267078)
@@ -0,0 +1,26 @@
+From 879a63ac5f0ffdbe7350ccc7438692a6669d26f2 Mon Sep 17 00:00:00 2001
+From: Peter Ross <pross at xvid.org>
+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: PKGBUILD
===================================================================
--- PKGBUILD	2017-11-17 10:58:06 UTC (rev 267077)
+++ PKGBUILD	2017-11-17 10:58:19 UTC (rev 267078)
@@ -1,32 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: tyr0 <thomas.hoernes at gmx.at>
-
-pkgname=vbindiff
-pkgver=3.0_beta4
-pkgrel=7
-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/PKGBUILD (from rev 267077, vbindiff/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-11-17 10:58:19 UTC (rev 267078)
@@ -0,0 +1,25 @@
+# $Id$
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: tyr0 <thomas.hoernes at gmx.at>
+
+pkgname=vbindiff
+pkgver=3.0_beta5
+pkgrel=1
+pkgdesc="displays files in hexadecimal and ASCII (or EBCDIC) and highlight the differences between them"
+arch=('x86_64')
+url="https://www.cjmweb.net/vbindiff/"
+license=('GPL')
+depends=('gcc-libs' 'ncurses')
+source=($url/$pkgname-$pkgver.tar.gz)
+sha256sums=('f04da97de993caf8b068dcb57f9de5a4e7e9641dc6c47f79b60b8138259133b8')
+
+build() {
+  cd "$srcdir"/$pkgname-$pkgver
+  ./configure --prefix="$pkgdir"/usr
+  make
+}
+
+package() {
+  cd "$srcdir"/$pkgname-$pkgver
+  make install
+}