Merge branch 'master' of github.com:pisilinux/main

2017-02-06 19:03:25 +03:00
parent 1375c5f0fc 82f0030341
commit fb04ad7c69
3 changed files with 48 additions and 13 deletions
@@ -5,25 +5,22 @@
 # See the file http://www.gnu.org/licenses/gpl.txt

 from pisi.actionsapi import shelltools
-from pisi.actionsapi import autotools
+from pisi.actionsapi import cmaketools
 from pisi.actionsapi import pisitools
 from pisi.actionsapi import libtools
 from pisi.actionsapi import get

 def setup():
-    #autotools.autoreconf("-fi")
-
-    #libtools.libtoolize("--force --install")
-
-    autotools.configure("--enable-libjpeg \
-                         --enable-opengl \
-                         --enable-shared \
-                         --disable-static")
+    cmaketools.configure("-DCMAKE_INSTALL_PREFIX=/usr    \
+                          -DCMAKE_INSTALL_LIBDIR=lib     \
+                          -DCMAKE_BUILD_TYPE=Release     \
+                          -DALLOW_IN_SOURCE_BUILD=ON     \
+                          -DCMAKE_SKIP_INSTALL_RPATH=YES")

 def build():
-    autotools.make()
+    cmaketools.make()

 def install():
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    cmaketools.rawInstall("DESTDIR=%s" % get.installDIR())

-    pisitools.dodoc("NEWS", "README", "doc/*")
+    pisitools.dodoc("LICENSE", "README")
@@ -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@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
@@ -15,12 +15,13 @@
        <Description>JasPer is a software-based implementation of the codec specified in the JPEG-2000 Part-1 standard (ISO/IEC 15444-1:2000).</Description>
        <Archive sha1sum="42518b05fd73242f8ee8047d2e35e0275a697a5f" type="targz">http://www.ece.uvic.ca/~frodo/jasper/software/jasper-2.0.10.tar.gz</Archive>
        <BuildDependencies>
+            <Dependency>cmake</Dependency>
            <Dependency>libjpeg-turbo-devel</Dependency>
            <!--<Dependency>mesa-devel</Dependency>-->
            <!--<Dependency>mesa-glu-devel</Dependency>-->
        </BuildDependencies>
        <Patches>
-<!--             <Patch level="1" compressionType="bz2">jasper-1.900.1-fixes-20081208.patch.bz2</Patch> -->
+            <Patch level="1">jasper-1.900.1-fix-filename-buffer-overflow.patch</Patch>
        </Patches>
    </Source>