Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=370dc9da660010e86bd900fa8842386e49206cb7

commit 370dc9da660010e86bd900fa8842386e49206cb7
Author: DeX77 <[email protected]>
Date:   Tue May 5 15:52:29 2015 +0200

lzo-2.09-1-x86_64

* take maintainership
* version bump

diff --git a/source/base/lzo/CVE-2014-4607.patch 
b/source/base/lzo/CVE-2014-4607.patch
deleted file mode 100644
index a0fdd26..0000000
--- a/source/base/lzo/CVE-2014-4607.patch
+++ /dev/null
@@ -1,242 +0,0 @@
-Description: CVE-2014-4607 lzo: lzo1x_decompress_safe() integer overflow
-Origin: 
https://git.centos.org/raw/rpms!lzo.git/24e0bd6a43820ba4b8cdcf361556aa939bad89ff/SOURCES!lzo-2.06-CVE-2014-4607.patch
-Bug-Debian: http://bugs.debian.org/752861
-Bug-RedHat: https://bugzilla.redhat.com/show_bug.cgi?id=1112418
-Bug-SuSE: https://bugzilla.novell.com/show_bug.cgi?id=883947
-Forwarded: not-needed
-Last-Update: 2014-08-02
-Applied-Upstream: 2.07
-
---- a/minilzo/minilzo.c
-+++ b/minilzo/minilzo.c
-@@ -3547,6 +3547,8 @@ DO_COMPRESS      ( const lzo_bytep in ,
- #undef TEST_LBO
- #undef NEED_IP
- #undef NEED_OP
-+#undef TEST_IV
-+#undef TEST_OV
- #undef HAVE_TEST_IP
- #undef HAVE_TEST_OP
- #undef HAVE_NEED_IP
-@@ -3561,6 +3563,7 @@ DO_COMPRESS      ( const lzo_bytep in ,
- #  if (LZO_TEST_OVERRUN_INPUT >= 2)
- #    define NEED_IP(x) \
-             if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x))  goto input_overrun
-+#    define TEST_IV(x)          if ((x) > (lzo_uint)0 - (511)) goto 
input_overrun
- #  endif
- #endif
-
-@@ -3572,6 +3575,7 @@ DO_COMPRESS      ( const lzo_bytep in ,
- #    undef TEST_OP
- #    define NEED_OP(x) \
-             if ((lzo_uint)(op_end - op) < (lzo_uint)(x))  goto output_overrun
-+#    define TEST_OV(x)          if ((x) > (lzo_uint)0 - (511)) goto 
output_overrun
- #  endif
- #endif
-
-@@ -3602,11 +3606,13 @@ DO_COMPRESS      ( const lzo_bytep in ,
- #  define HAVE_NEED_IP 1
- #else
- #  define NEED_IP(x)            ((void) 0)
-+#  define TEST_IV(x)            ((void) 0)
- #endif
- #if defined(NEED_OP)
- #  define HAVE_NEED_OP 1
- #else
- #  define NEED_OP(x)            ((void) 0)
-+#  define TEST_OV(x)            ((void) 0)
- #endif
-
- #if defined(HAVE_TEST_IP) || defined(HAVE_NEED_IP)
-@@ -3687,6 +3693,7 @@ DO_DECOMPRESS  ( const lzo_bytep in , lz
-             {
-                 t += 255;
-                 ip++;
-+                TEST_IV(t);
-                 NEED_IP(1);
-             }
-             t += 15 + *ip++;
-@@ -3835,6 +3842,7 @@ match:
-                     {
-                         t += 255;
-                         ip++;
-+                        TEST_OV(t);
-                         NEED_IP(1);
-                     }
-                     t += 31 + *ip++;
-@@ -3879,6 +3887,7 @@ match:
-                     {
-                         t += 255;
-                         ip++;
-+                        TEST_OV(t);
-                         NEED_IP(1);
-                     }
-                     t += 7 + *ip++;
-@@ -4073,6 +4082,8 @@ lookbehind_overrun:
- #undef TEST_LBO
- #undef NEED_IP
- #undef NEED_OP
-+#undef TEST_IV
-+#undef TEST_OV
- #undef HAVE_TEST_IP
- #undef HAVE_TEST_OP
- #undef HAVE_NEED_IP
-@@ -4087,6 +4098,7 @@ lookbehind_overrun:
- #  if (LZO_TEST_OVERRUN_INPUT >= 2)
- #    define NEED_IP(x) \
-             if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x))  goto input_overrun
-+#    define TEST_IV(x)          if ((x) > (lzo_uint)0 - (511)) goto 
input_overrun
- #  endif
- #endif
-
-@@ -4098,6 +4110,7 @@ lookbehind_overrun:
- #    undef TEST_OP
- #    define NEED_OP(x) \
-             if ((lzo_uint)(op_end - op) < (lzo_uint)(x))  goto output_overrun
-+#    define TEST_OV(x)          if ((x) > (lzo_uint)0 - (511)) goto 
output_overrun
- #  endif
- #endif
-
-@@ -4128,11 +4141,13 @@ lookbehind_overrun:
- #  define HAVE_NEED_IP 1
- #else
- #  define NEED_IP(x)            ((void) 0)
-+#  define TEST_IV(x)            ((void) 0)
- #endif
- #if defined(NEED_OP)
- #  define HAVE_NEED_OP 1
- #else
- #  define NEED_OP(x)            ((void) 0)
-+#  define TEST_OV(x)            ((void) 0)
- #endif
-
- #if defined(HAVE_TEST_IP) || defined(HAVE_NEED_IP)
-@@ -4213,6 +4228,7 @@ DO_DECOMPRESS  ( const lzo_bytep in , lz
-             {
-                 t += 255;
-                 ip++;
-+                TEST_IV(t);
-                 NEED_IP(1);
-             }
-             t += 15 + *ip++;
-@@ -4361,6 +4377,7 @@ match:
-                     {
-                         t += 255;
-                         ip++;
-+                        TEST_OV(t);
-                         NEED_IP(1);
-                     }
-                     t += 31 + *ip++;
-@@ -4405,6 +4422,7 @@ match:
-                     {
-                         t += 255;
-                         ip++;
-+                        TEST_OV(t);
-                         NEED_IP(1);
-                     }
-                     t += 7 + *ip++;
---- a/src/lzo1_d.ch
-+++ b/src/lzo1_d.ch
-@@ -76,6 +76,8 @@
- #undef TEST_LBO
- #undef NEED_IP
- #undef NEED_OP
-+#undef TEST_IV
-+#undef TEST_OV
- #undef HAVE_TEST_IP
- #undef HAVE_TEST_OP
- #undef HAVE_NEED_IP
-@@ -91,6 +93,7 @@
- #  if (LZO_TEST_OVERRUN_INPUT >= 2)
- #    define NEED_IP(x) \
-             if ((lzo_uint)(ip_end - ip) < (lzo_uint)(x))  goto input_overrun
-+#    define TEST_IV(x)          if ((x) > (lzo_uint)0 - (511)) goto 
input_overrun
- #  endif
- #endif
-
-@@ -102,6 +105,7 @@
- #    undef TEST_OP              /* don't need both of the tests here */
- #    define NEED_OP(x) \
-             if ((lzo_uint)(op_end - op) < (lzo_uint)(x))  goto output_overrun
-+#    define TEST_OV(x)          if ((x) > (lzo_uint)0 - (511)) goto 
output_overrun
- #  endif
- #endif
-
-@@ -135,11 +139,13 @@
- #  define HAVE_NEED_IP 1
- #else
- #  define NEED_IP(x)            ((void) 0)
-+#  define TEST_IV(x)            ((void) 0)
- #endif
- #if defined(NEED_OP)
- #  define HAVE_NEED_OP 1
- #else
- #  define NEED_OP(x)            ((void) 0)
-+#  define TEST_OV(x)            ((void) 0)
- #endif
-
-
---- a/src/lzo1b_d.ch
-+++ b/src/lzo1b_d.ch
-@@ -187,6 +187,7 @@ match:
-                 {
-                     t += 255;
-                     ip++;
-+                    TEST_OV(t);
-                     NEED_IP(1);
-                 }
-                 t += (M4_MIN_LEN - M3_MIN_LEN) + *ip++;
---- a/src/lzo1f_d.ch
-+++ b/src/lzo1f_d.ch
-@@ -84,6 +84,7 @@ DO_DECOMPRESS  ( const lzo_bytep in , lz
-             {
-                 t += 255;
-                 ip++;
-+                TEST_IV(t);
-                 NEED_IP(1);
-             }
-             t += 31 + *ip++;
-@@ -138,6 +139,7 @@ match:
-                         {
-                             t += 255;
-                             ip++;
-+                            TEST_OV(t);
-                             NEED_IP(1);
-                         }
-                         t += 31 + *ip++;
---- a/src/lzo1x_d.ch
-+++ b/src/lzo1x_d.ch
-@@ -120,6 +120,7 @@ DO_DECOMPRESS  ( const lzo_bytep in , lz
-             {
-                 t += 255;
-                 ip++;
-+                TEST_IV(t);
-                 NEED_IP(1);
-             }
-             t += 15 + *ip++;
-@@ -273,6 +274,7 @@ match:
-                     {
-                         t += 255;
-                         ip++;
-+                        TEST_OV(t);
-                         NEED_IP(1);
-                     }
-                     t += 31 + *ip++;
-@@ -317,6 +319,7 @@ match:
-                     {
-                         t += 255;
-                         ip++;
-+                        TEST_OV(t);
-                         NEED_IP(1);
-                     }
-                     t += 7 + *ip++;
---- a/src/lzo2a_d.ch
-+++ b/src/lzo2a_d.ch
-@@ -131,6 +131,7 @@ DO_DECOMPRESS    ( const lzo_bytep in ,
-             {
-                 t += 255;
-                 ip++;
-+                TEST_OV(t);
-                 NEED_IP(1);
-             }
-             t += *ip++;
diff --git a/source/base/lzo/FrugalBuild b/source/base/lzo/FrugalBuild
index 74e13cf..e0d3e32 100644
--- a/source/base/lzo/FrugalBuild
+++ b/source/base/lzo/FrugalBuild
@@ -1,23 +1,19 @@
# Compiling Time: 0.25 SBU
-# Maintainer: Christian Hamar alias krix <[email protected]>
+# Contributor: Christian Hamar alias krix <[email protected]>
+# Maintainer: DeX77 <[email protected]>

pkgname=lzo
-pkgver=2.06
-pkgrel=3
+pkgver=2.09
+pkgrel=1
pkgdesc="A real-time data compression library"
-url="http://www.oberhumer.com/opensource/lzo/";
+url="http://www.oberhumer.com/opensource/lzo";
depends=('glibc')
archs=('i686' 'x86_64' 'arm')
makedepends=('zlib')
groups=('base')
-up2date="lynx -dump $url/download |grep 'LZO - full source'|sed -e 
's/.*lzo-\(.*\).tar.gz.*/\1/'"
+up2date="Flasttar $url/download/"
source=($url/download/$pkgname-$pkgver.tar.gz)
Fconfopts+=" --enable-shared"
-sha1sums=('a11768b8a168ec607750842bbef406f11547b904')
-
-# FSA fix ***
-source=(${source[@]} CVE-2014-4607.patch)
-sha1sums=(${sha1sums[@]} '0c80230721bd63f9f9ed792a975905c7febb6531')
-# ***********
+sha1sums=('e2a60aca818836181e7e6f8c4f2c323aca6ac057')

# optimization OK
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to