Revert back to upstream 0.6.0 and remove all except for dhcp relatedsubmit/tizen/20160323.053424

Change-Id: Ide839cfefc7c4049715f86a2bf769c333175b2bf

10 files changed, 37 insertions, 162 deletions

diff --git a/packaging/bin_tv.links b/packaging/bin_tv.links
deleted file mode 100644
index 5c3aa65..0000000
--- a/packaging/bin_tv.links
+++ /dev/null
@@ -1,2 +0,0 @@
-ping
-ping6
diff --git a/packaging/config b/packaging/config
index 4004694..c368e46 100644
--- a/packaging/config
+++ b/packaging/config
@@ -13,32 +13,27 @@ CONFIG_TOYBOX_SHADOW=y
 CONFIG_TOYBOX_FORK=y
 
 #
-# Samsung developed commands
-#
-# CONFIG_NSLOOKUP is not set
-
-#
 # 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_CATV is not set
 # 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=y
-CONFIG_CP_MORE=y
-CONFIG_CP_PRESERVE=y
-CONFIG_CP_Z=y
-CONFIG_MV=y
-CONFIG_MV_MORE=y
-CONFIG_INSTALL=y
-CONFIG_INSTALL_Z=y
+# CONFIG_CP is not set
+# CONFIG_CP_MORE is not set
+# CONFIG_CP_PRESERVE is not set
+# CONFIG_CP_Z is not set
+# CONFIG_MV is not set
+# CONFIG_MV_MORE is not set
+# CONFIG_INSTALL is not set
+# CONFIG_INSTALL_Z is not set
 # CONFIG_CPIO is not set
 # CONFIG_CUT is not set
 # CONFIG_DATE is not set
@@ -63,12 +58,12 @@ CONFIG_INSTALL_Z=y
 # CONFIG_KILLALL5 is not set
 # CONFIG_LINK is not set
 # CONFIG_LN is not set
-CONFIG_LS=y
-CONFIG_LS_COLOR=y
-CONFIG_MKDIR=y
-CONFIG_MKDIR_Z=y
-CONFIG_MKFIFO=y
-CONFIG_MKFIFO_Z=y
+# 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
@@ -78,7 +73,7 @@ CONFIG_MKFIFO_Z=y
 # CONFIG_PRINTF is not set
 # CONFIG_PWD is not set
 # CONFIG_RENICE is not set
-CONFIG_RM=y
+# CONFIG_RM is not set
 # CONFIG_RMDIR is not set
 # CONFIG_SED is not set
 # CONFIG_SLEEP is not set
@@ -140,10 +135,10 @@ CONFIG_DUMPLEASES=y
 # 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_KLOGD is not set
+# CONFIG_KLOGD_SOURCE_RING_BUFFER is not set
 # CONFIG_LAST is not set
-CONFIG_LOGGER=y
+# CONFIG_LOGGER is not set
 # CONFIG_MDEV is not set
 # CONFIG_MDEV_CONF is not set
 # CONFIG_MKE2FS is not set
@@ -164,7 +159,7 @@ CONFIG_PING=y
 # CONFIG_EXIT is not set
 # CONFIG_CD is not set
 # CONFIG_SULOGIN is not set
-CONFIG_SYSLOGD=y
+# CONFIG_SYSLOGD is not set
 # CONFIG_TAR is not set
 # CONFIG_TCPSVD is not set
 # CONFIG_TELNET is not set
@@ -187,7 +182,7 @@ CONFIG_TRACEROUTE=y
 # CONFIG_BASE64 is not set
 # CONFIG_BLKID is not set
 # CONFIG_FSTYPE is not set
-CONFIG_BLOCKDEV=y
+# CONFIG_BLOCKDEV is not set
 # CONFIG_BUNZIP2 is not set
 # CONFIG_BZCAT is not set
 # CONFIG_CHCON is not set
@@ -204,14 +199,14 @@ CONFIG_BLOCKDEV=y
 # CONFIG_FREERAMDISK is not set
 # CONFIG_FSFREEZE is not set
 # CONFIG_FSYNC is not set
-CONFIG_HELP=y
-CONFIG_HELP_EXTRAS=y
+# CONFIG_HELP is not set
+# CONFIG_HELP_EXTRAS is not set
 # 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_INSMOD is not set
 # CONFIG_IONICE is not set
 # CONFIG_IORENICE is not set
 # CONFIG_LOGIN is not set
@@ -249,8 +244,8 @@ CONFIG_INSMOD=y
 # CONFIG_RMMOD is not set
 # CONFIG_SETSID is not set
 # CONFIG_SHRED is not set
-CONFIG_STAT=y
-CONFIG_STAT_C=y
+# CONFIG_STAT is not set
+# CONFIG_STAT_C is not set
 # CONFIG_SWAPOFF is not set
 # CONFIG_SWAPON is not set
 # CONFIG_SWITCH_ROOT is not set
@@ -277,16 +272,16 @@ CONFIG_STAT_C=y
 # CONFIG_KILLALL is not set
 # CONFIG_MD5SUM is not set
 # CONFIG_SHA1SUM is not set
-CONFIG_MKNOD=y
-CONFIG_MKNOD_Z=y
-CONFIG_MKTEMP=y
-CONFIG_MOUNT=y
+# CONFIG_MKNOD is not set
+# CONFIG_MKNOD_Z is not set
+# CONFIG_MKTEMP is not set
+# CONFIG_MOUNT is not set
 # 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
+# CONFIG_UMOUNT is not set
 
 #
 # Example commands
diff --git a/packaging/klogd.manifest b/packaging/klogd.manifest
deleted file mode 100644
index 97e8c31..0000000
--- a/packaging/klogd.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-	<request>
-		<domain name="_"/>
-	</request>
-</manifest>
diff --git a/packaging/klogd.service b/packaging/klogd.service
deleted file mode 100644
index 03df845..0000000
--- a/packaging/klogd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Run syslog
-DefaultDependencies=no
-After=syslogd.service
-ConditionKernelCommandLine=|!sec_debug.enable=0
-ConditionKernelCommandLine=|!sec_debug.enable_user=0
-
-[Service]
-Type=forking
-ExecStart=/sbin/klogd
-OOMScoreAdjust=-1000
-Restart=always
-RestartSec=0
-
-[Install]
-WantedBy=basic.target
diff --git a/packaging/sbin.links b/packaging/sbin.links
index ff4418a..e69de29 100644
--- a/packaging/sbin.links
+++ b/packaging/sbin.links
@@ -1,2 +0,0 @@
-klogd
-syslogd
diff --git a/packaging/sbin_tv.links b/packaging/sbin_tv.links
deleted file mode 100644
index 02d4a98..0000000
--- a/packaging/sbin_tv.links
+++ /dev/null
@@ -1,4 +0,0 @@
-klogd
-syslogd
-ping
-ping6
diff --git a/packaging/syslogd.manifest b/packaging/syslogd.manifest
deleted file mode 100644
index 97e8c31..0000000
--- a/packaging/syslogd.manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-<manifest>
-	<request>
-		<domain name="_"/>
-	</request>
-</manifest>
diff --git a/packaging/syslogd.service b/packaging/syslogd.service
deleted file mode 100644
index 7b10609..0000000
--- a/packaging/syslogd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=Run syslog
-DefaultDependencies=no
-After=local-fs.target
-ConditionKernelCommandLine=|!sec_debug.enable=0
-ConditionKernelCommandLine=|!sec_debug.enable_user=0
-
-[Service]
-Type=forking
-ExecStart=/sbin/syslogd -b 5 -B 99
-OOMScoreAdjust=-1000
-Restart=always
-RestartSec=0
-
-[Install]
-WantedBy=basic.target
diff --git a/packaging/toybox.spec b/packaging/toybox.spec
index dd6d12f..0f46c58 100644
--- a/packaging/toybox.spec
+++ b/packaging/toybox.spec
@@ -7,20 +7,11 @@ 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
@@ -31,22 +22,6 @@ 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'
@@ -68,8 +43,6 @@ ToyBox symlinks for utilities corresponding to 'dhcpd' package.
 
 %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"
@@ -94,63 +67,21 @@ 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
-/usr/bin/nslookup
-%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
+%license LICENSE
 %defattr(-,root,root,-)
-%{_datadir}/license/toybox-symlinks-sysklogd
-/sbin/syslogd
-#%{_unitdir}/syslogd.service
-#%{_unitdir}/basic.target.wants/syslogd.service
-%manifest syslogd.manifest
+/bin/toybox
 
 %files symlinks-dhcp
+%manifest toybox.manifest
+%license LICENSE
 %defattr(-,root,root,-)
-%{_datadir}/license/toybox-symlinks-dhcp
 %{_bindir}/dhcp
-%manifest toybox.manifest
 
 %files symlinks-dhcpd
+%manifest toybox.manifest
+%license LICENSE
 %defattr(-,root,root,-)
-%{_datadir}/license/toybox-symlinks-dhcpd
 %{_bindir}/dumpleases
 %{_sbindir}/dhcpd
-%manifest toybox.manifest
diff --git a/packaging/usrbin.links b/packaging/usrbin.links
index 2ed0e8d..424150e 100644
--- a/packaging/usrbin.links
+++ b/packaging/usrbin.links
@@ -1,3 +1,2 @@
 dumpleases
 dhcp
-nslookup