OpenWrt
/
packages
mirror of https://git.openwrt.org/feed/packages.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

sstp-client: Update to 1.0.13 

Edited deprecated OpenSSL patch slightly.

Fixed up license information.

Reorganized Makefile for consistency between packages.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2019-12-04 10:23:51 -08:00
parent 936a52610a
commit b3f52f80ad
No known key found for this signature in database
GPG Key ID: 36D31CFA845F0E3B
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/sstp-client/Makefile
View File

@ -8,18 +8,19 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=sstp-client PKG_NAME:=sstp-client
PKG_VERSION:=1.0.12 PKG_VERSION:=1.0.13
PKG_RELEASE:=3 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=@SF/sstp-client/$(PKG_VERSION) PKG_SOURCE_URL:=@SF/sstp-client/$(PKG_VERSION)
PKG_HASH:=487eb406579689803ce0397f6102b18641e4572ac7bc9b9e5f3027c84dcf67ff PKG_HASH:=961258fca0795d8ad60b047942cf7cb53d025d353fd1e4ba08c2b75799f5321b
PKG_LICENSE=GPLv2
PKG_MAINTAINER:=Federico Di Marco <fededim@gmail.com>
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
TARGET_CPPFLAGS += -I$(PKG_BUILD_DIR)/include
define Package/sstp-client define Package/sstp-client
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
@ -27,7 +28,6 @@ define Package/sstp-client
DEPENDS=+libevent2 +libopenssl +ppp +resolveip DEPENDS=+libevent2 +libopenssl +ppp +resolveip
TITLE:=SSTP-Client is a SSTP client for Linux. TITLE:=SSTP-Client is a SSTP client for Linux.
URL:=http://sstp-client.sourceforge.net/ URL:=http://sstp-client.sourceforge.net/
MAINTAINER:=Federico Di Marco <fededim@gmail.com>
endef endef
define Package/sstp-client/description define Package/sstp-client/description
@ -48,14 +48,16 @@ define Package/sstp-client/conffiles
/etc/ppp/peers/peer-sstp-example.txt /etc/ppp/peers/peer-sstp-example.txt
endef endef
TARGET_CPPFLAGS += -I$(PKG_BUILD_DIR)/include
define Package/sstp-client/install define Package/sstp-client/install
$(INSTALL_DIR) $(1)/usr/{bin,lib} $(INSTALL_DIR) $(1)/usr/{bin,lib}
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/.libs/sstpc $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/.libs/sstpc $(1)/usr/bin/
$(CP) $(PKG_BUILD_DIR)/src/libsstp-api/.libs/*.so* $(1)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/src/libsstp-api/.libs/*.so* $(1)/usr/lib/
$(CP) $(PKG_BUILD_DIR)/src/pppd-plugin/.libs/*.so* $(1)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/src/pppd-plugin/.libs/*.so* $(1)/usr/lib/
$(INSTALL_DIR) $(1)/etc $(INSTALL_DIR) $(1)/etc
$(CP) files/etc $(1) $(CP) files/etc $(1)
$(INSTALL_DIR) $(1)/lib/netifd/proto $(INSTALL_DIR) $(1)/lib/netifd/proto
$(INSTALL_BIN) ./files/lib/netifd/proto/sstp.sh $(1)/lib/netifd/proto $(INSTALL_BIN) ./files/lib/netifd/proto/sstp.sh $(1)/lib/netifd/proto
endef endef

12
net/sstp-client/patches/200-openssl-deprecated.patch
View File

@ -8,11 +8,13 @@
/* Initialize the OpenSSL library */ /* Initialize the OpenSSL library */
status = SSL_library_init(); status = SSL_library_init();
if (status != 1) if (status != 1)
@@ -487,6 +488,7 @@ static status_t sstp_init_ssl(sstp_client_st *client, sstp_option_st *opt) @@ -490,6 +491,9 @@ static status_t sstp_init_ssl(sstp_client_st *client, sstp_option_st *opt)
/* Load all error strings */
SSL_load_error_strings();
+#endif
/* Create a new crypto context */ /* Create a new crypto context */
client->ssl_ctx = SSL_CTX_new(SSLv23_client_method()); client->ssl_ctx = SSL_CTX_new(SSLv23_client_method());
+#else
+ client->ssl_ctx = SSL_CTX_new(TLS_client_method());
+#endif
if (client->ssl_ctx == NULL)
{
log_err("Could not get SSL crypto context");