summaryrefslogtreecommitdiff
path: root/net-mail
diff options
context:
space:
mode:
Diffstat (limited to 'net-mail')
-rw-r--r--net-mail/Manifest.gzbin18251 -> 18251 bytes
-rw-r--r--net-mail/email/Manifest6
-rw-r--r--net-mail/email/email-2.5.0.ebuild50
-rw-r--r--net-mail/email/email-3.0.5.ebuild56
-rw-r--r--net-mail/email/email-3.1.2.ebuild50
-rw-r--r--net-mail/ezmlm-idx/Manifest2
-rw-r--r--net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r1.ebuild63
-rw-r--r--net-mail/ezmlm-idx/ezmlm-idx-7.0.0.ebuild63
-rw-r--r--net-mail/getmail/Manifest4
-rw-r--r--net-mail/getmail/getmail-5.4.ebuild4
-rw-r--r--net-mail/getmail/getmail-5.6.ebuild24
-rw-r--r--net-mail/mailbase/Manifest2
-rw-r--r--net-mail/mailbase/mailbase-1.2.ebuild67
-rw-r--r--net-mail/mailbase/mailbase-1.ebuild70
-rw-r--r--net-mail/poppassd_ceti/Manifest1
-rw-r--r--net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild47
-rw-r--r--net-mail/qmailadmin/Manifest5
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.10.ebuild96
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.12.ebuild87
-rw-r--r--net-mail/qmailadmin/qmailadmin-1.2.15.ebuild96
-rw-r--r--net-mail/qmhandle/Manifest2
-rw-r--r--net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild34
-rw-r--r--net-mail/vpopmail/Manifest7
-rw-r--r--net-mail/vpopmail/files/vpopmail-double-free.patch4
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild28
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild305
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.33.ebuild26
27 files changed, 371 insertions, 828 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index baba429c8e67..98cb17195421 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
Binary files differ
diff --git a/net-mail/email/Manifest b/net-mail/email/Manifest
index d6f230c2b3b1..82351acc58e0 100644
--- a/net-mail/email/Manifest
+++ b/net-mail/email/Manifest
@@ -1,9 +1,3 @@
-DIST email-2.5.0.tar.bz2 133167 BLAKE2B 3c04076d20d84eaf098afac0ca214db6c3700e898e3f49cc1eaf0791904485504968cc442d4e81d9aa527786964423bb2e16894d005c848519ef07bbf106b05e SHA512 e1f56a875262db6dc79bd0e58e73875cc86bbc73c91c71fb44e9325e4d95b4133f32ca2f299e9bcdbb8217eb20ce155382f0c8d35c48f4d03caf88ef82193ad7
-DIST email-3.0.5.tar.bz2 176575 BLAKE2B 5981a3843bd58124584c7ab07c3d3ded6166fbd993e5a1415e28e0f73843c3b3f9776cfa9c57233002df7a516033060a6c7fae19c2d631b6c8a1cc294df95b45 SHA512 9cb664be7e23c7509d9091115b9ea5450bc90a78c16c3ac514cdff08a4d13f687c25ea5e10f9a644158e2f001c1022e03ba8d1994fcafa1605986c394f54621e
-DIST email-3.1.2.tar.bz2 179546 BLAKE2B 31bf4cb2c10d2ea3b668ebf7870edfc60683899bb7fbfb0b1bd4a126259307e88c0e385236961e34437637d5c8779b962d6ba8140bf2aecff1994cb1ff8026be SHA512 cd005a59b45985ec9ae3cfe86e989568732eaf1e2a127028d0faa7abc0e704ab59668c48b7249e8829fd4944ca8bb27fb3bd23bfe23df5f6fc861d1385f531d1
DIST email-3.1.3.tar.bz2 178396 BLAKE2B 645d1fd3f0585ce6cbe2e0f2354989f07b39c83c8d21789a94d27a9e9820ea02ec1b213080018c560c7c79ef6f8fa2b636df4f40c9bc5390321d438cf64c448e SHA512 3fc1a8aa653a519261614e54b3215b89e41273207aa63f64572c8820093922a820ecad5e939b0eadf8d4c0587be83ffcb239bb31fd959b96dcf566157420f33b
-EBUILD email-2.5.0.ebuild 1071 BLAKE2B 9eea3835fdb051eeb560a9307466d9a6b09f65d23096a0e3f7fc58c4e88527ded0ca45766d7592fca5d44741eead7f60cf5ed637398df2c436a0b24a460be714 SHA512 405c8d91f714a04ada67932186e156e69c3bb0307a08f85102a8b43c7bf6184852360a7b9a0a224ad677c8e2e9b17beadaca9449d0a4c20dd604c2036576f63d
-EBUILD email-3.0.5.ebuild 1163 BLAKE2B 28443efc57606831b6b0e59dc05ef61dcfc58a13a8bf73409c9a6c6b35748afb6fbd33602cd316941b169fea8d7f4e9137ae3e42d1519b2fe199b22e4ab280f0 SHA512 cbf4cff480645c9e70e89793c1b7159641dd543761e759aa691e590e14af3f5692687eb2fbc2f6647c57a4df5e752f7537e6865d1a2dc57fa56e7cd69f14d43e
-EBUILD email-3.1.2.ebuild 1092 BLAKE2B 8f749b4441056a04a02306b461fa52e047977bf091d27262e9d06e5696c89c0f2cfa04ad6c8df3cdfc7fddb06172c2bbd4aa65c631cc80abed7348a3c0a179f8 SHA512 0acca06e7e4d1a506bd84e64d92b5db58d0cf939668ee5fcf3da16c6baa2a78be4804db5d0739b2fe6934fd57b30db1fc19074dfbcaaa03aaf434beca8301115
EBUILD email-3.1.3.ebuild 558 BLAKE2B 47884a0b4af4c192ad593c6c43a422c308dc320e61c6b7494178657ecda9c0d0945b56406e18c63a99f996f21b93120a532099de451f3324fb049cfb74b2f24e SHA512 849dbb318fb20a479fe2c46fb8bd7fad9679d8983de5ec4c27040d75401d703c96073fea84e1b39474a07bc1e6d014175de0de3ea1429eb82fcdfc31aed33593
MISC metadata.xml 341 BLAKE2B db81f48bf76969be24f09df0354f6fecd9e0ad9da358f5f47f8fe45d5cea0b478138e942ceac523a634bb4e7163f9d301a39ece513b75527c8d3c0c7e434fce8 SHA512 8f94720f124779c884470d421573bbf405a5cd82877a2487d3cb0231255a9052f8666f015b62c1ac895b82f2b4eb9ad57fa8cabced7e0fe78d2429f74dcebb24
diff --git a/net-mail/email/email-2.5.0.ebuild b/net-mail/email/email-2.5.0.ebuild
deleted file mode 100644
index 10ed37c23d02..000000000000
--- a/net-mail/email/email-2.5.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Advanced CLI tool for sending email"
-HOMEPAGE="http://email.cleancode.org"
-SRC_URI="http://email.cleancode.org/download/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="alpha amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_compile() {
- local myconf=""
-
- if [ -f /etc/conf.d/clock ]; then
- . /etc/conf.d/clock
- if [ x$CLOCK = "xUTC" ]; then
- elog "Using UTC timestamps (from /etc/conf.d/clock)"
- myconf="${myconf} --with-utc"
- fi
- fi
-
- sed -i -e "s:/doc/email-\${version}:/share/doc:" configure
- sed -i -e "s:DIVIDER = '---':DIVIDER = '-- ':" email.conf
-
- econf ${myconf} || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- doman email.1
- dodoc INSTALL quoted-printable.rfc RFC821 TODO
- make DESTDIR="${D}" install || die "install failed"
-}
-
-pkg_preinst() {
- rm "${D}"/usr/share/doc/"${P}"/email.1
-}
-
-pkg_postinst() {
- echo
- elog "Do not forget to edit /etc/email/email.conf file before using email."
- echo
-}
diff --git a/net-mail/email/email-3.0.5.ebuild b/net-mail/email/email-3.0.5.ebuild
deleted file mode 100644
index 5f321515d327..000000000000
--- a/net-mail/email/email-3.0.5.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit flag-o-matic
-
-DESCRIPTION="Advanced CLI tool for sending email"
-HOMEPAGE="http://www.cleancode.org/projects/email"
-SRC_URI="http://www.cleancode.org/downloads/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- append-ldflags $(no-as-needed)
-}
-
-src_compile() {
- local myconf=""
-
- if [ -f /etc/conf.d/clock ]; then
- . /etc/conf.d/clock
- if [ x$CLOCK = "xUTC" ]; then
- elog "Using UTC timestamps (from /etc/conf.d/clock)"
- myconf="${myconf} --with-utc"
- fi
- fi
-
- sed -i -e "s:/doc/email-\${version}:/share/doc:" configure
- sed -i -e "s:DIVIDER = '---':DIVIDER = '-- ':" email.conf
-
- econf ${myconf} || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- doman email.1
- dodoc INSTALL quoted-printable.rfc RFC821 TODO
- make DESTDIR="${D}" install || die "install failed"
-}
-
-pkg_preinst() {
- rm "${D}"/usr/share/doc/"${P}"/email.1
-}
-
-pkg_postinst() {
- echo
- elog "Do not forget to edit /etc/email/email.conf file before using email."
- echo
-}
diff --git a/net-mail/email/email-3.1.2.ebuild b/net-mail/email/email-3.1.2.ebuild
deleted file mode 100644
index b8e28f557b15..000000000000
--- a/net-mail/email/email-3.1.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Advanced CLI tool for sending email"
-HOMEPAGE="http://www.cleancode.org/projects/email"
-SRC_URI="http://www.cleancode.org/downloads/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~alpha ~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_compile() {
- local myconf=""
-
- if [ -f /etc/conf.d/clock ]; then
- . /etc/conf.d/clock
- if [ x$CLOCK = "xUTC" ]; then
- elog "Using UTC timestamps (from /etc/conf.d/clock)"
- myconf="${myconf} --with-utc"
- fi
- fi
-
- sed -i -e "s:/doc/email-\${version}:/share/doc:" configure
- sed -i -e "s:DIVIDER = '---':DIVIDER = '-- ':" email.conf
-
- econf ${myconf} || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- doman email.1
- dodoc INSTALL quoted-printable.rfc RFC821 TODO
- make DESTDIR="${D}" install || die "install failed"
-}
-
-pkg_preinst() {
- rm "${D}"/usr/share/doc/"${P}"/email.1
-}
-
-pkg_postinst() {
- echo
- elog "Do not forget to edit /etc/email/email.conf file before using email."
- echo
-}
diff --git a/net-mail/ezmlm-idx/Manifest b/net-mail/ezmlm-idx/Manifest
index 284029d14fef..2db7954d6c3b 100644
--- a/net-mail/ezmlm-idx/Manifest
+++ b/net-mail/ezmlm-idx/Manifest
@@ -2,7 +2,5 @@ DIST ezmlm-0.53.tar.gz 62693 BLAKE2B f417522da8d2b3ae7d0465e7226cd95dc85b55a397b
DIST ezmlm-idx-6.0.0.tar.gz 659996 BLAKE2B bf5f7ac0a40d1167d42ef26c4b28f95899f5a72d4c969c975368f61902f5ce9b5721143c251cdcb70c58149e6d7eb28c834b26426d9611b4249a285b523c38d8 SHA512 547186a2e32f3861ef51a9012442e7d8b553d90f2af949bb51845c29178ee2a44760471852c7c23fbd241c14753f22357463c5d5f10b70eceb05603cc6d83d4a
DIST ezmlm-idx-7.0.0.tar.gz 689019 BLAKE2B 22c66a4a2fcc6c0c754061ff0d93bde8fd192266112da0516e936278610288dc11d44d1959cd135a90eacb4befa43d62f53b3bedb94e994afc13aed986834bce SHA512 c0fc35aef4a72aefa4cdaee4c1933cc00aab82ee81ad7577793952fbf57106c06e4a5844a2bbf3919ad2985d2062ba1edf8831e6aa66d7e762210e7e147210ef
EBUILD ezmlm-idx-6.0.0.ebuild 1740 BLAKE2B 268ec06ad95ed38cdb4fe02d4c36a1a10f877603a6c629c67e205ab4664cf9dfeec45d1dd9998ebe382dce754105476db2dc951ebc7420951163c2c1d9090b16 SHA512 42ffd641cd6d754f898c6d66b4026b0ec5f6492ba52b4f6799b0ef60ff0b1050e86db44886cc487c263da1a7c1d575ec0cb33842d3c47ce9cb0db00cc8713bb3
-EBUILD ezmlm-idx-7.0.0-r1.ebuild 1521 BLAKE2B 52bf5ebd59dc636c5f00dc45ba57f0d99bd70f891b15283615eddd438351bbc4e592f9ab7013ecf718373a2ee57cf3bf78ff9a82e04635883a70ae09e5a8c7ad SHA512 76ab459dfbf2d5132ff15fff296bf49025ad350508a8299ccd99223467f2418b7738a514fc5a840ccbfe2676413be5749c876af498e227d0768d388af01bf880
EBUILD ezmlm-idx-7.0.0-r2.ebuild 1534 BLAKE2B aacca11db0ff7d161a0c4313385c6ed2f4e5d7ce71f689ee31196a05dcba132124ac87bf399983bfd8017bce0886c2f897dedc817dc09836916e40167df2a7c2 SHA512 3fed930045f3451e4efa6fbd88ffab8b1e98f8dd2b366fbc21655194f94e3b00794c2ce57bc0bf42c84de12025f7c4172370b5658dd9a3dffe9dad5808c25474
-EBUILD ezmlm-idx-7.0.0.ebuild 1492 BLAKE2B 62e9aaddf8926eb35cd2e05302078ebc5a25bc8b6005848ff47825cfabc8134911b6dd6face6814537867e0f04a1417977e0b5f31d46abc87dc573f8f8c27e03 SHA512 633fc79f94ca1f676586725168ca43f7070b5e1af1a74d339d006e73b7635bb56efb5696d3cefc3edc711f2c18f7e53907200c42d273106a96f937f878b5a1bd
MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r1.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r1.ebuild
deleted file mode 100644
index 3c6166ea4f29..000000000000
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit qmail multilib
-
-DESCRIPTION="Simple yet powerful mailing list manager for qmail"
-HOMEPAGE="http://www.ezmlm.org"
-SRC_URI="http://www.ezmlm.org/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="mysql postgres"
-
-DEPEND="mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql )"
-RDEPEND="${DEPEND}
- virtual/qmail"
-
-pkg_setup() {
- if use mysql && use postgres; then
- die "cannot build mysql and pgsql support at the same time"
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}" || die
-
- echo /usr/bin > conf-bin
- echo /usr/$(get_libdir)/ezmlm > conf-lib
- echo /etc/ezmlm > conf-etc
- echo /usr/share/man > conf-man
- echo ${QMAIL_HOME} > conf-qmail
-
- echo $(tc-getCC) ${CFLAGS} -I/usr/include/{my,postgre}sql > conf-cc
- echo $(tc-getCC) ${CFLAGS} -Wl,-E > conf-ld
-
- # fix DESTDIR and skip cat man-pages
- sed -e "s:\(/install\) \(\"\`head\):\1 ${D}\2:" \
- -e "s:\(./install.*\) < MAN$:grep -v \:/cat MAN | \1:" \
- -e "s:\(\"\`head -n 1 conf-etc\`\"/default\):${D}\1:" \
- -i Makefile
-}
-
-src_compile() {
- emake it man || die "make failed"
-
- if use mysql; then
- emake mysql || die "make mysql failed"
- elif use postgres; then
- emake pgsql || die "make pgsql failed"
- fi
-}
-
-src_install () {
- dodir /usr/bin /usr/$(get_libdir)/ezmlm /etc/ezmlm /usr/share/man
- dobin ezmlm-{cgi,checksub}
-
- make DESTDIR="${D}" setup || die "make setup failed"
-}
diff --git a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0.ebuild b/net-mail/ezmlm-idx/ezmlm-idx-7.0.0.ebuild
deleted file mode 100644
index 2f1e6ec24b60..000000000000
--- a/net-mail/ezmlm-idx/ezmlm-idx-7.0.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit qmail
-
-DESCRIPTION="Simple yet powerful mailing list manager for qmail"
-HOMEPAGE="http://www.ezmlm.org"
-SRC_URI="http://www.ezmlm.org/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
-IUSE="mysql postgres"
-
-DEPEND="mysql? ( virtual/mysql )
- postgres? ( dev-db/postgresql )"
-RDEPEND="${DEPEND}
- virtual/qmail"
-
-pkg_setup() {
- if use mysql && use postgres; then
- die "cannot build mysql and pgsql support at the same time"
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}" || die
-
- echo /usr/bin > conf-bin
- echo /usr/lib/ezmlm > conf-lib
- echo /etc/ezmlm > conf-etc
- echo /usr/share/man > conf-man
- echo ${QMAIL_HOME} > conf-qmail
-
- echo $(tc-getCC) ${CFLAGS} -I/usr/include/{my,postgre}sql > conf-cc
- echo $(tc-getCC) ${CFLAGS} -Wl,-E > conf-ld
-
- # fix DESTDIR and skip cat man-pages
- sed -e "s:\(/install\) \(\"\`head\):\1 ${D}\2:" \
- -e "s:\(./install.*\) < MAN$:grep -v \:/cat MAN | \1:" \
- -e "s:\(\"\`head -n 1 conf-etc\`\"/default\):${D}\1:" \
- -i Makefile
-}
-
-src_compile() {
- emake it man || die "make failed"
-
- if use mysql; then
- emake mysql || die "make mysql failed"
- elif use postgres; then
- emake pgsql || die "make pgsql failed"
- fi
-}
-
-src_install () {
- dodir /usr/bin /usr/lib/ezmlm /etc/ezmlm /usr/share/man
- dobin ezmlm-{cgi,checksub}
-
- make DESTDIR="${D}" setup || die "make setup failed"
-}
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index fe4e5837df9a..735829bf98a1 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -1,3 +1,5 @@
DIST getmail-5.4.tar.gz 194884 BLAKE2B f6a64b0bb4f5d89e75187fe162ad13e6e3601fd3338e6d9ef30b2100d8ab59328df1446a6771ec992b18e46e75341fff9308af9a994e4e61f41ab89cec20cf4c SHA512 6557cc46df1d31116f9d28cda1232737c01a568e6ada44edb14cdec30a42160966e1e69f42c46855ce139c3b70d77747324adda8abff3dd772a54a79015b0050
-EBUILD getmail-5.4.ebuild 638 BLAKE2B f2b125ce5cbb5f172118ea7b302e356b1629af7c120ffe079a60717ecf13789333422ef6311a9e0b022e0dbfc57ceb27797dd0cf7b5beb5eae25dff1c08ec011 SHA512 f48009f9e1103f55c0d8b567cd00d05c53bee812e1c1f3e85444f115e8068f2ed214fd148065671ab24bd982947ee027b7eff49c9a94b817dba810f6b4706a08
+DIST getmail-5.6.tar.gz 197360 BLAKE2B 0833933c4dd4b0b7962070dd3d6738b2c7336f359ca9e40e6febbeaffc6cea6942e4271de6cd3053447af94cc7fd189a25beb99c81d2d1221f1c478807dd7c33 SHA512 7ee34f214ab4d98d1b34e46abba61561133f27edf1f64bb9c5d5f671e6944724d1773234bd8ab626607b732cc54fd335cbfcb69fdff8f4d8fcdb33108b25bafd
+EBUILD getmail-5.4.ebuild 638 BLAKE2B d5474cb28c778be265e73661b42e9375f4cce0ee51bd0bf8771178b6ffa82ed5f6deb471ea76ca315c062fe834d110efa0d01a5763710eb8511ebf1c0d6b51bc SHA512 3d4464bd5f4d878711ffb17f04e4dfaa3e204b923a04f881797fe628b69c2cc880b632fc782031a879e3dd393e08ba585cea8cba58c93b0aed9792c2dc231c53
+EBUILD getmail-5.6.ebuild 636 BLAKE2B e6e381cd97d7652c8e746157daaf3e30f6b477e4243a0436ce2f8eecda777bf92ae7e5e33273d17669e4bcca4b6f7a46aa065534e46e1edbc2ffb84c2375f0aa SHA512 ddc4795213d5110a957364afba95cfea5c1762b079565a2d1a97ca81aa0bc2967fa763be48f6adc800ec6ae3fa56ee47b1f627e709c42b63d81a52975980a3dd
MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-mail/getmail/getmail-5.4.ebuild b/net-mail/getmail/getmail-5.4.ebuild
index 2fadbd7fdfea..bcf25b422aa1 100644
--- a/net-mail/getmail/getmail-5.4.ebuild
+++ b/net-mail/getmail/getmail-5.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="http://pyropus.ca/software/getmail/"
SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
LICENSE="GPL-2"
-SLOT="4"
+SLOT="0"
KEYWORDS="amd64 ppc x86 ~ppc-macos ~x86-macos ~x64-solaris"
IUSE="ssl"
diff --git a/net-mail/getmail/getmail-5.6.ebuild b/net-mail/getmail/getmail-5.6.ebuild
new file mode 100644
index 000000000000..5e4129b2b2eb
--- /dev/null
+++ b/net-mail/getmail/getmail-5.6.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="ssl?"
+
+inherit distutils-r1
+
+DESCRIPTION="A mail retriever with reliable Maildir and mbox delivery"
+HOMEPAGE="http://pyropus.ca/software/getmail/"
+SRC_URI="http://pyropus.ca/software/getmail/old-versions/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos ~x64-solaris"
+IUSE="ssl"
+
+python_prepare_all() {
+ sed -i -e "s,'getmail-%s' % __version__,'${PF}'," \
+ -e "/docs\/COPYING/d" "${S}"/setup.py || die
+
+ distutils-r1_python_prepare_all
+}
diff --git a/net-mail/mailbase/Manifest b/net-mail/mailbase/Manifest
index f4141ea41a2c..bba9c7605a11 100644
--- a/net-mail/mailbase/Manifest
+++ b/net-mail/mailbase/Manifest
@@ -4,8 +4,6 @@ AUX common-pamd-include 245 BLAKE2B 3c2a5133b232869a5749df49a7e1f94a51f68d3bd370
AUX mailcap 2235 BLAKE2B 3cf2cba9c1f67feab3b63246f21f8aa78b808a42b2368add9f77c36cca8d92c13122f53663ac3fe4d8b0968a66a35803d98cce6197110f1efe08562e9f837e74 SHA512 1461deb4f065c0d1778acbbcb1e08db821740de0363d3905a569d45d459a76d8813ef1c2c052d6e84b4b9b5576c89e524ecf44a9fffd8e05e91f85eb917557b0
AUX mailcap.5 9886 BLAKE2B a03170a94f30cda347c97909de7c066efbe2cc7295badd8f8c97abce52e154ce0b3635fadf83d18fe46966b2d550b2a321f4cf4483d1e32fbe420b85d2155f19 SHA512 fac60eeb754bbfa89518fd1ae5182e1ecf22f8d2b9f6883786fb78e5759eadbee58f927cf1084ea5e04958e6b505f178ba49dab7a570e91099a8ef2ceef608e3
EBUILD mailbase-1.1.ebuild 1657 BLAKE2B ae93c9819b1e5bb8f8ede43955453d2f6aa68a306ebce97b611bb1b37abcbb12fe390c20a4db2c997f860c0b2b0db251052b12d6073e70c3ee1e40b7361139b5 SHA512 998ad423d34728fd24d0ff04d014568eba456775deedb1551e9c8e05a5993235347b0235975599e330e0545a84d8857ac84ce160fedc3bbb8d8062b908026932
-EBUILD mailbase-1.2.ebuild 1492 BLAKE2B ea342a3be316df8623fa242ed2dcc3e47f6bc303cb880a9c4b240a89edebacbecbdc86cc7abe058b5b9b233235f7e9983a8fe548ee77d3ab9be9523637c7e12b SHA512 a5e8edf618de36acefb9326f40e64b9c7f659f704b8f8effd5930ff619085895a8bd26da556adbccfad1d375bdb14149dfb4704c623ce7359ab67f438eb28d6e
EBUILD mailbase-1.3.ebuild 1458 BLAKE2B 835a54fe1e299fd10342d6d890ef3436b91483a9e12cfc74d4291939c0a8bb1702f9467b9b9f0687a748915fdc3bdccefedaace530d96cb4d37108a474db3e7a SHA512 60cbbe72959a4b0f7f05080765257cdc18bde09c5444acf97d19b4bfbbe70eec3b6e110cbefc382db74d1506f551d9d5e919e8b927465c70fd6ac8a951eaaeb3
EBUILD mailbase-1.4.ebuild 1482 BLAKE2B eb1a131d41e204bc07a0d6a339bbed18c0abd27054a31f259d7ccecc9d129ba3f2c49984b51939ab8e0ee70c7d21e7bbd5e8e249f5361ad467b53ec2fd177723 SHA512 9463c5dd2bdc408972c4e3fd4a926f97a7e36672d2f6fcca5e361dd922968bea1517bc191bf0dc968fcda51cfcb3951ef1def837a88fc38bc680ae2b1746f0a9
-EBUILD mailbase-1.ebuild 1608 BLAKE2B f730c8dc3723241b5bdad4de17471b22ed3893ad70b072de1ced072fc994c5615cc2c7e7827ebb1d371a6c85eb194dcc943ff1136172229736b45fc9ed86303c SHA512 18bb8bfd64c6eb6e80cfbc5d7c5d4583155020583baf07cd0c031611271994676891a00e354a2b4da02f8f9fefbc423287dbae1ce4c12e5be2284760920720c4
MISC metadata.xml 240 BLAKE2B eeb6099e7ebc29b81588528b970830d2461fa16783bda673672d405615e46d240dcd806b3d18b6207ef8e5365f8860aa20c304394c3f5b267c5ea4dc739cb94b SHA512 97824dbce22630efb21e647b55212b7a8a19d8e38b5bf05cb0b8078530bbbaaf4dc91284e2a11beab7dfcfb779df82b87b49d11a746c7a4f6dc71f2fda8942db
diff --git a/net-mail/mailbase/mailbase-1.2.ebuild b/net-mail/mailbase/mailbase-1.2.ebuild
deleted file mode 100644
index 45ddce55a0e2..000000000000
--- a/net-mail/mailbase/mailbase-1.2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit pam eutils user
-
-DESCRIPTION="MTA layout package"
-SRC_URI=""
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="pam"
-
-RDEPEND="pam? ( virtual/pam )"
-
-S=${WORKDIR}
-
-pkg_setup() {
- enewgroup mail 12
- enewuser mail 8 -1 /var/spool/mail mail
- enewuser postmaster 14 -1 /var/spool/mail
-}
-
-src_install() {
- dodir /etc/mail
- insinto /etc/mail
- doins "${FILESDIR}"/aliases || die
- insinto /etc
- doins "${FILESDIR}"/mailcap || die
-
- keepdir /var/spool/mail
- fowners root:mail /var/spool/mail
- fperms 03775 /var/spool/mail
- dosym /var/spool/mail /var/mail
-
- newpamd "${FILESDIR}"/common-pamd-include pop
- newpamd "${FILESDIR}"/common-pamd-include imap
- if use pam ; then
- local p
- for p in pop3 pop3s pops ; do
- dosym pop /etc/pam.d/${p} || die
- done
- for p in imap4 imap4s imaps ; do
- dosym imap /etc/pam.d/${p} || die
- done
- fi
-}
-
-get_permissions_oct() {
- if [[ ${USERLAND} = GNU ]] ; then
- stat -c%a "${ROOT}$1"
- elif [[ ${USERLAND} = BSD ]] ; then
- stat -f%p "${ROOT}$1" | cut -c 3-
- fi
-}
-
-pkg_postinst() {
- # bug 614396
- if [[ "$(get_permissions_oct /var/spool/mail)" != "3775" ]] ; then
- einfo "Fixing ${ROOT}var/spool/mail/ permissions"
- chown root:mail "${ROOT}var/spool/mail/"
- chmod 03775 "${ROOT}var/spool/mail/"
- fi
-}
diff --git a/net-mail/mailbase/mailbase-1.ebuild b/net-mail/mailbase/mailbase-1.ebuild
deleted file mode 100644
index a8ffd2843f24..000000000000
--- a/net-mail/mailbase/mailbase-1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit pam eutils user
-
-DESCRIPTION="MTA layout package"
-SRC_URI=""
-HOMEPAGE="https://www.gentoo.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="pam"
-
-RDEPEND="pam? ( virtual/pam )"
-
-S=${WORKDIR}
-
-pkg_setup() {
- enewgroup mail 12
- enewuser mail 8 -1 /var/spool/mail mail
- enewuser postmaster 14 -1 /var/spool/mail
-}
-
-src_install() {
- dodir /etc/mail
- insinto /etc/mail
- doins "${FILESDIR}"/aliases || die
- insinto /etc
- doins "${FILESDIR}"/mailcap || die
-
- keepdir /var/spool/mail
- fowners root:mail /var/spool/mail
- fperms 0775 /var/spool/mail
- dosym /var/spool/mail /var/mail
-
- newpamd "${FILESDIR}"/common-pamd-include pop
- newpamd "${FILESDIR}"/common-pamd-include imap
- if use pam ; then
- local p
- for p in pop3 pop3s pops ; do
- dosym pop /etc/pam.d/${p} || die
- done
- for p in imap4 imap4s imaps ; do
- dosym imap /etc/pam.d/${p} || die
- done
- fi
-}
-
-get_permissions_oct() {
- if [[ ${USERLAND} = GNU ]] ; then
- stat -c%a "${ROOT}$1"
- elif [[ ${USERLAND} = BSD ]] ; then
- stat -f%p "${ROOT}$1" | cut -c 3-
- fi
-}
-
-pkg_postinst() {
- if [[ "$(get_permissions_oct /var/spool/mail)" != "775" ]] ; then
- echo
- ewarn "Your ${ROOT}/var/spool/mail/ directory permissions differ from"
- ewarn " those which mailbase set when you first installed it (0775)."
- ewarn " If you did not change them on purpose, consider running:"
- ewarn
- ewarn " chmod 0775 ${ROOT}/var/spool/mail/"
- echo
- fi
-}
diff --git a/net-mail/poppassd_ceti/Manifest b/net-mail/poppassd_ceti/Manifest
index 4837f4e73343..ce09d8d58416 100644
--- a/net-mail/poppassd_ceti/Manifest
+++ b/net-mail/poppassd_ceti/Manifest
@@ -1,5 +1,4 @@
AUX poppassd.xinetd 245 BLAKE2B 28fe0bc0c1c87c4ff48cae52c703a4a6c3e776bf91b869040025951dbaf1f07345a95c9bc45d40f87c3ad9a83d6556421f805d65952f4f9d7588abed9bb5b25f SHA512 333d331433a0b43f414f83e51cad3502afb6f5b287967e55d0dedd90ac06955ccbcbe598a3dafe682c97a7ac4ecf501c0842ade940c0702fb797717e8844ffd4
DIST poppassd-1.8.5.tar.gz 6054 BLAKE2B f97c908a3880aa9ddb76ce09f33046649dfa2d145c8d8d5b70f1a7b473ba2ba8901b62d8e0644187c5987e3c4c8257c8f2bee9504b98bf3d81035e0acda4522c SHA512 4d8d9c3b15b986bd34e5e459f654e8137019a2466b9fec001d9e61a3267b09f150c3faee8e6914d98742c7b3a7301271ba522ee6dff614cca97815a3ae241ae9
-EBUILD poppassd_ceti-1.8.5-r1.ebuild 1053 BLAKE2B 56d4103103523f14824f703cbb32081dbd200bc8f7516cff0106b89d99ffc7aa6340f278d0e3dad45605930013ce7dde7c72196a6e105f7a3e23ca9482cb5f27 SHA512 175bbfc6dc0472fd3b1e8a64210afce02bd4cbc7d30d95ede217ff5ffa276284482e45cb2187ce698a02a3047a665e444e8a682293614a232f7a2a76b6fbed1b
EBUILD poppassd_ceti-1.8.5-r2.ebuild 910 BLAKE2B f0cf814c91814de5ab0f0e587a5c1f865286642f90a06d58cc57eb95f190dc3b2b8bf629d3be947f5bd78936923ea99586af782990e40dd940f1fa241aecfb01 SHA512 004588261ef4a027c984bb8f776c98e08de981b8b9e243c21fdf14bc53e7410ba26db1c4556000ae7d42053fea1e7a87e85b7856e28ffb005d2a4a589f871652
MISC metadata.xml 782 BLAKE2B 00eda3e3c64aa944e4675b970f714bbf5763e169b3beab2836532e69601425b0c222e5b88ea259f49f85ba95f884f69a2e597035ee61f6b2ed403b26bd0fe975 SHA512 8ce15614cc7864c9d4a40ad1c83609d403d012f1d4bb9b6f0fcd523b210d943e816d58a3dd6f9e5345fc889118f7d833980b9615cba1d04d54184c2df8d4e2f8
diff --git a/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild b/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild
deleted file mode 100644
index 1499debb512c..000000000000
--- a/net-mail/poppassd_ceti/poppassd_ceti-1.8.5-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs pam portability
-
-MY_PN="poppassd"
-MY_P="${MY_PN}-${PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="Password change daemon with PAM support"
-HOMEPAGE="http://echelon.pl/pubs/poppassd.html"
-SRC_URI="http://echelon.pl/pubs/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cracklib"
-
-DEPEND="virtual/pam"
-
-RDEPEND="${DEPEND}
- sys-apps/xinetd
- cracklib? ( sys-libs/cracklib )"
-
-src_compile() {
- $(tc-getCC) -c ${CFLAGS} ${MY_PN}.c || die "Compile failed."
- $(tc-getCC) -o poppassd ${MY_PN}.o -lpam $(dlopen_lib) || die "Linking failed."
-}
-
-src_install() {
- dodoc README
-
- pamd_mimic_system poppassd auth account password
- if use cracklib; then
- echo -e "password\trequired\tpam_cracklib.so retry=3" >> \
- ${D}/etc/pam.d/poppassd
- fi
-
- insinto /etc/xinetd.d
- newins ${FILESDIR}/poppassd.xinetd poppassd
-
- insinto /usr/sbin
- insopts -o root -g bin -m 500
- doins poppassd || die "Install failed."
-}
diff --git a/net-mail/qmailadmin/Manifest b/net-mail/qmailadmin/Manifest
index b03e9e7471d1..24cf550fa6e3 100644
--- a/net-mail/qmailadmin/Manifest
+++ b/net-mail/qmailadmin/Manifest
@@ -1,13 +1,8 @@
AUX qmailadmin-1.2.12-quota-overflow.patch 3613 BLAKE2B c923f9ec3d265f19f63ecbd05f49e588ff34160fca918e2e316585e29d73ccda73fc87a78da3a1442a32dff21ea8f83ad98c632444b069e26abc8b948c1390c6 SHA512 bc2550c86a97dad01558ec57f5ee01e49f1f76feb12cef85e7947fa25d0eaac064b401084972dc195116252bec5454115c432f8be4e9b1377eedbf007a3c4087
AUX qmailadmin-1.2.15-quota-security.patch 1820 BLAKE2B 59ffe36de71e5c02bba8a93d65883cf68aec4fd73dc952e1c2718d6ee4345328c185c3634cd363f1ee72ef5d6f8ea90172613d118ce58a05b1eac5f2366c5aa9 SHA512 bff16e5066f4090e307c971f0be772a9d3db1715cba75063e1e7a7d1760297d849ee54e2f22e6a4c27d369353ba9492f66111ecf2b9637ee57b29da337affa38
AUX qmailadmin-1.2.9-maildir.patch 253 BLAKE2B 6da2fb45531cc88a98960b9443ca7dff84bbd9385042bbba7a9e5f09bb59bc2b8e5543fb9f4792ab447ee259948f11f3244e37822b331150fb7aeef76f97d4f8 SHA512 e6d617db023af69d96e5d7d85ba7bbf24886b7b947feab333e4bd219c719351076396bf27b4de97e78a4888cdeabb0d989107133fe3dfcdcfbe92079c2f86045
-DIST qmailadmin-1.2.10.tar.gz 390150 BLAKE2B 0c221e7abef7d2ae73a55598005d8bbd4d0bb96d51603867ff72fe396bc345c6c87a3c533c5f1db1658db17b7fd46630facfc8ae00c8e588bc8a350e0ea5588a SHA512 43dcd55b9b3458896398eada9a7d0b513cce5bde6edecb8ae54b6519509361dfab18c7600a3f94ff141b4a3b824e93b4a88a5db3e5a8980ddabf2e6dda8cfb47
-DIST qmailadmin-1.2.12.tar.gz 400144 BLAKE2B 0b4065421cf60bc2328ac11db38294faf9301630927c6955b73604e90fb72db7c924f153e07769689339f1d3937407704d35e8dbf29b0fd5fda935533cad1320 SHA512 9fea49c3cab31606b37b9b827cd21ee852267e8c5555d96c48d52fc8388d7a3a862384cf18211c89c34525b84f866fa371a70a88386309e32dde1d7d8bb5b3ed
DIST qmailadmin-1.2.15.tar.gz 385529 BLAKE2B 2bd4f86d157c577f410e44ec8c8c7df25d654b1dbf0621e52c167067bf72ce04bc7b03230c2517e97c14bd4f5bb3354da23d9794faafc7d3d007476c7b98dfdb SHA512 0cf32916bd6ef47fce091d4a92203fb8b80e0c3349cf8af826c047ba778e7992bcb98002023219648c7aa1ab60fbb052d4726f12f44d68647e657fb3760b8347
DIST qmailadmin-1.2.16.tar.gz 388689 BLAKE2B 713fbf862eb19940801394b85371f7249ab31528891356b226ba88b55ecd3027f0cdcd08b10a1eb1a4b93355b4bf948dae96d34dbfb3a1df3c3291fe5a8ddb8d SHA512 4afa18461d8bb91e7075f08f00f3e1ef030a01381d049e122d4c234f2b6db9884d4426e9f4c61d5257e55786228741a3b8ded1fbfb925611f536cedb9d61de91
-EBUILD qmailadmin-1.2.10.ebuild 2629 BLAKE2B 8e9983bc1ce4af0a48015b10c2d4d576bfe9819ac28dc8f33b1df29526d4e0ab199af0ba8b46f2d9e322160c2bcf2554ebbd734fde43b8dd4626636e4363f453 SHA512 923bbdbc450636118dc6600fc70c022d49fecbf2489a8cf9e587f54b4864587356d79ef08c3ec2fd53766bf1580b624589436e66b8867933fd7a5c0e1f039dfc
-EBUILD qmailadmin-1.2.12.ebuild 2153 BLAKE2B c499f55d76bfb7fa48a75908436cba5a5067d2d5e58f39f5b5522ef85cc91050ba963f6f684396d7c661f43628d2cce7f4f28c2c17e58a39585f57b239587b16 SHA512 c73778f2eac01eb689c54b7aa549af19e041e762a5c05ee6be3a2ea4813deae94c1754fd2ddf83c0388ceb803cd946b946c2db16fe9a4a286b341304fd2b8687
EBUILD qmailadmin-1.2.15-r1.ebuild 2341 BLAKE2B f79f4ab948b150e15b21a9e40b5537cf24dab2069d6616a3be2258e55d830cafe7648c085bc78c8e5ab8fb3b6ad48e5f3aec630d4ce0180e3531d8b26251b23d SHA512 8e00182cac1a77768d6eff31ebde4ce59e3d199f788bb6e59eeed181f63e515625ea12ea7bcaa3d2dc6f3ce0e8ef9405d0e1361f03accdfbea0e7c28e07e9a57
-EBUILD qmailadmin-1.2.15.ebuild 2490 BLAKE2B c779be0ad6d09dd0c7179d09e4a93f81ef4c6e56788496fa49a06d4063f2181ffd81b8d509374820c7d452781e6f8516dce230de4a2d4e7c27053d8eab2fdd43 SHA512 80e8007984fb8bd4df9906cc0f4416bb4f3b2004655f3335640c2a61f1c299d02491cd16e97fde8b78224c3ac1fce89234642f87688b75d3226306eb55e64160
EBUILD qmailadmin-1.2.16.ebuild 2759 BLAKE2B 73689e59456e0f63e6d1cf1c58159883061f851ce392f19e9a6bf3640b80c3d00789e5e328ec774b08de2b722f7f5e567277d6889787ac5a9ad4dfb248952c68 SHA512 606397c31e347fbec59dc3be0199b4b67e5e7b985f0dc3fbeea0bd86b477464286d12a2ea8accd3e5aa7db69f5a5256112d80d726dff8161aa12b2a1e19cb806
MISC metadata.xml 494 BLAKE2B 9dc9cea1215b20658f1769a463e0ca17cfa0a34ecebbba5756bd405e212312cde43ec803efe1c4711ba6066f4b539181c97aef1ff7552c6dedaf80b4a29be6e0 SHA512 b2fbb40308df4de4d19781832a17557947033ab4b44f0ce6a6b8048c81d05ae8e67780970914e97e9774b190c57474ca20877c4d4f93c3d6357e7ec6f7535c5b
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild
deleted file mode 100644
index 8dfec046d256..000000000000
--- a/net-mail/qmailadmin/qmailadmin-1.2.10.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-# TODO: convert this ebuild to use web-app.
-
-# the RESTRICT is because the vpopmail lib directory is locked down
-# and non-root can't access them.
-RESTRICT='userpriv'
-
-MY_PV="${PV/_rc/-rc}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="A web interface for managing a qmail system with virtual domains"
-HOMEPAGE="http://www.inter7.com/qmailadmin.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc s390 sh sparc x86"
-IUSE="maildrop"
-
-DEPEND="virtual/qmail
- >=net-mail/vpopmail-5.3
- net-mail/autorespond
- maildrop? ( >=mail-filter/maildrop-2.0.1 )"
-RDEPEND="${DEPEND}"
-# apache and lighttpd both work, but there's no virtual yet
-# www-servers/apache"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
-}
-
-src_compile() {
- local dir_vpopmail="/var/vpopmail"
- local dir_vhost="/var/www/localhost"
- local dir_htdocs="${dir_vhost}/htdocs/${PN}"
- local dir_htdocs_images="${dir_htdocs}/images"
- local url_htdocs_images="/${PN}/images"
- local dir_cgibin="${dir_vhost}/cgi-bin"
- local url_cgibin="/cgi-bin/${PN}"
- local dir_htdocs_htmlib="/usr/share/${PN}/htmllib"
- local dir_qmail="/var/qmail"
- local dir_true="/bin"
- local dir_ezmlm="/usr/bin"
- local dir_autorespond="/var/qmail/bin"
-
- # Pass spam stuff through $@ so we get the quoting right
- if use maildrop ; then
- set -- --enable-modify-spam \
- --enable-spam-command='|preline maildrop /etc/maildroprc'
- else
- set --
- fi
-
- econf \
- --enable-valias \
- --enable-vpopmaildir=${dir_vpopmail} \
- --enable-htmldir=${dir_htdocs} \
- --enable-imageurl=${url_htdocs_images} \
- --enable-imagedir=${dir_htdocs_images} \
- --enable-htmllibdir=${dir_htdocs_htmlib} \
- --enable-qmaildir=${dir_qmail} \
- --enable-true-path=${dir_true} \
- --enable-ezmlmdir=${dir_ezmlm} \
- --enable-cgibindir=${dir_cgibin} \
- --enable-cgipath=${url_cgibin} \
- --enable-autoresponder-path=${dir_autorespond} \
- --enable-domain-autofill \
- --enable-modify-quota \
- --enable-no-cache \
- --enable-maxusersperpage=50 \
- --enable-maxaliasesperpage=50 \
- --enable-vpopuser=vpopmail \
- --enable-vpopgroup=vpopmail \
- "$@" \
- || die "econf failed"
- emake || die
-}
-
-src_install() {
- make DESTDIR="${D}" install || die
- dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog TRANSLATORS NEWS FAQ README contrib/*
-}
-
-pkg_postinst() {
- elog "If you would like support for ezmlm mailing lists inside qmailadmin,"
- elog "please emerge some variant of ezmlm-idx."
-}
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.12.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.12.ebuild
deleted file mode 100644
index 93204d118804..000000000000
--- a/net-mail/qmailadmin/qmailadmin-1.2.12.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit qmail eutils webapp
-
-# the RESTRICT is because the vpopmail lib directory is locked down
-# and non-root can't access them.
-RESTRICT="userpriv"
-
-MY_P=${P/_rc/-rc}
-
-DESCRIPTION="A web interface for managing a qmail system with virtual domains"
-HOMEPAGE="http://www.inter7.com/qmailadmin.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~s390 ~sh ~sparc ~x86"
-IUSE="maildrop"
-
-DEPEND="virtual/qmail
- >=net-mail/vpopmail-5.3
- net-mail/autorespond
- maildrop? ( >=mail-filter/maildrop-2.0.1 )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
-}
-
-src_compile() {
- # Pass spam stuff through $@ so we get the quoting right
- if use maildrop ; then
- set -- --enable-modify-spam \
- --enable-spam-command='|preline maildrop /etc/maildroprc'
- else
- set --
- fi
-
- econf \
- --enable-valias \
- --enable-vpopmaildir=/var/vpopmail \
- --enable-htmldir="${MY_HTDOCSDIR}" \
- --enable-imagedir="${MY_HTDOCSDIR}"/images \
- --enable-imageurl=/${PN}/images \
- --enable-htmllibdir=/usr/share/${PN}/htmllib \
- --enable-cgibindir="${MY_CGIBINDIR}" \
- --enable-cgipath=/cgi-bin/${PN} \
- --enable-qmaildir="${QMAIL_HOME}" \
- --enable-autoresponder-path="${QMAIL_HOME}"/bin \
- --enable-true-path=/bin \
- --enable-ezmlmdir=/usr/bin \
- --enable-domain-autofill \
- --enable-modify-quota \
- --enable-no-cache \
- --enable-maxusersperpage=50 \
- --enable-maxaliasesperpage=50 \
- --enable-vpopuser=vpopmail \
- --enable-vpopgroup=vpopmail \
- "$@" \
- || die "econf failed"
-
- emake || die "make failed"
-}
-
-src_install() {
- webapp_src_preinst
-
- make DESTDIR="${D}" install || die "make install failed"
-
- dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog \
- TRANSLATORS NEWS FAQ README contrib/*
-
- webapp_src_install
-}
-
-pkg_postinst() {
- einfo "If you would like support for ezmlm mailing lists inside qmailadmin,"
- einfo "please emerge some variant of ezmlm-idx."
- webapp_pkg_postinst
-}
diff --git a/net-mail/qmailadmin/qmailadmin-1.2.15.ebuild b/net-mail/qmailadmin/qmailadmin-1.2.15.ebuild
deleted file mode 100644
index 1725e884bab2..000000000000
--- a/net-mail/qmailadmin/qmailadmin-1.2.15.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit qmail eutils webapp autotools
-
-# the RESTRICT is because the vpopmail lib directory is locked down
-# and non-root can't access them.
-RESTRICT="userpriv"
-
-MY_P=${P/_rc/-rc}
-
-DESCRIPTION="A web interface for managing a qmail system with virtual domains"
-HOMEPAGE="http://www.inter7.com/qmailadmin.html"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-WEBAPP_MANUAL_SLOT="yes"
-KEYWORDS="amd64 arm ~hppa ppc s390 sh sparc x86"
-IUSE="maildrop"
-
-DEPEND="virtual/qmail
- >=net-mail/vpopmail-5.3
- net-mail/autorespond
- maildrop? ( >=mail-filter/maildrop-2.0.1 )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/${PN}-1.2.9-maildir.patch
- epatch "${FILESDIR}"/${PN}-1.2.12-quota-overflow.patch
- eautoreconf
-}
-
-src_compile() {
- # Pass spam stuff through $@ so we get the quoting right
- if use maildrop ; then
- set -- --enable-modify-spam \
- --enable-spam-command='|preline maildrop /etc/maildroprc'
- else
- set --
- fi
- # If vpopmail is built with mysql, we need to pick that up.
- CFLAGS="${CFLAGS} $(</var/vpopmail/etc/inc_deps)"
- LDFLAGS="${LDFLAGS} $(</var/vpopmail/etc/lib_deps)"
-
- econf \
- --enable-valias \
- --enable-vpopmaildir=/var/vpopmail \
- --enable-htmldir="${MY_HTDOCSDIR}" \
- --enable-imagedir="${MY_HTDOCSDIR}"/images \
- --enable-imageurl=/${PN}/images \
- --enable-htmllibdir=/usr/share/${PN}/htmllib \
- --enable-cgibindir="${MY_CGIBINDIR}" \
- --enable-cgipath=/cgi-bin/${PN} \
- --enable-qmaildir="${QMAIL_HOME}" \
- --enable-autoresponder-path="${QMAIL_HOME}"/bin \
- --enable-true-path=/bin \
- --enable-ezmlmdir=/usr/bin \
- --enable-domain-autofill \
- --enable-modify-quota \
- --enable-no-cache \
- --enable-trivial-password \
- --enable-catchall \
- --enable-maxusersperpage=50 \
- --enable-maxaliasesperpage=50 \
- --enable-vpopuser=vpopmail \
- --enable-vpopgroup=vpopmail \
- LDFLAGS="${LDFLAGS}" \
- CFLAGS="${CFLAGS}" \
- "$@" \
- || die "econf failed"
-
- emake || die "make failed"
-}
-
-src_install() {
- webapp_src_preinst
-
- make DESTDIR="${D}" install || die "make install failed"
-
- dodoc AUTHORS INSTALL README.hooks BUGS TODO ChangeLog \
- TRANSLATORS NEWS FAQ README contrib/*
-
- webapp_src_install
-}
-
-pkg_postinst() {
- einfo "If you would like support for ezmlm mailing lists inside qmailadmin,"
- einfo "please emerge some variant of ezmlm-idx."
- webapp_pkg_postinst
-}
diff --git a/net-mail/qmhandle/Manifest b/net-mail/qmhandle/Manifest
index cef0d56fd437..adc98c6d885e 100644
--- a/net-mail/qmhandle/Manifest
+++ b/net-mail/qmhandle/Manifest
@@ -1,6 +1,4 @@
AUX qmHandle-gentoo-svc.patch 718 BLAKE2B efb684c0c11ab7c2a3df534f0ab9c5cf911c2936fc23c74bef8b88f64b2e4ed68293f5ac6427146ac593149ce9e1e809a88e62d7e717f87045750ccd3de27f37 SHA512 9beeb4a2b17c2577807620b3a67147c694de3f43f491452a7511fd213e5376950b3da55278f2a64b76b95129b3ea7153fc117c286fffd2f472dd9fc4a2f20992
-DIST qmhandle-1.2.0.tar.gz 13134 BLAKE2B e0c3766b1375e2b774e59565f8a03bb025034185dfd555d8288bb514aad0934ddd2b685480ecab7ae65ba268c02c744c4520ec7e787b2cece167a92ee191e06f SHA512 5db69a0fff3a2b6cfc150995f6ff13bcaac4f9c99b653af05904f0af5c38cdee9a5378a8b66d460f403dd938daa650bcffd6d5dc860d0a0813d060105a22ce0e
DIST qmhandle-1.3.2.tar.gz 15423 BLAKE2B 92a97404fb495b83329e6a7b6dd83140e5b73f2dfd6a6999d546a7fc2dfdf302d52e0a5ae67a8415e012f972688283b2cafc9538aeca41608a05b3c9d91b58f3 SHA512 ec6bb344f4d345e4a59ab3acb336a5a76a22c07a9eccac1e1f178b2a96f83afb9a4d669f16f960c254cc203745db96027ef9e6181ea8a16b0bff5e86141ce779
-EBUILD qmhandle-1.2.0-r1.ebuild 597 BLAKE2B 2dc47adb570ffd4527f53942a04283adcb485be6a4181b1dd5de42c758ffc1c16973a244cac60a2a379db9062a754b2a77382de8a396272e7d88205b95a539cb SHA512 02183fe7a065fca604977096d7fe0be41628c870807d4aec70b225a22ed22f757097e1131cbaec6c546080a695428f06632cf1298e63ec0e83dcc5a3d1beed5f
EBUILD qmhandle-1.3.2.ebuild 678 BLAKE2B 5177e5f603d724cd3d3835b5fcd81373ffe50fa045730c2d5fb7f372fe01a06bc9afc2d1897c6192ab0c3e4e2c0707d37a384ecccfbcd6f26af6ec634d9ef575 SHA512 deba6d7414d689720c11726f2fc7a5d06d9eeffea06b120f6d72c64a576b38d3f663089e9aeb89c958cbf31eef573aaf9caff5d13dfd0527b8091665dad380bf
MISC metadata.xml 762 BLAKE2B f3d23ddb50669bab668e1e5279eec4ee45cb7bc44688aa41ba101c3c90ef128473f0bf396815fc16962f8b44336630cd908fb352a617d15370ed84a5170c59b0 SHA512 88d0d2a8527bf75f55da559f64ccf40e4dc08b64c6bda3a9354b6e0e59a53b8fcb5fd85b6012e30419bb9b03a672ab4b83a1aec93583dc77e64a3c0d1ffa08e4
diff --git a/net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild b/net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild
deleted file mode 100644
index 976cf819ee0b..000000000000
--- a/net-mail/qmhandle/qmhandle-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="Qmail message queue tool"
-HOMEPAGE="http://qmhandle.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qmhandle/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc sparc x86"
-IUSE=""
-
-RDEPEND="
- virtual/qmail
- dev-lang/perl
- sys-process/psmisc
-"
-DEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
- unpack ${A}
- epatch "${FILESDIR}"/qmHandle-gentoo-svc.patch
-}
-
-src_install() {
- dodoc README HISTORY
- dobin qmHandle || die "dobin failed"
-}
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