public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/iptstate] f43: New version 2.3.0
@ 2026-06-24 21:11 Phil Sutter
0 siblings, 0 replies; only message in thread
From: Phil Sutter @ 2026-06-24 21:11 UTC (permalink / raw)
To: git-commits
A new commit has been pushed.
Repo : rpms/iptstate
Branch : f43
Commit : 595718a0e29c8341c2ba5e9b135b79a39ee16c83
Author : Phil Sutter <psutter@redhat.com>
Date : 2026-06-23T18:00:03+02:00
Stats : +8/-191 in 7 file(s)
URL : https://src.fedoraproject.org/rpms/iptstate/c/595718a0e29c8341c2ba5e9b135b79a39ee16c83?branch=f43
Log:
New version 2.3.0
---
diff --git a/.gitignore b/.gitignore
index c7d3985..3ce67f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ iptstate-2.2.2.tar.bz2
/iptstate-2.2.5.tar.bz2
/iptstate-2.2.6.tar.bz2
/iptstate-2.2.7.tar.bz2
+/v2.3.0.tar.gz
diff --git a/0001-Makefile-respect-LDFLAGS.patch b/0001-Makefile-respect-LDFLAGS.patch
deleted file mode 100644
index 25361a2..0000000
--- a/0001-Makefile-respect-LDFLAGS.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d3d373600e32ab1ec79211c7e592e628072951bf Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 10 Dec 2021 03:10:49 +0000
-Subject: [PATCH] Makefile: respect LDFLAGS
-
-Signed-off-by: Sam James <sam@gentoo.org>
-(cherry picked from commit 1ac59c1b12b2b53c8620a8195bbb3cd7c07ec9a9)
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 6e85b6c795fdc..f7eb4faa2772d 100644
---- a/Makefile
-+++ b/Makefile
-@@ -49,7 +49,7 @@ iptstate: iptstate.cc Makefile
- echo "+------------------------------------------------------------+" ;\
- echo "";
-
-- $(CXX) $(CXXFLAGS) $(CXXFILES) -o iptstate $(LIBS) $(CPPFLAGS)
-+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(CXXFILES) -o iptstate $(LIBS)
- @touch iptstate
-
- @\
---
-2.34.1
-
diff --git a/0002-Makefile-Use-pkg-config.patch b/0002-Makefile-Use-pkg-config.patch
deleted file mode 100644
index aa91bcc..0000000
--- a/0002-Makefile-Use-pkg-config.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 323118dcf8c7872d607a77ce6f3f6f05af7fde7b Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 10 Dec 2021 03:10:42 +0000
-Subject: [PATCH] Makefile: Use pkg-config
-
-Depending on platform, linking against ncurses may require -ltinfo as well,
-and linking against netfilter_conntrack may require -lnetfilter too.
-
-Signed-off-by: Sam James <sam@gentoo.org>
-(cherry picked from commit 3bac50422fcd8fae153e6787e767a3f7a1953a25)
----
- Makefile | 3 ++-
- README.md | 6 +++---
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index f7eb4faa2772d..ddf0ca552aefe 100644
---- a/Makefile
-+++ b/Makefile
-@@ -13,6 +13,7 @@ SBIN?=$(PREFIX)/sbin
- INSTALL?=/usr/bin/install
- STRIP?=/usr/bin/strip
- MAN?=$(PREFIX)/share/man
-+PKG_CONFIG?=pkg-config
-
- ### ADVANCED USERS AND PACKAGERS MIGHT WANT TO CHANGE THIS
-
-@@ -25,7 +26,7 @@ CXXFLAGS?= -g -Wall -O2 -Werror=format-security -Wformat-truncation=0
- CXXFILES?= iptstate.cc
-
- # THIS IS FOR NORMAL COMPILATION
--LIBS?= -lncurses -lnetfilter_conntrack
-+LIBS?= $(shell $(PKG_CONFIG) --libs ncurses libnetfilter_conntrack)
- CPPFLAGS=
-
- ### YOU SHOULDN'T NEED TO CHANGE ANYTHING BELOW THIS
-diff --git a/README.md b/README.md
-index de1645169fdb5..3647d6dc6df5e 100644
---- a/README.md
-+++ b/README.md
-@@ -28,9 +28,9 @@ Make sure you have some version of curses installed (for most users this is
- probably ncurses). Note that if you are using vendor packages you will most
- likely need the packaged with '-dev' on the end of of it (i.e. ncurses-dev).
-
--Starting with version 2.2.0 you also need libnetfilter_conntrack version 0.0.50
--or later. These libraries also require nf_conntrack_netlink and nfnetlink
--support in your kernel.
-+Starting with version 2.2.0, you also need libnetfilter_conntrack version 0.0.50
-+or later. These libraries also require nf_conntrack_netlink and nfnetlink support
-+in your kernel. You will also need pkg-config at build-time.
-
- ## INSTALLATION
-
---
-2.34.1
-
diff --git a/0003-Makefile-don-t-override-CPPFLAGS.patch b/0003-Makefile-don-t-override-CPPFLAGS.patch
deleted file mode 100644
index a4a01d8..0000000
--- a/0003-Makefile-don-t-override-CPPFLAGS.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 23f4b4700a9f995df69650bcddbee8290a56fae1 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Fri, 10 Dec 2021 03:19:45 +0000
-Subject: [PATCH] Makefile: don't override CPPFLAGS
-
-There's no need to explicitly blank this and it prevents overrides
-from the environment.
-
-Signed-off-by: Sam James <sam@gentoo.org>
-(cherry picked from commit 9bd435ddbad5a2103d1e562c62f0126fd19f20eb)
----
- Makefile | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index ddf0ca552aefe..61ed786168d22 100644
---- a/Makefile
-+++ b/Makefile
-@@ -27,7 +27,6 @@ CXXFILES?= iptstate.cc
-
- # THIS IS FOR NORMAL COMPILATION
- LIBS?= $(shell $(PKG_CONFIG) --libs ncurses libnetfilter_conntrack)
--CPPFLAGS=
-
- ### YOU SHOULDN'T NEED TO CHANGE ANYTHING BELOW THIS
-
---
-2.34.1
-
diff --git a/0004-Cleanup-table-entry-17-18.patch b/0004-Cleanup-table-entry-17-18.patch
deleted file mode 100644
index 5b94d60..0000000
--- a/0004-Cleanup-table-entry-17-18.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 0b40c9d23dc111b8b40cdfece166fefdfcda44bc Mon Sep 17 00:00:00 2001
-From: Tomas Barton <barton.tomas@gmail.com>
-Date: Thu, 25 Aug 2022 23:32:41 +0200
-Subject: [PATCH] Cleanup table entry (#17) (#18)
-
-* Cleanup table entry (#17)
-* Fix indentation, avoid code duplication
-* Move comment
-
-(cherry picked from commit 5b4712121b4f42fe853e075fc211723f7463c2b4)
----
- iptstate.cc | 25 +++++++++++++++----------
- 1 file changed, 15 insertions(+), 10 deletions(-)
-
-diff --git a/iptstate.cc b/iptstate.cc
-index 9beff1d9b2fe7..2d072ba3655f9 100644
---- a/iptstate.cc
-+++ b/iptstate.cc
-@@ -1228,6 +1228,18 @@ int conntrack_hook(enum nf_conntrack_msg_type nf_type, struct nf_conntrack *ct,
- return NFCT_CB_CONTINUE;
- }
-
-+/**
-+ * Nuke the tentry_t's we made before deleting the vector of pointers
-+ */
-+void clear_table(vector<tentry_t*> &stable)
-+{
-+ for (tentry_t* entry: stable) {
-+ delete entry;
-+ }
-+ stable.clear();
-+}
-+
-+
- /*
- * This is the core of this program - build a table of states.
- *
-@@ -1259,15 +1271,8 @@ void build_table(flags_t &flags, const filters_t &filters, vector<tentry_t*>
- /*
- * Initialization
- */
-- // Nuke the tentry_t's we made before deleting the vector of pointers
-- for (
-- vector<tentry_t*>::iterator it = stable.begin();
-- it != stable.end();
-- it++
-- ) {
-- delete *it;
-- }
-- stable.clear();
-+ clear_table(stable);
-+
- counts.tcp = counts.udp = counts.icmp = counts.other = counts.skipped = 0;
-
- cth = nfct_open(CONNTRACK, 0);
-@@ -2258,7 +2263,6 @@ void interactive_help(const string &sorting, const flags_t &flags,
- halfdelay(1);
- }
-
--
- /*
- * MAIN
- */
-@@ -2958,6 +2962,7 @@ int main(int argc, char *argv[])
- } // end while(1)
-
- out:
-+ clear_table(stable);
-
- /*
- * The user has broken out of the loop, take down the curses
diff --git a/iptstate.spec b/iptstate.spec
index e19c5bb..f34a4b6 100644
--- a/iptstate.spec
+++ b/iptstate.spec
@@ -1,12 +1,8 @@
Name: iptstate
Summary: A top-like display of IP Tables state table entries
-Version: 2.2.7
-Release: 11%{?dist}
-Source: https://github.com/jaymzh/iptstate/releases/download/v%{version}/iptstate-%{version}.tar.bz2
-Patch01: 0001-Makefile-respect-LDFLAGS.patch
-Patch02: 0002-Makefile-Use-pkg-config.patch
-Patch03: 0003-Makefile-don-t-override-CPPFLAGS.patch
-Patch04: 0004-Cleanup-table-entry-17-18.patch
+Version: 2.3.0
+Release: 1%{?dist}
+Source: https://github.com/jaymzh/iptstate/archive/refs/tags/v%{version}.tar.gz
URL: http://www.phildev.net/iptstate/
License: zlib
Requires: iptables
@@ -51,6 +47,9 @@ display the state table once.
%{_mandir}/man8/iptstate.*
%changelog
+* Tue Jun 23 2026 Phil Sutter <psutter@redhat.com> - 2.3.0-1
+- new version
+
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.7-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
diff --git a/sources b/sources
index c4f4650..e63b940 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (iptstate-2.2.7.tar.bz2) = 43e258639e0f728d4a393d2dd7a834a6df1131da5291559a504800a0918dad3e010baaeb1bca66cb9a62bad6955f678be3302aac916fc956a525cdd7e9d0690a
+SHA512 (v2.3.0.tar.gz) = 355f48f45965ed7bf79a59249c20505c96ec51a06711cf9df02b5a32dcf4bfd5e90d2aa97c08ee9b19ae738583b4d16094050a469bece295910926253eb6acc7
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2026-06-24 21:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-06-24 21:11 [rpms/iptstate] f43: New version 2.3.0 Phil Sutter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox