Browse Source
Merge pull request #7383 from neheb/squ
socat: Fix compile with deprecated APIs disabled
lilik-openwrt-22.03
Ted Hess
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
14 additions and
1 deletions
-
net/socat/Makefile
-
net/socat/patches/200-openssl-deprecated.patch
|
|
@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk |
|
|
|
|
|
|
|
|
PKG_NAME:=socat |
|
|
PKG_NAME:=socat |
|
|
PKG_VERSION:=1.7.3.2 |
|
|
PKG_VERSION:=1.7.3.2 |
|
|
PKG_RELEASE:=3 |
|
|
|
|
|
|
|
|
PKG_RELEASE:=4 |
|
|
|
|
|
|
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 |
|
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 |
|
|
PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download |
|
|
PKG_SOURCE_URL:=http://www.dest-unreach.org/socat/download |
|
|
|
|
|
@ -0,0 +1,13 @@ |
|
|
|
|
|
diff --git a/xio-openssl.c b/xio-openssl.c
|
|
|
|
|
|
index e931983..84ec100 100644
|
|
|
|
|
|
--- a/xio-openssl.c
|
|
|
|
|
|
+++ b/xio-openssl.c
|
|
|
|
|
|
@@ -8,6 +8,8 @@
|
|
|
|
|
|
#if WITH_OPENSSL /* make this address configure dependend */ |
|
|
|
|
|
#include <openssl/conf.h> |
|
|
|
|
|
#include <openssl/x509v3.h> |
|
|
|
|
|
+#include <openssl/dh.h>
|
|
|
|
|
|
+#include <openssl/bn.h>
|
|
|
|
|
|
|
|
|
|
|
|
#include "xioopen.h" |
|
|
|
|
|
|
