klibc-1.5.15: fix build with kernel 2.6.32 (only for 7025 yet)

diff --git a/recipes/klibc/klibc-1.5.15/23-use-AF_INET-directly.patch b/recipes/klibc/klibc-1.5.15/23-use-AF_INET-directly.patch
new file mode 100644 (file)
index 0000000..a5a9b78
--- /dev/null
+++ b/recipes/klibc/klibc-1.5.15/23-use-AF_INET-directly.patch
@@ -0,0 +1,58 @@
+From: maximilian attems <max@stro.at>
+Subject: [PATCH 2/3] [klibc] nfsmount: s/PF_INET/AF_INET/
+
+use AF_INET directly.
+
+Origin: vendor, http://www.zytor.com/pipermail/klibc/2010-February/002487.html
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/534281
+Forwarded: yes
+Last-Update: 2010-03-10
+
+diff -Nur -x '*.orig' -x '*~' klibc-1.5.15/usr/kinit/nfsmount/dummypmap.c klibc-1.5.15.new/usr/kinit/nfsmount/dummypmap.c
+--- klibc-1.5.15/usr/kinit/nfsmount/dummypmap.c        2009-01-04 19:28:03.000000000 +0000
++++ klibc-1.5.15.new/usr/kinit/nfsmount/dummypmap.c    2010-03-10 18:40:43.000000000 +0000
+@@ -39,7 +39,7 @@
+ 
+ static int bind_portmap(void)
+ {
+-      int sock = socket(PF_INET, SOCK_DGRAM, 0);
++      int sock = socket(AF_INET, SOCK_DGRAM, 0);
+       struct sockaddr_in sin;
+ 
+       if (sock < 0)
+diff -Nur -x '*.orig' -x '*~' klibc-1.5.15/usr/kinit/nfsmount/mount.c klibc-1.5.15.new/usr/kinit/nfsmount/mount.c
+--- klibc-1.5.15/usr/kinit/nfsmount/mount.c    2010-03-10 18:40:41.000000000 +0000
++++ klibc-1.5.15.new/usr/kinit/nfsmount/mount.c        2010-03-10 18:40:43.000000000 +0000
+@@ -295,9 +295,9 @@
+       mounted = 1;
+ 
+       if (data->flags & NFS_MOUNT_TCP) {
+-              sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
++              sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+       } else {
+-              sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
++              sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+       }
+ 
+       if (sock == -1) {
+diff -Nur -x '*.orig' -x '*~' klibc-1.5.15/usr/kinit/nfsmount/sunrpc.c klibc-1.5.15.new/usr/kinit/nfsmount/sunrpc.c
+--- klibc-1.5.15/usr/kinit/nfsmount/sunrpc.c   2009-01-04 19:28:03.000000000 +0000
++++ klibc-1.5.15.new/usr/kinit/nfsmount/sunrpc.c       2010-03-10 18:40:43.000000000 +0000
+@@ -152,7 +152,7 @@
+ 
+       memset(clnt, 0, sizeof(clnt));
+ 
+-      if ((sock = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) {
++      if ((sock = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP)) == -1) {
+               perror("socket");
+               goto bail;
+       }
+@@ -197,7 +197,7 @@
+ 
+       memset(clnt, 0, sizeof(clnt));
+ 
+-      if ((sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) {
++      if ((sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) {
+               perror("socket");
+               goto bail;
+       }

diff --git a/recipes/klibc/klibc-1.5.15/24-add-relevant-socket-h-definitions.patch b/recipes/klibc/klibc-1.5.15/24-add-relevant-socket-h-definitions.patch
new file mode 100644 (file)
index 0000000..d2c523e
--- /dev/null
+++ b/recipes/klibc/klibc-1.5.15/24-add-relevant-socket-h-definitions.patch
@@ -0,0 +1,67 @@
+From: maximilian attems <max@stro.at>
+Subject: [PATCH 3/3] [klibc] Add relevant socket.h definitions
+
+linux-2.6 9c501935a3cdcf6b1d35aaee3aa11c7a7051a305 cleaned
+<linux/socket.h> from allmost any userspace export.
+
+thus define the stuff that used to be there in klibc socket.h
+
+Origin: vendor, http://www.zytor.com/pipermail/klibc/2010-February/002488.html
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/534281
+Forwarded: yes
+Last-Update: 2010-03-10
+
+diff -Nur -x '*.orig' -x '*~' klibc-1.5.15/usr/include/sys/socket.h klibc-1.5.15.new/usr/include/sys/socket.h
+--- klibc-1.5.15/usr/include/sys/socket.h      2009-01-04 19:28:03.000000000 +0000
++++ klibc-1.5.15.new/usr/include/sys/socket.h  2010-03-10 18:33:01.000000000 +0000
+@@ -9,6 +9,9 @@
+ #include <klibc/compiler.h>
+ #include <klibc/sysconfig.h>
+ #include <linux/socket.h>
++#include <linux/sockios.h>            /* the SIOCxxx I/O controls     */
++#include <linux/uio.h>                        /* iovec support                */
++#include <asm/socket.h>                       /* arch-dependent defines       */
+ #if _KLIBC_HAS_ARCHSOCKET_H
+ #include <klibc/archsocket.h>
+ #endif
+@@ -27,6 +30,40 @@
+ # define SOCK_PACKET    10
+ #endif
+ 
++
++typedef unsigned short        sa_family_t;
++
++struct sockaddr {
++      sa_family_t     sa_family;      /* address family, AF_xxx       */
++      char            sa_data[14];    /* 14 bytes of protocol address */
++};
++
++
++/*
++ *    As we do 4.4BSD message passing we use a 4.4BSD message passing
++ *    system, not 4.3. Thus msg_accrights(len) are now missing. They
++ *    belong in an obscure libc emulation or the bin.
++ */
++ 
++struct msghdr {
++      void    *       msg_name;       /* Socket name                  */
++      int             msg_namelen;    /* Length of name               */
++      struct iovec *  msg_iov;        /* Data blocks                  */
++      size_t          msg_iovlen;     /* Number of blocks             */
++      void    *       msg_control;    /* Per protocol magic (eg BSD file descriptor passing) */
++      size_t          msg_controllen; /* Length of cmsg list */
++      unsigned        msg_flags;
++};
++
++
++/* address families */
++#define AF_INET               2       /* Internet IP Protocol         */
++#define AF_INET6      10      /* IP version 6                 */
++#define AF_PACKET     17      /* Packet family                */
++
++/* Flags we can use with send/ and recv. */
++#define MSG_PEEK      2
++
+ typedef int socklen_t;
+ 
+ __extern int socket(int, int, int);

diff --git a/recipes/klibc/klibc_1.5.15.inc b/recipes/klibc/klibc_1.5.15.inc
index 2aeba26..1355860 100644 (file)
--- a/recipes/klibc/klibc_1.5.15.inc
+++ b/recipes/klibc/klibc_1.5.15.inc
@@ -9,6 +9,11 @@ SRC_URI += "file://staging.patch;patch=1 \
 SRC_URI_append = "${@base_conditional('DISTRO', 'opendreambox', '', \
                ' file://klibc_kexecsyscall.patch;patch=1', d)}"
 
+#needed for kernel 2.6.32
+SRC_URI_append_dm7025 = "file://23-use-AF_INET-directly.patch;patch=1 \
+       file://24-add-relevant-socket-h-definitions.patch;patch=1 \
+"
+
 # we want only the shared programms and the lib so we chose them manually
 do_install() {
         install -d ${D}${base_bindir}