mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
strongswan: fix musl builds, reenable lost modules
Signed-off-by: Steven Barth <steven@midlink.org>
This commit is contained in:
@@ -0,0 +1,73 @@
|
||||
--- a/src/libstrongswan/library.h
|
||||
+++ b/src/libstrongswan/library.h
|
||||
@@ -118,6 +118,7 @@
|
||||
#include "utils/leak_detective.h"
|
||||
#include "plugins/plugin_loader.h"
|
||||
#include "settings/settings.h"
|
||||
+#include "musl.h"
|
||||
|
||||
typedef struct library_t library_t;
|
||||
|
||||
--- /dev/null
|
||||
+++ b/src/libstrongswan/musl.h
|
||||
@@ -0,0 +1,27 @@
|
||||
+#include <sys/types.h>
|
||||
+
|
||||
+#define crypt x_crypt
|
||||
+#define encrypt x_encrypt
|
||||
+#include <unistd.h>
|
||||
+
|
||||
+#define fd_set x_fd_set
|
||||
+#define ino_t x_ino_t
|
||||
+#define off_t x_off_t
|
||||
+#define loff_t x_loff_t
|
||||
+#define dev_t x_dev_t
|
||||
+#define nlink_t x_nlink_t
|
||||
+#define timer_t x_timer_t
|
||||
+#define blkcnt_t x_blkcnt_t
|
||||
+#define __kernel_nlink_t void
|
||||
+
|
||||
+#include <linux/types.h>
|
||||
+
|
||||
+#undef fd_set
|
||||
+#undef ino_t
|
||||
+#undef off_t
|
||||
+#undef dev_t
|
||||
+#undef nlink_t
|
||||
+#undef timer_t
|
||||
+#undef blkcnt_t
|
||||
+#undef crypt
|
||||
+#undef encrypt
|
||||
--- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
|
||||
+++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_ipsec.c
|
||||
@@ -18,6 +18,8 @@
|
||||
* for more details.
|
||||
*/
|
||||
|
||||
+#include <musl.h>
|
||||
+
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <stdint.h>
|
||||
--- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
|
||||
+++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_net.c
|
||||
@@ -37,6 +37,8 @@
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
+#include "musl.h"
|
||||
+
|
||||
#include <sys/socket.h>
|
||||
#include <sys/utsname.h>
|
||||
#include <linux/netlink.h>
|
||||
--- a/src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.c
|
||||
+++ b/src/libhydra/plugins/kernel_netlink/kernel_netlink_shared.c
|
||||
@@ -15,6 +15,8 @@
|
||||
* for more details.
|
||||
*/
|
||||
|
||||
+#include "musl.h"
|
||||
+
|
||||
#include <sys/socket.h>
|
||||
#include <linux/netlink.h>
|
||||
#include <linux/rtnetlink.h>
|
||||
Reference in New Issue
Block a user