From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 87F1F15800A for ; Sat, 29 Jul 2023 03:13:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BFE74E0AB7; Sat, 29 Jul 2023 03:13:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A78D5E0AB7 for ; Sat, 29 Jul 2023 03:13:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D59B7341483 for ; Sat, 29 Jul 2023 03:13:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1F3CEDC1 for ; Sat, 29 Jul 2023 03:13:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1690600375.e1d85b00ac57ee129fd4e82eba5462365dfa8d28.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/wgetpaste/, app-text/wgetpaste/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/wgetpaste/files/wgetpaste-2.33-disable-sprunge.patch app-text/wgetpaste/wgetpaste-2.33-r1.ebuild app-text/wgetpaste/wgetpaste-2.33-r2.ebuild X-VCS-Directories: app-text/wgetpaste/ app-text/wgetpaste/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e1d85b00ac57ee129fd4e82eba5462365dfa8d28 X-VCS-Branch: master Date: Sat, 29 Jul 2023 03:13:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9981d6b6-9b47-4e8f-9851-76c93dae8236 X-Archives-Hash: 82b9c50aeaef144fe72c5f551b04f8cc commit: e1d85b00ac57ee129fd4e82eba5462365dfa8d28 Author: Oskari Pirhonen gmail com> AuthorDate: Sat Jul 29 02:52:23 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jul 29 03:12:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d85b00 app-text/wgetpaste: disable sprunge Sprunge seems dead... Signed-off-by: Oskari Pirhonen gmail.com> Closes: https://github.com/gentoo/gentoo/pull/32089 Signed-off-by: Sam James gentoo.org> .../files/wgetpaste-2.33-disable-sprunge.patch | 29 ++++++++++++++++++++++ ...ste-2.33-r1.ebuild => wgetpaste-2.33-r2.ebuild} | 16 ++++++++++++ 2 files changed, 45 insertions(+) diff --git a/app-text/wgetpaste/files/wgetpaste-2.33-disable-sprunge.patch b/app-text/wgetpaste/files/wgetpaste-2.33-disable-sprunge.patch new file mode 100644 index 000000000000..7d335728bea2 --- /dev/null +++ b/app-text/wgetpaste/files/wgetpaste-2.33-disable-sprunge.patch @@ -0,0 +1,29 @@ +From ab4632ca9cd54c9e7478f37eee821113c0135c37 Mon Sep 17 00:00:00 2001 +From: Oskari Pirhonen +Date: Fri, 28 Jul 2023 18:55:10 -0500 +Subject: [PATCH] Disable sprunge + +Sprunge seems to have recently died. Disable it by removing it from the +service list, but keep the core bits in case it decides to come back. + +RIP ;( +--- + wgetpaste | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wgetpaste b/wgetpaste +index 864d5ef..b3a537b 100755 +--- a/wgetpaste ++++ b/wgetpaste +@@ -41,7 +41,7 @@ POST_generic() { + } + + ### services +-SERVICES="0x0 bpaste codepad dpaste gists ix_io snippets sprunge" ++SERVICES="0x0 bpaste codepad dpaste gists ix_io snippets" + # 0x0 + ENGINE_0x0=0x0 + URL_0x0="http://0x0.st" +-- +2.41.0 + diff --git a/app-text/wgetpaste/wgetpaste-2.33-r1.ebuild b/app-text/wgetpaste/wgetpaste-2.33-r2.ebuild similarity index 68% rename from app-text/wgetpaste/wgetpaste-2.33-r1.ebuild rename to app-text/wgetpaste/wgetpaste-2.33-r2.ebuild index 9550b6ea686d..d7840c31c259 100644 --- a/app-text/wgetpaste/wgetpaste-2.33-r1.ebuild +++ b/app-text/wgetpaste/wgetpaste-2.33-r2.ebuild @@ -21,6 +21,7 @@ RDEPEND="net-misc/wget[ssl?]" PATCHES=( "${FILESDIR}"/${PN}-2.33-tests.patch + "${FILESDIR}"/${PN}-2.33-disable-sprunge.patch ) src_prepare() { @@ -42,4 +43,19 @@ src_install() { pkg_postinst() { optfeature "ANSI (color code) stripping support" app-text/ansifilter optfeature "xclip support" x11-misc/xclip + + if [[ -n ${REPLACING_VERSIONS} ]]; then + local old + + for old in ${REPLACING_VERSIONS}; do + if ver_test ${old} -lt '2.33-r2'; then + ewarn + ewarn "Sprunge is dead and the service has been dropped from the code. Remove or" + ewarn "replace sprunge as the default service in the system or user wgetpaste" + ewarn "config if applicable." + ewarn + break + fi + done + fi }