[DRE-commits] [unicorn] 03/07: Drop backported patch 0002-tests-fix-SO_REUSEPORT-tests-for-old-Linux-and-non-L.patch.

Hleb Valoshka tsfgnu-guest at moszumanska.debian.org
Sun Apr 13 18:11:09 UTC 2014


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

tsfgnu-guest pushed a commit to branch master
in repository unicorn.

commit 26ad80034c9a515f642ff19a91cfe7b37ac0cda3
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Sat Jan 11 22:46:25 2014 +0300

    Drop backported patch 0002-tests-fix-SO_REUSEPORT-tests-for-old-Linux-and-non-L.patch.
---
 ...O_REUSEPORT-tests-for-old-Linux-and-non-L.patch | 23 ----------------------
 debian/patches/series                              |  1 -
 2 files changed, 24 deletions(-)

diff --git a/debian/patches/0002-tests-fix-SO_REUSEPORT-tests-for-old-Linux-and-non-L.patch b/debian/patches/0002-tests-fix-SO_REUSEPORT-tests-for-old-Linux-and-non-L.patch
deleted file mode 100644
index c88bf1c..0000000
--- a/debian/patches/0002-tests-fix-SO_REUSEPORT-tests-for-old-Linux-and-non-L.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Eric Wong <normalperson at yhbt.net>
-Date: Mon, 4 Nov 2013 18:28:46 +0000
-Subject: tests: fix SO_REUSEPORT tests for old Linux and non-Linux
-
----
- test/unit/test_socket_helper.rb | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/test/unit/test_socket_helper.rb b/test/unit/test_socket_helper.rb
-index abc177b..8992757 100644
---- a/test/unit/test_socket_helper.rb
-+++ b/test/unit/test_socket_helper.rb
-@@ -190,6 +190,8 @@ class TestSocketHelper < Test::Unit::TestCase
-     name = "#@test_addr:#{port}"
-     sock = bind_listen(name, :reuseport => true)
-     cur = sock.getsockopt(Socket::SOL_SOCKET, SO_REUSEPORT).unpack('i')[0]
--    assert_equal 1, cur
--  end if defined?(SO_REUSEPORT)
-+    assert_operator cur, :>, 0
-+  rescue Errno::ENOPROTOOPT
-+    # kernel does not support SO_REUSEPORT (older Linux)
-+  end
- end
diff --git a/debian/patches/series b/debian/patches/series
index 3782c44..dd6652b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-explicitly-use-escaped-minus-in-man-pages.patch
-0002-tests-fix-SO_REUSEPORT-tests-for-old-Linux-and-non-L.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/unicorn.git



More information about the Pkg-ruby-extras-commits mailing list