public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
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	[thread overview]
Message-ID: <1436267616-13856-2-git-send-email-erik.kapfer@ipfire.org> (raw)
In-Reply-To: <1436267616-13856-1-git-send-email-erik.kapfer@ipfire.org>

[-- Attachment #1: Type: text/plain, Size: 2832 bytes --]

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 @@
 
 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)
-- 
2.4.4


      reply	other threads:[~2015-07-07 11:13 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-07 11:13 [PATCH 1/2] openvpn: Update to version 2.3.7, added --verify-x509-name directive Erik Kapfer
2015-07-07 11:13 ` Erik Kapfer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1436267616-13856-2-git-send-email-erik.kapfer@ipfire.org \
    --to=erik.kapfer@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox