From 5710f3584e4927e929ddaf3341a2cb41a5608087a5ddb1452c61df89a3b1b537 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 28 Feb 2020 09:32:14 +0000 Subject: [PATCH] - Update project url - Drop no longer needed patches: * netdiscover-fix-spelling-binary.patch * netdiscover-fix-manpage.patch * netdiscover-fix-makefile.patch * netdiscover-update-oui.patch - Update to version 0.5.1: * Added an official repository notice in README. * Added dates of releases in ChangeLog. * Added some copyright notices. * Several important fixes and improvements in manpage and help page. - For changes for previous releses see provided Changelog OBS-URL: https://build.opensuse.org/package/show/network:utilities/netdiscover?expand=0&rev=8 --- netdiscover-0.3-pre-beta7-LINUXONLY.tar.gz | 3 - netdiscover-0.5.1.tar.gz | 3 + netdiscover-fix-makefile.patch | 18 ---- netdiscover-fix-manpage.patch | 53 ------------ netdiscover-fix-spelling-binary.patch | 35 -------- netdiscover-update-oui.patch | 99 ---------------------- netdiscover.changes | 16 ++++ netdiscover.spec | 31 +++---- 8 files changed, 29 insertions(+), 229 deletions(-) delete mode 100644 netdiscover-0.3-pre-beta7-LINUXONLY.tar.gz create mode 100644 netdiscover-0.5.1.tar.gz delete mode 100644 netdiscover-fix-makefile.patch delete mode 100644 netdiscover-fix-manpage.patch delete mode 100644 netdiscover-fix-spelling-binary.patch delete mode 100644 netdiscover-update-oui.patch diff --git a/netdiscover-0.3-pre-beta7-LINUXONLY.tar.gz b/netdiscover-0.3-pre-beta7-LINUXONLY.tar.gz deleted file mode 100644 index 3ece0cc..0000000 --- a/netdiscover-0.3-pre-beta7-LINUXONLY.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:01c6e090c3b06e374005f7efcead3b5b2f63f47bfb94383c1dbde9abcf1cd8aa -size 367639 diff --git a/netdiscover-0.5.1.tar.gz b/netdiscover-0.5.1.tar.gz new file mode 100644 index 0000000..65c7df7 --- /dev/null +++ b/netdiscover-0.5.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:153bab7fee507ff631cdedee673031cd5fa8e2cbd6347f4928d1edbeab20f2c6 +size 334815 diff --git a/netdiscover-fix-makefile.patch b/netdiscover-fix-makefile.patch deleted file mode 100644 index c184e5a..0000000 --- a/netdiscover-fix-makefile.patch +++ /dev/null @@ -1,18 +0,0 @@ -Description: avoid to install undesirable files. -Author: Joao Eriberto Mota Filho -Last-Update: 2015-04-15 -Index: netdiscover-0.3-pre-beta7/Makefile.am -=================================================================== ---- netdiscover-0.3-pre-beta7.orig/Makefile.am -+++ netdiscover-0.3-pre-beta7/Makefile.am -@@ -5,10 +5,7 @@ SUBDIRS = src doc - - doc_DATA = \ - README\ -- COPYING\ - AUTHORS\ -- ChangeLog\ -- NEWS\ - TODO - - EXTRA_DIST = \ diff --git a/netdiscover-fix-manpage.patch b/netdiscover-fix-manpage.patch deleted file mode 100644 index 8cd8e16..0000000 --- a/netdiscover-fix-manpage.patch +++ /dev/null @@ -1,53 +0,0 @@ -Description: fix some spelling mistakes. -Author: William Vera - Joao Eriberto Mota Filho -Last-Update: 2016-11-28 -Index: netdiscover-0.3-pre-beta7/doc/netdiscover.8 -=================================================================== ---- netdiscover-0.3-pre-beta7.orig/doc/netdiscover.8 -+++ netdiscover-0.3-pre-beta7/doc/netdiscover.8 -@@ -61,7 +61,7 @@ wireless networks with low signal level. - .TP - \fB\-f\fR - Enable fast mode scan. This will only scan for .1, .100 and .254 on --each network. This mode is usefull while searching for ranges being -+each network. This mode is useful while searching for ranges being - used. After you found such range you can make a specific range scan to - find online boxes. - -@@ -83,7 +83,7 @@ When using -P, continue program executio - to capture ARP packets passively. - - .SH USAGE --If passive mode (-p), scan list (-l) or scan range (-r) options arent -+If passive mode (-p), scan list (-l) or scan range (-r) options aren't - enabled, netdiscover will scan for common lan addresses. - .PP - Screen control keys -@@ -102,7 +102,7 @@ Scroll up (or up arrow) - - .TP - \fBa\fR --Show arp replys list -+Show arp replies list - - .TP - \fBr\fR -@@ -114,7 +114,7 @@ Close help screen or end application - - .SH CONFIG FILES - There are 2 configuration files that netdiscover will look for, each --time it is executed, if file doesnt exist it will use default values. -+time it is executed, if file doesn't exist it will use default values. - You can use the -d switch to disable reading and loading configuration - files. - -@@ -131,7 +131,7 @@ Example:\fR - - .TP - \fB~/.netdiscover/fastips\fR --List contaning the last octect of the ips to be scanned on each -+List containing the last octect of the ips to be scanned on each - subnet, when using fast mode, by default (1,100,154). - - Example:\fR diff --git a/netdiscover-fix-spelling-binary.patch b/netdiscover-fix-spelling-binary.patch deleted file mode 100644 index 58b9481..0000000 --- a/netdiscover-fix-spelling-binary.patch +++ /dev/null @@ -1,35 +0,0 @@ -Description: fix spellings in final binary. -Author: Joao Eriberto Mota Filho -Last-Update: 2016-04-14 -Index: netdiscover-0.3-pre-beta7/src/screen.c -=================================================================== ---- netdiscover-0.3-pre-beta7.orig/src/screen.c -+++ netdiscover-0.3-pre-beta7/src/screen.c -@@ -326,7 +326,7 @@ void fill_screen() - "\t | q: exit this screen or end | \n" - "\t | | \n" - "\t | \33[1mScreen views\33[0m | \n" -- "\t | a: show arp replys list | \n" -+ "\t | a: show arp replies list | \n" - "\t | r: show arp requests list | \n" - "\t | u: show unique hosts detected | \n" - "\t | | \n" -Index: netdiscover-0.3-pre-beta7/src/main.c -=================================================================== ---- netdiscover-0.3-pre-beta7.orig/src/main.c -+++ netdiscover-0.3-pre-beta7/src/main.c -@@ -528,12 +528,12 @@ void usage(char *comando) - " -p passive mode: do not send anything, only sniff\n" - " -m file: scan the list of known MACs and host names\n" - " -F filter: Customize pcap filter expression (default: \"arp\")\n" -- " -s time: time to sleep between each arp request (miliseconds)\n" -+ " -s time: time to sleep between each arp request (milliseconds)\n" - " -n node: last ip octet used for scanning (from 2 to 253)\n" - " -c count: number of times to send each arp reques (for nets with packet loss)\n" - " -f enable fastmode scan, saves a lot of time, recommended for auto\n" - " -d ignore home config files for autoscan and fast mode\n" -- " -S enable sleep time supression betwen each request (hardcore mode)\n" -+ " -S enable sleep time supression between each request (hardcore mode)\n" - " -P print results in a format suitable for parsing by another program\n" - " -N Do not print header. Only valid when -P is enabled.\n" - " -L in parsable output mode (-P), continue listening after the active scan is completed\n\n" diff --git a/netdiscover-update-oui.patch b/netdiscover-update-oui.patch deleted file mode 100644 index a6a7fdf..0000000 --- a/netdiscover-update-oui.patch +++ /dev/null @@ -1,99 +0,0 @@ -Index: netdiscover-0.3-pre-beta7/update-oui-database.sh -=================================================================== ---- netdiscover-0.3-pre-beta7.orig/update-oui-database.sh -+++ netdiscover-0.3-pre-beta7/update-oui-database.sh -@@ -23,15 +23,15 @@ - JA=${0##*/} - DATE=$(date +'%Y%m%d') - ORIGF=oui.txt --DSTD=src -+#DSTD=src - DSTF=oui.h - URL="http://standards.ieee.org/develop/regauth/oui/oui.txt" --TMPF=$ORIGF-$DATE -+TMPF=$ORIGF - AWK="gawk" - #AWK="mawk" - #AWK="awk" - --[ -d "$DSTD" ] || { echo "$JA: Destdir \"$DSTD\" not exist!"; exit 1; } -+#[ -d "$DSTD" ] || { echo "$JA: Destdir \"$DSTD\" not exist!"; exit 1; } - #if ! [ -f "$TMPF" -a -s "$TMPF" ]; then - # echo "Trying download \"$ORIGF\" with lynx..." - # if ! lynx -source $URL >"$TMPF"; then -@@ -47,32 +47,32 @@ AWK="gawk" - #else - # echo "\"$TMPF\" already exist, skipping download..." - #fi --if ! [ -f "$TMPF" -a -s "$TMPF" ]; then -- echo -n "Trying download \"$ORIGF\" with lynx..." -- if [[ -x /usr/bin/lynx ]]; then -- lynx -source $URL >"$TMPF" -- else -- echo -n " with elinks..." -- if [[ -x /usr/bin/elinks ]]; then -- elinks -source $URL >"$TMPF" -- else -- echo " with wget..." -- if [[ -x /usr/bin/wget ]]; then -- wget --quiet --output-document="$TMPF" $URL -- else -- if [[ -x /usr/bin/curl ]]; then -- curl -s $URL >"$TMPF" -- else -- echo "$JA: Can't obtain \"$URL\"!" -- exit 1 -- fi -- fi -- fi -- fi --else -- echo -n "\"$TMPF\" already exist, skipping download..." --fi --echo "" -+#if ! [ -f "$TMPF" -a -s "$TMPF" ]; then -+# echo -n "Trying download \"$ORIGF\" with lynx..." -+# if [[ -x /usr/bin/lynx ]]; then -+# lynx -source $URL >"$TMPF" -+# else -+# echo -n " with elinks..." -+# if [[ -x /usr/bin/elinks ]]; then -+# elinks -source $URL >"$TMPF" -+# else -+# echo " with wget..." -+# if [[ -x /usr/bin/wget ]]; then -+# wget --quiet --output-document="$TMPF" $URL -+# else -+# if [[ -x /usr/bin/curl ]]; then -+# curl -s $URL >"$TMPF" -+# else -+# echo "$JA: Can't obtain \"$URL\"!" -+# exit 1 -+# fi -+# fi -+# fi -+# fi -+#else -+# echo -n "\"$TMPF\" already exist, skipping download..." -+#fi -+#echo "" - - echo "Process oui.txt (\"$TMPF\")..." - -@@ -108,7 +108,8 @@ BEGIN { - END { - printf(" { NULL, NULL }\n};\n\n"); - printf("// Total %i items.\n\n", NN); --}' >"$DSTD/$DSTF" -+}' >"$DSTF" -+##}' >"$DSTD/$DSTF" - - - if [ $? -ne 0 ]; then -@@ -116,5 +117,5 @@ if [ $? -ne 0 ]; then - exit 1 - else - echo "All OK" -- ls -oh oui.txt-* src/oui.h -+## ls -oh oui.txt-* src/oui.h - fi diff --git a/netdiscover.changes b/netdiscover.changes index 40bcd66..62b6c2b 100644 --- a/netdiscover.changes +++ b/netdiscover.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Feb 28 09:22:14 UTC 2020 - Martin Pluskal + +- Update project url +- Drop no longer needed patches: + * netdiscover-fix-spelling-binary.patch + * netdiscover-fix-manpage.patch + * netdiscover-fix-makefile.patch + * netdiscover-update-oui.patch +- Update to version 0.5.1: + * Added an official repository notice in README. + * Added dates of releases in ChangeLog. + * Added some copyright notices. + * Several important fixes and improvements in manpage and help page. +- For changes for previous releses see provided Changelog + ------------------------------------------------------------------- Wed Feb 28 14:25:58 UTC 2018 - mpluskal@suse.com diff --git a/netdiscover.spec b/netdiscover.spec index 949bb57..92b545c 100644 --- a/netdiscover.spec +++ b/netdiscover.spec @@ -1,7 +1,7 @@ # # spec file for package netdiscover # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,28 +12,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define pkgver 0.3-pre-beta7 Name: netdiscover -Version: 0.3_beta7 +Version: 0.5.1 Release: 0 Summary: A network address discovering/monitoring tool License: GPL-3.0-or-later Group: Productivity/Networking/Other -Url: https://sourceforge.net/projects/netdiscover/?source=directory -Source0: https://sourceforge.net/projects/netdiscover/files/netdiscover/%{pkgver}-LINUXONLY/netdiscover-%{pkgver}-LINUXONLY.tar.gz -# PATCH-FIX-OPENSUSE netdiscover-update-oui.patch -- alows us updating oui -# database from hwdata -Patch0: netdiscover-update-oui.patch -# Patches from debian -Patch1: netdiscover-fix-makefile.patch -Patch2: netdiscover-fix-spelling-binary.patch -Patch3: netdiscover-fix-manpage.patch +URL: https://github.com/netdiscover-scanner/netdiscover +Source0: https://github.com/netdiscover-scanner/netdiscover/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRequires: autoconf BuildRequires: automake +BuildRequires: dos2unix BuildRequires: hwdata BuildRequires: libnet-devel BuildRequires: libpcap-devel @@ -49,18 +42,14 @@ inspect your network arp traffic, and find network addresses using auto scan mode, which will scan for common local networks. %prep -%setup -q -n netdiscover-%{pkgver} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup %build autoreconf -fiv %configure cp %{_datadir}/hwdata/oui.txt ./ -sh update-oui-database.sh -make %{?_smp_mflags} +sh update-oui-database.sh --no-download +%make_build %install %make_install @@ -70,6 +59,6 @@ rm -rf %{buildroot}%{_datadir}/doc %license COPYING %doc ChangeLog README AUTHORS NEWS TODO %{_sbindir}/netdiscover -%{_mandir}/man8/netdiscover.8%{ext_man} +%{_mandir}/man8/netdiscover.8%{?ext_man} %changelog