diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000000000000000000000000000000000..9b7c16d48bd159875d83e4763fc63b46ce1bd58f --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +*.bz2 filter=lfs diff=lfs merge=lfs -text diff --git a/.lfsconfig b/.lfsconfig new file mode 100644 index 0000000000000000000000000000000000000000..c256ff673756d5dd88bf384b632fdacf30e2b37c --- /dev/null +++ b/.lfsconfig @@ -0,0 +1,2 @@ +[lfs] + url = https://artlfs.openeuler.openatom.cn/src-openEuler/libgcrypt diff --git a/Use-the-compiler-switch-O0-for-compiling-jitterentro.patch b/Use-the-compiler-switch-O0-for-compiling-jitterentro.patch index 4d9340e8fedd0990f55aa2a06e756b46a4160a22..92bbfb851d9356ace30bdc6efb2507e31d8c59b0 100644 --- a/Use-the-compiler-switch-O0-for-compiling-jitterentro.patch +++ b/Use-the-compiler-switch-O0-for-compiling-jitterentro.patch @@ -1,25 +1,25 @@ -From 642d43d4545b48322dc10a5b9f08bc5d09a8591f Mon Sep 17 00:00:00 2001 -From: zhengxiaoxiao -Date: Tue, 1 Aug 2023 12:05:44 +0800 -Subject: [PATCH] Use the compiler switch -O0 for compiling jitterentropy.c. - ---- - random/jitterentropy-base.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/random/jitterentropy-base.c b/random/jitterentropy-base.c -index cf7630d..08a2cd3 100644 ---- a/random/jitterentropy-base.c -+++ b/random/jitterentropy-base.c -@@ -55,7 +55,7 @@ - ***************************************************************************/ - - #ifdef __OPTIMIZE__ -- #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c." -+ #pragma GCC optimize ("O0") - #endif - - /* --- -2.33.0 - +From 642d43d4545b48322dc10a5b9f08bc5d09a8591f Mon Sep 17 00:00:00 2001 +From: zhengxiaoxiao +Date: Tue, 1 Aug 2023 12:05:44 +0800 +Subject: [PATCH] Use the compiler switch -O0 for compiling jitterentropy.c. + +--- + random/jitterentropy-base.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/random/jitterentropy-base.c b/random/jitterentropy-base.c +index cf7630d..08a2cd3 100644 +--- a/random/jitterentropy-base.c ++++ b/random/jitterentropy-base.c +@@ -55,7 +55,7 @@ + ***************************************************************************/ + + #ifdef __OPTIMIZE__ +- #error "The CPU Jitter random number generator must not be compiled with optimizations. See documentation. Use the compiler switch -O0 for compiling jitterentropy.c." ++ #pragma GCC optimize ("O0") + #endif + + /* +-- +2.33.0 + diff --git a/libgcrypt-1.10.2.tar.bz2 b/libgcrypt-1.10.2.tar.bz2 deleted file mode 100644 index a8d70bc04ca23940666a90e088509859c831d255..0000000000000000000000000000000000000000 Binary files a/libgcrypt-1.10.2.tar.bz2 and /dev/null differ diff --git a/libgcrypt-1.11.2.tar.bz2 b/libgcrypt-1.11.2.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..30310112a3e5ef0804977698fcfc7b3962da9012 --- /dev/null +++ b/libgcrypt-1.11.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ba59dd192270e8c1d22ddb41a07d95dcdbc1f0fb02d03c4b54b235814330aac +size 4237802 diff --git a/libgcrypt.spec b/libgcrypt.spec index 1af661f84b90a75d0beb7b774497c4ccc827567c..b10722f2d0d06ccfbd32c5edc2c76c05bea8fede 100644 --- a/libgcrypt.spec +++ b/libgcrypt.spec @@ -3,10 +3,10 @@ %global hmackey orboDeJITITejsirpADONivirpUkvarP Name: libgcrypt -Version: 1.10.2 -Release: 3 +Version: 1.11.2 +Release: 1 Summary: A general-purpose cryptography library -License: LGPLv2+ +License: BSD-3-Clause AND (BSD-3-Clause OR GPL-2.0-only) AND GPL-2.0-or-later AND LGPL-2.1-or-later AND LGPL-2.0-or-later AND MIT-Modern-Variant URL: https://www.gnupg.org/ Source0: https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-%{version}.tar.bz2 Source7: random.conf @@ -15,7 +15,7 @@ Patch0: Use-the-compiler-switch-O0-for-compiling-jitterentro.patch Patch1: add-GCRY_MD_SM3_PGP-set-to-109.patch BuildRequires: gcc texinfo autoconf automake libtool -BuildRequires: gawk libgpg-error-devel >= 1.11 pkgconfig +BuildRequires: gawk libgpg-error-devel >= 1.49 pkgconfig Provides: %{name}-sm3 = %{version}-%{release} @@ -24,8 +24,7 @@ Libgcrypt is a general purpose cryptographic library originally based on code fr %package devel Summary: Development files for the %{name} package -License: LGPLv2+ and GPLv2+ -Requires: libgpg-error-devel %{name} = %{version}-%{release} pkgconfig +Requires: %{name} = %{version}-%{release} %description devel Libgcrypt is a general purpose crypto library based on the code used @@ -38,7 +37,6 @@ applications using libgcrypt. %autosetup -n %{name}-%{version} -p1 %build -%define _lto_cflags %{nil} autoreconf -f %configure --disable-static --enable-noexecstack --enable-hmac-binary-check \ @@ -68,7 +66,6 @@ make check sed -i -e 's,^libdir="/usr/lib.*"$,libdir="/usr/lib",g' $RPM_BUILD_ROOT/%{_bindir}/libgcrypt-config sed -i -e 's,^my_host=".*"$,my_host="none",g' $RPM_BUILD_ROOT/%{_bindir}/libgcrypt-config -%delete_la /sbin/ldconfig -n $RPM_BUILD_ROOT/%{_libdir} @@ -98,19 +95,17 @@ popd mkdir -p -m 755 $RPM_BUILD_ROOT/etc/gcrypt install -m644 %{SOURCE7} $RPM_BUILD_ROOT/etc/gcrypt/random.conf -%ldconfig_scriptlets +%delete_la +rm -fr %{buildroot}%{_infodir}/dir %files -%defattr(-,root,root) %doc AUTHORS NEWS THANKS %license COPYING.LIB COPYING %dir /etc/gcrypt %config(noreplace) /etc/gcrypt/random.conf %{gcrylibdir}/*.so.* -%exclude %{_infodir}/dir %files devel -%defattr(-,root,root) %{_bindir}/* %{_includedir}/* %{_libdir}/*.so @@ -118,11 +113,13 @@ install -m644 %{SOURCE7} $RPM_BUILD_ROOT/etc/gcrypt/random.conf %{_datadir}/aclocal/* %files help -%defattr(-,root,root) %{_mandir}/man1/* %{_infodir}/gcrypt.info* %changelog +* Tue Aug 05 2025 Funda Wang - 1.11.2-1 +- Update version to 1.11.2 + * Sat Oct 26 2024 zhengxiaoxiao - 1.10.2-3 - Type:bugfix - ID:NA