- CRUX - lists.crux.nu

ports/core (3.6): [notify] openssl: update to 1.1.1n, security fix for CVE-2022-0778
by crux＠crux.nu 15 Mar '22

15 Mar '22

commit 0804bbb4777db9f90375cbf76272791a170a4307 Author: Juergen Daubert <jue(a)jue.li> Date: Tue Mar 15 18:43:58 2022 +0100 [notify] openssl: update to 1.1.1n, security fix for CVE-2022-0778 see https://www.openssl.org/news/secadv/20220315.txt diff --git a/openssl/.footprint b/openssl/.footprint index 064026e9..cb6e33ff 100644 --- a/openssl/.footprint +++ b/openssl/.footprint @@ -668,6 +668,7 @@ lrwxrwxrwx root/root usr/share/man/man3/BN_mod_mul.3ssl.gz -> BN_add.3ssl.gz -rw-r--r-- root/root usr/share/man/man3/BN_mod_mul_montgomery.3ssl.gz -rw-r--r-- root/root usr/share/man/man3/BN_mod_mul_reciprocal.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/BN_mod_sqr.3ssl.gz -> BN_add.3ssl.gz +lrwxrwxrwx root/root usr/share/man/man3/BN_mod_sqrt.3ssl.gz -> BN_add.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/BN_mod_sub.3ssl.gz -> BN_add.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/BN_mod_word.3ssl.gz -> BN_add_word.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/BN_mpi2bn.3ssl.gz -> BN_bn2bin.3ssl.gz @@ -3488,6 +3489,7 @@ lrwxrwxrwx root/root usr/share/man/man3/X509_STORE_CTX_init.3ssl.gz -> X509_STOR lrwxrwxrwx root/root usr/share/man/man3/X509_STORE_CTX_lookup_certs_fn.3ssl.gz -> X509_STORE_set_verify_cb_func.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/X509_STORE_CTX_lookup_crls_fn.3ssl.gz -> X509_STORE_set_verify_cb_func.3ssl.gz -rw-r--r-- root/root usr/share/man/man3/X509_STORE_CTX_new.3ssl.gz +lrwxrwxrwx root/root usr/share/man/man3/X509_STORE_CTX_purpose_inherit.3ssl.gz -> X509_STORE_CTX_new.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/X509_STORE_CTX_set0_crls.3ssl.gz -> X509_STORE_CTX_new.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/X509_STORE_CTX_set0_param.3ssl.gz -> X509_STORE_CTX_new.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/X509_STORE_CTX_set0_trusted_stack.3ssl.gz -> X509_STORE_CTX_new.3ssl.gz @@ -3499,6 +3501,8 @@ lrwxrwxrwx root/root usr/share/man/man3/X509_STORE_CTX_set_default.3ssl.gz -> X5 lrwxrwxrwx root/root usr/share/man/man3/X509_STORE_CTX_set_error.3ssl.gz -> X509_STORE_CTX_get_error.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/X509_STORE_CTX_set_error_depth.3ssl.gz -> X509_STORE_CTX_get_error.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/X509_STORE_CTX_set_ex_data.3ssl.gz -> BIO_get_ex_new_index.3ssl.gz +lrwxrwxrwx root/root usr/share/man/man3/X509_STORE_CTX_set_purpose.3ssl.gz -> X509_STORE_CTX_new.3ssl.gz +lrwxrwxrwx root/root usr/share/man/man3/X509_STORE_CTX_set_trust.3ssl.gz -> X509_STORE_CTX_new.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/X509_STORE_CTX_set_verify.3ssl.gz -> X509_STORE_CTX_new.3ssl.gz -rw-r--r-- root/root usr/share/man/man3/X509_STORE_CTX_set_verify_cb.3ssl.gz lrwxrwxrwx root/root usr/share/man/man3/X509_STORE_CTX_verify_cb.3ssl.gz -> X509_STORE_CTX_set_verify_cb.3ssl.gz diff --git a/openssl/.signature b/openssl/.signature index 9f68c264..5df5de77 100644 --- a/openssl/.signature +++ b/openssl/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqo8fAphzSH0+O81WQ/uN2CCpXhV2LxEf9D3GMh8vGdZ9JaA+75jx736fwO4J9kF47Tmyd2jOycgOBx1lIwgnIwQ= -SHA256 (Pkgfile) = d8321d97096c98f65403182dd8254d7229ace5db659357958095d641b882197f -SHA256 (.footprint) = ee040b0371884bf3268f6acd127d3940829bea65757786043ae495bc66c8fcdd -SHA256 (openssl-1.1.1m.tar.gz) = f89199be8b23ca45fc7cb9f1d8d3ee67312318286ad030f5316aca6462db6c96 +RWRJc1FUaeVeqnOWZd8GIGHdsmtUD7JE/RIIyeFJGWLSPWZK9rClCuDPx6lHYornD8Zzf1f4c8h/c5OwptQm+6e/MBrx13Bj5AY= +SHA256 (Pkgfile) = ff5e5d9a7e9a28f2bf2e6c5d25767b836636d62f09059fa8a3c55b7b16626d0b +SHA256 (.footprint) = b22e12ae866f1f8ac4ef120977b7f9800135abf2ce55c8e71f0944ab6ca6b80c +SHA256 (openssl-1.1.1n.tar.gz) = 40dceb51a4f6a5275bde0e6bf20ef4b91bfc32ed57c0552e2e8e15463372b17a SHA256 (mksslcert.sh) = d01cfd061b792f4f7444429582c5c9e83aaa7fc63cafd05669fd3f2970dff779 diff --git a/openssl/Pkgfile b/openssl/Pkgfile index 9413fa9f..1c45b39e 100644 --- a/openssl/Pkgfile +++ b/openssl/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=openssl -version=1.1.1m +version=1.1.1n release=1 source=(https://www.openssl.org/source/$name-$version.tar.gz \ mksslcert.sh)

1 0

ports/opt (3.6): [notify] apache: update to 2.4.53, security fixes
by crux＠crux.nu 14 Mar '22

14 Mar '22

commit 23fa344e6de7784c53c9b482aef5dfce09377826 Author: Juergen Daubert <jue(a)jue.li> Date: Mon Mar 14 12:05:38 2022 +0100 [notify] apache: update to 2.4.53, security fixes see https://downloads.apache.org/httpd/CHANGES_2.4.53 diff --git a/apache/.signature b/apache/.signature index 72ba23c3e..4f9fdecfa 100644 --- a/apache/.signature +++ b/apache/.signature @@ -1,7 +1,7 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/UNTmvpTQWCJIWTOc13xhgG0bgGQJLXx/5Qx1yPeQ5pZm1I8eLooKIgTOvOK4xvMWZ/M+2Z+pB04t7LBL+GNhQ4= -SHA256 (Pkgfile) = 1ad1512606f472124a0b116c38ee7bbefd7192ffbcbcaa865d16473f32b74895 +RWSE3ohX2g5d/UwpC0FLkpvcjn55DfS+6W85l/vfCOkJDqZGbb2dtXw88JXdPGLcgJp+6UXEDv9LX/RiBkuro9OnjF8bRZS2MQA= +SHA256 (Pkgfile) = 08343c16a5eddc9ac761caab627776721b535d9a279e1e1857864c9f80f55e69 SHA256 (.footprint) = acf30483788e8e161ff93877feff858f69b6e70c7115798bbf5418b33183d628 -SHA256 (httpd-2.4.52.tar.bz2) = 0127f7dc497e9983e9c51474bed75e45607f2f870a7675a86dc90af6d572f5c9 +SHA256 (httpd-2.4.53.tar.bz2) = d0bbd1121a57b5f2a6ff92d7b96f8050c5a45d3f14db118f64979d525858db63 SHA256 (crux.layout) = cf555f92cdc9a078d9e89035819da1ac0d2e248f0d31637b9e8f48fc8d3f42cf SHA256 (apache) = f4ff530751a937bead9030e15689a3b19591f790095b46bddc073efc82f756dd diff --git a/apache/Pkgfile b/apache/Pkgfile index 4e3895af3..5aeca0b22 100644 --- a/apache/Pkgfile +++ b/apache/Pkgfile @@ -4,7 +4,7 @@ # Depends on: apr libpcre openssl libxml2 name=apache -version=2.4.52 +version=2.4.53 release=1 source=(http://www.apache.org/dist/httpd/httpd-$version.tar.bz2 \ crux.layout apache)

1 0

ports/contrib (3.6): [notify] containerd: updated to version 1.6.1, fixes CVE-2022-23648
by crux＠crux.nu 07 Mar '22

07 Mar '22

commit 528140028dd13c4f527044f75d252da4aea89e2e Author: Matt Housh <jaeger(a)crux.ninja> Date: Sun Mar 6 18:54:21 2022 -0600 [notify] containerd: updated to version 1.6.1, fixes CVE-2022-23648 See https://github.com/containerd/containerd/security/advisories/GHSA-crp2-qrr5… diff --git a/containerd/.signature b/containerd/.signature index f8bee97ed..fcb517251 100644 --- a/containerd/.signature +++ b/containerd/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF37D/o1yscLiUcNTbDaCxCLag4gj1qVUeH90A5bvS7Ipx26vbxYyD66CsetCMAOJzBGVvwSwhYGMbekXIEU2R2wk= -SHA256 (Pkgfile) = 3eb2d59c418d48f94dfa9699eed3e41a09c0107a2b3812190323238939f03ff6 +RWSagIOpLGJF39rGy4DAE6iSY1dTuyy6QL9260iSX44cRZN88O1kLzkdnLvHYE0F8zz/pq+SMKlle0yUgyOQtd+QO4jZa8APHQ4= +SHA256 (Pkgfile) = 3bafb966f76be4b00dd6af9c80b2c6006d4c992c5ff32537f6f95ca51cb3f8dd SHA256 (.footprint) = fcb21e77eaefae687cbea41bdacbe47a1191c052138040fc15368af8bf7b436c -SHA256 (containerd-1.5.9.tar.xz) = 5a55366962267e6b647fbb1877481ec2c6dcf73e7770641337d7fba5b4374de5 +SHA256 (containerd-1.6.1.tar.xz) = 0144c299d070ab3b6c017adf5ac504bcd18fed4110a654fa90d6bdcdc0d5ae64 diff --git a/containerd/Pkgfile b/containerd/Pkgfile index a36e89dea..7ae4c1cef 100644 --- a/containerd/Pkgfile +++ b/containerd/Pkgfile @@ -4,7 +4,7 @@ # Depends on: go btrfs-progs git libseccomp name=containerd -version=1.5.9 +version=1.6.1 release=1 source=(http://jaeger.morpheus.net/linux/crux/files/$name-$version.tar.xz) @@ -16,7 +16,7 @@ build() { cd $name export GOPATH=$SRC # use the long commit hash here - make GIT_COMMIT=1407cab509ff0d96baa4f0eb6ff9980270e6e620 + make GIT_COMMIT=10f428dac7cec44c864e1b830a4623af27a9fc70 install -d -m 0755 $PKG/usr/bin install -m 0755 bin/* $PKG/usr/bin/ }

1 0

ports/contrib (3.6): [notify] libappindicator-gtk3: fix segmentation faults with electron/matrix/discord
by crux＠crux.nu 06 Mar '22

06 Mar '22

commit 82e780be8cd17736072e13e4fb0b7cfc63c22f12 Author: Danny Rawlins <contact(a)romster.me> Date: Sun Mar 6 11:48:32 2022 +1100 [notify] libappindicator-gtk3: fix segmentation faults with electron/matrix/discord diff --git a/libappindicator-gtk3/.signature b/libappindicator-gtk3/.signature index 27e46778b..f6aec0565 100644 --- a/libappindicator-gtk3/.signature +++ b/libappindicator-gtk3/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF35XPauo7dwjJM9lEgICoKsbA9nnyzv0G+V0TiJJGWgLq9G/S6KKdgb+dE/UP85SQ8bwEuBHDNs+SbF6NhEDEowQ= -SHA256 (Pkgfile) = 161f4ba9298502b5d2ada5abda6d9e24e0d26a4a9e8c463127f203e74d6316b9 +RWSagIOpLGJF306yUFjMqXLxg1S2GcWdfSrh4JCeO3Ma4nKC4UScOeQW6ikKVNFQQlN9Ep76ixcJY4wSdNuABmacO9+rcggngg8= +SHA256 (Pkgfile) = fa90e216111ce0d61ed920f17689a5a0b5723aa1fdd968ff42261ae8db16ce3d SHA256 (.footprint) = 0f344ad028e87844c0bd006fe75421196f846e80ab02b84fd57a88452d9bbc37 SHA256 (libappindicator-16.10.tar.gz) = f33e0e06096fa8f8ca560ffcd84b8eb64830fa7308b30964c77bd5f45d0c497e SHA256 (0001-Glib.Timeout-fix.patch) = bc7e3d5db0b9b324dc072f807519547fdc2c96514eb17aa07a71117a787d9b80 @@ -12,3 +12,5 @@ SHA256 (disable-mono.patch) = 3ec51b8923a65d8d71374977206239dd511a1775a60e3d72ca SHA256 (gtk3.patch) = 39fc14496fa491c933f224c6a977a23343d0daeebd93911f3538c29f1bf69407 SHA256 (improved-plasma-support.patch) = c199e075fef864eb9a24845986f5486ee3a4cc30f9209b417eaa005cf5dc98a4 SHA256 (vala-inherit.patch) = 77635b7b5bc0686577a191e0ac78dcfba79f5e5695b6b72cae7c412e59bc736d +SHA256 (segfault-fix.patch) = f193c6e87a84039158bfe14dc9d4935dbfdd5e9b9bf80abd101a18d1e62a1ef8 +SHA256 (n_elements.patch) = 3230a52b9733367f69276548f5463f49191e7c33b013da40d0dcebadfb8b3871 diff --git a/libappindicator-gtk3/Pkgfile b/libappindicator-gtk3/Pkgfile index cf8f36eb1..17e06620f 100644 --- a/libappindicator-gtk3/Pkgfile +++ b/libappindicator-gtk3/Pkgfile @@ -5,9 +5,9 @@ name=libappindicator-gtk3 version=16.10 -release=2 +release=3 source=(http://unrealize.co.uk/source/libappindicator-16.10.tar.gz -0001-Glib.Timeout-fix.patch 0002-Fix-mono-nunit-pkgconfig-name.patch 0003-Fix-Mono-assemblies-directory.patch badfunction.patch conditional-py-bindings.patch disable-mono.patch gtk3.patch improved-plasma-support.patch vala-inherit.patch) +0001-Glib.Timeout-fix.patch 0002-Fix-mono-nunit-pkgconfig-name.patch 0003-Fix-Mono-assemblies-directory.patch badfunction.patch conditional-py-bindings.patch disable-mono.patch gtk3.patch improved-plasma-support.patch vala-inherit.patch segfault-fix.patch n_elements.patch) build() { cd libappindicator-$version @@ -30,6 +30,10 @@ build() { # Having mono or gtk-sharp installed kills this build patch -p1 -i $SRC/disable-mono.patch + # https://bugs.launchpad.net/ubuntu/+source/libappindicator/+bug/1867996 + patch -p1 -i $SRC/segfault-fix.patch + patch -p1 -i $SRC/n_elements.patch + sed -i -e 's/ -Werror//' src/Makefile.am sed -e 's/--enable-gtk-doc//g' -i autogen.sh NOCONFIGURE=1 ./autogen.sh diff --git a/libappindicator-gtk3/n_elements.patch b/libappindicator-gtk3/n_elements.patch new file mode 100644 index 000000000..597fe4371 --- /dev/null +++ b/libappindicator-gtk3/n_elements.patch @@ -0,0 +1,11 @@ +--- libappindicator-12.10.1+18.04.20180322.1/src/app-indicator.c 2018-03-22 01:15:43.000000000 +0000 ++++ ../libappindicator/libappindicator-12.10.1+18.04.20180322.1/src/app-indicator.c 2020-03-21 23:06:34.879451825 +0000 +@@ -1616,7 +1616,7 @@ + gint n_elements, i; + gboolean found=FALSE; + gtk_icon_theme_get_search_path(icon_theme, &path, &n_elements); +- for (i=0; i< n_elements || path[i] == NULL; i++) { ++ for (i=0; i< n_elements; i++) { + if(g_strcmp0(path[i], theme_path) == 0) { + found=TRUE; + break; diff --git a/libappindicator-gtk3/segfault-fix.patch b/libappindicator-gtk3/segfault-fix.patch new file mode 100644 index 000000000..c219f4560 --- /dev/null +++ b/libappindicator-gtk3/segfault-fix.patch @@ -0,0 +1,11 @@ +--- libappindicator/src/app-indicator.c 2020-03-17 18:14:09.254862070 -0400 ++++ wrk/src/app-indicator.c 2020-03-17 21:05:31.009065383 -0400 +@@ -2137,7 +2137,7 @@ + g_free (self->priv->absolute_icon_theme_path); + self->priv->absolute_icon_theme_path = get_real_theme_path (self); + +- g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path, TRUE); ++ g_signal_emit (self, signals[NEW_ICON_THEME_PATH], 0, self->priv->icon_theme_path); + + if (self->priv->dbus_registration != 0 && self->priv->connection != NULL) { + const gchar *theme_path = self->priv->absolute_icon_theme_path ?

1 0

Crux package suggestion for ports/opt --> adding HEIC image format support to ImageMagick package
by Thierry Moreau 02 Mar '22

02 Mar '22

Hi! This suggestion is to add the following two library packages in the /usr/ports/opt repository. The libheif package depends on libde265. Plus the following line in /usr/ports/opt/imagemagick Optional: libheif Re-building ImageMagick after installing libde265 and libheif triggered the addition of two files in the ImageMagick .footprint. This fulfills an application need for image format support: I encountered the HEIC image format from an Apple technology user unaware of such details and my Crux tools (Firefox, geeqie, ImageMagick) would not display the image. (I did not attempt to upgrade Firefox or geeqie to a later version in order to get "native" HEIC format support.) "Hope it helps!" Thanks a lot for the Crux distribution. - Thierry Moreau

2 1

ports/opt (3.6): [notify] qtwebengine: 5.15.6 -> 5.15.8 new dependency ffmpeg4
by crux＠crux.nu 21 Feb '22

21 Feb '22

commit bfed937a1959912034a446648006f848f15d1d4f Author: Danny Rawlins <contact(a)romster.me> Date: Mon Feb 21 20:23:39 2022 +1100 [notify] qtwebengine: 5.15.6 -> 5.15.8 new dependency ffmpeg4 diff --git a/qtwebengine/.footprint b/qtwebengine/.footprint index eed207d83..8f4460072 100644 --- a/qtwebengine/.footprint +++ b/qtwebengine/.footprint @@ -299,6 +299,7 @@ drwxr-xr-x root/root usr/lib/qt5/qml/QtWebEngine/Controls2Delegates/ drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/qt5/ drwxr-xr-x root/root usr/share/qt5/resources/ +-rw-r--r-- root/root usr/share/qt5/resources/icudtl.dat -rw-r--r-- root/root usr/share/qt5/resources/qtwebengine_devtools_resources.pak -rw-r--r-- root/root usr/share/qt5/resources/qtwebengine_resources.pak -rw-r--r-- root/root usr/share/qt5/resources/qtwebengine_resources_100p.pak diff --git a/qtwebengine/.signature b/qtwebengine/.signature index d95b32149..e0884e909 100644 --- a/qtwebengine/.signature +++ b/qtwebengine/.signature @@ -1,7 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/YCkf1DYQZcoH/ynBvqqO2w+fIYwm6IVTQomNE60A+0qQeIlSd09JBubGE5vC/7FZsLTuZRPQXsatm6G8+ZAlQQ= -SHA256 (Pkgfile) = 6b06b33b2c7e3772d0a17b663354803f46e8cfed9464e9f8110305ba6e8d2d67 -SHA256 (.footprint) = 9c07e0209b90e6d45f593e30c0b5342a594c32de974cc61990189f9e80f4a21a -SHA256 (qtwebengine-5.15.6.tar.xz) = b120e51147bea8a91d447cc4458b50c4dda99b7c49c7ca06ca9bbdcaac9a2690 -SHA256 (qtwebengine-5.15.6-5.15.7-1.patch) = 792bafa85e7bbf87274db435f7a5dd36c8398feb515565f43744f9cf689c9249 -SHA256 (qtwebengine-5.15.7-build_fixes-1.patch) = 94cdbc0d55bc968b6705a8a3b1fc115a6d4ac66e6e19d83b02d1580ae3a6ff30 +RWSE3ohX2g5d/R8gKK+2LSPc07GbUqh8EkA4SRAwVbrDoPxR2/eNmE8pQG9uNiSDvzIsEzRZhIS2kwTD7iof0Z8woV2gcJe+twk= +SHA256 (Pkgfile) = 2b2f80d437eae5fa139a47b042aa7cc789f83ad114f02f92fba80497b22ba1d6 +SHA256 (.footprint) = 44b1db82a792e29d0e7a4bf1a4ea7d0ed7b440ab9f0df493452d03ff3c164554 +SHA256 (qtwebengine-5.15.8.tar.xz) = 9315c78db8e077d6dab6bd67e4b47c89c0109c87a557fb5095e9da280cbdafec +SHA256 (qtwebengine-5.15.8-build_fixes-1.patch) = 78aa2fb51bf3b4916f23e4bf81dcaff838da7b38c3261d8cfd18178b52e50445 diff --git a/qtwebengine/Pkgfile b/qtwebengine/Pkgfile index 2898cdfa4..999187345 100644 --- a/qtwebengine/Pkgfile +++ b/qtwebengine/Pkgfile @@ -1,21 +1,19 @@ # Description: Provides support for web applications using the Chromium browser project. # URL: https://www.qt.io/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: ffmpeg libvpx libwebp nodejs nss python qt5 xorg-libxscrnsaver xorg-libxtst +# Depends on: ffmpeg4 libvpx libwebp nodejs nss python qt5 xorg-libxscrnsaver xorg-libxtst name=qtwebengine -version=5.15.6 -release=2 +version=5.15.8 +release=1 source=(https://anduin.linuxfromscratch.org/BLFS/qtwebengine/$name-$version… - https://www.linuxfromscratch.org/patches/blfs/svn/qtwebengine-5.15.6-5.15.7… - https://www.linuxfromscratch.org/patches/blfs/svn/qtwebengine-5.15.7-build_…) + https://www.linuxfromscratch.org/patches/blfs/svn/qtwebengine-5.15.8-build_…) build() { cd qtwebengine-$version # https://www.linuxfromscratch.org/blfs/view/svn/x/qtwebengine.html - patch -p1 -i $SRC/qtwebengine-5.15.6-5.15.7-1.patch - patch -p1 -i $SRC/qtwebengine-5.15.7-build_fixes-1.patch + patch -p1 -i $SRC/qtwebengine-5.15.8-build_fixes-1.patch mkdir -pv .git src/3rdparty/chromium/.git sed -e '/^MODULE_VERSION/s/5.*/5.15.2/' -i .qmake.conf @@ -41,11 +39,11 @@ build() { install -d build cd build - ulimit -n 2048 - prt-get isinst pulseaudio && PKGMK_QTWEBENGINE+=' -pulseaudio' || PKGMK_QTWEBENGINE+=' -no-pulseaudio' prt-get isinst icu && PKGMK_QTWEBENGINE+=' -webengine-icu' || PKGMK_QTWEBENGINE+=' -no-webengine-icu' + export PKG_CONFIG_PATH+="/usr/lib/ffmpeg4/pkgconfig" + qmake-qt5 .. -- \ $PKGMK_QTWEBENGINE \ -proprietary-codecs \

1 0

ports/opt (3.6): [notify] vulkan-validation-layers: 1.2.198.0 -> 1.3.204.0 new dependency: robin-hood-hashing
by crux＠crux.nu 20 Feb '22

20 Feb '22

commit ae0859303c2759a34eddf3f9525aa71f1852df48 Author: Danny Rawlins <contact(a)romster.me> Date: Sun Feb 20 22:21:58 2022 +1100 [notify] vulkan-validation-layers: 1.2.198.0 -> 1.3.204.0 new dependency: robin-hood-hashing diff --git a/vulkan-validation-layers/.signature b/vulkan-validation-layers/.signature index bb5cf1084..cd4b25fe4 100644 --- a/vulkan-validation-layers/.signature +++ b/vulkan-validation-layers/.signature @@ -1,10 +1,10 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/RT3z5C1mwgkx3oCkkrsiG71IvsjgHp/G/A9KqaXTMyZz4uonnyV4fichl6GygaNi48X01kTyQZbnALhwKsY2QU= -SHA256 (Pkgfile) = 19a56db31a3a3e1aad8d527b1f29b7db5a5f20d092362806ff86ab12cc5f9a7a +RWSE3ohX2g5d/ddp0Mk6lnB83rimmC/5PqLKcw6mXeC9/g8ZmGCuBlRkZmleRojgpuHFNKjKktlQEq/P4hfveNQZRXvthM5xjAY= +SHA256 (Pkgfile) = 12014068c3233e343d24b372b3380d47028ab1ee3fa886be10c1899d7efd7690 SHA256 (.footprint) = cd0824869148d109d026a99a0393dd24215cedf6341979627c5b49957a634e5f -SHA256 (Vulkan-ValidationLayers-1.2.198.0.tar.gz) = 4a70cc5da26baf873fcf69b081eeeda545515dd66e5904f18fee32b4d275593a -SHA256 (SPIRV-Headers-814e728b30ddd0f4509233099a3ad96fd4318c07.tar.gz) = c262d3c0c36ad5c87fbe3572aa292d2aed4dcd9b1ca4868eff9ec180e3f994f2 -SHA256 (robin-hood-hashing-3.11.3.tar.gz) = dcf2b7fa9ef9dd0c67102d94c28e8df3effbe1845e0ed1f31f4772ca5e857fc4 +SHA256 (Vulkan-ValidationLayers-1.3.204.0.tar.gz) = 82b59c4622e9d1dbe267c4651bb2514b6b89bee90e512ae7d1d7abc76c833a1d +SHA256 (SPIRV-Headers-b42ba6d92faf6b4938e6f22ddd186dbdacc98d78.tar.gz) = d58e8e65ea4b4f1e421caaad68f88ce7b713ac3519bd49e7b71b6a5690489eb6 SHA256 (known_good.py.in) = f5e5330201ab5686a84d9ff65fd372af510d564aa6eb2d3c332d59a6e69ce2e3 SHA256 (add-missing-export.patch) = 6ce7222099403dea8425b1dd305b9ebc43e747c32aca2a24cfc7f67ddd34cebf SHA256 (fix_shared.patch) = 840af33ab26638c8c29da4a7f284eae6aeb40e01d506eef9851d7e6ee4a8bed0 +SHA256 (vulkan-layers-1.3.204-Fix-dependency-detection.patch) = 9aff42a5d6fc5073fbcb6c0dde45b4eba49083317a4bee0cd6db011c92b4744c diff --git a/vulkan-validation-layers/Pkgfile b/vulkan-validation-layers/Pkgfile index 2d036e88b..3fd96e1a6 100644 --- a/vulkan-validation-layers/Pkgfile +++ b/vulkan-validation-layers/Pkgfile @@ -1,33 +1,30 @@ # Description: Vulkan validation layers # URL: https://www.khronos.org/vulkan/ # Maintainer: Danny Rawlins, crux at romster dot me -# Depends on: cmake glslang spirv-tools vulkan-headers xorg-libxcb xorg-libx11 xorg-libxrandr +# Depends on: glslang robin-hood-hashing spirv-tools vulkan-headers xorg-libxrandr # Optional: wayland name=vulkan-validation-layers -version=1.2.198.0 -_spirv_headers=814e728b30ddd0f4509233099a3ad96fd4318c07 -_robin_hood=3.11.3 -release=2 +version=1.3.204.0 +_spirv_headers=b42ba6d92faf6b4938e6f22ddd186dbdacc98d78 +release=1 source=(https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk… https://github.com/KhronosGroup/SPIRV-Headers/archive/$_spirv_headers/SPIRV… - https://github.com/martinus/robin-hood-hashing/archive/$_robin_hood/robin-h… known_good.py.in add-missing-export.patch - fix_shared.patch) + fix_shared.patch + vulkan-layers-1.3.204-Fix-dependency-detection.patch) build() { ( cd Vulkan-ValidationLayers-sdk-$version - mkdir -p \ - headers/external/spirv-headers \ - robin_hood/external/robin-hood-hashing + mkdir -p headers/external/spirv-headers cp -r $SRC/SPIRV-Headers-$_spirv_headers/* headers/external/spirv-headers - cp -r $SRC/robin-hood-hashing-$_robin_hood/* robin_hood/external/robin-hood-hashing patch -p1 -i $SRC/add-missing-export.patch patch -p1 -i $SRC/fix_shared.patch + patch -p1 -i $SRC/vulkan-layers-1.3.204-Fix-dependency-detection.patch ) sed -e "s|@SRC@|$SRC/Vulkan-ValidationLayers-sdk-$version|" $SRC/known_good.py.in > $SRC/known_good.py @@ -44,8 +41,7 @@ build() { -D CMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}" \ -D BUILD_TESTS=OFF \ -D BUILD_LAYER_SUPPORT_FILES=ON \ - -D GLSLANG_INSTALL_DIR:PATH='/usr/include/glslang' \ - -D ROBIN_HOOD_HASHING_INSTALL_DIR:PATH="$SRC/Vulkan-ValidationLayers-sdk-$version/robin_hood/external/robin-hood-hashing" \ + -D USE_ROBIN_HOOD_HASHING=ON \ -D SPIRV_HEADERS_INSTALL_DIR:PATH="$SRC/Vulkan-ValidationLayers-sdk-$version/headers/external/spirv-headers" \ -Wno-dev diff --git a/vulkan-validation-layers/vulkan-layers-1.3.204-Fix-dependency-detection.patch b/vulkan-validation-layers/vulkan-layers-1.3.204-Fix-dependency-detection.patch new file mode 100644 index 000000000..25f3b4baf --- /dev/null +++ b/vulkan-validation-layers/vulkan-layers-1.3.204-Fix-dependency-detection.patch @@ -0,0 +1,90 @@ +From 534810e26e0be782b2c702a97bf726af250b8cd6 Mon Sep 17 00:00:00 2001 +From: Jeremy Gebben <jeremyg(a)lunarg.com> +Date: Thu, 17 Feb 2022 15:26:25 -0700 +Subject: [PATCH] build: Handle many permutations of SPIRV-Headers locations + +If the SPIRV-Headers package is not found, fall back to looking for +headers in SPIRV_HEADERS_INSTALL_DIR or SPIRV_HEADERS_INCLUDE_DIR. + +Fixes #3765 +--- + CMakeLists.txt | 19 ++++++++++++++++--- + layers/CMakeLists.txt | 7 +------ + tests/CMakeLists.txt | 6 +++--- + 3 files changed, 20 insertions(+), 12 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d4ca786ca07..58a966f03d6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -256,10 +256,23 @@ if (USE_ROBIN_HOOD_HASHING) + endif() + endif() + +-set(SPIRV_HEADERS_INCLUDE_DIR "" CACHE STRING "") + if(BUILD_LAYERS OR BUILD_TESTS) +- if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "") +- find_package(SPIRV-Headers REQUIRED CONFIG) ++ find_package(SPIRV-Headers CONFIG QUIET) ++ if(SPIRV-Headers_FOUND) ++ # pefer the package if found. Note that if SPIRV_HEADERS_INSTALL_DIR points at an 'installed' ++ # version of SPIRV-Headers, the package will be found. ++ get_target_property(SPIRV_HEADERS_INCLUDE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES) ++ elseif(SPIRV_HEADERS_INCLUDE_DIR) ++ # This is set by SPIRV-Tools (in parent scope!) and also some packages that include VVL with add_subdirectory ++ if (NOT EXISTS "${SPIRV_HEADERS_INCLUDE_DIR}/spirv/unified1/spirv.h") ++ message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INCLUDE_DIR: ${SPIRV_HEADERS_INCLUDE_DIR}") ++ endif() ++ elseif(SPIRV_HEADERS_INSTALL_DIR) ++ # This is our official variable for setting SPIRV-Headers location, but pointing at the raw source of SPIRV-Headers ++ if (NOT EXISTS "${SPIRV_HEADERS_INSTALL_DIR}/include/spirv/unified1/spirv.h") ++ message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INSTALL_DIR: ${SPIRV_HEADERS_INSTALL_DIR}") ++ endif() ++ set(SPIRV_HEADERS_INCLUDE_DIR "${SPIRV_HEADERS_INSTALL_DIR}/include") + endif() + endif() + +diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt +index 6edcf6eb5ab..59e294a0793 100644 +--- a/layers/CMakeLists.txt ++++ b/layers/CMakeLists.txt +@@ -309,12 +309,7 @@ if(BUILD_LAYERS) + if (USE_ROBIN_HOOD_HASHING) + target_include_directories(VkLayer_khronos_validation PRIVATE ${ROBIN_HOOD_HASHING_INCLUDE_DIR}) + endif() +- if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "") +- target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Headers::SPIRV-Headers) +- else() +- target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR}) +- endif() +- ++ target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR}) + target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt) + + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 2b98d109b7f..780c0538486 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,6 +1,6 @@ + # ~~~ +-# Copyright (c) 2014-2021 Valve Corporation +-# Copyright (c) 2014-2021 LunarG, Inc. ++# Copyright (c) 2014-2022 Valve Corporation ++# Copyright (c) 2014-2022 LunarG, Inc. + # + # Licensed under the Apache License, Version 2.0 (the "License"); + # you may not use this file except in compliance with the License. +@@ -149,11 +149,11 @@ if (NOT MSVC) + target_compile_options(vk_layer_validation_tests PRIVATE "-Wno-sign-compare") + endif() + ++target_include_directories(vk_layer_validation_tests PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR}) + # Specify target_link_libraries + target_link_libraries(vk_layer_validation_tests + PRIVATE VkLayer_utils + ${GLSLANG_LIBRARIES} +- SPIRV-Headers::SPIRV-Headers + SPIRV-Tools-static SPIRV-Tools-opt + GTest::gtest GTest::gtest_main) +

1 0

ports/core (3.6): [notify] expat: update to 2.4.5
by crux＠crux.nu 19 Feb '22

19 Feb '22

commit 7e7d756d738e7e1e2cb2ae335c3a2ad8b465d807 Author: Juergen Daubert <jue(a)jue.li> Date: Sat Feb 19 11:24:26 2022 +0100 [notify] expat: update to 2.4.5 several security fixes, see https://github.com/libexpat/libexpat/blob/R_2_4_5/expat/Changes diff --git a/expat/.footprint b/expat/.footprint index f9dea74e..774b3e56 100644 --- a/expat/.footprint +++ b/expat/.footprint @@ -8,9 +8,9 @@ drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libexpat.a -rwxr-xr-x root/root usr/lib/libexpat.la -lrwxrwxrwx root/root usr/lib/libexpat.so -> libexpat.so.1.8.4 -lrwxrwxrwx root/root usr/lib/libexpat.so.1 -> libexpat.so.1.8.4 --rwxr-xr-x root/root usr/lib/libexpat.so.1.8.4 +lrwxrwxrwx root/root usr/lib/libexpat.so -> libexpat.so.1.8.5 +lrwxrwxrwx root/root usr/lib/libexpat.so.1 -> libexpat.so.1.8.5 +-rwxr-xr-x root/root usr/lib/libexpat.so.1.8.5 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/expat.pc drwxr-xr-x root/root usr/share/ diff --git a/expat/.signature b/expat/.signature index d821fd14..87150861 100644 --- a/expat/.signature +++ b/expat/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -RWRJc1FUaeVeqlqxxT8rRecqsHheqaHmqEPNeXIgrKnOnD2hYUmNW/mZKyQVssuZesyZmSK4Uhumad/QHiks0GAM4kqkErVxhAM= -SHA256 (Pkgfile) = 5321bae9aefb346d9d43d56d068813856e0b99f48eb7f0d3e12509c84000a718 -SHA256 (.footprint) = 131cf668112560f73fef9e65c4ba421d8208d822110545144d0ec8b7c9822448 -SHA256 (expat-2.4.4.tar.xz) = b5d25d6e373351c2ed19b562b4732d01d2589ac8c8e9e7962d8df1207cc311b8 +RWRJc1FUaeVeqj6Jzd/o5+093Vgd1Bd73d+rbm6Z0Nx08j9yF05JW/CZkW5jxvptdCeTfol7AKGmI8JRSGz/k3/8BYL1evqIhwU= +SHA256 (Pkgfile) = 2c5397b1f6993e0fe690f6c464665d934396d11edf52569588ebe7f450015ed9 +SHA256 (.footprint) = db7aa5dc323ee5eb3418e392a3ec7f0ea426d1c9dfeb96343b6e1c35a36919ee +SHA256 (expat-2.4.5.tar.xz) = f2af8fc7cdc63a87920da38cd6d12cb113c3c3a3f437495b1b6541e0cff32579 diff --git a/expat/Pkgfile b/expat/Pkgfile index d5cc5cd2..05b116a6 100644 --- a/expat/Pkgfile +++ b/expat/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=expat -version=2.4.4 +version=2.4.5 release=1 source=(http://download.sourceforge.net/$name/$name-$version.tar.xz)

1 0

ports/opt (3.6): [notify] ffmpeg: 4.4.1 -> 5.0 version 5.x, if you need support for older ffmpeg there is contrib/ffmpeg4 that can be installed alongside opt/ffmpeg
by crux＠crux.nu 19 Feb '22

19 Feb '22

commit 70ff4cff1c38d542fd3ed705847e3311b0f9bba3 Author: Danny Rawlins <contact(a)romster.me> Date: Sat Feb 19 19:48:31 2022 +1100 [notify] ffmpeg: 4.4.1 -> 5.0 version 5.x, if you need support for older ffmpeg there is contrib/ffmpeg4 that can be installed alongside opt/ffmpeg diff --git a/ffmpeg/.footprint b/ffmpeg/.footprint index 2de828023..3f3ea3139 100644 --- a/ffmpeg/.footprint +++ b/ffmpeg/.footprint @@ -15,6 +15,7 @@ drwxr-xr-x root/root usr/include/libavcodec/ -rw-r--r-- root/root usr/include/libavcodec/codec_id.h -rw-r--r-- root/root usr/include/libavcodec/codec_par.h -rw-r--r-- root/root usr/include/libavcodec/d3d11va.h +-rw-r--r-- root/root usr/include/libavcodec/defs.h -rw-r--r-- root/root usr/include/libavcodec/dirac.h -rw-r--r-- root/root usr/include/libavcodec/dv_profile.h -rw-r--r-- root/root usr/include/libavcodec/dxva2.h @@ -22,7 +23,6 @@ drwxr-xr-x root/root usr/include/libavcodec/ -rw-r--r-- root/root usr/include/libavcodec/mediacodec.h -rw-r--r-- root/root usr/include/libavcodec/packet.h -rw-r--r-- root/root usr/include/libavcodec/qsv.h --rw-r--r-- root/root usr/include/libavcodec/vaapi.h -rw-r--r-- root/root usr/include/libavcodec/vdpau.h -rw-r--r-- root/root usr/include/libavcodec/version.h -rw-r--r-- root/root usr/include/libavcodec/videotoolbox.h @@ -40,9 +40,6 @@ drwxr-xr-x root/root usr/include/libavformat/ -rw-r--r-- root/root usr/include/libavformat/avformat.h -rw-r--r-- root/root usr/include/libavformat/avio.h -rw-r--r-- root/root usr/include/libavformat/version.h -drwxr-xr-x root/root usr/include/libavresample/ --rw-r--r-- root/root usr/include/libavresample/avresample.h --rw-r--r-- root/root usr/include/libavresample/version.h drwxr-xr-x root/root usr/include/libavutil/ -rw-r--r-- root/root usr/include/libavutil/adler32.h -rw-r--r-- root/root usr/include/libavutil/aes.h @@ -65,6 +62,7 @@ drwxr-xr-x root/root usr/include/libavutil/ -rw-r--r-- root/root usr/include/libavutil/cpu.h -rw-r--r-- root/root usr/include/libavutil/crc.h -rw-r--r-- root/root usr/include/libavutil/des.h +-rw-r--r-- root/root usr/include/libavutil/detection_bbox.h -rw-r--r-- root/root usr/include/libavutil/dict.h -rw-r--r-- root/root usr/include/libavutil/display.h -rw-r--r-- root/root usr/include/libavutil/dovi_meta.h @@ -142,47 +140,42 @@ drwxr-xr-x root/root usr/include/libswscale/ -rw-r--r-- root/root usr/include/libswscale/version.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libavcodec.a -lrwxrwxrwx root/root usr/lib/libavcodec.so -> libavcodec.so.58.134.100 -lrwxrwxrwx root/root usr/lib/libavcodec.so.58 -> libavcodec.so.58.134.100 --rwxr-xr-x root/root usr/lib/libavcodec.so.58.134.100 +lrwxrwxrwx root/root usr/lib/libavcodec.so -> libavcodec.so.59.18.100 +lrwxrwxrwx root/root usr/lib/libavcodec.so.59 -> libavcodec.so.59.18.100 +-rwxr-xr-x root/root usr/lib/libavcodec.so.59.18.100 -rw-r--r-- root/root usr/lib/libavdevice.a -lrwxrwxrwx root/root usr/lib/libavdevice.so -> libavdevice.so.58.13.100 -lrwxrwxrwx root/root usr/lib/libavdevice.so.58 -> libavdevice.so.58.13.100 --rwxr-xr-x root/root usr/lib/libavdevice.so.58.13.100 +lrwxrwxrwx root/root usr/lib/libavdevice.so -> libavdevice.so.59.4.100 +lrwxrwxrwx root/root usr/lib/libavdevice.so.59 -> libavdevice.so.59.4.100 +-rwxr-xr-x root/root usr/lib/libavdevice.so.59.4.100 -rw-r--r-- root/root usr/lib/libavfilter.a -lrwxrwxrwx root/root usr/lib/libavfilter.so -> libavfilter.so.7.110.100 -lrwxrwxrwx root/root usr/lib/libavfilter.so.7 -> libavfilter.so.7.110.100 --rwxr-xr-x root/root usr/lib/libavfilter.so.7.110.100 +lrwxrwxrwx root/root usr/lib/libavfilter.so -> libavfilter.so.8.24.100 +lrwxrwxrwx root/root usr/lib/libavfilter.so.8 -> libavfilter.so.8.24.100 +-rwxr-xr-x root/root usr/lib/libavfilter.so.8.24.100 -rw-r--r-- root/root usr/lib/libavformat.a -lrwxrwxrwx root/root usr/lib/libavformat.so -> libavformat.so.58.76.100 -lrwxrwxrwx root/root usr/lib/libavformat.so.58 -> libavformat.so.58.76.100 --rwxr-xr-x root/root usr/lib/libavformat.so.58.76.100 --rw-r--r-- root/root usr/lib/libavresample.a -lrwxrwxrwx root/root usr/lib/libavresample.so -> libavresample.so.4.0.0 -lrwxrwxrwx root/root usr/lib/libavresample.so.4 -> libavresample.so.4.0.0 --rwxr-xr-x root/root usr/lib/libavresample.so.4.0.0 +lrwxrwxrwx root/root usr/lib/libavformat.so -> libavformat.so.59.16.100 +lrwxrwxrwx root/root usr/lib/libavformat.so.59 -> libavformat.so.59.16.100 +-rwxr-xr-x root/root usr/lib/libavformat.so.59.16.100 -rw-r--r-- root/root usr/lib/libavutil.a -lrwxrwxrwx root/root usr/lib/libavutil.so -> libavutil.so.56.70.100 -lrwxrwxrwx root/root usr/lib/libavutil.so.56 -> libavutil.so.56.70.100 --rwxr-xr-x root/root usr/lib/libavutil.so.56.70.100 +lrwxrwxrwx root/root usr/lib/libavutil.so -> libavutil.so.57.17.100 +lrwxrwxrwx root/root usr/lib/libavutil.so.57 -> libavutil.so.57.17.100 +-rwxr-xr-x root/root usr/lib/libavutil.so.57.17.100 -rw-r--r-- root/root usr/lib/libpostproc.a -lrwxrwxrwx root/root usr/lib/libpostproc.so -> libpostproc.so.55.9.100 -lrwxrwxrwx root/root usr/lib/libpostproc.so.55 -> libpostproc.so.55.9.100 --rwxr-xr-x root/root usr/lib/libpostproc.so.55.9.100 +lrwxrwxrwx root/root usr/lib/libpostproc.so -> libpostproc.so.56.3.100 +lrwxrwxrwx root/root usr/lib/libpostproc.so.56 -> libpostproc.so.56.3.100 +-rwxr-xr-x root/root usr/lib/libpostproc.so.56.3.100 -rw-r--r-- root/root usr/lib/libswresample.a -lrwxrwxrwx root/root usr/lib/libswresample.so -> libswresample.so.3.9.100 -lrwxrwxrwx root/root usr/lib/libswresample.so.3 -> libswresample.so.3.9.100 --rwxr-xr-x root/root usr/lib/libswresample.so.3.9.100 +lrwxrwxrwx root/root usr/lib/libswresample.so -> libswresample.so.4.3.100 +lrwxrwxrwx root/root usr/lib/libswresample.so.4 -> libswresample.so.4.3.100 +-rwxr-xr-x root/root usr/lib/libswresample.so.4.3.100 -rw-r--r-- root/root usr/lib/libswscale.a -lrwxrwxrwx root/root usr/lib/libswscale.so -> libswscale.so.5.9.100 -lrwxrwxrwx root/root usr/lib/libswscale.so.5 -> libswscale.so.5.9.100 --rwxr-xr-x root/root usr/lib/libswscale.so.5.9.100 +lrwxrwxrwx root/root usr/lib/libswscale.so -> libswscale.so.6.4.100 +lrwxrwxrwx root/root usr/lib/libswscale.so.6 -> libswscale.so.6.4.100 +-rwxr-xr-x root/root usr/lib/libswscale.so.6.4.100 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libavcodec.pc -rw-r--r-- root/root usr/lib/pkgconfig/libavdevice.pc -rw-r--r-- root/root usr/lib/pkgconfig/libavfilter.pc -rw-r--r-- root/root usr/lib/pkgconfig/libavformat.pc --rw-r--r-- root/root usr/lib/pkgconfig/libavresample.pc -rw-r--r-- root/root usr/lib/pkgconfig/libavutil.pc -rw-r--r-- root/root usr/lib/pkgconfig/libpostproc.pc -rw-r--r-- root/root usr/lib/pkgconfig/libswresample.pc diff --git a/ffmpeg/.signature b/ffmpeg/.signature index d349dc43d..f8d7cd217 100644 --- a/ffmpeg/.signature +++ b/ffmpeg/.signature @@ -1,7 +1,8 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/X3jrAnWOI4FJawtpcAMwXK6NXB+yRNK93e/hYuZ0ZOcaJcqDEK/NJU7vxENbN7attAp7OAQHLlaJaxbgRJycws= -SHA256 (Pkgfile) = aaabe961df2932961483370f07b27f2524eb0035892129b15039456319576934 -SHA256 (.footprint) = 1738e69565d5f2a7df346ad944b1476269c9d635e3a8368d55575d77477fea7d -SHA256 (ffmpeg-4.4.1.tar.bz2) = 8fc9f20ac5ed95115a9e285647add0eedd5cc1a98a039ada14c132452f98ac42 +RWSE3ohX2g5d/V/vxDpqQUuzY89HCog47GFqkuVvDlLIy5qATJR8R3TTv0NrVulrsuueqcfRDzDJOxE8XiaGrSDAv+Knp3Vp9gs= +SHA256 (Pkgfile) = 0784ecece44a5384f45714036d17554e87d5e38f73cf4a9ab3d33c4c744a4777 +SHA256 (.footprint) = 06e32249d28bb0ac16dc915a77d20353bed90a70a05410213cebba459fbddd23 +SHA256 (ffmpeg-5.0.tar.bz2) = c0130b8db2c763430fd1c6905288d61bc44ee0548ad5fcd2dfd650b88432bed9 SHA256 (ffmpeg-x264-10bit.sh) = dde9627c41800235fbcfe0f74d2181be96239a82cd2d0d277715dddb57eb9cb3 -SHA256 (CVE-2018-6621.patch) = e3b9aff1fe9aef2d7153d7517f9c349beef27c2859bf1fb01076eeab263a445e +SHA256 (vmaf-model-path.patch) = 8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d +SHA256 (add-av_stream_get_first_dts-for-chromium.patch) = 91973c465f01446a999f278f0c2a3763304994dba1ac35de0e4c72f12f39409e diff --git a/ffmpeg/CVE-2018-6621.patch b/ffmpeg/CVE-2018-6621.patch deleted file mode 100644 index 8c9e4dd0e..000000000 --- a/ffmpeg/CVE-2018-6621.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/libavcodec/utvideodec.c 2017-12-11 05:35:09.000000000 +0800 -+++ b/libavcodec/utvideodec.c 2018-02-06 15:54:54.872000000 +0800 -@@ -561,7 +561,7 @@ static int decode_frame(AVCodecContext * - for (j = 0; j < c->slices; j++) { - slice_end = bytestream2_get_le32u(&gb); - if (slice_end < 0 || slice_end < slice_start || -- bytestream2_get_bytes_left(&gb) < slice_end) { -+ bytestream2_get_bytes_left(&gb) < slice_end + 1024LL) { - av_log(avctx, AV_LOG_ERROR, "Incorrect slice size\n"); - return AVERROR_INVALIDDATA; - } diff --git a/ffmpeg/Pkgfile b/ffmpeg/Pkgfile index 955a76a6e..69a0d421c 100644 --- a/ffmpeg/Pkgfile +++ b/ffmpeg/Pkgfile @@ -5,21 +5,27 @@ # Optional: alsa-lib cuda dav1d fdk-aac nv-codec-headers gnutls gsm jack jack-audio-connection-kit lame libass libsdl2 libtheora libva libvdpau libvorbis libvpx libwebp opus pulseaudio x264 x265 name=ffmpeg -version=4.4.1 +version=5.0 release=1 source=(https://ffmpeg.org/releases/$name-$version.tar.bz2 ffmpeg-x264-10bit.sh - CVE-2018-6621.patch) + vmaf-model-path.patch + add-av_stream_get_first_dts-for-chromium.patch) build() { cd $name-$version - #https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6621 - patch -p1 -i $SRC/CVE-2018-6621.patch + patch -p1 -i $SRC/vmaf-model-path.patch + + # https://crbug.com/1251779 + patch -p1 -i $SRC/add-av_stream_get_first_dts-for-chromium.patch + +[[ -e '/usr/bin/clang' && -e '/usr/lib/pkgconfig/cuda.pc' && -e '/usr/share/pkgconfig/ffnvcodec.pc' ]] && \ + PKGMK_FFMPEG+=' --enable-cuda-llvm --enable-nonfree --enable-cuda-nvcc --enable-libnpp' && \ + PKGMK_FFMPEG+=' --extra-cflags=-I/opt/cuda/include --extra-ldflags=-L/opt/cuda/lib64' && PATH="$PATH:/opt/cuda/bin" [ -e '/usr/share/pkgconfig/ffnvcodec.pc' ] && PKGMK_FFMPEG+=' --enable-nvdec --enable-nvenc' [ -e '/usr/include/AMF/core/VulkanAMF.h' ] && PKGMK_FFMPEG+=' --enable-amf' -[ -e '/usr/bin/clang' ] && [ -e '/usr/lib/pkgconfig/cuda.pc' ] && PKGMK_FFMPEG+=' --enable-cuda-llvm' [ -e '/usr/lib/pkgconfig/libwebp.pc' ] && PKGMK_FFMPEG+=' --enable-libwebp' [ -e '/usr/lib/pkgconfig/vdpau.pc' ] && PKGMK_FFMPEG+=' --enable-vdpau' [ -e '/usr/lib/pkgconfig/freetype2.pc' ] && PKGMK_FFMPEG+=' --enable-libfreetype' @@ -55,8 +61,7 @@ build() { --enable-avfilter \ --enable-postproc \ --enable-pthreads \ - --enable-swresample \ - --enable-avresample + --enable-swresample make make DESTDIR=$PKG install install-man diff --git a/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch b/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch new file mode 100644 index 000000000..fb5589800 --- /dev/null +++ b/ffmpeg/add-av_stream_get_first_dts-for-chromium.patch @@ -0,0 +1,44 @@ +From 95aab0fd83619408995720ce53d7a74790580220 Mon Sep 17 00:00:00 2001 +From: "liberato(a)chromium.org" <liberato(a)chromium.org> +Date: Wed, 7 Jul 2021 19:01:22 -0700 +Subject: [PATCH] Add av_stream_get_first_dts for Chromium + +[foutrelis: adjust for new FFStream struct replacing AVStreamInternal] +--- + libavformat/avformat.h | 4 ++++ + libavformat/utils.c | 7 +++++++ + 2 files changed, 11 insertions(+) + +diff --git a/libavformat/avformat.h b/libavformat/avformat.h +index cd7b0d941c..b4a6dce885 100644 +--- a/libavformat/avformat.h ++++ b/libavformat/avformat.h +@@ -1010,6 +1010,10 @@ struct AVCodecParserContext *av_stream_get_parser(const AVStream *s); + */ + int64_t av_stream_get_end_pts(const AVStream *st); + ++// Chromium: We use the internal field first_dts vvv ++int64_t av_stream_get_first_dts(const AVStream *st); ++// Chromium: We use the internal field first_dts ^^^ ++ + #define AV_PROGRAM_RUNNING 1 + + /** +diff --git a/libavformat/utils.c b/libavformat/utils.c +index de7580c32d..0ef0fe530e 100644 +--- a/libavformat/utils.c ++++ b/libavformat/utils.c +@@ -121,6 +121,13 @@ int64_t av_stream_get_end_pts(const AVStream *st) + return AV_NOPTS_VALUE; + } + ++// Chromium: We use the internal field first_dts vvv ++int64_t av_stream_get_first_dts(const AVStream *st) ++{ ++ return cffstream(st)->first_dts; ++} ++// Chromium: We use the internal field first_dts ^^^ ++ + struct AVCodecParserContext *av_stream_get_parser(const AVStream *st) + { + return st->internal->parser; diff --git a/ffmpeg/vmaf-model-path.patch b/ffmpeg/vmaf-model-path.patch new file mode 100644 index 000000000..abd65cdf7 --- /dev/null +++ b/ffmpeg/vmaf-model-path.patch @@ -0,0 +1,13 @@ +diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c +index 249e50c720..9b791e19b1 100644 +--- a/libavfilter/vf_libvmaf.c ++++ b/libavfilter/vf_libvmaf.c +@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext { + #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM + + static const AVOption libvmaf_options[] = { +- {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS}, ++ {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS}, + {"log_path", "Set the file path to be used to store logs.", OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS}, + {"log_fmt", "Set the format of the log (xml or json).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS}, + {"enable_transform", "Enables transform for computing vmaf.", OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},

1 0

ports/opt (3.6): [notify] webkitgtk: 2.34.3 -> 2.34.5 security update https://webkitgtk.org/security/WSA-2022-0001.html https://webkitgtk.org/security/WSA-2022-0002.html
by crux＠crux.nu 15 Feb '22

15 Feb '22

commit c64289fb0ea8e554cec9fe8f0ed8ca04307570a8 Author: Danny Rawlins <contact(a)romster.me> Date: Wed Feb 16 08:26:25 2022 +1100 [notify] webkitgtk: 2.34.3 -> 2.34.5 security update https://webkitgtk.org/security/WSA-2022-0001.html https://webkitgtk.org/security/WSA-2022-0002.html diff --git a/webkitgtk/.footprint b/webkitgtk/.footprint index 6acfd661e..bafcf921d 100644 --- a/webkitgtk/.footprint +++ b/webkitgtk/.footprint @@ -228,11 +228,11 @@ drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/WebKit2-4.1.typelib -rw-r--r-- root/root usr/lib/girepository-1.0/WebKit2WebExtension-4.1.typelib lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-4.1.so -> libjavascriptcoregtk-4.1.so.0 -lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-4.1.so.0 -> libjavascriptcoregtk-4.1.so.0.0.3 --rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-4.1.so.0.0.3 +lrwxrwxrwx root/root usr/lib/libjavascriptcoregtk-4.1.so.0 -> libjavascriptcoregtk-4.1.so.0.0.5 +-rwxr-xr-x root/root usr/lib/libjavascriptcoregtk-4.1.so.0.0.5 lrwxrwxrwx root/root usr/lib/libwebkit2gtk-4.1.so -> libwebkit2gtk-4.1.so.0 -lrwxrwxrwx root/root usr/lib/libwebkit2gtk-4.1.so.0 -> libwebkit2gtk-4.1.so.0.0.3 --rwxr-xr-x root/root usr/lib/libwebkit2gtk-4.1.so.0.0.3 +lrwxrwxrwx root/root usr/lib/libwebkit2gtk-4.1.so.0 -> libwebkit2gtk-4.1.so.0.0.5 +-rwxr-xr-x root/root usr/lib/libwebkit2gtk-4.1.so.0.0.5 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/javascriptcoregtk-4.1.pc -rw-r--r-- root/root usr/lib/pkgconfig/webkit2gtk-4.1.pc diff --git a/webkitgtk/.signature b/webkitgtk/.signature index 117eb7d4e..a0f5207e8 100644 --- a/webkitgtk/.signature +++ b/webkitgtk/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/XUyYfN7kYxGGxC91suUOeQCNWv9PmYpbKlUnOw6/0GcpA/29n6vfStJCmblmNqeoLu/Zmbfde7/7KTN1/7uOwo= -SHA256 (Pkgfile) = 71662ac4319c37b1a960618cfcb9706f269be02e0073bf6c1ca15fbf704eff9a -SHA256 (.footprint) = 8ee4086a2f363bdd4ec4eb2a94a4132fb31d659b15468c261765826ca9396fbf -SHA256 (webkitgtk-2.34.3.tar.xz) = 0d2f37aa32e21a36e4dd5a5ce7ae5ce27435c29d6803b962b8c90cb0cc49c52d +RWSE3ohX2g5d/ZtOYku1VW6oi3+aiJt96ccwf38Aazfh7VEM2F/+NoTyn3Lx99M6evF8Y8S6garTpDhBVhPJS078QkWQkywJvAc= +SHA256 (Pkgfile) = 8da69007bafb2323ef8dca83bf99521da2a94389bb9868dca449da46fcc11282 +SHA256 (.footprint) = 630c10953e7b501b8f484fa8cd8d397f0ef525086e98dfa83aafca22173a2365 +SHA256 (webkitgtk-2.34.5.tar.xz) = 68930643af7a47a3af05f46d66e784422433753dab335d3282f319a85a5629b4 diff --git a/webkitgtk/Pkgfile b/webkitgtk/Pkgfile index 79632a77b..ec56e51b1 100644 --- a/webkitgtk/Pkgfile +++ b/webkitgtk/Pkgfile @@ -5,7 +5,7 @@ # Optional: enchant libnotify geoclue openjpeg2 xdg-dbus-proxy bubblewrap wpebackend-fdo libmanette name=webkitgtk -version=2.34.3 +version=2.34.5 release=1 source=(https://webkitgtk.org/releases/webkitgtk-$version.tar.xz)

1 0