From cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jun 2018 09:27:03 +0100 Subject: gentoo resync : 09.06.2018 --- net-mail/vpopmail/Manifest | 7 +- net-mail/vpopmail/files/vpopmail-double-free.patch | 4 +- net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild | 28 +- net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild | 305 +++++++++++++++++++++ net-mail/vpopmail/vpopmail-5.4.33.ebuild | 26 +- 5 files changed, 342 insertions(+), 28 deletions(-) create mode 100644 net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild (limited to 'net-mail/vpopmail') diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest index ea2c3221027f..6f45286cfd9c 100644 --- a/net-mail/vpopmail/Manifest +++ b/net-mail/vpopmail/Manifest @@ -1,10 +1,11 @@ AUX 99vpopmail 64 BLAKE2B ab9b8b28494fa8093f1a72e582fc10787eb1f9814b860b1c03f4e336c6a8563b50b34fcc2c33d95e45703ebad5b8155d9575551c894af4e7c12b52748b526216 SHA512 8e9323006ddafae6e4ee8da2e0c9753ce11fd3f6e7c8bb6931ccc147ab6c9782c71d704222343be902f8784aa27a4425fd04a1f11cff5421dfc25fd76d3de953 AUX vpopmail-5.4.9-access.violation.patch 918 BLAKE2B cb416e6fdbad9405ed01768e070344b2378bca19db3ec80f48e3c93f7fa5d28b61d0d4e73e95716d5db8c77d2ad40f086f4af00f7452fa2e1317f03e69f7f6f0 SHA512 8d877f5057550d25a77a617e81913e9fd94875ab1f1dd6c41e5d49756ff89cd2e089c48d48c81f990d901d5fcfbd0c467b2b0d1a3cdf8c7e78581c1f368e64fd AUX vpopmail-Maildir-dotmaildir-fix.sh 1346 BLAKE2B efc7c1e97c201e9f36c3b817538b87c5522b0b2b16b681e0bbbf77bdd8537634d56cbe29b7eb26d657d83fb696b0fc00724dea9d03f246794c5631f8c2ca7ce1 SHA512 201ad103157add727560bc1596042ae621d1645abf912aa3b3ec1af71aaf65dff92c967f000b7a126e9f2eb5e351838c78ffee855402d93bdcf89e96ebb0d0e9 -AUX vpopmail-double-free.patch 411 BLAKE2B 682f7280e6d0d7010157e3469d16d3d9dd6538c19c2b78a262282ab559feb213329bcccca3808c7ca23af0dea026b0ae62a611cd6c9b25e6441818b9c94c64e0 SHA512 f12c29172e0bf0da173847c30db552dfb49e437805c74e0d03064dffb7a1bf71b0d897a5f13d019fd25cb103e394f0f869778de42288e6c6cc3e8612037b5190 +AUX vpopmail-double-free.patch 395 BLAKE2B e17be028bf2ef0b4770c78bbfbeb6f8024db738e50dee7a23728543d1f3f1415a725cdbe0d8b2efff77d86d685a95a5bc9dde0eacf55dd677c090e72e79980c4 SHA512 7c6f6359e6512901e457b76c97826315a9856fc41bf842438fb696f16facebf691a1aa0f227773b6138f52f8252558a5747eeb0edc2cf1800037cf31e61782a8 AUX vpopmail-lazy.patch 324 BLAKE2B 171579db62d8582612c4b5a1bccdb57b4f08317b0c37ac66298717b1c175204de358c1299e380c191603538d3e6d795dbacde25ef672c6809d85bf7a055c7630 SHA512 42f1e24ee850b9e858a271d734246981c506d74556a62d0124ebe8e842553e32e57603975545d8f49d76e3cca832a73ef61ef191a0a1cf07f9343fe609ecc0c5 AUX vpopmail-vpgsql.patch 2666 BLAKE2B cad5f0152a3d0a1bc83972aaea7dacf55f1e9f2f2e76e16da9a4cda0f7e9cc609c2d53edc91241566c68cb653910947c74387d23e6d59cd26f8322695c5bc9b8 SHA512 a8067aabfac181637f1366be0215c885ad380e44bbae1a69f9b0438b0a99cd194c2ce2068acf25142c9bfe6623ca8a77b1a9b82790f7faeb6e921c20cd1c1e20 DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab -EBUILD vpopmail-5.4.33-r1.ebuild 7929 BLAKE2B 9eb9f3c9ac772e1404fd5578cb2e335218ad9eb358575aeb1351b71ddcd6d0108d0c2582ae054d19bd7a9e0c20b9ae44737ce520dc84aee81c4d92f470d7f275 SHA512 0ba88759c94ab55f6f4e0cfdd4118c80bcbec34117a338e5ab423bb0e70cbcc57ffde9ccdbe765e7c834e5aec30130b42fde04c19cd045585bb38d9efe196a0b -EBUILD vpopmail-5.4.33.ebuild 7532 BLAKE2B 6f4019273f02c2127a2aab7825133b3a10dfc8139a2add4ffd0cfb8b7faaeffc021d98deb5dfdb3330ff956d5cfacde747a1e56707203b595f6472e0f6a5b93e SHA512 d9ee0f65e07ebc0de79122cc34502bbfd208fb28db7bbe68c8f9f6a5b768eae555847dc44a27e815835bc297a119756c657a842a81ab4427ef3e22a21d69a4cf +EBUILD vpopmail-5.4.33-r1.ebuild 8059 BLAKE2B f8933d6e46ae839bc4280f21013145c0d2d59dad9121028e0e7f2d331c2fa26eeb236f8491554e52ca7f7d8b82cef2a233c775dea853a29a51f508dd373cccba SHA512 4b922cfade81bb7fbc0d5123346d657873dc49dade23882a75faff2a4b81e220d16b661175f06524320ab78297f8066770a7a9201e235dc34ec021d174fe1408 +EBUILD vpopmail-5.4.33-r2.ebuild 9073 BLAKE2B 9d9e0ad5a29f4cf2e9f57f3f174d667755124c59e265040af5b777b32bf03981126df014f2b9ebe44e8f5ae65e93a7fbcd6fd9c3f7e82ba05c2e17e38f8996fb SHA512 9ba37070099d91fe574db65d5c2c05896263ea77ed69028d40ba54b661b053fdfbe9ea51753322b19b890107034f5441641b9346cb06abf88de394adc163f3de +EBUILD vpopmail-5.4.33.ebuild 7658 BLAKE2B 0c3d9c5736e549d84be9604ece0a11fb064b4966f600fea5c1456ac92ddc25a4488c0fe328b53d12869a229426d98f333170b703484286804db1962e1c72f358 SHA512 8ad7fed94d1cf598ff019c04363ad4d3262716c4d460597c3886826d12b746f1b4151813526c7923225adc29165ba91db2d98bc988b8545bc659df0f5fcee0f6 MISC metadata.xml 680 BLAKE2B 66efc812c404922158bcef2b9f264e6e90c7c4af1231b7b558d7c8ac8d3d6e21b78f83d350f77278a3e79f66ef865c22f3666a469551e105c59d079ab652ad07 SHA512 66869b1dd1465c1914461874ca44988a1cf3cc34ca53cdaf2fc2851d6580d756ac1446cedc7168f50bcdfc82821f7ebb109276deabdc099325d0848a97a63ffd diff --git a/net-mail/vpopmail/files/vpopmail-double-free.patch b/net-mail/vpopmail/files/vpopmail-double-free.patch index d7d118578d73..16a40b82c4f4 100644 --- a/net-mail/vpopmail/files/vpopmail-double-free.patch +++ b/net-mail/vpopmail/files/vpopmail-double-free.patch @@ -1,7 +1,7 @@ diff --git a/trunk/vpalias.c b/trunk/vpalias.c index 9853f14..e9bd81f 100644 ---- a/trunk/vpalias.c -+++ b/trunk/vpalias.c +--- vpalias.c ++++ vpalias.c @@ -369,7 +369,7 @@ char *valias_select_names( char *domain ) } } diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild index ecc09b21af25..78bc92f714ee 100644 --- a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -6,7 +6,7 @@ EAPI=5 inherit autotools eutils fixheadtails qmail user HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail" -DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers" +DESCRIPTION="Collection of programs to manage virtual email on Qmail servers" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" @@ -18,7 +18,7 @@ REQUIRED_USE="mysql? ( !postgres )" DEPEND="virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) - postgres? ( dev-db/postgresql[server] ) + postgres? ( dev-db/postgresql:=[server] ) spamassassin? ( mail-filter/spamassassin )" RDEPEND="${DEPEND}" @@ -28,7 +28,6 @@ VPOP_DEFAULT_HOME="/var/vpopmail" vpopmail_set_homedir() { VPOP_HOME=$(egethome vpopmail) if [[ -z "${VPOP_HOME}" ]]; then - ebeep eerror "vpopmail's home directory is null in passwd data!" eerror "You probably want to check that out." eerror "Continuing with default." @@ -82,14 +81,15 @@ src_configure() { local authopts if use mysql; then - mysqlinc=$(mysql_config --include) - authopts="--enable-incdir=${mysqlinc#-I}" + incdir=$(mysql_config --variable=pkgincludedir) + libdir=$(mysql_config --variable=pkglibdir) authopts+=" --enable-auth-module=mysql" - authopts+=" --enable-libdir=/usr/$(get_libdir)/mysql" - authopts+=" --enable-sql-logging" + authopts+=" --enable-incdir=${incdir}" + authopts+=" --enable-libdir=${libdir}" + authopts+=" --enable-sql-logging" authopts+=" --enable-valias" - authopts+=" --disable-mysql-replication" - authopts+=" --enable-mysql-limits" + authopts+=" --disable-mysql-replication" + authopts+=" --enable-mysql-limits" elif use postgres; then pglibdir=$(pg_config --libdir) authopts+=" --enable-auth-module=pgsql" @@ -140,13 +140,17 @@ src_install() { dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README* dohtml doc/doc_html/* doc/man_html/* rm -rf "${D}/${VPOP_HOME}"/doc - dosym /usr/share/doc/${PF}/ "${VPOP_HOME}"/doc + dosym \ + $(realpath --relative-to "${D}/${VPOP_HOME}"/ "${D}"/usr/share/doc/${PF}/) \ + "${VPOP_HOME}"/doc # create /etc/vpopmail.conf if use mysql; then dodir /etc mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf - dosym /etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql + dosym \ + $(realpath --relative-to "${D}/${VPOP_HOME}"/etc/ "${D}"/etc/vpopmail.conf) \ + "${VPOP_HOME}"/etc/vpopmail.mysql sed -e '12d' -i "${D}"/etc/vpopmail.conf echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild new file mode 100644 index 000000000000..244a01190981 --- /dev/null +++ b/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild @@ -0,0 +1,305 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools eutils fixheadtails qmail user + +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="virtual/qmail + maildrop? ( mail-filter/maildrop ) + mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c[mysqlcompat] ) ) + postgres? ( dev-db/postgresql:=[server] ) + spamassassin? ( mail-filter/spamassassin )" +RDEPEND="${DEPEND}" + +PATCHES=( + "-p0" + "--" + "${FILESDIR}"/${PN}-5.4.9-access.violation.patch + "${FILESDIR}"/${PN}-lazy.patch + "${FILESDIR}"/${PN}-vpgsql.patch + "${FILESDIR}"/${PN}-double-free.patch +) +DOCS=( + ChangeLog + doc/AUTHORS + doc/FAQ + doc/INSTALL + doc/README.activedirectory + doc/README.authvchkpw + doc/README.filelocking + doc/README.ipaliasdomains + doc/README.ldap + doc/README.maildrop + doc/README.mysql + doc/README.onchange + doc/README.oracle + doc/README.pgsql + doc/README.qmail-default + doc/README.quotas + doc/README.roamingusers + doc/README.spamassassin + doc/README.sybase + doc/README.vdelivermail + doc/README.vlimits + doc/README.vpopmaild + doc/README.vqmaillocal +) +HTML_DOCS=( + doc/doc_html/vpopmail5.abw + doc/doc_html/vpopmailapi.png + doc/doc_html/vpopmail.html + doc/man_html/clearopensmtp.html + doc/man_html/index.html + doc/man_html/vaddaliasdomain.html + doc/man_html/vadddomain.html + doc/man_html/vadduser.html + doc/man_html/vchkpw.html + doc/man_html/vconvert.html + doc/man_html/vdeldomain.html + doc/man_html/vdelivermail.html + doc/man_html/vdeluser.html + doc/man_html/vpasswd.html + doc/man_html/vpopbull.html + doc/man_html/vsetuserquota.html +) + +# This makes sure the variable is set, and that it isn't null. +VPOP_DEFAULT_HOME="/var/vpopmail" + +vpopmail_set_homedir() { + VPOP_HOME=$(egethome vpopmail) + if [[ -z "${VPOP_HOME}" ]]; then + eerror "vpopmail's home directory is null in passwd data!" + eerror "You probably want to check that out." + eerror "Continuing with default." + VPOP_HOME="${VPOP_DEFAULT_HOME}" + else + einfo "Setting VPOP_HOME to: $VPOP_HOME" + fi +} + +pkg_setup() { + enewgroup vpopmail 89 + enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail + upgradewarning +} + +src_prepare() { + default + + echo 'install-recursive: install-exec-am' \ + >>"${S}"/Makefile.am + + # 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 -f "${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() { + vpopmail_set_homedir + + local authopts + if use mysql; then + incdir=$(mysql_config --variable=pkgincludedir) + libdir=$(mysql_config --variable=pkglibdir) + 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" + elif use postgres; then + libdir=$(pg_config --libdir) + incdir=$(pg_config --pkgincludedir) + authopts+=" --enable-auth-module=pgsql" + authopts+=" --enable-incdir=${incdir}" + authopts+=" --enable-libdir=${libdir}" + authopts+=" --enable-sql-logging" + authopts+=" --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() { + vpopmail_set_homedir + + 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 + + einstalldocs + rm -rf "${D}/${VPOP_HOME}"/doc + dosym \ + $(realpath --relative-to "${D}/${VPOP_HOME}"/ "${D}"/usr/share/doc/${PF}/) \ + "${VPOP_HOME}"/doc + + # create /etc/vpopmail.conf + if use mysql; then + dodir /etc + mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf + dosym \ + $(realpath --relative-to "${D}/${VPOP_HOME}"/etc/ "${D}"/etc/vpopmail.conf) \ + "${VPOP_HOME}"/etc/vpopmail.mysql + + sed -e '12d' -i "${D}"/etc/vpopmail.conf + 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 + + # 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 + + einfo "Installing env.d entry" + dodir /etc/env.d + 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 + chown root:vpopmail /etc/vpopmail.conf + fi + + upgradewarning +} + +pkg_postrm() { + vpopmail_set_homedir + + elog "The vpopmail DATA will NOT be removed automatically." + elog "You can delete them manually by removing the ${VPOP_HOME} directory." +} + +upgradewarning() { + 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 + + 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 + elog + elog "If you are upgrading from 5.4.17 or older, you have to fix your" + elog "MySQL tables:" + elog + elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;' + elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;' + elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;' + elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;' + elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;' + elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;' + elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,' + elog ' ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,' + elog ' ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;' + elog + 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.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild index 0084ce003a76..bfc60278c208 100644 --- a/net-mail/vpopmail/vpopmail-5.4.33.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.33.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=4 @@ -6,7 +6,7 @@ EAPI=4 inherit autotools eutils fixheadtails qmail user HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail" -DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers" +DESCRIPTION="Collection of programs to manage virtual email on Qmail servers" SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" @@ -26,7 +26,6 @@ VPOP_DEFAULT_HOME="/var/vpopmail" vpopmail_set_homedir() { VPOP_HOME=$(egethome vpopmail) if [[ -z "${VPOP_HOME}" ]]; then - ebeep eerror "vpopmail's home directory is null in passwd data!" eerror "You probably want to check that out." eerror "Continuing with default." @@ -76,14 +75,15 @@ src_configure() { local authopts if use mysql; then - authopts="$(mysql_config --include)" - authopts="--enable-incdir=${authopts#-I}" + incdir=$(mysql_config --variable=pkgincludedir) + libdir=$(mysql_config --variable=pkglibdir) authopts+=" --enable-auth-module=mysql" - authopts+=" --enable-libdir=/usr/$(get_libdir)/mysql" - authopts+=" --enable-sql-logging" + authopts+=" --enable-incdir=${incdir}" + authopts+=" --enable-libdir=${libdir}" + authopts+=" --enable-sql-logging" authopts+=" --enable-valias" - authopts+=" --disable-mysql-replication" - authopts+=" --enable-mysql-limits" + authopts+=" --disable-mysql-replication" + authopts+=" --enable-mysql-limits" else authopts="--enable-auth-module=cdb" fi @@ -129,13 +129,17 @@ src_install() { dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README* dohtml doc/doc_html/* doc/man_html/* rm -rf "${D}/${VPOP_HOME}"/doc - dosym /usr/share/doc/${PF}/ "${VPOP_HOME}"/doc + dosym \ + $(realpath --relative-to "${D}/${VPOP_HOME}"/ "${D}"/usr/share/doc/${PF}/) \ + "${VPOP_HOME}"/doc # create /etc/vpopmail.conf if use mysql; then dodir /etc mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf - dosym /etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql + dosym \ + $(realpath --relative-to "${D}/${VPOP_HOME}"/etc/ "${D}"/etc/vpopmail.conf) \ + "${VPOP_HOME}"/etc/vpopmail.mysql sed -e '12d' -i "${D}"/etc/vpopmail.conf echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf -- cgit v1.2.3