Date: Saturday, February 13, 2021 @ 18:44:22 Author: anthraxx Revision: 407988
archrelease: copy trunk to extra-x86_64 Added: jasper/repos/extra-x86_64/PKGBUILD (from rev 407987, jasper/trunk/PKGBUILD) jasper/repos/extra-x86_64/jasper-1.900.1-fix-filename-buffer-overflow.patch (from rev 407987, jasper/trunk/jasper-1.900.1-fix-filename-buffer-overflow.patch) Deleted: jasper/repos/extra-x86_64/PKGBUILD jasper/repos/extra-x86_64/jasper-1.900.1-fix-filename-buffer-overflow.patch ---------------------------------------------------+ PKGBUILD | 164 ++++++++++---------- jasper-1.900.1-fix-filename-buffer-overflow.patch | 74 ++++----- 2 files changed, 119 insertions(+), 119 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2021-02-13 18:44:17 UTC (rev 407987) +++ PKGBUILD 2021-02-13 18:44:22 UTC (rev 407988) @@ -1,82 +0,0 @@ -# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> -# Maintainer: Eric Bélanger <e...@archlinux.org> - -pkgbase=jasper -pkgname=('jasper' 'jasper-doc') -pkgver=2.0.24 -pkgrel=1 -pkgdesc='Software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard' -url='https://www.ece.uvic.ca/~mdadams/jasper/' -arch=('x86_64') -license=('custom:JasPer2.0') -makedepends=('glibc' 'libjpeg' 'freeglut' 'libxmu' 'glu' 'cmake' 'doxygen') -options=('staticlibs') -source=(${pkgname}-${pkgver}.tar.gz::https://github.com/mdadams/jasper/archive/version-${pkgver}.tar.gz - jasper-1.900.1-fix-filename-buffer-overflow.patch) -sha512sums=('9e3c6b236844d5a25d9f75cfd55de9d1137b2c3f46d5646761fd501fefc6386ffbf935d2d806d9a28fa351569afd90d1fed494ef929615beca3a0dd0f8247e04' - 'b8d798bf75523c5db263783e42c653dd0cb03deee90be32eddf878bb6893cca02abadd94de6a8c737a5b7fe76f7fb245979f010765e6a95fc520b215e3a2a7f0') -b2sums=('20535ca3de34b28ef0f759411de105df56458d2b4dfecb912868fe7cd18b4879ee884f18b895d4e9f9a52520ecdd8acedb701c01e20948bac14e30779e5149ca' - '9b1927a437ed9b32491f07a210600b5a7d10711ec954dadc030a8238b67e9c6d1a8e67956fd7a5515e7060f0a1651fa86763e21d6d20592f8f00e9d3260722a1') - -prepare() { - cd ${pkgbase}-version-${pkgver} - patch -p1 < "${srcdir}/jasper-1.900.1-fix-filename-buffer-overflow.patch" - sed -r 's|(CMAKE_SKIP_BUILD_RPATH) FALSE|\1 TRUE|g' -i CMakeLists.txt -} - -build() { - cd ${pkgbase}-version-${pkgver} - - local options=( - -DCMAKE_INSTALL_PREFIX=/usr - -DCMAKE_INSTALL_LIBDIR=lib - -DCMAKE_BUILD_TYPE=Release - -DJAS_ENABLE_OPENGL=ON - -DJAS_ENABLE_LIBJPEG=ON - -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF - -DCMAKE_SKIP_RPATH=ON - ) - - echo "Building static lib..." - cmake \ - -B build-static \ - "${options[@]}" \ - -DJAS_ENABLE_SHARED=OFF - make -C build-static - - echo "Building shared lib..." - cmake \ - -B build-shared \ - "${options[@]}" \ - -DJAS_ENABLE_SHARED=ON - make -C build-shared -} - -check() { - cd ${pkgbase}-version-${pkgver}/build-static - make -j1 test -} - -package_jasper() { - depends=('glibc' 'libjpeg' 'libjpeg.so') - optdepends=('jasper-doc: documentation' - 'freeglut: jiv support' - 'glu: jiv support') - provides=('libjasper.so') - cd ${pkgbase}-version-${pkgver} - make -C build-static DESTDIR="${pkgdir}" install - make -C build-shared DESTDIR="${pkgdir}" install - install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" - rm -r "${pkgdir}/usr/share/doc" -} - -package_jasper-doc() { - pkgdesc+=' (documentation)' - optdepends=('jasper') - cd ${pkgbase}-version-${pkgver} - make -C build-shared DESTDIR="${pkgdir}" install - install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" - rm -rf "${pkgdir}/usr/"{bin,include,lib,share/man} -} - -# vim: ts=2 sw=2 et: Copied: jasper/repos/extra-x86_64/PKGBUILD (from rev 407987, jasper/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2021-02-13 18:44:22 UTC (rev 407988) @@ -0,0 +1,82 @@ +# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org> +# Maintainer: Eric Bélanger <e...@archlinux.org> + +pkgbase=jasper +pkgname=('jasper' 'jasper-doc') +pkgver=2.0.25 +pkgrel=1 +pkgdesc='Software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard' +url='https://www.ece.uvic.ca/~mdadams/jasper/' +arch=('x86_64') +license=('custom:JasPer2.0') +makedepends=('glibc' 'libjpeg' 'freeglut' 'libxmu' 'glu' 'cmake' 'doxygen') +options=('staticlibs') +source=(${pkgname}-${pkgver}.tar.gz::https://github.com/mdadams/jasper/archive/version-${pkgver}.tar.gz + jasper-1.900.1-fix-filename-buffer-overflow.patch) +sha512sums=('721957120526227233b1f707b6bc3541e73ba95c919398097a36b3cbb256803306cebf0cec6d6999692a4603fea2bd5bbc70d567fe2da8719957e98a9e1a65e8' + 'b8d798bf75523c5db263783e42c653dd0cb03deee90be32eddf878bb6893cca02abadd94de6a8c737a5b7fe76f7fb245979f010765e6a95fc520b215e3a2a7f0') +b2sums=('190a8bcd5c3f342b376e436935d5c5de80b4838256fe934f5890f2c9cba42559be86e5d30099bb70268ccdad587b0e4a98c7bd6d5c3e27ca6b8632bbb75252d9' + '9b1927a437ed9b32491f07a210600b5a7d10711ec954dadc030a8238b67e9c6d1a8e67956fd7a5515e7060f0a1651fa86763e21d6d20592f8f00e9d3260722a1') + +prepare() { + cd ${pkgbase}-version-${pkgver} + patch -p1 < "${srcdir}/jasper-1.900.1-fix-filename-buffer-overflow.patch" + sed -r 's|(CMAKE_SKIP_BUILD_RPATH) FALSE|\1 TRUE|g' -i CMakeLists.txt +} + +build() { + cd ${pkgbase}-version-${pkgver} + + local options=( + -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_LIBDIR=lib + -DCMAKE_BUILD_TYPE=Release + -DJAS_ENABLE_OPENGL=ON + -DJAS_ENABLE_LIBJPEG=ON + -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF + -DCMAKE_SKIP_RPATH=ON + ) + + echo "Building static lib..." + cmake \ + -B build-static \ + "${options[@]}" \ + -DJAS_ENABLE_SHARED=OFF + make -C build-static + + echo "Building shared lib..." + cmake \ + -B build-shared \ + "${options[@]}" \ + -DJAS_ENABLE_SHARED=ON + make -C build-shared +} + +check() { + cd ${pkgbase}-version-${pkgver}/build-static + make -j1 test +} + +package_jasper() { + depends=('glibc' 'libjpeg' 'libjpeg.so') + optdepends=('jasper-doc: documentation' + 'freeglut: jiv support' + 'glu: jiv support') + provides=('libjasper.so') + cd ${pkgbase}-version-${pkgver} + make -C build-static DESTDIR="${pkgdir}" install + make -C build-shared DESTDIR="${pkgdir}" install + install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" + rm -r "${pkgdir}/usr/share/doc" +} + +package_jasper-doc() { + pkgdesc+=' (documentation)' + optdepends=('jasper') + cd ${pkgbase}-version-${pkgver} + make -C build-shared DESTDIR="${pkgdir}" install + install -Dm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}" + rm -rf "${pkgdir}/usr/"{bin,include,lib,share/man} +} + +# vim: ts=2 sw=2 et: Deleted: jasper-1.900.1-fix-filename-buffer-overflow.patch =================================================================== --- jasper-1.900.1-fix-filename-buffer-overflow.patch 2021-02-13 18:44:17 UTC (rev 407987) +++ jasper-1.900.1-fix-filename-buffer-overflow.patch 2021-02-13 18:44:22 UTC (rev 407988) @@ -1,37 +0,0 @@ -Description: Filename buffer overflow fix - This patch fixes a security hole by a bad buffer size handling. -Author: Roland Stigge <sti...@antcom.de> -Bug-Debian: http://bugs.debian.org/645118 - ---- a/src/libjasper/include/jasper/jas_stream.h -+++ b/src/libjasper/include/jasper/jas_stream.h -@@ -77,6 +77,7 @@ - #include <jasper/jas_config.h> - - #include <stdio.h> -+#include <limits.h> - #if defined(JAS_HAVE_FCNTL_H) - #include <fcntl.h> - #endif -@@ -99,6 +100,12 @@ extern "C" { - #define O_BINARY 0 - #endif - -+#ifdef PATH_MAX -+#define JAS_PATH_MAX PATH_MAX -+#else -+#define JAS_PATH_MAX 4096 -+#endif -+ - /* - * Stream open flags. - */ -@@ -251,7 +258,7 @@ typedef struct { - typedef struct { - int fd; - int flags; -- char pathname[L_tmpnam + 1]; -+ char pathname[JAS_PATH_MAX + 1]; - } jas_stream_fileobj_t; - - #define JAS_STREAM_FILEOBJ_DELONCLOSE 0x01 Copied: jasper/repos/extra-x86_64/jasper-1.900.1-fix-filename-buffer-overflow.patch (from rev 407987, jasper/trunk/jasper-1.900.1-fix-filename-buffer-overflow.patch) =================================================================== --- jasper-1.900.1-fix-filename-buffer-overflow.patch (rev 0) +++ jasper-1.900.1-fix-filename-buffer-overflow.patch 2021-02-13 18:44:22 UTC (rev 407988) @@ -0,0 +1,37 @@ +Description: Filename buffer overflow fix + This patch fixes a security hole by a bad buffer size handling. +Author: Roland Stigge <sti...@antcom.de> +Bug-Debian: http://bugs.debian.org/645118 + +--- a/src/libjasper/include/jasper/jas_stream.h ++++ b/src/libjasper/include/jasper/jas_stream.h +@@ -77,6 +77,7 @@ + #include <jasper/jas_config.h> + + #include <stdio.h> ++#include <limits.h> + #if defined(JAS_HAVE_FCNTL_H) + #include <fcntl.h> + #endif +@@ -99,6 +100,12 @@ extern "C" { + #define O_BINARY 0 + #endif + ++#ifdef PATH_MAX ++#define JAS_PATH_MAX PATH_MAX ++#else ++#define JAS_PATH_MAX 4096 ++#endif ++ + /* + * Stream open flags. + */ +@@ -251,7 +258,7 @@ typedef struct { + typedef struct { + int fd; + int flags; +- char pathname[L_tmpnam + 1]; ++ char pathname[JAS_PATH_MAX + 1]; + } jas_stream_fileobj_t; + + #define JAS_STREAM_FILEOBJ_DELONCLOSE 0x01