libnet: update to 1.2

This commit is contained in:
Nathan Owens 2019-10-30 21:13:41 -05:00 committed by Helmut Pozimski
parent 72f66a8e4e
commit c60419f830
4 changed files with 37 additions and 47 deletions

View file

@ -1388,7 +1388,7 @@ libFOX-1.6.so.0 fox-1.6.49_1
libCHART-1.6.so.0 fox-1.6.49_1
libchromaprint.so.1 chromaprint-1.3.2_1
libedit.so.0 libedit-20130712.3.1_1
libnet.so.1 libnet-1.1.6_1
libnet.so.9 libnet-1.2_1
libgpaste.so.11 libgpaste-3.28.2_1
libthreadutil.so.6 libupnp-1.6.18_1
libixml.so.2 libupnp-1.6.18_1
@ -2059,7 +2059,7 @@ libcvm-udp.so.1 cvm-0.97_1
libcvm-v1client.so.1 cvm-0.97_1
libcvm-v2client.so.1 cvm-0.97_1
libudns.so.0 udns-0.4_1
libcriu.so.1 criu-1.5.1_2
libcriu.so.2 criu-3.13_1
libwebsockets.so.15 libwebsockets-3.2.0_1
libnfc.so.0 libnfc-1.7.1_1
libfuzzy.so.2 libfuzzy-2.12_1

View file

@ -0,0 +1,29 @@
From a87fdb41a476b59c53416f714b3e49f6dcefd6b5 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Wed, 30 Oct 2019 21:55:13 -0500
Subject: [PATCH] libnet-structure-musl-fix
---
include/libnet/libnet-structures.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/libnet/libnet-structures.h b/include/libnet/libnet-structures.h
index 6084caa..34fffc6 100644
--- include/libnet/libnet-structures.h
+++ include/libnet/libnet-structures.h
@@ -49,9 +49,9 @@ struct libnet_port_list_chain
/* libnet statistics structure */
struct libnet_stats
{
- __int64_t packets_sent; /* packets sent */
- __int64_t packet_errors; /* packets errors */
- __int64_t bytes_written; /* bytes written */
+ int64_t packets_sent; /* packets sent */
+ int64_t packet_errors; /* packets errors */
+ int64_t bytes_written; /* bytes written */
};
--
2.23.0

View file

@ -1,39 +0,0 @@
--- src/libnet_link_linux.c 2012-03-19 17:59:50.000000000 +0100
+++ src/libnet_link_linux.c 2015-08-07 15:36:24.378946840 +0200
@@ -30,13 +30,8 @@
#include <sys/time.h>
#include <net/if.h>
-#if (__GLIBC__)
#include <netinet/if_ether.h>
#include <net/if_arp.h>
-#else
-#include <linux/if_arp.h>
-#include <linux/if_ether.h>
-#endif
#if (HAVE_PACKET_SOCKET)
#ifndef SOL_PACKET
--- src/libnet_link_linux.c 2018-01-04 18:20:00.809758263 +0100
+++ src/libnet_link_linux.c 2018-01-04 18:19:35.515756459 +0100
@@ -30,8 +30,8 @@
#include <sys/time.h>
#include <net/if.h>
-#include <netinet/if_ether.h>
#include <net/if_arp.h>
+#include <netinet/if_ether.h>
#if (HAVE_PACKET_SOCKET)
#ifndef SOL_PACKET
@@ -43,8 +43,10 @@
#else
#include <asm/types.h>
#include <linux/if_packet.h>
+#if defined(__GLIBC__)
#include <linux/if_ether.h> /* The L2 protocols */
#endif
+#endif
#endif /* HAVE_PACKET_SOCKET */
#include "../include/libnet.h"

View file

@ -1,14 +1,14 @@
# Template file for 'libnet'
pkgname=libnet
version=1.1.6
revision=4
version=1.2
revision=1
build_style=gnu-configure
short_desc="A C library for portable packet creation and injection"
short_desc="C library for portable packet creation and injection"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3"
license="GPL-3.0-only"
homepage="https://github.com/sam-github/libnet"
distfiles="${SOURCEFORGE_SITE}/${pkgname}-dev/$pkgname-$version.tar.gz"
checksum=d392bb5825c4b6b672fc93a0268433c86dc964e1500c279dc6d0711ea6ec467a
distfiles="https://github.com/sam-github/libnet/releases/download/v${version}/${pkgname}-${version}.tar.gz"
checksum=caa4868157d9e5f32e9c7eac9461efeff30cb28357f7f6bf07e73933fb4edaa7
libnet-devel_package() {
depends="${sourcepkg}-${version}_${revision}"