From: jk7744.park <jk7744.park@samsung.com>
Date: Tue, 8 Sep 2015 12:50:58 +0000 (+0900)
Subject: tizen 2.3.1 release
X-Git-Tag: submit/tizen_2.3.1/20150915.074147^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen_2.3.1;p=external%2Fexpat.git

tizen 2.3.1 release
---

diff --git a/expat.manifest b/expat.manifest
new file mode 100644
index 0000000..f5585fc
--- /dev/null
+++ b/expat.manifest
@@ -0,0 +1,8 @@
+<manifest>
+    <request>
+        <domain name="_" />
+    </request>
+    <assign>
+        <filesystem path="/usr/bin/xmlwf" exec_label="none" />
+    </assign>
+</manifest>
diff --git a/packaging/expat-2.0.1-CVE-2009-3720.diff b/packaging/expat-2.0.1-CVE-2009-3720.diff
new file mode 100644
index 0000000..9f2d336
--- /dev/null
+++ b/packaging/expat-2.0.1-CVE-2009-3720.diff
@@ -0,0 +1,11 @@
+--- lib/xmltok_impl.c	2006-11-26 18:34:46.000000000 +0100
++++ lib/xmltok_impl.c.oden	2009-08-21 23:01:22.000000000 +0200
+@@ -1744,7 +1744,7 @@ PREFIX(updatePosition)(const ENCODING *e
+                        const char *end,
+                        POSITION *pos)
+ {
+-  while (ptr != end) {
++  while (ptr < end) {
+     switch (BYTE_TYPE(enc, ptr)) {
+ #define LEAD_CASE(n) \
+     case BT_LEAD ## n: \
diff --git a/packaging/expat-2.0.1-confcxx.patch b/packaging/expat-2.0.1-confcxx.patch
new file mode 100644
index 0000000..8b924e0
--- /dev/null
+++ b/packaging/expat-2.0.1-confcxx.patch
@@ -0,0 +1,13 @@
+
+Configure for C++ too so the testsuite works.
+
+--- expat-2.0.1/configure.in.confcxx
++++ expat-2.0.1/configure.in
+@@ -62,6 +62,7 @@ AC_SUBST(LIBAGE)
+ 
+ dnl Checks for programs.
+ AC_PROG_CC
++AC_PROG_CXX
+ AC_PROG_INSTALL
+ 
+ if test "$GCC" = yes ; then
diff --git a/packaging/expat.spec b/packaging/expat.spec
index aeb242d..d9236a9 100644
--- a/packaging/expat.spec
+++ b/packaging/expat.spec
@@ -3,7 +3,7 @@ Version:        2.0.1
 Release:        8
 Summary:        An XML parser library
 Group:          System/Libraries
-Source:         http://download.sourceforge.net/expat/expat-%{version}.tar.gz
+Source:         %{name}-%{version}.tar.gz
 Patch0:         expat-2.0.1-CVE-2009-3720.diff
 Patch1:         expat-2.0.1-confcxx.patch
 
@@ -52,6 +52,9 @@ make %{?_smp_mflags}
 
 %install
 
+mkdir -p %{buildroot}/usr/share/license
+cp COPYING %{buildroot}/usr/share/license/%{name}
+
 rm -f examples/*.dsp
 chmod 644 README COPYING Changes doc/* examples/*
 
@@ -73,10 +76,12 @@ rm -rf %{buildroot}
 %postun -p /sbin/ldconfig
 
 %files
+%manifest expat.manifest
 %defattr(-,root,root,-)
 %doc COPYING
 %{_bindir}/*
 /%{_lib}/lib*.so.*
+/usr/share/license/%{name}
 
 %files devel
 %defattr(-,root,root)
diff --git a/packaging/unused b/packaging/unused
deleted file mode 100644
index 5364927..0000000
--- a/packaging/unused
+++ /dev/null
@@ -1 +0,0 @@
-this package is not used in OBS