uts (2.10+9) unstable; urgency=low

  * Added illumos-3785-MAP_32BIT.patch:
    3785 Implement MAP_32BIT flag to mmap()
  * Added define-SOL_IP.patch:
    define SOL_IP, SOL_IPV6, SOL_ICMPV6
  * Use GNU ld for helper programs and sun ld for kernel modules

5 files changed, 93 insertions, 0 deletions

diff --git a/uts/debian/changelog b/uts/debian/changelog
index 56ccf99..7ce0492 100644
--- a/uts/debian/changelog
+++ b/uts/debian/changelog
@@ -1,3 +1,13 @@
+uts (2.10+9) unstable; urgency=low
+
+  * Added illumos-3785-MAP_32BIT.patch:
+    3785 Implement MAP_32BIT flag to mmap()
+  * Added define-SOL_IP.patch:
+    define SOL_IP, SOL_IPV6, SOL_ICMPV6
+  * Use GNU ld for helper programs and sun ld for kernel modules
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sun, 15 Dec 2013 14:19:49 +0400
+
 uts (2.10+8) unstable; urgency=low
 
   * Updated illumos-195.patch to fix __STDC__ issue in *.x files
diff --git a/uts/debian/patches/define-SOL_IP.patch b/uts/debian/patches/define-SOL_IP.patch
new file mode 100644
index 0000000..2d0c6e9
--- /dev/null
+++ b/uts/debian/patches/define-SOL_IP.patch
@@ -0,0 +1,16 @@
+Description: compatibiity with Linux
+Index: uts/usr/src/uts/common/netinet/in.h
+===================================================================
+--- uts.orig/usr/src/uts/common/netinet/in.h	2012-10-08 04:25:58.000000000 +0400
++++ uts/usr/src/uts/common/netinet/in.h	2013-12-15 13:59:38.916674425 +0400
+@@ -179,6 +179,10 @@
+ #define	IPPROTO_RAW		255		/* raw IP packet */
+ #define	IPPROTO_MAX		256
+ 
++#define SOL_IP IPPROTO_IP
++#define SOL_IPV6 IPPROTO_IPV6
++#define SOL_ICMPV6 IPPROTO_ICMPV6
++
+ #if !defined(_XPG4_2) || defined(__EXTENSIONS__)
+ #define	PROTO_SDP		257		/* Sockets Direct Protocol */
+ #endif /* !defined(_XPG4_2) || defined(__EXTENSIONS__) */
diff --git a/uts/debian/patches/illumos-3785-MAP_32BIT.patch b/uts/debian/patches/illumos-3785-MAP_32BIT.patch
new file mode 100644
index 0000000..be272df
--- /dev/null
+++ b/uts/debian/patches/illumos-3785-MAP_32BIT.patch
@@ -0,0 +1,59 @@
+commit 1b3b16f35bee1ffc210591d82bca6adf247954b0
+Author: Theo Schlossnagle <jesus@omniti.com>
+Date:   Fri Aug 23 11:13:02 2013 -0400
+
+    3785 Implement MAP_32BIT flag to mmap()
+    Reviewed by: Albert Lee <trisk@nexenta.com>
+    Reviewed by: Dan McDonald <danmcd@nexenta.com>
+    Reviewed by: Robert Mustacchi <rm@joyent.com>
+    Approved by: Dan McDonald <danmcd@nexenta.com>
+
+diff --git a/usr/src/uts/common/os/grow.c b/usr/src/uts/common/os/grow.c
+index c08ea0d..f5e92cf 100644
+--- a/usr/src/uts/common/os/grow.c
++++ b/usr/src/uts/common/os/grow.c
+@@ -19,6 +19,8 @@
+  * CDDL HEADER END
+  */
+ 
++/* Copyright 2013 OmniTI Computer Consulting, Inc. All rights reserved. */
++
+ /*
+  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+  * Use is subject to license terms.
+@@ -814,9 +816,7 @@ smmap64(caddr_t addr, size_t len, int prot, int flags, int fd, off_t pos)
+ 	struct file *fp;
+ 	int error;
+ 
+-	if (flags & _MAP_LOW32)
+-		error = EINVAL;
+-	else if (fd == -1 && (flags & MAP_ANON) != 0)
++	if (fd == -1 && (flags & MAP_ANON) != 0)
+ 		error = smmap_common(&addr, len, prot, flags,
+ 		    NULL, (offset_t)pos);
+ 	else if ((fp = getf(fd)) != NULL) {
+diff --git a/usr/src/uts/common/sys/mman.h b/usr/src/uts/common/sys/mman.h
+index 6c9119e..8f66bf7 100644
+--- a/usr/src/uts/common/sys/mman.h
++++ b/usr/src/uts/common/sys/mman.h
+@@ -19,6 +19,7 @@
+  * CDDL HEADER END
+  */
+ 
++/* Copyright 2013 OmniTI Computer Consulting, Inc. All rights reserved. */
+ /*
+  * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+  * Use is subject to license terms.
+@@ -104,9 +105,11 @@ extern "C" {
+ #if	(_POSIX_C_SOURCE <= 2) || defined(_XPG4_2)
+ #ifdef	_KERNEL
+ #define	PROT_EXCL	0x20
+-#define	_MAP_LOW32	0x80	/* force mapping in lower 4G of address space */
+ #endif	/* _KERNEL */
+ 
++#define	_MAP_LOW32	0x80	/* force mapping in lower 4G of address space */
++#define	MAP_32BIT	_MAP_LOW32
++
+ /*
+  * For the sake of backward object compatibility, we use the _MAP_NEW flag.
+  * This flag will be automatically or'ed in by the C library for all
diff --git a/uts/debian/patches/series b/uts/debian/patches/series
index edd35e2..70072b2 100644
--- a/uts/debian/patches/series
+++ b/uts/debian/patches/series
@@ -75,3 +75,5 @@ illumos-3359-hostid-generation-should-be-more-predictable.patch
 illumos-3518-incorrect-hostid-calculation.patch
 add-futimes.patch
 illumos-195.patch
+illumos-3785-MAP_32BIT.patch
+define-SOL_IP.patch
diff --git a/uts/debian/rules b/uts/debian/rules
index 19e7db7..f37a18e 100755
--- a/uts/debian/rules
+++ b/uts/debian/rules
@@ -64,6 +64,12 @@ unpack-stamp:
 	# GCC does not support -msave-args for a while:
 	echo 'export SAVEARGS=' >> usr/env.sh
 
+	# Use GNU ld for helper programs (due to changes in crt1.o)
+	# and sun ld for kernel modules
+	sed -i /LD_ALTEXEC/d usr/env.sh
+	echo 'export LD=sunld' >> usr/env.sh
+
+
 # Disable 32-bit builds on 64-bit host, and vice versa
 ifeq (64,$(DEB_HOST_ARCH_BITS))
 	echo "export DEF_BUILDS32=''" >> usr/env.sh