r5289 - in glibc-package/trunk/debian: . patches patches/hurd-i386
Author: sthibault
Date: 2012-06-22 18:22:54 +0000 (Fri, 22 Jun 2012)
New Revision: 5289
Added:
glibc-package/trunk/debian/patches/hurd-i386/submitted-AF_LINK.diff
Modified:
glibc-package/trunk/debian/changelog
glibc-package/trunk/debian/patches/series.hurd-i386
Log:
New hurd-only patch to comment AF_LINK values, unimplemented on the Hurd.
Modified: glibc-package/trunk/debian/changelog
===================================================================
--- glibc-package/trunk/debian/changelog 2012-06-17 19:38:18 UTC (rev 5288)
+++ glibc-package/trunk/debian/changelog 2012-06-22 18:22:54 UTC (rev 5289)
@@ -12,6 +12,8 @@
libpthread bringing librt also brings issues.
* patches/hurd-i386/libpthread_nort.diff: Add patch to revert upstream librt
usage.
+ * patches/hurd-i386/submitted-AF_LINK.diff: New hurd-only patch to comment
+ AF_LINK values, unimplemented on the Hurd.
-- Aurelien Jarno <aurel32@debian.org> Sun, 03 Jun 2012 22:51:53 +0200
Added: glibc-package/trunk/debian/patches/hurd-i386/submitted-AF_LINK.diff
===================================================================
--- glibc-package/trunk/debian/patches/hurd-i386/submitted-AF_LINK.diff (rev 0)
+++ glibc-package/trunk/debian/patches/hurd-i386/submitted-AF_LINK.diff 2012-06-22 18:22:54 UTC (rev 5289)
@@ -0,0 +1,29 @@
+Hurd: comment PF_LINK/AF_LINK defines
+
+Comment out the PF_LINK and AF_LINK defines, since they are usually associated
+with struct sockaddr_dl, which is not available on Hurd.
+
+2012-06-22 Pino Toscano <toscano.pino@tiscali.it>
+
+ * sysdeps/mach/hurd/bits/socket.h (PF_LINK): Comment out.
+ (AF_LINK): Likewise.
+--- a/sysdeps/unix/bsd/bsd4.4/bits/socket.h
++++ b/sysdeps/unix/bsd/bsd4.4/bits/socket.h
+@@ -97,7 +97,7 @@ enum __socket_type
+ #define PF_HYLINK 15 /* NSC Hyperchannel protocol. */
+ #define PF_APPLETALK 16 /* Don't use this. */
+ #define PF_ROUTE 17 /* Internal Routing Protocol. */
+-#define PF_LINK 18 /* Link layer interface. */
++/* #define PF_LINK 18 Link layer interface. */
+ #define PF_XTP 19 /* eXpress Transfer Protocol (no AF). */
+ #define PF_COIP 20 /* Connection-oriented IP, aka ST II. */
+ #define PF_CNT 21 /* Computer Network Technology. */
+@@ -130,7 +130,7 @@ enum __socket_type
+ #define AF_HYLINK PF_HYLINK
+ #define AF_APPLETALK PF_APPLETALK
+ #define AF_ROUTE PF_ROUTE
+-#define AF_LINK PF_LINK
++/* #define AF_LINK PF_LINK */
+ #define pseudo_AF_XTP PF_XTP
+ #define AF_COIP PF_COIP
+ #define AF_CNT PF_CNT
Modified: glibc-package/trunk/debian/patches/series.hurd-i386
===================================================================
--- glibc-package/trunk/debian/patches/series.hurd-i386 2012-06-17 19:38:18 UTC (rev 5288)
+++ glibc-package/trunk/debian/patches/series.hurd-i386 2012-06-22 18:22:54 UTC (rev 5289)
@@ -5,3 +5,4 @@
hurd-i386/local-msg-nosignal.diff
hurd-i386/unsubmitted-pthread.diff
hurd-i386/local-clock_gettime_MONOTONIC.diff
+hurd-i386/submitted-AF_LINK.diff
Reply to: