cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfixorama: Add patches for KDE Bugs 80209, 80821, 80955 and two

Browse Source 
security related patches.

Bump PORTREVISION.
This commit is contained in:
Michael Nottebrock 2004-05-14 14:47:03 +00:00
parent 4a657e751e
commit 0e9d309c85
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=109129
8 changed files with 166 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
x11/kdelibs3/Makefile
View File

@ -8,7 +8,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src

11
x11/kdelibs3/files/patch-kdecore_kapplication.cpp Normal file
View File

@ -0,0 +1,11 @@
--- kdecore/kapplication.cpp 8 Apr 2004 09:56:28 -0000 1.637.2.8
+++ kdecore/kapplication.cpp 14 May 2004 12:24:53 -0000
@@ -2172,7 +2172,7 @@ void KApplication::invokeMailer(const QS
if (command.isEmpty() || command == QString::fromLatin1("kmail")
|| command.endsWith("/kmail"))
- command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A %t");
+ command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t");
// TODO: Take care of the preferred terminal app (instead of hardcoding
// Konsole), this will probably require a rewrite of the configurable

47
x11/kdelibs3/files/patch-khtml_khtml_part.cpp Normal file
View File

@ -0,0 +1,47 @@
--- khtml/khtml_part.cpp 2004/04/03 05:28:15 1.959.2.14
+++ khtml/khtml_part.cpp 2004/05/10 16:40:50 1.959.2.18
@@ -203,7 +203,7 @@ void KHTMLPart::init( KHTMLView *view, G
d->m_paViewFrame = new KAction( i18n( "View Frame Source" ), 0, this, SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" );
d->m_paViewInfo = new KAction( i18n( "View Document Information" ), CTRL+Key_I, this, SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" );
d->m_paSaveBackground = new KAction( i18n( "Save &Background Image As..." ), 0, this, SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" );
- d->m_paSaveDocument = new KAction( i18n( "&Save As..." ), CTRL+Key_S, this, SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" );
+ d->m_paSaveDocument = KStdAction::saveAs( this, SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" );
if ( parentPart() )
d->m_paSaveDocument->setShortcut( KShortcut() ); // avoid clashes
d->m_paSaveFrame = new KAction( i18n( "Save &Frame As..." ), 0, this, SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
@@ -332,7 +332,7 @@ void KHTMLPart::init( KHTMLView *view, G
d->m_paFindNext->setShortcut( KShortcut() ); // avoid clashes
}
- d->m_paPrintFrame = new KAction( i18n( "Print Frame" ), "frameprint", 0, this, SLOT( slotPrintFrame() ), actionCollection(), "printFrame" );
+ d->m_paPrintFrame = new KAction( i18n( "Print Frame..." ), "frameprint", 0, this, SLOT( slotPrintFrame() ), actionCollection(), "printFrame" );
d->m_paPrintFrame->setWhatsThis( i18n( "Print Frame<p>"
"Some pages have several frames. To print only a single frame, click "
"on it and then use this function." ) );
@@ -2665,7 +2665,7 @@ void KHTMLPart::findTextNext()
d->m_find->setPattern( d->m_findDialog->pattern() );
d->m_find->resetCounts();
}
- long options = d->m_findDialog->options();
+ options = d->m_findDialog->options();
if ( d->m_lastFindState.options != options )
{
d->m_find->setOptions( options );
@@ -2712,7 +2712,7 @@ void KHTMLPart::findTextNext()
{
// Grab text from render object
QString s;
- bool renderAreaText = (QCString(obj->parent()->renderName())== "RenderTextArea");
+ bool renderAreaText = obj->parent() && (QCString(obj->parent()->renderName())== "RenderTextArea");
bool renderLineText = (QCString(obj->renderName())== "RenderLineEdit");
if ( renderAreaText )
{
@@ -3288,7 +3288,7 @@ void KHTMLPart::urlSelected( const QStri
kdDebug( 6000 ) << "urlSelected: complete URL:" << cURL.url() << " target = " << target << endl;
- if ( button == LeftButton && (state & ControlButton) )
+ if ( state & ControlButton )
{
args.setNewTab(true);
emit d->m_extension->createNewWindow( cURL, args );

24
x11/kdelibs3/files/patch-kio_misc_ktelnetservice.cpp Normal file
View File

@ -0,0 +1,24 @@
--- kio/misc/ktelnetservice.cpp 18 Feb 2004 11:42:12 -0000 1.7.2.1
+++ kio/misc/ktelnetservice.cpp 13 May 2004 15:12:14 -0000
@@ -77,10 +77,19 @@ int main(int argc, char **argv)
cmd << url.user();
}
+ QString host;
if (!url.host().isEmpty())
- cmd << url.host(); // telnet://host
+ host = url.host(); // telnet://host
else if (!url.path().isEmpty())
- cmd << url.path(); // telnet:host
+ host = url.path(); // telnet:host
+
+ if (host.isEmpty() || host.startsWith("-"))
+ {
+ kdError() << "Invalid hostname " << host << endl;
+ return 2;
+ }
+
+ cmd << host;
if (url.port()){
if ( url.protocol() == "ssh" )

2
x11/kdelibs4/Makefile
View File

@ -8,7 +8,7 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src

11
x11/kdelibs4/files/patch-kdecore_kapplication.cpp Normal file
View File

@ -0,0 +1,11 @@
--- kdecore/kapplication.cpp 8 Apr 2004 09:56:28 -0000 1.637.2.8
+++ kdecore/kapplication.cpp 14 May 2004 12:24:53 -0000
@@ -2172,7 +2172,7 @@ void KApplication::invokeMailer(const QS
if (command.isEmpty() || command == QString::fromLatin1("kmail")
|| command.endsWith("/kmail"))
- command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A %t");
+ command = QString::fromLatin1("kmail --composer -s %s -c %c -b %b --body %B --attach %A -- %t");
// TODO: Take care of the preferred terminal app (instead of hardcoding
// Konsole), this will probably require a rewrite of the configurable

47
x11/kdelibs4/files/patch-khtml_khtml_part.cpp Normal file
View File

@ -0,0 +1,47 @@
--- khtml/khtml_part.cpp 2004/04/03 05:28:15 1.959.2.14
+++ khtml/khtml_part.cpp 2004/05/10 16:40:50 1.959.2.18
@@ -203,7 +203,7 @@ void KHTMLPart::init( KHTMLView *view, G
d->m_paViewFrame = new KAction( i18n( "View Frame Source" ), 0, this, SLOT( slotViewFrameSource() ), actionCollection(), "viewFrameSource" );
d->m_paViewInfo = new KAction( i18n( "View Document Information" ), CTRL+Key_I, this, SLOT( slotViewPageInfo() ), actionCollection(), "viewPageInfo" );
d->m_paSaveBackground = new KAction( i18n( "Save &Background Image As..." ), 0, this, SLOT( slotSaveBackground() ), actionCollection(), "saveBackground" );
- d->m_paSaveDocument = new KAction( i18n( "&Save As..." ), CTRL+Key_S, this, SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" );
+ d->m_paSaveDocument = KStdAction::saveAs( this, SLOT( slotSaveDocument() ), actionCollection(), "saveDocument" );
if ( parentPart() )
d->m_paSaveDocument->setShortcut( KShortcut() ); // avoid clashes
d->m_paSaveFrame = new KAction( i18n( "Save &Frame As..." ), 0, this, SLOT( slotSaveFrame() ), actionCollection(), "saveFrame" );
@@ -332,7 +332,7 @@ void KHTMLPart::init( KHTMLView *view, G
d->m_paFindNext->setShortcut( KShortcut() ); // avoid clashes
}
- d->m_paPrintFrame = new KAction( i18n( "Print Frame" ), "frameprint", 0, this, SLOT( slotPrintFrame() ), actionCollection(), "printFrame" );
+ d->m_paPrintFrame = new KAction( i18n( "Print Frame..." ), "frameprint", 0, this, SLOT( slotPrintFrame() ), actionCollection(), "printFrame" );
d->m_paPrintFrame->setWhatsThis( i18n( "Print Frame<p>"
"Some pages have several frames. To print only a single frame, click "
"on it and then use this function." ) );
@@ -2665,7 +2665,7 @@ void KHTMLPart::findTextNext()
d->m_find->setPattern( d->m_findDialog->pattern() );
d->m_find->resetCounts();
}
- long options = d->m_findDialog->options();
+ options = d->m_findDialog->options();
if ( d->m_lastFindState.options != options )
{
d->m_find->setOptions( options );
@@ -2712,7 +2712,7 @@ void KHTMLPart::findTextNext()
{
// Grab text from render object
QString s;
- bool renderAreaText = (QCString(obj->parent()->renderName())== "RenderTextArea");
+ bool renderAreaText = obj->parent() && (QCString(obj->parent()->renderName())== "RenderTextArea");
bool renderLineText = (QCString(obj->renderName())== "RenderLineEdit");
if ( renderAreaText )
{
@@ -3288,7 +3288,7 @@ void KHTMLPart::urlSelected( const QStri
kdDebug( 6000 ) << "urlSelected: complete URL:" << cURL.url() << " target = " << target << endl;
- if ( button == LeftButton && (state & ControlButton) )
+ if ( state & ControlButton )
{
args.setNewTab(true);
emit d->m_extension->createNewWindow( cURL, args );

24
x11/kdelibs4/files/patch-kio_misc_ktelnetservice.cpp Normal file
View File

@ -0,0 +1,24 @@
--- kio/misc/ktelnetservice.cpp 18 Feb 2004 11:42:12 -0000 1.7.2.1
+++ kio/misc/ktelnetservice.cpp 13 May 2004 15:12:14 -0000
@@ -77,10 +77,19 @@ int main(int argc, char **argv)
cmd << url.user();
}
+ QString host;
if (!url.host().isEmpty())
- cmd << url.host(); // telnet://host
+ host = url.host(); // telnet://host
else if (!url.path().isEmpty())
- cmd << url.path(); // telnet:host
+ host = url.path(); // telnet:host
+
+ if (host.isEmpty() || host.startsWith("-"))
+ {
+ kdError() << "Invalid hostname " << host << endl;
+ return 2;
+ }
+
+ cmd << host;
if (url.port()){
if ( url.protocol() == "ssh" )