From c8eea69e4c623cf25804afadef8f1596c0674445 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 7 Dec 2007 17:02:31 +0000 Subject: [PATCH 01/54] Initialize branch EL-4 for pcapdiff --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..6ec5cef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-4 From 161fef450e81c9daf3aa91fd45d9deb81db9d295 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 7 Dec 2007 18:27:55 +0000 Subject: [PATCH 02/54] Initial import. --- .cvsignore | 1 + pcapdiff | 6 ++ pcapdiff-pcapdiff-noshebang.patch | 7 +++ pcapdiff-pcapdiff_helper-noshebang.patch | 7 +++ pcapdiff-printpackets-noshebang.patch | 7 +++ pcapdiff.spec | 76 ++++++++++++++++++++++++ printpackets | 6 ++ sources | 1 + 8 files changed, 111 insertions(+) create mode 100644 pcapdiff create mode 100644 pcapdiff-pcapdiff-noshebang.patch create mode 100644 pcapdiff-pcapdiff_helper-noshebang.patch create mode 100644 pcapdiff-printpackets-noshebang.patch create mode 100644 pcapdiff.spec create mode 100644 printpackets diff --git a/.cvsignore b/.cvsignore index e69de29..980c8e1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +pcapdiff-0.1.tar.gz diff --git a/pcapdiff b/pcapdiff new file mode 100644 index 0000000..87ad9db --- /dev/null +++ b/pcapdiff @@ -0,0 +1,6 @@ +#!/usr/bin/env python +if __name__ == '__main__': + import sys + sys.path.insert(0, '/usr/share/pcapdiff') + from pcapdiff import main + main() diff --git a/pcapdiff-pcapdiff-noshebang.patch b/pcapdiff-pcapdiff-noshebang.patch new file mode 100644 index 0000000..6c9d63a --- /dev/null +++ b/pcapdiff-pcapdiff-noshebang.patch @@ -0,0 +1,7 @@ +--- pcapdiff.py 2007-11-30 14:17:27.000000000 -0600 ++++ pcapdiff.py 2007-11-30 14:17:27.000000000 -0600 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # + # pcapdiff: shows you the differences between two pcap dump files + # (such as those produced by tcpdump), with an eye towards counting diff --git a/pcapdiff-pcapdiff_helper-noshebang.patch b/pcapdiff-pcapdiff_helper-noshebang.patch new file mode 100644 index 0000000..4e6049d --- /dev/null +++ b/pcapdiff-pcapdiff_helper-noshebang.patch @@ -0,0 +1,7 @@ +--- pcapdiff_helper.py 2007-11-30 14:22:23.000000000 -0600 ++++ pcapdiff_helper.py 2007-11-30 14:22:23.000000000 -0600 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # + # pcapdiff_helper: helper functions for pcapdiff.py + # diff --git a/pcapdiff-printpackets-noshebang.patch b/pcapdiff-printpackets-noshebang.patch new file mode 100644 index 0000000..db45e1d --- /dev/null +++ b/pcapdiff-printpackets-noshebang.patch @@ -0,0 +1,7 @@ +--- printpackets.py 2007-11-30 14:17:58.000000000 -0600 ++++ printpackets.py 2007-11-30 14:17:58.000000000 -0600 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # + # printpackets: + # prints out packets from a pcap dump file with ether and ip header info diff --git a/pcapdiff.spec b/pcapdiff.spec new file mode 100644 index 0000000..5bb56a3 --- /dev/null +++ b/pcapdiff.spec @@ -0,0 +1,76 @@ +Name: pcapdiff +Version: 0.1 +Release: 2%{?dist} +Summary: Compares packet captures, detects forged, dropped or mangled packets + +Group: Development/Languages +License: GPLv2+ and GPLv3+ +URL: http://www.eff.org/testyourisp/pcapdiff/ +Source0: http://www.eff.org/files/pcapdiff-%{version}.tar.gz +Source1: pcapdiff +Source2: printpackets +Patch0: pcapdiff-pcapdiff-noshebang.patch +Patch1: pcapdiff-printpackets-noshebang.patch +Patch2: pcapdiff-pcapdiff_helper-noshebang.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) +BuildArch: noarch +BuildRequires: python-devel +Requires: pcapy + +%description +Pcapdiff is a tool developed by the EFF to compare two packet captures and +identify potentially forged, dropped, or mangled packets. Two technically- +inclined friends can set up packet captures (e.g. tcpdump or Wireshark) on +their own computers and produce network traffic between their two computers +over the Internet. Later, they can run pcapdiff on the two packet capture +files to identify suspicious packets for further investigation. See +Detecting packet injection: a guide to observing packet spoofing by ISPs +and EFF's Test Your ISP Project for more background. + +%prep +%setup -qn pcapdiff + +%patch0 -p0 +%patch1 -p0 +%patch2 -p0 + +%build + + +#fix encodings +#sed -i 's/\r//' LICENSE +#sed -i 's/\r//' README +#sed -i 's/\r//' pcapdiff.html +#iconv -f IBM850 -t UTF8 pcapdiff.html > pcapdiff.html.tmp +#mv pcapdiff.html.tmp pcapdiff.html + + +%install +rm -rf $RPM_BUILD_ROOT +install -D -m 755 -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/pcapdiff +install -D -m 644 -p pcapdiff.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcapdiff.py +install -D -m 755 -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/printpackets +install -D -m 644 -p printpackets.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/printpackets.py +install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcapdiff_helper.py + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc README COPYING.2 COPYING.3 +%{_bindir}/pcapdiff +%{_bindir}/printpackets +%dir %{_datadir}/pcapdiff/ +%{_datadir}/pcapdiff/*.py +%{_datadir}/pcapdiff/*.pyc +%{_datadir}/pcapdiff/*.pyo + +%changelog +* Tue Dec 04 2007 Jon Ciesla - 0.1-2 +- Added python-devel BR to fix .pyc/.pyo issue. + +* Fri Nov 30 2007 Jon Ciesla - 0.1-1 +- create. diff --git a/printpackets b/printpackets new file mode 100644 index 0000000..ed87944 --- /dev/null +++ b/printpackets @@ -0,0 +1,6 @@ +#!/usr/bin/env python +if __name__ == '__main__': + import sys + sys.path.insert(0, '/usr/share/pcapdiff') + from printpackets import main + main() diff --git a/sources b/sources index e69de29..dc80159 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +2f7f122969c7894a6aff3e72c886f63d pcapdiff-0.1.tar.gz From f22adb9a7cc8c400ca49a7aecf0c4cd431bf9ace Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Sat, 15 Dec 2007 17:15:31 +0000 Subject: [PATCH 03/54] Initial import. --- pcapdiff | 6 ++ pcapdiff-pcapdiff-noshebang.patch | 7 +++ pcapdiff-pcapdiff_helper-noshebang.patch | 7 +++ pcapdiff-printpackets-noshebang.patch | 7 +++ pcapdiff.spec | 76 ++++++++++++++++++++++++ printpackets | 6 ++ sources | 1 + 7 files changed, 110 insertions(+) create mode 100644 pcapdiff create mode 100644 pcapdiff-pcapdiff-noshebang.patch create mode 100644 pcapdiff-pcapdiff_helper-noshebang.patch create mode 100644 pcapdiff-printpackets-noshebang.patch create mode 100644 pcapdiff.spec create mode 100644 printpackets diff --git a/pcapdiff b/pcapdiff new file mode 100644 index 0000000..87ad9db --- /dev/null +++ b/pcapdiff @@ -0,0 +1,6 @@ +#!/usr/bin/env python +if __name__ == '__main__': + import sys + sys.path.insert(0, '/usr/share/pcapdiff') + from pcapdiff import main + main() diff --git a/pcapdiff-pcapdiff-noshebang.patch b/pcapdiff-pcapdiff-noshebang.patch new file mode 100644 index 0000000..6c9d63a --- /dev/null +++ b/pcapdiff-pcapdiff-noshebang.patch @@ -0,0 +1,7 @@ +--- pcapdiff.py 2007-11-30 14:17:27.000000000 -0600 ++++ pcapdiff.py 2007-11-30 14:17:27.000000000 -0600 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # + # pcapdiff: shows you the differences between two pcap dump files + # (such as those produced by tcpdump), with an eye towards counting diff --git a/pcapdiff-pcapdiff_helper-noshebang.patch b/pcapdiff-pcapdiff_helper-noshebang.patch new file mode 100644 index 0000000..4e6049d --- /dev/null +++ b/pcapdiff-pcapdiff_helper-noshebang.patch @@ -0,0 +1,7 @@ +--- pcapdiff_helper.py 2007-11-30 14:22:23.000000000 -0600 ++++ pcapdiff_helper.py 2007-11-30 14:22:23.000000000 -0600 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # + # pcapdiff_helper: helper functions for pcapdiff.py + # diff --git a/pcapdiff-printpackets-noshebang.patch b/pcapdiff-printpackets-noshebang.patch new file mode 100644 index 0000000..db45e1d --- /dev/null +++ b/pcapdiff-printpackets-noshebang.patch @@ -0,0 +1,7 @@ +--- printpackets.py 2007-11-30 14:17:58.000000000 -0600 ++++ printpackets.py 2007-11-30 14:17:58.000000000 -0600 +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + # + # printpackets: + # prints out packets from a pcap dump file with ether and ip header info diff --git a/pcapdiff.spec b/pcapdiff.spec new file mode 100644 index 0000000..5bb56a3 --- /dev/null +++ b/pcapdiff.spec @@ -0,0 +1,76 @@ +Name: pcapdiff +Version: 0.1 +Release: 2%{?dist} +Summary: Compares packet captures, detects forged, dropped or mangled packets + +Group: Development/Languages +License: GPLv2+ and GPLv3+ +URL: http://www.eff.org/testyourisp/pcapdiff/ +Source0: http://www.eff.org/files/pcapdiff-%{version}.tar.gz +Source1: pcapdiff +Source2: printpackets +Patch0: pcapdiff-pcapdiff-noshebang.patch +Patch1: pcapdiff-printpackets-noshebang.patch +Patch2: pcapdiff-pcapdiff_helper-noshebang.patch + +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) +BuildArch: noarch +BuildRequires: python-devel +Requires: pcapy + +%description +Pcapdiff is a tool developed by the EFF to compare two packet captures and +identify potentially forged, dropped, or mangled packets. Two technically- +inclined friends can set up packet captures (e.g. tcpdump or Wireshark) on +their own computers and produce network traffic between their two computers +over the Internet. Later, they can run pcapdiff on the two packet capture +files to identify suspicious packets for further investigation. See +Detecting packet injection: a guide to observing packet spoofing by ISPs +and EFF's Test Your ISP Project for more background. + +%prep +%setup -qn pcapdiff + +%patch0 -p0 +%patch1 -p0 +%patch2 -p0 + +%build + + +#fix encodings +#sed -i 's/\r//' LICENSE +#sed -i 's/\r//' README +#sed -i 's/\r//' pcapdiff.html +#iconv -f IBM850 -t UTF8 pcapdiff.html > pcapdiff.html.tmp +#mv pcapdiff.html.tmp pcapdiff.html + + +%install +rm -rf $RPM_BUILD_ROOT +install -D -m 755 -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/pcapdiff +install -D -m 644 -p pcapdiff.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcapdiff.py +install -D -m 755 -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/printpackets +install -D -m 644 -p printpackets.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/printpackets.py +install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcapdiff_helper.py + +%clean +rm -rf $RPM_BUILD_ROOT + + +%files +%defattr(-,root,root,-) +%doc README COPYING.2 COPYING.3 +%{_bindir}/pcapdiff +%{_bindir}/printpackets +%dir %{_datadir}/pcapdiff/ +%{_datadir}/pcapdiff/*.py +%{_datadir}/pcapdiff/*.pyc +%{_datadir}/pcapdiff/*.pyo + +%changelog +* Tue Dec 04 2007 Jon Ciesla - 0.1-2 +- Added python-devel BR to fix .pyc/.pyo issue. + +* Fri Nov 30 2007 Jon Ciesla - 0.1-1 +- create. diff --git a/printpackets b/printpackets new file mode 100644 index 0000000..ed87944 --- /dev/null +++ b/printpackets @@ -0,0 +1,6 @@ +#!/usr/bin/env python +if __name__ == '__main__': + import sys + sys.path.insert(0, '/usr/share/pcapdiff') + from printpackets import main + main() diff --git a/sources b/sources index e69de29..dc80159 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +2f7f122969c7894a6aff3e72c886f63d pcapdiff-0.1.tar.gz From 4fb5d2dd7a0e40768273fed3113bca4c03ae0ae3 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 18 Dec 2007 12:45:37 +0000 Subject: [PATCH 04/54] Removing bytecde, possible build fix. --- pcapdiff.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 5bb56a3..64c29a5 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -65,8 +65,6 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/printpackets %dir %{_datadir}/pcapdiff/ %{_datadir}/pcapdiff/*.py -%{_datadir}/pcapdiff/*.pyc -%{_datadir}/pcapdiff/*.pyo %changelog * Tue Dec 04 2007 Jon Ciesla - 0.1-2 From e675e3140fb22a4a5ad1e2d34e9f001c57c7558c Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Fri, 22 Feb 2008 22:57:19 +0000 Subject: [PATCH 05/54] BZ 434582. --- pcapdiff => pcapdiff.py | 0 pcapdiff.spec | 7 +++++-- 2 files changed, 5 insertions(+), 2 deletions(-) rename pcapdiff => pcapdiff.py (100%) diff --git a/pcapdiff b/pcapdiff.py similarity index 100% rename from pcapdiff rename to pcapdiff.py diff --git a/pcapdiff.spec b/pcapdiff.spec index 5bb56a3..e6c7172 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,13 +1,13 @@ Name: pcapdiff Version: 0.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages License: GPLv2+ and GPLv3+ URL: http://www.eff.org/testyourisp/pcapdiff/ Source0: http://www.eff.org/files/pcapdiff-%{version}.tar.gz -Source1: pcapdiff +Source1: pcapdiff.py Source2: printpackets Patch0: pcapdiff-pcapdiff-noshebang.patch Patch1: pcapdiff-printpackets-noshebang.patch @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pcapdiff/*.pyo %changelog +* Fri Feb 22 2008 Jon Ciesla - 0.1-3 +- BZ 434582. + * Tue Dec 04 2007 Jon Ciesla - 0.1-2 - Added python-devel BR to fix .pyc/.pyo issue. From 3284c7027377242521852ced7b3a01c2121658ff Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Mon, 1 Dec 2008 15:00:38 +0000 Subject: [PATCH 06/54] Rebuild for Python 2.6 --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index e6c7172..8bab2b4 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pcapdiff/*.pyo %changelog +* Mon Dec 01 2008 Ignacio Vazquez-Abrams - 0.1-4 +- Rebuild for Python 2.6 + * Fri Feb 22 2008 Jon Ciesla - 0.1-3 - BZ 434582. From 3609242ba73a87538fa35b08b9e18ce7af4459d2 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Thu, 26 Feb 2009 10:07:17 +0000 Subject: [PATCH 07/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 8bab2b4..c802cd8 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pcapdiff/*.pyo %changelog +* Thu Feb 26 2009 Fedora Release Engineering - 0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Mon Dec 01 2008 Ignacio Vazquez-Abrams - 0.1-4 - Rebuild for Python 2.6 From 3e06f9d9c745a412e4fd502e3a3c77e4b0ac44d2 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 25 Jul 2009 23:20:56 +0000 Subject: [PATCH 08/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index c802cd8..91999ae 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pcapdiff/*.pyo %changelog +* Sat Jul 25 2009 Fedora Release Engineering - 0.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Thu Feb 26 2009 Fedora Release Engineering - 0.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild From 76672ab9a6dd20f67eaf7a2d878dae3e0fcf3320 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 23:30:20 +0000 Subject: [PATCH 09/54] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5feaa8a..bd4e836 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: pcapdiff -# $Id$ +# $Id: Makefile,v 1.1 2007/12/07 17:01:56 kevin Exp $ NAME := pcapdiff SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 4c17d97f35ee837c3ad1a7b9a61a45c9d428ea09 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:49:22 +0000 Subject: [PATCH 10/54] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5feaa8a..bd4e836 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: pcapdiff -# $Id$ +# $Id: Makefile,v 1.1 2007/12/07 17:01:56 kevin Exp $ NAME := pcapdiff SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 66843a94905f7b6ec4edbe38e82c64abaefef989 Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 30 Mar 2010 20:25:34 +0000 Subject: [PATCH 11/54] Crash fix. --- pcapdiff.py | 3 +-- pcapdiff.spec | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pcapdiff.py b/pcapdiff.py index 87ad9db..65b9419 100644 --- a/pcapdiff.py +++ b/pcapdiff.py @@ -2,5 +2,4 @@ if __name__ == '__main__': import sys sys.path.insert(0, '/usr/share/pcapdiff') - from pcapdiff import main - main() + import pcapdiff diff --git a/pcapdiff.spec b/pcapdiff.spec index 91999ae..30e0194 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pcapdiff/*.pyo %changelog +* Tue Mar 20 2010 Jon Ciesla - 0.1-7 +- Fix for crash, BZ 557733. + * Sat Jul 25 2009 Fedora Release Engineering - 0.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 35f2028ad6e4acb5d0dd38e086800bec07ca73eb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 05:36:53 +0000 Subject: [PATCH 12/54] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index bd4e836..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: pcapdiff -# $Id: Makefile,v 1.1 2007/12/07 17:01:56 kevin Exp $ -NAME := pcapdiff -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 6ec5cef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-4 From eaea92ec204f97f4c316544e9c156c0efc408b25 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 05:36:55 +0000 Subject: [PATCH 13/54] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index bd4e836..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: pcapdiff -# $Id: Makefile,v 1.1 2007/12/07 17:01:56 kevin Exp $ -NAME := pcapdiff -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From be139b0a1b3fc20694346537801513e96497d390 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Wed, 11 Aug 2010 17:54:30 -0400 Subject: [PATCH 14/54] recompiling .py files against Python 2.7 (rhbz#623344) --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 30e0194..af51537 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pcapdiff/*.pyo %changelog +* Wed Aug 11 2010 David Malcolm - 0.1-8 +- recompiling .py files against Python 2.7 (rhbz#623344) + * Tue Mar 20 2010 Jon Ciesla - 0.1-7 - Fix for crash, BZ 557733. From 48484fa5d960ff8a86d900fc2431b981cf343386 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 08:58:21 -0600 Subject: [PATCH 15/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index af51537..10c5bf0 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pcapdiff/*.pyo %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 0.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Wed Aug 11 2010 David Malcolm - 0.1-8 - recompiling .py files against Python 2.7 (rhbz#623344) From a46eefaa736b828a4875e6f893e7ce2ec68ae49d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 06:04:12 -0600 Subject: [PATCH 16/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 10c5bf0..12eda91 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pcapdiff/*.pyo %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 0.1-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Feb 08 2011 Fedora Release Engineering - 0.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From da8584561ed80a9fd3b2dcca48c753402bbab73d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 20 Jul 2012 03:53:27 -0500 Subject: [PATCH 17/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 12eda91..143ce9c 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pcapdiff/*.pyo %changelog +* Fri Jul 20 2012 Fedora Release Engineering - 0.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jan 13 2012 Fedora Release Engineering - 0.1-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 3761162cc732cbede41c25bb0954a238a5ef33ab Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 03:55:15 -0600 Subject: [PATCH 18/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 143ce9c..12ac6ef 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pcapdiff/*.pyo %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 0.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Fri Jul 20 2012 Fedora Release Engineering - 0.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 4aa48f57eb0ce06145f8a8fe381ea5942d285de3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 11:41:46 -0500 Subject: [PATCH 19/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 12ac6ef..4f92b53 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pcapdiff/*.pyo %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 0.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Thu Feb 14 2013 Fedora Release Engineering - 0.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 2b2fe8bc1b5d139ead69b9b4ecbef59b0ef64ca5 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 6 Jun 2014 18:51:58 -0500 Subject: [PATCH 20/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 4f92b53..2f119fe 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pcapdiff/*.pyo %changelog +* Fri Jun 06 2014 Fedora Release Engineering - 0.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sat Aug 03 2013 Fedora Release Engineering - 0.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 8a7f98938dd81508edf6dc9b21d57d0d272030ce Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 00:50:58 +0000 Subject: [PATCH 21/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 2f119fe..05c4274 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pcapdiff/*.pyo %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 0.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Jun 06 2014 Fedora Release Engineering - 0.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 68a47a3494c0d8e7a629672e7cf0732f26b28c20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 12:00:01 +0000 Subject: [PATCH 22/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 05c4274..3c7d7c7 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pcapdiff/*.pyo %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 0.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Thu Jun 18 2015 Fedora Release Engineering - 0.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From 0dc79409004dda507ada7863b1e3a81e03357b1a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 01:20:12 +0000 Subject: [PATCH 23/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 3c7d7c7..9d983d2 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pcapdiff/*.pyo %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 0.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 0.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 9c2f2e7598254a7b0ac8dc717128caee17ffa143 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 02:15:40 +0000 Subject: [PATCH 24/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 9d983d2..a4e1272 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pcapdiff/*.pyo %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 0.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Sat Feb 11 2017 Fedora Release Engineering - 0.1-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 6f3eb550bf55e721f39b1c4d78faa473e74cb121 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 8 Feb 2018 18:25:07 +0000 Subject: [PATCH 25/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index a4e1272..d920243 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pcapdiff/*.pyo %changelog +* Thu Feb 08 2018 Fedora Release Engineering - 0.1-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Jul 27 2017 Fedora Release Engineering - 0.1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From d9c9f7a5f90b3078f843f3e7f1bca2bc45a073b3 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:59:52 +0100 Subject: [PATCH 26/54] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- pcapdiff.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index d920243..7721ac8 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -13,7 +13,6 @@ Patch0: pcapdiff-pcapdiff-noshebang.patch Patch1: pcapdiff-printpackets-noshebang.patch Patch2: pcapdiff-pcapdiff_helper-noshebang.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n) BuildArch: noarch BuildRequires: python-devel Requires: pcapy From 99409569dfe97140df8acbd03b29eecbe062cb7b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 08:28:47 +0100 Subject: [PATCH 27/54] Remove %clean section None of currently supported distributions need that. Last one was EL5 which is EOL for a while. Signed-off-by: Igor Gnatenko --- pcapdiff.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 7721ac8..08396f2 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -53,9 +53,6 @@ install -D -m 755 -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/printpackets install -D -m 644 -p printpackets.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/printpackets.py install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcapdiff_helper.py -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) From 0cea0444dba8396b6a9aeaebeee2d55806684526 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Thu, 1 Mar 2018 06:00:36 +0100 Subject: [PATCH 28/54] Update Python 2 dependency declarations to new packaging standards --- pcapdiff.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 08396f2..ac186be 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -14,7 +14,7 @@ Patch1: pcapdiff-printpackets-noshebang.patch Patch2: pcapdiff-pcapdiff_helper-noshebang.patch BuildArch: noarch -BuildRequires: python-devel +BuildRequires: python2-devel Requires: pcapy %description @@ -65,6 +65,10 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap %{_datadir}/pcapdiff/*.pyo %changelog +* Thu Mar 01 2018 Iryna Shcherbina - 0.1-20 +- Update Python 2 dependency declarations to new packaging standards + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Thu Feb 08 2018 Fedora Release Engineering - 0.1-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From b32037df2bb2bfe58109952d52bff84a0d2545fb Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 02:16:35 -0500 Subject: [PATCH 29/54] Remove needless use of %defattr --- pcapdiff.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index ac186be..2930f88 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -55,7 +55,6 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap %files -%defattr(-,root,root,-) %doc README COPYING.2 COPYING.3 %{_bindir}/pcapdiff %{_bindir}/printpackets From c65858a8a2a5b721e06659cdaa926957fa45b8f4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 15:34:19 +0000 Subject: [PATCH 30/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 2930f88..27d3a4e 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets Group: Development/Languages @@ -64,6 +64,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap %{_datadir}/pcapdiff/*.pyo %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 0.1-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Mar 01 2018 Iryna Shcherbina - 0.1-20 - Update Python 2 dependency declarations to new packaging standards (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) From 1504dc898a5fb6fae2456a3b8c856b786adf8adf Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 2 Aug 2018 15:38:07 -0500 Subject: [PATCH 31/54] FTBFS. --- pcapdiff.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 27d3a4e..9eaed04 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -60,8 +60,8 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap %{_bindir}/printpackets %dir %{_datadir}/pcapdiff/ %{_datadir}/pcapdiff/*.py -%{_datadir}/pcapdiff/*.pyc -%{_datadir}/pcapdiff/*.pyo +#%%{_datadir}/pcapdiff/*.pyc +#%%{_datadir}/pcapdiff/*.pyo %changelog * Fri Jul 13 2018 Fedora Release Engineering - 0.1-21 From e391c6dc2c96e9923f9faea78c1b8ee6f0475a05 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 10 Sep 2018 15:12:08 -0500 Subject: [PATCH 32/54] Fix shebangs. --- pcapdiff-pcapdiff-noshebang.patch | 7 ------ pcapdiff-pcapdiff_helper-noshebang.patch | 7 ------ pcapdiff-printpackets-noshebang.patch | 7 ------ pcapdiff.py | 2 +- pcapdiff.spec | 27 ++++++------------------ printpackets | 2 +- 6 files changed, 8 insertions(+), 44 deletions(-) delete mode 100644 pcapdiff-pcapdiff-noshebang.patch delete mode 100644 pcapdiff-pcapdiff_helper-noshebang.patch delete mode 100644 pcapdiff-printpackets-noshebang.patch diff --git a/pcapdiff-pcapdiff-noshebang.patch b/pcapdiff-pcapdiff-noshebang.patch deleted file mode 100644 index 6c9d63a..0000000 --- a/pcapdiff-pcapdiff-noshebang.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- pcapdiff.py 2007-11-30 14:17:27.000000000 -0600 -+++ pcapdiff.py 2007-11-30 14:17:27.000000000 -0600 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # - # pcapdiff: shows you the differences between two pcap dump files - # (such as those produced by tcpdump), with an eye towards counting diff --git a/pcapdiff-pcapdiff_helper-noshebang.patch b/pcapdiff-pcapdiff_helper-noshebang.patch deleted file mode 100644 index 4e6049d..0000000 --- a/pcapdiff-pcapdiff_helper-noshebang.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- pcapdiff_helper.py 2007-11-30 14:22:23.000000000 -0600 -+++ pcapdiff_helper.py 2007-11-30 14:22:23.000000000 -0600 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # - # pcapdiff_helper: helper functions for pcapdiff.py - # diff --git a/pcapdiff-printpackets-noshebang.patch b/pcapdiff-printpackets-noshebang.patch deleted file mode 100644 index db45e1d..0000000 --- a/pcapdiff-printpackets-noshebang.patch +++ /dev/null @@ -1,7 +0,0 @@ ---- printpackets.py 2007-11-30 14:17:58.000000000 -0600 -+++ printpackets.py 2007-11-30 14:17:58.000000000 -0600 -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # - # printpackets: - # prints out packets from a pcap dump file with ether and ip header info diff --git a/pcapdiff.py b/pcapdiff.py index 65b9419..d022f02 100644 --- a/pcapdiff.py +++ b/pcapdiff.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 if __name__ == '__main__': import sys sys.path.insert(0, '/usr/share/pcapdiff') diff --git a/pcapdiff.spec b/pcapdiff.spec index 9eaed04..1ce2344 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,17 +1,13 @@ Name: pcapdiff Version: 0.1 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets -Group: Development/Languages License: GPLv2+ and GPLv3+ URL: http://www.eff.org/testyourisp/pcapdiff/ Source0: http://www.eff.org/files/pcapdiff-%{version}.tar.gz Source1: pcapdiff.py Source2: printpackets -Patch0: pcapdiff-pcapdiff-noshebang.patch -Patch1: pcapdiff-printpackets-noshebang.patch -Patch2: pcapdiff-pcapdiff_helper-noshebang.patch BuildArch: noarch BuildRequires: python2-devel @@ -30,23 +26,9 @@ and EFF's Test Your ISP Project for more background. %prep %setup -qn pcapdiff -%patch0 -p0 -%patch1 -p0 -%patch2 -p0 - %build - -#fix encodings -#sed -i 's/\r//' LICENSE -#sed -i 's/\r//' README -#sed -i 's/\r//' pcapdiff.html -#iconv -f IBM850 -t UTF8 pcapdiff.html > pcapdiff.html.tmp -#mv pcapdiff.html.tmp pcapdiff.html - - %install -rm -rf $RPM_BUILD_ROOT install -D -m 755 -p %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/pcapdiff install -D -m 644 -p pcapdiff.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcapdiff.py install -D -m 755 -p %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/printpackets @@ -60,10 +42,13 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap %{_bindir}/printpackets %dir %{_datadir}/pcapdiff/ %{_datadir}/pcapdiff/*.py -#%%{_datadir}/pcapdiff/*.pyc -#%%{_datadir}/pcapdiff/*.pyo +%{_datadir}/pcapdiff/*.pyc +%{_datadir}/pcapdiff/*.pyo %changelog +* Mon Sep 10 2018 Gwyn Ciesla - 0.1-22 +- Fix shebang handling. + * Fri Jul 13 2018 Fedora Release Engineering - 0.1-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/printpackets b/printpackets index ed87944..51e59e2 100644 --- a/printpackets +++ b/printpackets @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python2 if __name__ == '__main__': import sys sys.path.insert(0, '/usr/share/pcapdiff') From bd6db92b8bdec1493558163cf95285bf418c6069 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 10 Sep 2018 15:22:46 -0500 Subject: [PATCH 33/54] Sigh. --- pcapdiff.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 1ce2344..cb7b2a9 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -42,8 +42,8 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap %{_bindir}/printpackets %dir %{_datadir}/pcapdiff/ %{_datadir}/pcapdiff/*.py -%{_datadir}/pcapdiff/*.pyc -%{_datadir}/pcapdiff/*.pyo +#%{_datadir}/pcapdiff/*.pyc +#%{_datadir}/pcapdiff/*.pyo %changelog * Mon Sep 10 2018 Gwyn Ciesla - 0.1-22 From 195e50319fdf032b913c87ec293a8ae881873bcf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 18:05:35 +0000 Subject: [PATCH 34/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index cb7b2a9..98f5f92 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPLv2+ and GPLv3+ @@ -46,6 +46,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 0.1-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Sep 10 2018 Gwyn Ciesla - 0.1-22 - Fix shebang handling. From 21572e1fd482a12a4bc0a4adbfadfabd393848cd Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 00:11:29 +0000 Subject: [PATCH 35/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 98f5f92..63edd52 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPLv2+ and GPLv3+ @@ -46,6 +46,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 0.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 0.1-23 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 52bf9352bf394398cf2cbf61f14ee325519a0713 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 6 Aug 2019 14:33:03 -0500 Subject: [PATCH 36/54] Python 3. --- pcapdiff-python3.patch | 345 +++++++++++++++++++++++++++++++++++++++++ pcapdiff.py | 2 +- pcapdiff.spec | 11 +- 3 files changed, 354 insertions(+), 4 deletions(-) create mode 100644 pcapdiff-python3.patch diff --git a/pcapdiff-python3.patch b/pcapdiff-python3.patch new file mode 100644 index 0000000..176d8df --- /dev/null +++ b/pcapdiff-python3.patch @@ -0,0 +1,345 @@ +--- pcapdiff.py.bak 2007-11-27 04:21:09.000000000 -0600 ++++ pcapdiff.py 2019-08-06 14:05:25.910214377 -0500 +@@ -42,14 +42,14 @@ + skew_amount = 0 + + def print_usage(): +- print ''' ++ print(''' + Usage: + %s [-v | -h] + %s [-V[V]] [-c] [-t] [-s] + +- ''' % (sys.argv[0], sys.argv[0]) ++ ''' % (sys.argv[0], sys.argv[0])) + +- print ''' ++ print(''' + pcapdiff takes two pcap files (usually produced by running tcpdump on two + different computers) and compares them to find dropped and forged packets + between the two machines. Required arguments are the filenames of the two +@@ -95,14 +95,14 @@ + skew and apply this difference to all other timestamps. The purpose of + this option is to reduce the amount of memory used by pcapdiff; it will + never affect the output (except for printing the clock skew). +- ''' ++ ''') + + (opts, args) = \ + getopt.gnu_getopt(sys.argv[1:], 'vhVcts', ['version', 'help', 'verbose=', 'use-checksum', 'ignore-timestamps', 'skew-clocks']) + + for opt in opts: + if opt[0] == '-v' or opt[0] == '--version': +- print "pcapdiff version:", version ++ print("pcapdiff version:", version) + sys.exit(0) + if opt[0] == '-h' or opt[0] == '--help': + print_usage() +@@ -125,7 +125,7 @@ + pcap_remote = pcapy.open_offline(args[2]) + ip_remote = args[3] + except: +- print "Error opening file or identifying IP address" ++ print("Error opening file or identifying IP address") + print_usage() + sys.exit(1) + +@@ -147,7 +147,7 @@ + ''' + while 1: + try: +- packet = a.next() ++ packet = a.__next__() + except pcapy.PcapError: + return 0 + spacket = parse_and_save(packet) +@@ -218,7 +218,7 @@ + next['remote'] = get_packet(pcap_remote, 1) + + if ['local'] == 0 or next['remote'] == 0: +- print "ERROR: No packets in one or more files!" ++ print("ERROR: No packets in one or more files!") + sys.exit(2) + + last_ts_local = tsp(next['local']) +@@ -226,7 +226,7 @@ + first_ts = max(last_ts_local, last_ts_remote) + if skew_clocks: + skew_amount = last_ts_local - last_ts_remote +- if v>=1: print "Clock skew:", skew_amount ++ if v>=1: print("Clock skew:", skew_amount) + + # now, find first real packet we care about: + if not is_our_traffic(next['local']): +@@ -306,9 +306,9 @@ + + # XXX put code here + +-if v >= 2: print "Parsed. Local num of unique packets: %d, num of duplicate packets: %d" % (len(manifest.keys()), total['duplicates']) ++if v >= 2: print("Parsed. Local num of unique packets: %d, num of duplicate packets: %d" % (len(list(manifest.keys())), total['duplicates'])) + +-if v >= 2: print "Remote num of unmatching packets: %d" % len(manifest.keys()) ++if v >= 2: print("Remote num of unmatching packets: %d" % len(list(manifest.keys()))) + + dropped_in = [] + dropped_out = [] +@@ -316,70 +316,70 @@ + forged_out = [] + errors = [] + +-for p in manifest.keys(): ++for p in list(manifest.keys()): + mp = manifest[p] +- if v >= 2: print '--------------' ++ if v >= 2: print('--------------') + ip_from = re_ipfrom.search(p).group(1) + ip_to = re_ipto.search(p).group(1) + if ip_from == ip_local and ip_to == ip_remote: + if mp > 0: +- if v >=2 : print "DROPPED: %d" % mp ++ if v >=2 : print("DROPPED: %d" % mp) + dropped_out += [getid(p)] * abs(mp) + elif mp < 0: +- if v >= 2: print "!!! FORGED: %d" % mp ++ if v >= 2: print("!!! FORGED: %d" % mp) + forged_out += [getid(p)] * abs(mp) + else: +- if v >= 2: print "ERROR" ++ if v >= 2: print("ERROR") + errors += [getid(p)] + elif ip_from == ip_remote and ip_to == ip_local: + if mp > 0: +- if v >= 2: print "!!! FORGED: %d" % mp ++ if v >= 2: print("!!! FORGED: %d" % mp) + forged_in += [getid(p)] * abs(mp) + elif mp < 0: +- if v >= 2: print "DROPPED: %d" % mp ++ if v >= 2: print("DROPPED: %d" % mp) + dropped_in += [getid(p)] * abs(mp) + else: +- if v >= 2: print "ERROR" ++ if v >= 2: print("ERROR") + errors += [getid(p)] + else: + if v >= 2: +- print "ERROR: ip addrs should have been dropped %d -> %d" % (ip_from, ip_to) ++ print("ERROR: ip addrs should have been dropped %d -> %d" % (ip_from, ip_to)) + errors += [1] +- if v >= 2: print p ++ if v >= 2: print(p) + + if v >= 1: +- print "Here are the IP identification fields for forged and dropped packets:" +- print +- print "list of inbound forged packets: ", ' '.join(forged_in) +- print +- print "list of outbound forged packets: ", ' '.join(forged_out) +- print +- print "list of inbound dropped packets: ", ' '.join(dropped_in) +- print +- print "list of outbound dropped packets: ", ' '.join(dropped_out) +- print ++ print("Here are the IP identification fields for forged and dropped packets:") ++ print() ++ print("list of inbound forged packets: ", ' '.join(forged_in)) ++ print() ++ print("list of outbound forged packets: ", ' '.join(forged_out)) ++ print() ++ print("list of inbound dropped packets: ", ' '.join(dropped_in)) ++ print() ++ print("list of outbound dropped packets: ", ' '.join(dropped_out)) ++ print() + + mystery = {} + mystery['in'] = total['local'] - total['remote_received'] + len(forged_out) - len(dropped_out) + mystery['out'] = total['remote'] - total['local_received'] + len(forged_in) - len(dropped_in) + +-print "-------------" +-print "Packet counts" +-print "-------------" +- +-print " inbound",\ +- " outbound" +-print "sent: %9d" % total['remote'],\ +- " %9d" % total['local'] +-print "received: %9d" % total['local_received'],\ +- " %9d" % total['remote_received'] +-print "forged: %9d" % len(forged_in),\ +- " %9d" % len(forged_out) +-print "dropped: %9d" % len(dropped_in),\ +- " %9d" % len(dropped_out) ++print("-------------") ++print("Packet counts") ++print("-------------") ++ ++print(" inbound",\ ++ " outbound") ++print("sent: %9d" % total['remote'],\ ++ " %9d" % total['local']) ++print("received: %9d" % total['local_received'],\ ++ " %9d" % total['remote_received']) ++print("forged: %9d" % len(forged_in),\ ++ " %9d" % len(forged_out)) ++print("dropped: %9d" % len(dropped_in),\ ++ " %9d" % len(dropped_out)) + if mystery['in'] != 0 or mystery['out'] != 0: +- print "mystery: %9d" % mystery['in'],\ +- " %9d" % mystery['out'] ++ print("mystery: %9d" % mystery['in'],\ ++ " %9d" % mystery['out']) + +-if len(errors): print "\nERRORS: %d" % len(errors) ++if len(errors): print("\nERRORS: %d" % len(errors)) + +--- printpackets.py.bak 2007-11-16 22:09:07.000000000 -0600 ++++ printpackets.py 2019-08-06 14:05:45.300107950 -0500 +@@ -31,13 +31,13 @@ + try: + pcap_local = pcapy.open_offline(sys.argv[1]) + except IndexError: +- print "Usage: %s " % sys.argv[0] ++ print("Usage: %s " % sys.argv[0]) + sys.exit(1) + + while 1: + try: +- packet = pcap_local.next() ++ packet = next(pcap_local) + except pcapy.PcapError: + break + +- print "------------------\n%s" % packet_to_string(parse_and_save(packet)) ++ print("------------------\n%s" % packet_to_string(parse_and_save(packet))) +--- pcapdiff_helper.py.bak 2007-11-16 22:03:16.000000000 -0600 ++++ pcapdiff_helper.py 2019-08-06 14:10:12.034643912 -0500 +@@ -30,8 +30,8 @@ + + s = packet_to_string(spacket) + if s: +- print '------------' +- print s ++ print('------------') ++ print(s) + + def packet_to_string(spacket, hidefields=0): + ''' +@@ -51,7 +51,7 @@ + + for field in fields: + try: +- if spacket.has_key(field) and not (hidefields and field in hiddenfields): ++ if field in spacket and not (hidefields and field in hiddenfields): + if field == 'ip_payload_data': + s += field + ": " + str(spacket[field]).encode("string_escape") + "\n" + else: +--- pcapdiff_helper.py~ 2019-08-06 14:10:39.000000000 -0500 ++++ pcapdiff_helper.py 2019-08-06 14:21:15.141999262 -0500 +@@ -30,8 +30,8 @@ + + s = packet_to_string(spacket) + if s: +- print('------------') +- print(s) ++ print('------------') ++ print(s) + + def packet_to_string(spacket, hidefields=0): + ''' +--- pcapdiff_helper.py~ 2019-08-06 14:21:31.000000000 -0500 ++++ pcapdiff_helper.py 2019-08-06 14:22:39.880533430 -0500 +@@ -47,17 +47,17 @@ + hiddenfields = 'timestamp eth_type eth_dest eth_src ip_tos ip_ttl ip_header_checksum'.split(' ') + + if hidefields and spacket['eth_type'] == '(not IPv4)': +- return ++ return + + for field in fields: +- try: ++ try: + if field in spacket and not (hidefields and field in hiddenfields): +- if field == 'ip_payload_data': ++ if field == 'ip_payload_data': + s += field + ": " + str(spacket[field]).encode("string_escape") + "\n" +- else: +- s += field + ": " + str(spacket[field]) + "\n" +- except KeyError: +- pass ++ else: ++ s += field + ": " + str(spacket[field]) + "\n" ++ except KeyError: ++ pass + + return s + +--- pcapdiff_helper.py~ 2019-08-06 14:22:49.000000000 -0500 ++++ pcapdiff_helper.py 2019-08-06 14:23:12.813352392 -0500 +@@ -51,7 +51,7 @@ + + for field in fields: + try: +- if field in spacket and not (hidefields and field in hiddenfields): ++ if field in spacket and not (hidefields and field in hiddenfields): + if field == 'ip_payload_data': + s += field + ": " + str(spacket[field]).encode("string_escape") + "\n" + else: +--- pcapdiff_helper.py~ 2019-08-06 14:23:18.000000000 -0500 ++++ pcapdiff_helper.py 2019-08-06 14:23:41.238196138 -0500 +@@ -53,7 +53,7 @@ + try: + if field in spacket and not (hidefields and field in hiddenfields): + if field == 'ip_payload_data': +- s += field + ": " + str(spacket[field]).encode("string_escape") + "\n" ++ s += field + ": " + str(spacket[field]).encode("string_escape") + "\n" + else: + s += field + ": " + str(spacket[field]) + "\n" + except KeyError: +--- pcapdiff_helper.py~ 2019-08-06 14:23:47.000000000 -0500 ++++ pcapdiff_helper.py 2019-08-06 14:24:12.667023367 -0500 +@@ -71,8 +71,8 @@ + + packet = dump_packet[1] + if ord(packet[12]) != 8 or ord(packet[13]) != 0: +- spacket['eth_type'] = '(not IPv4)' +- return spacket ++ spacket['eth_type'] = '(not IPv4)' ++ return spacket + + spacket['eth_type'] = "%02x%02x" % (ord(packet[12]), ord(packet[13])) + +--- pcapdiff_helper.py~ 2019-08-06 14:24:19.000000000 -0500 ++++ pcapdiff_helper.py 2019-08-06 14:25:06.375728108 -0500 +@@ -82,8 +82,8 @@ + ip_packet = packet[14:] + spacket['ip_version'] = binascii.hexlify(ip_packet[0])[0] + if spacket['ip_version'] != '4': +- spacket['eth_type'] = '(not IPv4)' +- return spacket ++ spacket['eth_type'] = '(not IPv4)' ++ return spacket + + spacket['ip_header_length'] = binascii.hexlify(ip_packet[0])[1] + spacket['ip_tos'] = binascii.hexlify(ip_packet[1]) +--- pcapdiff_helper.py~ 2019-08-06 14:25:15.000000000 -0500 ++++ pcapdiff_helper.py 2019-08-06 14:27:11.309041330 -0500 +@@ -100,14 +100,14 @@ + #payload = ip_packet[header_len:] # also in bytes + if ignore_tcp_checksum and spacket['ip_protocol'] == 0x06: + #ignore TCP checksums because of offloading +- payload = ip_packet[header_len:header_len+16] +\ +- '\0\0' + ip_packet[header_len+18:spacket['ip_total_length']] # also in bytes ++ payload = ip_packet[header_len:header_len+16] +\ ++ '\0\0' + ip_packet[header_len+18:spacket['ip_total_length']] # also in bytes + elif ignore_tcp_checksum and spacket['ip_protocol'] == 0x11: +- #ignore UDP checksums because of offloading +- payload = ip_packet[header_len:header_len+4] +\ +- '\0\0' + ip_packet[header_len+6:spacket['ip_total_length']] # also in bytes ++ #ignore UDP checksums because of offloading ++ payload = ip_packet[header_len:header_len+4] +\ ++ '\0\0' + ip_packet[header_len+6:spacket['ip_total_length']] # also in bytes + else: +- payload = ip_packet[header_len:spacket['ip_total_length']] # also in bytes ++ payload = ip_packet[header_len:spacket['ip_total_length']] # also in bytes + + spacket['ip_payload_length'] = len(payload) + spacket['ip_payload_data'] = payload diff --git a/pcapdiff.py b/pcapdiff.py index d022f02..b96fa6e 100644 --- a/pcapdiff.py +++ b/pcapdiff.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 if __name__ == '__main__': import sys sys.path.insert(0, '/usr/share/pcapdiff') diff --git a/pcapdiff.spec b/pcapdiff.spec index 63edd52..c095119 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPLv2+ and GPLv3+ @@ -8,10 +8,11 @@ URL: http://www.eff.org/testyourisp/pcapdiff/ Source0: http://www.eff.org/files/pcapdiff-%{version}.tar.gz Source1: pcapdiff.py Source2: printpackets +Patch0: pcapdiff-python3.patch BuildArch: noarch -BuildRequires: python2-devel -Requires: pcapy +BuildRequires: python3-devel +Requires: python3-pcapy %description Pcapdiff is a tool developed by the EFF to compare two packet captures and @@ -25,6 +26,7 @@ and EFF's Test Your ISP Project for more background. %prep %setup -qn pcapdiff +%patch0 -p0 %build @@ -46,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Tue Aug 06 2019 Gwyn Ciesla - 0.1-25 +- Python 3. + * Fri Jul 26 2019 Fedora Release Engineering - 0.1-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From f2f18b567c26c0a1984fa83046fef48048fb92dc Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Tue, 13 Aug 2019 08:21:24 -0500 Subject: [PATCH 37/54] Fix last python 2 bit. --- pcapdiff.spec | 5 ++++- printpackets | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index c095119..ef33731 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPLv2+ and GPLv3+ @@ -48,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Tue Aug 13 2019 Gwyn Ciesla 0.1-26 +- Eliminate final python 2 dep. + * Tue Aug 06 2019 Gwyn Ciesla - 0.1-25 - Python 3. diff --git a/printpackets b/printpackets index 51e59e2..c67695b 100644 --- a/printpackets +++ b/printpackets @@ -1,4 +1,4 @@ -#!/usr/bin/python2 +#!/usr/bin/python3 if __name__ == '__main__': import sys sys.path.insert(0, '/usr/share/pcapdiff') From 793e3dd126b49871cea0f5dd8beb06d248bc36a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 21:01:58 +0000 Subject: [PATCH 38/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index ef33731..666068b 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPLv2+ and GPLv3+ @@ -48,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 0.1-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Tue Aug 13 2019 Gwyn Ciesla 0.1-26 - Eliminate final python 2 dep. From 8b300f8e01894f7a16b683302530a8d5187ed19b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 13:16:17 +0000 Subject: [PATCH 39/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 666068b..76451ee 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPLv2+ and GPLv3+ @@ -48,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 0.1-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 0.1-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 0565fae8783b0344146b90d1d34790c5e176ab7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 23:03:33 +0000 Subject: [PATCH 40/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 76451ee..692253c 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPLv2+ and GPLv3+ @@ -48,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 0.1-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 0.1-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From fe82501d30ca29f5d78ac6a3892b8bf250ccb1b1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 17:49:07 +0000 Subject: [PATCH 41/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 692253c..88b8bf2 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPLv2+ and GPLv3+ @@ -48,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 0.1-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 0.1-29 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 1a74c81851e3d20db22e69f9efd5a68802cb108f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 23:00:37 +0000 Subject: [PATCH 42/54] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 88b8bf2..7ac59dc 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPLv2+ and GPLv3+ @@ -48,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 0.1-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 0.1-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 26d1a4cd7d696d5a53c8b6d24110311807822e83 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 02:48:48 +0000 Subject: [PATCH 43/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 7ac59dc..9afb0de 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPLv2+ and GPLv3+ @@ -48,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 0.1-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 0.1-31 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 39822d0417de9b4f293679b4c565003c11b32f7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 23:29:34 +0000 Subject: [PATCH 44/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 9afb0de..83837bb 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPLv2+ and GPLv3+ @@ -48,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 0.1-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 0.1-32 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 80f9d306b467bc0710be3140f0e4c9d9ac19651e Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Sat, 4 Mar 2023 20:11:10 -0600 Subject: [PATCH 45/54] migrated to SPDX license --- pcapdiff.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 83837bb..9515f3a 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,9 +1,9 @@ Name: pcapdiff Version: 0.1 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets -License: GPLv2+ and GPLv3+ +License: GPL-2.0-or-later AND GPL-3.0-or-later URL: http://www.eff.org/testyourisp/pcapdiff/ Source0: http://www.eff.org/files/pcapdiff-%{version}.tar.gz Source1: pcapdiff.py @@ -48,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Sun Mar 05 2023 Gwyn Ciesla - 0.1-34 +- migrated to SPDX license + * Thu Jan 19 2023 Fedora Release Engineering - 0.1-33 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f9e31a349997b7458cf28e146a49dbb71e7fd487 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 18:47:10 +0000 Subject: [PATCH 46/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 9515f3a..2b51683 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -48,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 0.1-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sun Mar 05 2023 Gwyn Ciesla - 0.1-34 - migrated to SPDX license From f21f7ab28227209667be0c6fc7d6b77f50123a37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 11:58:28 +0000 Subject: [PATCH 47/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 2b51683..eb1c1c4 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -48,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 0.1-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 0.1-35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From a51adf3794528d1b190d5a8db45e900698a12089 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 12:14:22 +0000 Subject: [PATCH 48/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index eb1c1c4..9f8f4f1 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 36%{?dist} +Release: 37%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -48,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 0.1-37 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 0.1-36 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 338e79240b8dfd32a2dc269c6c73c40786dcca36 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:48 +0200 Subject: [PATCH 49/54] Eliminate use of obsolete %patchN syntax (#2283636) --- pcapdiff.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 9f8f4f1..34f2b7b 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -26,7 +26,7 @@ and EFF's Test Your ISP Project for more background. %prep %setup -qn pcapdiff -%patch0 -p0 +%patch -P0 -p0 %build From b55cb0ab11d618914ef7807ae19b7ba2474bc496 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 21:35:34 +0000 Subject: [PATCH 50/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 34f2b7b..f9412ee 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 37%{?dist} +Release: 38%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -48,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 0.1-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Jan 25 2024 Fedora Release Engineering - 0.1-37 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 690c248f09d6fa63627055fc478628aedc607c5d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 22:31:36 +0000 Subject: [PATCH 51/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index f9412ee..0006c88 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 38%{?dist} +Release: 39%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -48,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 0.1-39 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 0.1-38 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 41fbccd380e524a67d569c0bf8003a5a41a84191 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 00:01:32 +0000 Subject: [PATCH 52/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 0006c88..4321a5d 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 39%{?dist} +Release: 40%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -48,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.1-40 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 0.1-39 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From f00b46792e38ec27246c88d79ed2d0fec268b3a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 23:22:14 +0000 Subject: [PATCH 53/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 4321a5d..5ff13bd 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 40%{?dist} +Release: 41%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -48,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 0.1-41 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jul 25 2025 Fedora Release Engineering - 0.1-40 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From e7c52d6413e1d7a5cde6cce9e5fad8d3e68bff5b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jul 2026 10:53:32 +0000 Subject: [PATCH 54/54] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- pcapdiff.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pcapdiff.spec b/pcapdiff.spec index 5ff13bd..7eaa87b 100644 --- a/pcapdiff.spec +++ b/pcapdiff.spec @@ -1,6 +1,6 @@ Name: pcapdiff Version: 0.1 -Release: 41%{?dist} +Release: 42%{?dist} Summary: Compares packet captures, detects forged, dropped or mangled packets License: GPL-2.0-or-later AND GPL-3.0-or-later @@ -48,6 +48,9 @@ install -D -m 644 -p pcapdiff_helper.py $RPM_BUILD_ROOT%{_datadir}/pcapdiff/pcap #%{_datadir}/pcapdiff/*.pyo %changelog +* Thu Jul 16 2026 Fedora Release Engineering - 0.1-42 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Fri Jan 16 2026 Fedora Release Engineering - 0.1-41 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild