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

11 files changed, 191 insertions, 8 deletions

diff --git a/TODO b/TODO
index e8d039a36..9c121685d 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,8 @@
-- keyboard layout support
 - relocatable gcc
 - adkinstall with NTP and hwclock support
 - newtarget simplify and make target like newpackage
 - PKG_CONFLICTS for python/python2, is this possible with Kconfig?
 - mirror only option, no internet access
-- vim tabbing for split command - terminal issue
 - check alsa on foxg20 target
 - fix ARM OABI support
 - fix watchdog for alix1c (mfgpt timers problem)
diff --git a/package/busybox/Makefile b/package/busybox/Makefile
index cf093bd19..b6ddc2363 100644
--- a/package/busybox/Makefile
+++ b/package/busybox/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		busybox
 PKG_VERSION:=		1.17.2
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		7360b7138b899ee7fc885791c740c3c3
 PKG_DESCR:=		Core utilities for embedded systems
 PKG_SECTION:=		base
diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in
index e22c7d566..069eab70d 100644
--- a/package/busybox/config/coreutils/Config.in
+++ b/package/busybox/config/coreutils/Config.in
@@ -590,7 +590,7 @@ config BUSYBOX_FEATURE_FANCY_SLEEP
 
 config BUSYBOX_FEATURE_FLOAT_SLEEP
 	bool "Enable fractional arguments"
-	default n
+	default y
 	depends on BUSYBOX_FEATURE_FANCY_SLEEP
 	help
 	  Allow for fractional numeric parameters.
diff --git a/package/busybox/files/busybox.postinst b/package/busybox/files/busybox.postinst
index 9f1f9987b..f9f8e212b 100644
--- a/package/busybox/files/busybox.postinst
+++ b/package/busybox/files/busybox.postinst
@@ -1,4 +1,5 @@
 #!/bin/sh
+if [ -z $IPKG_INSTROOT ];then chmod u+s /bin/busybox;fi
 . $IPKG_INSTROOT/etc/functions.sh
 add_rcconf network network YES
 add_rcconf crond crond NO
diff --git a/package/busybox/patches/008-ps.patch b/package/busybox/patches/008-ps.patch
new file mode 100644
index 000000000..7e9e2dd70
--- /dev/null
+++ b/package/busybox/patches/008-ps.patch
@@ -0,0 +1,110 @@
+--- busybox-1.17.2.orig/procps/ps.c	2010-08-23 02:44:35.000000000 +0200
++++ busybox-1.17.2/procps/ps.c	2010-11-27 23:47:59.000000000 +0100
+@@ -14,8 +14,6 @@
+ /* Absolute maximum on output line length */
+ enum { MAX_WIDTH = 2*1024 };
+ 
+-#if ENABLE_DESKTOP
+-
+ #include <sys/times.h> /* for times() */
+ #ifndef AT_CLKTCK
+ #define AT_CLKTCK 17
+@@ -544,98 +542,3 @@ int ps_main(int argc UNUSED_PARAM, char 
+ 
+ 	return EXIT_SUCCESS;
+ }
+-
+-
+-#else /* !ENABLE_DESKTOP */
+-
+-
+-int ps_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+-int ps_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
+-{
+-	procps_status_t *p;
+-	int psscan_flags = PSSCAN_PID | PSSCAN_UIDGID
+-			| PSSCAN_STATE | PSSCAN_VSZ | PSSCAN_COMM;
+-	unsigned terminal_width IF_NOT_FEATURE_PS_WIDE(= 79);
+-	enum {
+-		OPT_Z = (1 << 0) * ENABLE_SELINUX,
+-		OPT_T = (1 << ENABLE_SELINUX) * ENABLE_FEATURE_SHOW_THREADS,
+-	};
+-	int opts = 0;
+-	/* If we support any options, parse argv */
+-#if ENABLE_SELINUX || ENABLE_FEATURE_SHOW_THREADS || ENABLE_FEATURE_PS_WIDE
+-# if ENABLE_FEATURE_PS_WIDE
+-	/* -w is a bit complicated */
+-	int w_count = 0;
+-	opt_complementary = "-:ww";
+-	opts = getopt32(argv, IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T")"w", &w_count);
+-	/* if w is given once, GNU ps sets the width to 132,
+-	 * if w is given more than once, it is "unlimited"
+-	 */
+-	if (w_count) {
+-		terminal_width = (w_count == 1) ? 132 : MAX_WIDTH;
+-	} else {
+-		get_terminal_width_height(0, &terminal_width, NULL);
+-		/* Go one less... */
+-		if (--terminal_width > MAX_WIDTH)
+-			terminal_width = MAX_WIDTH;
+-	}
+-# else
+-	/* -w is not supported, only -Z and/or -T */
+-	opt_complementary = "-";
+-	opts = getopt32(argv, IF_SELINUX("Z")IF_FEATURE_SHOW_THREADS("T"));
+-# endif
+-#endif
+-
+-#if ENABLE_SELINUX
+-	if ((opts & OPT_Z) && is_selinux_enabled()) {
+-		psscan_flags = PSSCAN_PID | PSSCAN_CONTEXT
+-				| PSSCAN_STATE | PSSCAN_COMM;
+-		puts("  PID CONTEXT                          STAT COMMAND");
+-	} else
+-#endif
+-	{
+-		puts("  PID USER       VSZ STAT COMMAND");
+-	}
+-	if (opts & OPT_T) {
+-		psscan_flags |= PSSCAN_TASKS;
+-	}
+-
+-	p = NULL;
+-	while ((p = procps_scan(p, psscan_flags)) != NULL) {
+-		int len;
+-#if ENABLE_SELINUX
+-		if (psscan_flags & PSSCAN_CONTEXT) {
+-			len = printf("%5u %-32.32s %s  ",
+-					p->pid,
+-					p->context ? p->context : "unknown",
+-					p->state);
+-		} else
+-#endif
+-		{
+-			const char *user = get_cached_username(p->uid);
+-			//if (p->vsz == 0)
+-			//	len = printf("%5u %-8.8s        %s ",
+-			//		p->pid, user, p->state);
+-			//else
+-			{
+-				char buf6[6];
+-				smart_ulltoa5(p->vsz, buf6, " mgtpezy");
+-				buf6[5] = '\0';
+-				len = printf("%5u %-8.8s %s %s  ",
+-					p->pid, user, buf6, p->state);
+-			}
+-		}
+-
+-		{
+-			int sz = terminal_width - len;
+-			char buf[sz + 1];
+-			read_cmdline(buf, sz, p->pid, p->comm);
+-			puts(buf);
+-		}
+-	}
+-	if (ENABLE_FEATURE_CLEAN_UP)
+-		clear_username_cache();
+-	return EXIT_SUCCESS;
+-}
+-
+-#endif /* !ENABLE_DESKTOP */
diff --git a/package/keychain/Makefile b/package/keychain/Makefile
new file mode 100644
index 000000000..81cad89df
--- /dev/null
+++ b/package/keychain/Makefile
@@ -0,0 +1,30 @@
+# 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:=		keychain
+PKG_VERSION:=		2.7.1
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		07c622833192189f483cbaec287f9704
+PKG_DESCR:=		manage ssh and GPG keys in a secure manner
+PKG_SECTION:=		crypto
+PKG_URL:=		http://www.funtoo.org/en/security/keychain/intro/
+PKG_SITES:=		http://www.funtoo.org/archive/keychain/
+
+DISTFILES:=             ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,KEYCHAIN,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIG_STYLE:=		manual
+INSTALL_STYLE:=		manual
+ALL_TARGET:=		keychain
+
+do-install:
+	$(INSTALL_DIR) $(IDIR_KEYCHAIN)/usr/bin
+	$(INSTALL_BIN) $(WRKBUILD)/keychain \
+		$(IDIR_KEYCHAIN)/usr/bin
+
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/keychain/patches/patch-Makefile b/package/keychain/patches/patch-Makefile
new file mode 100644
index 000000000..487051824
--- /dev/null
+++ b/package/keychain/patches/patch-Makefile
@@ -0,0 +1,11 @@
+--- keychain-2.7.1.orig/Makefile	2010-05-07 19:24:14.000000000 +0200
++++ keychain-2.7.1/Makefile	2010-11-27 23:36:29.000000000 +0100
+@@ -44,7 +44,7 @@ GENKEYCHAINPL = open P, "keychain.txt" o
+ 			s/\#\#VERSION\#\#/$V/g || die; \
+ 		print
+ 
+-keychain: keychain.sh keychain.txt
++keychain: keychain.sh
+ 	perl -e '$(GENKEYCHAINPL)' >keychain || rm -f keychain
+ 	chmod +x keychain
+ 
diff --git a/package/sudo/files/sudo.postinst b/package/sudo/files/sudo.postinst
index 300ea80ef..a392a58c4 100644
--- a/package/sudo/files/sudo.postinst
+++ b/package/sudo/files/sudo.postinst
@@ -1,3 +1,2 @@
 #!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-chmod u+s /usr/bin/sudo
+if [ -z $IPKG_INSTROOT ];then chmod u+s /usr/bin/sudo;fi
diff --git a/package/vim/Makefile b/package/vim/Makefile
index 1eabf5555..206c43dc8 100644
--- a/package/vim/Makefile
+++ b/package/vim/Makefile
@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		vim
 PKG_VERSION:=		7.3
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		5b9510a17074e2b37d8bb38ae09edbf2
 PKG_DESCR:=		The text editor
 PKG_SECTION:=		editor
@@ -58,6 +58,9 @@ XAKE_FLAGS+=		prefix=/usr \
 
 post-install:
 	${INSTALL_DIR} ${IDIR_VIM}/usr/bin
+	${INSTALL_DIR} ${IDIR_VIM}/usr/share/vim
 	${CP} ${WRKINST}/usr/bin/{ex,vim,view} ${IDIR_VIM}/usr/bin
+	${CP} ${WRKINST}/usr/share/vim/vim73/vimrc_example.vim \
+		${IDIR_VIM}/usr/share/vim/vimrc
 
 include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xbindkeys/Makefile b/package/xbindkeys/Makefile
new file mode 100644
index 000000000..d40bfff35
--- /dev/null
+++ b/package/xbindkeys/Makefile
@@ -0,0 +1,31 @@
+# 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:=		xbindkeys
+PKG_VERSION:=		1.8.3
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		393dd74f85850a4ba0803b5a78bc598b
+PKG_DESCR:=		keybindings for X11
+PKG_SECTION:=		x11/apps
+PKG_SITES:=		http://openadk.org/distfiles/
+
+include $(TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,XBINDKEYS,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+
+CONFIGURE_ARGS+=	--disable-guile \
+			--disable-tk
+CONFIGURE_ENV+=		ac_cv_func_malloc_0_nonnull=yes
+#BUILD_STYLE:=		manual
+#INSTALL_STYLE:=	manual
+
+# please install all files and directories to the package dir
+post-install:
+	$(INSTALL_DIR) $(IDIR_XBINDKEYS)/usr/bin
+	$(INSTALL_BIN) $(WRKINST)/usr/bin/xbindkeys \
+		$(IDIR_XBINDKEYS)/usr/bin
+
+# please remove ALL above comments, before commiting
+include ${TOPDIR}/mk/pkg-bottom.mk
diff --git a/package/xorg-server/files/xorg-server.postinst b/package/xorg-server/files/xorg-server.postinst
index 0d8bd0d14..4d8403d7d 100644
--- a/package/xorg-server/files/xorg-server.postinst
+++ b/package/xorg-server/files/xorg-server.postinst
@@ -1,5 +1,5 @@
 #!/bin/sh
+if [ -z $IPKG_INSTROOT ];then chmod u+s /usr/bin/X;fi
 . $IPKG_INSTROOT/etc/functions.sh
 gid=$(get_next_gid)
 add_group video $gid
-chmod u+s /usr/bin/X