diff --git a/add-test-case-and-enable-in-rpmbuild.patch b/add-test-case-and-enable-in-rpmbuild.patch index a1d73bf1d4aa09c71e24b298a6feb076fcad39d5..6831830f65554ee7d30ac1242d5769cbb401cd21 100644 --- a/add-test-case-and-enable-in-rpmbuild.patch +++ b/add-test-case-and-enable-in-rpmbuild.patch @@ -1,27 +1,30 @@ From be875657f0fcaa2f87658a07c9de9fefb7f74f29 Mon Sep 17 00:00:00 2001 -From: renmingshuai +From: liubo Date: Mon, 13 Mar 2023 19:58:35 +0800 Subject: [PATCH] add test case and enable in rpmbuild --- - utils/Makefile.in | 1 + - utils/iftest.c | 50 +++++++++++++++++++++++++++++++++++++++++++++-- - 2 files changed, 49 insertions(+), 2 deletions(-) + utils/Makefile.in | 2 ++ + utils/iftest.c | 49 ++++++++++++++++++++++++++++++++++++++++++++++- + 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/utils/Makefile.in b/utils/Makefile.in -index d0c62f6..df5db23 100644 +index d0c62f6..5bd6d2a 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in -@@ -404,6 +404,7 @@ distdir: $(DISTFILES) +@@ -402,8 +402,10 @@ distdir: $(DISTFILES) + || exit 1; \ + fi; \ done ++ETHNAME=$(shell cat /proc/net/dev | awk '/[0-9]+/{print $$1,$$2}'| sed 's/://' | sort -k2rn | head -n1 | awk '{print $$1}' ) check-am: all-am $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) -+ ./iftest enp3s0 ++ ./iftest $(ETHNAME) check: check-am all-am: Makefile installdirs: diff --git a/utils/iftest.c b/utils/iftest.c -index 02f5807..f5c3664 100644 +index 02f5807..b0cf819 100644 --- a/utils/iftest.c +++ b/utils/iftest.c @@ -5,15 +5,19 @@ @@ -45,15 +48,7 @@ index 02f5807..f5c3664 100644 if (argc != 2) { fprintf(stderr, "Usage: %s \n", argv[0]); -@@ -40,7 +44,6 @@ int main(int argc, char *argv[]) - - if (nlif_get_ifflags(h, idx, &flags) == -1) { - fprintf(stderr, "Cannot get flags for device `%s'\n", argv[1]); -- exit(EXIT_FAILURE); - } - - printf("index (%d) is %s (%s) (%s)\n", idx, argv[1], -@@ -48,5 +51,48 @@ int main(int argc, char *argv[]) +@@ -48,5 +52,48 @@ int main(int argc, char *argv[]) flags & IFF_UP ? "UP" : "DOWN"); nlif_close(h); @@ -103,5 +98,5 @@ index 02f5807..f5c3664 100644 return EXIT_SUCCESS; } -- -2.23.0 +2.33.0 diff --git a/libnfnetlink.spec b/libnfnetlink.spec index d1a35db017f56abc831c078b0d8be0d43049b713..73850318265c1fd4341c39251fc4113df6608f9d 100644 --- a/libnfnetlink.spec +++ b/libnfnetlink.spec @@ -1,6 +1,6 @@ Name: libnfnetlink Version: 1.0.1 -Release: 17 +Release: 18 Summary: Netlink library for netfilter License: GPLv2+ URL: http://netfilter.org @@ -57,6 +57,12 @@ make check %doc README %changelog +* Tue Sep 19 2023 xingwei - 1.0.1-18 +- Type:bugfix +- CVE: +- SUG:NA +- DESC:optimize the acquisition of network card interface names + * Mon Mar 13 2023 liubo - 1.0.1-17 - add test case and enable in rpmbuild