Aisha Tammy <[email protected]> writes:
> Hi,
> I've attached the patch for updates of usockets, uwebsockets and
> purritobin.
>
> Main build changes are in the net/usockets port where now I've
> replaced the Makefile by Makefile.obsd to keep things simple.
Hello,
I was just taking a look at the diff and noted that it got mangled :/
some quick comments: I don't use purritobin/usockets but these caught
the eye.
> [...]
> -NO_TEST = Yes
> +# tests need A LOT of file desrciptors ~5000-6000
typo :)
> [...]
> diff --git a/net/usockets/patches/patch-Makefile_obsd
> b/net/usockets/patches/patch-Makefile_obsd
> new file mode 100644
> index 00000000000..d822e7933ae
> --- /dev/null
> +++ b/net/usockets/patches/patch-Makefile_obsd
instead of adding a file with a patch against /dev/null, I think it's
easier to just add the makefile in files/Makefile and then, in
post-extract do
${INSTALL_DATA} ${FILESDIR}/Makefile ${WRKSRC}
or something like that.
> [...]
> --- a/www/purritobin/Makefile
> +++ b/www/purritobin/Makefile
> @@ -1,12 +1,12 @@
> # $OpenBSD $
>
> COMMENT = minimalistic command line pastebin
> -PKGNAME = ${DISTNAME:L}
> CATEGORIES = www net
>
> GH_ACCOUNT = PurritoBin
> GH_PROJECT = PurritoBin
> -GH_TAGNAME = 0.3.3
> +GH_TAGNAME = 0.6.7
> +PKGNAME = ${DISTNAME:L}
nitpick: to reduce the churn, I'd probably leave the PKGNAME as per
Makefile.template order, after COMMENT and before CATEGORIES.
>[...]
> sample httpd(8) configuration
> @@ -30,6 +33,10 @@ http_port=80
> https_port=443
> ext_if=egress
>
> +# so that non suffixed paste files are recognized as
> +# plain text files
> +default type text/plain
> +
> server "bsd.ac" {
> alias "www.bsd.ac"
> listen on $ext_if port $http_port
> @@ -44,29 +51,97 @@ server "bsd.ac" {
>
> server "bsd.ac" {
> alias "www.bsd.ac"
> - listen on egress port $https_port
> + listen on $ext_if port $https_port
> + tls {
> + certificate "/etc/ssl/bsd.ac.crt"
> + key "/etc/ssl/private/bsd.ac.key"
> + }
nitpick: there's a mix of spaces and tabs
