Skip to contentSkip to conversation

package/httping: update to latest git

PATCH In review Waldemar Brodkorb 2 participants 2 messages Sep 23, 2024

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 package/httping: update to latest git

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, and therefore we don't need to add Config.in.legacy handling for this option
- remove no longer required patches 0001/0002
- update license file to LICENSE
- update license to AGPLv3
- always build without gettext support

---
v1-v2:
- clarification of license issues, httping is licensed under AGPLv3 as now stated in the readme and LICENSE was updated accordingly, switch to latest git for these changes. (requested by Thomas P.)
- fix Config.in so that libressl can be used, suggested by Thomas P.
- add missing select BR2_PACKAGE_FFTW, suggested by Thomas P.

---
 .../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                    | 40 +++++-----------
 5 files changed, 25 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..d21b97ea1d 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_OPENSSL
+	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
+	select BR2_PACKAGE_FFTW_DOUBLE
 
 endif
package/httping/httping.hash +2 -2
index 3178c32377..055c309a9e 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  3e895a0a6d7bd79de25a255a1376d4da88eb09c34efdd0476ab5a907e75bfaf8  httping-2.5.tgz
-sha256  c5db2e5b9a692fcdf2bd370f1533529063fbcf8947a8f5ee9d4b050a14e0566d  license.txt
+sha256  4402ac1e669ec96bad9deea466e5f140f7ec7c5166550c3e2924d9535f0cf9fa  httping-0e26c53d5fe504eb7204d64b23513729aa4a5bb0.tar.gz
+sha256  8486a10c4393cee1c25392769ddd3b2d6c242d6ec7928e1414efff7dfb2f07ef  LICENSE
package/httping/httping.mk +12 -28
index b3a625a8e1..dff54626ea 100644
@@ -4,34 +4,18 @@
 #
 ################################################################################
 
-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) \
-	$(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 = 0e26c53d5fe504eb7204d64b23513729aa4a5bb0
+HTTPING_SITE = $(call github,folkertvanheusden,HTTPing,$(HTTPING_VERSION))
+HTTPING_LICENSE = AGPL-3.0
+HTTPING_LICENSE_FILES = LICENSE
 
-define HTTPING_BUILD_CMDS
-	$(HTTPING_MAKE_OPTS) LDFLAGS="$(HTTPING_LDFLAGS)" \
-		$(MAKE) DEBUG=no -C $(@D)
-endef
+ifeq ($(BR2_PACKAGE_HTTPING_TUI),y)
+HTTPING_DEPENDENCIES += ncurses fftw-double
+HTTPING_CONF_OPTS += -DUSE_TUI=1
+endif
 
-define HTTPING_INSTALL_TARGET_CMDS
-	$(HTTPING_MAKE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install
-endef
+ifeq ($(BR2_PACKAGE_HTTPING_SSL),y)
+HTTPING_DEPENDENCIES += openssl
+endif
 
-$(eval $(generic-package))
+$(eval $(cmake-package))
Signature · 6 lines
2.30.2

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

Wlademar, All,

On 2024-09-23 06:02 +0200, Waldemar Brodkorb spake thusly:

Quoted 21 lines

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, and therefore we don't need to add Config.in.legacy handling for this option
- remove no longer required patches 0001/0002
- update license file to LICENSE
- update license to AGPLv3
- always build without gettext support

---
v1-v2:
- clarification of license issues, httping is licensed under AGPLv3 as now stated in the readme and LICENSE was updated accordingly, switch to latest git for these changes. (requested by Thomas P.)
- fix Config.in so that libressl can be used, suggested by Thomas P.
- add missing select BR2_PACKAGE_FFTW, suggested by Thomas P.

Quoted 3 lines
---
 .../0001-fix-math-library-linking.patch       | 27 -----------
 ...Makefile-allow-build-without-gettext.patch | 48 -------------------
    $ ./utils/docker-run make check-package
    .checkpackageignore:587: ignored file package/httping/0001-fix-math-library-linking.patch is missing
    .checkpackageignore:588: ignored file package/httping/0002-Makefile-allow-build-without-gettext.patch is missing

[--SNIP--]

package/httping/httping.mk

Quoted 5 lines
package/httping/httping.mk +0 -0
index b3a625a8e1..dff54626ea 100644
@@ -4,34 +4,18 @@

[--SNIP--]

package/httping/httping.mk line 8

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

We've recently decided to switch away from the github and gtilab helpers, because there is no guarantee provided by GitHub or GitLab that the archives they generate are reproducible (GitHub galready broke that mu;tiple times, and their doc now explicitly ststes those arechives are not guaranteed to be stable).

Instead, we want to use the git download method, as we do control the way the archives are generated locally (and ew're *are* going at great length to make them reproducible).

I've fixed both issues, and applied to master, thanks.

Regards,
Yann E. MORIN.

Signature · 10 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot