From 0722927b11cd68409d75a6cf425743843150ce32 Mon Sep 17 00:00:00 2001
From: Leonardo Arena <rnalrd@alpinelinux.org>
Date: Mon, 24 Dec 2018 10:34:13 +0000
Subject: [PATCH] community/sniproxy: upgrade to 0.6.0
Modernize APKBUILD, update license, disable tests, add openrc subpkg
Several tests fail under abuild:
PASS: address_test
PASS: buffer_test
PASS: cfg_tokenizer_test
PASS: table_test
PASS: http_test
PASS: tls_test
PASS: binder_test
FAIL: connection_reset_test
PASS: bad_request_test
FAIL: fallback_test
FAIL: functional_test
FAIL: bind_source_test
FAIL: fd_limit_test
FAIL: ipv6_v6only_test
FAIL: proxy_header_test
SKIP: transparent_proxy_test
PASS: config_test
FAIL: reuseport_test
FAIL: reload_test
FAIL: slow_client_test
PASS: resolv_test
PASS: bad_dns_request_test
Running "make check" manually there's only one fail:
PASS: address_test
PASS: buffer_test
PASS: cfg_tokenizer_test
PASS: table_test
PASS: http_test
PASS: tls_test
PASS: binder_test
PASS: functional_test
PASS: bad_request_test
PASS: bind_source_test
PASS: connection_reset_test
PASS: fallback_test
PASS: fd_limit_test
PASS: ipv6_v6only_test
FAIL: proxy_header_test
PASS: reload_test
PASS: reuseport_test
PASS: slow_client_test
SKIP: transparent_proxy_test
PASS: config_test
PASS: resolv_test
PASS: bad_dns_request_test
---
community/sniproxy/APKBUILD | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/community/sniproxy/APKBUILD b/community/sniproxy/APKBUILD
index b64cb2175399..6acdbcf59854 100644
--- a/community/sniproxy/APKBUILD
+++ b/community/sniproxy/APKBUILD
@@ -1,60 +1,63 @@
# Maintainer: Leonardo Arena <rnalrd@alpinelinux.org>
pkgname=sniproxy
-pkgver=0.5.0
+pkgver=0.6.0
pkgrel=0
pkgdesc="Proxies incoming HTTP and TLS connections based on the hostname
contained in the initial request of the TCP session."
url="https://github.com/dlundquist/sniproxy"
arch="all"
-license="GPL"
-depends=
-depends_dev=
+license="BSD-2-Clause"
makedepends="$depends_dev autoconf automake bsd-compat-headers gettext-dev
libev-dev libtool pcre-dev udns-dev
"
install="${pkgname}.pre-install"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-openrc"
pkgusers="sniproxy"
pkggroups="sniproxy"
+options="!check" # several tests failing
source="sniproxy-$pkgver.tar.gz::https://github.com/dlundquist/$pkgname/archive/$pkgver.tar.gz
$pkgname.initd
$pkgname.conf
$pkgname.logrotate
"
-
-_builddir="$srcdir"/$pkgname-$pkgver
+builddir="$srcdir"/$pkgname-$pkgver
prepare() {
- cd "$_builddir"
- # apply patches here
+ default_prepare
+ ./autogen.sh
}
build() {
- cd "$_builddir"
- ./autogen.sh && ./configure \
+ cd "$builddir"
+ ./configure \
--prefix=/usr \
--sysconfdir=/etc \
--mandir=/usr/share/man \
--infodir=/usr/share/info
- make || return 1
+ make
+}
+
+check() {
+ cd "$builddir"
+ make check
}
package() {
cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
+ make DESTDIR="$pkgdir" install
install -Dm755 "$srcdir"/$pkgname.initd \
- "$pkgdir"/etc/init.d/$pkgname || return 1
+ "$pkgdir"/etc/init.d/$pkgname
install -Dm644 "$srcdir"/$pkgname.conf \
- "$pkgdir"/etc/$pkgname/$pkgname.conf || return 1
+ "$pkgdir"/etc/$pkgname/$pkgname.conf
install -Dm644 "$srcdir"/$pkgname.logrotate \
- "$pkgdir"/etc/logrotate.d/$pkgname || return 1
+ "$pkgdir"/etc/logrotate.d/$pkgname
for dir in /var/log /etc /var/run; do
mkdir -p "$pkgdir"/$dir/$pkgname
chown $pkgusers:$pkggroups "$pkgdir"/$dir/$pkgname
done
}
-sha512sums="52dbb217193d2b7bf9dea37b13fde395b5c56d0a6627508a245f2807920deb282aae3c1ae7e6b5fa68432990e48998989fd28027b65cb7310f214b29f98e5e5d sniproxy-0.5.0.tar.gz
+sha512sums="8a99573673bdd57e528c5781cb166d39c80daed699382b24c3fa18a6011d074a1d9e470fee404d24b4450cf067c9995125910b2941b5216d88d189a1d79ebf73 sniproxy-0.6.0.tar.gz
57f4997f8a96516b4622105c024708bf39002a83d7f3eb76dd857ee0202598309b51d585f6b25b5e72e9710b79c36a3e4f21bc2effcead16dd2c032137c704f3 sniproxy.initd
f7423cfd48e9333d5db857b4eb61b747664221607e2d47a55167493159b7b838580f101427e98252468c0be9c42693f7f0689ac8bd1acdcd1dfb75638a8f49fb sniproxy.conf
8c026af5ed23620776ef5a9a08f09236d30fc5152c9f95de2b95eb7ac48ad001c21010922d74dc7c78071f9e6ef8f794c2a59c11677d8e12be8d57e94bac2b5e sniproxy.logrotate"
--
GitLab