[SCM] GNU gnutls branch, master, updated. gnutls_2_9_9-7-g69a40f5

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=69a40f54c6a20d7add946b0e001ca254a51dc47b

The branch, master has been updated
       via  69a40f54c6a20d7add946b0e001ca254a51dc47b (commit)
      from  e953bd1687db980515a41e34fcc2ff732044b615 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 69a40f54c6a20d7add946b0e001ca254a51dc47b
Author: Simon Josefsson <address@hidden>
Date:   Fri Nov 27 17:01:10 2009 +0100

    More fixes of grep -q problem.

-----------------------------------------------------------------------

Summary of changes:
 doc/manpages/Makefile.am           |    2 +-
 tests/key-id/key-id                |    2 +-
 tests/nist-pkits/gnutls_test_entry |    4 ++--
 tests/x509paths/chain              |   10 +++++-----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index d3e2ba2..676f8f9 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -591,7 +591,7 @@ update-makefile:
        MANS=""; \
        SRPMANS=""; \
        for i in $$FUNCS; do \
-               if echo $$i | grep -q _srp_; then \
+               if echo $$i | grep gnutls_srp_ > /dev/null; then \
                        SRPMANS="$$SRPMANS\nSRPMANS += $$i.3"; \
                else \
                        MANS="$$MANS\nAPIMANS += $$i.3"; \
diff --git a/tests/key-id/key-id b/tests/key-id/key-id
index c6be220..be53bd3 100755
--- a/tests/key-id/key-id
+++ b/tests/key-id/key-id
@@ -39,7 +39,7 @@ $CERTTOOL $PARAMS --load-ca-certificate 
$srcdir/ca-weird-keyid.pem \
     --outfile user-weird-keyid.pem 2> /dev/null
 
 if $CERTTOOL -i < user-weird-keyid.pem \
-    | grep -q '7a2c7a6097460603cbfb28e8e219df18deeb4e0d'; then
+    | grep '7a2c7a6097460603cbfb28e8e219df18deeb4e0d' > /dev/null; then
     :
 else
     echo "Could not find CA SKI in user certificate."
diff --git a/tests/nist-pkits/gnutls_test_entry 
b/tests/nist-pkits/gnutls_test_entry
index 6d4e87e..41fe007 100755
--- a/tests/nist-pkits/gnutls_test_entry
+++ b/tests/nist-pkits/gnutls_test_entry
@@ -9,8 +9,8 @@ certtool -e < chain.pem > output.txt
 
 rm -f chain.pem
 
-if grep -q 'Verification output:' output.txt; then
-    if grep 'Verification output' output.txt | grep -q -v 'Verification 
output: Verified.'; then
+if grep 'Verification output:' output.txt > /dev/null; then
+    if grep 'Verification output' output.txt | grep -v 'Verification output: 
Verified.' > /dev/null; then
        if test "$RESULT" = "0"; then
            echo "<font color=red>Unexpected reject</font>"
        else
diff --git a/tests/x509paths/chain b/tests/x509paths/chain
index 04eb87d..522fcee 100755
--- a/tests/x509paths/chain
+++ b/tests/x509paths/chain
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2004, 2005, 2007 Free Software Foundation
+# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation
 #
 # Author: Simon Josefsson
 #
@@ -40,14 +40,14 @@ while test -d X509tests/test$i; do
     if test $rc != 0; then
        echo "Chain $i FATAL failure."
     else
-       if echo "$SUCCESS" | grep -q " $i "; then
-           if grep 'Verification output:' out | grep -q -v 'Verification 
output: Verified\.$'; then
+       if echo "$SUCCESS" | grep " $i " > /dev/null; then
+           if grep 'Verification output:' out | grep -v 'Verification output: 
Verified\.$' > /dev/null; then
                echo "Chain $i verification failure UNEXPECTED."
            else
                echo "Chain $i verification success as expected."
            fi
-       elif echo "$FAILURE" | grep -q " $i "; then
-           if grep 'Verification output:' out | grep -q -v 'Verification 
output: Verified\.$'; then
+       elif echo "$FAILURE" | grep " $i "; then
+           if grep 'Verification output:' out | grep -v 'Verification output: 
Verified\.$' > /dev/null; then
                echo "Chain $i verification failure as expected."
            else
                echo "Chain $i verification success UNEXPECTED. "


hooks/post-receive
-- 
GNU gnutls