Remove mail/dkim-milter.
There is a note on HOMEPAGE [1] saying that dkim-milter has been replaced by OpenDKIM, which we have a port for already: mail/opendkim. [1] https://sourceforge.net/projects/dkim-milter/ OK bcallah@, gonzalo@, sthen@
This commit is contained in:
parent
9ca1ca1230
commit
4339963726
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.368 2018/08/09 22:42:05 jeremy Exp $
|
||||
# $OpenBSD: Makefile,v 1.369 2018/08/14 18:45:31 fcambus Exp $
|
||||
|
||||
SUBDIR =
|
||||
SUBDIR += abook
|
||||
@ -30,7 +30,6 @@
|
||||
SUBDIR += cucipop
|
||||
SUBDIR += cue
|
||||
SUBDIR += cyrus-imapd
|
||||
SUBDIR += dkim-milter
|
||||
SUBDIR += dkimproxy
|
||||
SUBDIR += dovecot
|
||||
SUBDIR += dovecot-antispam
|
||||
|
@ -1,45 +0,0 @@
|
||||
# $OpenBSD: Makefile,v 1.41 2018/01/11 19:27:03 rpe Exp $
|
||||
|
||||
COMMENT= DKIM milter
|
||||
|
||||
DISTNAME= dkim-milter-2.8.3
|
||||
REVISION= 6
|
||||
CATEGORIES= mail
|
||||
HOMEPAGE= http://sourceforge.net/projects/dkim-milter/
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dkim-milter/}
|
||||
|
||||
MAINTAINER= Jakob Schlyter <jakob@openbsd.org>
|
||||
|
||||
# sendmail open source license
|
||||
PERMIT_PACKAGE_CDROM= Patent
|
||||
PERMIT_PACKAGE_FTP= Yes
|
||||
|
||||
WANTLIB= c crypto milter pthread ssl
|
||||
|
||||
LIB_DEPENDS= mail/sendmail,-libmilter
|
||||
|
||||
EXAMPLESDIR= share/examples/dkim-milter
|
||||
|
||||
post-configure:
|
||||
@(echo "define(\`confCC', \`${CC}')"; \
|
||||
echo "define(\`confOPTIMIZE', \`${CFLAGS}')"; \
|
||||
echo "define(\`confNO_MAN_BUILD')"; \
|
||||
echo "APPENDDEF(\`confINCDIRS', \`-I${LOCALBASE}/include')"; \
|
||||
echo "APPENDDEF(\`confLIBDIRS', \`-L${LOCALBASE}/lib ')") \
|
||||
>${WRKSRC}/devtools/Site/site.config.m4
|
||||
|
||||
do-install:
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/obj.*/dkim-filter/dkim-filter ${PREFIX}/libexec
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/obj.*/dkim-filter/dkim-testkey ${PREFIX}/bin
|
||||
${INSTALL_PROGRAM} ${WRKSRC}/obj.*/dkim-filter/dkim-testssp ${PREFIX}/bin
|
||||
${INSTALL_SCRIPT} ${WRKSRC}/dkim-filter/dkim-genkey.sh ${PREFIX}/bin/dkim-genkey
|
||||
${INSTALL_MAN} ${WRKSRC}/dkim-filter/dkim-filter.conf.5 ${PREFIX}/man/man5
|
||||
${INSTALL_MAN} ${WRKSRC}/dkim-filter/dkim-filter.8 ${PREFIX}/man/man8
|
||||
${INSTALL_MAN} ${WRKSRC}/dkim-filter/dkim-testkey.8 ${PREFIX}/man/man8
|
||||
${INSTALL_MAN} ${WRKSRC}/dkim-filter/dkim-testssp.8 ${PREFIX}/man/man8
|
||||
${INSTALL_MAN} ${WRKSRC}/dkim-filter/dkim-genkey.8 ${PREFIX}/man/man8
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/${EXAMPLESDIR}
|
||||
${INSTALL_DATA} ${WRKSRC}/dkim-filter/dkim-filter.conf.sample ${PREFIX}/${EXAMPLESDIR}
|
||||
|
||||
.include <bsd.port.mk>
|
@ -1,2 +0,0 @@
|
||||
SHA256 (dkim-milter-2.8.3.tar.gz) = Iir8k2twuCMono4yfAbCkgpfM99D8HAktfkxhWQGBI8=
|
||||
SIZE (dkim-milter-2.8.3.tar.gz) = 748415
|
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-dkim-filter_dkim-filter_8,v 1.6 2009/01/23 06:43:07 jasper Exp $
|
||||
--- dkim-filter/dkim-filter.8.orig Mon Jul 28 01:53:57 2008
|
||||
+++ dkim-filter/dkim-filter.8 Thu Jan 22 23:28:54 2009
|
||||
@@ -322,6 +322,7 @@ and primary group ID of the named
|
||||
unless an alternate
|
||||
.I group
|
||||
is specified.
|
||||
+The default is to change user to _dkim-milter.
|
||||
.TP
|
||||
.I -U popdb
|
||||
Requests that the filter consult a POP authentication database for IP
|
@ -1,33 +0,0 @@
|
||||
$OpenBSD: patch-dkim-filter_dkim-filter_c,v 1.11 2013/10/23 16:33:21 jca Exp $
|
||||
- key_data should be NUL-terminated (dkim_sign calls strlen)
|
||||
- fix double free at reload time
|
||||
- set unprivileged _dkim-milter user
|
||||
--- dkim-filter/dkim-filter.c.orig Wed May 27 18:34:05 2009
|
||||
+++ dkim-filter/dkim-filter.c Mon Oct 14 01:13:06 2013
|
||||
@@ -4872,7 +4872,7 @@ dkimf_loadkeys(char *file, struct dkimf_config *conf)
|
||||
return -1;
|
||||
}
|
||||
|
||||
- new->key_data = malloc(s.st_size);
|
||||
+ new->key_data = calloc(1, s.st_size + 1);
|
||||
if (new->key_data == NULL)
|
||||
{
|
||||
fprintf(stderr, "%s: malloc(): %s\n",
|
||||
@@ -4950,7 +4950,7 @@ dkimf_freekeys(struct dkimf_config *conf)
|
||||
if (cur->key_domain != NULL)
|
||||
free(cur->key_domain);
|
||||
if (cur->key_data != NULL)
|
||||
- free(cur->key_domain);
|
||||
+ free(cur->key_data);
|
||||
regfree(&cur->key_re);
|
||||
|
||||
free(cur);
|
||||
@@ -9044,7 +9044,7 @@ main(int argc, char **argv)
|
||||
unsigned long tmpl;
|
||||
const char *args = CMDLINEOPTS;
|
||||
FILE *f;
|
||||
- char *become = NULL;
|
||||
+ char *become = "_dkim-milter";
|
||||
char *p;
|
||||
char *pidfile = NULL;
|
||||
#if POPAUTH
|
@ -1,14 +0,0 @@
|
||||
$OpenBSD: patch-libdkim_dkim_h,v 1.6 2013/10/23 16:33:21 jca Exp $
|
||||
--- libdkim/dkim.h.orig Tue Apr 7 00:36:09 2009
|
||||
+++ libdkim/dkim.h Mon Oct 14 00:55:25 2013
|
||||
@@ -17,6 +17,10 @@ static char dkim_h_id[] = "@(#)$Id: dkim.h,v 1.202 200
|
||||
/* openssl includes */
|
||||
#include <openssl/sha.h>
|
||||
|
||||
+#if defined(__OpenBSD__)
|
||||
+#include <sha2.h>
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
** version -- 0xrrMMmmpp
|
||||
**
|
@ -1,5 +0,0 @@
|
||||
The dkim-milter package is an open source implementation of the DKIM
|
||||
sender authentication system proposed by the E-mail Signing Technology
|
||||
Group (ESTG). DKIM is an amalgamation of the DomainKeys (DK) proposal
|
||||
by Yahoo!, Inc. and the Internet Identified Mail (IIM) proposal by
|
||||
Cisco.
|
@ -1,17 +0,0 @@
|
||||
@comment $OpenBSD: PLIST,v 1.6 2014/01/15 00:20:42 sthen Exp $
|
||||
@newgroup _dkim-milter:569
|
||||
@newuser _dkim-milter:569:_dkim-milter:daemon:dkim-milter Account:/nonexistent:/sbin/nologin
|
||||
bin/dkim-genkey
|
||||
@bin bin/dkim-testkey
|
||||
@bin bin/dkim-testssp
|
||||
@bin libexec/dkim-filter
|
||||
@man man/man5/dkim-filter.conf.5
|
||||
@man man/man8/dkim-filter.8
|
||||
@man man/man8/dkim-genkey.8
|
||||
@man man/man8/dkim-testkey.8
|
||||
@man man/man8/dkim-testssp.8
|
||||
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
|
@ -1,88 +0,0 @@
|
||||
$OpenBSD: README,v 1.1 2013/03/08 06:42:09 ajacoutot Exp $
|
||||
|
||||
+-----------------------------------------------------------------------
|
||||
| Running ${FULLPKGNAME} on OpenBSD
|
||||
+-----------------------------------------------------------------------
|
||||
|
||||
(1) Choose a selector name. Current convention is to use a code for the
|
||||
current month and year, or just the year. However, you are free to
|
||||
choose any name you wish, especially if you have a selector assignment
|
||||
scheme in mind.
|
||||
|
||||
(2) Create a public/private keypair for signing:
|
||||
|
||||
(a) Run the script "dkim-genkey".
|
||||
|
||||
This will generate a private key in PEM format and a TXT record
|
||||
appropriate for insertion into your DNS zone file. Insert the contents
|
||||
of the TXT record file into your DNS zone file, increment the
|
||||
serial number, and reload your DNS server so that the new record
|
||||
is published. This is by far the easiest approach.
|
||||
|
||||
(b) If for some reason you cannot use the "dkim-genkey" script, manually
|
||||
generate a public and private key. The steps below are exactly what
|
||||
is performed by the dkim-genkey script.
|
||||
|
||||
(i) Run this command:
|
||||
|
||||
% openssl genrsa -out rsa.private 1024
|
||||
|
||||
This generates a private key and writes it to the file "rsa.private".
|
||||
The generated key is in PEM format and is a 1024-bit key, the
|
||||
minimum required by the DKIM specification.
|
||||
|
||||
(ii) Run this command:
|
||||
|
||||
% openssl rsa -in rsa.private -out rsa.public -pubout -outform PEM
|
||||
|
||||
This reads the private key generated in the previous step and
|
||||
extracts from it the matching public key. This is written to the
|
||||
file "rsa.public".
|
||||
|
||||
(iii) Add a TXT DNS record containing the base64 encoding of your public
|
||||
key, which is everything between the BEGIN and END lines in the
|
||||
rsa.public file generated above, with spaces and newlines removed.
|
||||
It should be in this form:
|
||||
|
||||
"g=*; k=rsa; t=y; p=MFwwDQYJ...AwEAAQ=="
|
||||
|
||||
...using, of course, your own public key's base64 data. The name of
|
||||
the TXT record should be SELECTOR._domainkey.example.com (where
|
||||
"SELECTOR" is the name you chose and "example.com" is your domain
|
||||
name). Reload your nameserver so that the record gets published.
|
||||
If you are running BIND 9 the command is "rndc reload"; for other
|
||||
nameservers, consult your vendor documentation.
|
||||
|
||||
For a translation of the parameter and value pairs shown here, see
|
||||
the DKIM specification (RFC4871) section 3.6. The specification
|
||||
is available in a file in the source code package called
|
||||
"rfc4871.txt". Basically this key record just announces an RSA
|
||||
public key and also declares that your site is using this key in
|
||||
test mode so nobody should take any real action based on success
|
||||
or failure of the use of this key to verify a message.
|
||||
|
||||
(3) Store the private key in a safe place. We generally use a path like
|
||||
/var/db/dkim/SELECTOR.key.pem (where "SELECTOR" is the name you chose).
|
||||
The /var/db/dkim directory and the associated .pem file should be owned by
|
||||
the user that will be executing the filter (preferably not the
|
||||
superuser) and be mode 0700 and 0600 respectively.
|
||||
|
||||
(4) Start dkim-filter. You will need at least the "-p" option. (A manual
|
||||
page for this tool is available and will be installed by the above
|
||||
process if you want to see the available options.) The current
|
||||
recommended set of command line options is:
|
||||
|
||||
-l -p SOCKETSPEC -d DOMAIN -k KEYPATH -s SELECTOR
|
||||
|
||||
...where SOCKETSPEC is the socket you want the MTA to use (see below),
|
||||
DOMAIN is the domain or set of domains for which you want to sign
|
||||
mail, KEYPATH is the path to the private key file you generated, and
|
||||
SELECTOR is the selector name you picked. You can tack "-f" on there
|
||||
if you want it to run in the foreground instead of in the background
|
||||
as a daemon.
|
||||
|
||||
The SOCKETSPEC is a socket where the MTA will attempt to connect
|
||||
to your filter. The filter must therefore be listening there for
|
||||
connections from MTAs in order to process messages. See the
|
||||
documentation in libmilter (available with the open source sendmail
|
||||
source code) for details on selecting and specifying a socket.
|
@ -1,12 +0,0 @@
|
||||
#!/bin/ksh
|
||||
#
|
||||
# $OpenBSD: dkim_filter.rc,v 1.2 2018/01/11 19:27:03 rpe Exp $
|
||||
|
||||
daemon="${TRUEPREFIX}/libexec/dkim-filter"
|
||||
daemon_flags="-x ${SYSCONFDIR}/dkim-filter.conf"
|
||||
|
||||
. /etc/rc.d/rc.subr
|
||||
|
||||
rc_reload=NO
|
||||
|
||||
rc_cmd $1
|
Loading…
x
Reference in New Issue
Block a user