Merge branch 'upstream' into tizen

And version 0.6.0 applied

Change-Id: Iabc3dc2fc4bd984a114445d8b70df57eb43c3b16

diff --cc packaging/config
index 7178c4d,0000000..6258959
mode 100644,000000..100644
--- 1/packaging/config
--- /dev/null
+++ b/packaging/config
@@@ -1,317 -1,0 +1,321 @@@
- # Mon Jul 27 13:41:41 2015
 +#
 +# Automatically generated make config: don't edit
 +# ToyBox version: KCONFIG_VERSION
++# Thu Aug 20 11:23:54 2015
 +#
 +CONFIG_TOYBOX_CONTAINER=y
 +CONFIG_TOYBOX_FIFREEZE=y
 +CONFIG_TOYBOX_ICONV=y
 +CONFIG_TOYBOX_FALLOCATE=y
 +CONFIG_TOYBOX_UTMPX=y
 +CONFIG_TOYBOX_SHADOW=y
 +# CONFIG_TOYBOX_ON_ANDROID is not set
 +CONFIG_TOYBOX_FORK=y
 +
 +#
 +# Posix commands
 +#
 +# CONFIG_BASENAME is not set
 +# CONFIG_CAL is not set
 +# CONFIG_CAT is not set
 +# CONFIG_CAT_V is not set
 +CONFIG_CATV=y
 +# CONFIG_CHGRP is not set
 +# CONFIG_CHOWN is not set
 +# CONFIG_CHMOD is not set
 +# CONFIG_CKSUM is not set
 +# CONFIG_CMP is not set
 +# CONFIG_COMM is not set
 +# CONFIG_CP is not set
 +# CONFIG_CP_MORE is not set
 +# CONFIG_CP_PRESERVE is not set
 +# CONFIG_MV is not set
 +# CONFIG_MV_MORE is not set
 +# CONFIG_INSTALL is not set
 +# CONFIG_CPIO is not set
 +# CONFIG_CUT is not set
 +# CONFIG_DATE is not set
 +# CONFIG_DF is not set
 +# CONFIG_DIRNAME is not set
 +# CONFIG_DU is not set
 +# CONFIG_ECHO is not set
 +# CONFIG_ENV is not set
 +# CONFIG_EXPAND is not set
 +# CONFIG_FALSE is not set
 +# CONFIG_FIND is not set
 +# CONFIG_GREP is not set
 +# CONFIG_EGREP is not set
 +# CONFIG_FGREP is not set
 +# CONFIG_HEAD is not set
 +# CONFIG_ID is not set
 +# CONFIG_ID_Z is not set
 +# CONFIG_GROUPS is not set
 +# CONFIG_LOGNAME is not set
 +# CONFIG_WHOAMI is not set
 +# CONFIG_KILL is not set
 +# CONFIG_KILLALL5 is not set
 +# CONFIG_LINK is not set
 +# CONFIG_LN is not set
 +# CONFIG_LS is not set
 +# CONFIG_LS_COLOR is not set
 +# CONFIG_MKDIR is not set
 +# CONFIG_MKDIR_Z is not set
 +# CONFIG_MKFIFO is not set
 +# CONFIG_MKFIFO_Z is not set
 +# CONFIG_NICE is not set
 +# CONFIG_NL is not set
 +# CONFIG_NOHUP is not set
 +# CONFIG_OD is not set
 +# CONFIG_PASTE is not set
 +# CONFIG_PATCH is not set
 +# CONFIG_PRINTF is not set
 +# CONFIG_PWD is not set
 +# CONFIG_RENICE is not set
 +CONFIG_RM=y
 +# CONFIG_RMDIR is not set
 +# CONFIG_SED is not set
 +# CONFIG_SLEEP is not set
 +# CONFIG_SLEEP_FLOAT is not set
 +# CONFIG_SORT is not set
 +# CONFIG_SORT_BIG is not set
 +# CONFIG_SORT_FLOAT is not set
 +# CONFIG_SPLIT is not set
 +# CONFIG_STRINGS is not set
 +# CONFIG_TAIL is not set
 +# CONFIG_TAIL_SEEK is not set
 +# CONFIG_TEE is not set
 +# CONFIG_TIME is not set
 +# CONFIG_TOUCH is not set
 +# CONFIG_TRUE is not set
 +# CONFIG_TTY is not set
 +# CONFIG_UNAME is not set
 +# CONFIG_UNIQ is not set
 +# CONFIG_UNLINK is not set
 +# CONFIG_UUDECODE is not set
 +# CONFIG_UUENCODE is not set
 +# CONFIG_WC is not set
 +# CONFIG_WHO is not set
 +# CONFIG_XARGS is not set
 +# CONFIG_XARGS_PEDANTIC is not set
 +
 +#
 +# pending (see toys/pending/README)
 +#
 +# CONFIG_ARP is not set
 +# CONFIG_ARPING is not set
 +# CONFIG_BOOTCHARTD is not set
 +# CONFIG_BRCTL is not set
 +# CONFIG_COMPRESS is not set
 +# CONFIG_GZIP is not set
 +# CONFIG_GZIP_D is not set
 +# CONFIG_DECOMPRESS is not set
 +# CONFIG_ZCAT is not set
 +# CONFIG_GUNZIP is not set
 +# CONFIG_CROND is not set
 +# CONFIG_CRONTAB is not set
 +# CONFIG_DD is not set
 +CONFIG_DHCP=y
 +CONFIG_DHCPD=y
 +CONFIG_DEBUG_DHCP=y
 +# CONFIG_DIFF is not set
 +CONFIG_DUMPLEASES=y
 +# CONFIG_EXPR is not set
 +# CONFIG_FDISK is not set
 +# CONFIG_FOLD is not set
 +# CONFIG_FSCK is not set
 +# CONFIG_FTPGET is not set
 +# CONFIG_GETTY is not set
 +# CONFIG_GROUPADD is not set
 +# CONFIG_GROUPDEL is not set
 +# CONFIG_HOST is not set
 +# CONFIG_ICONV is not set
 +# CONFIG_INIT is not set
 +# CONFIG_IP is not set
 +# CONFIG_IPCRM is not set
 +# CONFIG_IPCS is not set
 +CONFIG_KLOGD=y
 +CONFIG_KLOGD_SOURCE_RING_BUFFER=y
 +# CONFIG_LAST is not set
 +CONFIG_LOGGER=y
 +# CONFIG_MDEV is not set
 +# CONFIG_MDEV_CONF is not set
 +# CONFIG_MKE2FS is not set
 +# CONFIG_MKE2FS_JOURNAL is not set
 +# CONFIG_MKE2FS_GEN is not set
 +# CONFIG_MKE2FS_LABEL is not set
 +# CONFIG_MKE2FS_EXTENDED is not set
 +# CONFIG_MODPROBE is not set
 +# CONFIG_MORE is not set
 +# CONFIG_NETSTAT is not set
 +# CONFIG_OPENVT is not set
 +# CONFIG_DEALLOCVT is not set
 +# CONFIG_PGREP is not set
 +CONFIG_PING=y
 +# CONFIG_PS is not set
 +# CONFIG_ROUTE is not set
 +# CONFIG_SH is not set
 +# CONFIG_EXIT is not set
 +# CONFIG_CD is not set
 +# CONFIG_SULOGIN is not set
 +CONFIG_SYSLOGD=y
 +# CONFIG_TAR is not set
 +# CONFIG_TCPSVD is not set
 +# CONFIG_TELNET is not set
 +# CONFIG_TELNETD is not set
 +# CONFIG_TEST is not set
++# CONFIG_TFTP is not set
 +# CONFIG_TFTPD is not set
 +# CONFIG_TOP is not set
 +# CONFIG_TR is not set
 +CONFIG_TRACEROUTE=y
 +# CONFIG_USERADD is not set
 +# CONFIG_USERDEL is not set
 +# CONFIG_WATCH is not set
 +# CONFIG_XZCAT is not set
 +
 +#
 +# Other commands
 +#
 +# CONFIG_ACPI is not set
 +# CONFIG_BASE64 is not set
 +# CONFIG_BLKID is not set
 +# CONFIG_FSTYPE is not set
 +CONFIG_BLOCKDEV=y
++# CONFIG_BUNZIP2 is not set
 +# CONFIG_BZCAT is not set
 +# CONFIG_CHCON is not set
 +# CONFIG_CHROOT is not set
 +# CONFIG_CHVT is not set
 +# CONFIG_CLEAR is not set
 +# CONFIG_COUNT is not set
 +# CONFIG_DOS2UNIX is not set
 +# CONFIG_UNIX2DOS is not set
 +# CONFIG_EJECT is not set
 +# CONFIG_FACTOR is not set
 +# CONFIG_FALLOCATE is not set
 +# CONFIG_FREE is not set
 +# CONFIG_FREERAMDISK is not set
 +# CONFIG_FSFREEZE is not set
++# CONFIG_FSYNC is not set
 +CONFIG_HELP=y
 +CONFIG_HELP_EXTRAS=y
 +# CONFIG_HEXEDIT is not set
++# CONFIG_HOSTID is not set
 +# CONFIG_HWCLOCK is not set
 +# CONFIG_IFCONFIG is not set
 +# CONFIG_INOTIFYD is not set
 +CONFIG_INSMOD=y
 +# CONFIG_IONICE is not set
 +# CONFIG_IORENICE is not set
 +# CONFIG_LOGIN is not set
 +# CONFIG_LOSETUP is not set
 +# CONFIG_LSATTR is not set
 +# CONFIG_CHATTR is not set
 +# CONFIG_LSMOD is not set
 +# CONFIG_LSPCI is not set
 +# CONFIG_LSPCI_TEXT is not set
 +# CONFIG_LSUSB is not set
 +# CONFIG_MAKEDEVS is not set
 +# CONFIG_MIX is not set
 +# CONFIG_MKPASSWD is not set
 +# CONFIG_MKSWAP is not set
 +# CONFIG_MODINFO is not set
 +# CONFIG_MOUNTPOINT is not set
 +# CONFIG_NBD_CLIENT is not set
 +# CONFIG_NETCAT is not set
 +# CONFIG_NETCAT_LISTEN is not set
 +# CONFIG_UNSHARE is not set
 +# CONFIG_NSENTER is not set
 +# CONFIG_ONEIT is not set
 +# CONFIG_PARTPROBE is not set
 +# CONFIG_PIVOT_ROOT is not set
 +# CONFIG_PMAP is not set
 +# CONFIG_PRINTENV is not set
 +# CONFIG_PWDX is not set
 +# CONFIG_READAHEAD is not set
 +# CONFIG_READLINK is not set
 +# CONFIG_REALPATH is not set
 +# CONFIG_REBOOT is not set
 +# CONFIG_RESET is not set
 +# CONFIG_REV is not set
 +# CONFIG_RFKILL is not set
 +# CONFIG_RMMOD is not set
 +# CONFIG_SETSID is not set
 +# CONFIG_SHRED is not set
 +# CONFIG_STAT is not set
 +# CONFIG_SWAPOFF is not set
 +# CONFIG_SWAPON is not set
 +# CONFIG_SWITCH_ROOT is not set
 +# CONFIG_SYSCTL is not set
 +# CONFIG_TAC is not set
 +# CONFIG_NPROC is not set
 +# CONFIG_TASKSET is not set
 +# CONFIG_TIMEOUT is not set
 +# CONFIG_TRUNCATE is not set
 +# CONFIG_UPTIME is not set
 +# CONFIG_USLEEP is not set
 +# CONFIG_VCONFIG is not set
 +# CONFIG_VMSTAT is not set
 +# CONFIG_W is not set
 +# CONFIG_WHICH is not set
 +# CONFIG_XXD is not set
 +# CONFIG_YES is not set
 +
 +#
 +# Linux Standard Base commands
 +#
 +# CONFIG_DMESG is not set
 +# CONFIG_HOSTNAME is not set
 +# CONFIG_KILLALL is not set
 +# CONFIG_MD5SUM is not set
 +# CONFIG_SHA1SUM is not set
 +# CONFIG_MKNOD is not set
 +# CONFIG_MKNOD_Z is not set
 +# CONFIG_MKTEMP is not set
 +CONFIG_MOUNT=y
 +# CONFIG_PASSWD is not set
 +# CONFIG_PIDOF is not set
 +# CONFIG_SEQ is not set
 +# CONFIG_SU is not set
 +# CONFIG_SYNC is not set
 +CONFIG_UMOUNT=y
 +
 +#
 +# Example commands
 +#
 +# CONFIG_HELLO is not set
 +# CONFIG_SKELETON is not set
 +# CONFIG_SKELETON_ALIAS is not set
 +
 +#
 +# Android
 +#
 +# CONFIG_GETENFORCE is not set
 +# CONFIG_GETPROP is not set
 +# CONFIG_LOAD_POLICY is not set
 +# CONFIG_RESTORECON is not set
 +# CONFIG_RUNCON is not set
 +# CONFIG_SETENFORCE is not set
 +# CONFIG_SETPROP is not set
 +
 +#
 +# 
 +#
 +
 +#
 +# Toybox global settings
 +#
 +CONFIG_TOYBOX=y
 +# CONFIG_TOYBOX_SUID is not set
 +CONFIG_TOYBOX_LSM_NONE=y
 +# CONFIG_TOYBOX_SELINUX is not set
 +# CONFIG_TOYBOX_SMACK is not set
 +# CONFIG_TOYBOX_FLOAT is not set
 +CONFIG_TOYBOX_HELP=y
 +CONFIG_TOYBOX_HELP_DASHDASH=y
 +# CONFIG_TOYBOX_I18N is not set
 +# CONFIG_TOYBOX_FREE is not set
 +# CONFIG_TOYBOX_NORECURSE is not set
 +# CONFIG_TOYBOX_DEBUG is not set
 +CONFIG_TOYBOX_UID_SYS=100
 +CONFIG_TOYBOX_UID_USR=500

diff --cc packaging/toybox.spec
index 24f2a5c,0000000..19be664
mode 100644,000000..100644
--- 1/packaging/toybox.spec
--- /dev/null
+++ b/packaging/toybox.spec
@@@ -1,155 -1,0 +1,155 @@@
- Version: 0.5.1
 +Name: toybox
++Version: 0.6.0
 +Release: 1%{?dist}
 +Summary: Single binary providing simplified versions of system commands
 +Group: Base/Utilities
 +License: BSD-2-Clause-FreeBSD 
 +URL: http://www.landley.net/toybox/
 +Source: %{name}-%{version}.tar.bz2
 +Source1: config
 +%if "%{?profile}"=="tv"
 +Source2: bin_tv.links
 +Source3: sbin_tv.links
 +%else
 +Source2: bin.links
 +Source3: sbin.links
 +%endif
 +Source4: usrbin.links
 +Source5: usrsbin.links
 +Source101: klogd.service
 +Source102: syslogd.service
 +Source1001: toybox.manifest
 +Source1002: syslogd.manifest
 +Source1003: klogd.manifest
 +
 +BuildRequires : smack-devel
 +BuildRequires : libattr-devel
 +
 +%description 
 +Toybox is a single binary which includes versions of a large number
 +of system commands, including a shell.  This package can be very
 +useful for recovering from certain types of system failures,
 +particularly those involving broken shared libraries.
 +
 +%package symlinks-klogd
 +Group: tools
 +Summary: ToyBox symlinks to provide 'klogd'
 +Requires: %{name} = %{version}-%{release}
 +
 +%description symlinks-klogd
 +ToyBox symlinks for utilities corresponding to 'klogd' package.
 +
 +%package symlinks-sysklogd
 +Group: tools
 +Summary: ToyBox symlinks to provide 'sysklogd'
 +Requires: %{name} = %{version}-%{release}
 +
 +%description symlinks-sysklogd
 +ToyBox symlinks for utilities corresponding to 'sysklogd' package.
 +
 +%package symlinks-dhcp
 +Group: tools
 +Summary: ToyBox symlinks to provide 'dhcp'
 +Requires: %{name} = %{version}-%{release}
 +
 +%description symlinks-dhcp
 +ToyBox symlinks for utilities corresponding to 'dhcp' package.
 +
 +%package symlinks-dhcpd
 +Group: tools
 +Summary: ToyBox symlinks to provide 'dhcpd'
 +Requires: %{name} = %{version}-%{release}
 +
 +%description symlinks-dhcpd
 +ToyBox symlinks for utilities corresponding to 'dhcpd' package.
 +
 +%prep
 +%setup -q
 +
 +%build
 +cp %{SOURCE1001} .
 +cp %{SOURCE1002} .
 +cp %{SOURCE1003} .
 +# create dynamic toybox - the executable is toybox
 +cp %{SOURCE1} .config
 +make -j 4 CC="gcc $RPM_OPT_FLAGS" CFLAGS="$CFLAGS -fPIE" LDOPTIMIZE="-Wl,--gc-sections -pie"
 +cp toybox toybox-dynamic
 +
 +%install
 +rm -rf $RPM_BUILD_ROOT
 +mkdir -p $RPM_BUILD_ROOT/bin
 +mkdir -p $RPM_BUILD_ROOT/sbin
 +install -m 755 toybox-dynamic $RPM_BUILD_ROOT/bin/toybox
 +
 +# debian/toybox.links
 +pushd %{buildroot}
 +mkdir -p usr/bin usr/sbin sbin
 +cd bin
 +for f in `cat %SOURCE2` ; do ln -s toybox $f ; done
 +cd ../sbin
 +for f in `cat %SOURCE3` ; do ln -s ../bin/toybox $f ; done
 +cd ../usr/bin
 +for f in `cat %SOURCE4` ; do ln -s ../../bin/toybox $f ; done
 +cd ../../usr/sbin
 +for f in `cat %SOURCE5` ; do ln -s ../../bin/toybox $f ; done
 +popd
 +
 +# install systemd service files for syslogd and klogd
 +mkdir -p  %{buildroot}%{_unitdir}/basic.target.wants
 +install -m 644 %SOURCE101  %{buildroot}%{_unitdir}/klogd.service
 +ln -s ../klogd.service  %{buildroot}%{_unitdir}/basic.target.wants/klogd.service
 +install -m 644 %SOURCE102  %{buildroot}%{_unitdir}/syslogd.service
 +ln -s ../syslogd.service  %{buildroot}%{_unitdir}/basic.target.wants/syslogd.service
 +rm -rf $RPM_BUILD_ROOT/sbin/syslogd
 +cp -f $RPM_BUILD_ROOT/bin/toybox $RPM_BUILD_ROOT/sbin/syslogd
 +rm -rf $RPM_BUILD_ROOT/sbin/klogd
 +cp -f $RPM_BUILD_ROOT/bin/toybox $RPM_BUILD_ROOT/sbin/klogd
 +
 +mkdir -p $RPM_BUILD_ROOT%{_datadir}/license
 +cat LICENSE > $RPM_BUILD_ROOT%{_datadir}/license/toybox
 +cat LICENSE > $RPM_BUILD_ROOT%{_datadir}/license/toybox-symlinks-klogd
 +cat LICENSE > $RPM_BUILD_ROOT%{_datadir}/license/toybox-symlinks-sysklogd
 +cat LICENSE > $RPM_BUILD_ROOT%{_datadir}/license/toybox-symlinks-dhcp
 +cat LICENSE > $RPM_BUILD_ROOT%{_datadir}/license/toybox-symlinks-dhcpd
 +
 +%files
 +%defattr(-,root,root,-)
 +%doc LICENSE
 +%{_datadir}/license/toybox
 +/bin/toybox
 +%if "%{?profile}"=="tv"
 +/sbin/ping
 +/bin/ping
 +/sbin/ping6
 +/bin/ping6
 +%endif
 +%manifest toybox.manifest
 +
 +%files symlinks-klogd
 +%defattr(-,root,root,-)
 +%{_datadir}/license/toybox-symlinks-klogd
 +/sbin/klogd
 +%{_unitdir}/klogd.service
 +%{_unitdir}/basic.target.wants/klogd.service
 +%manifest klogd.manifest
 +
 +%files symlinks-sysklogd
 +%defattr(-,root,root,-)
 +%{_datadir}/license/toybox-symlinks-sysklogd
 +/sbin/syslogd
 +%{_unitdir}/syslogd.service
 +%{_unitdir}/basic.target.wants/syslogd.service
 +%manifest syslogd.manifest
 +
 +%files symlinks-dhcp
 +%defattr(-,root,root,-)
 +%{_datadir}/license/toybox-symlinks-dhcp
 +%{_bindir}/dhcp
 +%manifest toybox.manifest
 +
 +%files symlinks-dhcpd
 +%defattr(-,root,root,-)
 +%{_datadir}/license/toybox-symlinks-dhcpd
 +%{_bindir}/dumpleases
 +%{_sbindir}/dhcpd
 +%manifest toybox.manifest