diff options
author | 2016-01-17 20:16:35 +0000 | |
---|---|---|
committer | 2016-01-17 20:16:35 +0000 | |
commit | e6f5c241a15cd6db5683d5bb0a5eb00cd59dbe62 (patch) | |
tree | 2195970717fee10b7e1519f3570d507759f1b40e /mail-filter | |
parent | Update eblits/common.eblit affecting sys-libs/glibc-2.17, sys-libs/glibc-2.19... (diff) | |
download | srcshelton-e6f5c241a15cd6db5683d5bb0a5eb00cd59dbe62.tar.gz srcshelton-e6f5c241a15cd6db5683d5bb0a5eb00cd59dbe62.tar.bz2 srcshelton-e6f5c241a15cd6db5683d5bb0a5eb00cd59dbe62.zip |
Add mail-filter/opendkim-2.9.2-r1, update README.md
Diffstat (limited to 'mail-filter')
-rw-r--r-- | mail-filter/opendkim/Manifest | 5 | ||||
-rw-r--r-- | mail-filter/opendkim/files/opendkim-2.9.2-safekeys.patch | 101 | ||||
-rw-r--r-- | mail-filter/opendkim/files/opendkim.init.r3 | 56 | ||||
-rw-r--r-- | mail-filter/opendkim/files/opendkim.service | 11 | ||||
-rw-r--r-- | mail-filter/opendkim/opendkim-2.9.2-r1.ebuild | 199 |
5 files changed, 372 insertions, 0 deletions
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest new file mode 100644 index 00000000..76b598ed --- /dev/null +++ b/mail-filter/opendkim/Manifest @@ -0,0 +1,5 @@ +AUX opendkim-2.9.2-safekeys.patch 3554 SHA256 2f31a4b34e149af7de9a30b252e1438bc2f9fdfe19ef10c75da241467abedb64 SHA512 d27e49531aa3b01f5ab5f0c843b0589c503cb59b1889b032e7fe634ffcfbd0141045caecdf0c5add61d3bba478bdbc40a1c223bd730616562ec7968aef482fa4 WHIRLPOOL 153c25a079d91d540eb3225804f41f8881e657858e7fda7bd6a746a52615bcb67531aea9229a74c3b79bed479a666ab10fb7198987e97ff66b31ac8aa0a336e0 +AUX opendkim.init.r3 1479 SHA256 b2daa1749672a81bebad1af9ff03e300e6937a70cf0602307392c943346c1a95 SHA512 e86916e25951a8c9c1b3f49fd7d35e4773d70588881fd082b9f83aae467e0d4f7ae7ff3495257f1034aedc7b13b457f8994b047ec3d52f44ba98be4af4891d51 WHIRLPOOL f8ea0ec3182d80a4055356e47fe1513f0751a99333907b7cde020b503d884962e23f6d8add8fe097e236d377c32bf378e4e55eaf36a83539044547205cec42b6 +AUX opendkim.service 439 SHA256 8636aee39d924067d1f1673291d1501cec3e6fdee0de16533a1e3616471b35ed SHA512 308edc70fdb0bd57b424e739412217fd8017b017e9b27bc0954dec55294d10d8b7713f6f191836b94aa49bf578bfb391dca748af0c8d9b72e14ebe1eae21e834 WHIRLPOOL 4b7c42b130a31120efba7aa04f90cacd8c6b760204577e2914901eddc6cb425b1c06253d60f43673d28f9992e4b078010f444a390569544573601b3fdbf66e76 +DIST opendkim-2.9.2.tar.gz 1229383 SHA256 1f0c66afbe48f6223d2ab985b2c27594ae45035e3e81eba887d8ec6e5e1282c0 SHA512 f6fe77897927a93c9f57d09e5e9f43b1e73e2b21a586461b5665fb430eee1362b33d9601c8643d50d5a53c8e01b03c7af331f28cd992c9163f959723f21ebf63 WHIRLPOOL b61212d272d07c367c7d9ecb951466b66759b6d449047c10947681ea6889a1f2b2c12986e6c11a59620fb8ace3c0a177235f65f58c54c993909f61dee5cf3c3a +EBUILD opendkim-2.9.2-r1.ebuild 6214 SHA256 4831dbc0e720f4ddee0c63a578e8d01c6351e269dbff9c62c445bd8bfcc3ec93 SHA512 ae3ed334fdc86a5adffb09a39968bd9defdcb4ca89e07609870290b97669c1f565fb5c4716c7d70718e37be508522eb24fef057e3a990140face5801d8fae9f8 WHIRLPOOL 0a0561faa3b981b0be2020b8f2cc9da0404e55bb19c71eca1be949f87079c758d622cb5ece569cd1cff914d6a0e75ae64eb756e663d93bb8953c34f39468bb86 diff --git a/mail-filter/opendkim/files/opendkim-2.9.2-safekeys.patch b/mail-filter/opendkim/files/opendkim-2.9.2-safekeys.patch new file mode 100644 index 00000000..7500441e --- /dev/null +++ b/mail-filter/opendkim/files/opendkim-2.9.2-safekeys.patch @@ -0,0 +1,101 @@ +--- opendkim/opendkim.c.dist ++++ opendkim/opendkim.c +@@ -4613,7 +4613,7 @@ dkimf_checkfsnode(const char *path, uid_ + if (err != NULL) + { + snprintf(err, errlen, +- "%s is not owned by the executing uid (%d)%s", ++ "file \"%s\" is not owned by the executing uid (%d)%s", + path, myuid, + myuid != 0 ? " or the superuser" + : ""); +@@ -4638,7 +4638,7 @@ dkimf_checkfsnode(const char *path, uid_ + if (err != NULL) + { + snprintf(err, errlen, +- "%s is in group %u which has multiple users (e.g. \"%s\")", ++ "file \"%s\" is in group %u which has multiple users (e.g. \"%s\")", + path, s.st_gid, + pw->pw_name); + } +@@ -4664,7 +4664,7 @@ dkimf_checkfsnode(const char *path, uid_ + if (err != NULL) + { + snprintf(err, errlen, +- "%s is in group %u which has multiple users (e.g., \"%s\")", ++ "file \"%s\" is in group %u which has multiple users (e.g., \"%s\")", + path, s.st_gid, + gr->gr_mem[c]); + } +@@ -4682,7 +4682,7 @@ dkimf_checkfsnode(const char *path, uid_ + if (err != NULL) + { + snprintf(err, errlen, +- "%s can be read or written by other users", ++ "file \"%s\" can be read or written by other users", + path); + } + +@@ -4699,18 +4699,24 @@ dkimf_checkfsnode(const char *path, uid_ + if (err != NULL) + { + snprintf(err, errlen, +- "%s can be read or written by other users", ++ "directory \"%s\" can be read or written by other users", + path); + } + return 0; + } + + /* group write needs to be super-user or me only */ +- if ((s.st_mode & S_IWGRP) != 0) ++ ++ /* Gentoo: ++ * Users 'sync', 'shutdown', 'halt', and 'operator' ++ * also share GID 0, so this test will always error by ++ * default. ++ */ ++ if ((s.st_mode & S_IWGRP) != 0 && s.st_gid != 0) + { + int c; + +- /* check if anyone else has this file's gid */ ++ /* check if anyone else has this dir's gid */ + pthread_mutex_lock(&pwdb_lock); + setpwent(); + for (pw = getpwent(); pw != NULL; pw = getpwent()) +@@ -4722,9 +4728,9 @@ dkimf_checkfsnode(const char *path, uid_ + if (err != NULL) + { + snprintf(err, errlen, +- "%s is in group %u which has multiple users (e.g., \"%s\")", +- myname, s.st_gid, +- pw->pw_name); ++ "directory \"%s\" has group %u which is the primary GID of multiple users (including '%s')", ++ path, s.st_gid, ++ pw->pw_name); + } + + pthread_mutex_unlock(&pwdb_lock); +@@ -4748,9 +4754,9 @@ dkimf_checkfsnode(const char *path, uid_ + if (err != NULL) + { + snprintf(err, errlen, +- "%s is in group %u which has multiple users (e.g., \"%s\")", +- myname, s.st_gid, +- gr->gr_mem[c]); ++ "directory \"%s\" has group %u which contains multiple users (including '%s')", ++ path, s.st_gid, ++ gr->gr_mem[c]); + } + + pthread_mutex_unlock(&pwdb_lock); +@@ -4768,7 +4774,7 @@ dkimf_checkfsnode(const char *path, uid_ + if (err != NULL) + { + snprintf(err, errlen, +- "%s is writeable and owned by uid %u which is not the executing uid (%u)%s", ++ "directory \"%s\" is writeable and owned by uid %u which is not the executing uid (%u)%s", + path, s.st_uid, myuid, + myuid != 0 ? " or the superuser" + : ""); diff --git a/mail-filter/opendkim/files/opendkim.init.r3 b/mail-filter/opendkim/files/opendkim.init.r3 new file mode 100644 index 00000000..9a599453 --- /dev/null +++ b/mail-filter/opendkim/files/opendkim.init.r3 @@ -0,0 +1,56 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id: 7f56da5c569aca2c3c701b57eeee29398adef623 $ + +CONFFILE=/etc/opendkim/${SVCNAME}.conf + +depend() { + use dns logger net + before mta +} + +check_cfg() { + + PIDFILE=$(sed -ne 's/^[[:space:]]*PidFile[[:space:]]\+//p' "${CONFFILE}") + local PIDDIR="${PIDFILE%/*}" + if [ ! -d "${PIDDIR}" ] ; then + checkpath -q -d -o milter:milter -m 0755 "${PIDDIR}" || return 1 + fi + if [ ! -f "${CONFFILE}" ] ; then + eerror "Configuration file ${CONFFILE} is missing" + return 1 + fi + if [ -z "${PIDFILE}" ] ; then + eerror "Configuration file needs PidFile setting - recommend adding 'PidFile /var/run/opendkim/${SVCNAME}.pid' to ${CONFFILE}" + return 1 + fi + + if egrep -q '^[[:space:]]*Background[[:space:]]+no' "${CONFFILE}" ; then + eerror "${SVCNAME} service cannot run with Background key set to yes!" + return 1 + fi +} + +start() { + check_cfg || return 1 + + # Remove stalled Unix socket if no other process is using it + local UNIX_SOCKET=$(sed -ne 's/^[[:space:]]*Socket[[:space:]]\+\(unix\|local\)://p' "${CONFFILE}") + + if [ -S "${UNIX_SOCKET}" ] && ! fuser -s "${UNIX_SOCKET}"; then + rm "${UNIX_SOCKET}" + fi + + ebegin "Starting OpenDKIM" + start-stop-daemon --start --pidfile "${PIDFILE}" \ + --exec /usr/sbin/opendkim -- -x "${CONFFILE}" + eend $? +} + +stop() { + check_cfg || return 1 + ebegin "Stopping OpenDKIM" + start-stop-daemon --stop --pidfile "${PIDFILE}" + eend $? +} diff --git a/mail-filter/opendkim/files/opendkim.service b/mail-filter/opendkim/files/opendkim.service new file mode 100644 index 00000000..be534d67 --- /dev/null +++ b/mail-filter/opendkim/files/opendkim.service @@ -0,0 +1,11 @@ +[Unit] +Description=DomainKeys Identified Mail (DKIM) Milter +Documentation=man:opendkim(8) man:opendkim.conf(5) man:opendkim-genkey(8) man:opendkim-genzone(8) man:opendkim-testadsp(8) man:opendkim-testkey http://www.opendkim.org/docs.html +After=network.target nss-lookup.target syslog.target + +[Service] +ExecStart=/usr/sbin/opendkim -f -x /etc/opendkim/opendkim.conf +ExecReload=/bin/kill -USR1 $MAINPID + +[Install] +WantedBy=multi-user.target diff --git a/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild b/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild new file mode 100644 index 00000000..1ee77d57 --- /dev/null +++ b/mail-filter/opendkim/opendkim-2.9.2-r1.ebuild @@ -0,0 +1,199 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id: 6f7cb7dedb4f87d587047d875311b32c39793f52 $ + +EAPI=5 +inherit autotools db-use eutils systemd user + +# for betas +#MY_P=${P/_b/.B} +#S=${WORKDIR}/${PN}-2.8.0 +#SRC_URI="mirror://sourceforge/opendkim/${MY_P}.tar.gz" + +DESCRIPTION="A milter-based application to provide DKIM signing and verification" +HOMEPAGE="http://opendkim.org" +SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz" + +LICENSE="Sendmail-Open-Source BSD" +SLOT="0" +KEYWORDS="amd64 ~arm x86" +IUSE="+berkdb gnutls ldap lmdb lua memcached opendbx poll sasl selinux +ssl static-libs unbound" + +DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail ) + dev-libs/libbsd + ssl? ( >=dev-libs/openssl-0.9.8 ) + berkdb? ( >=sys-libs/db-3.2 ) + opendbx? ( >=dev-db/opendbx-1.4.0 ) + lua? ( dev-lang/lua ) + ldap? ( net-nds/openldap ) + lmdb? ( dev-db/lmdb ) + memcached? ( dev-libs/libmemcached ) + sasl? ( dev-libs/cyrus-sasl ) + unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root ) + !unbound? ( net-libs/ldns ) + gnutls? ( >=net-libs/gnutls-2.11.7 )" + +RDEPEND="${DEPEND} + sys-process/psmisc + selinux? ( sec-policy/selinux-dkim ) +" + +REQUIRED_USE="sasl? ( ldap )" + +pkg_setup() { + enewgroup milter + # mail-milter/spamass-milter creates milter user with this home directory + # For consistency reasons, milter user must be created here with this home directory + # even though this package doesn't need a home directory for this user (#280571) + enewuser milter -1 -1 /var/lib/milter milter +} + +src_prepare() { + sed -i -e 's:/var/db/dkim:/etc/opendkim:g' \ + -e 's:/var/db/opendkim:/var/lib/opendkim:g' \ + -e 's:/etc/mail:/etc/opendkim:g' \ + -e 's:mailnull:milter:g' \ + -e 's:^#[[:space:]]*PidFile.*:PidFile /var/run/opendkim/opendkim.pid:' \ + opendkim/opendkim.conf.sample opendkim/opendkim.conf.simple.in \ + stats/opendkim-reportstats{,.in} || die + + sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \ + || die + + #sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/tmp":' opendkim/tests/*.lua + sed -i -e '/sock.*mt.getcwd/s:mt.getcwd():"/proc/self/cwd":' opendkim/tests/*.lua + + epatch "${FILESDIR}"/"${P}"-safekeys.patch + + eautoreconf +} + +src_configure() { + local myconf + if use berkdb ; then + myconf=$(db_includedir) + myconf="--with-db-incdir=${myconf#-I}" + myconf+=" --enable-popauth" + myconf+=" --enable-query_cache" + myconf+=" --enable-stats" + fi + if use unbound; then + myconf+=" --with-unbound" + else + myconf+=" --with-ldns" + fi + if use ldap; then + myconf+=" $(use_with sasl)" + fi + econf \ + $(use_with berkdb db) \ + $(use_with opendbx odbx) \ + $(use_with lua) \ + $(use_enable lua rbl) \ + $(use_with ldap openldap) \ + $(use_with lmdb) \ + $(use_enable poll) \ + $(use_enable static-libs static) \ + $(use_with gnutls) \ + $(use_with memcached libmemcached) \ + ${myconf} \ + --docdir=/usr/share/doc/${PF} \ + --htmldir=/usr/share/doc/${PF}/html \ + --enable-filter \ + --enable-adsp_lists \ + --enable-atps \ + --enable-identity_header \ + --enable-rate_limit \ + --enable-resign \ + --enable-replace_rules \ + --enable-default_sender \ + --enable-sender_macro \ + --enable-vbr \ + --disable-live-testing + #--disable-rpath \ + #--with-test-socket=/tmp/opendkim-$(echo ${RANDOM})-S +} + +src_install() { + emake DESTDIR="${D}" install + + dosbin stats/opendkim-reportstats + + newinitd "${FILESDIR}/opendkim.init.r3" opendkim + systemd_dounit "${FILESDIR}/opendkim.service" + + dodir /etc/opendkim /var/lib/opendkim + fowners milter:milter /var/lib/opendkim + + # default configuration + if [ ! -f "${ROOT}"/etc/opendkim/opendkim.conf ]; then + grep ^[^#] "${S}"/opendkim/opendkim.conf.simple \ + > "${D}"/etc/opendkim/opendkim.conf + if use unbound; then + echo TrustAnchorFile /etc/dnssec/root-anchors.txt >> "${D}"/etc/opendkim/opendkim.conf + fi + echo UserID milter >> "${D}"/etc/opendkim/opendkim.conf + if use berkdb; then + echo Statistics /var/lib/opendkim/stats.dat >> \ + "${D}"/etc/opendkim/opendkim.conf + fi + fi + + use static-libs || find "${D}" -name "*.la" -delete +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSION} ]]; then + elog "If you want to sign your mail messages and need some help" + elog "please run:" + elog " emerge --config ${CATEGORY}/${PN}" + elog "It will help you create your key and give you hints on how" + elog "to configure your DNS and MTA." + + ewarn "Make sure your MTA has r/w access to the socket file." + ewarn "This can be done either by setting UMask to 002 and adding MTA's user" + ewarn "to milter group or you can simply set UMask to 000." + fi +} + +pkg_config() { + local selector keysize pubkey + + read -p "Enter the selector name (default ${HOSTNAME}): " selector + [[ -n "${selector}" ]] || selector=${HOSTNAME} + if [[ -z "${selector}" ]]; then + eerror "Oddly enough, you don't have a HOSTNAME." + return 1 + fi + if [[ -f "${ROOT}"etc/opendkim/${selector}.private ]]; then + ewarn "The private key for this selector already exists." + else + keysize=1024 + # generate the private and public keys + opendkim-genkey -b ${keysize} -D "${ROOT}"etc/opendkim/ \ + -s ${selector} -d '(your domain)' && \ + chown milter:milter \ + "${ROOT}"etc/opendkim/"${selector}".private || \ + { eerror "Failed to create private and public keys." ; return 1; } + chmod go-r "${ROOT}"etc/opendkim/"${selector}".private + fi + + # opendkim selector configuration + echo + einfo "Make sure you have the following settings in your /etc/opendkim/opendkim.conf:" + einfo " Keyfile /etc/opendkim/${selector}.private" + einfo " Selector ${selector}" + + # MTA configuration + echo + einfo "If you are using Postfix, add following lines to your main.cf:" + einfo " smtpd_milters = unix:/var/run/opendkim/opendkim.sock" + einfo " non_smtpd_milters = unix:/var/run/opendkim/opendkim.sock" + einfo " and read http://www.postfix.org/MILTER_README.html" + + # DNS configuration + einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:" + cat "${ROOT}"etc/opendkim/${selector}.txt + einfo "t=y signifies you only test the DKIM on your domain. See following page for the complete list of tags:" + einfo " http://www.dkim.org/specs/rfc4871-dkimbase.html#key-text" +} |