diff --git a/compatible-with-libgcrypt1.9.4.patch b/compatible-with-libgcrypt1.9.4.patch new file mode 100644 index 0000000000000000000000000000000000000000..00b97e6b1d29972fcb35199f76f5a846f5065f99 --- /dev/null +++ b/compatible-with-libgcrypt1.9.4.patch @@ -0,0 +1,314 @@ +From e1ac9b3807d03fcfbc2ed9ccc9d3ca621230a46d Mon Sep 17 00:00:00 2001 +From: qsw33 +Date: Thu, 30 Nov 2023 19:01:58 +0800 +Subject: [PATCH] first + +--- + Makefile.in | 2 ++ + cipher/Makefile.in | 2 ++ + compat/Makefile.in | 2 ++ + configure | 20 ++++++++++++++++++++ + configure.ac | 22 +++++++++++++++++++++- + doc/Makefile.in | 2 ++ + m4/Makefile.in | 2 ++ + mpi/Makefile.in | 2 ++ + random/Makefile.in | 2 ++ + src/Makefile.in | 2 ++ + src/gcrypt.h.in | 9 +++++++++ + tests/Makefile.in | 2 ++ + 12 files changed, 68 insertions(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 51bd467..98cebfa 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -269,6 +269,7 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ ++FALLBACK_SOCKLEN_T = @FALLBACK_SOCKLEN_T@ + FGREP = @FGREP@ + GCRYPT_CIPHERS = @GCRYPT_CIPHERS@ + GCRYPT_DIGESTS = @GCRYPT_DIGESTS@ +@@ -283,6 +284,7 @@ GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ + GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@ + GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@ + GREP = @GREP@ ++INSERT_SYS_SELECT_H = @INSERT_SYS_SELECT_H@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/cipher/Makefile.in b/cipher/Makefile.in +index 521036a..a92a8dc 100644 +--- a/cipher/Makefile.in ++++ b/cipher/Makefile.in +@@ -352,6 +352,7 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ ++FALLBACK_SOCKLEN_T = @FALLBACK_SOCKLEN_T@ + FGREP = @FGREP@ + GCRYPT_CIPHERS = @GCRYPT_CIPHERS@ + GCRYPT_DIGESTS = @GCRYPT_DIGESTS@ +@@ -366,6 +367,7 @@ GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ + GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@ + GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@ + GREP = @GREP@ ++INSERT_SYS_SELECT_H = @INSERT_SYS_SELECT_H@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/compat/Makefile.in b/compat/Makefile.in +index 9ddfcde..1946913 100644 +--- a/compat/Makefile.in ++++ b/compat/Makefile.in +@@ -243,6 +243,7 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ ++FALLBACK_SOCKLEN_T = @FALLBACK_SOCKLEN_T@ + FGREP = @FGREP@ + GCRYPT_CIPHERS = @GCRYPT_CIPHERS@ + GCRYPT_DIGESTS = @GCRYPT_DIGESTS@ +@@ -257,6 +258,7 @@ GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ + GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@ + GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@ + GREP = @GREP@ ++INSERT_SYS_SELECT_H = @INSERT_SYS_SELECT_H@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/configure b/configure +index bcdc185..05ff36e 100755 +--- a/configure ++++ b/configure +@@ -710,6 +710,8 @@ MPI_MOD_ASM_MPIH_SUB1_TRUE + MPI_MOD_ASM_MPIH_ADD1_FALSE + MPI_MOD_ASM_MPIH_ADD1_TRUE + MPI_SFLAGS ++FALLBACK_SOCKLEN_T ++INSERT_SYS_SELECT_H + PTH_LIBS + PTH_CFLAGS + PTH_CONFIG +@@ -16026,6 +16028,10 @@ fi + + done + ++INSERT_SYS_SELECT_H= ++if test x"$ac_cv_header_sys_select_h" = xyes; then ++ INSERT_SYS_SELECT_H=" include " ++fi + + + ########################################## +@@ -16323,6 +16329,20 @@ _ACEOF + + fi + ++case "${host}" in ++ *-*-mingw32*) ++ # socklen_t may or may not be defined depending on what headers ++ # are included. To be safe we use int as this is the actual type. ++ FALLBACK_SOCKLEN_T="typedef int gcry_socklen_t;" ++ ;; ++ *) ++ if test ".$gl_cv_socklen_t_equiv" = "."; then ++ FALLBACK_SOCKLEN_T="typedef socklen_t gcry_socklen_t;" ++ else ++ FALLBACK_SOCKLEN_T="typedef ${gl_cv_socklen_t_equiv} gcry_socklen_t;" ++ fi ++esac ++ + + # + # Check for __builtin_bswap32 intrinsic. +diff --git a/configure.ac b/configure.ac +index 24ec2eb..ad9e10e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -844,7 +844,12 @@ AC_SEARCH_LIBS(setsockopt, [nsl]) + #### Checks for header files. #### + ################################## + +-AC_CHECK_HEADERS(unistd.h sys/auxv.h sys/random.h) ++AC_CHECK_HEADERS(unistd.h sys/select.h sys/auxv.h sys/random.h) ++INSERT_SYS_SELECT_H= ++if test x"$ac_cv_header_sys_select_h" = xyes; then ++ INSERT_SYS_SELECT_H=" include " ++fi ++AC_SUBST(INSERT_SYS_SELECT_H) + + + ########################################## +@@ -860,6 +865,21 @@ AC_TYPE_PID_T + AC_CHECK_TYPES([byte, ushort, u16, u32, u64]) + + gl_TYPE_SOCKLEN_T ++case "${host}" in ++ *-*-mingw32*) ++ # socklen_t may or may not be defined depending on what headers ++ # are included. To be safe we use int as this is the actual type. ++ FALLBACK_SOCKLEN_T="typedef int gcry_socklen_t;" ++ ;; ++ *) ++ if test ".$gl_cv_socklen_t_equiv" = "."; then ++ FALLBACK_SOCKLEN_T="typedef socklen_t gcry_socklen_t;" ++ else ++ FALLBACK_SOCKLEN_T="typedef ${gl_cv_socklen_t_equiv} gcry_socklen_t;" ++ fi ++esac ++AC_SUBST(FALLBACK_SOCKLEN_T) ++ + + # + # Check for __builtin_bswap32 intrinsic. +diff --git a/doc/Makefile.in b/doc/Makefile.in +index 356c380..f2d4664 100644 +--- a/doc/Makefile.in ++++ b/doc/Makefile.in +@@ -253,6 +253,7 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ ++FALLBACK_SOCKLEN_T = @FALLBACK_SOCKLEN_T@ + FGREP = @FGREP@ + GCRYPT_CIPHERS = @GCRYPT_CIPHERS@ + GCRYPT_DIGESTS = @GCRYPT_DIGESTS@ +@@ -267,6 +268,7 @@ GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ + GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@ + GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@ + GREP = @GREP@ ++INSERT_SYS_SELECT_H = @INSERT_SYS_SELECT_H@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/m4/Makefile.in b/m4/Makefile.in +index 254733c..9a5441e 100644 +--- a/m4/Makefile.in ++++ b/m4/Makefile.in +@@ -160,6 +160,7 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ ++FALLBACK_SOCKLEN_T = @FALLBACK_SOCKLEN_T@ + FGREP = @FGREP@ + GCRYPT_CIPHERS = @GCRYPT_CIPHERS@ + GCRYPT_DIGESTS = @GCRYPT_DIGESTS@ +@@ -174,6 +175,7 @@ GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ + GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@ + GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@ + GREP = @GREP@ ++INSERT_SYS_SELECT_H = @INSERT_SYS_SELECT_H@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/mpi/Makefile.in b/mpi/Makefile.in +index 0632506..d830b00 100644 +--- a/mpi/Makefile.in ++++ b/mpi/Makefile.in +@@ -293,6 +293,7 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ ++FALLBACK_SOCKLEN_T = @FALLBACK_SOCKLEN_T@ + FGREP = @FGREP@ + GCRYPT_CIPHERS = @GCRYPT_CIPHERS@ + GCRYPT_DIGESTS = @GCRYPT_DIGESTS@ +@@ -307,6 +308,7 @@ GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ + GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@ + GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@ + GREP = @GREP@ ++INSERT_SYS_SELECT_H = @INSERT_SYS_SELECT_H@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/random/Makefile.in b/random/Makefile.in +index 2c07928..02fed9c 100644 +--- a/random/Makefile.in ++++ b/random/Makefile.in +@@ -243,6 +243,7 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ ++FALLBACK_SOCKLEN_T = @FALLBACK_SOCKLEN_T@ + FGREP = @FGREP@ + GCRYPT_CIPHERS = @GCRYPT_CIPHERS@ + GCRYPT_DIGESTS = @GCRYPT_DIGESTS@ +@@ -257,6 +258,7 @@ GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ + GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@ + GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@ + GREP = @GREP@ ++INSERT_SYS_SELECT_H = @INSERT_SYS_SELECT_H@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/src/Makefile.in b/src/Makefile.in +index cf81eb5..37e4457 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -341,6 +341,7 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ ++FALLBACK_SOCKLEN_T = @FALLBACK_SOCKLEN_T@ + FGREP = @FGREP@ + GCRYPT_CIPHERS = @GCRYPT_CIPHERS@ + GCRYPT_DIGESTS = @GCRYPT_DIGESTS@ +@@ -355,6 +356,7 @@ GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ + GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@ + GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@ + GREP = @GREP@ ++INSERT_SYS_SELECT_H = @INSERT_SYS_SELECT_H@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in +index 58581da..9dc6ec0 100644 +--- a/src/gcrypt.h.in ++++ b/src/gcrypt.h.in +@@ -33,12 +33,21 @@ + #include + + #if defined _WIN32 || defined __WIN32__ ++# include ++# include ++# include + # ifndef __GNUC__ + typedef long ssize_t; + typedef int pid_t; + # endif /*!__GNUC__*/ ++#else ++# include ++# include ++#@INSERT_SYS_SELECT_H@ + #endif /*_WIN32*/ + ++@FALLBACK_SOCKLEN_T@ ++ + /* This is required for error code compatibility. */ + #define _GCRY_ERR_SOURCE_DEFAULT GPG_ERR_SOURCE_GCRYPT + +diff --git a/tests/Makefile.in b/tests/Makefile.in +index 9e1039c..24cb751 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in +@@ -470,6 +470,7 @@ ECHO_T = @ECHO_T@ + EGREP = @EGREP@ + EXEEXT = @EXEEXT@ + EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@ ++FALLBACK_SOCKLEN_T = @FALLBACK_SOCKLEN_T@ + FGREP = @FGREP@ + GCRYPT_CIPHERS = @GCRYPT_CIPHERS@ + GCRYPT_DIGESTS = @GCRYPT_DIGESTS@ +@@ -484,6 +485,7 @@ GPG_ERROR_LIBS = @GPG_ERROR_LIBS@ + GPG_ERROR_MT_CFLAGS = @GPG_ERROR_MT_CFLAGS@ + GPG_ERROR_MT_LIBS = @GPG_ERROR_MT_LIBS@ + GREP = @GREP@ ++INSERT_SYS_SELECT_H = @INSERT_SYS_SELECT_H@ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ +-- +2.27.0 + diff --git a/libgcrypt.spec b/libgcrypt.spec index 3ad866045361c1b4b60a33e75ceaf8f4e9f8fdad..2c6dfa344c10cf060ba561906555f1e7051e9fef 100644 --- a/libgcrypt.spec +++ b/libgcrypt.spec @@ -4,7 +4,7 @@ Name: libgcrypt Version: 1.10.2 -Release: 1 +Release: 2 Summary: A general-purpose cryptography library License: LGPLv2+ URL: https://www.gnupg.org/ @@ -12,6 +12,7 @@ Source0: https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-%{version}.t Source7: random.conf Patch0: Use-the-compiler-switch-O0-for-compiling-jitterentro.patch +Patch1: compatible-with-libgcrypt1.9.4.patch BuildRequires: gcc texinfo autoconf automake libtool BuildRequires: gawk libgpg-error-devel >= 1.11 pkgconfig @@ -119,6 +120,12 @@ install -m644 %{SOURCE7} $RPM_BUILD_ROOT/etc/gcrypt/random.conf %{_infodir}/gcrypt.info* %changelog +* Tue Nov 30 2023 wangqingsan - 1.10.2-2 +- Type:requirements +- ID:NA +- SUG:NA +- DESC:compatible with libgcrypt1.9.4 + * Sat Oct 28 2023 wangqingsan - 1.10.2-1 - Type:requirements - ID:NA