* [PR PATCH] libnet: update to 1.2
@ 2019-10-31 3:56 voidlinux-github
2019-10-31 7:30 ` [PR PATCH] [Merged]: " voidlinux-github
0 siblings, 1 reply; 2+ messages in thread
From: voidlinux-github @ 2019-10-31 3:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 305 bytes --]
There is a new pull request by ndowens against master on the void-packages repository
https://github.com/ndowens/void-packages libnet
https://github.com/void-linux/void-packages/pull/15986
libnet: update to 1.2
A patch file from https://github.com/void-linux/void-packages/pull/15986.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-libnet-15986.patch --]
[-- Type: text/x-diff, Size: 10844 bytes --]
From 89a8d60f3312620d2005617452ef635078836c67 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Wed, 30 Oct 2019 21:14:14 -0500
Subject: [PATCH 1/8] tcpreplay: revbump against libnet
---
srcpkgs/tcpreplay/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/tcpreplay/template b/srcpkgs/tcpreplay/template
index a23844c9abd..45146e8766f 100644
--- a/srcpkgs/tcpreplay/template
+++ b/srcpkgs/tcpreplay/template
@@ -1,7 +1,7 @@
# Template file for 'tcpreplay'
pkgname=tcpreplay
version=4.3.2
-revision=1
+revision=2
build_style=gnu-configure
hostmakedepends="libpcap-devel"
makedepends="libpcap-devel libnl-devel libdnet-devel libnet-devel"
From 4e103964b4eb5b84e1e370f531d2816362c10966 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Wed, 30 Oct 2019 21:14:40 -0500
Subject: [PATCH 2/8] nemesis: revbump against libnet
---
srcpkgs/nemesis/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/nemesis/template b/srcpkgs/nemesis/template
index 2fc4ea82564..085ca71caaa 100644
--- a/srcpkgs/nemesis/template
+++ b/srcpkgs/nemesis/template
@@ -1,7 +1,7 @@
# Template file for 'nemesis'
pkgname=nemesis
version=1.6
-revision=1
+revision=2
build_style=gnu-configure
makedepends="libnet-devel"
short_desc="Command-line network packet crafting and injection utility"
From 444476e63e834c7de9b2d09b69d3e7e83404f22e Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Wed, 30 Oct 2019 21:15:06 -0500
Subject: [PATCH 3/8] yersinia: revbump against libnet
---
srcpkgs/yersinia/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/yersinia/template b/srcpkgs/yersinia/template
index 227c4a5291d..e36b3a56e15 100644
--- a/srcpkgs/yersinia/template
+++ b/srcpkgs/yersinia/template
@@ -1,7 +1,7 @@
# Template file for 'yersinia'
pkgname=yersinia
version=0.8.2
-revision=1
+revision=2
build_style=gnu-configure
configure_args="--disable-gtk"
hostmakedepends="pkg-config automake"
From 8983fdb88bc69cb7c27716900f3719e49e1d21ea Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Wed, 30 Oct 2019 21:15:25 -0500
Subject: [PATCH 4/8] ettercap: revbump against libnet
---
srcpkgs/ettercap/template | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/ettercap/template b/srcpkgs/ettercap/template
index e2284e34a76..cbb7b64fe21 100644
--- a/srcpkgs/ettercap/template
+++ b/srcpkgs/ettercap/template
@@ -1,16 +1,16 @@
# Template file for 'ettercap'
pkgname=ettercap
version=0.8.2
-revision=12
-lib32disabled=yes
+revision=13
build_style=cmake
configure_args="-DENABLE_GTK=OFF"
hostmakedepends="flex"
makedepends="ncurses-devel libressl-devel libcurl-devel libltdl-devel libnet-devel libpcap-devel pcre-devel"
conf_files="/etc/${pkgname}/etter.conf"
-short_desc="A network sniffer/interceptor/logger for ethernet LANs"
+short_desc="Network sniffer/interceptor/logger for ethernet LANs"
maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
+license="GPL-2.0-only"
homepage="http://ettercap.github.com/ettercap/"
distfiles="https://github.com/Ettercap/ettercap/archive/v${version}.tar.gz"
checksum=f38514f35bea58bfe6ef1902bfd4761de0379942a9aa3e175fc9348f4eef2c81
+lib32disabled=yes
From 897e1470bdbf170d1acbb2cc716797387a27f791 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Wed, 30 Oct 2019 21:15:49 -0500
Subject: [PATCH 5/8] netsniff-ng: revbump against libnet
---
srcpkgs/netsniff-ng/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/netsniff-ng/template b/srcpkgs/netsniff-ng/template
index 136670e37f1..fce04329920 100644
--- a/srcpkgs/netsniff-ng/template
+++ b/srcpkgs/netsniff-ng/template
@@ -1,7 +1,7 @@
# Template file for 'netsniff-ng'
pkgname=netsniff-ng
version=0.6.6
-revision=1
+revision=2
build_style=configure
configure_args="--prefix=/usr --disable-geoip"
hostmakedepends="pkg-config flex bison"
From ccb2a119e3fee7ea531d247644bbc0e2cb2d5cae Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Wed, 30 Oct 2019 21:16:15 -0500
Subject: [PATCH 6/8] criu: revbump against libnet
While here, update to 3.13
---
srcpkgs/criu/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/criu/template b/srcpkgs/criu/template
index 298780232bf..225a3c00f70 100644
--- a/srcpkgs/criu/template
+++ b/srcpkgs/criu/template
@@ -1,10 +1,10 @@
# Template file for 'criu'
pkgname=criu
-version=3.11
+version=3.13
revision=1
build_style=gnu-makefile
make_use_env=compliant
-hostmakedepends="asciidoc pkg-config xmlto"
+hostmakedepends="asciidoc pkg-config xmlto protobuf"
makedepends="libcap-devel libnet-devel libnl3-devel protobuf-c-devel
protobuf-devel"
short_desc="Utility to checkpoint/restore a process tree"
@@ -12,7 +12,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-only"
homepage="http://criu.org/"
distfiles="https://download.openvz.org/criu/criu-${version}.tar.bz2"
-checksum=886b5851a3f46755a4074414e1d09638dfbd3fddebe00706a7b5783eacafd10e
+checksum=ea027f2acb55c62d47aec0c7776c723e5a877978e60d3574961b6f4c538fc9fa
nocross="fails to run protobuf internals"
case "$XBPS_TARGET_MACHINE" in
From 5faa1623b462e77c49474914c423fdc000496e61 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Wed, 30 Oct 2019 21:16:34 -0500
Subject: [PATCH 7/8] suricata: revbump against libnet
---
srcpkgs/suricata/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/suricata/template b/srcpkgs/suricata/template
index e25354ea81d..c6b02eb5f9c 100644
--- a/srcpkgs/suricata/template
+++ b/srcpkgs/suricata/template
@@ -1,7 +1,7 @@
# Template file for 'suricata'
pkgname=suricata
version=4.1.4
-revision=1
+revision=2
build_style=gnu-configure
build_helper="$(vopt_if rust rust)"
configure_args="--disable-gccmarch-native $(vopt_enable rust)
From 799beeb6e8cfbfe638fe02b3e428d9b8975b2c8c Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens04@gmail.com>
Date: Wed, 30 Oct 2019 21:13:41 -0500
Subject: [PATCH 8/8] libnet: update to 1.2
---
common/shlibs | 4 +--
srcpkgs/libnet/patches/musl-build-fix.patch | 29 +++++++++++++++
srcpkgs/libnet/patches/musl_includes.patch | 39 ---------------------
srcpkgs/libnet/template | 12 +++----
4 files changed, 37 insertions(+), 47 deletions(-)
create mode 100644 srcpkgs/libnet/patches/musl-build-fix.patch
delete mode 100644 srcpkgs/libnet/patches/musl_includes.patch
diff --git a/common/shlibs b/common/shlibs
index 41e609a31db..90e606e4952 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -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
diff --git a/srcpkgs/libnet/patches/musl-build-fix.patch b/srcpkgs/libnet/patches/musl-build-fix.patch
new file mode 100644
index 00000000000..3bdff22be2b
--- /dev/null
+++ b/srcpkgs/libnet/patches/musl-build-fix.patch
@@ -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
+
diff --git a/srcpkgs/libnet/patches/musl_includes.patch b/srcpkgs/libnet/patches/musl_includes.patch
deleted file mode 100644
index 54f9562a155..00000000000
--- a/srcpkgs/libnet/patches/musl_includes.patch
+++ /dev/null
@@ -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"
diff --git a/srcpkgs/libnet/template b/srcpkgs/libnet/template
index 7550eac12c2..d38ed97b349 100644
--- a/srcpkgs/libnet/template
+++ b/srcpkgs/libnet/template
@@ -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}"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: libnet: update to 1.2
2019-10-31 3:56 [PR PATCH] libnet: update to 1.2 voidlinux-github
@ 2019-10-31 7:30 ` voidlinux-github
0 siblings, 0 replies; 2+ messages in thread
From: voidlinux-github @ 2019-10-31 7:30 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 155 bytes --]
There's a merged pull request on the void-packages repository
libnet: update to 1.2
https://github.com/void-linux/void-packages/pull/15986
Description:
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-10-31 7:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-31 3:56 [PR PATCH] libnet: update to 1.2 voidlinux-github
2019-10-31 7:30 ` [PR PATCH] [Merged]: " voidlinux-github
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).