diff options
author | Will Andrews <will@FreeBSD.org> | 2003-04-11 14:39:16 +0000 |
---|---|---|
committer | Will Andrews <will@FreeBSD.org> | 2003-04-11 14:39:16 +0000 |
commit | 145f2547fa612edc0d309eb34ae7adfd02587bb2 (patch) | |
tree | 3eb90d62ccaa281283ff920f4921c07207478afd /x11/kdelibs3 | |
parent | New port: wmmemfree (diff) |
Upgrade to 3.1.1a to handle PS/PDF security advisory. There are additional
patches to kgv which are also included in this commit.
Submitted by: Lauri Watts <lauri@kde.org>
Notes
Notes:
svn path=/head/; revision=78735
Diffstat (limited to 'x11/kdelibs3')
-rw-r--r-- | x11/kdelibs3/Makefile | 2 | ||||
-rw-r--r-- | x11/kdelibs3/distinfo | 2 | ||||
-rw-r--r-- | x11/kdelibs3/files/patch-kio::kio::kzip.cpp | 59 | ||||
-rw-r--r-- | x11/kdelibs3/files/patch-kioslave::http::http.cc | 126 |
4 files changed, 2 insertions, 187 deletions
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile index 680adf019ee1..373e231ab854 100644 --- a/x11/kdelibs3/Makefile +++ b/x11/kdelibs3/Makefile @@ -7,7 +7,7 @@ # PORTNAME= kdelibs -PORTVERSION= ${KDE_VERSION} +PORTVERSION= ${KDE_VERSION}a PORTREVISION= 0 CATEGORIES= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo index a1a6eb15842c..f75781c8d9b1 100644 --- a/x11/kdelibs3/distinfo +++ b/x11/kdelibs3/distinfo @@ -1 +1 @@ -MD5 (KDE/kdelibs-3.1.1.tar.bz2) = 15eb9412c589126844b277b9e80cfffc +MD5 (KDE/kdelibs-3.1.1a.tar.bz2) = 77cc0b44b43ea239cb3f8e37d7814f1a diff --git a/x11/kdelibs3/files/patch-kio::kio::kzip.cpp b/x11/kdelibs3/files/patch-kio::kio::kzip.cpp deleted file mode 100644 index 1b4b7d35e230..000000000000 --- a/x11/kdelibs3/files/patch-kio::kio::kzip.cpp +++ /dev/null @@ -1,59 +0,0 @@ ---- kio/kio/kzip.cpp.orig Fri Jan 3 05:58:47 2003 -+++ kio/kio/kzip.cpp Fri Mar 21 11:13:48 2003 -@@ -332,27 +332,43 @@ - - KArchiveEntry* entry; - if ( isdir ) -- entry = new KArchiveDirectory( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null ); -+ { -+ QString path = QDir::cleanDirPath( name.left( pos ) ); -+ KArchiveEntry* ent = rootDir()->entry( path ); -+ if ( ent && ent->isDirectory() ) -+ { -+ //kdDebug(7040) << "Directory already exists, NOT going to add it again" << endl; -+ entry = 0L; -+ } -+ else -+ { -+ entry = new KArchiveDirectory( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null ); -+ //kdDebug(7040) << "KArchiveDirectory created, entryName= " << entryName << ", name=" << name << endl; -+ } -+ } - else - { - entry = new KZipFileEntry( this, entryName, access, time, rootDir()->user(), rootDir()->group(), QString::null, -- name, dataoffset, ucsize, cmethod, csize ); -+ name, dataoffset, ucsize, cmethod, csize ); - static_cast<KZipFileEntry *>(entry)->setHeaderStart( localheaderoffset ); -- //kdDebug(7040) << "KZipFileEntry created" << endl; -+ //kdDebug(7040) << "KZipFileEntry created, entryName= " << entryName << ", name=" << name << endl; - d->m_fileList.append( static_cast<KZipFileEntry *>( entry ) ); - } - -- if ( pos == -1 ) -+ if ( entry ) - { -- rootDir()->addEntry(entry); -- } -- else -- { -- // In some tar files we can find dir/./file => call cleanDirPath -- QString path = QDir::cleanDirPath( name.left( pos ) ); -- // Ensure container directory exists, create otherwise -- KArchiveDirectory * tdir = findOrCreate( path ); -- tdir->addEntry(entry); -+ if ( pos == -1 ) -+ { -+ rootDir()->addEntry(entry); -+ } -+ else -+ { -+ // In some tar files we can find dir/./file => call cleanDirPath -+ QString path = QDir::cleanDirPath( name.left( pos ) ); -+ // Ensure container directory exists, create otherwise -+ KArchiveDirectory * tdir = findOrCreate( path ); -+ tdir->addEntry(entry); -+ } - } - - //calculate offset to next entry diff --git a/x11/kdelibs3/files/patch-kioslave::http::http.cc b/x11/kdelibs3/files/patch-kioslave::http::http.cc deleted file mode 100644 index b2ed6d914d1f..000000000000 --- a/x11/kdelibs3/files/patch-kioslave::http::http.cc +++ /dev/null @@ -1,126 +0,0 @@ ---- kioslave/http/http.cc.orig Sun Mar 2 20:02:28 2003 -+++ kioslave/http/http.cc Thu Mar 20 22:05:14 2003 -@@ -438,7 +438,6 @@ - kdDebug(7113) << "(" << m_pid << ") Unset tunneling flag!" << endl; - setEnableSSLTunnel( false ); - m_bIsTunneled = true; -- m_bNeedTunnel = false; - // Reset the CONNECT response code... - m_responseCode = m_prevResponseCode; - continue; -@@ -1936,7 +1935,42 @@ - // Check the validity of the current connection, if one exists. - httpCheckConnection(); - -- // Determine if this is a POST or GET method -+ -+ if ( !m_bIsTunneled && m_bNeedTunnel ) -+ { -+ setEnableSSLTunnel( true ); -+ // We send a HTTP 1.0 header since some proxies refuse HTTP 1.1 and we don't -+ // need any HTTP 1.1 capabilities for CONNECT - Waba -+ header = QString("CONNECT %1:%2 HTTP/1.0" -+ "\r\n").arg( m_request.hostname).arg(m_request.port); -+ -+ // Identify who you are to the proxy server! -+ if (!m_request.userAgent.isEmpty()) -+ header += "User-Agent: " + m_request.userAgent + "\r\n"; -+ -+ /* Add hostname information */ -+ header += "Host: "; -+ if (m_state.hostname.find(':') != -1) -+ { -+ // This is an IPv6 (not hostname) -+ header += '['; -+ header += m_state.hostname; -+ header += ']'; -+ } -+ else -+ { -+ header += m_state.hostname; -+ } -+ -+ if (m_state.port != m_iDefaultPort) -+ header += QString(":%1").arg(m_state.port); -+ header += "\r\n"; -+ -+ header += proxyAuthenticationHeader(); -+ } -+ else -+ { -+ // Determine the kind of method we are handling... - switch (m_request.method) - { - case HTTP_GET: -@@ -1944,12 +1978,12 @@ - break; - case HTTP_PUT: - header = "PUT "; -- moreData = !m_bNeedTunnel; -+ moreData = true; - m_request.bCachedWrite = false; // Do not put any result in the cache - break; - case HTTP_POST: - header = "POST "; -- moreData = !m_bNeedTunnel; -+ moreData = true; - m_request.bCachedWrite = false; // Do not put any result in the cache - break; - case HTTP_HEAD: -@@ -2033,40 +2067,6 @@ - return false; - } - -- if ( !m_bIsTunneled && m_bNeedTunnel ) -- { -- setEnableSSLTunnel( true ); -- // We send a HTTP 1.0 header since some proxies refuse HTTP 1.1 and we don't -- // need any HTTP 1.1 capabilities for CONNECT - Waba -- header = QString("CONNECT %1:%2 HTTP/1.0" -- "\r\n").arg( m_request.hostname).arg(m_request.port); -- -- // Identify who you are to the proxy server! -- if (!m_request.userAgent.isEmpty()) -- header += "User-Agent: " + m_request.userAgent + "\r\n"; -- -- /* Add hostname information */ -- header += "Host: "; -- if (m_state.hostname.find(':') != -1) -- { -- // This is an IPv6 (not hostname) -- header += '['; -- header += m_state.hostname; -- header += ']'; -- } -- else -- { -- header += m_state.hostname; -- } -- -- if (m_state.port != m_iDefaultPort) -- header += QString(":%1").arg(m_state.port); -- header += "\r\n"; -- -- header += proxyAuthenticationHeader(); -- } -- else -- { - // format the URI - if (m_state.doProxy && !m_bIsTunneled) - { -@@ -2271,7 +2271,6 @@ - // Do we need to authorize to the proxy server ? - if ( m_state.doProxy && !m_bIsTunneled ) - header += proxyAuthenticationHeader(); -- } - - if ( m_protocol == "webdav" || m_protocol == "webdavs" ) - { -@@ -2289,6 +2288,7 @@ - // add extra header elements for WebDAV - if ( !davHeader.isNull() ) - header += davHeader; -+ } - } - - kdDebug(7103) << "(" << m_pid << ") ============ Sending Header:" << endl; |