[packages/ipsec-tools] - remove sysctl.h includes, not needed and harmful on x32
baggins
baggins at pld-linux.org
Sun Aug 9 20:03:38 CEST 2015
commit 34866a891c406bc8f56cb80d71cd0e9d871c2a34
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Sun Aug 9 20:03:14 2015 +0200
- remove sysctl.h includes, not needed and harmful on x32
ipsec-tools.spec | 2 ++
no-sysctl.patch | 20 ++++++++++++++++++++
2 files changed, 22 insertions(+)
---
diff --git a/ipsec-tools.spec b/ipsec-tools.spec
index 6985b53..34fe4e0 100644
--- a/ipsec-tools.spec
+++ b/ipsec-tools.spec
@@ -26,6 +26,7 @@ Patch0: %{name}-hip.patch
Patch1: %{name}-gssapi.patch
Patch2: %{name}-support-glibc-2.20.patch
Patch3: %{name}-link.patch
+Patch4: no-sysctl.patch
BuildRequires: autoconf >= 2.52
BuildRequires: automake
BuildRequires: bison
@@ -106,6 +107,7 @@ Biblioteki statyczne libipsec i libracoon.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%{__sed} -i 's!@INCLUDE_GLIBC@!!g' src/Makefile.am
%{__sed} -i 's/-Werror//' configure.ac
diff --git a/no-sysctl.patch b/no-sysctl.patch
new file mode 100644
index 0000000..d8d6237
--- /dev/null
+++ b/no-sysctl.patch
@@ -0,0 +1,20 @@
+--- ipsec-tools-0.8.2/src/setkey/setkey.c~ 2012-08-23 13:10:46.000000000 +0200
++++ ipsec-tools-0.8.2/src/setkey/setkey.c 2015-08-09 20:01:16.128401541 +0200
+@@ -40,7 +40,6 @@
+ #include <sys/socket.h>
+ #include <sys/time.h>
+ #include <sys/stat.h>
+-#include <sys/sysctl.h>
+ #include <err.h>
+ #include <netinet/in.h>
+ #include <net/pfkeyv2.h>
+--- ipsec-tools-0.8.2/src/racoon/pfkey.c~ 2012-08-23 13:10:45.000000000 +0200
++++ ipsec-tools-0.8.2/src/racoon/pfkey.c 2015-08-09 20:01:56.678932946 +0200
+@@ -59,7 +59,6 @@
+ #include <sys/param.h>
+ #include <sys/socket.h>
+ #include <sys/queue.h>
+-#include <sys/sysctl.h>
+
+ #include <net/route.h>
+ #include <net/pfkeyv2.h>
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ipsec-tools.git/commitdiff/34866a891c406bc8f56cb80d71cd0e9d871c2a34
More information about the pld-cvs-commit
mailing list