1 |
commit: 79b3c30e3703cdceb0dee1e60115b4348b955579 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 10 18:49:31 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 10 19:36:01 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79b3c30e |
7 |
|
8 |
net-vpn/networkmanager-sstp: add 1.3.0 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
net-vpn/networkmanager-sstp/Manifest | 1 + |
13 |
...ager-sstp-1.3.0-fix-configure.ac-bashisms.patch | 114 +++++++++++++++++++++ |
14 |
net-vpn/networkmanager-sstp/metadata.xml | 3 + |
15 |
.../networkmanager-sstp-1.3.0.ebuild | 85 +++++++++++++++ |
16 |
4 files changed, 203 insertions(+) |
17 |
|
18 |
diff --git a/net-vpn/networkmanager-sstp/Manifest b/net-vpn/networkmanager-sstp/Manifest |
19 |
index 6bf141bbaa3d..4de7ee4a3463 100644 |
20 |
--- a/net-vpn/networkmanager-sstp/Manifest |
21 |
+++ b/net-vpn/networkmanager-sstp/Manifest |
22 |
@@ -1,2 +1,3 @@ |
23 |
DIST NetworkManager-sstp-1.2.0.tar.bz2 440695 BLAKE2B 170221842c25945da09f94364642be94993ac4ef7bbaffebefc463e18eeff78f3a58d95607a6f0be9fb5ecdabee244d64abb02eb56deb213ac089019089821f4 SHA512 31c7f61c2d0326c2ddc681690d4a9e0a25f29b3b5f51c44ea196cd74aab1002a6eb66bd06bddd8218961b18e666d5c28e57cfe0b2694a686ea8eb4195fcd9776 |
24 |
DIST NetworkManager-sstp-1.2.6.tar.bz2 450813 BLAKE2B 9eefc73a676c825fd56b36085385fc382616059b82f8c14394e315b657162baa608f15046cad584d088774af1432a4e4d3751ecbecc6e779af7080c4bec9034f SHA512 60f5636e73d40ad3e16e5751a22ec12616e8d1fcffe63cba2ae1d04a13edd553c8c72a336ec52d353be6df5431a8a27a74e6e056b1a1a18ed050d5ec226bbe8e |
25 |
+DIST NetworkManager-sstp-1.3.0.tar.bz2 548907 BLAKE2B 97248268a781033bc960f930c5a55102e9fa76efa4be6477ffd277fd334649625b6c88418f00d678afa4412fb088cd201ef6711ef6f48b516daaa38fac02caa9 SHA512 9a26c737601990b913d9506ecaac957c4f6d2a4c64a3a0eb8beaf93eaef797ed134b2ddfe2421006a7ffe0dbd18800d49501836f3671f798132a1df707da138a |
26 |
|
27 |
diff --git a/net-vpn/networkmanager-sstp/files/networkmanager-sstp-1.3.0-fix-configure.ac-bashisms.patch b/net-vpn/networkmanager-sstp/files/networkmanager-sstp-1.3.0-fix-configure.ac-bashisms.patch |
28 |
new file mode 100644 |
29 |
index 000000000000..7f603028e639 |
30 |
--- /dev/null |
31 |
+++ b/net-vpn/networkmanager-sstp/files/networkmanager-sstp-1.3.0-fix-configure.ac-bashisms.patch |
32 |
@@ -0,0 +1,114 @@ |
33 |
+https://gitlab.gnome.org/GNOME/network-manager-sstp/-/merge_requests/44 |
34 |
+ |
35 |
+From abe1e3aa7e2cd71e979035168ffa54268bb26b9b Mon Sep 17 00:00:00 2001 |
36 |
+From: Sam James <sam@g.o> |
37 |
+Date: Tue, 10 May 2022 19:29:26 +0000 |
38 |
+Subject: [PATCH] configure.ac: fix bashism, use x prefix |
39 |
+ |
40 |
+configure scripts are expected to work with POSIX compliant shells providing |
41 |
+/bin/sh so use = instead of == to work with both Bash and other shells. |
42 |
+ |
43 |
+Also, throw in x"$var" == xvar guards (x) because it's a lot easier to just |
44 |
+have them and avoid pitfalls when a variable ends up not defined and having |
45 |
+a syntax error, even though it's not needed in every context depending |
46 |
+on shell. |
47 |
+ |
48 |
+Signed-off-by: Sam James <sam@g.o> |
49 |
+--- a/configure.ac |
50 |
++++ b/configure.ac |
51 |
+@@ -59,7 +59,7 @@ AC_CACHE_CHECK([if pppd/mppe.h defines mppe_keys_xyz() functions], ac_cv_working |
52 |
+ return 0;]])], |
53 |
+ [ac_cv_working_mppe_h=yes], |
54 |
+ [ac_cv_working_mppe_h=no])]) |
55 |
+-if test $ac_cv_working_mppe_h = yes; then |
56 |
++if test $ac_cv_working_mppe_h = xyes; then |
57 |
+ AC_DEFINE(HAVE_MPPE_KEYS_FUNCTIONS, 1, |
58 |
+ [Define to 1 if you have <pppd/mppe.h> and it declares the mppe_keys_xyz() functions]) |
59 |
+ fi |
60 |
+@@ -70,11 +70,11 @@ dnl Support for the auth notify callback in pppd >= 2.4.9 |
61 |
+ AC_ARG_WITH([pppd-auth-notify-support], |
62 |
+ [AS_HELP_STRING([--with-pppd-auth-notify-support], [is the auth-notifier supported by pppd])]) |
63 |
+ if test x"$with_pppd_auth_notify_support" != xyes; then |
64 |
+- if test x"$pppd_pkgconfig_support" == xyes; then # pkgconfig implies pppd > 2.4.9 |
65 |
++ if test x"$pppd_pkgconfig_support" = xyes; then # pkgconfig implies pppd > 2.4.9 |
66 |
+ AS_VAR_SET([with_pppd_auth_notify_support],[yes]) |
67 |
+ fi |
68 |
+ fi |
69 |
+-if test x"$with_pppd_auth_notify_support" == xyes; then |
70 |
++if test x"$with_pppd_auth_notify_support" = xyes; then |
71 |
+ AC_DEFINE(USE_PPPD_AUTH_HOOK,1,[Define if pppd has support for client side authentication complete notification]) |
72 |
+ else |
73 |
+ AS_VAR_SET([with_pppd_auth_notify_support],[no]) |
74 |
+@@ -85,11 +85,11 @@ dnl Enable support for extended tls settings in pppd > 2.4.9 |
75 |
+ AC_ARG_WITH([pppd-ext-tls-settings-suppport], |
76 |
+ [AS_HELP_STRING([--with-pppd-ext-tls-settings-support], [is settings such as pkcs12, tls-verify-method, tls-verify-key-usage and max-tls-version supported in by pppd])]) |
77 |
+ if test x"$with_pppd_ext_tls_settings_support" != xyes; then |
78 |
+- if test x"$pppd_pkgconfig_support" == xyes; then # pkgconfig implies pppd > 2.4.9 |
79 |
++ if test x"$pppd_pkgconfig_support" = xyes; then # pkgconfig implies pppd > 2.4.9 |
80 |
+ AS_VAR_SET([with_pppd_ext_tls_settings_support],[yes]) |
81 |
+ fi |
82 |
+ fi |
83 |
+-if test x"$with_pppd_ext_tls_settings_support" == xyes; then |
84 |
++if test x"$with_pppd_ext_tls_settings_support" = xyes; then |
85 |
+ AC_DEFINE(USE_PPP_EXT_TLS_SETTINGS,1,[Define if pppd has support for extended tls-settings like pkcs12, tls-verify-method, tls-verify-key-usage, max-tls-version]) |
86 |
+ else |
87 |
+ AS_VAR_SET([with_pppd_ext_tls_settings_support],[no]) |
88 |
+@@ -102,7 +102,7 @@ AC_ARG_WITH([pppd-plugin-dir], |
89 |
+ if test -n "$with_pppd_plugin_dir" ; then |
90 |
+ PPPD_PLUGIN_DIR="$with_pppd_plugin_dir" |
91 |
+ else |
92 |
+- if test x"$pppd_pkgconfig_support" == xyes; then |
93 |
++ if test x"$pppd_pkgconfig_support" = xyes; then |
94 |
+ PKG_CHECK_VAR(PPPD_PLUGIN_DIR, [pppd], [plugindir]) |
95 |
+ else |
96 |
+ PPPD_PLUGIN_DIR="${libdir}/pppd/2.4.7" |
97 |
+@@ -134,29 +134,29 @@ dnl |
98 |
+ AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-sstp without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no]) |
99 |
+ AC_ARG_WITH(gtk4, AS_HELP_STRING([--with-gtk4], [Build NetworkManager-sstp with libnma-gtk4 support]), [], [with_gtk4_specified=no]) |
100 |
+ AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-sstp with libnm-glib comatibility (deprecated)]), [], [with_libnm_glib_specified=no]) |
101 |
+-if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then |
102 |
+- if test "$with_gnome_specified" != no -a "$with_gnome" == no; then |
103 |
++if test x"$with_libnm_glib_specified" != xno -a x"$with_libnm_glib" != xno; then |
104 |
++ if test x"$with_gnome_specified" != xno -a x"$with_gnome" = xno; then |
105 |
+ AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome) |
106 |
+ fi |
107 |
+ fi |
108 |
+-if test "$with_gnome" != no; then |
109 |
++if test x"$with_gnome" != xno; then |
110 |
+ with_gnome=yes |
111 |
+ fi |
112 |
+-if test "$with_gtk4_specified" == no; then |
113 |
++if test x"$with_gtk4_specified" = xno; then |
114 |
+ with_gtk4=no |
115 |
+ fi |
116 |
+-if test "$with_gtk4" != yes; then |
117 |
++if test x"$with_gtk4" != xyes; then |
118 |
+ with_gtk4=no |
119 |
+ fi |
120 |
+-if test "$with_libnm_glib_specified" == no; then |
121 |
++if test x"$with_libnm_glib_specified" = xno; then |
122 |
+ with_libnm_glib=no |
123 |
+ fi |
124 |
+-if test "$with_libnm_glib" != yes; then |
125 |
++if test x"$with_libnm_glib" != xyes; then |
126 |
+ with_libnm_glib=no |
127 |
+ fi |
128 |
+-AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no) |
129 |
+-AM_CONDITIONAL(WITH_GTK4, test "$with_gtk4" != no) |
130 |
+-AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no) |
131 |
++AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno) |
132 |
++AM_CONDITIONAL(WITH_GTK4, test x"$with_gtk4" != xno) |
133 |
++AM_CONDITIONAL(WITH_LIBNM_GLIB, test x"$with_libnm_glib" != xno) |
134 |
+ AC_ARG_ENABLE(absolute-paths, AS_HELP_STRING([--enable-absolute-paths], [Use absolute paths to in .name files. Useful for development. (default is no)])) |
135 |
+ |
136 |
+ GETTEXT_PACKAGE=NetworkManager-sstp |
137 |
+@@ -223,7 +223,7 @@ NM_COMPILER_WARNINGS([yes]) |
138 |
+ |
139 |
+ NM_PLUGIN_DIR="$libdir/NetworkManager" |
140 |
+ AC_SUBST(NM_PLUGIN_DIR) |
141 |
+-if test x"$enable_absolute_paths" == x"yes"; then |
142 |
++if test x"$enable_absolute_paths" = x"yes"; then |
143 |
+ NM_PLUGIN_DIR_NAME_FILE="$NM_PLUGIN_DIR/" |
144 |
+ else |
145 |
+ enable_absolute_paths=no |
146 |
+GitLab |
147 |
|
148 |
diff --git a/net-vpn/networkmanager-sstp/metadata.xml b/net-vpn/networkmanager-sstp/metadata.xml |
149 |
index 334a1211764a..0ce44d230220 100644 |
150 |
--- a/net-vpn/networkmanager-sstp/metadata.xml |
151 |
+++ b/net-vpn/networkmanager-sstp/metadata.xml |
152 |
@@ -2,6 +2,9 @@ |
153 |
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
154 |
<pkgmetadata> |
155 |
<!--maintainer-needed--> |
156 |
+ <use> |
157 |
+ <flag name="gtk4">Use <pkg>gui-libs/gtk:4</pkg> for GUI support.</flag> |
158 |
+ </use> |
159 |
<upstream> |
160 |
<remote-id type="sourceforge">sstp-client</remote-id> |
161 |
</upstream> |
162 |
|
163 |
diff --git a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.0.ebuild b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.0.ebuild |
164 |
new file mode 100644 |
165 |
index 000000000000..c6d18ab9057c |
166 |
--- /dev/null |
167 |
+++ b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.0.ebuild |
168 |
@@ -0,0 +1,85 @@ |
169 |
+# Copyright 1999-2022 Gentoo Authors |
170 |
+# Distributed under the terms of the GNU General Public License v2 |
171 |
+ |
172 |
+EAPI=8 |
173 |
+ |
174 |
+MY_PN="NetworkManager-sstp" |
175 |
+MY_P="${MY_PN}-${PV}" |
176 |
+ |
177 |
+inherit autotools |
178 |
+ |
179 |
+DESCRIPTION="Client for the proprietary Microsoft Secure Socket Tunneling Protocol(SSTP)" |
180 |
+HOMEPAGE="https://gitlab.gnome.org/GNOME/network-manager-sstp https://sourceforge.net/projects/sstp-client/" |
181 |
+SRC_URI="mirror://sourceforge/project/sstp-client/network-manager-sstp//${MY_P}.tar.bz2" |
182 |
+S="${WORKDIR}/${MY_P}" |
183 |
+ |
184 |
+LICENSE="GPL-2" |
185 |
+SLOT="0" |
186 |
+KEYWORDS="~amd64 ~x86" |
187 |
+IUSE="gui gtk4" |
188 |
+ |
189 |
+# As of 1.3.0, if want GUI support, GTK 3 is always needed, even with GTK 4. |
190 |
+# atk/graphene/harfbuzz/cairo/gdk-pixbuf/pango are all standard "dragged in by gtk/glib" |
191 |
+# deps. |
192 |
+RDEPEND=">=dev-libs/glib-2.32:2 |
193 |
+ net-misc/sstp-client |
194 |
+ >=net-misc/networkmanager-1.1.0 |
195 |
+ net-dialup/ppp:= |
196 |
+ net-libs/gnutls:= |
197 |
+ gui? ( |
198 |
+ >=net-libs/libnma-1.2.0 |
199 |
+ >=app-crypt/libsecret-0.18 |
200 |
+ >=x11-libs/gtk+-3.4:3 |
201 |
+ |
202 |
+ gtk4? ( |
203 |
+ dev-libs/atk |
204 |
+ media-libs/graphene |
205 |
+ media-libs/harfbuzz:= |
206 |
+ x11-libs/cairo |
207 |
+ x11-libs/gdk-pixbuf:2 |
208 |
+ x11-libs/pango |
209 |
+ |
210 |
+ gui-libs/gtk:4 |
211 |
+ ) |
212 |
+ )" |
213 |
+DEPEND="${RDEPEND}" |
214 |
+BDEPEND="dev-util/gdbus-codegen |
215 |
+ dev-util/intltool |
216 |
+ virtual/pkgconfig |
217 |
+ sys-apps/file |
218 |
+ sys-devel/gettext" |
219 |
+ |
220 |
+PATCHES=( |
221 |
+ "${FILESDIR}"/${P}-fix-configure.ac-bashisms.patch |
222 |
+) |
223 |
+ |
224 |
+src_prepare() { |
225 |
+ default |
226 |
+ |
227 |
+ # Bug #741108 |
228 |
+ sed -i 's|/appdata|/metainfo|g' Makefile.{in,am} || die |
229 |
+ |
230 |
+ eautoreconf |
231 |
+} |
232 |
+ |
233 |
+src_configure() { |
234 |
+ local PPPD_VER="$(best_version net-dialup/ppp)" |
235 |
+ # Reduce it to ${PV}-${PR} |
236 |
+ PPPD_VER=${PPPD_VER#*/*-} |
237 |
+ # Main version without beta/pre/patch/revision |
238 |
+ PPPD_VER=${PPPD_VER%%[_-]*} |
239 |
+ |
240 |
+ econf \ |
241 |
+ --disable-more-warnings \ |
242 |
+ --with-dist-version=Gentoo \ |
243 |
+ --with-pppd-plugin-dir="${EPREFIX}/usr/$(get_libdir)/pppd/${PPPD_VER}" \ |
244 |
+ $(use_with gui gnome) \ |
245 |
+ $(use_with gtk4) \ |
246 |
+ --without-libnm-glib |
247 |
+} |
248 |
+ |
249 |
+src_install() { |
250 |
+ default |
251 |
+ |
252 |
+ find "${ED}" -type f -name '*.la' -delete || die |
253 |
+} |