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

[Antonio Rojas]

    Date: Saturday, May 8, 2021 @ 18:36:44
  Author: arojas
Revision: 414759

Fix CVE-2020-0499 (FS#70063)

Modified:
  flac/trunk/PKGBUILD

----------+
 PKGBUILD |   19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-08 18:33:28 UTC (rev 414758)
+++ PKGBUILD	2021-05-08 18:36:44 UTC (rev 414759)
@@ -4,7 +4,7 @@
 pkgbase=flac
 pkgname=('flac' 'flac-doc')
 pkgver=1.3.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Free Lossless Audio Codec'
 url='https://xiph.org/flac/'
 arch=('x86_64')
@@ -11,10 +11,21 @@
 license=('BSD' 'GPL')
 depends=('gcc-libs' 'libogg')
 makedepends=('nasm' 'doxygen')
-source=(https://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748')
-sha512sums=('d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28')
+source=(https://downloads.xiph.org/releases/flac/${pkgbase}-${pkgver}.tar.xz
+        https://github.com/xiph/flac/commit/2e7931c.patch
+        https://github.com/xiph/flac/commit/ced7f68.patch)
+sha512sums=('d6417e14fab0c41b2df369e5e39ce62a5f588e491af4d465b0162f74e171e5549b2f061867f344bfbf8aaccd246bf5f2acd697e532a2c7901c920c69429b1a28'
+            '56182fb46cbefcd34137ec0e93ec540bc029e1e2cb4787444178ee941ae03cc73bd360c87ec3735a6ca524044d28f22253fe37a42fdb93aea7def65178ea663b'
+            'c5f17f6afa7358ba1dd610b7fe9d576f217ac7f71a8edf7833cfa2ed6a971a8d2c69468e96c35b97ffb6b019cb1be89dc23fe839ee19e445a6eef6cc74d2f435')
 
+prepare() {
+  cd ${pkgbase}-${pkgver}
+  # CVE-2020-0499
+  patch -p1 -i ../2e7931c.patch
+  # Add some overflow checks for residual bits calculation
+  patch -p1 -i ../ced7f68.patch
+}
+
 build() {
   cd ${pkgbase}-${pkgver}
   ./configure \