r1141 - in trunk/web/patches: . upstream-only
Author: rmh
Date: 2006-02-06 11:19:46 +0000 (Mon, 06 Feb 2006)
New Revision: 1141
Added:
trunk/web/patches/upstream-only/dhcp.diff
Removed:
trunk/web/patches/dhcp.diff
Log:
Update dhcp.diff using new Aurelien's version for 3.x (obtained from debian package).
Deleted: trunk/web/patches/dhcp.diff
===================================================================
--- trunk/web/patches/dhcp.diff 2006-02-06 11:04:44 UTC (rev 1140)
+++ trunk/web/patches/dhcp.diff 2006-02-06 11:19:46 UTC (rev 1141)
@@ -1,76 +0,0 @@
-
-Status: dirty
-
-diff -ur dhcp-2.0pl5.old/common/dispatch.c dhcp-2.0pl5/common/dispatch.c
---- dhcp-2.0pl5.old/common/dispatch.c 1999-07-13 14:51:55.000000000 +0200
-+++ dhcp-2.0pl5/common/dispatch.c 2004-10-04 22:41:52.000000000 +0200
-@@ -167,7 +167,7 @@
-
- /* If we have the capability, extract link information
- and record it in a linked list. */
--#ifdef HAVE_AF_LINK
-+#if defined(HAVE_AF_LINK) && defined(__linux__)
- if (ifp -> ifr_addr.sa_family == AF_LINK) {
- struct sockaddr_dl *foo = ((struct sockaddr_dl *)
- (&ifp -> ifr_addr));
-diff -ur dhcp-2.0pl5.old/configure dhcp-2.0pl5/configure
---- dhcp-2.0pl5.old/configure 1999-07-13 20:38:55.000000000 +0200
-+++ dhcp-2.0pl5/configure 2004-10-04 21:39:40.000000000 +0200
-@@ -19,19 +19,16 @@
- if [ $machine = 'alpha' ]; then
- sysname=alphaosf
- fi;;
-- Linux)
-+ Linux|GNU|GNU/*)
- release=`uname -r`
- minor=`echo $release |sed -e 's/[0-9]*\.\([0-9][0-9]*\)\(\..*\)*$/\1/'`
- major=`echo $release |sed -e 's/\([0-9][0-9]*\)\..*$/\1/'`
-
-- case $major in
-+ case $major.$minor in
- 1) sysname=linux-1 ;;
-- 2) case $minor in
-- 0) sysname=linux-2.0 ;;
-- 1) sysname=linux-2.1 ;;
-- 2) sysname=linux-2.2 ;;
-- *) sysname=linux-2.2 ;;
-- esac;;
-+ 2.0) sysname=linux-2.0 ;;
-+ 2.1) sysname=linux-2.1 ;;
-+ *) sysname=linux-2.2 ;;
- esac;;
- SunOS)
- case `uname -r` in
-diff -ur dhcp-2.0pl5.old/includes/cf/linux.h dhcp-2.0pl5/includes/cf/linux.h
---- dhcp-2.0pl5.old/includes/cf/linux.h 1999-05-27 19:44:53.000000000 +0200
-+++ dhcp-2.0pl5/includes/cf/linux.h 2004-10-04 22:41:51.000000000 +0200
-@@ -67,7 +67,7 @@
- #include <net/if.h>
- #include <net/route.h>
-
--#if LINUX_MAJOR == 1
-+#if defined(__linux__) && (LINUX_MAJOR == 1)
- # include <linux/if_arp.h>
- # include <linux/time.h> /* also necessary */
- #else
-@@ -111,7 +111,7 @@
- #define TIME time_t
- #define GET_TIME(x) time ((x))
-
--#if (LINUX_MAJOR >= 2)
-+#if defined(__linux__) && (LINUX_MAJOR >= 2)
- # if (LINUX_MINOR >= 1)
- # if defined (USE_DEFAULT_NETWORK)
- # define USE_LPF
-diff -ur dhcp-2.0pl5.old/includes/osdep.h dhcp-2.0pl5/includes/osdep.h
---- dhcp-2.0pl5.old/includes/osdep.h 1999-10-25 17:40:32.000000000 +0200
-+++ dhcp-2.0pl5/includes/osdep.h 2004-10-04 22:41:51.000000000 +0200
-@@ -99,7 +99,7 @@
- # include "cf/ultrix.h"
- #endif
-
--#ifdef linux
-+#if defined(linux) || defined(__GNU__) || defined(__GLIBC__)
- # include "cf/linux.h"
- #endif
-
Added: trunk/web/patches/upstream-only/dhcp.diff
===================================================================
--- trunk/web/patches/upstream-only/dhcp.diff 2006-02-06 11:04:44 UTC (rev 1140)
+++ trunk/web/patches/upstream-only/dhcp.diff 2006-02-06 11:19:46 UTC (rev 1141)
@@ -0,0 +1,74 @@
+diff -ur dhcp-3.0.4b2.old/Makefile.conf dhcp-3.0.4b2/Makefile.conf
+--- dhcp-3.0.4b2.old/Makefile.conf 2005-06-16 21:39:35.000000000 +0200
++++ dhcp-3.0.4b2/Makefile.conf 2006-02-06 12:15:55.000000000 +0100
+@@ -486,3 +486,22 @@
+ #FFMANEXT = .5
+ #MANINSTALL = install -i -m 444
+ ##--hpux-gcc--
++
++## GNU/kFreeBSD
++##--kfreebsd--
++#CF = cf/kfreebsd.h
++#COPTS = $(BINDDEF) $(CC_OPTIONS)
++#ADMMANDIR = /usr/share/man/man8
++#ADMMANEXT = .8
++#FFMANDIR = /usr/share/man/man5
++#FFMANEXT = .5
++#LIBMANDIR = /usr/share/man/man3
++#LIBMANEXT = .3
++#USRMANDIR = /usr/share/man/man1
++#USRMANEXT = .1
++#MANCAT = man
++#VARRUN = /var/run
++#VARDB = /var/lib/dhcp
++#SCRIPT=kfreebsd
++##--kfreebsd--
++
+Only in dhcp-3.0.4b2/client/scripts: kfreebsd
+diff -ur dhcp-3.0.4b2.old/common/bpf.c dhcp-3.0.4b2/common/bpf.c
+--- dhcp-3.0.4b2.old/common/bpf.c 2004-11-24 18:39:15.000000000 +0100
++++ dhcp-3.0.4b2/common/bpf.c 2006-02-06 12:15:55.000000000 +0100
+@@ -407,7 +407,7 @@
+ interface -> rbuf,
+ (size_t)interface -> rbuf_max);
+ if (length <= 0) {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ if (errno == ENXIO) {
+ #else
+ if (errno == EIO) {
+diff -ur dhcp-3.0.4b2.old/configure dhcp-3.0.4b2/configure
+--- dhcp-3.0.4b2.old/configure 2004-09-10 23:02:30.000000000 +0200
++++ dhcp-3.0.4b2/configure 2006-02-06 12:15:55.000000000 +0100
+@@ -184,6 +184,8 @@
+ sysname=nextstep;;
+ UnixWare)
+ sysname=uw7;;
++ GNU/kFreeBSD)
++ sysname=kfreebsd;
+ esac
+ fi
+
+@@ -213,6 +215,7 @@
+ echo " qnx QNX 4.2 or higher"
+ echo " NEXTSTEP NeXTSTEP"
+ echo " sco SCO Open Server"
++ echo " kfreebsd GNU/kFreeBSD"
+ exit 1;
+ fi
+ fi
+Only in dhcp-3.0.4b2/includes/cf: kfreebsd.h
+diff -ur dhcp-3.0.4b2.old/includes/osdep.h dhcp-3.0.4b2/includes/osdep.h
+--- dhcp-3.0.4b2.old/includes/osdep.h 2005-09-28 20:58:27.000000000 +0200
++++ dhcp-3.0.4b2/includes/osdep.h 2006-02-06 12:15:55.000000000 +0100
+@@ -133,6 +133,10 @@
+ # endif
+ #endif
+
++#if defined(__FreeBSD_kernel__) && defined(__GLIBC__)
++# include "cf/kfreebsd.h"
++#endif
++
+ /* snprintf/vsnprintf hacks. for systems with no libc versions only. */
+ #ifdef NO_SNPRINTF
+ extern int isc_print_snprintf(char *, size_t, const char *, ...);
Reply to: