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

TODO

@@ -1,12 +1,11 @@
+- rework startup, maybe use init.c, start gettys after bootup ready
+- more output for initscripts on bootup
 - port uuterm
 - move tools to package host infrastructure, resolve dependency handling for host tools
 - finish miniconfig + cleanup
 - qemu-sh serial
 - choice qemu with graphic
 - x32 musl
-- socat openssl flavour + update
-- hash-style=gnu for non-mips and non-musl
-- add misp64 n32/n64 toolchains
 - hash-style=gnu for non-mips and non-musl
 - add fb full screen logo
 - port opkg with gpg signing

mk/build.mk

@@ -310,7 +310,7 @@ all: menuconfig
 # ---------------------------------------------------------------------------
 
 # force entering the subdir, as dependency checking is done there
-.PHONY: $(CONFIG)/conf $(CONFIG)/mconf $(CONFIG)/gconf
+.PHONY: $(CONFIG)/conf $(CONFIG)/mconf
 
 $(CONFIG)/conf:
 	@$(MAKE) -C $(CONFIG) conf
@@ -318,9 +318,6 @@ $(CONFIG)/conf:
 $(CONFIG)/mconf:
 	@$(MAKE) -C $(CONFIG)
 
-$(CONFIG)/gconf:
-	@$(MAKE) -C $(CONFIG) gconf
-
 defconfig: .menu $(CONFIG)/conf
 	@${BASH} ${TOPDIR}/scripts/update-sys
 	@${BASH} ${TOPDIR}/scripts/update-pkg

mk/perl.mk

@@ -1,2 +1,2 @@
-PERL_VERSION=5.12.3
+PERL_VERSION=5.18.1
 PERL_SITEDIR:=/usr/lib/perl5/site_perl/$(PERL_VERSION)/$(CPU_ARCH)-linux

package/busybox/config/shell/Config.in

@@ -8,7 +8,7 @@ menu "Shells"
 
 config BUSYBOX_ASH
 	bool "ash"
-	default y
+	default n
 	depends on !BUSYBOX_NOMMU
 	help
 	  Tha 'ash' shell adds about 60k in the default configuration and is

package/cyrus-sasl/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		cyrus-sasl
 PKG_VERSION:=		2.1.26
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		a7f4e5e559a0e37b3ffc438c9456e425
 PKG_DESCR:=		a general purpose authentication library
 PKG_SECTION:=		libs
@@ -21,10 +21,9 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
 
-CONFIGURE_ARGS+=	--enable-staticdlopen \
+CONFIGURE_ARGS+=	--enable-plain \
-			--enable-plain \
-			--enable-anon \
 			--enable-login \
+			--disable-anon \
 			--disable-cram \
 			--disable-digest \
 			--disable-scram \

package/cyrus-sasl/patches/patch-config_ltconfig

@@ -1,5 +1,14 @@
---- cyrus-sasl-2.1.23.orig/config/ltconfig	2003-06-12 02:32:43.000000000 +0200
+--- cyrus-sasl-2.1.26.orig/config/ltconfig	2012-10-12 16:05:48.000000000 +0200
-+++ cyrus-sasl-2.1.23/config/ltconfig	2011-08-08 10:54:43.509265006 +0200
++++ cyrus-sasl-2.1.26/config/ltconfig	2014-03-07 07:46:01.000000000 +0100
+@@ -2024,7 +2024,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no
 @@ -2034,16 +2034,7 @@ linux-gnu*)
    shlibpath_var=LD_LIBRARY_PATH
    shlibpath_overrides_runpath=no

package/epdfview/Makefile

@@ -1,31 +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:=		epdfview
-PKG_VERSION:=		0.1.8
-PKG_RELEASE:=		2
-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://openadk.org/distfiles
-
-PKG_CFLINE_EPDFVIEW:=  depends on ADK_BROKEN
-
-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

package/gdbm/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		gdbm
 PKG_VERSION:=		1.8.3
-PKG_RELEASE:=		2
+PKG_RELEASE:=		3
 PKG_MD5SUM:=		1d1b1d5c0245b1c00aff92da751e9aa1
 PKG_DESCR:=		disk file format database
 PKG_SECTION:=		libs

package/gdbm/patches/patch-configure

@@ -0,0 +1,11 @@
+--- gdbm-1.8.3.orig/configure	2002-10-15 23:53:26.000000000 +0200
++++ gdbm-1.8.3/configure	2014-03-07 10:48:33.000000000 +0100
+@@ -5532,7 +5532,7 @@ linux-gnuoldld* | linux-gnuaout* | linux
+   ;;
+ 
+ # This must be Linux ELF.
+-linux-gnu*)
++linux-*)
+   version_type=linux
+   need_lib_prefix=no
+   need_version=no

package/jamvm/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		jamvm
 PKG_VERSION:=		1.5.4
-PKG_RELEASE:=		3
+PKG_RELEASE:=		4
 PKG_MD5SUM:=		7654e9657691f5f09c4f481ed4686176
 PKG_DESCR:=		A Java Virtual Machine (JVM) implementation
 PKG_SECTION:=		lang
@@ -28,12 +28,6 @@ BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
 CONFIGURE_ARGS+=	--enable-ffi
-ifeq ($(ARCH),mips)
-CONFIGURE_ARGS+=	--disable-tls
-endif
-ifeq ($(ARCH),arm)
-CONFIGURE_ARGS+=	--disable-tls
-endif
 
 hostpost-install:
 	ln -sf ${STAGING_HOST_DIR}/usr/bin/jamvm ${STAGING_HOST_DIR}/usr/lib/jvm/bin/java

package/jikes/Makefile

@@ -8,6 +8,7 @@ PKG_VERSION:=		1.22
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		cda958c7fef6b43b803e1d1ef9afcb85
 PKG_DESCR:=		jikes java compiler
+PKG_BUILDDEP:=		jikes-host
 PKG_SECTION:=		lang
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=jikes/Jikes/1.22/}
 
@@ -17,6 +18,7 @@ include $(TOPDIR)/mk/host.mk
 include $(TOPDIR)/mk/package.mk
 
 $(eval $(call HOST_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE}))
+$(eval $(call PKG_template,JIKES,jikes,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
 HOST_STYLE:=		auto
 
@@ -26,6 +28,7 @@ hostpost-install:
 	$(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/bin/javac
 	$(CP) ${STAGING_HOST_DIR}/usr/bin/jikes ${STAGING_HOST_DIR}/usr/lib/jvm/jre/bin/javac
 
+jikes-install:
 
 include ${TOPDIR}/mk/host-bottom.mk
 include ${TOPDIR}/mk/pkg-bottom.mk

package/miax/Makefile

@@ -1,36 +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:=		miax
-PKG_VERSION:=		1.4
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		44f0d2ef46ee2697d890b7b96846adc7
-PKG_DESCR:=		A console iax (asterisk) client
-PKG_SECTION:=		misc
-PKG_DEPENDS:=		libpthread
-PKG_URL:=		http://sourceforge.net/projects/miax
-PKG_SITES:=		http://mesh.dl.sourceforge.net/sourceforge/miax/
-PKG_CFLINE_MIAX:=	depends on ADK_BROKEN
-
-DISTFILES:=		${PKG_NAME}_${PKG_VERSION}.tar.gz
-WRKDIST=		${WRKDIR}/${PKG_NAME}
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,MIAX,miax,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIG_STYLE:=		manual
-INSTALL_STYLE:=		manual
-
-MAKE_FLAGS+=		CC="${TARGET_CC}" \
-			OFLAGS="${TARGET_CFLAGS}" \
-			CPPFLAGS="${TARGET_CPPFLAGS}" \
-			LDFLAGS="${TARGET_LDFLAGS}"
-
-do-install:
-	${INSTALL_DIR} ${IDIR_MIAX}/usr/bin
-	${INSTALL_BIN} ${WRKBUILD}/miax ${IDIR_MIAX}/usr/bin/
-
-include ${TOPDIR}/mk/pkg-bottom.mk

package/miax/patches/01-cross.patch

@@ -1,24 +0,0 @@
-diff -ruN miax-1.4-old/Makefile miax-1.4-new/Makefile
---- miax.orig/Makefile	2005-04-27 18:56:13.000000000 +0200
-+++ miax/Makefile	2013-12-22 09:48:41.000000000 +0100
-@@ -1,4 +1,5 @@
--CFLAGS= -Iiax/ -Igsm/inc -DIAXC_IAX2 -DLIBIAX -g -DPOSIXSLEEP -DLINUX -O2 
-+OFLAGS= -02 -g
-+CFLAGS= -Iiax/ -Igsm/inc $(CPPFLAGS) -DIAXC_IAX2 -DLIBIAX -DPOSIXSLEEP -DLINUX $(OFLAGS)
- SYSLIBS=-lpthread -lm -lbluetooth
- 
- 
-@@ -32,11 +33,10 @@ OBJS=\
- 	miax.o
- 
- all: $(OBJS)
--	gcc $(OBJS) $(CFLAGS) $(SYSLIBS)  -o miax
--	cp miax /bin/miax
-+	$(CC) $(OBJS) $(CFLAGS) $(LDFLAGS) $(SYSLIBS) -o miax
- 
- static: $(OBJS) bluetooth.o 
--	gcc $(OBJS) $(CFLAGS) $(SYSLIBS)  -static -o miax
-+	$(CC) $(OBJS) $(CFLAGS) $(LDFLAGS) $(SYSLIBS) -static -o miax
- 
- clean: 
- 	rm -f $(OBJS) miax 

package/mksh/Makefile

@@ -4,16 +4,15 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mksh
-PKG_VERSION:=		48b
+PKG_VERSION:=		49
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		ab9baa6b5a4de9d0e6a3ce9957c18da0
+PKG_MD5SUM:=		e8c205cac72c3dc8540bbc3897421422
 PKG_DESCR:=		MirBSD Korn Shell
 PKG_SECTION:=		shells
 PKG_URL:=		http://www.mirbsd.org/
 PKG_SITES:=		${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
 
-PKG_FLAVOURS_MKSH:=	FULL
+PKG_DFLT_MKSH:=		y if !ADK_TOOLCHAIN_ONLY
-PKGFD_FULL:=		Include all features
 
 DISTFILES=		${PKG_NAME}-R${PKG_VERSION}.tgz
 WRKDIST=		${WRKDIR}/${PKG_NAME}
@@ -22,10 +21,7 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MKSH,mksh,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-ifeq ($(strip ${ADK_PACKAGE_MKSH_FULL}),)
 TARGET_CPPFLAGS+=	-DMKSH_SMALL=1
-endif
-
 CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual

package/p5-XML-Parser/Makefile

@@ -5,14 +5,16 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		p5-XML-Parser
 PKG_VERSION:=		2.40
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		c66e9adba003d0667cc40115ccd837a5
 PKG_DESCR:=		XML::Parser
 PKG_SECTION:=		lang
-PKG_DEPENDS:=		libexpat
+PKG_DEPENDS:=		perl libexpat
-PKG_BUILDDEP:=		expat
+PKG_BUILDDEP:=		perl-host expat
 PKG_SITES:=		http://search.cpan.org/CPAN/authors/id/C/CH/CHORNY/
 
+PKG_CFLINE_P5_XML_PARSER:=	depends on ADK_BROKEN
+
 DISTFILES:=             XML-Parser-${PKG_VERSION}.tar.gz
 WRKDIST=		${WRKDIR}/XML-Parser-${PKG_VERSION}
 
@@ -26,7 +28,10 @@ XAKE_FLAGS+=		CC="$(TARGET_CC)" CCFLAGS="$(TARGET_CFLAGS)"
 include $(TOPDIR)/mk/perl.mk
 
 pre-build:
-	(cd ${WRKSRC} && perl Makefile.PL EXPATLIBPATH=${STAGING_TARGET_DIR}/usr/lib EXPATINCPATH=${STAGING_TARGET_DIR}/usr/include)
+	(cd ${WRKSRC} && PATH='${HOST_PATH}' \
+		perl-host Makefile.PL \
+		EXPATLIBPATH=${STAGING_TARGET_DIR}/usr/lib \
+		EXPATINCPATH=${STAGING_TARGET_DIR}/usr/include)
 
 p5-xml-parser-install:
 	$(INSTALL_DIR) $(IDIR_P5_XML_PARSER)$(PERL_SITEDIR)

package/proftpd/Makefile

@@ -1,43 +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:=		proftpd
-PKG_VERSION:=		1.3.4d
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		13c6fd7ce320886adc371c81a3e23f07
-PKG_DESCR:=		A very configurable FTP server
-PKG_SECTION:=		www
-PKG_URL:=		http://www.proftpd.org/
-PKG_SITES:=		ftp://ftp.proftpd.org/distrib/source/
-PKG_NOPARALLEL:=	1
-
-PKG_LIBC_DEPENDS:=	glibc
-PKG_CFLINE_PROFTPD:=	depends on ADK_BROKEN
-
-PKG_FLAVOURS_PROFTPD:=	WITH_FTPUSERS
-PKGFD_WITH_FTPUSERS:=	install /etc/ftpusers along with proftpd
-
-include $(TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,PROFTPD,proftpd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-CONFIGURE_ARGS+=	--disable-cap
-CONFIGURE_ENV+=		ac_cv_func_setpgrp_void=yes \
-			ac_cv_func_setgrent_void=yes
-TARGET_LDFLAGS+=	-ltinfo
-
-proftpd-install:
-	$(INSTALL_DIR) $(IDIR_PROFTPD)/etc
-	$(INSTALL_DATA) ./files/proftpd.conf $(IDIR_PROFTPD)/etc/
-	$(INSTALL_DIR) $(IDIR_PROFTPD)/usr/{s,}bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/ftp{count,dctl,top,who} \
-		$(IDIR_PROFTPD)/usr/bin/
-	$(INSTALL_BIN) $(WRKINST)/usr/sbin/{ftpshut,proftpd} \
-		$(IDIR_PROFTPD)/usr/sbin/
-ifeq (${ADK_PACKAGE_PROFTPD_WITH_FTPUSERS},y)
-	${INSTALL_DATA} ./files/ftpusers ${IDIR_PROFTPD}/etc/
-endif
-
-include ${TOPDIR}/mk/pkg-bottom.mk

package/proftpd/files/ftpusers

@@ -1,37 +0,0 @@
-# Provided by ftpbase (dont remove this line!)
-# /etc/ftpusers: list of users disallowed FTP access
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftpbase/files/ftpusers,v 1.1 2005/06/28 14:52:26 uberlord Exp $
-
-halt
-operator
-root
-shutdown
-sync
-bin
-daemon
-adm
-lp
-mail
-postmaster
-news
-uucp
-man
-games
-at
-cron
-www
-named
-squid
-gdm
-mysql
-postgres
-guest
-nobody
-alias
-qmaild
-qmaill
-qmailp
-qmailq
-qmailr
-qmails
-postfix

package/proftpd/files/proftpd.conf

@@ -1,60 +0,0 @@
-ServerName			"ProFTPD Default Installation"
-ServerType			standalone
-DefaultServer			on
-
-# Port 21 is the standard FTP port.
-Port				21
-
-# Don't use IPv6 support by default.
-UseIPv6				off
-
-# Umask 022 is a good standard umask to prevent new dirs and files
-# from being group and world writable.
-Umask				022
-
-# To prevent DoS attacks, set the maximum number of child processes
-# to 30.  If you need to allow more than 30 concurrent connections
-# at once, simply increase this value.  Note that this ONLY works
-# in standalone mode, in inetd mode you should use an inetd server
-# that allows you to limit maximum number of processes per service
-# (such as xinetd).
-MaxInstances			30
-
-# Set the user and group under which the server will run.
-User				nobody
-Group				nogroup
-
-# To cause every FTP user to be "jailed" (chrooted) into their home
-# directory, uncomment this line.
-#DefaultRoot ~
-
-# Normally, we want files to be overwriteable.
-AllowOverwrite		on
-
-# Bar use of SITE CHMOD by default
-<Limit SITE_CHMOD>
-  DenyAll
-</Limit>
-
-# A basic anonymous configuration, no upload directories.  If you do not
-# want anonymous users, simply delete this entire <Anonymous> section.
-<Anonymous ~ftp>
-  User				ftp
-  Group				ftp
-
-  # We want clients to be able to login with "anonymous" as well as "ftp"
-  UserAlias			anonymous ftp
-
-  # Limit the maximum number of anonymous logins
-  MaxClients			10
-
-  # We want 'welcome.msg' displayed at login, and '.message' displayed
-  # in each newly chdired directory.
-  DisplayLogin			welcome.msg
-  DisplayChdir			.message
-
-  # Limit WRITE everywhere in the anonymous chroot
-  <Limit WRITE>
-    DenyAll
-  </Limit>
-</Anonymous>

package/proftpd/files/proftpd.conffiles

@@ -1,2 +0,0 @@
-/etc/proftpd.conf
-/etc/ftpusers

package/proftpd/files/proftpd.init

@@ -1,29 +0,0 @@
-#!/bin/sh
-#PKG proftpd
-#INIT 60
-. /etc/rc.conf
-
-case $1 in
-autostop) ;;
-autostart)
-	test x"${proftpd:-NO}" = x"NO" && exit 0
-	exec sh $0 start
-	;;
-start)
-	[ -f /etc/proftpd.conf ] || exit
-	/usr/sbin/proftpd
-	;;
-stop)
-	kill $(pgrep -f /usr/sbin/proftpd)
-	;;
-restart)
-	sh $0 stop
-	sleep 1
-	sh $0 start
-	;;
-*)
-	echo "Usage: $0 {start | stop | restart}"
-	exit 1
-	;;
-esac
-exit $?

package/proftpd/files/proftpd.postinst

@@ -1,3 +0,0 @@
-#!/bin/sh
-. $IPKG_INSTROOT/etc/functions.sh
-add_rcconf proftpd proftpd NO

package/proftpd/patches/patch-Make_rules_in

@@ -1,16 +0,0 @@
-	do not try to set user or group id when installing
---- proftpd-1.3.3.orig/Make.rules.in	2009-11-18 22:48:25.000000000 +0100
-+++ proftpd-1.3.3/Make.rules.in	2010-05-30 12:47:38.265625000 +0200
-@@ -28,9 +28,9 @@ UTILS_LIBS=@UTILS_LIBS@ @LIBS@
- INSTALL=@INSTALL@
- INSTALL_USER=@install_user@
- INSTALL_GROUP=@install_group@
--INSTALL_BIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
--INSTALL_SBIN=$(INSTALL) @INSTALL_STRIP@ -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755
--INSTALL_MAN=$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644
-+INSTALL_BIN=$(INSTALL) -m 0755
-+INSTALL_SBIN=$(INSTALL) -m 0755
-+INSTALL_MAN=$(INSTALL) -m 0644
- 
- RM=rm -f
- SHELL=@CONFIG_SHELL@

package/proftpd/patches/patch-Makefile_in

@@ -1,33 +0,0 @@
-	hiding it won't help, we install as non-root so no chown possible
---- proftpd-1.3.3.orig/Makefile.in	2009-12-16 00:24:42.000000000 +0100
-+++ proftpd-1.3.3/Makefile.in	2010-05-30 12:47:41.187500000 +0200
-@@ -79,7 +79,6 @@ check: proftpd$(EXEEXT)
- $(DESTDIR)$(localedir) $(DESTDIR)$(includedir) $(DESTDIR)$(includedir)/proftpd $(DESTDIR)$(libdir) $(DESTDIR)$(pkgconfigdir) $(DESTDIR)$(libdir)/proftpd $(DESTDIR)$(libexecdir) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man8:
- 	@if [ ! -d $@ ]; then \
- 		mkdir -p $@; \
--		chown $(INSTALL_USER):$(INSTALL_GROUP) $@; \
- 		chmod 0755 $@; \
- 	fi
- 
-@@ -89,7 +88,6 @@ install-proftpd: proftpd $(DESTDIR)$(inc
- 		rm -f $(DESTDIR)$(sbindir)/in.proftpd ; \
- 	fi
- 	ln -s proftpd $(DESTDIR)$(sbindir)/in.proftpd
--	-chown -h $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(sbindir)/in.proftpd
- 
- install-libs: $(DESTDIR)$(libdir)/proftpd
- 	cd lib/ && $(MAKE) install
-@@ -125,11 +123,11 @@ install-utils: $(DESTDIR)$(sbindir) $(DE
- 	$(INSTALL_SBIN) ftpshut  $(DESTDIR)$(sbindir)/ftpshut
- 	$(INSTALL_BIN)  ftptop   $(DESTDIR)$(bindir)/ftptop
- 	$(INSTALL_BIN)  ftpwho   $(DESTDIR)$(bindir)/ftpwho
--	$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
-+	$(INSTALL) -m 0755 src/prxs $(DESTDIR)$(bindir)/prxs
- 
- install-conf: $(DESTDIR)$(sysconfdir)
- 	if [ ! -f $(DESTDIR)$(sysconfdir)/proftpd.conf ] ; then \
--		$(INSTALL) -o $(INSTALL_USER) -g $(INSTALL_GROUP) -m 0644 \
-+		$(INSTALL) -m 0644 \
- 		           $(top_srcdir)/sample-configurations/basic.conf \
- 	       	           $(DESTDIR)$(sysconfdir)/proftpd.conf ; \
- 	fi

package/proftpd/patches/patch-locale_Makefile_in

@@ -1,11 +0,0 @@
-	drop anything that has to do with owner/group changing *grrr*
---- proftpd-1.3.2b.orig/locale/Makefile.in	2009-04-29 00:50:22.000000000 +0200
-+++ proftpd-1.3.2b/locale/Makefile.in	2010-01-20 18:03:53.909480484 +0100
-@@ -51,7 +51,6 @@ install: $(LANGS)
- 		if [ -f $$lang.mo ]; then \
-  			if [ ! -d $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES ]; then \
- 				mkdir -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
--				chown $(INSTALL_USER):$(INSTALL_GROUP) $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
- 				chmod 0755 $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES; \
- 			fi; \
- 			$(INSTALL_MAN) $$lang.mo $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \

package/proftpd/patches/patch-modules_mod_auth_unix_c

@@ -1,29 +0,0 @@
---- proftpd-1.3.3.orig/modules/mod_auth_unix.c	2009-10-14 20:49:31.000000000 +0200
-+++ proftpd-1.3.3/modules/mod_auth_unix.c	2010-05-30 13:02:15.515625000 +0200
-@@ -77,6 +77,7 @@
- # endif
- #endif /* PR_USE_SIA */
- 
-+/*
- #ifdef CYGWIN
- typedef void *HANDLE;
- typedef unsigned long DWORD;
-@@ -85,7 +86,8 @@ typedef unsigned long DWORD;
- DWORD WINAPI GetVersion(void);
- extern HANDLE cygwin_logon_user (const struct passwd *, const char *);
- extern void cygwin_set_impersonation_token (const HANDLE);
--#endif /* CYGWIN */
-+#endif 
-+*/
- 
- #ifdef SETGRENT_VOID
- # define RETSETGRENTTYPE	void
-@@ -738,7 +740,7 @@ MODRET pw_check(cmd_rec *cmd) {
- 
- #else /* !PR_USE_SIA */
- 
--# ifdef CYGWIN
-+# if 0
-   /* We have to do special Windows NT voodoo with Cygwin in order to be
-    * able to switch UID/GID. More info at
-    * http://cygwin.com/cygwin-ug-net/ntsec.html#NTSEC-SETUID

package/ussp-push/Makefile

@@ -1,28 +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:=		ussp-push
-PKG_VERSION:=		0.11
-PKG_RELEASE:=		1
-PKG_MD5SUM:=		5c44983ee27809867041feff6bb4423a
-PKG_DESCR:=		OBEX push command
-PKG_SECTION:=		misc
-PKG_DEPENDS:=		openobex
-PKG_BUILDDEP:=		openobex
-PKG_SITES:=		http://xmailserver.org/
-PKG_CFLINE_USSP_PUSH:=	depends on ADK_BROKEN
-
-include ${TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,USSP_PUSH,ussp-push,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-
-MAKE_FLAGS+=		OBEXINC="${TARGET_CPPFLAGS}" \
-			OBEXLIB="${TARGET_LDFLAGS} -lopenobex -lbluetooth"
-
-ussp-push-install:
-	${INSTALL_DIR} ${IDIR_USSP_PUSH}/usr/bin
-	${INSTALL_BIN} ${WRKINST}/usr/bin/ussp-push ${IDIR_USSP_PUSH}/usr/bin/
-
-include ${TOPDIR}/mk/pkg-bottom.mk

package/ussp-push/patches/patch-src_obex_socket_c

@@ -1,21 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- ussp-push-0.11.orig/src/obex_socket.c	2008-08-24 22:48:53.000000000 +0200
-+++ ussp-push-0.11/src/obex_socket.c	2008-10-16 11:08:10.000000000 +0200
-@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c
- 	for (i = 0; i < niinf; i++) {
- 		char devname[128];
- 
--		if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
-+		if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1,
- 				    devname, 100000) >= 0) {
- 			if (strcasecmp(devname, btname) == 0) {
- 				*btaddr = piinf[i].bdaddr;
-@@ -297,7 +297,7 @@ static int cobex_init(struct cobex_conte
- 			gt->wfd = gt->rfd;
- 
- 			tcgetattr(gt->rfd, &gt->oldtio);
--			bzero(&gt->newtio, sizeof(struct termios));
-+			memset(&gt->newtio, 0, sizeof(struct termios));
- 			gt->newtio.c_cflag = B115200 | CS8 | CREAD;
- 			gt->newtio.c_iflag = IGNPAR;
- 			gt->newtio.c_oflag = 0;

scripts/create.sh

@@ -2,7 +2,7 @@
 #-
 # Copyright © 2010, 2011, 2012
 #	Thorsten Glaser <tg@mirbsd.org>
-# Copyright © 2010, 2011
+# Copyright © 2010-2014
 #	Waldemar Brodkorb <wbx@openadk.org>
 #
 # Provided that these terms and disclaimer and all copyright notices
@@ -36,19 +36,6 @@ case :$PATH: in
 (*) export PATH=$PATH:$TOPDIR/host_$HOST/usr/bin ;;
 esac
 
-test -n "$KSH_VERSION" || if ! which mksh >/dev/null 2>&1; then
-	make package=mksh fetch || exit 1
-	df=mksh-R48b.tgz
-	rm -rf build_mksh
-	mkdir -p build_mksh
-	gzip -dc dl/"$df" | (cd build_mksh; cpio -mid)
-	cd build_mksh/mksh
-	bash Build.sh -r -c lto || bash Build.sh -r || exit 1
-	cp mksh "$TOPDIR"/host_$HOST/usr/bin
-	cd "$TOPDIR"
-	rm -rf build_mksh
-fi
-
 test -n "$KSH_VERSION" || exec mksh "$me" "$@"
 if test -z "$KSH_VERSION"; then
 	echo >&2 Fatal error: could not run myself with mksh!

scripts/scan-pkgs.sh

@@ -83,11 +83,4 @@ if [[ -n $NEED_JAVA ]]; then
 	fi
 fi
 
-if [[ -n $ADK_USE_CCACHE ]]; then
-        if ! which ccache >/dev/null 2>&1; then
-                echo >&2 You have selected to build with ccache, but ccache could not be found.
-                out=1
-        fi
-fi
-
 exit $out

target/config/Config.in.adk

@@ -46,6 +46,7 @@ config ADK_WGET_TIMEOUT
 
 config ADK_USE_CCACHE
 	bool "Use ccache to speedup recompilation"
+	select ADK_HOST_NEED_CCACHE
 	default n
 	help
 	  Useful if you have enough space for the cache and need speedup compilation.

target/config/Config.in.runtime

@@ -50,7 +50,7 @@ config ADK_RUNTIME_CONSOLE_VGA
 config ADK_RUNTIME_CONSOLE_SERIAL
 	bool "console output on serial"
 	help
-	  Start getty on serial console. (ttyS0)
+	  Start getty on serial console.
 
 config ADK_RUNTIME_CONSOLE_BOTH
 	bool "console output on VGA and serial"
@@ -74,7 +74,14 @@ config ADK_RUNTIME_KBD_LAYOUT
 
 choice
 prompt "Initial login shell for the root user"
-default ADK_ROOTSH_ASH
+default ADK_ROOTSH_MKSH
+
+config ADK_ROOTSH_MKSH
+	select ADK_PACKAGE_MKSH
+	bool "mksh (MirBSD Korn Shell)"
+	help
+	  Use mksh (a Korn Shell variant) as standard login shell
+	  for the superuser.
 
 config ADK_ROOTSH_ASH
 	select BUSYBOX_ASH
@@ -114,7 +121,14 @@ endchoice
 
 choice
 prompt "System /bin/sh (POSIX script shell)"
-default ADK_BINSH_ASH
+default ADK_BINSH_MKSH
+
+config ADK_BINSH_MKSH
+	select ADK_PACKAGE_MKSH
+	bool "mksh (MirBSD Korn Shell)"
+	help
+	  Use mksh (a Korn Shell variant) as system shell, which is
+	  both small and powerful, so quite suited for this task.
 
 config ADK_BINSH_ASH
 	select BUSYBOX_ASH
@@ -131,13 +145,6 @@ config ADK_BINSH_BASH
 	  Use GNU bash as system shell. This is discouraged due to
 	  its size and slowness.
 
-config ADK_BINSH_MKSH
-	select ADK_PACKAGE_MKSH
-	bool "mksh (MirBSD Korn Shell)"
-	help
-	  Use mksh (a Korn Shell variant) as system shell, which is
-	  both small and powerful, so quite suited for this task.
-
 config ADK_BINSH_ZSH
 	select ADK_PACKAGE_ZSH
 	bool "zsh (The Z Shell)"

target/config/Config.in.tools

@@ -34,6 +34,10 @@ config ADK_HOST_NEED_XZ
 	boolean
 	default n
 
+config ADK_HOST_NEED_CCACHE
+	boolean
+	default n
+
 config ADK_TOOLS_ADDPATTERN_ARGS
 	string
 	default "-p W54G -v v4.20.6" if ADK_TARGET_BROADCOM_MODEL_LINKSYS_WRT54G

toolchain/gcc/Makefile

@@ -18,6 +18,7 @@ GCC_CONFOPTS=		--prefix=$(STAGING_HOST_DIR) \
 			--with-libelf=$(STAGING_HOST_DIR) \
 			--disable-__cxa_atexit \
 			--with-gnu-ld \
+			--with-gnu-as \
 			--disable-libsanitizer \
 			--disable-libitm \
 			--disable-libmudflap \
@@ -180,6 +181,7 @@ $(GCC_BUILD_DIR_FINAL)/.configured:
 		$(WRKBUILD)/configure \
 			${GCC_CONFOPTS} \
 			--enable-languages=$(LANGUAGES) \
+			--with-build-sysroot='$${prefix}/${STAGING_HOST2TARGET}' \
 			--with-sysroot='$${prefix}/${STAGING_HOST2TARGET}' \
 			--enable-shared
 	touch $@

toolchain/uClibc/Makefile

@@ -114,8 +114,6 @@ endif
 		RUNTIME_PREFIX=/ \
 		CPU_CFLAGS="$(TARGET_CFLAGS)" \
 		all install_runtime
-	rm -rf $(STAGING_TARGET_DIR)/lib/libc.so
-	ln -s libc.so.0 $(STAGING_TARGET_DIR)/lib/libc.so
 	# cleanup toolchain
 	-find $(STAGING_TARGET_DIR) $(STAGING_HOST_DIR) -name \*.la -delete
 ifeq ($(ADK_TOOLCHAIN),y)

tools/Makefile

@@ -3,7 +3,7 @@
 
 include $(TOPDIR)/rules.mk
 
-TARGETS:=adk mkcrypt cpio m4 flex bc bzip2 xz
+TARGETS:=adk mksh mkcrypt cpio m4 flex bc bzip2 xz
 
 ifeq ($(ADK_HOST_NEED_GENEXT2FS),y)
 TARGETS+=genext2fs
@@ -29,6 +29,9 @@ endif
 ifeq ($(ADK_HOST_NEED_LZMA),y)
 TARGETS+=lzma
 endif
+ifeq ($(ADK_HOST_NEED_CCACHE),y)
+TARGETS+=ccache
+endif
 
 TARGETS_INSTALL:=$(patsubst %,%-install,$(TARGETS))
 TARGETS_CLEAN:=$(patsubst %,%-clean,$(TARGETS))

tools/ccache/Makefile

@@ -0,0 +1,25 @@
+# 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:=		ccache
+PKG_VERSION:=		3.1.9
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		a5e9954b1dae036762f7b13673a2cf76
+PKG_SITES:=		http://samba.org/ftp/ccache/
+
+include ../rules.mk
+
+install: ${STAGING_HOST_DIR}/usr/bin/ccache
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
+	(cd ${WRKBUILD}; ./configure --prefix=$(STAGING_HOST_DIR)/usr)
+	${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}'
+	touch $@
+
+${STAGING_HOST_DIR}/usr/bin/ccache: $(WRKBUILD)/.compiled
+	$(INSTALL_BIN) $(WRKBUILD)/ccache \
+		${STAGING_HOST_DIR}/usr/bin
+
+include $(TOPDIR)/mk/tools.mk

tools/mksh/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:=		mksh
+PKG_VERSION:=		49
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		e8c205cac72c3dc8540bbc3897421422
+PKG_SITES:=		${MASTER_SITE_MIRBSD:distfiles/=dist/mir/mksh/}
+
+DISTFILES=		${PKG_NAME}-R${PKG_VERSION}.tgz
+WRKDIST=		${WRKDIR}/${PKG_NAME}
+
+include ../rules.mk
+
+install: ${STAGING_HOST_DIR}/usr/bin/mksh
+
+$(WRKBUILD)/.compiled: ${WRKDIST}/.prepared
+	cd ${WRKBUILD} && CC='${TARGET_CC}' CFLAGS='${TARGET_CFLAGS}' \
+	    CPPFLAGS='${TARGET_CPPFLAGS}' LDFLAGS='${TARGET_LDFLAGS}' \
+	    HAVE_CAN_FSTACKPROTECTORALL=0 \
+	    TARGET_OS=Linux ${BASH} ${WRKSRC}/Build.sh -Q -r -c lto
+	touch $@
+
+${STAGING_HOST_DIR}/usr/bin/mksh: $(WRKBUILD)/.compiled
+	${INSTALL_BIN} ${WRKBUILD}/mksh \
+		${STAGING_HOST_DIR}/usr/bin
+
+include $(TOPDIR)/mk/tools.mk