From a0e652963f4d02b0e7c1148509f4ce3327c83808 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 May 2023 21:59:42 +0100 Subject: gentoo auto-resync : 13:05:2023 - 21:59:42 --- net-vpn/Manifest.gz | Bin 7062 -> 7068 bytes net-vpn/networkmanager-sstp/Manifest | 3 +- .../networkmanager-sstp-1.3.1-ppp-2.4.9.patch | 30 +++++++ .../networkmanager-sstp-1.3.1-r1.ebuild | 88 -------------------- .../networkmanager-sstp-1.3.1-r2.ebuild | 89 +++++++++++++++++++++ 5 files changed, 121 insertions(+), 89 deletions(-) create mode 100644 net-vpn/networkmanager-sstp/files/networkmanager-sstp-1.3.1-ppp-2.4.9.patch delete mode 100644 net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-r1.ebuild create mode 100644 net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-r2.ebuild (limited to 'net-vpn') diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz index 2e61134dd9c7..8fd96eb061e5 100644 Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ diff --git a/net-vpn/networkmanager-sstp/Manifest b/net-vpn/networkmanager-sstp/Manifest index 63976daa9589..d2f21f5ec4b2 100644 --- a/net-vpn/networkmanager-sstp/Manifest +++ b/net-vpn/networkmanager-sstp/Manifest @@ -1,7 +1,8 @@ AUX networkmanager-sstp-1.3.0-fix-configure.ac-bashisms.patch 5579 BLAKE2B f47cdac48099067340ae0723b011dca385711ed9f7651105e14541f2f799d96d8476604d20c747f43651ece043e11c857edf86acb5b99fd7a37db544020a953d SHA512 c9ef2c096d887f9a06c0bf64fe78d4dd2713997ecf5cf103c154f95465b40bf706b842483979df86ffa4efda208788bdfeb5015a39110568fd05ce951cca1672 +AUX networkmanager-sstp-1.3.1-ppp-2.4.9.patch 867 BLAKE2B a5c034fb9c3dca03ad2c2577b9077aca1a5bdbc36c6bf4fa695e71d4ca3256c3d54c028278c81fafb6d62da601e40835ba21a5ce10763d7c3bcfc5566ef23c42 SHA512 760544e428c57974dde50362ddf1cb56416252df6b89a8d1ccd6ee98a4ae1e20fd39348522f132911ab184d3c1fca3922335200cd27782d1226c80891c0f2cdd DIST NetworkManager-sstp-1.3.0.tar.bz2 548907 BLAKE2B 97248268a781033bc960f930c5a55102e9fa76efa4be6477ffd277fd334649625b6c88418f00d678afa4412fb088cd201ef6711ef6f48b516daaa38fac02caa9 SHA512 9a26c737601990b913d9506ecaac957c4f6d2a4c64a3a0eb8beaf93eaef797ed134b2ddfe2421006a7ffe0dbd18800d49501836f3671f798132a1df707da138a DIST NetworkManager-sstp-1.3.1.tar.xz 508392 BLAKE2B 1ead40fa9c8f5bb48b8f7d6d7f6593812849cc26778c531c17a247f60969dbb8d72f477057e4ec7ec838425c3bd21a922b1a65235b72da0bee813f75540a928b SHA512 10247931a2b951b1126a6d7b9bd396fe2eab58d575888c409430f311baeaab85468f23a6c5b6afb7bef90bf73d1e2dbc2f5750cfb126dd365db23b3f79dd7ca6 DIST networkmanager-sstp-1.3.1-ppp-2.5.0-patches.tar.xz 6792 BLAKE2B 58470f9e04be67029ad57cb2bddb3c80dd503ac5bfc2916683e7d6b4a9332aedb58883bc364a2317c31a8d871888662dbf6431c92753b6fd20b6ae873e45d96e SHA512 ee41eb9aba27e457ba5a8cba9ba27a98991f33750b8202c42ce8be2227bd6c1491bf8861b9e05cc1b3f97ea1bf93d60f5b5f83db3eefbed82ef8aff104ecba95 EBUILD networkmanager-sstp-1.3.0.ebuild 1908 BLAKE2B 65db01a396d8586734dae6633b2e08b5f57481b62edbb1491eeeaa5e8c9df77a4f66bc8cc531868696ff70b12de5828cb6333d7230dac05e101aa19f7b019e27 SHA512 3783edf78594d49a4f0765822929918bd12a2acde2dd6a317632bc4c7f5115e140b19c2f87d9c02e024949a49c99fb8d2a70645714dc6da140a338e82bc3e39e -EBUILD networkmanager-sstp-1.3.1-r1.ebuild 2032 BLAKE2B d7bb1430dee554f14b922f38b111a977f1c38c59cfd73b240c5baab5915056729e1baeab900db70d4f876fa084a8c842fe2e0ab8fbd130f49d13ea5cbf0db508 SHA512 95f01abee2aeb4685e7059c55331b3e09c79943355910c9e6758cc682d3d0ae4b57c8cdef5ac39a78b78b56a0b28ed499e2654582fdfce0e91e25b9a0d39286d +EBUILD networkmanager-sstp-1.3.1-r2.ebuild 2089 BLAKE2B b2d4b36cd861232e1807b3c9e3c773aaed4f1a919000e779ef46a528606b939b5abb934cef23715c27e9cc85082abfc36b6356b56673c96246c8a88190ab083b SHA512 4142290a2deb7794b7f83524be63f6daeb0f3a49a678e2a6bf5bae212b1bb19fbf710a6c62514202e154040007f94b8783f09ae4c5660e158858a2663feebeb3 MISC metadata.xml 406 BLAKE2B 5d7fa7ddbe8eb683af682b5ba31218ef5d59a15257119c1974d36ccfd5c0dd7ea1447abe1a1a76ff4c2f52dcab413ceafd98ce9350b2b19acd51b5abb1ee6ed9 SHA512 7142217c702ff68273a22dd75b34bf3bf5292c3e09c40fb2f2a6d1292a7b8e7f5aed2c6e3e736992ff0e2c88066450c9c793108d7f40024c0ac687d52155ea33 diff --git a/net-vpn/networkmanager-sstp/files/networkmanager-sstp-1.3.1-ppp-2.4.9.patch b/net-vpn/networkmanager-sstp/files/networkmanager-sstp-1.3.1-ppp-2.4.9.patch new file mode 100644 index 000000000000..a504b60ce008 --- /dev/null +++ b/net-vpn/networkmanager-sstp/files/networkmanager-sstp-1.3.1-ppp-2.4.9.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/906254 +https://gitlab.gnome.org/GNOME/network-manager-sstp/-/merge_requests/54 + +From f4feed7431b1cf884bd3c1c10df795efaf8d149d Mon Sep 17 00:00:00 2001 +From: Mike Gilbert +Date: Sat, 13 May 2023 12:19:44 -0400 +Subject: [PATCH] Compile nm-sstp-pppd-mppe.c when !WITH_PPP_MPPE_KEYS + +Bug: https://bugs.gentoo.org/906254 +Fixes: 4cd0ec66174011925c93aa04edccca92b4d1387f +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 3be01b6..770fc59 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -120,7 +120,7 @@ src_nm_sstp_pppd_plugin_la_SOURCES = \ + src/nm-sstp-pppd-status.h + if !WITH_PPP_MPPE_KEYS + src_nm_sstp_pppd_plugin_la_SOURCES += \ +- src/nm-sstp-pppd-mppe.h ++ src/nm-sstp-pppd-mppe.c + endif + src_nm_sstp_pppd_plugin_la_CPPFLAGS = \ + $(src_cppflags) +-- +GitLab + diff --git a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-r1.ebuild b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-r1.ebuild deleted file mode 100644 index 378579b00d87..000000000000 --- a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2023 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="https://gitlab.gnome.org/GNOME/network-manager-sstp/-/releases/release-${PV}/downloads/dist/${MY_P}.tar.xz" -SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-ppp-2.5.0-patches.tar.xz" -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? ( - >=app-accessibility/at-spi2-core-2.46.0 - 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 - sys-apps/file - sys-devel/gettext - virtual/pkgconfig -" - -PATCHES=( - "${WORKDIR}"/${P}-ppp-2.5.0-patches -) - -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 -} diff --git a/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-r2.ebuild b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-r2.ebuild new file mode 100644 index 000000000000..f6a37a57f8f8 --- /dev/null +++ b/net-vpn/networkmanager-sstp/networkmanager-sstp-1.3.1-r2.ebuild @@ -0,0 +1,89 @@ +# Copyright 1999-2023 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="https://gitlab.gnome.org/GNOME/network-manager-sstp/-/releases/release-${PV}/downloads/dist/${MY_P}.tar.xz" +SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-ppp-2.5.0-patches.tar.xz" +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? ( + >=app-accessibility/at-spi2-core-2.46.0 + 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 + sys-apps/file + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + "${WORKDIR}"/${P}-ppp-2.5.0-patches + "${FILESDIR}"/networkmanager-sstp-1.3.1-ppp-2.4.9.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 +} -- cgit v1.2.3