diff --git a/tar-1.30-sw.patch b/tar-1.30-sw.patch new file mode 100644 index 0000000000000000000000000000000000000000..6524856cf7ce0033c17955a73beda400a2b0cecd --- /dev/null +++ b/tar-1.30-sw.patch @@ -0,0 +1,40 @@ +diff -Naur tar-1.30.org/configure tar-1.30.sw/configure +--- tar-1.30.org/configure 2023-06-17 09:40:37.174948627 +0800 ++++ tar-1.30.sw/configure 2023-06-17 09:42:56.387867938 +0800 +@@ -12390,6 +12390,10 @@ + rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ;; + ++ sw_64* ) ++ gl_cv_host_cpu_c_abi=sw_64 ++ ;; ++ + alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] ) + gl_cv_host_cpu_c_abi=alpha + ;; +diff -Naur tar-1.30.org/m4/host-cpu-c-abi.m4 tar-1.30.sw/m4/host-cpu-c-abi.m4 +--- tar-1.30.org/m4/host-cpu-c-abi.m4 2017-12-17 05:23:32.000000000 +0800 ++++ tar-1.30.sw/m4/host-cpu-c-abi.m4 2023-06-17 09:46:19.165033390 +0800 +@@ -91,6 +91,12 @@ + ;; + + changequote(,)dnl ++ sw_64* ) ++changequote([,])dnl ++ gl_cv_host_cpu_c_abi=sw_64 ++ ;; ++ ++changequote(,)dnl + alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] ) + changequote([,])dnl + gl_cv_host_cpu_c_abi=alpha +@@ -301,6 +307,9 @@ + #ifndef __x86_64__ + #undef __x86_64__ + #endif ++#ifndef __sw_64__ ++#undef __sw_64__ ++#endif + #ifndef __alpha__ + #undef __alpha__ + #endif diff --git a/tar.spec b/tar.spec index 11999138b219627c7b7426aa4a5cd9b99cc4f355..1fcd80d78d97fc2e6e701dd9d20038c26c756eea 100644 --- a/tar.spec +++ b/tar.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1} %global WITH_SELINUX 1 %endif @@ -32,6 +32,7 @@ Patch17: tar-1.30-Fix-the-no-overwrite-dir-option # Remove the capabilities test, due to fails (BZ#2066320 and BZ#1926332) Patch18: tar-1.30-remove-capabs-test.patch Patch19: tar-1.30-CVE-2022-48303.patch +Patch100: tar-1.30-sw.patch # run "make check" by default %bcond_without check @@ -148,6 +149,9 @@ fi %doc AUTHORS README THANKS NEWS ChangeLog %changelog +* Sat Jun 17 2023 wuxiat -1.30-9.0.2 +- add sw patch + * Thu May 25 2023 Hangbo Fan - 1.30-9.0.1 - Add doc sub package