Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D7CFF84D3C for ; Sun, 23 Jul 2023 17:20:13 +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 Y9nXGV2kYMz1 for ; Sun, 23 Jul 2023 17:20:13 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 0245E84D31 for ; Sun, 23 Jul 2023 17:20:13 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EF06EFBDB; Sun, 23 Jul 2023 17:20:12 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_169013281217470" MIME-Version: 1.0 Date: Sun, 23 Jul 2023 17:20:12 +0000 From: "Izumi Tsutsui" Subject: CVS commit: pkgsrc/net/mikutter To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: tsutsui@netbsd.org X-Mailer: log_accum Message-Id: <20230723172012.EF06EFBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_169013281217470 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tsutsui Date: Sun Jul 23 17:20:12 UTC 2023 Modified Files: pkgsrc/net/mikutter: Makefile distinfo Added Files: pkgsrc/net/mikutter/patches: patch-plugin_mastodon__sse__streaming_raw__server__sent__events__stream.rb patch-plugin_mastodon_mastodon.rb Log Message: mikutter: pull upstream usability fixes. - update icon for social.mikutter.hachune.net (#1590) - fix non-working function to delay retry period on reconnecting to mastodon streaming APIs (#1591) Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.211 -r1.212 pkgsrc/net/mikutter/Makefile cvs rdiff -u -r1.184 -r1.185 pkgsrc/net/mikutter/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/net/mikutter/patches/patch-plugin_mastodon__sse__streaming_raw__server__sent__events__stream.rb \ pkgsrc/net/mikutter/patches/patch-plugin_mastodon_mastodon.rb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_169013281217470 Content-Disposition: inline Content-Length: 4424 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/net/mikutter/Makefile diff -u pkgsrc/net/mikutter/Makefile:1.211 pkgsrc/net/mikutter/Makefile:1.212 --- pkgsrc/net/mikutter/Makefile:1.211 Sun Jan 29 21:17:28 2023 +++ pkgsrc/net/mikutter/Makefile Sun Jul 23 17:20:12 2023 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.211 2023/01/29 21:17:28 ryoon Exp $ +# $NetBSD: Makefile,v 1.212 2023/07/23 17:20:12 tsutsui Exp $ DISTNAME= mikutter-5.0.4 PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= net MASTER_SITES= https://mikutter.hachune.net/bin/ Index: pkgsrc/net/mikutter/distinfo diff -u pkgsrc/net/mikutter/distinfo:1.184 pkgsrc/net/mikutter/distinfo:1.185 --- pkgsrc/net/mikutter/distinfo:1.184 Sun Jan 30 01:23:58 2022 +++ pkgsrc/net/mikutter/distinfo Sun Jul 23 17:20:12 2023 @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.184 2022/01/30 01:23:58 tsutsui Exp $ +$NetBSD: distinfo,v 1.185 2023/07/23 17:20:12 tsutsui Exp $ BLAKE2s (mikutter-5.0.4.tar.gz) = 9d858c23cdd673139c1dc7f4144327a0ab1a881d9b36612dbcf5baf6f1a6fdfb SHA512 (mikutter-5.0.4.tar.gz) = 30e8b24af56e38fabeb454d4ea3f6a20b11e7836527f68e61f26f164fed0c2028b29db20c21397b2203fe23fceaef2e92a481d734692da3869dfcedcae2a58e0 Size (mikutter-5.0.4.tar.gz) = 2378972 bytes SHA1 (patch-core_config.rb) = a3167ba101f840983d9d27ea36252ec5e0b0435d SHA1 (patch-mikutter.rb) = f3cc7f0226ab6041e8ad0080a33371041a6bdf85 +SHA1 (patch-plugin_mastodon__sse__streaming_raw__server__sent__events__stream.rb) = b0d1fb560db0c0ddcf64df56a392076aef3532ed +SHA1 (patch-plugin_mastodon_mastodon.rb) = 396829b73063e8ce3a72caf9fa553b6f6221f8a8 Added files: Index: pkgsrc/net/mikutter/patches/patch-plugin_mastodon__sse__streaming_raw__server__sent__events__stream.rb diff -u /dev/null pkgsrc/net/mikutter/patches/patch-plugin_mastodon__sse__streaming_raw__server__sent__events__stream.rb:1.1 --- /dev/null Sun Jul 23 17:20:12 2023 +++ pkgsrc/net/mikutter/patches/patch-plugin_mastodon__sse__streaming_raw__server__sent__events__stream.rb Sun Jul 23 17:20:12 2023 @@ -0,0 +1,34 @@ +$NetBSD: patch-plugin_mastodon__sse__streaming_raw__server__sent__events__stream.rb,v 1.1 2023/07/23 17:20:12 tsutsui Exp $ + +- pull upstream fix https://dev.mikutter.hachune.net/issues/1591 + +--- plugin/mastodon_sse_streaming/raw_server_sent_events_stream.rb.orig 2022-01-29 23:56:32.000000000 +0000 ++++ plugin/mastodon_sse_streaming/raw_server_sent_events_stream.rb +@@ -29,17 +29,16 @@ module Plugin::MastodonSseStreaming + client = HTTPClient.new + client.ssl_config.set_default_paths + notice "connect #{@connection_type.perma_link} (#{@connection_type})" +- response = client.request(:get, @connection_type.perma_link.to_s, {}, {}, headers) do |fragment| +- yielder << fragment +- end +- if response +- raise ResponseError.new( +- response.reason, +- code: response.status_code, +- response: response +- ) +- else +- raise ConnectionRefusedError ++ client.request(:get, @connection_type.perma_link.to_s, {}, {}, headers) do |response, part| ++ if response.ok? ++ yielder << part ++ else ++ raise ResponseError.new( ++ response.reason, ++ code: response.status_code, ++ response: response ++ ) ++ end + end + rescue SocketError, + HTTPClient::BadResponseError, Index: pkgsrc/net/mikutter/patches/patch-plugin_mastodon_mastodon.rb diff -u /dev/null pkgsrc/net/mikutter/patches/patch-plugin_mastodon_mastodon.rb:1.1 --- /dev/null Sun Jul 23 17:20:12 2023 +++ pkgsrc/net/mikutter/patches/patch-plugin_mastodon_mastodon.rb Sun Jul 23 17:20:12 2023 @@ -0,0 +1,15 @@ +$NetBSD: patch-plugin_mastodon_mastodon.rb,v 1.1 2023/07/23 17:20:12 tsutsui Exp $ + +- pull upstream fix https://dev.mikutter.hachune.net/issues/1590 + +--- plugin/mastodon/mastodon.rb.orig 2022-01-29 23:56:32.000000000 +0000 ++++ plugin/mastodon/mastodon.rb +@@ -232,7 +232,7 @@ Plugin.create(:mastodon) do + world.rest.public_local.datasource_slug, + world.sse.public_local.datasource_slug, + ], +- icon: 'https://%{domain}/apple-touch-icon.png' % slug_param, ++ icon: 'https://%{domain}/favicon.ico' % slug_param, + }) + end + end --_----------=_169013281217470--