Author: aurel32 Date: 2008-04-08 04:54:26 +0000 (Tue, 08 Apr 2008) New Revision: 2910
Added: glibc-package/trunk/debian/patches/any/cvs-ethertype.diff Removed: glibc-package/trunk/debian/patches/any/submitted-ethertype.diff Modified: glibc-package/trunk/debian/changelog Log: Remplace submitted-ethertype.diff by cvs-ethertype.diff Modified: glibc-package/trunk/debian/changelog =================================================================== --- glibc-package/trunk/debian/changelog 2008-04-06 16:28:53 UTC (rev 2909) +++ glibc-package/trunk/debian/changelog 2008-04-08 04:54:26 UTC (rev 2910) @@ -15,8 +15,8 @@ * patches/localedata/locale-shs_CA.diff: add SecwepemctsĂn from CVS. * debhelper.in/libc-prof.README.Debian: new file to explain how to use libc-prof. Closes: #442858. - * patches/any/submitted-ethertype.diff: new patch to define - ETHERTYPE_VLAN and ETHERTYPE_IPV6. Closes: #474171. + * patches/any/cvs-ethertype.diff: new patch to add new ETHERTYPE_* + definitions. Closes: #474171. [ Pierre Habouzit ] * Add any/cvs-strerror_r.diff to make strerror_r actually thread safe. Added: glibc-package/trunk/debian/patches/any/cvs-ethertype.diff =================================================================== --- glibc-package/trunk/debian/patches/any/cvs-ethertype.diff (rev 0) +++ glibc-package/trunk/debian/patches/any/cvs-ethertype.diff 2008-04-08 04:54:26 UTC (rev 2910) @@ -0,0 +1,33 @@ +2008-04-07 Ulrich Drepper <[EMAIL PROTECTED]> + + [BZ #6042] + * sysdeps/unix/sysv/linux/net/ethernet.h: Add a few more + ETHERTYPE_* definitions. + Patch partly by Aurelien Jarno <[EMAIL PROTECTED]>. + +--- a/sysdeps/unix/sysv/linux/net/ethernet.h ++++ b/sysdeps/unix/sysv/linux/net/ethernet.h +@@ -1,4 +1,4 @@ +-/* Copyright (C) 1997, 1999, 2001 Free Software Foundation, Inc. ++/* Copyright (C) 1997, 1999, 2001, 2008 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 +@@ -45,9 +45,17 @@ struct ether_header + + /* Ethernet protocol ID's */ + #define ETHERTYPE_PUP 0x0200 /* Xerox PUP */ ++#define ETHERTYPE_SPRITE 0x0500 /* Sprite */ + #define ETHERTYPE_IP 0x0800 /* IP */ + #define ETHERTYPE_ARP 0x0806 /* Address resolution */ + #define ETHERTYPE_REVARP 0x8035 /* Reverse ARP */ ++#define ETHERTYPE_AT 0x809B /* AppleTalk protocol */ ++#define ETHERTYPE_AARP 0x80F3 /* AppleTalk ARP */ ++#define ETHERTYPE_VLAN 0x8100 /* IEEE 802.1Q VLAN tagging */ ++#define ETHERTYPE_IPX 0x8137 /* IPX */ ++#define ETHERTYPE_IPV6 0x86dd /* IP protocol version 6 */ ++#define ETHERTYPE_LOOPBACK 0x9000 /* used to test interfaces */ ++ + + #define ETHER_ADDR_LEN ETH_ALEN /* size of ethernet addr */ + #define ETHER_TYPE_LEN 2 /* bytes in type field */ Deleted: glibc-package/trunk/debian/patches/any/submitted-ethertype.diff =================================================================== --- glibc-package/trunk/debian/patches/any/submitted-ethertype.diff 2008-04-06 16:28:53 UTC (rev 2909) +++ glibc-package/trunk/debian/patches/any/submitted-ethertype.diff 2008-04-08 04:54:26 UTC (rev 2910) @@ -1,18 +0,0 @@ -2008-04-06 Aurelien Jarno <[EMAIL PROTECTED]> - - * sysdeps/unix/sysv/linux/net/ethernet.h: Add defines for - ETHERTYPE_VLAN and ETHERTYPE_IPV6. - -diff --git a/sysdeps/unix/sysv/linux/net/ethernet.h b/sysdeps/unix/sysv/linux/net/ethernet.h -index 7ca8e83..ff9f506 100644 ---- a/sysdeps/unix/sysv/linux/net/ethernet.h -+++ b/sysdeps/unix/sysv/linux/net/ethernet.h -@@ -48,6 +48,8 @@ struct ether_header - #define ETHERTYPE_IP 0x0800 /* IP */ - #define ETHERTYPE_ARP 0x0806 /* Address resolution */ - #define ETHERTYPE_REVARP 0x8035 /* Reverse ARP */ -+#define ETHERTYPE_VLAN 0x8100 /* IEEE 802.1Q VLAN tagging */ -+#define ETHERTYPE_IPV6 0x86dd /* IP protocol version 6 */ - - #define ETHER_ADDR_LEN ETH_ALEN /* size of ethernet addr */ - #define ETHER_TYPE_LEN 2 /* bytes in type field */ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]