summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
authorYves-Alexis Perez <corsac@debian.org>2014-07-11 20:32:11 +0200
committerYves-Alexis Perez <corsac@debian.org>2014-07-11 20:32:28 +0200
commit0cb057d80942a4b231c20e321d4135cbadc5a3ae (patch)
tree7af0910994c5f338d6d98e13d30b8d8607236ab8 /debian/patches
parent878ecc72da140ffb7e01b5b6e774473fb795af1b (diff)
downloadvyos-strongswan-0cb057d80942a4b231c20e321d4135cbadc5a3ae.tar.gz
vyos-strongswan-0cb057d80942a4b231c20e321d4135cbadc5a3ae.zip
debian/patches: 03_pfkey-Always-include-stdint.h dropped, included upstream.
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/03_pfkey-Always-include-stdint.h.patch30
-rw-r--r--debian/patches/series1
2 files changed, 0 insertions, 31 deletions
diff --git a/debian/patches/03_pfkey-Always-include-stdint.h.patch b/debian/patches/03_pfkey-Always-include-stdint.h.patch
deleted file mode 100644
index 4335f28ab..000000000
--- a/debian/patches/03_pfkey-Always-include-stdint.h.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 403ad5dd8556721e5c6ffefd294a13e8bc5d03d5 Mon Sep 17 00:00:00 2001
-From: Tobias Brunner <tobias@strongswan.org>
-Date: Mon, 19 May 2014 14:53:24 +0200
-Subject: [PATCH] pfkey: Always include stdint.h
-
-On some systems (e.g. on Debian/kFreeBSD) that header is required when
-including ipsec.h, on Linux we require it too when including pfkeyv2.h,
-so to simplify things we just always include it.
----
- src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
-+++ b/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
-@@ -14,6 +14,7 @@
- * for more details.
- */
-
-+#include <stdint.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-
-@@ -24,7 +25,6 @@
- #ifdef HAVE_NET_PFKEYV2_H
- #include <net/pfkeyv2.h>
- #else
--#include <stdint.h>
- #include <linux/pfkeyv2.h>
- #endif
-
diff --git a/debian/patches/series b/debian/patches/series
index f18852ab1..27732685c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
01_fix-manpages.patch
02_disable-libtls-tests.patch
-03_pfkey-Always-include-stdint.h.patch