On 2014/01/14 12:21, Remi Locherer wrote:
> On Tue, Jan 14, 2014 at 11:05:04AM +0000, Stuart Henderson wrote:
> > On 2014/01/14 08:19, Remi Locherer wrote:
> > > ping
> >
> > groff is picked up by configure and used at the end of build, I think this
> > should be disabled, which can be done with a tweak to site.config.m4,
> >
> > post-configure:
> > @(echo "define(\`confCC', \`${CC}')"; \
> > - echo "define(\`confOPTIMIZE', \`${CFLAGS}')") \
> > + echo "define(\`confOPTIMIZE', \`${CFLAGS}')"; \
> > + echo "define(\`confNO_MAN_BUILD')") \
> > >${WRKSRC}/devtools/Site/site.config.m4
> >
> > I'm a bit unsure about the reload support, it does have some support, but
> > a number of config options aren't handled, and it loses command line values
> > (which may be passed in via dkim_filter_flags), so I think maybe it's better
> > not to have that exposed by rc.d?
> >
>
> This is true. Command line flags get lost on reload. Maybe it's better
> to not support reload and add rc_reload=NO to the rc script.
>
With additional tweaks: @sample the configuration file into
/etc/dkim-filter.conf, and adjust the default flags to use it.
Does this still work for you Remi?
Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/dkim-milter/Makefile,v
retrieving revision 1.37
diff -u -p -r1.37 Makefile
--- Makefile 23 Oct 2013 16:33:20 -0000 1.37
+++ Makefile 14 Jan 2014 11:32:54 -0000
@@ -3,7 +3,7 @@
COMMENT= DKIM milter
DISTNAME= dkim-milter-2.8.3
-REVISION = 2
+REVISION= 3
CATEGORIES= mail
HOMEPAGE= http://sourceforge.net/projects/dkim-milter/
@@ -18,11 +18,11 @@ PERMIT_PACKAGE_FTP= Yes
WANTLIB= c crypto milter pthread ssl
EXAMPLESDIR= share/examples/dkim-milter
-USE_GROFF = Yes
post-configure:
@(echo "define(\`confCC', \`${CC}')"; \
- echo "define(\`confOPTIMIZE', \`${CFLAGS}')") \
+ echo "define(\`confOPTIMIZE', \`${CFLAGS}')"; \
+ echo "define(\`confNO_MAN_BUILD')") \
>${WRKSRC}/devtools/Site/site.config.m4
do-install:
Index: distinfo
===================================================================
RCS file: /cvs/ports/mail/dkim-milter/distinfo,v
retrieving revision 1.27
diff -u -p -r1.27 distinfo
--- distinfo 1 Jun 2009 12:15:57 -0000 1.27
+++ distinfo 14 Jan 2014 11:32:54 -0000
@@ -1,5 +1,2 @@
-MD5 (dkim-milter-2.8.3.tar.gz) = 0gQ8Jp8XIMwJWptPFjzz3w==
-RMD160 (dkim-milter-2.8.3.tar.gz) = M5iGqOwCYVp4W1pWBbK3UujpRrs=
-SHA1 (dkim-milter-2.8.3.tar.gz) = 7o96oUKfdj9qQBLpAilnM98PoOY=
SHA256 (dkim-milter-2.8.3.tar.gz) =
Iir8k2twuCMono4yfAbCkgpfM99D8HAktfkxhWQGBI8=
SIZE (dkim-milter-2.8.3.tar.gz) = 748415
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/dkim-milter/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 8 Mar 2013 06:42:09 -0000 1.5
+++ pkg/PLIST 14 Jan 2014 11:32:54 -0000
@@ -13,3 +13,5 @@ bin/dkim-genkey
share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/dkim-milter/
share/examples/dkim-milter/dkim-filter.conf.sample
+@sample ${SYSCONFDIR}/dkim-filter.conf
+@rcscript ${RCDIR}/dkim_filter
Index: pkg/dkim_filter.rc
===================================================================
RCS file: pkg/dkim_filter.rc
diff -N pkg/dkim_filter.rc
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/dkim_filter.rc 14 Jan 2014 11:32:54 -0000
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $OpenBSD$
+
+daemon="${TRUEPREFIX}/libexec/dkim-filter"
+daemon_flags="-x ${SYSCONFDIR}/dkim-filter.conf"
+
+. /etc/rc.d/rc.subr
+
+rc_reload=NO
+rc_cmd $1
