Date: Thursday, July 1, 2021 @ 00:16:50
Author: seblu
Revision: 968330
upgpkg: sslh 1.21c-2
- fix FS#71323
Added:
sslh/trunk/fix-libconfig.patch
Modified:
sslh/trunk/PKGBUILD
---------------------+
PKGBUILD | 21 ++++++++++++++++++---
fix-libconfig.patch | 11 +++++++++++
2 files changed, 29 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-07-01 00:16:49 UTC (rev 968329)
+++ PKGBUILD 2021-07-01 00:16:50 UTC (rev 968330)
@@ -4,7 +4,7 @@
pkgname=sslh
pkgver=1.21c
-pkgrel=1
+pkgrel=2
pkgdesc='SSL/SSH/OpenVPN/XMPP/tinc port multiplexer'
arch=('x86_64')
url='https://www.rutschle.net/tech/sslh/README.html'
@@ -17,7 +17,8 @@
'sslh.cfg'
'sslh.service'
'sslh-select.service'
- 'sslh-fork.service')
+ 'sslh-fork.service'
+ 'fix-libconfig.patch')
validpgpkeys=('CDDDBADBEA4B72748E007D326C056F7AC7934136') # Yves Rutschle
<y...@rutschle.net>
sha256sums=('3bfe783726f82c1f5a4be630ddc494ebb08dbb69980662cd7ffdeb7bc9e1e706'
'SKIP'
@@ -24,8 +25,22 @@
'35ed3d14c6fa78f82037b64779ec3e6884563e15df471689ede1606a05e8a59a'
'49ed1c88b0de079bc31a94e600b63edd7ea95b4aa9b5f533c15db1221d0892db'
'5824ae86ced9142c37343367bd737661c2da826fba244cea7072685347be2250'
- 'd41f7cb8a3a3d8fc11608bc552014f03177ac3cdd8c5c6157d7d1a557d91cacb')
+ 'd41f7cb8a3a3d8fc11608bc552014f03177ac3cdd8c5c6157d7d1a557d91cacb'
+ 'eefab0803283120454a11c7e1850ae181062a96cbd40a0f9a17d421b74040e4c')
+prepare() {
+ cd $pkgname-v$pkgver
+ # apply patch from the source array (should be a pacman feature)
+ local src
+ for src in "${source[@]}"; do
+ src="${src%%::*}"
+ src="${src##*/}"
+ [[ $src = *.patch ]] || continue
+ echo "Applying patch $src..."
+ patch -Np1 < "../$src"
+ done
+}
+
build() {
cd $pkgname-v$pkgver
make VERSION=\"v$pkgver\" USELIBCAP=1 USESYSTEMD=1 all systemd-sslh-generator
Added: fix-libconfig.patch
===================================================================
--- fix-libconfig.patch (rev 0)
+++ fix-libconfig.patch 2021-07-01 00:16:50 UTC (rev 968330)
@@ -0,0 +1,11 @@
+--- a/sslh-conf.c 2020-07-30 09:45:50.000000000 +0200
++++ b/sslh-conf.c 2021-07-01 02:11:39.589685985 +0200
+@@ -1599,7 +1599,7 @@
+ }
+ }
+
+- s = config_lookup(&c, "/");
++ s = config_root_setting(&c);
+
+ res = read_block(s, cfg, table_sslhcfg, &errmsg);
+ if (!res) {
