aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancesco Colista <fcolista@alpinelinux.org>2024-05-07 14:37:50 +0200
committerFrancesco Colista <fcolista@alpinelinux.org>2024-05-07 12:42:12 +0000
commit8c84426633f564727deeb308dbcefdbdb8336ca0 (patch)
tree631f8ea0e71dffebd85009dfc27a8defda08d869
parente96b6cee19bcd4ef22fc6fd58e5b84386639ca0b (diff)
community/sslh: upgrade to 2.1.1HEADmaster
-rw-r--r--community/sslh/APKBUILD22
-rw-r--r--community/sslh/fix-make-install.patch13
2 files changed, 19 insertions, 16 deletions
diff --git a/community/sslh/APKBUILD b/community/sslh/APKBUILD
index 88aa18761a9..7cad6c367de 100644
--- a/community/sslh/APKBUILD
+++ b/community/sslh/APKBUILD
@@ -1,13 +1,14 @@
# Contributor: Francesco Colista <fcolista@alpinelinux.org>
# Maintainer: Francesco Colista <fcolista@alpinelinux.org>
pkgname=sslh
-pkgver=2.0.1
+pkgver=2.1.1
pkgrel=0
pkgdesc="Applicative Protocol Multiplexer (e.g. share SSH and HTTPS on the same port)"
url="https://www.rutschle.net/tech/sslh/README.html"
arch="all"
license="GPL-2.0-or-later"
-makedepends="libconfig-dev libcap-dev pcre2-dev libev-dev perl"
+makedepends="libconfig-dev libcap-dev pcre2-dev libev-dev perl
+autoconf automake libtool"
checkdepends="perl-conf-libconfig perl-io-socket-inet6 lcov valgrind"
subpackages="$pkgname-fail2ban::noarch $pkgname-doc $pkgname-openrc"
source="$pkgname-$pkgver.tar.gz::https://github.com/yrutschle/sslh/archive/refs/tags/v$pkgver.tar.gz
@@ -21,12 +22,15 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/yrutschle/sslh/archive/refs/
# Can't test in chroot due to sockets and processes opened. (?)
options="!check"
+prepare() {
+ default_prepare
+ aclocal && autoconf
+ libtoolize
+}
+
build() {
- make CFLAGS="$CFLAGS -std=gnu99" \
- ENABLE_REGEX=1 \
- USELIBPCRE=1 \
- USELIBCONFIG=1 \
- USELIBCAP=1
+ ./configure --prefix=/usr
+ make
}
check() {
@@ -62,8 +66,8 @@ doc() {
}
sha512sums="
-a20f33af45b3719d85f8c1595ab58e378646894506a2c7179d4a1010a514131de33507c0fa873dc1dbc4d0ba99f5ceaf564bd0252014116d172f0f09efb89fef sslh-2.0.1.tar.gz
-b82d3c799f0cdf183fe0545e1d2b4f142070112d7ec3594afd709608c4893c300122aa32026dd7f8e782eb3981bf85fc02f878e2613ddfe014f39bbb94fb441e fix-make-install.patch
+f689394028ec25e16dd59a5f1aa4c18a760108f0acf23b4eb2ccf000dc09adf1428272c3e93f5b0012f9603076ab1408a3e1aca98adb3e69743d184cb898a9a4 sslh-2.1.1.tar.gz
+a5676b7b4626f298c6d31ba5bbd27a1b1732de04f9b54b55d421a80ff12f7ca15aae5c9aef36af23db4ba0efa4c2c3761fb17ace715f7df0baeac34a9ec859c4 fix-make-install.patch
5773ee1d91e099726b614dbe385f2668699d25029fc300b664411c6082e95d3f27df11b9b1489bee3444c81bf941b8db13b4d382343788e47408c593c4531816 fail2ban.patch
0e677ed7c9d09fa96d0a0571d09660a094a24e5978d6c9f0cf43d8c2b084df2b6b2f4c9bddfb63be943a56e9bb628f8a156f06d0fc4b6ce52d63ea02c6569307 config.patch
20ad403c7e8bd37c849263886ff4307a478fbeaec74d52b7db864dea2e9bdafb2c501afd70fa2621385baf3536553a79cee006b4a629260921d2e08db7991696 sslh.initd
diff --git a/community/sslh/fix-make-install.patch b/community/sslh/fix-make-install.patch
index d289f6a6b1b..aab4315a064 100644
--- a/community/sslh/fix-make-install.patch
+++ b/community/sslh/fix-make-install.patch
@@ -1,13 +1,12 @@
---- a/Makefile
-+++ b/Makefile
-@@ -98,7 +98,9 @@
- install: sslh $(MAN)
+diff --git a/Makefile.in b/Makefile.in
+index 57cf591..624a59e 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -143,6 +143,7 @@ install: sslh-fork $(MAN)
mkdir -p $(DESTDIR)/$(BINDIR)
mkdir -p $(DESTDIR)/$(MANDIR)
-- install -p sslh-fork $(DESTDIR)/$(BINDIR)/sslh
-+ install -p sslh-fork $(DESTDIR)/$(BINDIR)/sslh-fork
+ install -p sslh-fork $(DESTDIR)/$(BINDIR)/sslh
+ install -p sslh-select $(DESTDIR)/$(BINDIR)/sslh-select
-+ ln -s sslh-fork $(DESTDIR)/$(BINDIR)/sslh
install -p -m 0644 $(MAN) $(DESTDIR)/$(MANDIR)/$(MAN)
# "extended" install for Debian: install startup script