Przeglądaj źródła

iptraf-ng: update to 1.2.2

Waldemar Brodkorb 3 miesięcy temu
rodzic
commit
cc7c9a34f1

+ 5 - 5
package/iptraf-ng/Makefile

@@ -4,23 +4,23 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		iptraf-ng
-PKG_GIT:=		tag
-PKG_HASH:=		cf385d3a0d2344f0159be0ab859651de2f750b661d88d1f22f96b82a7cd4ae13
-PKG_VERSION:=		v1.2.1
+PKG_VERSION:=		1.2.2
 PKG_RELEASE:=		1
+PKG_HASH:=		75fd653745ea0705995c25e6c07b34252ecc2563c6a91b007a3a8c26f29cc252
 PKG_DESCR:=		a console-based network monitoring program
 PKG_SECTION:=		net/perf
 PKG_DEPENDS:=		libncurses
 PKG_BUILDDEP:=		ncurses
 PKG_URL:=		https://github.com/iptraf-ng/iptraf-ng
-PKG_SITES:=		https://github.com/iptraf-ng/iptraf-ng.git
+PKG_SITES:=		https://github.com/iptraf-ng/iptraf-ng/archive/refs/tags/
+
+DISTFILES:=		v$(PKG_VERSION).tar.gz
 
 include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,IPTRAF_NG,iptraf-ng,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-TARGET_LDFLAGS+=	-ltinfo -lncurses -lpanel
 XAKE_FLAGS+=		PLATFORM="-DPLATFORM=\\\"Linux/${ARCH}\\\"" \
 			TARGET="/usr/bin" \
 			WORKDIR="/var/lib/iptraf-ng" V=1

+ 21 - 3
package/iptraf-ng/patches/patch-Makefile

@@ -1,6 +1,15 @@
---- iptraf-ng-v1.2.1.orig/Makefile	2024-02-25 17:52:43.000000000 +0100
-+++ iptraf-ng-v1.2.1/Makefile	2024-02-25 17:54:46.973660535 +0100
-@@ -25,7 +25,7 @@ ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) $(IPT
+--- iptraf-ng-1.2.2.orig/Makefile	2024-11-21 09:02:17.000000000 +0100
++++ iptraf-ng-1.2.2/Makefile	2026-05-16 11:31:34.113800107 +0200
+@@ -18,14 +18,14 @@ VERSION-FILE: FORCE
+ 	@$(SHELL_PATH) ./GEN-VERSION-FILE
+ -include VERSION-FILE
+ 
+-CFLAGS = -g -O2 -Wall -W -Werror=format-security
+-LDFLAGS =
++CFLAGS ?= -g -O2 -Wall -W -Werror=format-security
++LDFLAGS ?=
+ IPTRAF_CFLAGS := -std=gnu99 -D_GNU_SOURCE
+ ALL_CFLAGS = $(CPPFLAGS) $(CFLAGS) $(IPTRAF_CFLAGS)
  ALL_LDFLAGS = $(LDFLAGS)
  STRIP ?= strip
  
@@ -9,3 +18,12 @@
  sbindir_relative = sbin
  sbindir = $(prefix)/$(sbindir_relative)
  mandir = $(prefix)/share/man
+@@ -39,7 +39,7 @@ pathsep = :
+ 
+ export prefix bindir sharedir sysconfdir gitwebdir localedir
+ 
+-CC = cc
++CC ?= cc
+ RM = rm -f
+ INSTALL = install
+ RPMBUILD = rpmbuild