From dee2110b14633996ed00f8df750c44cd7ff05e36 Mon Sep 17 00:00:00 2001
From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Mon, 12 Oct 2015 20:46:07 +0200
Subject: [PATCH] avoid GNUisms to allow building with POSIXLY_CORRECT

---
 regression-tests/backends/gmysql-master           |  2 +-
 regression-tests/backends/goracle-master          |  2 +-
 regression-tests/backends/gpgsql-master           |  4 ++--
 regression-tests/backends/gpgsql-slave            | 10 ++++++----
 regression-tests/backends/gsql-common             |  2 +-
 regression-tests/backends/gsqlite3-master         |  2 +-
 regression-tests/tests/verify-dnssec-zone/command |  2 +-
 7 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/regression-tests/backends/gmysql-master b/regression-tests/backends/gmysql-master
index d611960cd..84606f5c3 100644
--- a/regression-tests/backends/gmysql-master
+++ b/regression-tests/backends/gmysql-master
@@ -25,7 +25,7 @@ gmysql-host=$GMYSQLHOST
 gmysql-password=$GMYSQLPASSWD
 __EOF__
 
-		gsql-master gmysql
+		gsql_master gmysql
 		;;
 
 	*)
diff --git a/regression-tests/backends/goracle-master b/regression-tests/backends/goracle-master
index 173d20a5a..175747b13 100644
--- a/regression-tests/backends/goracle-master
+++ b/regression-tests/backends/goracle-master
@@ -34,7 +34,7 @@ goracle-user=$GORACLEUSER
 goracle-password=$GORACLEPASSWD
 __EOF__
 
-		gsql-master goracle nodyndns
+		gsql_master goracle nodyndns
 		;;
 
 	*)
diff --git a/regression-tests/backends/gpgsql-master b/regression-tests/backends/gpgsql-master
index 741e4dd7a..21447683f 100644
--- a/regression-tests/backends/gpgsql-master
+++ b/regression-tests/backends/gpgsql-master
@@ -9,7 +9,7 @@ case $context in
 		createdb --user="$GPGSQLUSER" "$GPGSQLDB"	|| echo ignoring mysqladmin drop failure
 		psql --user="$GPGSQLUSER" "$GPGSQLDB" < ../modules/gpgsqlbackend/schema.pgsql.sql
 		tosql gpgsql | psql --user="$GPGSQLUSER" "$GPGSQLDB" 2>&1 | uniq -c
-                psql --user="$GPGSQLUSER" "$GPGSQLDB" -c "ANALYZE"
+                psql --user="$GPGSQLUSER" -c "ANALYZE" "$GPGSQLDB"
 
 		cat > pdns-gpgsql.conf << __EOF__
 module-dir=./modules
@@ -18,7 +18,7 @@ gpgsql-dbname=$GPGSQLDB
 gpgsql-user=$GPGSQLUSER
 __EOF__
 
-		gsql-master gpgsql nodyndns
+		gsql_master gpgsql nodyndns
 		;;
 
 	*)
diff --git a/regression-tests/backends/gpgsql-slave b/regression-tests/backends/gpgsql-slave
index 499735166..734d95dee 100644
--- a/regression-tests/backends/gpgsql-slave
+++ b/regression-tests/backends/gpgsql-slave
@@ -20,8 +20,9 @@ __EOF__
 
 	for zone in $(grep 'zone ' named.conf  | cut -f2 -d\" | tac)
 	do
-		psql --user="$GPGSQL2USER" "$GPGSQL2DB" \
-		-c "INSERT INTO domains (name, type, master) VALUES('$zone','SLAVE','127.0.0.1:$port')"
+		psql --user="$GPGSQL2USER" \
+		-c "INSERT INTO domains (name, type, master) VALUES('$zone','SLAVE','127.0.0.1:$port')" \
+		"$GPGSQL2DB"
 	done
 
 	$PDNSSEC --config-dir=. --config-name=gpgsql2 import-tsig-key test $ALGORITHM $KEY
@@ -43,8 +44,9 @@ __EOF__
 	while [ $loopcount -lt 30 ]
 	do
 		sleep 5
-		todo=$(psql --user="$GPGSQL2USER" "$GPGSQL2DB" \
-		  -t -c 'SELECT COUNT(id) FROM domains WHERE last_check IS NULL')
+		todo=$(psql --user="$GPGSQL2USER" \
+		  -t -c 'SELECT COUNT(id) FROM domains WHERE last_check IS NULL' \
+		   "$GPGSQL2DB")
 		if [ $todo = 0 ]
 		then
 			break
diff --git a/regression-tests/backends/gsql-common b/regression-tests/backends/gsql-common
index 6a035b96a..3e27d8d69 100644
--- a/regression-tests/backends/gsql-common
+++ b/regression-tests/backends/gsql-common
@@ -1,4 +1,4 @@
-gsql-master()
+gsql_master()
 {
 	backend=$1
 	skipreasons=$2
diff --git a/regression-tests/backends/gsqlite3-master b/regression-tests/backends/gsqlite3-master
index c7b3ec0cb..1f5063c15 100644
--- a/regression-tests/backends/gsqlite3-master
+++ b/regression-tests/backends/gsqlite3-master
@@ -13,7 +13,7 @@ launch=gsqlite3
 gsqlite3-database=pdns.sqlite3
 __EOF__
 
-		gsql-master gsqlite3 nodyndns
+		gsql_master gsqlite3 nodyndns
 		;;
 
 	*)
diff --git a/regression-tests/tests/verify-dnssec-zone/command b/regression-tests/tests/verify-dnssec-zone/command
index 841d45c22..7f92e3eea 100755
--- a/regression-tests/tests/verify-dnssec-zone/command
+++ b/regression-tests/tests/verify-dnssec-zone/command
@@ -2,7 +2,7 @@
 for zone in $(grep 'zone ' named.conf  | cut -f2 -d\" | grep -v '^\(example.com\|nztest.com\)$')
 do
 	TFILE=$(mktemp tmp.XXXXXXXXXX)
-	drill axfr $zone @$nameserver -p $port | ldns-read-zone -z > $TFILE
+	drill -p $port axfr $zone @$nameserver | ldns-read-zone -z > $TFILE
 	for validator in "ldns-verify-zone -V2" validns jdnssec-verifyzone named-checkzone
 	do
 		echo --- $validator $zone
-- 
2.50.1