forked from pool/glibc
Andreas Schwab
7db7ce4082
- no-long-double.patch: Don't use long double functions if NO_LONG_DOUBLE - Update to glibc 2.23 release. * Unicode 8.0.0 Support * sched_setaffinity, pthread_setaffinity_np no longer attempt to guess the kernel-internal CPU set size * The fts.h header can now be used with -D_FILE_OFFSET_BITS=64 * getaddrinfo now detects certain invalid responses on an internal netlink socket * A defect in the malloc implementation, present since glibc 2.15 (2012) or glibc 2.10 via --enable-experimental-malloc (2009), could result in the unnecessary serialization of memory allocation requests across threads * The obsolete header <regexp.h> has been removed * The obsolete functions bdflush, create_module, get_kernel_syms, query_module and uselib are no longer available to newly linked binaries * Optimized string, wcsmbs and memory functions for IBM z13. * Newly linked programs that define a variable called signgam will no longer have it set by the lgamma, lgammaf and lgammal functions - Removed patches: * dont-remove-nodelete-flag.patch * openat64-readd-o-largefile.patch * mntent-blank-line.patch * opendir-o-directory-check.patch * strcoll-remove-strdiff-opt.patch * ld-pointer-guard.patch * tls-dtor-list-mangling.patch * powerpc-lock-elision-race.patch * prelink-elf-rtype-class.patch OBS-URL: https://build.opensuse.org/request/show/361238 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=423
333 lines
12 KiB
Diff
333 lines
12 KiB
Diff
Index: glibc-2.20/crypt/Makefile
|
|
===================================================================
|
|
--- glibc-2.20.orig/crypt/Makefile
|
|
+++ glibc-2.20/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.20/crypt/Versions
|
|
===================================================================
|
|
--- glibc-2.20.orig/crypt/Versions
|
|
+++ glibc-2.20/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.20/crypt/crypt-entry.c
|
|
===================================================================
|
|
--- glibc-2.20.orig/crypt/crypt-entry.c
|
|
+++ glibc-2.20/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];
|
|
@@ -145,6 +145,7 @@ __crypt_r (key, salt, data)
|
|
_ufc_output_conversion_r (res[0], res[1], salt, data);
|
|
return data->crypt_3_buf;
|
|
}
|
|
+#if 0
|
|
weak_alias (__crypt_r, crypt_r)
|
|
|
|
char *
|
|
@@ -187,3 +188,4 @@ __fcrypt (key, salt)
|
|
return crypt (key, salt);
|
|
}
|
|
#endif
|
|
+#endif
|
|
Index: glibc-2.20/crypt/crypt-private.h
|
|
===================================================================
|
|
--- glibc-2.20.orig/crypt/crypt-private.h
|
|
+++ glibc-2.20/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.20/shlib-versions
|
|
===================================================================
|
|
--- glibc-2.20.orig/shlib-versions
|
|
+++ glibc-2.20/shlib-versions
|
|
@@ -88,6 +88,7 @@ sh.*-.*-linux.* ld=ld-linux.so.2 GLIBC_
|
|
|
|
# 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.20/sysdeps/unix/sysv/linux/aarch64/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/aarch64/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/alpha/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/alpha/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/arm/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/arm/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/hppa/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/hppa/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/i386/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/i386/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/ia64/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/ia64/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/m68k/coldfire/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/m68k/coldfire/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/m68k/m680x0/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/m68k/m680x0/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/microblaze/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/microblaze/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/mips/mips32/fpu/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/mips/mips32/fpu/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/mips/mips32/nofpu/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/mips/mips32/nofpu/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/mips/mips64/n32/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/mips/mips64/n32/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/mips/mips64/n64/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/mips/mips64/n64/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc64/libowcrypt-le.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc64/libowcrypt-le.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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc64/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/powerpc/powerpc64/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/s390/s390-32/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/s390/s390-32/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/s390/s390-64/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/s390/s390-64/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/sh/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/sh/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/sparc/sparc32/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/sparc/sparc32/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/sparc/sparc64/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/sparc/sparc64/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/tile/tilepro/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/tile/tilepro/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/x86_64/64/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/x86_64/64/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
|
|
Index: glibc-2.20/sysdeps/unix/sysv/linux/x86_64/x32/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.20/sysdeps/unix/sysv/linux/x86_64/x32/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
|