Remove vulnerable version, bug #531070.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xFDF4F788

4 files changed, 22 insertions, 291 deletions

diff --git a/kde-misc/plasma-nm/ChangeLog b/kde-misc/plasma-nm/ChangeLog
index 27732c03e525..2515889256a8 100644
--- a/kde-misc/plasma-nm/ChangeLog
+++ b/kde-misc/plasma-nm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-misc/plasma-nm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-nm/ChangeLog,v 1.25 2015/07/18 19:32:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-nm/ChangeLog,v 1.26 2015/07/18 19:54:57 johu Exp $
+
+  18 Jul 2015; Johannes Huber <johu@gentoo.org>
+  -files/plasma-nm-0.9.3.5-openconnect.patch, -plasma-nm-0.9.3.5.ebuild:
+  Remove vulnerable version, bug #531070.
 
   18 Jul 2015; Agostino Sarubbo <ago@gentoo.org> plasma-nm-0.9.3.6.ebuild:
   Stable for x86, wrt bug #531070
diff --git a/kde-misc/plasma-nm/Manifest b/kde-misc/plasma-nm/Manifest
index 70b8dfc45bf0..35bb06df9b6e 100644
--- a/kde-misc/plasma-nm/Manifest
+++ b/kde-misc/plasma-nm/Manifest
@@ -1,27 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX plasma-nm-0.9.3.5-openconnect.patch 8688 SHA256 34bfb4cf6b510d15da4e4b575eb5c919043007a5e8be55f4eabd6e869ab806f9 SHA512 55ddd5d343eff52996d6d216f48fa3f1e4110d05b005f7e08f096111bbd50395593a11369340f4b73dba0f53716d84cd9e9309d43a7a8add07a9c00b1be0dd70 WHIRLPOOL 9aa5bc31ceb0b01285144cf4889b802123f1abe9f0d61d8d45aa5a8ed0fa7fd2787bb614c0d478974f616001409b47f4185e6445971e500a335c44d24f7c6eb2
-DIST plasma-nm-0.9.3.5.tar.xz 545340 SHA256 7757151e426c5448f5ff247c08d78e177d5ce676d886287b57abd3e9276ca135 SHA512 0a9c3c77a91fdea702ce5686293e978835de644dac9782879bdc8013de9bf15ab2603c27bdce7b91b1bf306f842d2fd2e06671bf4c6769b16ef12c1aab1beadc WHIRLPOOL c67d9c022630f6f8200473883a35ab3c4e91d21ea41429bfb117a8f7425d0bc88e242d8157706d72969178dc3509381b9b8d44e32531b21f7cd9aec16886139a
 DIST plasma-nm-0.9.3.6.tar.xz 551320 SHA256 56b5c8221761fac30808117c7f8fa11a9e3cdb4b2d16a733d33996bc7136b64b SHA512 50f3e5020f4437d710709a301b981f888898c293a71dff3aee809255207a0f97caf5d3811b453da2338df93238ef33a79e85cb3598ee38d8a41255d8a572e256 WHIRLPOOL 2486304f8c5c169105e2ea0527e7fb291cc9c9f9fee36a2cdc9d5aff7f5a72cb8bdda692ac54f621c63a84b2e48ba2c429e20a4bbe7efa91ecb48a393286dc7c
-EBUILD plasma-nm-0.9.3.5.ebuild 1409 SHA256 7193caf652b57b18d3338b57bc83832675c97d23820fda106d7356eb0978bdd3 SHA512 20bbde5ba889f7733ebc2d69dde140ab1a3fb13e95331147a9242426e2209d43cfcf9c38abecb58b08a9924dceb2a503822a3adb55939479650d1ef4a10cceaa WHIRLPOOL 6b1436d79952e314b67b9fb5c49bb22efda3b4accc94c86b4bc9b2c3f77dcd5899581b5a3306e23be58a9f1a99459b4502a9da37f511b335563bd627fa0ef29a
 EBUILD plasma-nm-0.9.3.6.ebuild 1361 SHA256 7b20bc2f14f7bfddaaeb7f3f18af170c03d1fdffa0b1a908313eb95401033fc2 SHA512 9cbcbe8c2b831f71052117cdad49b6242b181d949507c127d8f4a14197d242083f3281385d48e3b6e73ecfba513017493d9dcd3084040d92da44112594ee7098 WHIRLPOOL c5c64872e0a9005cdf8ff1de77fdaacb77b17a0680a7425f1e9a04783e06196c1aa0daf9cb5449e67950b497bcd3a3e7331a2fe3b84f2257cc0fa4cd6536a0f6
-MISC ChangeLog 3899 SHA256 386a9a6369c24757dffc10cfa407ac71feee30cb8016e3a0effc2e4d22535bbe SHA512 418b7d206bfb9dae51a1402b4ba2369004d8e89ae675f6214dc05a70a8b8d788780c265ceddfaa187c76dace78cd3bc73d97426f7145141174ad69f8ab4237a3 WHIRLPOOL 3fd95ab9cf04be1883ec3b035c68e0bdfe84c3b057fe97e629bdae57258329359c6deeef80841c4f1d4fed1b254b7c2d1ea4c74b6b5ac744fc8d8ac4c0576886
+MISC ChangeLog 4064 SHA256 6f556c5b9ec848b66f3504f120d5b04b6fcc544ded91269206d58c20793b2128 SHA512 871601577578454087f0947b7901e2c068ddc363db9f5b1512c615ccc1780c407e94bf0d734e21f6d8b6a5cb6bfaea328d0e11ff842f54f4becddb842772545e WHIRLPOOL dde2fc65d625559c24e0299750e1b3953f2eddad25a73c7567cdd301c498b85f9439d6aacff61b69c8c4c747d5258cdb0f1adf85db3d73c47dd8b511ca844b1a
 MISC metadata.xml 330 SHA256 598d25af1553b160d5b27b576c797590385f39c8a9cc278d8008bb865c964042 SHA512 965cd3a76762cc052b1efa3cb00f0c75467ec29e68f85067987c967a9c709d98bce93f75e256bd7d4ec13dd65c3503cfab95e61bd86e748419da72d1c10765dd WHIRLPOOL 7623305bbd7becf563cd693e9f092c4154d081487b7319eef1e0f140812b78e6ba7f5d35e826cb6b8e10998d728182b5aef1d4bd658b4f7366dda38481b69496
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.1
 
-iQIcBAEBCAAGBQJVqqngAAoJELp701BxlEWf/roP/iqnClUdvyVnEq7ICww4EkA9
-MdCNkRBa/uywduYlsNqsCQAwwafokm2JIV2msB9H5xGDPqD8x5mDMTY2IfuhcWzW
-lsqeE2BSvcow9RhblbtrjHuO6zcoOXmrO/9xw/yyejPRH7OxqQ7NUB6RUd0ntQuP
-DcnoME1Cf0NWDJvV/wrwqbxMuxJGphJQGbcF7y5CJ7gGN8hv4FM75wCyahNi/Aq3
-U8cfm95ZOUoifA9huakHvLE6R0OlF+bCBXfbFkqwjJmdTUURhWUzQMMruXp2OqQA
-bJpObieYDpQ3oerBrCdDYwuJnSl0zohZ5DGc1rrauDG/aA5RWfzFK+TEUHe5ZmY6
-G0XenD0wx1aM/ku040hVVvsId9tBA9642Wg3SIbALpg9h6kfbYpMiHkghjhvhq1U
-043QEuB6uv5kbfbDz4HzQw+QhVLHZC/MJnd1l3yp+KLN3MsnzhdWpGhhXxqysiKq
-CcTRGtwA6vGWaLON/LnDyFz6ClscfG/Z32UEpWgEsibsRE3Es8hbSavankkZujHz
-VmXfBgIxH8cOlQTVb6B57muCbPToUYDQcA473G6GfxbzNXa86EvdkhahQlSHb+fz
-vkghhCUXcYAGcF/t3jZ/8dzIZQQ1929lXyWBLIVeIIran8BnoPk25nkGY7le+3Sx
-U2ilygqOstiFjpl9Ajz9
-=mBah
+iQJ8BAEBCABmBQJVqq90XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0N0Y0MTczMjZGRTRGODM5M0MzOTU4RDAy
+OTU0NDVDRUY5MDcyRDJGAAoJEClURc75By0vBJoP/3qkvLeC+raAH/ypT7x9yBOv
+J3hYPqIb52k65iQIWfZH/BfyO7A5836FN8NQXEQ7dtFI/vvZlBQ2aarSz8pTtML/
+0JzpAUVIDspYjNQJp2kzn4/94iUrYm9lt8kLErTch1Yr7YEadqSRI3wf9gjzV9ho
+EJyFElv2FQgEco/nCwifnxsxH0n9dvTl3yAl1XSQDCgJ13hzY4yE/ys9MWhgqe9d
+bMo7EsoqRD3alj78j32ES0goXF6mMVNr91SkvflE6NJ/sQ3BOCmXagStSw8REXc7
+VHbJsn47OFGOgpUX3XkMlLkAMMRGbN3oW912aQsnDIQe9pOHPtcKQtEqBx0WYi5Y
+xuWmuNAmMZZqvgUVq7z5rsFq9nEcsjUgCwxh8DGvSru2IMMFzkFgG7IKidhJsj+z
+cIeIMJn9NqTyJ1vmrFwX0nn+pgiUaDMMrA3f40PGbSXPxSrCKTaNtB08LzWF71L1
+R0eQLd3ekXwZaDojwhBxsnCS/b85qL3JqmwYrnKG4j7qbf2gU1tIDpka0cQhJaSY
+OC0XphoqYHtPDcGIli4BmplMKGoKnJ9VJcEMC9vCdmnkHfjJMVnKZJZW1XK5runL
+jJylfE7TatG7U1tIpHgeZkOX2EduwwTp5/O/dnhPuFfVt8A5BAbROAV/jSCwrabK
+C+GdrLT/4PRu2Xh647JK
+=KZoA
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/plasma-nm/files/plasma-nm-0.9.3.5-openconnect.patch b/kde-misc/plasma-nm/files/plasma-nm-0.9.3.5-openconnect.patch
deleted file mode 100644
index 43efb16fef36..000000000000
--- a/kde-misc/plasma-nm/files/plasma-nm-0.9.3.5-openconnect.patch
+++ /dev/null
@@ -1,221 +0,0 @@
-From: David Woodhouse <David.Woodhouse@intel.com>
-Date: Wed, 03 Dec 2014 14:10:44 +0000
-Subject: Update OpenConnect support for library version 5
-X-Git-Url: http://quickgit.kde.org/?p=plasma-nm.git&a=commitdiff&h=3e6585fa4dd2fb3d9b59c7704bd3d7ae5b2c4167
----
-Update OpenConnect support for library version 5
-
-String ownership rules are now very simple: the library never takes ownership
-of a string it's passed. It always takes its *own* copy and is responsible
-for freeing that. Mostly driven by Windows DLL Hell where it's painful to
-allocate in one library and free in another because they might actually be
-using different heaps.
-
-Also adapt to the changes in server certificate hash handling. We are no
-longer supposed to just compare strings, and must call the relevant function
-to check a hash against the server's certificate. This gives better matching
-and allows libopenconnect to upgrade the hash in future when it becomes
-necessary.
----
-Backported from upstream
-
-Signed-off-by: Markos Chandras <hwoarang@gentoo.org>
-X-Gentoo-Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=532294
----
---- a/vpn/openconnect/CMakeLists.txt
-+++ b/vpn/openconnect/CMakeLists.txt
-@@ -15,6 +15,8 @@
- 
-     if (${OPENCONNECT_VERSION} VERSION_GREATER ${MINIMUM_OPENCONNECT_VERSION_REQUIRED} OR
-         ${OPENCONNECT_VERSION} VERSION_EQUAL ${MINIMUM_OPENCONNECT_VERSION_REQUIRED})
-+
-+        include_directories(${OPENCONNECT_INCLUDE_DIRS})
- 
-         set(openconnect_SRCS
-         openconnectui.cpp
-
---- a/vpn/openconnect/openconnectauth.cpp
-+++ b/vpn/openconnect/openconnectauth.cpp
-@@ -161,7 +161,7 @@
-     }
-     if (!dataMap[NM_OPENCONNECT_KEY_CACERT].isEmpty()) {
-         const QByteArray crt = QFile::encodeName(dataMap[NM_OPENCONNECT_KEY_CACERT]);
--        openconnect_set_cafile(d->vpninfo, strdup(crt.data()));
-+        openconnect_set_cafile(d->vpninfo, OC3DUP(crt.data()));
-     }
-     if (dataMap[NM_OPENCONNECT_KEY_CSD_ENABLE] == "yes") {
-         char *wrapper;
-@@ -174,12 +174,12 @@
-     }
-     if (!dataMap[NM_OPENCONNECT_KEY_PROXY].isEmpty()) {
-         const QByteArray proxy = QFile::encodeName(dataMap[NM_OPENCONNECT_KEY_PROXY]);
--        openconnect_set_http_proxy(d->vpninfo, strdup(proxy.data()));
-+        openconnect_set_http_proxy(d->vpninfo, OC3DUP(proxy.data()));
-     }
-     if (!dataMap[NM_OPENCONNECT_KEY_USERCERT].isEmpty()) {
-         const QByteArray crt = QFile::encodeName(dataMap[NM_OPENCONNECT_KEY_USERCERT]);
-         const QByteArray key = QFile::encodeName(dataMap[NM_OPENCONNECT_KEY_PRIVKEY]);
--        openconnect_set_client_cert (d->vpninfo, strdup(crt.data()), strdup(key.data()));
-+        openconnect_set_client_cert (d->vpninfo, OC3DUP(crt.data()), OC3DUP(key.data()));
- 
-         if (!crt.isEmpty() && dataMap[NM_OPENCONNECT_KEY_PEM_PASSPHRASE_FSID] == "yes") {
-             openconnect_passphrase_from_fsid(d->vpninfo);
-@@ -276,10 +276,10 @@
-     const VPNHost &host = d->hosts.at(i);
-     if (openconnect_parse_url(d->vpninfo, host.address.toAscii().data())) {
-         kWarning() << "Failed to parse server URL" << host.address;
--        openconnect_set_hostname(d->vpninfo, strdup(host.address.toAscii().data()));
-+        openconnect_set_hostname(d->vpninfo, OC3DUP(host.address.toAscii().data()));
-     }
-     if (!openconnect_get_urlpath(d->vpninfo) && !host.group.isEmpty())
--        openconnect_set_urlpath(d->vpninfo, strdup(host.group.toAscii().data()));
-+        openconnect_set_urlpath(d->vpninfo, OC3DUP(host.group.toAscii().data()));
-     d->secrets["lasthost"] = host.name;
-     addFormInfo(QLatin1String("dialog-information"), i18n("Contacting host, please wait..."));
-     d->worker->start();
-@@ -301,9 +301,13 @@
-     secrets.insert(QLatin1String(NM_OPENCONNECT_KEY_COOKIE), QLatin1String(openconnect_get_cookie(d->vpninfo)));
-     openconnect_clear_cookie(d->vpninfo);
- 
-+#if OPENCONNECT_CHECK_VER(5,0)
-+    const char *fingerprint = openconnect_get_peer_cert_hash(d->vpninfo);
-+#else
-     OPENCONNECT_X509 *cert = openconnect_get_peer_cert(d->vpninfo);
-     char fingerprint[41];
-     openconnect_get_cert_sha1(d->vpninfo, cert, fingerprint);
-+#endif
-     secrets.insert(QLatin1String(NM_OPENCONNECT_KEY_GWCERT), QLatin1String(fingerprint));
-     secrets.insert(QLatin1String("certsigs"), d->certificateFingerprints.join("\t"));
-     secrets.insert(QLatin1String("autoconnect"), d->ui.chkAutoconnect->isChecked() ? "yes" : "no");
-@@ -578,14 +582,14 @@
-             if (opt->type == OC_FORM_OPT_PASSWORD || opt->type == OC_FORM_OPT_TEXT) {
-                 KLineEdit *le = qobject_cast<KLineEdit*>(widget);
-                 QByteArray text = le->text().toUtf8();
--                opt->value = strdup(text.data());
-+                openconnect_set_option_value(opt, text.data());
-                 if (opt->type == OC_FORM_OPT_TEXT) {
-                     d->secrets.insert(key,le->text());
-                 }
-             } else if (opt->type == OC_FORM_OPT_SELECT) {
-                 KComboBox *cbo = qobject_cast<KComboBox*>(widget);
-                 QByteArray text = cbo->itemData(cbo->currentIndex()).toString().toAscii();
--                opt->value = strdup(text.data());
-+                openconnect_set_option_value(opt, text.data());
-                 d->secrets.insert(key,cbo->itemData(cbo->currentIndex()).toString());
-             }
-         }
-
---- a/vpn/openconnect/openconnectauthworkerthread.cpp
-+++ b/vpn/openconnect/openconnectauthworkerthread.cpp
-@@ -43,6 +43,20 @@
- class OpenconnectAuthStaticWrapper
- {
- public:
-+#if OPENCONNECT_CHECK_VER(5,0)
-+    static int writeNewConfig(void *obj, const char *str, int num)
-+    {
-+        if (obj)
-+            return static_cast<OpenconnectAuthWorkerThread*>(obj)->writeNewConfig(str, num);
-+        return -1;
-+    }
-+    static int validatePeerCert(void *obj, const char *str)
-+    {
-+        if (obj)
-+            return static_cast<OpenconnectAuthWorkerThread*>(obj)->validatePeerCert(NULL, str);
-+        return -1;
-+    }
-+#else
-     static int writeNewConfig(void *obj, char *str, int num)
-     {
-         if (obj)
-@@ -55,7 +69,8 @@
-             return static_cast<OpenconnectAuthWorkerThread*>(obj)->validatePeerCert(cert, str);
-         return -1;
-     }
--    static int processAuthForm(void *obj, struct oc_auth_form *form)
-+#endif
-+	static int processAuthForm(void *obj, struct oc_auth_form *form)
-     {
-         if (obj)
-             return static_cast<OpenconnectAuthWorkerThread*>(obj)->processAuthFormP(form);
-@@ -108,7 +123,7 @@
-     return m_openconnectInfo;
- }
- 
--int OpenconnectAuthWorkerThread::writeNewConfig(char *buf, int buflen)
-+int OpenconnectAuthWorkerThread::writeNewConfig(const char *buf, int buflen)
- {
-     Q_UNUSED(buflen)
-     if (*m_userDecidedToQuit)
-@@ -139,10 +154,16 @@
- }
- #endif
- 
--int OpenconnectAuthWorkerThread::validatePeerCert(OPENCONNECT_X509 *cert, const char *reason)
--{
--    if (*m_userDecidedToQuit)
--        return -EINVAL;
-+int OpenconnectAuthWorkerThread::validatePeerCert(void *cert, const char *reason)
-+{
-+    if (*m_userDecidedToQuit)
-+        return -EINVAL;
-+
-+#if OPENCONNECT_CHECK_VER(5,0)
-+    (void)cert;
-+    const char *fingerprint = openconnect_get_peer_cert_hash(m_openconnectInfo);
-+    char *details = openconnect_get_peer_cert_details(m_openconnectInfo);
-+#else
-     char fingerprint[41];
-     int ret = 0;
- 
-@@ -151,7 +172,7 @@
-         return ret;
- 
-     char *details = openconnect_get_cert_details(m_openconnectInfo, cert);
--
-+#endif
-     bool accepted = false;
-     m_mutex->lock();
-     QString qFingerprint(fingerprint);
-@@ -160,7 +181,7 @@
-     emit validatePeerCert(qFingerprint, qCertinfo, qReason, &accepted);
-     m_waitForUserInput->wait(m_mutex);
-     m_mutex->unlock();
--    ::free(details);
-+    openconnect_free_cert_info(m_openconnectInfo, details);
-     if (*m_userDecidedToQuit)
-         return -EINVAL;
- 
-
---- a/vpn/openconnect/openconnectauthworkerthread.h
-+++ b/vpn/openconnect/openconnectauthworkerthread.h
-@@ -59,6 +59,17 @@
- #define OC_FORM_RESULT_NEWGROUP	2
- #endif
- 
-+#if OPENCONNECT_CHECK_VER(4,0)
-+#define OC3DUP(x)			(x)
-+#else
-+#define openconnect_set_option_value(opt, val) do { \
-+		struct oc_form_opt *_o = (opt);				\
-+		free(_o->value); _o->value = strdup(val);		\
-+	} while (0)
-+#define openconnect_free_cert_info(v, x) ::free(x)
-+#define OC3DUP(x)			strdup(x)
-+#endif
-+
- #include <QThread>
- 
- class QMutex;
-@@ -85,8 +96,8 @@
-     void run();
- 
- private:
--    int writeNewConfig(char *, int);
--    int validatePeerCert(OPENCONNECT_X509 *, const char *);
-+    int writeNewConfig(const char *, int);
-+    int validatePeerCert(void *, const char *);
-     int processAuthFormP(struct oc_auth_form *);
-     void writeProgress(int level, const char *, va_list);
- 
-
diff --git a/kde-misc/plasma-nm/plasma-nm-0.9.3.5.ebuild b/kde-misc/plasma-nm/plasma-nm-0.9.3.5.ebuild
deleted file mode 100644
index 3e83080ae802..000000000000
--- a/kde-misc/plasma-nm/plasma-nm-0.9.3.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/plasma-nm/plasma-nm-0.9.3.5.ebuild,v 1.6 2015/05/13 09:33:03 ago Exp $
-
-EAPI=5
-
-KDE_LINGUAS="ar bg bs ca ca@valencia cs da de el en_GB eo es et fa fi fr ga gl
-hr hu is it ja km ko lt lv mai mr ms nb nds nl nn pa pl pt pt_BR ro ru sk
-sl sr sr@ijekavian sr@ijekavianlatin sr@latin sv th tr ug uk zh_CN zh_TW"
-DECLARATIVE_REQUIRED="always"
-inherit kde4-base
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	KEYWORDS="amd64 x86"
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-else
-	KEYWORDS=""
-fi
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-HOMEPAGE="https://projects.kde.org/projects/playground/network/plasma-nm"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="4"
-IUSE="debug modemmanager openconnect"
-
-RDEPEND="
-	>=net-libs/libnm-qt-0.9.8.2[modemmanager?]
-	net-misc/mobile-broadband-provider-info
-	>=net-misc/networkmanager-0.9.8.0
-	modemmanager? ( >=net-libs/libmm-qt-1.0.0 )
-	openconnect? (
-		net-misc/networkmanager-openconnect
-		net-misc/openconnect
-	)
-	!kde-misc/networkmanagement
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-PATCHES=( "${FILESDIR}"/${P}-openconnect.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use !modemmanager DISABLE_MODEMMANAGER_SUPPORT)
-		$(cmake-utils_use_find_package openconnect OpenConnect)
-	)
-
-	kde4-base_src_configure
-}