[arch-commits] Commit in libytnef/trunk (PKGBUILD)

[Jan Steffens]

    Date: Thursday, March 18, 2021 @ 16:31:37
  Author: heftig
Revision: 410230

1.9.3-1: FS#70056 CVEs

Modified:
  libytnef/trunk/PKGBUILD

----------+
 PKGBUILD |   41 +++++++++++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-18 16:05:56 UTC (rev 410229)
+++ PKGBUILD	2021-03-18 16:31:37 UTC (rev 410230)
@@ -1,18 +1,20 @@
+# Maintainer: Jan Alexander Steffens (heftig) <heftig at archlinux.org>
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 # Contributor: Andre Klitzing <aklitzing () online () de>
 
 pkgname=libytnef
-pkgver=1.9.3+7+g24fe30e
-pkgrel=2
-pkgdesc="Yerase's TNEF Stream Reader library (decode winmail.dat)"
+pkgver=1.9.3
+pkgrel=1
+epoch=1
+pkgdesc="Yerase's TNEF Stream Reader library (decodes 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")
+license=(GPL)
+arch=(x86_64)
+depends=(glibc)
+makedepends=(perl git)
+optdepends=('perl: ytnefprocess')
+_commit=d9b2f01d125c9b178f7a00ec397cc2a9f258e8e1  # tags/v1.9.3
+source=("git+https://github.com/Yeraze/ytnef#commit=$_commit")
 sha256sums=('SKIP')
 
 pkgver() {
@@ -20,10 +22,25 @@
   git describe --tags | sed 's/^v//;s/-/+/g'
 }
 
+prepare() {
+  cd ytnef
+
+  # https://github.com/Yeraze/ytnef/pull/74
+  git cherry-pick -n f7ff4f66a1e6f8a9936aea2add6512c4b23a4261
+
+  # CVE-2021-3404
+  # https://bugs.archlinux.org/task/70056
+  git cherry-pick -n f9ff4a203b8c155d51a208cadadb62f224fba715
+
+  # CVE-2021-3403
+  # https://bugs.archlinux.org/task/70056
+  git cherry-pick -n f2380a53fb84d370eaf6e6c3473062c54c57fac7
+
+  ./autogen.sh
+}
+
 build() {
   cd ytnef
-  ./autogen.sh
-  autoreconf -fi
   ./configure --prefix=/usr --disable-static
   make
 }