rpms/libxcrypt
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add a patch to define crypt_gensalt_r as macro, so applications

Browse Source 
link the identical crypt_gensalt_rn directly
This commit is contained in:
Björn Esser 2018-11-13 12:32:44 +01:00
parent 8fbb0ab6aa
commit 212efbeb18
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
libxcrypt-4.3.3-gensalt_r_as_macro.patch Normal file
View File

@ -0,0 +1,25 @@
Index: libxcrypt-4.3.3/crypt.h.in.in
===================================================================
--- libxcrypt-4.3.3.orig/crypt.h.in.in
+++ libxcrypt-4.3.3/crypt.h.in.in
@@ -178,12 +178,14 @@ extern char *crypt_gensalt_rn (const cha
char *__output, int __output_size)
__THROW;
-/* Identical to crypt_gensalt_rn. Kept for code compatibility with
- older versions (v3.1.1 and earlier) of libxcrypt. */
-extern char *crypt_gensalt_r (const char *__prefix, unsigned long __count,
- const char *__rbytes, int __nrbytes,
- char *__output, int __output_size)
-__THROW;
+/* Kept for code compatibility with older versions (v3.1.1 and earlier)
+ of libxcrypt.
+ We intentionally define a macro here, since we actually want to
+ link compiled applications against the identical crypt_gensalt_rn
+ function. */
+#ifndef IN_LIBCRYPT /* Defined when building libxcrypt. */
+# define crypt_gensalt_r crypt_gensalt_rn
+#endif
/* Another thread-safe version of crypt_gensalt; the generated setting
string is in storage allocated by malloc, and should be deallocated

7
libxcrypt.spec
View File

@ -90,7 +90,7 @@ fi \
Name: libxcrypt Name: libxcrypt
Version: 4.3.3 Version: 4.3.3
Release: 1%{?dist} Release: 2%{?dist}
Summary: Extended crypt library for DES, MD5, Blowfish and others Summary: Extended crypt library for DES, MD5, Blowfish and others
# For explicit license breakdown, see the # For explicit license breakdown, see the
@ -104,6 +104,7 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# Patch 3001 - 6000: Backported patches from pull requests. # Patch 3001 - 6000: Backported patches from pull requests.
# Patch 6001 - 9999: Downstream patches. # Patch 6001 - 9999: Downstream patches.
Patch6001: %{name}-4.3.3-gensalt_r_as_macro.patch
BuildRequires: fipscheck BuildRequires: fipscheck
BuildRequires: libtool BuildRequires: libtool
@ -346,6 +347,10 @@ done
%changelog %changelog
* Tue Nov 13 2018 Björn Esser <besser82@fedoraproject.org> - 4.3.3-2
- Add a patch to define crypt_gensalt_r as macro, so applications
link the identical crypt_gensalt_rn directly
* Sun Nov 11 2018 Björn Esser <besser82@fedoraproject.org> - 4.3.3-1 * Sun Nov 11 2018 Björn Esser <besser82@fedoraproject.org> - 4.3.3-1
- New upstream release - New upstream release