Date: Thursday, August 23, 2018 @ 22:08:16
Author: jgc
Revision: 332891
upgpkg: libytnef 1.9.3+7+g24fe30e-1
Modified:
libytnef/trunk/PKGBUILD
Deleted:
libytnef/trunk/CVE-2017-9058.patch
-+
CVE-2017-9058.patch | 13 -
PKGBUILD| 23 +++
2 files changed, 11 insertions(+), 25 deletions(-)
Deleted: CVE-2017-9058.patch
===
--- CVE-2017-9058.patch 2018-08-23 22:06:00 UTC (rev 332890)
+++ CVE-2017-9058.patch 2018-08-23 22:08:16 UTC (rev 332891)
@@ -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);
Modified: PKGBUILD
===
--- PKGBUILD2018-08-23 22:06:00 UTC (rev 332890)
+++ PKGBUILD2018-08-23 22:08:16 UTC (rev 332891)
@@ -3,27 +3,26 @@
# Contributor: Andre Klitzing
pkgname=libytnef
-pkgver=1.9.2
-pkgrel=2
+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')
+makedepends=('perl' git)
optdepends=('perl: ytnefprocess.pl script')
-source=(https://github.com/Yeraze/ytnef/archive/v${pkgver}.tar.gz
-CVE-2017-9058.patch)
-sha256sums=('48f7d7272ba74b267d3f98a1b14c81fef54cfb53460346d7c36a9604df1f95ad'
-'d2fcf8e9c3253f8a56006b2e622b527a37c4352487cdfc86719eb3fb719318ed')
+_commit=24fe30e592a7a840b415dbbc16ba47c7a882bb38 # master
+source=("git+https://github.com/Yeraze/ytnef/#commit=$_commit;)
+sha256sums=('SKIP')
-prepare() {
- cd ytnef-${pkgver}
- patch -Np1 -i ../CVE-2017-9058.patch
+pkgver() {
+ cd ytnef
+ git describe --tags | sed 's/^v//;s/-/+/g'
}
build() {
- cd ytnef-${pkgver}
+ cd ytnef
./autogen.sh
autoreconf -fi
./configure --prefix=/usr --disable-static
@@ -31,6 +30,6 @@
}
package() {
- cd ytnef-${pkgver}
+ cd ytnef
make DESTDIR="$pkgdir" install
}