[DRE-commits] [ruby-hiredis] 02/05: Refresh patches

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository ruby-hiredis.

commit bab59dbe4228383eaa74947edfea317d8fa3e322
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Tue Feb 9 15:54:37 2016 +0200

    Refresh patches
---
 debian/patches/disable-network-tests.patch  |  4 ++--
 debian/patches/disable-no-eagain-test.patch |  2 +-
 debian/patches/use_system_libhiredis.patch  | 31 +++++++++++++++--------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/debian/patches/disable-network-tests.patch b/debian/patches/disable-network-tests.patch
index fc33c7e..9cfa76e 100644
--- a/debian/patches/disable-network-tests.patch
+++ b/debian/patches/disable-network-tests.patch
@@ -9,7 +9,7 @@ Forwarded: no
 Last-Update: 2014-04-14
 --- a/test/connection_test.rb
 +++ b/test/connection_test.rb
-@@ -80,12 +80,13 @@
+@@ -78,12 +78,13 @@
      thread.join
    end
  
@@ -29,7 +29,7 @@ Last-Update: 2014-04-14
  
    def test_connect_wrong_port
      assert_raises Errno::ECONNREFUSED do
-@@ -151,41 +152,44 @@
+@@ -149,41 +150,44 @@
      end
    end
  
diff --git a/debian/patches/disable-no-eagain-test.patch b/debian/patches/disable-no-eagain-test.patch
index da576f0..d50052b 100644
--- a/debian/patches/disable-no-eagain-test.patch
+++ b/debian/patches/disable-no-eagain-test.patch
@@ -8,7 +8,7 @@ Last-Update: 2014-04-14
 
 --- a/test/connection_test.rb
 +++ b/test/connection_test.rb
-@@ -362,35 +362,37 @@
+@@ -361,35 +361,37 @@
      end
    end
  
diff --git a/debian/patches/use_system_libhiredis.patch b/debian/patches/use_system_libhiredis.patch
index 4b5e2fe..71f61c1 100644
--- a/debian/patches/use_system_libhiredis.patch
+++ b/debian/patches/use_system_libhiredis.patch
@@ -6,7 +6,7 @@ Last-Update: 2013-04-10
 Forwarded: no
 --- a/ext/hiredis_ext/extconf.rb
 +++ b/ext/hiredis_ext/extconf.rb
-@@ -2,12 +2,6 @@
+@@ -9,12 +9,6 @@
  
  RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
  
@@ -19,21 +19,22 @@ Forwarded: no
  RbConfig::CONFIG['configure_args'] =~ /with-make-prog\=(\w+)/
  make_program = $1 || ENV['make']
  make_program ||= case RUBY_PLATFORM
-@@ -19,15 +13,8 @@
-   'make'
+@@ -27,15 +21,9 @@
  end
  
--# Make sure hiredis is built...
--Dir.chdir(hiredis_dir) do
--  success = system("#{make_program} static")
--  raise "Building hiredis failed" if !success
--end
+ if build_hiredis
+-  # Make sure hiredis is built...
+-  Dir.chdir(hiredis_dir) do
+-    success = system("#{make_program} static")
+-    raise "Building hiredis failed" if !success
+-  end
 -
--# Statically link to hiredis (mkmf can't do this for us)
--$CFLAGS << " -I#{hiredis_dir}"
--$LDFLAGS << " #{hiredis_dir}/libhiredis.a"
-+$CFLAGS << " -I/usr/include/hiredis"
-+$LDFLAGS << " -lhiredis"
+-  # Statically link to hiredis (mkmf can't do this for us)
+-  $CFLAGS << " -I#{hiredis_dir}"
+-  $LDFLAGS << " #{hiredis_dir}/libhiredis.a"
++  # Debian: use system hiredis
++  $CFLAGS << " -I/usr/include/hiredis"
++  $LDFLAGS << " -lhiredis"
  
- have_func("rb_thread_fd_select")
- create_makefile('hiredis/ext/hiredis_ext')
+   have_func("rb_thread_fd_select")
+   create_makefile('hiredis/ext/hiredis_ext')

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