Merge branch 'master' of git+ssh://openadk.org/git/openadk

6 files changed, 48 insertions, 19 deletions

diff --git a/package/ImageMagick/Makefile b/package/ImageMagick/Makefile
index 63f6d916f..5876ae6fe 100644
--- a/package/ImageMagick/Makefile
+++ b/package/ImageMagick/Makefile
@@ -10,7 +10,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		a07a97cfb28b588cbcf83ffa9ec92e3f
 PKG_DESCR:=		image processing and converting utility
 PKG_SECTION:=		multimedia
-PKG_BUILDDEP:=		libpng jpeg libtiff fontconfig libiconv
+PKG_BUILDDEP:=		libpng jpeg libtiff fontconfig libiconv libtool
 PKG_URL:=		http://www.imagemagick.org/
 PKG_SITES:=		http://image_magick.veidrodis.com/image_magick/
 PKG_NEED_CXX:=		1
@@ -36,6 +36,7 @@ $(eval $(call PKG_template,LIBIMAGEMAGICK,libimagemagick,$(PKG_VERSION)-${PKG_RE
 $(eval $(call PKG_template,CONVERT,convert,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_CONVERT},${PKGSD_CONVERT},${PKGSC_CONVERT}))
 $(eval $(call PKG_template,DISPLAY,display,$(PKG_VERSION)-${PKG_RELEASE},${PKGSS_DISPLAY},${PKGSD_DISPLAY},${PKGSC_DISPLAY}))
 
+TARGET_LDFLAGS+=	-L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib
 TARGET_CFLAGS:=         $(filter-out -flto,$(TARGET_CFLAGS))
 CONFIGURE_ENV+=		ac_cv_sys_file_offset_bits=yes
 CONFIGURE_ARGS+=	--with-magick-plus-plus=no \
diff --git a/package/cmake/Makefile b/package/cmake/Makefile
index 59869bc02..204d02903 100644
--- a/package/cmake/Makefile
+++ b/package/cmake/Makefile
@@ -12,11 +12,14 @@ PKG_SECTION:=		lang
 PKG_URL:=		http://www.cmake.org/
 PKG_SITES:=		http://www.cmake.org/files/v2.8/
 
+PKG_CFLINE_CMAKE:=	depends on ADK_NATIVE
+
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call PKG_template,CMAKE,cmake,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
+XAKE_FLAGS+=		GCC_HONOUR_COPTS=s
 
 pre-configure:
 	(cd $(WRKBUILD); ./configure -prefix=/usr)
diff --git a/package/firefox/Makefile b/package/firefox/Makefile
index e57bf9bcf..c5271f249 100644
--- a/package/firefox/Makefile
+++ b/package/firefox/Makefile
@@ -9,11 +9,11 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		3468a2c463b4fc2788ba621e4b511c30
 PKG_DESCR:=		graphical webbrowser
 PKG_SECTION:=		x11/apps
-PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk libpng libtiff libnotify
+PKG_DEPENDS:=		libpthread alsa-lib dbus-glib glib libgtk libpng libtiff
 PKG_DEPENDS+=		nspr nss libjpeg libatk pango cairo libxt libx11 libstdcxx hicolor-icon-theme
 PKG_DEPENDS+=		libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf libintl
 PKG_BUILDDEP:=		alsa-lib dbus-glib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf
-PKG_BUILDDEP+=		nspr nss jpeg libXt fontconfig sqlite atk libpng hicolor-icon-theme libnotify
+PKG_BUILDDEP+=		nspr nss jpeg libXt fontconfig sqlite atk libpng hicolor-icon-theme
 PKG_URL:=		http://www.mozilla.org/
 PKG_SITES:=		http://releases.mozilla.org/pub/mozilla.org/firefox/releases/${PKG_VERSION}/source/
 PKG_NOPARALLEL:=	1
@@ -37,6 +37,8 @@ else
 CONFIGURE_ARGS+=	--enable-ipc
 endif
 
+TARGET_LDFLAGS+=	-L$(STAGING_TARGET_DIR)/lib -L$(STAGING_TARGET_DIR)/usr/lib
+
 CONFIGURE_ENV+=		CROSS_COMPILE=1 \
 			HOST_CC="${CC_FOR_BUILD}" \
 			HOST_CPPFLAGS="${CPPFLAGS_FOR_BUILD}" \
@@ -64,8 +66,10 @@ CONFIGURE_ARGS+=	--enable-application=browser \
 			--with-libIDL-prefix=${STAGING_TARGET_DIR}/usr \
 			--with-glib-prefix=${STAGING_TARGET_DIR}/usr \
 			--enable-libxul \
-			--enable-libnotify \
-			--enable-dbus \
+			--disable-libnotify \
+			--disable-accessibility \
+			--disable-smil \
+			--disable-dbus \
 			--disable-debug \
 			--disable-logging \
 			--disable-strip \
diff --git a/package/grep/Makefile b/package/grep/Makefile
index 0f9a73f9b..5c14aa091 100644
--- a/package/grep/Makefile
+++ b/package/grep/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_MD5SUM:=		e848f07e3e79aa7899345d17c7e4115e
 PKG_DESCR:=		global search for a regular expression and print out matched lines
 PKG_SECTION:=		utils
-PKG_DEPENDS:=		libpcre
+PKG_DEPENDS:=		libpcre libiconv
 PKG_BUILDDEP:=		pcre
 PKG_URL:=		http://www.gnu.org/software/grep/
 PKG_SITES:=		ftp://ftp.gnu.org/gnu/grep/
diff --git a/target/linux/config/Config.in.crypto b/target/linux/config/Config.in.crypto
index ee8d65c20..ff6fb6b00 100644
--- a/target/linux/config/Config.in.crypto
+++ b/target/linux/config/Config.in.crypto
@@ -163,6 +163,20 @@ config ADK_KPACKAGE_KMOD_CRYPTO_SEQIV
 	  This IV generator generates an IV based on a sequence number by
 	  xoring it with a salt.  This algorithm is mainly useful for CTR
 
+config ADK_KPACKAGE_KMOD_CRYPTO_CTS
+	prompt "kmod-crypto-cts...................... CTS support"
+	tristate
+	select ADK_KPACKAGE_KMOD_CRYPTO_BLKCIPHER2
+	select ADK_KPACKAGE_KMOD_CRYPTO_MANAGER2
+	default n
+	help
+          CTS: Cipher Text Stealing
+          This is the Cipher Text Stealing mode as described by
+          Section 8 of rfc2040 and referenced by rfc3962.
+          (rfc3962 includes errata information in its Appendix A)
+          This mode is required for Kerberos gss mechanism support
+          for AES encryption.
+
 config ADK_KPACKAGE_KMOD_CRYPTO_CBC
 	prompt "kmod-crypto-cbc...................... CBC support"
 	tristate
diff --git a/target/linux/config/Config.in.fsnet b/target/linux/config/Config.in.fsnet
index fa90abfe2..756ffaa18 100644
--- a/target/linux/config/Config.in.fsnet
+++ b/target/linux/config/Config.in.fsnet
@@ -50,6 +50,8 @@ config ADK_KPACKAGE_KMOD_NFS_FS
 	tristate
 	default n
 	select ADK_KERNEL_NFS_V3
+	select ADK_KERNEL_NFS_V4
+	select ADK_KERNEL_DNOTIFY
 	select ADK_KPACKAGE_KMOD_SUNRPC
 	select ADK_KPACKAGE_KMOD_LOCKD
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
@@ -92,12 +94,18 @@ config ADK_KERNEL_NFSD_V3
 	boolean
 	default n
 
+config ADK_KERNEL_NFSD_V4
+	boolean
+	default n
+
 config ADK_KPACKAGE_KMOD_NFSD
 	prompt "kmod-fs-nfsd...................... NFS server support (includes V3 support)"
 	tristate
 	default n
 	select ADK_KPACKAGE_KMOD_EXPORTFS if !ADK_KERNEL_EXPORTFS
 	select ADK_KERNEL_NFSD_V3
+	select ADK_KERNEL_NFSD_V4
+	select ADK_KERNEL_DNOTIFY
 	select ADK_KPACKAGE_KMOD_SUNRPC
 	select ADK_KPACKAGE_KMOD_LOCKD
 	select ADK_KERNEL_NETWORK_FILESYSTEMS
@@ -122,19 +130,6 @@ config ADK_KPACKAGE_KMOD_NFSD
 	  Please read the NFS-HOWTO, available from
 	  <http://www.tldp.org/docs.html#howto>.
 
-config ADK_KERNEL_NFSD_V4
-	prompt "Enable NFSv4 and RPC Kerberos"
-	boolean
-	depends on !ADK_TARGET_ROOTFS_NFSROOT
-	depends on ADK_KPACKAGE_KMOD_NFSD || ADK_KPACKAGE_KMOD_NFS_FS
-	select ADK_KPACKAGE_KMOD_SUNRPC_GSS
-	select ADK_KPACKAGE_KMOD_RPCSEC_GSS_KRB5
-	select ADK_KERNEL_NFS_V4
-	select ADK_KERNEL_DNOTIFY
-	default n
-	help
-	 NFSv4 with Kerberos authentication.
-
 config ADK_KPACKAGE_KMOD_LOCKD
 	tristate
 	default n
@@ -151,5 +146,17 @@ config ADK_KPACKAGE_KMOD_SUNRPC_GSS
 
 config ADK_KPACKAGE_KMOD_RPCSEC_GSS_KRB5
 	tristate
+	select ADK_KERNEL_NETWORK_FILESYSTEMS
 	select ADK_KPACKAGE_KMOD_SUNRPC_GSS
+	select ADK_KPACKAGE_KMOD_SUNRPC
+	select ADK_KPACKAGE_KMOD_CRYPTO
+	select ADK_KPACKAGE_KMOD_CRYPTO_MD5
+	select ADK_KPACKAGE_KMOD_CRYPTO_DES
+	select ADK_KPACKAGE_KMOD_CRYPTO_CBC
+	select ADK_KPACKAGE_KMOD_CRYPTO_CTS
+	select ADK_KPACKAGE_KMOD_CRYPTO_ECB
+	select ADK_KPACKAGE_KMOD_CRYPTO_HMAC
+	select ADK_KPACKAGE_KMOD_CRYPTO_SHA1
+	select ADK_KPACKAGE_KMOD_CRYPTO_AES
+	select ADK_KPACKAGE_KMOD_CRYPTO_ARC4
 	default n