diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-08 14:09:45 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-08 14:09:45 +0200 |
| commit | 1e60f16ff4121d20025f8a00244ae4b5856f5581 (patch) | |
| tree | d86f77fa497f7f9d935b53a5bcc3eb2c01ea74fd /package/libnfnetlink | |
| parent | 854670adfd162d4dff21085804a03c6c903c7f60 (diff) | |
| parent | eecf91bc2127f5d0fcd6e0935e0a07be84b692ff (diff) | |
Merge branch 'master' of git+ssh://www.openadk.org/git/openadk
Diffstat (limited to 'package/libnfnetlink')
4 files changed, 25 insertions, 8 deletions
diff --git a/package/libnfnetlink/Makefile b/package/libnfnetlink/Makefile index ae10b6ef3..88d61245f 100644 --- a/package/libnfnetlink/Makefile +++ b/package/libnfnetlink/Makefile @@ -5,9 +5,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= libnfnetlink PKG_VERSION:= 1.0.1 -PKG_RELEASE:= 3 +PKG_RELEASE:= 4 PKG_MD5SUM:= 98927583d2016a9fb1936fed992e2c5e -PKG_DESCR:= low-level library for netfilter related kernel/userspace communication +PKG_DESCR:= netfilter related kernel/userspace communication PKG_SECTION:= libs PKG_URL:= http://www.netfilter.org/projects/libnfnetlink/ PKG_SITES:= http://www.netfilter.org/projects/libnfnetlink/files/ diff --git a/package/libnfnetlink/patches/patch-include_libnfnetlink_libnfnetlink_h b/package/libnfnetlink/patches/patch-include_libnfnetlink_libnfnetlink_h index 679be187d..9754ebca8 100644 --- a/package/libnfnetlink/patches/patch-include_libnfnetlink_libnfnetlink_h +++ b/package/libnfnetlink/patches/patch-include_libnfnetlink_libnfnetlink_h @@ -1,10 +1,10 @@ --- libnfnetlink-1.0.1.orig/include/libnfnetlink/libnfnetlink.h 2010-05-09 23:31:56.000000000 +0200 -+++ libnfnetlink-1.0.1/include/libnfnetlink/libnfnetlink.h 2013-08-20 18:44:17.220339451 +0200 -@@ -15,6 +15,7 @@ ++++ libnfnetlink-1.0.1/include/libnfnetlink/libnfnetlink.h 2014-04-08 08:59:56.000000000 +0200 +@@ -15,6 +15,8 @@ #define aligned_u64 unsigned long long __attribute__((aligned(8))) #endif -+#include <sys/types.h> ++#include <stdint.h> #include <sys/socket.h> /* for sa_family_t */ #include <linux/netlink.h> #include <libnfnetlink/linux_nfnetlink.h> diff --git a/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_compat_h b/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_compat_h index 9ea8016a3..2679e67c3 100644 --- a/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_compat_h +++ b/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_compat_h @@ -1,6 +1,15 @@ --- libnfnetlink-1.0.1.orig/include/libnfnetlink/linux_nfnetlink_compat.h 2008-06-18 14:36:57.000000000 +0200 -+++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink_compat.h 2014-04-05 09:33:12.251169468 +0200 -@@ -20,8 +20,8 @@ ++++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink_compat.h 2014-04-08 09:00:23.000000000 +0200 +@@ -3,6 +3,8 @@ + #ifndef __KERNEL__ + /* Old nfnetlink macros for userspace */ + ++#include <stdint.h> ++ + /* nfnetlink groups: Up to 32 maximum */ + #define NF_NETLINK_CONNTRACK_NEW 0x00000001 + #define NF_NETLINK_CONNTRACK_UPDATE 0x00000002 +@@ -20,8 +22,8 @@ struct nfattr { diff --git a/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_h b/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_h index 9f89c6f55..86b231660 100644 --- a/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_h +++ b/package/libnfnetlink/patches/patch-include_libnfnetlink_linux_nfnetlink_h @@ -1,5 +1,13 @@ --- libnfnetlink-1.0.1.orig/include/libnfnetlink/linux_nfnetlink.h 2008-06-18 14:36:57.000000000 +0200 -+++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink.h 2014-04-05 09:34:31.863222315 +0200 ++++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink.h 2014-04-08 09:31:12.000000000 +0200 +@@ -1,6 +1,6 @@ + #ifndef _NFNETLINK_H + #define _NFNETLINK_H +-#include <linux/types.h> ++#include <stdint.h> + #include <libnfnetlink/linux_nfnetlink_compat.h> + + enum nfnetlink_groups { @@ -25,9 +25,9 @@ enum nfnetlink_groups { /* General form of address family dependent message. */ |