Date: Sunday, September 6, 2015 @ 21:36:07 Author: foutrelis Revision: 139342
archrelease: copy trunk to community-staging-i686, community-staging-x86_64 Added: vbindiff/repos/community-staging-i686/ vbindiff/repos/community-staging-i686/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch (from rev 139341, vbindiff/trunk/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch) vbindiff/repos/community-staging-i686/PKGBUILD (from rev 139341, vbindiff/trunk/PKGBUILD) vbindiff/repos/community-staging-x86_64/ vbindiff/repos/community-staging-x86_64/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch (from rev 139341, vbindiff/trunk/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch) vbindiff/repos/community-staging-x86_64/PKGBUILD (from rev 139341, vbindiff/trunk/PKGBUILD) ------------------------------------------------------------------------------------------+ community-staging-i686/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch | 26 ++++++++ community-staging-i686/PKGBUILD | 32 ++++++++++ community-staging-x86_64/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch | 26 ++++++++ community-staging-x86_64/PKGBUILD | 32 ++++++++++ 4 files changed, 116 insertions(+) Copied: vbindiff/repos/community-staging-i686/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch (from rev 139341, vbindiff/trunk/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch) =================================================================== --- community-staging-i686/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch (rev 0) +++ community-staging-i686/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch 2015-09-06 19:36:07 UTC (rev 139342) @@ -0,0 +1,26 @@ +From 879a63ac5f0ffdbe7350ccc7438692a6669d26f2 Mon Sep 17 00:00:00 2001 +From: Peter Ross <pr...@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-staging-i686/PKGBUILD (from rev 139341, vbindiff/trunk/PKGBUILD) =================================================================== --- community-staging-i686/PKGBUILD (rev 0) +++ community-staging-i686/PKGBUILD 2015-09-06 19:36:07 UTC (rev 139342) @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: tyr0 <thomas.hoer...@gmx.at> + +pkgname=vbindiff +pkgver=3.0_beta4 +pkgrel=6 +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-staging-x86_64/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch (from rev 139341, vbindiff/trunk/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch) =================================================================== --- community-staging-x86_64/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch (rev 0) +++ community-staging-x86_64/0001-vbindiff-prevent-segfault-when-comparing-files-of-di.patch 2015-09-06 19:36:07 UTC (rev 139342) @@ -0,0 +1,26 @@ +From 879a63ac5f0ffdbe7350ccc7438692a6669d26f2 Mon Sep 17 00:00:00 2001 +From: Peter Ross <pr...@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-staging-x86_64/PKGBUILD (from rev 139341, vbindiff/trunk/PKGBUILD) =================================================================== --- community-staging-x86_64/PKGBUILD (rev 0) +++ community-staging-x86_64/PKGBUILD 2015-09-06 19:36:07 UTC (rev 139342) @@ -0,0 +1,32 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: tyr0 <thomas.hoer...@gmx.at> + +pkgname=vbindiff +pkgver=3.0_beta4 +pkgrel=6 +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 +}