Günther Deschner
parent
3386b9a228
commit
7d36d24c88
|
|
@ -121,3 +121,5 @@ samba-3.6.0pre1.tar.gz
|
|||
/samba-4.8.0rc4.tar.asc
|
||||
/samba-4.8.0.tar.xz
|
||||
/samba-4.8.0.tar.asc
|
||||
/samba-4.8.1.tar.xz
|
||||
/samba-4.8.1.tar.asc
|
||||
|
|
|
|||
|
|
@ -1,111 +0,0 @@
|
|||
From a4d002af9c33b2fa9fbec390aad7e4ac484df123 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Schwenke <martin@meltin.net>
|
||||
Date: Thu, 8 Mar 2018 11:49:56 +1100
|
||||
Subject: [PATCH] ctdb-tests: Don't use nc -d or -w options
|
||||
|
||||
nmap-ncat is used in some distributions to replace netcat. It has a
|
||||
different meaning for these options.
|
||||
|
||||
We can get the same effect as the current combination of -d and -w by
|
||||
piping a sleep process to nc. Subsequent use of $! works because it
|
||||
gets the last process in pipeline.
|
||||
|
||||
Note that redirecting from /dev/null doesn't work with some versions
|
||||
of nc. They just exit when they get EOF.
|
||||
|
||||
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13327
|
||||
|
||||
Signed-off-by: Martin Schwenke <martin@meltin.net>
|
||||
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
|
||||
|
||||
(cherry picked from commit 9e954bcbf43d67a18ee55f84cda0b09028f96b92)
|
||||
---
|
||||
ctdb/tests/complex/30_nfs_tickle_killtcp.sh | 2 +-
|
||||
ctdb/tests/complex/31_nfs_tickle.sh | 2 +-
|
||||
ctdb/tests/complex/32_cifs_tickle.sh | 2 +-
|
||||
ctdb/tests/complex/34_nfs_tickle_restart.sh | 2 +-
|
||||
ctdb/tests/complex/36_smb_reset_server.sh | 2 +-
|
||||
ctdb/tests/complex/37_nfs_reset_server.sh | 2 +-
|
||||
6 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/ctdb/tests/complex/30_nfs_tickle_killtcp.sh b/ctdb/tests/complex/30_nfs_tickle_killtcp.sh
|
||||
index d1e7d714646..40ec6babf2e 100755
|
||||
--- a/ctdb/tests/complex/30_nfs_tickle_killtcp.sh
|
||||
+++ b/ctdb/tests/complex/30_nfs_tickle_killtcp.sh
|
||||
@@ -46,7 +46,7 @@ test_port=2049
|
||||
|
||||
echo "Connecting to node ${test_node} on IP ${test_ip}:${test_port} with netcat..."
|
||||
|
||||
-nc -d -w 30 $test_ip $test_port &
|
||||
+sleep 30 | nc $test_ip $test_port &
|
||||
nc_pid=$!
|
||||
ctdb_test_exit_hook_add "kill $nc_pid >/dev/null 2>&1"
|
||||
|
||||
diff --git a/ctdb/tests/complex/31_nfs_tickle.sh b/ctdb/tests/complex/31_nfs_tickle.sh
|
||||
index c82d31dda1b..0b6990f8df9 100755
|
||||
--- a/ctdb/tests/complex/31_nfs_tickle.sh
|
||||
+++ b/ctdb/tests/complex/31_nfs_tickle.sh
|
||||
@@ -54,7 +54,7 @@ test_port=2049
|
||||
|
||||
echo "Connecting to node ${test_node} on IP ${test_ip}:${test_port} with netcat..."
|
||||
|
||||
-nc -d -w $(($monitor_interval * 4)) $test_ip $test_port &
|
||||
+sleep $((monitor_interval * 4)) | nc $test_ip $test_port &
|
||||
nc_pid=$!
|
||||
ctdb_test_exit_hook_add "kill $nc_pid >/dev/null 2>&1"
|
||||
|
||||
diff --git a/ctdb/tests/complex/32_cifs_tickle.sh b/ctdb/tests/complex/32_cifs_tickle.sh
|
||||
index da369b9f5f7..366824501da 100755
|
||||
--- a/ctdb/tests/complex/32_cifs_tickle.sh
|
||||
+++ b/ctdb/tests/complex/32_cifs_tickle.sh
|
||||
@@ -52,7 +52,7 @@ test_port=445
|
||||
|
||||
echo "Connecting to node ${test_node} on IP ${test_ip}:${test_port} with netcat..."
|
||||
|
||||
-nc -d -w $(($monitor_interval * 4)) $test_ip $test_port &
|
||||
+sleep $((monitor_interval * 4)) | nc $test_ip $test_port &
|
||||
nc_pid=$!
|
||||
ctdb_test_exit_hook_add "kill $nc_pid >/dev/null 2>&1"
|
||||
|
||||
diff --git a/ctdb/tests/complex/34_nfs_tickle_restart.sh b/ctdb/tests/complex/34_nfs_tickle_restart.sh
|
||||
index 6350db68c2e..2aab0614ff9 100755
|
||||
--- a/ctdb/tests/complex/34_nfs_tickle_restart.sh
|
||||
+++ b/ctdb/tests/complex/34_nfs_tickle_restart.sh
|
||||
@@ -53,7 +53,7 @@ test_port=2049
|
||||
|
||||
echo "Connecting to node ${test_node} on IP ${test_ip}:${test_port} with netcat..."
|
||||
|
||||
-nc -d -w 600 $test_ip $test_port &
|
||||
+sleep 600 | nc $test_ip $test_port &
|
||||
nc_pid=$!
|
||||
ctdb_test_exit_hook_add "kill $nc_pid >/dev/null 2>&1"
|
||||
|
||||
diff --git a/ctdb/tests/complex/36_smb_reset_server.sh b/ctdb/tests/complex/36_smb_reset_server.sh
|
||||
index 5723ac7e025..beff1a22014 100755
|
||||
--- a/ctdb/tests/complex/36_smb_reset_server.sh
|
||||
+++ b/ctdb/tests/complex/36_smb_reset_server.sh
|
||||
@@ -52,7 +52,7 @@ sleep_for 5
|
||||
|
||||
echo "Connecting to node ${test_node} on IP ${test_ip}:${test_port} with nc..."
|
||||
|
||||
-nc -d -w $(($monitor_interval * 4)) $test_ip $test_port &
|
||||
+sleep $((monitor_interval * 4)) | nc $test_ip $test_port &
|
||||
nc_pid=$!
|
||||
ctdb_test_exit_hook_add "kill $nc_pid >/dev/null 2>&1"
|
||||
|
||||
diff --git a/ctdb/tests/complex/37_nfs_reset_server.sh b/ctdb/tests/complex/37_nfs_reset_server.sh
|
||||
index d6dd0f03b1f..07bd034d6c7 100755
|
||||
--- a/ctdb/tests/complex/37_nfs_reset_server.sh
|
||||
+++ b/ctdb/tests/complex/37_nfs_reset_server.sh
|
||||
@@ -52,7 +52,7 @@ sleep_for 5
|
||||
|
||||
echo "Connecting to node ${test_node} on IP ${test_ip}:${test_port} with nc..."
|
||||
|
||||
-nc -d -w $(($monitor_interval * 4)) $test_ip $test_port &
|
||||
+sleep $((monitor_interval * 4)) | nc $test_ip $test_port &
|
||||
nc_pid=$!
|
||||
ctdb_test_exit_hook_add "kill $nc_pid >/dev/null 2>&1"
|
||||
|
||||
--
|
||||
2.16.2
|
||||
|
||||
|
|
@ -6,9 +6,9 @@
|
|||
# ctdb is enabled by default, you can disable it with: --without clustering
|
||||
%bcond_without clustering
|
||||
|
||||
%define main_release 7
|
||||
%define main_release 0
|
||||
|
||||
%define samba_version 4.8.0
|
||||
%define samba_version 4.8.1
|
||||
%define talloc_version 2.1.11
|
||||
%define tdb_version 1.3.15
|
||||
%define tevent_version 0.9.36
|
||||
|
|
@ -122,8 +122,6 @@ Source14: samba.pamd
|
|||
Source200: README.dc
|
||||
Source201: README.downgrade
|
||||
|
||||
Patch0: samba-4.8.0-nc_in_ctdb_tests.patch
|
||||
|
||||
Requires(pre): /usr/sbin/groupadd
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
|
|
@ -3553,6 +3551,9 @@ fi
|
|||
%endif # with_clustering_support
|
||||
|
||||
%changelog
|
||||
* Thu Apr 26 2018 Guenther Deschner <gdeschner@redhat.com> - 4.8.1-0
|
||||
- Update to Samba 4.8.1
|
||||
|
||||
* Wed Mar 14 2018 Guenther Deschner <gdeschner@redhat.com> - 4.8.0-7
|
||||
- resolves: #1554754, #1554756 - Security fixes for CVE-2018-1050 CVE-2018-1057
|
||||
- resolves: #1555112 - Update to Samba 4.8.0
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (samba-4.8.0.tar.xz) = aec402cf929d1cda67d552aff0e64dfb507c2c715ae8ff5a78fa2d19ba27cbf1ca984b00cb33045e4f26506bdebaa629e126b3d61d7825bf0458c5a4310cc738
|
||||
SHA512 (samba-4.8.0.tar.asc) = 716f54983773dd595cd8d672ef23281170930f72e115443d083ebdcc022a63dc783239b4293eb4f57b943cb88f02e41c02f5e4d39dedffd4a0a0e5ed879f4040
|
||||
SHA512 (samba-4.8.1.tar.xz) = fa65631ad32f415bcfea10e2946117db0aab8c44ebea85b9b57ac9cf67811448a77dc07faba7f8ffe9ea3b5001f6164921e1692c136dcf07f8a7fd42e2992388
|
||||
SHA512 (samba-4.8.1.tar.asc) = 97e9c972c958ee0072350a724b70766fe1aec1ad35fccb2ba48cf14ebbd32052c17e859a6efb45b124629a8fee024f5d26a7f570fb936576e714daaef904e48b
|
||||
|
|
|
|||
Loading…
Reference in New Issue