diff options
author | 2022-05-10 18:49:31 +0000 | |
---|---|---|
committer | 2022-05-10 19:36:01 +0000 | |
commit | 79b3c30e3703cdceb0dee1e60115b4348b955579 (patch) | |
tree | 482dae1a946ce07ec8135bbb06286d12d24defa5 /net-vpn | |
parent | net-misc/sstp-client: add 1.0.17 (diff) | |
download | gentoo-79b3c30e3703cdceb0dee1e60115b4348b955579.tar.gz gentoo-79b3c30e3703cdceb0dee1e60115b4348b955579.tar.bz2 gentoo-79b3c30e3703cdceb0dee1e60115b4348b955579.zip |
net-vpn/networkmanager-sstp: add 1.3.0
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'net-vpn')
4 files changed, 203 insertions, 0 deletions
diff --git a/net-vpn/networkmanager-sstp/Manifest b/net-vpn/networkmanager-sstp/Manifest index 6bf141bbaa3d..4de7ee4a3463 100644 --- a/net-vpn/networkmanager-sstp/Manifest +++ b/net-vpn/networkmanager-sstp/Manifest @@ -1,2 +1,3 @@ DIST NetworkManager-sstp-1.2.0.tar.bz2 440695 BLAKE2B 170221842c25945da09f94364642be94993ac4ef7bbaffebefc463e18eeff78f3a58d95607a6f0be9fb5ecdabee244d64abb02eb56deb213ac089019089821f4 SHA512 31c7f61c2d0326c2ddc681690d4a9e0a25f29b3b5f51c44ea196cd74aab1002a6eb66bd06bddd8218961b18e666d5c28e57cfe0b2694a686ea8eb4195fcd9776 DIST NetworkManager-sstp-1.2.6.tar.bz2 450813 BLAKE2B 9eefc73a676c825fd56b36085385fc382616059b82f8c14394e315b657162baa608f15046cad584d088774af1432a4e4d3751ecbecc6e779af7080c4bec9034f SHA512 60f5636e73d40ad3e16e5751a22ec12616e8d1fcffe63cba2ae1d04a13edd553c8c72a336ec52d353be6df5431a8a27a74e6e056b1a1a18ed050d5ec226bbe8e +DIST NetworkManager-sstp-1.3.0.tar.bz2 548907 BLAKE2B 97248268a781033bc960f930c5a55102e9fa76efa4be6477ffd277fd334649625b6c88418f00d678afa4412fb088cd201ef6711ef6f48b516daaa38fac02caa9 SHA512 9a26c737601990b913d9506ecaac957c4f6d2a4c64a3a0eb8beaf93eaef797ed134b2ddfe2421006a7ffe0dbd18800d49501836f3671f798132a1df707da138a 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 new file mode 100644 index 000000000000..7f603028e639 --- /dev/null +++ b/net-vpn/networkmanager-sstp/files/networkmanager-sstp-1.3.0-fix-configure.ac-bashisms.patch @@ -0,0 +1,114 @@ +https://gitlab.gnome.org/GNOME/network-manager-sstp/-/merge_requests/44 + +From abe1e3aa7e2cd71e979035168ffa54268bb26b9b Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Tue, 10 May 2022 19:29:26 +0000 +Subject: [PATCH] configure.ac: fix bashism, use x prefix + +configure scripts are expected to work with POSIX compliant shells providing +/bin/sh so use = instead of == to work with both Bash and other shells. + +Also, throw in x"$var" == xvar guards (x) because it's a lot easier to just +have them and avoid pitfalls when a variable ends up not defined and having +a syntax error, even though it's not needed in every context depending +on shell. + +Signed-off-by: Sam James <sam@gentoo.org> +--- a/configure.ac ++++ b/configure.ac +@@ -59,7 +59,7 @@ AC_CACHE_CHECK([if pppd/mppe.h defines mppe_keys_xyz() functions], ac_cv_working + return 0;]])], + [ac_cv_working_mppe_h=yes], + [ac_cv_working_mppe_h=no])]) +-if test $ac_cv_working_mppe_h = yes; then ++if test $ac_cv_working_mppe_h = xyes; then + AC_DEFINE(HAVE_MPPE_KEYS_FUNCTIONS, 1, + [Define to 1 if you have <pppd/mppe.h> and it declares the mppe_keys_xyz() functions]) + fi +@@ -70,11 +70,11 @@ dnl Support for the auth notify callback in pppd >= 2.4.9 + AC_ARG_WITH([pppd-auth-notify-support], + [AS_HELP_STRING([--with-pppd-auth-notify-support], [is the auth-notifier supported by pppd])]) + if test x"$with_pppd_auth_notify_support" != xyes; then +- if test x"$pppd_pkgconfig_support" == xyes; then # pkgconfig implies pppd > 2.4.9 ++ if test x"$pppd_pkgconfig_support" = xyes; then # pkgconfig implies pppd > 2.4.9 + AS_VAR_SET([with_pppd_auth_notify_support],[yes]) + fi + fi +-if test x"$with_pppd_auth_notify_support" == xyes; then ++if test x"$with_pppd_auth_notify_support" = xyes; then + AC_DEFINE(USE_PPPD_AUTH_HOOK,1,[Define if pppd has support for client side authentication complete notification]) + else + AS_VAR_SET([with_pppd_auth_notify_support],[no]) +@@ -85,11 +85,11 @@ dnl Enable support for extended tls settings in pppd > 2.4.9 + AC_ARG_WITH([pppd-ext-tls-settings-suppport], + [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])]) + if test x"$with_pppd_ext_tls_settings_support" != xyes; then +- if test x"$pppd_pkgconfig_support" == xyes; then # pkgconfig implies pppd > 2.4.9 ++ if test x"$pppd_pkgconfig_support" = xyes; then # pkgconfig implies pppd > 2.4.9 + AS_VAR_SET([with_pppd_ext_tls_settings_support],[yes]) + fi + fi +-if test x"$with_pppd_ext_tls_settings_support" == xyes; then ++if test x"$with_pppd_ext_tls_settings_support" = xyes; then + 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]) + else + AS_VAR_SET([with_pppd_ext_tls_settings_support],[no]) +@@ -102,7 +102,7 @@ AC_ARG_WITH([pppd-plugin-dir], + if test -n "$with_pppd_plugin_dir" ; then + PPPD_PLUGIN_DIR="$with_pppd_plugin_dir" + else +- if test x"$pppd_pkgconfig_support" == xyes; then ++ if test x"$pppd_pkgconfig_support" = xyes; then + PKG_CHECK_VAR(PPPD_PLUGIN_DIR, [pppd], [plugindir]) + else + PPPD_PLUGIN_DIR="${libdir}/pppd/2.4.7" +@@ -134,29 +134,29 @@ dnl + AC_ARG_WITH(gnome, AS_HELP_STRING([--without-gnome], [Build NetworkManager-sstp without GNOME support, e.g. vpn service only]), [], [with_gnome_specified=no]) + AC_ARG_WITH(gtk4, AS_HELP_STRING([--with-gtk4], [Build NetworkManager-sstp with libnma-gtk4 support]), [], [with_gtk4_specified=no]) + AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--with-libnm-glib], [Build NetworkManager-sstp with libnm-glib comatibility (deprecated)]), [], [with_libnm_glib_specified=no]) +-if test "$with_libnm_glib_specified" != no -a "$with_libnm_glib" != no; then +- if test "$with_gnome_specified" != no -a "$with_gnome" == no; then ++if test x"$with_libnm_glib_specified" != xno -a x"$with_libnm_glib" != xno; then ++ if test x"$with_gnome_specified" != xno -a x"$with_gnome" = xno; then + AC_MSG_ERROR(Building --with-libnm-glib conflicts with --without-gnome) + fi + fi +-if test "$with_gnome" != no; then ++if test x"$with_gnome" != xno; then + with_gnome=yes + fi +-if test "$with_gtk4_specified" == no; then ++if test x"$with_gtk4_specified" = xno; then + with_gtk4=no + fi +-if test "$with_gtk4" != yes; then ++if test x"$with_gtk4" != xyes; then + with_gtk4=no + fi +-if test "$with_libnm_glib_specified" == no; then ++if test x"$with_libnm_glib_specified" = xno; then + with_libnm_glib=no + fi +-if test "$with_libnm_glib" != yes; then ++if test x"$with_libnm_glib" != xyes; then + with_libnm_glib=no + fi +-AM_CONDITIONAL(WITH_GNOME, test "$with_gnome" != no) +-AM_CONDITIONAL(WITH_GTK4, test "$with_gtk4" != no) +-AM_CONDITIONAL(WITH_LIBNM_GLIB, test "$with_libnm_glib" != no) ++AM_CONDITIONAL(WITH_GNOME, test x"$with_gnome" != xno) ++AM_CONDITIONAL(WITH_GTK4, test x"$with_gtk4" != xno) ++AM_CONDITIONAL(WITH_LIBNM_GLIB, test x"$with_libnm_glib" != xno) + AC_ARG_ENABLE(absolute-paths, AS_HELP_STRING([--enable-absolute-paths], [Use absolute paths to in .name files. Useful for development. (default is no)])) + + GETTEXT_PACKAGE=NetworkManager-sstp +@@ -223,7 +223,7 @@ NM_COMPILER_WARNINGS([yes]) + + NM_PLUGIN_DIR="$libdir/NetworkManager" + AC_SUBST(NM_PLUGIN_DIR) +-if test x"$enable_absolute_paths" == x"yes"; then ++if test x"$enable_absolute_paths" = x"yes"; then + NM_PLUGIN_DIR_NAME_FILE="$NM_PLUGIN_DIR/" + else + enable_absolute_paths=no +GitLab diff --git a/net-vpn/networkmanager-sstp/metadata.xml b/net-vpn/networkmanager-sstp/metadata.xml index 334a1211764a..0ce44d230220 100644 --- a/net-vpn/networkmanager-sstp/metadata.xml +++ b/net-vpn/networkmanager-sstp/metadata.xml @@ -2,6 +2,9 @@ <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!--maintainer-needed--> + <use> + <flag name="gtk4">Use <pkg>gui-libs/gtk:4</pkg> for GUI support.</flag> + </use> <upstream> <remote-id type="sourceforge">sstp-client</remote-id> </upstream> diff --git a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.0.ebuild b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.0.ebuild new file mode 100644 index 000000000000..c6d18ab9057c --- /dev/null +++ b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.0.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +MY_PN="NetworkManager-sstp" +MY_P="${MY_PN}-${PV}" + +inherit autotools + +DESCRIPTION="Client for the proprietary Microsoft Secure Socket Tunneling Protocol(SSTP)" +HOMEPAGE="https://gitlab.gnome.org/GNOME/network-manager-sstp https://sourceforge.net/projects/sstp-client/" +SRC_URI="mirror://sourceforge/project/sstp-client/network-manager-sstp//${MY_P}.tar.bz2" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="gui gtk4" + +# As of 1.3.0, if want GUI support, GTK 3 is always needed, even with GTK 4. +# atk/graphene/harfbuzz/cairo/gdk-pixbuf/pango are all standard "dragged in by gtk/glib" +# deps. +RDEPEND=">=dev-libs/glib-2.32:2 + net-misc/sstp-client + >=net-misc/networkmanager-1.1.0 + net-dialup/ppp:= + net-libs/gnutls:= + gui? ( + >=net-libs/libnma-1.2.0 + >=app-crypt/libsecret-0.18 + >=x11-libs/gtk+-3.4:3 + + gtk4? ( + dev-libs/atk + media-libs/graphene + media-libs/harfbuzz:= + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/pango + + gui-libs/gtk:4 + ) + )" +DEPEND="${RDEPEND}" +BDEPEND="dev-util/gdbus-codegen + dev-util/intltool + virtual/pkgconfig + sys-apps/file + sys-devel/gettext" + +PATCHES=( + "${FILESDIR}"/${P}-fix-configure.ac-bashisms.patch +) + +src_prepare() { + default + + # Bug #741108 + sed -i 's|/appdata|/metainfo|g' Makefile.{in,am} || die + + eautoreconf +} + +src_configure() { + local PPPD_VER="$(best_version net-dialup/ppp)" + # Reduce it to ${PV}-${PR} + PPPD_VER=${PPPD_VER#*/*-} + # Main version without beta/pre/patch/revision + PPPD_VER=${PPPD_VER%%[_-]*} + + econf \ + --disable-more-warnings \ + --with-dist-version=Gentoo \ + --with-pppd-plugin-dir="${EPREFIX}/usr/$(get_libdir)/pppd/${PPPD_VER}" \ + $(use_with gui gnome) \ + $(use_with gtk4) \ + --without-libnm-glib +} + +src_install() { + default + + find "${ED}" -type f -name '*.la' -delete || die +} |