[DRE-commits] [ruby-raindrops] 02/04: fix build against ruby2.3

Antonio Terceiro terceiro at moszumanska.debian.org
Mon Feb 22 17:49:46 UTC 2016


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

terceiro pushed a commit to branch master
in repository ruby-raindrops.

commit 69bdfbe65c9721972e0088b742f6044d489353b4
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Mon Feb 22 14:38:06 2016 -0300

    fix build against ruby2.3
---
 debian/changelog                                   |  2 +
 ...linux.rb-use-plain-ASCII-in-tempfile-name.patch | 49 ++++++++++++++++++++++
 ...ts-which-require-inet_diag-or-tcp_diag-ke.patch |  2 +
 debian/patches/series                              |  1 +
 4 files changed, 54 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c95e0da..bb7d6a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ruby-raindrops (0.15.0-1.1) UNRELEASED; urgency=medium
 
   * Team upload.
   * Refresh packaging with new dh-make-ruby run
+  * 0003-test-test_linux.rb-use-plain-ASCII-in-tempfile-name.patch: fix build
+    against ruby2.3
 
  -- Antonio Terceiro <terceiro at debian.org>  Mon, 22 Feb 2016 14:15:44 -0300
 
diff --git a/debian/patches/0003-test-test_linux.rb-use-plain-ASCII-in-tempfile-name.patch b/debian/patches/0003-test-test_linux.rb-use-plain-ASCII-in-tempfile-name.patch
new file mode 100644
index 0000000..268f73c
--- /dev/null
+++ b/debian/patches/0003-test-test_linux.rb-use-plain-ASCII-in-tempfile-name.patch
@@ -0,0 +1,49 @@
+From: Antonio Terceiro <terceiro at debian.org>
+Date: Mon, 22 Feb 2016 14:27:07 -0300
+Subject: test/test_linux.rb: use plain ASCII in tempfile name
+
+This fixes the build against ruby2.3
+---
+ test/test_linux.rb | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/test/test_linux.rb b/test/test_linux.rb
+index ec71681..e40817a 100644
+--- a/test/test_linux.rb
++++ b/test/test_linux.rb
+@@ -20,7 +20,7 @@ class TestLinux < Test::Unit::TestCase
+   end
+ 
+   def test_unix
+-    tmp = Tempfile.new("\xde\xad\xbe\xef") # valid path, really :)
++    tmp = Tempfile.new('raindrops')
+     File.unlink(tmp.path)
+     us = UNIXServer.new(tmp.path)
+     stats = unix_listener_stats([tmp.path])
+@@ -48,7 +48,7 @@ class TestLinux < Test::Unit::TestCase
+   end
+ 
+   def test_unix_all
+-    tmp = Tempfile.new("\xde\xad\xbe\xef") # valid path, really :)
++    tmp = Tempfile.new('raindrops')
+     File.unlink(tmp.path)
+     us = UNIXServer.new(tmp.path)
+     @to_close << UNIXSocket.new(tmp.path)
+@@ -68,7 +68,7 @@ class TestLinux < Test::Unit::TestCase
+   end
+ 
+   def test_unix_all_unused
+-    tmp = Tempfile.new("\xde\xad\xbe\xef") # valid path, really :)
++    tmp = Tempfile.new('raindrops')
+     File.unlink(tmp.path)
+     us = UNIXServer.new(tmp.path)
+     stats = unix_listener_stats
+@@ -79,7 +79,7 @@ class TestLinux < Test::Unit::TestCase
+   end
+ 
+   def test_unix_resolves_symlinks
+-    tmp = Tempfile.new("\xde\xad\xbe\xef") # valid path, really :)
++    tmp = Tempfile.new('raindrops')
+     File.unlink(tmp.path)
+     us = UNIXServer.new(tmp.path)
+ 
diff --git a/debian/patches/0004-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch b/debian/patches/0004-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch
index 319fd7b..528a6ec 100644
--- a/debian/patches/0004-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch
+++ b/debian/patches/0004-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch
@@ -5,6 +5,8 @@ Subject: Disable tests which require inet_diag or tcp_diag kernel modules
   These test will fail on buildd servers because they don't autoload
   kernel modules (at least inet_diag and tcp_diag required for these tests)
 ---
+ test/test_linux.rb | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/test/test_linux.rb b/test/test_linux.rb
 index 0e79a86..ec71681 100644
diff --git a/debian/patches/series b/debian/patches/series
index 7afaa40..ec598d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0002-Invoke-unix_listener_stats-conditionally.patch
 0004-Disable-tests-which-require-inet_diag-or-tcp_diag-ke.patch
+0003-test-test_linux.rb-use-plain-ASCII-in-tempfile-name.patch

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



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