From mboxrd@z Thu Jan  1 00:00:00 1970
From: Marcel Lorenz <marcel.lorenz@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] expat: update to 2.2.0
Date: Fri, 02 Sep 2016 11:07:58 +0200
Message-ID: <20160902090758.12490-1-marcel.lorenz@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1774533879032274044=="
List-Id: <development.lists.ipfire.org>

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

Signed-off-by: Marcel Lorenz <marcel.lorenz(a)ipfire.org>
---
 config/rootfiles/common/expat | 13 +++++++------
 lfs/expat                     | 14 +++++++-------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/config/rootfiles/common/expat b/config/rootfiles/common/expat
index aaa8265..81a8ba7 100644
--- 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 99e458d..aa97590 100644
--- 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(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,10 +24,10 @@
=20
 include Config
=20
-VER        =3D 2.1.0
+VER        =3D 2.2.0
=20
 THISAPP    =3D expat-$(VER)
-DL_FILE    =3D $(THISAPP).tar.gz
+DL_FILE    =3D $(THISAPP).tar.bz2
 DL_FROM    =3D $(URL_IPFIRE)
 DIR_APP    =3D $(DIR_SRC)/$(THISAPP)
 TARGET     =3D $(DIR_INFO)/$(THISAPP)
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D dd7dab7a5fea97d2a6a43f511449b7cd
+$(DL_FILE)_MD5 =3D 2f47841c829facb346eb6e3fab5212e2
=20
 install : $(TARGET)
=20
@@ -69,11 +69,11 @@ $(subst %,%_MD5,$(objects)) :
=20
 $(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=3D/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/$(THI=
SAPP)
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)
--=20
2.9.3


--===============1774533879032274044==--