diff -r 198005e4aad2 -r 4ca17af53013 dhcpd/dhcpd.spec
--- a/dhcpd/dhcpd.spec	Thu Sep 15 11:03:52 2011 +0200
+++ b/dhcpd/dhcpd.spec	Thu Sep 15 11:49:33 2011 +0200
@@ -1,6 +1,6 @@
 ##
 ##  dhcpd.spec -- OpenPKG RPM Package Specification
-##  Copyright (c) 2000-2008 OpenPKG Foundation e.V. <http://openpkg.net/>
+##  Copyright (c) 2000-2011 OpenPKG Foundation e.V. <http://openpkg.net/>
 ##
 ##  Permission to use, copy, modify, and distribute this software for
 ##  any purpose with or without fee is hereby granted, provided that
@@ -21,6 +21,10 @@
 ##  SUCH DAMAGE.
 ##
 
+#   package version
+%define       V_opkg 4.2.1
+%define       V_dist 4.2.1
+
 #   package information
 Name:         dhcpd
 Summary:      DHCP Daemon
@@ -31,23 +35,26 @@
 Class:        BASE
 Group:        DHCP
 License:      ISC/BSD
-Version:      4.1.0
-Release:      20090105
+Version:      %{V_opkg}
+Release:      20110424
 
 #   package options
 %option       with_fsl  yes
 
 #   list of sources
-Source0:      ftp://ftp.isc.org/isc/dhcp/dhcp-%{version}.tar.gz
+Source0:      ftp://ftp.isc.org/isc/dhcp/dhcp-%{V_dist}.tar.gz
 Source1:      dhcpd.conf
 Source2:      rc.dhcpd
 Source3:      fsl.dhcpd
+Patch0:       dhcpd.patch
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
 BuildPreReq:  OpenPKG, openpkg >= 20060823
 PreReq:       OpenPKG, openpkg >= 20060823
+BuildPreReq:  openssl
+PreReq:       openssl
 %if "%{with_fsl}" == "yes"
 BuildPreReq:  fsl
 PreReq:       fsl
@@ -60,13 +67,14 @@
 
 %track
     prog dhcpd = {
-        version   = %{version}
+        version   = %{V_dist}
         url       = ftp://ftp.isc.org/isc/dhcp/
         regex     = dhcp-(\d+\.\d+\.\d+)\.tar\.gz
     }
 
 %prep
-    %setup -q -n dhcp-%{version}
+    %setup -q -n dhcp-%{V_dist}
+    %patch -p0
 
 %build
     #   configure program
@@ -75,12 +83,6 @@
         -e 's;^[^#]*\(#define[^_]*_PATH_DHCPD_DB[^"]*\).*;\1 "%{l_prefix}/var/dhcpd/db/dhcpd.leases";' \
         -e 's;^[^#]*\(#define[^_]*_PATH_DHCPD_CONF[^"]*\).*;\1 "%{l_prefix}/etc/dhcpd/dhcpd.conf";' \
         includes/site.h
-    %{l_shtool} subst \
-        -e 's;struct option\([, )]\);struct option_dhcpd\1;g' \
-        includes/*.h \
-        client/*.c \
-        common/*.c \
-        server/*.c
     CC="%{l_cc}" \
     CFLAGS="%{l_cflags -O}" \
     CPPFLAGS="%{l_cppflags} -DNOMINUM" \
@@ -91,19 +93,21 @@
         --mandir=%{l_prefix}/man \
         --sysconfdir=%{l_prefix}/etc/dhcpd \
         --localstatedir=%{l_prefix}/var/dhcpd \
-        --disable-dhcpv6 \
         --with-srv-lease-file=%{l_prefix}/var/dhcpd/db/dhcpd.leases \
         --with-cli-lease-file=%{l_prefix}/var/dhcpd/db/dhclient.leases \
         --with-srv-pid-file=%{l_prefix}/var/dhcpd/run/dhcpd.pid \
         --with-cli-pid-file=%{l_prefix}/var/dhcpd/run/dhclient.pid \
-        --with-relay-pid-file=%{l_prefix}/var/dhcpd/run/dhrelay.pid
+        --with-relay-pid-file=%{l_prefix}/var/dhcpd/run/dhrelay.pid \
+        --disable-dhcpv6
 
     #   build program
     %{l_make} %{l_mflags}
 
 %install
+    #   clean up build cruft
+    rm -rf $RPM_BUILD_ROOT
+
     #   install program
-    rm -rf $RPM_BUILD_ROOT
     %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
 
     #   install default configuration