[meego-commits] 5174: Changes to Trunk/libpng

[Anas Nashif]

Hi,
I have made the following changes to libpng in project Trunk. Please review and accept ASAP.

Thank You,
Anas Nashif

[This message was auto-generated]

---

Request #5174:

  submit:   Trunk:Testing/libpng(r2) -> Trunk/libpng


Message:
    migrate from Testing after handset day1

State:   new          2010-06-30T14:58:25 nashif
Comment: None



changes files:
--------------
--- libpng.changes
+++ libpng.changes
@@ -1,3 +0,0 @@
-* Mon Apr 12 2010 Bin Gao <bin.gao at intel.com> - 1.2.37
-- fix CVE-2010-0205 [libpng] DoS via malformed PNG - decompression bomb
-

old:
----
  CVE-2010-0205.patch

spec files:
-----------
--- libpng.spec
+++ libpng.spec
@@ -1,6 +1,6 @@
 # 
 # Do not Edit! Generated by:
-# spectacle version 0.14
+# spectacle version 0.13~pre
 # 
 # >> macros
 # << macros
@@ -18,11 +18,12 @@
 Patch1:     libpng-pngconf.patch
 Patch2:     libpng-1.2.37-apng.patch
 Patch3:     libpng-header-fix.patch
-Patch4:     CVE-2010-0205.patch
 Requires(post):  /sbin/ldconfig
 Requires(postun):  /sbin/ldconfig
 BuildRequires:  zlib-devel
 
+BuildRoot:  %{_tmppath}/%{name}-%{version}-build
+
 %description
 The libpng package contains a library of functions for creating and
 manipulating PNG (Portable Network Graphics) image format files.  PNG
@@ -50,17 +51,10 @@
 
 %prep
 %setup -q -n %{name}-%{version}
-
-# libpng-multilib.patch
 %patch0 -p1
-# libpng-pngconf.patch
 %patch1 -p1
-# libpng-1.2.37-apng.patch
 %patch2 -p1
-# libpng-header-fix.patch
 %patch3 -p1
-# CVE-2010-0205.patch
-%patch4 -p1
 # >> setup
 # << setup
 
@@ -69,6 +63,7 @@
 # << build pre
 
 %configure --disable-static
+# Call make instruction with smp support
 make %{?jobs:-j%jobs}
 
 # >> build post
@@ -82,6 +77,9 @@
 # >> install post
 # << install post
 
+%clean
+rm -rf %{buildroot}
+
 
 
 %post -p /sbin/ldconfig

other changes:
--------------

++++++ libpng.yaml
--- libpng.yaml
+++ libpng.yaml
@@ -12,7 +12,6 @@
     - libpng-pngconf.patch
     - libpng-1.2.37-apng.patch
     - libpng-header-fix.patch
-    - CVE-2010-0205.patch
 Description: |
     The libpng package contains a library of functions for creating and
     manipulating PNG (Portable Network Graphics) image format files.  PNG

++++++ deleted files:
--- CVE-2010-0205.patch