OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 22-Oct-2003 21:14:50
Branch: HEAD Handle: 2003102220144802
Modified files:
openpkg-re/vcheck vc.libxml
openpkg-src/libxml libxml.patch libxml.spec
openpkg-web news.txt
Log:
upgrading package: libxml 2.5.11 -> 2.6.0
Summary:
Revision Changes Path
1.28 +1 -1 openpkg-re/vcheck/vc.libxml
1.4 +9 -17 openpkg-src/libxml/libxml.patch
1.68 +2 -6 openpkg-src/libxml/libxml.spec
1.7114 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.libxml
============================================================================
$ cvs diff -u -r1.27 -r1.28 vc.libxml
--- openpkg-re/vcheck/vc.libxml 10 Sep 2003 18:09:15 -0000 1.27
+++ openpkg-re/vcheck/vc.libxml 22 Oct 2003 19:14:48 -0000 1.28
@@ -2,7 +2,7 @@
}
prog libxml = {
- version = 2.5.11
+ version = 2.6.0
url = ftp://xmlsoft.org/
regex = libxml2-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libxml/libxml.patch
============================================================================
$ cvs diff -u -r1.3 -r1.4 libxml.patch
--- openpkg-src/libxml/libxml.patch 9 Jul 2003 15:13:02 -0000 1.3
+++ openpkg-src/libxml/libxml.patch 22 Oct 2003 19:14:50 -0000 1.4
@@ -1,6 +1,7 @@
---- nanoftp.c.dist 2003-07-09 16:36:59.000000000 +0200
-+++ nanoftp.c 2003-07-09 16:48:21.000000000 +0200
-@@ -1480,7 +1480,7 @@
+Index: nanoftp.c
+--- nanoftp.c.orig 2003-10-10 17:49:38.000000000 +0200
++++ nanoftp.c 2003-10-22 20:55:34.000000000 +0200
+@@ -1553,7 +1553,7 @@
memset (&dataAddr, 0, sizeof(dataAddr));
#ifdef SUPPORT_IP6
@@ -9,7 +10,7 @@
ctxt->dataFd = socket (AF_INET6, SOCK_STREAM, IPPROTO_TCP);
((struct sockaddr_in6 *)&dataAddr)->sin6_family = AF_INET6;
dataAddrLen = sizeof(struct sockaddr_in6);
-@@ -1500,7 +1500,7 @@
+@@ -1572,7 +1572,7 @@
if (ctxt->passive) {
#ifdef SUPPORT_IP6
@@ -18,16 +19,16 @@
snprintf (buf, sizeof(buf), "EPSV\r\n");
else
#endif
-@@ -1530,7 +1530,7 @@
+@@ -1603,7 +1603,7 @@
cur = &ctxt->controlBuf[ctxt->controlBufAnswer];
while (((*cur < '0') || (*cur > '9')) && *cur != '\0') cur++;
#ifdef SUPPORT_IP6
- if ((ctxt->ftpAddr).ss_family == AF_INET6) {
+ if (((struct sockaddr *)&ctxt->ftpAddr)->sa_family == AF_INET6) {
if (sscanf (cur, "%u", &temp[0]) != 1) {
- xmlGenericError (xmlGenericErrorContext,
+ __xmlIOErr(XML_FROM_FTP, XML_FTP_EPSV_ANSWER,
"Invalid answer to EPSV\n");
-@@ -1568,7 +1568,7 @@
+@@ -1640,7 +1640,7 @@
} else {
getsockname(ctxt->dataFd, (struct sockaddr *) &dataAddr, &dataAddrLen);
#ifdef SUPPORT_IP6
@@ -36,16 +37,7 @@
((struct sockaddr_in6 *)&dataAddr)->sin6_port = 0;
else
#endif
-@@ -1584,7 +1584,7 @@
-
- if (listen(ctxt->dataFd, 1) < 0) {
- #ifdef SUPPORT_IP6
-- if ((ctxt->ftpAddr).ss_family == AF_INET6)
-+ if (((struct sockaddr *)&ctxt->ftpAddr)->sa_family == AF_INET6)
- xmlGenericError (xmlGenericErrorContext,
- "Could not listen on port %d\n",
- ntohs (((struct sockaddr_in6 *)&dataAddr)->sin6_port));
-@@ -1597,7 +1597,7 @@
+@@ -1659,7 +1659,7 @@
return (-1);
}
#ifdef SUPPORT_IP6
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libxml/libxml.spec
============================================================================
$ cvs diff -u -r1.67 -r1.68 libxml.spec
--- openpkg-src/libxml/libxml.spec 10 Sep 2003 18:09:17 -0000 1.67
+++ openpkg-src/libxml/libxml.spec 22 Oct 2003 19:14:50 -0000 1.68
@@ -32,8 +32,8 @@
Distribution: OpenPKG [BASE]
Group: SGML
License: LGPL
-Version: 2.5.11
-Release: 20030910
+Version: 2.6.0
+Release: 20031022
# list of sources
Source0: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
@@ -56,10 +56,6 @@
%prep
%setup -q -n libxml2-%{version}
%patch -p0
- # fix syntax error
- %{l_shtool} subst \
- -e 's;\(test *\$[a-z0-9_]*\)=;\1 = ;g' \
- configure.in configure
%build
%{l_shtool} subst \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7113 -r1.7114 news.txt
--- openpkg-web/news.txt 22 Oct 2003 19:13:51 -0000 1.7113
+++ openpkg-web/news.txt 22 Oct 2003 19:14:48 -0000 1.7114
@@ -1,3 +1,4 @@
+22-Oct-2003: Upgraded package: P<libxml-2.6.0-20031022>
22-Oct-2003: Upgraded package: P<perl-parse-20031022-20031022>
22-Oct-2003: Upgraded package: P<mysql-4.0.16-20031022>
22-Oct-2003: Upgraded package: P<linkchecker-1.9.4-20031022>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
