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

14 files changed, 109 insertions, 96 deletions

diff --git a/jtools/openjdk/Makefile b/jtools/openjdk/Makefile
index 600db055b..32e0eac0e 100644
--- a/jtools/openjdk/Makefile
+++ b/jtools/openjdk/Makefile
@@ -62,6 +62,8 @@ $(WRKDIST)/.extract: $(WRKDIST)/.extract_done
 	cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/openjdk.patch
 	cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/iconv.patch
 	cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/remove-libnsl.patch
+	cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/linux3.patch
+	cd $(WRKDIST); patch -p0 < ${TOPDIR}/jtools/openjdk/patches/disable-backtrace.patch
 	touch $@
 
 $(WRKDIST)/.configured: ${WRKDIST}/.extract
diff --git a/jtools/openjdk/patches/disable-backtrace.patch b/jtools/openjdk/patches/disable-backtrace.patch
new file mode 100644
index 000000000..393ee9251
--- /dev/null
+++ b/jtools/openjdk/patches/disable-backtrace.patch
@@ -0,0 +1,24 @@
+
+ uClibc does not have backtrace support right now. Disable it for now.
+
+--- openjdk-6.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c	2011-02-28 17:06:50.000000000 +0100
++++ openjdk-6/jdk/src/solaris/native/sun/xawt/XToolkit.c	2011-08-08 10:45:01.445330729 +0200
+@@ -27,9 +27,6 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xos.h>
+ #include <X11/Xatom.h>
+-#ifdef __linux__
+-#include <execinfo.h>
+-#endif
+ 
+ #include <jvm.h>
+ #include <jni.h>
+@@ -689,7 +686,7 @@
+     return ret;
+ }
+ 
+-#ifdef __linux__
++#if 0
+ void print_stack(void)
+ {
+   void *array[10];
diff --git a/jtools/openjdk/patches/linux3.patch b/jtools/openjdk/patches/linux3.patch
new file mode 100644
index 000000000..bf6ccaa28
--- /dev/null
+++ b/jtools/openjdk/patches/linux3.patch
@@ -0,0 +1,11 @@
+--- openjdk-6.orig/hotspot/make/linux/Makefile	2011-02-28 17:03:13.000000000 +0100
++++ openjdk-6/hotspot/make/linux/Makefile	2012-03-27 22:44:07.897199377 +0200
+@@ -230,7 +230,7 @@
+ # Solaris 2.5.1, 2.6).
+ # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
+ 
+-SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%
++SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7% 3.0% 3.1% 3.2% 3.3%
+ OS_VERSION := $(shell uname -r)
+ EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
+ 
diff --git a/package/epdfview/Makefile b/package/epdfview/Makefile
new file mode 100644
index 000000000..b0b760838
--- /dev/null
+++ b/package/epdfview/Makefile
@@ -0,0 +1,29 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		epdfview
+PKG_VERSION:=		0.1.8
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		0c57d5e33adbfba047ffa13e570f79d6
+PKG_DESCR:=		lightweight pdf viewer
+PKG_SECTION:=		x11/apps
+PKG_DEPENDS:=		poppler libgtk
+PKG_BUILDDEP:=		poppler gtk+
+PKG_URL:=		http://trac.emma-soft.com/epdfview/wiki
+PKG_SITES:=		http://trac.emma-soft.com/epdfview/chrome/site/releases/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,EPDFVIEW,epdfview,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+epdfview-install:
+	$(INSTALL_DIR) $(IDIR_EPDFVIEW)/usr/share/epdfview
+	$(CP) $(WRKINST)/usr/share/epdfview/*
+		$(IDIR_EPDFVIEW)/usr/share/epdfview
+	$(INSTALL_DIR) $(IDIR_EPDFVIEW)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/epdfview \
+		$(IDIR_EPDFVIEW)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile
index 933fd123b..f02e7bb3d 100644
--- a/package/nfs-utils/Makefile
+++ b/package/nfs-utils/Makefile
@@ -5,23 +5,15 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		nfs-utils
 PKG_VERSION:=		1.2.5
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		8395ac770720b83c5c469f88306d7765
 PKG_DESCR:=		Utilities for NFS kernel server implementation
 PKG_SECTION:=		net/fs
-PKG_DEPENDS:=		kmod-nfsd keyutils
-PKG_BUILDDEP:=		keyutils
+PKG_DEPENDS:=		kmod-nfsd keyutils libtirpc rpcbind
+PKG_BUILDDEP:=		keyutils libtirpc
 PKG_URL:=		http://sourceforge.net/projects/nfs
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=nfs/}
 
-PKG_CHOICES_NFS_UTILS:= WITH_TIRPC WITHOUT_TIRPC
-PKGCD_WITH_TIRPC:=	enable Transport Independent RPC
-PKGCS_WITH_TIRPC:=	libtirpc rpcbind
-PKGCB_WITH_TIRPC:=	libtirpc rpcbind
-PKGCD_WITHOUT_TIRPC:=	disable Transport Independent RPC
-PKGCS_WITHOUT_TIRPC:=	portmap
-PKGCB_WITHOUT_TIRPC:=	portmap
-
 PKG_FLAVOURS_NFS_UTILS:=WITH_KERBEROS
 PKGFD_WITH_KERBEROS:=	enable Kerberos support (MIT)
 PKGFS_WITH_KERBEROS:=	libkrb5 libevent libnfsidmap librpcsecgss libcom-err libgssglue kmod-rpcsec-gss-krb5 kmod-sunrpc-gss
@@ -52,17 +44,12 @@ CONFIGURE_ARGS+=	--disable-nfsv4 \
 			--disable-gss
 endif
 
-ifeq ($(ADK_PACKAGE_NFS_UTILS_WITH_TIRPC),y)
-CONFIGURE_ARGS+=	--enable-tirpc \
-			--with-tirpcinclude=${TIRPCINC}
-else
-CONFIGURE_ARGS+=	--disable-tirpc
-endif
-
 CONFIGURE_ENV+=		knfsd_cv_bsd_signals=no \
 			ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	--without-tcp-wrappers \
 			--with-rpcgen=internal \
+			--enable-tirpc \
+			--with-tirpcinclude=${TIRPCINC} \
 			--disable-uuid
 
 post-install:
diff --git a/package/openjdk/Makefile b/package/openjdk/Makefile
index 2c953c0fe..d49fe8b22 100644
--- a/package/openjdk/Makefile
+++ b/package/openjdk/Makefile
@@ -26,7 +26,7 @@ PKG_SITES:=		http://download.java.net/openjdk/jdk6/promoted/b22/ \
 
 PKG_HOST_DEPENDS:=	!darwin !cygwin !openbsd !netbsd !freebsd
 PKG_ARCH_DEPENDS:=	arm mips x86 x86_64
-PKG_SYSTEM_DEPENDS:=	!lemote-yeelong !linksys-ag241 !fon-fon2100 !broadcom-bcm47xx
+PKG_SYSTEM_DEPENDS:=	!linksys-ag241 !fon-fon2100 !broadcom-bcm47xx
 
 # autotools infrastructure for OpenJDK
 ICEDTEA_NAME:=		icedtea6
diff --git a/package/poppler/Makefile b/package/poppler/Makefile
new file mode 100644
index 000000000..b716ff034
--- /dev/null
+++ b/package/poppler/Makefile
@@ -0,0 +1,24 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=		poppler
+PKG_VERSION:=		0.18.4
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		12658f3308597e57f3faff538cc73baf
+PKG_DESCR:=		pdf rendering library
+PKG_SECTION:=		libs
+PKG_URL:=		http://poppler.freedesktop.org/
+PKG_SITES:=		http://poppler.freedesktop.org/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,POPPLER,poppler,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+poppler-install:
+	$(INSTALL_DIR) $(IDIR_POPPLER)/usr/lib
+	$(CP) $(WRKINST)/usr/lib/libpoppler*.so* \
+		$(IDIR_POPPLER)/usr/lib
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/portmap/Makefile b/package/portmap/Makefile
deleted file mode 100644
index 2026c6670..000000000
--- a/package/portmap/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include ${TOPDIR}/rules.mk
-
-PKG_NAME:=		portmap
-PKG_VERSION:=		6.0
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		ac108ab68bf0f34477f8317791aaf1ff
-PKG_DESCR:=		RPC portmapper
-PKG_SECTION:=		net/misc
-PKG_URL:=		http://neil.brown.name/portmap/
-PKG_SITES:=		http://neil.brown.name/portmap/
-
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
-WRKDIST=		${WRKDIR}/${PKG_NAME}_${PKG_VERSION}
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,PORTMAP,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=          manual
-INSTALL_STYLE:=         manual
-
-MAKE_FLAGS+=		NO_TCP_WRAPPER=1
-TARGET_CPPFLAGS+=	-DDAEMON_UID=20 -DDAEMON_GID=20
-TARGET_CFLAGS+=		-fPIC
-MAKE_FLAGS+=		${TARGET_CONFIGURE_OPTS} \
-			CFLAGS='${TARGET_CFLAGS}'
-
-do-install:
-	${INSTALL_DIR} ${IDIR_PORTMAP}/usr/sbin
-	${INSTALL_BIN} ${WRKBUILD}/portmap ${IDIR_PORTMAP}/usr/sbin
-
-include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/portmap/files/portmap.postinst b/package/portmap/files/portmap.postinst
deleted file mode 100644
index b8b30f45b..000000000
--- a/package/portmap/files/portmap.postinst
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf portmap
-add_group portmap 20
-add_user portmap 20 20 /tmp/.portmap
-add_service sunrpc 111/tcp
-add_service sunrpc 111/udp
-
diff --git a/package/portmap/patches/patch-Makefile b/package/portmap/patches/patch-Makefile
deleted file mode 100644
index 63d559ac7..000000000
--- a/package/portmap/patches/patch-Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- portmap_6.0.orig/Makefile	2007-05-11 05:02:10.000000000 +0200
-+++ portmap_6.0/Makefile	2010-12-19 22:23:02.000000000 +0100
-@@ -125,9 +125,7 @@ CFLAGS   += -Wall -Wstrict-prototypes
- all:	portmap pmap_dump pmap_set portmap.man
- 
- CPPFLAGS += $(HOSTS_ACCESS)
--portmap: CFLAGS   += -fpie
- portmap: LDLIBS   += $(WRAP_LIB)
--portmap: LDFLAGS  += -pie
- portmap: portmap.o pmap_check.o from_local.o
- 
- from_local: CPPFLAGS += -DTEST
diff --git a/package/portmap/patches/patch-pmap_check_c b/package/portmap/patches/patch-pmap_check_c
deleted file mode 100644
index 9dc7cd67f..000000000
--- a/package/portmap/patches/patch-pmap_check_c
+++ /dev/null
@@ -1,16 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
-
-* do not include tcpd.h, when hosts access disabled
-
---- portmap_6.0.orig/pmap_check.c	2007-05-11 05:02:10.000000000 +0200
-+++ portmap_6.0/pmap_check.c	2009-04-24 12:26:06.041879543 +0200
-@@ -44,7 +44,9 @@
- #include <netinet/in.h>
- #include <rpc/rpcent.h>
- #endif
-+#ifdef HOSTS_ACCESS
- #include <tcpd.h>
-+#endif
- #include <arpa/inet.h>
- #include <grp.h>
- 
diff --git a/package/portmap/files/portmap.init b/package/xdm/files/xdm.init
index 36ce2aee0..1bcce7df5 100644
--- a/package/portmap/files/portmap.init
+++ b/package/xdm/files/xdm.init
@@ -1,20 +1,23 @@
 #!/bin/sh
-#PKG portmap
-#INIT 60
+#PKG xdm
+#INIT 99
+
 . /etc/rc.conf
 
 case $1 in
 autostop) ;;
 autostart)
-	test x"${portmap:-NO}" = x"NO" && exit 0
+	test x"${xdm:-NO}" = x"NO" && exit 0
 	exec sh $0 start
 	;;
 start)
-	mkdir -p /tmp/.portmap
-	/usr/sbin/portmap -t /tmp/.portmap
+	if [ ! -d /var/lib/xdm ];then
+		mkdir -p /var/lib/xdm
+	fi
+	xdm
 	;;
 stop)
-	kill $(pgrep -f /usr/sbin/portmap)
+	kill $(pgrep -f /usr/bin/xdm)
 	;;
 restart)
 	sh $0 stop
diff --git a/package/xdm/files/xdm.postinst b/package/xdm/files/xdm.postinst
new file mode 100644
index 000000000..be112629e
--- /dev/null
+++ b/package/xdm/files/xdm.postinst
@@ -0,0 +1,3 @@
+#!/bin/sh
+. $IPKG_INSTROOT/etc/functions.sh
+add_rcconf xdm xdm YES
diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs
index f53064b6e..03e191be3 100644
--- a/target/linux/config/Config.in.fs
+++ b/target/linux/config/Config.in.fs
@@ -104,6 +104,7 @@ config ADK_KPACKAGE_KMOD_EXT3_FS
 	  (available at <http://sourceforge.net/projects/e2fsprogs/>).
 
 config ADK_KERNEL_EXT4_FS
+	prompt "ext4.............................. EXT4 filesystem support (kernel)"
 	boolean
 	select ADK_KERNEL_CRC16
 	default n