OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 09-Jul-2003 17:13:02
Branch: HEAD Handle: 2003070916130002
Added files:
openpkg-src/libxml libxml.patch
Modified files:
openpkg-src/libxml libxml.spec
openpkg-web news.txt
Log:
better ipv6 socket interface compatibility
Summary:
Revision Changes Path
1.3 +56 -0 openpkg-src/libxml/libxml.patch
1.63 +3 -1 openpkg-src/libxml/libxml.spec
1.5483 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/libxml/libxml.patch
============================================================================
$ cvs diff -u -r0 -r1.3 libxml.patch
--- /dev/null 2003-07-09 17:13:02.000000000 +0200
+++ libxml.patch 2003-07-09 17:13:02.000000000 +0200
@@ -0,0 +1,56 @@
+--- 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 @@
+
+ memset (&dataAddr, 0, sizeof(dataAddr));
+ #ifdef SUPPORT_IP6
+- if ((ctxt->ftpAddr).ss_family == AF_INET6) {
++ if (((struct sockaddr *)&ctxt->ftpAddr)->sa_family == AF_INET6) {
+ 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 @@
+
+ if (ctxt->passive) {
+ #ifdef SUPPORT_IP6
+- if ((ctxt->ftpAddr).ss_family == AF_INET6)
++ if (((struct sockaddr *)&ctxt->ftpAddr)->sa_family == AF_INET6)
+ snprintf (buf, sizeof(buf), "EPSV\r\n");
+ else
+ #endif
+@@ -1530,7 +1530,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,
+ "Invalid answer to EPSV\n");
+@@ -1568,7 +1568,7 @@
+ } else {
+ getsockname(ctxt->dataFd, (struct sockaddr *) &dataAddr, &dataAddrLen);
+ #ifdef SUPPORT_IP6
+- if ((ctxt->ftpAddr).ss_family == AF_INET6)
++ if (((struct sockaddr *)&ctxt->ftpAddr)->sa_family == AF_INET6)
+ ((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 @@
+ return (-1);
+ }
+ #ifdef SUPPORT_IP6
+- if ((ctxt->ftpAddr).ss_family == AF_INET6) {
++ if (((struct sockaddr *)&ctxt->ftpAddr)->sa_family == AF_INET6) {
+ char buf6[INET6_ADDRSTRLEN];
+ inet_ntop (AF_INET6, &((struct sockaddr_in6 *)&dataAddr)->sin6_addr,
+ buf6, INET6_ADDRSTRLEN);
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/libxml/libxml.spec
============================================================================
$ cvs diff -u -r1.62 -r1.63 libxml.spec
--- openpkg-src/libxml/libxml.spec 8 Jul 2003 14:40:37 -0000 1.62
+++ openpkg-src/libxml/libxml.spec 9 Jul 2003 15:13:02 -0000 1.63
@@ -33,10 +33,11 @@
Group: SGML
License: LGPL
Version: 2.5.8
-Release: 20030708
+Release: 20030709
# list of sources
Source0: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
+Patch0: libxml.patch
# build information
Prefix: %{l_prefix}
@@ -54,6 +55,7 @@
%prep
%setup -q -n libxml2-%{version}
+ %patch -p0
%build
%{l_shtool} subst \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5482 -r1.5483 news.txt
--- openpkg-web/news.txt 9 Jul 2003 15:11:32 -0000 1.5482
+++ openpkg-web/news.txt 9 Jul 2003 15:13:00 -0000 1.5483
@@ -1,3 +1,4 @@
+09-Jul-2003: Upgraded package: P<libxml-2.5.8-20030709>
09-Jul-2003: Upgraded package: P<aica-0.81-20030709>
09-Jul-2003: Upgraded package: P<gimp-1.2.5-20030709>
09-Jul-2003: Upgraded package: P<teapop-0.3.5-20030709>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
