From a58eda8be0b619d340a5932cfb052e5041a4db85 Mon Sep 17 00:00:00 2001
From: Yves-Alexis Perez <corsac@debian.org>
Date: Mon, 19 May 2014 14:46:11 +0200
Subject: Fix FTBFS on kFreeBSD by always including stdint.h
---
debian/changelog | 3 +++
debian/patches/03_include-stdint.patch | 12 +++++++++
.../patches/03_pfkey-Always-include-stdint.h.patch | 30 ++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 46 insertions(+)
create mode 100644 debian/patches/03_include-stdint.patch
create mode 100644 debian/patches/03_pfkey-Always-include-stdint.h.patch
diff --git a/debian/changelog b/debian/changelog
index 715ff2f28..111204733 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ strongswan (5.1.3-4) UNRELEASED; urgency=medium
* debian/control:
- add build-dep on pkg-config.
+ * debian/patches:
+ - 03_pfkey-Always-include-stdint.h added, cherry-picked from upstream git:
+ always include of stdint.h. Fix FTBFS on kFreeBSD.
-- Yves-Alexis Perez <corsac@debian.org> Mon, 19 May 2014 13:56:20 +0200
diff --git a/debian/patches/03_include-stdint.patch b/debian/patches/03_include-stdint.patch
new file mode 100644
index 000000000..e913049ac
--- /dev/null
+++ b/debian/patches/03_include-stdint.patch
@@ -0,0 +1,12 @@
+diff --git a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c b/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
+index 4704d41..4f4a1bc 100644
+--- a/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
++++ b/src/libhydra/plugins/kernel_pfkey/kernel_pfkey_ipsec.c
+@@ -33,6 +33,7 @@
+ #endif
+
+ #ifdef HAVE_NETIPSEC_IPSEC_H
++#include <stdint.h>
+ #include <netipsec/ipsec.h>
+ #elif defined(HAVE_NETINET6_IPSEC_H)
+ #include <netinet6/ipsec.h>
diff --git a/debian/patches/03_pfkey-Always-include-stdint.h.patch b/debian/patches/03_pfkey-Always-include-stdint.h.patch
new file mode 100644
index 000000000..4335f28ab
--- /dev/null
+++ b/debian/patches/03_pfkey-Always-include-stdint.h.patch
@@ -0,0 +1,30 @@
+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 27732685c..f18852ab1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01_fix-manpages.patch
02_disable-libtls-tests.patch
+03_pfkey-Always-include-stdint.h.patch
--
cgit v1.2.3