From 441d1370330332b7d78f238d2f5e13f7aed5e4e0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 Dec 2020 23:06:25 +0000 Subject: gentoo christmass resync : 25.12.2020 --- net-mail/dovecot/Manifest | 10 +- net-mail/dovecot/dovecot-2.3.10.1.ebuild | 288 -------------------- net-mail/dovecot/dovecot-2.3.11.3-r100.ebuild | 303 +++++++++++++++++++++ net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild | 2 +- net-mail/dovecot/dovecot-2.3.7.2.ebuild | 291 -------------------- .../dovecot-2.3.11.3-autoconf-lua-version.patch | 17 ++ 6 files changed, 324 insertions(+), 587 deletions(-) delete mode 100644 net-mail/dovecot/dovecot-2.3.10.1.ebuild create mode 100644 net-mail/dovecot/dovecot-2.3.11.3-r100.ebuild delete mode 100644 net-mail/dovecot/dovecot-2.3.7.2.ebuild create mode 100644 net-mail/dovecot/files/dovecot-2.3.11.3-autoconf-lua-version.patch (limited to 'net-mail/dovecot') diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index 81de961518ba..5d197e3910fd 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -1,20 +1,16 @@ AUX dovecot-2.3.11.3-apop-fix.patch 2226 BLAKE2B 47971fc29ff3add43ca7ee253c4e1579dd22e603c6692f592c605a742330df80309ee06f8bb811e64de03392e0dee19efe1964229f61209b9f48fb0dd557b7d2 SHA512 6ebc10a6e0ca9f4790cbe57a9e9283838c5fbe124e9be305fcd16e472a5edea97a055700613fb6a1a43fe139537da80a603493f250b34f2179f969da2a09f2cc +AUX dovecot-2.3.11.3-autoconf-lua-version.patch 538 BLAKE2B 3978ebff83cb42591f60fc1cc155bd67a743d78c24d7d7ddfc0776c8df53fbdfad5cee79d1377e6436d69f6ca429ccf33b154adf470f8fc9d6429a746d49788f SHA512 a3e7403fb636078607b5452a580d229ce1d2e240d30e24138f33c3964ff008d99fef6477605f3d64dbdd8fc53187c9c6ad4eb82c58375b329dc9f8be87192eb7 AUX dovecot-fix-search-crash.patch 3417 BLAKE2B 3d3b63d7be8d19fea2f159b6191fb1dcb94be4abe6cbbde5984c0c6e55fcb56a6e32bbe07650a2d218b3ecc55ede620e95befff24dce3a562733b119142e216d SHA512 9cb34a7f6de6d19ec7d6e4c3206c5d15f6531f92027d7dbef21284206ddd9f3418d4a1266d2860789dfa56f97579a89f3cafc54f24152f321dddb9b470d9f473 AUX dovecot-unwind-generic.patch 645 BLAKE2B 6598abbd2819f7109d4caacbce5123b8810b93b623956561a12a749cbc582667caa160eac62305067db6037f820c8e1a8bd8a22da09a454afcb9e21209cc5fd3 SHA512 6ede0edd5bd6d1123ff1567886898eee5795baa549c610ba8a3567c0f8fee27d69028aaf8b6067c2f37b915a07e165aa0d6a2d5fb8314deffd61a187b18de4ae AUX dovecot-userdb-passwd-fix.patch 500 BLAKE2B 133e7b13cf3dd1515db5694945abd2d00ecd89c4a766ea873099ebbdd450700e70b80696ba58b21cc4f7160fa3becde6453c9334d41cdad426e3f59bd9e5491e SHA512 18a26eed0c793b0ccee828dc5eafc6448dda94d705597b19c3333f21944e838b677af2884f5fb65eb2f6dc79158ad8b3143b24d3788d841038de6dd24885fc0d AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed288c787dc81f8902e770f7774c54eba90de49e9634eb93873046a043bd7825cfb65bab5b2ea9ce108 SHA512 982f9897e4a0a5a3957bb12785961c9cde72a2c941f55efdb23e9a26cec19efe89e3be4effe79522c297ea2b258d201db78c19b6e3f9cd5e68d3736c2a0f0063 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.10.tar.gz 1899237 BLAKE2B a308500d6a51d4a9b99ae16b75829f1f799351675a31d91e450c4ea1b095d7719af424534f4b7736559b06819a337e7be0bd44307b77a775c8a54359e41822c1 SHA512 f3d380edba4d25d20ee52db21d2965e3a6b229924e9a04fbf45cfe32e1d25448977ee41b12ba41ad8cf8b795f19bb1dbef1d7d09e775598d782123268f61dc8b DIST dovecot-2.3-pigeonhole-0.5.11.tar.gz 1912411 BLAKE2B ed35cbae5ea2c1da24a1a255c1fc943b9a8c35280840ea42c1b5f83ea327872bb83ae8901696abfe3b0d27dfd6c11d3fb1661614fad54eeab9d700b5f0b7b13a SHA512 793d93edc50192c52654e2f7244d3e01aaa4e69f786e3ecfcd658a4ab26a5099cc5319cb93221150db4ce94bc4515ffb38115b1d0eeb6e052b956efec680b33d -DIST dovecot-2.3-pigeonhole-0.5.7.2.tar.gz 1857602 BLAKE2B 8de6200bb1ca99d25b48c963c007e9fda07e21f0708d4542e497985a61c07270febd8f29171d607c4025f4651c2ef17d84447a789ebad896c55aa36ec2cd876c SHA512 7fc8d89ee31c8e8c16a9aeaeffb591f4188de36fc80e3a30a9ae10bc5acd7ea5d5d91e077fda566e61d588d9221ec53044ce17a9cc0c9c219dbe6824558a1d60 -DIST dovecot-2.3.10.1.tar.gz 7226958 BLAKE2B 2f9223d9184b3f8809b573ebd5637e1fd32885a377d95284bbf6d0d975b61462e351d42c515ca860a2348e39634ff440cb58dc6894008782a0e7d5a4dead4d77 SHA512 5c07436a3e861993f241caa2c60f035c533c5fceb5c8540c1717d31bedd54b82299f7ea11bfee12c72d4d33985d93a7130c4f56877864a7ad21cf7373a29cc06 DIST dovecot-2.3.11.3.tar.gz 7353412 BLAKE2B 0067989b35fe29c0d23f6ca25712a87fa69608cc4ee6081d9eb929d63e7a586ccc0d86fcdbe1aac67aea9f2678ab0e150f053667817b08f4a7246947bb812fdb SHA512 d83e52a7faab918a8e6f6257acc5936b81733c10489affd042c3a043cb842db060286cba9978be378e4958e9ac2e60b55ce289d7f3a88df08e7637e4785e23bb -DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1f997b64c9a699b506ccbd04e8e7c2d503ddc12a2598958dfca88560c19487801a728f386b8fea5f637a75b83812e SHA512 172f7f0edb884259e4c050607510aee67a35c3a20b7dd147e7c8a25a04921c18f7d6b5c85af2c69ae8c4d53791550970e471b033dbfae94253e331053b6a317d EBUILD dovecot-2.2.36.4.ebuild 8605 BLAKE2B b649cd8db3cc6ed5fe93a6013a16e7f99a121e35d684fdfa9fc74aec1487f571fb1f59f4433ad89a6bdcd33de0d916b111226a33bdacc084383580c881d98551 SHA512 811bd1cb2ebec984f98d02a975c7774e0449e1b87c26840107d2e93c79ba69f0c8714d2db5c63513233893c0230080d2fd002962aa6b536f12f6ba6d36f7b5a9 -EBUILD dovecot-2.3.10.1.ebuild 8630 BLAKE2B 225309f96696de58410097589fef31f07c3ae25d91d42577ec140a7ffb4ed6d7f230fe78e65cd330ae6cfa8b8d3a275d57984927755cbf99713e07ac72084c5e SHA512 4f806e5741cc787d6a5d15e052d126f7f187814502cd1879bf45bb174bf30a82c868305cc98c8cf91079101ee03905e9a8f37f7d2108ef937314ba473dcd75cf EBUILD dovecot-2.3.11.3-r1.ebuild 8838 BLAKE2B d2db4a8a2f3dd6d6ee2cd4ab6401dbddb34834fbc2bf60bfe27800b30560e42aefa9d977c2ccd8109c31208cbd4c95f5a435cedb50dc718c311a610cc74542e8 SHA512 796c4e3b0cf7677b52af6a8c03c68479c37b7ee797aff2222a09ffcfd24cccebd1ab8208c035ec8fa4f4d02ea1b58f7b29e43a08d8c060ca635ad77634d4490c -EBUILD dovecot-2.3.11.3-r2.ebuild 8883 BLAKE2B c87d5ede5ed17d3fff195063dac545466964ca659cc2b6f09abc63965cf8c66ac0c4be7fb89ae8e88bf62aa69ad1d3bb6c511e326c3eed45272e891a9223d7a6 SHA512 e79953c4ef81d4551450cbf4df9c9b20151752291092ced4320fb3e43954367d8243927e37d02cc84dd36f7b95708f156b697e72d800f27c77da9eb68445cd25 +EBUILD dovecot-2.3.11.3-r100.ebuild 9059 BLAKE2B bd8f4ebecbd5452c8ef6591455d0b8cec94d53c579a5b701b53a3113747b1501d475273259d20b9443bb728ce7d72f18d1950a744c79b3838b8f1d6c9b326204 SHA512 a23e69effb144d437b522136d3f024a1f4fb9cc237f00079af557b9e5e328e65282bb46481b64312a6e664cd92b89d3acdad3bda6bea973c3d32737753e123be +EBUILD dovecot-2.3.11.3-r2.ebuild 8878 BLAKE2B 6796b48d607fe36c8fb6a741bee5a8b702f4c1d309d24533f248b4f6359bc4c9e8c28fb0f81bbcbf23363737de54f01977364fdffc9c4c0acd56310efa238d5f SHA512 bbadf212ea9f462606aa2a424960fe38a1bee71ed28334bc665f39db1ec1602f4193d42b7ad33fbe83e8cec4ff8334c60151d7de54093a7b6744e24711de9e61 EBUILD dovecot-2.3.11.3.ebuild 8676 BLAKE2B ddede1b054dde5b42d23cccfb06f4e66060d720b934c49804edeee423191baae808ae34fb50c86caf0b5b953eb5a073408396f2504e9f32ccf9834a7490f4a99 SHA512 8ff4591d1b3122c084d644b19ba4e482490f7700b14fa20d680ab023e472d8d570528b568cf159b4949f24bbdb991b0bfecb6393cd714117ba5abf771b223b08 -EBUILD dovecot-2.3.7.2.ebuild 8718 BLAKE2B 5ef26dfdf336f8f81d23f9e74a79146f4fe796bf84a159645a4c074603702eb9240cfbf5f6dc6fd5279d3d8d7405ef3168b099edbb1d9d595149dfaaf180b0ad SHA512 2dfe8a18c6b4e006028c84ebf48ba0e8cc35fc33000db39becab5ed835a911e41b12360869a6ca9112030151708abed3e93f776041a0b3d79955f5cf4931ead7 MISC metadata.xml 998 BLAKE2B c65428e9f0019e942fc1d634d53c2a85c7f8a699e34cf9c49ae09bfe9ce8a54fd368512f7a4d74f6a10baff949a9fe8021e1e0c009f8315b100fb5736efd34ae SHA512 f285f0928dc0915c8e8cebb966de84f5564be9f7dd3baa7c0cccb3343da75507003aeadf80fe34ffb4b69dd9208997a80fdb47c20bfd65fdc60c43423a00813c diff --git a/net-mail/dovecot/dovecot-2.3.10.1.ebuild b/net-mail/dovecot/dovecot-2.3.10.1.ebuild deleted file mode 100644 index f22ac9b03955..000000000000 --- a/net-mail/dovecot/dovecot-2.3.10.1.ebuild +++ /dev/null @@ -1,288 +0,0 @@ -# Copyright 1999-2020 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 toolchain-funcs - -MY_P="${P/_/.}" -#MY_S="${PN}-ce-${PV}" -major_minor="$(ver_cut 1-2)" -sieve_version="0.5.10" -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 unwind" - -IUSE="${IUSE_DOVECOT_AUTH} ${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:0= ) - 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 ) - unwind? ( sys-libs/libunwind ) - 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 unwind libunwind ) \ - $( 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 = = 5.1, [ + AC_DEFINE([HAVE_LUA], [1], [Define to 1 if you have lua]) + with_lua=yes + ], [LUAPC=""]) # otherwise pkg_check will fail + if test "x$LUA_LIBS" != "x"; then break; fi +- done + ]) + + AS_IF([test "x$with_lua" = "xyes"], [ -- cgit v1.2.3