Index | Thread | Search

From:
Christoph Liebender <christoph@liebender.dev>
Subject:
Re: NEW: net/mollysocket
To:
ports@openbsd.org
Date:
Sat, 1 Mar 2025 19:47:00 +0100

Download raw body.

Thread
Am 25.02.25 um 16:55 schrieb Christoph Liebender:
> Thanks for your comments. I've integrated your suggestions in the 
> attached tarball.
> 
> - christoph
> 
> diff --git a/net/mollysocket/Makefile b/net/mollysocket/Makefile
> index 8fcee423108..8c07fa3c296 100644
> --- a/net/mollysocket/Makefile
> +++ b/net/mollysocket/Makefile
> @@ -1,6 +1,8 @@
>   COMMENT =        get Signal notifications via UnifiedPush
> 
> -DIST_TUPLE +=        github mollyim mollysocket 1.6.0 .
> +GH_ACCOUNT =        mollyim
> +GH_PROJECT =        mollysocket
> +GH_TAGNAME =        1.6.0
> 
>   CATEGORIES =        net
> 
> diff --git a/net/mollysocket/pkg/PLIST b/net/mollysocket/pkg/PLIST
> index 8a190222039..693e85789e2 100644
> --- a/net/mollysocket/pkg/PLIST
> +++ b/net/mollysocket/pkg/PLIST
> @@ -1,14 +1,13 @@
> -@newgroup _mollysocket:902
> -@newuser _mollysocket:902:902::mollysocket daemon:/nonexistent:/sbin/ 
> nologin
> +@newgroup _mollysocket:589
> +@newuser _mollysocket:589:589::mollysocket daemon:/nonexistent:/sbin/ 
> nologin
>   @rcscript ${RCDIR}/mollysocket
>   @bin bin/mollysocket
> +share/doc/pkg-readmes/${PKGSTEM}
>   share/examples/mollysocket/
>   share/examples/mollysocket/mollysocket.conf
>   @mode 0640
> -@owner
>   @group _mollysocket
>   @sample ${SYSCONFDIR}/mollysocket.conf
>   @mode 0700
>   @owner _mollysocket
> -@group _mollysocket
>   @sample /var/db/mollysocket/
> diff --git a/net/mollysocket/pkg/README b/net/mollysocket/pkg/README
> new file mode 100644
> index 00000000000..3bc09414630
> --- /dev/null
> +++ b/net/mollysocket/pkg/README
> @@ -0,0 +1,16 @@
> +${PKGSTEM} setup on OpenBSD
> +~~~~~~~~~~~~~~~~~~~~~~~~~~~
> +
> +To finish your mollysocket install, you need to generate a VAPID key 
> and append
> +it to ${SYSCONFDIR}/mollysocket.conf .
> +
> +To do this, either run
> +
> +$ mollysocket vapid gen
> +
> +and paste its output in the "vapid_privkey" field of the configuration, 
> or:
> +
> +# sed -i "s|changeme|$(mollysocket vapid gen)|" ${SYSCONFDIR}/ 
> mollysocket.conf
> +
> +Make sure that the permissions on ${SYSCONFDIR}/mollysocket.conf stay
> +restrictive.
> diff --git a/net/mollysocket/pkg/mollysocket.rc b/net/mollysocket/pkg/ 
> mollysocket.rc
> index 467eca92ffe..27ef650fa76 100644
> --- a/net/mollysocket/pkg/mollysocket.rc
> +++ b/net/mollysocket/pkg/mollysocket.rc
> @@ -1,9 +1,9 @@
>   #!/bin/ksh
> 
> -daemon="${TRUEPREFIX}/bin/mollysocket -v"
> -daemon_logger="daemon.info"
> +daemon="${TRUEPREFIX}/bin/mollysocket"
> +daemon_logger="daemon.error"
>   daemon_user="_mollysocket"
> -daemon_flags="-c /etc/mollysocket.conf server"
> +daemon_flags="-c ${SYSCONFDIR}/mollysocket.conf server"
> 
>   . /etc/rc.d/rc.subr
> 

Comments, ok?