From 618bb3a79696a9033fbaae8452e653f79c91ab96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Mon, 8 Aug 2022 06:00:02 +0200
Subject: [PATCH] main/lua-mqtt-publish: revert workaround for SIGPIPE being
 ignored

This has been fixed by mosquitto upstream.

See: https://github.com/eclipse/mosquitto/issues/2564

This reverts commit 1d5e4a47f9a896b9f50f5e7fd26492011a39ed17.
---
 main/lua-mqtt-publish/APKBUILD                | 14 ++++-------
 .../restore-sigpipe-handler.patch             | 23 -------------------
 2 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100644 main/lua-mqtt-publish/restore-sigpipe-handler.patch

diff --git a/main/lua-mqtt-publish/APKBUILD b/main/lua-mqtt-publish/APKBUILD
index 0f1d28051667..49dcaadba358 100644
--- a/main/lua-mqtt-publish/APKBUILD
+++ b/main/lua-mqtt-publish/APKBUILD
@@ -2,19 +2,18 @@
 _luaversions="5.1 5.2 5.3 5.4"
 pkgname=lua-mqtt-publish
 pkgver=0.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Lua module for simple MQTT connect, publish and disconnect"
 url="https://github.com/ncopa/lua-mqtt-publish"
 arch="all"
 license="MIT"
-makedepends="lua-posix lua-mosquitto" # so build order can be calculated
+makedepends="lua-mosquitto" # so build order can be calculated
 
 for _v in $_luaversions; do
 	subpackages="$subpackages lua$_v-mqtt-publish:_split"
 done
 
-source="lua-mqtt-publish-$pkgver.tar.gz::https://github.com/ncopa/lua-mqtt-publish/archive/v$pkgver.tar.gz
-	restore-sigpipe-handler.patch"
+source="lua-mqtt-publish-$pkgver.tar.gz::https://github.com/ncopa/lua-mqtt-publish/archive/v$pkgver.tar.gz"
 
 package() {
 	for i in $_luaversions; do
@@ -28,7 +27,7 @@ _split() {
 	msg "_ver=$_ver"
 	pkgdesc="$pkgdesc for Lua $_ver"
 	install_if="lua$_ver $pkgname=$pkgver-r$pkgrel"
-	depends="lua$_ver-posix lua$_ver-mosquitto"
+	depends="lua$_ver-mosquitto"
 	for d in usr/lib/lua usr/share/lua; do
 		if [ -d "$pkgdir"/$d/$_ver ]; then
 			mkdir -p "$subpkgdir"/$d
@@ -37,7 +36,4 @@ _split() {
 	done
 }
 
-sha512sums="
-ccbf87c53305e19a2dd04f07ac7b3d1fdae3ce0a6c726b89f357d3d5a68a73c0ce830d0ca47d57eaf1990224fcc97794720bdbc8e4e0caa408003cc33dce3b65  lua-mqtt-publish-0.3.tar.gz
-3bba23bc2dfbf88e39d37bb85df1634fbda92d906e8f0d8803e84729f870efe2ca1c9cf507155e91679d10c0e75a2925f57744d84f95a714f049b909549a8b6c  restore-sigpipe-handler.patch
-"
+sha512sums="ccbf87c53305e19a2dd04f07ac7b3d1fdae3ce0a6c726b89f357d3d5a68a73c0ce830d0ca47d57eaf1990224fcc97794720bdbc8e4e0caa408003cc33dce3b65  lua-mqtt-publish-0.3.tar.gz"
diff --git a/main/lua-mqtt-publish/restore-sigpipe-handler.patch b/main/lua-mqtt-publish/restore-sigpipe-handler.patch
deleted file mode 100644
index ceedfb97e66e..000000000000
--- a/main/lua-mqtt-publish/restore-sigpipe-handler.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-See https://gitlab.alpinelinux.org/alpine/infra/infra/-/issues/10758
-
-diff -upr lua-mqtt-publish-0.3.orig/mqtt/publish.lua lua-mqtt-publish-0.3/mqtt/publish.lua
---- lua-mqtt-publish-0.3.orig/mqtt/publish.lua	2022-06-12 12:09:12.127534562 +0200
-+++ lua-mqtt-publish-0.3/mqtt/publish.lua	2022-06-12 12:15:41.038026395 +0200
-@@ -1,6 +1,7 @@
- --- @module mosquitto.publish
- 
- local mqtt = require("mosquitto")
-+local signal = require("posix.signal")
- local publish = {}
- 
- function publish.tls_set(cafile, capath, certfile, keyfile)
-@@ -51,6 +52,9 @@ function publish.multiple(msgs, hostname
- 		       keepalive or publish.keepalive)
- 	client:loop_forever()
- 	client:destroy()
-+
-+	-- Workaround for https://github.com/eclipse/mosquitto/issues/2564
-+	signal.signal(signal.SIGPIPE, signal.SIG_DFL)
- end
- 
- function publish.single(topic, payload, qos, retain, hostname, port, client_id,