[arch-commits] Commit in jasper/repos/extra-x86_64 (4 files)
Felix Yan
felixonmars at archlinux.org
Fri Jun 11 00:20:27 UTC 2021
Date: Friday, June 11, 2021 @ 00:20:26
Author: felixonmars
Revision: 417947
archrelease: copy trunk to extra-x86_64
Added:
jasper/repos/extra-x86_64/PKGBUILD
(from rev 417946, jasper/trunk/PKGBUILD)
jasper/repos/extra-x86_64/jasper-1.900.1-fix-filename-buffer-overflow.patch
(from rev 417946, 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-06-11 00:20:14 UTC (rev 417946)
+++ PKGBUILD 2021-06-11 00:20:26 UTC (rev 417947)
@@ -1,82 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgbase=jasper
-pkgname=('jasper' 'jasper-doc')
-pkgver=2.0.28
-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=('13a47efc3b3d10e0680e7cf0637a417df0920e1ca8af20f2206303d0a14753688f7e6c6b3383f6db946effca389754e5736e286ed45d5b643b422f5600223eab'
- 'b8d798bf75523c5db263783e42c653dd0cb03deee90be32eddf878bb6893cca02abadd94de6a8c737a5b7fe76f7fb245979f010765e6a95fc520b215e3a2a7f0')
-b2sums=('a04d745b2eca2395ea73e117c58171ab34ad6f2368e5c6c6768ed5fdb656b30c2a1c9f110f981e027f01af0636514d4b16f4be5c0528ed3a072d7fa66321b2d8'
- '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 417946, jasper/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-06-11 00:20:26 UTC (rev 417947)
@@ -0,0 +1,82 @@
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgbase=jasper
+pkgname=('jasper' 'jasper-doc')
+pkgver=2.0.29
+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=('fb1046e1414753976508eee8bf4c433fa87043ac7323913749110d0007f5962054c1e7c743080ed487e1be3153c02ce5e64226eb90640120fa81c741d431f58e'
+ 'b8d798bf75523c5db263783e42c653dd0cb03deee90be32eddf878bb6893cca02abadd94de6a8c737a5b7fe76f7fb245979f010765e6a95fc520b215e3a2a7f0')
+b2sums=('2a593bbce6d1f5e481463150e75f56a6dace1e2d98df1ddfa529a5d45bdcc4727e9f3c20ae63c4a658d549ea6bfa5a4ccd397109f4df8dde9380113832cc8f71'
+ '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-06-11 00:20:14 UTC (rev 417946)
+++ jasper-1.900.1-fix-filename-buffer-overflow.patch 2021-06-11 00:20:26 UTC (rev 417947)
@@ -1,37 +0,0 @@
-Description: Filename buffer overflow fix
- This patch fixes a security hole by a bad buffer size handling.
-Author: Roland Stigge <stigge at 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 417946, 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-06-11 00:20:26 UTC (rev 417947)
@@ -0,0 +1,37 @@
+Description: Filename buffer overflow fix
+ This patch fixes a security hole by a bad buffer size handling.
+Author: Roland Stigge <stigge at 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
More information about the arch-commits
mailing list