summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2014-09-23 11:56:04 +0000
committerPacho Ramos <pacho@gentoo.org>2014-09-23 11:56:04 +0000
commit0e9fad33530ac50f732641a097f808920e6d7b2e (patch)
tree349319e68f69f0f6edd74e90b6dad26fd4ef7ad3 /gnome-extra
parentbump; several minor fixes; added systemd support, wrt bug 353492 (diff)
downloadhistorical-0e9fad33530ac50f732641a097f808920e6d7b2e.tar.gz
historical-0e9fad33530ac50f732641a097f808920e6d7b2e.tar.bz2
historical-0e9fad33530ac50f732641a097f808920e6d7b2e.zip
Version bump, drop old
Package-Manager: portage-2.2.12/cvs/Linux x86_64 Manifest-Sign-Key: 0xA188FBD4
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/nm-applet/ChangeLog9
-rw-r--r--gnome-extra/nm-applet/Manifest17
-rw-r--r--gnome-extra/nm-applet/files/nm-applet-0.9.8.8-revert-ca-certificates.patch74
-rw-r--r--gnome-extra/nm-applet/nm-applet-0.9.10.0.ebuild (renamed from gnome-extra/nm-applet/nm-applet-0.9.8.8-r2.ebuild)21
4 files changed, 20 insertions, 101 deletions
diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index 7e60ecea59c5..9d73735a142e 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for gnome-extra/nm-applet
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.121 2014/07/24 18:10:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.122 2014/09/23 11:56:02 pacho Exp $
+
+*nm-applet-0.9.10.0 (23 Sep 2014)
+
+ 23 Sep 2014; Pacho Ramos <pacho@gentoo.org> +nm-applet-0.9.10.0.ebuild,
+ -files/nm-applet-0.9.8.8-revert-ca-certificates.patch,
+ -nm-applet-0.9.8.8-r2.ebuild:
+ Version bump, drop old
24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
nm-applet-0.9.8.10-r1.ebuild, nm-applet-0.9.8.8-r2.ebuild:
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index d39cc375c504..e36da8332002 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,21 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
-AUX nm-applet-0.9.8.8-revert-ca-certificates.patch 3205 SHA256 e47f1758b19e7108488e9f19860842f5cf881046391148592c549d3bf08b81a3 SHA512 3482851570a98982b45f18b360064d7d432b223d2c9266f3f19924a9bdc7faf4c065a8b75a0ea364da558da162dc1b57574194c3389a167c3039f3a0065117f1 WHIRLPOOL 6effcb87ee41457d8292ce4f6cfc496d58acfc0a0619366f37a510be810e11c6b5039c5a20cb8d7f53d6505f741b735c616390ccea787c78eaa670700a3a938d
+DIST network-manager-applet-0.9.10.0.tar.xz 1274656 SHA256 f5c26c692f538dc0145dc7d46d3d390754fad73d0ff06861c074c61f3dc54eca SHA512 d9472bb6613fa8feb7bbde15932542adcfdb99897d6f1376ea4d511a6ff785debb0b4dd630deb7dc6ba2c244ca2487a00cd8c758274a914d61864370226e2b1d WHIRLPOOL 8f03dabe55a29d24cb0959b4a36c63ca31a4866e6af04dbc8e0eed575c148d674d583d5e039721e9a6eed7a0115943d130dea9b0bce39ec167a3376a92b00365
DIST network-manager-applet-0.9.8.10.tar.xz 1234720 SHA256 46fee9a1e667d1826e6a94bb6bd2e6bdbde535fc995e534542f5f7e8b8dae0cb SHA512 c943eff9eaba1f28ad9101c659d4e3da72d6190dd7fd58f3c3d54bcc53c21ec33247aee6dc7a3d7348efd905876f699c39fb3f64cf46f5f627a3976deaa06fa2 WHIRLPOOL 070e4fc914f5db60fc5e66884c7a1868a49cc011556685c9f64505e55d7c59ac749f9828c8fdf31c1e5e727b640943ea9663c6ef0139adb634f64097c4b4f243
-DIST network-manager-applet-0.9.8.8.tar.xz 1223116 SHA256 581ebf9ead919e33d7e910322c2f64919f98716d8636f1a640b72c9b2e3ba9eb SHA512 a43cb00ac60b9401a035aac22a3384625624ca7e3b852106c55c1dc79a6a409d68f482615df6420778cafee0eb38e0088768198de78af52358db48ce9b7222f7 WHIRLPOOL 25dee2f0bb411182c9670cf78e536576521ba65e9aaddd301f899d0c22e954c18b6050ffb4eb9b89f492ccc5304195765a21824c8992bc2ca0d4881299e02253
+EBUILD nm-applet-0.9.10.0.ebuild 1493 SHA256 046e7591857e0da028194464827df0a5a87b6cef8f98d1dee1eea973dd6b1910 SHA512 b627ca7ff542a277035b244ad2c960e7ba2a217b7e533b59ab21d5f67ad218c0dcc297449825205fef27d096aee1152da6b4a5e3feddcac3bdc2f278dbb33afe WHIRLPOOL 8f051146bb8dfbb22480d15b4b983fe7ce9e5367084f40c73688a8703a96959957beb63e52d9b4133928da435e1de99fbf0bc098525f10ad3e14e819c0f5ec1f
EBUILD nm-applet-0.9.8.10-r1.ebuild 1556 SHA256 f3339c3db5a3a6129982f92aedd20ffcffd7cff967c16c863920511126943f12 SHA512 b5d082c3c9d37a0eb6a7197462549593c566063e89a027de4c7d86a387776e4f31ceec0b359c2f32cbe7dce0fb0f3c65b6fd96283bc81ae65eca3c6806875df1 WHIRLPOOL a90c7f2ca46dc398d9abb086db97d51e92592e9c364e2cb170f1d8cd6ac9c375aa9781ed0938e89cef3aa712cd79a506fbf947328d29e651d6588da719bf22d7
-EBUILD nm-applet-0.9.8.8-r2.ebuild 1783 SHA256 219bc5a451c723ec436c1265b5da3e429dec52140b03827f5cb531f0c840d9b5 SHA512 f6c53c8b450ffa10765435d136a3c613b389f94319d11b6e5ccb23e70ad115e3041bd7e4194563e7a75e49fca030357ddecdabfe406ce46c37e21973a4e9d0dc WHIRLPOOL a4e0ad1d9718285cf4707bff60c89c903d17bf3d1814be12dd273129882ca2f7c170bcb5b698a0ee72af92313979038978eeee2ef28f3613502f9b823da01d03
-MISC ChangeLog 20795 SHA256 ab76225178217c84a6e976a56cac96a59f0713f97e91a52483b4614956e73b52 SHA512 6a8dd7d0c2a8885a360386746733c2aeac7f499ac0daaa321467cd05187ce39d4e5fc38d3b275c55464bdcfe39669ad2b1df6244116182cf8beea1bdc775960d WHIRLPOOL 1831dfb3e43c91fff9031527a1908fa5b2d0a072c50cd146c9e49d0f978c18ba846593b2515ded179ae8396ac67fd5830c1e7abd4b930de25572264ded39d90b
+MISC ChangeLog 21015 SHA256 886be256bf527dcefe99c68be36b7e4d851c996375f11f98911767e377f1ff60 SHA512 4836078b7ae3e80899a14c264408fffade9c1bca3a64d649583ce1e35fb127adfa656803a3c119c524132dee730f686843084da7374c07e988be8c2775b60380 WHIRLPOOL 65f690fc9b67edb6407bb98755dd424f4b4a4a8ea573d8d41b445dc31e70254f6b7faf9ce649daf31fc3ee0dd71a33dd138df1ceb0af93842fc369ee6c65e58d
MISC metadata.xml 386 SHA256 11ac59c3d3e6aa7d2960358ccadc66df45e823c6cc88433a74810f03f39caec9 SHA512 6b9b209da423954b94a97de7d8e6f4d398d62e6527b3a387de1787da9fec77d5c9a71d52497598d6379df5a7427b736b1e7674a834120ebe88e8f1a2cac2c048 WHIRLPOOL 7158c5dc3f39b3586e289e28972dfa9cdccc6e8b34ebe8b0bdf02406535a7d46e2386ad934ce650ca3832ac5f388bfca6d9e37d76f88baf9cfedb99ae072f7d2
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQEcBAEBCAAGBQJT0UwTAAoJEEdUh39IaPFNTtgH/1mL4IKVwQzL1EiMh3LhX7vu
-1vCuTrjxrKpMq6GW1y3IFTIasapjXGoAVh1sKuXfLNIvmKhw+UycSOqqodZS8WTh
-bD7DY4IoMasthjDpeG1HaQc6n5XjfZOUFY8p5bJnHltknncMEkXbbpQk3E7OrSTU
-sftp35r45lYFxXx62twj6aurjr7WqRdcGIfHm6NqyX0EiJV6i+DbP6WtZ7nHPcEa
-sCc0NrMy/oh/PGINJ009cN24X8dqAGlLnEwt8LZUhjCfmebZYgEjoHjIgyhC0N2T
-AonhONm2dd7koVYZipaafMw2ZdCiUDLv6rA9Ihp1X9aoJXH443cQFs4878c8DDs=
-=LN7l
+iEYEAREIAAYFAlQhX9QACgkQCaWpQKGI+9TurgCdH0UlresMTNTFIcn+e00zBoa6
+rP4An15zpz6fFSv54L59myjYbgMc4F3k
+=0y+I
-----END PGP SIGNATURE-----
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
deleted file mode 100644
index 32d501ca24a6..000000000000
--- a/gnome-extra/nm-applet/files/nm-applet-0.9.8.8-revert-ca-certificates.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-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.8.8-r2.ebuild b/gnome-extra/nm-applet/nm-applet-0.9.10.0.ebuild
index 9bd778685029..08cfb117c35c 100644
--- a/gnome-extra/nm-applet/nm-applet-0.9.8.8-r2.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.9.10.0.ebuild
@@ -1,13 +1,13 @@
# 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.8-r2.ebuild,v 1.2 2014/07/24 18:10:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.9.10.0.ebuild,v 1.1 2014/09/23 11:56:02 pacho Exp $
EAPI=5
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
GNOME_ORG_MODULE="network-manager-applet"
-inherit eutils gnome2
+inherit gnome2
DESCRIPTION="GNOME applet for NetworkManager"
HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
@@ -15,19 +15,19 @@ HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
LICENSE="GPL-2+"
SLOT="0"
IUSE="bluetooth gconf +introspection modemmanager"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS=" ~amd64 ~x86"
RDEPEND="
app-crypt/libsecret
- >=dev-libs/glib-2.26:2
+ >=dev-libs/glib-2.32: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/gtk+-3.4:3[introspection?]
>=x11-libs/libnotify-0.7.0
app-text/iso-codes
- >=net-misc/networkmanager-0.9.8[introspection?]
+ >=net-misc/networkmanager-0.9.9.95[introspection?]
net-misc/mobile-broadband-provider-info
bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6:= )
@@ -47,7 +47,6 @@ DEPEND="${RDEPEND}
src_configure() {
gnome2_src_configure \
- --with-gtkver=3 \
--disable-more-warnings \
--disable-static \
--localstatedir=/var \
@@ -56,11 +55,3 @@ 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
-}