[23267] trunk/dports/kde/kdeaddons3

[source_changes at macosforge.org]

Revision: 23267
          http://trac.macosforge.org/projects/macports/changeset/23267
Author:   takanori at macports.org
Date:     2007-03-28 01:27:58 -0700 (Wed, 28 Mar 2007)

Log Message:
-----------
Version 3.5.6

Modified Paths:
--------------
    trunk/dports/kde/kdeaddons3/Portfile
    trunk/dports/kde/kdeaddons3/files/CompileScript.sh
    trunk/dports/kde/kdeaddons3/files/InstallScript.sh

Added Paths:
-----------
    trunk/dports/kde/kdeaddons3/files/kdeaddons-restrict-webarchiver.diff

Modified: trunk/dports/kde/kdeaddons3/Portfile
===================================================================
--- trunk/dports/kde/kdeaddons3/Portfile	2007-03-28 08:27:36 UTC (rev 23266)
+++ trunk/dports/kde/kdeaddons3/Portfile	2007-03-28 08:27:58 UTC (rev 23267)
@@ -1,10 +1,10 @@
 # $Id$
 
-#Synced with Fink, Version 3.5.5-1021
+#Synced with Fink, Version 3.5.6-1021
 
 PortSystem 1.0
 name		kdeaddons3
-version		3.5.5
+version		3.5.6
 set kdeadmin	kde-admindir-429
 categories	kde
 maintainers	nomaintainer at macports.org
@@ -13,16 +13,16 @@
 long_description ${description}
 platforms	darwin
 homepage	http://www.kde.org/
-master_sites	kde:stable/${version}/src/:kde355 \
+master_sites	kde:stable/${version}/src/:kde356 \
 		http://ranger.users.finkproject.org/distfiles/:admin \
 		http://ranger.befunk.com/fink/:admin \
 		http://astrange.ithinksw.net/~astrange/ranger-fink/:admin \
 		http://www.southofheaven.net/befunk/:admin
-#		opendarwin::kde355
+#		opendarwin::kde356
 #		opendarwin::admin
 use_bzip2	yes
 distname	kdeaddons-${version}
-distfiles	${distname}.tar.bz2:kde355 \
+distfiles	${distname}.tar.bz2:kde356 \
 		${kdeadmin}.tar.bz2:admin
 depends_build	port:autoconf \
 		port:unsermake
@@ -33,7 +33,7 @@
 #		port:gtk1
 #		port:libsdl
 
-checksums	${distname}.tar.bz2 md5 71c0a690abf8ad0f43135fa887d0b40c \
+checksums	${distname}.tar.bz2 md5 96d6d2a76da2a5232b3b46318456a5bc \
 		${kdeadmin}.tar.bz2 md5 73186bf0bdabf96c9f7d559de56d3772
 
 extract.only	${distname}.tar.bz2
@@ -45,6 +45,7 @@
 		foreach file $patchfiles {
 		    system "sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
 		}
+		system "patch -p0 < ${filespath}/kdeaddons-restrict-webarchiver.diff"
 		system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' admin/*"
 }
 post-patch	{

Modified: trunk/dports/kde/kdeaddons3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdeaddons3/files/CompileScript.sh	2007-03-28 08:27:36 UTC (rev 23266)
+++ trunk/dports/kde/kdeaddons3/files/CompileScript.sh	2007-03-28 08:27:58 UTC (rev 23267)
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ev
 
         export PREFIX="%p" USE_UNSERMAKE=1
         . ./environment-helper.sh

Modified: trunk/dports/kde/kdeaddons3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdeaddons3/files/InstallScript.sh	2007-03-28 08:27:36 UTC (rev 23266)
+++ trunk/dports/kde/kdeaddons3/files/InstallScript.sh	2007-03-28 08:27:58 UTC (rev 23267)
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh -ev
 
         export PREFIX="%p" USE_UNSERMAKE=1
         . ./environment-helper.sh

Added: trunk/dports/kde/kdeaddons3/files/kdeaddons-restrict-webarchiver.diff
===================================================================
--- trunk/dports/kde/kdeaddons3/files/kdeaddons-restrict-webarchiver.diff	                        (rev 0)
+++ trunk/dports/kde/kdeaddons3/files/kdeaddons-restrict-webarchiver.diff	2007-03-28 08:27:58 UTC (rev 23267)
@@ -0,0 +1,50 @@
+------------------------------------------------------------------------
+r626814 | mueller | 2007-01-24 18:16:52 +0100 (Wed, 24 Jan 2007) | 5 lines
+Changed paths:
+   M /branches/KDE/3.5/kdeaddons/konq-plugins/webarchiver/archivedialog.cpp
+   M /branches/KDE/3.5/kdeaddons/konq-plugins/webarchiver/webarchivecreator.cpp
+
+fix a minor but annoying privacy issue: the web archiver
+would happily put local files or other launch other unsafe
+protocols if referenced in the website, even though konqueror
+itself wouldn't handle it
+
+------------------------------------------------------------------------
+Index: konq-plugins/webarchiver/webarchivecreator.cpp
+===================================================================
+--- konq-plugins/webarchiver/webarchivecreator.cpp	(revision 626813)
++++ konq-plugins/webarchiver/webarchivecreator.cpp	(revision 626814)
+@@ -32,7 +32,7 @@
+ 
+ extern "C"
+ {
+-	ThumbCreator *new_creator()
++	ThumbCreator * KDE_EXPORT new_creator()
+ 	{
+ 		return new WebArchiveCreator;
+ 	}
+Index: konq-plugins/webarchiver/archivedialog.cpp
+===================================================================
+--- konq-plugins/webarchiver/archivedialog.cpp	(revision 626813)
++++ konq-plugins/webarchiver/archivedialog.cpp	(revision 626814)
+@@ -395,12 +395,15 @@ void ArchiveDialog::saveArchiveRecursive
+ QString ArchiveDialog::handleLink(const KURL& _url, const QString& _link)
+ {
+    KURL url(getAbsoluteURL(_url, _link));
+-   QString tarFileName;
+ 
+-   if (m_state==Retrieving)
+-      m_urlsToDownload.append(url);
+-   else if (m_state==Saving)
+-      tarFileName = m_downloadedURLDict[url.url()];
++   QString tarFileName;
++   if (kapp->authorizeURLAction("redirect", _url, url))
++   {
++       if (m_state==Retrieving)
++           m_urlsToDownload.append(url);
++       else if (m_state==Saving)
++           tarFileName = m_downloadedURLDict[url.url()];
++   }
+ 
+    return tarFileName;
+ }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070328/94edaf2e/attachment.html