diff --git a/glibc-fix-check-abi.patch b/glibc-fix-check-abi.patch index 5f1f920..361b585 100644 --- a/glibc-fix-check-abi.patch +++ b/glibc-fix-check-abi.patch @@ -1,8 +1,36 @@ -Index: glibc-2.-15.90/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist +The addition of the Blowfish cipher functions also requires updating +the ABI check list for all targets. + +--- + glibc-ports-2.16/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist | 12 ++++++++++ + glibc-ports-2.16/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist | 12 ++++++++++ + glibc-ports-2.16/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist | 12 ++++++++++ + glibc-ports-2.16/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist | 12 ++++++++++ + glibc-ports-2.16/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist | 12 ++++++++++ + glibc-ports-2.16/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist | 12 ++++++++++ + glibc-ports-2.16/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist | 12 ++++++++++ + glibc-ports-2.16/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist | 12 ++++++++++ + glibc-ports-2.16/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist | 12 ++++++++++ + glibc-ports-2.16/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcrypt.abilist | 12 ++++++++++ + glibc-ports-2.16/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcrypt.abilist | 12 ++++++++++ + glibc-ports-2.16/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abilist | 12 ++++++++++ + sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist | 12 ++++++++++ + sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist | 12 ++++++++++ + sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist | 12 ++++++++++ + sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist | 12 ++++++++++ + sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist | 12 ++++++++++ + sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist | 12 ++++++++++ + sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist | 12 ++++++++++ + sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist | 12 ++++++++++ + sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist | 12 ++++++++++ + sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist | 12 ++++++++++ + 22 files changed, 264 insertions(+) + +Index: glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist =================================================================== ---- glibc-2.15.90.orig/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist -+++ glibc-2.15.90/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist +--- glibc-2.16.orig/glibc-ports-2.16/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist ++++ glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/alpha/nptl/libcrypt.abilist @@ -1,9 +1,21 @@ GLIBC_2.0 GLIBC_2.0 A @@ -25,140 +53,10 @@ Index: glibc-2.-15.90/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist + crypt_gensalt_rn F + crypt_ra F + crypt_rn F -Index: glibc-2.15.90/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist +Index: glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist =================================================================== ---- glibc-2.15.90.orig/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist -+++ glibc-2.15.90/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist -@@ -1,9 +1,21 @@ - GLIBC_2.0 - GLIBC_2.0 A - crypt F -+ crypt_gensalt F -+ crypt_gensalt_ra F -+ crypt_gensalt_rn F - crypt_r F -+ crypt_ra F -+ crypt_rn F - encrypt F - encrypt_r F - fcrypt F - setkey F - setkey_r F -+OW_CRYPT_1.0 -+ OW_CRYPT_1.0 A -+ crypt_gensalt F -+ crypt_gensalt_ra F -+ crypt_gensalt_rn F -+ crypt_ra F -+ crypt_rn F -Index: glibc-2.15.90/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist -=================================================================== ---- glibc-2.15.90.orig/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist -+++ glibc-2.15.90/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist -@@ -1,9 +1,21 @@ - GLIBC_2.3 - GLIBC_2.3 A - crypt F -+ crypt_gensalt F -+ crypt_gensalt_ra F -+ crypt_gensalt_rn F - crypt_r F -+ crypt_ra F -+ crypt_rn F - encrypt F - encrypt_r F - fcrypt F - setkey F - setkey_r F -+OW_CRYPT_1.0 -+ OW_CRYPT_1.0 A -+ crypt_gensalt F -+ crypt_gensalt_ra F -+ crypt_gensalt_rn F -+ crypt_ra F -+ crypt_rn F -Index: glibc-2.15.90/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist -=================================================================== ---- glibc-2.15.90.orig/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist -+++ glibc-2.15.90/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist -@@ -1,9 +1,21 @@ - GLIBC_2.0 - GLIBC_2.0 A - crypt F -+ crypt_gensalt F -+ crypt_gensalt_ra F -+ crypt_gensalt_rn F - crypt_r F -+ crypt_ra F -+ crypt_rn F - encrypt F - encrypt_r F - fcrypt F - setkey F - setkey_r F -+OW_CRYPT_1.0 -+ OW_CRYPT_1.0 A -+ crypt_gensalt F -+ crypt_gensalt_ra F -+ crypt_gensalt_rn F -+ crypt_ra F -+ crypt_rn F -Index: glibc-2.15.90/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist -=================================================================== ---- glibc-2.15.90.orig/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist -+++ glibc-2.15.90/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist -@@ -1,9 +1,21 @@ - GLIBC_2.2 - GLIBC_2.2 A - crypt F -+ crypt_gensalt F -+ crypt_gensalt_ra F -+ crypt_gensalt_rn F - crypt_r F -+ crypt_ra F -+ crypt_rn F - encrypt F - encrypt_r F - fcrypt F - setkey F - setkey_r F -+OW_CRYPT_1.0 -+ OW_CRYPT_1.0 A -+ crypt_gensalt F -+ crypt_gensalt_ra F -+ crypt_gensalt_rn F -+ crypt_ra F -+ crypt_rn F -Index: glibc-2.15.90/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist -=================================================================== ---- glibc-2.15.90.orig/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist -+++ glibc-2.15.90/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist -@@ -1,9 +1,21 @@ - GLIBC_2.2.5 - GLIBC_2.2.5 A - crypt F -+ crypt_gensalt F -+ crypt_gensalt_ra F -+ crypt_gensalt_rn F - crypt_r F -+ crypt_ra F -+ crypt_rn F - encrypt F - encrypt_r F - fcrypt F - setkey F - setkey_r F -+OW_CRYPT_1.0 -+ OW_CRYPT_1.0 A -+ crypt_gensalt F -+ crypt_gensalt_ra F -+ crypt_gensalt_rn F -+ crypt_ra F -+ crypt_rn F -Index: glibc-2.15.90/glibc-ports-2.16/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist -=================================================================== ---- glibc-2.15.90.orig/glibc-ports-2.16/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist -+++ glibc-2.15.90/glibc-ports-2.16/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist +--- glibc-2.16.orig/glibc-ports-2.16/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist ++++ glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/arm/nptl/libcrypt.abilist @@ -1,9 +1,21 @@ GLIBC_2.4 GLIBC_2.4 A @@ -181,3 +79,525 @@ Index: glibc-2.15.90/glibc-ports-2.16/sysdeps/unix/sysv/linux/arm/nptl/libcrypt. + crypt_gensalt_rn F + crypt_ra F + crypt_rn F +Index: glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/glibc-ports-2.16/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist ++++ glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/ia64/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.0 + GLIBC_2.0 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/glibc-ports-2.16/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist ++++ glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/m68k/coldfire/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.4 + GLIBC_2.4 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/glibc-ports-2.16/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist ++++ glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/m68k/m680x0/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.0 + GLIBC_2.0 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/glibc-ports-2.16/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist ++++ glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/mips/mips32/nptl/libcrypt.abilist +@@ -1,7 +1,12 @@ + GLIBC_2.0 + GLIBC_2.0 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F +@@ -9,3 +14,10 @@ GLIBC_2.0 + setkey_r F + _gp_disp + _gp_disp A ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/glibc-ports-2.16/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist ++++ glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/mips/mips64/n32/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.0 + GLIBC_2.0 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/glibc-ports-2.16/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist ++++ glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/mips/mips64/n64/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.0 + GLIBC_2.0 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/glibc-ports-2.16/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist ++++ glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.0 + GLIBC_2.0 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/glibc-ports-2.16/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcrypt.abilist ++++ glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.12 + GLIBC_2.12 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/glibc-ports-2.16/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcrypt.abilist ++++ glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.12 + GLIBC_2.12 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/glibc-ports-2.16/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abilist ++++ glibc-2.16/glibc-ports-2.16/sysdeps/unix/sysv/linux/tile/tilepro/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.12 + GLIBC_2.12 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist ++++ glibc-2.16/sysdeps/unix/sysv/linux/i386/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.0 + GLIBC_2.0 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist ++++ glibc-2.16/sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.0 + GLIBC_2.0 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist ++++ glibc-2.16/sysdeps/unix/sysv/linux/powerpc/powerpc64/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.3 + GLIBC_2.3 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist ++++ glibc-2.16/sysdeps/unix/sysv/linux/s390/s390-32/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.0 + GLIBC_2.0 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist ++++ glibc-2.16/sysdeps/unix/sysv/linux/s390/s390-64/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.2 + GLIBC_2.2 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist ++++ glibc-2.16/sysdeps/unix/sysv/linux/sh/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.0 + GLIBC_2.0 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist ++++ glibc-2.16/sysdeps/unix/sysv/linux/sparc/sparc32/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.0 + GLIBC_2.0 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist ++++ glibc-2.16/sysdeps/unix/sysv/linux/sparc/sparc64/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.0 + GLIBC_2.0 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist ++++ glibc-2.16/sysdeps/unix/sysv/linux/x86_64/64/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.2.5 + GLIBC_2.2.5 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F +Index: glibc-2.16/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist +=================================================================== +--- glibc-2.16.orig/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist ++++ glibc-2.16/sysdeps/unix/sysv/linux/x86_64/x32/nptl/libcrypt.abilist +@@ -1,9 +1,21 @@ + GLIBC_2.16 + GLIBC_2.16 A + crypt F ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F + crypt_r F ++ crypt_ra F ++ crypt_rn F + encrypt F + encrypt_r F + fcrypt F + setkey F + setkey_r F ++OW_CRYPT_1.0 ++ OW_CRYPT_1.0 A ++ crypt_gensalt F ++ crypt_gensalt_ra F ++ crypt_gensalt_rn F ++ crypt_ra F ++ crypt_rn F diff --git a/glibc.changes b/glibc.changes index cd1a267..b5f723f 100644 --- a/glibc.changes +++ b/glibc.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Sep 28 07:47:33 UTC 2012 - aj@suse.de + +- Fix crash in relocation on sparc with bind-now (swo#14376) + (patch sparc-bind-now.patch). + +------------------------------------------------------------------- +Thu Sep 27 12:20:11 UTC 2012 - aj@suse.de + +- Fix check-abi on more architectures (bnc#780696), patch by Jan + Engelhardt (updated patch glibc-fix-check-abi.patch). + ------------------------------------------------------------------- Tue Sep 4 11:08:53 UTC 2012 - schwab@linux-m68k.org diff --git a/glibc.spec b/glibc.spec index fd9c365..b110147 100644 --- a/glibc.spec +++ b/glibc.spec @@ -253,6 +253,8 @@ Patch402: nscd-avoid-gcc-warning.diff ### # PATCH-FIX-UPSTREAM Fix dns buffer - aj@suse.de Patch1021: glibc-2.16-getaddrinfo-buffer.patch +# PATCH-FIX-UPSTREAM Fix sparc dynamic linker triggered by bind-now swo#14376 - aj@suse.de +Patch1022: sparc-bind-now.patch ### # Patches awaiting upstream approval @@ -497,6 +499,7 @@ rm nscd/s-stamp %patch20 -p1 %endif %patch1021 -p1 +%patch1022 -p1 %patch2001 -p1 # XXX: Does not pass testsuite, still there's no better solution yet diff --git a/sparc-bind-now.patch b/sparc-bind-now.patch new file mode 100644 index 0000000..6608d77 --- /dev/null +++ b/sparc-bind-now.patch @@ -0,0 +1,31 @@ +commit aa9bbfe6a79fce593ab3d298bb0e880d77eb7f71 +Author: David S. Miller +Date: Thu Sep 27 21:33:54 2012 -0700 + + Fix sparc64 crashes with LD_BIND_NOW and --enable-bind-now. + + [BZ #14376] + * sysdeps/sparc/sparc64/dl-machine.h (elf_machine_rela): Do not + pass reloc->r_addend in as the 'high' argument to + sparc64_fixup_plt when handling R_SPARC_JMP_IREL relocations. + +diff --git a/sysdeps/sparc/sparc64/dl-machine.h b/sysdeps/sparc/sparc64/dl-machine.h +index 35c24d1..2f8bbe1 100644 +--- a/sysdeps/sparc/sparc64/dl-machine.h ++++ b/sysdeps/sparc/sparc64/dl-machine.h +@@ -458,7 +458,14 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, + break; + case R_SPARC_JMP_IREL: + value = ((Elf64_Addr (*) (int)) value) (GLRO(dl_hwcap)); +- /* Fall thru */ ++ /* 'high' is always zero, for large PLT entries the linker ++ emits an R_SPARC_IRELATIVE. */ ++#ifdef RESOLVE_CONFLICT_FIND_MAP ++ sparc64_fixup_plt (NULL, reloc, reloc_addr, value, 0, 0); ++#else ++ sparc64_fixup_plt (map, reloc, reloc_addr, value, 0, 0); ++#endif ++ break; + case R_SPARC_JMP_SLOT: + #ifdef RESOLVE_CONFLICT_FIND_MAP + /* R_SPARC_JMP_SLOT conflicts against .plt[32768+]