From bcf44e19331d5c7b4c7ad1b71476e12e59b67d99 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 12 Jan 2017 17:30:26 +0100 Subject: [PATCH 01/47] Rebuild for readline 7.x Signed-off-by: Igor Gnatenko --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index 7ba7a40..0983652 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.4 -Release: 13%{?dist} +Release: 14%{?dist} Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}.tbz2 URL: http://fedorahosted.org/dropwatch License: GPLv2+ @@ -45,6 +45,9 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %changelog +* Thu Jan 12 2017 Igor Gnatenko - 1.4-14 +- Rebuild for readline 7.x + * Wed Feb 03 2016 Fedora Release Engineering - 1.4-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 0bc2fb3abcad7b3fe267069d41796eee0834b69c Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Fri, 13 Jan 2017 07:35:33 -0500 Subject: [PATCH 02/47] Resolves: bz 1412926 --- dropwatch.spec | 7 ++++++- printf-format-fix.patch | 12 ++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 printf-format-fix.patch diff --git a/dropwatch.spec b/dropwatch.spec index 0983652..09c8529 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.4 -Release: 14%{?dist} +Release: 15%{?dist} Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}.tbz2 URL: http://fedorahosted.org/dropwatch License: GPLv2+ @@ -12,6 +12,7 @@ BuildRequires: binutils-devel, binutils-static libnl3-devel pkgconfig Requires: libnl3, readline Patch0: convert-a-to-m-in-scanf-line.patch +Patch1: printf-format-fix.patch %description dropwatch is an utility to interface to the kernel to monitor for dropped @@ -20,6 +21,7 @@ network packets. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build cd src @@ -45,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %changelog +* Fri Jan 13 2017 Neil Horman - 1.4-15 +- fix build error (bz 1412926) + * Thu Jan 12 2017 Igor Gnatenko - 1.4-14 - Rebuild for readline 7.x diff --git a/printf-format-fix.patch b/printf-format-fix.patch new file mode 100644 index 0000000..9cc0839 --- /dev/null +++ b/printf-format-fix.patch @@ -0,0 +1,12 @@ +diff -up ./src/main.c.fixup ./src/main.c +--- ./src/main.c.fixup 2017-01-13 07:26:06.255896365 -0500 ++++ ./src/main.c 2017-01-13 07:26:34.349677272 -0500 +@@ -333,7 +333,7 @@ void handle_dm_alert_msg(struct netlink_ + printf ("%d drops at location %p\n", alert->points[i].count, location); + else + printf ("%d drops at %s+%llx (%p)\n", +- alert->points[i].count, res.symbol, res.offset, location); ++ alert->points[i].count, res.symbol, (long long unsigned)res.offset, location); + acount++; + if (alimit && (acount == alimit)) { + printf("Alert limit reached, deactivating!\n"); From 07810f62066c2092f3f8c85b82c31d783c4b6cd0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 08:37:46 +0000 Subject: [PATCH 03/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index 09c8529..8122903 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.4 -Release: 15%{?dist} +Release: 16%{?dist} Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}.tbz2 URL: http://fedorahosted.org/dropwatch License: GPLv2+ @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.4-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Fri Jan 13 2017 Neil Horman - 1.4-15 - fix build error (bz 1412926) From 34789f23ff3d378fcf49fa7e99e9824b3ea1dd9f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 06:35:20 +0000 Subject: [PATCH 04/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index 8122903..28a9a27 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.4 -Release: 16%{?dist} +Release: 17%{?dist} Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}.tbz2 URL: http://fedorahosted.org/dropwatch License: GPLv2+ @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.4-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.4-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From adf8d33ab8528deef7dfcf6728824538635423e2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 19:47:26 +0000 Subject: [PATCH 05/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index 28a9a27..62c500f 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.4 -Release: 17%{?dist} +Release: 18%{?dist} Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}.tbz2 URL: http://fedorahosted.org/dropwatch License: GPLv2+ @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 1.4-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.4-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 8bde48aae4d5c46115e1199fee89560c6f184997 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Tue, 30 Jan 2018 11:25:17 -0600 Subject: [PATCH 06/47] Drop unnecessary BuildRequires for binutils-static Not building kernel modules, so use kernel-headers instead of kernel-devel --- dropwatch.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dropwatch.spec b/dropwatch.spec index 62c500f..e5ec6db 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,14 +1,14 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.4 -Release: 18%{?dist} +Release: 19%{?dist} Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}.tbz2 URL: http://fedorahosted.org/dropwatch License: GPLv2+ Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: kernel-devel, readline-devel -BuildRequires: binutils-devel, binutils-static libnl3-devel pkgconfig +BuildRequires: kernel-headers readline-devel +BuildRequires: binutils-devel libnl3-devel pkgconfig Requires: libnl3, readline Patch0: convert-a-to-m-in-scanf-line.patch @@ -47,6 +47,10 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %changelog +* Tue Jan 30 2018 Merlin Mathesius - 1.4-19 +- Drop unnecessary BuildRequires for binutils-static + Not building kernel modules, so use kernel-headers instead of kernel-devel + * Wed Aug 02 2017 Fedora Release Engineering - 1.4-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 06c32af03f36af60b251f75e8a7fbad21265f307 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Thu, 1 Feb 2018 16:15:10 +0100 Subject: [PATCH 07/47] Build with linker flags from redhat-rpm-config --- dropwatch.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dropwatch.spec b/dropwatch.spec index e5ec6db..453ae97 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.4 -Release: 19%{?dist} +Release: 20%{?dist} Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}.tbz2 URL: http://fedorahosted.org/dropwatch License: GPLv2+ @@ -25,7 +25,7 @@ network packets. %build cd src -export CFLAGS=$RPM_OPT_FLAGS +export CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" make %install @@ -47,6 +47,9 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %changelog +* Thu Feb 1 2018 Florian Weimer - 1.4-20 +- Build with linker flags from redhat-rpm-config + * Tue Jan 30 2018 Merlin Mathesius - 1.4-19 - Drop unnecessary BuildRequires for binutils-static Not building kernel modules, so use kernel-headers instead of kernel-devel From a1f6810696a93fe88a44f23d08b1a7fd6a4ffca6 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Fri, 2 Feb 2018 07:21:46 -0500 Subject: [PATCH 08/47] Resolves: bz1541058 --- dropwatch-linker-fix.patch | 11 +++++++++++ dropwatch.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 dropwatch-linker-fix.patch diff --git a/dropwatch-linker-fix.patch b/dropwatch-linker-fix.patch new file mode 100644 index 0000000..b9fe6f8 --- /dev/null +++ b/dropwatch-linker-fix.patch @@ -0,0 +1,11 @@ +diff -up ./src/Makefile.linker ./src/Makefile +--- ./src/Makefile.linker 2012-05-30 18:35:40.000000000 -0400 ++++ ./src/Makefile 2018-02-02 07:19:25.625443850 -0500 +@@ -1,6 +1,6 @@ + all: dropwatch + CFLAGS+=-c -g -D_GNU_SOURCE -Wall -Werror `pkg-config --cflags libnl-3.0` +-LDFLAGS=-lbfd -lreadline -lnl-3 -lnl-genl-3 ++LDFLAGS+=-lbfd -lreadline -lnl-3 -lnl-genl-3 + OBJFILES := main.o lookup.o\ + lookup_bfd.o lookup_kas.o + diff --git a/dropwatch.spec b/dropwatch.spec index 453ae97..cbbc780 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.4 -Release: 20%{?dist} +Release: 21%{?dist} Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}.tbz2 URL: http://fedorahosted.org/dropwatch License: GPLv2+ @@ -13,6 +13,7 @@ Requires: libnl3, readline Patch0: convert-a-to-m-in-scanf-line.patch Patch1: printf-format-fix.patch +Patch2: dropwatch-linker-fix.patch %description dropwatch is an utility to interface to the kernel to monitor for dropped @@ -22,6 +23,7 @@ network packets. %setup -q %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build cd src @@ -47,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %changelog +* Fri Feb 1 2018 Neil Horman - 1.4-21 +- Fix linker flag recognition (bz 1541058) + * Thu Feb 1 2018 Florian Weimer - 1.4-20 - Build with linker flags from redhat-rpm-config From 9976d0bd438fe68a9190cef2b7e55fa5184eda41 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 07:21:01 +0000 Subject: [PATCH 09/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index cbbc780..ae7cd47 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.4 -Release: 21%{?dist} +Release: 22%{?dist} Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}.tbz2 URL: http://fedorahosted.org/dropwatch License: GPLv2+ @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.4-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Fri Feb 1 2018 Neil Horman - 1.4-21 - Fix linker flag recognition (bz 1541058) From 8f7f5437259976683357f44e0eb91ad4a19fbea1 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:15:15 +0100 Subject: [PATCH 10/47] 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 --- dropwatch.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index ae7cd47..01a9d06 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -6,7 +6,6 @@ Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}.tb URL: http://fedorahosted.org/dropwatch License: GPLv2+ Group: Applications/System -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root BuildRequires: kernel-headers readline-devel BuildRequires: binutils-devel libnl3-devel pkgconfig Requires: libnl3, readline From f9d69881f739135c7abe7e6abd28345d0aacc30b Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 14 Feb 2018 07:58:35 +0100 Subject: [PATCH 11/47] 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 --- dropwatch.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/dropwatch.spec b/dropwatch.spec index 01a9d06..92d56f4 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -36,9 +36,6 @@ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 install -m0755 src/dropwatch $RPM_BUILD_ROOT%{_bindir} install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 -%clean -rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) From 84998050e4a67d7ff15fdbf2bdb0e1a5e4f38fa6 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Tue, 8 May 2018 08:47:15 -0400 Subject: [PATCH 12/47] Updating source url for github --- dropwatch.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dropwatch.spec b/dropwatch.spec index 92d56f4..ddb0e59 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,9 +1,9 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.4 -Release: 22%{?dist} -Source0: https://fedorahosted.org/releases/d/r/dropwatch/dropwatch-%{version}.tbz2 -URL: http://fedorahosted.org/dropwatch +Release: 23%{?dist} +Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tbz2 +URL: https://github.com/nhorman/dropwatch License: GPLv2+ Group: Applications/System BuildRequires: kernel-headers readline-devel @@ -45,6 +45,9 @@ install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 %doc COPYING %changelog +* Tue May 08 2018 Neil Horman - 1.4-23 +- Updated specfile url and source location for github + * Wed Feb 07 2018 Fedora Release Engineering - 1.4-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 5a973f26309be8595e1c1c5d453717d58bac480e Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Tue, 15 May 2018 14:58:45 -0400 Subject: [PATCH 13/47] Update to latest upstream and add CI harness --- .gitignore | 1 + convert-a-to-m-in-scanf-line.patch | 12 ----- dropwatch-linker-fix.patch | 11 ----- dropwatch.spec | 28 ++++++----- printf-format-fix.patch | 12 ----- sources | 2 +- tests/README | 2 + tests/inventory | 3 ++ tests/selftest/Makefile | 64 ++++++++++++++++++++++++++ tests/selftest/PURPOSE | 4 ++ tests/selftest/runtest.sh | 74 ++++++++++++++++++++++++++++++ tests/tests.yml | 19 ++++++++ 12 files changed, 181 insertions(+), 51 deletions(-) delete mode 100644 convert-a-to-m-in-scanf-line.patch delete mode 100644 dropwatch-linker-fix.patch delete mode 100644 printf-format-fix.patch create mode 100644 tests/README create mode 100644 tests/inventory create mode 100644 tests/selftest/Makefile create mode 100644 tests/selftest/PURPOSE create mode 100755 tests/selftest/runtest.sh create mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore index 58a89e1..f240a26 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ dropwatch-1.0.tbz2 dropwatch-1.1-0.tbz2 dropwatch-1.2.tbz2 /dropwatch-1.4.tbz2 +/dropwatch-1.5.tar.gz diff --git a/convert-a-to-m-in-scanf-line.patch b/convert-a-to-m-in-scanf-line.patch deleted file mode 100644 index 2443ae3..0000000 --- a/convert-a-to-m-in-scanf-line.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./src/lookup_kas.c.orig ./src/lookup_kas.c ---- ./src/lookup_kas.c.orig 2012-05-30 18:43:23.000000000 -0400 -+++ ./src/lookup_kas.c 2015-07-06 09:03:59.093744007 -0400 -@@ -102,7 +102,7 @@ static int lookup_kas_proc(__u64 pc, str - * - "%pK %c %s\n" (for kernel internal symbols), or - * - "%pK %c %s\t[%s]\n" (for module-provided symbols) - */ -- if (fscanf(pf, "%llx %*s %as [ %*[^]] ]", &ppc, &name) < 0) { -+ if (fscanf(pf, "%llx %*s %ms [ %*[^]] ]", (unsigned long long *)&ppc, &name) < 0) { - perror("Error Scanning File: "); - break; - } diff --git a/dropwatch-linker-fix.patch b/dropwatch-linker-fix.patch deleted file mode 100644 index b9fe6f8..0000000 --- a/dropwatch-linker-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up ./src/Makefile.linker ./src/Makefile ---- ./src/Makefile.linker 2012-05-30 18:35:40.000000000 -0400 -+++ ./src/Makefile 2018-02-02 07:19:25.625443850 -0500 -@@ -1,6 +1,6 @@ - all: dropwatch - CFLAGS+=-c -g -D_GNU_SOURCE -Wall -Werror `pkg-config --cflags libnl-3.0` --LDFLAGS=-lbfd -lreadline -lnl-3 -lnl-genl-3 -+LDFLAGS+=-lbfd -lreadline -lnl-3 -lnl-genl-3 - OBJFILES := main.o lookup.o\ - lookup_bfd.o lookup_kas.o - diff --git a/dropwatch.spec b/dropwatch.spec index ddb0e59..786cdf4 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,33 +1,28 @@ Summary: Kernel dropped packet monitor Name: dropwatch -Version: 1.4 -Release: 23%{?dist} -Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tbz2 +Version: 1.5 +Release: 1%{?dist} +Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz URL: https://github.com/nhorman/dropwatch License: GPLv2+ Group: Applications/System BuildRequires: kernel-headers readline-devel BuildRequires: binutils-devel libnl3-devel pkgconfig +BuildRequires: autoconf automake libtool Requires: libnl3, readline -Patch0: convert-a-to-m-in-scanf-line.patch -Patch1: printf-format-fix.patch -Patch2: dropwatch-linker-fix.patch %description dropwatch is an utility to interface to the kernel to monitor for dropped network packets. %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q -n dropwatch-dropwatch-1.5 %build -cd src -export CFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" -make +./autogen.sh +%configure +make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT @@ -41,17 +36,20 @@ install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 %defattr(-,root,root,-) %{_bindir}/* %{_mandir}/man1/* -%doc README +%doc README.md %doc COPYING %changelog +* Tue May 15 2018 Neil Horman - 1.5-1 +- Update to latest upstream and add CI harness + * Tue May 08 2018 Neil Horman - 1.4-23 - Updated specfile url and source location for github * Wed Feb 07 2018 Fedora Release Engineering - 1.4-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild -* Fri Feb 1 2018 Neil Horman - 1.4-21 +* Thu Feb 01 2018 Neil Horman - 1.4-21 - Fix linker flag recognition (bz 1541058) * Thu Feb 1 2018 Florian Weimer - 1.4-20 diff --git a/printf-format-fix.patch b/printf-format-fix.patch deleted file mode 100644 index 9cc0839..0000000 --- a/printf-format-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up ./src/main.c.fixup ./src/main.c ---- ./src/main.c.fixup 2017-01-13 07:26:06.255896365 -0500 -+++ ./src/main.c 2017-01-13 07:26:34.349677272 -0500 -@@ -333,7 +333,7 @@ void handle_dm_alert_msg(struct netlink_ - printf ("%d drops at location %p\n", alert->points[i].count, location); - else - printf ("%d drops at %s+%llx (%p)\n", -- alert->points[i].count, res.symbol, res.offset, location); -+ alert->points[i].count, res.symbol, (long long unsigned)res.offset, location); - acount++; - if (alimit && (acount == alimit)) { - printf("Alert limit reached, deactivating!\n"); diff --git a/sources b/sources index 649b394..6906f6e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5145753b3e9255bd9b190251ba4d3bbf dropwatch-1.4.tbz2 +SHA512 (dropwatch-1.5.tar.gz) = 437fdf5430674670c91520ab67d65d4ab35f0ba16c198f474d78e1cd391d263214f87c9d57c655f680e39c53661f3c6b85c60ef865cae4b74ee57cc8953d87de diff --git a/tests/README b/tests/README new file mode 100644 index 0000000..44fb438 --- /dev/null +++ b/tests/README @@ -0,0 +1,2 @@ +initial tests: +run make check, which runs any selftests in the upstream source tarball diff --git a/tests/inventory b/tests/inventory new file mode 100644 index 0000000..6238138 --- /dev/null +++ b/tests/inventory @@ -0,0 +1,3 @@ +#!/bin/bash +export TEST_DOCKER_EXTRA_ARGS="--security-opt seccomp:unconfined" +exec merge-standard-inventory "$@" diff --git a/tests/selftest/Makefile b/tests/selftest/Makefile new file mode 100644 index 0000000..7b452de --- /dev/null +++ b/tests/selftest/Makefile @@ -0,0 +1,64 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /CoreOS/patch/Sanity/selftest +# Description: Executes upstream test suite +# Author: Miroslav Vadkerti +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2010 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export TEST=/CoreOS/rng-tools/Sanity/selftest +export TESTVERSION=1.0 + +BUILT_FILES= + +FILES=$(METADATA) runtest.sh Makefile PURPOSE + +.PHONY: all install download clean + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + chmod a+x runtest.sh + +clean: + rm -f *~ $(BUILT_FILES) + + +include /usr/share/rhts/lib/rhts-make.include + +$(METADATA): Makefile + @echo "Owner: Miroslav Vadkerti " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: Executes upstream test suite" >> $(METADATA) + @echo "Type: Sanity" >> $(METADATA) + @echo "TestTime: 30m" >> $(METADATA) + @echo "RunFor: patch" >> $(METADATA) + @echo "Requires: patch gcc rpm-build automake libselinux-devel ed libattr-devel" >> $(METADATA) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: GPLv2" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + @echo "Releases: -RHEL3 -RHEL4 -RHELServer5 -RHELClient5" >> $(METADATA) + + rhts-lint $(METADATA) diff --git a/tests/selftest/PURPOSE b/tests/selftest/PURPOSE new file mode 100644 index 0000000..971cc3f --- /dev/null +++ b/tests/selftest/PURPOSE @@ -0,0 +1,4 @@ +PURPOSE of /CoreOS/dropwatch/Sanity/selftest +Description: Executes rngtest to validate integrity of dropwatch +Author: Neil Horman + diff --git a/tests/selftest/runtest.sh b/tests/selftest/runtest.sh new file mode 100755 index 0000000..a9f6055 --- /dev/null +++ b/tests/selftest/runtest.sh @@ -0,0 +1,74 @@ +#!/bin/bash +# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /CoreOS/rng-tools/Sanity/selftest +# Description: Executes the upstream test suite comming with the package +# Author: Miroslav Vadkerti +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2010 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Include rhts environment +. /usr/bin/rhts-environment.sh || exit 1 +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +PACKAGE="dropwatch" +PACKAGES="dropwatch automake autoconf libtool kernel-headers readline-devel binutils-devel libnl3-devel pkgconf-pkg-config" +UPSTREAMPKG="dropwatch-*" +BUILDLOG=`mktemp` +TESTLOG=`mktemp` +TARGET=$(echo `uname -m` | egrep ppc) +if [[ $TARGET != "" ]]; then TARGET="--target `uname -m`"; fi +TOPDIR=`mktemp -d` +SPEC="$TOPDIR/SPECS/$PACKAGE*.spec" +TESTDIR="$TOPDIR/BUILD/$UPSTREAMPKG/" + +rlJournalStart + rlPhaseStartSetup + for PKG in $PACKAGES; do + rlAssertRpm $PKG + done + rlPhaseEnd + rlPhaseStartTest + rlFetchSrcForInstalled $PACKAGE + rlRun "rpm -ivh --define '_topdir $TOPDIR' $PACKAGE*.src.rpm" 0 "Installing $PACKAGE src rpm" + echo "+ Building $PACKAGE (Log: $BUILDLOG)" + echo "+ Build command: rpmbuild -bc $SPEC $TARGET" + rlRun "rpmbuild --define '_topdir $TOPDIR' -bc $SPEC $TARGET &> $BUILDLOG" + echo "+ Buildlog:" + tail -n 100 $BUILDLOG + rlRun "pushd ." + rlRun "cd $TESTDIR" + rlRun "make check &> $TESTLOG" + if [ $? -eq 0 ] + then + rlPass "Selftest Passed" + else + rlFail "Selftest Failed" + fi + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -rf $PACKAGE*.src.rpm" 0 "Removing source rpm" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..127190b --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,19 @@ +--- +# This first play always runs on the local staging system +- hosts: localhost + roles: + - role: standard-test-beakerlib + tags: + - classic + tests: + - selftest + required_packages: + - autoconf + - automake + - libtool + - kernel-headers + - readline-devel + - binutils-devel + - libnl3-devel + - pkgconf-pkg-config + - libnl3-devel From b30dda201bf131f918c868e144966ade7aaed148 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Fri, 18 May 2018 10:37:02 -0400 Subject: [PATCH 14/47] Make inventory script executable --- tests/inventory | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tests/inventory diff --git a/tests/inventory b/tests/inventory old mode 100644 new mode 100755 From 032f0c9de1d4e6cb48059d778757a4ea10a0dabf Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Fri, 18 May 2018 10:39:01 -0400 Subject: [PATCH 15/47] bump release --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index 786cdf4..cb9eb82 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.5 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz URL: https://github.com/nhorman/dropwatch License: GPLv2+ @@ -40,6 +40,9 @@ install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 %doc COPYING %changelog +* Fri May 18 2018 Neil Horman - 1.5-2 +- Make inventory script executable + * Tue May 15 2018 Neil Horman - 1.5-1 - Update to latest upstream and add CI harness From aca7d773c9c25b286327554d76ad26034fd4f99d Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Fri, 18 May 2018 11:10:53 -0400 Subject: [PATCH 16/47] Add wget to test.yml inventory, trying to get CI tests to pass --- dropwatch.spec | 5 ++++- tests/tests.yml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index cb9eb82..56c595d 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.5 -Release: 2%{?dist} +Release: 3%{?dist} Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz URL: https://github.com/nhorman/dropwatch License: GPLv2+ @@ -40,6 +40,9 @@ install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 %doc COPYING %changelog +* Fri May 18 2018 Neil Horman - 1.5-3 +- add wget to test.yml inventory + * Fri May 18 2018 Neil Horman - 1.5-2 - Make inventory script executable diff --git a/tests/tests.yml b/tests/tests.yml index 127190b..71e2449 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -17,3 +17,4 @@ - libnl3-devel - pkgconf-pkg-config - libnl3-devel + - wget From 634d9703e64174aa2bbc31e4d76729be6b368067 Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Fri, 18 May 2018 13:10:47 -0400 Subject: [PATCH 17/47] Adding rpm-build to tests.yml inventory --- dropwatch.spec | 5 ++++- tests/tests.yml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index 56c595d..d9389a7 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.5 -Release: 3%{?dist} +Release: 4%{?dist} Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz URL: https://github.com/nhorman/dropwatch License: GPLv2+ @@ -40,6 +40,9 @@ install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 %doc COPYING %changelog +* Fri May 18 2018 Neil Horman - 1.5-4 +- add rpm-build to test.yml inventory + * Fri May 18 2018 Neil Horman - 1.5-3 - add wget to test.yml inventory diff --git a/tests/tests.yml b/tests/tests.yml index 71e2449..a4aef7b 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -18,3 +18,4 @@ - pkgconf-pkg-config - libnl3-devel - wget + - rpm-build From 93e0b24d6f9ab38922eabc7b05d8b91fe8e1b906 Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Tue, 10 Jul 2018 00:41:17 -0500 Subject: [PATCH 18/47] Remove needless use of %defattr --- dropwatch.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index d9389a7..5bf6efa 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -33,7 +33,6 @@ install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 %files -%defattr(-,root,root,-) %{_bindir}/* %{_mandir}/man1/* %doc README.md From 2ff812875a38815572bcab1b158a60bf083907a3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 12 Jul 2018 23:10:21 +0000 Subject: [PATCH 19/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index 5bf6efa..61225c1 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.5 -Release: 4%{?dist} +Release: 5%{?dist} Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz URL: https://github.com/nhorman/dropwatch License: GPLv2+ @@ -39,6 +39,9 @@ install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 %doc COPYING %changelog +* Thu Jul 12 2018 Fedora Release Engineering - 1.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri May 18 2018 Neil Horman - 1.5-4 - add rpm-build to test.yml inventory From 4e1ec8b2eb35d4ce693ddd2078b695abd836e671 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:42 +0100 Subject: [PATCH 20/47] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- dropwatch.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index 61225c1..dac11d8 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -5,7 +5,6 @@ Release: 5%{?dist} Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz URL: https://github.com/nhorman/dropwatch License: GPLv2+ -Group: Applications/System BuildRequires: kernel-headers readline-devel BuildRequires: binutils-devel libnl3-devel pkgconfig BuildRequires: autoconf automake libtool From b1237275872a21b9f5ecfb5aed7f9c5434f6cd48 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 17:38:11 +0000 Subject: [PATCH 21/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index dac11d8..f1c1299 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.5 -Release: 5%{?dist} +Release: 6%{?dist} Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz URL: https://github.com/nhorman/dropwatch License: GPLv2+ @@ -38,6 +38,9 @@ install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 %doc COPYING %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 1.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Jul 12 2018 Fedora Release Engineering - 1.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From eb85303fcf5d26717fb9e613e44b445185245639 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 17 Feb 2019 09:30:49 +0100 Subject: [PATCH 22/47] Rebuild for readline 8.0 --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index f1c1299..1dff4ec 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.5 -Release: 6%{?dist} +Release: 7%{?dist} Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz URL: https://github.com/nhorman/dropwatch License: GPLv2+ @@ -38,6 +38,9 @@ install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 %doc COPYING %changelog +* Sun Feb 17 2019 Igor Gnatenko - 1.5-7 +- Rebuild for readline 8.0 + * Thu Jan 31 2019 Fedora Release Engineering - 1.5-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 4e7bd904b970e2a9c4b9fccc6346da19a0f38aa5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 22:25:43 +0000 Subject: [PATCH 23/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index 1dff4ec..2eb591f 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.5 -Release: 7%{?dist} +Release: 8%{?dist} Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz URL: https://github.com/nhorman/dropwatch License: GPLv2+ @@ -38,6 +38,9 @@ install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 %doc COPYING %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sun Feb 17 2019 Igor Gnatenko - 1.5-7 - Rebuild for readline 8.0 From 2d9a14f9ed1efd5f6ee5c7cd0dc05309bb77ed91 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 16:18:23 +0000 Subject: [PATCH 24/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index 2eb591f..da22563 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.5 -Release: 8%{?dist} +Release: 9%{?dist} Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz URL: https://github.com/nhorman/dropwatch License: GPLv2+ @@ -38,6 +38,9 @@ install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 %doc COPYING %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jul 24 2019 Fedora Release Engineering - 1.5-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 9c938ec11e7529830c2cb0e389a563240b41375e Mon Sep 17 00:00:00 2001 From: Neil Horman Date: Thu, 19 Mar 2020 10:35:18 -0400 Subject: [PATCH 25/47] Update to latest upstream --- .gitignore | 1 + dropwatch.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f240a26..371c672 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ dropwatch-1.1-0.tbz2 dropwatch-1.2.tbz2 /dropwatch-1.4.tbz2 /dropwatch-1.5.tar.gz +/dropwatch-1.5.3.tar.gz diff --git a/dropwatch.spec b/dropwatch.spec index da22563..3bad4a4 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,13 +1,13 @@ Summary: Kernel dropped packet monitor Name: dropwatch -Version: 1.5 -Release: 9%{?dist} +Version: 1.5.3 +Release: 1%{?dist} Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz URL: https://github.com/nhorman/dropwatch License: GPLv2+ BuildRequires: kernel-headers readline-devel BuildRequires: binutils-devel libnl3-devel pkgconfig -BuildRequires: autoconf automake libtool +BuildRequires: autoconf automake libtool libpcap-devel Requires: libnl3, readline @@ -16,7 +16,7 @@ dropwatch is an utility to interface to the kernel to monitor for dropped network packets. %prep -%setup -q -n dropwatch-dropwatch-1.5 +%setup %build ./autogen.sh @@ -38,6 +38,9 @@ install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 %doc COPYING %changelog +* Thu Mar 19 2020 Neil Horman - 1.5.3-1 +- Update to latest upstream + * Tue Jan 28 2020 Fedora Release Engineering - 1.5-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 6906f6e..27f2b55 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dropwatch-1.5.tar.gz) = 437fdf5430674670c91520ab67d65d4ab35f0ba16c198f474d78e1cd391d263214f87c9d57c655f680e39c53661f3c6b85c60ef865cae4b74ee57cc8953d87de +SHA512 (dropwatch-1.5.3.tar.gz) = 098e464084ac3bc5509f5a523fe499ab54cca78ba53bebbcccd57a6c01260740c07e5b62b1218c6a62bf2147a74c056b3880dbbc92b3e11425efe8fe83af8878 From 16cf611c53e6887ab284507e61489c0f5ddbb5f0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 15:46:18 +0000 Subject: [PATCH 26/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index 3bad4a4..3da79c7 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz URL: https://github.com/nhorman/dropwatch License: GPLv2+ @@ -38,6 +38,9 @@ install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 %doc COPYING %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Mar 19 2020 Neil Horman - 1.5.3-1 - Update to latest upstream From 71ffcb93de74f1127e716e284bbfc7a8d543414e Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Fri, 13 Nov 2020 21:37:55 -0700 Subject: [PATCH 27/47] Fix off-by-one buffer overflow caught by gcc-11 --- dropwatch-gcc11.patch | 13 +++++++++++++ dropwatch.spec | 7 ++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 dropwatch-gcc11.patch diff --git a/dropwatch-gcc11.patch b/dropwatch-gcc11.patch new file mode 100644 index 0000000..6662498 --- /dev/null +++ b/dropwatch-gcc11.patch @@ -0,0 +1,13 @@ +diff --git a/src/lookup_bfd.c b/src/lookup_bfd.c +index 8fa4833..e09dc3f 100644 +--- a/src/lookup_bfd.c ++++ b/src/lookup_bfd.c +@@ -35,7 +35,7 @@ static int lookup_bfd_init(void) + if(uname(&uts)<0) + return-1; + +- dbibuf = malloc(strlen("/usr/lib/debug/lib/modules") + strlen(uts.release) + 1); ++ dbibuf = malloc(strlen("/usr/lib/debug/lib/modules/") + strlen(uts.release) + 1); + sprintf(dbibuf,"/usr/lib/debug/lib/modules/%s", uts.release); + if (stat(dbibuf,&sb) < 0) { + free(dbibuf); diff --git a/dropwatch.spec b/dropwatch.spec index 3da79c7..8bef6c2 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,8 +1,9 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.5.3 -Release: 2%{?dist} +Release: 3%{?dist} Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz +Patch0: %{name}-gcc11.patch URL: https://github.com/nhorman/dropwatch License: GPLv2+ BuildRequires: kernel-headers readline-devel @@ -17,6 +18,7 @@ network packets. %prep %setup +%patch0 -p1 %build ./autogen.sh @@ -38,6 +40,9 @@ install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 %doc COPYING %changelog +* Fri Nov 13 2020 Jeff Law - 1.5.3-3 +- Fix off-by-one buffer overflow caught by gcc-11 + * Mon Jul 27 2020 Fedora Release Engineering - 1.5.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From b186dfd820509e6bdfa40cfe3780b4443de4752b Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 04:44:20 +0000 Subject: [PATCH 28/47] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- dropwatch.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/dropwatch.spec b/dropwatch.spec index 8bef6c2..c42c457 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -9,6 +9,7 @@ License: GPLv2+ BuildRequires: kernel-headers readline-devel BuildRequires: binutils-devel libnl3-devel pkgconfig BuildRequires: autoconf automake libtool libpcap-devel +BuildRequires: make Requires: libnl3, readline From 5300abb293713bc0aa62c2373438e20ba46334d1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 03:47:01 +0000 Subject: [PATCH 29/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index c42c457..252d4f7 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,7 +1,7 @@ Summary: Kernel dropped packet monitor Name: dropwatch Version: 1.5.3 -Release: 3%{?dist} +Release: 4%{?dist} Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz Patch0: %{name}-gcc11.patch URL: https://github.com/nhorman/dropwatch @@ -41,6 +41,9 @@ install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 %doc COPYING %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.5.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Nov 13 2020 Jeff Law - 1.5.3-3 - Fix off-by-one buffer overflow caught by gcc-11 From 73190a619d59462188afa1ee03663e0fc78ba342 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 8 Jun 2021 21:17:53 +0200 Subject: [PATCH 30/47] Orphaned for 6+ weeks --- .gitignore | 6 -- dead.package | 1 + dropwatch-gcc11.patch | 13 --- dropwatch.spec | 179 -------------------------------------- sources | 1 - tests/README | 2 - tests/inventory | 3 - tests/selftest/Makefile | 64 -------------- tests/selftest/PURPOSE | 4 - tests/selftest/runtest.sh | 74 ---------------- tests/tests.yml | 21 ----- 11 files changed, 1 insertion(+), 367 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 dropwatch-gcc11.patch delete mode 100644 dropwatch.spec delete mode 100644 sources delete mode 100644 tests/README delete mode 100755 tests/inventory delete mode 100644 tests/selftest/Makefile delete mode 100644 tests/selftest/PURPOSE delete mode 100755 tests/selftest/runtest.sh delete mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 371c672..0000000 --- a/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ -dropwatch-1.0.tbz2 -dropwatch-1.1-0.tbz2 -dropwatch-1.2.tbz2 -/dropwatch-1.4.tbz2 -/dropwatch-1.5.tar.gz -/dropwatch-1.5.3.tar.gz diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/dropwatch-gcc11.patch b/dropwatch-gcc11.patch deleted file mode 100644 index 6662498..0000000 --- a/dropwatch-gcc11.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/lookup_bfd.c b/src/lookup_bfd.c -index 8fa4833..e09dc3f 100644 ---- a/src/lookup_bfd.c -+++ b/src/lookup_bfd.c -@@ -35,7 +35,7 @@ static int lookup_bfd_init(void) - if(uname(&uts)<0) - return-1; - -- dbibuf = malloc(strlen("/usr/lib/debug/lib/modules") + strlen(uts.release) + 1); -+ dbibuf = malloc(strlen("/usr/lib/debug/lib/modules/") + strlen(uts.release) + 1); - sprintf(dbibuf,"/usr/lib/debug/lib/modules/%s", uts.release); - if (stat(dbibuf,&sb) < 0) { - free(dbibuf); diff --git a/dropwatch.spec b/dropwatch.spec deleted file mode 100644 index 252d4f7..0000000 --- a/dropwatch.spec +++ /dev/null @@ -1,179 +0,0 @@ -Summary: Kernel dropped packet monitor -Name: dropwatch -Version: 1.5.3 -Release: 4%{?dist} -Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz -Patch0: %{name}-gcc11.patch -URL: https://github.com/nhorman/dropwatch -License: GPLv2+ -BuildRequires: kernel-headers readline-devel -BuildRequires: binutils-devel libnl3-devel pkgconfig -BuildRequires: autoconf automake libtool libpcap-devel -BuildRequires: make -Requires: libnl3, readline - - -%description -dropwatch is an utility to interface to the kernel to monitor for dropped -network packets. - -%prep -%setup -%patch0 -p1 - -%build -./autogen.sh -%configure -make %{?_smp_mflags} - -%install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_bindir} -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install -m0755 src/dropwatch $RPM_BUILD_ROOT%{_bindir} -install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 - - -%files -%{_bindir}/* -%{_mandir}/man1/* -%doc README.md -%doc COPYING - -%changelog -* Tue Jan 26 2021 Fedora Release Engineering - 1.5.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Fri Nov 13 2020 Jeff Law - 1.5.3-3 -- Fix off-by-one buffer overflow caught by gcc-11 - -* Mon Jul 27 2020 Fedora Release Engineering - 1.5.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Thu Mar 19 2020 Neil Horman - 1.5.3-1 -- Update to latest upstream - -* Tue Jan 28 2020 Fedora Release Engineering - 1.5-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jul 24 2019 Fedora Release Engineering - 1.5-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sun Feb 17 2019 Igor Gnatenko - 1.5-7 -- Rebuild for readline 8.0 - -* Thu Jan 31 2019 Fedora Release Engineering - 1.5-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Thu Jul 12 2018 Fedora Release Engineering - 1.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri May 18 2018 Neil Horman - 1.5-4 -- add rpm-build to test.yml inventory - -* Fri May 18 2018 Neil Horman - 1.5-3 -- add wget to test.yml inventory - -* Fri May 18 2018 Neil Horman - 1.5-2 -- Make inventory script executable - -* Tue May 15 2018 Neil Horman - 1.5-1 -- Update to latest upstream and add CI harness - -* Tue May 08 2018 Neil Horman - 1.4-23 -- Updated specfile url and source location for github - -* Wed Feb 07 2018 Fedora Release Engineering - 1.4-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Feb 01 2018 Neil Horman - 1.4-21 -- Fix linker flag recognition (bz 1541058) - -* Thu Feb 1 2018 Florian Weimer - 1.4-20 -- Build with linker flags from redhat-rpm-config - -* Tue Jan 30 2018 Merlin Mathesius - 1.4-19 -- Drop unnecessary BuildRequires for binutils-static - Not building kernel modules, so use kernel-headers instead of kernel-devel - -* Wed Aug 02 2017 Fedora Release Engineering - 1.4-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.4-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.4-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Jan 13 2017 Neil Horman - 1.4-15 -- fix build error (bz 1412926) - -* Thu Jan 12 2017 Igor Gnatenko - 1.4-14 -- Rebuild for readline 7.x - -* Wed Feb 03 2016 Fedora Release Engineering - 1.4-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Jul 06 2015 Neil Horman - 1.4-12 -- Fixed FTBFS issue (bz 1239436) - -* Wed Jun 17 2015 Fedora Release Engineering - 1.4-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat Aug 16 2014 Fedora Release Engineering - 1.4-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.4-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Nov 29 2013 Neil Horman - 1.4-8 -- Updating spec file - -* Fri Nov 29 2013 Neil Horman - 1.4-7 -- Drop libnl-devel BuildRequire (bz 1035791) - -* Sat Aug 03 2013 Fedora Release Engineering - 1.4-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 1.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jan 20 2013 Dan Horák - 1.4-4 -- rebuilt again for fixed soname in libnl3 - -* Fri Jan 18 2013 Neil Horman - 1.4-3 -- rebuilt to pull in new libnl3 dependencies - -* Wed Jul 18 2012 Fedora Release Engineering - 1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Fri Jun 01 2012 Neil Horman - 1.4-1 -- Update to latest upstream - -* Fri Jan 13 2012 Fedora Release Engineering - 1.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Feb 08 2011 Fedora Release Engineering - 1.2-1 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Wed Jun 30 2010 Neil Horman - 1.2 -- Update to latest upstream - -* Thu Apr 08 2010 Neil Horman - 1.1-2 -- Adding more missing buildrequires - -* Wed Apr 07 2010 Neil Horman - 1.1-1 -- Add missing buildrequires - -* Wed Apr 07 2010 Neil Horman - 1.1-0 -- Move to latest upstream sources - -* Fri Jul 24 2009 Fedora Release Engineering - 1.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Mar 20 2009 Neil Horman 1.0-2 -- Fixed up Errors found in package review (bz 491240) - -* Tue Mar 17 2009 Neil Horman 1.0-1 -- Initial build - diff --git a/sources b/sources deleted file mode 100644 index 27f2b55..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (dropwatch-1.5.3.tar.gz) = 098e464084ac3bc5509f5a523fe499ab54cca78ba53bebbcccd57a6c01260740c07e5b62b1218c6a62bf2147a74c056b3880dbbc92b3e11425efe8fe83af8878 diff --git a/tests/README b/tests/README deleted file mode 100644 index 44fb438..0000000 --- a/tests/README +++ /dev/null @@ -1,2 +0,0 @@ -initial tests: -run make check, which runs any selftests in the upstream source tarball diff --git a/tests/inventory b/tests/inventory deleted file mode 100755 index 6238138..0000000 --- a/tests/inventory +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -export TEST_DOCKER_EXTRA_ARGS="--security-opt seccomp:unconfined" -exec merge-standard-inventory "$@" diff --git a/tests/selftest/Makefile b/tests/selftest/Makefile deleted file mode 100644 index 7b452de..0000000 --- a/tests/selftest/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/patch/Sanity/selftest -# Description: Executes upstream test suite -# Author: Miroslav Vadkerti -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2010 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/rng-tools/Sanity/selftest -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Miroslav Vadkerti " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Executes upstream test suite" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 30m" >> $(METADATA) - @echo "RunFor: patch" >> $(METADATA) - @echo "Requires: patch gcc rpm-build automake libselinux-devel ed libattr-devel" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: -RHEL3 -RHEL4 -RHELServer5 -RHELClient5" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/selftest/PURPOSE b/tests/selftest/PURPOSE deleted file mode 100644 index 971cc3f..0000000 --- a/tests/selftest/PURPOSE +++ /dev/null @@ -1,4 +0,0 @@ -PURPOSE of /CoreOS/dropwatch/Sanity/selftest -Description: Executes rngtest to validate integrity of dropwatch -Author: Neil Horman - diff --git a/tests/selftest/runtest.sh b/tests/selftest/runtest.sh deleted file mode 100755 index a9f6055..0000000 --- a/tests/selftest/runtest.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash -# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/rng-tools/Sanity/selftest -# Description: Executes the upstream test suite comming with the package -# Author: Miroslav Vadkerti -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2010 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include rhts environment -. /usr/bin/rhts-environment.sh || exit 1 -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="dropwatch" -PACKAGES="dropwatch automake autoconf libtool kernel-headers readline-devel binutils-devel libnl3-devel pkgconf-pkg-config" -UPSTREAMPKG="dropwatch-*" -BUILDLOG=`mktemp` -TESTLOG=`mktemp` -TARGET=$(echo `uname -m` | egrep ppc) -if [[ $TARGET != "" ]]; then TARGET="--target `uname -m`"; fi -TOPDIR=`mktemp -d` -SPEC="$TOPDIR/SPECS/$PACKAGE*.spec" -TESTDIR="$TOPDIR/BUILD/$UPSTREAMPKG/" - -rlJournalStart - rlPhaseStartSetup - for PKG in $PACKAGES; do - rlAssertRpm $PKG - done - rlPhaseEnd - rlPhaseStartTest - rlFetchSrcForInstalled $PACKAGE - rlRun "rpm -ivh --define '_topdir $TOPDIR' $PACKAGE*.src.rpm" 0 "Installing $PACKAGE src rpm" - echo "+ Building $PACKAGE (Log: $BUILDLOG)" - echo "+ Build command: rpmbuild -bc $SPEC $TARGET" - rlRun "rpmbuild --define '_topdir $TOPDIR' -bc $SPEC $TARGET &> $BUILDLOG" - echo "+ Buildlog:" - tail -n 100 $BUILDLOG - rlRun "pushd ." - rlRun "cd $TESTDIR" - rlRun "make check &> $TESTLOG" - if [ $? -eq 0 ] - then - rlPass "Selftest Passed" - else - rlFail "Selftest Failed" - fi - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -rf $PACKAGE*.src.rpm" 0 "Removing source rpm" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index a4aef7b..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# This first play always runs on the local staging system -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - classic - tests: - - selftest - required_packages: - - autoconf - - automake - - libtool - - kernel-headers - - readline-devel - - binutils-devel - - libnl3-devel - - pkgconf-pkg-config - - libnl3-devel - - wget - - rpm-build From 500ac66ab7e50eda5dc2e4aa05824087d24111b5 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Mon, 12 Jul 2021 09:29:45 +0200 Subject: [PATCH 31/47] Revert "Orphaned for 6+ weeks" This reverts commit 73190a619d59462188afa1ee03663e0fc78ba342. Unretirement request: https://pagure.io/releng/issue/10207 Signed-off-by: Tomas Hrcka --- .gitignore | 6 ++ dead.package | 1 - dropwatch-gcc11.patch | 13 +++ dropwatch.spec | 179 ++++++++++++++++++++++++++++++++++++++ sources | 1 + tests/README | 2 + tests/inventory | 3 + tests/selftest/Makefile | 64 ++++++++++++++ tests/selftest/PURPOSE | 4 + tests/selftest/runtest.sh | 74 ++++++++++++++++ tests/tests.yml | 21 +++++ 11 files changed, 367 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 dead.package create mode 100644 dropwatch-gcc11.patch create mode 100644 dropwatch.spec create mode 100644 sources create mode 100644 tests/README create mode 100755 tests/inventory create mode 100644 tests/selftest/Makefile create mode 100644 tests/selftest/PURPOSE create mode 100755 tests/selftest/runtest.sh create mode 100644 tests/tests.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..371c672 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +dropwatch-1.0.tbz2 +dropwatch-1.1-0.tbz2 +dropwatch-1.2.tbz2 +/dropwatch-1.4.tbz2 +/dropwatch-1.5.tar.gz +/dropwatch-1.5.3.tar.gz diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/dropwatch-gcc11.patch b/dropwatch-gcc11.patch new file mode 100644 index 0000000..6662498 --- /dev/null +++ b/dropwatch-gcc11.patch @@ -0,0 +1,13 @@ +diff --git a/src/lookup_bfd.c b/src/lookup_bfd.c +index 8fa4833..e09dc3f 100644 +--- a/src/lookup_bfd.c ++++ b/src/lookup_bfd.c +@@ -35,7 +35,7 @@ static int lookup_bfd_init(void) + if(uname(&uts)<0) + return-1; + +- dbibuf = malloc(strlen("/usr/lib/debug/lib/modules") + strlen(uts.release) + 1); ++ dbibuf = malloc(strlen("/usr/lib/debug/lib/modules/") + strlen(uts.release) + 1); + sprintf(dbibuf,"/usr/lib/debug/lib/modules/%s", uts.release); + if (stat(dbibuf,&sb) < 0) { + free(dbibuf); diff --git a/dropwatch.spec b/dropwatch.spec new file mode 100644 index 0000000..252d4f7 --- /dev/null +++ b/dropwatch.spec @@ -0,0 +1,179 @@ +Summary: Kernel dropped packet monitor +Name: dropwatch +Version: 1.5.3 +Release: 4%{?dist} +Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz +Patch0: %{name}-gcc11.patch +URL: https://github.com/nhorman/dropwatch +License: GPLv2+ +BuildRequires: kernel-headers readline-devel +BuildRequires: binutils-devel libnl3-devel pkgconfig +BuildRequires: autoconf automake libtool libpcap-devel +BuildRequires: make +Requires: libnl3, readline + + +%description +dropwatch is an utility to interface to the kernel to monitor for dropped +network packets. + +%prep +%setup +%patch0 -p1 + +%build +./autogen.sh +%configure +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT%{_bindir} +mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +install -m0755 src/dropwatch $RPM_BUILD_ROOT%{_bindir} +install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 + + +%files +%{_bindir}/* +%{_mandir}/man1/* +%doc README.md +%doc COPYING + +%changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.5.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Nov 13 2020 Jeff Law - 1.5.3-3 +- Fix off-by-one buffer overflow caught by gcc-11 + +* Mon Jul 27 2020 Fedora Release Engineering - 1.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Thu Mar 19 2020 Neil Horman - 1.5.3-1 +- Update to latest upstream + +* Tue Jan 28 2020 Fedora Release Engineering - 1.5-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jul 24 2019 Fedora Release Engineering - 1.5-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 17 2019 Igor Gnatenko - 1.5-7 +- Rebuild for readline 8.0 + +* Thu Jan 31 2019 Fedora Release Engineering - 1.5-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Thu Jul 12 2018 Fedora Release Engineering - 1.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri May 18 2018 Neil Horman - 1.5-4 +- add rpm-build to test.yml inventory + +* Fri May 18 2018 Neil Horman - 1.5-3 +- add wget to test.yml inventory + +* Fri May 18 2018 Neil Horman - 1.5-2 +- Make inventory script executable + +* Tue May 15 2018 Neil Horman - 1.5-1 +- Update to latest upstream and add CI harness + +* Tue May 08 2018 Neil Horman - 1.4-23 +- Updated specfile url and source location for github + +* Wed Feb 07 2018 Fedora Release Engineering - 1.4-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Feb 01 2018 Neil Horman - 1.4-21 +- Fix linker flag recognition (bz 1541058) + +* Thu Feb 1 2018 Florian Weimer - 1.4-20 +- Build with linker flags from redhat-rpm-config + +* Tue Jan 30 2018 Merlin Mathesius - 1.4-19 +- Drop unnecessary BuildRequires for binutils-static + Not building kernel modules, so use kernel-headers instead of kernel-devel + +* Wed Aug 02 2017 Fedora Release Engineering - 1.4-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.4-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.4-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Jan 13 2017 Neil Horman - 1.4-15 +- fix build error (bz 1412926) + +* Thu Jan 12 2017 Igor Gnatenko - 1.4-14 +- Rebuild for readline 7.x + +* Wed Feb 03 2016 Fedora Release Engineering - 1.4-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Mon Jul 06 2015 Neil Horman - 1.4-12 +- Fixed FTBFS issue (bz 1239436) + +* Wed Jun 17 2015 Fedora Release Engineering - 1.4-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat Aug 16 2014 Fedora Release Engineering - 1.4-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Nov 29 2013 Neil Horman - 1.4-8 +- Updating spec file + +* Fri Nov 29 2013 Neil Horman - 1.4-7 +- Drop libnl-devel BuildRequire (bz 1035791) + +* Sat Aug 03 2013 Fedora Release Engineering - 1.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 1.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jan 20 2013 Dan Horák - 1.4-4 +- rebuilt again for fixed soname in libnl3 + +* Fri Jan 18 2013 Neil Horman - 1.4-3 +- rebuilt to pull in new libnl3 dependencies + +* Wed Jul 18 2012 Fedora Release Engineering - 1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Fri Jun 01 2012 Neil Horman - 1.4-1 +- Update to latest upstream + +* Fri Jan 13 2012 Fedora Release Engineering - 1.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Tue Feb 08 2011 Fedora Release Engineering - 1.2-1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Wed Jun 30 2010 Neil Horman - 1.2 +- Update to latest upstream + +* Thu Apr 08 2010 Neil Horman - 1.1-2 +- Adding more missing buildrequires + +* Wed Apr 07 2010 Neil Horman - 1.1-1 +- Add missing buildrequires + +* Wed Apr 07 2010 Neil Horman - 1.1-0 +- Move to latest upstream sources + +* Fri Jul 24 2009 Fedora Release Engineering - 1.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Mar 20 2009 Neil Horman 1.0-2 +- Fixed up Errors found in package review (bz 491240) + +* Tue Mar 17 2009 Neil Horman 1.0-1 +- Initial build + diff --git a/sources b/sources new file mode 100644 index 0000000..27f2b55 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (dropwatch-1.5.3.tar.gz) = 098e464084ac3bc5509f5a523fe499ab54cca78ba53bebbcccd57a6c01260740c07e5b62b1218c6a62bf2147a74c056b3880dbbc92b3e11425efe8fe83af8878 diff --git a/tests/README b/tests/README new file mode 100644 index 0000000..44fb438 --- /dev/null +++ b/tests/README @@ -0,0 +1,2 @@ +initial tests: +run make check, which runs any selftests in the upstream source tarball diff --git a/tests/inventory b/tests/inventory new file mode 100755 index 0000000..6238138 --- /dev/null +++ b/tests/inventory @@ -0,0 +1,3 @@ +#!/bin/bash +export TEST_DOCKER_EXTRA_ARGS="--security-opt seccomp:unconfined" +exec merge-standard-inventory "$@" diff --git a/tests/selftest/Makefile b/tests/selftest/Makefile new file mode 100644 index 0000000..7b452de --- /dev/null +++ b/tests/selftest/Makefile @@ -0,0 +1,64 @@ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Makefile of /CoreOS/patch/Sanity/selftest +# Description: Executes upstream test suite +# Author: Miroslav Vadkerti +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2010 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +export TEST=/CoreOS/rng-tools/Sanity/selftest +export TESTVERSION=1.0 + +BUILT_FILES= + +FILES=$(METADATA) runtest.sh Makefile PURPOSE + +.PHONY: all install download clean + +run: $(FILES) build + ./runtest.sh + +build: $(BUILT_FILES) + chmod a+x runtest.sh + +clean: + rm -f *~ $(BUILT_FILES) + + +include /usr/share/rhts/lib/rhts-make.include + +$(METADATA): Makefile + @echo "Owner: Miroslav Vadkerti " > $(METADATA) + @echo "Name: $(TEST)" >> $(METADATA) + @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) + @echo "Path: $(TEST_DIR)" >> $(METADATA) + @echo "Description: Executes upstream test suite" >> $(METADATA) + @echo "Type: Sanity" >> $(METADATA) + @echo "TestTime: 30m" >> $(METADATA) + @echo "RunFor: patch" >> $(METADATA) + @echo "Requires: patch gcc rpm-build automake libselinux-devel ed libattr-devel" >> $(METADATA) + @echo "Priority: Normal" >> $(METADATA) + @echo "License: GPLv2" >> $(METADATA) + @echo "Confidential: no" >> $(METADATA) + @echo "Destructive: no" >> $(METADATA) + @echo "Releases: -RHEL3 -RHEL4 -RHELServer5 -RHELClient5" >> $(METADATA) + + rhts-lint $(METADATA) diff --git a/tests/selftest/PURPOSE b/tests/selftest/PURPOSE new file mode 100644 index 0000000..971cc3f --- /dev/null +++ b/tests/selftest/PURPOSE @@ -0,0 +1,4 @@ +PURPOSE of /CoreOS/dropwatch/Sanity/selftest +Description: Executes rngtest to validate integrity of dropwatch +Author: Neil Horman + diff --git a/tests/selftest/runtest.sh b/tests/selftest/runtest.sh new file mode 100755 index 0000000..a9f6055 --- /dev/null +++ b/tests/selftest/runtest.sh @@ -0,0 +1,74 @@ +#!/bin/bash +# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# runtest.sh of /CoreOS/rng-tools/Sanity/selftest +# Description: Executes the upstream test suite comming with the package +# Author: Miroslav Vadkerti +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +# +# Copyright (c) 2010 Red Hat, Inc. All rights reserved. +# +# This copyrighted material is made available to anyone wishing +# to use, modify, copy, or redistribute it subject to the terms +# and conditions of the GNU General Public License version 2. +# +# This program is distributed in the hope that it will be +# useful, but WITHOUT ANY WARRANTY; without even the implied +# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR +# PURPOSE. See the GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program; if not, write to the Free +# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +# Boston, MA 02110-1301, USA. +# +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# Include rhts environment +. /usr/bin/rhts-environment.sh || exit 1 +. /usr/share/beakerlib/beakerlib.sh || exit 1 + +PACKAGE="dropwatch" +PACKAGES="dropwatch automake autoconf libtool kernel-headers readline-devel binutils-devel libnl3-devel pkgconf-pkg-config" +UPSTREAMPKG="dropwatch-*" +BUILDLOG=`mktemp` +TESTLOG=`mktemp` +TARGET=$(echo `uname -m` | egrep ppc) +if [[ $TARGET != "" ]]; then TARGET="--target `uname -m`"; fi +TOPDIR=`mktemp -d` +SPEC="$TOPDIR/SPECS/$PACKAGE*.spec" +TESTDIR="$TOPDIR/BUILD/$UPSTREAMPKG/" + +rlJournalStart + rlPhaseStartSetup + for PKG in $PACKAGES; do + rlAssertRpm $PKG + done + rlPhaseEnd + rlPhaseStartTest + rlFetchSrcForInstalled $PACKAGE + rlRun "rpm -ivh --define '_topdir $TOPDIR' $PACKAGE*.src.rpm" 0 "Installing $PACKAGE src rpm" + echo "+ Building $PACKAGE (Log: $BUILDLOG)" + echo "+ Build command: rpmbuild -bc $SPEC $TARGET" + rlRun "rpmbuild --define '_topdir $TOPDIR' -bc $SPEC $TARGET &> $BUILDLOG" + echo "+ Buildlog:" + tail -n 100 $BUILDLOG + rlRun "pushd ." + rlRun "cd $TESTDIR" + rlRun "make check &> $TESTLOG" + if [ $? -eq 0 ] + then + rlPass "Selftest Passed" + else + rlFail "Selftest Failed" + fi + rlPhaseEnd + + rlPhaseStartCleanup + rlRun "popd" + rlRun "rm -rf $PACKAGE*.src.rpm" 0 "Removing source rpm" + rlPhaseEnd +rlJournalPrintText +rlJournalEnd diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..a4aef7b --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,21 @@ +--- +# This first play always runs on the local staging system +- hosts: localhost + roles: + - role: standard-test-beakerlib + tags: + - classic + tests: + - selftest + required_packages: + - autoconf + - automake + - libtool + - kernel-headers + - readline-devel + - binutils-devel + - libnl3-devel + - pkgconf-pkg-config + - libnl3-devel + - wget + - rpm-build From 2a09140ade8572b59ba37f418bec58354667b80b Mon Sep 17 00:00:00 2001 From: Hangbin Liu Date: Fri, 2 Jul 2021 18:14:04 +0800 Subject: [PATCH 32/47] Install new command dwdump - Install new command dwdump - Update obsoleted m4 macros - Update Makefile license - Update spec file --- dropwatch-Fix-license-specifiers.patch | 91 +++++++++++++++++++ ...configure-update-obsoleted-m4-macros.patch | 36 ++++++++ dropwatch-install-dwdump-manpage.patch | 17 ++++ dropwatch.spec | 63 ++++++++----- 4 files changed, 183 insertions(+), 24 deletions(-) create mode 100644 dropwatch-Fix-license-specifiers.patch create mode 100644 dropwatch-configure-update-obsoleted-m4-macros.patch create mode 100644 dropwatch-install-dwdump-manpage.patch diff --git a/dropwatch-Fix-license-specifiers.patch b/dropwatch-Fix-license-specifiers.patch new file mode 100644 index 0000000..d2e23d5 --- /dev/null +++ b/dropwatch-Fix-license-specifiers.patch @@ -0,0 +1,91 @@ +From ab2965faeeb63fb22b938cc4c80a417b3bf7716b Mon Sep 17 00:00:00 2001 +From: Neil Horman +Date: Wed, 7 Jul 2021 08:36:48 -0400 +Subject: [PATCH] Fix license specifiers + +It was noted that there was an LGPL license in a makefile, which is +rather non-sensical in my mind, and clearly erroneous. So lets fix up +the other build files to match the spdx header in the source code + +Signed-off-by: Neil Horman +--- + Makefile.am | 19 +------------------ + autogen.sh | 2 ++ + configure.ac | 2 ++ + doc/Makefile.am | 1 + + src/Makefile.am | 3 ++- + 5 files changed, 8 insertions(+), 19 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index fb2cfd6..dba20d4 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,24 +1,7 @@ + # Makefile.am -- + # Copyright 2018 Neil Horman + # All Rights Reserved. +-# +-# This library is free software; you can redistribute it and/or +-# modify it under the terms of the GNU Lesser General Public +-# License as published by the Free Software Foundation; either +-# version 2.1 of the License, or (at your option) any later version. +-# +-# This library is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +-# Lesser General Public License for more details. +-# +-# You should have received a copy of the GNU Lesser General Public +-# License along with this library; if not, write to the Free Software +-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +-# +-# Authors: +-# Steve Grubb +-# ++# SPDX-License-Identifier: GPL-2.0-or-later + + AUTOMAKE_OPTIONS = no-dependencies + ACLOCAL_AMFLAGS = -I m4 +diff --git a/autogen.sh b/autogen.sh +index b792e8b..35a8644 100755 +--- a/autogen.sh ++++ b/autogen.sh +@@ -1,4 +1,6 @@ + #! /bin/sh ++# SPDX-License-Identifier: GPL-2.0-or-later ++ + set -x -e + mkdir -p m4 + # --no-recursive is available only in recent autoconf versions +diff --git a/configure.ac b/configure.ac +index 3671f27..3b51fb2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,3 +1,5 @@ ++# SPDX-License-Identifier: GPL-2.0-or-later ++ + AC_INIT(dropwatch,1.5.3) + AC_PREREQ(2.12)dnl + AC_CONFIG_HEADERS(config.h) +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 3d61286..76da64e 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -1,2 +1,3 @@ ++# SPDX-License-Identifier: GPL-2.0-or-later + dist_man_MANS = dropwatch.1 dwdump.1 + +diff --git a/src/Makefile.am b/src/Makefile.am +index f56a39d..1fd6c33 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,4 +1,5 @@ +- ++# SPDX-License-Identifier: GPL-2.0-or-later ++# + bin_PROGRAMS = dropwatch dwdump + + AM_CFLAGS = -g -Wall -Werror $(LIBNL3_CFLAGS) $(READLINE_CFLAGS) +-- +2.31.1 + diff --git a/dropwatch-configure-update-obsoleted-m4-macros.patch b/dropwatch-configure-update-obsoleted-m4-macros.patch new file mode 100644 index 0000000..c9d878f --- /dev/null +++ b/dropwatch-configure-update-obsoleted-m4-macros.patch @@ -0,0 +1,36 @@ +From 6259779e26c928d59b7aae66273da095fcfcb49b Mon Sep 17 00:00:00 2001 +From: Hangbin Liu +Date: Tue, 6 Jul 2021 19:11:43 +0800 +Subject: [PATCH] configure: update obsoleted m4 macros + +Replace obsoleted AM_CONFIG_HEADER[1] with AC_CONFIG_HEADERS. +Also replace deprecated AM_PROG_LIBTOOL[2] with LT_INIT. + +[1] https://www.gnu.org/software/automake/manual/html_node/Optional.html +[2] https://www.gnu.org/software/libtool/manual/html_node/LT_005fINIT.html + +Signed-off-by: Hangbin Liu +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 2a840cc..3671f27 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1,10 +1,10 @@ + AC_INIT(dropwatch,1.5.3) + AC_PREREQ(2.12)dnl +-AM_CONFIG_HEADER(config.h) ++AC_CONFIG_HEADERS(config.h) + + AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([foreign] [subdir-objects]) +-AM_PROG_LIBTOOL ++LT_INIT + AC_SUBST(LIBTOOL_DEPS) + + AC_PROG_CC +-- +2.31.1 + diff --git a/dropwatch-install-dwdump-manpage.patch b/dropwatch-install-dwdump-manpage.patch new file mode 100644 index 0000000..1872328 --- /dev/null +++ b/dropwatch-install-dwdump-manpage.patch @@ -0,0 +1,17 @@ +From a6a152f111766afefcdf3a3ba271cdeb3f387553 Mon Sep 17 00:00:00 2001 +From: Sebastian Wiesinger +Date: Wed, 13 Jan 2021 12:30:06 +0100 +Subject: [PATCH] Install manpage for dwdump + +--- + doc/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/doc/Makefile.am b/doc/Makefile.am +index 6ff1152..3d61286 100644 +--- a/doc/Makefile.am ++++ b/doc/Makefile.am +@@ -1,2 +1,2 @@ +-dist_man_MANS = dropwatch.1 ++dist_man_MANS = dropwatch.1 dwdump.1 + diff --git a/dropwatch.spec b/dropwatch.spec index 252d4f7..aa915a7 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,46 +1,61 @@ -Summary: Kernel dropped packet monitor -Name: dropwatch +Name: dropwatch Version: 1.5.3 -Release: 4%{?dist} -Source0: https://github.com/nhorman/dropwatch/archive/dropwatch-%{version}.tar.gz -Patch0: %{name}-gcc11.patch -URL: https://github.com/nhorman/dropwatch -License: GPLv2+ -BuildRequires: kernel-headers readline-devel -BuildRequires: binutils-devel libnl3-devel pkgconfig -BuildRequires: autoconf automake libtool libpcap-devel -BuildRequires: make -Requires: libnl3, readline +Release: 5%{?dist} +Summary: Kernel dropped packet monitor +License: GPLv2+ +URL: https://github.com/nhorman/dropwatch +Source0: https://github.com/nhorman/dropwatch/archive/v%{version}/%{name}-%{version}.tar.gz +Patch0: %{name}-gcc11.patch +Patch1: %{name}-install-dwdump-manpage.patch +Patch2: %{name}-configure-update-obsoleted-m4-macros.patch +Patch3: %{name}-Fix-license-specifiers.patch + +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc +BuildRequires: make +BuildRequires: pkgconfig +BuildRequires: libtool +BuildRequires: kernel-headers +BuildRequires: binutils-devel +BuildRequires: libnl3-devel +BuildRequires: libpcap-devel +BuildRequires: readline-devel + +Requires: libnl3 +Requires: readline %description dropwatch is an utility to interface to the kernel to monitor for dropped network packets. %prep -%setup -%patch0 -p1 +%autosetup -p1 %build ./autogen.sh %configure -make %{?_smp_mflags} +%make_build %install -rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT%{_bindir} -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -install -m0755 src/dropwatch $RPM_BUILD_ROOT%{_bindir} -install -m0644 doc/dropwatch.1 $RPM_BUILD_ROOT%{_mandir}/man1 - +%{make_install} %files -%{_bindir}/* -%{_mandir}/man1/* +%{_bindir}/dropwatch +%{_bindir}/dwdump +%{_mandir}/man1/dropwatch.1* +%{_mandir}/man1/dwdump.1* %doc README.md -%doc COPYING +%license COPYING %changelog +* Mon Jul 12 2021 Hangbin Liu - 1.5.3-5 +- Update spec file +- Update Makefile license +- Update obsoleted m4 macros +- Install new command dwdump + * Tue Jan 26 2021 Fedora Release Engineering - 1.5.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a7edd2c46b5537377bd688fae0a6b35adadf2bcc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 21:08:43 +0000 Subject: [PATCH 33/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index aa915a7..136e5f1 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,6 +1,6 @@ Name: dropwatch Version: 1.5.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Kernel dropped packet monitor License: GPLv2+ @@ -50,6 +50,9 @@ network packets. %license COPYING %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.5.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Jul 12 2021 Hangbin Liu - 1.5.3-5 - Update spec file - Update Makefile license From efd0d56be9e4e93a079c43e1a235d2fecce079b2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 01:03:36 +0000 Subject: [PATCH 34/47] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index 136e5f1..56ee9a7 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,6 +1,6 @@ Name: dropwatch Version: 1.5.3 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Kernel dropped packet monitor License: GPLv2+ @@ -50,6 +50,9 @@ network packets. %license COPYING %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.5.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Wed Jul 21 2021 Fedora Release Engineering - 1.5.3-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From dfb9c27b1383aea2e501691913aa56c5c59ed8b7 Mon Sep 17 00:00:00 2001 From: Hangbin Liu Date: Sat, 29 Jan 2022 17:55:44 +0800 Subject: [PATCH 35/47] 1.5.3-8 Resolves: rhbz#2045324 Signed-off-by: Hangbin Liu --- dropwatch-gcc12.patch | 48 +++++++++++++++++++++++++++++++++++++++++++ dropwatch.spec | 6 +++++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 dropwatch-gcc12.patch diff --git a/dropwatch-gcc12.patch b/dropwatch-gcc12.patch new file mode 100644 index 0000000..5b579b7 --- /dev/null +++ b/dropwatch-gcc12.patch @@ -0,0 +1,48 @@ +From 2093d1a4c0cd635edd5de38700ce4b0a404ba06d Mon Sep 17 00:00:00 2001 +From: Hangbin Liu +Date: Wed, 26 Jan 2022 11:06:56 +0800 +Subject: [PATCH] Fix compilation error with gcc 12 + +With gcc 12, there is a warning: + +lookup_bfd.c: In function 'lookup_bfd_init': +lookup_bfd.c:39:52: error: '%s' directive writing up to 389 bytes into a region of size 260 [-Werror=format-overflow=] + 39 | sprintf(dbibuf,"/usr/lib/debug/lib/modules/%s", uts.release); + | ^~ ~~~~~~~~~~~ +In file included from /usr/include/stdio.h:894, + from lookup_bfd.c:14: +In function 'sprintf', + inlined from 'lookup_bfd_init' at lookup_bfd.c:39:2: +/usr/include/bits/stdio2.h:38:10: note: '__sprintf_chk' output between 28 and 417 bytes into a destination of size 287 + 38 | return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1, + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 39 | __glibc_objsize (__s), __fmt, + | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + 40 | __va_arg_pack ()); + | ~~~~~~~~~~~~~~~~~ + +Fix it by using sizeof() instead of strlen() to get the total size of +uts.release. Remove the last +1 since sizeof() will include the last NULL +character. + +Signed-off-by: Hangbin Liu +--- + src/lookup_bfd.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lookup_bfd.c b/src/lookup_bfd.c +index e09dc3f..fdd32c2 100644 +--- a/src/lookup_bfd.c ++++ b/src/lookup_bfd.c +@@ -35,7 +35,7 @@ static int lookup_bfd_init(void) + if(uname(&uts)<0) + return-1; + +- dbibuf = malloc(strlen("/usr/lib/debug/lib/modules/") + strlen(uts.release) + 1); ++ dbibuf = malloc(strlen("/usr/lib/debug/lib/modules/") + sizeof(uts.release)); + sprintf(dbibuf,"/usr/lib/debug/lib/modules/%s", uts.release); + if (stat(dbibuf,&sb) < 0) { + free(dbibuf); +-- +2.31.1 + diff --git a/dropwatch.spec b/dropwatch.spec index 56ee9a7..13ad9aa 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,6 +1,6 @@ Name: dropwatch Version: 1.5.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Kernel dropped packet monitor License: GPLv2+ @@ -10,6 +10,7 @@ Patch0: %{name}-gcc11.patch Patch1: %{name}-install-dwdump-manpage.patch Patch2: %{name}-configure-update-obsoleted-m4-macros.patch Patch3: %{name}-Fix-license-specifiers.patch +Patch4: %{name}-gcc12.patch BuildRequires: autoconf BuildRequires: automake @@ -50,6 +51,9 @@ network packets. %license COPYING %changelog +* Sat Jan 29 2022 Hangbin Liu - 1.5.3-8 +- Fix compilation error with gcc 12 + * Thu Jan 20 2022 Fedora Release Engineering - 1.5.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From a966910798b04a4269a35db4599f81df0a8a79ee Mon Sep 17 00:00:00 2001 From: Hangbin Liu Date: Thu, 5 May 2022 14:46:26 +0800 Subject: [PATCH 36/47] 1.5.4-1 Update to latest upstream version Signed-off-by: Hangbin Liu --- .gitignore | 1 + dropwatch-Fix-license-specifiers.patch | 91 ------------------- ...configure-update-obsoleted-m4-macros.patch | 36 -------- dropwatch-gcc11.patch | 13 --- dropwatch-gcc12.patch | 48 ---------- dropwatch-install-dwdump-manpage.patch | 17 ---- dropwatch.spec | 22 +++-- sources | 2 +- 8 files changed, 17 insertions(+), 213 deletions(-) delete mode 100644 dropwatch-Fix-license-specifiers.patch delete mode 100644 dropwatch-configure-update-obsoleted-m4-macros.patch delete mode 100644 dropwatch-gcc11.patch delete mode 100644 dropwatch-gcc12.patch delete mode 100644 dropwatch-install-dwdump-manpage.patch diff --git a/.gitignore b/.gitignore index 371c672..53969bf 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ dropwatch-1.2.tbz2 /dropwatch-1.4.tbz2 /dropwatch-1.5.tar.gz /dropwatch-1.5.3.tar.gz +/dropwatch-1.5.4.tar.gz diff --git a/dropwatch-Fix-license-specifiers.patch b/dropwatch-Fix-license-specifiers.patch deleted file mode 100644 index d2e23d5..0000000 --- a/dropwatch-Fix-license-specifiers.patch +++ /dev/null @@ -1,91 +0,0 @@ -From ab2965faeeb63fb22b938cc4c80a417b3bf7716b Mon Sep 17 00:00:00 2001 -From: Neil Horman -Date: Wed, 7 Jul 2021 08:36:48 -0400 -Subject: [PATCH] Fix license specifiers - -It was noted that there was an LGPL license in a makefile, which is -rather non-sensical in my mind, and clearly erroneous. So lets fix up -the other build files to match the spdx header in the source code - -Signed-off-by: Neil Horman ---- - Makefile.am | 19 +------------------ - autogen.sh | 2 ++ - configure.ac | 2 ++ - doc/Makefile.am | 1 + - src/Makefile.am | 3 ++- - 5 files changed, 8 insertions(+), 19 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index fb2cfd6..dba20d4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,24 +1,7 @@ - # Makefile.am -- - # Copyright 2018 Neil Horman - # All Rights Reserved. --# --# This library is free software; you can redistribute it and/or --# modify it under the terms of the GNU Lesser General Public --# License as published by the Free Software Foundation; either --# version 2.1 of the License, or (at your option) any later version. --# --# This library is distributed in the hope that it will be useful, --# but WITHOUT ANY WARRANTY; without even the implied warranty of --# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU --# Lesser General Public License for more details. --# --# You should have received a copy of the GNU Lesser General Public --# License along with this library; if not, write to the Free Software --# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --# --# Authors: --# Steve Grubb --# -+# SPDX-License-Identifier: GPL-2.0-or-later - - AUTOMAKE_OPTIONS = no-dependencies - ACLOCAL_AMFLAGS = -I m4 -diff --git a/autogen.sh b/autogen.sh -index b792e8b..35a8644 100755 ---- a/autogen.sh -+++ b/autogen.sh -@@ -1,4 +1,6 @@ - #! /bin/sh -+# SPDX-License-Identifier: GPL-2.0-or-later -+ - set -x -e - mkdir -p m4 - # --no-recursive is available only in recent autoconf versions -diff --git a/configure.ac b/configure.ac -index 3671f27..3b51fb2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,3 +1,5 @@ -+# SPDX-License-Identifier: GPL-2.0-or-later -+ - AC_INIT(dropwatch,1.5.3) - AC_PREREQ(2.12)dnl - AC_CONFIG_HEADERS(config.h) -diff --git a/doc/Makefile.am b/doc/Makefile.am -index 3d61286..76da64e 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -1,2 +1,3 @@ -+# SPDX-License-Identifier: GPL-2.0-or-later - dist_man_MANS = dropwatch.1 dwdump.1 - -diff --git a/src/Makefile.am b/src/Makefile.am -index f56a39d..1fd6c33 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,4 +1,5 @@ -- -+# SPDX-License-Identifier: GPL-2.0-or-later -+# - bin_PROGRAMS = dropwatch dwdump - - AM_CFLAGS = -g -Wall -Werror $(LIBNL3_CFLAGS) $(READLINE_CFLAGS) --- -2.31.1 - diff --git a/dropwatch-configure-update-obsoleted-m4-macros.patch b/dropwatch-configure-update-obsoleted-m4-macros.patch deleted file mode 100644 index c9d878f..0000000 --- a/dropwatch-configure-update-obsoleted-m4-macros.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 6259779e26c928d59b7aae66273da095fcfcb49b Mon Sep 17 00:00:00 2001 -From: Hangbin Liu -Date: Tue, 6 Jul 2021 19:11:43 +0800 -Subject: [PATCH] configure: update obsoleted m4 macros - -Replace obsoleted AM_CONFIG_HEADER[1] with AC_CONFIG_HEADERS. -Also replace deprecated AM_PROG_LIBTOOL[2] with LT_INIT. - -[1] https://www.gnu.org/software/automake/manual/html_node/Optional.html -[2] https://www.gnu.org/software/libtool/manual/html_node/LT_005fINIT.html - -Signed-off-by: Hangbin Liu ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2a840cc..3671f27 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,10 +1,10 @@ - AC_INIT(dropwatch,1.5.3) - AC_PREREQ(2.12)dnl --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE([foreign] [subdir-objects]) --AM_PROG_LIBTOOL -+LT_INIT - AC_SUBST(LIBTOOL_DEPS) - - AC_PROG_CC --- -2.31.1 - diff --git a/dropwatch-gcc11.patch b/dropwatch-gcc11.patch deleted file mode 100644 index 6662498..0000000 --- a/dropwatch-gcc11.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/lookup_bfd.c b/src/lookup_bfd.c -index 8fa4833..e09dc3f 100644 ---- a/src/lookup_bfd.c -+++ b/src/lookup_bfd.c -@@ -35,7 +35,7 @@ static int lookup_bfd_init(void) - if(uname(&uts)<0) - return-1; - -- dbibuf = malloc(strlen("/usr/lib/debug/lib/modules") + strlen(uts.release) + 1); -+ dbibuf = malloc(strlen("/usr/lib/debug/lib/modules/") + strlen(uts.release) + 1); - sprintf(dbibuf,"/usr/lib/debug/lib/modules/%s", uts.release); - if (stat(dbibuf,&sb) < 0) { - free(dbibuf); diff --git a/dropwatch-gcc12.patch b/dropwatch-gcc12.patch deleted file mode 100644 index 5b579b7..0000000 --- a/dropwatch-gcc12.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 2093d1a4c0cd635edd5de38700ce4b0a404ba06d Mon Sep 17 00:00:00 2001 -From: Hangbin Liu -Date: Wed, 26 Jan 2022 11:06:56 +0800 -Subject: [PATCH] Fix compilation error with gcc 12 - -With gcc 12, there is a warning: - -lookup_bfd.c: In function 'lookup_bfd_init': -lookup_bfd.c:39:52: error: '%s' directive writing up to 389 bytes into a region of size 260 [-Werror=format-overflow=] - 39 | sprintf(dbibuf,"/usr/lib/debug/lib/modules/%s", uts.release); - | ^~ ~~~~~~~~~~~ -In file included from /usr/include/stdio.h:894, - from lookup_bfd.c:14: -In function 'sprintf', - inlined from 'lookup_bfd_init' at lookup_bfd.c:39:2: -/usr/include/bits/stdio2.h:38:10: note: '__sprintf_chk' output between 28 and 417 bytes into a destination of size 287 - 38 | return __builtin___sprintf_chk (__s, __USE_FORTIFY_LEVEL - 1, - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 39 | __glibc_objsize (__s), __fmt, - | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - 40 | __va_arg_pack ()); - | ~~~~~~~~~~~~~~~~~ - -Fix it by using sizeof() instead of strlen() to get the total size of -uts.release. Remove the last +1 since sizeof() will include the last NULL -character. - -Signed-off-by: Hangbin Liu ---- - src/lookup_bfd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lookup_bfd.c b/src/lookup_bfd.c -index e09dc3f..fdd32c2 100644 ---- a/src/lookup_bfd.c -+++ b/src/lookup_bfd.c -@@ -35,7 +35,7 @@ static int lookup_bfd_init(void) - if(uname(&uts)<0) - return-1; - -- dbibuf = malloc(strlen("/usr/lib/debug/lib/modules/") + strlen(uts.release) + 1); -+ dbibuf = malloc(strlen("/usr/lib/debug/lib/modules/") + sizeof(uts.release)); - sprintf(dbibuf,"/usr/lib/debug/lib/modules/%s", uts.release); - if (stat(dbibuf,&sb) < 0) { - free(dbibuf); --- -2.31.1 - diff --git a/dropwatch-install-dwdump-manpage.patch b/dropwatch-install-dwdump-manpage.patch deleted file mode 100644 index 1872328..0000000 --- a/dropwatch-install-dwdump-manpage.patch +++ /dev/null @@ -1,17 +0,0 @@ -From a6a152f111766afefcdf3a3ba271cdeb3f387553 Mon Sep 17 00:00:00 2001 -From: Sebastian Wiesinger -Date: Wed, 13 Jan 2021 12:30:06 +0100 -Subject: [PATCH] Install manpage for dwdump - ---- - doc/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/Makefile.am b/doc/Makefile.am -index 6ff1152..3d61286 100644 ---- a/doc/Makefile.am -+++ b/doc/Makefile.am -@@ -1,2 +1,2 @@ --dist_man_MANS = dropwatch.1 -+dist_man_MANS = dropwatch.1 dwdump.1 - diff --git a/dropwatch.spec b/dropwatch.spec index 13ad9aa..fa9db9e 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,16 +1,11 @@ Name: dropwatch -Version: 1.5.3 -Release: 8%{?dist} +Version: 1.5.4 +Release: 1%{?dist} Summary: Kernel dropped packet monitor License: GPLv2+ URL: https://github.com/nhorman/dropwatch Source0: https://github.com/nhorman/dropwatch/archive/v%{version}/%{name}-%{version}.tar.gz -Patch0: %{name}-gcc11.patch -Patch1: %{name}-install-dwdump-manpage.patch -Patch2: %{name}-configure-update-obsoleted-m4-macros.patch -Patch3: %{name}-Fix-license-specifiers.patch -Patch4: %{name}-gcc12.patch BuildRequires: autoconf BuildRequires: automake @@ -51,6 +46,19 @@ network packets. %license COPYING %changelog +* Thu May 5 2022 Hangbin Liu - 1.5.4-1 +- Update to version 1.5.4 +- Support packet drop reason reporting when included in netlink message +- fix some minor compilation warnings/errors +- clean up some comments about deadline support +- convert configure.ac to use AM_PROG_LIBTOOL from outdated LT_INIT +- Fix missing SOL_NETLINK define in glibc < 2.24 +- Fix licensing issues that didn't make sense +- ignore ENOBUFS errors on data socket +- adding arm64 travis ci testing +- man page updates +- move to libnl3 from libnl + * Sat Jan 29 2022 Hangbin Liu - 1.5.3-8 - Fix compilation error with gcc 12 diff --git a/sources b/sources index 27f2b55..cb66d7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dropwatch-1.5.3.tar.gz) = 098e464084ac3bc5509f5a523fe499ab54cca78ba53bebbcccd57a6c01260740c07e5b62b1218c6a62bf2147a74c056b3880dbbc92b3e11425efe8fe83af8878 +SHA512 (dropwatch-1.5.4.tar.gz) = 4af06c05c694d4a044a5e92ba9869a865730bb2caa28cddc33160481f490ed77a7300ef57c9f76722d7bc8d4ac47cdfd5f13daf4f764500f3c90a72b5ee58d61 From a61dc003379ac17f94e1575cddbd12d78201aa37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 00:57:57 +0000 Subject: [PATCH 37/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index fa9db9e..b46475e 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,6 +1,6 @@ Name: dropwatch Version: 1.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kernel dropped packet monitor License: GPLv2+ @@ -46,6 +46,9 @@ network packets. %license COPYING %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.5.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu May 5 2022 Hangbin Liu - 1.5.4-1 - Update to version 1.5.4 - Support packet drop reason reporting when included in netlink message From c66c962c45c3c8356b0ecb2d6d673cf87b33649a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 01:48:58 +0000 Subject: [PATCH 38/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index b46475e..624dbbf 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,6 +1,6 @@ Name: dropwatch Version: 1.5.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Kernel dropped packet monitor License: GPLv2+ @@ -46,6 +46,9 @@ network packets. %license COPYING %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.5.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 1.5.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From b350a3983c41fb45a7e353985850b5203f0f1d10 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 17:54:57 +0000 Subject: [PATCH 39/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index 624dbbf..6e04b76 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,6 +1,6 @@ Name: dropwatch Version: 1.5.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Kernel dropped packet monitor License: GPLv2+ @@ -46,6 +46,9 @@ network packets. %license COPYING %changelog +* Wed Jul 19 2023 Fedora Release Engineering - 1.5.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 1.5.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From e0f464424edbb2921afab36ba6af754cd6f5cda7 Mon Sep 17 00:00:00 2001 From: Hangbin Liu Date: Tue, 14 Nov 2023 14:05:09 +0800 Subject: [PATCH 40/47] spec: update license to SPDX format Signed-off-by: Hangbin Liu --- dropwatch.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dropwatch.spec b/dropwatch.spec index 6e04b76..0bbd167 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,9 +1,9 @@ Name: dropwatch Version: 1.5.4 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Kernel dropped packet monitor -License: GPLv2+ +License: GPL-2.0-or-later URL: https://github.com/nhorman/dropwatch Source0: https://github.com/nhorman/dropwatch/archive/v%{version}/%{name}-%{version}.tar.gz @@ -46,6 +46,9 @@ network packets. %license COPYING %changelog +* Tue Nov 14 2023 Hangbin Liu - 1.5.4-5 +- Update License to SPDX format + * Wed Jul 19 2023 Fedora Release Engineering - 1.5.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From beb90bd4f9d5aaabbfd03ce2c29b155823621a9f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 17:34:25 +0000 Subject: [PATCH 41/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index 0bbd167..71000e4 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,6 +1,6 @@ Name: dropwatch Version: 1.5.4 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Kernel dropped packet monitor License: GPL-2.0-or-later @@ -46,6 +46,9 @@ network packets. %license COPYING %changelog +* Fri Jan 19 2024 Fedora Release Engineering - 1.5.4-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Nov 14 2023 Hangbin Liu - 1.5.4-5 - Update License to SPDX format From 7b46e6148db0abb78be8ddad03a860f34f403556 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 09:51:10 +0000 Subject: [PATCH 42/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index 71000e4..57ceae2 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,6 +1,6 @@ Name: dropwatch Version: 1.5.4 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Kernel dropped packet monitor License: GPL-2.0-or-later @@ -46,6 +46,9 @@ network packets. %license COPYING %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.5.4-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 19 2024 Fedora Release Engineering - 1.5.4-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 6af13c8c8eb9a8ea16de89dfe93d3f10bddfa78d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 21:24:38 +0000 Subject: [PATCH 43/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index 57ceae2..ebb4c42 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,6 +1,6 @@ Name: dropwatch Version: 1.5.4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Kernel dropped packet monitor License: GPL-2.0-or-later @@ -46,6 +46,9 @@ network packets. %license COPYING %changelog +* Wed Jul 17 2024 Fedora Release Engineering - 1.5.4-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 1.5.4-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From e81c726cb862026d2c12bc2fb8dfb2afcaee98f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 16:15:23 +0000 Subject: [PATCH 44/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index ebb4c42..f63d181 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,6 +1,6 @@ Name: dropwatch Version: 1.5.4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Kernel dropped packet monitor License: GPL-2.0-or-later @@ -46,6 +46,9 @@ network packets. %license COPYING %changelog +* Thu Jan 16 2025 Fedora Release Engineering - 1.5.4-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jul 17 2024 Fedora Release Engineering - 1.5.4-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 3d952b57a6f870980adf9941289faf163a1a0b55 Mon Sep 17 00:00:00 2001 From: Hangbin Liu Date: Wed, 30 Apr 2025 02:29:22 +0000 Subject: [PATCH 45/47] 1.5.5-1 Update to 1.5.5 Signed-off-by: Hangbin Liu --- .gitignore | 1 + dropwatch.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 53969bf..e8a6050 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ dropwatch-1.2.tbz2 /dropwatch-1.5.tar.gz /dropwatch-1.5.3.tar.gz /dropwatch-1.5.4.tar.gz +/dropwatch-1.5.5.tar.gz diff --git a/dropwatch.spec b/dropwatch.spec index f63d181..18efa3e 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,6 +1,6 @@ Name: dropwatch -Version: 1.5.4 -Release: 9%{?dist} +Version: 1.5.5 +Release: 1%{?dist} Summary: Kernel dropped packet monitor License: GPL-2.0-or-later @@ -46,6 +46,12 @@ network packets. %license COPYING %changelog +* Wed Apr 30 2025 Hangbin Liu - 1.5.5-1 +- Update to version 1.5.5 +- kas is the default symbol lookup method now +- Fix building without libtool installed +- Misc fixes for kas lookup logic + * Thu Jan 16 2025 Fedora Release Engineering - 1.5.4-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/sources b/sources index cb66d7b..e954bb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dropwatch-1.5.4.tar.gz) = 4af06c05c694d4a044a5e92ba9869a865730bb2caa28cddc33160481f490ed77a7300ef57c9f76722d7bc8d4ac47cdfd5f13daf4f764500f3c90a72b5ee58d61 +SHA512 (dropwatch-1.5.5.tar.gz) = b85de34d9b7c1f8232720dd8d4d843cb251ef96d2d9bd592e001d889bd55c2c6821cb8fb3af061bd8e5e2488f9f3aef4c45d1a0c41de3e626bc7c3794c1a4405 From 27a66461c59353b8bfb9b2f57d22f882aa28c81f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 19:32:03 +0000 Subject: [PATCH 46/47] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- dropwatch.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dropwatch.spec b/dropwatch.spec index 18efa3e..568b88e 100644 --- a/dropwatch.spec +++ b/dropwatch.spec @@ -1,6 +1,6 @@ Name: dropwatch Version: 1.5.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kernel dropped packet monitor License: GPL-2.0-or-later @@ -46,6 +46,9 @@ network packets. %license COPYING %changelog +* Wed Jul 23 2025 Fedora Release Engineering - 1.5.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Apr 30 2025 Hangbin Liu - 1.5.5-1 - Update to version 1.5.5 - kas is the default symbol lookup method now From 14117825e6d6be7bd19829ba5cb42f42bb83be7c Mon Sep 17 00:00:00 2001 From: Hangbin Liu Date: Tue, 29 Jul 2025 08:37:58 +0000 Subject: [PATCH 47/47] Convert test to tmt Resolves: rhbz#2382892 Signed-off-by: Hangbin Liu --- .fmf/version | 1 + plans.fmf | 9 +++++ tests/README | 2 -- tests/inventory | 3 -- tests/main.fmf | 2 ++ tests/run_tests.sh | 15 ++++++++ tests/selftest/Makefile | 64 --------------------------------- tests/selftest/PURPOSE | 4 --- tests/selftest/runtest.sh | 74 --------------------------------------- tests/tests.yml | 21 ----------- 10 files changed, 27 insertions(+), 168 deletions(-) create mode 100644 .fmf/version create mode 100644 plans.fmf delete mode 100644 tests/README delete mode 100755 tests/inventory create mode 100644 tests/main.fmf create mode 100755 tests/run_tests.sh delete mode 100644 tests/selftest/Makefile delete mode 100644 tests/selftest/PURPOSE delete mode 100755 tests/selftest/runtest.sh delete mode 100644 tests/tests.yml diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/plans.fmf b/plans.fmf new file mode 100644 index 0000000..20f21fd --- /dev/null +++ b/plans.fmf @@ -0,0 +1,9 @@ +summary: Run dropwatch selftest +discover: + how: fmf +prepare: + how: install + # install psmisc for killall + package: [dropwatch, psmisc] +execute: + how: tmt diff --git a/tests/README b/tests/README deleted file mode 100644 index 44fb438..0000000 --- a/tests/README +++ /dev/null @@ -1,2 +0,0 @@ -initial tests: -run make check, which runs any selftests in the upstream source tarball diff --git a/tests/inventory b/tests/inventory deleted file mode 100755 index 6238138..0000000 --- a/tests/inventory +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -export TEST_DOCKER_EXTRA_ARGS="--security-opt seccomp:unconfined" -exec merge-standard-inventory "$@" diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..6189cf3 --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,2 @@ +summary: Smoke test +test: ./run_tests.sh diff --git a/tests/run_tests.sh b/tests/run_tests.sh new file mode 100755 index 0000000..6777d3c --- /dev/null +++ b/tests/run_tests.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +abort_dropwatch() { + sleep 5 + killall -SIGINT dropwatch +} + +abort_dropwatch & +echo -e "set alertlimit 1\nstart\nstop\nexit" | dropwatch -l kas &> "$TMT_TEST_DATA"/dropwatch.log + +# shellcheck disable=SC2181 +[ $? -eq 0 ] && exit 0 +# If the platform doesn't support NET_DM, skip this test +# Usually we got this issue in container as no privilege permission +grep -q NET_DM "$TMT_TEST_DATA"/dropwatch.log && exit 0 || exit 1 diff --git a/tests/selftest/Makefile b/tests/selftest/Makefile deleted file mode 100644 index 7b452de..0000000 --- a/tests/selftest/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Makefile of /CoreOS/patch/Sanity/selftest -# Description: Executes upstream test suite -# Author: Miroslav Vadkerti -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2010 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -export TEST=/CoreOS/rng-tools/Sanity/selftest -export TESTVERSION=1.0 - -BUILT_FILES= - -FILES=$(METADATA) runtest.sh Makefile PURPOSE - -.PHONY: all install download clean - -run: $(FILES) build - ./runtest.sh - -build: $(BUILT_FILES) - chmod a+x runtest.sh - -clean: - rm -f *~ $(BUILT_FILES) - - -include /usr/share/rhts/lib/rhts-make.include - -$(METADATA): Makefile - @echo "Owner: Miroslav Vadkerti " > $(METADATA) - @echo "Name: $(TEST)" >> $(METADATA) - @echo "TestVersion: $(TESTVERSION)" >> $(METADATA) - @echo "Path: $(TEST_DIR)" >> $(METADATA) - @echo "Description: Executes upstream test suite" >> $(METADATA) - @echo "Type: Sanity" >> $(METADATA) - @echo "TestTime: 30m" >> $(METADATA) - @echo "RunFor: patch" >> $(METADATA) - @echo "Requires: patch gcc rpm-build automake libselinux-devel ed libattr-devel" >> $(METADATA) - @echo "Priority: Normal" >> $(METADATA) - @echo "License: GPLv2" >> $(METADATA) - @echo "Confidential: no" >> $(METADATA) - @echo "Destructive: no" >> $(METADATA) - @echo "Releases: -RHEL3 -RHEL4 -RHELServer5 -RHELClient5" >> $(METADATA) - - rhts-lint $(METADATA) diff --git a/tests/selftest/PURPOSE b/tests/selftest/PURPOSE deleted file mode 100644 index 971cc3f..0000000 --- a/tests/selftest/PURPOSE +++ /dev/null @@ -1,4 +0,0 @@ -PURPOSE of /CoreOS/dropwatch/Sanity/selftest -Description: Executes rngtest to validate integrity of dropwatch -Author: Neil Horman - diff --git a/tests/selftest/runtest.sh b/tests/selftest/runtest.sh deleted file mode 100755 index a9f6055..0000000 --- a/tests/selftest/runtest.sh +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/bash -# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# runtest.sh of /CoreOS/rng-tools/Sanity/selftest -# Description: Executes the upstream test suite comming with the package -# Author: Miroslav Vadkerti -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -# -# Copyright (c) 2010 Red Hat, Inc. All rights reserved. -# -# This copyrighted material is made available to anyone wishing -# to use, modify, copy, or redistribute it subject to the terms -# and conditions of the GNU General Public License version 2. -# -# This program is distributed in the hope that it will be -# useful, but WITHOUT ANY WARRANTY; without even the implied -# warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -# PURPOSE. See the GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program; if not, write to the Free -# Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. -# -# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -# Include rhts environment -. /usr/bin/rhts-environment.sh || exit 1 -. /usr/share/beakerlib/beakerlib.sh || exit 1 - -PACKAGE="dropwatch" -PACKAGES="dropwatch automake autoconf libtool kernel-headers readline-devel binutils-devel libnl3-devel pkgconf-pkg-config" -UPSTREAMPKG="dropwatch-*" -BUILDLOG=`mktemp` -TESTLOG=`mktemp` -TARGET=$(echo `uname -m` | egrep ppc) -if [[ $TARGET != "" ]]; then TARGET="--target `uname -m`"; fi -TOPDIR=`mktemp -d` -SPEC="$TOPDIR/SPECS/$PACKAGE*.spec" -TESTDIR="$TOPDIR/BUILD/$UPSTREAMPKG/" - -rlJournalStart - rlPhaseStartSetup - for PKG in $PACKAGES; do - rlAssertRpm $PKG - done - rlPhaseEnd - rlPhaseStartTest - rlFetchSrcForInstalled $PACKAGE - rlRun "rpm -ivh --define '_topdir $TOPDIR' $PACKAGE*.src.rpm" 0 "Installing $PACKAGE src rpm" - echo "+ Building $PACKAGE (Log: $BUILDLOG)" - echo "+ Build command: rpmbuild -bc $SPEC $TARGET" - rlRun "rpmbuild --define '_topdir $TOPDIR' -bc $SPEC $TARGET &> $BUILDLOG" - echo "+ Buildlog:" - tail -n 100 $BUILDLOG - rlRun "pushd ." - rlRun "cd $TESTDIR" - rlRun "make check &> $TESTLOG" - if [ $? -eq 0 ] - then - rlPass "Selftest Passed" - else - rlFail "Selftest Failed" - fi - rlPhaseEnd - - rlPhaseStartCleanup - rlRun "popd" - rlRun "rm -rf $PACKAGE*.src.rpm" 0 "Removing source rpm" - rlPhaseEnd -rlJournalPrintText -rlJournalEnd diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index a4aef7b..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- -# This first play always runs on the local staging system -- hosts: localhost - roles: - - role: standard-test-beakerlib - tags: - - classic - tests: - - selftest - required_packages: - - autoconf - - automake - - libtool - - kernel-headers - - readline-devel - - binutils-devel - - libnl3-devel - - pkgconf-pkg-config - - libnl3-devel - - wget - - rpm-build