* sanity.sh (basicb-21): The getopt() in glibc 2.9 thru 2.13 are

not posix.2 compliant. They use "%s: invalid option -- '%c'\n"
instead of "%s: illegal option -- %c\n", so adjust the expr.
(Reported by David Taylor <dtaylor@emc.com>.)

src/ChangeLog

+2011-04-28  Mark D. Baushke  <mdb@gnu.org>
+
+	* sanity.sh (basicb-21): The getopt() in glibc 2.9 thru 2.13 are
+	not posix.2 compliant. They use "%s: invalid option -- '%c'\n"
+	instead of "%s: illegal option -- %c\n", so adjust the expr.
+	(Reported by David Taylor <dtaylor@emc.com>.)
+	
 2011-03-30  Larry Jones  <lawrence.jones@siemens.com>
 	* gpg.c (parse_signature_subpacket): Correct spout->raw memory

src/sanity.sh

@@ -3980,9 +3980,9 @@ ${SPROG} \[admin aborted\]: attempt to delete all revisions"
 	  # lib/getopt.c will use POSIX when __posixly_correct
 	  # otherwise the other, so accept both of them. -- mdb
 	  dotest_fail basicb-21 "${testcvs} -q admin -H" \
-"admin: invalid option -- H
+"admin: invalid option -- ${DOTSTAR}H${DOTSTAR}
 ${CPROG} \[admin aborted\]: specify ${CPROG} -H admin for usage information" \
-"admin: illegal option -- H
+"admin: illegal option -- ${DOTSTAR}H${DOTSTAR}
 ${CPROG} \[admin aborted\]: specify ${CPROG} -H admin for usage information"
 	  cd ..
 	  rmdir 1