expat: update to 2.2.0

Signed-off-by: Marcel Lorenz <marcel.lorenz@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/common/expat b/config/rootfiles/common/expat
index aaa8265cc3b923497e7599dc78757b9919756169..81a8ba7a0ff603b323d3dc9c280a8c0342768e0c 100644 (file)
--- a/config/rootfiles/common/expat
+++ b/config/rootfiles/common/expat
@@ -1,15 +1,16 @@
 #usr/bin/xmlwf
 #usr/include/expat.h
+#usr/include/expat_config.h
 #usr/include/expat_external.h
 #usr/lib/libexpat.a
 #usr/lib/libexpat.la
 usr/lib/libexpat.so
 usr/lib/libexpat.so.1
-usr/lib/libexpat.so.1.6.0
+usr/lib/libexpat.so.1.6.2
 #usr/lib/pkgconfig/expat.pc
-#usr/share/doc/expat-2.1.0
-#usr/share/doc/expat-2.1.0/expat.png
-#usr/share/doc/expat-2.1.0/reference.html
-#usr/share/doc/expat-2.1.0/style.css
-#usr/share/doc/expat-2.1.0/valid-xhtml10.png
+#usr/share/doc/expat-2.2.0
+#usr/share/doc/expat-2.2.0/expat.png
+#usr/share/doc/expat-2.2.0/reference.html
+#usr/share/doc/expat-2.2.0/style.css
+#usr/share/doc/expat-2.2.0/valid-xhtml10.png
 #usr/share/man/man1/xmlwf.1

diff --git a/lfs/expat b/lfs/expat
index 99e458d15e634d9d3077f57a1469576509c6ec67..aa9759094e9cf2c0c005ee0b4618303a4f8a3538 100644 (file)
--- a/lfs/expat
+++ b/lfs/expat
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2014  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2016 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,10 +24,10 @@
 
 include Config
 
-VER        = 2.1.0
+VER        = 2.2.0
 
 THISAPP    = expat-$(VER)
-DL_FILE    = $(THISAPP).tar.gz
+DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = dd7dab7a5fea97d2a6a43f511449b7cd
+$(DL_FILE)_MD5 = 2f47841c829facb346eb6e3fab5212e2
 
 install : $(TARGET)
 
@@ -69,11 +69,11 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
-       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
        cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
-       cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/expat-2.1.0
-       cd $(DIR_APP) && install -v -m644 doc/*.{html,png,css} /usr/share/doc/expat-2.1.0
+       cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/$(THISAPP)
+       cd $(DIR_APP) && install -v -m644 doc/*.{html,png,css} /usr/share/doc/$(THISAPP)
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)