tizen 2.3 release

diff --git a/packaging/toybox.spec b/packaging/toybox.spec
index cacfefa..9f7c4f2 100644 (file)
--- a/packaging/toybox.spec
+++ b/packaging/toybox.spec
@@ -81,9 +81,9 @@ 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
+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
@@ -112,8 +112,8 @@ cat LICENSE > $RPM_BUILD_ROOT%{_datadir}/license/toybox-symlinks-udhcpd
 %doc LICENSE
 %{_datadir}/license/toybox
 /bin/toybox
-#/bin/mount
-#/bin/umount
+/bin/mount
+/bin/umount
 %manifest toybox.manifest
 
 %files symlinks-klogd
@@ -144,4 +144,3 @@ cat LICENSE > $RPM_BUILD_ROOT%{_datadir}/license/toybox-symlinks-udhcpd
 %{_bindir}/dumpleases
 %{_sbindir}/udhcpd
 %manifest toybox.manifest
-

diff --git a/packaging/toybox_tizen.config b/packaging/toybox_tizen.config
index c5e7158..39894dd 100644 (file)
--- a/packaging/toybox_tizen.config
+++ b/packaging/toybox_tizen.config
@@ -17,12 +17,12 @@ CONFIG_TOYBOX_CONTAINER=y
 # CONFIG_MD5SUM_SHA1SUM is not set
 # CONFIG_MKNOD is not set
 # CONFIG_MKTEMP is not set
-# CONFIG_MOUNT is not set
+CONFIG_MOUNT=y
 # CONFIG_PASSWD is not set
 # CONFIG_PIDOF is not set
 # CONFIG_SEQ is not set
 # CONFIG_SYNC is not set
-# CONFIG_UMOUNT is not set
+CONFIG_UMOUNT=y
 
 #
 # Other commands

diff --git a/toys/other/udhcpc.c b/toys/other/udhcpc.c
index ef49c6b..b6c150e 100644 (file)
--- a/toys/other/udhcpc.c
+++ b/toys/other/udhcpc.c
@@ -43,7 +43,13 @@ config UDHCPC
       USR2  Release current lease
 
 */
-
+/***************************************************
+ * Changes Hostory
+ * [OSETOYBOX-37] - Ashwini Kumar 2014.05.19
+ *    Function dhcpc_parseoptions(), continued to parse options,
+ *    after the 'pad' option without checking for the 'end' option.
+ *    which was causing a segfault later.
+ ***************************************************/
 #define FOR_udhcpc
 #include "toys.h"
 #include <linux/filter.h> //FIXME: linux specific. fix for other OS ports
@@ -1202,7 +1208,10 @@ static uint8_t dhcpc_parseoptions(dhcpc_result_t *presult, uint8_t *optptr)
   }
 
   while (*optptr != DHCP_OPTION_END) {
-    while (*optptr == DHCP_OPTION_PADDING) optptr++;
+    if (*optptr == DHCP_OPTION_PADDING) {
+      optptr++;
+      continue;
+    }
     if (*optptr == DHCP_OPTION_OVERLOAD) {
       overloaded = optptr[2];
       optptr += optptr[1] + 2;