* [meta-networking][PATCH 1/6] nftables: upgrade 1.0.0 -> 1.0.1
@ 2022-01-14 1:39 Yi Zhao
2022-01-14 1:39 ` [meta-networking][PATCH 2/6] ipset: upgrade 7.11 -> 7.15 Yi Zhao
` (4 more replies)
0 siblings, 5 replies; 7+ messages in thread
From: Yi Zhao @ 2022-01-14 1:39 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
.../nftables/{nftables_1.0.0.bb => nftables_1.0.1.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-networking/recipes-filter/nftables/{nftables_1.0.0.bb => nftables_1.0.1.bb} (93%)
diff --git a/meta-networking/recipes-filter/nftables/nftables_1.0.0.bb b/meta-networking/recipes-filter/nftables/nftables_1.0.1.bb
similarity index 93%
rename from meta-networking/recipes-filter/nftables/nftables_1.0.0.bb
rename to meta-networking/recipes-filter/nftables/nftables_1.0.1.bb
index 68409c910..91df1547d 100644
--- a/meta-networking/recipes-filter/nftables/nftables_1.0.0.bb
+++ b/meta-networking/recipes-filter/nftables/nftables_1.0.1.bb
@@ -10,7 +10,7 @@ DEPENDS = "libmnl libnftnl bison-native \
UPSTREAM_CHECK_REGEX = "nftables-(?P<pver>\d+(\.\d+){2,}).tar.bz2"
SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "58bf547daf967a2b88ecb4f425f126006ebde22711db806b25c1d6cf84fe45f4"
+SRC_URI[sha256sum] = "3ceeba625818e81a0be293e9dd486c3ef799ebd92165270f1e57e9a201efa423"
inherit autotools manpages pkgconfig
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-networking][PATCH 2/6] ipset: upgrade 7.11 -> 7.15
2022-01-14 1:39 [meta-networking][PATCH 1/6] nftables: upgrade 1.0.0 -> 1.0.1 Yi Zhao
@ 2022-01-14 1:39 ` Yi Zhao
2022-01-14 1:39 ` [meta-networking][PATCH 3/6] libnetfilter-queue: upgrade 1.0.3 -> 1.0.5 Yi Zhao
` (3 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Yi Zhao @ 2022-01-14 1:39 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
.../recipes-filter/ipset/{ipset_7.11.bb => ipset_7.15.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta-networking/recipes-filter/ipset/{ipset_7.11.bb => ipset_7.15.bb} (87%)
diff --git a/meta-networking/recipes-filter/ipset/ipset_7.11.bb b/meta-networking/recipes-filter/ipset/ipset_7.15.bb
similarity index 87%
rename from meta-networking/recipes-filter/ipset/ipset_7.11.bb
rename to meta-networking/recipes-filter/ipset/ipset_7.15.bb
index 3e64f4159..7af7dea7a 100644
--- a/meta-networking/recipes-filter/ipset/ipset_7.11.bb
+++ b/meta-networking/recipes-filter/ipset/ipset_7.15.bb
@@ -10,7 +10,7 @@ SECTION = "base"
DEPENDS = "libtool libmnl"
SRC_URI = "http://ftp.netfilter.org/pub/ipset/${BP}.tar.bz2"
-SRC_URI[sha256sum] = "3151baad30f1d9e317b2ab4f2f5aa7a9f7b4dc11fcf8fe73acd0dc0b5dbabf7d"
+SRC_URI[sha256sum] = "0a5545aaadb640142c1f888d366a78ddf8724799967fa20686a70053bd621751"
inherit autotools pkgconfig module-base
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-networking][PATCH 3/6] libnetfilter-queue: upgrade 1.0.3 -> 1.0.5
2022-01-14 1:39 [meta-networking][PATCH 1/6] nftables: upgrade 1.0.0 -> 1.0.1 Yi Zhao
2022-01-14 1:39 ` [meta-networking][PATCH 2/6] ipset: upgrade 7.11 -> 7.15 Yi Zhao
@ 2022-01-14 1:39 ` Yi Zhao
2022-01-14 1:39 ` [meta-networking][PATCH 4/6] bridge-utils: upgrade 1.7 -> 1.7.1 Yi Zhao
` (2 subsequent siblings)
4 siblings, 0 replies; 7+ messages in thread
From: Yi Zhao @ 2022-01-14 1:39 UTC (permalink / raw)
To: openembedded-devel
Drop 0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch
as the clang build issue had been fixed upstream.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
...define-visivility-attribute-together.patch | 1227 -----------------
...e_1.0.3.bb => libnetfilter-queue_1.0.5.bb} | 3 +-
2 files changed, 1 insertion(+), 1229 deletions(-)
delete mode 100644 meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch
rename meta-networking/recipes-filter/libnetfilter/{libnetfilter-queue_1.0.3.bb => libnetfilter-queue_1.0.5.bb} (77%)
diff --git a/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch b/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch
deleted file mode 100644
index aa9ff09a9..000000000
--- a/meta-networking/recipes-filter/libnetfilter/files/0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch
+++ /dev/null
@@ -1,1227 +0,0 @@
-From db7eb5f0a4e78c6bd3c4f9cbd8332d909eb82ad6 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 10 Apr 2017 12:09:41 -0700
-Subject: [PATCH] Declare the define visivility attribute together
-
-clang ignores the visibility attribute if its not
-defined before the definition. As a result these
-symbols become hidden and consumers of this library
-fail to link due to these missing symbols
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- doxygen.cfg.in | 2 +-
- src/extra/ipv4.c | 15 ++----
- src/extra/ipv6.c | 9 ++--
- src/extra/pktbuff.c | 42 +++++----------
- src/extra/tcp.c | 21 +++-----
- src/extra/udp.c | 21 +++-----
- src/internal.h | 5 +-
- src/libnetfilter_queue.c | 108 +++++++++++++--------------------------
- src/nlmsg.c | 21 +++-----
- 9 files changed, 82 insertions(+), 162 deletions(-)
-
-diff --git a/doxygen.cfg.in b/doxygen.cfg.in
-index a7378ca..659abee 100644
---- a/doxygen.cfg.in
-+++ b/doxygen.cfg.in
-@@ -72,7 +72,7 @@ RECURSIVE = YES
- EXCLUDE =
- EXCLUDE_SYMLINKS = NO
- EXCLUDE_PATTERNS =
--EXCLUDE_SYMBOLS = EXPORT_SYMBOL
-+EXCLUDE_SYMBOLS =
- EXAMPLE_PATH =
- EXAMPLE_PATTERNS =
- EXAMPLE_RECURSIVE = NO
-diff --git a/src/extra/ipv4.c b/src/extra/ipv4.c
-index a93d113..56d5dc7 100644
---- a/src/extra/ipv4.c
-+++ b/src/extra/ipv4.c
-@@ -32,7 +32,7 @@
- * This funcion returns NULL if the IPv4 is malformed or the protocol version
- * is not 4. On success, it returns a valid pointer to the IPv4 header.
- */
--struct iphdr *nfq_ip_get_hdr(struct pkt_buff *pktb)
-+struct iphdr __EXPORTED *nfq_ip_get_hdr(struct pkt_buff *pktb)
- {
- struct iphdr *iph;
- unsigned int pktlen = pktb->tail - pktb->network_header;
-@@ -53,14 +53,13 @@ struct iphdr *nfq_ip_get_hdr(struct pkt_buff *pktb)
-
- return iph;
- }
--EXPORT_SYMBOL(nfq_ip_get_hdr);
-
- /**
- * nfq_ip_set_transport_header - set transport header
- * \param pktb: pointer to network packet buffer
- * \param iph: pointer to the IPv4 header
- */
--int nfq_ip_set_transport_header(struct pkt_buff *pktb, struct iphdr *iph)
-+int __EXPORTED nfq_ip_set_transport_header(struct pkt_buff *pktb, struct iphdr *iph)
- {
- int doff = iph->ihl * 4;
-
-@@ -71,7 +70,6 @@ int nfq_ip_set_transport_header(struct pkt_buff *pktb, struct iphdr *iph)
- pktb->transport_header = pktb->network_header + doff;
- return 0;
- }
--EXPORT_SYMBOL(nfq_ip_set_transport_header);
-
- /**
- * nfq_ip_set_checksum - set IPv4 checksum
-@@ -80,14 +78,13 @@ EXPORT_SYMBOL(nfq_ip_set_transport_header);
- * \note Call to this function if you modified the IPv4 header to update the
- * checksum.
- */
--void nfq_ip_set_checksum(struct iphdr *iph)
-+void __EXPORTED nfq_ip_set_checksum(struct iphdr *iph)
- {
- uint32_t iph_len = iph->ihl * 4;
-
- iph->check = 0;
- iph->check = nfq_checksum(0, (uint16_t *)iph, iph_len);
- }
--EXPORT_SYMBOL(nfq_ip_set_checksum);
-
- /**
- * nfq_ip_mangle - mangle IPv4 packet buffer
-@@ -100,7 +97,7 @@ EXPORT_SYMBOL(nfq_ip_set_checksum);
- *
- * \note This function recalculates the IPv4 checksum (if needed).
- */
--int nfq_ip_mangle(struct pkt_buff *pkt, unsigned int dataoff,
-+int __EXPORTED nfq_ip_mangle(struct pkt_buff *pkt, unsigned int dataoff,
- unsigned int match_offset, unsigned int match_len,
- const char *rep_buffer, unsigned int rep_len)
- {
-@@ -116,7 +113,6 @@ int nfq_ip_mangle(struct pkt_buff *pkt, unsigned int dataoff,
-
- return 1;
- }
--EXPORT_SYMBOL(nfq_ip_mangle);
-
- /**
- * nfq_pkt_snprintf_ip - print IPv4 header into buffer in iptables LOG format
-@@ -128,7 +124,7 @@ EXPORT_SYMBOL(nfq_ip_mangle);
- * case that there is enough room in the buffer. Read snprintf manpage for more
- * information to know more about this strange behaviour.
- */
--int nfq_ip_snprintf(char *buf, size_t size, const struct iphdr *iph)
-+int __EXPORTED nfq_ip_snprintf(char *buf, size_t size, const struct iphdr *iph)
- {
- int ret;
- struct in_addr src = { iph->saddr };
-@@ -147,7 +143,6 @@ int nfq_ip_snprintf(char *buf, size_t size, const struct iphdr *iph)
-
- return ret;
- }
--EXPORT_SYMBOL(nfq_ip_snprintf);
-
- /**
- * @}
-diff --git a/src/extra/ipv6.c b/src/extra/ipv6.c
-index 7c5dc9b..6641c6b 100644
---- a/src/extra/ipv6.c
-+++ b/src/extra/ipv6.c
-@@ -33,7 +33,7 @@
- * This funcion returns NULL if an invalid header is found. On sucess, it
- * returns a valid pointer to the header.
- */
--struct ip6_hdr *nfq_ip6_get_hdr(struct pkt_buff *pktb)
-+struct ip6_hdr __EXPORTED *nfq_ip6_get_hdr(struct pkt_buff *pktb)
- {
- struct ip6_hdr *ip6h;
- unsigned int pktlen = pktb->tail - pktb->network_header;
-@@ -50,7 +50,6 @@ struct ip6_hdr *nfq_ip6_get_hdr(struct pkt_buff *pktb)
-
- return ip6h;
- }
--EXPORT_SYMBOL(nfq_ip6_get_hdr);
-
- /**
- * nfq_ip6_set_transport_header - set transport header pointer for IPv6 packet
-@@ -61,7 +60,7 @@ EXPORT_SYMBOL(nfq_ip6_get_hdr);
- * This function returns 1 if the protocol has been found and the transport
- * header has been set. Otherwise, it returns 0.
- */
--int nfq_ip6_set_transport_header(struct pkt_buff *pktb, struct ip6_hdr *ip6h,
-+int __EXPORTED nfq_ip6_set_transport_header(struct pkt_buff *pktb, struct ip6_hdr *ip6h,
- uint8_t target)
- {
- uint8_t nexthdr = ip6h->ip6_nxt;
-@@ -115,7 +114,6 @@ int nfq_ip6_set_transport_header(struct pkt_buff *pktb, struct ip6_hdr *ip6h,
- pktb->transport_header = cur;
- return cur ? 1 : 0;
- }
--EXPORT_SYMBOL(nfq_ip6_set_transport_header);
-
- /**
- * nfq_ip6_snprintf - print IPv6 header into one buffer in iptables LOG format
-@@ -124,7 +122,7 @@ EXPORT_SYMBOL(nfq_ip6_set_transport_header);
- * \param ip6_hdr: pointer to a valid IPv6 header.
- *
- */
--int nfq_ip6_snprintf(char *buf, size_t size, const struct ip6_hdr *ip6h)
-+int __EXPORTED nfq_ip6_snprintf(char *buf, size_t size, const struct ip6_hdr *ip6h)
- {
- int ret;
- char src[INET6_ADDRSTRLEN];
-@@ -143,7 +141,6 @@ int nfq_ip6_snprintf(char *buf, size_t size, const struct ip6_hdr *ip6h)
-
- return ret;
- }
--EXPORT_SYMBOL(nfq_ip6_snprintf);
-
- /**
- * @}
-diff --git a/src/extra/pktbuff.c b/src/extra/pktbuff.c
-index 1c15a00..54d8244 100644
---- a/src/extra/pktbuff.c
-+++ b/src/extra/pktbuff.c
-@@ -40,7 +40,7 @@
- *
- * \return a pointer to a new queue handle or NULL on failure.
- */
--struct pkt_buff *
-+struct pkt_buff __EXPORTED *
- pktb_alloc(int family, void *data, size_t len, size_t extra)
- {
- struct pkt_buff *pktb;
-@@ -84,120 +84,108 @@ pktb_alloc(int family, void *data, size_t len, size_t extra)
- }
- return pktb;
- }
--EXPORT_SYMBOL(pktb_alloc);
-
- /**
- * pktb_data - return pointer to the beginning of the packet buffer
- * \param pktb Pointer to packet buffer
- */
--uint8_t *pktb_data(struct pkt_buff *pktb)
-+uint8_t __EXPORTED *pktb_data(struct pkt_buff *pktb)
- {
- return pktb->data;
- }
--EXPORT_SYMBOL(pktb_data);
-
- /**
- * pktb_len - return length of the packet buffer
- * \param pktb Pointer to packet buffer
- */
--uint32_t pktb_len(struct pkt_buff *pktb)
-+uint32_t __EXPORTED pktb_len(struct pkt_buff *pktb)
- {
- return pktb->len;
- }
--EXPORT_SYMBOL(pktb_len);
-
- /**
- * pktb_free - release packet buffer
- * \param pktb Pointer to packet buffer
- */
--void pktb_free(struct pkt_buff *pktb)
-+void __EXPORTED pktb_free(struct pkt_buff *pktb)
- {
- free(pktb);
- }
--EXPORT_SYMBOL(pktb_free);
-
- /**
- * pktb_push - update pointer to the beginning of the packet buffer
- * \param pktb Pointer to packet buffer
- */
--void pktb_push(struct pkt_buff *pktb, unsigned int len)
-+void __EXPORTED pktb_push(struct pkt_buff *pktb, unsigned int len)
- {
- pktb->data -= len;
- pktb->len += len;
- }
--EXPORT_SYMBOL(pktb_push);
-
- /**
- * pktb_pull - update pointer to the beginning of the packet buffer
- * \param pktb Pointer to packet buffer
- */
--void pktb_pull(struct pkt_buff *pktb, unsigned int len)
-+void __EXPORTED pktb_pull(struct pkt_buff *pktb, unsigned int len)
- {
- pktb->data += len;
- pktb->len -= len;
- }
--EXPORT_SYMBOL(pktb_pull);
-
- /**
- * pktb_put - add extra bytes to the tail of the packet buffer
- * \param pktb Pointer to packet buffer
- */
--void pktb_put(struct pkt_buff *pktb, unsigned int len)
-+void __EXPORTED pktb_put(struct pkt_buff *pktb, unsigned int len)
- {
- pktb->tail += len;
- pktb->len += len;
- }
--EXPORT_SYMBOL(pktb_put);
-
- /**
- * pktb_trim - set new length for this packet buffer
- * \param pktb Pointer to packet buffer
- */
--void pktb_trim(struct pkt_buff *pktb, unsigned int len)
-+void __EXPORTED pktb_trim(struct pkt_buff *pktb, unsigned int len)
- {
- pktb->len = len;
- }
--EXPORT_SYMBOL(pktb_trim);
-
- /**
- * pktb_tailroom - get room in bytes in the tail of the packet buffer
- * \param pktb Pointer to packet buffer
- */
--unsigned int pktb_tailroom(struct pkt_buff *pktb)
-+unsigned int __EXPORTED pktb_tailroom(struct pkt_buff *pktb)
- {
- return pktb->data_len - pktb->len;
- }
--EXPORT_SYMBOL(pktb_tailroom);
-
- /**
- * pktb_mac_header - return pointer to layer 2 header (if any)
- * \param pktb Pointer to packet buffer
- */
--uint8_t *pktb_mac_header(struct pkt_buff *pktb)
-+uint8_t __EXPORTED *pktb_mac_header(struct pkt_buff *pktb)
- {
- return pktb->mac_header;
- }
--EXPORT_SYMBOL(pktb_mac_header);
-
- /**
- * pktb_network_header - return pointer to layer 3 header
- * \param pktb Pointer to packet buffer
- */
--uint8_t *pktb_network_header(struct pkt_buff *pktb)
-+uint8_t __EXPORTED *pktb_network_header(struct pkt_buff *pktb)
- {
- return pktb->network_header;
- }
--EXPORT_SYMBOL(pktb_network_header);
-
- /**
- * pktb_transport_header - return pointer to layer 4 header (if any)
- * \param pktb Pointer to packet buffer
- */
--uint8_t *pktb_transport_header(struct pkt_buff *pktb)
-+uint8_t __EXPORTED *pktb_transport_header(struct pkt_buff *pktb)
- {
- return pktb->transport_header;
- }
--EXPORT_SYMBOL(pktb_transport_header);
-
- static int pktb_expand_tail(struct pkt_buff *pkt, int extra)
- {
-@@ -224,7 +212,7 @@ static int enlarge_pkt(struct pkt_buff *pkt, unsigned int extra)
- return 1;
- }
-
--int pktb_mangle(struct pkt_buff *pkt,
-+int __EXPORTED pktb_mangle(struct pkt_buff *pkt,
- unsigned int dataoff,
- unsigned int match_offset,
- unsigned int match_len,
-@@ -258,17 +246,15 @@ int pktb_mangle(struct pkt_buff *pkt,
- pkt->mangled = true;
- return 1;
- }
--EXPORT_SYMBOL(pktb_mangle);
-
- /**
- * pktb_mangled - return true if packet has been mangled
- * \param pktb Pointer to packet buffer
- */
--bool pktb_mangled(const struct pkt_buff *pkt)
-+bool __EXPORTED pktb_mangled(const struct pkt_buff *pkt)
- {
- return pkt->mangled;
- }
--EXPORT_SYMBOL(pktb_mangled);
-
- /**
- * @}
-diff --git a/src/extra/tcp.c b/src/extra/tcp.c
-index d1cd79d..8038ce5 100644
---- a/src/extra/tcp.c
-+++ b/src/extra/tcp.c
-@@ -40,7 +40,7 @@
- * \note You have to call nfq_ip_set_transport_header or
- * nfq_ip6_set_transport_header first to access the TCP header.
- */
--struct tcphdr *nfq_tcp_get_hdr(struct pkt_buff *pktb)
-+struct tcphdr __EXPORTED *nfq_tcp_get_hdr(struct pkt_buff *pktb)
- {
- if (pktb->transport_header == NULL)
- return NULL;
-@@ -51,14 +51,13 @@ struct tcphdr *nfq_tcp_get_hdr(struct pkt_buff *pktb)
-
- return (struct tcphdr *)pktb->transport_header;
- }
--EXPORT_SYMBOL(nfq_tcp_get_hdr);
-
- /**
- * nfq_tcp_get_payload - get the TCP packet payload
- * \param tcph: pointer to the TCP header
- * \param pktb: pointer to user-space network packet buffer
- */
--void *nfq_tcp_get_payload(struct tcphdr *tcph, struct pkt_buff *pktb)
-+void __EXPORTED *nfq_tcp_get_payload(struct tcphdr *tcph, struct pkt_buff *pktb)
- {
- unsigned int len = tcph->doff * 4;
-
-@@ -72,47 +71,43 @@ void *nfq_tcp_get_payload(struct tcphdr *tcph, struct pkt_buff *pktb)
-
- return pktb->transport_header + len;
- }
--EXPORT_SYMBOL(nfq_tcp_get_payload);
-
- /**
- * nfq_tcp_get_payload_len - get the tcp packet payload
- * \param tcph: pointer to the TCP header
- * \param pktb: pointer to user-space network packet buffer
- */
--unsigned int
-+unsigned int __EXPORTED
- nfq_tcp_get_payload_len(struct tcphdr *tcph, struct pkt_buff *pktb)
- {
- return pktb->tail - pktb->transport_header;
- }
--EXPORT_SYMBOL(nfq_tcp_get_payload_len);
-
- /**
- * nfq_tcp_set_checksum_ipv4 - computes IPv4/TCP packet checksum
- * \param tcph: pointer to the TCP header
- * \param iph: pointer to the IPv4 header
- */
--void
-+void __EXPORTED
- nfq_tcp_compute_checksum_ipv4(struct tcphdr *tcph, struct iphdr *iph)
- {
- /* checksum field in header needs to be zero for calculation. */
- tcph->check = 0;
- tcph->check = nfq_checksum_tcpudp_ipv4(iph);
- }
--EXPORT_SYMBOL(nfq_tcp_compute_checksum_ipv4);
-
- /**
- * nfq_tcp_set_checksum_ipv6 - computes IPv6/TCP packet checksum
- * \param tcph: pointer to the TCP header
- * \param iph: pointer to the IPv6 header
- */
--void
-+void __EXPORTED
- nfq_tcp_compute_checksum_ipv6(struct tcphdr *tcph, struct ip6_hdr *ip6h)
- {
- /* checksum field in header needs to be zero for calculation. */
- tcph->check = 0;
- tcph->check = nfq_checksum_tcpudp_ipv6(ip6h, tcph);
- }
--EXPORT_SYMBOL(nfq_tcp_compute_checksum_ipv6);
-
- /*
- * The union cast uses a gcc extension to avoid aliasing problems
-@@ -134,7 +129,7 @@ union tcp_word_hdr {
- * \param tcp: pointer to a valid tcp header.
- *
- */
--int nfq_tcp_snprintf(char *buf, size_t size, const struct tcphdr *tcph)
-+int __EXPORTED nfq_tcp_snprintf(char *buf, size_t size, const struct tcphdr *tcph)
- {
- int ret, len = 0;
-
-@@ -177,7 +172,6 @@ int nfq_tcp_snprintf(char *buf, size_t size, const struct tcphdr *tcph)
-
- return ret;
- }
--EXPORT_SYMBOL(nfq_tcp_snprintf);
-
- /**
- * nfq_tcp_mangle_ipv4 - mangle TCP/IPv4 packet buffer
-@@ -189,7 +183,7 @@ EXPORT_SYMBOL(nfq_tcp_snprintf);
- *
- * \note This function recalculates the IPv4 and TCP checksums for you.
- */
--int
-+int __EXPORTED
- nfq_tcp_mangle_ipv4(struct pkt_buff *pkt,
- unsigned int match_offset, unsigned int match_len,
- const char *rep_buffer, unsigned int rep_len)
-@@ -208,7 +202,6 @@ nfq_tcp_mangle_ipv4(struct pkt_buff *pkt,
-
- return 1;
- }
--EXPORT_SYMBOL(nfq_tcp_mangle_ipv4);
-
- /**
- * @}
-diff --git a/src/extra/udp.c b/src/extra/udp.c
-index 8c44a66..99c8faa 100644
---- a/src/extra/udp.c
-+++ b/src/extra/udp.c
-@@ -37,7 +37,7 @@
- * This function returns NULL if invalid UDP header is found. On success,
- * it returns the UDP header.
- */
--struct udphdr *nfq_udp_get_hdr(struct pkt_buff *pktb)
-+struct udphdr __EXPORTED *nfq_udp_get_hdr(struct pkt_buff *pktb)
- {
- if (pktb->transport_header == NULL)
- return NULL;
-@@ -48,14 +48,13 @@ struct udphdr *nfq_udp_get_hdr(struct pkt_buff *pktb)
-
- return (struct udphdr *)pktb->transport_header;
- }
--EXPORT_SYMBOL(nfq_udp_get_hdr);
-
- /**
- * nfq_udp_get_payload - get the UDP packet payload.
- * \param udph: the pointer to the UDP header.
- * \param tail: pointer to the tail of the packet
- */
--void *nfq_udp_get_payload(struct udphdr *udph, struct pkt_buff *pktb)
-+void __EXPORTED *nfq_udp_get_payload(struct udphdr *udph, struct pkt_buff *pktb)
- {
- uint16_t len = ntohs(udph->len);
-
-@@ -69,17 +68,15 @@ void *nfq_udp_get_payload(struct udphdr *udph, struct pkt_buff *pktb)
-
- return pktb->transport_header + sizeof(struct udphdr);
- }
--EXPORT_SYMBOL(nfq_udp_get_payload);
-
- /**
- * nfq_udp_get_payload_len - get the udp packet payload.
- * \param udp: the pointer to the udp header.
- */
--unsigned int nfq_udp_get_payload_len(struct udphdr *udph, struct pkt_buff *pktb)
-+unsigned int __EXPORTED nfq_udp_get_payload_len(struct udphdr *udph, struct pkt_buff *pktb)
- {
- return pktb->tail - pktb->transport_header;
- }
--EXPORT_SYMBOL(nfq_udp_get_payload_len);
-
- /**
- * nfq_udp_set_checksum_ipv4 - computes a IPv4/TCP packet's segment
-@@ -91,14 +88,13 @@ EXPORT_SYMBOL(nfq_udp_get_payload_len);
- * \see nfq_pkt_compute_ip_checksum
- * \see nfq_pkt_compute_udp_checksum
- */
--void
-+void __EXPORTED
- nfq_udp_compute_checksum_ipv4(struct udphdr *udph, struct iphdr *iph)
- {
- /* checksum field in header needs to be zero for calculation. */
- udph->check = 0;
- udph->check = nfq_checksum_tcpudp_ipv4(iph);
- }
--EXPORT_SYMBOL(nfq_udp_compute_checksum_ipv4);
-
- /**
- * nfq_udp_set_checksum_ipv6 - computes a IPv6/TCP packet's segment
-@@ -110,14 +106,13 @@ EXPORT_SYMBOL(nfq_udp_compute_checksum_ipv4);
- * \see nfq_pkt_compute_ip_checksum
- * \see nfq_pkt_compute_udp_checksum
- */
--void
-+void __EXPORTED
- nfq_udp_compute_checksum_ipv6(struct udphdr *udph, struct ip6_hdr *ip6h)
- {
- /* checksum field in header needs to be zero for calculation. */
- udph->check = 0;
- udph->check = nfq_checksum_tcpudp_ipv6(ip6h, udph);
- }
--EXPORT_SYMBOL(nfq_udp_compute_checksum_ipv6);
-
- /**
- * nfq_tcp_mangle_ipv4 - mangle TCP/IPv4 packet buffer
-@@ -129,7 +124,7 @@ EXPORT_SYMBOL(nfq_udp_compute_checksum_ipv6);
- *
- * \note This function recalculates the IPv4 and TCP checksums for you.
- */
--int
-+int __EXPORTED
- nfq_udp_mangle_ipv4(struct pkt_buff *pkt,
- unsigned int match_offset, unsigned int match_len,
- const char *rep_buffer, unsigned int rep_len)
-@@ -148,7 +143,6 @@ nfq_udp_mangle_ipv4(struct pkt_buff *pkt,
-
- return 1;
- }
--EXPORT_SYMBOL(nfq_udp_mangle_ipv4);
-
- /**
- * nfq_pkt_snprintf_udp_hdr - print udp header into one buffer in a humnan
-@@ -158,12 +152,11 @@ EXPORT_SYMBOL(nfq_udp_mangle_ipv4);
- * \param udp: pointer to a valid udp header.
- *
- */
--int nfq_udp_snprintf(char *buf, size_t size, const struct udphdr *udph)
-+int __EXPORTED nfq_udp_snprintf(char *buf, size_t size, const struct udphdr *udph)
- {
- return snprintf(buf, size, "SPT=%u DPT=%u ",
- htons(udph->source), htons(udph->dest));
- }
--EXPORT_SYMBOL(nfq_udp_snprintf);
-
- /**
- * @}
-diff --git a/src/internal.h b/src/internal.h
-index 558d267..79b0752 100644
---- a/src/internal.h
-+++ b/src/internal.h
-@@ -5,10 +5,9 @@
- #include <stdint.h>
- #include <stdbool.h>
- #ifdef HAVE_VISIBILITY_HIDDEN
--# define __visible __attribute__((visibility("default")))
--# define EXPORT_SYMBOL(x) typeof(x) (x) __visible
-+# define __EXPORTED __attribute__((visibility("default")))
- #else
--# define EXPORT_SYMBOL
-+# define __EXPORTED
- #endif
-
- struct iphdr;
-diff --git a/src/libnetfilter_queue.c b/src/libnetfilter_queue.c
-index 673e3b0..c12f068 100644
---- a/src/libnetfilter_queue.c
-+++ b/src/libnetfilter_queue.c
-@@ -133,8 +133,7 @@ struct nfq_data {
- struct nfattr **data;
- };
-
--int nfq_errno;
--EXPORT_SYMBOL(nfq_errno);
-+int __EXPORTED nfq_errno;
-
- /***********************************************************************
- * low level stuff
-@@ -218,11 +217,10 @@ static int __nfq_rcv_pkt(struct nlmsghdr *nlh, struct nfattr *nfa[],
-
- /* public interface */
-
--struct nfnl_handle *nfq_nfnlh(struct nfq_handle *h)
-+struct nfnl_handle __EXPORTED *nfq_nfnlh(struct nfq_handle *h)
- {
- return h->nfnlh;
- }
--EXPORT_SYMBOL(nfq_nfnlh);
-
- /**
- *
-@@ -294,11 +292,10 @@ EXPORT_SYMBOL(nfq_nfnlh);
- * over the netlink connection associated with the given queue connection
- * handle.
- */
--int nfq_fd(struct nfq_handle *h)
-+int __EXPORTED nfq_fd(struct nfq_handle *h)
- {
- return nfnl_fd(nfq_nfnlh(h));
- }
--EXPORT_SYMBOL(nfq_fd);
- /**
- * @}
- */
-@@ -349,7 +346,7 @@ EXPORT_SYMBOL(nfq_fd);
- *
- * \return a pointer to a new queue handle or NULL on failure.
- */
--struct nfq_handle *nfq_open(void)
-+struct nfq_handle __EXPORTED *nfq_open(void)
- {
- struct nfnl_handle *nfnlh = nfnl_open();
- struct nfq_handle *qh;
-@@ -366,7 +363,6 @@ struct nfq_handle *nfq_open(void)
-
- return qh;
- }
--EXPORT_SYMBOL(nfq_open);
-
- /**
- * @}
-@@ -382,7 +378,7 @@ EXPORT_SYMBOL(nfq_open);
- *
- * \return a pointer to a new queue handle or NULL on failure.
- */
--struct nfq_handle *nfq_open_nfnl(struct nfnl_handle *nfnlh)
-+struct nfq_handle __EXPORTED *nfq_open_nfnl(struct nfnl_handle *nfnlh)
- {
- struct nfnl_callback pkt_cb = {
- .call = __nfq_rcv_pkt,
-@@ -419,7 +415,6 @@ out_free:
- free(h);
- return NULL;
- }
--EXPORT_SYMBOL(nfq_open_nfnl);
-
- /**
- * \addtogroup LibrarySetup
-@@ -438,7 +433,7 @@ EXPORT_SYMBOL(nfq_open_nfnl);
- *
- * \return 0 on success, non-zero on failure.
- */
--int nfq_close(struct nfq_handle *h)
-+int __EXPORTED nfq_close(struct nfq_handle *h)
- {
- int ret;
-
-@@ -447,7 +442,6 @@ int nfq_close(struct nfq_handle *h)
- free(h);
- return ret;
- }
--EXPORT_SYMBOL(nfq_close);
-
- /**
- * nfq_bind_pf - bind a nfqueue handler to a given protocol family
-@@ -460,11 +454,10 @@ EXPORT_SYMBOL(nfq_close);
- *
- * \return integer inferior to 0 in case of failure
- */
--int nfq_bind_pf(struct nfq_handle *h, uint16_t pf)
-+int __EXPORTED nfq_bind_pf(struct nfq_handle *h, uint16_t pf)
- {
- return __build_send_cfg_msg(h, NFQNL_CFG_CMD_PF_BIND, 0, pf);
- }
--EXPORT_SYMBOL(nfq_bind_pf);
-
- /**
- * nfq_unbind_pf - unbind nfqueue handler from a protocol family
-@@ -476,11 +469,10 @@ EXPORT_SYMBOL(nfq_bind_pf);
- *
- * This call is obsolete, Linux kernels from 3.8 onwards ignore it.
- */
--int nfq_unbind_pf(struct nfq_handle *h, uint16_t pf)
-+int __EXPORTED nfq_unbind_pf(struct nfq_handle *h, uint16_t pf)
- {
- return __build_send_cfg_msg(h, NFQNL_CFG_CMD_PF_UNBIND, 0, pf);
- }
--EXPORT_SYMBOL(nfq_unbind_pf);
-
-
- /**
-@@ -524,7 +516,7 @@ typedef int nfq_callback(struct nfq_q_handle *qh,
- * The callback should return < 0 to stop processing.
- */
-
--struct nfq_q_handle *nfq_create_queue(struct nfq_handle *h,
-+struct nfq_q_handle __EXPORTED *nfq_create_queue(struct nfq_handle *h,
- uint16_t num,
- nfq_callback *cb,
- void *data)
-@@ -555,7 +547,6 @@ struct nfq_q_handle *nfq_create_queue(struct nfq_handle *h,
- add_qh(qh);
- return qh;
- }
--EXPORT_SYMBOL(nfq_create_queue);
-
- /**
- * @}
-@@ -573,7 +564,7 @@ EXPORT_SYMBOL(nfq_create_queue);
- * Removes the binding for the specified queue handle. This call also unbind
- * from the nfqueue handler, so you don't have to call nfq_unbind_pf.
- */
--int nfq_destroy_queue(struct nfq_q_handle *qh)
-+int __EXPORTED nfq_destroy_queue(struct nfq_q_handle *qh)
- {
- int ret = __build_send_cfg_msg(qh->h, NFQNL_CFG_CMD_UNBIND, qh->id, 0);
- if (ret == 0) {
-@@ -583,7 +574,6 @@ int nfq_destroy_queue(struct nfq_q_handle *qh)
-
- return ret;
- }
--EXPORT_SYMBOL(nfq_destroy_queue);
-
- /**
- * nfq_handle_packet - handle a packet received from the nfqueue subsystem
-@@ -597,11 +587,10 @@ EXPORT_SYMBOL(nfq_destroy_queue);
- *
- * \return 0 on success, non-zero on failure.
- */
--int nfq_handle_packet(struct nfq_handle *h, char *buf, int len)
-+int __EXPORTED nfq_handle_packet(struct nfq_handle *h, char *buf, int len)
- {
- return nfnl_handle_packet(h->nfnlh, buf, len);
- }
--EXPORT_SYMBOL(nfq_handle_packet);
-
- /**
- * nfq_set_mode - set the amount of packet data that nfqueue copies to userspace
-@@ -618,7 +607,7 @@ EXPORT_SYMBOL(nfq_handle_packet);
- *
- * \return -1 on error; >=0 otherwise.
- */
--int nfq_set_mode(struct nfq_q_handle *qh,
-+int __EXPORTED nfq_set_mode(struct nfq_q_handle *qh,
- uint8_t mode, uint32_t range)
- {
- union {
-@@ -638,7 +627,6 @@ int nfq_set_mode(struct nfq_q_handle *qh,
-
- return nfnl_query(qh->h->nfnlh, &u.nmh);
- }
--EXPORT_SYMBOL(nfq_set_mode);
-
- /**
- * nfq_set_queue_flags - set flags (options) for the kernel queue
-@@ -708,7 +696,7 @@ EXPORT_SYMBOL(nfq_set_mode);
- *
- * \return -1 on error with errno set appropriately; =0 otherwise.
- */
--int nfq_set_queue_flags(struct nfq_q_handle *qh,
-+int __EXPORTED nfq_set_queue_flags(struct nfq_q_handle *qh,
- uint32_t mask, uint32_t flags)
- {
- union {
-@@ -729,7 +717,6 @@ int nfq_set_queue_flags(struct nfq_q_handle *qh,
-
- return nfnl_query(qh->h->nfnlh, &u.nmh);
- }
--EXPORT_SYMBOL(nfq_set_queue_flags);
-
- /**
- * nfq_set_queue_maxlen - Set kernel queue maximum length parameter
-@@ -742,7 +729,7 @@ EXPORT_SYMBOL(nfq_set_queue_flags);
- *
- * \return -1 on error; >=0 otherwise.
- */
--int nfq_set_queue_maxlen(struct nfq_q_handle *qh,
-+int __EXPORTED nfq_set_queue_maxlen(struct nfq_q_handle *qh,
- uint32_t queuelen)
- {
- union {
-@@ -760,7 +747,6 @@ int nfq_set_queue_maxlen(struct nfq_q_handle *qh,
-
- return nfnl_query(qh->h->nfnlh, &u.nmh);
- }
--EXPORT_SYMBOL(nfq_set_queue_maxlen);
-
- /**
- * @}
-@@ -847,14 +833,13 @@ static int __set_verdict(struct nfq_q_handle *qh, uint32_t id,
- *
- * \return -1 on error; >= 0 otherwise.
- */
--int nfq_set_verdict(struct nfq_q_handle *qh, uint32_t id,
-+int __EXPORTED nfq_set_verdict(struct nfq_q_handle *qh, uint32_t id,
- uint32_t verdict, uint32_t data_len,
- const unsigned char *buf)
- {
- return __set_verdict(qh, id, verdict, 0, 0, data_len, buf,
- NFQNL_MSG_VERDICT);
- }
--EXPORT_SYMBOL(nfq_set_verdict);
-
- /**
- * nfq_set_verdict2 - like nfq_set_verdict, but you can set the mark.
-@@ -865,14 +850,13 @@ EXPORT_SYMBOL(nfq_set_verdict);
- * \param data_len number of bytes of data pointed to by #buf
- * \param buf the buffer that contains the packet data
- */
--int nfq_set_verdict2(struct nfq_q_handle *qh, uint32_t id,
-+int __EXPORTED nfq_set_verdict2(struct nfq_q_handle *qh, uint32_t id,
- uint32_t verdict, uint32_t mark,
- uint32_t data_len, const unsigned char *buf)
- {
- return __set_verdict(qh, id, verdict, htonl(mark), 1, data_len,
- buf, NFQNL_MSG_VERDICT);
- }
--EXPORT_SYMBOL(nfq_set_verdict2);
-
- /**
- * nfq_set_verdict_batch - issue verdicts on several packets at once
-@@ -886,13 +870,12 @@ EXPORT_SYMBOL(nfq_set_verdict2);
- * batch support was added in Linux 3.1.
- * These functions will fail silently on older kernels.
- */
--int nfq_set_verdict_batch(struct nfq_q_handle *qh, uint32_t id,
-+int __EXPORTED nfq_set_verdict_batch(struct nfq_q_handle *qh, uint32_t id,
- uint32_t verdict)
- {
- return __set_verdict(qh, id, verdict, 0, 0, 0, NULL,
- NFQNL_MSG_VERDICT_BATCH);
- }
--EXPORT_SYMBOL(nfq_set_verdict_batch);
-
- /**
- * nfq_set_verdict_batch2 - like nfq_set_verdict_batch, but you can set a mark.
-@@ -901,13 +884,12 @@ EXPORT_SYMBOL(nfq_set_verdict_batch);
- * \param verdict verdict to return to netfilter (NF_ACCEPT, NF_DROP)
- * \param mark mark to put on packet
- */
--int nfq_set_verdict_batch2(struct nfq_q_handle *qh, uint32_t id,
-+int __EXPORTED nfq_set_verdict_batch2(struct nfq_q_handle *qh, uint32_t id,
- uint32_t verdict, uint32_t mark)
- {
- return __set_verdict(qh, id, verdict, htonl(mark), 1, 0,
- NULL, NFQNL_MSG_VERDICT_BATCH);
- }
--EXPORT_SYMBOL(nfq_set_verdict_batch2);
-
- /**
- * nfq_set_verdict_mark - like nfq_set_verdict, but you can set the mark.
-@@ -923,14 +905,13 @@ EXPORT_SYMBOL(nfq_set_verdict_batch2);
- * This function is deprecated since it is broken, its use is highly
- * discouraged. Please, use nfq_set_verdict2 instead.
- */
--int nfq_set_verdict_mark(struct nfq_q_handle *qh, uint32_t id,
-+int __EXPORTED nfq_set_verdict_mark(struct nfq_q_handle *qh, uint32_t id,
- uint32_t verdict, uint32_t mark,
- uint32_t data_len, const unsigned char *buf)
- {
- return __set_verdict(qh, id, verdict, mark, 1, data_len, buf,
- NFQNL_MSG_VERDICT);
- }
--EXPORT_SYMBOL(nfq_set_verdict_mark);
-
- /**
- * @}
-@@ -965,12 +946,11 @@ EXPORT_SYMBOL(nfq_set_verdict_mark);
- } __attribute__ ((packed));
- \endverbatim
- */
--struct nfqnl_msg_packet_hdr *nfq_get_msg_packet_hdr(struct nfq_data *nfad)
-+struct nfqnl_msg_packet_hdr __EXPORTED *nfq_get_msg_packet_hdr(struct nfq_data *nfad)
- {
- return nfnl_get_pointer_to_data(nfad->data, NFQA_PACKET_HDR,
- struct nfqnl_msg_packet_hdr);
- }
--EXPORT_SYMBOL(nfq_get_msg_packet_hdr);
-
- /**
- * nfq_get_nfmark - get the packet mark
-@@ -978,11 +958,10 @@ EXPORT_SYMBOL(nfq_get_msg_packet_hdr);
- *
- * \return the netfilter mark currently assigned to the given queued packet.
- */
--uint32_t nfq_get_nfmark(struct nfq_data *nfad)
-+uint32_t __EXPORTED nfq_get_nfmark(struct nfq_data *nfad)
- {
- return ntohl(nfnl_get_data(nfad->data, NFQA_MARK, uint32_t));
- }
--EXPORT_SYMBOL(nfq_get_nfmark);
-
- /**
- * nfq_get_timestamp - get the packet timestamp
-@@ -993,7 +972,7 @@ EXPORT_SYMBOL(nfq_get_nfmark);
- *
- * \return 0 on success, non-zero on failure.
- */
--int nfq_get_timestamp(struct nfq_data *nfad, struct timeval *tv)
-+int __EXPORTED nfq_get_timestamp(struct nfq_data *nfad, struct timeval *tv)
- {
- struct nfqnl_msg_packet_timestamp *qpt;
- qpt = nfnl_get_pointer_to_data(nfad->data, NFQA_TIMESTAMP,
-@@ -1006,7 +985,6 @@ int nfq_get_timestamp(struct nfq_data *nfad, struct timeval *tv)
-
- return 0;
- }
--EXPORT_SYMBOL(nfq_get_timestamp);
-
- /**
- * nfq_get_indev - get the interface that the packet was received through
-@@ -1019,11 +997,10 @@ EXPORT_SYMBOL(nfq_get_timestamp);
- * \warning all nfq_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)
- */
--uint32_t nfq_get_indev(struct nfq_data *nfad)
-+uint32_t __EXPORTED nfq_get_indev(struct nfq_data *nfad)
- {
- return ntohl(nfnl_get_data(nfad->data, NFQA_IFINDEX_INDEV, uint32_t));
- }
--EXPORT_SYMBOL(nfq_get_indev);
-
- /**
- * nfq_get_physindev - get the physical interface that the packet was received
-@@ -1033,11 +1010,10 @@ EXPORT_SYMBOL(nfq_get_indev);
- * If the returned index is 0, the packet was locally generated or the
- * physical input interface is no longer known (ie. POSTROUTING?).
- */
--uint32_t nfq_get_physindev(struct nfq_data *nfad)
-+uint32_t __EXPORTED nfq_get_physindev(struct nfq_data *nfad)
- {
- return ntohl(nfnl_get_data(nfad->data, NFQA_IFINDEX_PHYSINDEV, uint32_t));
- }
--EXPORT_SYMBOL(nfq_get_physindev);
-
- /**
- * nfq_get_outdev - gets the interface that the packet will be routed out
-@@ -1047,11 +1023,10 @@ EXPORT_SYMBOL(nfq_get_physindev);
- * returned index is 0, the packet is destined for localhost or the output
- * interface is not yet known (ie. PREROUTING?).
- */
--uint32_t nfq_get_outdev(struct nfq_data *nfad)
-+uint32_t __EXPORTED nfq_get_outdev(struct nfq_data *nfad)
- {
- return ntohl(nfnl_get_data(nfad->data, NFQA_IFINDEX_OUTDEV, uint32_t));
- }
--EXPORT_SYMBOL(nfq_get_outdev);
-
- /**
- * nfq_get_physoutdev - get the physical interface that the packet output
-@@ -1063,11 +1038,10 @@ EXPORT_SYMBOL(nfq_get_outdev);
- *
- * \return The index of physical interface that the packet output will be routed out.
- */
--uint32_t nfq_get_physoutdev(struct nfq_data *nfad)
-+uint32_t __EXPORTED nfq_get_physoutdev(struct nfq_data *nfad)
- {
- return ntohl(nfnl_get_data(nfad->data, NFQA_IFINDEX_PHYSOUTDEV, uint32_t));
- }
--EXPORT_SYMBOL(nfq_get_physoutdev);
-
- /**
- * nfq_get_indev_name - get the name of the interface the packet
-@@ -1107,13 +1081,12 @@ EXPORT_SYMBOL(nfq_get_physoutdev);
- \endverbatim
- *
- */
--int nfq_get_indev_name(struct nlif_handle *nlif_handle,
-+int __EXPORTED nfq_get_indev_name(struct nlif_handle *nlif_handle,
- struct nfq_data *nfad, char *name)
- {
- uint32_t ifindex = nfq_get_indev(nfad);
- return nlif_index2name(nlif_handle, ifindex, name);
- }
--EXPORT_SYMBOL(nfq_get_indev_name);
-
- /**
- * nfq_get_physindev_name - get the name of the physical interface the
-@@ -1127,13 +1100,12 @@ EXPORT_SYMBOL(nfq_get_indev_name);
- *
- * \return -1 in case of error, > 0 if it succeed.
- */
--int nfq_get_physindev_name(struct nlif_handle *nlif_handle,
-+int __EXPORTED nfq_get_physindev_name(struct nlif_handle *nlif_handle,
- struct nfq_data *nfad, char *name)
- {
- uint32_t ifindex = nfq_get_physindev(nfad);
- return nlif_index2name(nlif_handle, ifindex, name);
- }
--EXPORT_SYMBOL(nfq_get_physindev_name);
-
- /**
- * nfq_get_outdev_name - get the name of the physical interface the
-@@ -1147,13 +1119,12 @@ EXPORT_SYMBOL(nfq_get_physindev_name);
- *
- * \return -1 in case of error, > 0 if it succeed.
- */
--int nfq_get_outdev_name(struct nlif_handle *nlif_handle,
-+int __EXPORTED nfq_get_outdev_name(struct nlif_handle *nlif_handle,
- struct nfq_data *nfad, char *name)
- {
- uint32_t ifindex = nfq_get_outdev(nfad);
- return nlif_index2name(nlif_handle, ifindex, name);
- }
--EXPORT_SYMBOL(nfq_get_outdev_name);
-
- /**
- * nfq_get_physoutdev_name - get the name of the interface the
-@@ -1168,13 +1139,12 @@ EXPORT_SYMBOL(nfq_get_outdev_name);
- * \return -1 in case of error, > 0 if it succeed.
- */
-
--int nfq_get_physoutdev_name(struct nlif_handle *nlif_handle,
-+int __EXPORTED nfq_get_physoutdev_name(struct nlif_handle *nlif_handle,
- struct nfq_data *nfad, char *name)
- {
- uint32_t ifindex = nfq_get_physoutdev(nfad);
- return nlif_index2name(nlif_handle, ifindex, name);
- }
--EXPORT_SYMBOL(nfq_get_physoutdev_name);
-
- /**
- * nfq_get_packet_hw
-@@ -1198,12 +1168,11 @@ EXPORT_SYMBOL(nfq_get_physoutdev_name);
- } __attribute__ ((packed));
- \endverbatim
- */
--struct nfqnl_msg_packet_hw *nfq_get_packet_hw(struct nfq_data *nfad)
-+struct nfqnl_msg_packet_hw __EXPORTED *nfq_get_packet_hw(struct nfq_data *nfad)
- {
- return nfnl_get_pointer_to_data(nfad->data, NFQA_HWADDR,
- struct nfqnl_msg_packet_hw);
- }
--EXPORT_SYMBOL(nfq_get_packet_hw);
-
- /**
- * nfq_get_uid - get the UID of the user the packet belongs to
-@@ -1215,7 +1184,7 @@ EXPORT_SYMBOL(nfq_get_packet_hw);
- *
- * \return 1 if there is a UID available, 0 otherwise.
- */
--int nfq_get_uid(struct nfq_data *nfad, uint32_t *uid)
-+int __EXPORTED nfq_get_uid(struct nfq_data *nfad, uint32_t *uid)
- {
- if (!nfnl_attr_present(nfad->data, NFQA_UID))
- return 0;
-@@ -1223,7 +1192,6 @@ int nfq_get_uid(struct nfq_data *nfad, uint32_t *uid)
- *uid = ntohl(nfnl_get_data(nfad->data, NFQA_UID, uint32_t));
- return 1;
- }
--EXPORT_SYMBOL(nfq_get_uid);
-
- /**
- * nfq_get_gid - get the GID of the user the packet belongs to
-@@ -1235,7 +1203,7 @@ EXPORT_SYMBOL(nfq_get_uid);
- *
- * \return 1 if there is a GID available, 0 otherwise.
- */
--int nfq_get_gid(struct nfq_data *nfad, uint32_t *gid)
-+int __EXPORTED nfq_get_gid(struct nfq_data *nfad, uint32_t *gid)
- {
- if (!nfnl_attr_present(nfad->data, NFQA_GID))
- return 0;
-@@ -1243,7 +1211,6 @@ int nfq_get_gid(struct nfq_data *nfad, uint32_t *gid)
- *gid = ntohl(nfnl_get_data(nfad->data, NFQA_GID, uint32_t));
- return 1;
- }
--EXPORT_SYMBOL(nfq_get_gid);
-
- /**
- * nfq_get_secctx - get the security context for this packet
-@@ -1256,7 +1223,7 @@ EXPORT_SYMBOL(nfq_get_gid);
- *
- * \return -1 on error, otherwise > 0
- */
--int nfq_get_secctx(struct nfq_data *nfad, unsigned char **secdata)
-+int __EXPORTED nfq_get_secctx(struct nfq_data *nfad, unsigned char **secdata)
- {
- if (!nfnl_attr_present(nfad->data, NFQA_SECCTX))
- return -1;
-@@ -1269,7 +1236,6 @@ int nfq_get_secctx(struct nfq_data *nfad, unsigned char **secdata)
-
- return 0;
- }
--EXPORT_SYMBOL(nfq_get_secctx);
-
- /**
- * nfq_get_payload - get payload
-@@ -1282,7 +1248,7 @@ EXPORT_SYMBOL(nfq_get_secctx);
- *
- * \return -1 on error, otherwise > 0.
- */
--int nfq_get_payload(struct nfq_data *nfad, unsigned char **data)
-+int __EXPORTED nfq_get_payload(struct nfq_data *nfad, unsigned char **data)
- {
- *data = (unsigned char *)
- nfnl_get_pointer_to_data(nfad->data, NFQA_PAYLOAD, char);
-@@ -1291,7 +1257,6 @@ int nfq_get_payload(struct nfq_data *nfad, unsigned char **data)
-
- return -1;
- }
--EXPORT_SYMBOL(nfq_get_payload);
-
- /**
- * @}
-@@ -1336,7 +1301,7 @@ do { \
- * would have been printed into the buffer (in case that there is enough
- * room in it). See snprintf() return value for more information.
- */
--int nfq_snprintf_xml(char *buf, size_t rem, struct nfq_data *tb, int flags)
-+int __EXPORTED nfq_snprintf_xml(char *buf, size_t rem, struct nfq_data *tb, int flags)
- {
- struct nfqnl_msg_packet_hdr *ph;
- struct nfqnl_msg_packet_hw *hwph;
-@@ -1489,7 +1454,6 @@ int nfq_snprintf_xml(char *buf, size_t rem, struct nfq_data *tb, int flags)
-
- return len;
- }
--EXPORT_SYMBOL(nfq_snprintf_xml);
-
- /**
- * @}
-diff --git a/src/nlmsg.c b/src/nlmsg.c
-index ba28c77..5582407 100644
---- a/src/nlmsg.c
-+++ b/src/nlmsg.c
-@@ -30,7 +30,7 @@
- * @{
- */
-
--void nfq_nlmsg_verdict_put(struct nlmsghdr *nlh, int id, int verdict)
-+void __EXPORTED nfq_nlmsg_verdict_put(struct nlmsghdr *nlh, int id, int verdict)
- {
- struct nfqnl_msg_verdict_hdr vh = {
- .verdict = htonl(verdict),
-@@ -38,20 +38,17 @@ void nfq_nlmsg_verdict_put(struct nlmsghdr *nlh, int id, int verdict)
- };
- mnl_attr_put(nlh, NFQA_VERDICT_HDR, sizeof(vh), &vh);
- }
--EXPORT_SYMBOL(nfq_nlmsg_verdict_put);
-
--void nfq_nlmsg_verdict_put_mark(struct nlmsghdr *nlh, uint32_t mark)
-+void __EXPORTED nfq_nlmsg_verdict_put_mark(struct nlmsghdr *nlh, uint32_t mark)
- {
- mnl_attr_put_u32(nlh, NFQA_MARK, htonl(mark));
- }
--EXPORT_SYMBOL(nfq_nlmsg_verdict_put_mark);
-
--void
-+void __EXPORTED
- nfq_nlmsg_verdict_put_pkt(struct nlmsghdr *nlh, const void *pkt, uint32_t plen)
- {
- mnl_attr_put(nlh, NFQA_PAYLOAD, plen, pkt);
- }
--EXPORT_SYMBOL(nfq_nlmsg_verdict_put_pkt);
-
- /**
- * @}
-@@ -85,7 +82,7 @@ EXPORT_SYMBOL(nfq_nlmsg_verdict_put_pkt);
- * given protocol family. Both commands are ignored by Linux kernel 3.8 and
- * later versions.
- */
--void nfq_nlmsg_cfg_put_cmd(struct nlmsghdr *nlh, uint16_t pf, uint8_t cmd)
-+void __EXPORTED nfq_nlmsg_cfg_put_cmd(struct nlmsghdr *nlh, uint16_t pf, uint8_t cmd)
- {
- struct nfqnl_msg_config_cmd command = {
- .command = cmd,
-@@ -93,9 +90,8 @@ void nfq_nlmsg_cfg_put_cmd(struct nlmsghdr *nlh, uint16_t pf, uint8_t cmd)
- };
- mnl_attr_put(nlh, NFQA_CFG_CMD, sizeof(command), &command);
- }
--EXPORT_SYMBOL(nfq_nlmsg_cfg_put_cmd);
-
--void nfq_nlmsg_cfg_put_params(struct nlmsghdr *nlh, uint8_t mode, int range)
-+void __EXPORTED nfq_nlmsg_cfg_put_params(struct nlmsghdr *nlh, uint8_t mode, int range)
- {
- struct nfqnl_msg_config_params params = {
- .copy_range = htonl(range),
-@@ -103,13 +99,11 @@ void nfq_nlmsg_cfg_put_params(struct nlmsghdr *nlh, uint8_t mode, int range)
- };
- mnl_attr_put(nlh, NFQA_CFG_PARAMS, sizeof(params), ¶ms);
- }
--EXPORT_SYMBOL(nfq_nlmsg_cfg_put_params);
-
--void nfq_nlmsg_cfg_put_qmaxlen(struct nlmsghdr *nlh, uint32_t queue_maxlen)
-+void __EXPORTED nfq_nlmsg_cfg_put_qmaxlen(struct nlmsghdr *nlh, uint32_t queue_maxlen)
- {
- mnl_attr_put_u32(nlh, NFQA_CFG_QUEUE_MAXLEN, htonl(queue_maxlen));
- }
--EXPORT_SYMBOL(nfq_nlmsg_cfg_put_qmaxlen);
-
- /**
- * @}
-@@ -179,12 +173,11 @@ static int nfq_pkt_parse_attr_cb(const struct nlattr *attr, void *data)
- * This function returns MNL_CB_ERROR if any error occurs, or MNL_CB_OK on
- * success.
- */
--int nfq_nlmsg_parse(const struct nlmsghdr *nlh, struct nlattr **attr)
-+int __EXPORTED nfq_nlmsg_parse(const struct nlmsghdr *nlh, struct nlattr **attr)
- {
- return mnl_attr_parse(nlh, sizeof(struct nfgenmsg),
- nfq_pkt_parse_attr_cb, attr);
- }
--EXPORT_SYMBOL(nfq_nlmsg_parse);
-
- /**
- * @}
diff --git a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.3.bb b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb
similarity index 77%
rename from meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.3.bb
rename to meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb
index 1bbab6f3c..f806b0747 100644
--- a/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.3.bb
+++ b/meta-networking/recipes-filter/libnetfilter/libnetfilter-queue_1.0.5.bb
@@ -6,10 +6,9 @@ LICENSE = "GPLv2+"
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
DEPENDS = "libnfnetlink libmnl"
-SRCREV = "601abd1c71ccdf90753cf294c120ad43fb25dc54"
+SRCREV = "2ff321690b8dafeca99ee8e9cafac71e36f292b9"
SRC_URI = "git://git.netfilter.org/libnetfilter_queue;branch=master \
- file://0001-libnetfilter-queue-Declare-the-define-visivility-attribute-together.patch \
"
S = "${WORKDIR}/git"
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-networking][PATCH 4/6] bridge-utils: upgrade 1.7 -> 1.7.1
2022-01-14 1:39 [meta-networking][PATCH 1/6] nftables: upgrade 1.0.0 -> 1.0.1 Yi Zhao
2022-01-14 1:39 ` [meta-networking][PATCH 2/6] ipset: upgrade 7.11 -> 7.15 Yi Zhao
2022-01-14 1:39 ` [meta-networking][PATCH 3/6] libnetfilter-queue: upgrade 1.0.3 -> 1.0.5 Yi Zhao
@ 2022-01-14 1:39 ` Yi Zhao
2022-01-14 1:39 ` [meta-networking][PATCH 5/6] tnftp: upgrade 20151004 -> 20210827 Yi Zhao
2022-01-14 1:39 ` [meta-networking][PATCH 6/6] iscsi-initiator-utils: upgrade 2.1.4. -> 2.1.5 Yi Zhao
4 siblings, 0 replies; 7+ messages in thread
From: Yi Zhao @ 2022-01-14 1:39 UTC (permalink / raw)
To: openembedded-devel
* Update SRC_URI to official git repo per [1]
* Refresh patches
* Backport a patch to fix build error with musl
[1] https://wiki.linuxfoundation.org/networking/bridge
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
| 6 +-
...on-t-ignore-CFLAGS-from-environment.patch} | 4 +-
...Modifying-the-AR-to-cross-toolchain.patch} | 10 +-
.../bridge-utils/0004-cleanup-includes.patch | 149 ++++++++++++++++++
...dge-utils_1.7.bb => bridge-utils_1.7.1.bb} | 11 +-
5 files changed, 165 insertions(+), 15 deletions(-)
rename meta-networking/recipes-support/bridge-utils/bridge-utils/{kernel-headers.patch => 0001-include-missing-kernel-header.patch} (88%)
rename meta-networking/recipes-support/bridge-utils/bridge-utils/{0005-build-don-t-ignore-CFLAGS-from-environment.patch => 0002-build-don-t-ignore-CFLAGS-from-environment.patch} (94%)
rename meta-networking/recipes-support/bridge-utils/bridge-utils/{0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch => 0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch} (85%)
create mode 100644 meta-networking/recipes-support/bridge-utils/bridge-utils/0004-cleanup-includes.patch
rename meta-networking/recipes-support/bridge-utils/{bridge-utils_1.7.bb => bridge-utils_1.7.1.bb} (67%)
diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch b/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-include-missing-kernel-header.patch
similarity index 88%
rename from meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch
rename to meta-networking/recipes-support/bridge-utils/bridge-utils/0001-include-missing-kernel-header.patch
index 8a23a3070..dbd6b18c4 100644
--- a/meta-networking/recipes-support/bridge-utils/bridge-utils/kernel-headers.patch
+++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0001-include-missing-kernel-header.patch
@@ -1,4 +1,4 @@
-From 824f838cc9c7b8a44174358446993d61be7bbb3f Mon Sep 17 00:00:00 2001
+From 203801ae47399569868aa468988e711ba3ddfa92 Mon Sep 17 00:00:00 2001
From: Joe MacDonald <joe_macdonald@mentor.com>
Date: Mon, 30 Oct 2017 13:18:20 -0400
Subject: [PATCH] include missing kernel header
@@ -17,7 +17,7 @@ Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
1 file changed, 1 insertion(+)
diff --git a/libbridge/libbridge.h b/libbridge/libbridge.h
-index c038b92..fd09306 100644
+index 962f316..422ec33 100644
--- a/libbridge/libbridge.h
+++ b/libbridge/libbridge.h
@@ -24,6 +24,7 @@
@@ -29,5 +29,5 @@ index c038b92..fd09306 100644
#include <linux/if_bridge.h>
--
-2.7.4
+2.17.1
diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch b/meta-networking/recipes-support/bridge-utils/bridge-utils/0002-build-don-t-ignore-CFLAGS-from-environment.patch
similarity index 94%
rename from meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch
rename to meta-networking/recipes-support/bridge-utils/bridge-utils/0002-build-don-t-ignore-CFLAGS-from-environment.patch
index 0a72c6b2c..5ec563b6b 100644
--- a/meta-networking/recipes-support/bridge-utils/bridge-utils/0005-build-don-t-ignore-CFLAGS-from-environment.patch
+++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0002-build-don-t-ignore-CFLAGS-from-environment.patch
@@ -1,4 +1,4 @@
-From 9d63838d12c772dfe33371e2bb8b8191625539f2 Mon Sep 17 00:00:00 2001
+From 0c1a66fc62cc321d307c94f962031283142eea69 Mon Sep 17 00:00:00 2001
From: Joe MacDonald <joe_macdonald@mentor.com>
Date: Mon, 30 Oct 2017 13:37:48 -0400
Subject: [PATCH] build: don't ignore CFLAGS from environment
@@ -36,5 +36,5 @@ index e1956d6..eff260c 100644
%.o: %.c brctl.h
$(CC) $(CFLAGS) $(INCLUDE) -c $<
--
-2.7.4
+2.17.1
diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch b/meta-networking/recipes-support/bridge-utils/bridge-utils/0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch
similarity index 85%
rename from meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch
rename to meta-networking/recipes-support/bridge-utils/bridge-utils/0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch
index 3f65761f5..586ebfec6 100644
--- a/meta-networking/recipes-support/bridge-utils/bridge-utils/0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch
+++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch
@@ -1,4 +1,4 @@
-From c924f66743c054d7ebafef90ca1bbebc96732357 Mon Sep 17 00:00:00 2001
+From 99264c688ff98d8f0f237cba6c7098eb4d5a12a7 Mon Sep 17 00:00:00 2001
From: Joe MacDonald <joe_macdonald@mentor.com>
Date: Mon, 30 Oct 2017 13:48:33 -0400
Subject: [PATCH] libbridge: Modifying the AR to cross toolchain
@@ -14,12 +14,12 @@ Upstream-Status: Pending
Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
---
- configure.ac | 1 +
+ configure.ac | 4 ++++
libbridge/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
+ 2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
-index 8b2e2ea..8426b7c 100644
+index 66817bb..bcc6946 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,10 @@ dnl Checks for programs.
@@ -47,5 +47,5 @@ index 7932bfe..bd55e9b 100644
CC=@CC@
--
-2.7.4
+2.17.1
diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-cleanup-includes.patch b/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-cleanup-includes.patch
new file mode 100644
index 000000000..eb5c53d9e
--- /dev/null
+++ b/meta-networking/recipes-support/bridge-utils/bridge-utils/0004-cleanup-includes.patch
@@ -0,0 +1,149 @@
+From 1763c5b7f8f72d651d62337029c3bdfb269491e4 Mon Sep 17 00:00:00 2001
+From: Stephen Hemminger <sthemmin@microsoft.com>
+Date: Fri, 7 Jan 2022 08:44:19 -0800
+Subject: [PATCH] cleanup includes
+
+Use IWYU to only include necessary headers.
+Should resolve build issues for distros that need limits.h
+to find PATH_MAX.
+
+Upstream-Status: Backport
+[https://git.kernel.org/pub/scm/network/bridge/bridge-utils.git/commit/?h=main&id=1763c5b7f8f72d651d62337029c3bdfb269491e4]
+
+Signed-off-by: Stephen Hemminger <sthemmin@microsoft.com>
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ brctl/brctl.c | 1 -
+ brctl/brctl_cmd.c | 3 ++-
+ brctl/brctl_disp.c | 1 -
+ libbridge/libbridge_devif.c | 5 ++++-
+ libbridge/libbridge_if.c | 5 +----
+ libbridge/libbridge_init.c | 4 +++-
+ libbridge/libbridge_misc.c | 5 +----
+ 7 files changed, 11 insertions(+), 13 deletions(-)
+
+diff --git a/brctl/brctl.c b/brctl/brctl.c
+index 8855234..d2fa005 100644
+--- a/brctl/brctl.c
++++ b/brctl/brctl.c
+@@ -17,7 +17,6 @@
+ */
+
+ #include <stdio.h>
+-#include <stdlib.h>
+ #include <string.h>
+ #include <errno.h>
+ #include <getopt.h>
+diff --git a/brctl/brctl_cmd.c b/brctl/brctl_cmd.c
+index 81f7dfa..4167503 100644
+--- a/brctl/brctl_cmd.c
++++ b/brctl/brctl_cmd.c
+@@ -18,10 +18,11 @@
+
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <stdint.h>
+ #include <string.h>
+ #include <sys/time.h>
+ #include <errno.h>
+-#include <asm/param.h>
++
+ #include "libbridge.h"
+ #include "brctl.h"
+
+diff --git a/brctl/brctl_disp.c b/brctl/brctl_disp.c
+index 3e81241..f6bf2af 100644
+--- a/brctl/brctl_disp.c
++++ b/brctl/brctl_disp.c
+@@ -17,7 +17,6 @@
+ */
+
+ #include <stdio.h>
+-#include <stdlib.h>
+ #include <string.h>
+ #include <sys/time.h>
+
+diff --git a/libbridge/libbridge_devif.c b/libbridge/libbridge_devif.c
+index 8b7d954..3aac0f9 100644
+--- a/libbridge/libbridge_devif.c
++++ b/libbridge/libbridge_devif.c
+@@ -18,12 +18,15 @@
+
+
+ #include <stdio.h>
+-#include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <dirent.h>
+ #include <fcntl.h>
++#include <limits.h>
++
++#include <sys/ioctl.h>
++#include <linux/sockios.h>
+
+ #include "libbridge.h"
+ #include "libbridge_private.h"
+diff --git a/libbridge/libbridge_if.c b/libbridge/libbridge_if.c
+index 5f3aed1..96dda30 100644
+--- a/libbridge/libbridge_if.c
++++ b/libbridge/libbridge_if.c
+@@ -16,12 +16,9 @@
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+-#include <stdio.h>
+-#include <stdlib.h>
+ #include <errno.h>
+-#include <string.h>
+-#include <fcntl.h>
+ #include <sys/ioctl.h>
++#include <linux/sockios.h>
+
+ #include "libbridge.h"
+ #include "libbridge_private.h"
+diff --git a/libbridge/libbridge_init.c b/libbridge/libbridge_init.c
+index c914971..d572895 100644
+--- a/libbridge/libbridge_init.c
++++ b/libbridge/libbridge_init.c
+@@ -16,14 +16,16 @@
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
++#include <limits.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+ #include <string.h>
+ #include <dirent.h>
+-#include <sys/types.h>
+ #include <sys/stat.h>
++#include <sys/ioctl.h>
++#include <linux/sockios.h>
+
+ #include "libbridge.h"
+ #include "libbridge_private.h"
+diff --git a/libbridge/libbridge_misc.c b/libbridge/libbridge_misc.c
+index 9379e93..5b146fd 100644
+--- a/libbridge/libbridge_misc.c
++++ b/libbridge/libbridge_misc.c
+@@ -16,14 +16,11 @@
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+-#include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <sys/time.h>
+ #include <asm/param.h>
+-#include "libbridge.h"
+-#include "libbridge_private.h"
+
++#include "libbridge.h"
+
+ static const char *state_names[5] = {
+ [BR_STATE_DISABLED] = "disabled",
+--
+2.17.1
+
diff --git a/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb b/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb
similarity index 67%
rename from meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb
rename to meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb
index b8975dec0..85a7e59d5 100644
--- a/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.bb
+++ b/meta-networking/recipes-support/bridge-utils/bridge-utils_1.7.1.bb
@@ -5,13 +5,14 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=f9d20a453221a1b7e32ae84694da2c37"
-SRCREV = "ab8a2cc330253321be7bc69dea88bfaa3d48415e"
+SRCREV = "75d949b9fae9718201422f0bd3d1103e67dd597c"
SRC_URI = "\
- git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git;branch=main \
- file://kernel-headers.patch \
- file://0005-build-don-t-ignore-CFLAGS-from-environment.patch \
- file://0006-libbridge-Modifying-the-AR-to-cross-toolchain.patch \
+ git://git.kernel.org/pub/scm/network/bridge/bridge-utils.git;branch=main \
+ file://0001-include-missing-kernel-header.patch \
+ file://0002-build-don-t-ignore-CFLAGS-from-environment.patch \
+ file://0003-libbridge-Modifying-the-AR-to-cross-toolchain.patch \
+ file://0004-cleanup-includes.patch \
"
S = "${WORKDIR}/git"
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-networking][PATCH 5/6] tnftp: upgrade 20151004 -> 20210827
2022-01-14 1:39 [meta-networking][PATCH 1/6] nftables: upgrade 1.0.0 -> 1.0.1 Yi Zhao
` (2 preceding siblings ...)
2022-01-14 1:39 ` [meta-networking][PATCH 4/6] bridge-utils: upgrade 1.7 -> 1.7.1 Yi Zhao
@ 2022-01-14 1:39 ` Yi Zhao
2022-01-14 16:49 ` [oe] " Khem Raj
2022-01-14 1:39 ` [meta-networking][PATCH 6/6] iscsi-initiator-utils: upgrade 2.1.4. -> 2.1.5 Yi Zhao
4 siblings, 1 reply; 7+ messages in thread
From: Yi Zhao @ 2022-01-14 1:39 UTC (permalink / raw)
To: openembedded-devel
* License-Update: Update copyright years
* Drop tnftp-autotools.patch as the issue had been fixed upstream
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
.../tnftp/tnftp/tnftp-autotools.patch | 42 -------------------
.../{tnftp_20151004.bb => tnftp_20210827.bb} | 7 ++--
2 files changed, 3 insertions(+), 46 deletions(-)
delete mode 100644 meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch
rename meta-networking/recipes-support/tnftp/{tnftp_20151004.bb => tnftp_20210827.bb} (83%)
diff --git a/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch b/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch
deleted file mode 100644
index 1bda576bc..000000000
--- a/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-[PATCH] Update configure.ac and Makefile.am to resolve warnings/errors
-
-Upstream-Status: Pending
-
-Signed-off-by: Roy Li <rongqing.li@windriver.com>
----
- configure.ac | 2 ++
- libnetbsd/Makefile.am | 2 +-
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index a96d2ab..b3b3069 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -71,9 +71,11 @@ AH_TEMPLATE([WITH_SSL],
- #
- # Checks for programs.
- #
-+AM_PROG_AR()
- AC_PROG_CC()
- AC_PROG_AWK()
- AC_PROG_LIBTOOL()
-+AM_PROG_CC_C_O()
-
- #
- # Checks for tool features.
-diff --git a/libnetbsd/Makefile.am b/libnetbsd/Makefile.am
-index 3e5c3ce..39bb12d 100644
---- a/libnetbsd/Makefile.am
-+++ b/libnetbsd/Makefile.am
-@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libnetbsd.la
- libnetbsd_la_SOURCES =
-
-
--CPPFLAGS = \
-+AM_CPPFLAGS = \
- -I$(srcdir) \
- -I$(top_srcdir) \
- -I$(top_builddir)
---
-1.7.10.4
-
diff --git a/meta-networking/recipes-support/tnftp/tnftp_20151004.bb b/meta-networking/recipes-support/tnftp/tnftp_20210827.bb
similarity index 83%
rename from meta-networking/recipes-support/tnftp/tnftp_20151004.bb
rename to meta-networking/recipes-support/tnftp/tnftp_20210827.bb
index 8e03f1bdb..111a63d29 100644
--- a/meta-networking/recipes-support/tnftp/tnftp_20151004.bb
+++ b/meta-networking/recipes-support/tnftp/tnftp_20210827.bb
@@ -15,7 +15,6 @@ LICENSE = "BSD-4-Clause"
DEPENDS = "ncurses"
SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/${BPN}-${PV}.tar.gz \
- file://tnftp-autotools.patch \
"
inherit autotools update-alternatives pkgconfig
@@ -28,9 +27,9 @@ ALTERNATIVE_TARGET_${PN} = "${bindir}/tnftp"
FILES:${PN} = "${bindir}/tnftp"
-LIC_FILES_CHKSUM = "file://COPYING;md5=6d6796cb166a9bb050958241dad9479e"
-SRC_URI[md5sum] = "a49fbe752318d5a7893f900046ea00d5"
-SRC_URI[sha256sum] = "c94a8a49d3f4aec1965feea831d4d5bf6f90c65fd8381ee0863d11a5029a43a0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=b4248c6fb8ecff27f256ba97b25f1a21"
+SRC_URI[md5sum] = "fdb6dd1b53dca79148c395b77c6dba5a"
+SRC_URI[sha256sum] = "101901e90b656c223ec8106370dd0d783fb63d26aa6f0b2a75f40e86a9f06ea2"
PACKAGECONFIG ?= "openssl \
${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [meta-networking][PATCH 6/6] iscsi-initiator-utils: upgrade 2.1.4. -> 2.1.5
2022-01-14 1:39 [meta-networking][PATCH 1/6] nftables: upgrade 1.0.0 -> 1.0.1 Yi Zhao
` (3 preceding siblings ...)
2022-01-14 1:39 ` [meta-networking][PATCH 5/6] tnftp: upgrade 20151004 -> 20210827 Yi Zhao
@ 2022-01-14 1:39 ` Yi Zhao
4 siblings, 0 replies; 7+ messages in thread
From: Yi Zhao @ 2022-01-14 1:39 UTC (permalink / raw)
To: openembedded-devel
Backport a patch to fix the build error.
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
...or-introduced-with-recent-IPv6-commi.patch | 43 +++++++++++++++++++
....1.4.bb => iscsi-initiator-utils_2.1.5.bb} | 3 +-
2 files changed, 45 insertions(+), 1 deletion(-)
create mode 100644 meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch
rename meta-networking/recipes-daemons/iscsi-initiator-utils/{iscsi-initiator-utils_2.1.4.bb => iscsi-initiator-utils_2.1.5.bb} (96%)
diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch
new file mode 100644
index 000000000..ba0ca4ca0
--- /dev/null
+++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/files/0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch
@@ -0,0 +1,43 @@
+From 424d5967e94f6adf4c0669d390779af8da0bef20 Mon Sep 17 00:00:00 2001
+From: Lee Duncan <lduncan@suse.com>
+Date: Sat, 18 Sep 2021 16:10:50 -0700
+Subject: [PATCH] Fix compiler error introduced with recent IPv6 commit.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Commit 76350316de38 ("Handle IPv6 interfaces correctly.") added
+a string copy that creates this gcc-11 error message:
+
+> gcc-11 -O2 -g -Wall -Werror -Wextra -fvisibility=hidden -fPIC -I/usr/include/kmod -c -o idbm.o idbm.c
+> idbm.c: In function ‘_idbm_node_rec_link’:
+> idbm.c:999:17: error: ‘strncpy’ specified bound 65 equals destination size [-Werror=stringop-truncation]
+> 999 | strncpy((*node).iface.name, iface_name, ISCSI_MAX_IFACE_LEN);
+> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+So copy one less character, maximum.
+
+Upstream-Status: Backport
+[https://github.com/open-iscsi/open-iscsi/commit/424d5967e94f6adf4c0669d390779af8da0bef20]
+
+Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
+---
+ libopeniscsiusr/idbm.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libopeniscsiusr/idbm.c b/libopeniscsiusr/idbm.c
+index b2524ed..6f57e45 100644
+--- a/libopeniscsiusr/idbm.c
++++ b/libopeniscsiusr/idbm.c
+@@ -996,7 +996,7 @@ static void _idbm_node_rec_link(struct iscsi_node *node, struct idbm_rec *recs,
+
+ /* use the interface name passed in, if any */
+ if (iface_name)
+- strncpy((*node).iface.name, iface_name, ISCSI_MAX_IFACE_LEN);
++ strncpy((*node).iface.name, iface_name, ISCSI_MAX_IFACE_LEN-1);
+
+ /*
+ * Note: because we do not add the iface.iscsi_ifacename to
+--
+2.25.1
+
diff --git a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.4.bb b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.5.bb
similarity index 96%
rename from meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.4.bb
rename to meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.5.bb
index 034e6ee9d..26b5b5c34 100644
--- a/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.4.bb
+++ b/meta-networking/recipes-daemons/iscsi-initiator-utils/iscsi-initiator-utils_2.1.5.bb
@@ -12,10 +12,11 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
-SRCREV ?= "095f59ca464220eae285de6b5f2ee31185a6a84c"
+SRCREV ?= "20d0aa96f2170339b1967f4be81e9c5042bbce03"
SRC_URI = "git://github.com/open-iscsi/open-iscsi;branch=master;protocol=https \
file://0001-Makefile-Do-not-set-Werror.patch \
+ file://0001-Fix-compiler-error-introduced-with-recent-IPv6-commi.patch \
file://initd.debian \
file://99_iscsi-initiator-utils \
file://iscsi-initiator \
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [oe] [meta-networking][PATCH 5/6] tnftp: upgrade 20151004 -> 20210827
2022-01-14 1:39 ` [meta-networking][PATCH 5/6] tnftp: upgrade 20151004 -> 20210827 Yi Zhao
@ 2022-01-14 16:49 ` Khem Raj
0 siblings, 0 replies; 7+ messages in thread
From: Khem Raj @ 2022-01-14 16:49 UTC (permalink / raw)
To: Yi Zhao; +Cc: openembeded-devel
it fails to build on musl see
https://errors.yoctoproject.org/Errors/Details/622607/
On Thu, Jan 13, 2022 at 5:40 PM Yi Zhao <yi.zhao@windriver.com> wrote:
>
> * License-Update: Update copyright years
> * Drop tnftp-autotools.patch as the issue had been fixed upstream
>
> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> ---
> .../tnftp/tnftp/tnftp-autotools.patch | 42 -------------------
> .../{tnftp_20151004.bb => tnftp_20210827.bb} | 7 ++--
> 2 files changed, 3 insertions(+), 46 deletions(-)
> delete mode 100644 meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch
> rename meta-networking/recipes-support/tnftp/{tnftp_20151004.bb => tnftp_20210827.bb} (83%)
>
> diff --git a/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch b/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch
> deleted file mode 100644
> index 1bda576bc..000000000
> --- a/meta-networking/recipes-support/tnftp/tnftp/tnftp-autotools.patch
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -[PATCH] Update configure.ac and Makefile.am to resolve warnings/errors
> -
> -Upstream-Status: Pending
> -
> -Signed-off-by: Roy Li <rongqing.li@windriver.com>
> ----
> - configure.ac | 2 ++
> - libnetbsd/Makefile.am | 2 +-
> - 2 files changed, 3 insertions(+), 1 deletion(-)
> -
> -diff --git a/configure.ac b/configure.ac
> -index a96d2ab..b3b3069 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -71,9 +71,11 @@ AH_TEMPLATE([WITH_SSL],
> - #
> - # Checks for programs.
> - #
> -+AM_PROG_AR()
> - AC_PROG_CC()
> - AC_PROG_AWK()
> - AC_PROG_LIBTOOL()
> -+AM_PROG_CC_C_O()
> -
> - #
> - # Checks for tool features.
> -diff --git a/libnetbsd/Makefile.am b/libnetbsd/Makefile.am
> -index 3e5c3ce..39bb12d 100644
> ---- a/libnetbsd/Makefile.am
> -+++ b/libnetbsd/Makefile.am
> -@@ -5,7 +5,7 @@ noinst_LTLIBRARIES = libnetbsd.la
> - libnetbsd_la_SOURCES =
> -
> -
> --CPPFLAGS = \
> -+AM_CPPFLAGS = \
> - -I$(srcdir) \
> - -I$(top_srcdir) \
> - -I$(top_builddir)
> ---
> -1.7.10.4
> -
> diff --git a/meta-networking/recipes-support/tnftp/tnftp_20151004.bb b/meta-networking/recipes-support/tnftp/tnftp_20210827.bb
> similarity index 83%
> rename from meta-networking/recipes-support/tnftp/tnftp_20151004.bb
> rename to meta-networking/recipes-support/tnftp/tnftp_20210827.bb
> index 8e03f1bdb..111a63d29 100644
> --- a/meta-networking/recipes-support/tnftp/tnftp_20151004.bb
> +++ b/meta-networking/recipes-support/tnftp/tnftp_20210827.bb
> @@ -15,7 +15,6 @@ LICENSE = "BSD-4-Clause"
> DEPENDS = "ncurses"
>
> SRC_URI = "ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/${BPN}-${PV}.tar.gz \
> - file://tnftp-autotools.patch \
> "
>
> inherit autotools update-alternatives pkgconfig
> @@ -28,9 +27,9 @@ ALTERNATIVE_TARGET_${PN} = "${bindir}/tnftp"
>
> FILES:${PN} = "${bindir}/tnftp"
>
> -LIC_FILES_CHKSUM = "file://COPYING;md5=6d6796cb166a9bb050958241dad9479e"
> -SRC_URI[md5sum] = "a49fbe752318d5a7893f900046ea00d5"
> -SRC_URI[sha256sum] = "c94a8a49d3f4aec1965feea831d4d5bf6f90c65fd8381ee0863d11a5029a43a0"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=b4248c6fb8ecff27f256ba97b25f1a21"
> +SRC_URI[md5sum] = "fdb6dd1b53dca79148c395b77c6dba5a"
> +SRC_URI[sha256sum] = "101901e90b656c223ec8106370dd0d783fb63d26aa6f0b2a75f40e86a9f06ea2"
>
> PACKAGECONFIG ?= "openssl \
> ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)} \
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#94818): https://lists.openembedded.org/g/openembedded-devel/message/94818
> Mute This Topic: https://lists.openembedded.org/mt/88412164/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-01-14 16:50 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-14 1:39 [meta-networking][PATCH 1/6] nftables: upgrade 1.0.0 -> 1.0.1 Yi Zhao
2022-01-14 1:39 ` [meta-networking][PATCH 2/6] ipset: upgrade 7.11 -> 7.15 Yi Zhao
2022-01-14 1:39 ` [meta-networking][PATCH 3/6] libnetfilter-queue: upgrade 1.0.3 -> 1.0.5 Yi Zhao
2022-01-14 1:39 ` [meta-networking][PATCH 4/6] bridge-utils: upgrade 1.7 -> 1.7.1 Yi Zhao
2022-01-14 1:39 ` [meta-networking][PATCH 5/6] tnftp: upgrade 20151004 -> 20210827 Yi Zhao
2022-01-14 16:49 ` [oe] " Khem Raj
2022-01-14 1:39 ` [meta-networking][PATCH 6/6] iscsi-initiator-utils: upgrade 2.1.4. -> 2.1.5 Yi Zhao
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.