diff options
| author | Max Brazhnikov <makc@FreeBSD.org> | 2011-05-16 19:26:43 +0000 |
|---|---|---|
| committer | Max Brazhnikov <makc@FreeBSD.org> | 2011-05-16 19:26:43 +0000 |
| commit | a34b8d38b831d19001533639592430f41527a96c (patch) | |
| tree | 039439a298b8e93967986e11178208cf8e1adbe2 /net/kdenetwork4 | |
| parent | eb56f7f7066ae94ebacc2284e0b0000539fca8d9 (diff) | |
| download | ports-a34b8d38b831d19001533639592430f41527a96c.tar.gz ports-a34b8d38b831d19001533639592430f41527a96c.zip | |
Notes
Diffstat (limited to 'net/kdenetwork4')
| -rw-r--r-- | net/kdenetwork4/Makefile | 2 | ||||
| -rw-r--r-- | net/kdenetwork4/distinfo | 4 | ||||
| -rw-r--r-- | net/kdenetwork4/files/patch-kget__ui__metalinkcreator__metalinker.cpp | 17 | ||||
| -rw-r--r-- | net/kdenetwork4/files/patch-krfb__krfb__CMakeLists.txt | 10 | ||||
| -rw-r--r-- | net/kdenetwork4/pkg-plist | 1 |
5 files changed, 2 insertions, 32 deletions
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index 9f09ff672fca..c92baf44c0db 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -6,7 +6,6 @@ PORTNAME= kdenetwork PORTVERSION= ${KDE4_VERSION} -PORTREVISION= 1 CATEGORIES= net kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src @@ -30,7 +29,6 @@ LIB_DEPENDS= slp.1:${PORTSDIR}/net/openslp \ meanwhile.1:${PORTSDIR}/net-im/meanwhile \ speex.1:${PORTSDIR}/audio/speex \ v4l2.0:${PORTSDIR}/multimedia/libv4l \ - kwebkit.1:${PORTSDIR}/www/kwebkitpart \ ktorrent.3:${PORTSDIR}/net-p2p/libktorrent RUN_DEPENDS= qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo index 03620256a568..4485d41a14c1 100644 --- a/net/kdenetwork4/distinfo +++ b/net/kdenetwork4/distinfo @@ -1,2 +1,2 @@ -SHA256 (KDE/kdenetwork-4.6.2.tar.bz2) = 0a569e1f247596d98add8e3687d3d1a0fb8b30defc18f910732e2237832f9d4a -SIZE (KDE/kdenetwork-4.6.2.tar.bz2) = 8689619 +SHA256 (KDE/kdenetwork-4.6.3.tar.bz2) = 423424f2bbc18cb6a0bd52305a238a5b7d4b5f483f30c0590f975b0c229be1fb +SIZE (KDE/kdenetwork-4.6.3.tar.bz2) = 8693954 diff --git a/net/kdenetwork4/files/patch-kget__ui__metalinkcreator__metalinker.cpp b/net/kdenetwork4/files/patch-kget__ui__metalinkcreator__metalinker.cpp deleted file mode 100644 index 4ab2df4364da..000000000000 --- a/net/kdenetwork4/files/patch-kget__ui__metalinkcreator__metalinker.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- kget/ui/metalinkcreator/metalinker.cpp 2010/12/22 13:31:19 1208598 -+++ kget/ui/metalinkcreator/metalinker.cpp 2011/04/09 09:26:37 1227471 -@@ -583,7 +583,13 @@ - return false; - } - -- if (name.contains(QRegExp("$(\\.\\.?)?/")) || name.contains("/../") || name.endsWith("/..")) { -+ if (name.endsWith('/')) { -+ kError(5001) << "Name attribute of Metalink::File does not contain a file name:" << name; -+ return false; -+ } -+ -+ const QStringList components = name.split('/'); -+ if (name.startsWith('/') || components.contains("..") || components.contains(".")) { - kError(5001) << "Name attribute of Metalink::File contains directory traversal directives:" << name; - return false; - } diff --git a/net/kdenetwork4/files/patch-krfb__krfb__CMakeLists.txt b/net/kdenetwork4/files/patch-krfb__krfb__CMakeLists.txt deleted file mode 100644 index 44d9826f9489..000000000000 --- a/net/kdenetwork4/files/patch-krfb__krfb__CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ ---- ./krfb/krfb/CMakeLists.txt.orig 2010-12-03 08:48:16.671158120 +1000 -+++ ./krfb/krfb/CMakeLists.txt 2010-12-03 08:48:21.971155466 +1000 -@@ -29,7 +29,6 @@ - - install (TARGETS krfbprivate - ${INSTALL_TARGETS_DEFAULT_ARGS} -- LIBRARY NAMELINK_SKIP - ) - - install (FILES diff --git a/net/kdenetwork4/pkg-plist b/net/kdenetwork4/pkg-plist index 96ee12a59291..5b2c2887d5b0 100644 --- a/net/kdenetwork4/pkg-plist +++ b/net/kdenetwork4/pkg-plist @@ -197,7 +197,6 @@ lib/libkopetestatusmenu.so.1.0.0 lib/libkrdccore.so lib/libkrdccore.so.5 lib/libkrdccore.so.5.0.1 -lib/libkrfbprivate.so lib/libkrfbprivate.so.5.0.1 lib/libkyahoo.so lib/libkyahoo.so.1 |