Signed-off-by: Marcel Lorenz marcel.lorenz@ipfire.org --- config/rootfiles/common/expat | 15 +++++++++------ lfs/expat | 8 ++++---- 2 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/config/rootfiles/common/expat b/config/rootfiles/common/expat index 81a8ba7a0..9de1a0c4b 100644 --- a/config/rootfiles/common/expat +++ b/config/rootfiles/common/expat @@ -6,11 +6,14 @@ #usr/lib/libexpat.la usr/lib/libexpat.so usr/lib/libexpat.so.1 -usr/lib/libexpat.so.1.6.2 +usr/lib/libexpat.so.1.6.7 #usr/lib/pkgconfig/expat.pc -#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/doc/expat +#usr/share/doc/expat-2.2.5 +#usr/share/doc/expat-2.2.5/expat.png +#usr/share/doc/expat-2.2.5/reference.html +#usr/share/doc/expat-2.2.5/style.css +#usr/share/doc/expat-2.2.5/valid-xhtml10.png +#usr/share/doc/expat/AUTHORS +#usr/share/doc/expat/changelog #usr/share/man/man1/xmlwf.1 diff --git a/lfs/expat b/lfs/expat index aa9759094..57ecd12f4 100644 --- a/lfs/expat +++ b/lfs/expat @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2016 IPFire Team info@ipfire.org # +# Copyright (C) 2007-2017 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.2.0 +VER = 2.2.5
THISAPP = expat-$(VER) DL_FILE = $(THISAPP).tar.bz2 @@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2f47841c829facb346eb6e3fab5212e2 +$(DL_FILE)_MD5 = 789e297f547980fc9ecc036f9a070d49
install : $(TARGET)
@@ -70,7 +70,7 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && ./configure --prefix=/usr --disable-nls + cd $(DIR_APP) && ./configure --prefix=/usr cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install cd $(DIR_APP) && install -v -m755 -d /usr/share/doc/$(THISAPP)