summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2012-10-24 11:59:54 +0000
committerEray Aslan <eras@gentoo.org>2012-10-24 11:59:54 +0000
commit849d2d398327a2738a632d793928608b8d951b0d (patch)
tree3822f1d70db785ffdd76b96b893253004203c86f /mail-filter/opendkim
parentStable for amd64, wrt bug #439258 (diff)
downloadhistorical-849d2d398327a2738a632d793928608b8d951b0d.tar.gz
historical-849d2d398327a2738a632d793928608b8d951b0d.tar.bz2
historical-849d2d398327a2738a632d793928608b8d951b0d.zip
Fix sys-process/psmisc dependency correctly
Package-Manager: portage-2.2.0_alpha141/cvs/Linux x86_64 Manifest-Sign-Key: 0x77F1F175586A3B1F
Diffstat (limited to 'mail-filter/opendkim')
-rw-r--r--mail-filter/opendkim/ChangeLog6
-rw-r--r--mail-filter/opendkim/Manifest31
-rw-r--r--mail-filter/opendkim/opendkim-2.6.7-r1.ebuild5
-rw-r--r--mail-filter/opendkim/opendkim-2.6.7-r2.ebuild204
4 files changed, 23 insertions, 223 deletions
diff --git a/mail-filter/opendkim/ChangeLog b/mail-filter/opendkim/ChangeLog
index b3b8ba26f521..60cba98a3f99 100644
--- a/mail-filter/opendkim/ChangeLog
+++ b/mail-filter/opendkim/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for mail-filter/opendkim
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.45 2012/10/24 11:02:23 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/ChangeLog,v 1.46 2012/10/24 11:59:45 eras Exp $
+
+ 24 Oct 2012; Eray Aslan <eras@gentoo.org> -opendkim-2.6.7-r2.ebuild,
+ opendkim-2.6.7-r1.ebuild:
+ Fix sys-process/psmisc dependency correctly
*opendkim-2.6.7-r2 (24 Oct 2012)
diff --git a/mail-filter/opendkim/Manifest b/mail-filter/opendkim/Manifest
index 4ea89dfdf8a3..aafa097aca68 100644
--- a/mail-filter/opendkim/Manifest
+++ b/mail-filter/opendkim/Manifest
@@ -12,25 +12,24 @@ EBUILD opendkim-2.4.3.ebuild 6386 SHA256 5a997081adfa28ba728b2b1a9afc1b548094eef
EBUILD opendkim-2.5.2-r1.ebuild 6381 SHA256 fb66509fcc160db3cb5add3386e5d0ff40ed21e3d28d1405f330575c34f36a72 SHA512 6275ecedda76b28ab20de3ab9ec010f4529a9b0545a62c5298aa8c1f4759583c51a6ee64f8a624fd3aca8395a274ac153ec682d2c2ab6519427c401d4ece34ba WHIRLPOOL cd3ed8b5e46bb1e2073d9918cfbda16bdf92f98615607e9bcc80335b60bfd6dead5e3e7c4ec1473446d900b9845db6989e4c2c420427fa1c5741121b257cd594
EBUILD opendkim-2.6.3.ebuild 6332 SHA256 ec74fb29947fed50cf835bf848d184f6f902ef81741c00891ed598338523b837 SHA512 278a57502a8343948bd4a118fbe8092ab8cf703b7b28f0989105d2125273c3e1747301ace318de54e96a9ce1026085c7945fc760bde3f631e141bbf7a698faf6 WHIRLPOOL 6f9156e644207a540340e51fa72235eb20c5603b070c946c2d785393fe46aaffc1bb1498278a8f01fd5c6cebc2ae8fe9f9f2afcba862c3a6ce4dc879a0c373c7
EBUILD opendkim-2.6.4.ebuild 6332 SHA256 6a789a58b78532698c1ac6351e9bd0404e000049a19ca330225dcd3aa79a5732 SHA512 7adb77946102c310aeb48f3a592b57ae165ee36c4793e3f0757e230160cba17569548bc39601ddc4273e8a86ae1919ae2f22230e105770f075ce33f7eee2d299 WHIRLPOOL ece4f43bc716d8768da704c19b293e8530a74111af9641ade1e6c1202b711ec76711a8b57396a60a0885203b312a7331d8f8ef8b623cf8285cc1c8e297068c2f
-EBUILD opendkim-2.6.7-r1.ebuild 6363 SHA256 5b96304b2804c0b9f25d7978e79da81e156e1155c6c7bdb7fdb1b23c7db87dbb SHA512 d21c7634904227478b21d2e5864f62f340a074370c3cf4fb9932aead44bb455d1e32400fcc11f231512298b0b3da8b2fe28886f70f8991702d456315fa177181 WHIRLPOOL 577210b217425b9542d838d358a8707d9a053e3dd3a366340d0544ab2ef3819c53d04c617efc113ba3ae675da27cba61dcbaede41b1a84f1645d0a75d61ca05b
-EBUILD opendkim-2.6.7-r2.ebuild 6383 SHA256 0f43426ed954cf61c3ee5da3bc54bff97904afb659c7340584814a27def493af SHA512 0a01126a0a92defa1d740e56b5c84decdcfba76f6f964e03e35a150fb759d592af90bd9db7aa537ffe269ff0fa0090754bdbce8f9ca7f63133b4bb206426b176 WHIRLPOOL 604db2a8da84f83bbc19b83ccf131a10499a8c82c0965ed40cb9b1cd7699ebbe18ed9a5b382e2dfc72fe227946ae47583028d8868ae8ab714b0e71ccdbf1e4ee
+EBUILD opendkim-2.6.7-r1.ebuild 6383 SHA256 8dca87b3071166b37027f8461275722a4e513882fb58f89398d42f66a13280a1 SHA512 5b0f05e5f0d9f52ff3bdc76e3003c4b4bafead8abf0d1cf5ccb6606eafe5f28be920f5248ac326baeb92e86d86f4012081a94bb1b0031b6af1cd0a2b18d352e2 WHIRLPOOL fc7a30ff591e428df687794fef89ebd88b82d454cdeb1d0af4f7ce81add70ae2afe2e61e81bb557bdebde1796b68dbdcb5bf451605d2a7437009fe8603cab863
EBUILD opendkim-2.6.7.ebuild 6332 SHA256 67455b4fca44a560cf226ef3a2814967e14cc210d2d15a378b48e842bf6172e0 SHA512 6134a4837b4b963425dc93403680e2022555fc158aac368b3de3753a367b299774b08c78ec373194d7fa86d5de5bde1c6d294f3735fc784df63038310a96b3dc WHIRLPOOL faa605f7bed9d139c78fed158c6e246a7450c9c7eba07d93929cabe4009ac6334adc42d4c6d93e7abc1c6300a04f037569416849543df5c2d0a4b656e5f49cfd
-MISC ChangeLog 8231 SHA256 b2cc8373a532b1ed4f318ca420ff7e4b32e10cd94694b9157003e57d56197226 SHA512 4fa8fdc7cc8581de28babba54e378d858f759ba11991d466ab76a49e47b1171c64e6f1a51a61dca80139238c40bfa1bc7c9e2280836aa76a61c4cd79f69dff5c WHIRLPOOL 008a0df493a59c5d130da738697e2c2aaa81b6e6e597f5b5d56f5d7a99e8bc77dc727d57ef30596ffce511a54da4cff8509254fea53149c00224354293cedce5
+MISC ChangeLog 8377 SHA256 036cd885a2594d610ae93b66fa58cae29a78cc18eab41bb06f7e941f4a04317b SHA512 acd95cc6d1448735c1856087e010004a97f28d3011ed13173c6d10f90c5f28e2698b4fd8fb233e20074dd44bf1a11546a93e6f6d87782f14f33836ef349d4f12 WHIRLPOOL 6739e977067b02d3376fc70c9f624dd33867183cee7a958ed5d7cd15103bdee260e0bef595f336af74433441cd45abbe54b5089b3cab08a652d4ef6220a69fc1
MISC metadata.xml 1325 SHA256 5c79e487583ffa41f2823235e61232f84c1ac18ef41b1b71150f8d32f76b82eb SHA512 ae25f27a0c0cc5c3460b150f3eb6369e34b3051984b58da6a81847b5e90edc62e91fdd8f0d428576ef73614db095dc3a415237cccc1cc3cc806f9d99ff588df5 WHIRLPOOL d8b1221d484e12c31d76a20e8a7e6e0d033e16884e7dd14f657d4383f24f8f9294bc51dea4f512896a4183f9299c2faef31e7540d95c418000245090a3a0cdfe
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQIcBAEBCAAGBQJQh8rJAAoJEHfx8XVYajsfUHEP/2WRpL4ondQJ2Ifp7ceU9FUb
-/vsuGZ0CnJY+owPpYKBKfSfXKMrrYLYgyFl5oWmPcRjJAWOz53J+47bsSW3ywzb4
-UvHT0wM93O4oaQcS5fiRXdjuM9xphy4qYWLhW2IjG29DLev5oBjxssKfTTJRe12d
-GGYrdxzYeQhFzaij0KQbn3zc/PXIuYpf5Fq1h5E5nemZBoG+n/gprqd1VsUoMXgB
-H0GjC5gX9ceoKT79OwaAzoVi/0vgygRwovN2IA+rPUiAsNX0OHIgMVyq8J/hjml6
-QAge4yphlmQpFKjvLyEMB4x1b3QzagaZ8+6r8lbEgE3j0S2Mn6bLnFvhNaXEpSgw
-pir2M6wSrno+3yns9+w+1llPNOOq9KoE/urwkYBGBrId+AAFrLpKEUIo/0L6KGhk
-vrpeutmyNyK3Izz33JoggyBf7lwHq/Swb2U1Y125QqEMECDWoLH67qFjZ2U49OvF
-l48HKME8Kq4EhOiPwJxCOM82FAK+q5+kM9/f8DI3TUhBKdeWxX4C9BHcTKg6XFVL
-w7YOIrHzW7T69dXPZwqjiaPflL9yL62uJsg9nxUTKIKFJ64jz+GGvdjHv5l0thZ9
-ThAtlxyDI2rEJsL2S8xQsUZQCn+DZbgqLjpCHqImhPD/coMkDZTyU71Z0U28u7o6
-lhDWunOFYM30fAMKrEEB
-=t2VH
+iQIcBAEBCAAGBQJQh9g5AAoJEHfx8XVYajsf4lAP/1nKlgjTZzvfFN3sg4LI5Xq3
+YmdNe/Qo1xLAtirC//EqrZuzkNdCHAjH0nl4wtDt8BWscyzh95BOxkhCEQ6/0aOi
+4yaXTuvEc8eIwqBUlcOyA7H2tpEu3Bybr5+bYrafLxdx5XI4IkIZIjPBuyEdHf5Y
+82CU3xw7spptdAoHJhhdeeBM+nMYfUjBUF3zH1vP5oxalL20UZ/KDU22NUs1Uo28
+1qHfhl41QH/SWRLE64Vrm7z0atH60CDepG4IrECB6Lu0rhPTgVKM7AyRzWQqfnrs
+PrY1mU7x57E2r0NVhChIAbRkIPjxksK+X3jyAbin7pCwKwZJu+8TqUkQHCp74S4p
+nt6HX3d2A5oguChTL5p1qPq0FVDhlyP7LnmzRh+5mBfyaDCTUeq7Jsjj/qnw42Re
+5tvS1ryF0l/7+peXXUaM85m8VxvfDzALZwV+LSxInYzpWhr9NfJ+xQBC5xlGIynN
+4G3yCP7daH8BpBTsMBmRKiCFzie52N4GfB+sb1FBRzxBQAfkq12+ySgO+pxp4C4Z
+G3/v/Zt8KdjQ+AnEDmDHAvTOS7yCsfR9CfB+a9sFvu+2kZjG7fMA13W7DDuESVG+
+iGB1uiBIuCHLwqRRhUCb+3NNmhedSoXRy6K0xnJYXFqn16WVrFnFPa6a7TMrMoTM
+SnkcSkpQbUXReo+vuaiX
+=Fpoq
-----END PGP SIGNATURE-----
diff --git a/mail-filter/opendkim/opendkim-2.6.7-r1.ebuild b/mail-filter/opendkim/opendkim-2.6.7-r1.ebuild
index edaa189f9e50..8321b614c970 100644
--- a/mail-filter/opendkim/opendkim-2.6.7-r1.ebuild
+++ b/mail-filter/opendkim/opendkim-2.6.7-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.6.7-r1.ebuild,v 1.1 2012/07/31 14:59:15 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.6.7-r1.ebuild,v 1.2 2012/10/24 11:59:45 eras Exp $
EAPI=4
inherit eutils db-use autotools user
@@ -32,7 +32,8 @@ DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
#diffheaders? ( dev-libs/tre )
#gnutls? ( >=net-libs/gnutls-2.11.7 )
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+ sys-process/psmisc"
REQUIRED_USE="sasl? ( ldap )"
#lua? ( berkdb )"
diff --git a/mail-filter/opendkim/opendkim-2.6.7-r2.ebuild b/mail-filter/opendkim/opendkim-2.6.7-r2.ebuild
deleted file mode 100644
index fd359449cd25..000000000000
--- a/mail-filter/opendkim/opendkim-2.6.7-r2.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.6.7-r2.ebuild,v 1.1 2012/10/24 11:02:23 eras Exp $
-
-EAPI=4
-inherit eutils db-use autotools user
-
-# for betas
-#MY_P=${P/_b/.B}
-#S=${WORKDIR}/${PN}-2.0.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 ~x86"
-IUSE="asyncdns +berkdb ldap lua opendbx poll sasl +ssl static-libs unbound"
-
-# FUTURE: diffheaders (libtre error) - bug #296813
-
-DEPEND="|| ( mail-filter/libmilter mail-mta/sendmail )
- 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 )
- sasl? ( dev-libs/cyrus-sasl )
- unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root )"
- #diffheaders? ( dev-libs/tre )
- #gnutls? ( >=net-libs/gnutls-2.11.7 )
-
-RDEPEND="${DEPEND}
- sys-process/psmisc"
-
-REQUIRED_USE="sasl? ( ldap )"
- #lua? ( berkdb )"
-
-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 || die
-
- sed -i -e 's:dist_doc_DATA:dist_html_DATA:' libopendkim/docs/Makefile.am \
- || die
-
- 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 asyncdns ; then
- if use unbound; then
- myconf+=" --with-unbound"
- else
- myconf+=" --enable-arlib"
- fi
- else
- myconf+=" $(use_with unbound) --disable-arlib"
- 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_enable poll) \
- $(use_enable static-libs static) \
- ${myconf} \
- --docdir=/usr/share/doc/${PF} \
- --htmldir=/usr/share/doc/${PF}/html \
- --enable-filter \
- --enable-oversign \
- --enable-adsp_lists \
- --enable-dkim_reputation \
- --enable-identity_header \
- --enable-rate_limit \
- --enable-redirect \
- --enable-resign \
- --enable-replace_rules \
- --enable-default_sender \
- --enable-sender_macro \
- --enable-vbr \
- --disable-rpath \
- --disable-live-testing
- #$(use_enable diffheaders)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- # file collision
- rm -f "${D}"/usr/share/man/man3/ar.3
-
- dosbin stats/opendkim-reportstats
- newinitd "${FILESDIR}/opendkim.init.r2" opendkim
- 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 TrustedAnchorFile /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() {
- 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."
-}
-
-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
- 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
- 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"
- einfo
- einfo "Also look at the ADSP http://tools.ietf.org/html/rfc5617"
-}