Revision: 5921
          http://ipcop.svn.sourceforge.net/ipcop/?rev=5921&view=rev
Author:   gespinasse
Date:     2011-10-10 06:37:09 +0000 (Mon, 10 Oct 2011)
Log Message:
-----------
Upgrade libpng to 1.5.5
A divide by 0 error exist in 1.5.4 (we may not use the needed function to 
trigger that issue)

Add libpng test suite

Remove obsolete --without-libpng-compat configure option
Remove the unneeded .la files

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/libpng
    ipcop/trunk/lfs/libpng
    ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1
    ipcop/trunk/updates/2.0.1/information.xml
    ipcop/trunk/updates/2.0.1/setup

Modified: ipcop/trunk/config/rootfiles/common/libpng
===================================================================
--- ipcop/trunk/config/rootfiles/common/libpng  2011-10-09 17:06:03 UTC (rev 
5920)
+++ ipcop/trunk/config/rootfiles/common/libpng  2011-10-10 06:37:09 UTC (rev 
5921)
@@ -1,5 +1,3 @@
-## libpng-1.5.4
-##
 #usr/bin/libpng-config
 #usr/include/libpng15
 #usr/include/libpng15/png.h
@@ -8,12 +6,10 @@
 #usr/include/png.h
 #usr/include/pngconf.h
 #usr/include/pnglibconf.h
-#usr/lib/libpng.la
 usr/lib/libpng.so
-#usr/lib/libpng15.la
 usr/lib/libpng15.so
 usr/lib/libpng15.so.15
-usr/lib/libpng15.so.15.4.0
+usr/lib/libpng15.so.15.5.0
 #usr/lib/pkgconfig/libpng.pc
 #usr/lib/pkgconfig/libpng15.pc
 #usr/share/man/man3/libpng.3

Modified: ipcop/trunk/lfs/libpng
===================================================================
--- ipcop/trunk/lfs/libpng      2011-10-09 17:06:03 UTC (rev 5920)
+++ ipcop/trunk/lfs/libpng      2011-10-10 06:37:09 UTC (rev 5921)
@@ -33,7 +33,7 @@
 include Config
 
 PKG_NAME   = libpng
-VER        = 1.5.4
+VER        = 1.5.5
 HOST_ARCH  = all
 OTHER_SRC  = yes
 
@@ -51,7 +51,7 @@
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = 5f4e7ca1b54f361c5cfe5d520d989f29
+$(DL_FILE)_MD5 = 5ec4e355e789570ce612c75c128056c8
 
 install : $(TARGET)
 
@@ -84,10 +84,15 @@
 
        cd $(DIR_APP) && ./configure    --prefix=/usr \
                                        --disable-static \
-                                       --without-binconfigs \
-                                       --without-libpng-compat
+                                       --without-binconfigs
        cd $(DIR_APP) && make -j $(PARALLELISM)
+
+ifeq "$(RUNNING_TEST)" "yes"
+       cd $(DIR_APP) && make -k check &> 
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+endif
+
        cd $(DIR_APP) && make install
 
+       rm /usr/lib/libpng*.la
        @rm -rf $(DIR_APP)
        @$(POSTBUILD)

Modified: ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1
===================================================================
--- ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1      2011-10-09 17:06:03 UTC 
(rev 5920)
+++ ipcop/trunk/updates/2.0.1/ROOTFILES.i486-2.0.1      2011-10-10 06:37:09 UTC 
(rev 5921)
@@ -105,6 +105,12 @@
 /etc/logwatch/conf/services/iptables.conf
 /etc/logwatch/scripts/services/iptables
 ##
+## libpng-1.5.5
+/usr/lib/libpng.so
+/usr/lib/libpng15.so
+/usr/lib/libpng15.so.15
+/usr/lib/libpng15.so.15.5.0
+##
 ## ntp-4.2.6p4
 /usr/bin/ntpd
 /usr/bin/ntpdate

Modified: ipcop/trunk/updates/2.0.1/information.xml
===================================================================
--- ipcop/trunk/updates/2.0.1/information.xml   2011-10-09 17:06:03 UTC (rev 
5920)
+++ ipcop/trunk/updates/2.0.1/information.xml   2011-10-10 06:37:09 UTC (rev 
5921)
@@ -6,7 +6,7 @@
         <description>Language updates.&lt;br /&gt;
             Add firewall logging to logsummary.&lt;br /&gt;
             Upgrade acpid to 2.0.12, bind to 9.8.1, dnsmasq to 2.58,
-            iptables to 1.4.12.1, iw to 3.1, ntp to 4.2.6p4,
+            iptables to 1.4.12.1, iw to 3.1, libpng to 1.5.5, ntp to 4.2.6p4,
             openssh to 5.9, openssl to 1.0.0e, openswan to 2.6.36,
             pciutils to 3.1.8, pixman to 0.22.2, tzdata to 2011k,
             several Perl CPAN modules.</description>

Modified: ipcop/trunk/updates/2.0.1/setup
===================================================================
--- ipcop/trunk/updates/2.0.1/setup     2011-10-09 17:06:03 UTC (rev 5920)
+++ ipcop/trunk/updates/2.0.1/setup     2011-10-10 06:37:09 UTC (rev 5921)
@@ -73,6 +73,7 @@
 /bin/rm -f /usr/lib/libssl.so.0.9.8
 /bin/rm -f /usr/lib/libpci.so.3.1.8
 /bin/rm -f /usr/lib/libpixman-1.so.0.20.2
+/bin/rm -f /usr/lib/libpng15.so.15.4.0
 
 # being only prove of concept code, should not have been installed by default
 /bin/rm -f /usr/libexec/ipsec/showpolicy

This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.


------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn

Reply via email to