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 Inetutils ".
The branch, master has been updated
via 02cef70810800aaf04fc1744a69803e1ba64a310 (commit)
from e0c18623f33b9fdf074772e0d1fe9684859b36c4 (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 -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=02cef70810800aaf04fc1744a69803e1ba64a310
commit 02cef70810800aaf04fc1744a69803e1ba64a310
Author: Mats Erik Andersson <[email protected]>
Date: Fri Dec 2 21:31:37 2011 +0100
Regex pattern with exact port number.
diff --git a/ChangeLog b/ChangeLog
index ee6a1cb..63712cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2011-12-02 Mats Erik Andersson <[email protected]>
+ * tests/syslogd.sh: Match exact port number in regex pattern.
+ * tests/tftp.sh: Likewise.
+
+2011-12-02 Mats Erik Andersson <[email protected]>
+
* tests/ftp-localhost.sh: Portable invokation of mktemp(1).
2011-12-02 Mats Erik Andersson <[email protected]>
diff --git a/tests/syslogd.sh b/tests/syslogd.sh
index 1546ea7..d29f253 100755
--- a/tests/syslogd.sh
+++ b/tests/syslogd.sh
@@ -147,7 +147,7 @@ if [ "$USER" != "root" ]; then
else
# Is the INET port already in use? If so,
# skip the test in its entirety.
- netstat -na | grep -q -E "^$PROTO(4|6|46)? .*$PORT "
+ netstat -na | grep -q -E "^$PROTO(4|6|46)?.*[^0-9]$PORT[^0-9]"
if [ $? -eq 0 ]; then
echo "The INET port $PORT/$PROTO is already in use."
echo "No reliable test is possible."
diff --git a/tests/tftp.sh b/tests/tftp.sh
index b880581..453e9e8 100755
--- a/tests/tftp.sh
+++ b/tests/tftp.sh
@@ -51,7 +51,7 @@ if [ "$VERBOSE" ]; then
fi
# Check that the port is still available
-netstat -na | grep -q -E "^$PROTO(4|6|46)? .*$PORT "
+netstat -na | grep -q -E "^$PROTO(4|6|46)?.*[^0-9]$PORT[^0-9]"
if test $? -eq 0; then
echo "Desired port $PORT/$PROTO is already in use."
exit 77
@@ -75,7 +75,7 @@ test -z "$VERBOSE" || echo "Launched Inetd as process
$inetd_pid." >&2
sleep 1
# Did `inetd' really succeed in establishing a listener?
-netstat -na | grep -q -E "^$PROTO(4|6|46)? .*$PORT "
+netstat -na | grep -q -E "^$PROTO(4|6|46)?.*[^0-9]$PORT[^0-9]"
if test $? -ne 0; then
# No it did not.
ps "$inetd_pid" >/dev/null 2>&1 && kill "$inetd_pid"
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
tests/syslogd.sh | 2 +-
tests/tftp.sh | 4 ++--
3 files changed, 8 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU Inetutils
_______________________________________________
Commit-inetutils mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/commit-inetutils
