Author: aurel32 Date: 2008-04-02 13:12:16 +0000 (Wed, 02 Apr 2008) New Revision: 2902
Added: glibc-package/trunk/debian/patches/mips/cvs-mipsn32.diff Removed: glibc-package/trunk/debian/patches/mips/submitted-mipsn32.diff Modified: glibc-package/trunk/debian/changelog glibc-package/trunk/debian/patches/series Log: * Replace patches/mips/submitted-mipsn32.diff by the version merged upstream. Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2008-04-02 09:15:58 UTC (rev 2901) +++ glibc-package/trunk/debian/changelog 2008-04-02 13:12:16 UTC (rev 2902) @@ -7,12 +7,14 @@ register accesses. * local/manpages/ld.so.8: fix libraries search order. Closes: #473458. * Update Finish debconf translation, by Esko Arajärvi. Closes: #473802. + * Replace patches/mips/submitted-mipsn32.diff by the version merged + upstream. [ Pierre Habouzit ] * Add any/cvs-strerror_r.diff to make strerror_r actually thread safe. Closes: #456531. - -- Aurelien Jarno <[EMAIL PROTECTED]> Wed, 02 Apr 2008 11:14:32 +0200 + -- Aurelien Jarno <[EMAIL PROTECTED]> Wed, 02 Apr 2008 15:11:06 +0200 glibc (2.7-10) unstable; urgency=low Added: glibc-package/trunk/debian/patches/mips/cvs-mipsn32.diff =================================================================== --- glibc-package/trunk/debian/patches/mips/cvs-mipsn32.diff (rev 0) +++ glibc-package/trunk/debian/patches/mips/cvs-mipsn32.diff 2008-04-02 13:12:16 UTC (rev 2902) @@ -0,0 +1,97 @@ +2008-04-02 Aurelien Jarno <[EMAIL PROTECTED]> + + * sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list: Add + truncate and ftruncate systems calls. + * sysdeps/unix/sysv/linux/mips/mips64/n32/ftruncate64.c: Make an + empty file. + * sysdeps/unix/sysv/linux/mips/mips64/n32/truncate64.c: Ditto. + +Index: ports/sysdeps/unix/sysv/linux/mips/mips64/n32/ftruncate64.c +=================================================================== +RCS file: /cvs/glibc/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/ftruncate64.c,v +retrieving revision 1.1 +diff -u -d -p -r1.1 ftruncate64.c +--- ports/sysdeps/unix/sysv/linux/mips/mips64/n32/ftruncate64.c 5 Apr 2003 19:57:35 -0000 1.1 ++++ ports/sysdeps/unix/sysv/linux/mips/mips64/n32/ftruncate64.c 2 Apr 2008 08:54:11 -0000 +@@ -1,28 +1 @@ +-/* Copyright (C) 2003 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 <sys/types.h> +- +-#include <sysdep.h> +- +-extern int ftruncate (int fd, off64_t length); +- +-int __ftruncate64 (int fd, off64_t length) { +- return ftruncate (fd, length); +-} +-weak_alias (__ftruncate64, ftruncate64) ++/* Empty. */ +Index: ports/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list +=================================================================== +RCS file: /cvs/glibc/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list,v +retrieving revision 1.1 +diff -u -d -p -r1.1 syscalls.list +--- ports/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list 23 May 2007 17:26:13 -0000 1.1 ++++ ports/sysdeps/unix/sysv/linux/mips/mips64/n32/syscalls.list 2 Apr 2008 08:54:11 -0000 +@@ -3,3 +3,5 @@ + readahead - readahead i:iii __readahead readahead + sync_file_range - sync_file_range i:iiii sync_file_range + posix_fadvise - fadvise64 i:iiii posix_fadvise ++ftruncate - ftruncate i:ii __ftruncate ftruncate ftruncate64 __ftruncate64 ++truncate - truncate i:si truncate truncate64 +Index: ports/sysdeps/unix/sysv/linux/mips/mips64/n32/truncate64.c +=================================================================== +RCS file: /cvs/glibc/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/truncate64.c,v +retrieving revision 1.1 +diff -u -d -p -r1.1 truncate64.c +--- ports/sysdeps/unix/sysv/linux/mips/mips64/n32/truncate64.c 5 Apr 2003 19:57:35 -0000 1.1 ++++ ports/sysdeps/unix/sysv/linux/mips/mips64/n32/truncate64.c 2 Apr 2008 08:54:11 -0000 +@@ -1,30 +1 @@ +-/* Copyright (C) 2003 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 <sys/types.h> +- +-#include <sysdep.h> +-#include <bp-checks.h> +- +-extern int truncate (const char *__unbounded path, int dummy, +- off64_t length); +- +-int truncate64 (const char *__unbounded path, int dummy, +- off64_t length) { +- return truncate (path, dummy, length); +-} ++/* Empty. */ Deleted: glibc-package/trunk/debian/patches/mips/submitted-mipsn32.diff =================================================================== --- glibc-package/trunk/debian/patches/mips/submitted-mipsn32.diff 2008-04-02 09:15:58 UTC (rev 2901) +++ glibc-package/trunk/debian/patches/mips/submitted-mipsn32.diff 2008-04-02 13:12:16 UTC (rev 2902) @@ -1,48 +0,0 @@ -2008-03-15 Aurelien Jarno <[EMAIL PROTECTED]> - - * sysdeps/unix/sysv/linux/mips/mips64/n32/ftruncate64.c: Drop ftruncate - declaration. - -2008-01-24 Aurelien Jarno <[EMAIL PROTECTED]> - - * sysdeps/unix/sysv/linux/mips/mips64/n32/truncate64.c: Drop truncate - declaration. - (truncate64): Fix arguments and call to truncate. - -Index: ftruncate64.c -=================================================================== -RCS file: /cvs/glibc/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/ftruncate64.c,v -retrieving revision 1.1 -diff -u -d -p -r1.1 ftruncate64.c ---- ports/sysdeps/unix/sysv/linux/mips/mips64/n32/ftruncate64.c 5 Apr 2003 19:57:35 -0000 1.1 -+++ ports/sysdeps/unix/sysv/linux/mips/mips64/n32/ftruncate64.c 15 Mar 2008 13:43:41 -0000 -@@ -20,8 +20,6 @@ - - #include <sysdep.h> - --extern int ftruncate (int fd, off64_t length); -- - int __ftruncate64 (int fd, off64_t length) { - return ftruncate (fd, length); - } -Index: truncate64.c -=================================================================== -RCS file: /cvs/glibc/ports/sysdeps/unix/sysv/linux/mips/mips64/n32/truncate64.c,v -retrieving revision 1.1 -diff -u -d -p -r1.1 truncate64.c ---- ports/sysdeps/unix/sysv/linux/mips/mips64/n32/truncate64.c 5 Apr 2003 19:57:35 -0000 1.1 -+++ ports/sysdeps/unix/sysv/linux/mips/mips64/n32/truncate64.c 15 Mar 2008 13:43:41 -0000 -@@ -21,10 +21,7 @@ - #include <sysdep.h> - #include <bp-checks.h> - --extern int truncate (const char *__unbounded path, int dummy, -- off64_t length); -- --int truncate64 (const char *__unbounded path, int dummy, -- off64_t length) { -- return truncate (path, dummy, length); -+int __truncate64 (const char *file, off64_t length) { -+ return truncate (file, length); - } -+weak_alias (__truncate64, truncate64) Modified: glibc-package/trunk/debian/patches/series =================================================================== --- glibc-package/trunk/debian/patches/series 2008-04-02 09:15:58 UTC (rev 2901) +++ glibc-package/trunk/debian/patches/series 2008-04-02 13:12:16 UTC (rev 2902) @@ -112,10 +112,10 @@ mips/cvs-memory-barriers.diff -p0 mips/cvs-fcsr.diff -p0 +mips/cvs-mipsn32.diff -p0 mips/local-lazy-eval.diff -p0 mips/local-r10k.diff -p0 mips/local-setjmp.diff -p0 -mips/submitted-mipsn32.diff -p0 powerpc/local-sysconf.diff -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]