summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhanibek Adilbekov2023-02-15 15:49:25 +0600
committerZhanibek Adilbekov2023-02-15 15:49:25 +0600
commit08dadd8ef473a8a9caf7394e5450f6da66acb50f (patch)
treea7990a0bf3d3fad08cbc56637d9094d3e7476846
parent9a24dd1bc4a5ab0bbbd8066878d6abf37ce7fada (diff)
downloadaur-08dadd8ef473a8a9caf7394e5450f6da66acb50f.tar.gz
build: fix compilation error
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD17
-rw-r--r--build-fix.patch16
3 files changed, 32 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4e0a9e1a30ab..c25bef9d125c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
pkgbase = pixelserv-tls
pkgdesc = A tiny bespoke webserver for adblock with HTTP/1.1 and HTTPS support
pkgver = 2.4
- pkgrel = 1
- url = https://kazoo.ga/pixelserv-tls/
+ pkgrel = 2
+ url = https://github.com/kvic-z/pixelserv-tls
install = pixelserv-tls.install
arch = any
license = GPL3
@@ -10,8 +10,10 @@ pkgbase = pixelserv-tls
source = pixelserv-tls-2.4.tar.gz::https://github.com/kvic-z/pixelserv-tls/archive/2.4.tar.gz
source = pixelserv-ca-init.sh
source = pixelserv-tls.service
+ source = build-fix.patch
b2sums = cec2a713c21b98083c5f00b05a49dae50d5f16f6b1014f0635558ce26d29c11e64a1178fc687234810d33267b5d30d1bea2ce0be9407d102a7b44f4501d92eaa
b2sums = 9e482f626c9e2451c29ee7d384b984d4d7a1fc580e5b343ba92d5301009676c336d53b0b409bbdde162f8a4f80f3a3b14fc27a801fba7f84e1a1961d80e759c0
b2sums = d5a7f2c193de9685e8daffedee45619d08b3192c53152302fcd9d97d75338a9906030c3511131872f4d4c7946e1d6e9e5dbb1d9918e3d6c011c0b6278e8b1118
+ b2sums = 2a9c40c6749a3c72b87267a6e6c0d076378a756176aad5fe964202d6a6fb21150b9a54564ec4259103b35223e2cdaf855c886648368be2ca7c2dd504bf58f6e1
pkgname = pixelserv-tls
diff --git a/PKGBUILD b/PKGBUILD
index 756fac2fa3f8..e9168da99e5e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,27 @@
-# Maintainer: Zhanibek Adilbekov <zhanibek.adilbekov@pm.me>
+# Maintainer: Zhanibek Adilbekov <zhanibek.adilbekov@proton.me>
pkgname=pixelserv-tls
pkgver=2.4
-pkgrel=1
+pkgrel=2
pkgdesc="A tiny bespoke webserver for adblock with HTTP/1.1 and HTTPS support"
arch=('any')
-url="https://kazoo.ga/pixelserv-tls/"
+url="https://github.com/kvic-z/pixelserv-tls"
license=('GPL3')
depends=('openssl>=1.0.2')
install=$pkgname.install
source=(
"$pkgname-$pkgver.tar.gz::https://github.com/kvic-z/pixelserv-tls/archive/$pkgver.tar.gz"
"pixelserv-ca-init.sh"
- "pixelserv-tls.service")
+ "pixelserv-tls.service"
+ "build-fix.patch")
b2sums=('cec2a713c21b98083c5f00b05a49dae50d5f16f6b1014f0635558ce26d29c11e64a1178fc687234810d33267b5d30d1bea2ce0be9407d102a7b44f4501d92eaa'
'9e482f626c9e2451c29ee7d384b984d4d7a1fc580e5b343ba92d5301009676c336d53b0b409bbdde162f8a4f80f3a3b14fc27a801fba7f84e1a1961d80e759c0'
- 'd5a7f2c193de9685e8daffedee45619d08b3192c53152302fcd9d97d75338a9906030c3511131872f4d4c7946e1d6e9e5dbb1d9918e3d6c011c0b6278e8b1118')
+ 'd5a7f2c193de9685e8daffedee45619d08b3192c53152302fcd9d97d75338a9906030c3511131872f4d4c7946e1d6e9e5dbb1d9918e3d6c011c0b6278e8b1118'
+ '2a9c40c6749a3c72b87267a6e6c0d076378a756176aad5fe964202d6a6fb21150b9a54564ec4259103b35223e2cdaf855c886648368be2ca7c2dd504bf58f6e1')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch --forward --strip=1 --input="${srcdir}/build-fix.patch"
+}
build() {
cd "$pkgname-$pkgver"
diff --git a/build-fix.patch b/build-fix.patch
new file mode 100644
index 000000000000..95e8ce8509e4
--- /dev/null
+++ b/build-fix.patch
@@ -0,0 +1,16 @@
+diff '--color=auto' --unified --recursive --text pixelserv-tls-2.4/pixelserv.c pixelserv-tls-2.4-fix/pixelserv.c
+--- pixelserv-tls-2.4/pixelserv.c 2023-02-15 15:39:19.168783894 +0600
++++ pixelserv-tls-2.4-fix/pixelserv.c 2023-02-15 15:38:40.247906442 +0600
+@@ -820,10 +820,9 @@
+ break;
+ /* fall through */
+ default:
+- log_msg(LGG_WARNING, "handshake failed: client %s:%s server %s. Lib(%d) Func(%d) Reason(%d)",
++ log_msg(LGG_WARNING, "handshake failed: client %s:%s server %s. Lib(%d) Reason(%d)",
+ ip_buf, port_buf, t->servername,
+- ERR_GET_LIB(ERR_peek_last_error()), ERR_GET_FUNC(ERR_peek_last_error()),
+- ERR_GET_REASON(ERR_peek_last_error()));
++ ERR_GET_LIB(ERR_peek_last_error()), ERR_GET_REASON(ERR_peek_last_error()));
+ }
+ break;
+ case SSL_ERROR_SYSCALL: