Date: Thursday, August 23, 2018 @ 22:08:19 Author: jgc Revision: 332892
archrelease: copy trunk to extra-x86_64 Added: libytnef/repos/extra-x86_64/PKGBUILD (from rev 332891, libytnef/trunk/PKGBUILD) Deleted: libytnef/repos/extra-x86_64/CVE-2017-9058.patch libytnef/repos/extra-x86_64/PKGBUILD ---------------------+ CVE-2017-9058.patch | 13 --------- PKGBUILD | 71 ++++++++++++++++++++++++-------------------------- 2 files changed, 35 insertions(+), 49 deletions(-) Deleted: CVE-2017-9058.patch =================================================================== --- CVE-2017-9058.patch 2018-08-23 22:08:16 UTC (rev 332891) +++ CVE-2017-9058.patch 2018-08-23 22:08:19 UTC (rev 332892) @@ -1,13 +0,0 @@ -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: PKGBUILD =================================================================== --- PKGBUILD 2018-08-23 22:08:16 UTC (rev 332891) +++ PKGBUILD 2018-08-23 22:08:19 UTC (rev 332892) @@ -1,36 +0,0 @@ -# $Id$ -# Maintainer: Jan de Groot <j...@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/PKGBUILD (from rev 332891, libytnef/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2018-08-23 22:08:19 UTC (rev 332892) @@ -0,0 +1,35 @@ +# $Id$ +# Maintainer: Jan de Groot <j...@archlinux.org> +# Contributor: Andre Klitzing <aklitzing () online () de> + +pkgname=libytnef +pkgver=1.9.3+7+g24fe30e +pkgrel=1 +pkgdesc="Yerase's TNEF Stream Reader library (decode winmail.dat)" +url="https://github.com/Yeraze/ytnef" +license=('GPL') +arch=('x86_64') +depends=('glibc') +makedepends=('perl' git) +optdepends=('perl: ytnefprocess.pl script') +_commit=24fe30e592a7a840b415dbbc16ba47c7a882bb38 # master +source=("git+https://github.com/Yeraze/ytnef/#commit=$_commit") +sha256sums=('SKIP') + +pkgver() { + cd ytnef + git describe --tags | sed 's/^v//;s/-/+/g' +} + +build() { + cd ytnef + ./autogen.sh + autoreconf -fi + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd ytnef + make DESTDIR="$pkgdir" install +}