diff options
author | Alin Năstac <mrness@gentoo.org> | 2009-07-19 07:26:16 +0000 |
---|---|---|
committer | Alin Năstac <mrness@gentoo.org> | 2009-07-19 07:26:16 +0000 |
commit | fec2678ea54f387e15be747d8fc9d7acb2ebdda0 (patch) | |
tree | 1aeff9b39ec3b4b5b39ba632c96047878505758d /mail-filter/dkim-milter | |
parent | Version bumped. (diff) | |
download | gentoo-2-fec2678ea54f387e15be747d8fc9d7acb2ebdda0.tar.gz gentoo-2-fec2678ea54f387e15be747d8fc9d7acb2ebdda0.tar.bz2 gentoo-2-fec2678ea54f387e15be747d8fc9d7acb2ebdda0.zip |
Version bump.
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'mail-filter/dkim-milter')
-rw-r--r-- | mail-filter/dkim-milter/ChangeLog | 9 | ||||
-rw-r--r-- | mail-filter/dkim-milter/dkim-milter-2.8.3.ebuild | 153 | ||||
-rw-r--r-- | mail-filter/dkim-milter/files/dkim-milter-2.8.3-gentoo.patch | 172 | ||||
-rw-r--r-- | mail-filter/dkim-milter/files/dkim-milter-build-system.patch | 117 |
4 files changed, 450 insertions, 1 deletions
diff --git a/mail-filter/dkim-milter/ChangeLog b/mail-filter/dkim-milter/ChangeLog index 9f930e065a74..ccf87d0a399e 100644 --- a/mail-filter/dkim-milter/ChangeLog +++ b/mail-filter/dkim-milter/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for mail-filter/dkim-milter # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/ChangeLog,v 1.30 2009/05/09 12:16:28 mrness Exp $ +# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/ChangeLog,v 1.31 2009/07/19 07:26:16 mrness Exp $ + +*dkim-milter-2.8.3 (19 Jul 2009) + + 19 Jul 2009; Alin Năstac <mrness@gentoo.org> + +files/dkim-milter-2.8.3-gentoo.patch, + +files/dkim-milter-build-system.patch, +dkim-milter-2.8.3.ebuild: + Version bump. 09 May 2009; Alin Năstac <mrness@gentoo.org> -files/dkim-milter-2.8.0-gentoo.patch, -dkim-milter-2.8.1.ebuild, diff --git a/mail-filter/dkim-milter/dkim-milter-2.8.3.ebuild b/mail-filter/dkim-milter/dkim-milter-2.8.3.ebuild new file mode 100644 index 000000000000..ab9534b1027c --- /dev/null +++ b/mail-filter/dkim-milter/dkim-milter-2.8.3.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/mail-filter/dkim-milter/dkim-milter-2.8.3.ebuild,v 1.1 2009/07/19 07:26:16 mrness Exp $ + +EAPI="2" + +inherit eutils toolchain-funcs + +DESCRIPTION="A milter-based application to provide DomainKeys Identified Mail (DKIM) service" +HOMEPAGE="http://sourceforge.net/projects/dkim-milter/" +SRC_URI="mirror://sourceforge/dkim-milter/${P}.tar.gz" + +LICENSE="Sendmail-Open-Source" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="ipv6 diffheaders" + +RDEPEND="dev-libs/openssl + >=sys-libs/db-3.2 + diffheaders? ( dev-libs/tre )" +DEPEND="${RDEPEND} + || ( mail-filter/libmilter mail-mta/sendmail )" # libmilter is a static library + +pkg_setup() { + enewgroup milter + enewuser milter -1 -1 -1 milter +} + +src_prepare() { + epatch "${FILESDIR}"/${PN}-build-system.patch + + cp site.config.m4.dist devtools/Site/site.config.m4 || \ + die "failed to copy site.config.m4" + epatch "${FILESDIR}"/${P}-gentoo.patch + + local ENVDEF="" + use ipv6 && ENVDEF="${ENVDEF} -DNETINET6" + sed -i -e "s:@@CFLAGS@@:${CFLAGS}:" \ + -e "s:@@ENVDEF@@:${ENVDEF}:" \ + -e "s:@@LIBDIR@@:/usr/$(get_libdir):" \ + devtools/Site/site.config.m4 + + if use diffheaders ; then + epatch "${FILESDIR}/${PN}-diffheaders.patch" + + sed -i -e 's/^dnl \(APPENDDEF.*-D_FFR_DIFFHEADERS.*\)/\1/' \ + devtools/Site/site.config.m4 + fi +} + +src_compile() { + emake -j1 CC="$(tc-getCC)" || die "emake failed" +} + +src_test() { + emake -j1 CC="$(tc-getCC)" OPTIONS=check \ + || die "emake check failed" +} + +src_install() { + # no other program need to read from here + dodir /etc/mail/dkim-filter + fowners milter:milter /etc/mail/dkim-filter + fperms 700 /etc/mail/dkim-filter + + insinto /etc/mail/dkim-filter + newins dkim-filter/dkim-filter.conf.sample dkim-filter.conf + + newinitd "${FILESDIR}/dkim-filter.init" dkim-filter \ + || die "newinitd failed" + sed -i -e s:bin/dkim-filter:sbin/dkim-filter: "${D}/etc/init.d/dkim-filter" \ + || die 'failed to correct dkim-filter path' + + # prepare directory for .pid, .sock and .stats files + dodir /var/run/dkim-filter + fowners milter:milter /var/run/dkim-filter + + dodir /usr/bin /usr/sbin + emake -j1 DESTDIR="${D}" \ + SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \ + install || die "make install failed" + + # man build is broken; do man page installation by hand + doman */*.{3,5,8} || die "failed to install man pages" + + # some people like docs + dodoc README RELEASE_NOTES *.txt && + dohtml -r libdkim/docs/* || + die "failed to install docs" +} + +pkg_postinst() { + elog "If you want to sign your mail messages, you will have to 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." +} + +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/mail/dkim-filter/${selector}.private ]]; then + ewarn "The private key for this selector already exists." + else + einfo "Select the size of private key:" + einfo " [1] 512 bits" + einfo " [2] 1024 bits" + while read -n 1 -s -p " Press 1 or 2 on the keyboard to select the key size " keysize ; do + [[ "${keysize}" == "1" || "${keysize}" == "2" ]] && echo && break + done + case ${keysize} in + 1) keysize=512 ;; + *) keysize=1024 ;; + esac + + # generate the private and public keys + dkim-genkey -b ${keysize} -D "${ROOT}"etc/mail/dkim-filter/ \ + -s ${selector} && \ + chown milter:milter \ + "${ROOT}"etc/mail/dkim-filter/"${selector}".private || \ + { eerror "Failed to create private and public keys." ; return 1; } + fi + + # dkim-filter selector configuration + echo + einfo "Make sure you have the following settings in your dkim-filter.conf:" + einfo " Keyfile /etc/mail/dkim-filter/${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/dkim-filter/dkim-filter.sock" + einfo " non_smtpd_milters = unix:/var/run/dkim-filter/dkim-filter.sock" + + # DNS configuration + einfo "After you configured your MTA, publish your key by adding this TXT record to your domain:" + cat "${ROOT}"etc/mail/dkim-filter/${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" + einfo + einfo "Also look at the draft ASP http://www.dkim.org/specs/draft-ietf-dkim-ssp-03.html" +} diff --git a/mail-filter/dkim-milter/files/dkim-milter-2.8.3-gentoo.patch b/mail-filter/dkim-milter/files/dkim-milter-2.8.3-gentoo.patch new file mode 100644 index 000000000000..aee1e10c0c05 --- /dev/null +++ b/mail-filter/dkim-milter/files/dkim-milter-2.8.3-gentoo.patch @@ -0,0 +1,172 @@ +diff -Nru dkim-milter-2.8.3.orig/devtools/Site/site.config.m4 dkim-milter-2.8.3/devtools/Site/site.config.m4 +--- dkim-milter-2.8.3.orig/devtools/Site/site.config.m4 2009-07-19 09:56:41.000000000 +0300 ++++ dkim-milter-2.8.3/devtools/Site/site.config.m4 2009-07-19 09:57:00.000000000 +0300 +@@ -11,7 +11,13 @@ + dnl If you are encountering coredumps and want to be able to analyze them + dnl using something like "gdb", enable this next line by deleting the "dnl" + dnl at the front of it. +-dnl define(`confOPTIMIZE', `-g') ++define(`confOPTIMIZE', `@@CFLAGS@@') ++define(`confENVDEF', `@@ENVDEF@@') ++define(`confMKDIR', `mkdir') ++define(`confLIBDIR', `@@LIBDIR@@') ++define(`confSHAREDLIBDIR', `@@LIBDIR@@') ++dnl man build is broken ++define(`confNO_MAN_BUILD',`') + + dnl Shared library for libdkim + dnl +@@ -26,7 +32,7 @@ + dnl the package, enable this next line by deleting the "dnl" at the front + dnl of it. This is done automatically if you've requested the shared + dnl library. +-dnl define(`bld_LIBDKIM_INSTALL', `true') ++define(`bld_LIBDKIM_INSTALL', `true') + + dnl Use native strlcat()/strlcpy() functions + dnl +@@ -53,7 +59,7 @@ + dnl + dnl If you want to use the provided asynchronous resolver library, enable this + dnl next line by deleting the "dnl" at the front of it. +-dnl define(`bld_USE_ARLIB', `true') ++define(`bld_USE_ARLIB', `true') + dnl + dnl libar normally uses res_init() or res_ninit() to load the contents + dnl of resolv.conf for its use. If neither of these work on your system +@@ -94,7 +100,7 @@ + dnl it has seen, rather than relying on the DNS server to provide caching, + dnl enable this next line by deleting the "dnl" at the front of it. Also + dnl see the section below called "BerkeleyDB". +-dnl APPENDDEF(`confENVDEF', `-DQUERY_CACHE ') ++APPENDDEF(`confENVDEF', `-DQUERY_CACHE ') + + dnl BerkeleyDB -- Berkeley DB ("Sleepycat") database + dnl +@@ -107,7 +113,7 @@ + dnl by deleting "dnl" from the front of them: + dnl APPENDDEF(`confINCDIRS', `-I/usr/local/BerkeleyDB/include ') + dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/BerkeleyDB/lib ') +-dnl APPENDDEF(`confLIBS', `-ldb ') ++APPENDDEF(`confLIBS', `-ldb ') + + dnl OpenSSL -- cryptography library + dnl +@@ -146,7 +152,7 @@ + dnl APPENDDEF(`confENVDEF', `-D_FFR_REPORT_INTERVALS ') + dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_CANONICALIZATION ') + dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECTOR_HEADER ') +-dnl APPENDDEF(`confENVDEF', `-D_FFR_STATS ') ++APPENDDEF(`confENVDEF', `-D_FFR_STATS ') + dnl APPENDDEF(`confENVDEF', `-D_FFR_VBR ') + dnl APPENDDEF(`confENVDEF', `-D_FFR_ZTAGS ') + +diff -Nru dkim-milter-2.8.3.orig/dkim-filter/dkim-filter.conf.sample dkim-milter-2.8.3/dkim-filter/dkim-filter.conf.sample +--- dkim-milter-2.8.3.orig/dkim-filter/dkim-filter.conf.sample 2008-12-27 07:21:56.000000000 +0200 ++++ dkim-milter-2.8.3/dkim-filter/dkim-filter.conf.sample 2009-07-19 09:57:00.000000000 +0300 +@@ -90,13 +90,6 @@ + + # AutoRestartRate n/tu + +-## Background { yes | no } +-## default "yes" +-## +-## Indicate whether or not the filter should run in the background. +- +-# Background Yes +- + ## BaseDirectory path + ## default (none) + ## +@@ -193,7 +186,7 @@ + ## hosts from which mail should be signed rather than verified. + ## Automatically contains 127.0.0.1. See man page for file format. + +-# InternalHosts filename ++# InternalHosts /etc/mail/dkim-filter/internalhosts + + ## KeepTemporaryFiles { yes | no } + ## default "no" +@@ -209,7 +202,7 @@ + ## Specifies the path to the private key to use when signing. Ignored if + ## Keylist is set. No default; must be specified for signing. + +-KeyFile /var/db/dkim/example.private ++KeyFile /etc/mail/dkim-filter/my-selector-name.private + + ## KeyList filename + ## +@@ -226,7 +219,7 @@ + ## as the beginning of a comment. See dkim-filter.conf(5) for more + ## information. + +-# KeyList /var/db/dkim/keylist ++# KeyList /etc/mail/dkim-filter/keylist + + ## LocalADSP filename + ## +@@ -350,24 +343,6 @@ + ## page for file format. + + # PeerList filename +- +-## PidFile filename +-## +-## Name of the file where the filter should write its pid before beginning +-## normal operations. +- +-# PidFile filename +- +-## POPDBFile filename +-## +-## Names a database which should be checked for "POP before SMTP" records +-## as a form of authentication of users who may be sending mail through +-## the MTA for signing. Requires special compilation of the filter. +-## See dkim-filter.conf(5) for more information. +- +-# POPDBFile filename +- +-## Quarantine { yes | no } + ## default "no" + ## + ## Indicates whether or not the filter should arrange to quarantine mail +@@ -486,7 +461,7 @@ + ## inet:port to listen on all interfaces + ## local:/path/to/socket to listen on a UNIX domain socket + +-Socket inet:port@localhost ++Socket local:/var/run/dkim-filter/dkim-filter.sock + + ## StrictTestMode { yes | no } + ## default "no" +@@ -553,7 +528,7 @@ + ## The system has its own default which will be used (usually 022). + ## See the umask(2) man page for more information. + +-# UMask 022 ++UMask 002 + + ## Userid userid + ## default (none) +@@ -561,7 +536,7 @@ + ## Change to user "userid" before starting normal operation? May include + ## a group ID as well, separated from the userid by a colon. + +-# UserID userid ++UserID milter + + ## X-Header { yes | no } + ## default "no" +@@ -570,3 +545,12 @@ + ## messages it has processed. + + # X-Header No ++# ++ ++## Statistics filename ++## ++## Names a file to which useful statistics will be saved. ++## See man dkim-stats page ++ ++Statistics /var/run/dkim-filter/dkim-filter.stats ++ diff --git a/mail-filter/dkim-milter/files/dkim-milter-build-system.patch b/mail-filter/dkim-milter/files/dkim-milter-build-system.patch new file mode 100644 index 000000000000..12d594c360ff --- /dev/null +++ b/mail-filter/dkim-milter/files/dkim-milter-build-system.patch @@ -0,0 +1,117 @@ +diff -Nru dkim-milter-2.8.3.orig/devtools/M4/UNIX/defines.m4 dkim-milter-2.8.3/devtools/M4/UNIX/defines.m4 +--- dkim-milter-2.8.3.orig/devtools/M4/UNIX/defines.m4 2006-10-06 08:44:44.000000000 +0300 ++++ dkim-milter-2.8.3/devtools/M4/UNIX/defines.m4 2009-07-19 09:52:08.000000000 +0300 +@@ -26,7 +26,7 @@ + CCLINK = ifdef(`confCCLINK', `confCCLINK', `confCC') + # Linker for libraries + LD= ifdef(`confLD', `confLD', `confCC') +-LDOPTS= ifdef(`confLDOPTS', `confLDOPTS') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `') ++LDOPTS= ifdef(`confLDOPTS', `confLDOPTS') + LDOPTS_SO= ${LDOPTS} ifdef(`confLDOPTS_SO', `confLDOPTS_SO', `-shared') + + # Shell +@@ -71,7 +71,7 @@ + LIBADD= ifdef(`conf_'bldCURRENT_PRD`_LIBS', `conf_'bldCURRENT_PRD`_LIBS') + + # libraries required on your system +-LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') ++LIBS= ${LIBADD} ifdef(`confLIBS', `confLIBS') ifdef(`conf_'bldCURRENT_PRD`_LIB_POST', `conf_'bldCURRENT_PRD`_LIB_POST') ifdef(`confMT', ifdef(`confMTLDOPTS', `confMTLDOPTS', `'), `') + + # location of sendmail binary (usually /usr/sbin or /usr/lib) + BINDIR= ifdef(`confMBINDIR', `confMBINDIR', `/usr/sbin') +diff -Nru dkim-milter-2.8.3.orig/devtools/M4/UNIX/executable.m4 dkim-milter-2.8.3/devtools/M4/UNIX/executable.m4 +--- dkim-milter-2.8.3.orig/devtools/M4/UNIX/executable.m4 2006-10-06 08:44:44.000000000 +0300 ++++ dkim-milter-2.8.3/devtools/M4/UNIX/executable.m4 2009-07-19 09:51:59.000000000 +0300 +@@ -30,12 +30,12 @@ + + ifdef(`bldNO_INSTALL', , + `install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT ifdef(`bldTARGET_INST_DEP', `bldTARGET_INST_DEP') +- ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'BINDIR}; else :; fi ') +- ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${bldINSTALL_DIR`'BINDIR} ++ ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" ]; then confMKDIR -p "${DESTDIR}${bldINSTALL_DIR`'BINDIR}"; else :; fi ') ++ ${INSTALL} -c -o ${bldBIN_TYPE`'BINOWN} -g ${bldBIN_TYPE`'BINGRP} -m ${bldBIN_TYPE`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${bldINSTALL_DIR`'BINDIR}" + ifdef(`bldTARGET_LINKS', `bldMAKE_TARGET_LINKS(${bldINSTALL_DIR`'BINDIR}/bldCURRENT_PRODUCT, ${bldCURRENT_PRODUCT`'TARGET_LINKS})')') + + strip-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT +- ${STRIP} ${STRIPOPTS} ${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT ++ ${STRIP} ${STRIPOPTS} "${DESTDIR}${bldINSTALL_DIR`'BINDIR}`'/bldCURRENT_PRODUCT" + + bldCURRENT_PRODUCT-clean: + rm -f ${OBJS} bldCURRENT_PRODUCT ${MANPAGES} +diff -Nru dkim-milter-2.8.3.orig/devtools/M4/UNIX/library.m4 dkim-milter-2.8.3/devtools/M4/UNIX/library.m4 +--- dkim-milter-2.8.3.orig/devtools/M4/UNIX/library.m4 2006-09-06 01:56:53.000000000 +0300 ++++ dkim-milter-2.8.3/devtools/M4/UNIX/library.m4 2009-07-19 09:51:59.000000000 +0300 +@@ -27,8 +27,8 @@ + ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)') + + install-`'bldCURRENT_PRODUCT: bldCURRENT_PRODUCT.a +-ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${bldINSTALL_DIR`'LIBDIR} ]; then confMKDIR -p ${DESTDIR}${bldINSTALL_DIR`'LIBDIR}; else :; fi ') +- ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a ${DESTDIR}${LIBDIR}') ++ifdef(`bldINSTALLABLE', ` ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${LIBDIR}" ]; then confMKDIR -p "${DESTDIR}${LIBDIR}"; else :; fi ') ++ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} bldCURRENT_PRODUCT.a "${DESTDIR}${LIBDIR}"') + + bldCURRENT_PRODUCT-clean: + rm -f ${OBJS} bldCURRENT_PRODUCT.a ${MANPAGES} +diff -Nru dkim-milter-2.8.3.orig/devtools/M4/UNIX/manpage.m4 dkim-milter-2.8.3/devtools/M4/UNIX/manpage.m4 +--- dkim-milter-2.8.3.orig/devtools/M4/UNIX/manpage.m4 2006-09-08 01:13:07.000000000 +0300 ++++ dkim-milter-2.8.3/devtools/M4/UNIX/manpage.m4 2009-07-19 09:51:59.000000000 +0300 +@@ -68,11 +68,11 @@ + ifdef(`confNO_MAN_INSTALL', `divert(-1)', `dnl') + define(`bldMAN_INSTALL_CMD', + `ifdef(`confDONT_INSTALL_CATMAN', `dnl', +-` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}; else :; fi ') +- ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'') ++` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}"; else :; fi ') ++ ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).`${MAN'bldGET_MAN_SOURCE_NUM($1)`SRC}' "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)}/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''") + ifdef(`confINSTALL_RAWMAN', +-` ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN} ]; then confMKDIR -p ${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}; else :; fi ') +- ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) `${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}'', `dnl')' ++` ifdef(`confMKDIR', `if [ ! -d "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'" ]; then confMKDIR -p "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'"; else :; fi ') ++ ${INSTALL} -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} bldGET_MAN_BASE_NAME($1).bldGET_MAN_SOURCE_NUM($1) "`${DESTDIR}${MAN'bldGET_MAN_SOURCE_NUM($1)`MAN}'/bldGET_MAN_BASE_NAME($1)`.${MAN'bldGET_MAN_SOURCE_NUM($1)`EXT}''", `dnl')' + )dnl + bldFOREACH(`bldMAN_INSTALL_CMD(', `bldMAN_PAGES') + ifdef(`confNO_MAN_INSTALL', `divert(0)', `dnl') +diff -Nru dkim-milter-2.8.3.orig/devtools/M4/UNIX/sharedlib.m4 dkim-milter-2.8.3/devtools/M4/UNIX/sharedlib.m4 +--- dkim-milter-2.8.3.orig/devtools/M4/UNIX/sharedlib.m4 2009-01-22 04:18:32.000000000 +0200 ++++ dkim-milter-2.8.3/devtools/M4/UNIX/sharedlib.m4 2009-07-19 09:51:59.000000000 +0300 +@@ -53,10 +53,10 @@ + ifdef(`bldLINK_SOURCES', `bldMAKE_SOURCE_LINKS(bldLINK_SOURCES)') + + install-`'bldCURRENT_PRODUCT: ${SHAREDLIB} +- ifdef(`confMKDIR', `if [ ! -d ${DESTDIR}${SHAREDLIBDIR} ]; then confMKDIR -p ${DESTDIR}${SHAREDLIBDIR}; else :; fi ') +- ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${SHAREDLIB} ${DESTDIR}${SHAREDLIBDIR} +- ifelse(bldOS, `AIX', `${AR} ${AROPTS} ${DESTDIR}${SHAREDLIBDIR}bldCURRENT_PRODUCT.a ${SHAREDLIB}', `rm -f ${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK} +- ${LN} ${LNOPTS} ${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB} ${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK}') ++ ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${SHAREDLIBDIR}" ]; then confMKDIR -p "${DESTDIR}${SHAREDLIBDIR}"; else :; fi ') ++ ${INSTALL} -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} ${SHAREDLIB} "${DESTDIR}${SHAREDLIBDIR}" ++ ifelse(bldOS, `AIX', `${AR} ${AROPTS} "${DESTDIR}${SHAREDLIBDIR}bldCURRENT_PRODUCT.a ${SHAREDLIB}"', `rm -f "${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK}" ++ ${LN} ${LNOPTS} ${SHAREDLIB} "${DESTDIR}${SHAREDLIBDIR}${SHAREDLIB_LINK}"') + + bldCURRENT_PRODUCT-clean: + rm -f ${OBJS} ${SHAREDLIB} bldCURRENT_PRODUCT.a ${MANPAGES} ifelse(bldOS, `AIX', `shr.o', `bldCURRENT_PRODUCT${SHAREDLIB_EXT}') +diff -Nru dkim-milter-2.8.3.orig/dkim-filter/Makefile.m4 dkim-milter-2.8.3/dkim-filter/Makefile.m4 +--- dkim-milter-2.8.3.orig/dkim-filter/Makefile.m4 2009-02-09 21:53:09.000000000 +0200 ++++ dkim-milter-2.8.3/dkim-filter/Makefile.m4 2009-07-19 09:51:59.000000000 +0300 +@@ -74,7 +74,8 @@ + divert(bldTARGETS_SECTION) + + install-genkey: +- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 555 ${SRCDIR}/dkim-filter/dkim-genkey.sh ${DESTDIR}${UBINDIR}/dkim-genkey ++ ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${UBINDIR}" ]; then confMKDIR -p "${DESTDIR}${UBINDIR}"; else :; fi ') ++ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 555 ${SRCDIR}/dkim-filter/dkim-genkey.sh "${DESTDIR}${UBINDIR}/dkim-genkey" + + divert(0) + bldPRODUCT_END +diff -Nru dkim-milter-2.8.3.orig/libdkim/Makefile.m4 dkim-milter-2.8.3/libdkim/Makefile.m4 +--- dkim-milter-2.8.3.orig/libdkim/Makefile.m4 2009-05-26 20:03:39.000000000 +0300 ++++ dkim-milter-2.8.3/libdkim/Makefile.m4 2009-07-19 09:51:59.000000000 +0300 +@@ -42,7 +42,8 @@ + divert(bldTARGETS_SECTION) + + install-dkim-includes: +- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 555 ${SRCDIR}/libdkim/dkim.h ${DESTDIR}${INCLUDEDIR}/dkim.h ++ ifdef(`confMKDIR', `if [ ! -d "${DESTDIR}${INCLUDEDIR}" ]; then confMKDIR -p "${DESTDIR}${INCLUDEDIR}"; else :; fi ') ++ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 ${SRCDIR}/libdkim/dkim.h "${DESTDIR}${INCLUDEDIR}/dkim.h" + bldPRODUCT_END + + define(`confCHECK_LIBS', `libdkim.a')dnl |