[Pkg-swan-devel] [strongswan] 04/05: debian/patches: 03_pfkey-Always-include-stdint.h dropped, included upstream.

[Yves-Alexis Perez]

This is an automated email from the git hooks/post-receive script.

corsac pushed a commit to branch master
in repository strongswan.

commit 0cb057d80942a4b231c20e321d4135cbadc5a3ae
Author: Yves-Alexis Perez <corsac at debian.org>
Date:   Fri Jul 11 20:32:11 2014 +0200

    debian/patches: 03_pfkey-Always-include-stdint.h dropped, included upstream.
---
 debian/changelog                                   |  2 ++
 .../patches/03_pfkey-Always-include-stdint.h.patch | 30 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dc1c881..ac07f23 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ strongswan (5.2.0-1) UNRELEASED; urgency=medium
   [ Yves-Alexis Perez ]
   * debian/po:
     - pt_BR.po updated, thanks Adriano Rafael Gomes.            closes: #752721
+  * debian/patches:
+    03_pfkey-Always-include-stdint.h dropped, included upstream.
 
  -- Yves-Alexis Perez <corsac at debian.org>  Fri, 11 Jul 2014 07:23:41 +0200
 
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 4335f28..0000000
--- 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 at 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 f18852a..2773268 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-swan/strongswan.git