Revert 'libnm-gtk: default to system CA certificates for validation for new connections', bug #497296 by mateakos. Drop old.

(Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

7 files changed, 98 insertions, 194 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index 452ade7b4a57..c029d47977e8 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for gnome-extra/nm-applet
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.110 2013/12/08 18:58:50 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.111 2014/01/10 20:32:13 pacho Exp $
+
+*nm-applet-0.9.8.8-r1 (10 Jan 2014)
+
+  10 Jan 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/nm-applet-0.9.8.8-revert-ca-certificates.patch,
+  +nm-applet-0.9.8.8-r1.ebuild,
+  -files/nm-applet-0.9.6.4-systray-icon-size.patch,
+  -files/nm-applet-0.9.8.4-autostart.patch, -nm-applet-0.9.6.4-r1.ebuild,
+  -nm-applet-0.9.8.2.ebuild, -nm-applet-0.9.8.4.ebuild:
+  Revert 'libnm-gtk: default to system CA certificates for validation for new
+  connections', bug #497296 by mateakos. Drop old.
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> nm-applet-0.9.8.8.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.9.6.4-systray-icon-size.patch b/gnome-extra/nm-applet/files/nm-applet-0.9.6.4-systray-icon-size.patch
deleted file mode 100644
index c06d47e150ee..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-0.9.6.4-systray-icon-size.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d6f5bd36387d278e60ffc746f79d2b1851fc441a Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Mon, 08 Apr 2013 19:48:23 +0000
-Subject: applet: improve icon size handling
-
-Always return an icon of exactly the requested size, and let that size
-be less than 16. Fixes the display in various non-GNOME panels.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=698901
----
-diff --git a/src/applet.c b/src/applet.c
-index 6c39509..a213173 100644
---- a/src/applet.c
-+++ b/src/applet.c
-@@ -3321,7 +3321,7 @@ nma_icon_check_and_load (const char *name, GdkPixbuf **icon, NMApplet *applet)
- 	/* Try to load the icon; if the load fails, log the problem, and set
- 	 * the icon to the fallback icon if requested.
- 	 */
--	*icon = gtk_icon_theme_load_icon (applet->icon_theme, name, applet->icon_size, 0, &error);
-+	*icon = gtk_icon_theme_load_icon (applet->icon_theme, name, applet->icon_size, GTK_ICON_LOOKUP_FORCE_SIZE, &error);
- 	if (!*icon) {
- 		g_warning ("Icon %s missing: (%d) %s",
- 		           name,
-@@ -3425,13 +3425,13 @@ status_icon_size_changed_cb (GtkStatusIcon *icon,
-                              NMApplet *applet)
- {
- 	if (getenv ("NMA_SIZE_DEBUG")) {
--		g_message ("%s(): status icon size now %d", __func__, size);
-+		g_message ("%s(): status icon size %d requested", __func__, size);
- 	}
- 
- 	/* icon_size may be 0 if for example the panel hasn't given us any space
- 	 * yet.  We'll get resized later, but for now just load the 16x16 icons.
- 	 */
--	applet->icon_size = MAX (16, size);
-+	applet->icon_size = size ? size : 16;
- 
- 	nma_icons_reload (applet);
- 
---
-cgit v0.9.2
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.9.8.4-autostart.patch b/gnome-extra/nm-applet/files/nm-applet-0.9.8.4-autostart.patch
deleted file mode 100644
index 512551f5f3be..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-0.9.8.4-autostart.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From db0e5f4ac25dba28d0943b6cbca7b2dd9282ab9e Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 15 Sep 2013 20:46:49 -0400
-Subject: [PATCH] Allow nm-applet to autostart for gnome3 fallback sessions
-
-Gentoo's patched gnome-session-2.32.1-r3 will also autostart it.
----
- nm-applet.desktop.in | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/nm-applet.desktop.in b/nm-applet.desktop.in
-index 8f94a88..20d9aff 100644
---- a/nm-applet.desktop.in
-+++ b/nm-applet.desktop.in
-@@ -6,7 +6,8 @@ Exec=nm-applet
- Terminal=false
- Type=Application
- NoDisplay=true
--NotShowIn=KDE;GNOME;
-+NotShowIn=KDE;
-+AutostartCondition=GNOME3 if-session gnome-fallback
- X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=NetworkManager
- X-GNOME-Bugzilla-Component=nm-applet
--- 
-1.8.3.2
-
diff --git a/gnome-extra/nm-applet/files/nm-applet-0.9.8.8-revert-ca-certificates.patch b/gnome-extra/nm-applet/files/nm-applet-0.9.8.8-revert-ca-certificates.patch
new file mode 100644
index 000000000000..32d501ca24a6
--- /dev/null
+++ b/gnome-extra/nm-applet/files/nm-applet-0.9.8.8-revert-ca-certificates.patch
@@ -0,0 +1,74 @@
+From c798c40c5dce3bc6d9b615621cefe59660b5a504 Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Tue, 29 Oct 2013 20:07:38 +0000
+Subject: Revert "libnm-gtk: default to system CA certificates for validation for new connections"
+
+This reverts commit 3021ce121b162fc69ec2fd800776a5dd28d72042.
+
+For EAP connections it usually does not make sense to validate the
+certificate with the system CA store. User mostly either want to
+provide the one exact certificate (ca-cert) or don't do any validation
+at all.
+
+Previously, nm-connection-editor set the property system-ca-certs=true
+for new connections, but there was no field in the UI to unset this
+setting. This effectively meant, that if the user did not provide a
+valid ca-cert (or put the certificate in the system wide store) the
+connection could not be established.
+
+Change the behavior, so that new connections created by nm-c-e don't
+have system-ca-certs set.
+
+The system-ca-certs property cannot be configured from the UI and nm-c-e
+will not touch it in existing connection. This makes sense, because referring
+to the system store is not a common use case. On the other hand, users who
+*really* want to use this option, can do so using e.g. nmcli. In that case,
+nm-c-e will not tamper with the setting.
+
+Connections that were created by older versions of nm-c-e might be
+unable to connect. The system-ca-certs option can be unset with:
+
+  $ nmcli connection modify id "$ID" 802-1x.system-ca-certs false
+
+https://bugzilla.gnome.org/show_bug.cgi?id=702608
+
+Signed-off-by: Thomas Haller <thaller@redhat.com>
+---
+diff --git a/src/wireless-security/eap-method-leap.c b/src/wireless-security/eap-method-leap.c
+index ad5d369..44f2342 100644
+--- a/src/wireless-security/eap-method-leap.c
++++ b/src/wireless-security/eap-method-leap.c
+@@ -98,7 +98,6 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
+ 	if (method->new_connection) {
+ 		g_object_set (s_8021x,
+ 		              NM_SETTING_802_1X_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
+-		              NM_SETTING_802_1X_SYSTEM_CA_CERTS, TRUE,
+ 		              NULL);
+ 	}
+ }
+diff --git a/src/wireless-security/eap-method-simple.c b/src/wireless-security/eap-method-simple.c
+index 117997b..74830bc 100644
+--- a/src/wireless-security/eap-method-simple.c
++++ b/src/wireless-security/eap-method-simple.c
+@@ -162,7 +162,6 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
+ 	if (method->new_connection && (not_saved == FALSE)) {
+ 		g_object_set (s_8021x,
+ 		              NM_SETTING_802_1X_PASSWORD_FLAGS, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
+-		              NM_SETTING_802_1X_SYSTEM_CA_CERTS, TRUE,
+ 		              NULL);
+ 	}
+ }
+diff --git a/src/wireless-security/eap-method-tls.c b/src/wireless-security/eap-method-tls.c
+index b57d1ed..a48b491 100644
+--- a/src/wireless-security/eap-method-tls.c
++++ b/src/wireless-security/eap-method-tls.c
+@@ -186,7 +186,6 @@ fill_connection (EAPMethod *parent, NMConnection *connection)
+ 	if (method->new_connection) {
+ 		g_object_set (s_8021x,
+ 		              secret_flag_prop, NM_SETTING_SECRET_FLAG_AGENT_OWNED,
+-		              NM_SETTING_802_1X_SYSTEM_CA_CERTS, TRUE,
+ 		              NULL);
+ 	}
+ 
+--
+cgit v0.9.2
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.6.4-r1.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.6.4-r1.ebuild
deleted file mode 100644
index a403b6a3690d..000000000000
--- a/gnome-extra/nm-applet/nm-applet-0.9.6.4-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.6.4-r1.ebuild,v 1.1 2013/06/10 10:08:14 sping Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~ssuominen/pngcrush-fixed-nm-signal-icons.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="bluetooth gconf"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=dev-libs/glib-2.26:2
-	>=dev-libs/dbus-glib-0.88
-	>=gnome-base/gnome-keyring-2.20
-	>=sys-apps/dbus-1.4.1
-	>=sys-auth/polkit-0.96-r1
-	>=x11-libs/gtk+-3:3
-	>=x11-libs/libnotify-0.7.0
-
-	app-text/iso-codes
-	>=net-misc/networkmanager-0.9.6
-	net-misc/mobile-broadband-provider-info
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )
-	gconf? ( >=gnome-base/gconf-2.20:2 )
-	virtual/freedesktop-icon-theme"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40"
-
-src_prepare() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		--with-gtkver=3
-		--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		$(use_with bluetooth)
-		$(use_enable gconf migration)"
-
-	mv -f "${WORKDIR}"/nm-signal-*.png icons/22/
-
-	gnome2_src_prepare
-
-	epatch "${FILESDIR}"/${PN}-0.9.6.4-systray-icon-size.patch
-}
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.8.2.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.8.2.ebuild
deleted file mode 100644
index 5aa8de978720..000000000000
--- a/gnome-extra/nm-applet/nm-applet-0.9.8.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.8.2.ebuild,v 1.4 2013/11/20 13:15:49 leio Exp $
-
-EAPI=5
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_ORG_MODULE="network-manager-applet"
-
-inherit eutils gnome2
-
-DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-IUSE="bluetooth gconf +introspection modemmanager"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND="
-	app-crypt/libsecret
-	>=dev-libs/glib-2.26:2
-	>=dev-libs/dbus-glib-0.88
-	>=sys-apps/dbus-1.4.1
-	>=sys-auth/polkit-0.96-r1
-	>=x11-libs/gtk+-3:3[introspection?]
-	>=x11-libs/libnotify-0.7.0
-
-	app-text/iso-codes
-	>=net-misc/networkmanager-0.9.8[introspection?]
-	net-misc/mobile-broadband-provider-info
-
-	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )
-	gconf? (
-		>=gnome-base/gconf-2.20:2
-		gnome-base/libgnome-keyring )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )
-	modemmanager? ( >=net-misc/modemmanager-0.7.990 )
-	virtual/freedesktop-icon-theme
-	virtual/udev[gudev]
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-"
-
-src_configure() {
-	gnome2_src_configure \
-		--with-gtkver=3 \
-		--disable-more-warnings \
-		--disable-static \
-		--localstatedir=/var \
-		$(use_with bluetooth) \
-		$(use_enable gconf migration) \
-		$(use_enable introspection) \
-		$(use_with modemmanager modem-manager-1)
-}
diff --git a/gnome-extra/nm-applet/nm-applet-0.9.8.4.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.8.8-r1.ebuild
index b42095e427c2..50f918fd969e 100644
--- a/gnome-extra/nm-applet/nm-applet-0.9.8.4.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.9.8.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.8.4.ebuild,v 1.2 2013/11/20 13:15:49 leio Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.8.8-r1.ebuild,v 1.1 2014/01/10 20:32:13 pacho Exp $
 
 EAPI=5
 GCONF_DEBUG="no"
@@ -10,7 +10,7 @@ GNOME_ORG_MODULE="network-manager-applet"
 inherit eutils gnome2
 
 DESCRIPTION="GNOME applet for NetworkManager"
-HOMEPAGE="http://projects.gnome.org/NetworkManager/"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -44,13 +44,6 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.40
 "
 
-src_prepare() {
-	# Allow nm-applet to autostart in gnome-2 and gnome-3.6 fallback sessions
-	epatch "${FILESDIR}/${PN}-0.9.8.4-autostart.patch"
-
-	gnome2_src_prepare
-}
-
 src_configure() {
 	gnome2_src_configure \
 		--with-gtkver=3 \
@@ -62,3 +55,11 @@ src_configure() {
 		$(use_enable introspection) \
 		$(use_with modemmanager modem-manager-1)
 }
+
+src_prepare() {
+	# Revert "libnm-gtk: default to system CA certificates for validation for new connections"
+	# bug #497296 (from 'master')
+	epatch "${FILESDIR}/${PN}-0.9.8.8-revert-ca-certificates.patch"
+
+	gnome2_src_prepare
+}