[pkg-dhcp-commits] [isc-dhcp] 01/01: release 4.3.1-2

[Michael Gilbert]

This is an automated email from the git hooks/post-receive script.

mgilbert pushed a commit to branch master
in repository isc-dhcp.

commit 6e14860aed6cd76d1d83dc49639048cf5ecd5623
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sat Sep 27 18:51:23 2014 -0400

    release 4.3.1-2
---
 debian/changelog                | 6 ++++++
 debian/debug                    | 5 +++--
 debian/dhclient-script.hurd     | 4 ++--
 debian/dhclient-script.kfreebsd | 4 ++--
 debian/dhclient-script.linux    | 4 ++--
 5 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7fa99b9..cbfacdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+isc-dhcp (4.3.1-2) unstable; urgency=medium
+
+  * Use /bin/sh instead of /bin/bash for dhclient scripts (closes: #762923).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sat, 27 Sep 2014 21:57:28 +0000
+
 isc-dhcp (4.3.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/debug b/debian/debug
index efe9fc2..5785a97 100644
--- a/debian/debug
+++ b/debian/debug
@@ -26,10 +26,11 @@ if [ "$RUN" = "yes" ]; then
 			       ip6_address ip6_prefix ip6_prefixlen \
 			       dhcp6_domain_search dhcp6_name_servers ; do
 			var="${prefix}${basevar}"
+			eval "content=\$var"
 
 			# show only variables with values set
-			if [ -n "${!var}" ]; then
-				echo "$var='${!var}'" >> /tmp/dhclient-script.debug
+			if [ -n "${content}" ]; then
+				echo "$var='${content}'" >> /tmp/dhclient-script.debug
 			fi
 		done
 	done
diff --git a/debian/dhclient-script.hurd b/debian/dhclient-script.hurd
index c73d83d..d03bf9c 100644
--- a/debian/dhclient-script.hurd
+++ b/debian/dhclient-script.hurd
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # dhclient-script for GNU, based on the script for Linux.
 # Dan Halbert, March, 1997.
@@ -11,7 +11,7 @@
 # Modified to work on point-to-point links. Andrew Pollock, June 2005
 # Modified to support passing the parameters called with to the hooks. Andrew Pollock, November 2005
 # Modified to work under GNU/Hurd for isc-dhcp-4.1.1 based on the
-# patch by Samuel Thibault for dhcp3. Svante Signell, February 2011.
+# patch by Samuel Thibault for dhcp. Svante Signell, February 2011.
 
 # The alias handling in here probably still sucks. -mdz
 
diff --git a/debian/dhclient-script.kfreebsd b/debian/dhclient-script.kfreebsd
index e691e06..2f67c85 100644
--- a/debian/dhclient-script.kfreebsd
+++ b/debian/dhclient-script.kfreebsd
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # dhclient-script for GNU/kFreeBSD. Aurelien Jarno, May, 2005.
 # Based on Linux and FreeBSD scripts.
 
@@ -67,7 +67,7 @@ run_hook() {
     shift	# discard the first argument, then the rest are the script's
 
     if [ -f $script ]; then
-        . $script "$@"
+        $script "$@"
     fi
 
     if [ -n "$exit_status" ] && [ "$exit_status" -ne 0 ]; then
diff --git a/debian/dhclient-script.linux b/debian/dhclient-script.linux
index 503e051..2b6505e 100644
--- a/debian/dhclient-script.linux
+++ b/debian/dhclient-script.linux
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # dhclient-script for Linux. Dan Halbert, March, 1997.
 # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
@@ -114,7 +114,7 @@ run_hook() {
     shift	# discard the first argument, then the rest are the script's
 
     if [ -f $script ]; then
-        . $script "$@"
+        $script "$@"
     fi
 
     if [ -n "$exit_status" ] && [ "$exit_status" -ne 0 ]; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-dhcp/isc-dhcp.git