[arch-commits] Commit in libytnef/repos (6 files)
Jan de Groot
jgc at archlinux.org
Sat Aug 12 21:22:46 UTC 2017
Date: Saturday, August 12, 2017 @ 21:22:45
Author: jgc
Revision: 301989
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libytnef/repos/extra-i686/CVE-2017-9058.patch
(from rev 301988, libytnef/trunk/CVE-2017-9058.patch)
libytnef/repos/extra-i686/PKGBUILD
(from rev 301988, libytnef/trunk/PKGBUILD)
libytnef/repos/extra-x86_64/CVE-2017-9058.patch
(from rev 301988, libytnef/trunk/CVE-2017-9058.patch)
libytnef/repos/extra-x86_64/PKGBUILD
(from rev 301988, libytnef/trunk/PKGBUILD)
Deleted:
libytnef/repos/extra-i686/PKGBUILD
libytnef/repos/extra-x86_64/PKGBUILD
----------------------------------+
/PKGBUILD | 72 +++++++++++++++++++++++++++++++++++++
extra-i686/CVE-2017-9058.patch | 13 ++++++
extra-i686/PKGBUILD | 29 --------------
extra-x86_64/CVE-2017-9058.patch | 13 ++++++
extra-x86_64/PKGBUILD | 29 --------------
5 files changed, 98 insertions(+), 58 deletions(-)
Copied: libytnef/repos/extra-i686/CVE-2017-9058.patch (from rev 301988, libytnef/trunk/CVE-2017-9058.patch)
===================================================================
--- extra-i686/CVE-2017-9058.patch (rev 0)
+++ extra-i686/CVE-2017-9058.patch 2017-08-12 21:22:45 UTC (rev 301989)
@@ -0,0 +1,13 @@
+Index: ytnef/lib/ytnef.c
+===================================================================
+--- ytnef.orig/lib/ytnef.c
++++ ytnef/lib/ytnef.c
+@@ -57,7 +57,7 @@
+
+ #define ALLOCCHECK(x) { if(!x) { printf("Out of Memory at %s : %i\n", __FILE__, __LINE__); return(-1); } }
+ #define ALLOCCHECK_CHAR(x) { if(!x) { printf("Out of Memory at %s : %i\n", __FILE__, __LINE__); return(NULL); } }
+-#define SIZECHECK(x) { if ((((char *)d - (char *)data) + x) > size) { printf("Corrupted file detected at %s : %i\n", __FILE__, __LINE__); return(-1); } }
++#define SIZECHECK(x) { if ((((char *)d - (char *)data) + x) >= size) { printf("Corrupted file detected at %s : %i\n", __FILE__, __LINE__); return(-1); } }
+
+ int TNEFFillMapi(TNEFStruct *TNEF, BYTE *data, DWORD size, MAPIProps *p);
+ void SetFlip(void);
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-08-12 21:22:29 UTC (rev 301988)
+++ extra-i686/PKGBUILD 2017-08-12 21:22:45 UTC (rev 301989)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Andre Klitzing <aklitzing () online () de>
-
-pkgname=libytnef
-pkgver=1.9.2
-pkgrel=1
-pkgdesc="Yerase's TNEF Stream Reader library (decode winmail.dat)"
-url="https://github.com/Yeraze/ytnef"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('glibc')
-makedepends=('perl')
-optdepends=('perl: ytnefprocess.pl script')
-source=(https://github.com/Yeraze/ytnef/archive/v${pkgver}.tar.gz)
-sha256sums=('48f7d7272ba74b267d3f98a1b14c81fef54cfb53460346d7c36a9604df1f95ad')
-
-build() {
- cd ytnef-${pkgver}
- ./autogen.sh
- autoreconf -fi
- ./configure --prefix=/usr --disable-static
- make
-}
-
-package() {
- cd ytnef-${pkgver}
- make DESTDIR="$pkgdir" install
-}
Copied: libytnef/repos/extra-i686/PKGBUILD (from rev 301988, libytnef/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-08-12 21:22:45 UTC (rev 301989)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Andre Klitzing <aklitzing () online () de>
+
+pkgname=libytnef
+pkgver=1.9.2
+pkgrel=2
+pkgdesc="Yerase's TNEF Stream Reader library (decode winmail.dat)"
+url="https://github.com/Yeraze/ytnef"
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('glibc')
+makedepends=('perl')
+optdepends=('perl: ytnefprocess.pl script')
+source=(https://github.com/Yeraze/ytnef/archive/v${pkgver}.tar.gz
+ CVE-2017-9058.patch)
+sha256sums=('48f7d7272ba74b267d3f98a1b14c81fef54cfb53460346d7c36a9604df1f95ad'
+ 'd2fcf8e9c3253f8a56006b2e622b527a37c4352487cdfc86719eb3fb719318ed')
+
+prepare() {
+ cd ytnef-${pkgver}
+ patch -Np1 -i ../CVE-2017-9058.patch
+}
+
+build() {
+ cd ytnef-${pkgver}
+ ./autogen.sh
+ autoreconf -fi
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+package() {
+ cd ytnef-${pkgver}
+ make DESTDIR="$pkgdir" install
+}
Copied: libytnef/repos/extra-x86_64/CVE-2017-9058.patch (from rev 301988, libytnef/trunk/CVE-2017-9058.patch)
===================================================================
--- extra-x86_64/CVE-2017-9058.patch (rev 0)
+++ extra-x86_64/CVE-2017-9058.patch 2017-08-12 21:22:45 UTC (rev 301989)
@@ -0,0 +1,13 @@
+Index: ytnef/lib/ytnef.c
+===================================================================
+--- ytnef.orig/lib/ytnef.c
++++ ytnef/lib/ytnef.c
+@@ -57,7 +57,7 @@
+
+ #define ALLOCCHECK(x) { if(!x) { printf("Out of Memory at %s : %i\n", __FILE__, __LINE__); return(-1); } }
+ #define ALLOCCHECK_CHAR(x) { if(!x) { printf("Out of Memory at %s : %i\n", __FILE__, __LINE__); return(NULL); } }
+-#define SIZECHECK(x) { if ((((char *)d - (char *)data) + x) > size) { printf("Corrupted file detected at %s : %i\n", __FILE__, __LINE__); return(-1); } }
++#define SIZECHECK(x) { if ((((char *)d - (char *)data) + x) >= size) { printf("Corrupted file detected at %s : %i\n", __FILE__, __LINE__); return(-1); } }
+
+ int TNEFFillMapi(TNEFStruct *TNEF, BYTE *data, DWORD size, MAPIProps *p);
+ void SetFlip(void);
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-08-12 21:22:29 UTC (rev 301988)
+++ extra-x86_64/PKGBUILD 2017-08-12 21:22:45 UTC (rev 301989)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Contributor: Andre Klitzing <aklitzing () online () de>
-
-pkgname=libytnef
-pkgver=1.9.2
-pkgrel=1
-pkgdesc="Yerase's TNEF Stream Reader library (decode winmail.dat)"
-url="https://github.com/Yeraze/ytnef"
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('glibc')
-makedepends=('perl')
-optdepends=('perl: ytnefprocess.pl script')
-source=(https://github.com/Yeraze/ytnef/archive/v${pkgver}.tar.gz)
-sha256sums=('48f7d7272ba74b267d3f98a1b14c81fef54cfb53460346d7c36a9604df1f95ad')
-
-build() {
- cd ytnef-${pkgver}
- ./autogen.sh
- autoreconf -fi
- ./configure --prefix=/usr --disable-static
- make
-}
-
-package() {
- cd ytnef-${pkgver}
- make DESTDIR="$pkgdir" install
-}
Copied: libytnef/repos/extra-x86_64/PKGBUILD (from rev 301988, libytnef/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-08-12 21:22:45 UTC (rev 301989)
@@ -0,0 +1,36 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Contributor: Andre Klitzing <aklitzing () online () de>
+
+pkgname=libytnef
+pkgver=1.9.2
+pkgrel=2
+pkgdesc="Yerase's TNEF Stream Reader library (decode winmail.dat)"
+url="https://github.com/Yeraze/ytnef"
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('glibc')
+makedepends=('perl')
+optdepends=('perl: ytnefprocess.pl script')
+source=(https://github.com/Yeraze/ytnef/archive/v${pkgver}.tar.gz
+ CVE-2017-9058.patch)
+sha256sums=('48f7d7272ba74b267d3f98a1b14c81fef54cfb53460346d7c36a9604df1f95ad'
+ 'd2fcf8e9c3253f8a56006b2e622b527a37c4352487cdfc86719eb3fb719318ed')
+
+prepare() {
+ cd ytnef-${pkgver}
+ patch -Np1 -i ../CVE-2017-9058.patch
+}
+
+build() {
+ cd ytnef-${pkgver}
+ ./autogen.sh
+ autoreconf -fi
+ ./configure --prefix=/usr --disable-static
+ make
+}
+
+package() {
+ cd ytnef-${pkgver}
+ make DESTDIR="$pkgdir" install
+}
More information about the arch-commits
mailing list