From mboxrd@z Thu Jan  1 00:00:00 1970
From: Erik Kapfer <erik.kapfer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 2/2] lzo: Update to version 2.09
Date: Tue, 07 Jul 2015 13:13:36 +0200
Message-ID: <1436267616-13856-2-git-send-email-erik.kapfer@ipfire.org>
In-Reply-To: <1436267616-13856-1-git-send-email-erik.kapfer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============7301580910643783156=="
List-Id: <development.lists.ipfire.org>

--===============7301580910643783156==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Erik Kapfer <erik.kapfer(a)ipfire.org>
---
 config/rootfiles/common/lzo | 17 ++++++++---------
 lfs/lzo                     | 15 ++++++++++-----
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/config/rootfiles/common/lzo b/config/rootfiles/common/lzo
index 6d746bd..4ebc05c 100644
--- a/config/rootfiles/common/lzo
+++ b/config/rootfiles/common/lzo
@@ -12,16 +12,15 @@
 #usr/include/lzo/lzoconf.h
 #usr/include/lzo/lzodefs.h
 #usr/include/lzo/lzoutil.h
-#usr/lib/liblzo2.a
 #usr/lib/liblzo2.la
 usr/lib/liblzo2.so
 usr/lib/liblzo2.so.2
 usr/lib/liblzo2.so.2.0.0
-#usr/share/doc/lzo
-#usr/share/doc/lzo/AUTHORS
-#usr/share/doc/lzo/COPYING
-#usr/share/doc/lzo/LZO.FAQ
-#usr/share/doc/lzo/LZO.TXT
-#usr/share/doc/lzo/LZOAPI.TXT
-#usr/share/doc/lzo/NEWS
-#usr/share/doc/lzo/THANKS
+#usr/share/doc/lzo-2.09
+#usr/share/doc/lzo-2.09/AUTHORS
+#usr/share/doc/lzo-2.09/COPYING
+#usr/share/doc/lzo-2.09/LZO.FAQ
+#usr/share/doc/lzo-2.09/LZO.TXT
+#usr/share/doc/lzo-2.09/LZOAPI.TXT
+#usr/share/doc/lzo-2.09/NEWS
+#usr/share/doc/lzo-2.09/THANKS
diff --git a/lfs/lzo b/lfs/lzo
index 19ad090..2afc89f 100644
--- a/lfs/lzo
+++ b/lfs/lzo
@@ -1,7 +1,7 @@
 ############################################################################=
###
 #                                                                           =
  #
 # IPFire.org - A linux based firewall                                       =
  #
-# Copyright (C) 2007-2014  IPFire Team   <info(a)ipfire.org>                =
    #
+# Copyright (C) 2015 IPFire Team   <info(a)ipfire.org>                      =
    #
 #                                                                           =
  #
 # This program is free software: you can redistribute it and/or modify      =
  #
 # it under the terms of the GNU General Public License as published by      =
  #
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 2.06
+VER        =3D 2.09
=20
 THISAPP    =3D lzo-$(VER)
 DL_FILE    =3D $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 95380bd4081f85ef08c5209f4107e9f8
+$(DL_FILE)_MD5 =3D c7ffc9a103afe2d1bba0b015e7aa887f
=20
 install : $(TARGET)
=20
@@ -70,9 +70,14 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/lzo-2.06-CVE-2014-4607=
.patch
-	cd $(DIR_APP) && ./configure --prefix=3D/usr --enable-shared=20
+	cd $(DIR_APP) && ./configure \
+		--prefix=3D/usr \
+		--enable-shared \
+		--disable-static \
+		--docdir=3D/usr/share/doc/lzo-2.09
+
 	cd $(DIR_APP) && make $(MAKETUNING)
 	cd $(DIR_APP) && make install
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--=20
2.4.4


--===============7301580910643783156==--