[openwrt/openwrt] thc-ipv6: update to 3.8

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/5479281c727004ecfdeb4318dc96d5f232ddaaf8

commit 5479281c727004ecfdeb4318dc96d5f232ddaaf8
Author: Nick Hainke <vincent at systemli.org>
AuthorDate: Mon Sep 26 07:22:08 2022 +0200

    thc-ipv6: update to 3.8
    
    Remove upstreamed patches:
    - 000-cflags_override.patch
    
    Manually refresh patches:
    - 100-no-ssl.patch
    
    Add patches:
    - 101-remove-march-native.patch
    
    Add THC_APPLETS:
    - toobigsniff6
    - flood_unreach6
    - connect6
    
    Signed-off-by: Nick Hainke <vincent at systemli.org>
---
 package/network/ipv6/thc-ipv6/Makefile                    |  6 +++---
 package/network/ipv6/thc-ipv6/patches/100-no-ssl.patch    |  7 ++++---
 ...flags_override.patch => 101-remove-march-native.patch} | 15 +++++++--------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/package/network/ipv6/thc-ipv6/Makefile b/package/network/ipv6/thc-ipv6/Makefile
index 91bacf625e..b26b0507fb 100644
--- a/package/network/ipv6/thc-ipv6/Makefile
+++ b/package/network/ipv6/thc-ipv6/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=thc-ipv6
-PKG_VERSION:=2.7
+PKG_VERSION:=3.8
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@GITHUB/vanhauser-thc/THC-Archive/master/Tools
-PKG_HASH:=440a3ae98b57100c397ec4f8634468dbbb0c3b48788c6b74af2a597a90544a96
+PKG_HASH:=b60be61a8b0a944a66e3b719704b4c03c1bc2c22f32d5d21e99e434c82a9d769
 
 PKG_MAINTAINER:=Jo-Philipp Wich <jo at mein.io>
 
@@ -31,7 +31,7 @@ THC_APPLETS := \
 	fuzz_dhcps6 implementation6 implementation6d inverse_lookup6          \
 	kill_router6 ndpexhaust6 node_query6 parasite6 passive_discovery6     \
 	randicmp6 redir6 rsmurf6 sendpees6 sendpeesmp6 smurf6 thcping6        \
-	toobig6 trace6
+	toobig6 trace6 toobigsniff6 flood_unreach6 connect6
 
 THC_DEPENDS_dnsdict6 := +libpthread
 THC_DEPENDS_thcping6 := +librt
diff --git a/package/network/ipv6/thc-ipv6/patches/100-no-ssl.patch b/package/network/ipv6/thc-ipv6/patches/100-no-ssl.patch
index 1ef1f66be8..118c2a705b 100644
--- a/package/network/ipv6/thc-ipv6/patches/100-no-ssl.patch
+++ b/package/network/ipv6/thc-ipv6/patches/100-no-ssl.patch
@@ -1,9 +1,10 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -1,5 +1,5 @@
+@@ -1,6 +1,6 @@
  # Comment out if openssl-dev is not present
+ # of if you want to compile statc
 -HAVE_SSL=yes
 +#HAVE_SSL=yes
  
- CC=gcc
- #CFLAGS=-g
+ # comment in if you want to compile static tools
+ #STATIC=-static
diff --git a/package/network/ipv6/thc-ipv6/patches/000-cflags_override.patch b/package/network/ipv6/thc-ipv6/patches/101-remove-march-native.patch
similarity index 69%
rename from package/network/ipv6/thc-ipv6/patches/000-cflags_override.patch
rename to package/network/ipv6/thc-ipv6/patches/101-remove-march-native.patch
index e1c36b6c6c..da6c7caa7c 100644
--- a/package/network/ipv6/thc-ipv6/patches/000-cflags_override.patch
+++ b/package/network/ipv6/thc-ipv6/patches/101-remove-march-native.patch
@@ -1,12 +1,11 @@
-diff -urN thc-ipv6-2.7/Makefile thc-ipv6-2.7.new/Makefile
---- thc-ipv6-2.7/Makefile	2014-12-27 05:05:30.000000000 -0800
-+++ thc-ipv6-2.7.new/Makefile	2017-02-04 20:55:51.679898101 -0800
-@@ -3,7 +3,7 @@
+--- a/Makefile
++++ b/Makefile
+@@ -7,7 +7,7 @@ HAVE_SSL=yes
  
- CC=gcc
+ #CC=gcc
  #CFLAGS=-g
--CFLAGS=-O2
-+CFLAGS?=-O2
+-CFLAGS+=-g -O3 -march=native -flto -falign-functions -falign-jumps -falign-loops -falign-labels -freorder-blocks
++CFLAGS+=-g -O3 -flto -falign-functions -falign-jumps -falign-loops -falign-labels -freorder-blocks
  CFLAGS+=$(if $(HAVE_SSL),-D_HAVE_SSL,)
  LDFLAGS+=-lpcap $(if $(HAVE_SSL),-lssl -lcrypto,)
- PROGRAMS=parasite6 dos-new-ip6 detect-new-ip6 fake_router6 fake_advertise6 fake_solicitate6 fake_mld6 fake_mld26 fake_mldrouter6 flood_mldrouter6 fake_mipv6 redir6 smurf6 alive6 toobig6 rsmurf6 implementation6 implementation6d sendpees6 sendpeesmp6 randicmp6 fuzz_ip6 flood_mld6 flood_mld26 flood_router6 flood_advertise6 flood_solicitate6 trace6 exploit6 denial6 fake_dhcps6 flood_dhcpc6 fake_dns6d fragmentation6 kill_router6 fake_dnsupdate6 ndpexhaust6 detect_sniffer6 dump_router6 fake_r [...]
+ PROGRAMS=parasite6 dos-new-ip6 detect-new-ip6 fake_router6 fake_advertise6 fake_solicitate6 fake_mld6 fake_mld26 fake_mldrouter6 flood_mldrouter6 fake_mipv6 redir6 smurf6 alive6 toobig6 rsmurf6 implementation6 implementation6d sendpees6 sendpeesmp6 randicmp6 fuzz_ip6 flood_mld6 flood_mld26 flood_router6 flood_advertise6 flood_solicitate6 trace6 exploit6 denial6 fake_dhcps6 flood_dhcpc6 fake_dns6d fragmentation6 kill_router6 fake_dnsupdate6 ndpexhaust6 detect_sniffer6 dump_router6 fake_r [...]