[arch-commits] Commit in jasper/repos (8 files)
Levente Polyak
anthraxx at archlinux.org
Tue Jan 3 12:31:25 UTC 2017
Date: Tuesday, January 3, 2017 @ 12:31:25
Author: anthraxx
Revision: 285239
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
jasper/repos/extra-i686/PKGBUILD
(from rev 285238, jasper/trunk/PKGBUILD)
jasper/repos/extra-i686/jasper-1.900.1-fix-filename-buffer-overflow.patch
(from rev 285238, jasper/trunk/jasper-1.900.1-fix-filename-buffer-overflow.patch)
jasper/repos/extra-x86_64/PKGBUILD
(from rev 285238, jasper/trunk/PKGBUILD)
jasper/repos/extra-x86_64/jasper-1.900.1-fix-filename-buffer-overflow.patch
(from rev 285238, jasper/trunk/jasper-1.900.1-fix-filename-buffer-overflow.patch)
Deleted:
jasper/repos/extra-i686/PKGBUILD
jasper/repos/extra-i686/jasper-1.900.1-fix-filename-buffer-overflow.patch
jasper/repos/extra-x86_64/PKGBUILD
jasper/repos/extra-x86_64/jasper-1.900.1-fix-filename-buffer-overflow.patch
----------------------------------------------------------------+
/PKGBUILD | 150 ++++++++++
/jasper-1.900.1-fix-filename-buffer-overflow.patch | 74 ++++
extra-i686/PKGBUILD | 44 --
extra-i686/jasper-1.900.1-fix-filename-buffer-overflow.patch | 37 --
extra-x86_64/PKGBUILD | 44 --
extra-x86_64/jasper-1.900.1-fix-filename-buffer-overflow.patch | 37 --
6 files changed, 224 insertions(+), 162 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2017-01-03 12:31:07 UTC (rev 285238)
+++ extra-i686/PKGBUILD 2017-01-03 12:31:25 UTC (rev 285239)
@@ -1,44 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=jasper
-pkgver=1.900.31
-pkgrel=1
-pkgdesc='Software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard'
-url='http://www.ece.uvic.ca/~mdadams/jasper/'
-arch=('i686' 'x86_64')
-license=('custom:JasPer2.0')
-depends=('libjpeg')
-makedepends=('freeglut' 'libxmu' 'glu')
-optdepends=('freeglut: jiv support'
- 'glu: jiv support')
-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=('e0f37106b59e4226a65e562e78e577e889dd8cbad7a04c63ca3e6ea2d0b1fe72e325abc0a701e2557aeb64b2dc999fa52426341264cb82e3e44338fb0cdc0f65'
- 'b8d798bf75523c5db263783e42c653dd0cb03deee90be32eddf878bb6893cca02abadd94de6a8c737a5b7fe76f7fb245979f010765e6a95fc520b215e3a2a7f0')
-
-prepare() {
- cd ${pkgname}-version-${pkgver}
- patch -p1 < "${srcdir}/jasper-1.900.1-fix-filename-buffer-overflow.patch"
- autoreconf -fvi
-}
-
-build() {
- cd ${pkgname}-version-${pkgver}
- ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared
- make
-}
-
-check() {
- cd ${pkgname}-version-${pkgver}
- make -j1 check
-}
-
-package() {
- cd ${pkgname}-version-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-# vim: ts=2 sw=2 et:
Copied: jasper/repos/extra-i686/PKGBUILD (from rev 285238, jasper/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2017-01-03 12:31:25 UTC (rev 285239)
@@ -0,0 +1,75 @@
+# 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.10
+pkgrel=1
+pkgdesc='Software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard'
+url='http://www.ece.uvic.ca/~mdadams/jasper/'
+arch=('i686' 'x86_64')
+license=('custom:JasPer2.0')
+makedepends=('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=('8f96f72b73197088ff28364c7b4db79745a3188aa9be888ad3b211541bb4d1e45f23604b36d0b6c4176a432c2da888d1e31f119279aaab73e09430699e036859'
+ 'b8d798bf75523c5db263783e42c653dd0cb03deee90be32eddf878bb6893cca02abadd94de6a8c737a5b7fe76f7fb245979f010765e6a95fc520b215e3a2a7f0')
+
+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
+ mkdir -p build-shared build-static
+}
+
+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
+ )
+ msg2 "Building static lib..."
+ (cd build-static
+ cmake ${options[@]} -DJAS_ENABLE_SHARED=OFF ..
+ make
+ )
+ msg2 "Building shared lib..."
+ (cd build-shared
+ cmake ${options[@]} -DJAS_ENABLE_SHARED=ON ..
+ make
+ )
+}
+
+check() {
+ cd ${pkgbase}-version-${pkgver}/build-static
+ make -j1 test
+}
+
+package_jasper() {
+ depends=('libjpeg')
+ optdepends=('jasper-doc: documentation'
+ 'freeglut: jiv support'
+ 'glu: jiv support')
+ cd ${pkgbase}-version-${pkgver}
+ make -C build-static DESTDIR="${pkgdir}" install
+ make -C build-shared DESTDIR="${pkgdir}" install
+ install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ 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 "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ rm -rf "${pkgdir}/usr/"{bin,include,lib,share/man}
+}
+
+# vim: ts=2 sw=2 et:
Deleted: extra-i686/jasper-1.900.1-fix-filename-buffer-overflow.patch
===================================================================
--- extra-i686/jasper-1.900.1-fix-filename-buffer-overflow.patch 2017-01-03 12:31:07 UTC (rev 285238)
+++ extra-i686/jasper-1.900.1-fix-filename-buffer-overflow.patch 2017-01-03 12:31:25 UTC (rev 285239)
@@ -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-i686/jasper-1.900.1-fix-filename-buffer-overflow.patch (from rev 285238, jasper/trunk/jasper-1.900.1-fix-filename-buffer-overflow.patch)
===================================================================
--- extra-i686/jasper-1.900.1-fix-filename-buffer-overflow.patch (rev 0)
+++ extra-i686/jasper-1.900.1-fix-filename-buffer-overflow.patch 2017-01-03 12:31:25 UTC (rev 285239)
@@ -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
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2017-01-03 12:31:07 UTC (rev 285238)
+++ extra-x86_64/PKGBUILD 2017-01-03 12:31:25 UTC (rev 285239)
@@ -1,44 +0,0 @@
-# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=jasper
-pkgver=1.900.31
-pkgrel=1
-pkgdesc='Software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard'
-url='http://www.ece.uvic.ca/~mdadams/jasper/'
-arch=('i686' 'x86_64')
-license=('custom:JasPer2.0')
-depends=('libjpeg')
-makedepends=('freeglut' 'libxmu' 'glu')
-optdepends=('freeglut: jiv support'
- 'glu: jiv support')
-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=('e0f37106b59e4226a65e562e78e577e889dd8cbad7a04c63ca3e6ea2d0b1fe72e325abc0a701e2557aeb64b2dc999fa52426341264cb82e3e44338fb0cdc0f65'
- 'b8d798bf75523c5db263783e42c653dd0cb03deee90be32eddf878bb6893cca02abadd94de6a8c737a5b7fe76f7fb245979f010765e6a95fc520b215e3a2a7f0')
-
-prepare() {
- cd ${pkgname}-version-${pkgver}
- patch -p1 < "${srcdir}/jasper-1.900.1-fix-filename-buffer-overflow.patch"
- autoreconf -fvi
-}
-
-build() {
- cd ${pkgname}-version-${pkgver}
- ./configure --prefix=/usr --mandir=/usr/share/man --enable-shared
- make
-}
-
-check() {
- cd ${pkgname}-version-${pkgver}
- make -j1 check
-}
-
-package() {
- cd ${pkgname}-version-${pkgver}
- make DESTDIR="${pkgdir}" install
- install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
-
-# vim: ts=2 sw=2 et:
Copied: jasper/repos/extra-x86_64/PKGBUILD (from rev 285238, jasper/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2017-01-03 12:31:25 UTC (rev 285239)
@@ -0,0 +1,75 @@
+# 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.10
+pkgrel=1
+pkgdesc='Software-based implementation of the codec specified in the emerging JPEG-2000 Part-1 standard'
+url='http://www.ece.uvic.ca/~mdadams/jasper/'
+arch=('i686' 'x86_64')
+license=('custom:JasPer2.0')
+makedepends=('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=('8f96f72b73197088ff28364c7b4db79745a3188aa9be888ad3b211541bb4d1e45f23604b36d0b6c4176a432c2da888d1e31f119279aaab73e09430699e036859'
+ 'b8d798bf75523c5db263783e42c653dd0cb03deee90be32eddf878bb6893cca02abadd94de6a8c737a5b7fe76f7fb245979f010765e6a95fc520b215e3a2a7f0')
+
+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
+ mkdir -p build-shared build-static
+}
+
+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
+ )
+ msg2 "Building static lib..."
+ (cd build-static
+ cmake ${options[@]} -DJAS_ENABLE_SHARED=OFF ..
+ make
+ )
+ msg2 "Building shared lib..."
+ (cd build-shared
+ cmake ${options[@]} -DJAS_ENABLE_SHARED=ON ..
+ make
+ )
+}
+
+check() {
+ cd ${pkgbase}-version-${pkgver}/build-static
+ make -j1 test
+}
+
+package_jasper() {
+ depends=('libjpeg')
+ optdepends=('jasper-doc: documentation'
+ 'freeglut: jiv support'
+ 'glu: jiv support')
+ cd ${pkgbase}-version-${pkgver}
+ make -C build-static DESTDIR="${pkgdir}" install
+ make -C build-shared DESTDIR="${pkgdir}" install
+ install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ 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 "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+ rm -rf "${pkgdir}/usr/"{bin,include,lib,share/man}
+}
+
+# vim: ts=2 sw=2 et:
Deleted: extra-x86_64/jasper-1.900.1-fix-filename-buffer-overflow.patch
===================================================================
--- extra-x86_64/jasper-1.900.1-fix-filename-buffer-overflow.patch 2017-01-03 12:31:07 UTC (rev 285238)
+++ extra-x86_64/jasper-1.900.1-fix-filename-buffer-overflow.patch 2017-01-03 12:31:25 UTC (rev 285239)
@@ -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 285238, jasper/trunk/jasper-1.900.1-fix-filename-buffer-overflow.patch)
===================================================================
--- extra-x86_64/jasper-1.900.1-fix-filename-buffer-overflow.patch (rev 0)
+++ extra-x86_64/jasper-1.900.1-fix-filename-buffer-overflow.patch 2017-01-03 12:31:25 UTC (rev 285239)
@@ -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