lzo: Update to version 2.09

Signed-off-by: Erik Kapfer <erik.kapfer@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/lzo b/config/rootfiles/common/lzo
index 6d746bd10d3ec0e065fe6317b9782b9f93f6cfed..4ebc05cdbc8a4bf6e7e69169407f53915a8a2b4d 100644 (file)
--- 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 19ad0909cc3d4f003ac3a3f6a94f3ab795551a92..2afc89f5d5a3244116874982201661a670b7f1cf 100644 (file)
--- a/lfs/lzo
+++ b/lfs/lzo
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2014  IPFire Team   <info@ipfire.org>                    #
+# Copyright (C) 2015 IPFire Team   <info@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 @@
 
 include Config
 
-VER        = 2.06
+VER        = 2.09
 
 THISAPP    = lzo-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 95380bd4081f85ef08c5209f4107e9f8
+$(DL_FILE)_MD5 = c7ffc9a103afe2d1bba0b015e7aa887f
 
 install : $(TARGET)
 
@@ -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=/usr --enable-shared 
+       cd $(DIR_APP) && ./configure \
+               --prefix=/usr \
+               --enable-shared \
+               --disable-static \
+               --docdir=/usr/share/doc/lzo-2.09
+
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
+
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)