SOURCES: dhcp-split-VARDB.patch (NEW) - split path setting for dhc...
baggins
baggins at pld-linux.org
Mon Apr 16 13:20:59 CEST 2007
Author: baggins Date: Mon Apr 16 11:20:58 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- split path setting for dhcpd.leases and dhclient.leases
---- Files affected:
SOURCES:
dhcp-split-VARDB.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/dhcp-split-VARDB.patch
diff -u /dev/null SOURCES/dhcp-split-VARDB.patch:1.1
--- /dev/null Mon Apr 16 13:20:58 2007
+++ SOURCES/dhcp-split-VARDB.patch Mon Apr 16 13:20:53 2007
@@ -0,0 +1,332 @@
+diff -ur dhcp-3.1.0a3/Makefile.conf dhcp-3.1.0a3.VARDB/Makefile.conf
+--- dhcp-3.1.0a3/Makefile.conf 2005-07-07 18:39:07.000000000 +0200
++++ dhcp-3.1.0a3.VARDB/Makefile.conf 2007-04-16 13:16:11.000000000 +0200
+@@ -41,7 +41,8 @@
+ CATMANPAGES =
+ ETC = /etc
+ VARRUN = /var/run
+-VARDB = /var/db
++VARDBS = /var/db
++VARDBC = /var/db
+ LIBDIR=/usr/local/lib
+ INCDIR=/usr/local/include
+ LIBS =
+@@ -88,7 +89,8 @@
+ #ADMMANEXT = .8
+ #FFMANEXT = .5
+ #VARRUN = /etc
+-#VARDB = /etc
++#VARDBS = /etc
++#VARDBC = /etc
+ ##--aix--
+
+ ## NEXTSTEP 3.x,4.x
+@@ -106,7 +108,8 @@
+ #LIBMANEXT = .3
+ #USRMANEXT = .3
+ #VARRUN = /etc
+-#VARDB = /etc
++#VARDBS = /etc
++#VARDBC = /etc
+ ##--nextstep--
+
+ ## SunOS 4.1
+@@ -119,7 +122,8 @@
+ #ADMMANEXT = .8
+ #FFMANEXT = .5
+ #VARRUN = /etc
+-#VARDB = /etc
++#VARDBS = /etc
++#VARDBC = /etc
+ ##--sunos4--
+
+ ## Solaris 2.5 (with gcc)
+@@ -143,7 +147,8 @@
+ #USRMANEXT = .1
+ #MANCAT = man
+ #VARRUN = /etc
+-#VARDB = /etc
++#VARDBS = /etc
++#VARDBC = /etc
+ #SCRIPT=solaris
+ ##--sunos5-gcc--
+
+@@ -167,7 +172,8 @@
+ #USRMANEXT = .1
+ #MANCAT = man
+ #VARRUN = /etc
+-#VARDB = /etc
++#VARDBS = /etc
++#VARDBC = /etc
+ #SCRIPT=solaris
+ ##--sunos5-cc--
+
+@@ -179,7 +185,8 @@
+ #CF = cf/alphaosf.h
+ #ADMMANEXT = .8
+ #FFMANEXT = .5
+-#VARDB = /etc
++#VARDBS = /etc
++#VARDBC = /etc
+ ##--alphaosf--
+
+ ## BSD/OS 2.1 through 4.0
+@@ -242,7 +249,8 @@
+ #BINDIR = /usr/etc
+ #CLIENTBINDIR=/etc
+ #VARRUN = /etc
+-#VARDB = /etc
++#VARDBS = /etc
++#VARDBC = /etc
+ #CF = cf/ultrix.h
+ #ADMMANDIR = /usr/man/man8
+ #ADMMANEXT = .8
+@@ -269,7 +277,8 @@
+ #USRMANEXT = .1
+ #MANCAT = man
+ #VARRUN = /var/run
+-#VARDB = /var/state/dhcp
++#VARDBS = /var/state/dhcp
++#VARDBC = /var/state/dhcp
+ #SCRIPT=linux
+ ##--linux-1--
+
+@@ -288,7 +297,8 @@
+ #USRMANEXT = .1
+ #MANCAT = man
+ #VARRUN = /var/run
+-#VARDB = /var/state/dhcp
++#VARDBS = /var/state/dhcp
++#VARDBC = /var/state/dhcp
+ #SCRIPT=linux
+ ##--linux-2.0--
+
+@@ -307,7 +317,8 @@
+ #USRMANEXT = .1
+ #MANCAT = man
+ #VARRUN = /var/run
+-#VARDB = /var/state/dhcp
++#VARDBS = /var/state/dhcp
++#VARDBC = /var/state/dhcp
+ #SCRIPT=linux
+ ##--linux-2.1--
+
+@@ -326,7 +337,8 @@
+ #USRMANEXT = .1
+ #MANCAT = man
+ #VARRUN = /var/run
+-#VARDB = /var/state/dhcp
++#VARDBS = /var/state/dhcp
++#VARDBC = /var/state/dhcp
+ #SCRIPT=linux
+ ##--linux-2.2--
+
+@@ -353,7 +365,8 @@
+ #MANINSTALL = compress
+ #MANTO = >
+ #VARRUN = /etc
+-#VARDB = /etc
++#VARDBS = /etc
++#VARDBC = /etc
+ #CATMANPAGES=
+ ##--sco-cc--
+
+@@ -375,7 +388,8 @@
+ #MANINSTALL = compress
+ #MANTO = >
+ #VARRUN = /usr/local/dhcp/var
+-#VARDB = /usr/local/dhcp/var
++#VARDBS = /usr/local/dhcp/var
++#VARDBC = /usr/local/dhcp/var
+ #CATMANPAGES=
+ #CLIENT_PATH = '"PATH=/bin:/etc:/usr/bin:/tcb/bin:/usr/bin/X11:/usr/local/bin:/usr/local/dhcp/bin"'
+ ##--sco-gcc--
+@@ -467,7 +481,8 @@
+ #CHMOD = chmod
+ #ETC = /etc
+ #VARRUN = /etc
+-#VARDB = /usr/local/etc/dhcp
++#VARDBS = /usr/local/etc/dhcp
++#VARDBC = /usr/local/etc/dhcp
+ ##--irix--
+
+ ## HP-UX
+Only in dhcp-3.1.0a3.VARDB: Makefile.conf~
+diff -ur dhcp-3.1.0a3/client/Makefile.dist dhcp-3.1.0a3.VARDB/client/Makefile.dist
+--- dhcp-3.1.0a3/client/Makefile.dist 2005-03-17 21:14:55.000000000 +0100
++++ dhcp-3.1.0a3.VARDB/client/Makefile.dist 2007-04-16 13:10:27.000000000 +0200
+@@ -38,7 +38,7 @@
+ all: $(PROG) $(CATMANPAGES)
+
+ install: all
+- for dir in $(CLIENTBINDIR) $(ETC) $(FFMANDIR) $(ADMMANDIR) $(VARDB); \
++ for dir in $(CLIENTBINDIR) $(ETC) $(FFMANDIR) $(ADMMANDIR) $(VARDBC); \
+ do \
+ foo=""; \
+ for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
+@@ -95,7 +95,7 @@
+ nroff -man dhclient.man8 >dhclient.cat8
+
+ dhclient.man8: dhclient.8
+- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
++ sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBC)#g" \
+ -e "s#CLIENTBINDIR#$(CLIENTBINDIR)#g" \
+ -e "s#RUNDIR#$(VARRUN)#g" < dhclient.8 >dhclient.man8
+
+@@ -103,13 +103,13 @@
+ nroff -man dhclient-script.man8 >dhclient-script.cat8
+
+ dhclient-script.man8: dhclient-script.8
+- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
++ sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBC)#g" \
+ -e "s#CLIENTBINDIR#$(CLIENTBINDIR)#g" \
+ -e "s#RUNDIR#$(VARRUN)#g" < dhclient-script.8 \
+ >dhclient-script.man8
+
+ dhclient.conf.man5: dhclient.conf.5
+- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
++ sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBC)#g" \
+ -e "s#CLIENTBINDIR#$(CLIENTBINDIR)#g" \
+ -e "s#RUNDIR#$(VARRUN)#g" < dhclient.conf.5 \
+ >dhclient.conf.man5
+@@ -118,7 +118,7 @@
+ nroff -man dhclient.conf.man5 >dhclient.conf.cat5
+
+ dhclient.leases.man5: dhclient.leases.5
+- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
++ sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBC)#g" \
+ -e "s#CLIENTBINDIR#$(CLIENTBINDIR)#g" \
+ -e "s#RUNDIR#$(VARRUN)#g" < dhclient.leases.5 \
+ >dhclient.leases.man5
+Only in dhcp-3.1.0a3.VARDB/client: Makefile.dist~
+diff -ur dhcp-3.1.0a3/common/Makefile.dist dhcp-3.1.0a3.VARDB/common/Makefile.dist
+--- dhcp-3.1.0a3/common/Makefile.dist 2005-03-17 21:14:56.000000000 +0100
++++ dhcp-3.1.0a3.VARDB/common/Makefile.dist 2007-04-16 13:11:38.000000000 +0200
+@@ -82,14 +82,14 @@
+ nroff -man dhcp-options.man5 >dhcp-options.cat5
+
+ dhcp-options.man5: dhcp-options.5
+- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
++ sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \
+ -e "s#RUNDIR#$(VARRUN)#g" < dhcp-options.5 >dhcp-options.man5
+
+ dhcp-eval.cat5: dhcp-eval.man5
+ nroff -man dhcp-eval.man5 >dhcp-eval.cat5
+
+ dhcp-eval.man5: dhcp-eval.5
+- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
++ sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \
+ -e "s#RUNDIR#$(VARRUN)#g" < dhcp-eval.5 >dhcp-eval.man5
+
+ # Dependencies (semi-automatically-generated)
+Only in dhcp-3.1.0a3.VARDB/common: Makefile.dist~
+diff -ur dhcp-3.1.0a3/dhcpctl/Makefile.dist dhcp-3.1.0a3.VARDB/dhcpctl/Makefile.dist
+--- dhcp-3.1.0a3/dhcpctl/Makefile.dist 2005-03-17 21:15:02.000000000 +0100
++++ dhcp-3.1.0a3.VARDB/dhcpctl/Makefile.dist 2007-04-16 13:12:33.000000000 +0200
+@@ -98,14 +98,14 @@
+ nroff -man dhcpctl.man3 >dhcpctl.cat3
+
+ dhcpctl.man3: dhcpctl.3
+- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
++ sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \
+ -e "s#RUNDIR#$(VARRUN)#g" < dhcpctl.3 >dhcpctl.man3
+
+ omshell.cat1: omshell.man1
+ nroff -man omshell.man1 >omshell.cat1
+
+ omshell.man1: omshell.1
+- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
++ sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \
+ -e "s#RUNDIR#$(VARRUN)#g" < omshell.1 >omshell.man1
+
+ # Dependencies (semi-automatically-generated)
+Only in dhcp-3.1.0a3.VARDB/dhcpctl: Makefile.dist~
+diff -ur dhcp-3.1.0a3/minires/Makefile.dist dhcp-3.1.0a3.VARDB/minires/Makefile.dist
+--- dhcp-3.1.0a3/minires/Makefile.dist 2005-03-17 21:15:17.000000000 +0100
++++ dhcp-3.1.0a3.VARDB/minires/Makefile.dist 2007-04-16 13:13:13.000000000 +0200
+@@ -67,7 +67,7 @@
+ nroff -man dhcpctl.man3 >dhcpctl.cat3
+
+ dhcpctl.man3: dhcpctl.3
+- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
++ sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \
+ -e "s#RUNDIR#$(VARRUN)#g" < dhcpctl.3 >dhcpctl.man3
+
+ # Dependencies (semi-automatically-generated)
+Only in dhcp-3.1.0a3.VARDB/minires: Makefile.dist~
+diff -ur dhcp-3.1.0a3/omapip/Makefile.dist dhcp-3.1.0a3.VARDB/omapip/Makefile.dist
+--- dhcp-3.1.0a3/omapip/Makefile.dist 2005-03-17 21:15:20.000000000 +0100
++++ dhcp-3.1.0a3.VARDB/omapip/Makefile.dist 2007-04-16 13:13:22.000000000 +0200
+@@ -106,7 +106,7 @@
+ nroff -man omapi.man3 >omapi.cat3
+
+ omapi.man3: omapi.3
+- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
++ sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \
+ -e "s#RUNDIR#$(VARRUN)#g" < omapi.3 >omapi.man3
+
+ # Dependencies (semi-automatically-generated)
+Only in dhcp-3.1.0a3.VARDB/omapip: Makefile.dist~
+diff -ur dhcp-3.1.0a3/relay/Makefile.dist dhcp-3.1.0a3.VARDB/relay/Makefile.dist
+--- dhcp-3.1.0a3/relay/Makefile.dist 2005-03-17 21:15:24.000000000 +0100
++++ dhcp-3.1.0a3.VARDB/relay/Makefile.dist 2007-04-16 13:13:58.000000000 +0200
+@@ -79,7 +79,7 @@
+ nroff -man dhcrelay.man8 >dhcrelay.cat8
+
+ dhcrelay.man8: dhcrelay.8
+- sed -e "s#ETCDIR#$(ETC)#" -e "s#DBDIR#$(VARDB)#" \
++ sed -e "s#ETCDIR#$(ETC)#" -e "s#DBDIR#$(VARDBS)#" \
+ -e "s#RUNDIR#$(VARRUN)#" < dhcrelay.8 >dhcrelay.man8
+
+ dhcrelay: dhcrelay.o $(DHCPLIB)
+Only in dhcp-3.1.0a3.VARDB/relay: Makefile.dist~
+diff -ur dhcp-3.1.0a3/server/Makefile.dist dhcp-3.1.0a3.VARDB/server/Makefile.dist
+--- dhcp-3.1.0a3/server/Makefile.dist 2006-07-25 15:26:00.000000000 +0200
++++ dhcp-3.1.0a3.VARDB/server/Makefile.dist 2007-04-16 13:14:23.000000000 +0200
+@@ -38,7 +38,7 @@
+ all: $(PROG) $(CATMANPAGES)
+
+ install: all
+- for dir in $(BINDIR) $(ADMMANDIR) $(FFMANDIR) $(VARDB); do \
++ for dir in $(BINDIR) $(ADMMANDIR) $(FFMANDIR) $(VARDBS); do \
+ foo=""; \
+ for bar in `echo $(DESTDIR)$${dir} |tr / ' '`; do \
+ foo=$${foo}/$$bar; \
+@@ -56,9 +56,9 @@
+ $(DESTDIR)$(FFMANDIR)/dhcpd.conf$(FFMANEXT)
+ $(MANINSTALL) $(MANFROM) dhcpd.leases.$(MANCAT)5 $(MANTO) \
+ $(DESTDIR)$(FFMANDIR)/dhcpd.leases$(FFMANEXT)
+- $(TOUCH) $(DESTDIR)$(VARDB)/dhcpd.leases
++ $(TOUCH) $(DESTDIR)$(VARDBS)/dhcpd.leases
+ # Note file mode is hardcoded to mode 0664 in server/db.c (889).
+- $(CHMOD) 664 $(DESTDIR)$(VARDB)/dhcpd.leases
++ $(CHMOD) 664 $(DESTDIR)$(VARDBS)/dhcpd.leases
+
+ depend:
+ $(MKDEP) $(INCLUDES) $(PREDEFINES) $(SRCS)
+@@ -88,21 +88,21 @@
+ nroff -man dhcpd.man8 >dhcpd.cat8
+
+ dhcpd.man8: dhcpd.8
+- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
++ sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \
+ -e "s#RUNDIR#$(VARRUN)#g" < dhcpd.8 >dhcpd.man8
+
+ dhcpd.conf.cat5: dhcpd.conf.man5
+ nroff -man dhcpd.conf.man5 >dhcpd.conf.cat5
+
+ dhcpd.conf.man5: dhcpd.conf.5
+- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
++ sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \
+ -e "s#RUNDIR#$(VARRUN)#g" < dhcpd.conf.5 >dhcpd.conf.man5
+
+ dhcpd.leases.cat5: dhcpd.leases.man5
+ nroff -man dhcpd.leases.man5 >dhcpd.leases.cat5
+
+ dhcpd.leases.man5: dhcpd.leases.5
+- sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \
++ sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDBS)#g" \
+ -e "s#RUNDIR#$(VARRUN)#g" < dhcpd.leases.5 >dhcpd.leases.man5
+
+ dhcpd: $(OBJS) $(COBJ) $(DHCPLIB)
+Only in dhcp-3.1.0a3.VARDB/server: Makefile.dist~
================================================================
More information about the pld-cvs-commit
mailing list