[arch-commits] Commit in musl/repos/community-x86_64 (PKGBUILD PKGBUILD)

[Eli Schwartz]

    Date: Friday, November 20, 2020 @ 20:28:55
  Author: eschwartz
Revision: 758087

archrelease: copy trunk to community-x86_64

Added:
  musl/repos/community-x86_64/PKGBUILD
    (from rev 758086, musl/trunk/PKGBUILD)
Deleted:
  musl/repos/community-x86_64/PKGBUILD

----------+
 PKGBUILD |   81 +++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 45 insertions(+), 36 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-20 20:28:39 UTC (rev 758086)
+++ PKGBUILD	2020-11-20 20:28:55 UTC (rev 758087)
@@ -1,36 +0,0 @@
-# Maintainer:  Sergej Pupykin <arch+pub at sergej.pp.ru>
-# Maintainer:  Eli Schwartz <eschwartz at archlinux.org>
-# Contributor: TJ Vanderpoel <tj at rubyists>
-
-pkgname=musl
-pkgver=1.2.1
-pkgrel=1
-pkgdesc='Lightweight implementation of C standard library'
-arch=('x86_64')
-url='https://www.musl-libc.org/'
-license=('MIT')
-options=('staticlibs' '!buildflags')
-validpgpkeys=('836489290BB6B70F99FFDA0556BCDB593020450F')
-source=(https://www.musl-libc.org/releases/musl-$pkgver.tar.gz{,.asc})
-sha256sums=('68af6e18539f646f9c41a3a2bb25be4a5cfa5a8f65f0bb647fd2bbfdf877e84b'
-            'SKIP')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr/lib/musl \
-    --exec-prefix=/usr \
-    --enable-wrapper=all
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-
-  # configure syslibdir with /lib for PT_INTERP compat, but install to /usr/lib
-  mv "$pkgdir"/lib/ld-musl*.so* "$pkgdir"/usr/lib/
-  rmdir "$pkgdir"/lib
-
-  install -Dm0644 README "$pkgdir"/usr/share/doc/musl/README
-  install -Dm0644 COPYRIGHT "$pkgdir"/usr/share/licenses/musl/COPYRIGHT
-}

Copied: musl/repos/community-x86_64/PKGBUILD (from rev 758086, musl/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-11-20 20:28:55 UTC (rev 758087)
@@ -0,0 +1,45 @@
+# Maintainer:  Sergej Pupykin <arch+pub at sergej.pp.ru>
+# Maintainer:  Eli Schwartz <eschwartz at archlinux.org>
+# Contributor: TJ Vanderpoel <tj at rubyists>
+
+pkgname=musl
+pkgver=1.2.1
+pkgrel=2
+pkgdesc='Lightweight implementation of C standard library'
+arch=('x86_64')
+url='https://www.musl-libc.org/'
+license=('MIT')
+options=('staticlibs' '!buildflags')
+validpgpkeys=('836489290BB6B70F99FFDA0556BCDB593020450F')
+source=(https://www.musl-libc.org/releases/musl-$pkgver.tar.gz{,.asc}
+        "CVE-2020-28928.patch::https://git.musl-libc.org/cgit/musl/patch/?id=3ab2a4e02682df1382955071919d8aa3c3ec40d4")
+sha256sums=('68af6e18539f646f9c41a3a2bb25be4a5cfa5a8f65f0bb647fd2bbfdf877e84b'
+            'SKIP'
+            '179b6e83f5277bbbad78a8fd19e47099da4d233cc11a4439485e640ddc756b2d')
+
+prepare() {
+  cd $pkgname-$pkgver
+
+  # FS#68685 - [musl][security] 1.2.1-1: CVE-2020-28928: wcsnrtombs destination buffer overflow
+  patch -p1 -i ../CVE-2020-28928.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr/lib/musl \
+    --exec-prefix=/usr \
+    --enable-wrapper=all
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # configure syslibdir with /lib for PT_INTERP compat, but install to /usr/lib
+  mv "$pkgdir"/lib/ld-musl*.so* "$pkgdir"/usr/lib/
+  rmdir "$pkgdir"/lib
+
+  install -Dm0644 README "$pkgdir"/usr/share/doc/musl/README
+  install -Dm0644 COPYRIGHT "$pkgdir"/usr/share/licenses/musl/COPYRIGHT
+}