Release v2.5

- Update lincese name to be more explicit.
- Update version.
- Update copyright year of changed files.
- Apply codespell (v1.16.0) typo fixes.

CREDITS

@@ -1,4 +1,4 @@
-License is GPL v2, is the same as of Linux kernel:
+License is GPL-2.0-only, is the same as of Linux kernel:
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

IPT-NETFLOW-MIB.my

@@ -29,7 +29,7 @@ iptNetflowMIB MODULE-IDENTITY
 
 	Copyright (c) 2014 <abc at telekom.ru>.
 
-	License: GPL"
+	License: GPL-2.0-only"
 
     REVISION	"201409110000Z"
     DESCRIPTION "Initial revision."

NEWS

@@ -1,6 +1,12 @@
 ipt-netflow NEWS
 ================
 
+2.5 (2020-04-24)
+    * Minor maintenance release.
+      - Compilation compatibility with kernels up to 5.6.
+      - Performance improvements by Vadim Fedorenko.
+      - Small code fixes and typo corrections.
+
 2.4 (2019-06-23)
     * Minor maintenance release.
       - Compilation compatibility with kernels up to 5.2.

README

@@ -463,7 +463,7 @@ ipt_NETFLOW linux 2.6.x-5.x kernel module by <abc@openwall.com> -- 2008-2019.
        For NetFlow v5 protocol meaning of fields in dummy flows are such:
          Src IP, Src Port  is Pre-nat source address.
          Dst IP, Dst Port  is Post-nat destination address.
-           - These two fields made equal to data flows catched in FORWARD chain.
+           - These two fields made equal to data flows caught in FORWARD chain.
          Nexthop, Src AS  is Post-nat source address for SNAT. Or,
          Nexthop, Dst AS  is Pre-nat destination address for DNAT.
          TCP Flags is SYN+SCK for start event, RST+FIN for stop event.
@@ -472,7 +472,7 @@ ipt_NETFLOW linux 2.6.x-5.x kernel module by <abc@openwall.com> -- 2008-2019.
        Natevents are compilation disabled by default, to enable you will need to
        add --enable-natevents option to ./configure script.
 
-       For techical description of NAT Events see:
+       For technical description of NAT Events see:
          http://tools.ietf.org/html/draft-ietf-behave-ipfix-nat-logging-04
 
    inactive_timeout=15

compat.h

@@ -1,7 +1,7 @@
 /* This code is derived from the Linux Kernel sources intended
  * to maintain compatibility with different Kernel versions.
  * Copyright of original source is of respective Linux Kernel authors.
- * License is GPLv2.
+ * License is GPL-2.0-only.
  */
 
 #ifndef COMPAT_NETFLOW_H

gen_compat_def

@@ -4,7 +4,7 @@
 # Generate defines based on kernel having
 # some symbols declared
 #
-# Copyright (C) 2019 <abc@openwall.com>
+# Copyright (C) 2019,2020 <abc@openwall.com>
 #
 
 export LANG=C

ipt_NETFLOW.c

@@ -1,6 +1,6 @@
 /*
  * This is NetFlow exporting module (NETFLOW target) for linux
- * (c) 2008-2019 <abc@openwall.com>
+ * (c) 2008-2020 <abc@openwall.com>
  *
  *
  *   This program is free software: you can redistribute it and/or modify
@@ -92,7 +92,7 @@
 # endif
 #endif
 
-#define IPT_NETFLOW_VERSION "2.4"   /* Note that if you are using git, you
+#define IPT_NETFLOW_VERSION "2.5"   /* Note that if you are using git, you
 				       will see version in other format. */
 #include "version.h"
 #ifdef GITVERSION

irqtop

@@ -1,7 +1,7 @@
 #!/usr/bin/ruby
-# Obeserve irq and softirq in top fashion
+# Observe irq and softirq in top fashion
 # (c) 2014 <abc@telekom.ru>
-# License: GPL.
+# License: GPL-2.0-only.
 
 require 'getoptlong'
 require 'curses'

openwrt/Makefile

@@ -5,7 +5,7 @@ PKG_NAME:=ipt-netflow
 PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=https://github.com/aabc/$(PKG_NAME).git
-PKG_VERSION:=2.4
+PKG_VERSION:=2.5
 PKG_SOURCE_VERSION:=v$(PKG_VERSION)
 
 #TO BUILD development version uncomment 2 rows below and remove patches