From 7f0ff6d9c616771a86b291f4e9dfd5f74c3e2ddd Mon Sep 17 00:00:00 2001 From: wxiat Date: Fri, 30 Jun 2023 10:49:56 +0800 Subject: [PATCH 1/2] sw-20230630 --- libxcrypt-4.1.1-sw.patch | 11 +++++++++++ libxcrypt.spec | 6 +++++- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 libxcrypt-4.1.1-sw.patch diff --git a/libxcrypt-4.1.1-sw.patch b/libxcrypt-4.1.1-sw.patch new file mode 100644 index 0000000..375a17c --- /dev/null +++ b/libxcrypt-4.1.1-sw.patch @@ -0,0 +1,11 @@ +diff -Naur libxcrypt-4.1.1.org/libcrypt.minver libxcrypt-4.1.1.sw/libcrypt.minver +--- libxcrypt-4.1.1.org/libcrypt.minver 2023-06-30 10:36:50.683842038 +0800 ++++ libxcrypt-4.1.1.sw/libcrypt.minver 2023-06-30 10:39:59.909530916 +0800 +@@ -42,6 +42,7 @@ + x86_64.* GLIBC_2.2.5 /* 64 */ defined __x86_64__ + s390x.* GLIBC_2.2 + alpha.* GLIBC_2.0 ++sw_64.* GLIBC_2.0 + hppa.* GLIBC_2.0 + i[3-9]86.* GLIBC_2.0 + ia64.* GLIBC_2.0 diff --git a/libxcrypt.spec b/libxcrypt.spec index 53f2d98..3bd50ad 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.3 +%define anolis_release .0.4 # Shared object version of libcrypt. %global soc 1 %global sol 1 @@ -34,6 +34,7 @@ Patch2: libxcrypt-rh1613537.patch Patch3: libxcrypt-rh1899716.patch #Add by Anolis Patch100: 0001-anolis-libxcrypt-add-loongarch64.patch +Patch1000: libxcrypt-4.1.1-sw.patch BuildRequires: fipscheck BuildRequires: libtool @@ -194,6 +195,9 @@ Doc pages for %{name}. %doc %{_pkgdocdir}/THANKS %changelog +* Fri Jun 30 2023 wuxiat - 4.1.1-6.0.4 +- add sw patch + * Wed Jul 20 2022 Xiaoping Liu - 4.1.1-6.0.3 - Add doc sub package -- Gitee From d93446ffe95a593a3d472ddc8615685025644c1c Mon Sep 17 00:00:00 2001 From: Weisson Date: Fri, 19 Jan 2024 11:27:18 +0800 Subject: [PATCH 2/2] libxcrypt is not robust enough to set werror flag for gcc-10. Signed-off-by: Weisson --- libxcrypt.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libxcrypt.spec b/libxcrypt.spec index 3bd50ad..f2e741e 100644 --- a/libxcrypt.spec +++ b/libxcrypt.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.4 +%define anolis_release .0.5 # Shared object version of libcrypt. %global soc 1 %global sol 1 @@ -132,6 +132,7 @@ Doc pages for %{name}. --enable-shared \ --enable-static \ --disable-failure-tokens \ + --disable-werror \ --enable-hashes=all \ --enable-obsolete-api=glibc \ --with-pkgconfigdir=%{_libdir}/pkgconfig @@ -195,6 +196,9 @@ Doc pages for %{name}. %doc %{_pkgdocdir}/THANKS %changelog +* Fri Jan 19 2024 Weisson - 4.1.1-6.0.5 +- libxcrypt is not robust enough to set werror flag for gcc-10. + * Fri Jun 30 2023 wuxiat - 4.1.1-6.0.4 - add sw patch -- Gitee