rpms/libreswan
7
0
Fork 0
Code Issues Pull Requests Releases Activity

make gcc7 truly happy

Browse Source
This commit is contained in:
Paul Wouters 2018-02-19 19:05:10 -05:00
parent f9eee4360c
commit 7388770781
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libreswan-3.23-gcc8.patch
View File

@ -1,6 +1,6 @@
diff -Naur libreswan-3.23-orig/programs/pluto/kernel_netlink.c libreswan-3.23/programs/pluto/kernel_netlink.c diff -Naur libreswan-3.23-orig/programs/pluto/kernel_netlink.c libreswan-3.23/programs/pluto/kernel_netlink.c
--- libreswan-3.23-orig/programs/pluto/kernel_netlink.c 2018-01-25 15:19:46.000000000 -0500 --- libreswan-3.23-orig/programs/pluto/kernel_netlink.c 2018-01-25 15:19:46.000000000 -0500
+++ libreswan-3.23/programs/pluto/kernel_netlink.c 2018-02-19 18:07:08.654780313 -0500 +++ libreswan-3.23/programs/pluto/kernel_netlink.c 2018-02-19 18:56:24.433527475 -0500
@@ -51,8 +51,9 @@ @@ -51,8 +51,9 @@
#include <linux/if_addr.h> #include <linux/if_addr.h>
#include <linux/if_link.h> #include <linux/if_link.h>
@ -14,7 +14,7 @@ diff -Naur libreswan-3.23-orig/programs/pluto/kernel_netlink.c libreswan-3.23/pr
#include "libreswan/pfkey.h" #include "libreswan/pfkey.h"
diff -Naur libreswan-3.23-orig/programs/pluto/linux_audit.c libreswan-3.23/programs/pluto/linux_audit.c diff -Naur libreswan-3.23-orig/programs/pluto/linux_audit.c libreswan-3.23/programs/pluto/linux_audit.c
--- libreswan-3.23-orig/programs/pluto/linux_audit.c 2018-01-25 15:19:46.000000000 -0500 --- libreswan-3.23-orig/programs/pluto/linux_audit.c 2018-01-25 15:19:46.000000000 -0500
+++ libreswan-3.23/programs/pluto/linux_audit.c 2018-02-19 18:07:08.654780313 -0500 +++ libreswan-3.23/programs/pluto/linux_audit.c 2018-02-19 18:58:51.356837932 -0500
@@ -74,6 +74,15 @@ @@ -74,6 +74,15 @@
#include "pluto_stats.h" #include "pluto_stats.h"
@ -31,6 +31,24 @@ diff -Naur libreswan-3.23-orig/programs/pluto/linux_audit.c libreswan-3.23/progr
static bool log_to_audit = FALSE; /* audit log messages for kernel */ static bool log_to_audit = FALSE; /* audit log messages for kernel */
void linux_audit_init(void) void linux_audit_init(void)
@@ -159,13 +168,13 @@
char raddr[ADDRTOT_BUF];
char laddr[ADDRTOT_BUF];
char audit_str[AUDIT_LOG_SIZE];
- char cipher_str[AUDIT_LOG_SIZE];
- char spi_str[AUDIT_LOG_SIZE];
+ char cipher_str[20];
+ char spi_str[20];
struct connection *const c = st->st_connection;
bool initiator = FALSE;
char head[IDTOA_BUF];
- char integname[IDTOA_BUF];
- char prfname[IDTOA_BUF];
+ char integname[20];
+ char prfname[20];
struct esb_buf esb, esb2;
/* we need to free() this */
char *conn_encode = audit_encode_nv_string("conn-name",c->name,0);
@@ -300,3 +309,6 @@ @@ -300,3 +309,6 @@
AUDIT_CRYPTO_IPSEC_SA : AUDIT_CRYPTO_IKE_SA, AUDIT_CRYPTO_IPSEC_SA : AUDIT_CRYPTO_IKE_SA,
audit_str, raddr, AUDIT_RESULT_OK); audit_str, raddr, AUDIT_RESULT_OK);
@ -40,7 +58,7 @@ diff -Naur libreswan-3.23-orig/programs/pluto/linux_audit.c libreswan-3.23/progr
+#endif +#endif
diff -Naur libreswan-3.23-orig/programs/pluto/log.h libreswan-3.23/programs/pluto/log.h diff -Naur libreswan-3.23-orig/programs/pluto/log.h libreswan-3.23/programs/pluto/log.h
--- libreswan-3.23-orig/programs/pluto/log.h 2018-01-25 15:19:46.000000000 -0500 --- libreswan-3.23-orig/programs/pluto/log.h 2018-01-25 15:19:46.000000000 -0500
+++ libreswan-3.23/programs/pluto/log.h 2018-02-19 18:07:08.655780307 -0500 +++ libreswan-3.23/programs/pluto/log.h 2018-02-19 18:56:24.433527475 -0500
@@ -154,7 +154,7 @@ @@ -154,7 +154,7 @@
#ifdef USE_LINUX_AUDIT #ifdef USE_LINUX_AUDIT
@ -52,7 +70,7 @@ diff -Naur libreswan-3.23-orig/programs/pluto/log.h libreswan-3.23/programs/plut
#define AUDIT_RESULT_OK 1 #define AUDIT_RESULT_OK 1
diff -Naur libreswan-3.23-orig/programs/pluto/pluto_constants.c libreswan-3.23/programs/pluto/pluto_constants.c diff -Naur libreswan-3.23-orig/programs/pluto/pluto_constants.c libreswan-3.23/programs/pluto/pluto_constants.c
--- libreswan-3.23-orig/programs/pluto/pluto_constants.c 2018-01-25 15:19:46.000000000 -0500 --- libreswan-3.23-orig/programs/pluto/pluto_constants.c 2018-01-25 15:19:46.000000000 -0500
+++ libreswan-3.23/programs/pluto/pluto_constants.c 2018-02-19 18:08:22.359413451 -0500 +++ libreswan-3.23/programs/pluto/pluto_constants.c 2018-02-19 18:56:24.434527471 -0500
@@ -478,7 +478,7 @@ @@ -478,7 +478,7 @@
policy & policy &
~(POLICY_SHUNT_MASK | POLICY_FAIL_MASK), ~(POLICY_SHUNT_MASK | POLICY_FAIL_MASK),