On Mon, Aug 19, 2024 at 03:48:20PM GMT, Omar Polo wrote:
> On 2024/08/17 16:28:35 +0100, Stuart Henderson <stu@spacehopper.org> wrote:
> > ok
> 
> Imported
> 
> Thank you,
> 
> Omar Polo
> 

Please see below revision to address config consistency.

Summary of changes:

- Bump revision
- Use full paths for cert/key in example conf
- Create /etc/hopm/ to hold all hopm config by default

-- 
Chaz

diff --git a/net/hopm/Makefile b/net/hopm/Makefile
index a7b8cab8ee4..a90193bcdad 100644
--- a/net/hopm/Makefile
+++ b/net/hopm/Makefile
@@ -1,7 +1,7 @@
 COMMENT=		open-proxy monitor irc bot
 
 DIST_TUPLE=		github ircd-hybrid hopm 1.1.10 .
-REVISION=		0
+REVISION=		1
 
 CATEGORIES=		net
 
diff --git a/net/hopm/patches/patch-doc_reference_conf b/net/hopm/patches/patch-doc_reference_conf
index 48966537eba..e85c90bc720 100644
--- a/net/hopm/patches/patch-doc_reference_conf
+++ b/net/hopm/patches/patch-doc_reference_conf
@@ -19,3 +19,19 @@ Index: doc/reference.conf
  };
  
  
+@@ -156,13 +156,13 @@ irc {
+ 	 *    chown <ircd-user>.<ircd.group> rsa.key
+ 	 *    chmod 0600 rsa.key
+ 	 */
+-#	rsa_private_key_file = "etc/rsa.key";
++#	rsa_private_key_file = "/etc/hopm/rsa.key";
+ 
+ 	/*
+ 	 * tls_certificate_file: the path to the file containing our
+ 	 * TLS certificate for encrypted client connection.
+ 	 */
+-#	tls_certificate_file = "etc/cert.pem";
++#	tls_certificate_file = "/etc/hopm/cert.pem";
+ 
+ 	/*
+ 	 * Checks if the host name defined above matches the identity in the
diff --git a/net/hopm/patches/patch-src_Makefile_in b/net/hopm/patches/patch-src_Makefile_in
index 7642e5d97fb..54a0a657081 100644
--- a/net/hopm/patches/patch-src_Makefile_in
+++ b/net/hopm/patches/patch-src_Makefile_in
@@ -8,7 +8,7 @@ Index: src/Makefile.in
  top_srcdir = @top_srcdir@
  SUBDIRS = libopm
 -AM_CPPFLAGS = -DHOPM_PREFIX="\"$(prefix)\"" -DHOPM_ETCDIR="\"$(sysconfdir)\"" -DHOPM_LOGDIR="\"$(localstatedir)/log\"" -DHOPM_BINPATH="\"$(bindir)/hopm\"" -I$(top_srcdir)/src/libopm/src/
-+AM_CPPFLAGS = -DHOPM_PREFIX="\"$(prefix)\"" -DHOPM_ETCDIR="\"$(sysconfdir)\"" -DHOPM_LOGDIR="\"$(localstatedir)/log/hopm\"" -DHOPM_BINPATH="\"$(bindir)/hopm\"" -I$(top_srcdir)/src/libopm/src/
++AM_CPPFLAGS = -DHOPM_PREFIX="\"$(prefix)\"" -DHOPM_ETCDIR="\"$(sysconfdir)/hopm\"" -DHOPM_LOGDIR="\"$(localstatedir)/log/hopm\"" -DHOPM_BINPATH="\"$(bindir)/hopm\"" -I$(top_srcdir)/src/libopm/src/
  AM_YFLAGS = -d
  hopm_SOURCES = compat.c        \
                 compat.h        \
diff --git a/net/hopm/pkg/PLIST b/net/hopm/pkg/PLIST
index a9b1849c551..6cfdd8026e8 100644
--- a/net/hopm/pkg/PLIST
+++ b/net/hopm/pkg/PLIST
@@ -4,7 +4,8 @@
 @bin bin/hopm
 share/examples/hopm/
 share/examples/hopm/reference.conf
-@sample ${SYSCONFDIR}/hopm.conf
+@sample ${SYSCONFDIR}/hopm/
+@sample ${SYSCONFDIR}/hopm/hopm.conf
 @owner _hopm
 @group _hopm
 @sample /var/log/hopm/