Architecture specific change in rpms/socat.git

The package rpms/socat.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/socat.git/commit/?id=b0bce51a41c89f7....

Change:
+%ifarch x86_64

Thanks.

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

commit b0bce51a41c89f7874b39c8173f45e433a4cedd1
Author: Paul Wouters 
Date:   Tue Feb 20 17:54:22 2024 -0500

- Update to 1.8.0.0

* Use autochangelog and autorelease macros
    * Update disabled test list
    * Re-enable testing with exceptions for x86_64 only
    * Remove no longer needed patches

diff --git a/socat.spec b/socat.spec
index 6482b03..7582388 100644
--- a/socat.spec
+++ b/socat.spec
@@ -3,7 +3,7 @@
 Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
 Version: 1.8.0.0
-Release: 2%{?dist}
+Release: %autorelease
 License: GPL-2.0-only
 Url:  http://www.dest-unreach.org/socat/
 Source: http://www.dest-unreach.org/socat/download/%%7Bname%7D-%%7Bversion%7D.tar.gz
@@ -55,16 +55,17 @@ echo ".so man1/socat.1" | gzip > %{buildroot}/%{_mandir}/man1/filan.1.gz
 cp -a %{buildroot}/%{_mandir}/man1/filan.1.gz %{buildroot}/%{_mandir}/man1/procan.1.gz

%check
+%ifarch x86_64
 export TERM=ansi
 export OD_C=/usr/bin/od
-# intermittently, a test sometimes just fails and some just hang
-# FAILED on ppc64le: 58 239
-# FAILED on armv7hl: 154 155 318 319
-#sed -i 's/NUMCOND=true/NUMCOND="test \$N -ne 93 -a \$N -ne 323"/' test.sh
-# since 1.8.0 the following fail
+# intermittently, some tests fail and just hang
+# FAILED on all arches:  146 478 528
+# FAILED on i686: 311 313 513
+# FAILED on 390s: 202 493
 # FAILED:  146 (DSA algo disallowed?)
-sed -i 's/NUMCOND=true/NUMCOND="test \$N -ne 146"/' test.sh
+sed -i 's/NUMCOND=true/NUMCOND="test \$N -ne 146 -a \$N -ne 478 -a \$N -ne 528"/' test.sh
 make test
+%endif

%files
 %doc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ PORTING
@@ -75,241 +76,4 @@ make test
 %{_bindir}/procan
 %doc %{_mandir}/man1/*

-%changelog
-* Tue Feb 20 2024 Paul Wouters  - 1.8.0.0-1
-- Update to 1.8.0.0
-- Update disabled test list, re-enable testing
-
-* Sat Jan 27 2024 Fedora Release Engineering  - 1.7.4.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Oct 02 2023 Martin Osvald  - 1.7.4.4-4
-- SPDX migration
-
-* Sat Jul 22 2023 Fedora Release Engineering  - 1.7.4.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Sat Jan 21 2023 Fedora Release Engineering  - 1.7.4.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Jan 17 2023 Clemens Lang  - 1.7.4.4-1
-- Resolves: rhbz#2038615 socat-1.7.4.4 is available
-
-* Mon Dec 12 2022 Florian Weimer  - 1.7.4.2-4
-- Port configure script to C99 (#2152488)
-
-* Sat Jul 23 2022 Fedora Release Engineering  - 1.7.4.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Sat Jan 22 2022 Fedora Release Engineering  - 1.7.4.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Nov  1 2021 Davide Cavalca  - 1.7.4.2-1
-- Resolves: rhbz#2018835 socat-1.7.4.2 is available
-
-* Tue Sep 14 2021 Sahana Prasad  - 1.7.4.1-4
-- Rebuilt with OpenSSL 3.0.0
-
-* Fri Jul 23 2021 Fedora Release Engineering  - 1.7.4.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Wed Jan 27 2021 Fedora Release Engineering  - 1.7.4.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Jan 11 10:35:54 EST 2021 Paul Wouters  - 1.7.4.1-1
-- Resolves: rhbz#1914653 socat-1.7.4.1 is available
-
-* Mon Jan  4 09:34:27 EST 2021 Paul Wouters  - 1.7.4.0-1
-- Resolves: rhbz#1912161 socat-1.7.4.0 is available
-
-* Wed Jul 29 2020 Fedora Release Engineering  - 1.7.3.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Thu Jan 30 2020 Fedora Release Engineering  - 1.7.3.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Jan 06 2020 Paul Wouters  - 1.7.3.4-1
-- Resolves: rhbz#1787954 socat-1.7.3.4 is available
-
-* Fri Jul 26 2019 Fedora Release Engineering  - 1.7.3.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Jun 24 2019 Paul Wouters  - 1.7.3.3-1
-- Resolves: rhbz#1696931 socat-1.7.3.3 is available
-- Resolves: rhbz#1612274 Man page scan results for socat
-- Disabled --enable-fips as its requires fipsld which we don't have.
-
-* Sun Feb 17 2019 Igor Gnatenko  - 1.7.3.2-9
-- Rebuild for readline 8.0
-
-* Sun Feb 03 2019 Fedora Release Engineering  - 1.7.3.2-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering  - 1.7.3.2-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Fri Feb 09 2018 Fedora Release Engineering  - 1.7.3.2-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Thu Jan 04 2018 Paul Wouters  - 1.7.3.2-5
-- Resolves: rhbz#1518784 socat should not require tcp_wrappers
-
-* Thu Aug 03 2017 Fedora Release Engineering  - 1.7.3.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering  - 1.7.3.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Mar 06 2017 Paul Wouters  - 1.7.3.2-3
-- Add BuildRequire for tcp_wrappers-devel to gain libwrap support
-
-* Sat Feb 11 2017 Fedora Release Engineering  - 1.7.3.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Feb 02 2017 Paul Wouters  - 1.7.3.2-1
-- Resolves rhbz#1404290 socat build failure on rawhide
-- Resolves rhbz#1416597 socat-1.7.3.2 is available
-- Resolves rhbz#1417483 Failed DNS resolution causes SIGSEGV and endless loop
-- Removed obsoleted patch
-
-* Thu Jan 12 2017 Igor Gnatenko  - 1.7.3.1-2
-- Rebuild for readline 7.x
-
-* Tue Apr 26 2016 Paul wouters  - 1.7.3.1-1
-- Update to 1.7.3.1 (#1186301)
-
-* Fri Feb 05 2016 Fedora Release Engineering  - 1.7.2.4-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Fri Jun 19 2015 Fedora Release Engineering  - 1.7.2.4-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Sat Jan 24 2015 Paul Wouters  - 1.7.2.4-4
-- Resolves rhbz#1182005 - socat 1.7.2.4 build failure missing linux/errqueue.h
-
-* Mon Aug 18 2014 Fedora Release Engineering  - 1.7.2.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Sun Jun 08 2014 Fedora Release Engineering  - 1.7.2.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Mon Apr 07 2014 Paul Wouters  - 1.7.2.4-1
-- Updated to 1.7.2.4 which contains many bugfixes
-- Run tests in make check
-- Add build dependancies for make test
-
-* Wed Jan 29 2014 Paul Wouters  - 1.7.2.3-1
-- Updated to 1.7.2.3 for CVE-2014-0019
-
-* Sun Aug 04 2013 Fedora Release Engineering  - 1.7.2.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Mon May 27 2013 Paul Wouters  - 1.7.2.2-2
-- Added two patches that fixes some -Wformat warnings. these fix 2 of 3
-  failing test cases from test.sh
-- Enabled hardening with full relro/pie
-- Switch from readline5 to readline(6)
-
-* Mon May 27 2013 Paul Wouters  - 1.7.2.2-1
-- Updated to 1.7.2.2 for CVE-2013-3571, rhbz#967539
-
-* Fri Feb 15 2013 Fedora Release Engineering  - 1.7.2.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Sat Jul 21 2012 Fedora Release Engineering  - 1.7.2.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Wed May 23 2012 Paul Wouters  - 1.7.2.1-1
-- Updated to 1.7.2.1 for CVE-2012-0219, rhbz#821553, rhbz#821688
-- Remove patch merged upstream
-- Remove --disable-fips from configure
-
-* Sat Jan 07 2012 Paul Wouters  - 1.7.2.0-1
-- Upgraded to 1.7.2.0 which allows tun/tap interfaces without IP address
-  and introduces options openssl-compress and max-children.
-
-* Wed Sep 21 2011 Paul Wouters  - 1.7.1.3-3
-- support TUN endpoint without IP address (rhbz#706226) [Till Maas]
-
-* Wed Feb 09 2011 Fedora Release Engineering  - 1.7.1.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Aug 23 2010 Paul Wouters  - 1.7.1.3-1
-- Upgrade to 1.7.1.3
-- Includes fix for CVE-2010-2799 Stack overflow by lexical scanning of nested
-  character patterns
-- Resolves https://bugzilla.redhat.com/show_bug.cgi?id=620430
-
-* Sat Jan 30 2010 Paul Wouters  - 1.7.1.2-1
-- Upgraded to 1.7.1.2
-- Link against compat-readline5 for GPLv2 license (Miroslav Lichvar)
-  (bz #511310)
-
-* Sat Aug 29 2009 Caolán McNamara  - 1.7.1.1-5
-- recreate autoconf to get correct includes when determining type
-  sizes in order to build correctly
-
-* Fri Aug 28 2009 Paul Wouters  - 1.7.1.1-4
-- Bump for new openssl
-
-* Fri Aug 21 2009 Tomas Mraz  - 1.7.1.1-3
-- rebuilt with new openssl
-
-* Sun Jul 26 2009 Fedora Release Engineering  - 1.7.1.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon May 11 2009 Paul Wouters  - 1.7.1.1-1
-- Upgraded to 1.7.1.1.
-- Patch for configure.in with -Wall
-
-* Wed Feb 25 2009 Fedora Release Engineering  - 1.7.0.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Tue Jan 20 2009 Paul Wouters <[e-mail] 1.7.0.0-1
-- Updated to new upstream version
-- utf8 the CHANGES file
-
-* Sun Jan 18 2009 Tomas Mraz  1.6.0.1-3
-- disable the upstream openssl fips support
-
-* Thu Sep  4 2008 Tom "spot" Callaway  1.6.0.1-2
-- forgot to upload new source
-
-* Thu Sep  4 2008 Tom "spot" Callaway  1.6.0.1-1
-- fix license tag
-- update to 1.6.0.1
-
-* Tue Feb 19 2008 Fedora Release Engineering  - 1.5.0.0-8
-- Autorebuild for GCC 4.3
-
-* Wed Dec 05 2007 Release Engineering <rel-eng at fedoraproject dot org> - 1.5.0.0-7
- - Rebuild for deps
-
-* Wed Dec  5 2007 Paul Wouters  1.5.0.0-6
-- Rebuild for updatesd libcrypto
-
-* Mon Feb 19 2007 Paul Wouters  1.5.0.0-5
-- Tagging failure bug in redhat build system requires bump
-
-* Mon Feb 19 2007 Paul Wouters  1.5.0.0-4
-- Some filesystem defines moved from their specific (ext2)
-  filesystem defines into the generic <linux/fs.h>.
-
-* Mon Sep 11 2006 Paul Wouters  1.5.0.0-3
-- Rebuild requested for PT_GNU_HASH support from gcc
-
-* Sun Aug 20 2006 Paul Wouters  - 1.5.0.0-2
-- Added missing examples to doc section and removed execute bits.
-
-* Fri Aug 04 2006 Paul Wouters  - 1.5.0.0-1
-- Updated to 1.5.0.0
-- removed version cut/mversion, since source untars properly now.
-
-* Tue May 09 2006 Paul Wouters  - 1.4.3.1-1
-- Updated to 1.4.3.1
-
-* Thu Jan 26 2006 Paul Wouters  1.4.3.0-2
-- Removed DESTDIR export and fixed two capitals
-
-* Thu Jan 26 2006 Paul Wouters  1.4.3.0-1
-- Initial version based on Pascal Bleser  suse rpm
+%autochangelog

commit 61493d10b91859cd58dab08d7d9b2165aabd2c64
Author: Paul Wouters 
Date:   Tue Feb 20 16:02:28 2024 -0500

- Update to 1.8.0.0

diff --git a/.gitignore b/.gitignore
index 5581756..c707474 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ socat-1.7.2.0.tar.gz
 /socat-1.7.4.2.tar.gz
 /socat-1.7.4.3.tar.gz
 /socat-1.7.4.4.tar.gz
+/socat-1.8.0.0.tar.gz
diff --git a/socat.spec b/socat.spec
index 1be5eb5..6482b03 100644
--- a/socat.spec
+++ b/socat.spec
@@ -2,15 +2,12 @@

Summary: Bidirectional data relay between two data channels ('netcat++')
 Name: socat
-Version: 1.7.4.4
-Release: 5%{?dist}
+Version: 1.8.0.0
+Release: 2%{?dist}
 License: GPL-2.0-only
 Url:  http://www.dest-unreach.org/socat/
 Source: http://www.dest-unreach.org/socat/download/%%7Bname%7D-%%7Bversion%7D.tar.gz

-Patch1: socat-1.7.3.3-warn.patch
-Patch2: socat-configure-c99.patch
-
 BuildRequires: make
 BuildRequires:  gcc
 BuildRequires: openssl-devel readline-devel ncurses-devel
@@ -30,10 +27,13 @@ line editor (readline), a program, or a combination of two of these.
 %setup -q
 iconv -f iso8859-1 -t utf-8 CHANGES > CHANGES.utf8
 mv CHANGES.utf8 CHANGES
-%patch1 -p1
-%patch2 -p1
+%autopatch -p1

%build
+# avoid warning on stderr disrupting tests
+sed -i "s/FGREP=fgrep/FGREP='grep -F'/" configure
+sed -i "s/fgrep/grep -F/" test.sh
+sed -i "s/egrep/egrep -E/" test.sh
 %configure  \
         --enable-help --enable-stdio \
         --enable-fdnum --enable-file --enable-creat \
@@ -58,23 +58,28 @@ cp -a %{buildroot}/%{_mandir}/man1/filan.1.gz %{buildroot}/%{_mandir}/man1/proca
 export TERM=ansi
 export OD_C=/usr/bin/od
 # intermittently, a test sometimes just fails and some just hang
-# HANGS on x86_64: 93, 323
-# FAILED on x86_64:  61 215 306 307
 # FAILED on ppc64le: 58 239
 # FAILED on armv7hl: 154 155 318 319
 #sed -i 's/NUMCOND=true/NUMCOND="test \$N -ne 93 -a \$N -ne 323"/' test.sh
-#make test
+# since 1.8.0 the following fail
+# FAILED:  146 (DSA algo disallowed?)
+sed -i 's/NUMCOND=true/NUMCOND="test \$N -ne 146"/' test.sh
+make test

%files
 %doc BUGREPORTS CHANGES DEVELOPMENT EXAMPLES FAQ PORTING
 %doc COPYING* README SECURITY
 %doc %{_docdir}/socat/*.sh
-%{_bindir}/socat
+%{_bindir}/socat*
 %{_bindir}/filan
 %{_bindir}/procan
 %doc %{_mandir}/man1/*

%changelog
+* Tue Feb 20 2024 Paul Wouters  - 1.8.0.0-1
+- Update to 1.8.0.0
+- Update disabled test list, re-enable testing
+
 * Sat Jan 27 2024 Fedora Release Engineering  - 1.7.4.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

diff --git a/sources b/sources
index 394cd75..3e31382 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (socat-1.7.4.4.tar.gz) = 709fd393642d4249152d75add4d489ea76e6118c9e6740e796f029e8c5ddd4f5c9218d587977fc57ada640f635a996cbbe4055275236a169881bb2be1d3e5df9
+SHA512 (socat-1.8.0.0.tar.gz) = edf459a9f1907a14025e13b3101ad29787f9a72795cffcd00017ce98847562884db29a95b9ae478a6a50868137548b142947c43fb18e975eb5853a763c42902c