dhcp: switch back to 3.1.x branch

4 files changed, 37 insertions, 45 deletions

diff --git a/dhcp/.footprint b/dhcp/.footprint
index 7e3f76803..152f47ab1 100644
--- a/dhcp/.footprint
+++ b/dhcp/.footprint
@@ -3,63 +3,52 @@ drwxr-xr-x	root/root	etc/
 -rw-r--r--	root/root	etc/dhcpd.conf
 drwxr-xr-x	root/root	etc/rc.d/
 -rwxr-xr-x	root/root	etc/rc.d/dhcpd
+drwxr-xr-x	root/root	sbin/
+-rwxr-xr-x	root/root	sbin/dhclient
+-rwx------	root/root	sbin/dhclient-script
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/omshell
-drwxr-xr-x	root/root	usr/etc/
--rw-r--r--	root/root	usr/etc/dhclient.conf
--rw-r--r--	root/root	usr/etc/dhcpd.conf
 drwxr-xr-x	root/root	usr/include/
-drwxr-xr-x	root/root	usr/include/dhcpctl/
--rw-r--r--	root/root	usr/include/dhcpctl/dhcpctl.h
+-rw-r--r--	root/root	usr/include/dhcpctl.h
 drwxr-xr-x	root/root	usr/include/isc-dhcp/
 -rw-r--r--	root/root	usr/include/isc-dhcp/boolean.h
--rw-r--r--	root/root	usr/include/isc-dhcp/commandline.h
 -rw-r--r--	root/root	usr/include/isc-dhcp/dst.h
--rw-r--r--	root/root	usr/include/isc-dhcp/formatcheck.h
 -rw-r--r--	root/root	usr/include/isc-dhcp/int.h
 -rw-r--r--	root/root	usr/include/isc-dhcp/lang.h
 -rw-r--r--	root/root	usr/include/isc-dhcp/list.h
--rw-r--r--	root/root	usr/include/isc-dhcp/mem.h
--rw-r--r--	root/root	usr/include/isc-dhcp/print.h
 -rw-r--r--	root/root	usr/include/isc-dhcp/result.h
--rw-r--r--	root/root	usr/include/isc-dhcp/string.h
 -rw-r--r--	root/root	usr/include/isc-dhcp/types.h
 drwxr-xr-x	root/root	usr/include/omapip/
 -rw-r--r--	root/root	usr/include/omapip/alloc.h
 -rw-r--r--	root/root	usr/include/omapip/buffer.h
--rw-r--r--	root/root	usr/include/omapip/convert.h
--rw-r--r--	root/root	usr/include/omapip/hash.h
 -rw-r--r--	root/root	usr/include/omapip/omapip.h
--rw-r--r--	root/root	usr/include/omapip/omapip_p.h
--rw-r--r--	root/root	usr/include/omapip/trace.h
 drwxr-xr-x	root/root	usr/lib/
 -rw-r--r--	root/root	usr/lib/libdhcpctl.a
--rw-r--r--	root/root	usr/lib/libdst.a
 -rw-r--r--	root/root	usr/lib/libomapi.a
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/omshell.1.gz
+-rwxr-xr-x	root/root	usr/man/man1/omshell.1.gz
 drwxr-xr-x	root/root	usr/man/man3/
--rw-r--r--	root/root	usr/man/man3/dhcpctl.3.gz
--rw-r--r--	root/root	usr/man/man3/omapi.3.gz
+-rwxr-xr-x	root/root	usr/man/man3/dhcpctl.3.gz
+-rwxr-xr-x	root/root	usr/man/man3/omapi.3.gz
+-rwxr-xr-x	root/root	usr/man/man3/omshell.3.gz
 drwxr-xr-x	root/root	usr/man/man5/
--rw-r--r--	root/root	usr/man/man5/dhclient.conf.5.gz
--rw-r--r--	root/root	usr/man/man5/dhclient.leases.5.gz
--rw-r--r--	root/root	usr/man/man5/dhcp-eval.5.gz
--rw-r--r--	root/root	usr/man/man5/dhcp-options.5.gz
--rw-r--r--	root/root	usr/man/man5/dhcpd.conf.5.gz
--rw-r--r--	root/root	usr/man/man5/dhcpd.leases.5.gz
+-rwxr-xr-x	root/root	usr/man/man5/dhclient.conf.5.gz
+-rwxr-xr-x	root/root	usr/man/man5/dhclient.leases.5.gz
+-rwxr-xr-x	root/root	usr/man/man5/dhcp-eval.5.gz
+-rwxr-xr-x	root/root	usr/man/man5/dhcp-options.5.gz
+-rwxr-xr-x	root/root	usr/man/man5/dhcpd.conf.5.gz
+-rwxr-xr-x	root/root	usr/man/man5/dhcpd.leases.5.gz
 drwxr-xr-x	root/root	usr/man/man8/
--rw-r--r--	root/root	usr/man/man8/dhclient-script.8.gz
--rw-r--r--	root/root	usr/man/man8/dhclient.8.gz
--rw-r--r--	root/root	usr/man/man8/dhcpd.8.gz
--rw-r--r--	root/root	usr/man/man8/dhcrelay.8.gz
+-rwxr-xr-x	root/root	usr/man/man8/dhclient-script.8.gz
+-rwxr-xr-x	root/root	usr/man/man8/dhclient.8.gz
+-rwxr-xr-x	root/root	usr/man/man8/dhcpd.8.gz
+-rwxr-xr-x	root/root	usr/man/man8/dhcrelay.8.gz
 drwxr-xr-x	root/root	usr/sbin/
--rwxr-xr-x	root/root	usr/sbin/dhclient
 -rwxr-xr-x	root/root	usr/sbin/dhcpd
 -rwxr-xr-x	root/root	usr/sbin/dhcrelay
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/state/
 drwxr-xr-x	root/root	var/state/dhcp/
--rw-r--r--	root/root	var/state/dhcp/dhcpd.leases (EMPTY)
+-rw-rw-r--	root/root	var/state/dhcp/dhcpd.leases (EMPTY)
diff --git a/dhcp/.md5sum b/dhcp/.md5sum
index ca3e16931..674be4681 100644
--- a/dhcp/.md5sum
+++ b/dhcp/.md5sum
@@ -1,3 +1,3 @@
 efc3dbabdb2e1127fddc590922ec46b6  default-config.diff
-31d79b27ce4a94089a0b9ce7f72307fa  dhcp-4.0.0.tar.gz
-82393e9302e5d8da24ece3ec8717cd7e  dhcpd
+fcc19330a9c3a0efb5620409214652a9  dhcp-3.1.1.tar.gz
+51665125f8360c6cc1ef59ad6cd8cf84  dhcpd
diff --git a/dhcp/Pkgfile b/dhcp/Pkgfile
index 172ab0f1c..41084f7e3 100644
--- a/dhcp/Pkgfile
+++ b/dhcp/Pkgfile
@@ -6,7 +6,7 @@
 # Depends on: 
 
 name=dhcp
-version=4.0.0
+version=3.1.1
 release=1
 source=(http://ftp.isc.org/isc/$name/$name-$version.tar.gz
       dhcpd
@@ -15,10 +15,13 @@ source=(http://ftp.isc.org/isc/$name/$name-$version.tar.gz
 build() {
   cd dhcp-$version
   patch -p1 -i $SRC/default-config.diff
-  ./configure --prefix=/usr --mandir=/usr/man
+
+  sed -i -e 's|usr/share/man|/usr/man|g' Makefile.conf
+  sed -i -e 's|usr/local/include|usr/include|g' Makefile.conf
+  sed -i -e 's|usr/local/lib|usr/lib|g' Makefile.conf
+  ./configure 
   make
   make DESTDIR=$PKG install
-  mkdir $PKG/etc/
   install -m644 client/dhclient.conf server/dhcpd.conf -t $PKG/etc
   install -D ../dhcpd $PKG/etc/rc.d/dhcpd
   mkdir -p $PKG/var/state/dhcp
diff --git a/dhcp/dhcpd b/dhcp/dhcpd
index 221bd5568..bf4fe5f16 100644
--- a/dhcp/dhcpd
+++ b/dhcp/dhcpd
@@ -5,19 +5,19 @@
 
 case $1 in
 start)
-	/usr/sbin/dhcpd -q
-	;;
+  /usr/sbin/dhcpd -q
+  ;;
 stop)
-	killall -q /usr/sbin/dhcpd
-	;;
+  killall -q /usr/sbin/dhcpd
+  ;;
 restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
+  $0 stop
+  sleep 1
+  $0 start
+  ;;
 *)
-	echo "usage: $0 [start|stop|restart]"
-	;;
+  echo "usage: $0 [start|stop|restart]"
+  ;;
 esac
 
 # End of file