mirror of
https://github.com/termux/termux-packages
synced 2024-06-18 04:07:07 +00:00
libnl: bump to 3.8.0
This commit is contained in:
parent
86f9664176
commit
a8270e03de
|
@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://github.com/thom311/libnl
|
|||
TERMUX_PKG_DESCRIPTION="Collection of libraries providing APIs to netlink protocol based Linux kernel interfaces"
|
||||
TERMUX_PKG_LICENSE="LGPL-2.1, GPL-2.0"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION="3.7.0"
|
||||
TERMUX_PKG_REVISION=2
|
||||
TERMUX_PKG_VERSION="3.8.0"
|
||||
TERMUX_PKG_SRCURL=https://github.com/thom311/libnl/releases/download/libnl${TERMUX_PKG_VERSION//./_}/libnl-$TERMUX_PKG_VERSION.tar.gz
|
||||
TERMUX_PKG_SHA256=9fe43ccbeeea72c653bdcf8c93332583135cda46a79507bfd0a483bb57f65939
|
||||
TERMUX_PKG_SHA256=bb726c6d7a08b121978d73ff98425bf313fa26a27a331d465e4f1d7ec5b838c6
|
||||
TERMUX_PKG_AUTO_UPDATE=true
|
||||
TERMUX_PKG_UPDATE_VERSION_REGEXP="\d+.\d+.\d+"
|
||||
TERMUX_PKG_BREAKS="libnl-dev"
|
||||
|
|
|
@ -1,10 +0,0 @@
|
|||
--- ./include/netlink-private/netlink.h 2018-05-10 17:48:07.762060270 +0530
|
||||
+++ ./include/netlink-private/netlink.h 2018-05-10 17:48:57.891691514 +0530
|
||||
@@ -29,6 +29,7 @@
|
||||
#include <limits.h>
|
||||
#include <search.h>
|
||||
|
||||
+typedef uint32_t in_addr_t;
|
||||
#include <arpa/inet.h>
|
||||
#include <netdb.h>
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
--- nf-queue.c.orig 2022-04-15 18:49:58.769003690 +0000
|
||||
+++ ./src/nf-queue.c 2022-04-15 18:51:25.966876442 +0000
|
||||
@@ -13,6 +13,7 @@
|
||||
#include <netlink/netfilter/queue.h>
|
||||
#include <netlink/netfilter/queue_msg.h>
|
||||
--- a/src/nf-queue.c
|
||||
+++ b/src/nf-queue.c
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
#include "nl-default.h"
|
||||
|
||||
+#include <sys/select.h>
|
||||
#include <linux/netfilter.h>
|
||||
#include <linux/netfilter/nfnetlink_queue.h>
|
||||
#include <linux/netlink.h>
|
||||
|
||||
static struct nl_sock *nf_sock;
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
--- ../../build/libnl3/cache/libnl-3.2.25/src/nl-monitor.c 2014-06-16 16:45:51.000000000 +0200
|
||||
+++ ./src/nl-monitor.c 2017-02-09 00:08:20.660339439 +0100
|
||||
--- a/src/nl-monitor.c
|
||||
+++ b/src/nl-monitor.c
|
||||
@@ -9,6 +9,7 @@
|
||||
* Copyright (c) 2003-2009 Thomas Graf <tgraf@suug.ch>
|
||||
*/
|
||||
|
||||
#include <linux/rtnetlink.h>
|
||||
|
||||
+#include <sys/select.h>
|
||||
#include <netlink/cli/utils.h>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- ../socket.h.orig 2021-10-05 20:33:54.147771599 +0200
|
||||
+++ ./include/linux-private/linux/socket.h 2021-10-05 20:37:22.881231039 +0200
|
||||
@@ -2,21 +2,7 @@
|
||||
--- a/include/linux-private/linux/socket.h
|
||||
+++ b/include/linux-private/linux/socket.h
|
||||
@@ -2,30 +2,8 @@
|
||||
#ifndef _LINUX_SOCKET_H
|
||||
#define _LINUX_SOCKET_H
|
||||
|
||||
|
@ -8,17 +8,26 @@
|
|||
- * Desired design of maximum size and alignment (see RFC2553)
|
||||
- */
|
||||
-#define _K_SS_MAXSIZE 128 /* Implementation specific max size */
|
||||
-#define _K_SS_ALIGNSIZE (__alignof__ (struct sockaddr *))
|
||||
- /* Implementation specific desired alignment */
|
||||
|
||||
-
|
||||
typedef unsigned short __kernel_sa_family_t;
|
||||
|
||||
-/*
|
||||
- * The definition uses anonymous union and struct in order to control the
|
||||
- * default alignment.
|
||||
- */
|
||||
-struct __kernel_sockaddr_storage {
|
||||
- __kernel_sa_family_t ss_family; /* address family */
|
||||
- /* Following field(s) are implementation specific */
|
||||
- char __data[_K_SS_MAXSIZE - sizeof(unsigned short)];
|
||||
- union {
|
||||
- struct {
|
||||
- __kernel_sa_family_t ss_family; /* address family */
|
||||
- /* Following field(s) are implementation specific */
|
||||
- char __data[_K_SS_MAXSIZE - sizeof(unsigned short)];
|
||||
- /* space to achieve desired size, */
|
||||
- /* _SS_MAXSIZE value minus size of ss_family */
|
||||
-} __attribute__ ((aligned(_K_SS_ALIGNSIZE))); /* force desired alignment */
|
||||
- };
|
||||
- void *__align; /* implementation specific desired alignment */
|
||||
- };
|
||||
-};
|
||||
-
|
||||
#endif /* _LINUX_SOCKET_H */
|
||||
#define SOCK_SNDBUF_LOCK 1
|
||||
#define SOCK_RCVBUF_LOCK 2
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user