Architecture specific change in rpms/onionscan.git

The package rpms/onionscan.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/onionscan.git/commit/?id=60920f63b5a...
https://src.fedoraproject.org/cgit/rpms/onionscan.git/commit/?id=f6d2c3264b5...
https://src.fedoraproject.org/cgit/rpms/onionscan.git/commit/?id=fbd6c14644c....

Change:
-%ifnarch
+%ifarch %{ix86} %{arm}
+%ifarch i686

Thanks.

Full change:
============

commit 60920f63b5abc172ec7e5f16d06f76e28f74be77
Author: Robert-André Mauchin 
Date:   Wed Jun 29 23:39:38 2022 +0200

Disable TestExtractBitcoinAddress test

diff --git a/onionscan.spec b/onionscan.spec
index 56ff2e3..823f032 100644
--- a/onionscan.spec
+++ b/onionscan.spec
@@ -1,5 +1,4 @@
 # Generated by go2rpm 1.6.0
-%ifnarch 
 %bcond_without check

# https://github.com/s-rah/onionscan

commit f6d2c3264b56171df034faead414c89beecea670
Author: Robert-André Mauchin 
Date:   Wed Jun 29 23:37:27 2022 +0200

Don't test on 32 bits platforms

diff --git a/onionscan.spec b/onionscan.spec
index e32e508..56ff2e3 100644
--- a/onionscan.spec
+++ b/onionscan.spec
@@ -1,4 +1,5 @@
 # Generated by go2rpm 1.6.0
+%ifnarch 
 %bcond_without check

# https://github.com/s-rah/onionscan
@@ -22,7 +23,7 @@ Summary:        Tool for investigating the Dark Web
 License:        MIT
 URL:            %{gourl}
 Source0:        %{gosource}
-Patch0:      onionv3.patch
+Patch0:         onionv3.patch

%description
 %{common_description}
@@ -46,10 +47,11 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/

%if %{with check}
 %check
-%ifarch i686
+%ifarch %{ix86} %{arm}
 # TestCrawlDB fails on i686
 for test in "TestCrawlDB" \
             "TestRelationship" \
+            "TestExtractBitcoinAddress" \
 ; do
 awk -i inplace '/^func.*'"$test"'(/ { print; print "\tt.Skip("disabled failing test")"; next}1' $(grep -rl $test)
 done

commit 82539daed0762eb2a65cf82469172145bfcdd21c
Author: Robert-André Mauchin 
Date:   Wed Jun 29 22:21:22 2022 +0200

Convert to automatic buildrequires

diff --git a/onionscan.spec b/onionscan.spec
index 437a215..e32e508 100644
--- a/onionscan.spec
+++ b/onionscan.spec
@@ -1,4 +1,4 @@
-# Generated by go2rpm 1
+# Generated by go2rpm 1.6.0
 %bcond_without check

# https://github.com/s-rah/onionscan
@@ -22,16 +22,7 @@ Summary:        Tool for investigating the Dark Web
 License:        MIT
 URL:            %{gourl}
 Source0:        %{gosource}
-Patch0001:      onionv3.patch
-
-BuildRequires:  golang(github.com/HouzuoGuo/tiedot/db)
-BuildRequires:  golang(github.com/rwcarlsen/goexif/exif)
-BuildRequires:  golang(github.com/rwcarlsen/goexif/tiff)
-BuildRequires:  golang(golang.org/x/crypto/openpgp)
-BuildRequires:  golang(golang.org/x/crypto/ssh)
-BuildRequires:  golang(golang.org/x/crypto/ssh/terminal)
-BuildRequires:  golang(golang.org/x/net/html)
-BuildRequires:  golang(golang.org/x/net/proxy)
+Patch0:      onionv3.patch

%description
 %{common_description}
@@ -40,7 +31,10 @@ BuildRequires:  golang(golang.org/x/net/proxy)

%prep
 %goprep
-%patch0001 -p1
+%patch0 -p1
+
+%generate_buildrequires
+%go_generate_buildrequires

%build
 %gobuild -o %{gobuilddir}/bin/onionscan %{goipath}
@@ -55,6 +49,7 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
 %ifarch i686
 # TestCrawlDB fails on i686
 for test in "TestCrawlDB" \
+            "TestRelationship" \
 ; do
 awk -i inplace '/^func.*'"$test"'(/ { print; print "\tt.Skip("disabled failing test")"; next}1' $(grep -rl $test)
 done

commit fbd6c14644c18e5edf91165a5c6fc069e551064b
Author: Mikel Olasagasti Uranga 
Date:   Thu Apr 14 23:01:33 2022 +0200

Skip test in i686 to fix FTBFS, closes rhbz#2046782

Add Patch to accept Onion V3 addresses.

diff --git a/onionscan.spec b/onionscan.spec
index 4f2dbac..437a215 100644
--- a/onionscan.spec
+++ b/onionscan.spec
@@ -22,6 +22,7 @@ Summary:        Tool for investigating the Dark Web
 License:        MIT
 URL:            %{gourl}
 Source0:        %{gosource}
+Patch0001:      onionv3.patch

BuildRequires:  golang(github.com/HouzuoGuo/tiedot/db)
 BuildRequires:  golang(github.com/rwcarlsen/goexif/exif)
@@ -39,6 +40,7 @@ BuildRequires:  golang(golang.org/x/net/proxy)

%prep
 %goprep
+%patch0001 -p1

%build
 %gobuild -o %{gobuilddir}/bin/onionscan %{goipath}
@@ -50,6 +52,13 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/

%if %{with check}
 %check
+%ifarch i686
+# TestCrawlDB fails on i686
+for test in "TestCrawlDB" \
+; do
+awk -i inplace '/^func.*'"$test"'(/ { print; print "\tt.Skip("disabled failing test")"; next}1' $(grep -rl $test)
+done
+%endif
 %gocheck
 %endif

diff --git a/onionv3.patch b/onionv3.patch
new file mode 100644
index 0000000..a4504c2
--- /dev/null
+++ b/onionv3.patch
@@ -0,0 +1,23 @@
+From 44aa72d6971ba9c025ee1d26fadf27d3be7492c4 Mon Sep 17 00:00:00 2001
+From: lovegreen1321 
+Date: Thu, 8 Jul 2021 23:20:49 +0530
+Subject: [PATCH] Update validation.go
+
+Updated version of https://github.com/s-rah/onionscan/pull/173
+---
+ utils/validation.go | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/utils/validation.go b/utils/validation.go
+index abf3d2a..563c419 100644
+--- a/utils/validation.go
++++ b/utils/validation.go
+@@ -8,7 +8,7 @@ import (
+ func IsOnion(identifier string) bool {
+ 	// TODO: At some point we will want to support i2p
+ 	if len(identifier) >= 22 && strings.HasSuffix(identifier, ".onion") {
+-		matched, _ := regexp.MatchString(`(^|.)[a-z2-7]{16}.onion$`, identifier)
++		matched, _ := regexp.MatchString(`(^|.)[a-z2-7]{16}.onion$|(^|.)[a-z2-7]{56}.onion$`, identifier)
+ 		return matched
+ 	}
+ 	return false

commit 44477002857e29e954fb69cec3b6d8f3f418c68d
Author: Robert-André Mauchin 
Date:   Wed Jun 29 22:11:43 2022 +0200

Convert to rpmautospec

diff --git a/changelog b/changelog
new file mode 100644
index 0000000..5cdb3e0
--- /dev/null
+++ b/changelog
@@ -0,0 +1,21 @@
+* Sat Jun 18 2022 Robert-André Mauchin  - 0.2-7
+- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
+  CVE-2022-29526, CVE-2022-30629
+
+* Sat Apr 16 2022 Fabio Alessandro Locati  - 0.2-6
+- Rebuilt for CVE-2022-27191
+
+* Thu Jan 20 2022 Fedora Release Engineering  - 0.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Thu Jul 22 2021 Fedora Release Engineering  - 0.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering  - 0.2-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering  - 0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Mar 28 2020 Fabian Affolter  - 0.2-1
+- Initial package for Fedora
diff --git a/onionscan.spec b/onionscan.spec
index d2b1b83..4f2dbac 100644
--- a/onionscan.spec
+++ b/onionscan.spec
@@ -16,7 +16,7 @@ OnionScan is a free and open source tool for investigating the Dark Web.}
                         design/001-database.md

Name:           onionscan
-Release:        7%{?dist}
+Release:        %autorelease
 Summary:        Tool for investigating the Dark Web

License:        MIT
@@ -62,25 +62,4 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
 %gopkgfiles

%changelog
-* Sat Jun 18 2022 Robert-André Mauchin  - 0.2-7
-- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
-  CVE-2022-29526, CVE-2022-30629
-
-* Sat Apr 16 2022 Fabio Alessandro Locati  - 0.2-6
-- Rebuilt for CVE-2022-27191
-
-* Thu Jan 20 2022 Fedora Release Engineering  - 0.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering  - 0.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering  - 0.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Tue Jul 28 2020 Fedora Release Engineering  - 0.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Mar 28 2020 Fabian Affolter  - 0.2-1
-- Initial package for Fedora
-
+%autochangelog

commit 0e084a5d1397dc2db44b0c8b432002c7630da9e5
Author: Robert-André Mauchin 
Date:   Sat Jun 18 12:16:41 2022 +0200

Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629

diff --git a/onionscan.spec b/onionscan.spec
index 3e90d9e..d2b1b83 100644
--- a/onionscan.spec
+++ b/onionscan.spec
@@ -16,7 +16,7 @@ OnionScan is a free and open source tool for investigating the Dark Web.}
                         design/001-database.md

Name:           onionscan
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Tool for investigating the Dark Web

License:        MIT
@@ -62,6 +62,10 @@ install -m 0755 -vp %{gobuilddir}/bin/* %{buildroot}%{_bindir}/
 %gopkgfiles

%changelog
+* Sat Jun 18 2022 Robert-André Mauchin  - 0.2-7
+- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191,
+  CVE-2022-29526, CVE-2022-30629
+
 * Sat Apr 16 2022 Fabio Alessandro Locati  - 0.2-6
 - Rebuilt for CVE-2022-27191