deleted file mode 100644
@@ -1,26 +0,0 @@
-From e36a2377e7ec50f6f675eb41f79edcda6ddebe5c Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <gustavo@zacarias.com.ar>
-Date: Tue, 10 Sep 2013 15:48:50 -0300
-Subject: [PATCH] configure: uclinux is also linux
-
-Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index e6e1317..189a753 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,7 +20,7 @@ AC_PROG_INSTALL
- AC_PROG_LN_S
-
- case "$host" in
--*-*-linux*) ;;
-+*-*-linux* | *-*-uclinux*) ;;
- *) AC_MSG_ERROR([Linux only, dude!]);;
- esac
-
-1.8.1.5
-
deleted file mode 100644
@@ -1,27 +0,0 @@
-From 7529487f70e244cd31ef84b037b1c32749c134a7 Mon Sep 17 00:00:00 2001
-From: Eric Leblond <eric@regit.org>
-Date: Sun, 4 Nov 2012 09:29:44 +0100
-Subject: Add include needed for integer type definition.
-
-[Retrieved from:
-https://git.netfilter.org/libnetfilter_log/commit/?id=7529487f70e244cd31ef84b037b1c32749c134a7]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- include/libnetfilter_log/libnetfilter_log.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/include/libnetfilter_log/libnetfilter_log.h b/include/libnetfilter_log/libnetfilter_log.h
-index 6b0d3b0..a1331de 100644
---- a/include/libnetfilter_log/libnetfilter_log.h
-+++ b/include/libnetfilter_log/libnetfilter_log.h
-@@ -9,6 +9,7 @@
- #ifndef __LIBNETFILTER_LOG_H
- #define __LIBNETFILTER_LOG_H
-
-+#include <sys/types.h>
- #include <libnetfilter_log/linux_nfnetlink_log.h>
-
- struct nflog_handle;
-cgit v1.2.3
-
deleted file mode 100644
@@ -1,489 +0,0 @@
-From 42878e88e5b72d3120434564942417cae3723385 Mon Sep 17 00:00:00 2001
-From: Felix Janda <felix.janda@posteo.de>
-Date: Sat, 16 May 2015 14:01:00 +0200
-Subject: src: Use stdint types everywhere
-
-Signed-off-by: Felix Janda <felix.janda@posteo.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-
-[Retrieved from:
-https://git.netfilter.org/libnetfilter_log/commit/?id=42878e88e5b72d3120434564942417cae3723385]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- include/libnetfilter_log/libipulog.h | 5 +-
- include/libnetfilter_log/libnetfilter_log.h | 39 ++++++------
- src/libipulog_compat.c | 10 ++--
- src/libnetfilter_log.c | 92 ++++++++++++++---------------
- utils/nfulnl_test.c | 6 +-
- 5 files changed, 77 insertions(+), 75 deletions(-)
-
-diff --git a/include/libnetfilter_log/libipulog.h b/include/libnetfilter_log/libipulog.h
-index 1093bdd..ee7890a 100644
---- a/include/libnetfilter_log/libipulog.h
-+++ b/include/libnetfilter_log/libipulog.h
-@@ -2,6 +2,7 @@
- #define _LIBIPULOG_H
-
- #include <errno.h>
-+#include <stdint.h>
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/types.h>
-@@ -33,9 +34,9 @@ typedef struct ulog_packet_msg {
- struct ipulog_handle;
- extern int ipulog_errno;
-
--u_int32_t ipulog_group2gmask(u_int32_t group);
-+uint32_t ipulog_group2gmask(uint32_t group);
-
--struct ipulog_handle *ipulog_create_handle(u_int32_t gmask, u_int32_t rmem);
-+struct ipulog_handle *ipulog_create_handle(uint32_t gmask, uint32_t rmem);
-
- void ipulog_destroy_handle(struct ipulog_handle *h);
-
-diff --git a/include/libnetfilter_log/libnetfilter_log.h b/include/libnetfilter_log/libnetfilter_log.h
-index a1331de..7812877 100644
---- a/include/libnetfilter_log/libnetfilter_log.h
-+++ b/include/libnetfilter_log/libnetfilter_log.h
-@@ -9,6 +9,7 @@
- #ifndef __LIBNETFILTER_LOG_H
- #define __LIBNETFILTER_LOG_H
-
-+#include <stdint.h>
- #include <sys/types.h>
- #include <libnetfilter_log/linux_nfnetlink_log.h>
-
-@@ -29,19 +30,19 @@ extern struct nflog_handle *nflog_open(void);
- extern struct nflog_handle *nflog_open_nfnl(struct nfnl_handle *nfnlh);
- extern int nflog_close(struct nflog_handle *h);
-
--extern int nflog_bind_pf(struct nflog_handle *h, u_int16_t pf);
--extern int nflog_unbind_pf(struct nflog_handle *h, u_int16_t pf);
-+extern int nflog_bind_pf(struct nflog_handle *h, uint16_t pf);
-+extern int nflog_unbind_pf(struct nflog_handle *h, uint16_t pf);
-
- extern struct nflog_g_handle *nflog_bind_group(struct nflog_handle *h,
-- u_int16_t num);
-+ uint16_t num);
- extern int nflog_unbind_group(struct nflog_g_handle *gh);
-
- extern int nflog_set_mode(struct nflog_g_handle *gh,
-- u_int8_t mode, unsigned int len);
--extern int nflog_set_timeout(struct nflog_g_handle *gh, u_int32_t timeout);
--extern int nflog_set_flags(struct nflog_g_handle *gh, u_int16_t flags);
--extern int nflog_set_qthresh(struct nflog_g_handle *gh, u_int32_t qthresh);
--extern int nflog_set_nlbufsiz(struct nflog_g_handle *gh, u_int32_t nlbufsiz);
-+ uint8_t mode, unsigned int len);
-+extern int nflog_set_timeout(struct nflog_g_handle *gh, uint32_t timeout);
-+extern int nflog_set_flags(struct nflog_g_handle *gh, uint16_t flags);
-+extern int nflog_set_qthresh(struct nflog_g_handle *gh, uint32_t qthresh);
-+extern int nflog_set_nlbufsiz(struct nflog_g_handle *gh, uint32_t nlbufsiz);
-
- extern int nflog_callback_register(struct nflog_g_handle *gh,
- nflog_callback *cb, void *data);
-@@ -50,23 +51,23 @@ extern int nflog_handle_packet(struct nflog_handle *h, char *buf, int len);
-
- extern struct nfulnl_msg_packet_hdr *nflog_get_msg_packet_hdr(struct nflog_data *nfad);
-
--extern u_int16_t nflog_get_hwtype(struct nflog_data *nfad);
--extern u_int16_t nflog_get_msg_packet_hwhdrlen(struct nflog_data *nfad);
-+extern uint16_t nflog_get_hwtype(struct nflog_data *nfad);
-+extern uint16_t nflog_get_msg_packet_hwhdrlen(struct nflog_data *nfad);
- extern char *nflog_get_msg_packet_hwhdr(struct nflog_data *nfad);
-
--extern u_int32_t nflog_get_nfmark(struct nflog_data *nfad);
-+extern uint32_t nflog_get_nfmark(struct nflog_data *nfad);
- extern int nflog_get_timestamp(struct nflog_data *nfad, struct timeval *tv);
--extern u_int32_t nflog_get_indev(struct nflog_data *nfad);
--extern u_int32_t nflog_get_physindev(struct nflog_data *nfad);
--extern u_int32_t nflog_get_outdev(struct nflog_data *nfad);
--extern u_int32_t nflog_get_physoutdev(struct nflog_data *nfad);
-+extern uint32_t nflog_get_indev(struct nflog_data *nfad);
-+extern uint32_t nflog_get_physindev(struct nflog_data *nfad);
-+extern uint32_t nflog_get_outdev(struct nflog_data *nfad);
-+extern uint32_t nflog_get_physoutdev(struct nflog_data *nfad);
- extern struct nfulnl_msg_packet_hw *nflog_get_packet_hw(struct nflog_data *nfad);
- extern int nflog_get_payload(struct nflog_data *nfad, char **data);
- extern char *nflog_get_prefix(struct nflog_data *nfad);
--extern int nflog_get_uid(struct nflog_data *nfad, u_int32_t *uid);
--extern int nflog_get_gid(struct nflog_data *nfad, u_int32_t *gid);
--extern int nflog_get_seq(struct nflog_data *nfad, u_int32_t *seq);
--extern int nflog_get_seq_global(struct nflog_data *nfad, u_int32_t *seq);
-+extern int nflog_get_uid(struct nflog_data *nfad, uint32_t *uid);
-+extern int nflog_get_gid(struct nflog_data *nfad, uint32_t *gid);
-+extern int nflog_get_seq(struct nflog_data *nfad, uint32_t *seq);
-+extern int nflog_get_seq_global(struct nflog_data *nfad, uint32_t *seq);
-
- enum {
- NFLOG_XML_PREFIX = (1 << 0),
-diff --git a/src/libipulog_compat.c b/src/libipulog_compat.c
-index 64ca7f3..2d5b23a 100644
---- a/src/libipulog_compat.c
-+++ b/src/libipulog_compat.c
-@@ -20,7 +20,7 @@ struct ipulog_handle
- struct nlmsghdr *last_nlh;
- #if 0
- int fd;
-- u_int8_t blocking;
-+ uint8_t blocking;
- struct sockaddr_nl local;
- struct sockaddr_nl peer;
- #endif
-@@ -72,7 +72,7 @@ const char *ipulog_strerror(int errcode)
- }
-
- /* convert a netlink group (1-32) to a group_mask suitable for create_handle */
--u_int32_t ipulog_group2gmask(u_int32_t group)
-+uint32_t ipulog_group2gmask(uint32_t group)
- {
- if (group < 1 || group > 32)
- {
-@@ -83,8 +83,8 @@ u_int32_t ipulog_group2gmask(u_int32_t group)
- }
-
- /* create a ipulog handle for the reception of packets sent to gmask */
--struct ipulog_handle *ipulog_create_handle(u_int32_t gmask,
-- u_int32_t rcvbufsize)
-+struct ipulog_handle *ipulog_create_handle(uint32_t gmask,
-+ uint32_t rcvbufsize)
- {
- int rv;
- struct ipulog_handle *h;
-@@ -155,7 +155,7 @@ next_msg: printf("next\n");
- h->upmsg.hook = hdr->hook;
-
- if (tb[NFULA_MARK-1])
-- h->upmsg.mark = ntohl(*(u_int32_t *)NFA_DATA(tb[NFULA_MARK-1]));
-+ h->upmsg.mark = ntohl(*(uint32_t *)NFA_DATA(tb[NFULA_MARK-1]));
- else
- h->upmsg.mark = 0;
-
-diff --git a/src/libnetfilter_log.c b/src/libnetfilter_log.c
-index 76ed436..e92576b 100644
---- a/src/libnetfilter_log.c
-+++ b/src/libnetfilter_log.c
-@@ -72,7 +72,7 @@ struct nflog_g_handle
- {
- struct nflog_g_handle *next;
- struct nflog_handle *h;
-- u_int16_t id;
-+ uint16_t id;
-
- nflog_callback *cb;
- void *data;
-@@ -111,7 +111,7 @@ static void add_gh(struct nflog_g_handle *gh)
- gh->h->gh_list = gh;
- }
-
--static struct nflog_g_handle *find_gh(struct nflog_handle *h, u_int16_t group)
-+static struct nflog_g_handle *find_gh(struct nflog_handle *h, uint16_t group)
- {
- struct nflog_g_handle *gh;
-
-@@ -124,8 +124,8 @@ static struct nflog_g_handle *find_gh(struct nflog_handle *h, u_int16_t group)
-
- /* build a NFULNL_MSG_CONFIG message */
- static int
--__build_send_cfg_msg(struct nflog_handle *h, u_int8_t command,
-- u_int16_t groupnum, u_int8_t pf)
-+__build_send_cfg_msg(struct nflog_handle *h, uint8_t command,
-+ uint16_t groupnum, uint8_t pf)
- {
- union {
- char buf[NFNL_HEADER_LEN
-@@ -148,7 +148,7 @@ static int __nflog_rcv_pkt(struct nlmsghdr *nlh, struct nfattr *nfa[],
- {
- struct nfgenmsg *nfmsg = NLMSG_DATA(nlh);
- struct nflog_handle *h = data;
-- u_int16_t group = ntohs(nfmsg->res_id);
-+ uint16_t group = ntohs(nfmsg->res_id);
- struct nflog_g_handle *gh = find_gh(h, group);
- struct nflog_data nfldata;
-
-@@ -359,7 +359,7 @@ int nflog_close(struct nflog_handle *h)
- *
- * \return integer inferior to 0 in case of failure
- */
--int nflog_bind_pf(struct nflog_handle *h, u_int16_t pf)
-+int nflog_bind_pf(struct nflog_handle *h, uint16_t pf)
- {
- return __build_send_cfg_msg(h, NFULNL_CFG_CMD_PF_BIND, 0, pf);
- }
-@@ -373,7 +373,7 @@ int nflog_bind_pf(struct nflog_handle *h, u_int16_t pf)
- * Unbinds the given nflog handle from processing packets belonging
- * to the given protocol family.
- */
--int nflog_unbind_pf(struct nflog_handle *h, u_int16_t pf)
-+int nflog_unbind_pf(struct nflog_handle *h, uint16_t pf)
- {
- return __build_send_cfg_msg(h, NFULNL_CFG_CMD_PF_UNBIND, 0, pf);
- }
-@@ -395,7 +395,7 @@ int nflog_unbind_pf(struct nflog_handle *h, u_int16_t pf)
- * \return a nflog_g_handle pointing to the newly created group
- */
- struct nflog_g_handle *
--nflog_bind_group(struct nflog_handle *h, u_int16_t num)
-+nflog_bind_group(struct nflog_handle *h, uint16_t num)
- {
- struct nflog_g_handle *gh;
-
-@@ -461,7 +461,7 @@ int nflog_unbind_group(struct nflog_g_handle *gh)
- * \return -1 on error; >= otherwise.
- */
- int nflog_set_mode(struct nflog_g_handle *gh,
-- u_int8_t mode, u_int32_t range)
-+ uint8_t mode, uint32_t range)
- {
- union {
- char buf[NFNL_HEADER_LEN
-@@ -493,10 +493,10 @@ int nflog_set_mode(struct nflog_g_handle *gh,
- *
- * \return -1 in case of error and errno is explicity set.
- */
--int nflog_set_timeout(struct nflog_g_handle *gh, u_int32_t timeout)
-+int nflog_set_timeout(struct nflog_g_handle *gh, uint32_t timeout)
- {
- union {
-- char buf[NFNL_HEADER_LEN+NFA_LENGTH(sizeof(u_int32_t))];
-+ char buf[NFNL_HEADER_LEN+NFA_LENGTH(sizeof(uint32_t))];
- struct nlmsghdr nmh;
- } u;
-
-@@ -518,10 +518,10 @@ int nflog_set_timeout(struct nflog_g_handle *gh, u_int32_t timeout)
- *
- * \return -1 in case of error and errno is explicity set.
- */
--int nflog_set_qthresh(struct nflog_g_handle *gh, u_int32_t qthresh)
-+int nflog_set_qthresh(struct nflog_g_handle *gh, uint32_t qthresh)
- {
- union {
-- char buf[NFNL_HEADER_LEN+NFA_LENGTH(sizeof(u_int32_t))];
-+ char buf[NFNL_HEADER_LEN+NFA_LENGTH(sizeof(uint32_t))];
- struct nlmsghdr nmh;
- } u;
-
-@@ -547,10 +547,10 @@ int nflog_set_qthresh(struct nflog_g_handle *gh, u_int32_t qthresh)
- *
- * \return -1 in case of error and errno is explicity set.
- */
--int nflog_set_nlbufsiz(struct nflog_g_handle *gh, u_int32_t nlbufsiz)
-+int nflog_set_nlbufsiz(struct nflog_g_handle *gh, uint32_t nlbufsiz)
- {
- union {
-- char buf[NFNL_HEADER_LEN+NFA_LENGTH(sizeof(u_int32_t))];
-+ char buf[NFNL_HEADER_LEN+NFA_LENGTH(sizeof(uint32_t))];
- struct nlmsghdr nmh;
- } u;
- int status;
-@@ -581,10 +581,10 @@ int nflog_set_nlbufsiz(struct nflog_g_handle *gh, u_int32_t nlbufsiz)
- *
- * \return -1 in case of error and errno is explicity set.
- */
--int nflog_set_flags(struct nflog_g_handle *gh, u_int16_t flags)
-+int nflog_set_flags(struct nflog_g_handle *gh, uint16_t flags)
- {
- union {
-- char buf[NFNL_HEADER_LEN+NFA_LENGTH(sizeof(u_int16_t))];
-+ char buf[NFNL_HEADER_LEN+NFA_LENGTH(sizeof(uint16_t))];
- struct nlmsghdr nmh;
- } u;
-
-@@ -616,9 +616,9 @@ int nflog_set_flags(struct nflog_g_handle *gh, u_int16_t flags)
- * The nfulnl_msg_packet_hdr structure is defined in libnetfilter_log.h as:
- *\verbatim
- struct nfulnl_msg_packet_hdr {
-- u_int16_t hw_protocol; // hw protocol (network order)
-- u_int8_t hook; // netfilter hook
-- u_int8_t _pad;
-+ uint16_t hw_protocol; // hw protocol (network order)
-+ uint8_t hook; // netfilter hook
-+ uint8_t _pad;
- } __attribute__ ((packed));
- \endverbatim
- */
-@@ -634,9 +634,9 @@ struct nfulnl_msg_packet_hdr *nflog_get_msg_packet_hdr(struct nflog_data *nfad)
- *
- * \return the hardware link layer type.
- */
--u_int16_t nflog_get_hwtype(struct nflog_data *nfad)
-+uint16_t nflog_get_hwtype(struct nflog_data *nfad)
- {
-- return ntohs(nfnl_get_data(nfad->nfa, NFULA_HWTYPE, u_int16_t));
-+ return ntohs(nfnl_get_data(nfad->nfa, NFULA_HWTYPE, uint16_t));
- }
-
- /**
-@@ -645,9 +645,9 @@ u_int16_t nflog_get_hwtype(struct nflog_data *nfad)
- *
- * \return the size of the hardware link layer header
- */
--u_int16_t nflog_get_msg_packet_hwhdrlen(struct nflog_data *nfad)
-+uint16_t nflog_get_msg_packet_hwhdrlen(struct nflog_data *nfad)
- {
-- return ntohs(nfnl_get_data(nfad->nfa, NFULA_HWLEN, u_int16_t));
-+ return ntohs(nfnl_get_data(nfad->nfa, NFULA_HWLEN, uint16_t));
- }
-
- /**
-@@ -667,9 +667,9 @@ char *nflog_get_msg_packet_hwhdr(struct nflog_data *nfad)
- *
- * \return the netfilter mark currently assigned to the logged packet.
- */
--u_int32_t nflog_get_nfmark(struct nflog_data *nfad)
-+uint32_t nflog_get_nfmark(struct nflog_data *nfad)
- {
-- return ntohl(nfnl_get_data(nfad->nfa, NFULA_MARK, u_int32_t));
-+ return ntohl(nfnl_get_data(nfad->nfa, NFULA_MARK, uint32_t));
- }
-
- /**
-@@ -707,9 +707,9 @@ int nflog_get_timestamp(struct nflog_data *nfad, struct timeval *tv)
- * \warning all nflog_get_dev() functions return 0 if not set, since linux
- * only allows ifindex >= 1, see net/core/dev.c:2600 (in 2.6.13.1)
- */
--u_int32_t nflog_get_indev(struct nflog_data *nfad)
-+uint32_t nflog_get_indev(struct nflog_data *nfad)
- {
-- return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_INDEV, u_int32_t));
-+ return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_INDEV, uint32_t));
- }
-
- /**
-@@ -720,9 +720,9 @@ u_int32_t nflog_get_indev(struct nflog_data *nfad)
- * If the returned index is 0, the packet was locally generated or the
- * physical input interface is no longer known (ie. POSTROUTING?).
- */
--u_int32_t nflog_get_physindev(struct nflog_data *nfad)
-+uint32_t nflog_get_physindev(struct nflog_data *nfad)
- {
-- return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_PHYSINDEV, u_int32_t));
-+ return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_PHYSINDEV, uint32_t));
- }
-
- /**
-@@ -733,9 +733,9 @@ u_int32_t nflog_get_physindev(struct nflog_data *nfad)
- * returned index is 0, the packet is destined for localhost or the output
- * interface is not yet known (ie. PREROUTING?).
- */
--u_int32_t nflog_get_outdev(struct nflog_data *nfad)
-+uint32_t nflog_get_outdev(struct nflog_data *nfad)
- {
-- return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_OUTDEV, u_int32_t));
-+ return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_OUTDEV, uint32_t));
- }
-
- /**
-@@ -749,9 +749,9 @@ u_int32_t nflog_get_outdev(struct nflog_data *nfad)
- * \return The index of physical interface that the packet output will be
- * routed out.
- */
--u_int32_t nflog_get_physoutdev(struct nflog_data *nfad)
-+uint32_t nflog_get_physoutdev(struct nflog_data *nfad)
- {
-- return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_PHYSOUTDEV, u_int32_t));
-+ return ntohl(nfnl_get_data(nfad->nfa, NFULA_IFINDEX_PHYSOUTDEV, uint32_t));
- }
-
- /**
-@@ -767,9 +767,9 @@ u_int32_t nflog_get_physoutdev(struct nflog_data *nfad)
- * The nfulnl_msg_packet_hw structure is defined in libnetfilter_log.h as:
- * \verbatim
- struct nfulnl_msg_packet_hw {
-- u_int16_t hw_addrlen;
-- u_int16_t _pad;
-- u_int8_t hw_addr[8];
-+ uint16_t hw_addrlen;
-+ uint16_t _pad;
-+ uint8_t hw_addr[8];
- } __attribute__ ((packed));
- \endverbatim
- */
-@@ -817,12 +817,12 @@ char *nflog_get_prefix(struct nflog_data *nfad)
- *
- * \return the UID of the user that has genered the packet, if any.
- */
--int nflog_get_uid(struct nflog_data *nfad, u_int32_t *uid)
-+int nflog_get_uid(struct nflog_data *nfad, uint32_t *uid)
- {
- if (!nfnl_attr_present(nfad->nfa, NFULA_UID))
- return -1;
-
-- *uid = ntohl(nfnl_get_data(nfad->nfa, NFULA_UID, u_int32_t));
-+ *uid = ntohl(nfnl_get_data(nfad->nfa, NFULA_UID, uint32_t));
- return 0;
- }
-
-@@ -832,12 +832,12 @@ int nflog_get_uid(struct nflog_data *nfad, u_int32_t *uid)
- *
- * \return the GID of the user that has genered the packet, if any.
- */
--int nflog_get_gid(struct nflog_data *nfad, u_int32_t *gid)
-+int nflog_get_gid(struct nflog_data *nfad, uint32_t *gid)
- {
- if (!nfnl_attr_present(nfad->nfa, NFULA_GID))
- return -1;
-
-- *gid = ntohl(nfnl_get_data(nfad->nfa, NFULA_GID, u_int32_t));
-+ *gid = ntohl(nfnl_get_data(nfad->nfa, NFULA_GID, uint32_t));
- return 0;
- }
-
-@@ -849,12 +849,12 @@ int nflog_get_gid(struct nflog_data *nfad, u_int32_t *gid)
- *
- * \return the local nflog sequence number.
- */
--int nflog_get_seq(struct nflog_data *nfad, u_int32_t *seq)
-+int nflog_get_seq(struct nflog_data *nfad, uint32_t *seq)
- {
- if (!nfnl_attr_present(nfad->nfa, NFULA_SEQ))
- return -1;
-
-- *seq = ntohl(nfnl_get_data(nfad->nfa, NFULA_SEQ, u_int32_t));
-+ *seq = ntohl(nfnl_get_data(nfad->nfa, NFULA_SEQ, uint32_t));
- return 0;
- }
-
-@@ -866,12 +866,12 @@ int nflog_get_seq(struct nflog_data *nfad, u_int32_t *seq)
- *
- * \return the global nflog sequence number.
- */
--int nflog_get_seq_global(struct nflog_data *nfad, u_int32_t *seq)
-+int nflog_get_seq_global(struct nflog_data *nfad, uint32_t *seq)
- {
- if (!nfnl_attr_present(nfad->nfa, NFULA_SEQ_GLOBAL))
- return -1;
-
-- *seq = ntohl(nfnl_get_data(nfad->nfa, NFULA_SEQ_GLOBAL, u_int32_t));
-+ *seq = ntohl(nfnl_get_data(nfad->nfa, NFULA_SEQ_GLOBAL, uint32_t));
- return 0;
- }
-
-@@ -923,7 +923,7 @@ int nflog_snprintf_xml(char *buf, size_t rem, struct nflog_data *tb, int flags)
- {
- struct nfulnl_msg_packet_hdr *ph;
- struct nfulnl_msg_packet_hw *hwph;
-- u_int32_t mark, ifi;
-+ uint32_t mark, ifi;
- int size, offset = 0, len = 0, ret;
- char *data;
-
-diff --git a/utils/nfulnl_test.c b/utils/nfulnl_test.c
-index ae5da79..dd3091b 100644
---- a/utils/nfulnl_test.c
-+++ b/utils/nfulnl_test.c
-@@ -9,9 +9,9 @@
- static int print_pkt(struct nflog_data *ldata)
- {
- struct nfulnl_msg_packet_hdr *ph = nflog_get_msg_packet_hdr(ldata);
-- u_int32_t mark = nflog_get_nfmark(ldata);
-- u_int32_t indev = nflog_get_indev(ldata);
-- u_int32_t outdev = nflog_get_outdev(ldata);
-+ uint32_t mark = nflog_get_nfmark(ldata);
-+ uint32_t indev = nflog_get_indev(ldata);
-+ uint32_t outdev = nflog_get_outdev(ldata);
- char *prefix = nflog_get_prefix(ldata);
- char *payload;
- int payload_len = nflog_get_payload(ldata, &payload);
-cgit v1.2.3
-
deleted file mode 100644
@@ -1,112 +0,0 @@
-From 614d8b6cfb969c6102ef320de22b1eb199efce2a Mon Sep 17 00:00:00 2001
-From: Felix Janda <felix.janda@posteo.de>
-Date: Sat, 16 May 2015 13:37:53 +0200
-Subject: include: Sync with current kernel headers
-
-Signed-off-by: Felix Janda <felix.janda@posteo.de>
-Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
-
-[Retrieved from:
-https://git.netfilter.org/libnetfilter_log/commit/?id=614d8b6cfb969c6102ef320de22b1eb199efce2a]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
----
- include/libnetfilter_log/linux_nfnetlink_log.h | 51 +++++++++++++-------------
- 1 file changed, 25 insertions(+), 26 deletions(-)
-
-diff --git a/include/libnetfilter_log/linux_nfnetlink_log.h b/include/libnetfilter_log/linux_nfnetlink_log.h
-index 4c802c8..9f38277 100644
---- a/include/libnetfilter_log/linux_nfnetlink_log.h
-+++ b/include/libnetfilter_log/linux_nfnetlink_log.h
-@@ -20,33 +20,31 @@ enum nfulnl_msg_types {
- };
-
- struct nfulnl_msg_packet_hdr {
-- u_int16_t hw_protocol; /* hw protocol (network order) */
-- u_int8_t hook; /* netfilter hook */
-- u_int8_t _pad;
--} __attribute__ ((packed));
-+ __be16 hw_protocol; /* hw protocol (network order) */
-+ __u8 hook; /* netfilter hook */
-+ __u8 _pad;
-+};
-
- struct nfulnl_msg_packet_hw {
-- u_int16_t hw_addrlen;
-- u_int16_t _pad;
-- u_int8_t hw_addr[8];
--} __attribute__ ((packed));
-+ __be16 hw_addrlen;
-+ __u16 _pad;
-+ __u8 hw_addr[8];
-+};
-
- struct nfulnl_msg_packet_timestamp {
-- aligned_u64 sec;
-- aligned_u64 usec;
--} __attribute__ ((packed));
--
--#define NFULNL_PREFIXLEN 30 /* just like old log target */
-+ __aligned_be64 sec;
-+ __aligned_be64 usec;
-+};
-
- enum nfulnl_attr_type {
- NFULA_UNSPEC,
- NFULA_PACKET_HDR,
-- NFULA_MARK, /* u_int32_t nfmark */
-+ NFULA_MARK, /* __u32 nfmark */
- NFULA_TIMESTAMP, /* nfulnl_msg_packet_timestamp */
-- NFULA_IFINDEX_INDEV, /* u_int32_t ifindex */
-- NFULA_IFINDEX_OUTDEV, /* u_int32_t ifindex */
-- NFULA_IFINDEX_PHYSINDEV, /* u_int32_t ifindex */
-- NFULA_IFINDEX_PHYSOUTDEV, /* u_int32_t ifindex */
-+ NFULA_IFINDEX_INDEV, /* __u32 ifindex */
-+ NFULA_IFINDEX_OUTDEV, /* __u32 ifindex */
-+ NFULA_IFINDEX_PHYSINDEV, /* __u32 ifindex */
-+ NFULA_IFINDEX_PHYSOUTDEV, /* __u32 ifindex */
- NFULA_HWADDR, /* nfulnl_msg_packet_hw */
- NFULA_PAYLOAD, /* opaque data payload */
- NFULA_PREFIX, /* string prefix */
-@@ -71,23 +69,23 @@ enum nfulnl_msg_config_cmds {
- };
-
- struct nfulnl_msg_config_cmd {
-- u_int8_t command; /* nfulnl_msg_config_cmds */
-+ __u8 command; /* nfulnl_msg_config_cmds */
- } __attribute__ ((packed));
-
- struct nfulnl_msg_config_mode {
-- u_int32_t copy_range;
-- u_int8_t copy_mode;
-- u_int8_t _pad;
-+ __be32 copy_range;
-+ __u8 copy_mode;
-+ __u8 _pad;
- } __attribute__ ((packed));
-
- enum nfulnl_attr_config {
- NFULA_CFG_UNSPEC,
- NFULA_CFG_CMD, /* nfulnl_msg_config_cmd */
- NFULA_CFG_MODE, /* nfulnl_msg_config_mode */
-- NFULA_CFG_NLBUFSIZ, /* u_int32_t buffer size */
-- NFULA_CFG_TIMEOUT, /* u_int32_t in 1/100 s */
-- NFULA_CFG_QTHRESH, /* u_int32_t */
-- NFULA_CFG_FLAGS, /* u_int16_t */
-+ NFULA_CFG_NLBUFSIZ, /* __u32 buffer size */
-+ NFULA_CFG_TIMEOUT, /* __u32 in 1/100 s */
-+ NFULA_CFG_QTHRESH, /* __u32 */
-+ NFULA_CFG_FLAGS, /* __u16 */
- __NFULA_CFG_MAX
- };
- #define NFULA_CFG_MAX (__NFULA_CFG_MAX -1)
-@@ -95,6 +93,7 @@ enum nfulnl_attr_config {
- #define NFULNL_COPY_NONE 0x00
- #define NFULNL_COPY_META 0x01
- #define NFULNL_COPY_PACKET 0x02
-+/* 0xff is reserved, don't use it for new copy modes. */
-
- #define NFULNL_CFG_F_SEQ 0x0001
- #define NFULNL_CFG_F_SEQ_GLOBAL 0x0002
-cgit v1.2.3
-
@@ -1,5 +1,6 @@
config BR2_PACKAGE_LIBNETFILTER_LOG
bool "libnetfilter_log"
+ select BR2_PACKAGE_LIBMNL
select BR2_PACKAGE_LIBNFNETLINK
help
libnetfilter_log is a userspace library providing interface
@@ -1,6 +1,5 @@
-# From ftp://ftp.netfilter.org/pub/libnetfilter_log/libnetfilter_log-1.0.1.tar.bz2.{md5sum,sha1sum}
-md5 2a4bb0654ae675a52d2e8d1c06090b94 libnetfilter_log-1.0.1.tar.bz2
-sha1 0b95bcb1ad15eea906fa3607cd6c2290bd48d5bd libnetfilter_log-1.0.1.tar.bz2
+# From ftp://ftp.netfilter.org/pub/libnetfilter_log/libnetfilter_log-1.0.2.tar.bz2.sha256sum
+sha256 e3f408575614d849e4726b45e90c7ebb0e6744b04859555a9ce6ec40744ffeea libnetfilter_log-1.0.2.tar.bz2
# Hash for license file:
-sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING
+sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING
@@ -4,12 +4,11 @@
#
################################################################################
-LIBNETFILTER_LOG_VERSION = 1.0.1
+LIBNETFILTER_LOG_VERSION = 1.0.2
LIBNETFILTER_LOG_SOURCE = libnetfilter_log-$(LIBNETFILTER_LOG_VERSION).tar.bz2
LIBNETFILTER_LOG_SITE = http://www.netfilter.org/projects/libnetfilter_log/files
LIBNETFILTER_LOG_INSTALL_STAGING = YES
-LIBNETFILTER_LOG_DEPENDENCIES = host-pkgconf libnfnetlink
-LIBNETFILTER_LOG_AUTORECONF = YES
+LIBNETFILTER_LOG_DEPENDENCIES = host-pkgconf libmnl libnfnetlink
LIBNETFILTER_LOG_LICENSE = GPL-2.0+
LIBNETFILTER_LOG_LICENSE_FILES = COPYING
- Drop patches (already in version) and so autoreconf - libmnl is needed since https://git.netfilter.org/libnetfilter_log/commit/?id=d3333c14bf32ceba24aca41c9b272f204b475183 - Update indentation in hash file (two spaces) https://netfilter.org/pub/libnetfilter_log/changes-libnetfilter_log-1.0.2.txt Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> --- package/libnetfilter_log/0001-uclinux.patch | 26 - ...e-needed-for-integer-type-definition.patch | 27 - ...0003-src-Use-stdint-types-everywhere.patch | 489 ------------------ ...ude-Sync-with-current-kernel-headers.patch | 112 ---- package/libnetfilter_log/Config.in | 1 + .../libnetfilter_log/libnetfilter_log.hash | 7 +- package/libnetfilter_log/libnetfilter_log.mk | 5 +- 7 files changed, 6 insertions(+), 661 deletions(-) delete mode 100644 package/libnetfilter_log/0001-uclinux.patch delete mode 100644 package/libnetfilter_log/0002-Add-include-needed-for-integer-type-definition.patch delete mode 100644 package/libnetfilter_log/0003-src-Use-stdint-types-everywhere.patch delete mode 100644 package/libnetfilter_log/0004-include-Sync-with-current-kernel-headers.patch