101-musl-fixes.patch (1855B)
1 --- a/src/libstrongswan/library.h 2 +++ b/src/libstrongswan/library.h 3 @@ -118,6 +118,7 @@ 4 #include "utils/leak_detective.h" 5 #include "plugins/plugin_loader.h" 6 #include "settings/settings.h" 7 +#include "musl.h" 8 9 typedef struct library_t library_t; 10 11 --- /dev/null 12 +++ b/src/libstrongswan/musl.h 13 @@ -0,0 +1,38 @@ 14 +#include <sys/types.h> 15 + 16 +#define crypt x_crypt 17 +#define encrypt x_encrypt 18 +#include <unistd.h> 19 + 20 +#define fd_set x_fd_set 21 +#define ino_t x_ino_t 22 +#define off_t x_off_t 23 +#define loff_t x_loff_t 24 +#define dev_t x_dev_t 25 +#define mode_t x_mode_t 26 +#define uid_t x_uid_t 27 +#define gid_t x_gid_t 28 +#define uint64_t x_uint64_t 29 +#define u_int64_t x_u_int64_t 30 +#define int64_t x_int64_t 31 +#define nlink_t x_nlink_t 32 +#define timer_t x_timer_t 33 +#define blkcnt_t x_blkcnt_t 34 + 35 +#include <linux/types.h> 36 + 37 +#undef fd_set 38 +#undef ino_t 39 +#undef off_t 40 +#undef dev_t 41 +#undef mode_t 42 +#undef uid_t 43 +#undef gid_t 44 +#undef uint64_t 45 +#undef u_int64_t 46 +#undef int64_t 47 +#undef nlink_t 48 +#undef timer_t 49 +#undef blkcnt_t 50 +#undef crypt 51 +#undef encrypt 52 --- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c 53 +++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_ipsec.c 54 @@ -19,6 +19,7 @@ 55 */ 56 57 #define _GNU_SOURCE 58 +#include <musl.h> 59 #include <sys/types.h> 60 #include <sys/socket.h> 61 #include <stdint.h> 62 --- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c 63 +++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_net.c 64 @@ -37,6 +37,8 @@ 65 * THE SOFTWARE. 66 */ 67 68 +#include "musl.h" 69 + 70 #include <sys/socket.h> 71 #include <sys/utsname.h> 72 #include <linux/netlink.h> 73 --- a/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c 74 +++ b/src/libcharon/plugins/kernel_netlink/kernel_netlink_shared.c 75 @@ -15,6 +15,8 @@ 76 * for more details. 77 */ 78 79 +#include "musl.h" 80 + 81 #include <sys/socket.h> 82 #include <linux/netlink.h> 83 #include <linux/rtnetlink.h>