r1550 - in glibc-package/branches/glibc-2.4/debian: . patches patches/hurd-i386
Author: aurel32
Date: 2006-05-28 09:59:25 +0000 (Sun, 28 May 2006)
New Revision: 1550
Removed:
glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/cvs-getresuid-dyslexia.diff
glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/cvs-ioctl-pfinet.diff
Modified:
glibc-package/branches/glibc-2.4/debian/changelog
glibc-package/branches/glibc-2.4/debian/patches/series
Log:
* Remove hurd-i386/cvs-ioctl-pfinet.diff (merged upstream).
* Remove hurd-i386/cvs-getresuid-dyslexia.diff (merged upstream).
Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog 2006-05-28 09:47:23 UTC (rev 1549)
+++ glibc-package/branches/glibc-2.4/debian/changelog 2006-05-28 09:59:25 UTC (rev 1550)
@@ -60,6 +60,8 @@
* Remove any/local-kernel-features.diff (merged upstream).
* Remove hppa/cvs-linesep.diff (merged upstream).
* Update hppa/submitted-fenv-align.diff to reflect the new port add-on.
+ * Remove hurd-i386/cvs-ioctl-pfinet.diff (merged upstream).
+ * Remove hurd-i386/cvs-getresuid-dyslexia.diff (merged upstream).
* Remove hurd-i386/cvs-posix-opts.diff (merged upstream).
* Update hurd-i386/submitted-sysvshm.diff.
* Remove m32r/cvs-elf-m32r_rel32.diff (merged upstream).
Deleted: glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/cvs-getresuid-dyslexia.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/cvs-getresuid-dyslexia.diff 2006-05-28 09:47:23 UTC (rev 1549)
+++ glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/cvs-getresuid-dyslexia.diff 2006-05-28 09:59:25 UTC (rev 1550)
@@ -1,341 +0,0 @@
-# All lines beginning with `# DP:' are a description of the patch.
-# DP: Description: [rs]etres[gu]id have misordered arguments
-# DP: This patch has been grabbed from BZ2329 and backported to 2.3.6
-# DP: Related bugs: #352500 BZ2329
-# DP: Dpatch author: Denis Barbier <barbier@debian.org>
-# DP: Patch author: Thomas Schwinge
-# DP: Upstream status: BZ2329
-# DP: Date: 2006-02-16
-
-2006-02-15 Thomas Schwinge <tschwinge@gnu.org>
-
- * include/unistd.h (__getresuid, __getresgid, __setresuid)
- (__setresgid): Correct prototypes.
- * posix/unistd.h (getresuid, getresgid, setresuid, setresgid):
- Likewise.
- * posix/getresuid.c (__getresuid): Correct definition.
- * posix/getresgid.c (__getresgid): Likewise.
- * posix/setresuid.c (__setresuid): Likewise.
- * posix/setresgid.c (__setresgid): Likewise.
- * sysdeps/mach/hurd/getresuid.c (__getresuid): Likewise.
- * sysdeps/mach/hurd/getresgid.c (__getresgid): Likewise.
- * sysdeps/mach/hurd/setresuid.c (__setresuid): Likewise.
- * sysdeps/mach/hurd/setresgid.c (__setresgid): Likewise.
-
- Reported by Samuel Thibault <samuel.thibault@ens-lyon.org>.
-
-Index: include/unistd.h
-===================================================================
-RCS file: /cvs/glibc/libc/include/unistd.h,v
-retrieving revision 1.45
-diff -u -r1.45 unistd.h
---- include/unistd.h 30 Jun 2004 07:35:39 -0000 1.45
-+++ include/unistd.h 15 Feb 2006 16:21:40 -0000
-@@ -96,10 +96,10 @@
- extern int __setpgid (__pid_t __pid, __pid_t __pgid);
- libc_hidden_proto (__setpgid)
- extern int __setregid (__gid_t __rgid, __gid_t __egid);
--extern int __getresuid (__uid_t *__euid, __uid_t *__ruid, __uid_t *__suid);
--extern int __getresgid (__gid_t *__egid, __gid_t *__rgid, __gid_t *__sgid);
--extern int __setresuid (__uid_t __euid, __uid_t __ruid, __uid_t __suid);
--extern int __setresgid (__gid_t __egid, __gid_t __rgid, __gid_t __sgid);
-+extern int __getresuid (__uid_t *__ruid, __uid_t *__euid, __uid_t *__suid);
-+extern int __getresgid (__gid_t *__rgid, __gid_t *__egid, __gid_t *__sgid);
-+extern int __setresuid (__uid_t __ruid, __uid_t __euid, __uid_t __suid);
-+extern int __setresgid (__gid_t __rgid, __gid_t __egid, __gid_t __sgid);
- libc_hidden_proto (__getresuid)
- libc_hidden_proto (__getresgid)
- libc_hidden_proto (__setresuid)
-Index: posix/unistd.h
---- posix/unistd.h 6 Jan 2006 12:14:05 -0000
-+++ posix/unistd.h 15 Feb 2006 16:21:41 -0000
-@@ -693,21 +693,21 @@
- #endif /* Use BSD. */
-
- #ifdef __USE_GNU
--/* Fetch the effective user ID, real user ID, and saved-set user ID,
-+/* Fetch the real user ID, effective user ID, and saved-set user ID,
- of the calling process. */
--extern int getresuid (__uid_t *__euid, __uid_t *__ruid, __uid_t *__suid);
-+extern int getresuid (__uid_t *__ruid, __uid_t *__euid, __uid_t *__suid);
-
--/* Fetch the effective group ID, real group ID, and saved-set group ID,
-+/* Fetch the real group ID, effective group ID, and saved-set group ID,
- of the calling process. */
--extern int getresgid (__gid_t *__egid, __gid_t *__rgid, __gid_t *__sgid);
-+extern int getresgid (__gid_t *__rgid, __gid_t *__egid, __gid_t *__sgid);
-
--/* Set the effective user ID, real user ID, and saved-set user ID,
-- of the calling process to EUID, RUID, and SUID, respectively. */
--extern int setresuid (__uid_t __euid, __uid_t __ruid, __uid_t __suid);
-+/* Set the real user ID, effective user ID, and saved-set user ID,
-+ of the calling process to RUID, EUID, and SUID, respectively. */
-+extern int setresuid (__uid_t __ruid, __uid_t __euid, __uid_t __suid);
-
--/* Set the effective group ID, real group ID, and saved-set group ID,
-- of the calling process to EGID, RGID, and SGID, respectively. */
--extern int setresgid (__gid_t __egid, __gid_t __rgid, __gid_t __sgid);
-+/* Set the real group ID, effective group ID, and saved-set group ID,
-+ of the calling process to RGID, EGID, and SGID, respectively. */
-+extern int setresgid (__gid_t __rgid, __gid_t __egid, __gid_t __sgid);
- #endif
-
-
-Index: sysdeps/generic/getresuid.c
---- sysdeps/generic/getresgid.c 14 Dec 2005 09:14:13 -0000
-+++ sysdeps/generic/getresgid.c 15 Feb 2006 16:21:41 -0000
-@@ -1,4 +1,5 @@
--/* Copyright (C) 1991,1995,1996,1997,1998,2002 Free Software Foundation, Inc.
-+/* Copyright (C) 1991,1995,1996,1997,1998,2002,2006
-+ 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
-@@ -19,10 +20,10 @@
- #include <errno.h>
- #include <unistd.h>
-
--/* Fetch the effective group ID, real group ID, and saved-set group ID,
-+/* Fetch the real group ID, effective group ID, and saved-set group ID,
- of the calling process. */
- int
--__getresgid (gid_t *egid, gid_t *rgid, gid_t *sgid)
-+__getresgid (gid_t *rgid, gid_t *egid, gid_t *sgid)
- {
- __set_errno (ENOSYS);
- return -1;
-Index: sysdeps/generic/getresuid.c
---- sysdeps/generic/getresuid.c 14 Dec 2005 09:14:28 -0000
-+++ sysdeps/generic/getresuid.c 15 Feb 2006 16:21:41 -0000
-@@ -1,4 +1,5 @@
--/* Copyright (C) 1991,1995,1996,1997,1998,2002 Free Software Foundation, Inc.
-+/* Copyright (C) 1991,1995,1996,1997,1998,2002,2006
-+ 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
-@@ -19,10 +20,10 @@
- #include <errno.h>
- #include <unistd.h>
-
--/* Fetch the effective user ID, real user ID, and saved-set user ID,
-+/* Fetch the real user ID, effective user ID, and saved-set user ID,
- of the calling process. */
- int
--__getresuid (uid_t *euid, uid_t *ruid, uid_t *suid)
-+__getresuid (uid_t *ruid, uid_t *euid, uid_t *suid)
- {
- __set_errno (ENOSYS);
- return -1;
-Index: sysdeps/generic/setresgid.c
---- sysdeps/generic/setresgid.c 14 Dec 2005 10:48:25 -0000
-+++ sysdeps/generic/setresgid.c 15 Feb 2006 16:21:41 -0000
-@@ -1,5 +1,5 @@
--/* setresgid -- set effective group ID, real group ID, and saved-set group ID
-- Copyright (C) 2002 Free Software Foundation, Inc.
-+/* setresgid -- set real group ID, effective group ID, and saved-set group ID
-+ Copyright (C) 2002, 2006 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
-@@ -20,10 +20,10 @@
- #include <errno.h>
- #include <unistd.h>
-
--/* Set the effective group ID, real group ID, and saved-set group ID,
-- of the calling process to EGID, RGID, and SGID, respectively. */
-+/* Set the real group ID, effective group ID, and saved-set group ID,
-+ of the calling process to RGID, EGID, and SGID, respectively. */
- int
--__setresgid (gid_t egid, gid_t rgid, gid_t sgid)
-+__setresgid (gid_t rgid, gid_t egid, gid_t sgid)
- {
- __set_errno (ENOSYS);
- return -1;
-Index: sysdeps/generic/setresuid.c
---- sysdeps/generic/setresuid.c 14 Dec 2005 10:48:41 -0000
-+++ sysdeps/generic/setresuid.c 15 Feb 2006 16:21:41 -0000
-@@ -1,5 +1,5 @@
--/* setresuid -- set effective user ID, real user ID, and saved-set user ID
-- Copyright (C) 2002 Free Software Foundation, Inc.
-+/* setresuid -- set real user ID, effective user ID, and saved-set user ID
-+ Copyright (C) 2002, 2006 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
-@@ -20,10 +20,10 @@
- #include <errno.h>
- #include <unistd.h>
-
--/* Set the effective user ID, real user ID, and saved-set user ID,
-- of the calling process to EUID, RUID, and SUID, respectively. */
-+/* Set the real user ID, effective user ID, and saved-set user ID,
-+ of the calling process to RUID, EUID, and SUID, respectively. */
- int
--__setresuid (uid_t euid, uid_t ruid, uid_t suid)
-+__setresuid (uid_t ruid, uid_t euid, uid_t suid)
- {
- __set_errno (ENOSYS);
- return -1;
-Index: sysdeps/mach/hurd/getresgid.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/getresgid.c,v
-retrieving revision 1.1
-diff -u -r1.1 getresgid.c
---- sysdeps/mach/hurd/getresgid.c 14 Oct 2002 01:03:11 -0000 1.1
-+++ sysdeps/mach/hurd/getresgid.c 15 Feb 2006 16:21:41 -0000
-@@ -1,5 +1,5 @@
--/* getresgid -- fetch effective group ID, real group ID, and saved-set group ID
-- Copyright (C) 2002 Free Software Foundation, Inc.
-+/* getresgid -- fetch real group ID, effective group ID, and saved-set group ID
-+ Copyright (C) 2002, 2006 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
-@@ -22,13 +22,13 @@
- #include <hurd.h>
- #include <hurd/id.h>
-
--/* Fetch the effective group ID, real group ID, and saved-set group ID,
-+/* Fetch the real group ID, effective group ID, and saved-set group ID,
- of the calling process. */
- int
--__getresgid (gid_t *egid, gid_t *rgid, gid_t *sgid)
-+__getresgid (gid_t *rgid, gid_t *egid, gid_t *sgid)
- {
- error_t err;
-- gid_t eff, real, saved;
-+ gid_t real, eff, saved;
-
- HURD_CRITICAL_BEGIN;
- __mutex_lock (&_hurd_id.lock);
-@@ -42,8 +42,8 @@
- else
- {
- real = _hurd_id.aux.gids[0];
-- saved = _hurd_id.aux.ngids < 2 ? real :_hurd_id.aux.gids[1];
- eff = _hurd_id.gen.ngids < 1 ? real : _hurd_id.gen.gids[0];
-+ saved = _hurd_id.aux.ngids < 2 ? real : _hurd_id.aux.gids[1];
- }
- }
-
-@@ -53,8 +53,8 @@
- if (err)
- return __hurd_fail (err);
-
-- *egid = eff;
- *rgid = real;
-+ *egid = eff;
- *sgid = saved;
- return 0;
- }
-Index: sysdeps/mach/hurd/getresuid.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/getresuid.c,v
-retrieving revision 1.1
-diff -u -r1.1 getresuid.c
---- sysdeps/mach/hurd/getresuid.c 14 Oct 2002 01:03:11 -0000 1.1
-+++ sysdeps/mach/hurd/getresuid.c 15 Feb 2006 16:21:41 -0000
-@@ -1,5 +1,5 @@
--/* getresuid -- fetch effective user ID, real user ID, and saved-set user ID
-- Copyright (C) 2002 Free Software Foundation, Inc.
-+/* getresuid -- fetch real user ID, effective user ID, and saved-set user ID
-+ Copyright (C) 2002, 2006 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
-@@ -22,13 +22,13 @@
- #include <hurd.h>
- #include <hurd/id.h>
-
--/* Fetch the effective user ID, real user ID, and saved-set user ID,
-+/* Fetch the real user ID, effective user ID, and saved-set user ID,
- of the calling process. */
- int
--__getresuid (uid_t *euid, uid_t *ruid, uid_t *suid)
-+__getresuid (uid_t *ruid, uid_t *euid, uid_t *suid)
- {
- error_t err;
-- uid_t eff, real, saved;
-+ uid_t real, eff, saved;
-
- HURD_CRITICAL_BEGIN;
- __mutex_lock (&_hurd_id.lock);
-@@ -42,8 +42,8 @@
- else
- {
- real = _hurd_id.aux.uids[0];
-- saved = _hurd_id.aux.nuids < 2 ? real :_hurd_id.aux.uids[1];
- eff = _hurd_id.gen.nuids < 1 ? real : _hurd_id.gen.uids[0];
-+ saved = _hurd_id.aux.nuids < 2 ? real : _hurd_id.aux.uids[1];
- }
- }
-
-@@ -53,8 +53,8 @@
- if (err)
- return __hurd_fail (err);
-
-- *euid = eff;
- *ruid = real;
-+ *euid = eff;
- *suid = saved;
- return 0;
- }
-Index: sysdeps/mach/hurd/setresgid.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/setresgid.c,v
-retrieving revision 1.2
-diff -u -r1.2 setresgid.c
---- sysdeps/mach/hurd/setresgid.c 15 Feb 2005 03:08:38 -0000 1.2
-+++ sysdeps/mach/hurd/setresgid.c 15 Feb 2006 16:21:41 -0000
-@@ -1,5 +1,5 @@
--/* setresgid -- set effective group ID, real group ID, and saved-set group ID
-- Copyright (C) 2002, 2005 Free Software Foundation, Inc.
-+/* setresgid -- set real group ID, effective group ID, and saved-set group ID
-+ Copyright (C) 2002, 2005, 2006 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
-@@ -22,10 +22,10 @@
- #include <hurd.h>
- #include <hurd/id.h>
-
--/* Set the effective group ID, real group ID, and saved-set group ID,
-- of the calling process to EGID, RGID, and SGID, respectively. */
-+/* Set the real group ID, effective group ID, and saved-set group ID,
-+ of the calling process to RGID, EGID, and SGID, respectively. */
- int
--__setresgid (gid_t egid, gid_t rgid, gid_t sgid)
-+__setresgid (gid_t rgid, gid_t egid, gid_t sgid)
- {
- auth_t newauth;
- error_t err;
-Index: sysdeps/mach/hurd/setresuid.c
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/setresuid.c,v
-retrieving revision 1.2
-diff -u -r1.2 setresuid.c
---- sysdeps/mach/hurd/setresuid.c 15 Feb 2005 03:08:38 -0000 1.2
-+++ sysdeps/mach/hurd/setresuid.c 15 Feb 2006 16:21:41 -0000
-@@ -1,5 +1,5 @@
--/* setresuid -- set effective user ID, real user ID, and saved-set user ID
-- Copyright (C) 2002, 2005 Free Software Foundation, Inc.
-+/* setresuid -- set real user ID, effective user ID, and saved-set user ID
-+ Copyright (C) 2002, 2005, 2006 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
-@@ -22,10 +22,10 @@
- #include <hurd.h>
- #include <hurd/id.h>
-
--/* Set the effective user ID, real user ID, and saved-set user ID,
-- of the calling process to EUID, RUID, and SUID, respectively. */
-+/* Set the real user ID, effective user ID, and saved-set user ID,
-+ of the calling process to RUID, EUID, and SUID, respectively. */
- int
--__setresuid (uid_t euid, uid_t ruid, uid_t suid)
-+__setresuid (uid_t ruid, uid_t euid, uid_t suid)
- {
- auth_t newauth;
- error_t err;
Deleted: glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/cvs-ioctl-pfinet.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/cvs-ioctl-pfinet.diff 2006-05-28 09:47:23 UTC (rev 1549)
+++ glibc-package/branches/glibc-2.4/debian/patches/hurd-i386/cvs-ioctl-pfinet.diff 2006-05-28 09:59:25 UTC (rev 1550)
@@ -1,27 +0,0 @@
-# DP: Description: Add SIOCGIFHWADDR ioctls for hurd-i386.
-# DP: Related bugs: #295117
-# DP: Dpatch author: GOTO Masanori <gotom@debian.org>
-# DP: Patch author: Marco Gerards <metgerards@student.han.nl>
-# DP: Upstream status: Pending
-# DP: Status Details: Currently not applied in cvs, but it's needed.
-# DP: Date: 2005-07-17
-
-2004-08-03 Marco Gerards <metgerards@student.han.nl>
-
- * sysdeps/mach/hurd/bits/ioctls.h (SIOCGIFHWADDR): New macro.
-
-Index: sysdeps/mach/hurd/bits/ioctls.h
-===================================================================
-RCS file: /cvs/glibc/libc/sysdeps/mach/hurd/bits/ioctls.h,v
-retrieving revision 1.7
-diff -u -p -u -p -r1.7 ioctls.h
---- sysdeps/mach/hurd/bits/ioctls.h 6 Jul 2001 04:55:58 -0000 1.7
-+++ sysdeps/mach/hurd/bits/ioctls.h 3 Aug 2004 13:55:34 -0000
-@@ -226,6 +226,7 @@ enum __ioctl_datum { IOC_8, IOC_16, IOC_
- #define SIOCSIFADDR _IOW('i', 12, struct ifreq) /* set ifnet address */
- #define OSIOCGIFADDR _IOWR('i',13, struct ifreq) /* get ifnet address */
- #define SIOCGIFADDR _IOWR('i',33, struct ifreq) /* get ifnet address */
-+#define SIOCGIFHWADDR _IOWR('i',39, struct ifreq) /* get hwaddress */
- #define SIOCSIFDSTADDR _IOW('i', 14, struct ifreq) /* set p-p address */
- #define OSIOCGIFDSTADDR _IOWR('i',15, struct ifreq) /* get p-p address */
- #define SIOCGIFDSTADDR _IOWR('i',34, struct ifreq) /* get p-p address */
Modified: glibc-package/branches/glibc-2.4/debian/patches/series
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-28 09:47:23 UTC (rev 1549)
+++ glibc-package/branches/glibc-2.4/debian/patches/series 2006-05-28 09:59:25 UTC (rev 1550)
@@ -67,8 +67,6 @@
#hppa/cvs-no-ldbl-128.diff -p1
#hppa/local-inlining.diff -p1
-#hurd-i386/cvs-getresuid-dyslexia.diff -p0
-#hurd-i386/cvs-ioctl-pfinet.diff -p0
hurd-i386/cvs-machrules-make.diff -p1
hurd-i386/local-enable-ldconfig.diff -p1
hurd-i386/local-mlock.diff -p1
@@ -102,7 +100,6 @@
all/local-pt_BR.diff -p1
all/submitted-new-brf-encoding.diff -p0
-#any/cvs-argp_h.diff -p1
#any/cvs-ctan.diff -p0
any/cvs-getcwd_c.diff -p1
#any/cvs-resource_h.diff -p1
Reply to: