Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 555407ff6e2f742df64ae93859f14a0fc1397829 Mon Sep 17 00:00:00 2001 |
| 2 | From: Wenzong Fan <wenzong.fan@windriver.com> |
| 3 | Date: Fri, 12 Sep 2014 05:35:05 -0400 |
| 4 | Subject: [PATCH] libpam/xtests: remove bash dependency |
| 5 | |
| 6 | There's not bash specific syntax in the xtest scripts: |
| 7 | |
| 8 | # after below patches applied: |
| 9 | $ cd Linux-PAM-1.1.6/xtests |
| 10 | $ checkbashisms *.sh |
| 11 | No output |
| 12 | |
| 13 | Just remove the runtime dependency to bash. |
| 14 | |
| 15 | Upstream-Status: Pending |
| 16 | |
| 17 | Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> |
| 18 | --- |
| 19 | xtests/run-xtests.sh | 2 +- |
| 20 | xtests/tst-pam_access1.sh | 2 +- |
| 21 | xtests/tst-pam_access2.sh | 2 +- |
| 22 | xtests/tst-pam_access3.sh | 2 +- |
| 23 | xtests/tst-pam_access4.sh | 2 +- |
| 24 | xtests/tst-pam_assemble_line1.sh | 2 +- |
| 25 | xtests/tst-pam_group1.sh | 2 +- |
| 26 | xtests/tst-pam_limits1.sh | 2 +- |
| 27 | xtests/tst-pam_pwhistory1.sh | 2 +- |
| 28 | xtests/tst-pam_substack1.sh | 2 +- |
| 29 | xtests/tst-pam_substack2.sh | 2 +- |
| 30 | xtests/tst-pam_substack3.sh | 2 +- |
| 31 | xtests/tst-pam_substack4.sh | 2 +- |
| 32 | xtests/tst-pam_substack5.sh | 2 +- |
| 33 | xtests/tst-pam_succeed_if1.sh | 2 +- |
| 34 | xtests/tst-pam_unix1.sh | 2 +- |
| 35 | xtests/tst-pam_unix2.sh | 2 +- |
| 36 | xtests/tst-pam_unix3.sh | 2 +- |
| 37 | xtests/tst-pam_unix4.sh | 2 +- |
| 38 | 19 files changed, 19 insertions(+), 19 deletions(-) |
| 39 | |
| 40 | diff --git a/xtests/run-xtests.sh b/xtests/run-xtests.sh |
| 41 | index 3a89057..1cf8684 100755 |
| 42 | --- a/xtests/run-xtests.sh |
| 43 | +++ b/xtests/run-xtests.sh |
| 44 | @@ -1,4 +1,4 @@ |
| 45 | -#!/bin/bash |
| 46 | +#!/bin/sh |
| 47 | |
| 48 | SRCDIR=$1 |
| 49 | shift 1 |
| 50 | diff --git a/xtests/tst-pam_access1.sh b/xtests/tst-pam_access1.sh |
| 51 | index 180d256..70521d2 100755 |
| 52 | --- a/xtests/tst-pam_access1.sh |
| 53 | +++ b/xtests/tst-pam_access1.sh |
| 54 | @@ -1,4 +1,4 @@ |
| 55 | -#!/bin/bash |
| 56 | +#!/bin/sh |
| 57 | |
| 58 | /usr/sbin/groupadd tstpamaccess |
| 59 | /usr/sbin/useradd -G tstpamaccess -p '!!' tstpamaccess1 |
| 60 | diff --git a/xtests/tst-pam_access2.sh b/xtests/tst-pam_access2.sh |
| 61 | index 0a30275..7e3e60f 100755 |
| 62 | --- a/xtests/tst-pam_access2.sh |
| 63 | +++ b/xtests/tst-pam_access2.sh |
| 64 | @@ -1,4 +1,4 @@ |
| 65 | -#!/bin/bash |
| 66 | +#!/bin/sh |
| 67 | |
| 68 | /usr/sbin/groupadd tstpamaccess |
| 69 | /usr/sbin/useradd -p '!!' tstpamaccess2 |
| 70 | diff --git a/xtests/tst-pam_access3.sh b/xtests/tst-pam_access3.sh |
| 71 | index 348e0c3..3630e2e 100755 |
| 72 | --- a/xtests/tst-pam_access3.sh |
| 73 | +++ b/xtests/tst-pam_access3.sh |
| 74 | @@ -1,4 +1,4 @@ |
| 75 | -#!/bin/bash |
| 76 | +#!/bin/sh |
| 77 | |
| 78 | /usr/sbin/useradd -p '!!' tstpamaccess3 |
| 79 | ./tst-pam_access3 |
| 80 | diff --git a/xtests/tst-pam_access4.sh b/xtests/tst-pam_access4.sh |
| 81 | index 61e7b44..4538df4 100755 |
| 82 | --- a/xtests/tst-pam_access4.sh |
| 83 | +++ b/xtests/tst-pam_access4.sh |
| 84 | @@ -1,4 +1,4 @@ |
| 85 | -#!/bin/bash |
| 86 | +#!/bin/sh |
| 87 | |
| 88 | /usr/sbin/useradd -p '!!' tstpamaccess4 |
| 89 | ./tst-pam_access4 |
| 90 | diff --git a/xtests/tst-pam_assemble_line1.sh b/xtests/tst-pam_assemble_line1.sh |
| 91 | index 248d47e..dc2a675 100755 |
| 92 | --- a/xtests/tst-pam_assemble_line1.sh |
| 93 | +++ b/xtests/tst-pam_assemble_line1.sh |
| 94 | @@ -1,3 +1,3 @@ |
| 95 | -#!/bin/bash |
| 96 | +#!/bin/sh |
| 97 | |
| 98 | exec ./tst-pam_authfail tst-pam_assemble_line1 |
| 99 | diff --git a/xtests/tst-pam_group1.sh b/xtests/tst-pam_group1.sh |
| 100 | index b76377f..44faca9 100755 |
| 101 | --- a/xtests/tst-pam_group1.sh |
| 102 | +++ b/xtests/tst-pam_group1.sh |
| 103 | @@ -1,4 +1,4 @@ |
| 104 | -#!/bin/bash |
| 105 | +#!/bin/sh |
| 106 | |
| 107 | /usr/sbin/groupadd tstpamgrpg |
| 108 | /usr/sbin/useradd -p '!!' tstpamgrp |
| 109 | diff --git a/xtests/tst-pam_limits1.sh b/xtests/tst-pam_limits1.sh |
| 110 | index 4faa822..32c021d 100755 |
| 111 | --- a/xtests/tst-pam_limits1.sh |
| 112 | +++ b/xtests/tst-pam_limits1.sh |
| 113 | @@ -1,4 +1,4 @@ |
| 114 | -#!/bin/bash |
| 115 | +#!/bin/sh |
| 116 | |
| 117 | /usr/sbin/useradd -p '!!' tstpamlimits |
| 118 | ./tst-pam_limits1 |
| 119 | diff --git a/xtests/tst-pam_pwhistory1.sh b/xtests/tst-pam_pwhistory1.sh |
| 120 | index ddb3b8b..0f212e2 100644 |
| 121 | --- a/xtests/tst-pam_pwhistory1.sh |
| 122 | +++ b/xtests/tst-pam_pwhistory1.sh |
| 123 | @@ -1,4 +1,4 @@ |
| 124 | -#!/bin/bash |
| 125 | +#!/bin/sh |
| 126 | |
| 127 | /usr/sbin/useradd tstpampwhistory |
| 128 | ./tst-pam_pwhistory1 |
| 129 | diff --git a/xtests/tst-pam_substack1.sh b/xtests/tst-pam_substack1.sh |
| 130 | index 5260175..f1b72a7 100755 |
| 131 | --- a/xtests/tst-pam_substack1.sh |
| 132 | +++ b/xtests/tst-pam_substack1.sh |
| 133 | @@ -1,3 +1,3 @@ |
| 134 | -#!/bin/bash |
| 135 | +#!/bin/sh |
| 136 | |
| 137 | exec ./tst-pam_authfail tst-pam_substack1 |
| 138 | diff --git a/xtests/tst-pam_substack2.sh b/xtests/tst-pam_substack2.sh |
| 139 | index c02f597..3804fa7 100755 |
| 140 | --- a/xtests/tst-pam_substack2.sh |
| 141 | +++ b/xtests/tst-pam_substack2.sh |
| 142 | @@ -1,3 +1,3 @@ |
| 143 | -#!/bin/bash |
| 144 | +#!/bin/sh |
| 145 | |
| 146 | exec ./tst-pam_authsucceed tst-pam_substack2 |
| 147 | diff --git a/xtests/tst-pam_substack3.sh b/xtests/tst-pam_substack3.sh |
| 148 | index 0e572aa..aa48e8e 100755 |
| 149 | --- a/xtests/tst-pam_substack3.sh |
| 150 | +++ b/xtests/tst-pam_substack3.sh |
| 151 | @@ -1,3 +1,3 @@ |
| 152 | -#!/bin/bash |
| 153 | +#!/bin/sh |
| 154 | |
| 155 | exec ./tst-pam_authsucceed tst-pam_substack3 |
| 156 | diff --git a/xtests/tst-pam_substack4.sh b/xtests/tst-pam_substack4.sh |
| 157 | index a3ef08a..958a07a 100755 |
| 158 | --- a/xtests/tst-pam_substack4.sh |
| 159 | +++ b/xtests/tst-pam_substack4.sh |
| 160 | @@ -1,3 +1,3 @@ |
| 161 | -#!/bin/bash |
| 162 | +#!/bin/sh |
| 163 | |
| 164 | exec ./tst-pam_authsucceed tst-pam_substack4 |
| 165 | diff --git a/xtests/tst-pam_substack5.sh b/xtests/tst-pam_substack5.sh |
| 166 | index e2714fd..7e0da74 100755 |
| 167 | --- a/xtests/tst-pam_substack5.sh |
| 168 | +++ b/xtests/tst-pam_substack5.sh |
| 169 | @@ -1,3 +1,3 @@ |
| 170 | -#!/bin/bash |
| 171 | +#!/bin/sh |
| 172 | |
| 173 | exec ./tst-pam_authfail tst-pam_substack5 |
| 174 | diff --git a/xtests/tst-pam_succeed_if1.sh b/xtests/tst-pam_succeed_if1.sh |
| 175 | index a643b2e..58e57b4 100755 |
| 176 | --- a/xtests/tst-pam_succeed_if1.sh |
| 177 | +++ b/xtests/tst-pam_succeed_if1.sh |
| 178 | @@ -1,4 +1,4 @@ |
| 179 | -#!/bin/bash |
| 180 | +#!/bin/sh |
| 181 | |
| 182 | /usr/sbin/useradd -p '!!' tstpamtest |
| 183 | /usr/sbin/useradd -p '!!' pamtest |
| 184 | diff --git a/xtests/tst-pam_unix1.sh b/xtests/tst-pam_unix1.sh |
| 185 | index f75bd84..72deac0 100755 |
| 186 | --- a/xtests/tst-pam_unix1.sh |
| 187 | +++ b/xtests/tst-pam_unix1.sh |
| 188 | @@ -1,4 +1,4 @@ |
| 189 | -#!/bin/bash |
| 190 | +#!/bin/sh |
| 191 | |
| 192 | /usr/sbin/useradd -p '!!' tstpamunix |
| 193 | ./tst-pam_unix1 |
| 194 | diff --git a/xtests/tst-pam_unix2.sh b/xtests/tst-pam_unix2.sh |
| 195 | index 7093155..c04d6e6 100755 |
| 196 | --- a/xtests/tst-pam_unix2.sh |
| 197 | +++ b/xtests/tst-pam_unix2.sh |
| 198 | @@ -1,4 +1,4 @@ |
| 199 | -#!/bin/bash |
| 200 | +#!/bin/sh |
| 201 | |
| 202 | # pamunix0 = 0aXKZztA.d1KY |
| 203 | /usr/sbin/useradd -p 0aXKZztA.d1KY tstpamunix |
| 204 | diff --git a/xtests/tst-pam_unix3.sh b/xtests/tst-pam_unix3.sh |
| 205 | index ef4a07c..b52db2b 100755 |
| 206 | --- a/xtests/tst-pam_unix3.sh |
| 207 | +++ b/xtests/tst-pam_unix3.sh |
| 208 | @@ -1,4 +1,4 @@ |
| 209 | -#!/bin/bash |
| 210 | +#!/bin/sh |
| 211 | |
| 212 | # pamunix01 = 0aXKZztA.d1KYIuFXArmd2jU |
| 213 | /usr/sbin/useradd -p 0aXKZztA.d1KYIuFXArmd2jU tstpamunix |
| 214 | diff --git a/xtests/tst-pam_unix4.sh b/xtests/tst-pam_unix4.sh |
| 215 | index 787c2f9..e7976fd 100755 |
| 216 | --- a/xtests/tst-pam_unix4.sh |
| 217 | +++ b/xtests/tst-pam_unix4.sh |
| 218 | @@ -1,4 +1,4 @@ |
| 219 | -#!/bin/bash |
| 220 | +#!/bin/sh |
| 221 | |
| 222 | # pamunix01 = 0aXKZztA.d1KYIuFXArmd2jU |
| 223 | /usr/sbin/useradd -p 0aXKZztA.d1KYIuFXArmd2jU tstpamunix |
| 224 | -- |
| 225 | 1.7.9.5 |
| 226 | |