[DRE-commits] [ruby-kgio] 05/06: Add patch to remove olddoc in gemspec

Fri Aug 18 13:30:19 UTC 2017

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

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

commit 2d1baba0e86e778273c802d067c020c2439fdbfa
Author: Hleb Valoshka <375gnu at gmail.com>
Date:   Fri Aug 18 15:00:05 2017 +0300

    Add patch to remove olddoc in gemspec
---
 .../patches/0001-fix-test-test_default_wait.patch  | 26 +++++++++++++
 ...test.patch => 0002-fix-tcp-fastopen-test.patch} | 17 +++++----
 .../0003-Remove-usage-of-olddoc-in-gemspec.patch   | 43 ++++++++++++++++++++++
 debian/patches/fix-test-test_default_wait          | 29 ---------------
 debian/patches/series                              |  5 ++-
 debian/rules                                       |  3 ++
 6 files changed, 85 insertions(+), 38 deletions(-)

diff --git a/debian/patches/0001-fix-test-test_default_wait.patch b/debian/patches/0001-fix-test-test_default_wait.patch
new file mode 100644
index 0000000..971a827
--- /dev/null
+++ b/debian/patches/0001-fix-test-test_default_wait.patch
@@ -0,0 +1,26 @@
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Fri, 18 Aug 2017 14:52:10 +0300
+Subject: fix-test-test_default_wait
+
+---
+ test/test_default_wait.rb | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/test/test_default_wait.rb b/test/test_default_wait.rb
+index 7137d0c..64ac6f7 100644
+--- a/test/test_default_wait.rb
++++ b/test/test_default_wait.rb
+@@ -39,7 +39,11 @@ class TestDefaultWait < Test::Unit::TestCase
+     diff = Time.now - t0
+     assert_in_delta diff, 1.1, 0.2
+ 
+-    a.kgio_read(16384)
++    # Read enough to ensure one kernel buffer is cleared
++    # to ensure that poll et al will start saying we have
++    # enough space to allow a write.  This should be at
++    # least the largest system page size we support.
++    a.kgio_read(65536)
+     assert_equal b, b.kgio_wait_writable(1.1)
+   end
+ end
diff --git a/debian/patches/fix-tcp-fastopen-test.patch b/debian/patches/0002-fix-tcp-fastopen-test.patch
similarity index 53%
rename from debian/patches/fix-tcp-fastopen-test.patch
rename to debian/patches/0002-fix-tcp-fastopen-test.patch
index 5d24703..180d29a 100644
--- a/debian/patches/fix-tcp-fastopen-test.patch
+++ b/debian/patches/0002-fix-tcp-fastopen-test.patch
@@ -1,11 +1,14 @@
-Description: check is tcp_fastopen exists before trying to read it
- At least on LXC containers on my system, /proc/sys/net/ipv4/tcp_fastopen does
- not exist.
-Author: Antonio Terceiro <terceiro at debian.org>
-Origin: vendor
-Last-Update: 2016-02-22
+From: Debian Ruby Extras Maintainers
+ <pkg-ruby-extras-maintainers at lists.alioth.debian.org>
+Date: Fri, 18 Aug 2017 14:52:10 +0300
+Subject: fix-tcp-fastopen-test
+
 ---
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ test/test_tfo.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test_tfo.rb b/test/test_tfo.rb
+index 5ab208d..d8874bc 100644
 --- a/test/test_tfo.rb
 +++ b/test/test_tfo.rb
 @@ -10,7 +10,7 @@ class TestTFO < Test::Unit::TestCase
diff --git a/debian/patches/0003-Remove-usage-of-olddoc-in-gemspec.patch b/debian/patches/0003-Remove-usage-of-olddoc-in-gemspec.patch
new file mode 100644
index 0000000..4e8c338
--- /dev/null
+++ b/debian/patches/0003-Remove-usage-of-olddoc-in-gemspec.patch
@@ -0,0 +1,43 @@
+From: Hleb Valoshka <375gnu at gmail.com>
+Date: Fri, 18 Aug 2017 15:47:34 +0300
+Subject: Remove usage of olddoc in gemspec
+
+---
+ kgio.gemspec | 21 +++++++++++----------
+ 1 file changed, 11 insertions(+), 10 deletions(-)
+
+diff --git a/kgio.gemspec b/kgio.gemspec
+index 17100c6..36ed655 100644
+--- a/kgio.gemspec
++++ b/kgio.gemspec
+@@ -1,19 +1,20 @@
+-ENV["VERSION"] or abort "VERSION= must be specified"
+ manifest = File.readlines('.manifest').map! { |x| x.chomp! }
+-require 'olddoc'
+-extend Olddoc::Gemspec
+-name, summary, title = readme_metadata
+ 
+ Gem::Specification.new do |s|
+   s.name = %q{kgio}
+-  s.version = ENV["VERSION"].dup
+-  s.homepage = Olddoc.config['rdoc_url']
+-  s.authors = ["#{name} hackers"]
+-  s.description = readme_description
++  s.version = '2.11.0'
++  s.homepage = 'https://bogomips.org/kgio/'
++  s.authors = ["kgio hackers"]
++  s.description = <<-END
++kgio provides non-blocking I/O methods for Ruby without raising
++exceptions on EAGAIN and EINPROGRESS.  It is intended for use with the
++Unicorn and Rainbows! Rack servers, but may be used by other
++applications (that run on Unix-like platforms).
++  END
+   s.email = %q{kgio-public at bogomips.org}
+-  s.extra_rdoc_files = extra_rdoc_files(manifest)
++  s.extra_rdoc_files = manifest.keep_if { |f| File.exist?(f) }
+   s.files = manifest
+-  s.summary = summary
++  s.summary = 'Kinder, gentler I/O for Ruby'
+   s.test_files = Dir['test/test_*.rb']
+   s.extensions = %w(ext/kgio/extconf.rb)
+ 
diff --git a/debian/patches/fix-test-test_default_wait b/debian/patches/fix-test-test_default_wait
deleted file mode 100644
index e03568d..0000000
--- a/debian/patches/fix-test-test_default_wait
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: fix test to take account of larger page sizes on ppc64el
- The test_default_wait/TestDefaultWait test assume that a single read
- can definatly switch a "full" pipe to one which will poll writable.  The
- kernel optimises for IO size by delaying the writable status until a
- complete buffer slot is available; these are the system page.  The test
- already exhibits this by using large IOs compared to the common 4K page
- size, but this is not sufficient in the face of the 64K page sizes on
- ppc64el.  Up this to 64k which represents the biggest page size available
- in the kernel.
-Author: Andy Whitcroft <apw at canonical.com>
-Last-Update: 2014-04-29
-
-Index: ruby-kgio/test/test_default_wait.rb
-===================================================================
---- ruby-kgio.orig/test/test_default_wait.rb
-+++ ruby-kgio/test/test_default_wait.rb
-@@ -39,7 +39,11 @@ class TestDefaultWait < Test::Unit::Test
-     diff = Time.now - t0
-     assert_in_delta diff, 1.1, 0.2
- 
--    a.kgio_read(16384)
-+    # Read enough to ensure one kernel buffer is cleared
-+    # to ensure that poll et al will start saying we have
-+    # enough space to allow a write.  This should be at
-+    # least the largest system page size we support.
-+    a.kgio_read(65536)
-     assert_equal b, b.kgio_wait_writable(1.1)
-   end
- end
diff --git a/debian/patches/series b/debian/patches/series
index 979b54e..4bd03a7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-fix-test-test_default_wait
-fix-tcp-fastopen-test.patch
+0001-fix-test-test_default_wait.patch
+0002-fix-tcp-fastopen-test.patch
+0003-Remove-usage-of-olddoc-in-gemspec.patch
diff --git a/debian/rules b/debian/rules
index 3454d59..9f8a847 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,3 +4,6 @@ export GEM2DEB_TEST_RUNNER = --check-dependencies
 
 %:
 	dh $@ --buildsystem=ruby --with ruby
+
+override_dh_auto_clean:
+	dh_auto_clean || true

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

