diff options
Diffstat (limited to 'sys-libs/glibc')
| -rw-r--r-- | sys-libs/glibc/ChangeLog | 25 | ||||
| -rw-r--r-- | sys-libs/glibc/Manifest | 14 | ||||
| -rw-r--r-- | sys-libs/glibc/files/2.2.5/glibc-2.2.5-getgrouplist.patch | 29 | ||||
| -rw-r--r-- | sys-libs/glibc/files/2.3.1/glibc-2.3.1-ftw.patch | 187 | ||||
| -rw-r--r-- | sys-libs/glibc/files/2.3.1/glibc-2.3.1-getgrouplist.patch | 68 | ||||
| -rw-r--r-- | sys-libs/glibc/files/2.3.2/glibc-2.3.2-dl_execstack-PaX-support.patch | 59 | ||||
| -rw-r--r-- | sys-libs/glibc/files/2.3.2/glibc-2.3.2-iconvconfig-name_insert.patch | 78 | ||||
| -rw-r--r-- | sys-libs/glibc/files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch | 144 | ||||
| -rw-r--r-- | sys-libs/glibc/files/2.3.2/glibc-2.3.2-propolice-guard-functions.patch | 144 | ||||
| -rw-r--r-- | sys-libs/glibc/files/digest-glibc-2.2.5-r9 | 2 | ||||
| -rw-r--r-- | sys-libs/glibc/files/digest-glibc-2.3.1-r5 | 2 | ||||
| -rw-r--r-- | sys-libs/glibc/files/digest-glibc-2.3.2-r3 | 3 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.2.5-r9.ebuild | 294 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.1-r5.ebuild | 338 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.2-r2.ebuild | 11 | ||||
| -rw-r--r-- | sys-libs/glibc/glibc-2.3.2-r3.ebuild | 575 |
16 files changed, 1963 insertions, 10 deletions
diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog index 2490c40c8d31..42844e9f7278 100644 --- a/sys-libs/glibc/ChangeLog +++ b/sys-libs/glibc/ChangeLog @@ -1,6 +1,29 @@ # ChangeLog for sys-libs/glibc # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.102 2003/11/10 03:44:03 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.103 2003/11/16 17:02:51 azarah Exp $ + +*glibc-2.3.1-r5 (16 Nov 2003) + + 16 Nov 2003; Martin Schlemmer <azarah@gentoo.org> glibc-2.2.5-r9.ebuild, + glibc-2.3.1-r5.ebuild, glibc-2.3.2-r2.ebuild, glibc-2.3.2-r3.ebuild, + files/2.2.5/glibc-2.2.5-getgrouplist.patch, + files/2.3.1/glibc-2.3.1-ftw.patch, + files/2.3.1/glibc-2.3.1-getgrouplist.patch, + files/2.3.2/glibc-2.3.2-dl_execstack-PaX-support.patch, + files/2.3.2/glibc-2.3.2-iconvconfig-name_insert.patch, + files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch, + files/2.3.2/glibc-2.3.2-propolice-guard-functions.patch: + - A bug in the getgrouplist function can cause a buffer overflow if the size + of the group list is too small to hold all the user's groups. More info can + be found at: https://rhn.redhat.com/errata/RHSA-2003-325.html + - Fix a memory leak in ftw_dir + - To circumvent problems with propolice when linking binaries statically among + things, __guard and __guard_setup__stack_smash_handler is now in libc.so. More + info at: http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml + Thanks for helping in developing these patchsets goes to "moid" from the + Openbsd team. + - We do not want name_insert() in iconvconfig.c to be defined inside + write_output() as it causes issues with PaX. 09 Nov 2003; Mike Frysinger <vapier@gentoo.org> : Fix sscanf.c compilation. This tiny patch can be found in 2.3.2 already. diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest index ff04437fc78d..91231c3a3cf8 100644 --- a/sys-libs/glibc/Manifest +++ b/sys-libs/glibc/Manifest @@ -1,15 +1,13 @@ -MD5 a755b4c37934ef1d42177c1dc25ad0bd glibc-2.3.2-r2.ebuild 17907 +MD5 2d20c306db480448c6f63e56b5982b79 glibc-2.3.2-r2.ebuild 17907 MD5 ec652c5641efa40df96db52e3b00f91e glibc-2.2.5-r8.ebuild 9682 MD5 6b445d28bca46cd31b2d20b82c5a6dd6 glibc-2.3.2-r7.ebuild 16935 -MD5 2634cfc9bc786bf7257eab0cbb156084 glibc-2.3.2-r3.ebuild 17112 -MD5 9a513e885015a811c989c5f45e60490b .glibc-2.3.2-r9.ebuild.swp 32768 -MD5 621e765b1ae2ef8e2deceddb367654c5 glibc-2.3.1-r5.ebuild 10877 -MD5 510cda5b0289fc1c171e61e083f3ea63 ChangeLog 20466 +MD5 886f5f85437a7bdc2b093a8be503eab7 glibc-2.3.2-r3.ebuild 17301 +MD5 4dd6a7760b1e06c798d72a1f22d49729 glibc-2.3.1-r5.ebuild 10876 +MD5 98d5e5ccc69b8397670c1ce969a4190d ChangeLog 21700 MD5 ab0a1721ea8e94d8a41ca3475b8751f6 glibc-2.3.2-r8.ebuild 18625 MD5 88021b4211f0c76913f19672c3e76043 glibc-2.3.2-r1.ebuild 16468 MD5 7b69920e93b5e834be4827c9223d021d glibc-2.3.2-r6.ebuild 17144 -MD5 15f5410da60aa6160ba68f786ede8040 glibc-2.3.2-r9.ebuild 19305 -MD5 c78900445c0872365dc2b11b9995a14d glibc-2.2.5-r9.ebuild 10004 +MD5 8ed2bf1fdf0fa74a7a40ac1bbf9b1786 glibc-2.2.5-r9.ebuild 10003 MD5 1ea973db6dd95f116e6d5a64c3f796b5 glibc-2.3.1-r4.ebuild 10521 MD5 2013443f5192d4b999953ba4248d288c files/nscd.conf 1158 MD5 98ea363167dacaaad23fd9a66ba98d5b files/nscd 844 @@ -24,7 +22,6 @@ MD5 439cce38dd07f6669b9bb50f0c211b41 files/digest-glibc-2.3.1-r4 141 MD5 9cc1e6b6f749dba7c8759bd07266f7d9 files/digest-glibc-2.2.5-r9 143 MD5 d8830438ea871dbfd1acf7a3d0299159 files/test-__thread.c 53 MD5 d688e44731d6e4b757382d7646c492c3 files/glibc-xdr_security.patch 6612 -MD5 4af4fb4754352589e97e8fdf046f60b6 files/digest-glibc-2.3.2-r9 233 MD5 4404ee4b6e3017819d8f36082e0265e5 files/test-sysctl_h.c 54 MD5 28b40cc815955bcf93af44886d72b018 files/digest-glibc-2.3.2-r8 233 MD5 de6744f3ba45c52573febfa91a3d1d1d files/digest-glibc-2.3.2-r2 296 @@ -89,6 +86,7 @@ MD5 b4b9ecd784dd62c4dcc2a9d3d35eb533 files/2.3.2/glibc-2.3.2-hppa-15-clone.patch MD5 f62924cbf762eb230514a9859522f5e7 files/2.3.2/glibc-2.3.2-nptl-fix-include.patch 247 MD5 cd0306085902d8629f2a77061cacdfd2 files/2.3.2/glibc-2.3.2-ia64-LOAD_ARGS-fixup.patch 4445 MD5 40ec7d0421a3b23dc1662d54fdf2258e files/2.3.2/glibc-2.3.2-hppa-13-dynamiclink.patch 1197 +MD5 15ac94e1ccc48f31120960dfe006818a files/2.3.2/glibc-2.3.2-iconvconfig-name_insert.patch 2262 MD5 afa967d5fea8e467dda9c588f5600ed1 files/2.3.2/glibc-2.3.2-amd64-nomultilib.patch 506 MD5 9bc5a914b9625c662544785a4a685086 files/2.3.2/glibc-2.3.2-redhat-nptl-fixes.patch 1077 MD5 21de46f362c277795f70e83e60f937fe files/2.3.2/glibc-2.3.2-hppa-16-prototypes.patch 367 diff --git a/sys-libs/glibc/files/2.2.5/glibc-2.2.5-getgrouplist.patch b/sys-libs/glibc/files/2.2.5/glibc-2.2.5-getgrouplist.patch new file mode 100644 index 000000000000..e8544ece803d --- /dev/null +++ b/sys-libs/glibc/files/2.2.5/glibc-2.2.5-getgrouplist.patch @@ -0,0 +1,29 @@ +--- glibc-2.2.5/grp/initgroups.c.orig 2003-11-13 13:03:29.620138976 -0500 ++++ glibc-2.2.5/grp/initgroups.c 2003-11-13 13:05:03.693837600 -0500 +@@ -23,6 +23,7 @@ + #include <stdlib.h> + #include <string.h> + #include <unistd.h> ++#include <sys/param.h> + #include <sys/types.h> + #include <nsswitch.h> + +@@ -207,6 +208,9 @@ + return -1; + + result = internal_getgrouplist (user, group, &size, &newgroups, -1); ++ ++ memcpy (groups, newgroups, MIN (*ngroups, result) * sizeof (gid_t)); ++ + if (result > *ngroups) + { + *ngroups = result; +@@ -214,8 +218,6 @@ + } + else + *ngroups = result; +- +- memcpy (groups, newgroups, *ngroups * sizeof (gid_t)); + + free (newgroups); + return result; diff --git a/sys-libs/glibc/files/2.3.1/glibc-2.3.1-ftw.patch b/sys-libs/glibc/files/2.3.1/glibc-2.3.1-ftw.patch new file mode 100644 index 000000000000..03377461b5c5 --- /dev/null +++ b/sys-libs/glibc/files/2.3.1/glibc-2.3.1-ftw.patch @@ -0,0 +1,187 @@ +2003-11-04 Jakub Jelinek <jakub@redhat.com> + + * io/ftw.c (ftw_dir): Close dir if callback with FTW_D type returns + non-zero. + * io/Makefile (tests): Add bug-ftw4. + * io/bug-ftw4.c: New test. + +--- libc/io/Makefile.jj 2003-10-29 00:18:42.000000000 +0100 ++++ libc/io/Makefile 2003-11-04 19:40:10.000000000 +0100 +@@ -57,7 +57,7 @@ static-only-routines = stat fstat lstat + others := pwd + test-srcs := ftwtest + tests := test-utime test-stat test-stat2 test-lfs tst-getcwd \ +- tst-fcntl bug-ftw1 bug-ftw2 bug-ftw3 ++ tst-fcntl bug-ftw1 bug-ftw2 bug-ftw3 bug-ftw4 + + distribute := ftwtest-sh + +--- libc/io/ftw.c.jj 2003-06-11 23:48:58.000000000 +0200 ++++ libc/io/ftw.c 2003-11-04 19:57:42.000000000 +0100 +@@ -474,7 +474,19 @@ ftw_dir (struct ftw_data *data, struct S + { + result = (*data->func) (data->dirbuf, st, FTW_D, &data->ftw); + if (result != 0) +- return result; ++ { ++ int save_err; ++fail: ++ save_err = errno; ++ __closedir (dir.stream); ++ __set_errno (save_err); ++ ++ if (data->actdir-- == 0) ++ data->actdir = data->maxdir - 1; ++ data->dirstreams[data->actdir] = NULL; ++ ++ return result; ++ } + } + + /* If necessary, change to this directory. */ +@@ -492,17 +504,7 @@ ftw_dir (struct ftw_data *data, struct S + } + + if (result != 0) +- { +- int save_err = errno; +- __closedir (dir.stream); +- __set_errno (save_err); +- +- if (data->actdir-- == 0) +- data->actdir = data->maxdir - 1; +- data->dirstreams[data->actdir] = NULL; +- +- return result; +- } ++ goto fail; + } + + /* Next, update the `struct FTW' information. */ +--- libc/io/bug-ftw4.c.jj 2003-11-04 19:39:53.000000000 +0100 ++++ libc/io/bug-ftw4.c 2003-11-04 19:43:57.000000000 +0100 +@@ -0,0 +1,124 @@ ++/* Test if ftw function doesn't leak fds. ++ Copyright (C) 2003 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ Contributed by Jakub Jelinek <jakub@redhat.com>, 2003. ++ ++ The GNU C Library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. ++ ++ The GNU C Library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with the GNU C Library; if not, write to the Free ++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA ++ 02111-1307 USA. */ ++ ++#include <fcntl.h> ++#include <ftw.h> ++#include <stdlib.h> ++#include <stdio.h> ++#include <sys/stat.h> ++#include <unistd.h> ++ ++static int cb_called; ++ ++static int ++cb (const char *name, const struct stat64 *st, int type) ++{ ++ return cb_called++ & 1; ++} ++ ++int ++main (void) ++{ ++ char name[32] = "/tmp/ftwXXXXXX", *p; ++ int ret, i, result = 0, fd, fd1, fd2; ++ ++ if (mkdtemp (name) == NULL) ++ { ++ printf ("Couldn't make temporary directory: %m\n"); ++ exit (EXIT_FAILURE); ++ } ++ p = strchr (name, '\0'); ++ strcpy (p, "/1"); ++ if (mkdir (name, 0755) < 0) ++ { ++ printf ("Couldn't make temporary subdirectory: %m\n"); ++ exit (EXIT_FAILURE); ++ } ++ *p = '\0'; ++ ++ ret = ftw64 (name, cb, 20); ++ if (ret != 1) ++ { ++ printf ("ftw64 returned %d instead of 1", ret); ++ result = 1; ++ } ++ ++ fd = open (name, O_RDONLY); ++ if (fd < 0) ++ { ++ printf ("open failed: %m\n"); ++ result = 1; ++ } ++ fd1 = open (name, O_RDONLY); ++ if (fd1 < 0) ++ { ++ printf ("open failed: %m\n"); ++ result = 1; ++ } ++ else ++ close (fd1); ++ if (fd >= 0) ++ close (fd); ++ ++ for (i = 0; i < 128; ++i) ++ { ++ ret = ftw64 (name, cb, 20); ++ if (ret != 1) ++ { ++ printf ("ftw64 returned %d instead of 1", ret); ++ result = 1; ++ } ++ } ++ ++ fd = open (name, O_RDONLY); ++ if (fd < 0) ++ { ++ printf ("open failed: %m\n"); ++ result = 1; ++ } ++ fd2 = open (name, O_RDONLY); ++ if (fd2 < 0) ++ { ++ printf ("open failed: %m\n"); ++ result = 1; ++ } ++ else ++ close (fd2); ++ if (fd >= 0) ++ close (fd); ++ ++ if (fd2 >= fd1 + 128) ++ { ++ printf ("ftw64 leaking fds: %d -> %d\n", fd1, fd2); ++ result = 1; ++ } ++ ++ if (cb_called != 129 * 2) ++ { ++ printf ("callback called %d times\n", cb_called); ++ result = 1; ++ } ++ ++ strcpy (p, "/1"); ++ rmdir (name); ++ *p = '\0'; ++ rmdir (name); ++ return result; ++} diff --git a/sys-libs/glibc/files/2.3.1/glibc-2.3.1-getgrouplist.patch b/sys-libs/glibc/files/2.3.1/glibc-2.3.1-getgrouplist.patch new file mode 100644 index 000000000000..8dba0fbbd829 --- /dev/null +++ b/sys-libs/glibc/files/2.3.1/glibc-2.3.1-getgrouplist.patch @@ -0,0 +1,68 @@ +2003-04-23 Ulrich Drepper <drepper@redhat.com> + + * grp/initgroups.c (getgrouplist): Don't copy too much into the + user buffer if more groups are found than fit into it. + +--- libc/grp/initgroups.c 13 Mar 2002 17:51:09 -0000 1.28 ++++ libc/grp/initgroups.c 23 Apr 2003 21:26:34 -0000 1.29 +@@ -23,6 +23,7 @@ + #include <stdlib.h> + #include <string.h> + #include <unistd.h> ++#include <sys/param.h> + #include <sys/types.h> + #include <nsswitch.h> + +@@ -207,6 +208,9 @@ getgrouplist (const char *user, gid_t gr + return -1; + + result = internal_getgrouplist (user, group, &size, &newgroups, -1); ++ ++ memcpy (groups, newgroups, MIN (*ngroups, result) * sizeof (gid_t)); ++ + if (result > *ngroups) + { + *ngroups = result; +@@ -215,8 +219,6 @@ getgrouplist (const char *user, gid_t gr + else + *ngroups = result; + +- memcpy (groups, newgroups, *ngroups * sizeof (gid_t)); +- + free (newgroups); + return result; + } + +============ +testcase: + +#include <grp.h> +#include <stdlib.h> + +int main (void) +{ + int ngroups = 2, old_ngroups; + gid_t *groups = (gid_t *) malloc ((ngroups + 1) * sizeof (gid_t)); + + if (groups == NULL) + abort (); + groups[ngroups] = (gid_t) 0xdeadbeef; + old_ngroups = ngroups; + if (getgrouplist ("bin", 0, groups, &ngroups) < 0) + { + if (groups[old_ngroups] != (gid_t) 0xdeadbeef) + abort (); + groups = realloc (groups, (ngroups + 1) * sizeof (gid_t)); + if (groups == NULL) + abort (); + groups[ngroups] = (gid_t) 0xdeadbeef; + old_ngroups = ngroups; + if (getgrouplist ("bin", 0, groups, &ngroups) < 0) + abort (); + if (groups[old_ngroups] != (gid_t) 0xdeadbeef) + abort (); + } + else + abort (); + exit (0); +} diff --git a/sys-libs/glibc/files/2.3.2/glibc-2.3.2-dl_execstack-PaX-support.patch b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-dl_execstack-PaX-support.patch new file mode 100644 index 000000000000..4e081ef9c847 --- /dev/null +++ b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-dl_execstack-PaX-support.patch @@ -0,0 +1,59 @@ +Index: sysdeps/unix/sysv/linux/dl-execstack.c +=================================================================== +RCS file: /cvs/glibc/libc/sysdeps/unix/sysv/linux/dl-execstack.c,v +retrieving revision 1.3 +diff -u -p -r1.3 dl-execstack.c +--- sysdeps/unix/sysv/linux/dl-execstack.c 25 Sep 2003 23:04:12 -0000 1.3 ++++ sysdeps/unix/sysv/linux/dl-execstack.c 8 Nov 2003 00:34:33 -0000 +@@ -41,8 +41,11 @@ _dl_make_stack_executable (void) + if (__mprotect ((void *) page, GL(dl_pagesize), + PROT_READ|PROT_WRITE|PROT_EXEC|PROT_GROWSDOWN) == 0) + return 0; +- if (errno != EINVAL) ++ if (errno == EACCES) { /* PAX is enabled */ ++ return 0; ++ } else if (errno != EINVAL) { + return errno; ++ } + no_growsdown = true; + } + # endif +@@ -64,8 +67,11 @@ _dl_make_stack_executable (void) + page -= size; + else + { +- if (errno != ENOMEM) /* Unexpected failure mode. */ ++ if (errno == EACCES) { /* PAX is enabled */ ++ return 0; ++ } else if (errno != ENOMEM) { /* Unexpected failure mode. */ + return errno; ++ } + + if (size == GL(dl_pagesize)) + /* We just tried to mprotect the top hole page and failed. +@@ -92,8 +98,11 @@ _dl_make_stack_executable (void) + if (__mprotect ((void *) page, GL(dl_pagesize), + PROT_READ|PROT_WRITE|PROT_EXEC|PROT_GROWSUP) == 0) + return 0; +- if (errno != EINVAL) ++ if (errno == EACCES) { /* PAX is enabled */ ++ return 0; ++ } else if (errno != EINVAL) { + return errno; ++ } + no_growsup = true; + } + # endif +@@ -114,8 +123,11 @@ _dl_make_stack_executable (void) + page += size; + else + { +- if (errno != ENOMEM) /* Unexpected failure mode. */ ++ if (errno == EACCES) { /* PAX is enabled */ ++ return 0; ++ } else if (errno != ENOMEM) { /* Unexpected failure mode. */ + return errno; ++ } + + if (size == GL(dl_pagesize)) + /* We just tried to mprotect the lowest hole page and failed. diff --git a/sys-libs/glibc/files/2.3.2/glibc-2.3.2-iconvconfig-name_insert.patch b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-iconvconfig-name_insert.patch new file mode 100644 index 000000000000..f1ffdbf40a1c --- /dev/null +++ b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-iconvconfig-name_insert.patch @@ -0,0 +1,78 @@ +--- glibc-2.3.2-net/iconv/iconvconfig.c 12 Jun 2003 09:48:20 -0000 1.1.1.10 ++++ glibc-2.3.2-redhat/iconv/iconvconfig.c 12 Jun 2003 09:55:36 -0000 1.14 +@@ -988,6 +988,34 @@ next_prime (uint32_t seed) + module name offset + (following last entry with step count 0) + */ ++ ++static struct hash_entry *hash_table; ++static size_t hash_size; ++ ++/* Function to insert the names. */ ++static void name_insert (const void *nodep, VISIT value, int level) ++{ ++ struct name *name; ++ unsigned int idx; ++ unsigned int hval2; ++ ++ if (value != leaf && value != postorder) ++ return; ++ ++ name = *(struct name **) nodep; ++ idx = name->hashval % hash_size; ++ hval2 = 1 + name->hashval % (hash_size - 2); ++ ++ while (hash_table[idx].string_offset != 0) ++ if ((idx += hval2) >= hash_size) ++ idx -= hash_size; ++ ++ hash_table[idx].string_offset = strtaboffset (name->strent); ++ ++ assert (name->module_idx != -1); ++ hash_table[idx].module_idx = name->module_idx; ++} ++ + static int + write_output (void) + { +@@ -995,8 +1023,6 @@ write_output (void) + char *string_table; + size_t string_table_size; + struct gconvcache_header header; +- struct hash_entry *hash_table; +- size_t hash_size; + struct module_entry *module_table; + char *extra_table; + char *cur_extra_table; +@@ -1008,30 +1034,6 @@ write_output (void) + char tmpfname[prefix_len + sizeof (GCONV_MODULES_CACHE) + + strlen (".XXXXXX")]; + char finalname[prefix_len + sizeof (GCONV_MODULES_CACHE)]; +- +- /* Function to insert the names. */ +- static void name_insert (const void *nodep, VISIT value, int level) +- { +- struct name *name; +- unsigned int idx; +- unsigned int hval2; +- +- if (value != leaf && value != postorder) +- return; +- +- name = *(struct name **) nodep; +- idx = name->hashval % hash_size; +- hval2 = 1 + name->hashval % (hash_size - 2); +- +- while (hash_table[idx].string_offset != 0) +- if ((idx += hval2) >= hash_size) +- idx -= hash_size; +- +- hash_table[idx].string_offset = strtaboffset (name->strent); +- +- assert (name->module_idx != -1); +- hash_table[idx].module_idx = name->module_idx; +- } + + /* Open the output file. */ + assert (GCONV_MODULES_CACHE[0] == '/'); + diff --git a/sys-libs/glibc/files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch new file mode 100644 index 000000000000..2a230f1d3da5 --- /dev/null +++ b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-propolice-guard-functions-v2.patch @@ -0,0 +1,144 @@ +diff -u -r -N glibc-2.3.2.ORIG/sysdeps/generic/libc-start.c glibc-2.3.2/sysdeps/generic/libc-start.c +--- glibc-2.3.2.ORIG/sysdeps/generic/libc-start.c 2003-02-14 23:59:15.000000000 +0100 ++++ glibc-2.3.2/sysdeps/generic/libc-start.c 2003-11-08 21:32:03.000000000 +0100 +@@ -184,6 +184,9 @@ + _dl_debug_printf ("\ntransferring control: %s\n\n", argv[0]); + #endif + ++ /* call the __guard_setup to set up the random __guard value */ ++ __guard_setup (); /* pappy@gentoo.org */ ++ + #ifdef HAVE_CLEANUP_JMP_BUF + /* Memory for the cancellation buffer. */ + struct pthread_unwind_buf unwind_buf; +diff -u -r -N glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Dist glibc-2.3.2/sysdeps/unix/sysv/linux/Dist +--- glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Dist 2003-02-21 07:30:10.000000000 +0100 ++++ glibc-2.3.2/sysdeps/unix/sysv/linux/Dist 2003-11-08 21:13:58.000000000 +0100 +@@ -1,3 +1,4 @@ ++ssp.c + bits/initspin.h + cmsg_nxthdr.c + dl-brk.c +diff -u -r -N glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Makefile glibc-2.3.2/sysdeps/unix/sysv/linux/Makefile +--- glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Makefile 2002-12-17 00:36:52.000000000 +0100 ++++ glibc-2.3.2/sysdeps/unix/sysv/linux/Makefile 2003-11-08 21:13:58.000000000 +0100 +@@ -1,5 +1,5 @@ + ifeq ($(subdir),csu) +-sysdep_routines += errno-loc ++sysdep_routines += errno-loc ssp + endif + + ifeq ($(subdir),db2) +diff -u -r -N glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Versions glibc-2.3.2/sysdeps/unix/sysv/linux/Versions +--- glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Versions 2002-12-17 00:28:17.000000000 +0100 ++++ glibc-2.3.2/sysdeps/unix/sysv/linux/Versions 2003-11-08 21:13:58.000000000 +0100 +@@ -108,6 +108,8 @@ + GLIBC_2.3.2 { + # New kernel interfaces. + epoll_create; epoll_ctl; epoll_wait; ++ # global objects and functions for the propolice patch in gcc - moved from libgcc by pappy@gentoo.org ++ __guard; __guard_setup; __stack_smash_handler; + } + GLIBC_PRIVATE { + # needed by libpthread. +diff -u -r -N glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/ssp.c glibc-2.3.2/sysdeps/unix/sysv/linux/ssp.c +--- glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/ssp.c 1970-01-01 01:00:00.000000000 +0100 ++++ glibc-2.3.2/sysdeps/unix/sysv/linux/ssp.c 2003-11-08 21:13:58.000000000 +0100 +@@ -0,0 +1,97 @@ ++#include <stdio.h> ++#include <string.h> ++#include <fcntl.h> ++#include <unistd.h> ++ ++#ifdef _POSIX_SOURCE ++#include <signal.h> ++#endif ++ ++#if defined(HAVE_SYSLOG) ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <sys/un.h> ++ ++#include <sys/syslog.h> ++#ifndef _PATH_LOG ++#define _PATH_LOG "/dev/log" ++#endif ++#endif ++ ++long __guard[8] = {0, 0, 0, 0, 0, 0, 0, 0}; ++ ++void __guard_setup (void) ++{ ++ int fd; ++ if (__guard[0]!=0) return; ++ fd = open ("/dev/urandom", 0); ++ if (fd != -1) { ++ ssize_t size = read (fd, (char*)&__guard, sizeof(__guard)); ++ close (fd) ; ++ if (size == sizeof(__guard)) return; ++ } ++ /* If a random generator can't be used, the protector switches the guard ++ to the "terminator canary" */ ++ ((char*)__guard)[0] = 0; ((char*)__guard)[1] = 0; ++ ((char*)__guard)[2] = '\n'; ((char*)__guard)[3] = 255; ++} ++ ++void __stack_smash_handler (char func[], int damaged) ++{ ++#if defined (__GNU_LIBRARY__) ++ extern char * __progname; ++#endif ++ const char message[] = ": stack smashing attack in function "; ++ int bufsz = 512, len; ++ char buf[bufsz]; ++#if defined(HAVE_SYSLOG) ++ int LogFile; ++ struct sockaddr_un SyslogAddr; /* AF_UNIX address of local logger */ ++#endif ++#ifdef _POSIX_SOURCE ++ { ++ sigset_t mask; ++ sigfillset(&mask); ++ sigdelset(&mask, SIGABRT); /* Block all signal handlers */ ++ sigprocmask(SIG_BLOCK, &mask, NULL); /* except SIGABRT */ ++ } ++#endif ++ ++ strcpy(buf, "<2>"); len=3; /* send LOG_CRIT */ ++#if defined (__GNU_LIBRARY__) ++ strncat(buf, __progname, bufsz-len-1); len = strlen(buf); ++#endif ++ if (bufsz>len) {strncat(buf, message, bufsz-len-1); len = strlen(buf);} ++ if (bufsz>len) {strncat(buf, func, bufsz-len-1); len = strlen(buf);} ++ /* print error message */ ++ write (STDERR_FILENO, buf+3, len-3); ++#if defined(HAVE_SYSLOG) ++ if ((LogFile = socket(AF_UNIX, SOCK_DGRAM, 0)) != -1) { ++ ++ /* ++ * Send "found" message to the "/dev/log" path ++ */ ++ SyslogAddr.sun_family = AF_UNIX; ++ (void)strncpy(SyslogAddr.sun_path, _PATH_LOG, ++ sizeof(SyslogAddr.sun_path) - 1); ++ SyslogAddr.sun_path[sizeof(SyslogAddr.sun_path) - 1] = '\0'; ++ sendto(LogFile, buf, len, 0, (struct sockaddr *)&SyslogAddr, ++ sizeof(SyslogAddr)); ++ } ++#endif ++ ++#ifdef _POSIX_SOURCE ++ { /* Make sure the default handler is associated with SIGABRT */ ++ struct sigaction sa; ++ ++ memset(&sa, 0, sizeof(struct sigaction)); ++ sigfillset(&sa.sa_mask); /* Block all signals */ ++ sa.sa_flags = 0; ++ sa.sa_handler = SIG_DFL; ++ sigaction(SIGABRT, &sa, NULL); ++ (void)kill(getpid(), SIGABRT); ++ } ++#endif ++ _exit(127); ++} ++ diff --git a/sys-libs/glibc/files/2.3.2/glibc-2.3.2-propolice-guard-functions.patch b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-propolice-guard-functions.patch new file mode 100644 index 000000000000..deb117dfd033 --- /dev/null +++ b/sys-libs/glibc/files/2.3.2/glibc-2.3.2-propolice-guard-functions.patch @@ -0,0 +1,144 @@ +diff -u -r -N glibc-2.3.2.ORIG/sysdeps/generic/libc-start.c glibc-2.3.2/sysdeps/generic/libc-start.c +--- glibc-2.3.2.ORIG/sysdeps/generic/libc-start.c 2003-02-14 23:59:15.000000000 +0100 ++++ glibc-2.3.2/sysdeps/generic/libc-start.c 2003-11-08 21:32:03.000000000 +0100 +@@ -149,6 +149,9 @@ + { + /* XXX This is where the try/finally handling must be used. */ + ++ /* call the __guard_setup to set up the random __guard value */ ++ __guard_setup (); /* pappy@gentoo.org */ ++ + result = main (argc, argv, __environ); + } + #ifdef HAVE_CANCELBUF +diff -u -r -N glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Dist glibc-2.3.2/sysdeps/unix/sysv/linux/Dist +--- glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Dist 2003-02-21 07:30:10.000000000 +0100 ++++ glibc-2.3.2/sysdeps/unix/sysv/linux/Dist 2003-11-08 21:13:58.000000000 +0100 +@@ -1,3 +1,4 @@ ++ssp.c + bits/initspin.h + cmsg_nxthdr.c + dl-brk.c +diff -u -r -N glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Makefile glibc-2.3.2/sysdeps/unix/sysv/linux/Makefile +--- glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Makefile 2002-12-17 00:36:52.000000000 +0100 ++++ glibc-2.3.2/sysdeps/unix/sysv/linux/Makefile 2003-11-08 21:13:58.000000000 +0100 +@@ -1,5 +1,5 @@ + ifeq ($(subdir),csu) +-sysdep_routines += errno-loc ++sysdep_routines += errno-loc ssp + endif + + ifeq ($(subdir),db2) +diff -u -r -N glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Versions glibc-2.3.2/sysdeps/unix/sysv/linux/Versions +--- glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/Versions 2002-12-17 00:28:17.000000000 +0100 ++++ glibc-2.3.2/sysdeps/unix/sysv/linux/Versions 2003-11-08 21:13:58.000000000 +0100 +@@ -108,6 +108,8 @@ + GLIBC_2.3.2 { + # New kernel interfaces. + epoll_create; epoll_ctl; epoll_wait; ++ # global objects and functions for the propolice patch in gcc - moved from libgcc by pappy@gentoo.org ++ __guard; __guard_setup; __stack_smash_handler; + } + GLIBC_PRIVATE { + # needed by libpthread. +diff -u -r -N glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/ssp.c glibc-2.3.2/sysdeps/unix/sysv/linux/ssp.c +--- glibc-2.3.2.ORIG/sysdeps/unix/sysv/linux/ssp.c 1970-01-01 01:00:00.000000000 +0100 ++++ glibc-2.3.2/sysdeps/unix/sysv/linux/ssp.c 2003-11-08 21:13:58.000000000 +0100 +@@ -0,0 +1,97 @@ ++#include <stdio.h> ++#include <string.h> ++#include <fcntl.h> ++#include <unistd.h> ++ ++#ifdef _POSIX_SOURCE ++#include <signal.h> ++#endif ++ ++#if defined(HAVE_SYSLOG) ++#include <sys/types.h> ++#include <sys/socket.h> ++#include <sys/un.h> ++ ++#include <sys/syslog.h> ++#ifndef _PATH_LOG ++#define _PATH_LOG "/dev/log" ++#endif ++#endif ++ ++long __guard[8] = {0, 0, 0, 0, 0, 0, 0, 0}; ++ ++void __guard_setup (void) ++{ ++ int fd; ++ if (__guard[0]!=0) return; ++ fd = open ("/dev/urandom", 0); ++ if (fd != -1) { ++ ssize_t size = read (fd, (char*)&__guard, sizeof(__guard)); ++ close (fd) ; ++ if (size == sizeof(__guard)) return; ++ } ++ /* If a random generator can't be used, the protector switches the guard ++ to the "terminator canary" */ ++ ((char*)__guard)[0] = 0; ((char*)__guard)[1] = 0; ++ ((char*)__guard)[2] = '\n'; ((char*)__guard)[3] = 255; ++} ++ ++void __stack_smash_handler (char func[], int damaged) ++{ ++#if defined (__GNU_LIBRARY__) ++ extern char * __progname; ++#endif ++ const char message[] = ": stack smashing attack in function "; ++ int bufsz = 512, len; ++ char buf[bufsz]; ++#if defined(HAVE_SYSLOG) ++ int LogFile; ++ struct sockaddr_un SyslogAddr; /* AF_UNIX address of local logger */ ++#endif ++#ifdef _POSIX_SOURCE ++ { ++ sigset_t mask; ++ sigfillset(&mask); ++ sigdelset(&mask, SIGABRT); /* Block all signal handlers */ ++ sigprocmask(SIG_BLOCK, &mask, NULL); /* except SIGABRT */ ++ } ++#endif ++ ++ strcpy(buf, "<2>"); len=3; /* send LOG_CRIT */ ++#if defined (__GNU_LIBRARY__) ++ strncat(buf, __progname, bufsz-len-1); len = strlen(buf); ++#endif ++ if (bufsz>len) {strncat(buf, message, bufsz-len-1); len = strlen(buf);} ++ if (bufsz>len) {strncat(buf, func, bufsz-len-1); len = strlen(buf);} ++ /* print error message */ ++ write (STDERR_FILENO, buf+3, len-3); ++#if defined(HAVE_SYSLOG) ++ if ((LogFile = socket(AF_UNIX, SOCK_DGRAM, 0)) != -1) { ++ ++ /* ++ * Send "found" message to the "/dev/log" path ++ */ ++ SyslogAddr.sun_family = AF_UNIX; ++ (void)strncpy(SyslogAddr.sun_path, _PATH_LOG, ++ sizeof(SyslogAddr.sun_path) - 1); ++ SyslogAddr.sun_path[sizeof(SyslogAddr.sun_path) - 1] = '\0'; ++ sendto(LogFile, buf, len, 0, (struct sockaddr *)&SyslogAddr, ++ sizeof(SyslogAddr)); ++ } ++#endif ++ ++#ifdef _POSIX_SOURCE ++ { /* Make sure the default handler is associated with SIGABRT */ ++ struct sigaction sa; ++ ++ memset(&sa, 0, sizeof(struct sigaction)); ++ sigfillset(&sa.sa_mask); /* Block all signals */ ++ sa.sa_flags = 0; ++ sa.sa_handler = SIG_DFL; ++ sigaction(SIGABRT, &sa, NULL); ++ (void)kill(getpid(), SIGABRT); ++ } ++#endif ++ _exit(127); ++} ++ diff --git a/sys-libs/glibc/files/digest-glibc-2.2.5-r9 b/sys-libs/glibc/files/digest-glibc-2.2.5-r9 new file mode 100644 index 000000000000..acc05c85ba28 --- /dev/null +++ b/sys-libs/glibc/files/digest-glibc-2.2.5-r9 @@ -0,0 +1,2 @@ +MD5 5be613d02b934d8e305dd2f93062fa6c glibc-2.2.5.tar.bz2 12404613 +MD5 33b9ae01d51263867d338adfba105278 glibc-linuxthreads-2.2.5.tar.bz2 168269 diff --git a/sys-libs/glibc/files/digest-glibc-2.3.1-r5 b/sys-libs/glibc/files/digest-glibc-2.3.1-r5 new file mode 100644 index 000000000000..a0effd0be274 --- /dev/null +++ b/sys-libs/glibc/files/digest-glibc-2.3.1-r5 @@ -0,0 +1,2 @@ +MD5 e8e7ffcb86f921c5b597008bf6f891bd glibc-2.3.1.tar.gz 17882515 +MD5 73a5b953b89c8ebeb534bf59822dde07 glibc-linuxthreads-2.3.1.tar.gz 244012 diff --git a/sys-libs/glibc/files/digest-glibc-2.3.2-r3 b/sys-libs/glibc/files/digest-glibc-2.3.2-r3 new file mode 100644 index 000000000000..7fb46fc2407d --- /dev/null +++ b/sys-libs/glibc/files/digest-glibc-2.3.2-r3 @@ -0,0 +1,3 @@ +MD5 ede969aad568f48083e413384f20753c glibc-2.3.2.tar.bz2 13377170 +MD5 894b8969cfbdf787c73e139782167607 glibc-linuxthreads-2.3.2.tar.bz2 216310 +MD5 befedad981599e1a673e19c3e63d6dce nptl-0.28.tar.bz2 145910 diff --git a/sys-libs/glibc/glibc-2.2.5-r9.ebuild b/sys-libs/glibc/glibc-2.2.5-r9.ebuild new file mode 100644 index 000000000000..75ca271a9f51 --- /dev/null +++ b/sys-libs/glibc/glibc-2.2.5-r9.ebuild @@ -0,0 +1,294 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.2.5-r9.ebuild,v 1.1 2003/11/16 17:02:51 azarah Exp $ + +IUSE="nls pic build" + +inherit flag-o-matic gcc + +filter-flags "-fomit-frame-pointer -malign-double" + +# Sparc support +replace-flags "-mcpu=ultrasparc" "-mcpu=v8 -mtune=ultrasparc" +replace-flags "-mcpu=v9" "-mcpu=v8 -mtune=v9" + +# Recently there has been a lot of stability problem in Gentoo-land. Many +# things can be the cause to this, but I believe that it is due to gcc3 +# still having issues with optimizations, or with it not filtering bad +# combinations (protecting the user maybe from himeself) yet. +# +# This can clearly be seen in large builds like glibc, where too aggressive +# CFLAGS cause the tests to fail miserbly. +# +# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion +# knows what he is talking about: +# +# People really shouldn't force code-specific options on... It's a +# bad idea. The -march options aren't just to look pretty. They enable +# options that are sensible (and include sse,mmx,3dnow when apropriate). +# +# The next command strips CFLAGS and CXXFLAGS from nearly all flags. If +# you do not like it, comment it, but do not bugreport if you run into +# problems. +# +# <azarah@gentoo.org> (13 Oct 2002) +strip-flags + +S="${WORKDIR}/${P}" +DESCRIPTION="GNU libc6 (also called glibc2) C library" +SRC_URI="ftp://sources.redhat.com/pub/glibc/releases/glibc-${PV}.tar.bz2 + ftp://sources.redhat.com/pub/glibc/releases/glibc-linuxthreads-${PV}.tar.bz2" +HOMEPAGE="http://www.gnu.org/software/libc/libc.html" + +KEYWORDS="x86 ppc sparc alpha arm" +SLOT="2.2" +LICENSE="LGPL-2" + +# Portage-1.8.9 needed for smart library merging feature (avoids segfaults on glibc upgrade) +# drobbins, 18 Mar 2002: we now rely on the system profile to select the correct linus-headers +DEPEND="virtual/os-headers + nls? ( sys-devel/gettext )" +RDEPEND="virtual/os-headers + sys-apps/baselayout + nls? ( sys-devel/gettext ) + build? ( >=sys-apps/portage-1.9.0 )" + +PROVIDE="virtual/glibc" + +# Lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here +export CFLAGS="${CFLAGS//-O?} -O2" +export CXXFLAGS="${CFLAGS}" + +src_unpack() { + unpack glibc-${PV}.tar.bz2 || die + cd ${S} + + # Security + # Fix for http://www.cert.org/advisories/CA-2003-10.html + einfo "Applying glibc-xdr_security.patch" + patch -p1 < ${FILESDIR}/glibc-xdr_security.patch > /dev/null || die + + #extract pre-made man pages. Otherwise we need perl, which is a no-no. + mkdir man; cd man + tar xjf ${FILESDIR}/glibc-manpages-${PV}.tar.bz2 > /dev/null || die + cd ${S} + unpack glibc-linuxthreads-${PV}.tar.bz2 || die + + # This patch apparently eliminates compiler warnings for some versions of gcc. + # For information about the string2 patch, see: + # http://lists.gentoo.org/pipermail/gentoo-dev/2001-June/001559.html + einfo "Applying string2.h patch..." + cd ${S}; patch -p0 < ${FILESDIR}/glibc-2.2.4-string2.h.diff > /dev/null || die + + # This next one is a new patch to fix thread signal handling. See: + # http://sources.redhat.com/ml/libc-hacker/2002-02/msg00120.html + # (Added by drobbins on 05 Mar 2002) + einfo "Applying threadsig patch..." + patch -p0 < ${FILESDIR}/${PV}/${P}-threadsig.diff > /dev/null || die + + # This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files + einfo "Applying test-lfs-timeout patch..." + cd ${S}/io; patch -p0 < ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch > /dev/null || die + + # A buffer overflow vulnerability exists in multiple implementations of DNS + # resolver libraries. This affects glibc-2.2.5 and earlier. See bug #4923 + # and: + # + # http://www.cert.org/advisories/CA-2002-19.html + einfo "Applying dns-network-overflow patch..." + cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-dns-network-overflow.diff > /dev/null || die + + # Security update for sunrpc + # <aliz@gentoo.org> + einfo "Applying sunrpc-overflow patch..." + cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-sunrpc-overflow.diff > /dev/null || die + + if [ "${ARCH}" = "x86" -o "${ARCH}" = "ppc" ]; then + # This patch fixes the nvidia-glx probs, openoffice and vmware probs and such.. + # http://sources.redhat.com/ml/libc-hacker/2002-02/msg00152.html + einfo "Applying divdi3 patch..." + cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-divdi3.diff > /dev/null || die + fi + + # A bug in the getgrouplist function can cause a buffer overflow if + # the size of the group list is too small to hold all the user's groups. + # + # https://rhn.redhat.com/errata/RHSA-2003-325.html + einfo "Applying getgrouplist patch..." + cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-getgrouplist.patch > /dev/null || die + + if [ "${ARCH}" = "ppc" ]; then + # This patch fixes the absence of sqrtl on PPC + # http://sources.redhat.com/ml/libc-hacker/2002-05/msg00012.html + einfo "Applying ppc-sqrtl patch..." + cd ${S}; patch -p0 < ${FILESDIR}/${PV}/${P}-ppc-sqrtl.diff > /dev/null || die + fi + + # Some gcc-3.1.1 fixes. This works fine for other versions of gcc as well, + # and should generally be ok, as it just fixes define order that causes scope + # problems with gcc-3.1.1. + # (Azarah, 14 Jul 2002) + einfo "Applying gcc311 patch..." + cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-gcc311.patch > /dev/null || die + + if [ "`gcc-major-version`" -eq "3" -a "`gcc-minor-version`" -ge "2" ]; then + cd ${S} + # http://archive.linuxfromscratch.org/mail-archives/lfs-dev/2002/08/0228.html + # <azarah@gentoo.org> (13 Oct 2002) + einfo "Applying divbyzero patch..." + patch -p1 < ${FILESDIR}/${PV}/${P}.divbyzero.patch > /dev/null || die + einfo "Applying restrict_arr patch..." + patch -p1 < ${FILESDIR}/${PV}/${P}.restrict_arr.patch > /dev/null || die + fi + + # Some patches to fixup build on alpha + if [ "${ARCH}" = "alpha" ]; then + cd ${S} + einfo "Applying alpha-gcc3-fix patch..." + patch -p1 < ${FILESDIR}/${PV}/${P}-alpha-gcc3-fix.diff > /dev/null || die + einfo "Applying alpha-pcdyn-fix patch..." + patch -p1 < ${FILESDIR}/${PV}/${P}-alpha-pcdyn-fix.diff > /dev/null || die + fi + + # Some patches to fixup build on sparc + + if use sparc > /dev/null + then + einfo "Applying sparc-mathinline patch..." + cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-sparc-mathinline.patch > /dev/null || die + + einfo "Applying sparc-misc patch..." + cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-sparc-misc.diff > /dev/null || die + + if [ "${PROFILE_ARCH}" = "sparc64" ] + then + einfo "Applying seemant's -fixups patch..." + cd ${S}; patch -p1 < ${FILESDIR}/${PV}/${P}-sparc64-fixups.diff > /dev/null || die + fi + + einfo "Applying nall's sparc32-semctl patch..." + cd ${S} + patch -p1 < ${FILESDIR}/${PV}/${P}-sparc32-semctl.patch > /dev/null || die + fi + + # Some patches to fixup build on arm + if [ "${ARCH}" = "arm" ]; then + cd ${S} + einfo "Applying ARM sysdep patch..." + patch -p0 < ${FILESDIR}/${PV}/${P}-arm-sysdeps-fix.diff || die + einfo "Applying ARM errlist patch..." + patch -p0 < ${FILESDIR}/${PV}/${P}-arm-errlist-fix.diff || die + fi +} + +src_compile() { + local myconf="" + + # If we build for the build system we use the kernel headers from the target + use build && myconf="${myconf} --with-headers=${ROOT}usr/include" + + use nls || myconf="${myconf} --disable-nls" + + einfo "Configuring GLIBC..." + rm -rf buildhere + mkdir buildhere + cd buildhere + ../configure --host=${CHOST} \ + --with-gd=no \ + --without-cvs \ + --enable-add-ons=linuxthreads \ + --disable-profile \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --libexecdir=/usr/lib/misc \ + ${myconf} || die + # This next option breaks the Sun JDK and the IBM JDK + # We should really keep compatibility with older kernels, anyway + # --enable-kernel=2.4.0 + + einfo "Building GLIBC..." + make PARALLELMFLAGS="${MAKEOPTS}" || die + einfo "Doing GLIBC checks..." + make check +} + + +src_install() { + export LC_ALL="C" + einfo "Installing GLIBC..." + make PARALLELMFLAGS="${MAKEOPTS}" \ + install_root=${D} \ + install -C buildhere || die + + if [ -z "`use build`" ] + then + einfo "Installing Info pages..." + make PARALLELMFLAGS="${MAKEOPTS}" \ + install_root=${D} \ + info -C buildhere || die + + einfo "Installing Locale data..." + make PARALLELMFLAGS="${MAKEOPTS}" \ + install_root=${D} \ + localedata/install-locales -C buildhere || die + + einfo "Installing man pages and docs..." + # Install linuxthreads man pages + dodir /usr/share/man/man3 + doman ${S}/man/*.3thr + + # Install nscd config file + insinto /etc + doins ${S}/nscd/nscd.conf + + dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \ + NEWS NOTES PROJECTS README* + else + rm -rf ${D}/usr/share ${D}/usr/lib/gconv + fi + + if [ "`use pic`" ] + then + find ${S}/buildhere -name "soinit.os" -exec cp {} ${D}/lib/soinit.o \; + find ${S}/buildhere -name "sofini.os" -exec cp {} ${D}/lib/sofini.o \; + find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \; + find ${S}/buildhere -name "*.map" -exec cp {} ${D}/lib \; + for i in ${D}/lib/*.map + do + mv ${i} ${i%.map}_pic.map + done + fi + + # Is this next line actually needed or does the makefile get it right? + # It previously has 0755 perms which was killing things. + fperms 4755 /usr/lib/misc/pt_chown + + rm -f ${D}/etc/ld.so.cache + + # Prevent overwriting of the /etc/localtime symlink. We'll handle the + # creation of the "factory" symlink in pkg_postinst(). + rm -f ${D}/etc/localtime + + # Some things want this, notably ash. + dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a +} + +pkg_postinst() { + # Correct me if I am wrong here, but my /etc/localtime is a file + # created by zic .... + # I am thinking that it should only be recreated if no /etc/localtime + # exists, or if it is an invalid symlink. + # + # For invalid symlink: + # -f && -e will fail + # -L will succeed + # + if [ ! -e ${ROOT}/etc/localtime ] + then + echo "Please remember to set your timezone using the zic command." + rm -f ${ROOT}/etc/localtime + ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime + fi +} + diff --git a/sys-libs/glibc/glibc-2.3.1-r5.ebuild b/sys-libs/glibc/glibc-2.3.1-r5.ebuild new file mode 100644 index 000000000000..a955b3c5af19 --- /dev/null +++ b/sys-libs/glibc/glibc-2.3.1-r5.ebuild @@ -0,0 +1,338 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.1-r5.ebuild,v 1.1 2003/11/16 17:02:51 azarah Exp $ + +IUSE="nls pic build" + +inherit eutils flag-o-matic gcc + +filter-flags "-fomit-frame-pointer -malign-double" + +# Sparc support ... +replace-sparc64-flags + +# Recently there has been a lot of stability problem in Gentoo-land. Many +# things can be the cause to this, but I believe that it is due to gcc3 +# still having issues with optimizations, or with it not filtering bad +# combinations (protecting the user maybe from himeself) yet. +# +# This can clearly be seen in large builds like glibc, where too aggressive +# CFLAGS cause the tests to fail miserbly. +# +# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion +# knows what he is talking about: +# +# People really shouldn't force code-specific options on... It's a +# bad idea. The -march options aren't just to look pretty. They enable +# options that are sensible (and include sse,mmx,3dnow when apropriate). +# +# The next command strips CFLAGS and CXXFLAGS from nearly all flags. If +# you do not like it, comment it, but do not bugreport if you run into +# problems. +# +# <azarah@gentoo.org> (13 Oct 2002) +strip-flags + +# Lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here +export CFLAGS="${CFLAGS//-O?} -O2" +export CXXFLAGS="${CFLAGS}" + +S="${WORKDIR}/${P}" +DESCRIPTION="GNU libc6 (also called glibc2) C library" +SRC_URI="http://ftp.gnu.org/gnu/glibc/glibc-${PV}.tar.gz + http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-${PV}.tar.gz" +HOMEPAGE="http://www.gnu.org/software/libc/libc.html" + +KEYWORDS="amd64 x86 ppc sparc alpha mips hppa arm" +# Is 99% compadible, just some .a's bork +SLOT="2.2" +LICENSE="LGPL-2" + +# Portage-1.8.9 needed for smart library merging feature (avoids segfaults on glibc upgrade) +# Drobbins, 18 Mar 2002: we now rely on the system profile to select the correct linus-headers +DEPEND=">=sys-devel/gcc-3.2 + >=sys-devel/binutils-2.13.90.0.16 + virtual/os-headers + nls? ( sys-devel/gettext )" +RDEPEND="virtual/os-headers + sys-apps/baselayout + nls? ( sys-devel/gettext ) + build? ( >=sys-apps/portage-1.9.0 )" + +PROVIDE="virtual/glibc" + + +pkg_config() { + if [ "`gcc-major-version`" -ne "3" -o "`gcc-minor-version`" -lt "2" ] + then + eerror "As of glibc-2.3, gcc-3.2 or later is needed" + eerror "for the build to succeed." + die "GCC too old" + fi +} + +src_unpack() { + + if [ -n "`is-flag "-fstack-protector"`" -a -n "`has "sandbox" $FEATURES`" ] + then + eerror "You have both -fstack-protector and sandbox enabled" + eerror "glibc will not compile correctly with both of these enabled" + eerror "Please disable sandbox by calling emerge with FEATURES=\"-sandbox\"" + die + fi + + unpack glibc-${PV}.tar.gz || die + # Extract pre-made man pages. Otherwise we need perl, which is a no-no. + mkdir -p ${S}/man; cd ${S}/man + tar xjf ${FILESDIR}/glibc-manpages-${PV}.tar.bz2 || die + cd ${S} + unpack glibc-linuxthreads-${PV}.tar.gz || die + + # Security Update + # Fix for http://www.cert.org/advisories/CA-2003-10.html + epatch ${FILESDIR}/${PN}-xdr_security.patch + + # This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files + cd ${S}/io; epatch ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch + + # This add back glibc 2.2 compadibility. See bug #8766 and #9586 for more info, + # and also: + # + # http://lists.debian.org/debian-glibc/2002/debian-glibc-200210/msg00093.html + # + # We should think about remoing it in the future after things have settled. + # + # Thanks to Jan Gutter <jangutter@tuks.co.za> for reporting it. + # + # <azarah@gentoo.org> (26 Oct 2002). + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-ctype-compat-v3.patch + + # One more compat issue which breaks sun-jdk-1.3.1. See bug #8766 for more + # info, and also: + # + # http://sources.redhat.com/ml/libc-alpha/2002-04/msg00143.html + # + # Thanks to Jan Gutter <jangutter@tuks.co.za> for reporting it. + # + # <azarah@gentoo.org> (30 Oct 2002). + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-libc_wait-compat.patch + + # One more compat issue ... libc_stack_end is missing from ld.so. + # Got this one from diffing redhat glibc tarball .. would help if + # they used patches and not modified tarball ... + # + # <azarah@gentoo.org> (7 Nov 2002). + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-stack_end-compat.patch + + # This one fixes a corner case with prelinking and preloading + # This is a diff from the glibc CVS + # http://sources.redhat.com/ml/libc-alpha/2002-11/msg00151.html + # <cretin@gentoo.org> (17 Nov 2002). + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-prelinkfix.patch + + # Fix 'locale -a' not listing all locales. This to Stefan Jones + # <cretin@gentoo.org> for this fix, bug #13240. + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-locale.patch + + # Fix problems with ORACLE, bug #16504 + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-typeo_dl-runtime_c.patch + + # Fix sscanf fixed arg bug + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-sscanf.patch + + # A bug in the getgrouplist function can cause a buffer overflow if + # the size of the group list is too small to hold all the user's groups. + # + # https://rhn.redhat.com/errata/RHSA-2003-325.html + cd ${S}; epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-getgrouplist.patch + + # Fix a memory leak in ftw_dir + cd ${S}; epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-ftw.patch + + # A few patches only for the MIPS platform. Descriptions of what they + # do can be found in the patch headers. + # <tuxus@gentoo.org> thx <dragon@gentoo.org> (11 Jan 2003) + if [ "${ARCH}" = "mips" ] + then + cd ${S} + epatch ${FILESDIR}/${PV}/${P}-elf-machine-rela-mips.patch + epatch ${FILESDIR}/${PV}/${P}-exit-syscall-mips.patch + epatch ${FILESDIR}/${PV}/${P}-fpu-cw-mips.patch + epatch ${FILESDIR}/${PV}/${P}-inline-syscall-mips.patch + epatch ${FILESDIR}/${PV}/${P}-libgcc-compat-mips.patch + epatch ${FILESDIR}/${PV}/${P}-librt-mips.patch + epatch ${FILESDIR}/${PV}/${P}-tst-rndseek-mips.patch + epatch ${FILESDIR}/${PV}/${P}-ulps-mips.patch + fi + + # Some patches for hppa. + # <gmsoft@gentoo.org> (27 Jan 2003) + if [ "${ARCH}" = "hppa" ] + then + cd ${S} + epatch ${FILESDIR}/${PV}/glibc23-00-hppa-pthreads.dpatch + epatch ${FILESDIR}/${PV}/glibc23-01-hppa-dl-machine.dpatch + epatch ${FILESDIR}/${PV}/glibc23-02-hppa-min-kern-unwind-fde.dpatch + epatch ${FILESDIR}/${PV}/glibc23-03-hppa-mcontext.dpatch + epatch ${FILESDIR}/${PV}/glibc23-04-hppa-fcntl64.dpatch + epatch ${FILESDIR}/${PV}/glibc23-05-hppa-buildhack.dpatch + epatch ${FILESDIR}/${PV}/glibc23-06-hppa-tests.dpatch + epatch ${FILESDIR}/${PV}/glibc23-07-hppa-atomicity.dpatch + epatch ${FILESDIR}/${PV}/glibc23-08-hppa-configure.dpatch + epatch ${FILESDIR}/${PV}/glibc23-hppa-shmlba.dpatch + fi +} + +src_compile() { + local myconf= + + # These should not be set, else the + # zoneinfo do not always get installed ... + unset LANGUAGE LANG LC_ALL + + # If we build for the build system we use the kernel headers from the target +# ( use build || use sparc ) \ +# && myconf="${myconf} --with-headers=${ROOT}usr/include" + myconf="${myconf} --with-headers=${ROOT}usr/include" + # Set it without "build" as well, else it might use the current kernel's + # headers, which might just fail (the linux-headers package is usually well + # tested...) + + use nls || myconf="${myconf} --disable-nls" + + # Thread Local Storage support. This dont really work as of yet... +# use x86 && use tls \ +# && myconf="${myconf} --with-tls" + myconf="${myconf} --without-tls --without-__thread" + + if [ "`uname -r | cut -d. -f2`" -ge "4" ] + then + myconf="${myconf} --enable-kernel=2.4.0" + fi + + # This should not be done for: ia64 s390 s390x +# use x86 && CFLAGS="${CFLAGS} -freorder-blocks" + + # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml or #gentoo-hardened/irc.freenode + has_version "sys-devel/hardened-gcc" && CC="${CC} -yet_exec" + + einfo "Configuring GLIBC..." + rm -rf buildhere + mkdir buildhere + cd buildhere + ../configure --host=${CHOST} \ + --with-gd=no \ + --without-cvs \ + --enable-add-ons=yes \ + --disable-profile \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --libexecdir=/usr/lib/misc \ + ${myconf} || die + + einfo "Building GLIBC..." + make PARALLELMFLAGS="${MAKEOPTS}" || die +# einfo "Doing GLIBC checks..." +# make check +} + + +src_install() { + # These should not be set, else the + # zoneinfo do not always get installed ... + unset LANGUAGE LANG LC_ALL + + einfo "Installing GLIBC..." + make PARALLELMFLAGS="${MAKEOPTS}" \ + install_root=${D} \ + install -C buildhere || die + + if [ -z "`use build`" ] + then + einfo "Installing Info pages..." + make PARALLELMFLAGS="${MAKEOPTS}" \ + install_root=${D} \ + info -C buildhere || die + + einfo "Installing Locale data..." + make PARALLELMFLAGS="${MAKEOPTS}" \ + install_root=${D} \ + localedata/install-locales -C buildhere || die + + einfo "Installing man pages and docs..." + # Install linuxthreads man pages + dodir /usr/share/man/man3 + doman ${S}/man/*.3thr + + # Install nscd config file + insinto /etc + doins ${S}/nscd/nscd.conf + + dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \ + NEWS NOTES PROJECTS README* + else + rm -rf ${D}/usr/share ${D}/usr/lib/gconv + + einfo "Installing Timezone data..." + make PARALLELMFLAGS="${MAKEOPTS}" \ + install_root=${D} \ + timezone/install-others -C buildhere || die + fi + + if [ "`use pic`" ] + then + find ${S}/buildhere -name "soinit.os" -exec cp {} ${D}/lib/soinit.o \; + find ${S}/buildhere -name "sofini.os" -exec cp {} ${D}/lib/sofini.o \; + find ${S}/buildhere -name "*_pic.a" -exec cp {} ${D}/lib \; + find ${S}/buildhere -name "*.map" -exec cp {} ${D}/lib \; + for i in ${D}/lib/*.map + do + mv ${i} ${i%.map}_pic.map + done + fi + + # Is this next line actually needed or does the makefile get it right? + # It previously has 0755 perms which was killing things. + fperms 4755 /usr/lib/misc/pt_chown + + rm -f ${D}/etc/ld.so.cache + + # Prevent overwriting of the /etc/localtime symlink. We'll handle the + # creation of the "factory" symlink in pkg_postinst(). + rm -f ${D}/etc/localtime + + # Some things want this, notably ash. + dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a +} + +pkg_postinst() { + # Correct me if I am wrong here, but my /etc/localtime is a file + # created by zic .... + # I am thinking that it should only be recreated if no /etc/localtime + # exists, or if it is an invalid symlink. + # + # For invalid symlink: + # -f && -e will fail + # -L will succeed + # + if [ ! -e ${ROOT}/etc/localtime ] + then + echo "Please remember to set your timezone using the zic command." + rm -f ${ROOT}/etc/localtime + ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime + fi + + # Generate fastloading iconv module configuration file. + if [ -x ${ROOT}/usr/sbin/iconvconfig ] + then + ${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT} + fi + + # Reload init ... + if [ "${ROOT}" = "/" ] + then + /sbin/init U &> /dev/null + fi +} + diff --git a/sys-libs/glibc/glibc-2.3.2-r2.ebuild b/sys-libs/glibc/glibc-2.3.2-r2.ebuild index 5362f81b44a3..e48242ac8097 100644 --- a/sys-libs/glibc/glibc-2.3.2-r2.ebuild +++ b/sys-libs/glibc/glibc-2.3.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2003 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r2.ebuild,v 1.14 2003/09/13 20:49:49 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r2.ebuild,v 1.15 2003/11/16 17:02:51 azarah Exp $ IUSE="nls pic build nptl" @@ -309,6 +309,15 @@ src_unpack() { epatch ${FILESDIR}/2.3.2/${P}-redhat-linuxthreads-fixes.patch fi + # To circumvent problems with propolice __guard and + # __guard_setup__stack_smash_handler + # + # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml + if [ "${ARCH}" != "hppa" -a "${ARCH}" != "hppa64" ] + then + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-propolice-guard-functions-v2.patch + fi + # This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files # cd ${S}/io; epatch ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch diff --git a/sys-libs/glibc/glibc-2.3.2-r3.ebuild b/sys-libs/glibc/glibc-2.3.2-r3.ebuild new file mode 100644 index 000000000000..1f662771b96a --- /dev/null +++ b/sys-libs/glibc/glibc-2.3.2-r3.ebuild @@ -0,0 +1,575 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.3.2-r3.ebuild,v 1.11 2003/11/16 17:02:51 azarah Exp $ + +IUSE="nls pic build nptl" + +inherit eutils flag-o-matic gcc + +filter-flags "-fomit-frame-pointer -malign-double" + +# Recently there has been a lot of stability problem in Gentoo-land. Many +# things can be the cause to this, but I believe that it is due to gcc3 +# still having issues with optimizations, or with it not filtering bad +# combinations (protecting the user maybe from himeself) yet. +# +# This can clearly be seen in large builds like glibc, where too aggressive +# CFLAGS cause the tests to fail miserbly. +# +# Quote from Nick Jones <carpaski@gentoo.org>, who in my opinion +# knows what he is talking about: +# +# People really shouldn't force code-specific options on... It's a +# bad idea. The -march options aren't just to look pretty. They enable +# options that are sensible (and include sse,mmx,3dnow when apropriate). +# +# The next command strips CFLAGS and CXXFLAGS from nearly all flags. If +# you do not like it, comment it, but do not bugreport if you run into +# problems. +# +# <azarah@gentoo.org> (13 Oct 2002) +strip-flags + +# Lock glibc at -O2 -- linuxthreads needs it and we want to be conservative here +export CFLAGS="${CFLAGS//-O?} -O2" +export CXXFLAGS="${CFLAGS}" + +NPTL_VER="0.28" + +# Minimum kernel version for --enable-kernel +export MIN_KV="2.4.1" +# Minimum kernel version for enabling TLS and NPTL ... +# NOTE: do not change this if you do not know what +# you are doing ! +export MIN_NPTL_KV="2.5.50" + +MY_PV="${PV/_}" +S="${WORKDIR}/${P%_*}" +DESCRIPTION="GNU libc6 (also called glibc2) C library" +SRC_URI="http://ftp.gnu.org/gnu/glibc/glibc-${MY_PV}.tar.bz2 + ftp://sources.redhat.com/pub/glibc/snapshots/glibc-${MY_PV}.tar.bz2 + http://ftp.gnu.org/gnu/glibc/glibc-linuxthreads-${MY_PV}.tar.bz2 + ftp://sources.redhat.com/pub/glibc/snapshots/glibc-linuxthreads-${MY_PV}.tar.bz2 + nptl? ( http://people.redhat.com/drepper/nptl/nptl-${NPTL_VER}.tar.bz2 )" +HOMEPAGE="http://www.gnu.org/software/libc/libc.html" + +# failing hppa: ../linuxthreads/sysdeps/pthread/errno-loc.c:39: +# `pthread_descr' undeclared (first use in this function) +KEYWORDS="x86 ppc sparc alpha -hppa ~arm mips ia64" +SLOT="2.2" +LICENSE="LGPL-2" + +# Portage-1.8.9 needed for smart library merging feature (avoids segfaults on glibc upgrade) +# Drobbins, 18 Mar 2002: we now rely on the system profile to select the correct linus-headers +DEPEND=">=sys-devel/gcc-3.2 + nptl? ( >=sys-devel/gcc-3.2.2-r1 ) + mips? >=sys-devel/binutils-2.13.90.0.16 : >=sys-devel/binutils-2.13.90.0.18 + virtual/os-headers + nls? ( sys-devel/gettext )" + +RDEPEND="virtual/os-headers + sys-apps/baselayout + nls? ( sys-devel/gettext ) + build? ( >=sys-apps/portage-1.9.0 )" + +PROVIDE="virtual/glibc" + + +# Convert a string type kernel version (2.4.0) to an int (132096) +# for easy compairing or versions ... +KV_to_int() { + [ -z "$1" ] && return 1 + + local KV="`echo $1 | \ + awk '{ tmp = $0; gsub(/^[0-9\.]*/, "", tmp); sub(tmp, ""); print }'`" + local KV_MAJOR="`echo "${KV}" | cut -d. -f1`" + local KV_MINOR="`echo "${KV}" | cut -d. -f2`" + local KV_MICRO="`echo "${KV}" | cut -d. -f3`" + local KV_int="$((KV_MAJOR * 65536 + KV_MINOR * 256 + KV_MICRO))" + + # We make version 2.2.0 the minimum version we will handle as + # a sanity check ... if its less, we fail ... + if [ "${KV_int}" -ge "131584" ] + then + echo "${KV_int}" + + return 0 + else + return 1 + fi +} + +get_KV() { + local KV="`uname -r`" + + echo "`KV_to_int ${KV}`" + + return $? +} + +# Try to get a kernel source tree with version equal or greater +# than $1. We basically just try a few default locations. The +# version need to be that which KV_to_int() returns ... +get_KHV() { + local headers="" + + [ -z "$1" ] && return 1 + + # - First check if linux-headers are installed (or symlink + # to current kernel ...) + # - Ok, do we have access to the current kernel's headers ? + # - Last option ... maybe its a weird bootstrap with /lib + # binded to the chroot ... + + # We do not really support more than 2 arguments ... + if [ -n "$2" ] + then + headers="$2" + else + # We try to find the current kernel's headers first, + # as we would rather build against linux 2.5 headers ... + headers="/lib/modules/`uname -r`/build/include \ + ${ROOT}/lib/modules/`uname -r`/build/include \ + /usr/src/linux/include \ + ${ROOT}/usr/src/linux/include \ + ${ROOT}/usr/include" + fi + + for x in ${headers} + do + local header="${x}/linux/version.h" + + if [ -f ${header} ] + then + + local version="`grep 'LINUX_VERSION_CODE' ${header} | \ + sed -e 's:^.*LINUX_VERSION_CODE[[:space:]]*::'`" + + if [ "${version}" -ge "$1" ] + then + echo "${x}" + + return 0 + fi + fi + done + + return 1 +} + +use_nptl() { + # Enable NPTL support if: + # - We have 'nptl' in USE + # - We have 'x86' in USE + # - We have linux-2.4 or later kernel (should prob check for 2.4.20 ...) + # - We have a CHOST of "i686-pc-linux-gnu" + if [ -n "`use nptl`" -a "`use x86`" -a \ + "`get_KV`" -ge "`KV_to_int ${MIN_NPTL_KV}`" -a "${CHOST/-*}" = "i686" ] + then + return 0 + else + return 1 + fi +} + +pkg_setup() { + # We need gcc 3.2 or later ... + if [ "`gcc-major-version`" -ne "3" -o "`gcc-minor-version`" -lt "2" ] + then + echo + eerror "As of glibc-2.3, gcc-3.2 or later is needed" + eerror "for the build to succeed." + die "GCC too old" + fi + + if use_nptl + then + echo + + # The use_nptl should have already taken care of kernel version, + # arch and CHOST, so now just check if we can find suitable kernel + # source tree or headers .... + einfon "Checking for sufficient version kernel headers ... " + if ! get_KHV "`KV_to_int ${MIN_NPTL_KV}`" &> /dev/null + then + echo "no" + echo + eerror "Could not find a kernel source tree or headers with" + eerror "version ${MIN_NPTL_KV} or later! Please correct this" + eerror "and try again." + die "Insufficient kernel headers present!" + else + echo "yes" + fi + + einfon "Checking gcc for __thread support ... " + if ! gcc -c ${FILESDIR}/test-__thread.c -o ${T}/test.o &> /dev/null + then + echo "no" + echo + eerror "Could not find a gcc that supports the __thread directive!" + eerror "please update to gcc-3.2.2-r1 or later, and try again." + die "No __thread support in gcc!" + else + echo "yes" + fi + + # Default disclaimer ... + echo + ewarn "Please note that NPTL support is still very experimental," + ewarn "and could break your system! Press ^C now if you do not know" + ewarn "what you are doing, and remove \"nptl\" from your USE ..." + echo + ewarn "As a final note ... it does NOT work with NVidia GLX!!" + sleep 5 + + elif use nptl &> /dev/null + then + # Just tell the user not to expect too much ... + ewarn "You have \"nptl\" in your USE, but your kernel version or" + ewarn "architecture does not support it!" + fi +} + +src_unpack() { + + unpack glibc-${MY_PV}.tar.bz2 + + # Extract pre-made man pages. Otherwise we need perl, which is a no-no. + mkdir -p ${S}/man; cd ${S}/man + use_nptl || tar xjf ${FILESDIR}/glibc-manpages-${MY_PV}.tar.bz2 + + cd ${S} + # Extract our threads package ... + if use_nptl + then + unpack nptl-${NPTL_VER}.tar.bz2 + else + unpack glibc-linuxthreads-${MY_PV}.tar.bz2 + fi + + # To circumvent problems with propolice __guard and + # __guard_setup__stack_smash_handler + # + # http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml + if [ "${ARCH}" != "hppa" -a "${ARCH}" != "hppa64" ] + then + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-propolice-guard-functions.patch + fi + + # This next patch fixes a test that will timeout due to ReiserFS' slow handling of sparse files +# cd ${S}/io; epatch ${FILESDIR}/glibc-2.2.2-test-lfs-timeout.patch + + # This add back glibc 2.2 compadibility. See bug #8766 and #9586 for more info, + # and also: + # + # http://lists.debian.org/debian-glibc/2002/debian-glibc-200210/msg00093.html + # + # We should think about remoing it in the future after things have settled. + # + # Thanks to Jan Gutter <jangutter@tuks.co.za> for reporting it. + # + # <azarah@gentoo.org> (26 Oct 2002). + cd ${S}; epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-ctype-compat-v3.patch + + # One more compat issue which breaks sun-jdk-1.3.1. See bug #8766 for more + # info, and also: + # + # http://sources.redhat.com/ml/libc-alpha/2002-04/msg00143.html + # + # Thanks to Jan Gutter <jangutter@tuks.co.za> for reporting it. + # + # <azarah@gentoo.org> (30 Oct 2002). + cd ${S}; epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-libc_wait-compat.patch + + # One more compat issue ... libc_stack_end is missing from ld.so. + # Got this one from diffing redhat glibc tarball .. would help if + # they used patches and not modified tarball ... + # + # <azarah@gentoo.org> (7 Nov 2002). + cd ${S}; epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-stack_end-compat.patch + + # Fix calculation problems in allocate_static_tls that caused a TLS + # enabled app that loads libGL.so to segfault. Thanks to Gareth Hughes + # from NVidia for pointing me in the right direction. This patch is + # from glibc CVS. + # + # <azarah@gentoo.org> (6 Apr 2003). + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-dl-reloc-calc-fix.patch + + # Fix compilation with gcc-3.3 + # + # http://sources.redhat.com/ml/libc-alpha/2003-03/msg00052.html + # + # <azarah@gentoo.org> (18 May 2003). + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-gcc33-sscanf.patch + + # The mathinline.h header omits the middle term of a ?: expression. This + # is a gcc extension, but since the ISO standard forbids it, it's a + # GLIBC bug (bug #27142). See also: + # + # http://bugs.gentoo.org/show_bug.cgi?id=27142 + # + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-fix-omitted-operand-in-mathinline_h.patch + + # A bug in the getgrouplist function can cause a buffer overflow if + # the size of the group list is too small to hold all the user's groups. + # + # https://rhn.redhat.com/errata/RHSA-2003-325.html + cd ${S}; epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-getgrouplist.patch + + # Fix a memory leak in ftw_dir + cd ${S}; epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-ftw.patch + + # We do not want name_insert() in iconvconfig.c to be defined inside + # write_output() as it causes issues with PaX. + cd ${S}; epatch ${FILESDIR}/${PV}/${P}-iconvconfig-name_insert.patch + + # A few patches only for the MIPS platform. Descriptions of what they + # do can be found in the patch headers. + # <tuxus@gentoo.org> thx <dragon@gentoo.org> (11 Jan 2003) + # <kumba@gentoo.org> remove tst-rndseek-mips & ulps-mips patches + if [ "${ARCH}" = "mips" ] + then + cd ${S} + epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-elf-machine-rela-mips.patch + epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-exit-syscall-mips.patch + epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-fpu-cw-mips.patch + epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-inline-syscall-mips.patch + epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-libgcc-compat-mips.patch + epatch ${FILESDIR}/2.3.1/${PN}-2.3.1-librt-mips.patch + fi + + # Fix compatability with compaq compilers by ifdef'ing out some + # 2.3.2 additions. + # <taviso@gentoo.org> (14 Jun 2003). + use alpha && epatch ${FILESDIR}/2.3.2/${P}-decc-compaq.patch + +} + +setup_flags() { + # -freorder-blocks for all but ia64 s390 s390x + use ppc || append-flags "-freorder-blocks" + + # Sparc/Sparc64 support + if [ `use sparc` ]; then + + # Both sparc and sparc64 can use -fcall-used-g6. -g7 is bad, though. + replace-flags "-fcall-used-g7" "" + append-flags "-fcall-used-g6" + + # Sparc64 Only support... + if [ "${PROFILE_ARCH}" = "sparc64" ]; then + + # Get rid of -mcpu options, the CHOST will fix this up + replace-flags "-mcpu=ultrasparc" "" + replace-flags "-mcpu=v9" "" + + # Get rid of flags known to fail + replace-flags "-mvis" "" + + # Setup the CHOST properly to insure "sparcv9" + # This passes -mcpu=ultrasparc -Wa,-Av9a to the compiler + export CHOST=${CHOST/sparc/sparcv9} + fi + fi +} + +src_compile() { + local myconf="" + local myconf_nptl="" + + setup_flags + + # These should not be set, else the + # zoneinfo do not always get installed ... + unset LANGUAGE LANG LC_ALL + + use nls || myconf="${myconf} --disable-nls" + + if use_nptl + then + local kernelheaders="$(get_KHV "`KV_to_int ${MIN_NPTL_KV}`")" + + # NTPL and Thread Local Storage support. + myconf="${myconf} --with-tls --with-__thread \ + --enable-add-ons=nptl \ + --enable-kernel=${MIN_NPTL_KV} \ + --with-headers=${kernelheaders}" + else + myconf="${myconf} --without-tls --without-__thread \ + --enable-add-ons=linuxthreads" + + # If we build for the build system we use the kernel headers from the target + # We also now set it without "build" as well, else it might use the + # current kernel's headers, which might just fail (the linux-headers + # package is usually well tested...) +# ( use build || use sparc ) \ +# && myconf="${myconf} --with-headers=${ROOT}usr/include" + myconf="${myconf} --with-headers=${ROOT}usr/include" + + # If kernel version and headers in ${ROOT}/usr/include are ok, + # then enable --enable-kernel=${MIN_KV} ... + if [ "`get_KV`" -ge "`KV_to_int ${MIN_KV}`" -a \ + -n "$(get_KHV "`KV_to_int ${MIN_KV}`" "${ROOT}/usr/include")" ] + then + myconf="${myconf} --enable-kernel=${MIN_KV}" + else + myconf="${myconf} --enable-kernel=2.2.5" + fi + fi + + has_version "sys-devel/hardened-gcc" && CC="${CC} -yet_exec" + + einfo "Configuring GLIBC..." + rm -rf ${S}/buildhere + mkdir -p ${S}/buildhere + cd ${S}/buildhere + ../configure --build=${CHOST} \ + --host=${CHOST} \ + --with-gd=no \ + --without-cvs \ + --disable-profile \ + --prefix=/usr \ + --mandir=/usr/share/man \ + --infodir=/usr/share/info \ + --libexecdir=/usr/lib/misc \ + ${myconf} || die + + einfo "Building GLIBC..." + cd ${S}/buildhere + make PARALLELMFLAGS="${MAKEOPTS}" || die +# einfo "Doing GLIBC checks..." +# make check +} + +src_install() { + local buildtarget="buildhere" + + setup_flags + + # These should not be set, else the + # zoneinfo do not always get installed ... + unset LANGUAGE LANG LC_ALL + + einfo "Installing GLIBC..." + make PARALLELMFLAGS="${MAKEOPTS}" \ + install_root=${D} \ + install -C ${buildtarget} || die + + # If librt.so is a symlink, change it into linker script (Redhat) + if [ -L ${D}/usr/lib/librt.so ] + then + local LIBRTSO="`cd ${D}/lib; echo librt.so.*`" + local LIBPTHREADSO="`cd ${D}/lib; echo libpthread.so.*`" + + rm -f ${D}/usr/lib/librt.so + cat > ${D}/usr/lib/librt.so <<EOF +/* GNU ld script + librt.so.1 needs libpthread.so.0 to come before libc.so.6* + in search scope. */ +EOF + grep "OUTPUT_FORMAT" ${D}/usr/lib/libc.so >> ${D}/usr/lib/librt.so + echo "GROUP ( /lib/${LIBPTHREADSO} /lib/${LIBRTSO} )" \ + >> ${D}/usr/lib/librt.so + fi + + if [ -z "`use build`" ] + then + einfo "Installing Info pages..." + make PARALLELMFLAGS="${MAKEOPTS}" \ + install_root=${D} \ + info -C ${buildtarget} || die + + einfo "Installing Locale data..." + make PARALLELMFLAGS="${MAKEOPTS}" \ + install_root=${D} \ + localedata/install-locales -C ${buildtarget} || die + + # Compatibility hack: this locale has vanished from glibc, + # but some other programs are still using it. + keepdir /usr/lib/locale/ru_RU/LC_MESSAGES + + einfo "Installing man pages and docs..." + # Install linuxthreads man pages + use_nptl || { + dodir /usr/share/man/man3 + doman ${S}/man/*.3thr + } + + # Install nscd config file + insinto /etc + doins ${FILESDIR}/nscd.conf + + dodoc BUGS ChangeLog* CONFORMANCE COPYING* FAQ INTERFACE \ + NEWS NOTES PROJECTS README* + else + rm -rf ${D}/usr/share ${D}/usr/lib/gconv + + einfo "Installing Timezone data..." + make PARALLELMFLAGS="${MAKEOPTS}" \ + install_root=${D} \ + timezone/install-others -C ${buildtarget} || die + fi + + if [ "`use pic`" ] + then + find ${S}/${buildtarget}/ -name "soinit.os" -exec cp {} ${D}/lib/soinit.o \; + find ${S}/${buildtarget}/ -name "sofini.os" -exec cp {} ${D}/lib/sofini.o \; + find ${S}/${buildtarget}/ -name "*_pic.a" -exec cp {} ${D}/lib \; + find ${S}/${buildtarget}/ -name "*.map" -exec cp {} ${D}/lib \; + for i in ${D}/lib/*.map + do + mv ${i} ${i%.map}_pic.map + done + fi + + # Is this next line actually needed or does the makefile get it right? + # It previously has 0755 perms which was killing things. + fperms 4755 /usr/lib/misc/pt_chown + + # Currently libraries in /usr/lib/gconv do not get loaded if not + # in search path ... +# insinto /etc/env.d +# doins ${FILESDIR}/03glibc + + rm -f ${D}/etc/ld.so.cache + + # Prevent overwriting of the /etc/localtime symlink. We'll handle the + # creation of the "factory" symlink in pkg_postinst(). + rm -f ${D}/etc/localtime + + # Some things want this, notably ash. + dosym /usr/lib/libbsd-compat.a /usr/lib/libbsd.a +} + +pkg_postinst() { + # Correct me if I am wrong here, but my /etc/localtime is a file + # created by zic .... + # I am thinking that it should only be recreated if no /etc/localtime + # exists, or if it is an invalid symlink. + # + # For invalid symlink: + # -f && -e will fail + # -L will succeed + # + if [ ! -e ${ROOT}/etc/localtime ] + then + echo "Please remember to set your timezone using the zic command." + rm -f ${ROOT}/etc/localtime + ln -s ../usr/share/zoneinfo/Factory ${ROOT}/etc/localtime + fi + + if [ -x ${ROOT}/usr/sbin/iconvconfig ] + then + # Generate fastloading iconv module configuration file. + ${ROOT}/usr/sbin/iconvconfig --prefix=${ROOT} + fi + + # Reload init ... + if [ "${ROOT}" = "/" ] + then + /sbin/init U &> /dev/null + fi +} + |