[gentoo-commits] repo/gentoo:master commit in: net-misc/sstp-client/, net-misc/sstp-client/files/
commit: 2a7e9cefaa79179e8953c4a826428d12ed638527
Author: Mike Gilbert gentoo org>
AuthorDate: Sun Apr 23 16:27:02 2023 +
Commit: Mike Gilbert gentoo org>
CommitDate: Sun Apr 23 16:28:41 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a7e9cef
net-misc/sstp-client: fix build with https://bugs.gentoo.org/904874
Signed-off-by: Mike Gilbert gentoo.org>
.../files/sstp-client-1.0.18-sstp-mppe.patch | 30 ++
net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild | 1 +
2 files changed, 31 insertions(+)
diff --git a/net-misc/sstp-client/files/sstp-client-1.0.18-sstp-mppe.patch
b/net-misc/sstp-client/files/sstp-client-1.0.18-sstp-mppe.patch
new file mode 100644
index ..a9842f6f23dd
--- /dev/null
+++ b/net-misc/sstp-client/files/sstp-client-1.0.18-sstp-mppe.patch
@@ -0,0 +1,30 @@
+https://bugs.gentoo.org/904874
+https://gitlab.com/sstp-project/sstp-client/-/merge_requests/11
+
+From e902ce947eaccdbd0399c42371934e16d3737f35 Mon Sep 17 00:00:00 2001
+From: Mike Gilbert
+Date: Sun, 23 Apr 2023 12:14:21 -0400
+Subject: [PATCH] Replace sstp-mppe.h with sstp-pppd-compat.h
+
+Fixes: 3f7835df9ac5e84729903ca536cf65e4a7b04c6c
+Signed-off-by: Mike Gilbert
+---
+ src/pppd-plugin/sstp-mppe.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/pppd-plugin/sstp-mppe.c b/src/pppd-plugin/sstp-mppe.c
+index 7c7c7c2..207e283 100644
+--- a/src/pppd-plugin/sstp-mppe.c
b/src/pppd-plugin/sstp-mppe.c
+@@ -27,7 +27,7 @@
+ #include
+ #include
+ #include
+-#include
++#include
+
+ #ifndef HAVE_MPPE_KEYS_FUNCTIONS
+
+--
+GitLab
+
diff --git a/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild
b/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild
index d3fbceca2f8f..3c2af86605a0 100644
--- a/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild
+++ b/net-misc/sstp-client/sstp-client-1.0.18-r2.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.0.18-includes.patch"
"${WORKDIR}/${P}-ppp-2.5.0-patches"
+ "${FILESDIR}/sstp-client-1.0.18-sstp-mppe.patch"
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: net-misc/sstp-client/, net-misc/sstp-client/files/
commit: a67752097b07e8857a1041b13194a1659dfc4d43
Author: Sam James gentoo org>
AuthorDate: Tue May 10 18:03:56 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue May 10 19:36:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6775209
net-misc/sstp-client: add 1.0.17
Signed-off-by: Sam James gentoo.org>
net-misc/sstp-client/Manifest | 1 +
...tp-client-1.0.17-fix-bashism-configure.ac.patch | 23
net-misc/sstp-client/sstp-client-1.0.17.ebuild | 65 ++
3 files changed, 89 insertions(+)
diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest
index 5bbc71ccec93..a45ddcf16074 100644
--- a/net-misc/sstp-client/Manifest
+++ b/net-misc/sstp-client/Manifest
@@ -1 +1,2 @@
DIST sstp-client-1.0.12.tar.gz 468683 BLAKE2B
4bb97465ee29eb6dd816a69b45c53e58e9de2cd5d7b5c9e39ea4ebbb3c3de0c21b3d95317114ae8c93bc3be359300bd6a55fa0512540bf25405fb47f8fb4e736
SHA512
d29128e59977fa844b0f2b02580284bb4e909994e5616c4dfa150b7a9807d0f34219355abe8c315c60c5f2482e3255824ce7e05566dbea9a7f13a1739d46468f
+DIST sstp-client-1.0.17.tar.gz 482831 BLAKE2B
d19c752b3f061401f89eb46bd52091e3ab0a3c931c6646a55c1ee0e6dd7e9c501fba14b7c870a2514cb72fb0fd1d8bc89538562d4d99b9d58a081e0917734f5d
SHA512
eff18eb894b2c96d46315b5ac7530fe50e8dd6e6c29ea946cd0e7c05c56416e85088fc65650fb77c05e3a747cb0b4e3575af5457515d240161027910abae9775
diff --git
a/net-misc/sstp-client/files/sstp-client-1.0.17-fix-bashism-configure.ac.patch
b/net-misc/sstp-client/files/sstp-client-1.0.17-fix-bashism-configure.ac.patch
new file mode 100644
index ..a3a41fb206a9
--- /dev/null
+++
b/net-misc/sstp-client/files/sstp-client-1.0.17-fix-bashism-configure.ac.patch
@@ -0,0 +1,23 @@
+https://gitlab.com/eivnaes/sstp-client/-/merge_requests/2
+
+From 3cae209750549b17c547c3025859c0468cd5fcf6 Mon Sep 17 00:00:00 2001
+From: Sam James
+Date: Tue, 10 May 2022 18:04:20 +
+Subject: [PATCH] configure.ac: fix bashism
+
+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.
+
+Signed-off-by: Sam James
+--- a/configure.ac
b/configure.ac
+@@ -129,7 +129,7 @@ PKG_CHECK_EXISTS([pppd],
+ AM_CONDITIONAL(WITH_PPP_PLUGIN, test "${enable_ppp_plugin}" = "yes")
+ AC_ARG_WITH([pppd-auth-notify-support],
+ AS_HELP_STRING([--with-pppd-auth-notify-support], [is the auth-notifier
supported in this pppd version]))
+-AS_IF([test "x$with_pppd_auth_notify_support" == "xyes" ],
++AS_IF([test "x$with_pppd_auth_notify_support" = "xyes" ],
+ [AC_DEFINE(USE_PPPD_AUTH_HOOK,1,[Define if pppd has support for client
side authentication complete notification])
+ PPPD_AUTH_NOTIFIER="yes"],
+ [PPPD_AUTH_NOTIFIER="no"])
+GitLab
diff --git a/net-misc/sstp-client/sstp-client-1.0.17.ebuild
b/net-misc/sstp-client/sstp-client-1.0.17.ebuild
new file mode 100644
index ..57f15cf30687
--- /dev/null
+++ b/net-misc/sstp-client/sstp-client-1.0.17.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info
+
+DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol
(SSTP)"
+HOMEPAGE="http://sstp-client.sourceforge.net/;
+SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="static"
+
+DEPEND="dev-libs/libevent:=
+ dev-libs/openssl:=
+ net-dialup/ppp:="
+RDEPEND="${DEPEND}
+ acct-group/sstpc
+ acct-user/sstpc"
+BDEPEND="virtual/pkgconfig"
+
+CONFIG_CHECK="~NETFILTER_NETLINK"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.12-remove-network-test.patch"
+ "${FILESDIR}/${PN}-1.0.12-fix-example.patch"
+
+ "${FILESDIR}/${PN}-1.0.17-fix-bashism-configure.ac.patch"
+)
+
+DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING )
+
+src_prepare() {
+ default
+
+ 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%%[_-]*}
+
+ local myeconfargs=(
+ --enable-ppp-plugin
+ --enable-group=sstpc
+ --enable-user=sstpc
+ --with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}"
+ --with-runtime-dir="/run/sstpc"
+ $(use_enable static)
+ )
+
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ default
+
+ find "${ED}" -name '*.la' -delete || die
+}
[gentoo-commits] repo/gentoo:master commit in: net-misc/sstp-client/, net-misc/sstp-client/files/
commit: 3f64da99e8f58aaf7f89aa4830b80f6f0753b5d0
Author: Maxim Koltsov gentoo org>
AuthorDate: Sat Aug 17 07:28:42 2019 +
Commit: Maxim Koltsov gentoo org>
CommitDate: Sat Aug 17 07:57:18 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f64da99
net-misc/sstp-client: remove old
Package-Manager: Portage-2.3.71, Repoman-2.3.12
Signed-off-by: Maxim Koltsov gentoo.org>
net-misc/sstp-client/Manifest | 1 -
.../files/sstp-client-1.0.11-fix-example.patch | 16 ---
.../sstp-client-1.0.11-remove-network-test.patch | 11 -
net-misc/sstp-client/sstp-client-1.0.11.ebuild | 56 --
4 files changed, 84 deletions(-)
diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest
index b52914daab1..d13f214b2a6 100644
--- a/net-misc/sstp-client/Manifest
+++ b/net-misc/sstp-client/Manifest
@@ -1,3 +1,2 @@
DIST sstp-client-1.0.10.tar.gz 3012713 BLAKE2B
6b924c9fef4df26a9aa93dd5670cae4dbfe020f2c1bfc955f88f229414b5295864c25637bddf3b80d522dd514a4f3042522f9615fe660165b4417d6ea832e4bf
SHA512
8f3e4b1b4d795015230b3a1b8aabf7d5fddd89be511bd6a59c22e5414520a392ba430f66f30aa2b982f084955e0085b0ea66d5acf5fd00414dc37c2c52a78cb7
-DIST sstp-client-1.0.11.tar.gz 3035707 BLAKE2B
f534060bc47599a372b95b25400e7cb09911eb0216b11faa5bdcf0241d7c5caabd7df6065e58dff2b6b1f6c4e416499f58f92900da024d0ad0684aa3cc4d9abd
SHA512
d22b03f1bc2d5215def6ce198d6e81b08a5cebc4db9de269bc2e66785845521f0606a96af5d9d257dcf78addafee8ad3d942de0075f47038fbfe0b5051002487
DIST sstp-client-1.0.12.tar.gz 468683 BLAKE2B
4bb97465ee29eb6dd816a69b45c53e58e9de2cd5d7b5c9e39ea4ebbb3c3de0c21b3d95317114ae8c93bc3be359300bd6a55fa0512540bf25405fb47f8fb4e736
SHA512
d29128e59977fa844b0f2b02580284bb4e909994e5616c4dfa150b7a9807d0f34219355abe8c315c60c5f2482e3255824ce7e05566dbea9a7f13a1739d46468f
diff --git a/net-misc/sstp-client/files/sstp-client-1.0.11-fix-example.patch
b/net-misc/sstp-client/files/sstp-client-1.0.11-fix-example.patch
deleted file mode 100644
index f2b81174fc1..000
--- a/net-misc/sstp-client/files/sstp-client-1.0.11-fix-example.patch
+++ /dev/null
@@ -1,16 +0,0 @@
a/Makefile.am 2018-02-07 21:51:10.451717813 +0100
-+++ b/Makefile.am 2018-02-07 21:54:43.811708840 +0100
-@@ -7,11 +7,11 @@
- include \
- src
-
--docdir = $(datadir)/doc/@PACKAGE@
- pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = sstp-client-1.0.pc
-
--doc_DATA = \
-+examplesdir = $(docdir)/examples
-+examples_DATA = \
- sstp-test.example \
- sstp-test-nopty.example
-
diff --git
a/net-misc/sstp-client/files/sstp-client-1.0.11-remove-network-test.patch
b/net-misc/sstp-client/files/sstp-client-1.0.11-remove-network-test.patch
deleted file mode 100644
index d6868f3e26b..000
--- a/net-misc/sstp-client/files/sstp-client-1.0.11-remove-network-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
a/src/Makefile.am 2018-02-07 21:42:37.755739374 +0100
-+++ b/src/Makefile.am 2018-02-07 21:45:28.855732178 +0100
-@@ -23,7 +23,7 @@
- utest_fcs \
- utest_route
-
--TESTS= $(check_PROGRAMS)
-+TESTS= utest_task utest_cmac utest_chap utest_fcs
-
- sstpc_SOURCES = \
- sstp-client.c \
diff --git a/net-misc/sstp-client/sstp-client-1.0.11.ebuild
b/net-misc/sstp-client/sstp-client-1.0.11.ebuild
deleted file mode 100644
index 07ce4377c76..000
--- a/net-misc/sstp-client/sstp-client-1.0.11.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info user
-
-DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol
(SSTP)"
-HOMEPAGE="http://sstp-client.sourceforge.net/;
-SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz"
-
-LICENSE="GPL-2+-with-openssl-exception"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="static"
-
-RDEPEND=">=dev-libs/libevent-2.0.10
- dev-libs/openssl:0=
- net-dialup/ppp:="
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-CONFIG_CHECK="~NETFILTER_NETLINK"
-
-PATCHES=( "${FILESDIR}/${P}-remove-network-test.patch"
- "${FILESDIR}/${P}-fix-example.patch"
-)
-DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING )
-
-pkg_setup() {
- enewgroup sstpc
- enewuser sstpc -1 -1 -1 sstpc
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local PPPD_VER="$(best_version net-dialup/ppp)"
- PPPD_VER=${PPPD_VER#*/*-} # reduce it to ${PV}-${PR}
- PPPD_VER=${PPPD_VER%%[_-]*} # main version without
beta/pre/patch/revision
- econf \
- --enable-ppp-plugin \
- --enable-group=sstpc \
- --enable-user=sstpc \
- --with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}" \
- --with-runtime-dir="/run/sstpc" \
-
[gentoo-commits] repo/gentoo:master commit in: net-misc/sstp-client/, net-misc/sstp-client/files/
commit: 129c10cbe13035d2dda5face949e47a43b0bc116
Author: Amy Liffey gentoo org>
AuthorDate: Wed Feb 7 21:18:29 2018 +
Commit: Amy Liffey gentoo org>
CommitDate: Wed Feb 7 21:20:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=129c10cb
net-misc/sstp-client: version bump 1.0.11
Suggested-by: mjeveritt
Closes: https://github.com/gentoo/gentoo/pull/5618
Package-Manager: Portage-2.3.13, Repoman-2.3.3
net-misc/sstp-client/Manifest | 1 +
.../files/sstp-client-1.0.11-fix-example.patch | 16 +++
.../sstp-client-1.0.11-remove-network-test.patch | 11 +
net-misc/sstp-client/sstp-client-1.0.11.ebuild | 56 ++
4 files changed, 84 insertions(+)
diff --git a/net-misc/sstp-client/Manifest b/net-misc/sstp-client/Manifest
index ea6208e5877..13f6d60ca4c 100644
--- a/net-misc/sstp-client/Manifest
+++ b/net-misc/sstp-client/Manifest
@@ -1 +1,2 @@
DIST sstp-client-1.0.10.tar.gz 3012713 BLAKE2B
6b924c9fef4df26a9aa93dd5670cae4dbfe020f2c1bfc955f88f229414b5295864c25637bddf3b80d522dd514a4f3042522f9615fe660165b4417d6ea832e4bf
SHA512
8f3e4b1b4d795015230b3a1b8aabf7d5fddd89be511bd6a59c22e5414520a392ba430f66f30aa2b982f084955e0085b0ea66d5acf5fd00414dc37c2c52a78cb7
+DIST sstp-client-1.0.11.tar.gz 3035707 BLAKE2B
f534060bc47599a372b95b25400e7cb09911eb0216b11faa5bdcf0241d7c5caabd7df6065e58dff2b6b1f6c4e416499f58f92900da024d0ad0684aa3cc4d9abd
SHA512
d22b03f1bc2d5215def6ce198d6e81b08a5cebc4db9de269bc2e66785845521f0606a96af5d9d257dcf78addafee8ad3d942de0075f47038fbfe0b5051002487
diff --git a/net-misc/sstp-client/files/sstp-client-1.0.11-fix-example.patch
b/net-misc/sstp-client/files/sstp-client-1.0.11-fix-example.patch
new file mode 100644
index 000..f2b81174fc1
--- /dev/null
+++ b/net-misc/sstp-client/files/sstp-client-1.0.11-fix-example.patch
@@ -0,0 +1,16 @@
+--- a/Makefile.am 2018-02-07 21:51:10.451717813 +0100
b/Makefile.am 2018-02-07 21:54:43.811708840 +0100
+@@ -7,11 +7,11 @@
+ include \
+ src
+
+-docdir = $(datadir)/doc/@PACKAGE@
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = sstp-client-1.0.pc
+
+-doc_DATA = \
++examplesdir = $(docdir)/examples
++examples_DATA = \
+ sstp-test.example \
+ sstp-test-nopty.example
+
diff --git
a/net-misc/sstp-client/files/sstp-client-1.0.11-remove-network-test.patch
b/net-misc/sstp-client/files/sstp-client-1.0.11-remove-network-test.patch
new file mode 100644
index 000..d6868f3e26b
--- /dev/null
+++ b/net-misc/sstp-client/files/sstp-client-1.0.11-remove-network-test.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile.am 2018-02-07 21:42:37.755739374 +0100
b/src/Makefile.am 2018-02-07 21:45:28.855732178 +0100
+@@ -23,7 +23,7 @@
+ utest_fcs \
+ utest_route
+
+-TESTS= $(check_PROGRAMS)
++TESTS= utest_task utest_cmac utest_chap utest_fcs
+
+ sstpc_SOURCES = \
+ sstp-client.c \
diff --git a/net-misc/sstp-client/sstp-client-1.0.11.ebuild
b/net-misc/sstp-client/sstp-client-1.0.11.ebuild
new file mode 100644
index 000..07ce4377c76
--- /dev/null
+++ b/net-misc/sstp-client/sstp-client-1.0.11.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools linux-info user
+
+DESCRIPTION="A client implementation of Secure Socket Tunneling Protocol
(SSTP)"
+HOMEPAGE="http://sstp-client.sourceforge.net/;
+SRC_URI="mirror://sourceforge/sstp-client/${P}.tar.gz"
+
+LICENSE="GPL-2+-with-openssl-exception"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="static"
+
+RDEPEND=">=dev-libs/libevent-2.0.10
+ dev-libs/openssl:0=
+ net-dialup/ppp:="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+CONFIG_CHECK="~NETFILTER_NETLINK"
+
+PATCHES=( "${FILESDIR}/${P}-remove-network-test.patch"
+ "${FILESDIR}/${P}-fix-example.patch"
+)
+DOCS=( AUTHORS ChangeLog DEVELOPERS NEWS README TODO USING )
+
+pkg_setup() {
+ enewgroup sstpc
+ enewuser sstpc -1 -1 -1 sstpc
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+src_configure() {
+ local PPPD_VER="$(best_version net-dialup/ppp)"
+ PPPD_VER=${PPPD_VER#*/*-} # reduce it to ${PV}-${PR}
+ PPPD_VER=${PPPD_VER%%[_-]*} # main version without
beta/pre/patch/revision
+ econf \
+ --enable-ppp-plugin \
+ --enable-group=sstpc \
+ --enable-user=sstpc \
+ --with-pppd-plugin-dir="/usr/$(get_libdir)/pppd/${PPPD_VER}" \
+ --with-runtime-dir="/run/sstpc" \
+ $(use_enable static)
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
