commit: 66059885d224eca79b8ede013342cef091704566 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> AuthorDate: Fri Jun 8 05:09:20 2018 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Fri Jun 8 05:11:42 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66059885
net-mail/vpopmail: cleanup some outstanding bugs - Compile fix: MySQL include dir (#526590) - Remove ebeep (#646174) - Repoman warnings for dosym - EAPI=6 ebuild Closes: https://bugs.gentoo.org/526590 Closes: https://bugs.gentoo.org/646174 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> Package-Manager: Portage-2.3.33, Repoman-2.3.9 net-mail/vpopmail/files/vpopmail-double-free.patch | 4 +- net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild | 13 ++-- net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild | 75 ++++++++++++++++++---- net-mail/vpopmail/vpopmail-5.4.33.ebuild | 11 ++-- 4 files changed, 80 insertions(+), 23 deletions(-) diff --git a/net-mail/vpopmail/files/vpopmail-double-free.patch b/net-mail/vpopmail/files/vpopmail-double-free.patch index d7d118578d7..16a40b82c4f 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 a41fd4be75c..78bc92f714e 100644 --- a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild @@ -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." @@ -141,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 index 498c53bc733..244a0119098 100644 --- a/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 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,17 +18,68 @@ 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] ) + 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 - ebeep eerror "vpopmail's home directory is null in passwd data!" eerror "You probably want to check that out." eerror "Continuing with default." @@ -45,10 +96,7 @@ pkg_setup() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch - epatch "${FILESDIR}"/${PN}-lazy.patch - epatch "${FILESDIR}"/${PN}-double-free.patch - epatch "${FILESDIR}"/${PN}-vpgsql.patch + default echo 'install-recursive: install-exec-am' \ >>"${S}"/Makefile.am @@ -140,16 +188,19 @@ src_install() { dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh into /usr - dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README* - dohtml doc/doc_html/* doc/man_html/* + einstalldocs 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.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild index e98c76b20ef..bfc60278c20 100644 --- a/net-mail/vpopmail/vpopmail-5.4.33.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.33.ebuild @@ -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." @@ -130,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
