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

[Jelle van der Waa]

    Date: Thursday, November 8, 2018 @ 20:56:28
  Author: jelle
Revision: 404160

archrelease: copy trunk to community-x86_64

Added:
  antiword/repos/community-x86_64/10_fix_buffer_overflow_wordole_c.patch
    (from rev 404159, antiword/trunk/10_fix_buffer_overflow_wordole_c.patch)
  antiword/repos/community-x86_64/PKGBUILD
    (from rev 404159, antiword/trunk/PKGBUILD)
Deleted:
  antiword/repos/community-x86_64/10_fix_buffer_overflow_wordole_c.patch
  antiword/repos/community-x86_64/PKGBUILD

----------------------------------------+
 10_fix_buffer_overflow_wordole_c.patch |   36 +++++++--------
 PKGBUILD                               |   71 +++++++++++++++----------------
 2 files changed, 53 insertions(+), 54 deletions(-)

Deleted: 10_fix_buffer_overflow_wordole_c.patch
===================================================================
--- 10_fix_buffer_overflow_wordole_c.patch	2018-11-08 20:56:19 UTC (rev 404159)
+++ 10_fix_buffer_overflow_wordole_c.patch	2018-11-08 20:56:28 UTC (rev 404160)
@@ -1,18 +0,0 @@
-Description: Add check for buffer overflow with malformed input files
-Author: <eriks at debian.org>
-Bug-Debian: http://bugs.debian.org/407015
-Last-Update: 2009-06-03
-
---- antiword-0.37~/wordole.c	2005-08-26 21:49:57.000000000 +0200
-+++ antiword-0.37/wordole.c	2009-06-03 22:31:15.948014682 +0200
-@@ -259,6 +259,10 @@
- 		}
- 		tNameSize = (size_t)usGetWord(0x40, aucBytes);
- 		tNameSize = (tNameSize + 1) / 2;
-+		if ( tNameSize > sizeof(atPPSlist[iIndex].szName)) {
-+			werr(0, "Name Size of PPS %d is too large", iIndex);
-+			tNameSize = sizeof(atPPSlist[iIndex].szName);
-+		}
- 		vName2String(atPPSlist[iIndex].szName, aucBytes, tNameSize);
- 		atPPSlist[iIndex].ucType = ucGetByte(0x42, aucBytes);
- 		if (atPPSlist[iIndex].ucType == 5) {

Copied: antiword/repos/community-x86_64/10_fix_buffer_overflow_wordole_c.patch (from rev 404159, antiword/trunk/10_fix_buffer_overflow_wordole_c.patch)
===================================================================
--- 10_fix_buffer_overflow_wordole_c.patch	                        (rev 0)
+++ 10_fix_buffer_overflow_wordole_c.patch	2018-11-08 20:56:28 UTC (rev 404160)
@@ -0,0 +1,18 @@
+Description: Add check for buffer overflow with malformed input files
+Author: <eriks at debian.org>
+Bug-Debian: http://bugs.debian.org/407015
+Last-Update: 2009-06-03
+
+--- antiword-0.37~/wordole.c	2005-08-26 21:49:57.000000000 +0200
++++ antiword-0.37/wordole.c	2009-06-03 22:31:15.948014682 +0200
+@@ -259,6 +259,10 @@
+ 		}
+ 		tNameSize = (size_t)usGetWord(0x40, aucBytes);
+ 		tNameSize = (tNameSize + 1) / 2;
++		if ( tNameSize > sizeof(atPPSlist[iIndex].szName)) {
++			werr(0, "Name Size of PPS %d is too large", iIndex);
++			tNameSize = sizeof(atPPSlist[iIndex].szName);
++		}
+ 		vName2String(atPPSlist[iIndex].szName, aucBytes, tNameSize);
+ 		atPPSlist[iIndex].ucType = ucGetByte(0x42, aucBytes);
+ 		if (atPPSlist[iIndex].ucType == 5) {

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-08 20:56:19 UTC (rev 404159)
+++ PKGBUILD	2018-11-08 20:56:28 UTC (rev 404160)
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
-# Contributor: Aaron, phrakture, Griffin <aaron at archlinux.org>
-# Contributor: Gustav Munkby <grddev at gmx.net>
-
-pkgname=antiword
-pkgver=0.37
-pkgrel=6
-pkgdesc="A free MS Word reader for Linux and RISC OS"
-arch=('i686' 'x86_64')
-url="http://www.winfield.demon.nl/"
-license=('GPL')
-depends=('bash')
-source=("http://www.winfield.demon.nl/linux/$pkgname-$pkgver.tar.gz"
-        '10_fix_buffer_overflow_wordole_c.patch')
-md5sums=('f868e2a269edcbc06bf77e89a55898d1'
-         '3eb02e9d913b355d64d9a30b08fc390f')
-
-prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
-  patch -p1 -i ../10_fix_buffer_overflow_wordole_c.patch
-}
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  sed -i "s|GLOBAL_INSTALL_DIR =.*|GLOBAL_INSTALL_DIR = /usr/bin|g" Makefile.Linux
-  make OPT="$CFLAGS -DNDEBUG" LDFLAGS="$LDFLAGS"
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" global_install
-  install -Dm644 Docs/antiword.1 "$pkgdir/usr/share/man/man1/antiword.1"
-}

Copied: antiword/repos/community-x86_64/PKGBUILD (from rev 404159, antiword/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-11-08 20:56:28 UTC (rev 404160)
@@ -0,0 +1,35 @@
+# Maintainer: Lukas Fleischer <lfleischer at archlinux.org>
+# Contributor: Aaron, phrakture, Griffin <aaron at archlinux.org>
+# Contributor: Gustav Munkby <grddev at gmx.net>
+
+pkgname=antiword
+pkgver=0.37
+pkgrel=7
+pkgdesc="A free MS Word reader for Linux and RISC OS"
+arch=('x86_64')
+url="http://www.winfield.demon.nl/"
+license=('GPL')
+depends=('bash')
+source=("http://www.winfield.demon.nl/linux/$pkgname-$pkgver.tar.gz"
+        '10_fix_buffer_overflow_wordole_c.patch')
+md5sums=('f868e2a269edcbc06bf77e89a55898d1'
+         '3eb02e9d913b355d64d9a30b08fc390f')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 -i ../10_fix_buffer_overflow_wordole_c.patch
+}
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  sed -i "s|GLOBAL_INSTALL_DIR =.*|GLOBAL_INSTALL_DIR = /usr/bin|g" Makefile.Linux
+  make OPT="$CFLAGS -DNDEBUG" LDFLAGS="$LDFLAGS"
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" global_install
+  install -Dm644 Docs/antiword.1 "$pkgdir/usr/share/man/man1/antiword.1"
+}