From 6c2b1e9635c4893593599236c0be36f9a4799f3e Mon Sep 17 00:00:00 2001
From: Huzaifa Sidhpurwala <huzaifas@redhat.com>
Date: Mon, 30 Jun 2014 10:50:36 +0530
Subject: [PATCH] New upstream

- Fix CVE-2014-4607
---
 .gitignore               |  1 +
 lzo-2.08-configure.patch | 24 ++++++++++++++++++++++++
 lzo.spec                 | 10 +++++++---
 sources                  |  2 +-
 4 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 lzo-2.08-configure.patch

diff --git a/.gitignore b/.gitignore
index 5153ac6..cded73e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 lzo-2.03.tar.gz
 /lzo-2.06.tar.gz
+/lzo-2.08.tar.gz
diff --git a/lzo-2.08-configure.patch b/lzo-2.08-configure.patch
new file mode 100644
index 0000000..78f2282
--- /dev/null
+++ b/lzo-2.08-configure.patch
@@ -0,0 +1,24 @@
+diff -Naur lzo-2.08/configure lzo-2.08.configure/configure
+--- lzo-2.08/configure	2014-06-29 15:08:49.000000000 +0530
++++ lzo-2.08.configure/configure	2014-06-30 10:38:08.344604418 +0530
+@@ -13875,7 +13875,7 @@
+ asm_msg_amd64=no
+ asm_msg_i386=no
+ 
+-case "$host_cpu-$ac_cv_sizeof_void_p" in
++case "$target_cpu-$ac_cv_sizeof_void_p" in
+     amd64-8 | x86_64-8) asm_arch="amd64"; asm_dir="asm/amd64/src_gas/elf64"; asm_mode="amd64_src_gas_elf64" ;;
+     i?86-4) asm_arch="i386"; asm_dir="asm/i386/src_gas"; asm_mode="i386_src_gas" ;;
+     *) enable_asm=no ;;
+diff -Naur lzo-2.08/configure.ac lzo-2.08.configure/configure.ac
+--- lzo-2.08/configure.ac	2014-06-29 15:08:49.000000000 +0530
++++ lzo-2.08.configure/configure.ac	2014-06-30 10:38:38.706603340 +0530
+@@ -123,7 +123,7 @@
+ asm_msg_amd64=no
+ asm_msg_i386=no
+ 
+-case "$host_cpu-$ac_cv_sizeof_void_p" in
++case "$target_cpu-$ac_cv_sizeof_void_p" in
+     amd64-8 | x86_64-8) asm_arch="amd64"; asm_dir="asm/amd64/src_gas/elf64"; asm_mode="amd64_src_gas_elf64" ;;
+     i?86-4) asm_arch="i386"; asm_dir="asm/i386/src_gas"; asm_mode="i386_src_gas" ;;
+     *) enable_asm=no ;;
diff --git a/lzo.spec b/lzo.spec
index 4734ac5..06e108d 100644
--- a/lzo.spec
+++ b/lzo.spec
@@ -1,12 +1,12 @@
 Name:           lzo
-Version:        2.06
-Release:        6%{?dist}
+Version:        2.08
+Release:        1%{?dist}
 Summary:        Data compression library with very fast (de)compression
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.oberhumer.com/opensource/lzo/
 Source0:        http://www.oberhumer.com/opensource/lzo/download/%{name}-%{version}.tar.gz
-Patch0:         lzo-2.06-configure.patch
+Patch0:         lzo-2.08-configure.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  zlib-devel
 
@@ -103,6 +103,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jun 30 2014 Huzaifa Sidhpurwala <huzaifas@redhat.com> - 2.08-1
+- New upstream
+- Fix CVE-2014-4607
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.06-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 431bcbc..04ad1a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-95380bd4081f85ef08c5209f4107e9f8  lzo-2.06.tar.gz
+fcec64c26a0f4f4901468f360029678f  lzo-2.08.tar.gz