Revision: 6958
http://ipcop.svn.sourceforge.net/ipcop/?rev=6958&view=rev
Author: gespinasse
Date: 2013-03-11 11:42:52 +0000 (Mon, 11 Mar 2013)
Log Message:
-----------
Upgrade libxml2 to 2.9.0
ac_cv_path_RM='rm -f' will be unneeded after 2.9.0
Disable zlib and thread features, that is not used in our case.
Probably I could disable more optional features. I may try in the futur.
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
Removed Paths:
-------------
ipcop/trunk/src/patches/libxml2-2.8.0_entities-local-buffers-size-problems.patch
ipcop/trunk/src/patches/libxml2-2.8.0_parser-local-buffers-size-problems.patch
Modified: ipcop/trunk/config/rootfiles/common/libxml2
===================================================================
--- ipcop/trunk/config/rootfiles/common/libxml2 2013-03-07 05:35:58 UTC (rev
6957)
+++ ipcop/trunk/config/rootfiles/common/libxml2 2013-03-11 11:42:52 UTC (rev
6958)
@@ -53,18 +53,18 @@
#usr/lib/libxml2.la
#usr/lib/libxml2.so
usr/lib/libxml2.so.2
-usr/lib/libxml2.so.2.8.0
+usr/lib/libxml2.so.2.9.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.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-2.9.0
+#usr/share/doc/libxml2-2.9.0/Copyright
+#usr/share/doc/libxml2-2.9.0/examples
+#usr/share/doc/libxml2-2.9.0/examples/testHTML.c
+#usr/share/doc/libxml2-2.9.0/examples/testSAX.c
+#usr/share/doc/libxml2-2.9.0/examples/testXPath.c
+#usr/share/doc/libxml2-2.9.0/examples/xmllint.c
#usr/share/doc/libxml2/html
#usr/share/doc/libxml2/html/DOM.gif
#usr/share/doc/libxml2/html/FAQ.html
@@ -126,9 +126,9 @@
#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/index.html
#usr/share/doc/libxml2/html/io1.c
#usr/share/doc/libxml2/html/io1.res
#usr/share/doc/libxml2/html/io2.c
Modified: ipcop/trunk/lfs/libxml2
===================================================================
--- ipcop/trunk/lfs/libxml2 2013-03-07 05:35:58 UTC (rev 6957)
+++ ipcop/trunk/lfs/libxml2 2013-03-11 11:42:52 UTC (rev 6958)
@@ -33,7 +33,7 @@
include Config
PKG_NAME := libxml2
-VER := 2.8.0
+VER := 2.9.0
HOST_ARCH := all
OTHER_SRC := yes
@@ -55,7 +55,7 @@
$(DL_FILE) := $(DL_FROM)/$(DL_FILE)
$(XMLTEST) := http://www.w3.org/XML/Test/$(XMLTEST)
-$(DL_FILE)_MD5 := c62106f02ee00b6437f0fb9d370c1093
+$(DL_FILE)_MD5 := 5b9bebf4f5d2200ae2c4efe8fa6103f7
$(XMLTEST)_MD5 := ae3d1ebe000a3972afa104ca7f0e1b4a
install : $(TARGET)
@@ -86,20 +86,17 @@
$(TARGET) : $(firstword $(MAKEFILE_LIST)) $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- # CVE-2012-2807 2 patches debian borrowed
- cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_parser-local-buffers-size-problems.patch
- cd $(DIR_APP) && patch -p1 -i
$(DIR_PATCHES)/$(THISAPP)_entities-local-buffers-size-problems.patch
- # 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 because we don't need python support
+ # --without-zlib because no prog use that feature
+ # --without-threads because this is not needed, (and it remove a lot of
warnings) rrdtool test only for xmlParseFile feature
# 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' \
+ # remove the ac_cv_path_RM workaround after 2.9.0
+ cd $(DIR_APP) && ac_cv_path_RM='rm -f' \
./configure \
--prefix=/usr \
--disable-static \
@@ -108,8 +105,10 @@
--without-ftp \
--without-http \
--without-legacy \
+ --without-python \
--without-regexps \
- --without-python
+ --without-threads \
+ --without-zlib
cd $(DIR_APP) && make -j $(PARALLELISM)
Deleted:
ipcop/trunk/src/patches/libxml2-2.8.0_entities-local-buffers-size-problems.patch
===================================================================
---
ipcop/trunk/src/patches/libxml2-2.8.0_entities-local-buffers-size-problems.patch
2013-03-07 05:35:58 UTC (rev 6957)
+++
ipcop/trunk/src/patches/libxml2-2.8.0_entities-local-buffers-size-problems.patch
2013-03-11 11:42:52 UTC (rev 6958)
@@ -1,98 +0,0 @@
-From: Daniel Veillard <veill...@redhat.com>
-Date: Wed, 18 Jul 2012 11:38:17 +0800
-Subject: Fix entities local buffers size problems
-
----
- entities.c | 36 +++++++++++++++++++++++-------------
- 1 file changed, 23 insertions(+), 13 deletions(-)
-
-diff --git a/entities.c b/entities.c
-index 6aef49f..a02738d 100644
---- a/entities.c
-+++ b/entities.c
-@@ -528,13 +528,13 @@ xmlGetDocEntity(xmlDocPtr doc, const xmlChar *name) {
- * Macro used to grow the current buffer.
- */
- #define growBufferReentrant() {
\
-- buffer_size *= 2; \
-- buffer = (xmlChar *) \
-- xmlRealloc(buffer, buffer_size * sizeof(xmlChar)); \
-- if (buffer == NULL) { \
-- xmlEntitiesErrMemory("xmlEncodeEntitiesReentrant: realloc failed");\
-- return(NULL); \
-- } \
-+ xmlChar *tmp; \
-+ size_t new_size = buffer_size * 2; \
-+ if (new_size < buffer_size) goto mem_error; \
-+ tmp = (xmlChar *) xmlRealloc(buffer, new_size); \
-+ if (tmp == NULL) goto mem_error; \
-+ buffer = tmp; \
-+ buffer_size = new_size; \
- }
-
-
-@@ -555,7 +555,7 @@ xmlEncodeEntitiesReentrant(xmlDocPtr doc, const xmlChar
*input) {
- const xmlChar *cur = input;
- xmlChar *buffer = NULL;
- xmlChar *out = NULL;
-- int buffer_size = 0;
-+ size_t buffer_size = 0;
- int html = 0;
-
- if (input == NULL) return(NULL);
-@@ -574,8 +574,8 @@ xmlEncodeEntitiesReentrant(xmlDocPtr doc, const xmlChar
*input) {
- out = buffer;
-
- while (*cur != '\0') {
-- if (out - buffer > buffer_size - 100) {
-- int indx = out - buffer;
-+ size_t indx = out - buffer;
-+ if (indx + 100 > buffer_size) {
-
- growBufferReentrant();
- out = &buffer[indx];
-@@ -692,6 +692,11 @@ xmlEncodeEntitiesReentrant(xmlDocPtr doc, const xmlChar
*input) {
- }
- *out = 0;
- return(buffer);
-+
-+mem_error:
-+ xmlEntitiesErrMemory("xmlEncodeEntitiesReentrant: realloc failed");
-+ xmlFree(buffer);
-+ return(NULL);
- }
-
- /**
-@@ -709,7 +714,7 @@ xmlEncodeSpecialChars(xmlDocPtr doc ATTRIBUTE_UNUSED,
const xmlChar *input) {
- const xmlChar *cur = input;
- xmlChar *buffer = NULL;
- xmlChar *out = NULL;
-- int buffer_size = 0;
-+ size_t buffer_size = 0;
- if (input == NULL) return(NULL);
-
- /*
-@@ -724,8 +729,8 @@ xmlEncodeSpecialChars(xmlDocPtr doc ATTRIBUTE_UNUSED,
const xmlChar *input) {
- out = buffer;
-
- while (*cur != '\0') {
-- if (out - buffer > buffer_size - 10) {
-- int indx = out - buffer;
-+ size_t indx = out - buffer;
-+ if (indx + 10 > buffer_size) {
-
- growBufferReentrant();
- out = &buffer[indx];
-@@ -774,6 +779,11 @@ xmlEncodeSpecialChars(xmlDocPtr doc ATTRIBUTE_UNUSED,
const xmlChar *input) {
- }
- *out = 0;
- return(buffer);
-+
-+mem_error:
-+ xmlEntitiesErrMemory("xmlEncodeSpecialChars: realloc failed");
-+ xmlFree(buffer);
-+ return(NULL);
- }
-
- /**
---
Deleted:
ipcop/trunk/src/patches/libxml2-2.8.0_parser-local-buffers-size-problems.patch
===================================================================
---
ipcop/trunk/src/patches/libxml2-2.8.0_parser-local-buffers-size-problems.patch
2013-03-07 05:35:58 UTC (rev 6957)
+++
ipcop/trunk/src/patches/libxml2-2.8.0_parser-local-buffers-size-problems.patch
2013-03-11 11:42:52 UTC (rev 6958)
@@ -1,261 +0,0 @@
-From: Daniel Veillard <veill...@redhat.com>
-Date: Tue, 17 Jul 2012 16:19:17 +0800
-Subject: Fix parser local buffers size problems
-
----
- parser.c | 74 ++++++++++++++++++++++++++++++++++++--------------------------
- 1 file changed, 43 insertions(+), 31 deletions(-)
-
-diff --git a/parser.c b/parser.c
-index 2c38fae..9863275 100644
---- a/parser.c
-+++ b/parser.c
-@@ -40,6 +40,7 @@
- #endif
-
- #include <stdlib.h>
-+#include <limits.h>
- #include <string.h>
- #include <stdarg.h>
- #include <libxml/xmlmemory.h>
-@@ -117,10 +118,10 @@ xmlCreateEntityParserCtxtInternal(const xmlChar *URL,
const xmlChar *ID,
- * parser option.
- */
- static int
--xmlParserEntityCheck(xmlParserCtxtPtr ctxt, unsigned long size,
-+xmlParserEntityCheck(xmlParserCtxtPtr ctxt, size_t size,
- xmlEntityPtr ent)
- {
-- unsigned long consumed = 0;
-+ size_t consumed = 0;
-
- if ((ctxt == NULL) || (ctxt->options & XML_PARSE_HUGE))
- return (0);
-@@ -2589,15 +2590,17 @@ xmlParserHandlePEReference(xmlParserCtxtPtr ctxt) {
-
- /*
- * Macro used to grow the current buffer.
-+ * buffer##_size is expected to be a size_t
-+ * mem_error: is expected to handle memory allocation failures
- */
- #define growBuffer(buffer, n) {
\
- xmlChar *tmp; \
-- buffer##_size *= 2;
\
-- buffer##_size += n;
\
-- tmp = (xmlChar *) \
-- xmlRealloc(buffer, buffer##_size * sizeof(xmlChar)); \
-+ size_t new_size = buffer##_size * 2 + n; \
-+ if (new_size < buffer##_size) goto mem_error; \
-+ tmp = (xmlChar *) xmlRealloc(buffer, new_size); \
- if (tmp == NULL) goto mem_error; \
- buffer = tmp; \
-+ buffer##_size = new_size; \
- }
-
- /**
-@@ -2623,14 +2626,14 @@ xmlChar *
- xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const xmlChar *str, int len,
- int what, xmlChar end, xmlChar end2, xmlChar end3) {
- xmlChar *buffer = NULL;
-- int buffer_size = 0;
-+ size_t buffer_size = 0;
-+ size_t nbchars = 0;
-
- xmlChar *current = NULL;
- xmlChar *rep = NULL;
- const xmlChar *last;
- xmlEntityPtr ent;
- int c,l;
-- int nbchars = 0;
-
- if ((ctxt == NULL) || (str == NULL) || (len < 0))
- return(NULL);
-@@ -2647,7 +2650,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const
xmlChar *str, int len,
- * allocate a translation buffer.
- */
- buffer_size = XML_PARSER_BIG_BUFFER_SIZE;
-- buffer = (xmlChar *) xmlMallocAtomic(buffer_size * sizeof(xmlChar));
-+ buffer = (xmlChar *) xmlMallocAtomic(buffer_size);
- if (buffer == NULL) goto mem_error;
-
- /*
-@@ -2667,7 +2670,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const
xmlChar *str, int len,
- if (val != 0) {
- COPY_BUF(0,buffer,nbchars,val);
- }
-- if (nbchars > buffer_size - XML_PARSER_BUFFER_SIZE) {
-+ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
- growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
- }
- } else if ((c == '&') && (what & XML_SUBSTITUTE_REF)) {
-@@ -2685,7 +2688,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const
xmlChar *str, int len,
- (ent->etype == XML_INTERNAL_PREDEFINED_ENTITY)) {
- if (ent->content != NULL) {
- COPY_BUF(0,buffer,nbchars,ent->content[0]);
-- if (nbchars > buffer_size - XML_PARSER_BUFFER_SIZE) {
-+ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
- growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
- }
- } else {
-@@ -2702,8 +2705,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const
xmlChar *str, int len,
- current = rep;
- while (*current != 0) { /* non input consuming loop */
- buffer[nbchars++] = *current++;
-- if (nbchars >
-- buffer_size - XML_PARSER_BUFFER_SIZE) {
-+ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
- if (xmlParserEntityCheck(ctxt, nbchars, ent))
- goto int_error;
- growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
-@@ -2717,7 +2719,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const
xmlChar *str, int len,
- const xmlChar *cur = ent->name;
-
- buffer[nbchars++] = '&';
-- if (nbchars > buffer_size - i - XML_PARSER_BUFFER_SIZE) {
-+ if (nbchars + i + XML_PARSER_BUFFER_SIZE > buffer_size) {
- growBuffer(buffer, i + XML_PARSER_BUFFER_SIZE);
- }
- for (;i > 0;i--)
-@@ -2745,8 +2747,7 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const
xmlChar *str, int len,
- current = rep;
- while (*current != 0) { /* non input consuming loop */
- buffer[nbchars++] = *current++;
-- if (nbchars >
-- buffer_size - XML_PARSER_BUFFER_SIZE) {
-+ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
- if (xmlParserEntityCheck(ctxt, nbchars, ent))
- goto int_error;
- growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
-@@ -2759,8 +2760,8 @@ xmlStringLenDecodeEntities(xmlParserCtxtPtr ctxt, const
xmlChar *str, int len,
- } else {
- COPY_BUF(l,buffer,nbchars,c);
- str += l;
-- if (nbchars > buffer_size - XML_PARSER_BUFFER_SIZE) {
-- growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
-+ if (nbchars + XML_PARSER_BUFFER_SIZE > buffer_size) {
-+ growBuffer(buffer, XML_PARSER_BUFFER_SIZE);
- }
- }
- if (str < last)
-@@ -3764,8 +3765,8 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int
*attlen, int normalize) {
- xmlChar limit = 0;
- xmlChar *buf = NULL;
- xmlChar *rep = NULL;
-- int len = 0;
-- int buf_size = 0;
-+ size_t len = 0;
-+ size_t buf_size = 0;
- int c, l, in_space = 0;
- xmlChar *current = NULL;
- xmlEntityPtr ent;
-@@ -3787,7 +3788,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int
*attlen, int normalize) {
- * allocate a translation buffer.
- */
- buf_size = XML_PARSER_BUFFER_SIZE;
-- buf = (xmlChar *) xmlMallocAtomic(buf_size * sizeof(xmlChar));
-+ buf = (xmlChar *) xmlMallocAtomic(buf_size);
- if (buf == NULL) goto mem_error;
-
- /*
-@@ -3804,7 +3805,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int
*attlen, int normalize) {
-
- if (val == '&') {
- if (ctxt->replaceEntities) {
-- if (len > buf_size - 10) {
-+ if (len + 10 > buf_size) {
- growBuffer(buf, 10);
- }
- buf[len++] = '&';
-@@ -3813,7 +3814,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int
*attlen, int normalize) {
- * The reparsing will be done in xmlStringGetNodeList()
- * called by the attribute() function in SAX.c
- */
-- if (len > buf_size - 10) {
-+ if (len + 10 > buf_size) {
- growBuffer(buf, 10);
- }
- buf[len++] = '&';
-@@ -3823,7 +3824,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int
*attlen, int normalize) {
- buf[len++] = ';';
- }
- } else if (val != 0) {
-- if (len > buf_size - 10) {
-+ if (len + 10 > buf_size) {
- growBuffer(buf, 10);
- }
- len += xmlCopyChar(0, &buf[len], val);
-@@ -3835,7 +3836,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int
*attlen, int normalize) {
- ctxt->nbentities += ent->owner;
- if ((ent != NULL) &&
- (ent->etype == XML_INTERNAL_PREDEFINED_ENTITY)) {
-- if (len > buf_size - 10) {
-+ if (len + 10 > buf_size) {
- growBuffer(buf, 10);
- }
- if ((ctxt->replaceEntities == 0) &&
-@@ -3863,7 +3864,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int
*attlen, int normalize) {
- current++;
- } else
- buf[len++] = *current++;
-- if (len > buf_size - 10) {
-+ if (len + 10 > buf_size) {
- growBuffer(buf, 10);
- }
- }
-@@ -3871,7 +3872,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int
*attlen, int normalize) {
- rep = NULL;
- }
- } else {
-- if (len > buf_size - 10) {
-+ if (len + 10 > buf_size) {
- growBuffer(buf, 10);
- }
- if (ent->content != NULL)
-@@ -3899,7 +3900,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int
*attlen, int normalize) {
- * Just output the reference
- */
- buf[len++] = '&';
-- while (len > buf_size - i - 10) {
-+ while (len + i + 10 > buf_size) {
- growBuffer(buf, i + 10);
- }
- for (;i > 0;i--)
-@@ -3912,7 +3913,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int
*attlen, int normalize) {
- if ((len != 0) || (!normalize)) {
- if ((!normalize) || (!in_space)) {
- COPY_BUF(l,buf,len,0x20);
-- while (len > buf_size - 10) {
-+ while (len + 10 > buf_size) {
- growBuffer(buf, 10);
- }
- }
-@@ -3921,7 +3922,7 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int
*attlen, int normalize) {
- } else {
- in_space = 0;
- COPY_BUF(l,buf,len,c);
-- if (len > buf_size - 10) {
-+ if (len + 10 > buf_size) {
- growBuffer(buf, 10);
- }
- }
-@@ -3946,7 +3947,18 @@ xmlParseAttValueComplex(xmlParserCtxtPtr ctxt, int
*attlen, int normalize) {
- }
- } else
- NEXT;
-- if (attlen != NULL) *attlen = len;
-+
-+ /*
-+ * There we potentially risk an overflow, don't allow attribute value of
-+ * lenght more than INT_MAX it is a very reasonnable assumption !
-+ */
-+ if (len >= INT_MAX) {
-+ xmlFatalErrMsg(ctxt, XML_ERR_ATTRIBUTE_NOT_FINISHED,
-+ "AttValue lenght too long\n");
-+ goto mem_error;
-+ }
-+
-+ if (attlen != NULL) *attlen = (int) len;
- return(buf);
-
- mem_error:
---
Modified: ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0
===================================================================
--- ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-03-07 05:35:58 UTC
(rev 6957)
+++ ipcop/trunk/updates/2.1.0/ROOTFILES.i486-2.1.0 2013-03-11 11:42:52 UTC
(rev 6958)
@@ -457,9 +457,9 @@
/usr/lib/libusb-1.0.so.0
/usr/lib/libusb-1.0.so.0.1.0
##
-## libxml2-2.8.0
+## libxml2-2.9.0
/usr/lib/libxml2.so.2
-/usr/lib/libxml2.so.2.8.0
+/usr/lib/libxml2.so.2.9.0
##
## logrotate-3.8.1
/usr/sbin/logrotate
Modified: ipcop/trunk/updates/2.1.0/information.xml
===================================================================
--- ipcop/trunk/updates/2.1.0/information.xml 2013-03-07 05:35:58 UTC (rev
6957)
+++ ipcop/trunk/updates/2.1.0/information.xml 2013-03-11 11:42:52 UTC (rev
6958)
@@ -15,7 +15,7 @@
hdparm to 9.39, httpd to 2.2.24, krb5 to 1.10.3,
less to 451, libffi to 3.0.11, libgd to 2.0.36~rc1, libgcrypt to
1.5.0, libnet to 1.1.6,
libnfnetlink to 1.0.1, libnetfiltercontrack to 1.0.2, libnl to
3.2.16, libpcap to 1.3.0, libpng to 1.5.14,
- libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2
to 2.8.0, logrotate to 3.8.1, lsof to 4.87,
+ libusb to 1.0.9, libusb-compat to 0.1.4, libtool to 2.4.2, libxml2
to 2.9.0, logrotate to 3.8.1, lsof to 4.87,
mdadm to 3.2.6, net-tools to 1.60-p20120127084908, openldap to
2.4.33, openssh to 6.1, openssl to 1.0.1e, openswan to 2.6.38,
parted to 3.1, pciutils to 3.1.10, pcre to 8.32, pixman to 0.24.4,
procps to 3.3.6, psmisc to 22.20,
rsyslog to 5.8.13, sed to 4.2.2, shadow to 4.1.5.1, smartmontools
to 6.0, sqlite to 3.7.13
Modified: ipcop/trunk/updates/2.1.0/setup
===================================================================
--- ipcop/trunk/updates/2.1.0/setup 2013-03-07 05:35:58 UTC (rev 6957)
+++ ipcop/trunk/updates/2.1.0/setup 2013-03-11 11:42:52 UTC (rev 6958)
@@ -145,7 +145,7 @@
/bin/rm -f /usr/lib/libpixman-1.so.0.22.2
/bin/rm -f /usr/lib/libpng15.so.15.{8,9,10,11,12}.0
/bin/rm -f /usr/lib/libusb-1.0.so.0.0.0
-/bin/rm -f /usr/lib/libxml2.so.2.7.8
+/bin/rm -f /usr/lib/libxml2.so.2.{7.8,8.0}
# Remove devel lib that should not be needed
/bin/rm -f /usr/lib/libatm.so
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
