* [gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager-openvpn/, net-misc/networkmanager-openvpn/files/
@ 2016-09-08 23:03 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2016-09-08 23:03 UTC (permalink / raw
To: gentoo-commits
commit: 8c3dc6ee17ae424a16d8f44847a3a3aa8918f408
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 6 22:30:41 2016 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Thu Sep 8 23:02:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3dc6ee
net-misc/networkmanager-openvpn: version bump to 1.2.2 to 1.2.4
dbus-glib is not needed anymore.
Fixes bug #588388 as well.
Package-Manager: portage-2.3.0
net-misc/networkmanager-openvpn/Manifest | 1 +
...tworkmanager-openvpn-1.2.4-underlinking-1.patch | 46 +++++++++++++++++
...tworkmanager-openvpn-1.2.4-underlinking-2.patch | 58 +++++++++++++++++++++
.../networkmanager-openvpn-1.2.4.ebuild | 60 ++++++++++++++++++++++
4 files changed, 165 insertions(+)
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index 23d5cd7..e0a7836 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,2 +1,3 @@
DIST NetworkManager-openvpn-1.0.8.tar.xz 428244 SHA256 1b979519d72ba4d78e729d4856c5b53fad914ca7ee3ca91209ce489ba78912ac SHA512 c641926e5593cfb46e2e1f2f1e4a244991efb2142a9ff420b3a2764692cc7b30941ee97980402a3f4911a527c06f8e8c4c9c6eabac5188837cad666b58369371 WHIRLPOOL 0fe6f54d09d2287ae0133ee2a6e78d5f7b1f7d5f0f4b584057069c8eae9f40da122aa39d7220c84a623292d62807f9c01576c771494ca81f2b38d626802dd446
DIST NetworkManager-openvpn-1.2.2.tar.xz 476964 SHA256 47a6d219a781eff8491c7876b7fb95b12dcfb8f8a05f916f95afc65c7babddef SHA512 4382cb32d78ad8f362a860e13acd440eff5499dc10e77ea86b57e3fe7f63f4448eecf5b9cd262be496d0497f325144489b0b501ddda3fafd1c911831e1a08396 WHIRLPOOL c2bb43265fa923d8fb9f65ee916d0c778f3634689a57702df4202d6fa7564b8d26f476c5fc359694d31e76be133854625767deaff4a1c58df8b6f1f78006157e
+DIST NetworkManager-openvpn-1.2.4.tar.xz 486720 SHA256 db6b4d5bc49c68990703c90f2cfbdc6a94e16f702b0740085017d5c06d3e5b9d SHA512 4b241031605c878483242a09492ae082ebf1f235c7bf5355db25be50f524ec9712198628e643a58e7c4dd26154d02828f3361ad8ca2b8d3af821ac6a81c675df WHIRLPOOL a4303e166b47623cce7fd650ba522ead3e07ed08cf43aaea93d7ff8c621f721ea5d36e12fb0f3d0cca6a65bff0c1ff98ebff105103fe6e94c0c1550982b76061
diff --git a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.2.4-underlinking-1.patch b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.2.4-underlinking-1.patch
new file mode 100644
index 00000000..3b6d4a6
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.2.4-underlinking-1.patch
@@ -0,0 +1,46 @@
+From 220b38717f8d0fc16c8b9d68cfd6e5b5751e4669 Mon Sep 17 00:00:00 2001
+From: Dennis Schridde <devurandom@gmx.net>
+Date: Mon, 15 Aug 2016 16:36:57 +0200
+Subject: build: fix linking libnm-vpn-plugin-openvpn.la for dlopen()
+
+On some systems, dlopen() is not in libdl.so [1].
+
+[1] https://autotools.io/autoconf/finding.html
+
+https://bugzilla.gnome.org/show_bug.cgi?id=769783
+---
+ configure.ac | 3 +++
+ properties/Makefile.am | 3 ++-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 34829f4..3988bad 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,6 +38,9 @@ dnl
+ AC_PROG_GCC_TRADITIONAL
+ AC_FUNC_MEMCMP
+ AC_CHECK_FUNCS(select socket uname)
++AC_SEARCH_LIBS([dlopen], [dl dld], [], [
++ AC_MSG_ERROR([unable to find the dlopen() function])
++])
+
+ dnl ensure that when the Automake generated makefile calls aclocal,
+ dnl it honours the $ACLOCAL_FLAGS environment variable
+diff --git a/properties/Makefile.am b/properties/Makefile.am
+index 552e537..04ed5cd 100644
+--- a/properties/Makefile.am
++++ b/properties/Makefile.am
+@@ -57,7 +57,8 @@ libnm_vpn_plugin_openvpn_la_CFLAGS = \
+ $(LIBNM_CFLAGS)
+
+ libnm_vpn_plugin_openvpn_la_LIBADD = \
+- $(LIBNM_LIBS)
++ $(LIBNM_LIBS) \
++ $(DLOPEN)
+
+ libnm_vpn_plugin_openvpn_la_LDFLAGS = \
+ -avoid-version \
+--
+cgit v0.12
+
diff --git a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.2.4-underlinking-2.patch b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.2.4-underlinking-2.patch
new file mode 100644
index 00000000..deddddc
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.2.4-underlinking-2.patch
@@ -0,0 +1,58 @@
+From 8d76aebe99b1b9c67adab4922c0c33edb1f89b7f Mon Sep 17 00:00:00 2001
+From: Thomas Haller <thaller@redhat.com>
+Date: Mon, 15 Aug 2016 16:55:01 +0200
+Subject: build: use $(DL_LIBS) name for -ldl
+
+Usually, our variables for libraries are call *_LIBS. Adjust the name.
+---
+ configure.ac | 6 +++---
+ properties/Makefile.am | 3 ++-
+ properties/tests/Makefile.am | 1 -
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3988bad..142fa67 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -38,9 +38,9 @@ dnl
+ AC_PROG_GCC_TRADITIONAL
+ AC_FUNC_MEMCMP
+ AC_CHECK_FUNCS(select socket uname)
+-AC_SEARCH_LIBS([dlopen], [dl dld], [], [
+- AC_MSG_ERROR([unable to find the dlopen() function])
+-])
++
++AC_SEARCH_LIBS([dlopen], [dl dld], [], [ac_cv_search_dlopen=])
++AC_SUBST([DL_LIBS], "$ac_cv_search_dlopen")
+
+ dnl ensure that when the Automake generated makefile calls aclocal,
+ dnl it honours the $ACLOCAL_FLAGS environment variable
+diff --git a/properties/Makefile.am b/properties/Makefile.am
+index 04ed5cd..12ee00c 100644
+--- a/properties/Makefile.am
++++ b/properties/Makefile.am
+@@ -58,7 +58,8 @@ libnm_vpn_plugin_openvpn_la_CFLAGS = \
+
+ libnm_vpn_plugin_openvpn_la_LIBADD = \
+ $(LIBNM_LIBS) \
+- $(DLOPEN)
++ $(DL_LIBS) \
++ $(NULL)
+
+ libnm_vpn_plugin_openvpn_la_LDFLAGS = \
+ -avoid-version \
+diff --git a/properties/tests/Makefile.am b/properties/tests/Makefile.am
+index c4639ee..c3eef5b 100644
+--- a/properties/tests/Makefile.am
++++ b/properties/tests/Makefile.am
+@@ -27,7 +27,6 @@ test_import_export_LDADD = \
+ $(GTK_LIBS) \
+ $(LIBNM_LIBS) \
+ $(LIBNMA_LIBS) \
+- -ldl \
+ $(top_builddir)/properties/libnm-vpn-plugin-openvpn-test.la
+
+
+--
+cgit v0.12
+
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.4.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.4.ebuild
new file mode 100644
index 00000000..176915d
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.2.4.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit autotools gnome2 user
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk test"
+
+RDEPEND="
+ >=dev-libs/glib-2.32:2
+ >=net-misc/networkmanager-1.2.0:=
+ >=net-misc/openvpn-2.1_rc9
+ gtk? (
+ >=app-crypt/libsecret-0.18
+ >=gnome-extra/nm-applet-1.2.0
+ >=x11-libs/gtk+-3.4:3
+ )
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ >=dev-util/intltool-0.35
+ virtual/pkgconfig
+"
+
+pkg_setup() {
+ enewgroup nm-openvpn
+ enewuser nm-openvpn -1 -1 -1 nm-openvpn
+}
+
+src_prepare() {
+ # Test will fail if the machine doesn't have a particular locale installed
+ # FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
+ sed '/test_non_utf8_import (plugin, test_dir)/ d' \
+ -i properties/tests/test-import-export.c || die "sed failed"
+
+ # Fix underlinking issue, bug #588388, upstream #769783
+ eapply "${FILESDIR}"/${PN}-1.2.4-underlinking-*.patch
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # --localstatedir=/var needed per bug #536248
+ gnome2_src_configure \
+ --localstatedir=/var \
+ --disable-more-warnings \
+ --disable-static \
+ --with-dist-version=Gentoo \
+ $(use_with gtk gnome)
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager-openvpn/, net-misc/networkmanager-openvpn/files/
@ 2017-11-22 21:09 Pacho Ramos
0 siblings, 0 replies; 2+ messages in thread
From: Pacho Ramos @ 2017-11-22 21:09 UTC (permalink / raw
To: gentoo-commits
commit: c20954b1e42a129a90e165a4bddfc2447730218a
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 22 21:07:46 2017 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Wed Nov 22 21:07:46 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c20954b1
net-misc/networkmanager-openvpn: Apply important fixes from 'master' to fix the saving of user_cert and handling of connection with static-key.
Package-Manager: Portage-2.3.14, Repoman-2.3.6
net-misc/networkmanager-openvpn/Manifest | 2 +-
.../networkmanager-openvpn-1.8.0-static-key.patch | 33 ++++++++++++
.../networkmanager-openvpn-1.8.0-user_cert.patch | 29 ++++++++++
.../networkmanager-openvpn-1.8.0-r1.ebuild | 63 ++++++++++++++++++++++
4 files changed, 126 insertions(+), 1 deletion(-)
diff --git a/net-misc/networkmanager-openvpn/Manifest b/net-misc/networkmanager-openvpn/Manifest
index 30f576c54c2..f136f11d8a6 100644
--- a/net-misc/networkmanager-openvpn/Manifest
+++ b/net-misc/networkmanager-openvpn/Manifest
@@ -1,4 +1,4 @@
DIST NetworkManager-openvpn-1.2.10.tar.xz 509148 SHA256 ac86a7a539d78df90095676e9183f2d422fb93dbfe4b3afef22f81825d303d61 SHA512 d597e8b3d2935c6874a283d2a036c511e1f3625aed7f5e6fbf5c77d3c3f5f6d170b19fe69202d74b2b1ac6d47d3704d3177598fd1889a19003fed98416ea6521 WHIRLPOOL 75669197a378d775eef26e6a69e764578d5628b2d8a6f11bf08b93e60a2e823b8138827e2456b37d8296def2c074362d0d4bc28b8e56389f5a826bcbdf19b502
DIST NetworkManager-openvpn-1.2.6.tar.xz 494132 SHA256 2373e2bb0a8a876cb2997cd8b0e3d6e10012d9bef3705ea3ac21f6394b3f1fb0 SHA512 973b13937bd14891181cfac4b3c8df891bbbd8aad31769130d7acd6f3c41e23fb3359a49a750c885e2c72c94aaf357ff1e326ece7a304b2154c6b33c35118a05 WHIRLPOOL b99542e3529b73d21770dc1ca492e29131f04de0336b6a53f58ed9a4e1f886e04bbebd32b33dc3a1b11483dd6a73779964af3a64d06edd8fb6f4c759c021cc2a
DIST NetworkManager-openvpn-1.2.8.tar.xz 498732 SHA256 3e0b4007f248d96df4b8eb5d0f937536044af7053debbbf525e67c9bc5d30654 SHA512 e6d64106cd93f91d292a6b2346dc31317e1056d2bbaf09a376c84ffaaa8fd584f92999865bdf52531b44de7ae144e1ae9271b9efc564d99f8569b0d059ab8019 WHIRLPOOL ead14f8ca4e194c0ff2b9b2151b44e3a2d97c81a4c89187c701090ce891861ba0f5a947e4b132bb2c70a28647ddb976d3989b1a3f54be87a22e983afad49f161
-DIST NetworkManager-openvpn-1.8.0.tar.xz 530112 SHA256 166e1123ade1b322162b83876c605393a8e74240aa908cba934319f312b2e3a4 SHA512 fd70e5ae6e85daf8ad0aaf3cc1b6388dc78b8e4e35c3535eb723cfcc5f4fd2e14062237829b27a644a8d057e034c6ebc6a1aeb78abc87e9de5773115ae7c642c WHIRLPOOL 170b6d02a4e2d2d9ebd5246fd390cc9a40f3b56fad019348b66e83d88458c309c61324bf528695c0295ae95e93a08918c4c4222582788789ccb97701b75f3230
+DIST NetworkManager-openvpn-1.8.0.tar.xz 530112 BLAKE2B f26901d83ca22d3c3979ce61a558981c3e533a9376785014ecd99c932e9929dbc4b564d980785acb880ab027c2b98fe7fea242215122960025eba93ec423b58e SHA512 fd70e5ae6e85daf8ad0aaf3cc1b6388dc78b8e4e35c3535eb723cfcc5f4fd2e14062237829b27a644a8d057e034c6ebc6a1aeb78abc87e9de5773115ae7c642c
diff --git a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.8.0-static-key.patch b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.8.0-static-key.patch
new file mode 100644
index 00000000000..07f98bd6e01
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.8.0-static-key.patch
@@ -0,0 +1,33 @@
+From eae01ceaeed9bf2c46a3b402fef89024dde0853b Mon Sep 17 00:00:00 2001
+From: Brandon Guttersohn <bguttersohn@gmail.com>
+Date: Wed, 27 Sep 2017 09:57:58 +0200
+Subject: [PATCH 1/1] properties: fix validation of static-key in GUI
+
+Otherwise it's not possible to edit a connection with static key.
+
+[thaller@redhat.com: modified original patch and add commit message]
+
+https://bugzilla.gnome.org/show_bug.cgi?id=788226
+
+Fixes: 86a70095afc229f1f970b7e546390d166152cfc2
+(cherry picked from commit b83f028a6da067dcc9b31555c15411f0288ebda1)
+---
+ properties/auth-helpers.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c
+index c55afd1..16ff6e5 100644
+--- a/properties/auth-helpers.c
++++ b/properties/auth-helpers.c
+@@ -449,7 +449,7 @@ auth_widget_check_validity (GtkBuilder *builder, const char *contype, GError **e
+ } else if (!strcmp (contype, NM_OPENVPN_CONTYPE_STATIC_KEY)) {
+ widget = GTK_WIDGET (gtk_builder_get_object (builder, "sk_key_chooser"));
+ filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (widget));
+- if (filename && strlen (filename)) {
++ if (!filename || !filename[0]) {
+ g_free (filename);
+ g_set_error (error,
+ NMV_EDITOR_PLUGIN_ERROR,
+--
+2.13.5
+
diff --git a/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.8.0-user_cert.patch b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.8.0-user_cert.patch
new file mode 100644
index 00000000000..43f0a97d7e3
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/files/networkmanager-openvpn-1.8.0-user_cert.patch
@@ -0,0 +1,29 @@
+From c79c951aa10524a238992314561c033e10f45882 Mon Sep 17 00:00:00 2001
+From: polygamma <jonny.westphalen@googlemail.com>
+Date: Mon, 25 Sep 2017 22:56:29 +0200
+Subject: [PATCH 1/1] properties: fix unusable config imports
+
+Fixes: 86a70095afc229f1f970b7e546390d166152cfc2
+
+https://github.com/NetworkManager/network-manager-openvpn/pull/1
+(cherry picked from commit fcf4b58fe0da5994687469ebb0c6eac3cf083e83)
+---
+ properties/auth-helpers.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/properties/auth-helpers.c b/properties/auth-helpers.c
+index f9babfb..c55afd1 100644
+--- a/properties/auth-helpers.c
++++ b/properties/auth-helpers.c
+@@ -544,7 +544,7 @@ update_tls (GtkBuilder *builder, const char *prefix, NMSettingVpn *s_vpn)
+ NM_OPENVPN_KEY_CERT,
+ NM_OPENVPN_KEY_KEY,
+ NM_OPENVPN_KEY_CERTPASS,
+- prefix, "ca_cert", s_vpn);
++ prefix, "user_cert", s_vpn);
+ }
+
+ static void
+--
+2.13.5
+
diff --git a/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0-r1.ebuild b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0-r1.ebuild
new file mode 100644
index 00000000000..1c70636fe18
--- /dev/null
+++ b/net-misc/networkmanager-openvpn/networkmanager-openvpn-1.8.0-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GNOME_ORG_MODULE="NetworkManager-${PN##*-}"
+
+inherit gnome2 user
+
+DESCRIPTION="NetworkManager OpenVPN plugin"
+HOMEPAGE="https://wiki.gnome.org/Projects/NetworkManager"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="gtk test"
+
+RDEPEND="
+ >=dev-libs/glib-2.32:2
+ >=net-misc/networkmanager-1.7.0:=
+ >=net-vpn/openvpn-2.1
+ gtk? (
+ >=app-crypt/libsecret-0.18
+ >=gnome-extra/nm-applet-1.7.0
+ >=x11-libs/gtk+-3.4:3
+ )
+"
+DEPEND="${RDEPEND}
+ sys-devel/gettext
+ >=dev-util/intltool-0.35
+ virtual/pkgconfig
+"
+
+pkg_setup() {
+ enewgroup nm-openvpn
+ enewuser nm-openvpn -1 -1 -1 nm-openvpn
+}
+
+PATCHES=(
+ # Fix unusable config imports (from 'master')
+ "${FILESDIR}/${PN}-1.8.0-user_cert.patch"
+
+ # Fix validation of static-key in GUI (from 'master')
+ "${FILESDIR}/${PN}-1.8.0-static-key.patch"
+)
+
+src_prepare() {
+ # Test will fail if the machine doesn't have a particular locale installed
+ # FAIL: (tls-import-data) unexpected 'ca' secret value, upstream bug #742708
+ sed '/test_non_utf8_import (plugin, test_dir)/ d' \
+ -i properties/tests/test-import-export.c || die "sed failed"
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # --localstatedir=/var needed per bug #536248
+ gnome2_src_configure \
+ --localstatedir=/var \
+ --disable-more-warnings \
+ --disable-static \
+ --with-dist-version=Gentoo \
+ $(use_with gtk gnome)
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-11-22 21:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-09-08 23:03 [gentoo-commits] repo/gentoo:master commit in: net-misc/networkmanager-openvpn/, net-misc/networkmanager-openvpn/files/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2017-11-22 21:09 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox