Andreas Schwab
9627e11e8b
- Update to glibc 2.25 * The feature test macro __STDC_WANT_LIB_EXT2__, from ISO/IEC TR 24731-2:2010, is supported to enable declarations of functions from that TR. * The feature test macro __STDC_WANT_IEC_60559_BFP_EXT__, from ISO/IEC TS 18661-1:2014, is supported to enable declarations of functions and macros from that TS. * The feature test macro __STDC_WANT_IEC_60559_FUNCS_EXT__, from ISO/IEC TS 18661-4:2015, is supported to enable declarations of functions and macros from that TS. * The nonstandard feature selection macros _REENTRANT and _THREAD_SAFE are now treated as compatibility synonyms for _POSIX_C_SOURCE=199506L. * The inclusion of <sys/sysmacros.h> by <sys/types.h> is deprecated. * New <fenv.h> features from TS 18661-1:2014 are added to libm: the fesetexcept, fetestexceptflag, fegetmode and fesetmode functions, the femode_t type and the FE_DFL_MODE and FE_SNANS_ALWAYS_SIGNAL macros. * Integer width macros from TS 18661-1:2014 are added to <limits.h>: CHAR_WIDTH, SCHAR_WIDTH, UCHAR_WIDTH, SHRT_WIDTH, USHRT_WIDTH, INT_WIDTH, UINT_WIDTH, LONG_WIDTH, ULONG_WIDTH, LLONG_WIDTH, ULLONG_WIDTH; and to <stdint.h>: INT8_WIDTH, UINT8_WIDTH, INT16_WIDTH, UINT16_WIDTH, INT32_WIDTH, UINT32_WIDTH, INT64_WIDTH, UINT64_WIDTH, INT_LEAST8_WIDTH, UINT_LEAST8_WIDTH, INT_LEAST16_WIDTH, UINT_LEAST16_WIDTH, INT_LEAST32_WIDTH, UINT_LEAST32_WIDTH, INT_LEAST64_WIDTH, UINT_LEAST64_WIDTH, INT_FAST8_WIDTH, UINT_FAST8_WIDTH, INT_FAST16_WIDTH, UINT_FAST16_WIDTH, INT_FAST32_WIDTH, UINT_FAST32_WIDTH, INT_FAST64_WIDTH, UINT_FAST64_WIDTH, INTPTR_WIDTH, UINTPTR_WIDTH, INTMAX_WIDTH, UINTMAX_WIDTH, PTRDIFF_WIDTH, SIG_ATOMIC_WIDTH, SIZE_WIDTH, WCHAR_WIDTH, WINT_WIDTH. * New <math.h> features are added from TS 18661-1:2014: - Signaling NaN macros: SNANF, SNAN, SNANL. OBS-URL: https://build.opensuse.org/request/show/454919 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=451
99 lines
3.0 KiB
Diff
99 lines
3.0 KiB
Diff
Index: glibc-2.25/crypt/Makefile
|
|
===================================================================
|
|
--- glibc-2.25.orig/crypt/Makefile
|
|
+++ glibc-2.25/crypt/Makefile
|
|
@@ -23,14 +23,18 @@ subdir := crypt
|
|
include ../Makeconfig
|
|
|
|
headers := crypt.h
|
|
+headers += gnu-crypt.h ow-crypt.h
|
|
|
|
-extra-libs := libcrypt
|
|
+extra-libs := libcrypt libowcrypt
|
|
extra-libs-others := $(extra-libs)
|
|
|
|
libcrypt-routines := crypt-entry md5-crypt sha256-crypt sha512-crypt crypt \
|
|
crypt_util
|
|
|
|
-tests := cert md5c-test sha256c-test sha512c-test badsalttest
|
|
+libcrypt-routines += crypt_blowfish x86 wrapper
|
|
+libowcrypt-routines := crypt_gensalt wrapper-gensalt
|
|
+
|
|
+tests := cert md5c-test sha256c-test sha512c-test
|
|
|
|
ifeq ($(crypt-in-libc),yes)
|
|
routines += $(libcrypt-routines)
|
|
Index: glibc-2.25/crypt/Versions
|
|
===================================================================
|
|
--- glibc-2.25.orig/crypt/Versions
|
|
+++ glibc-2.25/crypt/Versions
|
|
@@ -3,3 +3,8 @@ libcrypt {
|
|
crypt; crypt_r; encrypt; encrypt_r; fcrypt; setkey; setkey_r;
|
|
}
|
|
}
|
|
+libowcrypt {
|
|
+ OW_CRYPT_1.0 {
|
|
+ crypt_gensalt; crypt_gensalt_rn; crypt_gensalt_ra;
|
|
+ }
|
|
+}
|
|
Index: glibc-2.25/crypt/crypt-entry.c
|
|
===================================================================
|
|
--- glibc-2.25.orig/crypt/crypt-entry.c
|
|
+++ glibc-2.25/crypt/crypt-entry.c
|
|
@@ -71,7 +71,7 @@ extern struct crypt_data _ufc_foobar;
|
|
*/
|
|
|
|
char *
|
|
-__crypt_r (const char *key, const char *salt,
|
|
+__des_crypt_r (const char *key, const char *salt,
|
|
struct crypt_data * __restrict data)
|
|
{
|
|
ufc_long res[4];
|
|
@@ -152,6 +152,7 @@ __crypt_r (const char *key, const char *
|
|
|
|
return data->crypt_3_buf;
|
|
}
|
|
+#if 0
|
|
weak_alias (__crypt_r, crypt_r)
|
|
|
|
char *
|
|
@@ -190,3 +191,4 @@ __fcrypt (const char *key, const char *s
|
|
return crypt (key, salt);
|
|
}
|
|
#endif
|
|
+#endif
|
|
Index: glibc-2.25/crypt/crypt-private.h
|
|
===================================================================
|
|
--- glibc-2.25.orig/crypt/crypt-private.h
|
|
+++ glibc-2.25/crypt/crypt-private.h
|
|
@@ -65,7 +65,7 @@ extern void __encrypt_r (char * __restri
|
|
struct crypt_data * __restrict __data);
|
|
|
|
/* crypt-entry.c */
|
|
-extern char *__crypt_r (const char *__key, const char *__salt,
|
|
+extern char *__des_crypt_r (const char *__key, const char *__salt,
|
|
struct crypt_data * __restrict __data);
|
|
extern char *fcrypt (const char *key, const char *salt);
|
|
|
|
Index: glibc-2.25/shlib-versions
|
|
===================================================================
|
|
--- glibc-2.25.orig/shlib-versions
|
|
+++ glibc-2.25/shlib-versions
|
|
@@ -58,6 +58,7 @@ libnsl=1
|
|
|
|
# This defines the shared library version numbers we will install.
|
|
libcrypt=1
|
|
+libowcrypt=1
|
|
|
|
# The gross patch for programs assuming broken locale implementations.
|
|
libBrokenLocale=1
|
|
Index: glibc-2.25/sysdeps/unix/sysv/linux/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.25/sysdeps/unix/sysv/linux/libowcrypt.abilist
|
|
@@ -0,0 +1,4 @@
|
|
+OW_CRYPT_1.0 OW_CRYPT_1.0 A
|
|
+OW_CRYPT_1.0 crypt_gensalt F
|
|
+OW_CRYPT_1.0 crypt_gensalt_ra F
|
|
+OW_CRYPT_1.0 crypt_gensalt_rn F
|