diff --git a/eglibc-mandriva-fix-for-new-memcpy-behavior.patch b/eglibc-mandriva-fix-for-new-memcpy-behavior.patch deleted file mode 100644 index 33d83b7..0000000 --- a/eglibc-mandriva-fix-for-new-memcpy-behavior.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 03f3e2574dc5f8cd7a1fad83edee7f1d9f6b45cb Mon Sep 17 00:00:00 2001 -From: Felipe Contreras -Date: Mon, 11 Apr 2011 13:41:20 +0300 -Subject: [PATCH] x86_64: fix for new memcpy behavior - -On 2.14 memcpy@GLIBC_2.2.5 is an alias to memmove, only -memcpy@GLIBC_2.13 uses the new behavior. - -This backports the old behavior for versions before than 2.14. - -Signed-off-by: Felipe Contreras ---- - sysdeps/x86_64/multiarch/memcpy-ssse3-back.S | 1 + - sysdeps/x86_64/multiarch/memcpy-ssse3.S | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S b/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S -index 48c974e..2867d45 100644 ---- a/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S -+++ b/sysdeps/x86_64/multiarch/memcpy-ssse3-back.S -@@ -30,6 +30,7 @@ - #ifndef MEMCPY - # define MEMCPY __memcpy_ssse3_back - # define MEMCPY_CHK __memcpy_chk_ssse3_back -+# define USE_AS_MEMMOVE - #endif - - #ifndef ALIGN -diff --git a/sysdeps/x86_64/multiarch/memcpy-ssse3.S b/sysdeps/x86_64/multiarch/memcpy-ssse3.S -index 9a878d3..fb60e06 100644 ---- a/sysdeps/x86_64/multiarch/memcpy-ssse3.S -+++ b/sysdeps/x86_64/multiarch/memcpy-ssse3.S -@@ -30,6 +30,7 @@ - #ifndef MEMCPY - # define MEMCPY __memcpy_ssse3 - # define MEMCPY_CHK __memcpy_chk_ssse3 -+# define USE_AS_MEMMOVE - #endif - - #ifndef ALIGN --- -1.7.5.rc1 - diff --git a/glibc.spec b/glibc.spec index 9058dd8..bfe9f47 100644 --- a/glibc.spec +++ b/glibc.spec @@ -98,40 +98,32 @@ Source1002: locale_uninstall.sh # change this. Patch0: glibc-fedora-nscd.patch -# Build info files in the source tree, then move to the build -# tree so that they're identical for multilib builds -Patch4: glibc-rh825061.patch - # Horrible hack, never to be upstreamed. Can go away once the world # has been rebuilt to use the new ld.so path. -Patch5: glibc-arm-hardfloat-3.patch - -# Needs to be sent upstream -Patch6: glibc-rh697421.patch +Patch1: glibc-arm-hardfloat-3.patch # All these were from the glibc-fedora.patch mega-patch and need another # round of reviewing. Ideally they'll either be submitted upstream or # dropped. - -Patch12: glibc-fedora-__libc_multiple_libcs.patch -Patch14: glibc-fedora-elf-ORIGIN.patch -Patch15: glibc-fedora-elf-init-hidden_undef.patch -Patch16: glibc-fedora-elf-rh737223.patch -Patch18: eglibc-fedora-test-debug-gnuc-hack.patch -Patch21: glibc-fedora-i386-tls-direct-seg-refs.patch -Patch23: glibc-fedora-include-bits-ldbl.patch -Patch24: glibc-fedora-ldd.patch -Patch25: glibc-fedora-linux-tcsetattr.patch -Patch26: eglibc-fedora-locale-euro.patch +Patch10: glibc-fedora-__libc_multiple_libcs.patch +Patch11: glibc-fedora-elf-ORIGIN.patch +Patch12: glibc-fedora-elf-init-hidden_undef.patch +Patch13: glibc-fedora-elf-rh737223.patch +Patch14: eglibc-fedora-test-debug-gnuc-hack.patch +Patch15: glibc-fedora-i386-tls-direct-seg-refs.patch +Patch16: glibc-fedora-include-bits-ldbl.patch +Patch17: glibc-fedora-ldd.patch +Patch18: glibc-fedora-linux-tcsetattr.patch +Patch19: eglibc-fedora-locale-euro.patch # We disagree with # glibc-fedora-streams-rh436349.patch # Therefore we don't package/apply it. -Patch29: glibc-fedora-localedata-rh61908.patch -Patch30: glibc-fedora-localedef.patch -Patch31: glibc-fedora-locarchive.patch -Patch32: glibc-fedora-manual-dircategory.patch -Patch33: glibc-fedora-nis-rh188246.patch -Patch34: glibc-fedora-nptl-linklibc.patch +Patch20: glibc-fedora-localedata-rh61908.patch +Patch21: glibc-fedora-localedef.patch +Patch22: glibc-fedora-locarchive.patch +Patch23: glibc-fedora-manual-dircategory.patch +Patch24: glibc-fedora-nis-rh188246.patch +Patch25: glibc-fedora-nptl-linklibc.patch # # Patches from upstream @@ -143,54 +135,57 @@ Patch34: glibc-fedora-nptl-linklibc.patch # Obviously we're not there right now, but that's the goal # -Patch38: glibc-rh757881.patch -Patch40: glibc-rh741105.patch +# Needs to be sent upstream +Patch40: glibc-rh697421.patch +# Build info files in the source tree, then move to the build +# tree so that they're identical for multilib builds +Patch41: glibc-rh825061.patch +Patch42: glibc-rh741105.patch # Upstream BZ 14247 -Patch50: glibc-rh827510.patch +Patch43: glibc-rh827510.patch # Upstream BZ 14185 -Patch54: glibc-rh819430.patch -Patch51: glibc-rh952799.patch +Patch44: glibc-rh819430.patch +Patch45: glibc-rh952799.patch #----------------------------------------------------------------------- # mandriva patches -Patch56: eglibc-mandriva-localedef-archive-follow-symlinks.patch -Patch57: eglibc-mandriva-fix-dns-with-broken-routers.patch -Patch58: eglibc-mandriva-nss-upgrade.patch +Patch100: eglibc-mandriva-localedef-archive-follow-symlinks.patch +Patch101: eglibc-mandriva-fix-dns-with-broken-routers.patch +Patch102: eglibc-mandriva-nss-upgrade.patch #Drop patch. Use default directory for locale definitions -#Patch59: eglibc-mandriva-share-locale.patch -Patch60: eglibc-mandriva-nsswitch.conf.patch -Patch61: eglibc-mandriva-xterm-xvt.patch -Patch62: eglibc-mandriva-nscd-enable.patch -Patch63: eglibc-mandriva-nscd-no-host-cache.patch -Patch64: eglibc-mandriva-i386-hwcapinfo.patch -Patch65: eglibc-mandriva-nscd-init-should-start.patch -Patch66: eglibc-mandriva-timezone.patch -Patch67: eglibc-mandriva-biarch-cpp-defines.patch -Patch68: eglibc-mandriva-ENOTTY-fr-translation.patch -Patch69: eglibc-mandriva-biarch-utils.patch -Patch70: eglibc-mandriva-multiarch.patch -Patch72: eglibc-mandriva-i586-if-no-cmov.patch -Patch73: eglibc-mandriva-pt_BR-i18nfixes.patch -Patch74: eglibc-mandriva-testsuite-ldbl-bits.patch -Patch75: eglibc-mandriva-testsuite-rt-notparallel.patch +#Patch103: eglibc-mandriva-share-locale.patch +Patch104: eglibc-mandriva-nsswitch.conf.patch +Patch105: eglibc-mandriva-xterm-xvt.patch +Patch106: eglibc-mandriva-nscd-enable.patch +Patch107: eglibc-mandriva-nscd-no-host-cache.patch +Patch108: eglibc-mandriva-i386-hwcapinfo.patch +Patch109: eglibc-mandriva-nscd-init-should-start.patch +Patch110: eglibc-mandriva-timezone.patch +Patch111: eglibc-mandriva-biarch-cpp-defines.patch +Patch112: eglibc-mandriva-ENOTTY-fr-translation.patch +Patch113: eglibc-mandriva-biarch-utils.patch +Patch114: eglibc-mandriva-multiarch.patch +Patch115: eglibc-mandriva-i586-if-no-cmov.patch +Patch116: eglibc-mandriva-pt_BR-i18nfixes.patch +Patch117: eglibc-mandriva-testsuite-ldbl-bits.patch +Patch118: eglibc-mandriva-testsuite-rt-notparallel.patch # https://bugzilla.redhat.com/show_bug.cgi?id=638477#c275 # https://bugzilla.redhat.com/show_bug.cgi?id=696096 # https://bugzilla.redhat.com/attachment.cgi?id=491198 -Patch77: eglibc-mandriva-fix-for-new-memcpy-behavior.patch -Patch79: eglibc-mandriva-no-leaf-attribute.patch -Patch81: eglibc-mandriva-mdv-avx-owl-crypt.patch -Patch82: eglibc-mandriva-mdv-owl-crypt_freesec.patch -Patch83: eglibc-mandriva-avx-relocate_fcrypt.patch -Patch84: eglibc-mandriva-avx-increase_BF_FRAME.patch -Patch85: eglibc-mandriva-mdv-wrapper_handle_sha.patch +Patch120: eglibc-mandriva-no-leaf-attribute.patch +Patch121: eglibc-mandriva-mdv-avx-owl-crypt.patch +Patch122: eglibc-mandriva-mdv-owl-crypt_freesec.patch +Patch123: eglibc-mandriva-avx-relocate_fcrypt.patch +Patch124: eglibc-mandriva-avx-increase_BF_FRAME.patch +Patch125: eglibc-mandriva-mdv-wrapper_handle_sha.patch # Reverts a part of eglibc-fedora-uname-getrlimit.patch that breaks the build -Patch86: nptl-getrlimit-compile.patch +Patch126: nptl-getrlimit-compile.patch # http://sourceware.org/bugzilla/show_bug.cgi?id=14995 # http://sourceware.org/bugzilla/attachment.cgi?id=6795 -Patch88: glibc-2.17-gold.patch +Patch127: glibc-2.17-gold.patch # Crypt-blowfish patches -Patch100: crypt_blowfish-arm.patch +Patch128: crypt_blowfish-arm.patch BuildRequires: autoconf2.5 BuildRequires: gettext @@ -784,69 +779,74 @@ their ~/.profile configuration file. %setup -q -a3 -a50 %patch00 -p1 -%patch04 -p1 -%patch05 -p1 -%patch06 -p1 -%patch12 -p1 -b .multiple~ -%patch14 -p1 -b .elfORIGIN~ +%patch01 -p1 + +%patch10 -p1 -b .multiple~ +%patch11 -p1 -b .elfORIGIN~ +%patch12 -p1 +%patch13 -p1 -b .rh737223~ +%patch14 -p1 %patch15 -p1 -%patch16 -p1 -b .rh737223~ +%patch16 -p1 +%patch17 -p1 %patch18 -p1 +%patch19 -p1 -b .curr~ +%patch20 -p1 -b .locales~ %patch21 -p1 +%patch22 -p1 %patch23 -p1 %patch24 -p1 %patch25 -p1 -%patch26 -p1 -b .curr~ -%patch29 -p1 -b .locales~ -%patch30 -p1 -%patch31 -p1 -%patch32 -p1 -%patch33 -p1 -%patch34 -p1 + %patch40 -p1 -%patch50 -p1 -%patch54 -p1 -%patch51 -p1 -%patch56 -p1 -%patch57 -p1 -%patch58 -p1 -b .nssUpgrade~ -%patch60 -p1 -%patch61 -p1 -%patch62 -p1 -%patch63 -p1 -%patch64 -p1 -b .hwcap~ -%patch65 -p1 -%patch66 -p1 -%patch67 -p1 -%patch68 -p1 -%patch69 -p1 -%patch70 -p1 -b .multiarch~ -%patch72 -p1 -%patch73 -p1 -%patch74 -p1 -b .ldbl~ -%patch75 -p1 -b .tsp~ -%patch79 -p1 +%patch41 -p1 +%patch42 -p1 +%patch43 -p1 +%patch44 -p1 +%patch45 -p1 + +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 -b .nssUpgrade~ +#patch103 -p1 +%patch104 -p1 +%patch105 -p1 +%patch106 -p1 +%patch107 -p1 -b .hwcap~ +%patch108 -p1 +%patch109 -p1 +%patch110 -p1 +%patch111 -p1 +%patch112 -p1 +%patch113 -p1 -b .multiarch~ +%patch114 -p1 +%patch115 -p1 +%patch116 -p1 -b .ldbl~ +%patch117 -p1 -b .tsp~ +%patch118 -p1 + +%patch120 -p1 # copy freesec source cp %{SOURCE52} %{SOURCE53} crypt/ echo "Applying crypt_blowfish patch:" -%patch81 -p1 -b .owlCrypt~ +%patch121 -p1 -b .owlCrypt~ mv crypt/crypt.h crypt/gnu-crypt.h chmod 0644 crypt_blowfish-%{crypt_bf_ver}/*.[chS] cp -a crypt_blowfish-%{crypt_bf_ver}/*.[chS] crypt/ ## FreeSec support for extended/new-style/BSDI hashes in crypt(3) -%patch82 -p1 -b .freesec~ -%patch83 -p1 -b .relocateFcrypt~ -%patch84 -p0 +%patch122 -p1 -b .freesec~ +%patch123 -p1 -b .relocateFcrypt~ +%patch124 -p0 # add sha256-crypt and sha512-crypt support to the Openwall wrapper -%patch85 -p1 +%patch125 -p1 -%patch86 -p1 -b .compile~ +%patch126 -p1 -b .compile~ -%patch88 -p1 -b .gold~ +%patch127 -p1 -b .gold~ -%patch100 -p1 -b .blowfish_nonx86~ +%patch128 -p1 -b .blowfish_nonx86~ %if %{with selinux} # XXX kludge to build nscd with selinux support as it added -nostdinc