commit bf3d76ee71b7da542a8241398b488f58ed8e616f
Author: Jakub Bogusz <qbo...@pld-linux.org>
Date: Sun Sep 22 10:38:11 2024 +0200
- updated to 1.0.18, adapt ppp plugin for ppp 2.5.x
sstp-client-ppp.patch | 46 ++++++++++++++++++++++++++++++++++++++++++++++
sstp-client.spec | 11 +++++++----
2 files changed, 53 insertions(+), 4 deletions(-)
---
diff --git a/sstp-client.spec b/sstp-client.spec
index 881c79f..06f7b71 100644
--- a/sstp-client.spec
+++ b/sstp-client.spec
@@ -1,21 +1,22 @@
#
# Conditional build:
-%bcond_without static_libs # static libraries
+%bcond_without static_libs # static library
#
Summary: SSTP client for Linux
Summary(pl.UTF-8): Klient SSTP dla Linuksa
Name: sstp-client
-Version: 1.0.17
+Version: 1.0.18
Release: 1
License: GPL v2+
Group: Libraries
Source0:
https://downloads.sourceforge.net/sstp-client/%{name}-%{version}.tar.gz
-# Source0-md5: ca563f85badc4e4549e95aa42b2bf081
+# Source0-md5: 04ec1868f825d3218173a95bc9b9eff2
+Patch0: %{name}-ppp.patch
URL: http://sstp-client.sourceforge.net/
BuildRequires: libevent-devel >= 2.0.10
BuildRequires: openssl-devel
BuildRequires: pkgconfig
-BuildRequires: ppp-plugin-devel >= 2.4.9
+BuildRequires: ppp-plugin-devel >= 3:2.5.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -57,6 +58,7 @@ Summary: pppd plugin to relay the MPPE keys to
sstp-client
Summary(pl.UTF-8): Wtyczka pppd przekazująca klucze MPPE do klienta sstp
Group: Daemons
Requires: %{name} = %{version}-%{release}
+Requires: ppp >= 3:2.5.0
%description -n ppp-plugin-sstp
pppd plugin to relay the MPPE keys to sstp-client.
@@ -66,6 +68,7 @@ Wtyczka pppd przekazująca klucze MPPE do klienta sstp.
%prep
%setup -q
+%patch0 -p1
%build
%configure \
diff --git a/sstp-client-ppp.patch b/sstp-client-ppp.patch
new file mode 100644
index 0000000..f963874
--- /dev/null
+++ b/sstp-client-ppp.patch
@@ -0,0 +1,46 @@
+--- sstp-client-1.0.18/src/pppd-plugin/sstp-plugin.c.orig 2022-09-02
18:41:52.000000000 +0200
++++ sstp-client-1.0.18/src/pppd-plugin/sstp-plugin.c 2024-09-22
10:13:25.121832771 +0200
+@@ -36,7 +36,8 @@
+ #include <pppd/fsm.h>
+ #include <pppd/lcp.h>
+ #include <pppd/eap.h>
+-#include <pppd/chap-new.h>
++#include <pppd/chap.h>
++#include <pppd/options.h>
+
+ #include <sstp-api.h>
+ #include <sstp-mppe.h>
+@@ -109,7 +110,7 @@ static void sstp_send_notify()
+ key_len = mppe_get_send_key(key, sizeof(key));
+ if (key_len > 0) {
+ sstp_api_attr_add(msg, SSTP_API_ATTR_MPPE_SEND, key_len, key);
+- if (debug) {
++ if (debug_on()) {
+ dbglog("The mppe send key (%d): %0.*B", key_len, key_len,
key);
+ }
+ }
+@@ -117,7 +118,7 @@ static void sstp_send_notify()
+ key_len = mppe_get_recv_key(key, sizeof(key));
+ if (key_len > 0) {
+ sstp_api_attr_add(msg, SSTP_API_ATTR_MPPE_RECV, key_len, key);
+- if (debug) {
++ if (debug_on()) {
+ dbglog("The mppe recv key (%d): %0.*B", key_len, key_len,
key);
+ }
+ }
+@@ -259,13 +260,13 @@ void plugin_init(void)
+ add_options(sstp_option);
+
+ #ifdef USE_PPPD_AUTH_HOOK
+- add_notifier(&auth_up_notifier, sstp_auth_done, NULL);
++ ppp_add_notify(NF_AUTH_UP, sstp_auth_done, NULL);
+ #else
+ /* Let's snoop for CHAP authentication */
+ snoop_recv_hook = sstp_snoop_recv;
+
+ /* Add ip-up notifier */
+- add_notifier(&ip_up_notifier, sstp_ip_up, NULL);
++ ppp_add_notify(NF_IP_UP, sstp_ip_up, NULL);
+ #endif
+ }
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/sstp-client.git/commitdiff/bf3d76ee71b7da542a8241398b488f58ed8e616f
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
