From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 May 2021 20:59:14 +0100 Subject: gentoo resync : 31.05.2021 --- net-mail/courier-imap/Manifest | 10 +- net-mail/courier-imap/courier-imap-4.18.2.ebuild | 1 - net-mail/courier-imap/courier-imap-5.0.14.ebuild | 254 ----------------------- net-mail/courier-imap/courier-imap-5.0.7.ebuild | 252 ---------------------- net-mail/courier-imap/courier-imap-5.1.2.ebuild | 1 - net-mail/courier-imap/courier-imap-5.1.3.ebuild | 1 - 6 files changed, 3 insertions(+), 516 deletions(-) delete mode 100644 net-mail/courier-imap/courier-imap-5.0.14.ebuild delete mode 100644 net-mail/courier-imap/courier-imap-5.0.7.ebuild (limited to 'net-mail/courier-imap') diff --git a/net-mail/courier-imap/Manifest b/net-mail/courier-imap/Manifest index fe1690ba1ae1..28bce82750a9 100644 --- a/net-mail/courier-imap/Manifest +++ b/net-mail/courier-imap/Manifest @@ -21,13 +21,9 @@ AUX courier-imapd-ssl-r1.service 310 BLAKE2B 3894d582ace57379929712aabdfb243b28c AUX mkimapdcert 996 BLAKE2B 76a8bbe16f182a32fc47acc5410c20e545c117cda1af40b94d71f53b4ac668044dc3b5ba415fe3e0f8842a03757d9caf206846dc1c6f6dd589a3adafd0af226e SHA512 502eec64d1db7106ca83a38c18bb48ea9fa9d9a2526076fe45fbf54f7313866d9a4cf3bda7b0a8984af88fb8e8f35a24447071d3bc6882c8f158395d55548bf4 AUX mkpop3dcert 996 BLAKE2B 1016d041092c51afabce0bb6993fbfefd233e5aac7e8079d191168c58336206099e0eb3aafd3e50238d83391478bdede627156718bd613741efc34b1dc978984 SHA512 eab113a442dd6b22b5d4eaa6beb755849e2af61dbb3f0bc3eb93c6e9240058c46e5220971504a18587eb2af8f5c8d8c7c44ce24ad898603319a78c1b11dec078 DIST courier-imap-4.18.2.tar.bz2 3205230 BLAKE2B dd52c55698ac4307a52ef76ed6ca54d4289e00aacff487609cfe01bce351e180561b4bec4904e2701a0c05916bbac2e301409530ccbdcd08474b50be4c1365e3 SHA512 821f0151012f1a357faf705d938d8498a939cc994957398c0d5e2b7a619eabe202549f174e625161545ba6a94b753072458e9f0edc30cbb2443b15405740347e -DIST courier-imap-5.0.14.tar.bz2 3359363 BLAKE2B 23a734494ee3591b33361f209a465a54f893dd5ed30295fbda4d11707664f9750d5dd422449ff4a159a1fa8130d201bb50cde3fd56051293c45fe53d62c8ed41 SHA512 fa6feb9c6dc04a53e569cb0fdbf34cf4bbccd890cb827a4a0948bd221eb41834033cc7cb7b4c03e8b21c5a59545d73b845865a4da464c1b1b546f70805b18c31 -DIST courier-imap-5.0.7.tar.bz2 3296879 BLAKE2B 022522387cc667223c44354f4f3da822ac8abab19222bfc69a9dde4b7460665c97ca565b21705519f3bc0dfbe1d69bbd2ef288329bfa7b8d99e3251a4f9d3e98 SHA512 a0be5cb3e6bc42f4bf45b14132e7d4ad7e822c26aa3b3dd4bfefa7783a047b9c928ad503b462c8e832fddefb356af58b4adfa5ee91481bd024149992157a1aad DIST courier-imap-5.1.2.tar.bz2 3361084 BLAKE2B 0b42ec3a765c1adf425408f72b34beb7626bb9707df5adbc86b61cf60a12c3cbcad808a3173441666925f3ac4e44c137b611d4c8213566e2dc2e8fb8122d37c8 SHA512 697b7c91ea603ae67a3c167238841dcad266c6262965e7753bb2d2efee3a434c405ea55d35393330f7a55c2efc2cefbcca339c8b8f4867513e5157acc42c498d DIST courier-imap-5.1.3.tar.bz2 3361334 BLAKE2B 750a0fdca6882b26a7f9eef062b516a2d9271e6f73b8cd999653fc37947ffcfcbe7bb88c246be0e662f235b04c5a6f7d5dc7e06010075353670ecb1a2ca413ff SHA512 6685fe596eefcdc976f23aa115b3bc3d13e14421b1d430eb59a4bbee419ba86cb190e536871b42cbebba96160a3894cdef86571ae10bd7ee052cb7e7f8552dca -EBUILD courier-imap-4.18.2.ebuild 6787 BLAKE2B d3315cb5d74d86e9096df5823a9f34361a239495551ef52f67749e9fe08a9ddf3437d69da99e804e2a46e44d35e2ec9bd21a8f9881c2c707b146d255565ea1f2 SHA512 428ec41f625200965ef59ddda9b3650dd5f65a41fe1219e33a81c7d2971eb7948b9271fcbc6e45bfecd1442ec59af68195bb39e1e789ae475b8480fa4b2bd5e1 -EBUILD courier-imap-5.0.14.ebuild 7193 BLAKE2B 5b9bd6f0a86e39a1ce3199fd41ada07ccaa7492874ca25a67bddba203c67b7d9d402e5029646758e483d35020724062ffa19e7e93ad1a5c646734b8735cb00c1 SHA512 87b9168db76cb69f9b37336ae5725a277e8799739716fda395f998103b1c9272f65692d0fd76ef8598f6f143e43b435ff13892f6270b735f224ef9cdc7a9fe7e -EBUILD courier-imap-5.0.7.ebuild 7113 BLAKE2B 0406cf720873e5fad5073091d59b55bec309e37d937556371ed701354363f5fd5323e2dee0b426f16950fd4694bb05ad07b9c56d19c2a5af34b641afd6a212f3 SHA512 9690b253dad1f5adcf3372832054e789677b84ec0def9a03058f01f46b3183cc8964ed45898915d38eef35dedef97081ebb74634f1da1ee97d0d4a1c125ffd88 -EBUILD courier-imap-5.1.2.ebuild 7094 BLAKE2B 28c8ba9b49326a76d0917ea08573f69c3751ac59aa9e072e7d2d5ed3958b89499daf57e9eb145f428958dcb2201b428fcb5021eded8d1903a1ddc88462ee4ec5 SHA512 f95d10f9bf203a0ce021d0e28fea8be700d3737973f6871736bfefa2abd4a7776b14b64533a0b9efa3228d64b2c88564b16d14d1042e1d487c4f6958400f66be -EBUILD courier-imap-5.1.3.ebuild 7102 BLAKE2B 9db0df8aae46f6ffbdaee4606090f2cb2f1c0996ef30f7d21df48464522a718bbacc80c8794ca9b073ca1ac822ec7c1becaf5ea13f1e2a5b476e1002204b9216 SHA512 37b4b9bbe641b517f1e0fe35ec37cbecdb65725226b87bd2e1c38ff580d18a68d645de34d54ff5daa7fa92f4e41dfa1f2e2f59a74d2ff29446348c15b6d66453 +EBUILD courier-imap-4.18.2.ebuild 6767 BLAKE2B 95b7230c85b591fdbcfc08669db4f44ec7d4864971b44fb1b219f4fe05655cd63764bdfd1bd4b4d4176cdbe2c421d837c71e7f8f290f525bce2236620c1b4e82 SHA512 c2e75d35972f88a17a41ea79db0cdaea7ba6b867c9a5dce806ce5ba0249e155c4d1cdc79f0a7988cc36ff9a3c5895864f42a71b9e0a308f6b9fa1cb44efbbe05 +EBUILD courier-imap-5.1.2.ebuild 7074 BLAKE2B c00c5f5d1ddbe428d90b1edce1869111e4f6f91985cc9714d4d826fa3ab05d6206587b364b74c00372302e8a1b1ac907763c0e78807044c1a9e87a4dcb970ad9 SHA512 c1764aa9f8d32fe9786466c622090c72aaac827e7d001592c7a97f6fb9d620fedc17813d67545349371dd0c81f26d2030803289214051921acad1a8ecf56ee09 +EBUILD courier-imap-5.1.3.ebuild 7082 BLAKE2B 890f4e8a2559db901ccbad905fc0f9957dcbeab86f5dd3afdf0c32563f87edd996c5fe178abbd9193a5fb7ec04ee6edb0e044a15a95823195a01bdad7a6cad39 SHA512 101dff332dce914436c300b6d97331cedc1a2f7270b3c223ebe4f266e9a85d16130731bce889afd48c8b7e7fdc131538a0f8e5ff900ed5b21c6527b249053b0a MISC metadata.xml 462 BLAKE2B c03535d9f421fd089459b7c628f093b9ba1edf1317e0943b5dff3eca2f6645b6ed6947ae777dcf63752566602a30abe5143494d863ae6331a023abc0c73df446 SHA512 c26c6bd707b0cea4dd97389ef294420ad1d8a35ed588d041acc35580867e3ca64569e07b993db94bedeb92142cde77135e9bdba295cc8bf3152dd1371937e6a0 diff --git a/net-mail/courier-imap/courier-imap-4.18.2.ebuild b/net-mail/courier-imap/courier-imap-4.18.2.ebuild index fca5172405d8..8b034286d896 100644 --- a/net-mail/courier-imap/courier-imap-4.18.2.ebuild +++ b/net-mail/courier-imap/courier-imap-4.18.2.ebuild @@ -39,7 +39,6 @@ RDEPEND="${CDEPEND} # get rid of old style virtual - bug 350792 RDEPEND="${RDEPEND} !mail-mta/courier - !net-mail/bincimap !net-mail/cyrus-imapd " diff --git a/net-mail/courier-imap/courier-imap-5.0.14.ebuild b/net-mail/courier-imap/courier-imap-5.0.14.ebuild deleted file mode 100644 index 060bb3b5a84f..000000000000 --- a/net-mail/courier-imap/courier-imap-5.0.14.ebuild +++ /dev/null @@ -1,254 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools libtool readme.gentoo-r1 systemd - -DESCRIPTION="An IMAP daemon designed specifically for maildirs" -HOMEPAGE="https://www.courier-mta.org/imap/" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" - -IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota" -REQUIRED_USE="|| ( berkdb gdbm )" - -CDEPEND=" - gnutls? ( net-libs/gnutls[tools] ) - !gnutls? ( - dev-libs/openssl:0= - ) - >=net-libs/courier-authlib-0.66.4 - >=net-libs/courier-unicode-2 - >=net-mail/mailbase-0.00-r8 - net-dns/libidn:= - berkdb? ( sys-libs/db:= ) - fam? ( virtual/fam ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) -" -DEPEND="${CDEPEND} - dev-lang/perl - !mail-mta/courier - userland_GNU? ( sys-process/procps ) -" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-courier ) -" - -# get rid of old style virtual - bug 350792 -RDEPEND="${RDEPEND} - !mail-mta/courier - !net-mail/bincimap - !net-mail/cyrus-imapd -" - -RC_VER="4.0.6-r1" -INITD_VER="4.0.6-r1" - -# make check is not supported by this package due to the -# --enable-workarounds-for-imap-client-bugs option. -RESTRICT="test" - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading -and remove TLS_DHPARAMS from configuration files or run mkdhparams - -For a quick-start howto please refer to -${PN}-gentoo.readme in /usr/share/doc/${PF} - -Please convert maildir to utf8 -and rerun mkdhparams if needed. Location has changed -" - -PATCHES=( - "${FILESDIR}/${PN}-4.17-disable-fam-configure.ac.patch" - "${FILESDIR}/${PN}-4.17-aclocal-fix.patch" - "${FILESDIR}/${PN}-5.0.8-ar-fix.patch" -) - -src_prepare() { - default - - # These patches should fix problems detecting BerkeleyDB. - # We now can compile with db4 support. - if use berkdb ; then - eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch" - eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch" - fi - - cd libs/rootcerts & autoupdate - eautoreconf -} - -src_configure() { - local myconf="" - - # Default to gdbm if both berkdb and gdbm are present. - if use gdbm ; then - einfo "Building with GDBM support" - myconf="${myconf} --with-db=gdbm" - elif use berkdb ; then - einfo "Building with BerkeleyDB support" - myconf="${myconf} --with-db=db" - fi - - if use trashquota ; then - einfo "Building with Trash Quota Support" - myconf="${myconf} --with-trashquota" - fi - - use debug && myconf="${myconf} debug=true" - - econf \ - --with-notice=unicode \ - --disable-root-check \ - --bindir=/usr/sbin \ - --sysconfdir="/etc/${PN}" \ - --libexecdir="/usr/$(get_libdir)/${PN}" \ - --localstatedir="/var/lib/${PN}" \ - --with-authdaemonvar="/var/lib/${PN}/authdaemon" \ - --enable-workarounds-for-imap-client-bugs \ - --with-mailuser=mail \ - --with-mailgroup=mail \ - --with-certsdir="/etc/courier-imap" \ - $(use_with fam) \ - $(use_with ipv6) \ - $(use_with gnutls) \ - ${myconf} -} - -#src_compile() { - # spurious failures with parallel compiles, bug #???? -# emake -j1 -#} - -src_install() { - dodir "/var/lib/${PN}" /etc/pam.d - keepdir /var/lib/courier-imap - - default - rm -r "${D}/etc/pam.d" || die - - # Avoid name collisions in /usr/sbin wrt imapd and pop3d - for name in imapd pop3d ; do - mv "${D}/usr/sbin/"{,courier-}${name} \ - || die "failed to rename ${name} to courier-${name}" - done - - # Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of - # 'Maildir', and to use /usr/sbin/courier-foo names. - for service in {imapd,pop3d}{,-ssl} ; do - sed -e 's/Maildir/${MAILDIR}/' \ - -i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \ - || die "sed failed" - sed -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \ - -i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \ - || die "sed failed" - done - - # Rename the config files correctly and add a value for ${MAILDIR} - # to them. - for service in {imapd,pop3d}{,-ssl} ; do - mv "${D}/etc/${PN}/${service}"{.dist,} \ - || die "failed to rename ${service}.dist to ${service}" - echo -e '\n# Hardwire a value for ${MAILDIR}' \ - >> "${D}/etc/${PN}/${service}" - echo 'MAILDIR=.maildir' >> "${D}/etc/${PN}/${service}" - echo 'MAILDIRPATH=.maildir' >> "${D}/etc/${PN}/${service}" - done - - for service in imapd pop3d ; do - echo -e '# Put any program for ${PRERUN} here' \ - >> "${D}/etc/${PN}/${service}" - echo 'PRERUN=' >> "${D}/etc/${PN}/${service}" - echo -e '# Put any program for ${LOGINRUN} here' \ - >> "${D}/etc/${PN}/${service}" - echo -e '# this is for relay-ctrl-allow in 4*' \ - >> "${D}/etc/${PN}/${service}" - echo 'LOGINRUN=' >> "${D}/etc/${PN}/${service}" - done - - for x in "${D}/usr/sbin"/* ; do - if [[ -L "${x}" ]] ; then - rm "${x}" || die "failed to remove ${x}" - fi - done - - mv "${D}/usr/share"/* "${D}/usr/sbin/" || die - mv "${D}/usr/sbin/man" "${D}/usr/share/" || die - - rm "${D}/usr/sbin/"{mkimapdcert,mkpop3dcert} || die - - dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert" - - dosym ../../sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger" - - for initd in courier-{imapd,pop3d}{,-ssl} ; do - sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \ - "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" \ - > "${T}/${initd}" \ - || die "initd libdir-sed failed" - doinitd "${T}/${initd}" - done - - cp "${FILESDIR}"/courier-*-r1.service . - - sed -i \ - -e "s:/usr/lib/:/usr/$(get_libdir)/:" \ - courier-*-r1.service \ - || die - - systemd_newunit courier-authdaemond-r1.service \ - courier-authdaemond.service - systemd_newunit courier-imapd-ssl-r1.service \ - courier-imapd-ssl.service - systemd_newunit courier-imapd-r1.service \ - courier-imapd.service - - exeinto "/usr/$(get_libdir)/${PN}" - for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do - sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \ - "${FILESDIR}/${PN}-${RC_VER}-${exe}" \ - > "${T}/${exe}" \ - || die "exe libdir-sed failed" - doexe "${T}/${exe}" - done - - # Avoid a collision with mail-mta/netqmail, bug 482098. - mv "${D}/usr/sbin/"{,courier-}maildirmake \ - || die "failed to rename maildirmake to courier-maildirmake" - mv "${D}/usr/share/man/man1/"{,courier-}maildirmake.1 \ - || die "failed to rename maildirmake.1 to courier-maildirmake.1" - - dodoc AUTHORS INSTALL NEWS README ChangeLog - readme.gentoo_create_doc - dodoc "${FILESDIR}/${PN}-gentoo.readme" - docinto imap - dodoc libs/imap/ChangeLog libs/imap/BUGS* libs/imap/README* - docinto maildir - dodoc libs/maildir/AUTHORS libs/maildir/*.html libs/maildir/README* - docinto rfc2045 - dodoc libs/rfc2045/*.html - docinto tcpd - dodoc libs/tcpd/README* libs/tcpd/*.html - exeinto /etc/cron.monthly - newexe "${FILESDIR}"/${PN}.cron ${PN} -} - -pkg_postinst() { - # Some users have been reporting that permissions on this directory were - # getting scrambled, so let's ensure that they are sane. - fperms 0755 "${ROOT}/usr/$(get_libdir)/${PN}" - - readme.gentoo_print_elog - - elog "" - elog "Courier Imap now run as user mail:mail." - elog "" - elog "This require you to enable read/write access to the caches:" - elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)" - elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )" -} diff --git a/net-mail/courier-imap/courier-imap-5.0.7.ebuild b/net-mail/courier-imap/courier-imap-5.0.7.ebuild deleted file mode 100644 index 99e07788d575..000000000000 --- a/net-mail/courier-imap/courier-imap-5.0.7.ebuild +++ /dev/null @@ -1,252 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit autotools libtool readme.gentoo-r1 systemd - -DESCRIPTION="An IMAP daemon designed specifically for maildirs" -HOMEPAGE="https://www.courier-mta.org/imap/" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" - -IUSE="berkdb debug fam +gdbm gnutls ipv6 selinux trashquota" -REQUIRED_USE="|| ( berkdb gdbm )" - -CDEPEND=" - gnutls? ( net-libs/gnutls[tools] ) - !gnutls? ( - dev-libs/openssl:0= - ) - >=net-libs/courier-authlib-0.66.4 - >=net-libs/courier-unicode-2 - >=net-mail/mailbase-0.00-r8 - net-dns/libidn:= - berkdb? ( sys-libs/db:= ) - fam? ( virtual/fam ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) -" -DEPEND="${CDEPEND} - dev-lang/perl - !mail-mta/courier - userland_GNU? ( sys-process/procps ) -" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-courier ) -" - -# get rid of old style virtual - bug 350792 -RDEPEND="${RDEPEND} - !mail-mta/courier - !net-mail/bincimap - !net-mail/cyrus-imapd -" - -RC_VER="4.0.6-r1" -INITD_VER="4.0.6-r1" - -# make check is not supported by this package due to the -# --enable-workarounds-for-imap-client-bugs option. -RESTRICT="test" - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -Please read http://www.courier-mta.org/imap/INSTALL.html#upgrading -and remove TLS_DHPARAMS from configuration files or run mkdhparams - -For a quick-start howto please refer to -${PN}-gentoo.readme in /usr/share/doc/${PF} - -Please convert maildir to utf8 -and rerun mkdhparams if needed. Location has changed -" - -PATCHES=( - "${FILESDIR}/${PN}-4.17-disable-fam-configure.ac.patch" - "${FILESDIR}/${PN}-4.17-aclocal-fix.patch" -) - -src_prepare() { - default - - # These patches should fix problems detecting BerkeleyDB. - # We now can compile with db4 support. - if use berkdb ; then - eapply "${FILESDIR}/${PN}-4.17-db4-bdbobj_configure.ac.patch" - eapply "${FILESDIR}/${PN}-4.17-db4-configure.ac.patch" - fi - - eautoreconf -} - -src_configure() { - local myconf="" - - # Default to gdbm if both berkdb and gdbm are present. - if use gdbm ; then - einfo "Building with GDBM support" - myconf="${myconf} --with-db=gdbm" - elif use berkdb ; then - einfo "Building with BerkeleyDB support" - myconf="${myconf} --with-db=db" - fi - - if use trashquota ; then - einfo "Building with Trash Quota Support" - myconf="${myconf} --with-trashquota" - fi - - use debug && myconf="${myconf} debug=true" - - econf \ - --with-notice=unicode \ - --disable-root-check \ - --bindir=/usr/sbin \ - --sysconfdir="/etc/${PN}" \ - --libexecdir="/usr/$(get_libdir)/${PN}" \ - --localstatedir="/var/lib/${PN}" \ - --with-authdaemonvar="/var/lib/${PN}/authdaemon" \ - --enable-workarounds-for-imap-client-bugs \ - --with-mailuser=mail \ - --with-mailgroup=mail \ - --with-certsdir="/etc/courier-imap" \ - $(use_with fam) \ - $(use_with ipv6) \ - $(use_with gnutls) \ - ${myconf} -} - -#src_compile() { - # spurious failures with parallel compiles, bug #???? -# emake -j1 -#} - -src_install() { - dodir "/var/lib/${PN}" /etc/pam.d - keepdir /var/lib/courier-imap - - default - rm -r "${D}/etc/pam.d" || die - - # Avoid name collisions in /usr/sbin wrt imapd and pop3d - for name in imapd pop3d ; do - mv "${D}/usr/sbin/"{,courier-}${name} \ - || die "failed to rename ${name} to courier-${name}" - done - - # Hack /usr/lib/courier-imap/foo.rc to use ${MAILDIR} instead of - # 'Maildir', and to use /usr/sbin/courier-foo names. - for service in {imapd,pop3d}{,-ssl} ; do - sed -e 's/Maildir/${MAILDIR}/' \ - -i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \ - || die "sed failed" - sed -e "s/\/usr\/sbin\/${service}/\/usr\/sbin\/courier-${service}/" \ - -i "${D}/usr/$(get_libdir)/${PN}/${service}.rc" \ - || die "sed failed" - done - - # Rename the config files correctly and add a value for ${MAILDIR} - # to them. - for service in {imapd,pop3d}{,-ssl} ; do - mv "${D}/etc/${PN}/${service}"{.dist,} \ - || die "failed to rename ${service}.dist to ${service}" - echo -e '\n# Hardwire a value for ${MAILDIR}' \ - >> "${D}/etc/${PN}/${service}" - echo 'MAILDIR=.maildir' >> "${D}/etc/${PN}/${service}" - echo 'MAILDIRPATH=.maildir' >> "${D}/etc/${PN}/${service}" - done - - for service in imapd pop3d ; do - echo -e '# Put any program for ${PRERUN} here' \ - >> "${D}/etc/${PN}/${service}" - echo 'PRERUN=' >> "${D}/etc/${PN}/${service}" - echo -e '# Put any program for ${LOGINRUN} here' \ - >> "${D}/etc/${PN}/${service}" - echo -e '# this is for relay-ctrl-allow in 4*' \ - >> "${D}/etc/${PN}/${service}" - echo 'LOGINRUN=' >> "${D}/etc/${PN}/${service}" - done - - for x in "${D}/usr/sbin"/* ; do - if [[ -L "${x}" ]] ; then - rm "${x}" || die "failed to remove ${x}" - fi - done - - mv "${D}/usr/share"/* "${D}/usr/sbin/" || die - mv "${D}/usr/sbin/man" "${D}/usr/share/" || die - - rm "${D}/usr/sbin/"{mkimapdcert,mkpop3dcert} || die - - dosbin "${FILESDIR}/mkimapdcert" "${FILESDIR}/mkpop3dcert" - - dosym ../../sbin/courierlogger "/usr/$(get_libdir)/${PN}/courierlogger" - - for initd in courier-{imapd,pop3d}{,-ssl} ; do - sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \ - "${FILESDIR}/${PN}-${INITD_VER}-${initd}.rc6" \ - > "${T}/${initd}" \ - || die "initd libdir-sed failed" - doinitd "${T}/${initd}" - done - - cp "${FILESDIR}"/courier-*-r1.service . - - sed -i \ - -e "s:/usr/lib/:/usr/$(get_libdir)/:" \ - courier-*-r1.service \ - || die - - systemd_newunit courier-authdaemond-r1.service \ - courier-authdaemond.service - systemd_newunit courier-imapd-ssl-r1.service \ - courier-imapd-ssl.service - systemd_newunit courier-imapd-r1.service \ - courier-imapd.service - - exeinto "/usr/$(get_libdir)/${PN}" - for exe in gentoo-{imapd,pop3d}{,-ssl}.rc courier-{imapd,pop3d}.indirect ; do - sed -e "s:GENTOO_LIBDIR:$(get_libdir):g" \ - "${FILESDIR}/${PN}-${RC_VER}-${exe}" \ - > "${T}/${exe}" \ - || die "exe libdir-sed failed" - doexe "${T}/${exe}" - done - - # Avoid a collision with mail-mta/netqmail, bug 482098. - mv "${D}/usr/sbin/"{,courier-}maildirmake \ - || die "failed to rename maildirmake to courier-maildirmake" - mv "${D}/usr/share/man/man1/"{,courier-}maildirmake.1 \ - || die "failed to rename maildirmake.1 to courier-maildirmake.1" - - dodoc AUTHORS INSTALL NEWS README ChangeLog - readme.gentoo_create_doc - dodoc "${FILESDIR}/${PN}-gentoo.readme" - docinto imap - dodoc libs/imap/ChangeLog libs/imap/BUGS* libs/imap/README* - docinto maildir - dodoc libs/maildir/AUTHORS libs/maildir/*.html libs/maildir/README* - docinto rfc2045 - dodoc libs/rfc2045/*.html - docinto tcpd - dodoc libs/tcpd/README* libs/tcpd/*.html - exeinto /etc/cron.monthly - newexe "${FILESDIR}"/${PN}.cron ${PN} -} - -pkg_postinst() { - # Some users have been reporting that permissions on this directory were - # getting scrambled, so let's ensure that they are sane. - fperms 0755 "${ROOT}/usr/$(get_libdir)/${PN}" - - readme.gentoo_print_elog - - elog "" - elog "Courier Imap now run as user mail:mail." - elog "" - elog "This require you to enable read/write access to the caches:" - elog "/var/lib/courier-imap/courierssl*cache (chown mail:mail)" - elog "and read access to the certificates (e.g. /etc/courier-imap/pop3d.pem )" -} diff --git a/net-mail/courier-imap/courier-imap-5.1.2.ebuild b/net-mail/courier-imap/courier-imap-5.1.2.ebuild index 3f91d87cd83c..c908d5ac608a 100644 --- a/net-mail/courier-imap/courier-imap-5.1.2.ebuild +++ b/net-mail/courier-imap/courier-imap-5.1.2.ebuild @@ -40,7 +40,6 @@ RDEPEND="${CDEPEND} # get rid of old style virtual - bug 350792 RDEPEND="${RDEPEND} !mail-mta/courier - !net-mail/bincimap !net-mail/cyrus-imapd " diff --git a/net-mail/courier-imap/courier-imap-5.1.3.ebuild b/net-mail/courier-imap/courier-imap-5.1.3.ebuild index 2418f2ded5ef..df153dc82fd5 100644 --- a/net-mail/courier-imap/courier-imap-5.1.3.ebuild +++ b/net-mail/courier-imap/courier-imap-5.1.3.ebuild @@ -40,7 +40,6 @@ RDEPEND="${CDEPEND} # get rid of old style virtual - bug 350792 RDEPEND="${RDEPEND} !mail-mta/courier - !net-mail/bincimap !net-mail/cyrus-imapd " -- cgit v1.2.3