diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:11:03 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 22:11:03 +0100 |
commit | 2929788def9a92c1eb237eed93fbdb0c02838bbf (patch) | |
tree | 166b01591366d3479084ea774c888bc84aaa8d4f /net-mail/vpopmail | |
parent | ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030 (diff) |
Revert "gentoo resync : 13.10.2019"
This reverts commit ab499d7cfb9ad23e83cf7a4f5052bdf1b4c42030.
Diffstat (limited to 'net-mail/vpopmail')
-rw-r--r-- | net-mail/vpopmail/Manifest | 9 | ||||
-rw-r--r-- | net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch | 2 | ||||
-rw-r--r-- | net-mail/vpopmail/files/vpopmail-lazy.patch | 2 | ||||
-rw-r--r-- | net-mail/vpopmail/files/vpopmail-vpgsql.patch | 2 | ||||
-rw-r--r-- | net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild | 304 | ||||
-rw-r--r-- | net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild | 25 |
6 files changed, 334 insertions, 10 deletions
diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest index d45a8cac22ec..77e04e85d09b 100644 --- a/net-mail/vpopmail/Manifest +++ b/net-mail/vpopmail/Manifest @@ -6,12 +6,13 @@ AUX vpopmail-5.4.33-remove-unneeded-forward-declaration.patch 771 BLAKE2B 565944 AUX vpopmail-5.4.33-strncat.patch 6266 BLAKE2B 98656fb8d963df082ec48fbf7918423c8aeeeab6aebaab295f819b213e09d20e7b786057bf2c2fcf0a276cf9fc65c10978957cdb37dbc7cee57c0ff3eef9e78f SHA512 831ec541a52fe5e72f97832927ce0c6b8a90c2954d715be1c088f5886bba6058b313e4364e164c0af90d1de90f0890f9a1b64d1985ef1d448ac34e5951b0a16b AUX vpopmail-5.4.33-unistd.patch 266 BLAKE2B 19dd429573f0b45b93cd35d522787029ba445c2f363a7a270ab1c547e4f0c2a7be89c287642a3e5e8d69ea59a82271aff271670d19d3850146e92a3389aa3dc8 SHA512 1cc6e6a067cabc004224c022af8c3ee90125a3b3daa9c346ca8a57962be30681a6181605624fc09a8992a7e3d3e7b3d8d6c0ce95095399c1a5dec798e9d6f6cd AUX vpopmail-5.4.33-vdelivermail-add-static.patch 1017 BLAKE2B 279bd5c2b894268910a89d1df206289fce475df9b655febc27eca6f1ecf1ecd6bc55e250d0eeb5e86e89a5df0543a08af34b379888ecb4590b91ba62b521b9f2 SHA512 bcf80e30d5010decad135a84527985a29d61d054a0396af662f33bc4a63c3dc1dd0585e884376f25babf0ca263d2496991b16d1c215962a64597f4cd1cd50ca0 -AUX vpopmail-5.4.9-access.violation.patch 918 BLAKE2B ebf8c80ed2668d0bc96930493bd46788abf58d45defd5cb3ebcff0b67c0c31d7473b7dbf07c958366e18dc7ca56434a6e45b9bf7c9d920da993b8d51927df95a SHA512 6587d2a4ac7b6943b07db2334750db83aaf2e974053732696ad17846da29250a82ac91598f25f0cf1caafc731fdb89ec016e7ba6ff6f70ab269af3c0a15e80b5 +AUX vpopmail-5.4.9-access.violation.patch 922 BLAKE2B 038e5ee8483aceb521d2b8956af3fc2d166952d7ebba58960c247a90bda5ee73f2d33605c5e66f4ee667971a695251e1ef6b978d342bad9b4f34f0dfed0a6678 SHA512 eb9a37e3c2b5ad6faa9dcf8f07b240325ee2a3924dfc2abb3245972f8a892b7864f160c0475c1cbd3c5544f0844c20e20046b6a192b241bc8a3c90efe6797203 AUX vpopmail-Maildir-dotmaildir-fix.sh 1346 BLAKE2B efc7c1e97c201e9f36c3b817538b87c5522b0b2b16b681e0bbbf77bdd8537634d56cbe29b7eb26d657d83fb696b0fc00724dea9d03f246794c5631f8c2ca7ce1 SHA512 201ad103157add727560bc1596042ae621d1645abf912aa3b3ec1af71aaf65dff92c967f000b7a126e9f2eb5e351838c78ffee855402d93bdcf89e96ebb0d0e9 AUX vpopmail-double-free.patch 399 BLAKE2B ac2d7ad9b8b3e9cf25fbd973c7e42e48c1107edfca033126fb420420a9b1eb8866a53552df110e8dca8cced2d653181eb2a6dfc3c07e33a958d7f86ad4035285 SHA512 df7a99357d4673f9d5c4619d67e418a769b2ab72c95d0a7477f186bf15fc4d0f6bec93a64970660439c25573dc0cd2994f5f4aca335723eeaec6761a7838f332 -AUX vpopmail-lazy.patch 323 BLAKE2B c35a878e2aa69a9ba0e108fdf4f0f8de85965588acc8d2c3fecb1d152e2f0e9585d78b9ce5b2314735de8b70710687e0a75358ef3029dd96eaa704941df00bd7 SHA512 794ef15920ac565073d871a946df53395afb0630d561343f4d164af3287d1665e115ad42d7a2218306cedb5dc795b10d9c15852b69fd649854ddb0c18dc0b2dd -AUX vpopmail-vpgsql.patch 2668 BLAKE2B 0f69aa8642d15d740e0e5944a438854fde240831176ae2152cc805809e5a87ecd8ce5c6791f4c4e53d2027393d158e28e9dbec49d0efd7c4c2d50c9eeb4cf10d SHA512 9f02f9f9ab186791fe071ee5cb27334144727e81f0bbd6b8f5ce472368f892f5396a225c6c1af9d5b7a66bf66e7be50aef146d7635132fab9d91f265b68af1d9 +AUX vpopmail-lazy.patch 328 BLAKE2B 90cc8d6329e04348291df0ddeb5deb385f33cc7601b97fc6237233fcd51c12fccad824b609911aa3025912cd16a06fcc6c45dcc3390e190343f3ebf50e2b0619 SHA512 e89756acf8be564db00883f8e68a50bc96abb50b682a181c191f12c39f16ae4c71d5861fadc3279dd4a7e5ee5b513f502905da36006da583f239c396618133d6 +AUX vpopmail-vpgsql.patch 2670 BLAKE2B c295ed94b878f4f9cad64cc36647c470718043b889331c9eb94bfc762b4a6e317c7f35a7bbf0bc67569ec72533b3f25abdbbf1f5218cfa8af097b417cd4909e7 SHA512 45f516310f5cf47be7a297022b17e353d2794d156ece4d3b163747545379a018927fbf37b9986e8c939a987b07b13e959d8fd5322c23ce96b441f75cfe42448d DIST vpopmail-5.4.33.tar.gz 612271 BLAKE2B 1dacc512c5d64e8f73a0630209407161afd87ebec510cdf57cb8aaa8be9b911141612d69892981a2545fc263e798f6e7dc9d5a283e1177e223f4a2e1fac80017 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab -EBUILD vpopmail-5.4.33-r4.ebuild 7487 BLAKE2B 4c2c98e8045f81509a0f9bb1545dacd3faa13ff3babd339fc13669bd204266be2d3e0ded6a59996660f04aacfcc4469b33cae11f3cafa092ec4a157ef74cf6eb SHA512 b7fa9a8ebda554f1fb07c83100252594093877589173f22291fb1936e32768457d4326ab11f7ca84456e09082e54217e05635d6e66105bf87b2d82398c437a3f +EBUILD vpopmail-5.4.33-r3.ebuild 9013 BLAKE2B 52cf5e2fd6d298bc6360e5438c9f3361c6a8e942e8c1f94ce555391de350860469016b54d4cd133b2e045bb8ecc2289e547d93af9b8efa41ebc10d1bf7ca7d9c SHA512 d0e9373f3a207130c8281c91b955f62cccd40d7ad61a523aa823610783f2b0f675bfab038857693ece63a12e6022f6a7a8d177be1469b38327aeadaaee9d93d1 +EBUILD vpopmail-5.4.33-r4.ebuild 8003 BLAKE2B c1795b13757f230db9a86833c8cea20f78214303ff4d5a7d3d11210494c464661da9ae1ea1802c87a12584d274584c73933128624ca2b50b201a5f7eee5acc0f SHA512 79b283d5c5f5fd3ac42b950c517e1bdc1c71fc5db570722fbc7001175473974d48bdd2f392fd33a0322b595dbc65e34e07b31d1f3511d8b05030c466330988aa EBUILD vpopmail-5.4.33.ebuild 7658 BLAKE2B 585b4301997bcc0a13c40143338e29f2a054773c7477f3106dfd4ae71f787c15152f1fb9e84cf123c71092c42e0e42e96857ac5cb2ff1d918c87ffcb6f7c30fe SHA512 04ffa6437901fdb9f7d5a7f445dd60ff5f443d8c69add9a26d28c01f777195ea4d7f57bfef988c1452553b15d9a4fb8057ace7b6a004382f71e836fa4b9f9fdc MISC metadata.xml 798 BLAKE2B 9d38645910ab93bb1557fb51895900fc5280086a702d1b561a7676206147498a6c1cba59dde1e3f320fc20d3099f304ec71056273cf4955530cc59f0cc0b4439 SHA512 b91e76e79c223a21648a2c380d4d81517b4bab65238b641734d173312e2ced4004e31b7d4aaced92962ae5cd65bfaafe7ab2f14612489d28598b8b1d0a9a5465 diff --git a/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch b/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch index 5363267a21ae..ed7c62e76396 100644 --- a/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch +++ b/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch @@ -1,4 +1,4 @@ ---- a/configure.in 2004-06-30 22:11:08.000000000 -0700 +--- a/configure.in.org 2004-06-30 22:11:08.000000000 -0700 +++ b/configure.in 2004-08-22 16:45:36.279473008 -0700 @@ -463,16 +463,16 @@ if test ! -d $vpopmaildir diff --git a/net-mail/vpopmail/files/vpopmail-lazy.patch b/net-mail/vpopmail/files/vpopmail-lazy.patch index 7db04f8af460..4f4888ea6ba6 100644 --- a/net-mail/vpopmail/files/vpopmail-lazy.patch +++ b/net-mail/vpopmail/files/vpopmail-lazy.patch @@ -1,4 +1,4 @@ ---- a/Makefile.am 2005-11-18 03:19:43.000000000 +0100 +--- a/Makefile.am.orig 2005-11-18 03:19:43.000000000 +0100 +++ b/Makefile.am 2005-11-18 03:20:18.000000000 +0100 @@ -33,6 +33,7 @@ diff --git a/net-mail/vpopmail/files/vpopmail-vpgsql.patch b/net-mail/vpopmail/files/vpopmail-vpgsql.patch index 941cd9708ae9..8869356c7e42 100644 --- a/net-mail/vpopmail/files/vpopmail-vpgsql.patch +++ b/net-mail/vpopmail/files/vpopmail-vpgsql.patch @@ -1,4 +1,4 @@ ---- a/vpgsql.c 2011-02-28 18:00:45.000000000 +0100 +--- a/vpgsql.c.2 2011-02-28 18:00:45.000000000 +0100 +++ b/vpgsql.c 2011-08-06 05:46:49.959717911 +0200 @@ -392,10 +392,10 @@ #endif diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild new file mode 100644 index 000000000000..eca83681371d --- /dev/null +++ b/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild @@ -0,0 +1,304 @@ +# Copyright 1999-2019 Gentoo Authors +# 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=" + acct-group/vpopmail + virtual/qmail + maildrop? ( mail-filter/maildrop ) + mysql? ( dev-db/mysql-connector-c:0= ) + postgres? ( dev-db/postgresql:=[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 +) +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() { + 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-r4.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild index 3cbfe467136a..4b291b713517 100644 --- a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit autotools eutils fixheadtails qmail +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" @@ -38,7 +38,6 @@ PATCHES=( "${FILESDIR}"/${PN}-5.4.33-unistd.patch ) DOCS=( - ChangeLog doc/. ) HTML_DOCS=( @@ -46,9 +45,23 @@ HTML_DOCS=( man_html/. ) -VPOP_HOME="/var/vpopmail" +# 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() { + enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail upgradewarning } @@ -83,6 +96,8 @@ src_prepare() { } src_configure() { + vpopmail_set_homedir + local authopts if use mysql; then incdir=$(mysql_config --variable=pkgincludedir || die) @@ -133,6 +148,8 @@ src_configure() { } src_install() { + vpopmail_set_homedir + emake DESTDIR="${D}" install keepdir "${VPOP_HOME}"/domains @@ -212,6 +229,8 @@ pkg_postinst() { } 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." } |