[Debian-ha-commits] [pcs] 01/03: Cleanup debian/patches

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch master
in repository pcs.

commit b3a6d67e12a417247dce9a5ee61345cc3767a843
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Sun Dec 11 18:38:59 2016 +0100

    Cleanup debian/patches
---
 debian/patches/0007-Fix-IPv6-bind.patch            | 55 ----------------------
 ...osync-log.patch => 0007-Fix-corosync-log.patch} |  0
 debian/patches/series                              |  2 +-
 3 files changed, 1 insertion(+), 56 deletions(-)

diff --git a/debian/patches/0007-Fix-IPv6-bind.patch b/debian/patches/0007-Fix-IPv6-bind.patch
deleted file mode 100644
index 81f24a0..0000000
--- a/debian/patches/0007-Fix-IPv6-bind.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-Description: PCSD web interface listens only on IPv6
- The problem seems to be in the change to `WEBrick::Utils::create_listeners`
- introduced in ruby 2.1:
- .
- https://github.com/ruby/ruby/commit/b1f493dcd1092fe17cccec998e175516ed5c6e47
- .
- A small example program calling this function can prove this:
-   WEBrick::Utils::create_listeners("::", 2000)
- .
- This is the strace output for CentOS7 with ruby 2.0:
-   socket(PF_INET6, SOCK_STREAM|SOCK_CLOEXEC, IPPROTO_TCP) = 7
-   fcntl(7, F_GETFD)                       = 0x1 (flags FD_CLOEXEC)
-   fstat(7, {st_mode=S_IFSOCK|0777, st_size=0, ...}) = 0
-   fstat(7, {st_mode=S_IFSOCK|0777, st_size=0, ...}) = 0
-   setsockopt(7, SOL_SOCKET, SO_REUSEADDR, [1], 4) = 0
-   bind(7, {sa_family=AF_INET6, sin6_port=htons(2000), inet_pton(AF_INET6, "::", &sin6_addr), sin6_flowinfo=0, sin6_scope_id=0}, 28) = 0
-   listen(7, 128)                          = 0
- .
- On ruby 2.1 and newer the same program executes this:
-   socket(PF_INET6, SOCK_STREAM|SOCK_CLOEXEC, IPPROTO_TCP) = 7
-   fcntl(7, F_GETFD)                       = 0x1 (flags FD_CLOEXEC)
-   fstat(7, {st_mode=S_IFSOCK|0777, st_size=0, ...}) = 0
-   fstat(7, {st_mode=S_IFSOCK|0777, st_size=0, ...}) = 0
-   fstat(7, {st_mode=S_IFSOCK|0777, st_size=0, ...}) = 0
-   fstat(7, {st_mode=S_IFSOCK|0777, st_size=0, ...}) = 0
-   getsockname(7, {sa_family=AF_INET6, sin6_port=htons(0), inet_pton(AF_INET6, "::", &sin6_addr), sin6_flowinfo=0, sin6_scope_id=0}, [28]) = 0
-   setsockopt(7, SOL_IPV6, IPV6_V6ONLY, [1], 4) = 0
-   getsockname(7, {sa_family=AF_INET6, sin6_port=htons(0), inet_pton(AF_INET6, "::", &sin6_addr), sin6_flowinfo=0, sin6_scope_id=0}, [28]) = 0
-   setsockopt(7, SOL_SOCKET, SO_REUSEADDR, [1], 4) = 0
-   bind(7, {sa_family=AF_INET6, sin6_port=htons(2000), inet_pton(AF_INET6, "::", &sin6_addr), sin6_flowinfo=0, sin6_scope_id=0}, 28) = 0
-   listen(7, 128)                          = 0
- .
- The problem is caused by the IPV6_V6ONLY socket option being set:
-   setsockopt(7, SOL_IPV6, IPV6_V6ONLY, [1], 4) = 0
- .
- On ruby 2.1 using ``*`` in place of ``::`` has the same effect so
- this ruby version check is added to the bind code in pcsd.
-Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
-Bug: https://github.com/ClusterLabs/pcs/issues/51
-Last-Update: 2016-06-17
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/pcsd/ssl.rb
-+++ b/pcsd/ssl.rb
-@@ -128,6 +128,10 @@
-   end
- end
- 
-+if primary_addr == '::' and RUBY_VERSION >= '2.1'
-+  primary_addr = '*'
-+end
-+
- webrick_options = {
-   :Port               => 2224,
-   :BindAddress        => primary_addr,
diff --git a/debian/patches/0008-Fix-corosync-log.patch b/debian/patches/0007-Fix-corosync-log.patch
similarity index 100%
rename from debian/patches/0008-Fix-corosync-log.patch
rename to debian/patches/0007-Fix-corosync-log.patch
diff --git a/debian/patches/series b/debian/patches/series
index 844bfe2..e043f13 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,6 +4,6 @@
 0004-Remove-pcsd-test-.gitignore-file.patch
 0005-settings.py
 0006-Replace-orderedhash.patch
-0008-Fix-corosync-log.patch
+0007-Fix-corosync-log.patch
 0009-Fix-testsuite.patch
 0010-Replace-chkconfig.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pcs.git