forked from pool/glibc
Andreas Schwab
8f0c4de31f
- powerpc-opt-power8.patch: remove broken POWER8 implementation of isnan, isinf, finite; fix missing static symbols - glibc-2.14-crypt.diff: update for file renaming OBS-URL: https://build.opensuse.org/request/show/228198 OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=346
331 lines
11 KiB
Diff
331 lines
11 KiB
Diff
Index: glibc-2.19/Versions.def
|
|
===================================================================
|
|
--- glibc-2.19.orig/Versions.def
|
|
+++ glibc-2.19/Versions.def
|
|
@@ -45,6 +45,9 @@ libc {
|
|
libcrypt {
|
|
GLIBC_2.0
|
|
}
|
|
+libowcrypt {
|
|
+ OW_CRYPT_1.0
|
|
+}
|
|
libdl {
|
|
GLIBC_2.0
|
|
GLIBC_2.1
|
|
Index: glibc-2.19/crypt/Makefile
|
|
===================================================================
|
|
--- glibc-2.19.orig/crypt/Makefile
|
|
+++ glibc-2.19/crypt/Makefile
|
|
@@ -21,14 +21,18 @@
|
|
subdir := crypt
|
|
|
|
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
|
|
|
|
include ../Makeconfig
|
|
|
|
Index: glibc-2.19/crypt/Versions
|
|
===================================================================
|
|
--- glibc-2.19.orig/crypt/Versions
|
|
+++ glibc-2.19/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.19/crypt/crypt-entry.c
|
|
===================================================================
|
|
--- glibc-2.19.orig/crypt/crypt-entry.c
|
|
+++ glibc-2.19/crypt/crypt-entry.c
|
|
@@ -81,7 +81,7 @@ extern struct crypt_data _ufc_foobar;
|
|
*/
|
|
|
|
char *
|
|
-__crypt_r (key, salt, data)
|
|
+__des_crypt_r (key, salt, data)
|
|
const char *key;
|
|
const char *salt;
|
|
struct crypt_data * __restrict data;
|
|
@@ -155,6 +155,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 *
|
|
@@ -197,3 +198,4 @@ __fcrypt (key, salt)
|
|
return crypt (key, salt);
|
|
}
|
|
#endif
|
|
+#endif
|
|
Index: glibc-2.19/ports/sysdeps/unix/sysv/linux/aarch64/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/ports/sysdeps/unix/sysv/linux/aarch64/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/ports/sysdeps/unix/sysv/linux/alpha/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/ports/sysdeps/unix/sysv/linux/alpha/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/ports/sysdeps/unix/sysv/linux/arm/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/ports/sysdeps/unix/sysv/linux/arm/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/ports/sysdeps/unix/sysv/linux/ia64/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/ports/sysdeps/unix/sysv/linux/ia64/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/ports/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/ports/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/ports/sysdeps/unix/sysv/linux/mips/mips32/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/ports/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/ports/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/ports/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/shlib-versions
|
|
===================================================================
|
|
--- glibc-2.19.orig/shlib-versions
|
|
+++ glibc-2.19/shlib-versions
|
|
@@ -93,6 +93,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.
|
|
sh.*-.*-.* libBrokenLocale=1 GLIBC_2.2
|
|
Index: glibc-2.19/sysdeps/unix/sysv/linux/i386/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/sysdeps/unix/sysv/linux/i386/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libowcrypt-le.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libowcrypt-le.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/sysdeps/unix/sysv/linux/sh/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/sysdeps/unix/sysv/linux/sh/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/sysdeps/unix/sysv/linux/x86_64/64/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/sysdeps/unix/sysv/linux/x86_64/64/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|
|
Index: glibc-2.19/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libowcrypt.abilist
|
|
===================================================================
|
|
--- /dev/null
|
|
+++ glibc-2.19/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libowcrypt.abilist
|
|
@@ -0,0 +1,5 @@
|
|
+OW_CRYPT_1.0
|
|
+ OW_CRYPT_1.0 A
|
|
+ crypt_gensalt F
|
|
+ crypt_gensalt_ra F
|
|
+ crypt_gensalt_rn F
|