Revision: 6640
http://ipcop.svn.sourceforge.net/ipcop/?rev=6640&view=rev
Author: gespinasse
Date: 2012-06-04 17:55:25 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
Upgrade libxml2 to 2.8.0 as that will be a bit easier to maintain from that
base.
That allow to remove accumulated scurity patches.
I try to use libxml2-tests-2.8.0 but fail to execute this test suite without
errors.
Update the python comment as python is now build before libxml2.
Using make -s to run test suite deliver the log from a few unintersting
Entering/Nothing to be done/Leaving lines
Modified Paths:
--------------
ipcop/trunk/config/rootfiles/common/libxml2
ipcop/trunk/lfs/libxml2
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/libxml2
===================================================================
--- ipcop/trunk/config/rootfiles/common/libxml2 2012-06-03 17:25:53 UTC (rev
6639)
+++ ipcop/trunk/config/rootfiles/common/libxml2 2012-06-04 17:55:25 UTC (rev
6640)
@@ -53,18 +53,18 @@
#usr/lib/libxml2.la
#usr/lib/libxml2.so
usr/lib/libxml2.so.2
-usr/lib/libxml2.so.2.7.8
+usr/lib/libxml2.so.2.8.0
#usr/lib/pkgconfig/libxml-2.0.pc
#usr/lib/xml2Conf.sh
#usr/share/aclocal/libxml.m4
#usr/share/doc/libxml2
-#usr/share/doc/libxml2-2.7.8
-#usr/share/doc/libxml2-2.7.8/Copyright
-#usr/share/doc/libxml2-2.7.8/examples
-#usr/share/doc/libxml2-2.7.8/examples/testHTML.c
-#usr/share/doc/libxml2-2.7.8/examples/testSAX.c
-#usr/share/doc/libxml2-2.7.8/examples/testXPath.c
-#usr/share/doc/libxml2-2.7.8/examples/xmllint.c
+#usr/share/doc/libxml2-2.8.0
+#usr/share/doc/libxml2-2.8.0/Copyright
+#usr/share/doc/libxml2-2.8.0/examples
+#usr/share/doc/libxml2-2.8.0/examples/testHTML.c
+#usr/share/doc/libxml2-2.8.0/examples/testSAX.c
+#usr/share/doc/libxml2-2.8.0/examples/testXPath.c
+#usr/share/doc/libxml2-2.8.0/examples/xmllint.c
#usr/share/doc/libxml2/html
#usr/share/doc/libxml2/html/DOM.gif
#usr/share/doc/libxml2/html/FAQ.html
@@ -126,6 +126,7 @@
#usr/share/doc/libxml2/html/html/libxml-xpath.html
#usr/share/doc/libxml2/html/html/libxml-xpathInternals.html
#usr/share/doc/libxml2/html/html/libxml-xpointer.html
+#usr/share/doc/libxml2/html/html/libxml-xzlib.html
#usr/share/doc/libxml2/html/html/right.png
#usr/share/doc/libxml2/html/html/up.png
#usr/share/doc/libxml2/html/io1.c
Modified: ipcop/trunk/lfs/libxml2
===================================================================
--- ipcop/trunk/lfs/libxml2 2012-06-03 17:25:53 UTC (rev 6639)
+++ ipcop/trunk/lfs/libxml2 2012-06-04 17:55:25 UTC (rev 6640)
@@ -32,71 +32,31 @@
include Config
-PKG_NAME = libxml2
-VER = 2.7.8
-HOST_ARCH = all
-OTHER_SRC = yes
+PKG_NAME := libxml2
+VER := 2.8.0
+HOST_ARCH := all
+OTHER_SRC := yes
-THISAPP = $(PKG_NAME)-$(VER)
-DL_FILE = $(THISAPP).tar.gz
-DL_FROM = http://xmlsoft.org/sources
-DIR_APP = $(DIR_SRC)/$(THISAPP)
-TARGET = $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
+THISAPP := $(PKG_NAME)-$(VER)
+DL_FILE := $(THISAPP).tar.gz
+DL_FROM := http://xmlsoft.org/sources
+DIR_APP := $(DIR_SRC)/$(THISAPP)
+TARGET := $(DIR_INFO)/$(STAGE_ORDER)_$(STAGE)/$(THISAPP)
-GENTOO-PATCHES :=
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/libxml2/files
+XMLTEST := xmlts20080827.tar.gz
-XMLTEST = xmlts20080827.tar.gz
-# Gentoo 2.7.8-r5 borrowed (Debian package does not allow us to run tests)
-# Patches needed for prefix support
-# skipped 2.7.1-catalog_path.patch
-# skipped 2.7.2-winnt.patch
-# Reactivate the shared library versionning script
-# skipped reactivate-script.patch
-# Fix a potential memory access error
-PATCH1 := $(THISAPP)-xpath-memory.patch
-# Fix a potential freeing error in XPath
-PATCH2 := $(THISAPP)-xpath-freeing.patch
-PATCH3 := $(THISAPP)-xpath-freeing2.patch
-# Fix some potential problems on reallocation failures
-PATCH4 :=$(THISAPP)-reallocation-failures.patch
-# IPCop don't build python part
-# skipped disable_static_modules.patch
-# Hardening of XPath evaluation
-PATCH5 := $(THISAPP)-hardening-xpath.patch
-# Fix missing error status in XPath evaluation
-PATCH6 := $(THISAPP)-error-xpath.patch
-# Heap-based overflow in parsing long entity references
-PATCH7 := $(THISAPP)-allocation-error-copying-entities.patch
-# Make hash functions less predictable to prevent DoS
-PATCH8 := $(THISAPP)-hash-randomization.patch
###############################################################################
# Top-level Rules
###############################################################################
-objects = $(DL_FILE) $(XMLTEST) $(PATCH1) $(PATCH2) $(PATCH3) $(PATCH4)
$(PATCH5) $(PATCH6) $(PATCH7) $(PATCH8)
+objects = $(DL_FILE) $(XMLTEST)
$(DL_FILE) := $(DL_FROM)/$(DL_FILE)
$(XMLTEST) := http://www.w3.org/XML/Test/$(XMLTEST)
-$(PATCH1) := $(GENTOO-PATCHES)/$(PATCH1)
-$(PATCH2) := $(GENTOO-PATCHES)/$(PATCH2)
-$(PATCH3) := $(GENTOO-PATCHES)/$(PATCH3)
-$(PATCH4) := $(GENTOO-PATCHES)/$(PATCH4)
-$(PATCH5) := $(GENTOO-PATCHES)/$(PATCH5)
-$(PATCH6) := $(GENTOO-PATCHES)/$(PATCH6)
-$(PATCH7) := $(GENTOO-PATCHES)/$(PATCH7)
-$(PATCH8) := $(GENTOO-PATCHES)/$(PATCH8)
-$(DL_FILE)_MD5 := 8127a65e8c3b08856093099b52599c86
+$(DL_FILE)_MD5 := c62106f02ee00b6437f0fb9d370c1093
$(XMLTEST)_MD5 := ae3d1ebe000a3972afa104ca7f0e1b4a
-$(PATCH1)_MD5 := bec456883fa9c91b0e7d2ad91283eeb1
-$(PATCH2)_MD5 := 8e3374d282fc12c7e40a3c5fb4b62978
-$(PATCH3)_MD5 := d1eff47d3bc99b38a09744345eaf3434
-$(PATCH4)_MD5 := a5bc99ca6c1e25fc72fc58764f0dffa5
-$(PATCH5)_MD5 := 9027cbb76b112629cb5fa84ffcfc44bd
-$(PATCH6)_MD5 := 8bf2bd2422b9aab015fb7a8ca993eef3
-$(PATCH7)_MD5 := de02f584b928d3e25babc5c90aa800be
-$(PATCH8)_MD5 := 1f94463d974058c8f7bca8bf4f9fc608
install : $(TARGET)
@@ -127,47 +87,34 @@
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -p1 -i $(DIR_DL)/$(PATCH1)
- cd $(DIR_APP) && patch -p1 -i $(DIR_DL)/$(PATCH2)
- cd $(DIR_APP) && patch -p1 -i $(DIR_DL)/$(PATCH3)
- cd $(DIR_APP) && patch -p1 -i $(DIR_DL)/$(PATCH4)
- cd $(DIR_APP) && patch -p1 -i $(DIR_DL)/$(PATCH5)
- cd $(DIR_APP) && patch -p1 -i $(DIR_DL)/$(PATCH6)
- cd $(DIR_APP) && patch -p1 -i $(DIR_DL)/$(PATCH7)
- cd $(DIR_APP) && patch -p1 -i $(DIR_DL)/$(PATCH8)
- @cd $(DIR_APP) && rm -f *.orig
-
- # PATCH8 change configure.in. To avoid running autoreconf ( that
trigger many warnings),
- # this is doable here to change configure only
- # To find files where tweaking timestamp is required, run configure &&
make -d /usr/src/libxml2-2.2.8/config.h.in 2>/dev/null | grep 'Must remake'
- cd $(DIR_APP) && touch --reference=Makefile.in configure.in aclocal.m4
config.h.in
- cd $(DIR_APP) && sed -i 's/stat _stat signal/stat _stat signal rand
srand time/' configure
-
- # Fix the warning on install cannot stat `./*.html'
+ # Workaround install warning cannot stat `./*.html'
cd $(DIR_APP) && sed -i 's|$$(srcdir)/\*.html ||'
doc/examples/Makefile.in
# --docdir does nothing on 2.7.8
# --with-minimum is broken on 2.7.8, not on 2.7.7 but hard to know what
to test
# maybe we could reduce more the lib, who know?
# Removing version from --with-html-subdir limit the noise on upgrade
- # --without-python is for when we rebuild libxml2 after a full build
+ # --without-python because we don't need python support
# ac_cv_path_RM='rm -f' prevent "cannot remove" messages, explanation
at http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=523750
- cd $(DIR_APP) && ac_cv_path_RM='rm -f' ./configure --prefix=/usr \
- --disable-static \
- --with-html-subdir=$(PKG_NAME)/html \
- --without-debug \
- --without-ftp \
- --without-http \
- --without-legacy \
- --without-regexps \
- --without-python
+ cd $(DIR_APP) && ac_cv_path_RM='rm -f' \
+ ./configure \
+ --prefix=/usr \
+ --disable-static \
+ --with-html-subdir=$(PKG_NAME)/html \
+ --without-debug \
+ --without-ftp \
+ --without-http \
+ --without-legacy \
+ --without-regexps \
+ --without-python
cd $(DIR_APP) && make -j $(PARALLELISM)
ifeq "$(RUNNING_TEST)" "yes"
+ # libxml2-tests-2.8.0.tar.gz exist but hard to understand how to use
that and not produce errors
+ # (even with xmlts20080827 providing xmlconf/xmlconf.xml for the tests)
cd $(DIR_APP) && tar zxf $(DIR_DL)/$(XMLTEST)
- # python could be used for a bit more tests, we don't need that.
- cd $(DIR_APP) && make -j 1 -k check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
+ cd $(DIR_APP) && make -s -j 1 -k check &>
$(DIR_TEST)/$(THISAPP)-$(STAGE_ORDER).log
rm -f /missing.xml # testapi produce this empty file
endif
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-06-03 17:25:53 UTC
(rev 6639)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2012-06-04 17:55:25 UTC
(rev 6640)
@@ -368,9 +368,9 @@
/usr/lib/libusb-1.0.so.0
/usr/lib/libusb-1.0.so.0.1.0
##
-## libxml2-2.7.8 patched
+## libxml2-2.8.0
/usr/lib/libxml2.so.2
-/usr/lib/libxml2.so.2.7.8
+/usr/lib/libxml2.so.2.8.0
##
## linux-3.0-1 (3.0.31)
/boot/vmlinuz
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2012-06-03 17:25:53 UTC (rev
6639)
+++ ipcop/trunk/updates/2.1.0/information.xml 2012-06-04 17:55:25 UTC (rev
6640)
@@ -3,7 +3,7 @@
<version>2.1.0</version>
<releasedate>2012-04-dd</releasedate>
<size>0</size>
- <description>httpd, libxml2, gettext, setserial, pcmciautils
patched<br />
+ <description>httpd, gettext, setserial, pcmciautils patched<br />
cairo recompiled with -O3<br />
Add URL filter, xz-5.0.3<br />
Language updates.<br />
@@ -13,7 +13,7 @@
gmp to 5.0.5, gnupg to 1.4.12, grep to 2.12,
iproute2 to 3.3.0, iptables to 1.4.14, hdparm to 9.39, kernel to
3.0.32, krb5 to 1.9.3,
libffi to 3.0.10, libgd to 2.0.36~rc1, libgcrypt to 1.5.0,
libnetfiltercontrack to 1.0.1, libpng to 1.5.10,
- libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, lsof to
4.86,
+ libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2
to 2.8.0, lsof to 4.86,
openldap to 2.4.30, openssh to 6.0, openssl to 1.0.1c, openswan to
2.6.38,
pcre to 8.30, pixman to 0.24.4, procps to 3.3.3, psmisc to 22.16,
rsyslog to 5.8.9, shadow to 4.1.5.1, squid-langpack to 20120329,
Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup 2012-06-03 17:25:53 UTC (rev 6639)
+++ ipcop/trunk/updates/2.1.0/setup 2012-06-04 17:55:25 UTC (rev 6640)
@@ -137,6 +137,7 @@
/bin/rm -f /usr/lib/libpixman-1.so.0.22.2
/bin/rm -f /usr/lib/libpng15.so.15.8.0
/bin/rm -f /usr/lib/libusb-1.0.so.0.0.0
+/bin/rm -f /usr/lib/libxml2.so.2.7.8
# Remove devel lib that should not be needed
/bin/rm -f /usr/lib/libcairo.so
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
