- rediff patches, rebuild with openssl 3.0.0, rel 8

diff --git a/ieee-oui.patch b/ieee-oui.patch
index e0eec17525938a321bf4ef2f5aeda3885a781eaf..194384fb704cb6caec111e4c51b2c9ef034ec4dd 100644 (file)
--- a/ieee-oui.patch
+++ b/ieee-oui.patch
@@ -1,8 +1,9 @@
---- ntop-3.3.10/Makefile.am~   2010-04-07 01:05:52.000000000 +0300
-+++ ntop-3.3.10/Makefile.am    2010-04-07 09:18:06.085523903 +0300
-@@ -77,9 +77,12 @@
-       GeoIPASNum.dat \
-       GeoLiteCity.dat
+diff -urNp -x '*.orig' ntop-5.0.1.org/Makefile.am ntop-5.0.1/Makefile.am
+--- ntop-5.0.1.org/Makefile.am 2021-10-05 21:40:21.302499543 +0200
++++ ntop-5.0.1/Makefile.am     2021-10-05 21:40:21.552501388 +0200
+@@ -64,9 +64,12 @@ ETTER_PASSIVE = $(ETTER_PASSIVE_FILE).gz
+ ETTER_PASSIVE_DOWNLOAD_FROM = "http://ettercap.cvs.sourceforge.net/ettercap/ettercap_ng/share"
+ ETTER_PASSIVE_DOWNLOAD_PARMS = "rev=HEAD"
  
 +OUI_FILES = \
 +      oui.txt.gz
@@ -12,5 +13,5 @@
 -           oui.txt.gz \
 +           $(OUI_FILES) \
             specialMAC.txt.gz \
-                  $(GEOIP_FILES)
- 
+          GeoIPASNum.dat \
+          GeoLiteCity.dat

diff --git a/ntop-am.patch b/ntop-am.patch
index 630584d867bfc53e806e422625e43a425c750523..bec0497ce510817061b2f2602e02ad3cd9cc3aa6 100644 (file)
--- a/ntop-am.patch
+++ b/ntop-am.patch
@@ -1,17 +1,19 @@
---- ntop-3.2/Makefile.am~      2006-01-02 02:50:33.000000000 +0200
-+++ ntop-3.2/Makefile.am       2006-01-02 02:50:35.000000000 +0200
-@@ -97,7 +97,7 @@
+diff -urNp -x '*.orig' ntop-5.0.1.org/Makefile.am ntop-5.0.1/Makefile.am
+--- ntop-5.0.1.org/Makefile.am 2012-08-02 09:39:52.000000000 +0200
++++ ntop-5.0.1/Makefile.am     2021-10-05 21:40:19.232484258 +0200
+@@ -105,7 +105,7 @@ DOCSFILES      = `cat docs/FILES`
  #
  # The Games
  #
 -bin_PROGRAMS   = ntop
 +sbin_PROGRAMS   = ntop
  EXTRA_PROGRAMS = ntops
- bin_SCRIPTS    = 
+ bin_SCRIPTS    =
  
---- ntop-3.2/configure.in~     2006-01-02 02:54:22.000000000 +0200
-+++ ntop-3.2/configure.in      2006-01-02 02:58:04.000000000 +0200
-@@ -61,7 +61,7 @@
+diff -urNp -x '*.orig' ntop-5.0.1.org/configure.in ntop-5.0.1/configure.in
+--- ntop-5.0.1.org/configure.in        2012-08-13 09:35:26.000000000 +0200
++++ ntop-5.0.1/configure.in    2021-10-05 21:40:19.232484258 +0200
+@@ -61,7 +61,7 @@ AM_CONFIG_HEADER(config.h)
  HAS_ERROR=
  HAS_WARNING=
  
@@ -20,4 +22,3 @@
  
  echo
  echo "Welcome to $PACKAGE_NAME, Version $PACKAGE_VERSION $NTOP_VERSION_EXTRA"
-

diff --git a/ntop.spec b/ntop.spec
index d2de3ae177d63aad077fb380a087afc207e0a09a..c7c7a9425176e25da63859d76f86b318425fde9d 100644 (file)
--- a/ntop.spec
+++ b/ntop.spec
@@ -12,7 +12,7 @@ Summary:      Network monitoring tool
 Summary(pl.UTF-8):     Narzędzie do monitorowania sieci
 Name:          ntop
 Version:       5.0.1
-Release:       7
+Release:       8
 License:       GPL v3+
 Group:         Networking
 Source0:       http://downloads.sourceforge.net/ntop/%{name}-%{version}.tar.gz