From c090aeb186ebd4f0313cfbc2b0f090eb3473cfc7 Mon Sep 17 00:00:00 2001 From: roam Date: Sat, 17 Feb 2001 14:19:02 +0000 Subject: New patchfiles in the update to 3.0b2pl16. PR: 24911 Submitted by: Cyrille Lefevre - maintainer --- .../files/patch-client-Makefile.dist | 29 ++++++++++++++++++++++ net/isc-dhcp3-server/files/patch-dhclient-script.8 | 16 ++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 net/isc-dhcp3-server/files/patch-client-Makefile.dist create mode 100644 net/isc-dhcp3-server/files/patch-dhclient-script.8 (limited to 'net/isc-dhcp3-server') diff --git a/net/isc-dhcp3-server/files/patch-client-Makefile.dist b/net/isc-dhcp3-server/files/patch-client-Makefile.dist new file mode 100644 index 000000000000..f6ec21d77e09 --- /dev/null +++ b/net/isc-dhcp3-server/files/patch-client-Makefile.dist @@ -0,0 +1,29 @@ +--- client/Makefile.dist.orig Fri Oct 13 21:03:19 2000 ++++ client/Makefile.dist Fri Jan 26 05:05:24 2001 +@@ -52,8 +52,8 @@ + echo "No client script available."; \ + else \ + $(INSTALL) $(TOP)/client/scripts/$(SCRIPT)\ +- $(DESTDIR)$(ETC)/dhclient-script; \ +- $(CHMOD) 700 $(DESTDIR)$(ETC)/dhclient-script; \ ++ $(DESTDIR)$(CLIENTBINDIR)/dhclient-script; \ ++ $(CHMOD) 700 $(DESTDIR)$(CLIENTBINDIR)/dhclient-script; \ + fi + $(MANINSTALL) $(MANFROM) dhclient.$(MANCAT)8 $(MANTO) \ + $(DESTDIR)$(ADMMANDIR)/dhclient$(ADMMANEXT) +@@ -93,6 +93,7 @@ + + dhclient.man8: dhclient.8 + sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ ++ -e "s#CLIENTBINDIR#$(CLIENTBINDIR)#g" \ + -e "s#RUNDIR#$(VARRUN)#g" < dhclient.8 >dhclient.man8 + + dhclient-script.cat8: dhclient-script.man8 +@@ -100,6 +101,7 @@ + + dhclient-script.man8: dhclient-script.8 + sed -e "s#ETCDIR#$(ETC)#g" -e "s#DBDIR#$(VARDB)#g" \ ++ -e "s#CLIENTBINDIR#$(CLIENTBINDIR)#g" \ + -e "s#RUNDIR#$(VARRUN)#g" < dhclient-script.8 \ + >dhclient-script.man8 + diff --git a/net/isc-dhcp3-server/files/patch-dhclient-script.8 b/net/isc-dhcp3-server/files/patch-dhclient-script.8 new file mode 100644 index 000000000000..834d3282d999 --- /dev/null +++ b/net/isc-dhcp3-server/files/patch-dhclient-script.8 @@ -0,0 +1,16 @@ +--- client/dhclient-script.8.orig Tue Mar 30 00:50:50 1999 ++++ client/dhclient-script.8 Fri Jan 26 05:12:57 2001 +@@ -60,11 +60,11 @@ + to change the behaviour of the script. If an error occurs during the + execution of the script, it can set the exit_status variable to a nonzero + value, and +-.B ETCDIR/dhclient-script ++.B CLIENTBINDIR/dhclient-script + will exit with that error code immediately after the client script exits. + .PP + After all processing has completed, +-.B ETCDIR/dhclient-script ++.B CLIENTBINDIR/dhclient-script + checks for the presence of an executable + .B ETCDIR/dhclient-exit-hooks + script, which if present is invoked using the '.' command. The exit status -- cgit