[gentoo-commits] repo/gentoo:master commit in: app-text/wgetpaste/, app-text/wgetpaste/files/

["Sam James" <sam@gentoo.org>]

commit:     e1d85b00ac57ee129fd4e82eba5462365dfa8d28
Author:     Oskari Pirhonen <xxc3ncoredxx <AT> gmail <DOT> com>
AuthorDate: Sat Jul 29 02:52:23 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> 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 <xxc3ncoredxx <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/32089
Signed-off-by: Sam James <sam <AT> 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 <xxc3ncoredxx@gmail.com>
+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
 }