Received: by mail.netbsd.org (Postfix, from userid 605) id 5C2F584D2C; Tue, 3 Jan 2023 13:56:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8CFDD84CDC for ; Tue, 3 Jan 2023 13:56:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id wI6cXy3JB9Gb for ; Tue, 3 Jan 2023 13:56:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 3A54584CD9 for ; Tue, 3 Jan 2023 13:56:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 33D22FA90; Tue, 3 Jan 2023 13:56:31 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1672754191199260" MIME-Version: 1.0 Date: Tue, 3 Jan 2023 13:56:31 +0000 From: "Takahiro Kambe" Subject: CVS commit: pkgsrc/devel/ruby-zookeeper To: pkgsrc-changes@NetBSD.org Reply-To: taca@netbsd.org X-Mailer: log_accum Message-Id: <20230103135631.33D22FA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1672754191199260 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: taca Date: Tue Jan 3 13:56:31 UTC 2023 Modified Files: pkgsrc/devel/ruby-zookeeper: Makefile PLIST distinfo pkgsrc/devel/ruby-zookeeper/patches: patch-ext_extconf.rb Removed Files: pkgsrc/devel/ruby-zookeeper/patches: patch-ext_c__zookeeper.rb Log Message: devel/ruby-zookeeper: update to 1.5.3 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) To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ruby-zookeeper/Makefile \ pkgsrc/devel/ruby-zookeeper/PLIST cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ruby-zookeeper/distinfo cvs rdiff -u -r1.1 -r0 \ pkgsrc/devel/ruby-zookeeper/patches/patch-ext_c__zookeeper.rb cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/devel/ruby-zookeeper/patches/patch-ext_extconf.rb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1672754191199260 Content-Disposition: inline Content-Length: 5454 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/ruby-zookeeper/Makefile diff -u pkgsrc/devel/ruby-zookeeper/Makefile:1.2 pkgsrc/devel/ruby-zookeeper/Makefile:1.3 --- pkgsrc/devel/ruby-zookeeper/Makefile:1.2 Sun Jul 30 22:32:18 2017 +++ pkgsrc/devel/ruby-zookeeper/Makefile Tue Jan 3 13:56:30 2023 @@ -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= pkgsrc-users@NetBSD.org HOMEPAGE= https://github.com/zk-ruby/zookeeper Index: pkgsrc/devel/ruby-zookeeper/PLIST diff -u pkgsrc/devel/ruby-zookeeper/PLIST:1.2 pkgsrc/devel/ruby-zookeeper/PLIST:1.3 --- pkgsrc/devel/ruby-zookeeper/PLIST:1.2 Tue Jan 12 14:19:14 2016 +++ pkgsrc/devel/ruby-zookeeper/PLIST Tue Jan 3 13:56:30 2023 @@ -1,4 +1,4 @@ -@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} @@ -6,9 +6,9 @@ ${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 @@ -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 Index: pkgsrc/devel/ruby-zookeeper/distinfo diff -u pkgsrc/devel/ruby-zookeeper/distinfo:1.3 pkgsrc/devel/ruby-zookeeper/distinfo:1.4 --- pkgsrc/devel/ruby-zookeeper/distinfo:1.3 Tue Oct 26 10:19:53 2021 +++ pkgsrc/devel/ruby-zookeeper/distinfo Tue Jan 3 13:56:30 2023 @@ -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 Index: pkgsrc/devel/ruby-zookeeper/patches/patch-ext_extconf.rb diff -u pkgsrc/devel/ruby-zookeeper/patches/patch-ext_extconf.rb:1.1 pkgsrc/devel/ruby-zookeeper/patches/patch-ext_extconf.rb:1.2 --- pkgsrc/devel/ruby-zookeeper/patches/patch-ext_extconf.rb:1.1 Fri Jan 8 12:53:11 2016 +++ pkgsrc/devel/ruby-zookeeper/patches/patch-ext_extconf.rb Tue Jan 3 13:56:31 2023 @@ -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' @@ -32,17 +32,13 @@ Link pkgsrc libzookeeper instead of the - $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}" @@ -90,8 +86,10 @@ Link pkgsrc libzookeeper instead of the -# 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 --_----------=_1672754191199260--