diff -Nru pam-1.1.1/debian/changelog pam-1.1.1-4ubuntu1/debian/changelog
--- pam-1.1.1/debian/changelog	2010-11-15 10:41:21.000000000 +0000
+++ pam-1.1.1-4ubuntu1/debian/changelog	2010-10-18 12:32:39.000000000 +0000
@@ -1,10 +1,8 @@
-pam (1.1.1-4ubuntu2) maverick-security; urgency=low
+pam (1.1.1-4ubuntu1-1cross1) maverick; urgency=low
 
-  * SECURITY UPDATE: root privilege escalation via symlink following.
-    - debian/patches-applied/pam_motd-legal-notice: drop privs for work.
-    - CVE-2010-0832
+  * Patch for cross build
 
- -- Kees Cook <kees@ubuntu.com>  Mon, 25 Oct 2010 06:40:32 -0700
+ -- Peter Pearse <peter.pearse@linaro.org>  Mon, 18 Oct 2010 12:32:39 +0000
 
 pam (1.1.1-4ubuntu1) maverick; urgency=low
 
diff -Nru pam-1.1.1/debian/patches-applied/cross.diff pam-1.1.1-4ubuntu1/debian/patches-applied/cross.diff
--- pam-1.1.1/debian/patches-applied/cross.diff	1970-01-01 00:00:00.000000000 +0000
+++ pam-1.1.1-4ubuntu1/debian/patches-applied/cross.diff	2010-10-18 12:23:34.000000000 +0000
@@ -0,0 +1,75 @@
+diff -purN pam/configure pam_patch/configure
+--- pam/configure	2010-10-15 16:04:03.000000000 +0000
++++ pam_patch/configure	2010-10-18 12:20:35.000000000 +0000
+@@ -745,6 +745,7 @@ gt_needs=
+ ac_subst_vars='am__EXEEXT_FALSE
+ am__EXEEXT_TRUE
+ LTLIBOBJS
++CC_FOR_BUILD
+ HAVE_KEY_MANAGEMENT_FALSE
+ HAVE_KEY_MANAGEMENT_TRUE
+ HAVE_KEY_MANAGEMENT
+@@ -968,7 +969,8 @@ LIBS
+ CPPFLAGS
+ CPP
+ YACC
+-YFLAGS'
++YFLAGS
++CC_FOR_BUILD'
+ 
+ 
+ # Initialize some variables set by options.
+@@ -1659,6 +1661,8 @@ Some influential environment variables:
+   YFLAGS      The list of arguments that will be passed by default to $YACC.
+               This script will default YFLAGS to the empty string to avoid a
+               default value of `-d' given by some make applications.
++  CC_FOR_BUILD
++              Compiler to use to make build host binaries
+ 
+ Use these variables to override the choices made by `configure' or to help
+ it to find libraries and programs with nonstandard names/locations.
+diff -purN pam/configure.in pam_patch/configure.in
+--- pam/configure.in	2010-10-15 16:03:46.000000000 +0000
++++ pam_patch/configure.in	2010-10-18 10:40:43.000000000 +0000
+@@ -529,6 +529,13 @@ AC_SUBST([HAVE_KEY_MANAGEMENT], $HAVE_KE
+ 
+ AM_CONDITIONAL([HAVE_KEY_MANAGEMENT], [test "$have_key_syscalls" = 1])
+ 
++##########
++#
++
++AC_ARG_VAR(CC_FOR_BUILD, [Compiler to use to make build host binaries])
++
++##########
++
+ dnl Files to be created from when we run configure
+ AC_CONFIG_FILES([Makefile libpam/Makefile libpamc/Makefile libpamc/test/Makefile \
+ 	libpam_misc/Makefile conf/Makefile conf/pam_conv1/Makefile \
+diff -purN pam/doc/specs/Makefile.am pam_patch/doc/specs/Makefile.am
+--- pam/doc/specs/Makefile.am	2010-10-15 16:03:46.000000000 +0000
++++ pam_patch/doc/specs/Makefile.am	2010-10-18 10:05:07.000000000 +0000
+@@ -15,8 +15,12 @@ BUILT_SOURCES = parse_y.h
+ 
+ noinst_PROGRAMS = padout
+ 
++CC=@CC_FOR_BUILD@
++
+ padout_SOURCES = parse_l.l parse_y.y
+ 
+ padout_LDADD = @LEXLIB@
+ 
+ doc_DATA = draft-morgan-pam-current.txt rfc86.0.txt
++
++
+diff -purN pam/doc/specs/Makefile.in pam_patch/doc/specs/Makefile.in
+--- pam/doc/specs/Makefile.in	2010-10-15 16:04:03.000000000 +0000
++++ pam_patch/doc/specs/Makefile.in	2010-10-18 10:19:32.000000000 +0000
+@@ -121,7 +121,7 @@ AUTOHEADER = @AUTOHEADER@
+ AUTOMAKE = @AUTOMAKE@
+ AWK = @AWK@
+ BROWSER = @BROWSER@
+-CC = @CC@
++CC = @CC_FOR_BUILD@
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPP = @CPP@
diff -Nru pam-1.1.1/debian/patches-applied/series pam-1.1.1-4ubuntu1/debian/patches-applied/series
--- pam-1.1.1/debian/patches-applied/series	2010-11-15 10:41:21.000000000 +0000
+++ pam-1.1.1-4ubuntu1/debian/patches-applied/series	2010-10-18 12:23:14.000000000 +0000
@@ -25,3 +25,4 @@
 sys-types-include.patch
 ubuntu-rlimit_nice_correction 
 update-motd-manpage-ref
+cross.diff
diff -Nru pam-1.1.1/debian/rules pam-1.1.1-4ubuntu1/debian/rules
--- pam-1.1.1/debian/rules	2010-11-15 10:41:21.000000000 +0000
+++ pam-1.1.1-4ubuntu1/debian/rules	2010-10-18 12:29:29.000000000 +0000
@@ -10,6 +10,12 @@
 endif
 
 DEB_HOST_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+    CONFIGURE_ARGS+=--disable-regenerate-docu
+endif
 
 LC_COLLATE=C
 export LC_COLLATE
@@ -23,8 +29,9 @@
 	dh $@ --with quilt
 
 override_dh_auto_configure:
-	dh_auto_configure -- --enable-static --enable-shared \
+		dh_auto_configure -- --enable-static --enable-shared \
 		--libdir=/lib --sbindir=/sbin --disable-audit \
+		--host $(DEB_HOST_GNU_TYPE) --build $(DEB_BUILD_GNU_TYPE) $(CONFIGURE_ARGS) CC_FOR_BUILD=$(DEB_BUILD_GNU_TYPE)-gcc	\
 		CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 # make sure the SAG, MWG, ADG are readable with a browser.