Skip to content

Commit

Permalink
devel/ruby-zookeeper: update to 1.5.3
Browse files Browse the repository at this point in the history
pkgsrc change: clean up pkglint warnings

* Remove redundant PKGNAME.
* Remove ruby from CATEGORIES.


1.5.3 (2022-07-18)

* Ruby 3.1 compatibility (h/t: @casperisfine)

1.5.2 (2022-05-24, YANKED)

* Ruby 3.1 compatibility and zookeeper client updates.
* This release had build issues in the wild and was yanked

1.5.1 (2021-11-16)

* Update config.guess to support newer environments (h/t: @malmckay)

1.5.0 (2021-09-27)

* (housekeeping) Moves build to Github Actions from TravisCI
* (housekeeping) Drops build support for MRI Ruby < 2.5 and other rubies
* Build on Ruby 3 (#99) (h/t: @malmckay)
* Build on MacOS (#98) (h/t: @malmckay)
* Work around compiler errors on newer versions of gcc (#97) (h/t:
  @nickmarden)
* Fix a typo on a has_key (#83) (h/t: @lexspoon)
* Adds support macOS dylib (#86) (h/t: @pftg)
* Fix compilation on ARM (#82) (h/t: @cdonati)
  • Loading branch information
taca committed Jan 3, 2023
1 parent acbc000 commit 4825c0b
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 42 deletions.
7 changes: 3 additions & 4 deletions devel/ruby-zookeeper/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.2 2017/07/30 22:32:18 wiz Exp $
# $NetBSD: Makefile,v 1.3 2023/01/03 13:56:30 taca Exp $
#
DISTNAME= zookeeper-1.4.11
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME}
CATEGORIES= ruby devel
DISTNAME= zookeeper-1.5.3
CATEGORIES= devel

MAINTAINER= [email protected]
HOMEPAGE= https://github.com/zk-ruby/zookeeper
Expand Down
7 changes: 5 additions & 2 deletions devel/ruby-zookeeper/PLIST
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
@comment $NetBSD: PLIST,v 1.2 2016/01/12 14:19:14 taca Exp $
@comment $NetBSD: PLIST,v 1.3 2023/01/03 13:56:30 taca Exp $
${GEM_HOME}/cache/${GEM_NAME}.gem
${GEM_EXTSDIR}/gem.build_complete
${GEM_EXTSDIR}/zookeeper_c.${RUBY_DLEXT}
${GEM_LIBDIR}/.ctags_paths
${GEM_LIBDIR}/.dotfiles/ruby-gemset
${GEM_LIBDIR}/.dotfiles/ruby-version
${GEM_LIBDIR}/.dotfiles/rvmrc
${GEM_LIBDIR}/.github/workflows/build.yml
${GEM_LIBDIR}/.gitignore
${GEM_LIBDIR}/.gitmodules
${GEM_LIBDIR}/.travis.yml
${GEM_LIBDIR}/CHANGELOG
${GEM_LIBDIR}/Gemfile
${GEM_LIBDIR}/Guardfile
Expand All @@ -28,6 +28,9 @@ ${GEM_LIBDIR}/ext/event_lib.h
${GEM_LIBDIR}/ext/extconf.rb
${GEM_LIBDIR}/ext/generate_gvl_code.rb
${GEM_LIBDIR}/ext/patches/zkc-3.3.5-network.patch
${GEM_LIBDIR}/ext/patches/zkc-3.4.5-buffer-overflow.patch
${GEM_LIBDIR}/ext/patches/zkc-3.4.5-config.patch
${GEM_LIBDIR}/ext/patches/zkc-3.4.5-fetch-and-add.patch
${GEM_LIBDIR}/ext/patches/zkc-3.4.5-logging.patch
${GEM_LIBDIR}/ext/patches/zkc-3.4.5-out-of-order-ping.patch
${GEM_LIBDIR}/ext/patches/zkc-3.4.5-yosemite-htonl-fix.patch
Expand Down
11 changes: 5 additions & 6 deletions devel/ruby-zookeeper/distinfo
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
$NetBSD: distinfo,v 1.3 2021/10/26 10:19:53 nia Exp $
$NetBSD: distinfo,v 1.4 2023/01/03 13:56:30 taca Exp $

BLAKE2s (zookeeper-1.4.11.gem) = 9cf8d1598f0c88c1734a7f8943d902c9b3fde34f4020a045e470d6689feea3cf
SHA512 (zookeeper-1.4.11.gem) = 101d3e50b7f3f800454e4c2d5b3c0c1d1516ba71f55584609551d9770f56703e45b049feb93a66097d601937f407ebeec7b7dfd3b34d1e6a5e7c3cbfd4c752ff
Size (zookeeper-1.4.11.gem) = 933888 bytes
SHA1 (patch-ext_c__zookeeper.rb) = 787f51a72b00b9375f0b86d0752cf4f876b4f2b6
SHA1 (patch-ext_extconf.rb) = ad70116a048ef299f886fae37f9cf14eff081ffd
BLAKE2s (zookeeper-1.5.3.gem) = c7f56a31463197a3c033064d8de629fd7ea47427356732e5ca0ea0897e05f879
SHA512 (zookeeper-1.5.3.gem) = dedfa3fa5908677a7a40b69841fd14add2f55d886d381933036e89adeb21b1525ecd4dd786dd0ff38e3993ce2075102d6c8aa43b495cf0c5f87d203b072edd77
Size (zookeeper-1.5.3.gem) = 970752 bytes
SHA1 (patch-ext_extconf.rb) = be5849c2faeff6e2c85c3771d0810d96ce7d6c62
15 changes: 0 additions & 15 deletions devel/ruby-zookeeper/patches/patch-ext_c__zookeeper.rb

This file was deleted.

28 changes: 13 additions & 15 deletions devel/ruby-zookeeper/patches/patch-ext_extconf.rb
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
$NetBSD: patch-ext_extconf.rb,v 1.1 2016/01/08 12:53:11 fhajny Exp $
$NetBSD: patch-ext_extconf.rb,v 1.2 2023/01/03 13:56:31 taca Exp $

Link pkgsrc libzookeeper instead of the embedded build.

--- ext/extconf.rb.orig 2016-01-08 12:43:23.823917320 +0000
--- ext/extconf.rb.orig 2023-01-02 08:23:51.434066414 +0000
+++ ext/extconf.rb
@@ -2,96 +2,10 @@ require 'mkmf'
@@ -2,30 +2,6 @@ require 'mkmf'
require 'rbconfig'
require 'fileutils'

Expand Down Expand Up @@ -32,17 +32,13 @@
- $CFLAGS << ' -DZKRB_RUBY_187'
-end
-
-ZK_DEBUG = (ENV['DEBUG'] or ARGV.any? { |arg| arg == '--debug' })
ZK_DEBUG = (ENV['DEBUG'] or ARGV.any? { |arg| arg == '--debug' })
ZK_DEV = ENV['ZK_DEV']
-DEBUG_CFLAGS = " -O0 -ggdb3 -DHAVE_DEBUG -fstack-protector-all"
-
-if ZK_DEBUG
- $stderr.puts "*** Setting debug flags. ***"
- $EXTRA_CONF = "#{$EXTRA_CONF} --enable-debug"
- $CFLAGS.gsub!(/ -O[^0] /, ' ')
- $CFLAGS << DEBUG_CFLAGS
-end
-
DEBUG_CFLAGS = " -O0 -ggdb3 -DHAVE_DEBUG -fstack-protector-all"
@@ -37,63 +13,9 @@ if ZK_DEBUG
$CFLAGS << DEBUG_CFLAGS
end

-$includes = " -I#{HERE}/include"
-$libraries = " -L#{HERE}/lib -L#{RbConfig::CONFIG['libdir']}"
-$CFLAGS = "#{$includes} #{$libraries} #{$CFLAGS}"
Expand Down Expand Up @@ -90,8 +86,10 @@
-# Absolutely prevent the linker from picking up any other zookeeper_mt
-Dir.chdir("#{HERE}/lib") do
- %w[st mt].each do |stmt|
- %w[a la].each do |ext|
- system("cp -f libzookeeper_#{stmt}.#{ext} libzookeeper_#{stmt}_gem.#{ext}")
- %w[a la dylib].each do |ext|
- origin_lib_name = "libzookeeper_#{stmt}.#{ext}"
- dest_lib_name = "libzookeeper_#{stmt}_gem.#{ext}"
- system("cp -f #{origin_lib_name} #{dest_lib_name}") if File.exists?(origin_lib_name)
- end
- end
-end
Expand Down

0 comments on commit 4825c0b

Please sign in to comment.