From 7b0627d2f986001d05de1f12bd48efd1812a03e2 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sat, 5 Mar 2022 16:58:43 +0100 Subject: [PATCH 1/7] python3-pycparser: 2.20 -> 2.21 --- python3-pycparser/.footprint | 10 +++++----- python3-pycparser/.signature | 8 ++++---- python3-pycparser/Pkgfile | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/python3-pycparser/.footprint b/python3-pycparser/.footprint index be9e0000a..d54b72c5a 100644 --- a/python3-pycparser/.footprint +++ b/python3-pycparser/.footprint @@ -2,11 +2,11 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python3.9/ drwxr-xr-x root/root usr/lib/python3.9/site-packages/ -drwxr-xr-x root/root usr/lib/python3.9/site-packages/pycparser-2.20-py3.9.egg-info/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/pycparser-2.20-py3.9.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python3.9/site-packages/pycparser-2.20-py3.9.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/pycparser-2.20-py3.9.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/pycparser-2.20-py3.9.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python3.9/site-packages/pycparser-2.21-py3.9.egg-info/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/pycparser-2.21-py3.9.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python3.9/site-packages/pycparser-2.21-py3.9.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/pycparser-2.21-py3.9.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/pycparser-2.21-py3.9.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python3.9/site-packages/pycparser/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/pycparser/__init__.py drwxr-xr-x root/root usr/lib/python3.9/site-packages/pycparser/__pycache__/ diff --git a/python3-pycparser/.signature b/python3-pycparser/.signature index dd41e31a5..494662563 100644 --- a/python3-pycparser/.signature +++ b/python3-pycparser/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/SwY/I5n0BTjo0pocIQgWHG8ddd/TG45rsWujK/S5ohu41yiXk+2YGwVGYKCHtyLM5R+brifHIuXcEouZfrw5ws= -SHA256 (Pkgfile) = 2eccea29b224d746b6ff0c9434b4c9afd8ad9477919d9eb76630a918939cba77 -SHA256 (.footprint) = 8c4ebbdb9b01b4cf2eb42b644afb3563c91f660d40ff56378fe7e0db9d51aec1 -SHA256 (release_v2.20.tar.gz) = 1b895b4f6fb5195ce9c516ca7e28c9bd2f9ecd0f02755302b8a717454abea806 +RWSE3ohX2g5d/TSE+IiE4UiK+yZRCf+0EiZpfqsRek1V3yWLBKjaO4oRD8MlMOJpywbA5XfT3/vVst3C8296BZMZMJCr454U1ws= +SHA256 (Pkgfile) = 5a90e3266de5056b5c7913565d144552acf42eede27517c926621c3a08dc497d +SHA256 (.footprint) = 841c606e4285232984eee7f85932ba0ff462c94db537cce2cff5809be3674408 +SHA256 (release_v2.21.tar.gz) = 3c797eb2eb1ba57772bb99ffa7caed23c3a2c2ae58daef114c9b09d3a6da97e2 diff --git a/python3-pycparser/Pkgfile b/python3-pycparser/Pkgfile index a3fff247c..d70f40174 100644 --- a/python3-pycparser/Pkgfile +++ b/python3-pycparser/Pkgfile @@ -4,7 +4,7 @@ # Depends on: python3-setuptools name=python3-pycparser -version=2.20 +version=2.21 release=1 source=(https://github.com/eliben/${name#*-*}/archive/release_v$version.tar.gz) From 0854aa4a35e77169b531914251da78060d41c0fe Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sat, 5 Mar 2022 16:59:08 +0100 Subject: [PATCH 2/7] python3-markupsafe: 2.0.1 -> 2.1.0 --- python3-markupsafe/.footprint | 10 +++++----- python3-markupsafe/.signature | 8 ++++---- python3-markupsafe/Pkgfile | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/python3-markupsafe/.footprint b/python3-markupsafe/.footprint index 59025709e..86285b2e5 100644 --- a/python3-markupsafe/.footprint +++ b/python3-markupsafe/.footprint @@ -2,11 +2,11 @@ drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/python3.9/ drwxr-xr-x root/root usr/lib/python3.9/site-packages/ -drwxr-xr-x root/root usr/lib/python3.9/site-packages/MarkupSafe-2.0.1-py3.9.egg-info/ --rw-r--r-- root/root usr/lib/python3.9/site-packages/MarkupSafe-2.0.1-py3.9.egg-info/PKG-INFO --rw-r--r-- root/root usr/lib/python3.9/site-packages/MarkupSafe-2.0.1-py3.9.egg-info/SOURCES.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/MarkupSafe-2.0.1-py3.9.egg-info/dependency_links.txt --rw-r--r-- root/root usr/lib/python3.9/site-packages/MarkupSafe-2.0.1-py3.9.egg-info/top_level.txt +drwxr-xr-x root/root usr/lib/python3.9/site-packages/MarkupSafe-2.1.0-py3.9.egg-info/ +-rw-r--r-- root/root usr/lib/python3.9/site-packages/MarkupSafe-2.1.0-py3.9.egg-info/PKG-INFO +-rw-r--r-- root/root usr/lib/python3.9/site-packages/MarkupSafe-2.1.0-py3.9.egg-info/SOURCES.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/MarkupSafe-2.1.0-py3.9.egg-info/dependency_links.txt +-rw-r--r-- root/root usr/lib/python3.9/site-packages/MarkupSafe-2.1.0-py3.9.egg-info/top_level.txt drwxr-xr-x root/root usr/lib/python3.9/site-packages/markupsafe/ -rw-r--r-- root/root usr/lib/python3.9/site-packages/markupsafe/__init__.py drwxr-xr-x root/root usr/lib/python3.9/site-packages/markupsafe/__pycache__/ diff --git a/python3-markupsafe/.signature b/python3-markupsafe/.signature index 6b7ab7f40..78fc529ec 100644 --- a/python3-markupsafe/.signature +++ b/python3-markupsafe/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/aF+wOZHAFAkXqTK7S3hqCVvgnSnDXpv+iIEPSZH5s29L4/Y9f24of2TC25vJijHFCZtNN65xIMah+Ze5w2WMQw= -SHA256 (Pkgfile) = e2493312483dba4e0a05560a14e9bc3779e77be6e73dce5b1d725f4a830920ac -SHA256 (.footprint) = 567c29142386e292f42f17a8a275d76d63bd3709b57b2e68afd1a73ee672a8d5 -SHA256 (MarkupSafe-2.0.1.tar.gz) = 594c67807fb16238b30c44bdf74f36c02cdf22d1c8cda91ef8a0ed8dabf5620a +RWSE3ohX2g5d/Q6VrYRkYjNGtvPCqfMP9K0+Tm8I2WdBv2J+A1DGPP6ZatqmPwfp9xLBMEiRUVrhMunJGC5v6HGivar7FX6llw8= +SHA256 (Pkgfile) = ed6cf2fb48bb278790c9211cc87ee5f8974c9bd1fe3f20eaaef185b0532fedb8 +SHA256 (.footprint) = bdc748df59111fd6e7a09dd81f988b2822f80164e8e0d377f36cfb5c547aa507 +SHA256 (MarkupSafe-2.1.0.tar.gz) = 80beaf63ddfbc64a0452b841d8036ca0611e049650e20afcb882f5d3c266d65f diff --git a/python3-markupsafe/Pkgfile b/python3-markupsafe/Pkgfile index 5a29ee5ed..8668a5b5d 100644 --- a/python3-markupsafe/Pkgfile +++ b/python3-markupsafe/Pkgfile @@ -4,7 +4,7 @@ # Depends on: python3-setuptools name=python3-markupsafe -version=2.0.1 +version=2.1.0 release=1 source=(https://pypi.io/packages/source/M/MarkupSafe/MarkupSafe-$version.tar.gz) From 165691e8ce39a4a70683fccea947c07ce872ed50 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sat, 5 Mar 2022 17:09:29 +0100 Subject: [PATCH 3/7] libsecret: 0.20.4 -> 0.20.5; now uses meson/ninja --- libsecret/.footprint | 4 +--- libsecret/.signature | 8 ++++---- libsecret/Pkgfile | 25 ++++++++++++++----------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/libsecret/.footprint b/libsecret/.footprint index 19c464b94..3ccf79ddc 100644 --- a/libsecret/.footprint +++ b/libsecret/.footprint @@ -23,9 +23,7 @@ drwxr-xr-x root/root usr/include/libsecret-1/libsecret/ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/girepository-1.0/ -rw-r--r-- root/root usr/lib/girepository-1.0/Secret-1.typelib --rw-r--r-- root/root usr/lib/libsecret-1.a --rwxr-xr-x root/root usr/lib/libsecret-1.la -lrwxrwxrwx root/root usr/lib/libsecret-1.so -> libsecret-1.so.0.0.0 +lrwxrwxrwx root/root usr/lib/libsecret-1.so -> libsecret-1.so.0 lrwxrwxrwx root/root usr/lib/libsecret-1.so.0 -> libsecret-1.so.0.0.0 -rwxr-xr-x root/root usr/lib/libsecret-1.so.0.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ diff --git a/libsecret/.signature b/libsecret/.signature index 514c45688..ab952eaa0 100644 --- a/libsecret/.signature +++ b/libsecret/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/eyhv0vAoMtp76rv3xofq8PaN+xZ1uw9fXlhxyhR5XzyOfZIpvJkXv6ZsJUjlF9KfSn6vsfIi/1BhxIuAUp5XAo= -SHA256 (Pkgfile) = 8be7fab3037ab32bc867f9c5cac96d0f13f820974e57dabe7097211f2448d8b6 -SHA256 (.footprint) = c2510767f838c8b09bab6d9fd3a7dbc6ba2a7385b0c077ed47b1f8b87a8c150a -SHA256 (libsecret-0.20.4.tar.xz) = 325a4c54db320c406711bf2b55e5cb5b6c29823426aa82596a907595abb39d28 +RWSE3ohX2g5d/TEnOKT7cco/hals2MpSxFkvIj4rsAJNuO7tjiWftKFUFkqjcif3ZHE1UOeuIJ10APwib9ZnQ5LomA3ml+UTvgc= +SHA256 (Pkgfile) = 8f915d16f8736911435ef96c7b3919f96d415a86a79c3516efb1f6fbbde34cd8 +SHA256 (.footprint) = 992be0c263bea1b77cd025873e7e5a2bd1b27a2f0357371742b7f67f1dcf14cc +SHA256 (libsecret-0.20.5.tar.xz) = 3fb3ce340fcd7db54d87c893e69bfc2b1f6e4d4b279065ffe66dac9f0fd12b4d diff --git a/libsecret/Pkgfile b/libsecret/Pkgfile index a4bd26bbb..883e59f73 100644 --- a/libsecret/Pkgfile +++ b/libsecret/Pkgfile @@ -5,22 +5,25 @@ # Optional: vala docbook-xsl name=libsecret -version=0.20.4 +version=0.20.5 release=1 source=(https://download.gnome.org/sources/$name/${version:0:4}/$name-$version.tar.xz) build() { - cd $name-$version + prt-get isinst bash-completion || \ + PKGMK_LIBSECRET+=' -D bash_completion=disabled' + prt-get isinst docbook-xsl || PKGMK_LIBSECRET+=' -D manpage=false' + prt-get isinst vala || PKGMK_LIBSECRET+=' -D vapi=false' -prt-get isinst docbook-xsl && local MAN='' || local MAN='-disable-manpages' - - ./configure \ + meson setup build $name-$version $PKGMK_LIBSECRET \ --prefix=/usr \ - --disable-nls \ - --disable-dependency-tracking $MAN + --buildtype=plain \ + --wrap-mode nodownload \ + -D b_lto=true \ + -D b_pie=true \ + -D gtk_doc=false + meson compile -C build -j ${JOBS:-1} + DESTDIR=$PKG meson install -C build - make - make DESTDIR=$PKG install - - rm -r $PKG/usr/share/gtk-doc + rm -r $PKG/usr/share/locale } From b17b216227922f4ee580bcd8c83bcfcab9f5e8e7 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sat, 5 Mar 2022 17:10:30 +0100 Subject: [PATCH 4/7] jasper: 2.0.33 -> 3.0.2 --- jasper/.footprint | 9 ++++++--- jasper/.signature | 10 ++++------ jasper/Pkgfile | 34 ++++++++++++---------------------- 3 files changed, 22 insertions(+), 31 deletions(-) diff --git a/jasper/.footprint b/jasper/.footprint index db66a9332..5fccb74c8 100644 --- a/jasper/.footprint +++ b/jasper/.footprint @@ -11,16 +11,19 @@ drwxr-xr-x root/root usr/include/jasper/ -rw-r--r-- root/root usr/include/jasper/jas_config.h -rw-r--r-- root/root usr/include/jasper/jas_debug.h -rw-r--r-- root/root usr/include/jasper/jas_dll.h +-rw-r--r-- root/root usr/include/jasper/jas_export_cmake.h -rw-r--r-- root/root usr/include/jasper/jas_fix.h -rw-r--r-- root/root usr/include/jasper/jas_getopt.h -rw-r--r-- root/root usr/include/jasper/jas_icc.h -rw-r--r-- root/root usr/include/jasper/jas_image.h -rw-r--r-- root/root usr/include/jasper/jas_init.h +-rw-r--r-- root/root usr/include/jasper/jas_log.h -rw-r--r-- root/root usr/include/jasper/jas_malloc.h -rw-r--r-- root/root usr/include/jasper/jas_math.h -rw-r--r-- root/root usr/include/jasper/jas_seq.h -rw-r--r-- root/root usr/include/jasper/jas_stream.h -rw-r--r-- root/root usr/include/jasper/jas_string.h +-rw-r--r-- root/root usr/include/jasper/jas_thread.h -rw-r--r-- root/root usr/include/jasper/jas_tmr.h -rw-r--r-- root/root usr/include/jasper/jas_tvp.h -rw-r--r-- root/root usr/include/jasper/jas_types.h @@ -28,9 +31,9 @@ drwxr-xr-x root/root usr/include/jasper/ -rw-r--r-- root/root usr/include/jasper/jasper.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libjasper.a -lrwxrwxrwx root/root usr/lib/libjasper.so -> libjasper.so.4 -lrwxrwxrwx root/root usr/lib/libjasper.so.4 -> libjasper.so.4.0.0 --rwxr-xr-x root/root usr/lib/libjasper.so.4.0.0 +lrwxrwxrwx root/root usr/lib/libjasper.so -> libjasper.so.6 +lrwxrwxrwx root/root usr/lib/libjasper.so.6 -> libjasper.so.6.0.0 +-rwxr-xr-x root/root usr/lib/libjasper.so.6.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/jasper.pc drwxr-xr-x root/root usr/share/ diff --git a/jasper/.signature b/jasper/.signature index 28616b016..2595caefd 100644 --- a/jasper/.signature +++ b/jasper/.signature @@ -1,7 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/b3/u8mr38NUbo3iA57fNR7z2izgkMN74e3l/rAdx1+CELUoIixyMCNvpZN4rTC9ljeDAs7PCibbLozxf9uLVQc= -SHA256 (Pkgfile) = a584698d0f834649f37d50476e67f7c782cd3bad44baa12983c4b915f8e90337 -SHA256 (.footprint) = 2663af88aeb3fd06c40efc05558af405f50dbda6d410a36f3b02f005e0f0abf0 -SHA256 (jasper-2.0.33.tar.gz) = 38b8f74565ee9e7fec44657e69adb5c9b2a966ca5947ced5717cde18a7d2eca6 -SHA256 (jasper-1.900.1-fix-filename-buffer-overflow.patch) = f51377e9b3e4faaa6b17b2d5fcf6f6d94fe2916a65dc9c78b5a99b891f5726dc -SHA256 (jasper-freeglut.patch) = 1b2d784f48858e03ad64ee632f2a5e64d49c368b8dc3553b01315b52d14d3131 +RWSE3ohX2g5d/QwSSKQB/F37Hp/FCnFOfrO6P728kHrilXeYh/O0GImiPwPTXNBLAYk03EzqIxF9UAdO7Xo2GsM4pTfnFz53ZwE= +SHA256 (Pkgfile) = 0cf1d7028235c783f087688474f2e96d8e3f8e6ff66abcb3da86f4c387b297fb +SHA256 (.footprint) = a271234607ab03afb3b8ced203be71b2c485b6b8d5403a71e94837cd8473fd6b +SHA256 (jasper-3.0.2.tar.gz) = 3280c7b48ad53f956ce22ce719ac23ca7812cdeff0667e3914a5bc22592ad43f diff --git a/jasper/Pkgfile b/jasper/Pkgfile index 06c9f6f93..6da203d6d 100644 --- a/jasper/Pkgfile +++ b/jasper/Pkgfile @@ -4,45 +4,35 @@ # Depends on: freeglut libjpeg-turbo xorg-libxmu name=jasper -version=2.0.33 -release=2 -source=(https://github.com/jasper-software/jasper/archive/version-$version/$name-$version.tar.gz - jasper-1.900.1-fix-filename-buffer-overflow.patch - jasper-freeglut.patch) +version=3.0.2 +release=1 +source=(https://github.com/jasper-software/jasper/releases/download/version-$version/jasper-$version.tar.gz) build() { - cd $name-version-$version - - patch -p1 -i $SRC/jasper-1.900.1-fix-filename-buffer-overflow.patch - sed -r 's|(CMAKE_SKIP_BUILD_RPATH) FALSE|\1 TRUE|g' -i CMakeLists.txt - patch -p1 -i $SRC/jasper-freeglut.patch - - mkdir -p build-{shared,static} - local config=" -D CMAKE_INSTALL_PREFIX=/usr -D CMAKE_INSTALL_LIBDIR=lib -D CMAKE_BUILD_TYPE=Release +-D CMAKE_SKIP_BUILD_RPATH=ON -D JAS_ENABLE_OPENGL=ON -D JAS_ENABLE_LIBJPEG=ON --D JAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF -D CMAKE_SKIP_RPATH=ON -D OpenGL_GL_PREFERENCE=GLVND" #build static lib - ( cd build-static - cmake .. $config -D JAS_ENABLE_SHARED=OFF - make + ( cmake -S $name-version-$version -B build-static -G Ninja $config \ + -D JAS_ENABLE_SHARED=OFF + cmake --build build-static ) #build shared lib - ( cd build-shared - cmake .. $config -D JAS_ENABLE_SHARED=ON - make + ( cmake -S $name-version-$version -B build-shared -G Ninja $config \ + -D JAS_ENABLE_SHARED=ON + cmake --build build-shared ) - make -C build-static DESTDIR=$PKG install - make -C build-shared DESTDIR=$PKG install + DESTDIR=$PKG cmake --install build-static + DESTDIR=$PKG cmake --install build-shared rm -r $PKG/usr/share/doc } From 64a438e03f8ef86987377b55be083a502f470b15 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sat, 5 Mar 2022 17:22:09 +0100 Subject: [PATCH 5/7] flac: 1.3.3 -> 1.3.4 --- flac/.signature | 8 ++--- flac/2e7931c.patch | 25 ---------------- flac/Pkgfile | 11 ++----- flac/ced7f68.patch | 74 ---------------------------------------------- 4 files changed, 6 insertions(+), 112 deletions(-) delete mode 100644 flac/2e7931c.patch delete mode 100644 flac/ced7f68.patch diff --git a/flac/.signature b/flac/.signature index 7f0fff74a..98fabd9fc 100644 --- a/flac/.signature +++ b/flac/.signature @@ -1,7 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Uxh4j/6PEOv3zoJy43TDAwlkCC7uje5YLqSKUNMxXBdNiDaF0rquUbwnvlnyuX7NEE/xAJixVnV3pn2HA+V7Aw= -SHA256 (Pkgfile) = 7e94e96a7c807506dc3ecd9b5f94dcdd816d108b2c22a4e9ba892b738327e577 +RWSE3ohX2g5d/St5yD0QQQVvEo+/fXZ9iI4LO5SWKo44FyNM8pDGnQJ6HiSbb63Cc557rTY0xM1jAPGUK5s5Rsc87ovRH7L29wg= +SHA256 (Pkgfile) = 66df61db3f77928e589e385910393a586e5826f3fdb077a6f1cad9f1e808267f SHA256 (.footprint) = 1b4686b5a9615a67c8c91b0b51f2e1688c245bf737e0d2772231bcd502d96004 -SHA256 (flac-1.3.3.tar.xz) = 213e82bd716c9de6db2f98bcadbc4c24c7e2efe8c75939a1a84e28539c4e1748 -SHA256 (2e7931c.patch) = 4c720576c909cb0a624dba339285970bc01488b19a875333fdc74b43e1c020ba -SHA256 (ced7f68.patch) = f41722979b57c4fd9cc80018af90e035f0ecacbfb5cbe8161838c01d58879047 +SHA256 (flac-1.3.4.tar.xz) = 8ff0607e75a322dd7cd6ec48f4f225471404ae2730d0ea945127b1355155e737 diff --git a/flac/2e7931c.patch b/flac/2e7931c.patch deleted file mode 100644 index 53556bbca..000000000 --- a/flac/2e7931c.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2e7931c27eb15e387da440a37f12437e35b22dd4 Mon Sep 17 00:00:00 2001 -From: Erik de Castro Lopo -Date: Mon, 7 Oct 2019 12:55:58 +1100 -Subject: [PATCH] libFLAC/bitreader.c: Fix out-of-bounds read - -Credit: Oss-Fuzz -Issue: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=17069 -Testcase: fuzzer_decoder-5670265022840832 ---- - src/libFLAC/bitreader.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/libFLAC/bitreader.c b/src/libFLAC/bitreader.c -index 5e4b59180e..3df4d02c0b 100644 ---- a/src/libFLAC/bitreader.c -+++ b/src/libFLAC/bitreader.c -@@ -869,7 +869,7 @@ FLAC__bool FLAC__bitreader_read_rice_signed_block(FLAC__BitReader *br, int vals[ - cwords = br->consumed_words; - words = br->words; - ucbits = FLAC__BITS_PER_WORD - br->consumed_bits; -- b = br->buffer[cwords] << br->consumed_bits; -+ b = cwords < br->capacity ? br->buffer[cwords] << br->consumed_bits : 0; - } while(cwords >= words && val < end); - } - diff --git a/flac/Pkgfile b/flac/Pkgfile index 7c9d40f81..c67afdd4b 100644 --- a/flac/Pkgfile +++ b/flac/Pkgfile @@ -4,18 +4,13 @@ # Depends on: libogg name=flac -version=1.3.3 -release=2 -source=(https://downloads.xiph.org/releases/flac/$name-$version.tar.xz - 2e7931c.patch - ced7f68.patch) +version=1.3.4 +release=1 +source=(https://downloads.xiph.org/releases/flac/$name-$version.tar.xz) build() { cd $name-$version - patch -p1 -i $SRC/2e7931c.patch # CVE-2020-0499 - patch -p1 -i $SRC/ced7f68.patch # overflow checks - ./configure --prefix=/usr make diff --git a/flac/ced7f68.patch b/flac/ced7f68.patch deleted file mode 100644 index eb2b7871b..000000000 --- a/flac/ced7f68.patch +++ /dev/null @@ -1,74 +0,0 @@ -From ced7f6829d14e38128bf0ba66412cc0541246c46 Mon Sep 17 00:00:00 2001 -From: Martijn van Beurden -Date: Mon, 6 Jul 2020 21:38:39 +0200 -Subject: [PATCH] Add some overflow checks for residual bits calculation - ---- - src/libFLAC/stream_encoder.c | 23 +++++++++++++++-------- - 1 file changed, 15 insertions(+), 8 deletions(-) - -diff --git a/src/libFLAC/stream_encoder.c b/src/libFLAC/stream_encoder.c -index 74387ec3be..4c91247fe8 100644 ---- a/src/libFLAC/stream_encoder.c -+++ b/src/libFLAC/stream_encoder.c -@@ -4110,13 +4110,14 @@ static inline uint32_t count_rice_bits_in_partition_( - const FLAC__int32 *residual - ) - { -- uint32_t i, partition_bits = -+ uint32_t i; -+ uint64_t partition_bits = - FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN + /* actually could end up being FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN but err on side of 16bps */ - (1+rice_parameter) * partition_samples /* 1 for unary stop bit + rice_parameter for the binary portion */ - ; - for(i = 0; i < partition_samples; i++) - partition_bits += ( (FLAC__uint32)((residual[i]<<1)^(residual[i]>>31)) >> rice_parameter ); -- return partition_bits; -+ return (uint32_t)(flac_min(partition_bits,(uint32_t)(-1))); // To make sure the return value doesn't overflow - } - #else - static inline uint32_t count_rice_bits_in_partition_( -@@ -4125,15 +4126,15 @@ static inline uint32_t count_rice_bits_in_partition_( - const FLAC__uint64 abs_residual_partition_sum - ) - { -- return -+ return (uint32_t)(flac_min( // To make sure the return value doesn't overflow - FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE_PARAMETER_LEN + /* actually could end up being FLAC__ENTROPY_CODING_METHOD_PARTITIONED_RICE2_PARAMETER_LEN but err on side of 16bps */ - (1+rice_parameter) * partition_samples + /* 1 for unary stop bit + rice_parameter for the binary portion */ - ( - rice_parameter? -- (uint32_t)(abs_residual_partition_sum >> (rice_parameter-1)) /* rice_parameter-1 because the real coder sign-folds instead of using a sign bit */ -- : (uint32_t)(abs_residual_partition_sum << 1) /* can't shift by negative number, so reverse */ -+ (abs_residual_partition_sum >> (rice_parameter-1)) /* rice_parameter-1 because the real coder sign-folds instead of using a sign bit */ -+ : (abs_residual_partition_sum << 1) /* can't shift by negative number, so reverse */ - ) -- - (partition_samples >> 1) -+ - (partition_samples >> 1),(uint32_t)(-1))); - /* -(partition_samples>>1) to subtract out extra contributions to the abs_residual_partition_sum. - * The actual number of bits used is closer to the sum(for all i in the partition) of abs(residual[i])>>(rice_parameter-1) - * By using the abs_residual_partition sum, we also add in bits in the LSBs that would normally be shifted out. -@@ -4224,7 +4225,10 @@ FLAC__bool set_partitioned_rice_( - raw_bits[0] = 0; - } - parameters[0] = best_rice_parameter; -- bits_ += best_partition_bits; -+ if(best_partition_bits < UINT_MAX - bits_) // To make sure _bits doesn't overflow -+ bits_ += best_partition_bits; -+ else -+ bits_ = UINT_MAX; - } - else { - uint32_t partition, residual_sample; -@@ -4327,7 +4331,10 @@ FLAC__bool set_partitioned_rice_( - raw_bits[partition] = 0; - } - parameters[partition] = best_rice_parameter; -- bits_ += best_partition_bits; -+ if(best_partition_bits < UINT_MAX - bits_) // To make sure _bits doesn't overflow -+ bits_ += best_partition_bits; -+ else -+ bits_ = UINT_MAX; - residual_sample += partition_samples; - } - } From 7715a21f6a040b5cb701a4532a0b4418f43d8d93 Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sat, 5 Mar 2022 17:24:36 +0100 Subject: [PATCH 6/7] faudio: 22.02 -> 22.03 --- faudio/.footprint | 4 ++-- faudio/.signature | 8 ++++---- faudio/Pkgfile | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/faudio/.footprint b/faudio/.footprint index d22c8112a..63c271b89 100644 --- a/faudio/.footprint +++ b/faudio/.footprint @@ -15,7 +15,7 @@ drwxr-xr-x root/root usr/lib/cmake/FAudio/ -rw-r--r-- root/root usr/lib/cmake/FAudio/FAudio-targets.cmake -rw-r--r-- root/root usr/lib/cmake/FAudio/FAudioConfig.cmake lrwxrwxrwx root/root usr/lib/libFAudio.so -> libFAudio.so.0 -lrwxrwxrwx root/root usr/lib/libFAudio.so.0 -> libFAudio.so.0.22.02 --rwxr-xr-x root/root usr/lib/libFAudio.so.0.22.02 +lrwxrwxrwx root/root usr/lib/libFAudio.so.0 -> libFAudio.so.0.22.03 +-rwxr-xr-x root/root usr/lib/libFAudio.so.0.22.03 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/FAudio.pc diff --git a/faudio/.signature b/faudio/.signature index 83fc88cc4..dc833684a 100644 --- a/faudio/.signature +++ b/faudio/.signature @@ -1,5 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/Se3k7bYwAKK0Iz0BMxmRT6kSvq2ZUOCZ3IdHkLNrT04MNs06UhWTz6uJQYgnugyr+1jNkA3hiuPE/cuqaVRLw0= -SHA256 (Pkgfile) = fedd7bd48231dfa34ab6ceaa751950e7231ac10c97a57ef4adb930f8a436b887 -SHA256 (.footprint) = c8a3c757ba31437c7e2c0b7021baf1ed7486d4452f6b1ec275f79fda5931c533 -SHA256 (faudio-22.02.tar.gz) = fc6248fd471c59dc9dc1de706a186064511de666c78a7358861d275c084df9ed +RWSE3ohX2g5d/eN29NFbdorbuZ84P8Ll8YHYCeA0tsD2ylCIqbX7rlfqtdqxPBLTWlNMcKs16aW4KjS/GfRtXdHuKJRrwaEiywY= +SHA256 (Pkgfile) = b9307c3e7bb751ca0e4a1c9d989f7fea9d887aff9b8e8bb487db1583427289ca +SHA256 (.footprint) = d541d3628439ec185cd205ace807c4529f1edf07df68c036a27682b134607339 +SHA256 (faudio-22.03.tar.gz) = 91ea309417f6846fc097e06a0b4fb604bf4bdff67455fabc4820cf1dbe0e301e diff --git a/faudio/Pkgfile b/faudio/Pkgfile index 543a93ccd..91a43267c 100644 --- a/faudio/Pkgfile +++ b/faudio/Pkgfile @@ -4,7 +4,7 @@ # Depends on: libsdl2 gst-libav name=faudio -version=22.02 +version=22.03 release=1 source=(https://github.com/FNA-XNA/FAudio/archive/$version/$name-$version.tar.gz) @@ -14,7 +14,7 @@ build() { -D CMAKE_INSTALL_LIBDIR=lib \ -D CMAKE_BUILD_TYPE=Release \ -D CMAKE_C_FLAGS_RELEASE="$CFLAGS" \ - -D GSTREAMER=ON + -Wno-dev cmake --build build DESTDIR=$PKG cmake --install build From 4fb0c07846e768d7e0e0d38d95d3c68a81787d4a Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Sat, 5 Mar 2022 17:28:35 +0100 Subject: [PATCH 7/7] ccache: 4.5.1 -> 4.6 --- ccache/.signature | 6 +++--- ccache/Pkgfile | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ccache/.signature b/ccache/.signature index 458252113..544abd62e 100644 --- a/ccache/.signature +++ b/ccache/.signature @@ -1,6 +1,6 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/djDWwTtmDXRCKptWmDOjV4Nf2t0gbkabsZ5OgzUckR1AvO6MZFGB9TIvQiKLzwnizEx/hfayF18d7M7AmnTkwA= -SHA256 (Pkgfile) = d91917ae4a550597699c1731baf4277431028223ee7b4f3517fdfa799e9bb1fc +RWSE3ohX2g5d/eI4Vvm/zc5hWl42EnNl/+VhdHFqSIUKxoPk4Ac/bPvO+Vr5L7sV+iK+A3Ocfvg67sGBOWBK5vwT1p0MGuThLAI= +SHA256 (Pkgfile) = 1d466a867964d9297189b479037f0241b3834bcf54a349a48bb7dbf2b639c01d SHA256 (.footprint) = aa85bfc686cf873efffd292c55eae8016e161bd8074d4f3490539f6089eead23 -SHA256 (ccache-4.5.1.tar.xz) = 51186ebe0326365f4e6131e1caa8911de7da4aa6718efc00680322d63a759517 +SHA256 (ccache-4.6.tar.xz) = 3d2bb860f4359169e640f60cf7cc11da5fab5fb9aed55230d78141e49c3945e9 SHA256 (ccache.1) = 28c9779ef67b746ba3db355fa01f086470f3478248d17bfef453a7ce72e97207 diff --git a/ccache/Pkgfile b/ccache/Pkgfile index 54d5eec55..b355fe0cc 100644 --- a/ccache/Pkgfile +++ b/ccache/Pkgfile @@ -2,16 +2,16 @@ # URL: https://ccache.dev/ # Maintainer: Danny Rawlins, crux at romster dot me # Depends on: cmake -# Optional: clang-ccache-bindings asciidoctor +# Optional: asciidoctor clang-ccache-bindings name=ccache -version=4.5.1 -release=2 +version=4.6 +release=1 source=(https://github.com/$name/$name/releases/download/v$version/$name-$version.tar.xz ccache.1) build() { - [[ -e '/usr/bin/ninja' ]] && PKGMK_CCACHE+=' -G Ninja' + prt-get isinst ninja && PKGMK_CCACHE+=' -G Ninja' cmake -S $name-$version -B build $PKGMK_CCACHE \ -D CMAKE_INSTALL_PREFIX=/usr \