Merge pull request #2 from philippedeswert/master

[busybox] Add udhcpc and udhcpd utilities. Fixes JB#13591

busybox/busybox-sailfish.config

@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.21.1
-# Fri Nov  1 15:24:34 2013
+# Thu Nov 28 17:22:39 2013
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -817,20 +817,20 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
 # CONFIG_TUNCTL is not set
 # CONFIG_FEATURE_TUNCTL_UG is not set
 # CONFIG_UDHCPC6 is not set
-# CONFIG_UDHCPD is not set
+CONFIG_UDHCPD=y
 # CONFIG_DHCPRELAY is not set
 # CONFIG_DUMPLEASES is not set
-# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set
-# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set
-CONFIG_DHCPD_LEASES_FILE=""
-# CONFIG_UDHCPC is not set
-# CONFIG_FEATURE_UDHCPC_ARPING is not set
+CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY=y
+CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC=y
+CONFIG_DHCPD_LEASES_FILE="/var/lib/misc/udhcpd.leases"
+CONFIG_UDHCPC=y
+CONFIG_FEATURE_UDHCPC_ARPING=y
 # CONFIG_FEATURE_UDHCP_PORT is not set
-CONFIG_UDHCP_DEBUG=0
-# CONFIG_FEATURE_UDHCP_RFC3397 is not set
-# CONFIG_FEATURE_UDHCP_8021Q is not set
-CONFIG_UDHCPC_DEFAULT_SCRIPT=""
-CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=0
+CONFIG_UDHCP_DEBUG=1
+CONFIG_FEATURE_UDHCP_RFC3397=y
+CONFIG_FEATURE_UDHCP_8021Q=y
+CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script"
+CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80
 CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS=""
 # CONFIG_UDPSVD is not set
 # CONFIG_VCONFIG is not set

rpm/busybox.spec

@@ -5,6 +5,7 @@ Release: 1
 License: GPLv2
 Group: System/Shells
 Source: http://www.busybox.net/downloads/%{name}-%{version}.tar.bz2
+Source1: rpm/udhcpd.service
 URL: https://github.com/mer-packages/busybox 
 
 %define debug_package %{nil}
@@ -33,6 +34,18 @@ useful for recovering from certain types of system failures,
 particularly those involving broken shared libraries. This
 is the symlinks implementing gzip replacements.
 
+%package symlinks-dhcp
+Requires: %{name}
+Group: System/Shells
+Summary: Busybox dhcp utilities
+
+%description symlinks-dhcp
+Busybox 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. This contains
+the symlinks implementing the dhcp utilities (udhcpc/udhcpcd).
+
 %description docs
 Busybox documentation and user guides
 
@@ -47,13 +60,16 @@ make busybox.links
 cat >> busybox.links << EOF
 /usr/bin/gzip
 /usr/bin/gunzip
+/usr/sbin/udhcpc
 EOF
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/bin
 install -m 755 busybox %{buildroot}/bin/busybox
+install -m 644 -D %{SOURCE1} %{buildroot}/lib/systemd/system/udhcpd.service
 applets/install.sh %{buildroot} --symlinks
+rm -f %{buildroot}/sbin/udhcpc
 
 %files
 %defattr(-,root,root,-)
@@ -71,3 +87,9 @@ applets/install.sh %{buildroot} --symlinks
 /bin/gzip
 /usr/bin/gzip
 /bin/zcat
+
+%files symlinks-dhcp
+%defattr(-,root,root,-)
+/usr/sbin/udhcpc
+/usr/sbin/udhcpd
+/lib/systemd/system/udhcpd.service

rpm/udhcpd.service

@@ -0,0 +1,4 @@
+[Unit]
+Description=udhcpcd DHCP server
+[Service]
+ExecStart=/usr/sbin/udhcpd -f