diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-29 18:01:47 +0000 |
commit | ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (patch) | |
tree | 9f47ee47c31a0f13f9496879cd88a1042550aa81 /net-mail/vpopmail | |
parent | 53cba99042fa967e2a93da9f8db806fe2d035543 (diff) |
gentoo (leap year) resync : 29.02.2020
Diffstat (limited to 'net-mail/vpopmail')
-rw-r--r-- | net-mail/vpopmail/Manifest | 5 | ||||
-rw-r--r-- | net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild | 4 | ||||
-rw-r--r-- | net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild | 250 | ||||
-rw-r--r-- | net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild (renamed from net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild) | 63 |
4 files changed, 286 insertions, 36 deletions
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest index 6eba9c42bc2a..a5952eaef5e0 100644 --- a/net-mail/vpopmail/Manifest +++ b/net-mail/vpopmail/Manifest @@ -14,7 +14,8 @@ AUX vpopmail-double-free.patch 399 BLAKE2B ac2d7ad9b8b3e9cf25fbd973c7e42e48c1107 AUX vpopmail-lazy.patch 323 BLAKE2B c35a878e2aa69a9ba0e108fdf4f0f8de85965588acc8d2c3fecb1d152e2f0e9585d78b9ce5b2314735de8b70710687e0a75358ef3029dd96eaa704941df00bd7 SHA512 794ef15920ac565073d871a946df53395afb0630d561343f4d164af3287d1665e115ad42d7a2218306cedb5dc795b10d9c15852b69fd649854ddb0c18dc0b2dd AUX vpopmail-vpgsql.patch 2668 BLAKE2B 0f69aa8642d15d740e0e5944a438854fde240831176ae2152cc805809e5a87ecd8ce5c6791f4c4e53d2027393d158e28e9dbec49d0efd7c4c2d50c9eeb4cf10d SHA512 9f02f9f9ab186791fe071ee5cb27334144727e81f0bbd6b8f5ce472368f892f5396a225c6c1af9d5b7a66bf66e7be50aef146d7635132fab9d91f265b68af1d9 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab -EBUILD vpopmail-5.4.33-r4.ebuild 7633 BLAKE2B 10489cba302f017645c50b5fc1e50455c4a18ac80407e720f804e31a6f72c75ff6ebcc7257e818c617844635fe2252bb97cb30c26d60466e1a66c5215242776c SHA512 a94cee36d0803632634124a56bec6619889725a31b7383d816d1bbfa8bdf3661bf683a522391a34bf7f79249f577c0a120b9be1c2f9490b39b775aa9945460d4 -EBUILD vpopmail-5.4.33-r5.ebuild 7517 BLAKE2B 87f180f0ff4f1f76121cae28ce0d9eba40792e8038a09a7abe9e20a57ff4d7e51d5d9ef38a6f6338f9cd7d9e20147ddcf7a2fff02e2c527c88eaaa1e77b0f9b6 SHA512 daa486928665fbc90e56cf3702d5ba1c18cadbc8341ef624c489ef18eae68fed52a2d307691565e975c0560a85e3abf04160c99642c99f1b6f03e6730be00152 +EBUILD vpopmail-5.4.33-r5.ebuild 7513 BLAKE2B 9e2615d960bfc6d3cc88bdf1417e5825c1273c0b2b9a97d383c140ae1d72c0767cd093b563fbf8cf10036be98f69694652b236cf786ea1862e75c327b0cd05c8 SHA512 cece7550f49d235599875d7ee1d090a8bb5db49d90f4ef6b0aff54010e36ba93b7f9b9ba66c2389f84092c752c6657c2003123293d2af7bcd3eeecb77c0b1c22 +EBUILD vpopmail-5.4.33-r6.ebuild 7522 BLAKE2B fe99e39321e6f8cd240b2f498f4a0f50c5a0bc1e5ab426e4c99e5cc3a84a62f89e2fd09eb1c2802192796ff18c0ba1dcb5d3ba7aa5a98a65ada679ff563827ad SHA512 f0f2d3c9ca81f44c6a6d1000a285621caed73b5d1809f75cd4138346b6e9702cebc765f9c39dd5d52eaebd7b11b37f63aaee22638adaac48bf254d22d5986ef1 +EBUILD vpopmail-5.4.33-r7.ebuild 7541 BLAKE2B d342aa606fe1031a30b7fc7706a9cf9cc0af523e6a46571da5c7328ca711266e082d5e00f7be8b3f8d5157258f8d5ac5cf5e2d01689184bbdcf50c05cc404ca4 SHA512 2f526978a1586a3ab8b6c213b91cda1dd24d89b7386f8264538c406864f7d53e0b4cde7fb568e152118d45cb45f541fb1ac101e68298c12fa009283c41f1931d EBUILD vpopmail-5.4.33.ebuild 7678 BLAKE2B 0784b6ac7398d33dd6cb4dfd067d4778568a24ca2a1b71fbc52ff541bcbe5878056c74560270f44f7da7edb7ddb17955a4320d79ebdb92945cfddaa3f68ae372 SHA512 d0e9c724e49dda58c838c98e40da28638b8c7e5063517c03d5f26a5d471427af0795ec32c0f8711e1ae37e0e6a851807640d1081f5e834daedd89d82e4e43365 MISC metadata.xml 798 BLAKE2B 9d38645910ab93bb1557fb51895900fc5280086a702d1b561a7676206147498a6c1cba59dde1e3f320fc20d3099f304ec71056273cf4955530cc59f0cc0b4439 SHA512 b91e76e79c223a21648a2c380d4d81517b4bab65238b641734d173312e2ced4004e31b7d4aaced92962ae5cd65bfaafe7ab2f14612489d28598b8b1d0a9a5465 diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild index 8041e1622084..46dde6bd5e1a 100644 --- a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +KEYWORDS="~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86" IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin" REQUIRED_USE="mysql? ( !postgres )" diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild new file mode 100644 index 000000000000..6baa607e05c2 --- /dev/null +++ b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild @@ -0,0 +1,250 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools fixheadtails qmail + +HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail" +DESCRIPTION="Collection of programs to manage virtual email on Qmail servers" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86" +IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin" +REQUIRED_USE="mysql? ( !postgres )" + +DEPEND=" + acct-group/vpopmail + acct-user/vpopmail + virtual/qmail + maildrop? ( mail-filter/maildrop ) + mysql? ( dev-db/mysql-connector-c:0= ) + postgres? ( <dev-db/postgresql-9999:=[server] ) + spamassassin? ( mail-filter/spamassassin )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-5.4.9-access.violation.patch + "${FILESDIR}"/${PN}-lazy.patch + "${FILESDIR}"/${PN}-vpgsql.patch + "${FILESDIR}"/${PN}-double-free.patch + "${FILESDIR}"/${PN}-5.4.33-vdelivermail-add-static.patch + "${FILESDIR}"/${PN}-5.4.33-fix-those-vfork-instances-that-do-more-than-exec.patch + "${FILESDIR}"/${PN}-5.4.33-remove-unneeded-forward-declaration.patch + "${FILESDIR}"/${PN}-5.4.33-clean-up-calling-maildrop.patch + "${FILESDIR}"/${PN}-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch + "${FILESDIR}"/${PN}-5.4.33-strncat.patch + "${FILESDIR}"/${PN}-5.4.33-unistd.patch + "${FILESDIR}"/${PN}-5.4.33-check-crypt-return-value-for-NULL.patch + "${FILESDIR}"/${PN}-5.4.33-use-proper-printf-format-strings.patch +) +DOCS=( + ChangeLog + doc/. +) +HTML_DOCS=( + doc_html/. + man_html/. +) + +VPOP_HOME="/var/vpopmail" + +pkg_setup() { + upgradewarning +} + +src_prepare() { + default + + echo 'install-recursive: install-exec-am' \ + >>"${S}"/Makefile.am || die + + # fix maildir paths + sed -i -e 's|Maildir|.maildir|g' \ + vchkpw.c vconvert.c vdelivermail.c \ + vpopbull.c vpopmail.c vqmaillocal.c \ + vuserinfo.c maildirquota.c || die + + # remove vpopmail advertisement + sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \ + vdelivermail.c vpopbull.c vqmaillocal.c || die + + # automake/autoconf + mv "${S}"/configure.{in,ac} || die + sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \ + configure.ac || die + + # _FORTIFY_SOURCE + sed -i \ + -e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \ + vlistlib.c || die + + eautoreconf + ht_fix_file cdb/Makefile +} + +src_configure() { + local -a authopts + if use mysql; then + incdir=$(mysql_config --variable=pkgincludedir || die) + libdir=$(mysql_config --variable=pkglibdir || die) + authopts+=( "--enable-auth-module=mysql" + "--enable-incdir=${incdir}" + "--enable-libdir=${libdir}" + "--enable-sql-logging" + "--enable-valias" + "--disable-mysql-replication" + "--enable-mysql-limits" + ) + elif use postgres; then + libdir=$(pg_config --libdir || die) + incdir=$(pg_config --pkgincludedir || die) + authopts+=( "--enable-auth-module=pgsql" + "--enable-incdir=${incdir}" + "--enable-libdir=${libdir}" + "--enable-sql-logging" + "--enable-valias" + ) + else + authopts+=( "--enable-auth-module=cdb" ) + fi + + econf ${authopts[@]} \ + --sysconfdir=${VPOP_HOME}/etc \ + --enable-non-root-build \ + --enable-qmaildir=${QMAIL_HOME} \ + --enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \ + --enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \ + --enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \ + --enable-vpopuser=vpopmail \ + --enable-vpopgroup=vpopmail \ + --enable-many-domains \ + --enable-file-locking \ + --enable-file-sync \ + --enable-md5-passwords \ + --enable-logging \ + --enable-auth-logging \ + --enable-log-name=vpopmail \ + --enable-qmail-ext \ + --disable-tcpserver-file \ + --disable-roaming-users \ + $(use_enable ipalias ip-alias-domains) \ + $(use_enable clearpasswd clear-passwd) \ + $(use_enable maildrop) \ + $(use_enable maildrop maildrop-prog /usr/bin/maildrop) \ + $(use_enable spamassassin) +} + +src_install() { + emake DESTDIR="${D}" install + keepdir "${VPOP_HOME}"/domains + + # install helper script for maildir conversion + into "${VPOP_HOME}" + dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh + into /usr + + mv doc/doc_html/ doc/man_html/ . || die + einstalldocs + rm -r "${D}/${VPOP_HOME}"/doc || die + + # create /etc/vpopmail.conf + if use mysql; then + insinto /etc + newins "${D}${VPOP_HOME}"/etc/vpopmail.mysql vpopmail.conf + dosym ../../../etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql + + sed 's/^[^#]/# &/' -i "${D}"/etc/vpopmail.conf || die + echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf || die + echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die + echo '# Write DB' >> "${D}"/etc/vpopmail.conf || die + echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die + + # lock down perms + fperms 640 /etc/vpopmail.conf + fowners root:vpopmail /etc/vpopmail.conf + fi + + insinto "${VPOP_HOME}"/etc + doins vusagec.conf + dosym .."${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf + sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf || die + + einfo "Installing env.d entry" + doenvd "${FILESDIR}"/99vpopmail + + einfo "Locking down vpopmail permissions" + fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include} + fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw + fperms 4711 "${VPOP_HOME}"/bin/vchkpw +} + +pkg_postinst() { + if use mysql ; then + elog + elog "You have 'mysql' turned on in your USE" + elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'" + elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file" + elog + elog "First log into mysql as your mysql root user and pass. Then:" + elog "> create database vpopmail;" + elog "> use mysql;" + elog "> grant select, insert, update, delete, create, drop on vpopmail.* to" + elog " vpopmail@localhost identified by 'your password';" + elog "> flush privileges;" + elog + elog "If you have problems with vpopmail not accepting mail properly," + elog "please ensure that /etc/vpopmail.conf is chmod 640 and" + elog "owned by root:vpopmail" + elog + fi + + # do this for good measure + if [[ -e /etc/vpopmail.conf ]]; then + chmod 640 /etc/vpopmail.conf || die + chown root:vpopmail /etc/vpopmail.conf || die + fi + + upgradewarning +} + +pkg_postrm() { + elog "The vpopmail DATA will NOT be removed automatically." + elog "You can delete them manually by removing the ${VPOP_HOME} directory." +} + +upgradewarning() { + if has_version "<=net-mail/vpopmail-5.2.1-r8"; then + ewarn + ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older" + ewarn "The internal structure of the mail storage has changed for" + ewarn "consistancy with the rest of Gentoo! Please review and utilize the " + ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh" + ewarn "to upgrade your system! (It can do conversions both ways)." + ewarn "You should be able to run it right away without any changes." + ewarn + fi + + elog + elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider" + elog "using net-mail/relay-ctrl instead." + elog + + if use mysql; then + if has_version "<=net-mail/vpopmail-5.4.17"; then + elog + elog "If you are upgrading from 5.4.17 or older, you have to fix your" + elog "MySQL tables, please see the UPGRADE file in the documentation!" + elog + fi + fi + + ewarn + ewarn "Newer versions of vpopmail contain a quota daemon called vusaged." + ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled" + ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!" + ewarn "Otherwise mail delivery WILL BREAK" + ewarn +} diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild index 6e9edf574f83..ceca711c4a4f 100644 --- a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools eutils fixheadtails qmail +inherit autotools fixheadtails qmail HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail" DESCRIPTION="Collection of programs to manage virtual email on Qmail servers" @@ -21,7 +21,7 @@ DEPEND=" virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( dev-db/mysql-connector-c:0= ) - postgres? ( dev-db/postgresql:=[server] ) + postgres? ( dev-db/postgresql:= ) spamassassin? ( mail-filter/spamassassin )" RDEPEND="${DEPEND}" @@ -37,6 +37,8 @@ PATCHES=( "${FILESDIR}"/${PN}-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch "${FILESDIR}"/${PN}-5.4.33-strncat.patch "${FILESDIR}"/${PN}-5.4.33-unistd.patch + "${FILESDIR}"/${PN}-5.4.33-check-crypt-return-value-for-NULL.patch + "${FILESDIR}"/${PN}-5.4.33-use-proper-printf-format-strings.patch ) DOCS=( ChangeLog @@ -57,7 +59,7 @@ src_prepare() { default echo 'install-recursive: install-exec-am' \ - >>"${S}"/Makefile.am + >>"${S}"/Makefile.am || die # fix maildir paths sed -i -e 's|Maildir|.maildir|g' \ @@ -70,7 +72,7 @@ src_prepare() { vdelivermail.c vpopbull.c vqmaillocal.c || die # automake/autoconf - mv -f "${S}"/configure.{in,ac} || die + mv "${S}"/configure.{in,ac} || die sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \ configure.ac || die @@ -84,30 +86,32 @@ src_prepare() { } src_configure() { - local authopts + local -a authopts if use mysql; then incdir=$(mysql_config --variable=pkgincludedir || die) libdir=$(mysql_config --variable=pkglibdir || die) - authopts+=" --enable-auth-module=mysql" - authopts+=" --enable-incdir=${incdir}" - authopts+=" --enable-libdir=${libdir}" - authopts+=" --enable-sql-logging" - authopts+=" --enable-valias" - authopts+=" --disable-mysql-replication" - authopts+=" --enable-mysql-limits" + authopts+=( "--enable-auth-module=mysql" + "--enable-incdir=${incdir}" + "--enable-libdir=${libdir}" + "--enable-sql-logging" + "--enable-valias" + "--disable-mysql-replication" + "--enable-mysql-limits" + ) elif use postgres; then libdir=$(pg_config --libdir || die) incdir=$(pg_config --pkgincludedir || die) - authopts+=" --enable-auth-module=pgsql" - authopts+=" --enable-incdir=${incdir}" - authopts+=" --enable-libdir=${libdir}" - authopts+=" --enable-sql-logging" - authopts+=" --enable-valias" + authopts+=( "--enable-auth-module=pgsql" + "--enable-incdir=${incdir}" + "--enable-libdir=${libdir}" + "--enable-sql-logging" + "--enable-valias" + ) else - authopts+=" --enable-auth-module=cdb" + authopts+=( "--enable-auth-module=cdb" ) fi - econf ${authopts} \ + econf ${authopts[@]} \ --sysconfdir=${VPOP_HOME}/etc \ --enable-non-root-build \ --enable-qmaildir=${QMAIL_HOME} \ @@ -124,6 +128,7 @@ src_configure() { --enable-auth-logging \ --enable-log-name=vpopmail \ --enable-qmail-ext \ + --enable-onchange-script \ --disable-tcpserver-file \ --disable-roaming-users \ $(use_enable ipalias ip-alias-domains) \ @@ -145,23 +150,18 @@ src_install() { mv doc/doc_html/ doc/man_html/ . || die einstalldocs rm -r "${D}/${VPOP_HOME}"/doc || die - dosym \ - $(realpath --relative-to "${D}/${VPOP_HOME}"/ "${D}"/usr/share/doc/${PF}/ || die) \ - "${VPOP_HOME}"/doc # create /etc/vpopmail.conf if use mysql; then insinto /etc newins "${D}${VPOP_HOME}"/etc/vpopmail.mysql vpopmail.conf - dosym \ - $(realpath --relative-to "${D}/${VPOP_HOME}"/etc/ "${D}"/etc/vpopmail.conf || die) \ - "${VPOP_HOME}"/etc/vpopmail.mysql + dosym ../../../etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql - sed -e '12d' -i "${D}"/etc/vpopmail.conf || die - echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf - echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf - echo '# Write DB' >> "${D}"/etc/vpopmail.conf - echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf + sed 's/^[^#]/# &/' -i "${D}"/etc/vpopmail.conf || die + echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf || die + echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die + echo '# Write DB' >> "${D}"/etc/vpopmail.conf || die + echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die # lock down perms fperms 640 /etc/vpopmail.conf @@ -170,11 +170,10 @@ src_install() { insinto "${VPOP_HOME}"/etc doins vusagec.conf - dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf + dosym .."${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf || die einfo "Installing env.d entry" - dodir /etc/env.d doenvd "${FILESDIR}"/99vpopmail einfo "Locking down vpopmail permissions" |