[gentoo-commits] repo/gentoo:master commit in: net-libs/libnma/files/, net-libs/libnma/

2023-02-20 Thread Matt Turner
commit: fb03fcfc6ff785f86d38cff9f2e21206f49d489c
Author: Matt Turner  gentoo  org>
AuthorDate: Mon Feb 20 17:01:10 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Mon Feb 20 17:32:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb03fcfc

net-libs/libnma: Drop old versions

Signed-off-by: Matt Turner  gentoo.org>

 net-libs/libnma/Manifest   |  1 -
 .../files/libnma-1.10.4-path-eap-schema.patch  | 32 -
 net-libs/libnma/libnma-1.10.4-r2.ebuild| 80 --
 3 files changed, 113 deletions(-)

diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
index 94847542f63c..bab5b79bb500 100644
--- a/net-libs/libnma/Manifest
+++ b/net-libs/libnma/Manifest
@@ -1,2 +1 @@
-DIST libnma-1.10.4.tar.xz 1351932 BLAKE2B 
0178407d04fed680b260ea7e4615f0d939483504209b4bc721e2a4fe49ecbf49d9ffde0476b4352973cda9de4f088ac50d557c12f67d970f21031c1741f692e3
 SHA512 
4fe0d6b0e5b3c1bd7654e03dce747ee390de76d6641eb317fecb901ed6768bf48785e4a99e6fc8f12864066d06a64e308a8dbb2081a2d57e3f1509ca712deccc
 DIST libnma-1.10.6.tar.xz 702820 BLAKE2B 
8f5b62f9522c8e7f16d6847d0e297d32fa8f62c9be2db68af596765dcfaa93c4eb9c3d3e03098ebd024d7f6ad788dd82eedc7b4841738d4278f64e3a1053d2d6
 SHA512 
4801db35a8d510c651fc91da4f394a665a4ba5c35fbefe0496363c404b49d5f4e103f49084220ee58b995684d2ac93643320b7d1777ebeea555e7657768a1f6a

diff --git a/net-libs/libnma/files/libnma-1.10.4-path-eap-schema.patch 
b/net-libs/libnma/files/libnma-1.10.4-path-eap-schema.patch
deleted file mode 100644
index fe00ff9d9a9b..
--- a/net-libs/libnma/files/libnma-1.10.4-path-eap-schema.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 0ab5c1e39e94e158650da847f8512ab5e2b03593 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" 
-Date: Wed, 9 Nov 2022 08:00:19 +
-Subject: [PATCH] gschema: Remove path from eap schema
-
-This one needs to be relocatable, otherwise creating a new VPN
-connection will fail with:
-
-settings object created with schema 'org.gnome.nm-applet.eap'
-and path '/org/gnome/nm-applet/eap//',
-but path '/org/gnome/nm-applet/eap/' is specified by schema
-
-Fixes: https://bugs.archlinux.org/task/76490

- org.gnome.nm-applet.eap.gschema.xml.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/org.gnome.nm-applet.eap.gschema.xml.in 
b/org.gnome.nm-applet.eap.gschema.xml.in
-index 0fc3ca9f..f4a56ea6 100644
 a/org.gnome.nm-applet.eap.gschema.xml.in
-+++ b/org.gnome.nm-applet.eap.gschema.xml.in
-@@ -1,6 +1,6 @@
- 
- 
--  
-+  
- 
-   false
-   Ignore CA certificate
--- 
-GitLab
-

diff --git a/net-libs/libnma/libnma-1.10.4-r2.ebuild 
b/net-libs/libnma/libnma-1.10.4-r2.ebuild
deleted file mode 100644
index 7c36b9f96446..
--- a/net-libs/libnma/libnma-1.10.4-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit gnome.org gnome2-utils meson xdg vala
-
-DESCRIPTION="NetworkManager GUI library"
-HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager;
-
-LICENSE="GPL-2+"
-SLOT="0"
-# 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
-IUSE="gtk-doc +introspection +pkcs11 vala"
-REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-
-DEPEND="
-   >=gui-libs/gtk-4.0:4
-   app-text/iso-codes
-   net-misc/mobile-broadband-provider-info
-   >=dev-libs/glib-2.38:2
-   >=x11-libs/gtk+-3.12:3[introspection?]
-   >=net-misc/networkmanager-1.7[introspection?]
-   pkcs11? ( >=app-crypt/gcr-4.0.0:4 )
-   introspection? ( >=dev-libs/gobject-introspection-1.56:= )
-"
-RDEPEND="${DEPEND}
-   !https://gitlab.gnome.org/GNOME/libnma/-/issues/18
-   "${FILESDIR}/${PN}-1.10.4-path-eap-schema.patch"
-)
-
-src_prepare() {
-   default
-   use vala && vala_setup
-   xdg_environment_reset
-}
-
-src_configure() {
-   local emesonargs=(
-   -Dlibnma_gtk4=true
-   $(meson_use pkcs11 gcr)
-   -Dmore_asserts=0
-   -Diso_codes=true
-   -Dmobile_broadband_provider_info=true
-   -Dld_gc=false
-   $(meson_use gtk-doc gtk_doc)
-   $(meson_use introspection)
-   $(meson_use vala vapi)
-   )
-   meson_src_configure
-}
-
-src_install() {
-   meson_src_install
-   rm "${D}/usr/share/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml" || 
die
-}
-
-pkg_postinst() {
-   xdg_pkg_postinst
-   gnome2_schemas_update
-}
-
-pkg_postrm() {
-   xdg_pkg_postrm
-   gnome2_schemas_update
-}



[gentoo-commits] repo/gentoo:master commit in: net-libs/libnma/files/, net-libs/libnma/

2022-12-04 Thread Pacho Ramos
commit: ef1f1c97af1b9ada1d6b9ef86c3b5cda8075e459
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Dec  4 18:40:23 2022 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Dec  4 18:41:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef1f1c97

net-libs/libnma: Really apply the patch

Thanks-to: Matt Turner
Closes: https://bugs.gentoo.org/882419
Signed-off-by: Pacho Ramos  gentoo.org>

 .../files/libnma-1.10.4-path-eap-schema.patch  | 32 ++
 ...ma-1.10.4-r1.ebuild => libnma-1.10.4-r2.ebuild} |  5 
 2 files changed, 37 insertions(+)

diff --git a/net-libs/libnma/files/libnma-1.10.4-path-eap-schema.patch 
b/net-libs/libnma/files/libnma-1.10.4-path-eap-schema.patch
new file mode 100644
index ..fe00ff9d9a9b
--- /dev/null
+++ b/net-libs/libnma/files/libnma-1.10.4-path-eap-schema.patch
@@ -0,0 +1,32 @@
+From 0ab5c1e39e94e158650da847f8512ab5e2b03593 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" 
+Date: Wed, 9 Nov 2022 08:00:19 +
+Subject: [PATCH] gschema: Remove path from eap schema
+
+This one needs to be relocatable, otherwise creating a new VPN
+connection will fail with:
+
+settings object created with schema 'org.gnome.nm-applet.eap'
+and path '/org/gnome/nm-applet/eap//',
+but path '/org/gnome/nm-applet/eap/' is specified by schema
+
+Fixes: https://bugs.archlinux.org/task/76490
+---
+ org.gnome.nm-applet.eap.gschema.xml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/org.gnome.nm-applet.eap.gschema.xml.in 
b/org.gnome.nm-applet.eap.gschema.xml.in
+index 0fc3ca9f..f4a56ea6 100644
+--- a/org.gnome.nm-applet.eap.gschema.xml.in
 b/org.gnome.nm-applet.eap.gschema.xml.in
+@@ -1,6 +1,6 @@
+ 
+ 
+-  
++  
+ 
+   false
+   Ignore CA certificate
+-- 
+GitLab
+

diff --git a/net-libs/libnma/libnma-1.10.4-r1.ebuild 
b/net-libs/libnma/libnma-1.10.4-r2.ebuild
similarity index 93%
rename from net-libs/libnma/libnma-1.10.4-r1.ebuild
rename to net-libs/libnma/libnma-1.10.4-r2.ebuild
index 965eae62dbe5..845d3ba4a4fb 100644
--- a/net-libs/libnma/libnma-1.10.4-r1.ebuild
+++ b/net-libs/libnma/libnma-1.10.4-r2.ebuild
@@ -38,6 +38,11 @@ BDEPEND="
)
 "
 
+PATCHES=(
+   # https://gitlab.gnome.org/GNOME/libnma/-/issues/18
+   "${FILESDIR}/${PN}-1.10.4-path-eap-schema.patch"
+)
+
 src_prepare() {
default
use vala && vala_setup



[gentoo-commits] repo/gentoo:master commit in: net-libs/libnma/files/, net-libs/libnma/

2020-06-07 Thread Mart Raudsepp
commit: 351654f1ae9347e20e6dbb6d9f45a20cd24bdea7
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sun Jun  7 19:25:43 2020 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Jun  7 20:12:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=351654f1

net-libs/libnma: bump to 1.8.28

This is an upstream split from gnome-extra/nm-applet with USE=gcr
renamed to USE=pkcs11 (for naming based on feature it enables).
nm-applet will remain as the package providing the legacy applet
and nm-connection-editor, while consumers linking or using
introspection would commonly depend on this libnma package
directly instead.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Mart Raudsepp  gentoo.org>

 net-libs/libnma/Manifest   |  1 +
 net-libs/libnma/files/1.8.28-nma-ws-leak-fix.patch | 86 ++
 net-libs/libnma/libnma-1.8.28.ebuild   | 72 ++
 net-libs/libnma/metadata.xml   |  3 +
 4 files changed, 162 insertions(+)

diff --git a/net-libs/libnma/Manifest b/net-libs/libnma/Manifest
new file mode 100644
index 000..9428f91e9ef
--- /dev/null
+++ b/net-libs/libnma/Manifest
@@ -0,0 +1 @@
+DIST libnma-1.8.28.tar.xz 1366584 BLAKE2B 
598c2d310844930a5ed8b8d4b8bc0ae91193a8e62bccdb60050cc980cd37d198adf728b98694d9f1cf9f523998b865d9682fd271c88e434ead777ed5b69866b4
 SHA512 
d3996da3433493149edf0743b7f2280a83db2efc2228f04eddb773bbcb08ea2efcb640f781cb1d0a5cbabd8b25b1c612387682ff5239151d8ce249568e877f5b

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
new file mode 100644
index 000..8f2042a2568
--- /dev/null
+++ b/net-libs/libnma/files/1.8.28-nma-ws-leak-fix.patch
@@ -0,0 +1,86 @@
+From 55e33e4ce01c8b2b8dc98a5ee40a5636579cd577 Mon Sep 17 00:00:00 2001
+From: Beniamino Galvani 
+Date: Sat, 11 Apr 2020 15:44:17 +0200
+Subject: [PATCH] nma-ws: properly dispose wireless security objects
+
+Chain up to parent to properly free resources on dispose().
+
+Fixes: b61cc1b9fa040 ("nma-ws: add")
+
+https://gitlab.gnome.org/GNOME/libnma/-/issues/7
+---
+ src/nma-ws/nma-ws-802-1x.c  | 2 ++
+ src/nma-ws/nma-ws-leap.c| 2 ++
+ src/nma-ws/nma-ws-sae.c | 2 ++
+ src/nma-ws/nma-ws-wep-key.c | 2 ++
+ src/nma-ws/nma-ws-wpa-psk.c | 2 ++
+ 5 files changed, 10 insertions(+)
+
+diff --git a/src/nma-ws/nma-ws-802-1x.c b/src/nma-ws/nma-ws-802-1x.c
+index ba348266..0c148ce5 100644
+--- a/src/nma-ws/nma-ws-802-1x.c
 b/src/nma-ws/nma-ws-802-1x.c
+@@ -482,6 +482,8 @@ dispose (GObject *object)
+   g_clear_pointer (>secrets_hints, g_strfreev);
+   g_clear_pointer (>username, g_free);
+   g_clear_pointer (>password, g_free);
++
++  G_OBJECT_CLASS (nma_ws_802_1x_parent_class)->dispose (object);
+ }
+ 
+ static void
+diff --git a/src/nma-ws/nma-ws-leap.c b/src/nma-ws/nma-ws-leap.c
+index f90d43aa..df6d2dde 100644
+--- a/src/nma-ws/nma-ws-leap.c
 b/src/nma-ws/nma-ws-leap.c
+@@ -260,6 +260,8 @@ dispose (GObject *object)
+   NMAWsLeap *self = NMA_WS_LEAP (object);
+ 
+   g_clear_object (>connection);
++
++  G_OBJECT_CLASS (nma_ws_leap_parent_class)->dispose (object);
+ }
+ 
+ static void
+diff --git a/src/nma-ws/nma-ws-sae.c b/src/nma-ws/nma-ws-sae.c
+index e3454bbd..00fb6ff5 100644
+--- a/src/nma-ws/nma-ws-sae.c
 b/src/nma-ws/nma-ws-sae.c
+@@ -252,6 +252,8 @@ dispose (GObject *object)
+   NMAWsSae *self = NMA_WS_SAE (object);
+ 
+   g_clear_object (>connection);
++
++  G_OBJECT_CLASS (nma_ws_sae_parent_class)->dispose (object);
+ }
+ 
+ static void
+diff --git a/src/nma-ws/nma-ws-wep-key.c b/src/nma-ws/nma-ws-wep-key.c
+index cae8c272..992aabf7 100644
+--- a/src/nma-ws/nma-ws-wep-key.c
 b/src/nma-ws/nma-ws-wep-key.c
+@@ -404,6 +404,8 @@ dispose (GObject *object)
+   NMAWsWepKey *self = NMA_WS_WEP_KEY (object);
+ 
+   g_clear_object (>connection);
++
++  G_OBJECT_CLASS (nma_ws_wep_key_parent_class)->dispose (object);
+ }
+ 
+ static void
+diff --git a/src/nma-ws/nma-ws-wpa-psk.c b/src/nma-ws/nma-ws-wpa-psk.c
+index 1c73922a..27604960 100644
+--- a/src/nma-ws/nma-ws-wpa-psk.c
 b/src/nma-ws/nma-ws-wpa-psk.c
+@@ -270,6 +270,8 @@ dispose (GObject *object)
+   NMAWsWpaPsk *self = NMA_WS_WPA_PSK (object);
+ 
+   g_clear_object (>connection);
++
++  G_OBJECT_CLASS (nma_ws_wpa_psk_parent_class)->dispose (object);
+ }
+ 
+ static void
+-- 
+2.20.1
+

diff --git a/net-libs/libnma/libnma-1.8.28.ebuild 
b/net-libs/libnma/libnma-1.8.28.ebuild
new file mode 100644
index 000..140757c9ecb
--- /dev/null
+++ b/net-libs/libnma/libnma-1.8.28.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg vala
+
+DESCRIPTION="NetworkManager GUI library"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager;
+
+LICENSE="GPL-2+"
+SLOT="0"
+# pkcs11