Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package packETH for openSUSE:Factory checked in at 2021-06-29 22:43:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/packETH (Old) and /work/SRC/openSUSE:Factory/.packETH.new.2625 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "packETH" Tue Jun 29 22:43:36 2021 rev:4 rq:903076 version:2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/packETH/packETH.changes 2020-07-05 01:20:55.197506728 +0200 +++ /work/SRC/openSUSE:Factory/.packETH.new.2625/packETH.changes 2021-06-29 22:44:20.366959142 +0200 @@ -1,0 +2,13 @@ +Mon May 17 22:26:18 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de> + +- Update to version 2.1 + * packETHcli added burst mode (-m -6) + * packETHcli added receiver option (mode -m -9) to count received + packets + * packETHcli added option to incluce pattern (predifined or custom) + which can be checked by packETHcli in receiver mode if all packets + that were sent were also correctly received at the receiver site + * packETHcli - nanoseconds support +- Replaced packeth-ftbs-gcc10.patch with e72195b573.patch + +------------------------------------------------------------------- Old: ---- packETH-1.8.1.tar.bz2 packeth-ftbs-gcc10.patch New: ---- e72195b573.patch packETH-2.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ packETH.spec ++++++ --- /var/tmp/diff_new_pack.Zk9k08/_old 2021-06-29 22:44:20.770959675 +0200 +++ /var/tmp/diff_new_pack.Zk9k08/_new 2021-06-29 22:44:20.770959675 +0200 @@ -1,7 +1,7 @@ # # spec file for package packETH # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,39 +16,75 @@ # +# Uses x86 ASM +%ifarch %ix86 x86_64 amd64 ia32e +%bcond_without cli +%else +%bcond_with cli +%endif Name: packETH -Version: 1.8.1 +Version: 2.1 Release: 0 Summary: Packet generator tool for ethernet License: GPL-3.0-or-later Group: Productivity/Networking/Diagnostic URL: http://packeth.sourceforge.net/packeth/Home.html -Source0: http://downloads.sourceforge.net/project/packeth/packETH-%{version}.tar.bz2 +Source0: https://github.com/jemcek/packETH/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM e72195b573.patch -- https://github.com/jemcek/packETH/pull/22 +Patch0: https://github.com/jemcek/packETH/commit/e72195b573.patch +BuildRequires: automake BuildRequires: pkgconfig -BuildRequires: pkgconfig(glib-2.0) -BuildRequires: pkgconfig(gtk+-2.0) -Patch0: packeth-ftbs-gcc10.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(glib-2.0) >= 2.4 +BuildRequires: pkgconfig(gthread-2.0) +BuildRequires: pkgconfig(gtk+-2.0) >= 2.4 %description packETH is tool for generating packets to send over ethernet. +%if %{with cli} + +%package cli +Summary: CLI only packet generator tool for ethernet +Group: Productivity/Networking/Diagnostic + +%description cli +packETHcli is a command line version of packETH. + +It allows you to easily send packets from pcap file. +It has different sending options although not all features from packETH are supported. +It also has a receiver mode where packets sent by packETH or packETHcli can be captured +and checked for errors. + +%files cli +%license COPYING +%doc cli/NEWS cli/README +%{_bindir}/packETHcli + +%endif + %prep %autosetup -p1 -# yay, lm is not in checked libs -sed -i -e 's:$(DEPS_LIBS):$(DEPS_LIBS) -lm:' Makefile.in %build -export CFLAGS="%optflags -fvisibility=hidden" +autoreconf -fi %configure -make %{?_smp_mflags} +%make_build +%if %{with cli} +# CLI +pushd cli +%make_build CFLAGS="%{optflags}" +popd +%endif %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} +%make_install +%if %{with cli} +install -D -m 0755 cli/packETHcli %{buildroot}%{_bindir}/packETHcli +%endif %files -%defattr(-,root,root) -%doc COPYING CHANGELOG AUTHORS +%license COPYING +%doc CHANGELOG AUTHORS %{_bindir}/%{name} %{_datadir}/packeth ++++++ e72195b573.patch ++++++ From e72195b573a17e68632e5461db72dc2a4d142c94 Mon Sep 17 00:00:00 2001 From: Jeroen Roovers <jer@gentoo.org> Date: Mon, 3 Feb 2020 20:48:26 +0100 Subject: [PATCH] Fix GCC-10 / CFLAGS=-fno-common GCC 10 will enable -fno-common by default[0], which causes the linker to fail like this [1], even for older GCC versions for which it is explicitly enabled: ``` ld: src/function_send.o:(.bss+0x0): multiple definition of `iftext'; src/callbacks.o:(.bss+0x0): first defined here ``` Fix[2] this by declaring iftext as extern in the header and by defining it just once. [0] https://gcc.gnu.org/gcc-10/porting_to.html#common [1] https://bugs.gentoo.org/708048 [2] Note that src/function.h uses CRLF line endings. --- src/callbacks.c | 1 - src/function.c | 2 +- src/function.h | 2 ++ src/function_send.c | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/callbacks.c b/src/callbacks.c index ef02fb1..5efde80 100644 --- a/src/callbacks.c +++ b/src/callbacks.c @@ -65,7 +65,6 @@ extern int number; extern int stop_flag; extern long desired_bw; gint row_number;/* this is because i cant get the selected row number*/ -gchar iftext[20]; gchar address_filename[100] = "addresslist"; static GtkWidget *entry_field; static GtkWidget *entry_field_ip; diff --git a/src/function.c b/src/function.c index 1d7dfe2..96e4d8f 100644 --- a/src/function.c +++ b/src/function.c @@ -66,7 +66,7 @@ int ipv4_start = 0; int ipv6_start = 0; int eth_start = 0; gboolean stop_flag = 0; -extern char iftext[20]; +char iftext[20]; static unsigned long crc32_table[256]; int crc32_table_init = 0; int ip_proto_used = 0; // 0 - none, 4 - ipv4, 6- IPv6, 806 - ARP diff --git a/src/function.h b/src/function.h index 304caf5..461ce01 100644 --- a/src/function.h +++ b/src/function.h @@ -22,6 +22,8 @@ #include <gtk/gtk.h> +extern char iftext[20]; + signed int char2x(char *p); char c4(int value); guint32 get_checksum32(int start, int stop); diff --git a/src/function_send.c b/src/function_send.c index ca49639..5d3f1f6 100644 --- a/src/function_send.c +++ b/src/function_send.c @@ -55,7 +55,6 @@ extern long li_last_packets_sent; extern long li_packets_sent_lastsec; extern long sentstream[10]; extern long sendtime; -char iftext[20]; struct params { long long del;