diff --git a/srcpkgs/glibc/glibc-devel.template b/srcpkgs/glibc/glibc-devel.template index 4f07bebe0cb..a665982b317 100644 --- a/srcpkgs/glibc/glibc-devel.template +++ b/srcpkgs/glibc/glibc-devel.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains files for development: headers, static libs, etc." -revision=2 - Add_dependency run kernel-libc-headers Add_dependency run glibc diff --git a/srcpkgs/glibc/glibc-locales.template b/srcpkgs/glibc/glibc-locales.template index 50e1e9e5ca5..276cd342675 100644 --- a/srcpkgs/glibc/glibc-locales.template +++ b/srcpkgs/glibc/glibc-locales.template @@ -5,7 +5,6 @@ long_desc="${long_desc} This package contains the ${sourcepkg} locale files, for non US users." -revision=1 noarch=yes do_install() diff --git a/srcpkgs/glibc/nscd.template b/srcpkgs/glibc/nscd.template index e64c5f0e22b..2aa4a186ca7 100644 --- a/srcpkgs/glibc/nscd.template +++ b/srcpkgs/glibc/nscd.template @@ -5,7 +5,6 @@ long_desc=" This package contains nscd, a daemon that provides a cache for the most common name service requests." -revision=2 openrc_services="nscd default false" conf_files="/etc/nscd.conf" diff --git a/srcpkgs/glibc/patches/glibc-2.13-prelink.patch b/srcpkgs/glibc/patches/glibc-2.13-prelink.patch deleted file mode 100644 index 0d86131da62..00000000000 --- a/srcpkgs/glibc/patches/glibc-2.13-prelink.patch +++ /dev/null @@ -1,28 +0,0 @@ -http://sourceware.org/bugzilla/show_bug.cgi?id=12489 - -diff --git a/elf/rtld.c b/elf/rtld.c -index 9a560b3..201c9cf 100644 ---- elf/rtld.c -+++ elf/rtld.c -@@ -2168,6 +2168,10 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - we need it in the memory handling later. */ - GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist; - -+ /* Remember the last search directory added at startup, now that -+ malloc will no longer be the one from dl-minimal.c. */ -+ GLRO(dl_init_all_dirs) = GL(dl_all_dirs); -+ - if (prelinked) - { - if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL) -@@ -2288,10 +2292,6 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n", - lossage); - } - -- /* Remember the last search directory added at startup, now that -- malloc will no longer be the one from dl-minimal.c. */ -- GLRO(dl_init_all_dirs) = GL(dl_all_dirs); -- - if (! prelinked && rtld_multiple_ref) - { - /* There was an explicit ref to the dynamic linker as a shared lib. diff --git a/srcpkgs/glibc/template b/srcpkgs/glibc/template index 31d51cfcb79..36e491a18bd 100644 --- a/srcpkgs/glibc/template +++ b/srcpkgs/glibc/template @@ -1,14 +1,13 @@ # Template file for 'glibc' pkgname=glibc -version=2.13 -revision=3 +version=2.14 distfiles="http://ftp.gnu.org/gnu/glibc/glibc-${version}.tar.bz2" build_style=custom-install short_desc="The GNU C library" maintainer="Juan RP " homepage="http://www.gnu.org/software/libc" license="GPL-2, LGPL-2.1, BSD" -checksum=0173c92a0545e6d99a46a4fbed2da00ba26556f5c6198e2f9f1631ed5318dbb2 +checksum=8404b54651d42133d9a2ab17d30d698e53c5f250b2ad8e5f3d9a208ea7c75d6c long_desc=" The GNU C Library is the standard system C library for all GNU systems, and is an important part of what makes up a GNU system. It provides the