Author: aurel32 Date: 2009-07-20 10:14:49 +0000 (Mon, 20 Jul 2009) New Revision: 3640
Modified: glibc-package/branches/eglibc-2.10/debian/changelog glibc-package/branches/eglibc-2.10/debian/control glibc-package/branches/eglibc-2.10/debian/control.in/i386 glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-alt.preinst glibc-package/branches/eglibc-2.10/debian/local/etc/bindresvport.blacklist glibc-package/branches/eglibc-2.10/debian/local/etc_init.d/glibc.sh glibc-package/branches/eglibc-2.10/debian/patches/any/local-bindresvport_blacklist.diff glibc-package/branches/eglibc-2.10/debian/patches/kfreebsd/local-sysdeps.diff glibc-package/branches/eglibc-2.10/debian/po/cs.po glibc-package/branches/eglibc-2.10/debian/rules.d/build.mk Log: Merge from trunk, revisions 3521-3639. Modified: glibc-package/branches/eglibc-2.10/debian/changelog =================================================================== --- glibc-package/branches/eglibc-2.10/debian/changelog 2009-07-20 10:06:47 UTC (rev 3639) +++ glibc-package/branches/eglibc-2.10/debian/changelog 2009-07-20 10:14:49 UTC (rev 3640) @@ -106,6 +106,28 @@ -- Aurelien Jarno <[email protected]> Sun, 12 Jul 2009 14:58:42 +0200 +eglibc (2.9-22) UNSTABLE; urgency=low + + * kfreebsd/local-sysdeps.diff: update to revision 2653 (from glibc-bsd). + + -- Aurelien Jarno <[email protected]> Mon, 20 Jul 2009 11:53:15 +0200 + +eglibc (2.9-21) unstable; urgency=low + + [ Aurelien Jarno ] + * Re-add /usr/include/scsi/scsi.h. Closes: #537354. + * libc6-dev-i386: pre-depends on libc6-i386. Closes: #535313. + * /etc/bindresvport.blacklist: add rsync (port 873). Closes: #537289. + * any/local-bindresvport_blacklist.diff: update from latest openSUSE + version. + * kfreebsd/local-sysdeps.diff: update to revision 2643 (from glibc-bsd). + Closes: #537492. + * debian/local/etc_init.d/glibc.sh: add support for start/stop/restart/ + force-reload options. + * debian/debhelper.in/libc-alt.preinst: add set -e. + + -- Aurelien Jarno <[email protected]> Sun, 19 Jul 2009 21:09:38 +0200 + eglibc (2.9-20) unstable; urgency=low [ Clint Adams ] Modified: glibc-package/branches/eglibc-2.10/debian/control =================================================================== --- glibc-package/branches/eglibc-2.10/debian/control 2009-07-20 10:06:47 UTC (rev 3639) +++ glibc-package/branches/eglibc-2.10/debian/control 2009-07-20 10:14:49 UTC (rev 3640) @@ -364,6 +364,7 @@ Section: libdevel Priority: optional Provides: lib32c-dev +Pre-Depends: libc6-i386 (>= 2.9-21) Depends: libc6-i386 (= ${binary:Version}), libc6-dev (= ${binary:Version}) Recommends: gcc-multilib Description: GNU C Library: 32-bit development libraries for AMD64 Modified: glibc-package/branches/eglibc-2.10/debian/control.in/i386 =================================================================== --- glibc-package/branches/eglibc-2.10/debian/control.in/i386 2009-07-20 10:06:47 UTC (rev 3639) +++ glibc-package/branches/eglibc-2.10/debian/control.in/i386 2009-07-20 10:14:49 UTC (rev 3640) @@ -15,6 +15,7 @@ Section: libdevel Priority: optional Provides: lib32c-dev +Pre-Depends: libc6-i386 (>= 2.9-21) Depends: libc6-i386 (= ${binary:Version}), libc6-dev (= ${binary:Version}) Recommends: gcc-multilib Description: GNU C Library: 32-bit development libraries for AMD64 Modified: glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-alt.preinst =================================================================== --- glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-alt.preinst 2009-07-20 10:06:47 UTC (rev 3639) +++ glibc-package/branches/eglibc-2.10/debian/debhelper.in/libc-alt.preinst 2009-07-20 10:14:49 UTC (rev 3640) @@ -1,5 +1,7 @@ #!/bin/sh +set -e + case $1 in (upgrade) if [ "$(readlink /lib32)" = "/emul/ia32-linux/lib" ]; then Modified: glibc-package/branches/eglibc-2.10/debian/local/etc/bindresvport.blacklist =================================================================== --- glibc-package/branches/eglibc-2.10/debian/local/etc/bindresvport.blacklist 2009-07-20 10:06:47 UTC (rev 3639) +++ glibc-package/branches/eglibc-2.10/debian/local/etc/bindresvport.blacklist 2009-07-20 10:14:49 UTC (rev 3640) @@ -7,6 +7,7 @@ 631 # cups 636 # ldaps 774 # rpasswd +873 # rsync 921 # lwresd 993 # imaps 995 # pops Modified: glibc-package/branches/eglibc-2.10/debian/local/etc_init.d/glibc.sh =================================================================== --- glibc-package/branches/eglibc-2.10/debian/local/etc_init.d/glibc.sh 2009-07-20 10:06:47 UTC (rev 3639) +++ glibc-package/branches/eglibc-2.10/debian/local/etc_init.d/glibc.sh 2009-07-20 10:14:49 UTC (rev 3640) @@ -14,6 +14,26 @@ set -e +do_start () { + # glibc kernel version check: KERNEL_VERSION_CHECK +} -: exit 0 +case "$1" in + start|"") + do_start + ;; + restart|reload|force-reload) + echo "Error: argument '$1' not supported" >&2 + exit 3 + ;; + stop) + # No-op + ;; + *) + echo "Usage: glibc.sh [start|stop]" >&2 + exit 3 + ;; +esac + +exit 0 Modified: glibc-package/branches/eglibc-2.10/debian/patches/any/local-bindresvport_blacklist.diff =================================================================== --- glibc-package/branches/eglibc-2.10/debian/patches/any/local-bindresvport_blacklist.diff 2009-07-20 10:06:47 UTC (rev 3639) +++ glibc-package/branches/eglibc-2.10/debian/patches/any/local-bindresvport_blacklist.diff 2009-07-20 10:14:49 UTC (rev 3640) @@ -6,7 +6,7 @@ --- a/sunrpc/bindrsvprt.c +++ b/sunrpc/bindrsvprt.c -@@ -30,28 +30,106 @@ +@@ -30,28 +30,108 @@ * Copyright (c) 1987 by Sun Microsystems, Inc. */ @@ -68,6 +68,8 @@ + cp[strlen (cp) - 1] = '\0'; + + port = strtoul (cp, &tmp, 0); ++ while (isspace(*tmp)) ++ ++tmp; + if (*tmp != '\0' || (port == ULONG_MAX && errno == ERANGE)) + continue; + Modified: glibc-package/branches/eglibc-2.10/debian/patches/kfreebsd/local-sysdeps.diff =================================================================== --- glibc-package/branches/eglibc-2.10/debian/patches/kfreebsd/local-sysdeps.diff 2009-07-20 10:06:47 UTC (rev 3639) +++ glibc-package/branches/eglibc-2.10/debian/patches/kfreebsd/local-sysdeps.diff 2009-07-20 10:14:49 UTC (rev 3640) @@ -81,7 +81,7 @@ + +ifeq ($(subdir),io) +# For <unistd.h>. -+sysdep_routines += sys_fchownat sys_fexecve sys_getcwd sys_linkat sys_lseek sys_freebsd6_lseek sys_readlinkat sys_symlinkat sys_unlinkat ++sysdep_routines += sys_access sys_faccessat sys_fchownat sys_fexecve sys_getcwd sys_linkat sys_lseek sys_freebsd6_lseek sys_readlinkat sys_symlinkat sys_unlinkat +# For <fcntl.h>. +sysdep_routines += sys_open sys_openat open_2 +# For <sys/stat.h>. @@ -105,7 +105,7 @@ +# For <sched.h>. +sysdep_routines += clone start_thread +# For <unistd.h>. -+sysdep_routines += sys_faccessat sys_ftruncate sys_freebsd6_ftruncate sys_truncate sys_freebsd6_truncate ++sysdep_routines += sys_ftruncate sys_freebsd6_ftruncate sys_truncate sys_freebsd6_truncate +# For <sys/acl.h>. +sysdep_routines += acl_aclcheck_fd acl_aclcheck_file acl_delete_fd acl_delete_file acl_get_fd acl_get_file acl_set_fd acl_set_file +# For <sys/extattr.h>. @@ -532,6 +532,77 @@ + +#endif /* __A_OUT_GNU_H__ */ --- /dev/null ++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/access.c +@@ -0,0 +1,68 @@ ++/* Copyright (C) 2009 Free Software Foundation, Inc. ++ This file is part of the GNU C Library. ++ ++ 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 <errno.h> ++#include <fcntl.h> ++#include <stddef.h> ++#include <stdio.h> ++#include <string.h> ++#include <unistd.h> ++#include <sys/types.h> ++#include <sys/sysctl.h> ++#include <sys/user.h> ++#include <sysdep.h> ++ ++/* ++ The FreeBSD kernel do not test file access correctly when the ++ process' real user ID is superuser. In particular, they always return ++ zero when testing execute permissions without regard to whether the ++ file is executable. ++ ++ While this behaviour conforms to POSIX.1-2008, it is explicitely ++ discouraged. This wrapper implements the recommended behaviour. ++ */ ++ ++extern int __syscall_access (const char *path, int mode); ++libc_hidden_proto (__syscall_access) ++ ++int ++__access (const char *path, int mode) ++{ ++ struct stat64 stats; ++ ++ if ((__getuid() != 0) || !(mode & X_OK)) ++ return __syscall_access (path, mode); ++ ++ /* Althought the super-user can read and write any file, ++ the file-system might be i.e. read-only. Do the check. */ ++ ++ if (__syscall_access (path, mode)) ++ return -1; ++ ++ if (stat64 (path, &stats)) ++ return -1; ++ ++ /* The super-user can execute any file that anyone can execute. */ ++ if (stats.st_mode & (S_IXUSR | S_IXGRP | S_IXOTH)) ++ return 0; ++ ++ __set_errno (EACCES); ++ return -1; ++} ++ ++weak_alias (__access, access) +--- /dev/null +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/alpha/Makefile @@ -0,0 +1,28 @@ +# Additional header files to be installed in $prefix/include: @@ -8134,7 +8205,7 @@ +#endif --- /dev/null +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/faccessat.c -@@ -0,0 +1,164 @@ +@@ -0,0 +1,163 @@ +/* Test for access to file, relative to open directory. Linux version. + Copyright (C) 2006 Free Software Foundation, Inc. + This file is part of the GNU C Library. @@ -8166,8 +8237,7 @@ +#include <kernel-features.h> +#include <sysdep.h> + -+extern int __syscall_faccessat (int fd, const char *path, mode_t mode, -+ int flag); ++extern int __syscall_faccessat (int fd, const char *path, int mode, int flag); +libc_hidden_proto (__syscall_faccessat) + +int @@ -9899,8 +9969,8 @@ +#define OFF_T off64_t +#include <getdirentries.c> --- /dev/null -+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/getdomainname.c -@@ -0,0 +1,51 @@ ++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/getdomain.c +@@ -0,0 +1,50 @@ +/* Copyright (C) 2009 Free Software Foundation, Inc. + This file is part of the GNU C Library. + @@ -9928,7 +9998,7 @@ + name and the terminator. */ + +int -+__getdomainname (char *name, size_t len) ++getdomainname (char *name, size_t len) +{ + /* Fetch the "kern.domainname" sysctl value. */ + int request[2] = { CTL_KERN, KERN_NISDOMAINNAME }; @@ -9950,8 +10020,7 @@ + name[result_len] = '\0'; + return 0; +} -+ -+weak_alias (__getdomainname getdomainname) ++libc_hidden_def (getdomainname) --- /dev/null +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/getfsstat.c @@ -0,0 +1,49 @@ @@ -19320,7 +19389,7 @@ +weak_alias (__libc_sendto, __sendto) +weak_alias (__libc_sendto, sendto) --- /dev/null -+++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/setdomainname.c ++++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/setdomain.c @@ -0,0 +1,37 @@ +/* Copyright (C) 2002 Free Software Foundation, Inc. + This file is part of the GNU C Library. @@ -22144,8 +22213,9 @@ +#endif --- /dev/null +++ b/ports/sysdeps/unix/bsd/bsd4.4/kfreebsd/syscalls.list -@@ -0,0 +1,182 @@ +@@ -0,0 +1,183 @@ +# File name Caller Syscall name # args Strong name Weak names ++sys_access - access i:si __syscall_access +acl_aclcheck_fd - acl_aclcheck_fd i:iip __acl_aclcheck_fd +acl_aclcheck_file - acl_aclcheck_file i:sip __acl_aclcheck_file +acl_delete_fd - acl_delete_fd i:ii __acl_delete_fd Modified: glibc-package/branches/eglibc-2.10/debian/po/cs.po =================================================================== --- glibc-package/branches/eglibc-2.10/debian/po/cs.po 2009-07-20 10:06:47 UTC (rev 3639) +++ glibc-package/branches/eglibc-2.10/debian/po/cs.po 2009-07-20 10:14:49 UTC (rev 3640) @@ -214,4 +214,4 @@ "aktualizaci knihovny GNU libc nebudete moci pomocí těchto programů " "autentizovat. To jinými slovy znamená, že se uživatelé nedostanou ke svým " "uzamčeným sezením. Abyste tomu předešli, měli byste před aktualizací zmíněné " -"programy zastavit, nebo je ve vhodný čas restartovat." \ No newline at end of file +"programy zastavit, nebo je ve vhodný čas restartovat." Modified: glibc-package/branches/eglibc-2.10/debian/rules.d/build.mk =================================================================== --- glibc-package/branches/eglibc-2.10/debian/rules.d/build.mk 2009-07-20 10:06:47 UTC (rev 3639) +++ glibc-package/branches/eglibc-2.10/debian/rules.d/build.mk 2009-07-20 10:14:49 UTC (rev 3640) @@ -136,9 +136,6 @@ $(MAKE) -C $(DEB_BUILDDIR) \ install_root=$(CURDIR)/debian/tmp-$(curpass) install - # Remove files already provided by linux-libc-dev - rm -f $(CURDIR)/debian/tmp-$(curpass)/usr/include/scsi/scsi.h - # Generate the list of SUPPORTED locales if [ $(curpass) = libc ]; then \ $(MAKE) -f debian/generate-supported.mk IN=localedata/SUPPORTED \ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
