1 |
commit: 5a961cd3d1a61f52cb683c81884767493578035c |
2 |
Author: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Feb 6 09:39:37 2021 +0000 |
4 |
Commit: Mart Raudsepp <leio <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 6 09:57:04 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a961cd3 |
7 |
|
8 |
net-libs/libnma: remove old |
9 |
|
10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
11 |
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org> |
12 |
|
13 |
net-libs/libnma/Manifest | 1 - |
14 |
net-libs/libnma/files/1.8.28-nma-ws-leak-fix.patch | 86 ---------------------- |
15 |
net-libs/libnma/libnma-1.8.24.ebuild | 22 ------ |
16 |
net-libs/libnma/libnma-1.8.28.ebuild | 72 ------------------ |
17 |
4 files changed, 181 deletions(-) |
18 |
|
19 |
diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest |
20 |
index 411e28380aa..6cc656c73eb 100644 |
21 |
--- a/net-libs/libnma/Manifest |
22 |
+++ b/net-libs/libnma/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST libnma-1.8.28.tar.xz 1366584 BLAKE2B 598c2d310844930a5ed8b8d4b8bc0ae91193a8e62bccdb60050cc980cd37d198adf728b98694d9f1cf9f523998b865d9682fd271c88e434ead777ed5b69866b4 SHA512 d3996da3433493149edf0743b7f2280a83db2efc2228f04eddb773bbcb08ea2efcb640f781cb1d0a5cbabd8b25b1c612387682ff5239151d8ce249568e877f5b |
25 |
DIST libnma-1.8.30.tar.xz 1386248 BLAKE2B 7021e85595819b0cbd44b8c62087f49a5ecccc4bb230820d9a0159bf33b904df4f5c8021a79822c37d0933bdcde790a44f6d960b7f5f504e7506849aed35d54c SHA512 4d8f93d035fca4252e5c5dafc756ee6bc8f1d302aaeca77c5c0acb5d7f6cd4214224fb48e2706e69084c5a714aafa7837769be17d0642cc29eded9eb175a1107 |
26 |
|
27 |
diff --git a/net-libs/libnma/files/1.8.28-nma-ws-leak-fix.patch b/net-libs/libnma/files/1.8.28-nma-ws-leak-fix.patch |
28 |
deleted file mode 100644 |
29 |
index 8f2042a2568..00000000000 |
30 |
--- a/net-libs/libnma/files/1.8.28-nma-ws-leak-fix.patch |
31 |
+++ /dev/null |
32 |
@@ -1,86 +0,0 @@ |
33 |
-From 55e33e4ce01c8b2b8dc98a5ee40a5636579cd577 Mon Sep 17 00:00:00 2001 |
34 |
-From: Beniamino Galvani <bgalvani@××××××.com> |
35 |
-Date: Sat, 11 Apr 2020 15:44:17 +0200 |
36 |
-Subject: [PATCH] nma-ws: properly dispose wireless security objects |
37 |
- |
38 |
-Chain up to parent to properly free resources on dispose(). |
39 |
- |
40 |
-Fixes: b61cc1b9fa040 ("nma-ws: add") |
41 |
- |
42 |
-https://gitlab.gnome.org/GNOME/libnma/-/issues/7 |
43 |
---- |
44 |
- src/nma-ws/nma-ws-802-1x.c | 2 ++ |
45 |
- src/nma-ws/nma-ws-leap.c | 2 ++ |
46 |
- src/nma-ws/nma-ws-sae.c | 2 ++ |
47 |
- src/nma-ws/nma-ws-wep-key.c | 2 ++ |
48 |
- src/nma-ws/nma-ws-wpa-psk.c | 2 ++ |
49 |
- 5 files changed, 10 insertions(+) |
50 |
- |
51 |
-diff --git a/src/nma-ws/nma-ws-802-1x.c b/src/nma-ws/nma-ws-802-1x.c |
52 |
-index ba348266..0c148ce5 100644 |
53 |
---- a/src/nma-ws/nma-ws-802-1x.c |
54 |
-+++ b/src/nma-ws/nma-ws-802-1x.c |
55 |
-@@ -482,6 +482,8 @@ dispose (GObject *object) |
56 |
- g_clear_pointer (&self->secrets_hints, g_strfreev); |
57 |
- g_clear_pointer (&self->username, g_free); |
58 |
- g_clear_pointer (&self->password, g_free); |
59 |
-+ |
60 |
-+ G_OBJECT_CLASS (nma_ws_802_1x_parent_class)->dispose (object); |
61 |
- } |
62 |
- |
63 |
- static void |
64 |
-diff --git a/src/nma-ws/nma-ws-leap.c b/src/nma-ws/nma-ws-leap.c |
65 |
-index f90d43aa..df6d2dde 100644 |
66 |
---- a/src/nma-ws/nma-ws-leap.c |
67 |
-+++ b/src/nma-ws/nma-ws-leap.c |
68 |
-@@ -260,6 +260,8 @@ dispose (GObject *object) |
69 |
- NMAWsLeap *self = NMA_WS_LEAP (object); |
70 |
- |
71 |
- g_clear_object (&self->connection); |
72 |
-+ |
73 |
-+ G_OBJECT_CLASS (nma_ws_leap_parent_class)->dispose (object); |
74 |
- } |
75 |
- |
76 |
- static void |
77 |
-diff --git a/src/nma-ws/nma-ws-sae.c b/src/nma-ws/nma-ws-sae.c |
78 |
-index e3454bbd..00fb6ff5 100644 |
79 |
---- a/src/nma-ws/nma-ws-sae.c |
80 |
-+++ b/src/nma-ws/nma-ws-sae.c |
81 |
-@@ -252,6 +252,8 @@ dispose (GObject *object) |
82 |
- NMAWsSae *self = NMA_WS_SAE (object); |
83 |
- |
84 |
- g_clear_object (&self->connection); |
85 |
-+ |
86 |
-+ G_OBJECT_CLASS (nma_ws_sae_parent_class)->dispose (object); |
87 |
- } |
88 |
- |
89 |
- static void |
90 |
-diff --git a/src/nma-ws/nma-ws-wep-key.c b/src/nma-ws/nma-ws-wep-key.c |
91 |
-index cae8c272..992aabf7 100644 |
92 |
---- a/src/nma-ws/nma-ws-wep-key.c |
93 |
-+++ b/src/nma-ws/nma-ws-wep-key.c |
94 |
-@@ -404,6 +404,8 @@ dispose (GObject *object) |
95 |
- NMAWsWepKey *self = NMA_WS_WEP_KEY (object); |
96 |
- |
97 |
- g_clear_object (&self->connection); |
98 |
-+ |
99 |
-+ G_OBJECT_CLASS (nma_ws_wep_key_parent_class)->dispose (object); |
100 |
- } |
101 |
- |
102 |
- static void |
103 |
-diff --git a/src/nma-ws/nma-ws-wpa-psk.c b/src/nma-ws/nma-ws-wpa-psk.c |
104 |
-index 1c73922a..27604960 100644 |
105 |
---- a/src/nma-ws/nma-ws-wpa-psk.c |
106 |
-+++ b/src/nma-ws/nma-ws-wpa-psk.c |
107 |
-@@ -270,6 +270,8 @@ dispose (GObject *object) |
108 |
- NMAWsWpaPsk *self = NMA_WS_WPA_PSK (object); |
109 |
- |
110 |
- g_clear_object (&self->connection); |
111 |
-+ |
112 |
-+ G_OBJECT_CLASS (nma_ws_wpa_psk_parent_class)->dispose (object); |
113 |
- } |
114 |
- |
115 |
- static void |
116 |
--- |
117 |
-2.20.1 |
118 |
- |
119 |
|
120 |
diff --git a/net-libs/libnma/libnma-1.8.24.ebuild b/net-libs/libnma/libnma-1.8.24.ebuild |
121 |
deleted file mode 100644 |
122 |
index d088541fa52..00000000000 |
123 |
--- a/net-libs/libnma/libnma-1.8.24.ebuild |
124 |
+++ /dev/null |
125 |
@@ -1,22 +0,0 @@ |
126 |
-# Copyright 1999-2020 Gentoo Authors |
127 |
-# Distributed under the terms of the GNU General Public License v2 |
128 |
- |
129 |
-EAPI=7 |
130 |
- |
131 |
-DESCRIPTION="NetworkManager GUI library" |
132 |
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
133 |
- |
134 |
-LICENSE="GPL-2+" |
135 |
-SLOT="0" |
136 |
-IUSE="+introspection" |
137 |
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 ~sparc x86" |
138 |
- |
139 |
-# This is a transitional package for 1.8.24, but 1.16 version will be a real one split out of nm-applet by upstream |
140 |
-RDEPEND="~gnome-extra/nm-applet-${PV}[introspection?]" |
141 |
-DEPEND="${RDEPEND}" |
142 |
-BDEPEND="" |
143 |
- |
144 |
-S="${WORKDIR}" |
145 |
- |
146 |
-src_unpack() { :; } |
147 |
-src_install() { :; } |
148 |
|
149 |
diff --git a/net-libs/libnma/libnma-1.8.28.ebuild b/net-libs/libnma/libnma-1.8.28.ebuild |
150 |
deleted file mode 100644 |
151 |
index 140757c9ecb..00000000000 |
152 |
--- a/net-libs/libnma/libnma-1.8.28.ebuild |
153 |
+++ /dev/null |
154 |
@@ -1,72 +0,0 @@ |
155 |
-# Copyright 1999-2020 Gentoo Authors |
156 |
-# Distributed under the terms of the GNU General Public License v2 |
157 |
- |
158 |
-EAPI=7 |
159 |
- |
160 |
-inherit gnome.org gnome2-utils meson xdg vala |
161 |
- |
162 |
-DESCRIPTION="NetworkManager GUI library" |
163 |
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager" |
164 |
- |
165 |
-LICENSE="GPL-2+" |
166 |
-SLOT="0" |
167 |
-# pkcs11 default enabled as it's a small dep often already present by libnma users, and it was default enabled as IUSE=+gcr in nm-applet before |
168 |
-IUSE="gtk-doc +introspection +pkcs11 vala" |
169 |
-REQUIRED_USE="vala? ( introspection )" |
170 |
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" |
171 |
- |
172 |
-DEPEND=" |
173 |
- app-text/iso-codes |
174 |
- net-misc/mobile-broadband-provider-info |
175 |
- >=dev-libs/glib-2.38:2 |
176 |
- >=x11-libs/gtk+-3.10:3[introspection?] |
177 |
- >=net-misc/networkmanager-1.7[introspection?] |
178 |
- pkcs11? ( >=app-crypt/gcr-3.14:= ) |
179 |
- introspection? ( >=dev-libs/gobject-introspection-1.56:= ) |
180 |
-" |
181 |
-RDEPEND="${DEPEND} |
182 |
- !<gnome-extra/nm-applet-1.16.0" # gschema moved to here before nm-applet-1.16.0 |
183 |
-BDEPEND=" |
184 |
- dev-libs/libxml2 |
185 |
- >=sys-devel/gettext-0.19.8 |
186 |
- virtual/pkgconfig |
187 |
- gtk-doc? ( dev-util/gtk-doc |
188 |
- app-text/docbook-xml-dtd:4.3 ) |
189 |
- vala? ( $(vala_depend) |
190 |
- net-misc/networkmanager[vala] |
191 |
- ) |
192 |
-" |
193 |
- |
194 |
-PATCHES=( |
195 |
- "${FILESDIR}"/${PV}-nma-ws-leak-fix.patch |
196 |
-) |
197 |
- |
198 |
-src_prepare() { |
199 |
- use vala && vala_src_prepare |
200 |
- xdg_src_prepare |
201 |
-} |
202 |
- |
203 |
-src_configure() { |
204 |
- local emesonargs=( |
205 |
- -Dlibnma_gtk4=false |
206 |
- $(meson_use pkcs11 gcr) |
207 |
- -Dmore_asserts=0 |
208 |
- -Diso_codes=true |
209 |
- -Dmobile_broadband_provider_info=true |
210 |
- -Dld_gc=false |
211 |
- $(meson_use gtk-doc gtk_doc) |
212 |
- $(meson_use introspection) |
213 |
- $(meson_use vala vapi) |
214 |
- ) |
215 |
- meson_src_configure |
216 |
-} |
217 |
- |
218 |
-pkg_postinst() { |
219 |
- xdg_pkg_postinst |
220 |
- gnome2_schemas_update |
221 |
-} |
222 |
- |
223 |
-pkg_postrm() { |
224 |
- xdg_pkg_postrm |
225 |
- gnome2_schemas_update |
226 |
-} |