Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] package dhcpdump: bump to version 1.9
@ 2024-02-18  1:33 Kadambini Nema
  2024-02-18 21:27 ` Yann E. MORIN
  0 siblings, 1 reply; 4+ messages in thread
From: Kadambini Nema @ 2024-02-18  1:33 UTC (permalink / raw)
  To: buildroot; +Cc: Kadambini Nema

- Change the site to a well maintained - https://github.com/bbonev/dhcpdump
- Fix some of the reported build failures - autobuild.buildroot.org/?reason=dhcpdump-1.8
- Build test results
  ./utils/test-pkg -d br_test -k -c dhcpdump.config  -p dhcpdump
                    bootlin-armv5-uclibc [1/6]: OK
                     bootlin-armv7-glibc [2/6]: OK
                   bootlin-armv7m-uclibc [3/6]: OK
                     bootlin-x86-64-musl [4/6]: OK
                      br-arm-full-static [5/6]: OK
                            sourcery-arm [6/6]: OK
6 builds, 0 skipped, 0 build failed, 0 legal-info failed, 0 show-info failed

Signed-off-by: Kadambini Nema <kadambini.nema@gmail.com>
---
 ...Fix-build-with-gcc4.8-use-br-fortify.patch | 10 ++++++++
 .../0001-use-non-bsd-structures.patch         | 23 -------------------
 package/dhcpdump/Config.in                    |  2 +-
 package/dhcpdump/dhcpdump.hash                |  2 +-
 package/dhcpdump/dhcpdump.mk                  |  5 ++--
 5 files changed, 15 insertions(+), 27 deletions(-)
 create mode 100644 package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch
 delete mode 100644 package/dhcpdump/0001-use-non-bsd-structures.patch

diff --git a/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch
new file mode 100644
index 0000000000..a5c1218c99
--- /dev/null
+++ b/package/dhcpdump/0001-Fix-build-with-gcc4.8-use-br-fortify.patch
@@ -0,0 +1,10 @@
+diff -Naur a/Makefile b/Makefile
+--- a/Makefile	2024-02-17 13:57:08.166161973 -0800
++++ b/Makefile	2024-02-17 13:57:45.055153969 -0800
+@@ -1,5 +1,5 @@
+ CFLAGS+=${CPPFLAGS}
+-CFLAGS+=-Wall -Wextra -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -g -O3 -fPIE
++CFLAGS+=-Wall -Wextra -Wformat -Werror=format-security -g -O3 -fPIE
+ LDFLAGS+=-g -Wl,-z,relro -Wl,-z,now -fPIE -pie
+ LIBS+=-lpcap
+ 
diff --git a/package/dhcpdump/0001-use-non-bsd-structures.patch b/package/dhcpdump/0001-use-non-bsd-structures.patch
deleted file mode 100644
index 40115fb640..0000000000
--- a/package/dhcpdump/0001-use-non-bsd-structures.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-The udphdr structure has uh_* fields when _FAVOR_BSD is
-defined. Otherwise, the fields are just named source, dest, len and
-check. See <netinet/udp.h>.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-
-Index: dhcpdump-1.8/dhcpdump.c
-===================================================================
---- dhcpdump-1.8.orig/dhcpdump.c	2011-05-17 20:20:46.506980003 +0200
-+++ dhcpdump-1.8/dhcpdump.c	2011-05-17 20:20:59.338979999 +0200
-@@ -163,10 +163,10 @@
- 	strcpy(ip_origin, (u_char *)inet_ntoa(ip->ip_src));
- 	strcpy(ip_destination, (u_char *)inet_ntoa(ip->ip_dst));
- 
--	if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->uh_ulen)))
-+	if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->len)))
- 		return;
- 
--	printdata((u_char *)(sp + offset), ntohs(udp->uh_ulen));
-+	printdata((u_char *)(sp + offset), ntohs(udp->len));
- }
- 
- // check for matching CHADDR (Peter Apian-Bennewitz <apian@ise.fhg.de>)
diff --git a/package/dhcpdump/Config.in b/package/dhcpdump/Config.in
index e0abe040fc..30e42928e4 100644
--- a/package/dhcpdump/Config.in
+++ b/package/dhcpdump/Config.in
@@ -4,4 +4,4 @@ config BR2_PACKAGE_DHCPDUMP
 	help
 	  A tool for monitoring dhcp requests using tcpdump.
 
-	  http://www.mavetju.org/unix/general.php
+	  https://github.com/bbonev/dhcpdump
diff --git a/package/dhcpdump/dhcpdump.hash b/package/dhcpdump/dhcpdump.hash
index a24db5b275..fdf3243ad1 100644
--- a/package/dhcpdump/dhcpdump.hash
+++ b/package/dhcpdump/dhcpdump.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  6d5eb9418162fb738bc56e4c1682ce7f7392dd96e568cc996e44c28de7f77190  dhcpdump-1.8.tar.gz
+sha256  3658ac21cc33e79e72bed070454e49c543017991cb6c37f4253c85e9176869d1  dhcpdump-1.9.tar.xz
 sha256  bab6ca76b7e93885396513689b1248dfb0e8fd662695b8bd1b26784ef71a0192  LICENSE
diff --git a/package/dhcpdump/dhcpdump.mk b/package/dhcpdump/dhcpdump.mk
index ec9571c0af..4ce5047b2e 100644
--- a/package/dhcpdump/dhcpdump.mk
+++ b/package/dhcpdump/dhcpdump.mk
@@ -4,8 +4,9 @@
 #
 ################################################################################
 
-DHCPDUMP_VERSION = 1.8
-DHCPDUMP_SITE = http://www.mavetju.org/download
+DHCPDUMP_VERSION = 1.9
+DHCPDUMP_SITE = https://github.com/bbonev/dhcpdump/releases/download/v$(DHCPDUMP_VERSION)
+DHCPDUMP_SOURCE = dhcpdump-$(DHCPDUMP_VERSION).tar.xz
 DHCPDUMP_DEPENDENCIES = libpcap
 DHCPDUMP_LICENSE = BSD-2-Clause
 DHCPDUMP_LICENSE_FILES = LICENSE
-- 
2.25.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-02-20 21:35 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-02-18  1:33 [Buildroot] [PATCH 1/1] package dhcpdump: bump to version 1.9 Kadambini Nema
2024-02-18 21:27 ` Yann E. MORIN
2024-02-19 21:54   ` Kadambini Nema
2024-02-20 21:35     ` Yann E. MORIN

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox