From 438b7a7578b63216df47016bfe371c7bab745400 Mon Sep 17 00:00:00 2001
From: mdb <mdb@users.savannah.nongnu.org>
Date: Thu, 28 Apr 2011 23:49:18 +0000
Subject: [PATCH] * 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 | 7 +++++++
src/sanity.sh | 4 ++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/ChangeLog b/src/ChangeLog
index 09fae66d0..a643da607 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+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
diff --git a/src/sanity.sh b/src/sanity.sh
index fabe9b805..3f898da86 100755
--- a/src/sanity.sh
+++ b/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
--
GitLab