Author: aurel32
Date: 2010-01-06 17:18:55 +0000 (Wed, 06 Jan 2010)
New Revision: 4061

Removed:
   glibc-package/trunk/debian/patches/hurd-i386/submitted-if_ether.diff
Modified:
   glibc-package/trunk/debian/changelog
   glibc-package/trunk/debian/patches/series
Log:
Revert r4060


Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog        2010-01-06 09:47:07 UTC (rev 
4060)
+++ glibc-package/trunk/debian/changelog        2010-01-06 17:18:55 UTC (rev 
4061)
@@ -20,13 +20,11 @@
     answer buffers in resolver.
   * Add debian/patches/any/cvs-resolv-v6mapped.diff to fix lookup failure
     with IPv6 mapping enabled and big answers.  Closes: #558984.
-  * Add debian/patches/hurd-i386/submitted-if_ether.diff to fix double
-    definition of struct ether_addr on Hurd.  Closes: #545888.
 
   [ Petr Salinger]
   * kfreebsd/local-sysdeps.diff: update to revision 2907 (from glibc-bsd).
 
- -- Aurelien Jarno <aure...@debian.org>  Wed, 06 Jan 2010 10:46:54 +0100
+ -- Aurelien Jarno <aure...@debian.org>  Wed, 06 Jan 2010 09:38:43 +0100
 
 eglibc (2.10.2-3) unstable; urgency=low
 

Deleted: glibc-package/trunk/debian/patches/hurd-i386/submitted-if_ether.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-if_ether.diff        
2010-01-06 09:47:07 UTC (rev 4060)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-if_ether.diff        
2010-01-06 17:18:55 UTC (rev 4061)
@@ -1,187 +0,0 @@
-2010-01-06  Aurelien Jarno  <aurel...@aurel32.net>
-
-       * sysdeps/mach/hurd/net/if_ether.h: Moved to ...
-       * sysdeps/mach/hurd/netinet/if_ether.h: ... here.
-
-diff --git a/sysdeps/mach/hurd/net/if_ether.h 
b/sysdeps/mach/hurd/net/if_ether.h
-deleted file mode 100644
-index 36300cb..0000000
---- a/sysdeps/mach/hurd/net/if_ether.h
-+++ /dev/null
-@@ -1,85 +0,0 @@
--/* Copyright (C) 1997 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.  */
--
--#ifndef _NET_IF_ETHER_H
--#define _NET_IF_ETHER_H       1
--
--/*
-- *    IEEE 802.3 Ethernet magic constants.  The frame sizes omit the preamble
-- *    and FCS/CRC (frame check sequence).
-- */
--
--#define ETH_ALEN      6               /* Octets in one ethernet addr   */
--#define ETH_HLEN      14              /* Total octets in header.       */
--#define ETH_ZLEN      60              /* Min. octets in frame sans FCS */
--#define ETH_DATA_LEN  1500            /* Max. octets in payload        */
--#define ETH_FRAME_LEN 1514            /* Max. octets in frame sans FCS */
--
--/*
-- *    These are the defined Ethernet Protocol ID's.
-- */
--
--#define ETH_P_LOOP    0x0060          /* Ethernet Loopback packet     */
--#define ETH_P_ECHO    0x0200          /* Ethernet Echo packet         */
--#define ETH_P_PUP     0x0400          /* Xerox PUP packet             */
--#define ETH_P_IP      0x0800          /* Internet Protocol packet     */
--#define ETH_P_X25     0x0805          /* CCITT X.25                   */
--#define ETH_P_ARP     0x0806          /* Address Resolution packet    */
--#define       ETH_P_BPQ       0x08FF          /* G8BPQ AX.25 Ethernet Packet  
[ NOT AN OFFICIALLY REGISTERED ID ] */
--#define ETH_P_DEC       0x6000          /* DEC Assigned proto           */
--#define ETH_P_DNA_DL    0x6001          /* DEC DNA Dump/Load            */
--#define ETH_P_DNA_RC    0x6002          /* DEC DNA Remote Console       */
--#define ETH_P_DNA_RT    0x6003          /* DEC DNA Routing              */
--#define ETH_P_LAT       0x6004          /* DEC LAT                      */
--#define ETH_P_DIAG      0x6005          /* DEC Diagnostics              */
--#define ETH_P_CUST      0x6006          /* DEC Customer use             */
--#define ETH_P_SCA       0x6007          /* DEC Systems Comms Arch       */
--#define ETH_P_RARP      0x8035                /* Reverse Addr Res packet      
*/
--#define ETH_P_ATALK   0x809B          /* Appletalk DDP                */
--#define ETH_P_AARP    0x80F3          /* Appletalk AARP               */
--#define ETH_P_IPX     0x8137          /* IPX over DIX                 */
--#define ETH_P_IPV6    0x86DD          /* IPv6 over bluebook           */
--
--/*
-- *    Non DIX types. Won't clash for 1500 types.
-- */
--
--#define ETH_P_802_3   0x0001          /* Dummy type for 802.3 frames  */
--#define ETH_P_AX25    0x0002          /* Dummy protocol id for AX.25  */
--#define ETH_P_ALL     0x0003          /* Every packet (be careful!!!) */
--#define ETH_P_802_2   0x0004          /* 802.2 frames                 */
--#define ETH_P_SNAP    0x0005          /* Internal only                */
--#define ETH_P_DDCMP     0x0006          /* DEC DDCMP: Internal only     */
--#define ETH_P_WAN_PPP   0x0007          /* Dummy type for WAN PPP frames*/
--#define ETH_P_PPP_MP    0x0008          /* Dummy type for PPP MP frames */
--#define ETH_P_LOCALTALK 0x0009                /* Localtalk pseudo type        
*/
--#define ETH_P_PPPTALK 0x0010          /* Dummy type for Atalk over PPP*/
--#define ETH_P_TR_802_2        0x0011          /* 802.2 frames                 
*/
--
--/*
-- *    This is an Ethernet frame header.
-- */
--
--struct ethhdr
--{
--  unsigned char       h_dest[ETH_ALEN];       /* destination eth addr */
--  unsigned char       h_source[ETH_ALEN];     /* source ether addr    */
--  unsigned short int h_proto;         /* packet type ID field */
--};
--
--#endif        /* net/if_ether.h */
-diff --git a/sysdeps/mach/hurd/netinet/if_ether.h 
b/sysdeps/mach/hurd/netinet/if_ether.h
-new file mode 100644
-index 0000000..36300cb
---- /dev/null
-+++ b/sysdeps/mach/hurd/netinet/if_ether.h
-@@ -0,0 +1,85 @@
-+/* Copyright (C) 1997 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.  */
-+
-+#ifndef _NET_IF_ETHER_H
-+#define _NET_IF_ETHER_H       1
-+
-+/*
-+ *    IEEE 802.3 Ethernet magic constants.  The frame sizes omit the preamble
-+ *    and FCS/CRC (frame check sequence).
-+ */
-+
-+#define ETH_ALEN      6               /* Octets in one ethernet addr   */
-+#define ETH_HLEN      14              /* Total octets in header.       */
-+#define ETH_ZLEN      60              /* Min. octets in frame sans FCS */
-+#define ETH_DATA_LEN  1500            /* Max. octets in payload        */
-+#define ETH_FRAME_LEN 1514            /* Max. octets in frame sans FCS */
-+
-+/*
-+ *    These are the defined Ethernet Protocol ID's.
-+ */
-+
-+#define ETH_P_LOOP    0x0060          /* Ethernet Loopback packet     */
-+#define ETH_P_ECHO    0x0200          /* Ethernet Echo packet         */
-+#define ETH_P_PUP     0x0400          /* Xerox PUP packet             */
-+#define ETH_P_IP      0x0800          /* Internet Protocol packet     */
-+#define ETH_P_X25     0x0805          /* CCITT X.25                   */
-+#define ETH_P_ARP     0x0806          /* Address Resolution packet    */
-+#define       ETH_P_BPQ       0x08FF          /* G8BPQ AX.25 Ethernet Packet  
[ NOT AN OFFICIALLY REGISTERED ID ] */
-+#define ETH_P_DEC       0x6000          /* DEC Assigned proto           */
-+#define ETH_P_DNA_DL    0x6001          /* DEC DNA Dump/Load            */
-+#define ETH_P_DNA_RC    0x6002          /* DEC DNA Remote Console       */
-+#define ETH_P_DNA_RT    0x6003          /* DEC DNA Routing              */
-+#define ETH_P_LAT       0x6004          /* DEC LAT                      */
-+#define ETH_P_DIAG      0x6005          /* DEC Diagnostics              */
-+#define ETH_P_CUST      0x6006          /* DEC Customer use             */
-+#define ETH_P_SCA       0x6007          /* DEC Systems Comms Arch       */
-+#define ETH_P_RARP      0x8035                /* Reverse Addr Res packet      
*/
-+#define ETH_P_ATALK   0x809B          /* Appletalk DDP                */
-+#define ETH_P_AARP    0x80F3          /* Appletalk AARP               */
-+#define ETH_P_IPX     0x8137          /* IPX over DIX                 */
-+#define ETH_P_IPV6    0x86DD          /* IPv6 over bluebook           */
-+
-+/*
-+ *    Non DIX types. Won't clash for 1500 types.
-+ */
-+
-+#define ETH_P_802_3   0x0001          /* Dummy type for 802.3 frames  */
-+#define ETH_P_AX25    0x0002          /* Dummy protocol id for AX.25  */
-+#define ETH_P_ALL     0x0003          /* Every packet (be careful!!!) */
-+#define ETH_P_802_2   0x0004          /* 802.2 frames                 */
-+#define ETH_P_SNAP    0x0005          /* Internal only                */
-+#define ETH_P_DDCMP     0x0006          /* DEC DDCMP: Internal only     */
-+#define ETH_P_WAN_PPP   0x0007          /* Dummy type for WAN PPP frames*/
-+#define ETH_P_PPP_MP    0x0008          /* Dummy type for PPP MP frames */
-+#define ETH_P_LOCALTALK 0x0009                /* Localtalk pseudo type        
*/
-+#define ETH_P_PPPTALK 0x0010          /* Dummy type for Atalk over PPP*/
-+#define ETH_P_TR_802_2        0x0011          /* 802.2 frames                 
*/
-+
-+/*
-+ *    This is an Ethernet frame header.
-+ */
-+
-+struct ethhdr
-+{
-+  unsigned char       h_dest[ETH_ALEN];       /* destination eth addr */
-+  unsigned char       h_source[ETH_ALEN];     /* source ether addr    */
-+  unsigned short int h_proto;         /* packet type ID field */
-+};
-+
-+#endif        /* net/if_ether.h */

Modified: glibc-package/trunk/debian/patches/series
===================================================================
--- glibc-package/trunk/debian/patches/series   2010-01-06 09:47:07 UTC (rev 
4060)
+++ glibc-package/trunk/debian/patches/series   2010-01-06 17:18:55 UTC (rev 
4061)
@@ -112,7 +112,6 @@
 hurd-i386/local-disable-ioctls.diff
 hurd-i386/submitted-getcwd.diff
 hurd-i386/submitted-setsid.diff
-hurd-i386/submitted-if_ether.diff
 
 ia64/submitted-sysconf.diff
 ia64/submitted-libm.diff


-- 
To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Reply via email to