Skip to contentSkip to conversation

package/httping: update to 4.1.0

PATCH In review Waldemar Brodkorb 2 participants 2 messages Aug 22, 2024 – Sep 15, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/httping: update to 4.1.0

Changes made to the Buildroot package:
- use github url for download
- switch to cmake infrastructure
- add new option for TUI support
- add new option for SSL support
- TFO is always enabled now
- remove no longer required patches 0001/0002
- update license file to LICENSE
- update license to GPLv3
- always build without gettext support

---
 .../0001-fix-math-library-linking.patch       | 27 -----------
 ...Makefile-allow-build-without-gettext.patch | 48 -------------------
 package/httping/Config.in                     | 13 ++++-
 package/httping/httping.hash                  |  4 +-
 package/httping/httping.mk                    | 41 +++++-----------
 5 files changed, 26 insertions(+), 107 deletions(-)
 delete mode 100644 package/httping/0001-fix-math-library-linking.patch
 delete mode 100644 package/httping/0002-Makefile-allow-build-without-gettext.patch
package/httping/0001-fix-math-library-linking.patch deleted +0 -27
deleted file mode 100644
index 582fb9e917..0000000000
@@ -1,27 +0,0 @@
-Move LDFLAGS+=-lm option to the end.
-The order of the math library directive '-lm' matters.
-
-Signed-off-by: Yuvaraj Patil <[email protected]>
-[Fabrice: make the patch to be applied with fuzz factor 0]
-Signed-off-by: Fabrice Fontaine <[email protected]>
----
-diff -Nurp httping-2.3.4_orig/Makefile httping-2.3.4/Makefile
---- httping-2.3.4_orig/Makefile	2014-07-23 16:16:36.495546288 +0530
-+++ httping-2.3.4/Makefile	2014-07-23 16:18:42.547541002 +0530
-@@ -36,7 +36,6 @@ DEBUG=yes
- WFLAGS=-Wall -W -Wextra -pedantic -D_FORTIFY_SOURCE=2
- OFLAGS=
- CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" -DLOCALEDIR=\"$(LOCALEDIR)\"
--LDFLAGS+=-lm
- 
- PACKAGE=$(TARGET)-$(VERSION)
- PREFIX?=/usr
-@@ -97,6 +96,8 @@ ifeq ($(ARM),yes)
- CC=arm-linux-gcc
- endif
- 
-+LDFLAGS+=-lm
-+
- all: $(TARGET) $(TRANSLATIONS)
- 
- $(TARGET): $(OBJS)
package/httping/0002-Makefile-allow-build-without-gettext.patch deleted +0 -48

48 lines not on this page · raw message

package/httping/Config.in +11 -2
index c0e5071ce8..f5057e05d0 100644
@@ -16,7 +16,16 @@ config BR2_PACKAGE_HTTPING
 
 if BR2_PACKAGE_HTTPING
 
-config BR2_PACKAGE_HTTPING_TFO
-	bool "TCP Fast Open (TFO) support"
+config BR2_PACKAGE_HTTPING_SSL
+	bool "enable SSL support"
+	select BR2_PACKAGE_LIBOPENSSL
+	select BR2_PACKAGE_LIBOPENSSL_ENGINES
+	select BR2_PACKAGE_CA_CERTIFICATES # runtime
+
+config BR2_PACKAGE_HTTPING_TUI
+	bool "enable TUI support"
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_NCURSES_WCHAR
+	select BR2_PACKAGE_FFTW_DOUBLE
 
 endif
package/httping/httping.hash +2 -2
index 3178c32377..7c153ad2db 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  3e895a0a6d7bd79de25a255a1376d4da88eb09c34efdd0476ab5a907e75bfaf8  httping-2.5.tgz
-sha256  c5db2e5b9a692fcdf2bd370f1533529063fbcf8947a8f5ee9d4b050a14e0566d  license.txt
+sha256  41b29bedd19ad2aa0f744149c70ad925c9f28400717dcefbdaf77d321176cbfb  v4.1.0.tar.gz
+sha256  3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986  LICENSE
package/httping/httping.mk +13 -28

47 lines not on this page · raw message

Signature · 6 lines
2.30.2

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#1 lore raw

Hello,

Quoted 6 lines · On Thu, 22 Aug 2024 06:10:04 +0200 Waldemar Brodkorb <[email protected]> wrote:

Changes made to the Buildroot package:
- use github url for download
- switch to cmake infrastructure
- add new option for TUI support
- add new option for SSL support
- TFO is always enabled now

Specify: "and therefore we don't need to add Config.in.legacy handling for this option".

Quoted 6 lines

- remove no longer required patches 0001/0002
- update license file to LICENSE
- update license to GPLv3
- always build without gettext support

I was about to apply, but there's a major licensing issue: they have the GPLv3 license text, but all source files contain this:

/* Released under AGPL v3 with exception for the OpenSSL library. See license.txt */

license.txt doesn't exist, and AGPL v3 is obviously not GPL v3.

So could you check this with upstream, and ask them to fix those inconsistencies?

Also, I have comments below (which I had fixed locally... but need to drop because of this license issue).

package/httping/Config.in config BR2_PACKAGE_HTTPING · line 21

Quoted 13 lines
package/httping/Config.in +3 -2
index c0e5071ce8..f5057e05d0 100644
@@ -16,7 +16,16 @@ config BR2_PACKAGE_HTTPING
 
 if BR2_PACKAGE_HTTPING
 
-config BR2_PACKAGE_HTTPING_TFO
-	bool "TCP Fast Open (TFO) support"
+config BR2_PACKAGE_HTTPING_SSL
+	bool "enable SSL support"
+	select BR2_PACKAGE_LIBOPENSSL

Since it builds fine with libressl, this should be:

select BR2_PACKAGE_OPENSSL

package/httping/Config.in config BR2_PACKAGE_HTTPING · line 22

Quoted 1 line
package/httping/Config.in +1 -0
+	select BR2_PACKAGE_LIBOPENSSL_ENGINES

And so this should be:

select BR2_PACKAGE_LIBOPENSSL_ENGINES if BR2_PACKAGE_LIBOPENSSL

package/httping/Config.in config BR2_PACKAGE_HTTPING · line 29

Quoted 7 lines
package/httping/Config.in +7 -0
+	select BR2_PACKAGE_CA_CERTIFICATES # runtime
+
+config BR2_PACKAGE_HTTPING_TUI
+	bool "enable TUI support"
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_NCURSES_WCHAR
+	select BR2_PACKAGE_FFTW_DOUBLE

This causes a menuconfig warning because BR2_PACKAGE_FFTW_DOUBLE doesn't exist if you don't select BR2_PACKAGE_FFTW. So please add a "select BR2_PACKAGE_FFTW".

Quoted 20 lines
package/httping/httping.mk +0 -12
index b3a625a8e1..cf1189eeb6 100644
@@ -4,34 +4,19 @@
 #
 ################################################################################
 
-HTTPING_VERSION = 2.5
-HTTPING_SOURCE = httping-$(HTTPING_VERSION).tgz
-HTTPING_SITE = http://www.vanheusden.com/httping
-HTTPING_LICENSE = GPL-2.0
-HTTPING_LICENSE_FILES = license.txt
-HTTPING_LDFLAGS = $(TARGET_LDFLAGS) \
-	$(TARGET_NLS_LIBS) \
-	$(if $(BR2_PACKAGE_LIBICONV),-liconv)
-HTTPING_DEPENDENCIES = \
-	$(TARGET_NLS_DEPENDENCIES) \
-	$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
-	$(if $(BR2_PACKAGE_NCURSES_WCHAR),ncurses) \

package/httping/httping.mk line 8

Quoted 10 lines
package/httping/httping.mk +2 -8
-	$(if $(BR2_PACKAGE_OPENSSL),openssl) \
-	$(if $(BR2_PACKAGE_FFTW_DOUBLE),fftw-double)
-HTTPING_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) \
-	FW=$(if $(BR2_PACKAGE_FFTW_DOUBLE),yes,no) \
-	NC=$(if $(BR2_PACKAGE_NCURSES_WCHAR),yes,no) \
-	SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \
-	TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no) \
-	NO_GETTEXT=$(if $(BR2_SYSTEM_ENABLE_NLS),no,yes)
+HTTPING_VERSION = 4.1.0
+HTTPING_SOURCE = v$(HTTPING_VERSION).tar.gz

Please drop this HTTPING_SOURCE so that the default gets used.

package/httping/httping.mk line 10

Quoted 2 lines
package/httping/httping.mk +2 -0
+HTTPING_SITE = $(call github,folkertvanheusden,HTTPing,v$(HTTPING_VERSION))
+HTTPING_LICENSE = GPL-3.0

Of course, this might need to be adjusted once upstream clarifies their licensing intention.

Thanks!

Thomas

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot