From df2f382d20982d1bd637313db4913cd432f15c92 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 1 Dec 2019 17:00:53 +0800 Subject: [PATCH] redsocks2: compile with PolarSSL --- .../patches/010-pre_3.6_kernels_fix.patch | 74 --------------- .../patches/020-disable_unused_libs.patch | 91 ------------------- package/lienol/redsocks2/Makefile | 8 +- 3 files changed, 4 insertions(+), 169 deletions(-) delete mode 100644 package/lean/patches/010-pre_3.6_kernels_fix.patch delete mode 100644 package/lean/patches/020-disable_unused_libs.patch diff --git a/package/lean/patches/010-pre_3.6_kernels_fix.patch b/package/lean/patches/010-pre_3.6_kernels_fix.patch deleted file mode 100644 index 818e4efcdd..0000000000 --- a/package/lean/patches/010-pre_3.6_kernels_fix.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- a/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp -+++ b/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp -@@ -33,7 +33,6 @@ - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ -- - #include "socketcanbackend.h" - - #include -@@ -50,29 +49,7 @@ - #include - #include - --#ifndef CANFD_MTU --// CAN FD support was added by Linux kernel 3.6 --// For prior kernels we redefine the missing defines here --// they are taken from linux/can/raw.h & linux/can.h -- --enum { -- CAN_RAW_FD_FRAMES = 5 --}; -- --#define CAN_MAX_DLEN 8 --#define CANFD_MAX_DLEN 64 --struct canfd_frame { -- canid_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */ -- __u8 len; /* frame payload length in byte */ -- __u8 flags; /* additional flags for CAN FD */ -- __u8 __res0; /* reserved / padding */ -- __u8 __res1; /* reserved / padding */ -- __u8 data[CANFD_MAX_DLEN] __attribute__((aligned(8))); --}; --#define CAN_MTU (sizeof(struct can_frame)) --#define CANFD_MTU (sizeof(struct canfd_frame)) - --#endif - - #ifndef CANFD_BRS - # define CANFD_BRS 0x01 /* bit rate switch (second bitrate for payload data) */ ---- a/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.h -+++ b/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.h -@@ -45,6 +45,31 @@ - #include - #include - -+#ifndef CANFD_MTU -+// CAN FD support was added by Linux kernel 3.6 -+// For prior kernels we redefine the missing defines here -+// they are taken from linux/can/raw.h & linux/can.h -+ -+enum { -+ CAN_RAW_FD_FRAMES = 5 -+}; -+ -+#define CAN_MAX_DLEN 8 -+#define CANFD_MAX_DLEN 64 -+struct canfd_frame { -+ canid_t can_id; /* 32 bit CAN_ID + EFF/RTR/ERR flags */ -+ __u8 len; /* frame payload length in byte */ -+ __u8 flags; /* additional flags for CAN FD */ -+ __u8 __res0; /* reserved / padding */ -+ __u8 __res1; /* reserved / padding */ -+ __u8 data[CANFD_MAX_DLEN] __attribute__((aligned(8))); -+}; -+#define CAN_MTU (sizeof(struct can_frame)) -+#define CANFD_MTU (sizeof(struct canfd_frame)) -+ -+#endif -+ -+ - QT_BEGIN_NAMESPACE - - class SocketCanBackend : public QCanBusDevice diff --git a/package/lean/patches/020-disable_unused_libs.patch b/package/lean/patches/020-disable_unused_libs.patch deleted file mode 100644 index e32bae7647..0000000000 --- a/package/lean/patches/020-disable_unused_libs.patch +++ /dev/null @@ -1,91 +0,0 @@ -This patch disables prinstsupport, sql, concurrent, testlib base libs compilation ---- a/qtbase/src/src.pro -+++ b/qtbase/src/src.pro -@@ -66,22 +66,10 @@ src_dbus.target = sub-dbus - src_dbus.depends = src_corelib - force_dbus_bootstrap: src_dbus.depends += src_tools_bootstrap_dbus # avoid syncqt race - --src_concurrent.subdir = $$PWD/concurrent --src_concurrent.target = sub-concurrent --src_concurrent.depends = src_corelib -- --src_sql.subdir = $$PWD/sql --src_sql.target = sub-sql --src_sql.depends = src_corelib -- - src_network.subdir = $$PWD/network - src_network.target = sub-network - src_network.depends = src_corelib - --src_testlib.subdir = $$PWD/testlib --src_testlib.target = sub-testlib --src_testlib.depends = src_corelib # testlib links only to corelib, but see below for the headers -- - src_3rdparty_pcre2.subdir = $$PWD/3rdparty/pcre2 - src_3rdparty_pcre2.target = sub-3rdparty-pcre2 - -@@ -125,13 +113,6 @@ src_openglextensions.subdir = $$PWD/open - src_openglextensions.target = sub-openglextensions - src_openglextensions.depends = src_gui - --src_printsupport.subdir = $$PWD/printsupport --src_printsupport.target = sub-printsupport --src_printsupport.depends = src_corelib src_gui src_widgets src_tools_uic -- --src_plugins.subdir = $$PWD/plugins --src_plugins.target = sub-plugins -- - src_android.subdir = $$PWD/android - - # this order is important -@@ -152,14 +133,8 @@ TOOLS = src_tools_moc src_tools_rcc src_ - win32:SUBDIRS += src_winmain - qtConfig(network) { - SUBDIRS += src_network -- src_plugins.depends += src_network --} --qtConfig(sql) { -- SUBDIRS += src_sql -- src_plugins.depends += src_sql - } - qtConfig(xml): SUBDIRS += src_xml --qtConfig(testlib): SUBDIRS += src_testlib - qtConfig(dbus) { - force_dbus_bootstrap|qtConfig(private_tests): \ - SUBDIRS += src_tools_bootstrap_dbus -@@ -167,9 +142,7 @@ qtConfig(dbus) { - TOOLS += src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml - qtConfig(accessibility-atspi-bridge): \ - src_platformsupport.depends += src_dbus src_tools_qdbusxml2cpp -- src_plugins.depends += src_dbus src_tools_qdbusxml2cpp src_tools_qdbuscpp2xml - } --qtConfig(concurrent): SUBDIRS += src_concurrent - qtConfig(gui) { - qtConfig(harfbuzz):!qtConfig(system-harfbuzz) { - SUBDIRS += src_3rdparty_harfbuzzng -@@ -190,24 +163,17 @@ qtConfig(gui) { - } - SUBDIRS += src_gui src_platformsupport src_platformheaders - qtConfig(opengl): SUBDIRS += src_openglextensions -- src_plugins.depends += src_gui src_platformsupport src_platformheaders -- src_testlib.depends += src_gui # if QtGui is enabled, QtTest requires QtGui's headers - qtConfig(widgets) { - SUBDIRS += src_tools_uic src_widgets - !android-embedded: SUBDIRS += src_printsupport - TOOLS += src_tools_uic -- src_plugins.depends += src_widgets -- !android-embedded: src_plugins.depends += src_printsupport -- src_testlib.depends += src_widgets # if QtWidgets is enabled, QtTest requires QtWidgets's headers - qtConfig(opengl) { - SUBDIRS += src_opengl -- src_plugins.depends += src_opengl - } - } - } --SUBDIRS += src_plugins - --nacl: SUBDIRS -= src_network src_testlib -+nacl: SUBDIRS -= src_network - - android:!android-embedded: SUBDIRS += src_android src_3rdparty_gradle - diff --git a/package/lienol/redsocks2/Makefile b/package/lienol/redsocks2/Makefile index 1769cb44b7..547366b268 100644 --- a/package/lienol/redsocks2/Makefile +++ b/package/lienol/redsocks2/Makefile @@ -27,7 +27,7 @@ define Package/redsocks2 CATEGORY:=Network TITLE:=Redirect any TCP connection to a SOCKS or HTTPS proxy server URL:=https://github.com/semigodking/redsocks - DEPENDS:=+libevent2 +libopenssl + DEPENDS:=+libevent2 +libpolarssl endef define Package/redsocks2/description @@ -40,9 +40,9 @@ define Package/redsocks2/conffiles /etc/config/redsocks2 endef -#define Build/Compile -# $(call Build/Compile/Default,ENABLE_HTTPS_PROXY=true) -#endef +define Build/Compile + $(call Build/Compile/Default,USE_CRYPTO_POLARSSL=true) +endef define Package/redsocks2/install $(INSTALL_DIR) $(1)/usr/sbin