From 2929788def9a92c1eb237eed93fbdb0c02838bbf Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 Oct 2019 22:11:03 +0100 Subject: Revert "gentoo resync : 13.10.2019" This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030. --- net-mail/dovecot/Manifest | 7 +- net-mail/dovecot/dovecot-2.2.36.4.ebuild | 2 +- net-mail/dovecot/dovecot-2.3.7.2.ebuild | 2 +- net-mail/dovecot/dovecot-2.3.8.ebuild | 286 ------------------------------- 4 files changed, 4 insertions(+), 293 deletions(-) delete mode 100644 net-mail/dovecot/dovecot-2.3.8.ebuild (limited to 'net-mail/dovecot') diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index 97828937bd52..45a8b450796d 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -3,10 +3,7 @@ AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed DIST dovecot-2.2-pigeonhole-0.4.24.2.tar.gz 1833284 BLAKE2B bee45fd129aee3d5126bd48b27829e7e266a5c1043411b6b23655bbf32e2f684763b82bff476a954bf7f0c7aae4e038c0892be70776726c7b324e409a8f89d78 SHA512 a51de88bcbac83ced7d314a560bd44f119dd80bf58f350da522501f072c0a4c02ff8c11152e2b858f14bb8ca9a9b665960cbe37a0c8ef4600b430e65ddbf3bf4 DIST dovecot-2.2.36.4.tar.gz 6257899 BLAKE2B 3260e96f369e85f2dfd5ece0d9b12902c7192d057369e8a151cc6ab7b4f2033d4e1029fb862d412f2837fd384d7fe729cf1ab15cac9ac335e943bb1fdb532b51 SHA512 e33ab2f6c5f7b4ffca3d57580329f1df8e1655c755a1a6b575a4e49d57ea94d1ab67df2419033c9d68acf5959c6edfa596815dc2bc43798e9aef3d17d271cc4d DIST dovecot-2.3-pigeonhole-0.5.7.2.tar.gz 1857602 BLAKE2B 8de6200bb1ca99d25b48c963c007e9fda07e21f0708d4542e497985a61c07270febd8f29171d607c4025f4651c2ef17d84447a789ebad896c55aa36ec2cd876c SHA512 7fc8d89ee31c8e8c16a9aeaeffb591f4188de36fc80e3a30a9ae10bc5acd7ea5d5d91e077fda566e61d588d9221ec53044ce17a9cc0c9c219dbe6824558a1d60 -DIST dovecot-2.3-pigeonhole-0.5.8.tar.gz 1857780 BLAKE2B a1b86c7757238c4bfb6ec4aec5e152eedf482923ec34728cae7d9faccd6ad395f0c60b0cc5f86abee314f80de89d09796bbf0446e08e5bc46ad0191c0456e077 SHA512 ddf009c755cc87c362ddf1c17ac1403b0f6a504b039efef3244f2d5bd4d3963fb25baaaa4d98c089b3e8bddd4675d131765fee5499d9aaf01015e44f7d631d2d DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1f997b64c9a699b506ccbd04e8e7c2d503ddc12a2598958dfca88560c19487801a728f386b8fea5f637a75b83812e SHA512 172f7f0edb884259e4c050607510aee67a35c3a20b7dd147e7c8a25a04921c18f7d6b5c85af2c69ae8c4d53791550970e471b033dbfae94253e331053b6a317d -DIST dovecot-2.3.8.tar.gz 7136958 BLAKE2B 2769169519f0fd9293178e8d200467bc5be0f362bc6bfb3dcc6cc74ed146ecf66dab7730013704b70f0cc75a87ee5e52994137cd63c7c12c56bddcea37cedd07 SHA512 f62439e2ea77ffb544a7752c07085582c5653c64671cb42dd7a7e5aa69eb87059c677aa1fa071efa1ddd2287ab621e9a264ec115be2aeb2f43ab4c685411eae3 -EBUILD dovecot-2.2.36.4.ebuild 8572 BLAKE2B c5900ba2365ac280429b669a91f4cfc537f689c9fc9d52d3bd62a170467278ddd4736c2ba850ed1f97f775eb9fd132047bf9ea84625d3665270b83ab380c2931 SHA512 8c48542c6bd7831aca19b38b3af1c220cc43f1b9a1db22ce44d2c9c9f8f44a1387cb4e0b8ced38304e1e6b790c6ab81473f418f14ca922dbd50554e9190c596e -EBUILD dovecot-2.3.7.2.ebuild 8684 BLAKE2B 8f660cbe9a2f12c077d301167700ad9da9ee47491d33208279f1ba9516ec5e215e3c8fc23ecba65e769ff4846b01574c4254671b23ad1f56aeafa69077e07725 SHA512 8c8ec87757307bf05f754defc080dcd3d56db79f17de7962d1868275925e896282db3877d4948557c94b6d29732cba2d74105642931b0876579392abef468986 -EBUILD dovecot-2.3.8.ebuild 8558 BLAKE2B 7aa5ef722151554d553c69c02aa8c38622306561acf87dd02d0f84d32121f3d527f13b7aaf45656aa7055594ba15ba45f4933ccd82456eb8276ab39bc64a4222 SHA512 a5448124ac35c0d660998f1de3d2209d1e7b6d6bdc6de4e1811b8572aa19b4aa41aad01f4741cc6ef9abcc66b051ffec9fd106be8c31772781d3e74f0a46042e +EBUILD dovecot-2.2.36.4.ebuild 8571 BLAKE2B ffeffe8820f4ec9ab54828e260753ee2e77c7821bc8096e10b008f087d1781c8163256586c025e8177b0b8bf341026a0f37fe5d60bdfb2e01d463dda1f1f6214 SHA512 635117634a2a0437f6ae76da65b4b7d1534de6de71e493af7a4458ebeca1fbefea67b3839db76a9d9ecea0c7a623858c0efad21cfaf3819b50c3cbdb856b4643 +EBUILD dovecot-2.3.7.2.ebuild 8683 BLAKE2B 8bacc9251f1e1d86f8020b1c97c795e4ec81aac310d87008442215b9a870cb2a68e1b945a43f8b9bee5f139765af813164b295e7f192ddeafbb832b35e81713f SHA512 da83951d85ae21fc43eb14731ad70d208091637bfecbd34a0b59e51e2792477ae7810339c1093359cdc32450d4bac284f11795089a33551481a29073fd270a26 MISC metadata.xml 877 BLAKE2B 07dfbe6709d8abfe8a75bfce0ae605ba84519571bf4f85b572b0e7fe90846622dd74786c92c5da7c3829efd97075a94869eaa9b98542e0656a88a52c630c90d8 SHA512 95d9463fca2b5705778aba2ca0b175ed1e72a1e1d49f6ec52932b64dd976c9e06d59bd7c165ca76d75a1dad22888838076aaf73bbcf0a1d52a77e64eca7098f5 diff --git a/net-mail/dovecot/dovecot-2.2.36.4.ebuild b/net-mail/dovecot/dovecot-2.2.36.4.ebuild index 921d9821bd4c..10ac4e23aa58 100644 --- a/net-mail/dovecot/dovecot-2.2.36.4.ebuild +++ b/net-mail/dovecot/dovecot-2.2.36.4.ebuild @@ -43,7 +43,7 @@ DEPEND="bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) - pam? ( sys-libs/pam ) + pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) diff --git a/net-mail/dovecot/dovecot-2.3.7.2.ebuild b/net-mail/dovecot/dovecot-2.3.7.2.ebuild index 271aecab0c4f..94332fa22de7 100644 --- a/net-mail/dovecot/dovecot-2.3.7.2.ebuild +++ b/net-mail/dovecot/dovecot-2.3.7.2.ebuild @@ -46,7 +46,7 @@ DEPEND="argon2? ( dev-libs/libsodium ) lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) mysql? ( dev-db/mysql-connector-c:0= ) - pam? ( sys-libs/pam ) + pam? ( virtual/pam ) postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) selinux? ( sec-policy/selinux-dovecot ) solr? ( net-misc/curl dev-libs/expat ) diff --git a/net-mail/dovecot/dovecot-2.3.8.ebuild b/net-mail/dovecot/dovecot-2.3.8.ebuild deleted file mode 100644 index b32f3cabf59d..000000000000 --- a/net-mail/dovecot/dovecot-2.3.8.ebuild +++ /dev/null @@ -1,286 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -# do not add a ssl USE flag. ssl is mandatory -SSL_DEPS_SKIP=1 -inherit autotools ssl-cert systemd - -MY_P="${P/_/.}" -#MY_S="${PN}-ce-${PV}" -major_minor="$(ver_cut 1-2)" -sieve_version="0.5.8" -if [[ ${PV} == *_rc* ]] ; then - rc_dir="rc/" -else - rc_dir="" -fi -SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz - sieve? ( - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz - ) - managesieve? ( - https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz - ) " -DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" -HOMEPAGE="https://www.dovecot.org/" - -SLOT="0" -LICENSE="LGPL-2.1 MIT" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" - -IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail" -IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib" -IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve selinux sieve solr static-libs suid tcpd textcat" - -IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_STORAGE} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" - -DEPEND="argon2? ( dev-libs/libsodium ) - bzip2? ( app-arch/bzip2 ) - caps? ( sys-libs/libcap ) - kerberos? ( virtual/krb5 ) - ldap? ( net-nds/openldap ) - lua? ( dev-lang/lua:* ) - lucene? ( >=dev-cpp/clucene-2.3 ) - lzma? ( app-arch/xz-utils ) - lz4? ( app-arch/lz4 ) - mysql? ( dev-db/mysql-connector-c:0= ) - pam? ( sys-libs/pam ) - postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) - selinux? ( sec-policy/selinux-dovecot ) - solr? ( net-misc/curl dev-libs/expat ) - sqlite? ( dev-db/sqlite:* ) - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - suid? ( acct-group/mail ) - tcpd? ( sys-apps/tcp-wrappers ) - textcat? ( app-text/libexttextcat ) - vpopmail? ( net-mail/vpopmail ) - zlib? ( sys-libs/zlib ) - virtual/libiconv - dev-libs/icu:=" - -RDEPEND="${DEPEND} - acct-group/dovecot - acct-group/dovenull - acct-user/dovecot - acct-user/dovenull - net-mail/mailbase" - -pkg_setup() { - if use managesieve && ! use sieve; then - ewarn "managesieve USE flag selected but sieve USE flag unselected" - ewarn "sieve USE flag will be turned on" - fi -} - -src_prepare() { - default - # bug 657108 - elibtoolize - #eautoreconf -} - -src_configure() { - local conf="" - - if use postgres || use mysql || use sqlite; then - conf="${conf} --with-sql" - fi - - # turn valgrind tests off. Bug #340791 - VALGRIND=no econf \ - --with-rundir="${EPREFIX%/}/run/dovecot" \ - --with-statedir="${EPREFIX%/}/var/lib/dovecot" \ - --with-moduledir="${EPREFIX%/}/usr/$(get_libdir)/dovecot" \ - --without-stemmer \ - --disable-rpath \ - --without-libbsd \ - --with-icu \ - --with-ssl \ - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ - $( use_with argon2 sodium ) \ - $( use_with bzip2 bzlib ) \ - $( use_with caps libcap ) \ - $( use_with kerberos gssapi ) \ - $( use_with lua ) \ - $( use_with ldap ) \ - $( use_with lucene ) \ - $( use_with lz4 ) \ - $( use_with lzma ) \ - $( use_with mysql ) \ - $( use_with pam ) \ - $( use_with postgres pgsql ) \ - $( use_with sqlite ) \ - $( use_with solr ) \ - $( use_with tcpd libwrap ) \ - $( use_with textcat ) \ - $( use_with vpopmail ) \ - $( use_with zlib ) \ - $( use_enable static-libs static ) \ - ${conf} - - if use sieve || use managesieve ; then - # The sieve plugin needs this file to be build to determine the plugin - # directory and the list of libraries to link to. - emake dovecot-config - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" - econf \ - $( use_enable static-libs static ) \ - --localstatedir="${EPREFIX%/}/var" \ - --enable-shared \ - --with-dovecot="${S}" \ - $( use_with managesieve ) - fi -} - -src_compile() { - default - if use sieve || use managesieve ; then - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" - emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" - fi -} - -src_test() { - default - if use sieve || use managesieve ; then - cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" - default - fi -} - -src_install () { - default - - # insecure: - # use suid && fperms u+s /usr/libexec/dovecot/deliver - # better: - if use suid;then - einfo "Changing perms to allow deliver to be suided" - fowners root:mail "/usr/libexec/dovecot/dovecot-lda" - fperms 4750 "/usr/libexec/dovecot/dovecot-lda" - fi - - newinitd "${FILESDIR}"/dovecot.init-r6 dovecot - - rm -rf "${ED}"/usr/share/doc/dovecot - - dodoc AUTHORS NEWS README TODO - dodoc doc/*.{txt,cnf,xml,sh} - docinto example-config - dodoc doc/example-config/*.{conf,ext} - docinto example-config/conf.d - dodoc doc/example-config/conf.d/*.{conf,ext} - docinto wiki - dodoc doc/wiki/* - doman doc/man/*.{1,7} - - # Create the dovecot.conf file from the dovecot-example.conf file that - # the dovecot folks nicely left for us.... - local conf="${ED}/etc/dovecot/dovecot.conf" - local confd="${ED}/etc/dovecot/conf.d" - - insinto /etc/dovecot - doins doc/example-config/*.{conf,ext} - insinto /etc/dovecot/conf.d - doins doc/example-config/conf.d/*.{conf,ext} - fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext - rm -f "${confd}/../README" - - # .maildir is the Gentoo default - local mail_location="maildir:~/.maildir" - sed -i -e \ - "s|#mail_location =|mail_location = ${mail_location}|" \ - "${confd}/10-mail.conf" \ - || die "failed to update mail location settings in 10-mail.conf" - - # We're using pam files (imap and pop3) provided by mailbase - if use pam; then - sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \ - "${confd}/auth-system.conf.ext" \ - || die "failed to update PAM settings in auth-system.conf.ext" - # mailbase does not provide a sieve pam file - use managesieve && dosym imap /etc/pam.d/sieve - sed -i -e \ - 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \ - "${confd}/10-auth.conf" \ - || die "failed to update PAM settings in 10-auth.conf" - fi - - # Disable ipv6 if necessary - if ! use ipv6; then - sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \ - || die "failed to update listen settings in dovecot.conf" - fi - - # Update ssl cert locations - sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \ - || die "ssl conf failed" - sed -i -e 's:^ssl_cert =.*:ssl_cert =