Revision: 6525
http://ipcop.svn.sourceforge.net/ipcop/?rev=6525&view=rev
Author: gespinasse
Date: 2012-04-03 19:48:32 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
Upgrade libpng to 1.5.10
Drop --without-binconfigs as the only difference is to produce a broken
libpng-config link to not installed libpng15-config
Use the new in 1.5.10 SAFE_LIMITS_SUPPORTED
I even try to hack more on the configuration but there is no need as libpgn is
never a security risk for us.
The only libpng user should be rrdtool that only create png images.
httpd only serve files. When an image is displayed from the browser, this is
libpng code from the host running the browser that run, not the lib from the
ipcop machine.
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/libpng
ipcop/trunk/lfs/libpng
ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
ipcop/trunk/updates/2.1.0/information.xml
ipcop/trunk/updates/2.1.0/setup
Modified: ipcop/trunk/config/rootfiles/common/libpng
===================================================================
--- ipcop/trunk/config/rootfiles/common/libpng 2012-04-03 06:54:33 UTC (rev
6524)
+++ ipcop/trunk/config/rootfiles/common/libpng 2012-04-03 19:48:32 UTC (rev
6525)
@@ -1,4 +1,5 @@
#usr/bin/libpng-config
+#usr/bin/libpng15-config
#usr/include/libpng15
#usr/include/libpng15/png.h
#usr/include/libpng15/pngconf.h
@@ -9,7 +10,7 @@
#usr/lib/libpng.so
#usr/lib/libpng15.so
usr/lib/libpng15.so.15
-usr/lib/libpng15.so.15.8.0
+usr/lib/libpng15.so.15.10.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 2012-04-03 06:54:33 UTC (rev 6524)
+++ ipcop/trunk/lfs/libpng 2012-04-03 19:48:32 UTC (rev 6525)
@@ -33,7 +33,7 @@
include Config
PKG_NAME = libpng
-VER = 1.5.8
+VER = 1.5.10
HOST_ARCH = all
OTHER_SRC = yes
@@ -43,6 +43,9 @@
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+# Use safe limit new from 1.5.10
+CPPFLAGS := -DPNG_SAFE_LIMITS_SUPPORTED
+
###############################################################################
# Top-level Rules
###############################################################################
@@ -51,7 +54,7 @@
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0f7ae352beadaff78073733905613041
+$(DL_FILE)_MD5 = 9c2ac3c3a31de2ab867875718f8de18e
install : $(TARGET)
@@ -82,9 +85,7 @@
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr \
- --disable-static \
- --without-binconfigs
+ cd $(DIR_APP) && CPPFLAGS="$(CPPFLAGS)" ./configure --prefix=/usr
--disable-static
cd $(DIR_APP) && make -j $(PARALLELISM)
ifeq "$(RUNNING_TEST)" "yes"
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-04-03 06:54:33 UTC
(rev 6524)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-04-03 19:48:32 UTC
(rev 6525)
@@ -230,6 +230,10 @@
/usr/lib/libgcrypt.so.11
/usr/lib/libgcrypt.so.11.7.0
##
+## libpng-1.5.10
+/usr/lib/libpng15.so.15
+/usr/lib/libpng15.so.15.10.0
+##
## libtool-2.4.2
/usr/lib/libltdl.so.7
/usr/lib/libltdl.so.7.3.0
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-04-03 06:54:33 UTC (rev
6524)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-04-03 19:48:32 UTC (rev
6525)
@@ -10,7 +10,7 @@
e2fsprogs to 1.42.2, gawk to 4.0.1, ethtool to 3.2,
gmp to 5.0.4, grep to 2.11, gnupg to 1.4.12,
iproute2 to 3.3.0, iptables to 1.4.13, hdparm to 9.39, kernel to
3.0.26, krb5 to 1.9.3,
- libgcrypt to 1.5.0, libtool to 2.4.2, lsof to 4.85,
+ libgcrypt to 1.5.0, libpng to 1.5.10, libtool to 2.4.2, lsof to
4.85,
openldap to 2.4.30, openssl to 1.0.0h, openswan to 2.6.38,
pcre to 8.30, pixman to 0.24.4, procps to 3.3.2, psmisc to 22.16,
rsyslog to 5.8.9, shadow to 4.1.5, tzdata to 2012c, util-linux to
2.21, several Perl CPAN modules.
Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup 2012-04-03 06:54:33 UTC (rev 6524)
+++ ipcop/trunk/updates/2.1.0/setup 2012-04-03 19:48:32 UTC (rev 6525)
@@ -119,6 +119,7 @@
/bin/rm -f /usr/lib/libpcre.so.0.0.1
/bin/rm -f /usr/lib/libpixman-1.so.0
/bin/rm -f /usr/lib/libpixman-1.so.0.22.2
+/bin/rm -f /usr/lib/libpng15.so.15.8.0
# Remove devel lib that should not be needed
/bin/rm -f /usr/lib/libpcre.so
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Better than sec? Nothing is better than sec when it comes to
monitoring Big Data applications. Try Boundary one-second
resolution app monitoring today. Free.
http://p.sf.net/sfu/Boundary-dev2dev
_______________________________________________
Ipcop-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
