subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: mail\-mta\/netqmail\/"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2024-02-17 Thread Michael Orlitzky

commit: bf0ced9a085a7f000888f7fe239fc42c42d4df65
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Jan 28 11:08:59 2024 +
Commit: Michael Orlitzky  gentoo  org>
CommitDate: Sat Feb 17 23:18:13 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf0ced9a

mail-mta/netqmail: reduce path indirection

Remove needless version variable that is not going to change anymore. Also
directly point to qmail.org URL without the qmail mirrors, these files are
small, seldomly used and cached on Gentoo infrastructure anyway.

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Michael Orlitzky  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r14.ebuild | 7 +++
 mail-mta/netqmail/netqmail-1.06-r16.ebuild | 7 +++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
index 7cbf0e0d505f..8a7c9c01987b 100644
--- a/mail-mta/netqmail/netqmail-1.06-r14.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
@@ -10,8 +10,7 @@ QMAIL_TLS_PV=20190114
 QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
 QMAIL_TLS_CVE=vu555316.patch
 
-QMAIL_BIGTODO_PV=103
-QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
+QMAIL_BIGTODO_F=big-todo.103.patch
 
 QMAIL_LARGE_DNS='qmail-103.patch'
 
@@ -25,11 +24,11 @@ HOMEPAGE="
https://cr.yp.to/qmail.html
http://qmail.org
 "
-SRC_URI="mirror://qmail/${P}.tar.gz
+SRC_URI="http://qmail.org/${P}.tar.gz

https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F}
https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
!vanilla? (
-   highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
+   highvolume? ( http://qmail.org/${QMAIL_BIGTODO_F} )
qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
ssl? (
https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F}

diff --git a/mail-mta/netqmail/netqmail-1.06-r16.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r16.ebuild
index b1a7b7419fc1..d65f3790c60d 100644
--- a/mail-mta/netqmail/netqmail-1.06-r16.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r16.ebuild
@@ -10,8 +10,7 @@ QMAIL_TLS_PV=20190114
 QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
 QMAIL_TLS_CVE=vu555316.patch
 
-QMAIL_BIGTODO_PV=103
-QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
+QMAIL_BIGTODO_F=big-todo.103.patch
 
 QMAIL_LARGE_DNS='qmail-103.patch'
 
@@ -25,11 +24,11 @@ HOMEPAGE="
https://cr.yp.to/qmail.html
http://qmail.org
 "
-SRC_URI="mirror://qmail/${P}.tar.gz
+SRC_URI="http://qmail.org/${P}.tar.gz

https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F}
https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
!vanilla? (
-   highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
+   highvolume? ( http://qmail.org/${QMAIL_BIGTODO_F} )
qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
ssl? (
https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F}

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2023-06-23 Thread Matt Turner

commit: 894e78507eaef58ea920a0ed96394b4153c6e5e6
Author: Matt Turner  gentoo  org>
AuthorDate: Fri Jun 23 17:27:35 2023 +
Commit: Matt Turner  gentoo  org>
CommitDate: Fri Jun 23 18:07:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=894e7850

mail-mta/netqmail: Drop ppc keywords

Signed-off-by: Matt Turner  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r14.ebuild | 2 +-
 mail-mta/netqmail/netqmail-1.06-r16.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
index b97074ac9ce7..7cbf0e0d505f 100644
--- a/mail-mta/netqmail/netqmail-1.06-r14.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
@@ -41,7 +41,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc64 ~s390 sparc x86"
 IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"

diff --git a/mail-mta/netqmail/netqmail-1.06-r16.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r16.ebuild
index eac15c056ce8..b1a7b7419fc1 100644
--- a/mail-mta/netqmail/netqmail-1.06-r16.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r16.ebuild
@@ -41,7 +41,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~s390 ~sparc ~x86"
 IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/, eclass/, mail-mta/notqmail/

2022-12-31 Thread Sam James

commit: 9e1bcf7d0aa3975961de47467ed2185b3330c348
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Dec 31 21:32:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 31 22:40:03 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e1bcf7d

mail-mta/n[eo]tqmail: drop ucspi-ssl dependency for pop3s

Bug: https://bugs.gentoo.org/889216
Bug: https://bugs.gentoo.org/889218
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 eclass/qmail.eclass| 10 ++
 mail-mta/netqmail/netqmail-1.06-r14.ebuild |  5 +
 mail-mta/netqmail/netqmail-1.06-r16.ebuild |  5 +
 mail-mta/notqmail/notqmail-1.08-r5.ebuild  |  3 ---
 mail-mta/notqmail/notqmail-1.08-r6.ebuild  |  3 ---
 mail-mta/notqmail/notqmail-.ebuild |  3 ---
 6 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index 67069087376d..b647ac5d8e3a 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -240,7 +240,7 @@ qmail_tcprules_install() {
insinto "${TCPRULES_DIR}"
doins "${GENQMAIL_S}"/tcprules/Makefile.qmail
doins "${GENQMAIL_S}"/tcprules/tcp.qmail-*
-   use ssl && use pop3 || rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd
+   rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd
 }
 
 qmail_supervise_install_one() {
@@ -263,7 +263,6 @@ qmail_supervise_install() {
 
if use pop3; then
qmail_supervise_install_one qmail-pop3d
-   use ssl && qmail_supervise_install_one qmail-pop3sd
fi
 }
 
@@ -344,7 +343,7 @@ qmail_rootmail_fixup() {
 }
 
 qmail_tcprules_build() {
-   for f in tcp.qmail-{smtp,qmtp,qmqp,pop3,pop3s}; do
+   for f in tcp.qmail-{smtp,qmtp,qmqp,pop3}; do
# please note that we don't check if it exists
# as we want it to make the cdb files anyway!
src="${ROOT}${TCPRULES_DIR}/${f}"
@@ -371,11 +370,6 @@ qmail_supervise_config_notice() {
elog "To start the pop3 server as well, create the following 
link:"
elog "ln -s ${SUPERVISE_DIR}/qmail-pop3d /service/qmail-pop3d"
elog
-   if use ssl; then
-   elog "To start the pop3s server as well, create the 
following link:"
-   elog "ln -s ${SUPERVISE_DIR}/qmail-pop3sd 
/service/qmail-pop3sd"
-   elog
-   fi
fi
elog "Additionally, the QMTP and QMQP protocols are supported, "
elog "and can be started as:"

diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
index e1f204048728..b97074ac9ce7 100644
--- a/mail-mta/netqmail/netqmail-1.06-r14.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -67,9 +67,6 @@ RDEPEND="${DEPEND}
virtual/checkpassword
virtual/daemontools
authcram? ( >=net-mail/cmd5checkpw-0.30 )
-   ssl? (
-   pop3? ( sys-apps/ucspi-ssl )
-   )
!mail-mta/courier
!mail-mta/esmtp
!mail-mta/exim

diff --git a/mail-mta/netqmail/netqmail-1.06-r16.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r16.ebuild
index 3a8a3899566f..eac15c056ce8 100644
--- a/mail-mta/netqmail/netqmail-1.06-r16.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -65,9 +65,6 @@ DEPEND="
 RDEPEND="${DEPEND}
sys-apps/ucspi-tcp
authcram? ( >=net-mail/cmd5checkpw-0.30 )
-   ssl? (
-   pop3? ( sys-apps/ucspi-ssl )
-   )
!mail-mta/courier
!mail-mta/esmtp
!mail-mta/exim

diff --git a/mail-mta/notqmail/notqmail-1.08-r5.ebuild 
b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
index 9717aa7f830d..e46c90306906 100644
--- a/mail-mta/notqmail/notqmail-1.08-r5.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r5.ebuild
@@ -78,9 +78,6 @@ RDEPEND="${DEPEND}
acct-user/qmailr
acct-user/qmails
sys-apps/ucspi-tcp
-   ssl? (
-   pop3? ( sys-apps/ucspi-ssl )
-   )
!mail-mta/courier
!mail-mta/esmtp
!mail-mta/exim

diff --git a/mail-mta/notqmail/notqmail-1.08-r6.ebuild 
b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
index 8e5a4d4b1b99..55cc84b9f590 100644
--- a/mail-mta/notqmail/notqmail-1.08-r6.ebuild
+++ b/mail-mta/notqmail/notqmail-1.08-r6.ebuild
@@ -89,9 +89,6 @@ RDEPEND="${DEPEND}
acct-user/qmailr
acct-user/qmails
sys-apps/ucspi-tcp
-   ssl? (
-   pop3? ( sys-apps/ucspi-ssl )
-   )
!mail-mta/courier
!mail-mta/esmtp
!mail-mta/exim

diff --git a/mail-mta/notqmail/notqmail-99

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2022-12-31 Thread Sam James

commit: d22f9a5e29fa7f182abf8eec54616e1ed4c9f946
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Dec 31 21:27:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 31 22:39:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d22f9a5e

Revert "mail-mta/netqmail: Remove USE=pop3"

This reverts commit bbc98bfdcbeb0d54f0a389eb7c92f1ffd64af7c6.

Bug: https://bugs.gentoo.org/889216
Bug: https://bugs.gentoo.org/889218
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r14.ebuild | 7 +--
 mail-mta/netqmail/netqmail-1.06-r16.ebuild | 7 +--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
index de1b07a4b18c..e1f204048728 100644
--- a/mail-mta/netqmail/netqmail-1.06-r14.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="authcram gencertdaily highvolume qmail-spp ssl vanilla"
+IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"
 
@@ -67,6 +67,9 @@ RDEPEND="${DEPEND}
virtual/checkpassword
virtual/daemontools
authcram? ( >=net-mail/cmd5checkpw-0.30 )
+   ssl? (
+   pop3? ( sys-apps/ucspi-ssl )
+   )
!mail-mta/courier
!mail-mta/esmtp
!mail-mta/exim

diff --git a/mail-mta/netqmail/netqmail-1.06-r16.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r16.ebuild
index 10daf0337012..3a8a3899566f 100644
--- a/mail-mta/netqmail/netqmail-1.06-r16.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="authcram gencertdaily highvolume qmail-spp ssl vanilla"
+IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"
 
@@ -65,6 +65,9 @@ DEPEND="
 RDEPEND="${DEPEND}
sys-apps/ucspi-tcp
authcram? ( >=net-mail/cmd5checkpw-0.30 )
+   ssl? (
+   pop3? ( sys-apps/ucspi-ssl )
+   )
!mail-mta/courier
!mail-mta/esmtp
!mail-mta/exim

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2022-12-31 Thread Jakov Smolić

commit: bbc98bfdcbeb0d54f0a389eb7c92f1ffd64af7c6
Author: Jakov Smolić  gentoo  org>
AuthorDate: Sat Dec 31 18:20:58 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sat Dec 31 18:31:02 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbc98bfd

mail-mta/netqmail: Remove USE=pop3

Signed-off-by: Jakov Smolić  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r14.ebuild | 7 ++-
 mail-mta/netqmail/netqmail-1.06-r16.ebuild | 7 ++-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
index e1f204048728..de1b07a4b18c 100644
--- a/mail-mta/netqmail/netqmail-1.06-r14.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -42,7 +42,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla"
+IUSE="authcram gencertdaily highvolume qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"
 
@@ -67,9 +67,6 @@ RDEPEND="${DEPEND}
virtual/checkpassword
virtual/daemontools
authcram? ( >=net-mail/cmd5checkpw-0.30 )
-   ssl? (
-   pop3? ( sys-apps/ucspi-ssl )
-   )
!mail-mta/courier
!mail-mta/esmtp
!mail-mta/exim

diff --git a/mail-mta/netqmail/netqmail-1.06-r16.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r16.ebuild
index 3a8a3899566f..10daf0337012 100644
--- a/mail-mta/netqmail/netqmail-1.06-r16.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -42,7 +42,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla"
+IUSE="authcram gencertdaily highvolume qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"
 
@@ -65,9 +65,6 @@ DEPEND="
 RDEPEND="${DEPEND}
sys-apps/ucspi-tcp
authcram? ( >=net-mail/cmd5checkpw-0.30 )
-   ssl? (
-   pop3? ( sys-apps/ucspi-ssl )
-   )
!mail-mta/courier
!mail-mta/esmtp
!mail-mta/exim

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2021-11-07 Thread Sam James

commit: 8a8024d0cd69a08367600c6bf552392a6e432045
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Oct 19 17:49:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov  7 07:51:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a8024d0

mail-mta/netqmail: remove dependency to virtual/checkpassword

This is an optional runtime dependency.

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 mail-mta/netqmail/{netqmail-1.06-r15.ebuild => netqmail-1.06-r16.ebuild} | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r15.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r16.ebuild
similarity index 99%
rename from mail-mta/netqmail/netqmail-1.06-r15.ebuild
rename to mail-mta/netqmail/netqmail-1.06-r16.ebuild
index 093af57c515..3a8a3899566 100644
--- a/mail-mta/netqmail/netqmail-1.06-r15.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r16.ebuild
@@ -81,7 +81,6 @@ RDEPEND="${DEPEND}
!mail-mta/ssmtp[mta]
 "
 PDEPEND="
-   virtual/checkpassword
virtual/daemontools
 "

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2021-08-18 Thread Sam James

commit: 1fe6fe6f2307625b9285cff2dd740afcf96a2b99
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Aug 19 02:11:31 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 19 02:12:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fe6fe6f

mail-mta/netqmail: put virtuals in PDEPEND

One provider of virtual/checkpassword is vpopmail, which in turn depends on
virtual/qmail, which may form a circular dependency.

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sam James  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r15.ebuild | 187 +
 1 file changed, 187 insertions(+)

diff --git a/mail-mta/netqmail/netqmail-1.06-r15.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r15.ebuild
new file mode 100644
index 000..093af57c515
--- /dev/null
+++ b/mail-mta/netqmail/netqmail-1.06-r15.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GENQMAIL_PV=20200817
+QMAIL_SPP_PV=0.42
+
+QMAIL_TLS_PV=20190114
+QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_CVE=vu555316.patch
+
+QMAIL_BIGTODO_PV=103
+QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
+
+QMAIL_LARGE_DNS='qmail-103.patch'
+
+QMAIL_SMTPUTF8='qmail-smtputf8.patch'
+
+inherit qmail
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
+HOMEPAGE="
+   http://netqmail.org
+   https://cr.yp.to/qmail.html
+   http://qmail.org
+"
+SRC_URI="mirror://qmail/${P}.tar.gz
+   
https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F}
+   https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+   !vanilla? (
+   highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
+   qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
+   ssl? (
+   https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F}
+   http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
+   
https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch
+   )
+   )
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
+RESTRICT="test"
+
+DEPEND="
+   acct-group/nofiles
+   acct-group/qmail
+   acct-user/alias
+   acct-user/qmaild
+   acct-user/qmaill
+   acct-user/qmailp
+   acct-user/qmailq
+   acct-user/qmailr
+   acct-user/qmails
+   net-dns/libidn2
+   net-mail/queue-repair
+   sys-apps/gentoo-functions
+   sys-apps/groff
+   ssl? ( >=dev-libs/openssl-1.1:0= )
+"
+RDEPEND="${DEPEND}
+   sys-apps/ucspi-tcp
+   authcram? ( >=net-mail/cmd5checkpw-0.30 )
+   ssl? (
+   pop3? ( sys-apps/ucspi-ssl )
+   )
+   !mail-mta/courier
+   !mail-mta/esmtp
+   !mail-mta/exim
+   !mail-mta/mini-qmail
+   !mail-mta/msmtp[mta]
+   !mail-mta/nullmailer
+   !mail-mta/opensmtpd
+   !mail-mta/postfix
+   !mail-mta/qmail-ldap
+   !mail-mta/sendmail
+   !mail-mta/ssmtp[mta]
+"
+PDEPEND="
+   virtual/checkpassword
+   virtual/daemontools
+"
+
+src_unpack() {
+   genqmail_src_unpack
+   use qmail-spp && qmail_spp_src_unpack
+
+   unpack ${P}.tar.gz
+}
+
+PATCHES=(
+   "${FILESDIR}/${PV}-exit.patch"
+   "${FILESDIR}/${PV}-readwrite.patch"
+   "${DISTDIR}/${QMAIL_LARGE_DNS}"
+   "${FILESDIR}/${PV}-fbsd-utmpx.patch"
+   "${FILESDIR}/${P}-ipme-multiple.patch"
+   "${FILESDIR}/${P}-any-to-cname.patch"
+   "${FILESDIR}/${P}-CVE-2005-1513.patch"
+   "${FILESDIR}/${P}-CVE-2005-1514.patch"
+   "${FILESDIR}/${P}-CVE-2005-1515.patch"
+   "${FILESDIR}/${P}-overflows.patch"
+)
+
+src_prepare() {
+   if ! use vanilla; then
+   if use ssl; then
+   # This patch contains relative paths and needs to be 
cleaned up.
+   sed 's~^--- \.\./\.\./~--- ~g' \
+   < "${DISTDIR}"/${QMAIL_TLS_F} \
+   > "${T}"/${QMAIL_TLS_F} || die
+   PATCHES+=( "${T}/${QMAIL_TLS_F}"
+   "${DISTDIR}/${QMAIL_TLS_CVE}"
+   "${FILESDIR}/qmail-smtputf8.patch"
+   "${FILESDIR}/qmail-smtputf8-crlf-fix.patch"
+   )
+   fi
+   if use highvolume; then
+   PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
+   fi
+
+   if use qmail-spp; then
+   if use ssl; then
+   
SPP_PATCH="${QMAIL_SPP_S}/qmail-spp-smtpauth-tls-20060105.diff"
+   else
+   SPP_PATCH="${

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2021-06-17 Thread Sergei Trofimovich

commit: 9919ead8eb99038c8a79b60a454c5412c92e01fb
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Jun 17 14:57:57 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Jun 17 15:55:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9919ead8

mail-mta/netqmail: stop warning about QMAIL_PATCH_DIR

This has been removed years ago, time to remove the cruft.

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r14.ebuild | 11 ---
 1 file changed, 11 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
index 0e04cd4db01..aef1ed5b4dd 100644
--- a/mail-mta/netqmail/netqmail-1.06-r14.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
@@ -83,17 +83,6 @@ RDEPEND="${DEPEND}
!mail-mta/ssmtp[mta]
 "
 
-pkg_setup() {
-   if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
-   eerror
-   eerror "The QMAIL_PATCH_DIR variable for custom patches"
-   eerror "has been removed from ${PN}. If you need custom patches"
-   eerror "see 'user patches' in the portage manual."
-   eerror
-   die "QMAIL_PATCH_DIR is not supported anymore"
-   fi
-}
-
 src_unpack() {
genqmail_src_unpack
use qmail-spp && qmail_spp_src_unpack

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2020-12-30 Thread Sergei Trofimovich

commit: 2d3cca9da5654e776df42f693fbaae0b24613b6d
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Dec 30 17:00:23 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Wed Dec 30 17:01:22 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d3cca9d

mail-mta/netqmail: remove broken USE=libressl

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r14.ebuild | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r14.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
index af1fe14bd12..242a543c073 100644
--- a/mail-mta/netqmail/netqmail-1.06-r14.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
@@ -42,7 +42,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla"
+IUSE="authcram gencertdaily highvolume pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"
 
@@ -60,10 +60,7 @@ DEPEND="
net-mail/queue-repair
sys-apps/gentoo-functions
sys-apps/groff
-   ssl? (
-   !libressl? ( >=dev-libs/openssl-1.1:0= )
-   libressl? ( dev-libs/libressl:= )
-   )
+   ssl? ( >=dev-libs/openssl-1.1:0= )
 "
 RDEPEND="${DEPEND}
sys-apps/ucspi-tcp

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/, mail-mta/notqmail/

2020-08-27 Thread Sergei Trofimovich

commit: 38d3c30e937e5e5b51b471d1756a1487fdd09a74
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Aug  6 06:18:28 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Aug 27 18:41:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38d3c30e

mail-mta/n[eo]tqmail: bump genqmail tarball

Closes: https://bugs.gentoo.org/735090
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/17027
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/netqmail/Manifest  | 2 +-
 .../netqmail/{netqmail-1.06-r13.ebuild => netqmail-1.06-r14.ebuild} | 2 +-
 mail-mta/notqmail/Manifest  | 2 +-
 mail-mta/notqmail/{notqmail-1.08-r2.ebuild => notqmail-1.08-r3.ebuild}  | 2 +-
 mail-mta/notqmail/notqmail-.ebuild  | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index e79904ce151..4e98e5c4126 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -1,5 +1,5 @@
 DIST big-todo.103.patch 5546 BLAKE2B 
34889a97c642bafedebdd3fba7dd848e58f692bbebb33da26f39d47d65ac2067cc6bfeea9f044dcebcdce53bf789c7b2e029d6542ad1926a420291d4b59d7554
 SHA512 
fe6e19a94fb7dbe51f7164e38a91d8edb636251569d44ace1e146fe5f607b240edafb2884daaac481ff3219142ab553cfd5b01786e0dfc4662ef07336b789975
-DIST genqmail-20191010.tar.bz2 10063 BLAKE2B 
bd1b664fca9fdb92aba49930b1d0c336097f2bad56ea814014c0d811d9d96fb861925dd0b016ce4ef1edd0473481fa807e81be17b7169688bfbd72a72e287718
 SHA512 
8d19a25b8745a04f7bdb378259dcee7b43f62cf90e7a7d8f4843d39169f8221cd8c5b9c332b37e5ecc7917366093e56f34bc4362b8ab0dd1785a6d0f12687a4b
+DIST genqmail-20200817.tar.bz2 10071 BLAKE2B 
dfeb8aa094c0db1b672e5e7a39f3866e02c088e366d5814832870140c1422d7c5fc0cf655614641ec45b5e819d3c4f8b910252d39231f7ae0394a81fd3309245
 SHA512 
665ac06bfb127e8c905dda34520046fc327d21db2aa15da575f434ceff7e811f4206f7cde3c87815aab86f93b7b3e374547809eb02dd0ea0af419da121a8
 DIST netqmail-1.05-tls-smtpauth-20190114.patch 68060 BLAKE2B 
46a887c23e09d6cb9fa9a5259c288cfd9dc8ce51f361d076794ebf754250a35e33787426cdd53989dc196ce4a3a61fd1e66896b2ff0368c98a4566d7bef6c517
 SHA512 
33cbf4d05c4212efecb23237c1b3fb67ef9a1543f11d81ac1c397416a4153af3d67e144686f1764d8b5e7ccd51044bbe51cf833c6ac779344048384cabc1
 DIST netqmail-1.06.tar.gz 260941 BLAKE2B 
f60cf737f308d70433da917b30a07af600f8956ae718bcf17f1628382523d7fdfa2456549066b57674a112a53946a410136ee89c0911402b24a4153bbc37d39a
 SHA512 
de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b
 DIST qmail-103.patch 2104 BLAKE2B 
23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a
 SHA512 
b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354

diff --git a/mail-mta/netqmail/netqmail-1.06-r13.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
similarity index 99%
rename from mail-mta/netqmail/netqmail-1.06-r13.ebuild
rename to mail-mta/netqmail/netqmail-1.06-r14.ebuild
index 738fa4800d1..af1fe14bd12 100644
--- a/mail-mta/netqmail/netqmail-1.06-r13.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r14.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-GENQMAIL_PV=20191010
+GENQMAIL_PV=20200817
 QMAIL_SPP_PV=0.42
 
 QMAIL_TLS_PV=20190114

diff --git a/mail-mta/notqmail/Manifest b/mail-mta/notqmail/Manifest
index 01bd981c66e..7944b1c3be3 100644
--- a/mail-mta/notqmail/Manifest
+++ b/mail-mta/notqmail/Manifest
@@ -1,4 +1,4 @@
-DIST genqmail-20191010.tar.bz2 10063 BLAKE2B 
bd1b664fca9fdb92aba49930b1d0c336097f2bad56ea814014c0d811d9d96fb861925dd0b016ce4ef1edd0473481fa807e81be17b7169688bfbd72a72e287718
 SHA512 
8d19a25b8745a04f7bdb378259dcee7b43f62cf90e7a7d8f4843d39169f8221cd8c5b9c332b37e5ecc7917366093e56f34bc4362b8ab0dd1785a6d0f12687a4b
+DIST genqmail-20200817.tar.bz2 10071 BLAKE2B 
dfeb8aa094c0db1b672e5e7a39f3866e02c088e366d5814832870140c1422d7c5fc0cf655614641ec45b5e819d3c4f8b910252d39231f7ae0394a81fd3309245
 SHA512 
665ac06bfb127e8c905dda34520046fc327d21db2aa15da575f434ceff7e811f4206f7cde3c87815aab86f93b7b3e374547809eb02dd0ea0af419da121a8
 DIST notqmail-1.08-auth.patch 71183 BLAKE2B 
c980475ef7a2ad6e05d71f494293579e5082b63606fd0bbbd51fff5d067912b1548b4033f36de8030d60b195a684ff0845afe022d316ad835b1ad0b360cafbd6
 SHA512 
697b8b2a26a10c0029918193046dd2758bb3e84af97fb2e99f29bfb23efb0a9e0ee6ecca0431369e348d1414ef70bc5c446420b4f019ba427d16d0f07f23f6e3
 DIST notqmail-1.08-big-todo.patch 7179 BLAKE2B 
f7582d0193096f17316feb15e65c2b841545e274309351fc2921120ec3a4fb35b1998fbd8b8ca573c7dbd690ab7197f4b4f9105671f7d299687bf339b747deb2
 SHA512 
8444c8b4558410682d46e4954973721a1fb5e90585c9a3a4d7603448faf68cc0d07d2b5d51977ce72d35551b5c43b03014638251b542e48fe9cbef327cacc7c6
 DIST notqmail-1.08-spp.

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2020-06-04 Thread Sergei Trofimovich

commit: 9748e68401dcb7e3059f3dc2640b770707b2d43a
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Jun  4 06:55:22 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Jun  4 14:10:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9748e684

mail-mta/netqmail: drop vulnerable

Bug: https://bugs.gentoo.org/721566
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r12.ebuild | 199 -
 1 file changed, 199 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r12.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
deleted file mode 100644
index 997d508db9f..000
--- a/mail-mta/netqmail/netqmail-1.06-r12.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENQMAIL_PV=20191010
-QMAIL_SPP_PV=0.42
-
-QMAIL_TLS_PV=20190114
-QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
-QMAIL_TLS_CVE=vu555316.patch
-
-QMAIL_BIGTODO_PV=103
-QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
-
-QMAIL_LARGE_DNS='qmail-103.patch'
-
-QMAIL_SMTPUTF8='qmail-smtputf8.patch'
-
-inherit qmail
-
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
-HOMEPAGE="
-   http://netqmail.org
-   https://cr.yp.to/qmail.html
-   http://qmail.org
-"
-SRC_URI="mirror://qmail/${P}.tar.gz
-   
https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F}
-   https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
-   !vanilla? (
-   highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
-   qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
-   ssl? (
-   https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F}
-   http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
-   
https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch
-   )
-   )
-"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla"
-REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
-RESTRICT="test"
-
-DEPEND="
-   acct-group/nofiles
-   acct-group/qmail
-   acct-user/alias
-   acct-user/qmaild
-   acct-user/qmaill
-   acct-user/qmailp
-   acct-user/qmailq
-   acct-user/qmailr
-   acct-user/qmails
-   net-dns/libidn2
-   net-mail/queue-repair
-   sys-apps/gentoo-functions
-   sys-apps/groff
-   ssl? (
-   !libressl? ( >=dev-libs/openssl-1.1:0= )
-   libressl? ( dev-libs/libressl:= )
-   )
-"
-RDEPEND="${DEPEND}
-   sys-apps/ucspi-tcp
-   virtual/checkpassword
-   virtual/daemontools
-   authcram? ( >=net-mail/cmd5checkpw-0.30 )
-   ssl? (
-   pop3? ( sys-apps/ucspi-ssl )
-   )
-   !mail-mta/courier
-   !mail-mta/esmtp
-   !mail-mta/exim
-   !mail-mta/mini-qmail
-   !mail-mta/msmtp[mta]
-   !mail-mta/nullmailer
-   !mail-mta/opensmtpd
-   !mail-mta/postfix
-   !mail-mta/qmail-ldap
-   !mail-mta/sendmail
-   !mail-mta/ssmtp[mta]
-"
-
-pkg_setup() {
-   if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
-   eerror
-   eerror "The QMAIL_PATCH_DIR variable for custom patches"
-   eerror "has been removed from ${PN}. If you need custom patches"
-   eerror "see 'user patches' in the portage manual."
-   eerror
-   die "QMAIL_PATCH_DIR is not supported anymore"
-   fi
-}
-
-src_unpack() {
-   genqmail_src_unpack
-   use qmail-spp && qmail_spp_src_unpack
-
-   unpack ${P}.tar.gz
-}
-
-PATCHES=(
-   "${FILESDIR}/${PV}-exit.patch"
-   "${FILESDIR}/${PV}-readwrite.patch"
-   "${DISTDIR}/${QMAIL_LARGE_DNS}"
-   "${FILESDIR}/${PV}-fbsd-utmpx.patch"
-   "${FILESDIR}/${P}-ipme-multiple.patch"
-   "${FILESDIR}/${P}-any-to-cname.patch"
-)
-
-src_prepare() {
-   if ! use vanilla; then
-   if use ssl; then
-   # This patch contains relative paths and needs to be 
cleaned up.
-   sed 's~^--- \.\./\.\./~--- ~g' \
-   < "${DISTDIR}"/${QMAIL_TLS_F} \
-   > "${T}"/${QMAIL_TLS_F} || die
-   PATCHES+=( "${T}/${QMAIL_TLS_F}"
-   "${DISTDIR}/${QMAIL_TLS_CVE}"
-   "${FILESDIR}/qmail-smtputf8.patch"
-   "${FILESDIR}/qmail-smtputf8-crlf-fix.patch"
-   )
-   fi
-   if use highvolume; then
-   PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
-   fi
-
-   if use qmail-sp

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2020-06-03 Thread Agostino Sarubbo

commit: 38aff18af884e3e6720784777d1187661b01ef42
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jun  3 18:42:14 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jun  3 18:42:14 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38aff18a

mail-mta/netqmail: arm stable wrt bug #721566

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r13.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r13.ebuild
index ae21c36a52c..16179dfdd99 100644
--- a/mail-mta/netqmail/netqmail-1.06-r13.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r13.ebuild
@@ -41,7 +41,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86"
 IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2020-05-25 Thread Sergei Trofimovich

commit: 4132881cf4fe3ca455aa11443473b239d8dd5cab
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Mon May 25 09:32:10 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon May 25 09:32:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4132881c

mail-mta/netqmail: stable 1.06-r13 for ppc, bug #721566

Package-Manager: Portage-2.3.100, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r13.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r13.ebuild
index c3d23adef0d..ae21c36a52c 100644
--- a/mail-mta/netqmail/netqmail-1.06-r13.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r13.ebuild
@@ -41,7 +41,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc ~x86"
 IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2020-05-22 Thread Sergei Trofimovich

commit: 1094a343b01e2ff2e54973e4e64c366dd292fb49
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri May 22 07:57:35 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri May 22 08:02:03 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1094a343

mail-mta/netqmail: stable 1.06-r13 for ppc64, bug #721566

Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r13.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r13.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r13.ebuild
index 56be4e1891c..c3d23adef0d 100644
--- a/mail-mta/netqmail/netqmail-1.06-r13.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r13.ebuild
@@ -41,7 +41,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 sparc ~x86"
 IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/, mail-mta/netqmail/files/

2020-05-19 Thread Thomas Deutschmann

commit: 3cd7e2b9721dbbf24cd4a5f9135236418a9c0cfa
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue May 19 14:16:07 2020 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue May 19 18:36:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cd7e2b9

mail-mta/netqmail-1.06-r13: revbump for CVE-2005-1513, CVE-2005-1514, 
CVE-2005-1515

Bug: https://bugs.gentoo.org/721566
Signed-off-by: Rolf Eike Beer  opensource.sf-tec.de>
Closes: https://github.com/gentoo/gentoo/pull/15881
Signed-off-by: Thomas Deutschmann  gentoo.org>

 .../files/netqmail-1.06-CVE-2005-1513.patch|  66 ++
 .../files/netqmail-1.06-CVE-2005-1514.patch|  39 
 .../files/netqmail-1.06-CVE-2005-1515.patch|  64 ++
 .../netqmail/files/netqmail-1.06-overflows.patch   | 223 +
 mail-mta/netqmail/netqmail-1.06-r13.ebuild | 203 +++
 5 files changed, 595 insertions(+)

diff --git a/mail-mta/netqmail/files/netqmail-1.06-CVE-2005-1513.patch 
b/mail-mta/netqmail/files/netqmail-1.06-CVE-2005-1513.patch
new file mode 100644
index 000..58af5a9cee1
--- /dev/null
+++ b/mail-mta/netqmail/files/netqmail-1.06-CVE-2005-1513.patch
@@ -0,0 +1,66 @@
+From bb92ea678c2a2a524d2ee6e9d598275a659168d2 Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer 
+Date: Mon, 11 May 2020 18:30:13 +0200
+Subject: [PATCH 3/4] mimimum fix for CVE-2005-1513
+
+The first allocation at the tail of the function is not changed as that
+one starts with a small number of elements and grows only on
+subsequent call.s
+---
+ gen_allocdefs.h | 27 ++-
+ 1 file changed, 22 insertions(+), 5 deletions(-)
+
+diff --git a/gen_allocdefs.h b/gen_allocdefs.h
+index 783a9b1..0588441 100644
+--- a/gen_allocdefs.h
 b/gen_allocdefs.h
+@@ -4,24 +4,41 @@
+ #define GEN_ALLOC_ready(ta,type,field,len,a,i,n,x,base,ta_ready) \
+ int ta_ready(x,n) register ta *x; register unsigned int n; \
+ { register unsigned int i; \
++  unsigned int nlen; \
+   if (x->field) { \
+ i = x->a; \
+ if (n > i) { \
+-  x->a = base + n + (n >> 3); \
+-  if (alloc_re(&x->field,i * sizeof(type),x->a * sizeof(type))) return 1; 
\
++  unsigned int nnum; \
++  if (__builtin_add_overflow(base, n, &nlen)) \
++return 0; \
++  if (__builtin_add_overflow(nlen, n >> 3, &nlen)) \
++return 0; \
++  if (__builtin_mul_overflow(nlen, sizeof(type), &nnum)) \
++return 0; \
++  x->a = nlen; \
++  if (alloc_re(&x->field,i * sizeof(type),nnum)) return 1; \
+   x->a = i; return 0; } \
+ return 1; } \
+   x->len = 0; \
+   return !!(x->field = (type *) alloc((x->a = n) * sizeof(type))); }
+ 
+ #define GEN_ALLOC_readyplus(ta,type,field,len,a,i,n,x,base,ta_rplus) \
+-int ta_rplus(x,n) register ta *x; register unsigned int n; \
++int ta_rplus(x,n) register ta *x; unsigned int n; \
+ { register unsigned int i; \
+   if (x->field) { \
+ i = x->a; n += x->len; \
++if (__builtin_add_overflow(n, x->len, &n)) \
++  return 0; \
+ if (n > i) { \
+-  x->a = base + n + (n >> 3); \
+-  if (alloc_re(&x->field,i * sizeof(type),x->a * sizeof(type))) return 1; 
\
++  unsigned int nlen, nnum; \
++  if (__builtin_add_overflow(base, n, &nlen)) \
++return 0; \
++  if (__builtin_add_overflow(nlen, n >> 3, &nlen)) \
++return 0; \
++  if (__builtin_mul_overflow(nlen, sizeof(type), &nnum)) \
++return 0; \
++  x->a = nlen; \
++  if (alloc_re(&x->field,i * sizeof(type),nnum)) return 1; \
+   x->a = i; return 0; } \
+ return 1; } \
+   x->len = 0; \
+-- 
+2.26.1
+

diff --git a/mail-mta/netqmail/files/netqmail-1.06-CVE-2005-1514.patch 
b/mail-mta/netqmail/files/netqmail-1.06-CVE-2005-1514.patch
new file mode 100644
index 000..3876c290b67
--- /dev/null
+++ b/mail-mta/netqmail/files/netqmail-1.06-CVE-2005-1514.patch
@@ -0,0 +1,39 @@
+From dc617a2f2d31e4c448b806791b3f8736cf9d1ffb Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer 
+Date: Tue, 12 May 2020 20:06:38 +0200
+Subject: [PATCH 2/4] fix possible signed integer overflow in commands()
+ (CVE-2005-1514)
+
+Fix it as suggested by the Qualys Security Advisory team.
+---
+ commands.c | 7 ---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/commands.c b/commands.c
+index b0d3f61..90a50c9 100644
+--- a/commands.c
 b/commands.c
+@@ -10,16 +10,17 @@ int commands(ss,c)
+ substdio *ss;
+ struct commands *c;
+ {
+-  int i;
++  unsigned int i;
+   char *arg;
+ 
+   for (;;) {
+ if (!stralloc_copys(&cmd,"")) return -1;
+ 
+ for (;;) {
++  int j;
+   if (!stralloc_readyplus(&cmd,1)) return -1;
+-  i = substdio_get(ss,cmd.s + cmd.len,1);
+-  if (i != 1) return i;
++  j = substdio_get(ss,cmd.s + cmd.len,1);
++  if (j != 1) return j;
+   if (cmd.s[cmd.len] == '\n') break;
+   ++cmd.len;
+ }
+-- 
+2.26.1
+

diff --git a/mail-mta/netqmail/files/netqmail-1.06-CVE-2005-1515.patc

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/files/

2020-02-13 Thread Joonas Niilola

commit: cd7fd7bd6e623c6d4b21f726eec1f1f32aa3b740
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Tue Feb 11 14:19:02 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Feb 14 06:22:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd7fd7bd

mail-mta/netqmail: remove unused patches

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14624
Signed-off-by: Joonas Niilola  gentoo.org>

 mail-mta/netqmail/files/genqmail-20080406-ldflags.patch | 13 -
 mail-mta/netqmail/files/use-new-path-for-functions.sh.patch | 11 ---
 2 files changed, 24 deletions(-)

diff --git a/mail-mta/netqmail/files/genqmail-20080406-ldflags.patch 
b/mail-mta/netqmail/files/genqmail-20080406-ldflags.patch
deleted file mode 100644
index cfd27cbb828..000
--- a/mail-mta/netqmail/files/genqmail-20080406-ldflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nuar genqmail-20080406.orig/spp/Makefile genqmail-20080406/spp/Makefile
 a/genqmail-20080406/spp/Makefile   2008-04-06 15:44:14.0 +
-+++ b/genqmail-20080406/spp/Makefile   2013-05-27 00:37:58.687763457 +
-@@ -14,7 +14,7 @@
-   rm -f $(TARGETS)
- 
- $(RESOLV_OBJS):
--  $(CC) $(CFLAGS) -o $@ $@.c -lresolv
-+  $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.c -lresolv
- 
- $(SIMPLE_OBJS):
--  $(CC) $(CFLAGS) -o $@ $@.c
-+  $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $@.c

diff --git a/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch 
b/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch
deleted file mode 100644
index f275091da5d..000
--- a/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch
+++ /dev/null
@@ -1,11 +0,0 @@
 a/genqmail-20080406/ssl/mkservercert   2015-10-18 12:46:40.082559295 
-0200
-+++ b/genqmail-20080406/ssl/mkservercert   2015-10-18 12:49:03.749576181 
-0200
-@@ -5,7 +5,7 @@
- # Based on mkimapdcert from courier-imap.
-
- test -x /usr/bin/openssl || exit 0
--source /etc/init.d/functions.sh || exit 1
-+source /lib/gentoo/functions.sh || exit 1
-
- filedir="/var/qmail/control"
- pemfile="${filedir}/servercert.pem"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2020-01-25 Thread Sergei Trofimovich

commit: 346f5e80f69da0e364cfd831a6e0d6a4a156d7bf
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jan 25 21:00:25 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 25 21:00:51 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=346f5e80

mail-mta/netqmail: stable 1.06-r12 on alpha

I did not really test it. I'm restoring dependency tree
before alpha is dropped to ~arch treewide.

Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r12.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
index 10932c3f33e..7dfe21793e6 100644
--- a/mail-mta/netqmail/netqmail-1.06-r12.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
@@ -41,7 +41,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2020-01-25 Thread Sergei Trofimovich

commit: 07d49abd226f91fdc11bcb55910daa1fcd99f4e0
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Jan 25 19:02:02 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 25 19:03:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07d49abd

mail-mta/netqmail: drop old files from Manifest

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/netqmail/Manifest | 2 --
 1 file changed, 2 deletions(-)

diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 922fa4a3a69..e79904ce151 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -1,7 +1,5 @@
 DIST big-todo.103.patch 5546 BLAKE2B 
34889a97c642bafedebdd3fba7dd848e58f692bbebb33da26f39d47d65ac2067cc6bfeea9f044dcebcdce53bf789c7b2e029d6542ad1926a420291d4b59d7554
 SHA512 
fe6e19a94fb7dbe51f7164e38a91d8edb636251569d44ace1e146fe5f607b240edafb2884daaac481ff3219142ab553cfd5b01786e0dfc4662ef07336b789975
-DIST genqmail-20080406.tar.bz2 10252 BLAKE2B 
4e959ff9a79c7621f8681866e2e614ecbd6a2c64b45a79f9c553b202f2a495fbd5b1eeefdebb0502c48c0fbed5ba37073d9b500f28217a9a568bdf7eb376b8a3
 SHA512 
744d0968307bfedebf0ca7bc0d5bd0780884326acaf5fea0a66fb91f8b0caf5ba52eb443c9cb2a7d6389622ca5c87100c3204ec3408aed8ef5fb1e7f80ff0d35
 DIST genqmail-20191010.tar.bz2 10063 BLAKE2B 
bd1b664fca9fdb92aba49930b1d0c336097f2bad56ea814014c0d811d9d96fb861925dd0b016ce4ef1edd0473481fa807e81be17b7169688bfbd72a72e287718
 SHA512 
8d19a25b8745a04f7bdb378259dcee7b43f62cf90e7a7d8f4843d39169f8221cd8c5b9c332b37e5ecc7917366093e56f34bc4362b8ab0dd1785a6d0f12687a4b
-DIST netqmail-1.05-tls-smtpauth-20070417.patch 67942 BLAKE2B 
c9498d9ef5987f1f8eae77894a839708add2186bbd8b1d4a7df36b56e0345da9643b384bc3f575bdd87dae9571d7e22c9e09894fa5330910a2bf8679675e41b5
 SHA512 
ce5fb50ae9a7683b708eeb65c68a0db47c5817eb3fc14457c4f7c5746916ca2734c647a2369bf6f1240477ee818e3e7d7870aec3edbad2eaace179cba6267e41
 DIST netqmail-1.05-tls-smtpauth-20190114.patch 68060 BLAKE2B 
46a887c23e09d6cb9fa9a5259c288cfd9dc8ce51f361d076794ebf754250a35e33787426cdd53989dc196ce4a3a61fd1e66896b2ff0368c98a4566d7bef6c517
 SHA512 
33cbf4d05c4212efecb23237c1b3fb67ef9a1543f11d81ac1c397416a4153af3d67e144686f1764d8b5e7ccd51044bbe51cf833c6ac779344048384cabc1
 DIST netqmail-1.06.tar.gz 260941 BLAKE2B 
f60cf737f308d70433da917b30a07af600f8956ae718bcf17f1628382523d7fdfa2456549066b57674a112a53946a410136ee89c0911402b24a4153bbc37d39a
 SHA512 
de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b
 DIST qmail-103.patch 2104 BLAKE2B 
23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a
 SHA512 
b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2020-01-25 Thread Sergei Trofimovich

commit: 4662fe1e4967a48f12e818c5a5b8f74305738610
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Jan 25 17:57:57 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan 25 18:02:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4662fe1e

mail-mta/netqmail: drop old

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r4.ebuild | 186 --
 1 file changed, 186 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
deleted file mode 100644
index 520694626f7..000
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GENQMAIL_PV=20080406
-QMAIL_SPP_PV=0.42
-
-QMAIL_TLS_PV=20070417
-QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
-QMAIL_TLS_CVE=vu555316.patch
-
-QMAIL_BIGTODO_PV=103
-QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
-
-QMAIL_LARGE_DNS='qmail-103.patch'
-
-inherit eutils qmail
-
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
-HOMEPAGE="
-   http://netqmail.org
-   https://cr.yp.to/qmail.html
-   http://qmail.org
-"
-SRC_URI="mirror://qmail/${P}.tar.gz
-   https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
-   https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
-   http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
-   !vanilla? (
-   highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
-   qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
-   ssl? ( http://shupp.org/patches/${QMAIL_TLS_F} )
-   )
-"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="authcram gencertdaily highvolume libressl +pop3 qmail-spp ssl vanilla"
-REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
-RESTRICT="test"
-
-DEPEND="
-   !mail-mta/qmail
-   acct-group/nofiles
-   acct-group/qmail
-   acct-user/alias
-   acct-user/qmaild
-   acct-user/qmaill
-   acct-user/qmailp
-   acct-user/qmailq
-   acct-user/qmailr
-   acct-user/qmails
-   net-mail/queue-repair
-   ssl? (
-   !libressl? ( dev-libs/openssl:0= )
-   libressl? ( dev-libs/libressl:= )
-   )
-   sys-apps/gentoo-functions
-   sys-apps/groff
-"
-RDEPEND="
-   !mail-mta/courier
-   !mail-mta/esmtp
-   !mail-mta/exim
-   !mail-mta/mini-qmail
-   !mail-mta/msmtp[mta]
-   !mail-mta/nullmailer
-   !mail-mta/postfix
-   !mail-mta/qmail-ldap
-   !mail-mta/sendmail
-   !=mail-mta/ssmtp-2.64-r2[mta]
-   >=sys-apps/ucspi-tcp-0.88-r17
-   ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
-   virtual/daemontools
-   >=net-mail/dot-forward-0.71-r3
-   virtual/checkpassword
-   authcram? ( >=net-mail/cmd5checkpw-0.30 )
-   ${DEPEND}
-"
-
-pkg_setup() {
-   if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
-   eerror
-   eerror "The QMAIL_PATCH_DIR variable for custom patches"
-   eerror "has been removed from ${PN}. If you need custom patches"
-   eerror "you should create a copy of this ebuild in an overlay."
-   eerror
-   die "QMAIL_PATCH_DIR is not supported anymore"
-   fi
-}
-
-src_unpack() {
-   genqmail_src_unpack
-   use qmail-spp && qmail_spp_src_unpack
-
-   unpack ${P}.tar.gz
-}
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PV}-exit.patch
-   epatch "${FILESDIR}"/${PV}-readwrite.patch
-   epatch "${DISTDIR}"/${QMAIL_LARGE_DNS}
-   epatch "${FILESDIR}"/${PV}-fbsd-utmpx.patch
-
-   ht_fix_file Makefile*
-
-   if ! use vanilla; then
-   if use ssl; then
-   # This patch contains relative paths and needs to be 
cleaned up.
-   sed 's~^--- ../../~--- ~g' \
-   < "${DISTDIR}"/${QMAIL_TLS_F} \
-   > "${T}"/${QMAIL_TLS_F} || die
-   epatch "${T}"/${QMAIL_TLS_F}
-   epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
-   fi
-   use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
-
-   if use qmail-spp; then
-   if use ssl; then
-   epatch 
"${QMAIL_SPP_S}"/qmail-spp-smtpauth-tls-20060105.diff
-   else
-   epatch "${QMAIL_SPP_S}"/netqmail-spp.diff
-   fi
-   cd "${WORKDIR}" || die
-   epatch "${FILESDIR}"/genqmail-20080406-ldflags.patch
-   cd - || die
-   fi
-   fi
-
-   cd "${WORKDIR}" || die
-   epatch "${FILESDIR}"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2020-01-01 Thread Agostino Sarubbo

commit: 39d38bc4425374218d946162bd455f1d2874c4ae
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Wed Jan  1 12:53:01 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Wed Jan  1 12:53:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39d38bc4

mail-mta/netqmail: arm stable wrt bug #689864

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r12.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r12.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
index 7cfc235cdbe..10932c3f33e 100644
--- a/mail-mta/netqmail/netqmail-1.06-r12.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -41,7 +41,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-12-31 Thread Agostino Sarubbo

commit: 0d9812b1a31f811542bdaa8e86d18db74ee5e70b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Dec 31 14:23:01 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Dec 31 14:23:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d9812b1

mail-mta/netqmail: ia64 stable wrt bug #689864

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r12.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
index b5c033f7eca..7cfc235cdbe 100644
--- a/mail-mta/netqmail/netqmail-1.06-r12.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
@@ -41,7 +41,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-12-31 Thread Agostino Sarubbo

commit: 709ef0a17fd96248a481f4b1fe54bc2997adcf36
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Dec 31 14:20:43 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Dec 31 14:20:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=709ef0a1

mail-mta/netqmail: ppc64 stable wrt bug #689864

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r12.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
index 76bea93358e..b5c033f7eca 100644
--- a/mail-mta/netqmail/netqmail-1.06-r12.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
@@ -41,7 +41,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-12-31 Thread Agostino Sarubbo

commit: e1b76c084197630e3d8d9b5ad4a1e7ca9c85dd30
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Dec 31 14:15:30 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Dec 31 14:15:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1b76c08

mail-mta/netqmail: ppc stable wrt bug #689864

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r12.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
index 0db94bb7403..76bea93358e 100644
--- a/mail-mta/netqmail/netqmail-1.06-r12.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
@@ -41,7 +41,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 sparc x86"
 IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-12-31 Thread Agostino Sarubbo

commit: 08d90faf6b653936e6c8258916f878b7efc1948b
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Dec 31 14:05:25 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Dec 31 14:05:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08d90faf

mail-mta/netqmail: amd64 stable wrt bug #689864

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r12.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
index 0ca473af2e6..0db94bb7403 100644
--- a/mail-mta/netqmail/netqmail-1.06-r12.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
@@ -41,7 +41,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
 IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-12-30 Thread Sergei Trofimovich

commit: 81b213963ca2244ddad1d7eb3914f5847ab5c0a9
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Dec 30 22:30:07 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Dec 30 23:01:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81b21396

mail-mta/netqmail: stable 1.06-r12 for hppa/sparc, bug #689864

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="hppa sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r12.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
index 2e6bcd4fa91..de8e4e34326 100644
--- a/mail-mta/netqmail/netqmail-1.06-r12.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
@@ -41,7 +41,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-12-30 Thread Sergei Trofimovich

commit: 4723d32ecdfada81062948b1b2f5a81a9674e85d
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Dec 30 13:40:59 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Dec 30 15:16:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4723d32e

mail-mta/netqmail: drop old

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r10.ebuild | 196 
 mail-mta/netqmail/netqmail-1.06-r11.ebuild | 198 -
 2 files changed, 394 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r10.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r10.ebuild
deleted file mode 100644
index 35fb8779c8d..000
--- a/mail-mta/netqmail/netqmail-1.06-r10.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENQMAIL_PV=20191010
-QMAIL_SPP_PV=0.42
-
-QMAIL_TLS_PV=20190114
-QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
-QMAIL_TLS_CVE=vu555316.patch
-
-QMAIL_BIGTODO_PV=103
-QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
-
-QMAIL_LARGE_DNS='qmail-103.patch'
-
-QMAIL_SMTPUTF8='qmail-smtputf8.patch'
-
-inherit qmail
-
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
-HOMEPAGE="
-   http://netqmail.org
-   https://cr.yp.to/qmail.html
-   http://qmail.org
-"
-SRC_URI="mirror://qmail/${P}.tar.gz
-   
https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F}
-   https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
-   !vanilla? (
-   highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
-   qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
-   ssl? (
-   https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F}
-   http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
-   
https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch
-   )
-   )
-"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="authcram gencertdaily highvolume libressl +pop3 qmail-spp ssl vanilla"
-REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
-RESTRICT="test"
-
-DEPEND="
-   acct-group/nofiles
-   acct-group/qmail
-   acct-user/alias
-   acct-user/qmaild
-   acct-user/qmaill
-   acct-user/qmailp
-   acct-user/qmailq
-   acct-user/qmailr
-   acct-user/qmails
-   net-dns/libidn2
-   net-mail/queue-repair
-   sys-apps/gentoo-functions
-   sys-apps/groff
-   ssl? (
-   !libressl? ( >=dev-libs/openssl-1.1:0= )
-   libressl? ( dev-libs/libressl:= )
-   )
-"
-RDEPEND="${DEPEND}
-   sys-apps/ucspi-tcp
-   virtual/checkpassword
-   virtual/daemontools
-   authcram? ( >=net-mail/cmd5checkpw-0.30 )
-   ssl? ( sys-apps/ucspi-ssl )
-   !mail-mta/courier
-   !mail-mta/esmtp
-   !mail-mta/exim
-   !mail-mta/mini-qmail
-   !mail-mta/msmtp[mta]
-   !mail-mta/nullmailer
-   !mail-mta/opensmtpd
-   !mail-mta/postfix
-   !mail-mta/qmail-ldap
-   !mail-mta/sendmail
-   !mail-mta/ssmtp[mta]
-"
-
-pkg_setup() {
-   if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
-   eerror
-   eerror "The QMAIL_PATCH_DIR variable for custom patches"
-   eerror "has been removed from ${PN}. If you need custom patches"
-   eerror "see 'user patches' in the portage manual."
-   eerror
-   die "QMAIL_PATCH_DIR is not supported anymore"
-   fi
-}
-
-src_unpack() {
-   genqmail_src_unpack
-   use qmail-spp && qmail_spp_src_unpack
-
-   unpack ${P}.tar.gz
-}
-
-PATCHES=(
-   "${FILESDIR}/${PV}-exit.patch"
-   "${FILESDIR}/${PV}-readwrite.patch"
-   "${DISTDIR}/${QMAIL_LARGE_DNS}"
-   "${FILESDIR}/${PV}-fbsd-utmpx.patch"
-   "${FILESDIR}/${P}-ipme-multiple.patch"
-)
-
-src_prepare() {
-   if ! use vanilla; then
-   if use ssl; then
-   # This patch contains relative paths and needs to be 
cleaned up.
-   sed 's~^--- \.\./\.\./~--- ~g' \
-   < "${DISTDIR}"/${QMAIL_TLS_F} \
-   > "${T}"/${QMAIL_TLS_F} || die
-   PATCHES+=( "${T}/${QMAIL_TLS_F}"
-   "${DISTDIR}/${QMAIL_TLS_CVE}"
-   "${FILESDIR}/qmail-smtputf8.patch"
-   "${FILESDIR}/qmail-smtputf8-crlf-fix.patch"
-   )
-   fi
-   if use highvolume; then
-   PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
-   fi
-
-   if use qmail-spp; then
-   if use ssl; then
-

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-12-30 Thread Sergei Trofimovich

commit: 5c54846227b4752303cef34109ee78fe8d1bd3c8
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Dec 30 14:32:22 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Mon Dec 30 15:16:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c548462

mail-mta/netqmail: move keywords forward

Package-Manager: Portage-2.3.79, Repoman-2.3.16
RepoMan-Options: --include-arches="ia64 s90 sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r12.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r12.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
index 8044a26d502..2e6bcd4fa91 100644
--- a/mail-mta/netqmail/netqmail-1.06-r12.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
@@ -41,7 +41,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla"
 REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/files/, mail-mta/netqmail/

2019-12-03 Thread Joonas Niilola

commit: 668d198ff2da26953b3d6f9df3f8aea93375317d
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Nov 30 22:42:42 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Dec  3 13:34:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=668d198f

mail-mta/netqmail: avoid ANY DNS queries

Closes: https://bugs.gentoo.org/701476
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/13816
Signed-off-by: Joonas Niilola  gentoo.org>

 .../files/netqmail-1.06-any-to-cname.patch |  74 
 mail-mta/netqmail/netqmail-1.06-r12.ebuild | 199 +
 2 files changed, 273 insertions(+)

diff --git a/mail-mta/netqmail/files/netqmail-1.06-any-to-cname.patch 
b/mail-mta/netqmail/files/netqmail-1.06-any-to-cname.patch
new file mode 100644
index 000..9c9d5396351
--- /dev/null
+++ b/mail-mta/netqmail/files/netqmail-1.06-any-to-cname.patch
@@ -0,0 +1,74 @@
+From b05ec6cbdacdf40d6c75326394461e22b7f8ab20 Mon Sep 17 00:00:00 2001
+From: Jonathan de Boyne Pollard 
+Date: Fri, 12 Jul 2019 23:34:52 -0600
+Subject: [PATCH] Apply Jonathan de Boyne Pollard's any-to-cname patch.
+
+modifies the behaviour of qmail-remote to remove the workaround
+that Dan Bernstein added on 1996-10-03 to work around a bug in
+BIND versions earlier than version 4.9.4.
+
+Applying this patch incurs a risk, but yields a benefit. It is
+published in order to allow others to experiment with removing
+the workaround.
+
+The risk is twofold:
+
+ * qmail-remote will not be able to relay any mail if one's own
+   proxy DNS server is such a version of BIND. This is trivially
+   overcome by replacing such an old version of BIND either with a
+   new version of BIND that doesn't have the problem or with some
+   other proxy DNS server software entirely (such as dnscache).
+
+ * qmail-remote will not be able to relay mail to domains whose
+   content DNS servers use such versions of BIND, because the
+   "CNAME" resource record lookup will fail. To gauge the level of
+   this risk, notice that Dan's own 2002-12-17 survey of content DNS
+   servers reports a mere 2% of the "*.com." content DNS servers as
+   employing BIND version 4 (but doesn't report how many of that 2%
+   employ BIND 4 versions earlier than 4.9.4).
+
+The benefit of this patch is that it reduces DNS query traffic
+and proxy DNS server cache load.
+
+ * Without it, qmail-remote issues "ANY" queries. Some proxy DNS
+   server softwares (albeit not dnscache) pass such queries through
+   directly to the back end, meaning that every query issued by
+   qmail-remote will result in a back-end query to a content DNS
+   server, no matter if the necessary information is already cached.
+   Moreover: The results of such a query, which are often a large
+   collection of resource record sets of various types, are cached
+   in the proxy DNS server's cache, even though almost none of them
+   will be used. A caching proxy DNS server dedicated to serving
+   qmail will end up with all sorts of cruft in its cache that isn't
+   actually relevant to mail transportation, taking up space that
+   could be better put to use caching those resource record sets
+   that are relevant.
+
+ * With it, qmail-remote issues "CNAME" queries. All of the mainstream
+   proxy DNS server softwares in popular use (apart from dnscache,
+   because it has problems in this regard) don't pass such queries
+   directly through, and will answer them from their caches without
+   issuing a back-end query at all if the data are already there and
+   still current. Moreover: A caching proxy DNS server dedicated to
+   serving qmail will not have its cache cluttered with irrelevant
+   data.
+---
+ dns.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dns.c b/dns.c
+index 44db25b..77e4ff7 100644
+--- a/dns.c
 b/dns.c
+@@ -197,7 +197,7 @@ stralloc *sa;
+if (!sa->len) return loop;
+if (sa->s[sa->len - 1] == ']') return loop;
+if (sa->s[sa->len - 1] == '.') { --sa->len; continue; }
+-   switch(resolve(sa,T_ANY))
++   switch(resolve(sa,T_CNAME))
+ {
+  case DNS_MEM: return DNS_MEM;
+  case DNS_SOFT: return DNS_SOFT;
+-- 
+2.16.4
+

diff --git a/mail-mta/netqmail/netqmail-1.06-r12.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
new file mode 100644
index 000..8044a26d502
--- /dev/null
+++ b/mail-mta/netqmail/netqmail-1.06-r12.ebuild
@@ -0,0 +1,199 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENQMAIL_PV=20191010
+QMAIL_SPP_PV=0.42
+
+QMAIL_TLS_PV=20190114
+QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_CVE=vu555316.patch
+
+QMAIL_BIGTODO_PV=103
+QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
+
+QMAIL_LARGE_DNS='qmail-103.patch'
+
+QMAIL_SMTPUTF8='qmail-smtputf8.patch'
+
+inherit qmail
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple messag

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/, eclass/

2019-11-12 Thread Joonas Niilola

commit: f9d1928dc234b97340d2e398629cad01213fbef7
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Oct 10 11:49:53 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Nov 12 14:45:30 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9d1928d

qmail.eclass: hide qmail-pop3 behind a use flag

Other solutions offer much more features and better security, so do not install
this by default. Keep it for the moment for those who explicitely want it.

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/13551
Signed-off-by: Joonas Niilola  gentoo.org>

 eclass/qmail.eclass| 69 --
 mail-mta/netqmail/metadata.xml |  1 +
 mail-mta/netqmail/netqmail-1.06-r10.ebuild |  2 +-
 ...il-1.06-r10.ebuild => netqmail-1.06-r11.ebuild} |  6 +-
 mail-mta/netqmail/netqmail-1.06-r4.ebuild  |  2 +-
 5 files changed, 46 insertions(+), 34 deletions(-)

diff --git a/eclass/qmail.eclass b/eclass/qmail.eclass
index b6ef483aa82..7e33611462b 100644
--- a/eclass/qmail.eclass
+++ b/eclass/qmail.eclass
@@ -64,7 +64,7 @@ is_prime() {
 
 dospp() {
insinto "${QMAIL_HOME}"/plugins/
-   insopts -o root -g "$GROUP_ROOT" -m 0755
+   insopts -o root -g "${GROUP_ROOT}" -m 0755
newins $1 ${2:-$(basename $1)}
 }
 
@@ -77,8 +77,8 @@ dosupervise() {
local runfile=${2:-${service}} logfile=${3:-${service}-log}
[[ -z "${service}" ]] && die "no service given"
 
-   insopts -o root -g "$GROUP_ROOT" -m 0755
-   diropts -o root -g "$GROUP_ROOT" -m 0755
+   insopts -o root -g "${GROUP_ROOT}" -m 0755
+   diropts -o root -g "${GROUP_ROOT}" -m 0755
 
dodir ${SUPERVISE_DIR}/${service}{,/log}
fperms +t ${SUPERVISE_DIR}/${service}{,/log}
@@ -169,11 +169,13 @@ qmail_full_install() {
einfo "Installing all qmail software"
insopts -o root -g qmail -m 755
doins bouncesaying condredirect config-fast except preline qbiff \
-   qmail-{pop3d,qmqpd,qmtpd,qread,qstat,smtpd,tcpok,tcpto} \
+   qmail-{qmqpd,qmtpd,qread,qstat,smtpd,tcpok,tcpto} \
qreceipt qsmhook tcp-env
+   use pop3 && doins qmail-pop3d
 
insopts -o root -g qmail -m 711
-   doins qmail-{clean,getpw,local,popup,pw2u,remote,rspawn,send} splogger
+   doins qmail-{clean,getpw,local,pw2u,remote,rspawn,send} splogger
+   use pop3 && doins qmail-popup
 
insopts -o root -g qmail -m 700
doins qmail-{lspawn,newmrh,newu,start}
@@ -188,12 +190,12 @@ qmail_full_install() {
 qmail_config_install() {
einfo "Installing stock configuration files"
insinto "${QMAIL_HOME}"/control
-   insopts -o root -g "$GROUP_ROOT" -m 644
+   insopts -o root -g "${GROUP_ROOT}" -m 644
doins "${GENQMAIL_S}"/control/{conf-*,defaultdelivery}
 
einfo "Installing configuration sanity checker and launcher"
insinto "${QMAIL_HOME}"/bin
-   insopts -o root -g "$GROUP_ROOT" -m 644
+   insopts -o root -g "${GROUP_ROOT}" -m 644
doins "${GENQMAIL_S}"/control/qmail-config-system
 
declare -F qmail_config_install_hook >/dev/null && \
@@ -244,9 +246,9 @@ qmail_maildir_install() {
done
 
einfo "Setting up default maildirs in the account skeleton"
-   diropts -o root -g "$GROUP_ROOT" -m 755
+   diropts -o root -g "${GROUP_ROOT}" -m 755
insinto /etc/skel
-   insopts -o root -g "$GROUP_ROOT" -m 644
+   insopts -o root -g "${GROUP_ROOT}" -m 644
newins "${GENQMAIL_S}"/control/defaultdelivery .qmail.sample
"${MAILDIRMAKE}" "${D}"/etc/skel/.maildir
keepdir /etc/skel/.maildir/{cur,new,tmp}
@@ -258,10 +260,16 @@ qmail_maildir_install() {
 qmail_tcprules_install() {
dodir "${TCPRULES_DIR}"
insinto "${TCPRULES_DIR}"
-   insopts -o root -g "$GROUP_ROOT" -m 0644
+   insopts -o root -g "${GROUP_ROOT}" -m 0644
doins "${GENQMAIL_S}"/tcprules/Makefile.qmail
doins "${GENQMAIL_S}"/tcprules/tcp.qmail-*
-   use ssl || rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd
+   use ssl && use pop3 || rm -f "${D}${TCPRULES_DIR}"/tcp.qmail-pop3sd
+}
+
+qmail_supervise_install_one() {
+   dosupervise ${i}
+   diropts -o qmaill -g "${GROUP_ROOT}" -m 755
+   keepdir /var/log/qmail/${i}
 }
 
 qmail_supervise_install() {
@@ -269,16 +277,13 @@ qmail_supervise_install() {
 
cd "${GENQMAIL_S}"/supervise
 
-   for i in qmail-{send,smtpd,qmtpd,qmqpd,pop3d}; do
-   dosupervise ${i}
-   diropts -o qmaill -g "$GROUP_ROOT" -m 755
-   keepdir /var/log/qmail/${i}
+   for i in qmail-{send,smtpd,qmtpd,qmqpd}; do
+   qmail_supervise_install_one ${i}
done
 
-   if use ssl; then
-   dosupervise qmail-pop3sd
-   diropts -o qmaill -g "$GROUP_ROOT" -m 755
-   keepdir /var/log/qm

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-11-01 Thread Joonas Niilola

commit: 3edce141e40b4c29ccf5a985c76e18e6353ab850
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Oct 29 22:13:06 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov  1 13:59:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3edce141

mail-mta/netqmail: drop old

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/13491
Signed-off-by: Joonas Niilola  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r8.ebuild | 200 --
 mail-mta/netqmail/netqmail-1.06-r9.ebuild | 195 -
 2 files changed, 395 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r8.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r8.ebuild
deleted file mode 100644
index fd0fcf4bf94..000
--- a/mail-mta/netqmail/netqmail-1.06-r8.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENQMAIL_PV=20080406
-QMAIL_SPP_PV=0.42
-
-QMAIL_TLS_PV=20190114
-QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
-QMAIL_TLS_CVE=vu555316.patch
-
-QMAIL_BIGTODO_PV=103
-QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
-
-QMAIL_LARGE_DNS='qmail-103.patch'
-
-QMAIL_SMTPUTF8='qmail-smtputf8.patch'
-
-inherit qmail
-
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
-HOMEPAGE="
-   http://netqmail.org
-   https://cr.yp.to/qmail.html
-   http://qmail.org
-"
-SRC_URI="mirror://qmail/${P}.tar.gz
-   https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
-   https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
-   !vanilla? (
-   highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
-   qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
-   ssl? (
-   https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F}
-   http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
-   
https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch
-   )
-   )
-"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
-IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
-REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
-RESTRICT="test"
-
-DEPEND="
-   acct-group/nofiles
-   acct-group/qmail
-   acct-user/alias
-   acct-user/qmaild
-   acct-user/qmaill
-   acct-user/qmailp
-   acct-user/qmailq
-   acct-user/qmailr
-   acct-user/qmails
-   net-dns/libidn2
-   net-mail/queue-repair
-   sys-apps/gentoo-functions
-   sys-apps/groff
-   ssl? (
-   !libressl? ( >=dev-libs/openssl-1.1:0= )
-   libressl? ( dev-libs/libressl:= )
-   )
-"
-RDEPEND="${DEPEND}
-   sys-apps/ucspi-tcp
-   virtual/checkpassword
-   virtual/daemontools
-   authcram? ( >=net-mail/cmd5checkpw-0.30 )
-   ssl? ( sys-apps/ucspi-ssl )
-   !mail-mta/courier
-   !mail-mta/esmtp
-   !mail-mta/exim
-   !mail-mta/mini-qmail
-   !mail-mta/msmtp[mta]
-   !mail-mta/nullmailer
-   !mail-mta/opensmtpd
-   !mail-mta/postfix
-   !mail-mta/qmail-ldap
-   !mail-mta/sendmail
-   !mail-mta/ssmtp[mta]
-"
-
-pkg_setup() {
-   if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
-   eerror
-   eerror "The QMAIL_PATCH_DIR variable for custom patches"
-   eerror "has been removed from ${PN}. If you need custom patches"
-   eerror "see 'user patches' in the portage manual."
-   eerror
-   die "QMAIL_PATCH_DIR is not supported anymore"
-   fi
-}
-
-src_unpack() {
-   genqmail_src_unpack
-   use qmail-spp && qmail_spp_src_unpack
-
-   unpack ${P}.tar.gz
-}
-
-PATCHES=(
-   "${FILESDIR}/${PV}-exit.patch"
-   "${FILESDIR}/${PV}-readwrite.patch"
-   "${DISTDIR}/${QMAIL_LARGE_DNS}"
-   "${FILESDIR}/${PV}-fbsd-utmpx.patch"
-   "${FILESDIR}/${P}-ipme-multiple.patch"
-)
-
-src_prepare() {
-   if ! use vanilla; then
-   if use ssl; then
-   # This patch contains relative paths and needs to be 
cleaned up.
-   sed 's~^--- \.\./\.\./~--- ~g' \
-   < "${DISTDIR}"/${QMAIL_TLS_F} \
-   > "${T}"/${QMAIL_TLS_F} || die
-   PATCHES+=( "${T}/${QMAIL_TLS_F}"
-   "${DISTDIR}/${QMAIL_TLS_CVE}"
-   "${FILESDIR}/qmail-smtputf8.patch"
-   )
-   fi
-   if use highvolume; then
-   PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
-   fi
-
-   if use qmail-spp; then
-   if use ssl; then
-   
SPP_PATCH="${QMAIL_SPP_S}/qmail-spp-smtpauth-tls-200

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/files/, mail-mta/netqmail/

2019-11-01 Thread Joonas Niilola

commit: c0c074a84d82aba52e68925cbb158e8d4b57f0bf
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Oct 29 22:09:12 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Nov  1 13:59:14 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0c074a8

mail-mta/netqmail: fix SMTPUTF8 mode

This fix was provided by the original patch author, but he sadly did not provide
a new patch.

Closes: https://bugs.gentoo.org/611142
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 .../netqmail/files/qmail-smtputf8-crlf-fix.patch   |  12 ++
 mail-mta/netqmail/netqmail-1.06-r10.ebuild | 196 +
 2 files changed, 208 insertions(+)

diff --git a/mail-mta/netqmail/files/qmail-smtputf8-crlf-fix.patch 
b/mail-mta/netqmail/files/qmail-smtputf8-crlf-fix.patch
new file mode 100644
index 000..cde34e0f9dd
--- /dev/null
+++ b/mail-mta/netqmail/files/qmail-smtputf8-crlf-fix.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/611142
+
+--- a/qmail-remote.c   2019-10-29 22:46:27.07600 +0100
 b/qmail-remote.c   2019-10-29 22:48:18.86800 +0100
+@@ -556,6 +556,7 @@ void checkutf8message()
+ if (r == 0) break;
+ if (r == -1) temp_read();
+ 
++if (ch == '\n' && !stralloc_cats(&firstpart,"\r")) temp_nomem();
+ if (!stralloc_append(&firstpart,&ch)) temp_nomem();
+ 
+ if (ch == '\r')

diff --git a/mail-mta/netqmail/netqmail-1.06-r10.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r10.ebuild
new file mode 100644
index 000..315e297526f
--- /dev/null
+++ b/mail-mta/netqmail/netqmail-1.06-r10.ebuild
@@ -0,0 +1,196 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENQMAIL_PV=20191010
+QMAIL_SPP_PV=0.42
+
+QMAIL_TLS_PV=20190114
+QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_CVE=vu555316.patch
+
+QMAIL_BIGTODO_PV=103
+QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
+
+QMAIL_LARGE_DNS='qmail-103.patch'
+
+QMAIL_SMTPUTF8='qmail-smtputf8.patch'
+
+inherit qmail
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
+HOMEPAGE="
+   http://netqmail.org
+   https://cr.yp.to/qmail.html
+   http://qmail.org
+"
+SRC_URI="mirror://qmail/${P}.tar.gz
+   
https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F}
+   https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+   !vanilla? (
+   highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
+   qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
+   ssl? (
+   https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F}
+   http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
+   
https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch
+   )
+   )
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
+RESTRICT="test"
+
+DEPEND="
+   acct-group/nofiles
+   acct-group/qmail
+   acct-user/alias
+   acct-user/qmaild
+   acct-user/qmaill
+   acct-user/qmailp
+   acct-user/qmailq
+   acct-user/qmailr
+   acct-user/qmails
+   net-dns/libidn2
+   net-mail/queue-repair
+   sys-apps/gentoo-functions
+   sys-apps/groff
+   ssl? (
+   !libressl? ( >=dev-libs/openssl-1.1:0= )
+   libressl? ( dev-libs/libressl:= )
+   )
+"
+RDEPEND="${DEPEND}
+   sys-apps/ucspi-tcp
+   virtual/checkpassword
+   virtual/daemontools
+   authcram? ( >=net-mail/cmd5checkpw-0.30 )
+   ssl? ( sys-apps/ucspi-ssl )
+   !mail-mta/courier
+   !mail-mta/esmtp
+   !mail-mta/exim
+   !mail-mta/mini-qmail
+   !mail-mta/msmtp[mta]
+   !mail-mta/nullmailer
+   !mail-mta/opensmtpd
+   !mail-mta/postfix
+   !mail-mta/qmail-ldap
+   !mail-mta/sendmail
+   !mail-mta/ssmtp[mta]
+"
+
+pkg_setup() {
+   if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
+   eerror
+   eerror "The QMAIL_PATCH_DIR variable for custom patches"
+   eerror "has been removed from ${PN}. If you need custom patches"
+   eerror "see 'user patches' in the portage manual."
+   eerror
+   die "QMAIL_PATCH_DIR is not supported anymore"
+   fi
+}
+
+src_unpack() {
+   genqmail_src_unpack
+   use qmail-spp && qmail_spp_src_unpack
+
+   unpack ${P}.tar.gz
+}
+
+PATCHES=(
+   "${FILESDIR}/${PV}-exit.patch"
+   "${FILESDIR}/${PV}-readwrite.patch"
+   "${DISTDIR}/${QMAIL_LARGE_DNS}"
+   "${FILESDIR}/${PV}-fbsd-utmpx.patch"
+   "${FILESDIR}/${P}-ipme-multiple.patch"
+)
+
+src_prepare() {
+   if ! use vanilla; then
+   if use ssl; then
+

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-10-11 Thread Joonas Niilola

commit: 31a70a4ed627114f00588c4ffcf533a48394918f
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Oct 10 13:12:56 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Oct 11 14:16:29 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31a70a4e

mail-mta/netqmail: use new snapshot of genqmail

This puts the existing patches into the tarball from the start.

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/13248
Signed-off-by: Joonas Niilola  gentoo.org>

 mail-mta/netqmail/Manifest|   1 +
 mail-mta/netqmail/netqmail-1.06-r9.ebuild | 195 ++
 2 files changed, 196 insertions(+)

diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 8162e20cd0a..922fa4a3a69 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -1,5 +1,6 @@
 DIST big-todo.103.patch 5546 BLAKE2B 
34889a97c642bafedebdd3fba7dd848e58f692bbebb33da26f39d47d65ac2067cc6bfeea9f044dcebcdce53bf789c7b2e029d6542ad1926a420291d4b59d7554
 SHA512 
fe6e19a94fb7dbe51f7164e38a91d8edb636251569d44ace1e146fe5f607b240edafb2884daaac481ff3219142ab553cfd5b01786e0dfc4662ef07336b789975
 DIST genqmail-20080406.tar.bz2 10252 BLAKE2B 
4e959ff9a79c7621f8681866e2e614ecbd6a2c64b45a79f9c553b202f2a495fbd5b1eeefdebb0502c48c0fbed5ba37073d9b500f28217a9a568bdf7eb376b8a3
 SHA512 
744d0968307bfedebf0ca7bc0d5bd0780884326acaf5fea0a66fb91f8b0caf5ba52eb443c9cb2a7d6389622ca5c87100c3204ec3408aed8ef5fb1e7f80ff0d35
+DIST genqmail-20191010.tar.bz2 10063 BLAKE2B 
bd1b664fca9fdb92aba49930b1d0c336097f2bad56ea814014c0d811d9d96fb861925dd0b016ce4ef1edd0473481fa807e81be17b7169688bfbd72a72e287718
 SHA512 
8d19a25b8745a04f7bdb378259dcee7b43f62cf90e7a7d8f4843d39169f8221cd8c5b9c332b37e5ecc7917366093e56f34bc4362b8ab0dd1785a6d0f12687a4b
 DIST netqmail-1.05-tls-smtpauth-20070417.patch 67942 BLAKE2B 
c9498d9ef5987f1f8eae77894a839708add2186bbd8b1d4a7df36b56e0345da9643b384bc3f575bdd87dae9571d7e22c9e09894fa5330910a2bf8679675e41b5
 SHA512 
ce5fb50ae9a7683b708eeb65c68a0db47c5817eb3fc14457c4f7c5746916ca2734c647a2369bf6f1240477ee818e3e7d7870aec3edbad2eaace179cba6267e41
 DIST netqmail-1.05-tls-smtpauth-20190114.patch 68060 BLAKE2B 
46a887c23e09d6cb9fa9a5259c288cfd9dc8ce51f361d076794ebf754250a35e33787426cdd53989dc196ce4a3a61fd1e66896b2ff0368c98a4566d7bef6c517
 SHA512 
33cbf4d05c4212efecb23237c1b3fb67ef9a1543f11d81ac1c397416a4153af3d67e144686f1764d8b5e7ccd51044bbe51cf833c6ac779344048384cabc1
 DIST netqmail-1.06.tar.gz 260941 BLAKE2B 
f60cf737f308d70433da917b30a07af600f8956ae718bcf17f1628382523d7fdfa2456549066b57674a112a53946a410136ee89c0911402b24a4153bbc37d39a
 SHA512 
de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b

diff --git a/mail-mta/netqmail/netqmail-1.06-r9.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r9.ebuild
new file mode 100644
index 000..755e1c04b03
--- /dev/null
+++ b/mail-mta/netqmail/netqmail-1.06-r9.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENQMAIL_PV=20191010
+QMAIL_SPP_PV=0.42
+
+QMAIL_TLS_PV=20190114
+QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_CVE=vu555316.patch
+
+QMAIL_BIGTODO_PV=103
+QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
+
+QMAIL_LARGE_DNS='qmail-103.patch'
+
+QMAIL_SMTPUTF8='qmail-smtputf8.patch'
+
+inherit qmail
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
+HOMEPAGE="
+   http://netqmail.org
+   https://cr.yp.to/qmail.html
+   http://qmail.org
+"
+SRC_URI="mirror://qmail/${P}.tar.gz
+   
https://github.com/DerDakon/genqmail/releases/download/genqmail-${GENQMAIL_PV}/${GENQMAIL_F}
+   https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+   !vanilla? (
+   highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
+   qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
+   ssl? (
+   https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F}
+   http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
+   
https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch
+   )
+   )
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
+REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )"
+RESTRICT="test"
+
+DEPEND="
+   acct-group/nofiles
+   acct-group/qmail
+   acct-user/alias
+   acct-user/qmaild
+   acct-user/qmaill
+   acct-user/qmailp
+   acct-user/qmailq
+   acct-user/qmailr
+   acct-user/qmails
+   net-dns/libidn2
+   net-mail/queue-repair
+   sys-apps/gentoo-functions
+   sys-apps/groff
+   ssl? (
+   !libressl? ( >=dev-libs/openssl-1.1:0= )
+

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-10-09 Thread Andreas Sturmlechner

commit: 6c922fb73ec9faed3220a24cd9833486edfb2d18
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri Oct  4 21:55:07 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct 10 06:22:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c922fb7

mail-mta/netqmail: remove dot-forward as dependency

This allows using sendmails .forward files with qmail, but doing so is entirely
optional.

Also remove version restrictions for ucspi-*, all versions in tree match that
condition.

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/13145
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../netqmail/{netqmail-1.06-r7.ebuild => netqmail-1.06-r8.ebuild}| 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r7.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r8.ebuild
similarity index 97%
rename from mail-mta/netqmail/netqmail-1.06-r7.ebuild
rename to mail-mta/netqmail/netqmail-1.06-r8.ebuild
index 10a85284363..fd0fcf4bf94 100644
--- a/mail-mta/netqmail/netqmail-1.06-r7.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r8.ebuild
@@ -66,12 +66,11 @@ DEPEND="
)
 "
 RDEPEND="${DEPEND}
-   >=net-mail/dot-forward-0.71-r3
-   >=sys-apps/ucspi-tcp-0.88-r17
+   sys-apps/ucspi-tcp
virtual/checkpassword
virtual/daemontools
authcram? ( >=net-mail/cmd5checkpw-0.30 )
-   ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
+   ssl? ( sys-apps/ucspi-ssl )
!mail-mta/courier
!mail-mta/esmtp
!mail-mta/exim

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-10-03 Thread Joonas Niilola

commit: f1bbdec070723bd8f9e2d52bb4d788ab26ebe839
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Oct  1 17:28:21 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Oct  4 04:38:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1bbdec0

mail-mta/netqmail: clean old

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/13118
Signed-off-by: Joonas Niilola  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r2.ebuild | 176 ---
 mail-mta/netqmail/netqmail-1.06-r6.ebuild | 195 --
 2 files changed, 371 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r2.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
deleted file mode 100644
index d0a6074fd8f..000
--- a/mail-mta/netqmail/netqmail-1.06-r2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GENQMAIL_PV=20080406
-QMAIL_SPP_PV=0.42
-
-QMAIL_TLS_PV=20070417
-QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
-QMAIL_TLS_CVE=vu555316.patch
-
-QMAIL_BIGTODO_PV=103
-QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
-
-QMAIL_LARGE_DNS='qmail-103.patch'
-
-inherit eutils qmail
-
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
-HOMEPAGE="
-   http://netqmail.org
-   https://cr.yp.to/qmail.html
-   http://qmail.org
-"
-SRC_URI="mirror://qmail/${P}.tar.gz
-   https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
-   https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
-   http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
-   !vanilla? (
-   highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
-   qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
-   ssl? ( http://shupp.org/patches/${QMAIL_TLS_F} )
-   )
-"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="authcram gencertdaily highvolume qmail-spp ssl vanilla"
-REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
-RESTRICT="test"
-
-DEPEND="
-   !mail-mta/qmail
-   acct-group/nofiles
-   acct-group/qmail
-   acct-user/alias
-   acct-user/qmaild
-   acct-user/qmaill
-   acct-user/qmailp
-   acct-user/qmailq
-   acct-user/qmailr
-   acct-user/qmails
-   net-mail/queue-repair
-   ssl? ( dev-libs/openssl:0= )
-   sys-apps/groff
-"
-RDEPEND="
-   !mail-mta/courier
-   !mail-mta/esmtp
-   !mail-mta/exim
-   !mail-mta/mini-qmail
-   !mail-mta/msmtp[mta]
-   !mail-mta/nullmailer
-   !mail-mta/postfix
-   !mail-mta/qmail-ldap
-   !mail-mta/sendmail
-   !=mail-mta/ssmtp-2.64-r2[mta]
-   >=sys-apps/ucspi-tcp-0.88-r17
-   ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
-   virtual/daemontools
-   >=net-mail/dot-forward-0.71-r3
-   virtual/checkpassword
-   authcram? ( >=net-mail/cmd5checkpw-0.30 )
-   ${DEPEND}
-"
-
-pkg_setup() {
-   if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
-   eerror
-   eerror "The QMAIL_PATCH_DIR variable for custom patches"
-   eerror "has been removed from ${PN}. If you need custom patches"
-   eerror "you should create a copy of this ebuild in an overlay."
-   eerror
-   die "QMAIL_PATCH_DIR is not supported anymore"
-   fi
-}
-
-src_unpack() {
-   genqmail_src_unpack
-   use qmail-spp && qmail_spp_src_unpack
-
-   unpack ${P}.tar.gz
-}
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PV}-exit.patch
-   epatch "${FILESDIR}"/${PV}-readwrite.patch
-   epatch "${DISTDIR}"/${QMAIL_LARGE_DNS}
-   epatch "${FILESDIR}"/${PV}-fbsd-utmpx.patch
-
-   ht_fix_file Makefile*
-
-   if ! use vanilla; then
-   # This patch contains relative paths and needs to be cleaned up.
-   sed 's~^--- ../../~--- ~g' \
-   <"${DISTDIR}"/${QMAIL_TLS_F} \
-   >"${T}"/${QMAIL_TLS_F}
-   use ssl&& epatch "${T}"/${QMAIL_TLS_F}
-   use ssl&& epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
-   use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
-
-   if use qmail-spp; then
-   if use ssl; then
-   epatch 
"${QMAIL_SPP_S}"/qmail-spp-smtpauth-tls-20060105.diff
-   else
-   epatch "${QMAIL_SPP_S}"/netqmail-spp.diff
-   fi
-   cd "${WORKDIR}"
-   epatch "${FILESDIR}"/genqmail-20080406-ldflags.patch
-   cd -
-   fi
-   fi
-
-   qmail_src_postunpack
-
-   # Fix bug #33818 but for netqmail (Bug 137015)
-   if ! use authcram; then
-   einfo "Disabled CRAM_MD5 suppo

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-10-03 Thread Joonas Niilola

commit: 3ec6d23b15c0372e79da6705eda05283d3d98304
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Oct  1 17:26:59 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Oct  4 04:38:00 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ec6d23b

mail-mta/netqmail: stable 1.06-r4 for sparc

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index 913f34b6ea2..8d6b6afbb0b 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -36,7 +36,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
 REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/files/

2019-10-01 Thread Joonas Niilola

commit: 761fd4cf11be5311444d30fc4ae1865015fa60de
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Oct  1 14:54:28 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Oct  1 16:10:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=761fd4cf

mail-mta/netqmail: clean up patch header

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 mail-mta/netqmail/files/use-new-path-for-functions.sh.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch 
b/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch
index c107db0480f..f275091da5d 100644
--- a/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch
+++ b/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch
@@ -1,4 +1,4 @@
 a/genqmail-20080406/ssl/mkservercert.orig  2015-10-18 12:46:40.082559295 
-0200
+--- a/genqmail-20080406/ssl/mkservercert   2015-10-18 12:46:40.082559295 
-0200
 +++ b/genqmail-20080406/ssl/mkservercert   2015-10-18 12:49:03.749576181 
-0200
 @@ -5,7 +5,7 @@
  # Based on mkimapdcert from courier-imap.

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-09-25 Thread Joonas Niilola

commit: 09fff29d7671fbb78002b459b6ed472c6c08a358
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Sep 25 12:50:28 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Sep 25 12:50:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09fff29d

mail-mta/netqmail: fix a patching mistake I introduced in -r7

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Joonas Niilola  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r7.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r7.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r7.ebuild
index 00b6a3087f4..10a85284363 100644
--- a/mail-mta/netqmail/netqmail-1.06-r7.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r7.ebuild
@@ -118,13 +118,13 @@ src_prepare() {
sed 's~^--- \.\./\.\./~--- ~g' \
< "${DISTDIR}"/${QMAIL_TLS_F} \
> "${T}"/${QMAIL_TLS_F} || die
-   local PATCHES+=( "${T}/${QMAIL_TLS_F}"
+   PATCHES+=( "${T}/${QMAIL_TLS_F}"
"${DISTDIR}/${QMAIL_TLS_CVE}"
"${FILESDIR}/qmail-smtputf8.patch"
)
fi
if use highvolume; then
-   local PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
+   PATCHES+=( "${DISTDIR}/${QMAIL_BIGTODO_F}" )
fi
 
if use qmail-spp; then
@@ -136,7 +136,7 @@ src_prepare() {
# make the patch work with "-p1"
sed -e 's#^--- \([Mq]\)#--- a/\1#' -e 's#^+++ 
\([Mq]\)#+++ b/\1#' -i ${SPP_PATCH} || die
 
-   local PATCHES+=( "${SPP_PATCH}" )
+   PATCHES+=( "${SPP_PATCH}" )
fi
fi

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/files/, mail-mta/netqmail/

2019-09-24 Thread Joonas Niilola

commit: 6901a0a254a693859b3b83fabb26680d1bc900a0
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Sep 21 16:51:05 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Sep 25 03:31:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6901a0a2

mail-mta/netqmail: upgrade EAPI, clean up

- properly handle multiple IP addresses on the same interface

Closes: https://bugs.gentoo.org/show_bug.cgi?id=566826
Closes: https://github.com/gentoo/gentoo/pull/12989
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 .../netqmail/files/genqmail-20080406-ldflags.patch |   4 +-
 .../files/netqmail-1.06-ipme-multiple.patch| 117 
 .../files/use-new-path-for-functions.sh.patch  |   4 +-
 mail-mta/netqmail/netqmail-1.06-r7.ebuild  | 201 +
 4 files changed, 322 insertions(+), 4 deletions(-)

diff --git a/mail-mta/netqmail/files/genqmail-20080406-ldflags.patch 
b/mail-mta/netqmail/files/genqmail-20080406-ldflags.patch
index 1eb334c259c..cfd27cbb828 100644
--- a/mail-mta/netqmail/files/genqmail-20080406-ldflags.patch
+++ b/mail-mta/netqmail/files/genqmail-20080406-ldflags.patch
@@ -1,6 +1,6 @@
 diff -Nuar genqmail-20080406.orig/spp/Makefile genqmail-20080406/spp/Makefile
 genqmail-20080406.orig/spp/Makefile2008-04-06 15:44:14.0 
+
-+++ genqmail-20080406/spp/Makefile 2013-05-27 00:37:58.687763457 +
+--- a/genqmail-20080406/spp/Makefile   2008-04-06 15:44:14.0 +
 b/genqmail-20080406/spp/Makefile   2013-05-27 00:37:58.687763457 +
 @@ -14,7 +14,7 @@
rm -f $(TARGETS)
  

diff --git a/mail-mta/netqmail/files/netqmail-1.06-ipme-multiple.patch 
b/mail-mta/netqmail/files/netqmail-1.06-ipme-multiple.patch
new file mode 100644
index 000..85b5a450c95
--- /dev/null
+++ b/mail-mta/netqmail/files/netqmail-1.06-ipme-multiple.patch
@@ -0,0 +1,117 @@
+From d24a34857afc33ed11da9ba62736c0bb9b3e5b94 Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer 
+Date: Thu, 29 Aug 2019 20:35:48 +0200
+Subject: [PATCH 1/2] ask kernel for the correct buffer size to satisfy
+ SIOCGIFCONF before looping
+
+---
+ ipme.c | 41 -
+ 1 file changed, 28 insertions(+), 13 deletions(-)
+
+diff --git a/ipme.c b/ipme.c
+index 3c86127..d88785d 100644
+--- a/ipme.c
 b/ipme.c
+@@ -52,20 +52,35 @@ int ipme_init()
+   byte_copy(&ix.ip,4,"\0\0\0\0");
+   if (!ipalloc_append(&ipme,&ix)) { return 0; }
+   if ((s = socket(AF_INET,SOCK_STREAM,0)) == -1) return -1;
+- 
+-  len = 256;
+-  for (;;) {
+-if (!stralloc_ready(&buf,len)) { close(s); return 0; }
+-buf.len = 0;
++
++  ifc.ifc_buf = 0;
++  ifc.ifc_len = 0;
++
++  /* first pass: just ask what the correct length for all addresses is */
++  len = 0;
++  if (ioctl(s,SIOCGIFCONF,&ifc) >= 0 && ifc.ifc_len > 0) { /* > is for System 
V */
++if (!stralloc_ready(&buf,ifc.ifc_len)) { close(s); return 0; }
+ ifc.ifc_buf = buf.s;
+-ifc.ifc_len = len;
+-if (ioctl(s,SIOCGIFCONF,&ifc) >= 0) /* > is for System V */
+-  if (ifc.ifc_len + sizeof(*ifr) + 64 < len) { /* what a stupid interface 
*/
+-buf.len = ifc.ifc_len;
+-break;
+-  }
+-if (len > 20) { close(s); return -1; }
+-len += 100 + (len >> 2);
++if (ioctl(s,SIOCGIFCONF,&ifc) >= 0)
++  buf.len = ifc.ifc_len;
++  }
++
++  /* check if we have complete length, otherwise try so sort that out */
++  if (buf.len == 0) {
++len = 256;
++for (;;) {
++  if (!stralloc_ready(&buf,len)) { close(s); return 0; }
++  buf.len = 0;
++  ifc.ifc_buf = buf.s;
++  ifc.ifc_len = len;
++  if (ioctl(s,SIOCGIFCONF,&ifc) >= 0) /* > is for System V */
++if (ifc.ifc_len + sizeof(*ifr) + 64 < len) { /* what a stupid 
interface */
++  buf.len = ifc.ifc_len;
++  break;
++}
++  if (len > 20) { close(s); return -1; }
++  len += 100 + (len >> 2);
++}
+   }
+   x = buf.s;
+   while (x < buf.s + buf.len) {
+-- 
+2.16.4
+
+From 9d6c05d092e3cf94a6591cd5420f8026fcd4691f Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer 
+Date: Thu, 29 Aug 2019 20:37:03 +0200
+Subject: [PATCH 2/2] ipme: fix detection of multiple IP addresses on the same
+ link
+
+The problem was that the code did another ioctl() to check if the link is
+actually up, and when doing this overwrites the information it is currently
+looking at. The code when sa_len is available copies the current IP address out
+before checking if the link is up. Reorder the code so both branches share more
+code and both work.
+---
+ CHANGES |  2 ++
+ ipme.c  | 14 +++---
+ 2 files changed, 5 insertions(+), 11 deletions(-)
+
+diff --git a/ipme.c b/ipme.c
+index d88785d..e163f5b 100644
+--- a/ipme.c
 b/ipme.c
+@@ -89,6 +89,9 @@ int ipme_init()
+ len = sizeof(ifr->ifr_name) + ifr->ifr_addr.sa_len;
+ if (len < sizeof(*ifr))
+   len = sizeof(*ifr);
++#else
++len = sizeof(*ifr);
++

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-09-21 Thread Joonas Niilola

commit: 19fb427b069ec2e49b39bd1a1f69ca8bb0e6efea
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Mon Sep  9 19:33:36 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Sep 21 14:49:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19fb427b

mail-mta/netqmail: depend on users from acct-user

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r2.ebuild | 9 +++--
 mail-mta/netqmail/netqmail-1.06-r4.ebuild | 9 +++--
 mail-mta/netqmail/netqmail-1.06-r6.ebuild | 9 +++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r2.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
index 46b3fd42be7..d0a6074fd8f 100644
--- a/mail-mta/netqmail/netqmail-1.06-r2.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
@@ -45,6 +45,13 @@ DEPEND="
!mail-mta/qmail
acct-group/nofiles
acct-group/qmail
+   acct-user/alias
+   acct-user/qmaild
+   acct-user/qmaill
+   acct-user/qmailp
+   acct-user/qmailq
+   acct-user/qmailr
+   acct-user/qmails
net-mail/queue-repair
ssl? ( dev-libs/openssl:0= )
sys-apps/groff
@@ -79,8 +86,6 @@ pkg_setup() {
eerror
die "QMAIL_PATCH_DIR is not supported anymore"
fi
-
-   qmail_create_users
 }
 
 src_unpack() {

diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index 94f87db2055..913f34b6ea2 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -45,6 +45,13 @@ DEPEND="
!mail-mta/qmail
acct-group/nofiles
acct-group/qmail
+   acct-user/alias
+   acct-user/qmaild
+   acct-user/qmaill
+   acct-user/qmailp
+   acct-user/qmailq
+   acct-user/qmailr
+   acct-user/qmails
net-mail/queue-repair
ssl? (
!libressl? ( dev-libs/openssl:0= )
@@ -83,8 +90,6 @@ pkg_setup() {
eerror
die "QMAIL_PATCH_DIR is not supported anymore"
fi
-
-   qmail_create_users
 }
 
 src_unpack() {

diff --git a/mail-mta/netqmail/netqmail-1.06-r6.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
index 5e427e137a6..196164f97d7 100644
--- a/mail-mta/netqmail/netqmail-1.06-r6.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
@@ -50,6 +50,13 @@ DEPEND="
!mail-mta/qmail
acct-group/nofiles
acct-group/qmail
+   acct-user/alias
+   acct-user/qmaild
+   acct-user/qmaill
+   acct-user/qmailp
+   acct-user/qmailq
+   acct-user/qmailr
+   acct-user/qmails
net-mail/queue-repair
ssl? (
!libressl? ( >=dev-libs/openssl-1.1:0= )
@@ -89,8 +96,6 @@ pkg_setup() {
eerror
die "QMAIL_PATCH_DIR is not supported anymore"
fi
-
-   qmail_create_users
 }
 
 src_unpack() {

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/, mail-mta/netqmail/files/

2019-09-21 Thread Joonas Niilola

commit: 8c3963bfb197ed371f535dccfcae6004888b2f9c
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Thu Sep 19 19:04:30 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Sep 21 14:49:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3963bf

mail-mta/netqmail: clean up ebuild and patch

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/12975
Signed-off-by: Joonas Niilola  gentoo.org>

 mail-mta/netqmail/files/1.06-fbsd-utmpx.patch |  4 ++--
 mail-mta/netqmail/netqmail-1.06-r6.ebuild | 10 ++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/mail-mta/netqmail/files/1.06-fbsd-utmpx.patch 
b/mail-mta/netqmail/files/1.06-fbsd-utmpx.patch
index 8500eb53e3e..0307a0d1941 100644
--- a/mail-mta/netqmail/files/1.06-fbsd-utmpx.patch
+++ b/mail-mta/netqmail/files/1.06-fbsd-utmpx.patch
@@ -1,5 +1,5 @@
 qbiff.c.orig   2010-04-06 08:43:28.0 -0300
-+++ qbiff.c2010-04-06 08:44:35.0 -0300
+--- a/qbiff.c  2010-04-06 08:43:28.0 -0300
 b/qbiff.c  2010-04-06 08:44:35.0 -0300
 @@ -1,13 +1,6 @@
  #include 
  #include 

diff --git a/mail-mta/netqmail/netqmail-1.06-r6.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
index f58a3c0abad..ccdc0866b46 100644
--- a/mail-mta/netqmail/netqmail-1.06-r6.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
@@ -28,12 +28,14 @@ HOMEPAGE="
 SRC_URI="mirror://qmail/${P}.tar.gz
https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
-   http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
-   http://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch
!vanilla? (
highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
-   ssl? ( https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F} )
+   ssl? (
+   https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F}
+   http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
+   
https://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch
+   )
)
 "
 
@@ -81,7 +83,7 @@ pkg_setup() {
eerror
eerror "The QMAIL_PATCH_DIR variable for custom patches"
eerror "has been removed from ${PN}. If you need custom patches"
-   eerror "you should create a copy of this ebuild in an overlay."
+   eerror "see 'user patches' in the portage manual."
eerror
die "QMAIL_PATCH_DIR is not supported anymore"
fi

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-09-21 Thread Joonas Niilola

commit: bd8859ca34b9bdef50f306268c25b0c1ad9370ba
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Sep  8 19:37:38 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Sep 21 14:49:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd8859ca

mail-mta/netqmail: depend on groups from acct-group

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Joonas Niilola  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r2.ebuild | 2 ++
 mail-mta/netqmail/netqmail-1.06-r4.ebuild | 2 ++
 mail-mta/netqmail/netqmail-1.06-r6.ebuild | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/mail-mta/netqmail/netqmail-1.06-r2.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
index 076e9266515..46b3fd42be7 100644
--- a/mail-mta/netqmail/netqmail-1.06-r2.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
@@ -43,6 +43,8 @@ RESTRICT="test"
 
 DEPEND="
!mail-mta/qmail
+   acct-group/nofiles
+   acct-group/qmail
net-mail/queue-repair
ssl? ( dev-libs/openssl:0= )
sys-apps/groff

diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index aa64d3d57d5..94f87db2055 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -43,6 +43,8 @@ RESTRICT="test"
 
 DEPEND="
!mail-mta/qmail
+   acct-group/nofiles
+   acct-group/qmail
net-mail/queue-repair
ssl? (
!libressl? ( dev-libs/openssl:0= )

diff --git a/mail-mta/netqmail/netqmail-1.06-r6.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
index ccdc0866b46..5e427e137a6 100644
--- a/mail-mta/netqmail/netqmail-1.06-r6.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
@@ -48,6 +48,8 @@ RESTRICT="test"
 
 DEPEND="
!mail-mta/qmail
+   acct-group/nofiles
+   acct-group/qmail
net-mail/queue-repair
ssl? (
!libressl? ( >=dev-libs/openssl-1.1:0= )

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-09-19 Thread Joonas Niilola

commit: ac91b0b77a3d63edcc525e77e77156dbc39dceae
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Sep 18 19:59:02 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Sep 19 16:12:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac91b0b7

mail-mta/vpopmail: take it

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/12963
Signed-off-by: Joonas Niilola  gentoo.org>

 mail-mta/netqmail/metadata.xml | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/metadata.xml b/mail-mta/netqmail/metadata.xml
index 3bed043ffa5..913438ace92 100644
--- a/mail-mta/netqmail/metadata.xml
+++ b/mail-mta/netqmail/metadata.xml
@@ -1,7 +1,14 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-   
+   
+   gentoo-...@opensource.sf-tec.de
+   Rolf Eike Beer
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   

Enable AUTHCRAM support
Generate SSL certificates daily 
instead of

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-09-12 Thread Sergei Trofimovich

commit: 2df4a52d583ad6a7233faf7601106e1a32bcc161
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri Sep  6 19:35:42 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Sep 13 06:20:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2df4a52d

mail-mta/netqmail: require correct openssl version

Bug: https://bugs.gentoo.org/691670
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r6.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
index f78baf94aac..f58a3c0abad 100644
--- a/mail-mta/netqmail/netqmail-1.06-r6.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
@@ -48,7 +48,7 @@ DEPEND="
!mail-mta/qmail
net-mail/queue-repair
ssl? (
-   !libressl? ( dev-libs/openssl:0= )
+   !libressl? ( >=dev-libs/openssl-1.1:0= )
libressl? ( dev-libs/libressl:= )
)
sys-apps/gentoo-functions

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-08-09 Thread Joonas Niilola

commit: bb7f219c99bd6dfcac19d0d88dbfe106132c1173
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Wed Aug  7 09:49:34 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Aug 10 05:56:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb7f219c

mail-mta/netqmail: fix build without ssl

Closes: https://bugs.gentoo.org/649854
Closes: https://bugs.gentoo.org/674688
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/12630
Signed-off-by: Joonas Niilola  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r4.ebuild | 14 --
 mail-mta/netqmail/netqmail-1.06-r5.ebuild | 16 +---
 mail-mta/netqmail/netqmail-1.06-r6.ebuild | 16 +---
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index 1f750f0f171..aa64d3d57d5 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -101,12 +101,14 @@ src_prepare() {
ht_fix_file Makefile*
 
if ! use vanilla; then
-   # This patch contains relative paths and needs to be cleaned up.
-   sed 's~^--- ../../~--- ~g' \
-   <"${DISTDIR}"/${QMAIL_TLS_F} \
-   >"${T}"/${QMAIL_TLS_F} || die
-   use ssl&& epatch "${T}"/${QMAIL_TLS_F}
-   use ssl&& epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+   if use ssl; then
+   # This patch contains relative paths and needs to be 
cleaned up.
+   sed 's~^--- ../../~--- ~g' \
+   < "${DISTDIR}"/${QMAIL_TLS_F} \
+   > "${T}"/${QMAIL_TLS_F} || die
+   epatch "${T}"/${QMAIL_TLS_F}
+   epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+   fi
use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
 
if use qmail-spp; then

diff --git a/mail-mta/netqmail/netqmail-1.06-r5.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r5.ebuild
index 31387c27673..f6f4cfb3dee 100644
--- a/mail-mta/netqmail/netqmail-1.06-r5.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r5.ebuild
@@ -105,12 +105,14 @@ src_prepare() {
ht_fix_file Makefile*
 
if ! use vanilla; then
-   # This patch contains relative paths and needs to be cleaned up.
-   sed 's~^--- ../../~--- ~g' \
-   <"${DISTDIR}"/${QMAIL_TLS_F} \
-   >"${T}"/${QMAIL_TLS_F} || die
-   use ssl&& epatch "${T}"/${QMAIL_TLS_F}
-   use ssl&& epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+   if use ssl; then
+   # This patch contains relative paths and needs to be 
cleaned up.
+   sed 's~^--- ../../~--- ~g' \
+   < "${DISTDIR}"/${QMAIL_TLS_F} \
+   > "${T}"/${QMAIL_TLS_F} || die
+   epatch "${T}"/${QMAIL_TLS_F}
+   epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+   fi
use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
 
if use qmail-spp; then
@@ -127,7 +129,7 @@ src_prepare() {
 
cd "${WORKDIR}" || die
epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
-   epatch "${FILESDIR}"/qmail-smtputf8.patch
+   use ssl && epatch "${FILESDIR}"/qmail-smtputf8.patch
cd - || die
 
qmail_src_postunpack

diff --git a/mail-mta/netqmail/netqmail-1.06-r6.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
index ea0d2b7b10c..f78baf94aac 100644
--- a/mail-mta/netqmail/netqmail-1.06-r6.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
@@ -105,12 +105,14 @@ src_prepare() {
ht_fix_file Makefile*
 
if ! use vanilla; then
-   # This patch contains relative paths and needs to be cleaned up.
-   sed 's~^--- ../../~--- ~g' \
-   <"${DISTDIR}"/${QMAIL_TLS_F} \
-   >"${T}"/${QMAIL_TLS_F} || die
-   use ssl&& epatch "${T}"/${QMAIL_TLS_F}
-   use ssl&& epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+   if use ssl; then
+   # This patch contains relative paths and needs to be 
cleaned up.
+   sed 's~^--- ../../~--- ~g' \
+   < "${DISTDIR}"/${QMAIL_TLS_F} \
+   > "${T}"/${QMAIL_TLS_F} || die
+   epatch "${T}"/${QMAIL_TLS_F}
+   epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+   fi
use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
 
if use qmail-spp; then
@@ -127,7 +129,7 @@ src_prepare() {
 
cd "${WORKDIR}" || die
epatch "${FILESDIR}"/use-new-path-for-functions.sh.patch
-

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-07-13 Thread Hans de Graaff

commit: e6be99809aa817b7953a7855bab08df07ca588d3
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Jul 13 09:02:20 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Jul 13 09:02:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6be9980

mail-mta/netqmail: cleanup

Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 mail-mta/netqmail/netqmail-1.06.ebuild | 150 -
 1 file changed, 150 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06.ebuild 
b/mail-mta/netqmail/netqmail-1.06.ebuild
deleted file mode 100644
index 91bb9c2220e..000
--- a/mail-mta/netqmail/netqmail-1.06.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-GENQMAIL_PV=20080406
-QMAIL_SPP_PV=0.42
-
-QMAIL_TLS_PV=20070417
-QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
-
-QMAIL_BIGTODO_PV=103
-QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
-
-inherit eutils qmail
-
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
-HOMEPAGE="
-   http://netqmail.org
-   https://cr.yp.to/qmail.html
-   http://qmail.org
-"
-SRC_URI="mirror://qmail/${P}.tar.gz
-   https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
-   !vanilla? (
-   highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
-   qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
-   ssl? ( http://shupp.org/patches/${QMAIL_TLS_F} )
-   )
-"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="authcram gencertdaily highvolume qmail-spp ssl vanilla"
-RESTRICT="test"
-
-DEPEND="
-   !mail-mta/qmail
-   net-mail/queue-repair
-   ssl? ( dev-libs/openssl )
-"
-RDEPEND="
-   !mail-mta/courier
-   !mail-mta/esmtp
-   !mail-mta/exim
-   !mail-mta/mini-qmail
-   !mail-mta/msmtp
-   !mail-mta/nullmailer
-   !mail-mta/postfix
-   !mail-mta/qmail-ldap
-   !mail-mta/sendmail
-   !mail-mta/ssmtp
-   >=sys-apps/ucspi-tcp-0.88-r17
-   ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
-   virtual/daemontools
-   >=net-mail/dot-forward-0.71-r3
-   virtual/checkpassword
-   authcram? ( >=net-mail/cmd5checkpw-0.30 )
-   ${DEPEND}
-"
-
-pkg_setup() {
-   if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
-   eerror
-   eerror "The QMAIL_PATCH_DIR variable for custom patches"
-   eerror "has been removed from ${PN}. If you need custom patches"
-   eerror "you should create a copy of this ebuild in an overlay."
-   eerror
-   die "QMAIL_PATCH_DIR is not supported anymore"
-   fi
-
-   qmail_create_users
-}
-
-src_unpack() {
-   genqmail_src_unpack
-   use qmail-spp && qmail_spp_src_unpack
-
-   unpack ${P}.tar.gz
-   cd "${S}"
-
-   epatch "${FILESDIR}"/${PV}-exit.patch
-   epatch "${FILESDIR}"/${PV}-readwrite.patch
-
-   ht_fix_file Makefile*
-
-   if ! use vanilla; then
-   use ssl&& epatch "${DISTDIR}"/${QMAIL_TLS_F}
-   use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
-
-   if use qmail-spp; then
-   if use ssl; then
-   epatch 
"${QMAIL_SPP_S}"/qmail-spp-smtpauth-tls-20060105.diff
-   else
-   epatch "${QMAIL_SPP_S}"/netqmail-spp.diff
-   fi
-   fi
-   fi
-
-   qmail_src_postunpack
-
-   # Fix bug #33818 but for netqmail (Bug 137015)
-   if ! use authcram; then
-   einfo "Disabled CRAM_MD5 support"
-   sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c
-   else
-   einfo "Enabled CRAM_MD5 support"
-   fi
-}
-
-src_compile() {
-   qmail_src_compile
-   use qmail-spp && qmail_spp_src_compile
-}
-
-src_install() {
-   qmail_src_install
-}
-
-pkg_postinst() {
-   qmail_queue_setup
-   qmail_rootmail_fixup
-   qmail_tcprules_build
-
-   qmail_config_notice
-   qmail_supervise_config_notice
-   elog
-   elog "If you are looking for documentation, check those links:"
-   elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail";
-   elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
-   elog "http://www.lifewithqmail.com/";
-   elog "  -- Life with qmail"
-   elog
-}
-
-pkg_preinst() {
-   qmail_tcprules_fixup
-}
-
-pkg_config() {
-   # avoid some weird locale problems
-   export LC_ALL=C
-
-   qmail_config_fast
-   qmail_tcprules_config
-   qmail_tcprules_build
-
-   use ssl && qmail_ssl_generate
-}

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-07-13 Thread Hans de Graaff

commit: 2e30ff07409caeb08b5ff612fe40508dd30f
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Jul 13 07:30:52 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Jul 13 07:58:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e30ff07

mail-mta/netqmail: cleanup

Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 mail-mta/netqmail/netqmail-1.06-r1.ebuild | 161 
 mail-mta/netqmail/netqmail-1.06-r3.ebuild | 172 --
 2 files changed, 333 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r1.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r1.ebuild
deleted file mode 100644
index 676804f65d5..000
--- a/mail-mta/netqmail/netqmail-1.06-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-GENQMAIL_PV=20080406
-QMAIL_SPP_PV=0.42
-
-QMAIL_TLS_PV=20070417
-QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
-
-QMAIL_BIGTODO_PV=103
-QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
-
-QMAIL_LARGE_DNS='qmail-103.patch'
-
-inherit eutils qmail
-
-DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
-HOMEPAGE="
-   http://netqmail.org
-   https://cr.yp.to/qmail.html
-   http://qmail.org
-"
-SRC_URI="mirror://qmail/${P}.tar.gz
-   https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
-   https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
-   !vanilla? (
-   highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
-   qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
-   ssl? ( http://shupp.org/patches/${QMAIL_TLS_F} )
-   )
-"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
-IUSE="authcram gencertdaily highvolume qmail-spp ssl vanilla"
-REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
-RESTRICT="test"
-
-DEPEND="
-   !mail-mta/qmail
-   net-mail/queue-repair
-   ssl? ( dev-libs/openssl:0= )
-"
-RDEPEND="
-   !mail-mta/courier
-   !mail-mta/esmtp
-   !mail-mta/exim
-   !mail-mta/mini-qmail
-   !mail-mta/msmtp[mta]
-   !mail-mta/nullmailer
-   !mail-mta/postfix
-   !mail-mta/qmail-ldap
-   !mail-mta/sendmail
-   !=mail-mta/ssmtp-2.64-r2[mta]
-   >=sys-apps/ucspi-tcp-0.88-r17
-   ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
-   virtual/daemontools
-   >=net-mail/dot-forward-0.71-r3
-   virtual/checkpassword
-   authcram? ( >=net-mail/cmd5checkpw-0.30 )
-   ${DEPEND}
-"
-
-pkg_setup() {
-   if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
-   eerror
-   eerror "The QMAIL_PATCH_DIR variable for custom patches"
-   eerror "has been removed from ${PN}. If you need custom patches"
-   eerror "you should create a copy of this ebuild in an overlay."
-   eerror
-   die "QMAIL_PATCH_DIR is not supported anymore"
-   fi
-
-   qmail_create_users
-}
-
-src_unpack() {
-   genqmail_src_unpack
-   use qmail-spp && qmail_spp_src_unpack
-
-   unpack ${P}.tar.gz
-}
-
-src_prepare() {
-   epatch "${FILESDIR}"/${PV}-exit.patch
-   epatch "${FILESDIR}"/${PV}-readwrite.patch
-   epatch "${DISTDIR}"/${QMAIL_LARGE_DNS}
-
-   ht_fix_file Makefile*
-
-   if ! use vanilla; then
-   # This patch contains relative paths and needs to be cleaned up.
-   sed 's~^--- ../../~--- ~g' \
-   <"${DISTDIR}"/${QMAIL_TLS_F} \
-   >"${T}"/${QMAIL_TLS_F}
-   use ssl&& epatch "${T}"/${QMAIL_TLS_F}
-   use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
-
-   if use qmail-spp; then
-   if use ssl; then
-   epatch 
"${QMAIL_SPP_S}"/qmail-spp-smtpauth-tls-20060105.diff
-   else
-   epatch "${QMAIL_SPP_S}"/netqmail-spp.diff
-   fi
-   fi
-   fi
-
-   qmail_src_postunpack
-
-   # Fix bug #33818 but for netqmail (Bug 137015)
-   if ! use authcram; then
-   einfo "Disabled CRAM_MD5 support"
-   sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c
-   else
-   einfo "Enabled CRAM_MD5 support"
-   fi
-}
-
-src_compile() {
-   qmail_src_compile
-   use qmail-spp && qmail_spp_src_compile
-}
-
-src_install() {
-   qmail_src_install
-}
-
-pkg_postinst() {
-   qmail_queue_setup
-   qmail_rootmail_fixup
-   qmail_tcprules_build
-
-   qmail_config_notice
-   qmail_supervise_config_notice
-   elog
-   elog "If you are looking for documentation, check those links:"
-   elog "https://wiki.gentoo.org/wiki/Virtua

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-07-13 Thread Hans de Graaff

commit: 68f960be6f3ae117088fb103732007e5c7e75e11
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Jul 13 07:55:22 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Jul 13 07:58:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68f960be

mail-mta/netqmail:

Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 mail-mta/netqmail/Manifest|   1 +
 mail-mta/netqmail/netqmail-1.06-r6.ebuild | 182 ++
 2 files changed, 183 insertions(+)

diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index ec8065fdf86..8162e20cd0a 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -1,6 +1,7 @@
 DIST big-todo.103.patch 5546 BLAKE2B 
34889a97c642bafedebdd3fba7dd848e58f692bbebb33da26f39d47d65ac2067cc6bfeea9f044dcebcdce53bf789c7b2e029d6542ad1926a420291d4b59d7554
 SHA512 
fe6e19a94fb7dbe51f7164e38a91d8edb636251569d44ace1e146fe5f607b240edafb2884daaac481ff3219142ab553cfd5b01786e0dfc4662ef07336b789975
 DIST genqmail-20080406.tar.bz2 10252 BLAKE2B 
4e959ff9a79c7621f8681866e2e614ecbd6a2c64b45a79f9c553b202f2a495fbd5b1eeefdebb0502c48c0fbed5ba37073d9b500f28217a9a568bdf7eb376b8a3
 SHA512 
744d0968307bfedebf0ca7bc0d5bd0780884326acaf5fea0a66fb91f8b0caf5ba52eb443c9cb2a7d6389622ca5c87100c3204ec3408aed8ef5fb1e7f80ff0d35
 DIST netqmail-1.05-tls-smtpauth-20070417.patch 67942 BLAKE2B 
c9498d9ef5987f1f8eae77894a839708add2186bbd8b1d4a7df36b56e0345da9643b384bc3f575bdd87dae9571d7e22c9e09894fa5330910a2bf8679675e41b5
 SHA512 
ce5fb50ae9a7683b708eeb65c68a0db47c5817eb3fc14457c4f7c5746916ca2734c647a2369bf6f1240477ee818e3e7d7870aec3edbad2eaace179cba6267e41
+DIST netqmail-1.05-tls-smtpauth-20190114.patch 68060 BLAKE2B 
46a887c23e09d6cb9fa9a5259c288cfd9dc8ce51f361d076794ebf754250a35e33787426cdd53989dc196ce4a3a61fd1e66896b2ff0368c98a4566d7bef6c517
 SHA512 
33cbf4d05c4212efecb23237c1b3fb67ef9a1543f11d81ac1c397416a4153af3d67e144686f1764d8b5e7ccd51044bbe51cf833c6ac779344048384cabc1
 DIST netqmail-1.06.tar.gz 260941 BLAKE2B 
f60cf737f308d70433da917b30a07af600f8956ae718bcf17f1628382523d7fdfa2456549066b57674a112a53946a410136ee89c0911402b24a4153bbc37d39a
 SHA512 
de40a6d8fac502bd785010434d99b99f2c0524e10aea3d0f2a0d35c70fce91e991eb1fb8f20a1276eb56d7e73130ea5e2c178f6075d138af47b28d9ca6e6046b
 DIST qmail-103.patch 2104 BLAKE2B 
23721b3331c719f3b6deca8b2603bf824b66068d3901a84dda9edbe33b506d0c2b6e711364e2426d9e393453a54485f0286d4668f99cf6b9acabf10a5dc59b0a
 SHA512 
b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
 DIST qmail-smtputf8.patch 6693 BLAKE2B 
1b9cd78e63ab9f2f8ca9f49c49406f603efb31d323bb4423aaa8b970c2c26a7e76496a449a98501765dc1a5e6659d9bfd49a6dafbdba14db9a9594e1d1c9b94f
 SHA512 
8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4

diff --git a/mail-mta/netqmail/netqmail-1.06-r6.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
new file mode 100644
index 000..a647effd78b
--- /dev/null
+++ b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
@@ -0,0 +1,182 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+GENQMAIL_PV=20080406
+QMAIL_SPP_PV=0.42
+
+QMAIL_TLS_PV=20190114
+QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_CVE=vu555316.patch
+
+QMAIL_BIGTODO_PV=103
+QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
+
+QMAIL_LARGE_DNS='qmail-103.patch'
+
+QMAIL_SMTPUTF8='qmail-smtputf8.patch'
+
+inherit eutils qmail
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
+HOMEPAGE="
+   http://netqmail.org
+   https://cr.yp.to/qmail.html
+   http://qmail.org
+"
+SRC_URI="mirror://qmail/${P}.tar.gz
+   https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
+   https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+   http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
+   http://arnt.gulbrandsen.priv.no/qmail/qmail-smtputf8.patch
+   !vanilla? (
+   highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
+   qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
+   ssl? ( https://mirror.alexh.name/qmail/netqmail/${QMAIL_TLS_F} )
+   )
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
+REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
+RESTRICT="test"
+
+DEPEND="
+   !mail-mta/qmail
+   net-mail/queue-repair
+   ssl? (
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
+   )
+   sys-apps/gentoo-functions
+   sys-apps/groff
+   net-dns/libidn2
+"
+RDEPEND="
+   !mail-mta/courier
+   !mail-mta/esmtp
+   !mail-mta/exim
+   !mail-mta/mini-qma

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-07-13 Thread Hans de Graaff

commit: c4ab807c5baec32dccd38be6872256dc66c98cfc
Author: Hans de Graaff  gentoo  org>
AuthorDate: Sat Jul 13 07:58:13 2019 +
Commit: Hans de Graaff  gentoo  org>
CommitDate: Sat Jul 13 07:58:49 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c4ab807c

mail-mta/netqmail: new revision with openssl 1.1 compat

Add updated patches that ensure compatibility with openssl 1.1.x.
Based on patches by Alexander Hof and ebuild by Yida Zhang.

Fixes: https://bugs.gentoo.org/675060
Signed-off-by: Hans de Graaff  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11

 mail-mta/netqmail/netqmail-1.06-r6.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r6.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
index a647effd78b..ea0d2b7b10c 100644
--- a/mail-mta/netqmail/netqmail-1.06-r6.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 GENQMAIL_PV=20080406
 QMAIL_SPP_PV=0.42
@@ -17,7 +17,7 @@ QMAIL_LARGE_DNS='qmail-103.patch'
 
 QMAIL_SMTPUTF8='qmail-smtputf8.patch'
 
-inherit eutils qmail
+inherit qmail
 
 DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
 HOMEPAGE="
@@ -139,6 +139,8 @@ src_prepare() {
else
einfo "Enabled CRAM_MD5 support"
fi
+
+   eapply_user
 }
 
 src_compile() {

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-05-19 Thread Sergei Trofimovich

commit: 0dab16e9dd7d7a2d09eb49bb85ebb5c3462b18e2
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun May 19 12:50:38 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sun May 19 14:18:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dab16e9

mail-mta/netqmail: use https where it works

Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r1.ebuild | 4 ++--
 mail-mta/netqmail/netqmail-1.06-r2.ebuild | 4 ++--
 mail-mta/netqmail/netqmail-1.06-r3.ebuild | 4 ++--
 mail-mta/netqmail/netqmail-1.06-r4.ebuild | 4 ++--
 mail-mta/netqmail/netqmail-1.06-r5.ebuild | 4 ++--
 mail-mta/netqmail/netqmail-1.06.ebuild| 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r1.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r1.ebuild
index 2241f6b302f..676804f65d5 100644
--- a/mail-mta/netqmail/netqmail-1.06-r1.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r1.ebuild
@@ -19,12 +19,12 @@ inherit eutils qmail
 DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
 HOMEPAGE="
http://netqmail.org
-   http://cr.yp.to/qmail.html
+   https://cr.yp.to/qmail.html
http://qmail.org
 "
 SRC_URI="mirror://qmail/${P}.tar.gz
https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
-   http://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+   https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
!vanilla? (
highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )

diff --git a/mail-mta/netqmail/netqmail-1.06-r2.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
index 7ea91d79242..076e9266515 100644
--- a/mail-mta/netqmail/netqmail-1.06-r2.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
@@ -20,12 +20,12 @@ inherit eutils qmail
 DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
 HOMEPAGE="
http://netqmail.org
-   http://cr.yp.to/qmail.html
+   https://cr.yp.to/qmail.html
http://qmail.org
 "
 SRC_URI="mirror://qmail/${P}.tar.gz
https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
-   http://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+   https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
!vanilla? (
highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )

diff --git a/mail-mta/netqmail/netqmail-1.06-r3.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r3.ebuild
index c75b1f3991f..2ae5c68cb25 100644
--- a/mail-mta/netqmail/netqmail-1.06-r3.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r3.ebuild
@@ -20,12 +20,12 @@ inherit eutils qmail
 DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
 HOMEPAGE="
http://netqmail.org
-   http://cr.yp.to/qmail.html
+   https://cr.yp.to/qmail.html
http://qmail.org
 "
 SRC_URI="mirror://qmail/${P}.tar.gz
https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
-   http://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+   https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
!vanilla? (
highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )

diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index 04bb94458c0..1f750f0f171 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -20,12 +20,12 @@ inherit eutils qmail
 DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
 HOMEPAGE="
http://netqmail.org
-   http://cr.yp.to/qmail.html
+   https://cr.yp.to/qmail.html
http://qmail.org
 "
 SRC_URI="mirror://qmail/${P}.tar.gz
https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
-   http://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+   https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
!vanilla? (
highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )

diff --git a/mail-mta/netqmail/netqmail-1.06-r5.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r5.ebuild
index b5fb32e8e3b..31387c27673 100644
--- a/mail-mta/netqmail/netqmail-1.06-r5.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r5.ebuild
@@ -22,12 +22,12 @@ inherit eutils qmail
 DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
 HOMEPAGE="
http://netqmail.org
-   http://cr.yp.to/qmail.html
+   https://cr.yp.to/qmail.html
http://qmail.org
 "
 SRC_URI="mirror://qmail/${P}.tar.gz
https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
-   http://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+   https://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
http://arnt.gulbrandsen.priv.no/qmail/

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2019-01-07 Thread Lars Wendler

commit: 994b2637587b93854b7dc045079240382ef73a86
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Jan  7 18:54:28 2019 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Jan  7 19:15:42 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=994b2637

mail-mta/netqmail: Adjusted (sub-)slot dep on dev-libs/openssl

Package-Manager: Portage-2.3.54, Repoman-2.3.12
Signed-off-by: Lars Wendler  gentoo.org>

 mail-mta/netqmail/netqmail-1.06-r1.ebuild | 4 ++--
 mail-mta/netqmail/netqmail-1.06-r2.ebuild | 4 ++--
 mail-mta/netqmail/netqmail-1.06-r3.ebuild | 6 +++---
 mail-mta/netqmail/netqmail-1.06-r4.ebuild | 6 +++---
 mail-mta/netqmail/netqmail-1.06-r5.ebuild | 6 +++---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r1.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r1.ebuild
index 1ae9ddbc91b..2241f6b302f 100644
--- a/mail-mta/netqmail/netqmail-1.06-r1.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -42,7 +42,7 @@ RESTRICT="test"
 DEPEND="
!mail-mta/qmail
net-mail/queue-repair
-   ssl? ( dev-libs/openssl )
+   ssl? ( dev-libs/openssl:0= )
 "
 RDEPEND="
!mail-mta/courier

diff --git a/mail-mta/netqmail/netqmail-1.06-r2.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
index 77aa72ee142..7ea91d79242 100644
--- a/mail-mta/netqmail/netqmail-1.06-r2.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -44,7 +44,7 @@ RESTRICT="test"
 DEPEND="
!mail-mta/qmail
net-mail/queue-repair
-   ssl? ( dev-libs/openssl )
+   ssl? ( dev-libs/openssl:0= )
sys-apps/groff
 "
 RDEPEND="

diff --git a/mail-mta/netqmail/netqmail-1.06-r3.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r3.ebuild
index d939d63049c..c75b1f3991f 100644
--- a/mail-mta/netqmail/netqmail-1.06-r3.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -45,8 +45,8 @@ DEPEND="
!mail-mta/qmail
net-mail/queue-repair
ssl? (
-   !libressl? ( dev-libs/openssl:0 )
-   libressl? ( dev-libs/libressl )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
)
sys-apps/groff
 "

diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index 71b8eb49f7c..04bb94458c0 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -45,8 +45,8 @@ DEPEND="
!mail-mta/qmail
net-mail/queue-repair
ssl? (
-   !libressl? ( dev-libs/openssl:0 )
-   libressl? ( dev-libs/libressl )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
)
sys-apps/gentoo-functions
sys-apps/groff

diff --git a/mail-mta/netqmail/netqmail-1.06-r5.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r5.ebuild
index 54751d00c83..b5fb32e8e3b 100644
--- a/mail-mta/netqmail/netqmail-1.06-r5.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -48,8 +48,8 @@ DEPEND="
!mail-mta/qmail
net-mail/queue-repair
ssl? (
-   !libressl? ( dev-libs/openssl:0 )
-   libressl? ( dev-libs/libressl )
+   !libressl? ( dev-libs/openssl:0= )
+   libressl? ( dev-libs/libressl:= )
)
sys-apps/gentoo-functions
sys-apps/groff

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2018-04-24 Thread Mikle Kolyada

commit: 80ac15a82227a082641b941dc6400149144b6506
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Tue Apr 24 19:38:24 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Tue Apr 24 19:38:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80ac15a8

mail-mta/netqmail: arm stable wrt bug #504392

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 mail-mta/netqmail/netqmail-1.06-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index 39ce6f925c7..71b8eb49f7c 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -36,7 +36,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc 
x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
 REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2018-02-27 Thread Sergei Trofimovich

commit: 42709a34cb96f4a3f60c2d54425e7f11c8ff592f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Feb 27 22:28:04 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Feb 27 22:28:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42709a34

mail-mta/netqmail: stable 1.06-r4 for hppa, bug #504392

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="hppa"

 mail-mta/netqmail/netqmail-1.06-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index a5d343fd11a..39ce6f925c7 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -36,7 +36,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc 
x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc 
x86"
 IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
 REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2018-02-27 Thread Sergei Trofimovich

commit: af1e34c879aa993a48e7c9f92ba39abc3f7440de
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Tue Feb 27 20:08:19 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Tue Feb 27 20:08:19 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af1e34c8

mail-mta/netqmail: stable 1.06-r4 for ppc/ppc64, bug #504392

Package-Manager: Portage-2.3.24, Repoman-2.3.6
RepoMan-Options: --include-arches="ppc ppc64"

 mail-mta/netqmail/netqmail-1.06-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index 0288d16973e..a5d343fd11a 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -36,7 +36,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc 
x86"
 IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
 REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2018-02-06 Thread Thomas Deutschmann

commit: c819472b65156592ec01e9ecff87e04960a9c075
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Tue Feb  6 18:27:55 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Tue Feb  6 18:35:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c819472b

mail-mta/netqmail: x86 stable (bug #504392)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 mail-mta/netqmail/netqmail-1.06-r4.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index 1737b7b0edf..0288d16973e 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.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=5
@@ -36,7 +36,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
x86"
 IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
 REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2018-01-28 Thread Tobias Klausmann

commit: 80d896d9e8777f994e17f6697d9bcd11a5b1be06
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sun Jan 28 16:58:32 2018 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sun Jan 28 16:58:47 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80d896d9

mail-mta/netqmail-1.06-r4: alpha stable

Gentoo-Bug: http://bugs.gentoo.org/504392

 mail-mta/netqmail/netqmail-1.06-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index ebb18f0d4b0..1737b7b0edf 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -36,7 +36,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
+KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc 
~x86"
 IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
 REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2017-12-14 Thread Sergei Trofimovich

commit: 5c2608e08676b9e9fa1c74f1b24c04762581cb5f
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Thu Dec 14 20:04:42 2017 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Thu Dec 14 20:11:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c2608e0

mail-mta/netqmail: stable 1.06-r4 for ia64, bug #504392

Package-Manager: Portage-2.3.16, Repoman-2.3.6
RepoMan-Options: --include-arches="ia64"

 mail-mta/netqmail/netqmail-1.06-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index 7ccc3f851fa..f75334b2d3d 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -36,7 +36,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
 IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
 REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
 RESTRICT="test"

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2017-09-02 Thread Michael Palimaka

commit: 3548511919d67ba084940857582bc9bbabcc6269
Author: Francesco Turco  fastmail  fm>
AuthorDate: Fri Sep  1 19:54:41 2017 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Sep  2 14:14:58 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35485119

mail-mta/netqmail: update link to wiki

 mail-mta/netqmail/netqmail-1.06-r1.ebuild | 4 ++--
 mail-mta/netqmail/netqmail-1.06-r2.ebuild | 4 ++--
 mail-mta/netqmail/netqmail-1.06-r3.ebuild | 4 ++--
 mail-mta/netqmail/netqmail-1.06-r4.ebuild | 4 ++--
 mail-mta/netqmail/netqmail-1.06-r5.ebuild | 4 ++--
 mail-mta/netqmail/netqmail-1.06.ebuild| 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/mail-mta/netqmail/netqmail-1.06-r1.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r1.ebuild
index a8ab3bee2b0..1ae9ddbc91b 100644
--- a/mail-mta/netqmail/netqmail-1.06-r1.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -138,7 +138,7 @@ pkg_postinst() {
qmail_supervise_config_notice
elog
elog "If you are looking for documentation, check those links:"
-   elog "https://www.gentoo.org/doc/en/qmail-howto.xml";
+   elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail";
elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
elog "http://www.lifewithqmail.com/";
elog "  -- Life with qmail"

diff --git a/mail-mta/netqmail/netqmail-1.06-r2.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
index 8128c7840e0..77aa72ee142 100644
--- a/mail-mta/netqmail/netqmail-1.06-r2.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -146,7 +146,7 @@ pkg_postinst() {
qmail_supervise_config_notice
elog
elog "If you are looking for documentation, check those links:"
-   elog "https://www.gentoo.org/doc/en/qmail-howto.xml";
+   elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail";
elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
elog "http://www.lifewithqmail.com/";
elog "  -- Life with qmail"

diff --git a/mail-mta/netqmail/netqmail-1.06-r3.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r3.ebuild
index 8716aecbaaa..d939d63049c 100644
--- a/mail-mta/netqmail/netqmail-1.06-r3.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -149,7 +149,7 @@ pkg_postinst() {
qmail_supervise_config_notice
elog
elog "If you are looking for documentation, check those links:"
-   elog "https://www.gentoo.org/doc/en/qmail-howto.xml";
+   elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail";
elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
elog "http://www.lifewithqmail.com/";
elog "  -- Life with qmail"

diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index 1ae22912658..7ccc3f851fa 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -154,7 +154,7 @@ pkg_postinst() {
qmail_supervise_config_notice
elog
elog "If you are looking for documentation, check those links:"
-   elog "https://www.gentoo.org/doc/en/qmail-howto.xml";
+   elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail";
elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
elog "http://www.lifewithqmail.com/";
elog "  -- Life with qmail"

diff --git a/mail-mta/netqmail/netqmail-1.06-r5.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r5.ebuild
index faa0ab71fa0..54751d00c83 100644
--- a/mail-mta/netqmail/netqmail-1.06-r5.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -159,7 +159,7 @@ pkg_postinst() {
qmail_supervise_config_notice
elog
elog "If you are looking for documentation, check those links:"
-   elog "https://www.gentoo.org/doc/en/qmail-howto.xml";
+   elog "https://wiki.gentoo.org/wiki/Virtual_mail_hosting_with_qmail";
elog "  -- qmail/vpopmail Virtual Mail Hosting System Guide"
elog "http://www.lifewithqmail.com/";
elog "  -- Life wi

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/, mail-mta/netqmail/files/

2016-11-27 Thread Robin H. Johnson

commit: 656ae3db884b62b3576f24741cf18c6dc53226c5
Author: Arnt Gulbrandsen  gulbrandsen  priv  no>
AuthorDate: Tue Nov 15 14:20:37 2016 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Sun Nov 27 16:48:11 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=656ae3db

mail-mta/netqmail: Add SMTPUTF8 support for qmail

SMTPUTF8 (RFCs 6531 and 6532, plus several that aren't relevant to qmail)
allows using unencoded UTF8 almost everywhere in email, including in
localparts, domains, subjects and message bodies.

Thanks to cnnic.cn for sponsoring this work.

(cherry picked from commit 5116b83a9bf93f59fb7b7d3fcd286f7b2c4da438)
Signed-off-by: Robin H. Johnson  gentoo.org>

 mail-mta/netqmail/Manifest   |   1 +
 mail-mta/netqmail/files/qmail-smtputf8.patch | 242 +++
 mail-mta/netqmail/netqmail-1.06-r5.ebuild| 183 
 3 files changed, 426 insertions(+)

diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index cedd87f..39e82f2 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -5,3 +5,4 @@ DIST netqmail-1.06.tar.gz 260941 SHA256 
8e7d98d15211fc9f9c28109e942e2268f42a6672
 DIST qmail-103.patch 2104 SHA256 
4cad53c7a6628a600c74c36bfee327db5052ca24c222d4013e4dfcd7f427653d SHA512 
b81062bb0b0023f474c0b6af40601926e1c04ad395de480d114809e48a8060c06d99bdbdeb6f44d9e24ae1acedabb094b979193d305371aed958f18fc6eee354
 WHIRLPOOL 
5785684b98b9d9732ed14aa1b53910746bd09aa93514e0e6ef3d74831c3df8ed0a55f257057488f34a3d462e485b7a4417ed255f66abaff6dd63d881b9230063
 DIST qmail-spp-0.42.tar.gz 18689 SHA256 
1518e7e82d10fbbb8ecc520f51daf503edeb9c3a9fb935be65a8185e7b53808d SHA512 
03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf
 WHIRLPOOL 
2f8525bb264fbec4b057bad6d92968e29085fdf10b8538b8e572d81ea8793e74c07c6093d0cc2a34de00b629e797b048007b30e3845dce76829037fdb44f527c
 DIST vu555316.patch 617 SHA256 
cc7b2876ecb183fe55c280404c1c825a6bd1f6ccc87db67e7cfc8bc6336f9b0f SHA512 
5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65
 WHIRLPOOL 
2564d5622576b89918e247de5dd830011e8ef18a50fd03e6f48e98ebf4a53db2f4994eb0fb22a76c4cd0cbb35b457ac2a5507e05159130a72685866137c5ebc1
+DIST qmail-smtputf8.patch 6693 SHA256 
cf3a802d439fe53e9cecbeb82a6ce6ff5c71b5fcd0b053eac5a19df918724cfa SHA512 
8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4
 WHIRLPOOL 
36d2a822cf42efbe34e0e95da6e171a3394c049cfbcf2a3b68efe789b4199f00fcdb942d1e93268283a4eec15ad3ead7a58df31a327ade517c218fb18f8a7801

diff --git a/mail-mta/netqmail/files/qmail-smtputf8.patch 
b/mail-mta/netqmail/files/qmail-smtputf8.patch
new file mode 100644
index ..5b656b9
--- /dev/null
+++ b/mail-mta/netqmail/files/qmail-smtputf8.patch
@@ -0,0 +1,242 @@
+This patch adds EAI support to qmail; EAI allows UTF8 almost everywhere in
+email.
+
+Thanks for CNNIC for sponsoring this work.
+
+--- /dev/null
 netqmail-1.06/Makefile
+@@ -1446,7 +1446,7 @@ substdio.a error.a str.a fs.a auto_qmail.o dns.lib 
socket.lib
+   timeoutwrite.o timeoutconn.o tcpto.o now.o dns.o ip.o \
+   ipalloc.o ipme.o quote.o ndelay.a case.a sig.a open.a \
+   lock.a seek.a getln.a stralloc.a alloc.a substdio.a error.a \
+-  str.a fs.a auto_qmail.o  `cat dns.lib` `cat socket.lib`
++  str.a fs.a auto_qmail.o  `cat dns.lib` `cat socket.lib` -lidn2
+ 
+ qmail-remote.0: \
+ qmail-remote.8
+--- /dev/null
 netqmail-1.06/qmail-remote.c
+@@ -2,6 +2,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include "sig.h"
+ #include "stralloc.h"
+ #include "substdio.h"
+@@ -42,6 +43,7 @@
+ stralloc routes = {0};
+ struct constmap maproutes;
+ stralloc host = {0};
++stralloc asciihost = {0};
+ stralloc sender = {0};
+ 
+ saa reciplist = {0};
+@@ -53,12 +55,13 @@
+ # include "tls.h"
+ # include "ssl_timeoutio.h"
+ # include 
+-# define EHLO 1
+ 
+ int tls_init();
+ const char *ssl_err_str = 0;
+ #endif 
+ 
++# define EHLO 1
++
+ void out(s) char *s; { if (substdio_puts(subfdoutsmall,s) == -1) _exit(0); }
+ void zero() { if (substdio_put(subfdoutsmall,"\0",1) == -1) _exit(0); }
+ void zerodie() { zero(); substdio_flush(subfdoutsmall); _exit(0); }
+@@ -156,6 +159,7 @@
+ substdio smtpfrom = SUBSTDIO_FDBUF(saferead,-1,smtpfrombuf,sizeof 
smtpfrombuf);
+ 
+ stralloc smtptext = {0};
++stralloc firstpart = {0};
+ 
+ void get(ch)
+ char *ch;
+@@ -308,6 +312,8 @@
+   int r;
+   char ch;
+ 
++  substdio_put(&smtpto,firstpart.s,firstpart.len);
++
+   for (;;) {
+ r = substdio_get(&ssin,&ch,1);
+ if (r == 0) break;
+@@ -518,6 +524,88 @@
+ 
+ stralloc recip = {0};
+ 
++int containsutf8(p, l) unsigned char * p; int l;
++{
++  int i = 0;
++  while (i 127) return 1;
++  return 0;
++}
++
++int utf8message;
++
++void checkutf8message()
++{
++  int pos;
++  int i

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/, mail-mta/netqmail/files/

2015-10-23 Thread Michał Górny

commit: 41714291b8d9ae53c55d67011ac00fc0b95f3e10
Author: Lara Maia  lara  click>
AuthorDate: Sun Oct 18 15:02:26 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Oct 20 22:38:22 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41714291

mail-mta/netqmail: Update mkservercert to use new path for functions.sh

https://bugs.gentoo.org/show_bug.cgi?id=504392

 .../files/use-new-path-for-functions.sh.patch  |  11 ++
 mail-mta/netqmail/netqmail-1.06-r4.ebuild  | 177 +
 2 files changed, 188 insertions(+)

diff --git a/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch 
b/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch
new file mode 100644
index 000..52f3d8e
--- /dev/null
+++ b/mail-mta/netqmail/files/use-new-path-for-functions.sh.patch
@@ -0,0 +1,11 @@
+--- genqmail-20080406.orig/ssl/mkservercert.orig   2015-10-18 
12:46:40.082559295 -0200
 genqmail-20080406/ssl/mkservercert 2015-10-18 12:49:03.749576181 -0200
+@@ -5,7 +5,7 @@
+ # Based on mkimapdcert from courier-imap.
+
+ test -x /usr/bin/openssl || exit 0
+-source /etc/init.d/functions.sh || exit 1
++source /lib/gentoo/functions.sh || exit 1
+
+ filedir="/var/qmail/control"
+ pemfile="${filedir}/servercert.pem"

diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
new file mode 100644
index 000..040afc2
--- /dev/null
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENQMAIL_PV=20080406
+QMAIL_SPP_PV=0.42
+
+QMAIL_TLS_PV=20070417
+QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_CVE=vu555316.patch
+
+QMAIL_BIGTODO_PV=103
+QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
+
+QMAIL_LARGE_DNS='qmail-103.patch'
+
+inherit eutils qmail
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
+HOMEPAGE="
+   http://netqmail.org
+   http://cr.yp.to/qmail.html
+   http://qmail.org
+"
+SRC_URI="mirror://qmail/${P}.tar.gz
+   https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
+   http://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+   http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
+   !vanilla? (
+   highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
+   qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
+   ssl? ( http://shupp.org/patches/${QMAIL_TLS_F} )
+   )
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
+IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
+REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
+RESTRICT="test"
+
+DEPEND="
+   !mail-mta/qmail
+   net-mail/queue-repair
+   ssl? (
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   )
+   sys-apps/groff
+"
+RDEPEND="
+   !mail-mta/courier
+   !mail-mta/esmtp
+   !mail-mta/exim
+   !mail-mta/mini-qmail
+   !mail-mta/msmtp[mta]
+   !mail-mta/nullmailer
+   !mail-mta/postfix
+   !mail-mta/qmail-ldap
+   !mail-mta/sendmail
+   !=mail-mta/ssmtp-2.64-r2[mta]
+   >=sys-apps/ucspi-tcp-0.88-r17
+   ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
+   virtual/daemontools
+   >=net-mail/dot-forward-0.71-r3
+   virtual/checkpassword
+   authcram? ( >=net-mail/cmd5checkpw-0.30 )
+   ${DEPEND}
+"
+
+pkg_setup() {
+   if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
+   eerror
+   eerror "The QMAIL_PATCH_DIR variable for custom patches"
+   eerror "has been removed from ${PN}. If you need custom patches"
+   eerror "you should create a copy of this ebuild in an overlay."
+   eerror
+   die "QMAIL_PATCH_DIR is not supported anymore"
+   fi
+
+   qmail_create_users
+}
+
+src_unpack() {
+   genqmail_src_unpack
+   use qmail-spp && qmail_spp_src_unpack
+
+   unpack ${P}.tar.gz
+}
+
+src_prepare() {
+   epatch "${FILESDIR}"/${PV}-exit.patch
+   epatch "${FILESDIR}"/${PV}-readwrite.patch
+   epatch "${DISTDIR}"/${QMAIL_LARGE_DNS}
+   epatch "${FILESDIR}"/${PV}-fbsd-utmpx.patch
+
+   ht_fix_file Makefile*
+
+   if ! use vanilla; then
+   # This patch contains relative paths and needs to be cleaned up.
+   sed 's~^--- ../../~--- ~g' \
+   <"${DISTDIR}"/${QMAIL_TLS_F} \
+   >"${T}"/${QMAIL_TLS_F} || die
+   use ssl&& epatch "${T}"/${QMAIL_TLS_F}
+   use ssl&& epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+   use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
+
+   if use qmail-spp; then
+   if use ssl; then
+

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2015-10-23 Thread Michał Górny

commit: 6f988a7a825e5301e536fb7dda34bf89def9ad49
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Oct 23 21:07:21 2015 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct 23 21:07:21 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f988a7a

mail-mta/netqmail: Add missing dep on sys-apps/gentoo-functions

Package-Manager: portage-2.2.23

 mail-mta/netqmail/netqmail-1.06-r4.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index 040afc2..dc5a1eb 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -49,6 +49,7 @@ DEPEND="
!libressl? ( dev-libs/openssl:0 )
libressl? ( dev-libs/libressl )
)
+   sys-apps/gentoo-functions
sys-apps/groff
 "
 RDEPEND="

[gentoo-commits] repo/gentoo:master commit in: mail-mta/netqmail/

2015-10-10 Thread Anthony G. Basile

commit: df698a2d043800932ce06a74cd75ec75fcc2787b
Author: Anthony G. Basile  gentoo  org>
AuthorDate: Sun Oct 11 01:05:58 2015 +
Commit: Anthony G. Basile  gentoo  org>
CommitDate: Sun Oct 11 01:05:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df698a2d

mail-mta/netqmail: add libressl support

Package-Manager: portage-2.2.20.1

 mail-mta/netqmail/netqmail-1.06-r3.ebuild | 173 ++
 1 file changed, 173 insertions(+)

diff --git a/mail-mta/netqmail/netqmail-1.06-r3.ebuild 
b/mail-mta/netqmail/netqmail-1.06-r3.ebuild
new file mode 100644
index 000..08dd2eb
--- /dev/null
+++ b/mail-mta/netqmail/netqmail-1.06-r3.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GENQMAIL_PV=20080406
+QMAIL_SPP_PV=0.42
+
+QMAIL_TLS_PV=20070417
+QMAIL_TLS_F=${PN}-1.05-tls-smtpauth-${QMAIL_TLS_PV}.patch
+QMAIL_TLS_CVE=vu555316.patch
+
+QMAIL_BIGTODO_PV=103
+QMAIL_BIGTODO_F=big-todo.${QMAIL_BIGTODO_PV}.patch
+
+QMAIL_LARGE_DNS='qmail-103.patch'
+
+inherit eutils qmail
+
+DESCRIPTION="qmail -- a secure, reliable, efficient, simple message transfer 
agent"
+HOMEPAGE="
+   http://netqmail.org
+   http://cr.yp.to/qmail.html
+   http://qmail.org
+"
+SRC_URI="mirror://qmail/${P}.tar.gz
+   https://dev.gentoo.org/~hollow/distfiles/${GENQMAIL_F}
+   http://www.ckdhr.com/ckd/${QMAIL_LARGE_DNS}
+   http://inoa.net/qmail-tls/${QMAIL_TLS_CVE}
+   !vanilla? (
+   highvolume? ( mirror://qmail/${QMAIL_BIGTODO_F} )
+   qmail-spp? ( mirror://sourceforge/qmail-spp/${QMAIL_SPP_F} )
+   ssl? ( http://shupp.org/patches/${QMAIL_TLS_F} )
+   )
+"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh 
~sparc ~x86"
+IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
+REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
+RESTRICT="test"
+
+DEPEND="
+   !mail-mta/qmail
+   net-mail/queue-repair
+   ssl? (
+   !libressl? ( dev-libs/openssl:0 )
+   libressl? ( dev-libs/libressl )
+   )
+   sys-apps/groff
+"
+RDEPEND="
+   !mail-mta/courier
+   !mail-mta/esmtp
+   !mail-mta/exim
+   !mail-mta/mini-qmail
+   !mail-mta/msmtp[mta]
+   !mail-mta/nullmailer
+   !mail-mta/postfix
+   !mail-mta/qmail-ldap
+   !mail-mta/sendmail
+   !=mail-mta/ssmtp-2.64-r2[mta]
+   >=sys-apps/ucspi-tcp-0.88-r17
+   ssl? ( >=sys-apps/ucspi-ssl-0.70-r1 )
+   virtual/daemontools
+   >=net-mail/dot-forward-0.71-r3
+   virtual/checkpassword
+   authcram? ( >=net-mail/cmd5checkpw-0.30 )
+   ${DEPEND}
+"
+
+pkg_setup() {
+   if [[ -n "${QMAIL_PATCH_DIR}" ]]; then
+   eerror
+   eerror "The QMAIL_PATCH_DIR variable for custom patches"
+   eerror "has been removed from ${PN}. If you need custom patches"
+   eerror "you should create a copy of this ebuild in an overlay."
+   eerror
+   die "QMAIL_PATCH_DIR is not supported anymore"
+   fi
+
+   qmail_create_users
+}
+
+src_unpack() {
+   genqmail_src_unpack
+   use qmail-spp && qmail_spp_src_unpack
+
+   unpack ${P}.tar.gz
+}
+
+src_prepare() {
+   epatch "${FILESDIR}"/${PV}-exit.patch
+   epatch "${FILESDIR}"/${PV}-readwrite.patch
+   epatch "${DISTDIR}"/${QMAIL_LARGE_DNS}
+   epatch "${FILESDIR}"/${PV}-fbsd-utmpx.patch
+
+   ht_fix_file Makefile*
+
+   if ! use vanilla; then
+   # This patch contains relative paths and needs to be cleaned up.
+   sed 's~^--- ../../~--- ~g' \
+   <"${DISTDIR}"/${QMAIL_TLS_F} \
+   >"${T}"/${QMAIL_TLS_F}
+   use ssl&& epatch "${T}"/${QMAIL_TLS_F}
+   use ssl&& epatch "${DISTDIR}"/${QMAIL_TLS_CVE}
+   use highvolume && epatch "${DISTDIR}"/${QMAIL_BIGTODO_F}
+
+   if use qmail-spp; then
+   if use ssl; then
+   epatch 
"${QMAIL_SPP_S}"/qmail-spp-smtpauth-tls-20060105.diff
+   else
+   epatch "${QMAIL_SPP_S}"/netqmail-spp.diff
+   fi
+   cd "${WORKDIR}"
+   epatch "${FILESDIR}"/genqmail-20080406-ldflags.patch
+   cd -
+   fi
+   fi
+
+   qmail_src_postunpack
+
+   # Fix bug #33818 but for netqmail (Bug 137015)
+   if ! use authcram; then
+   einfo "Disabled CRAM_MD5 support"
+   sed -e 's,^#define CRAM_MD5$,/*&*/,' -i "${S}"/qmail-smtpd.c
+   else
+   einfo "Enabled CRAM_MD5 support"
+   fi
+}
+
+src_compile() {
+   qmail_src_compile
+   use qmail-spp && qmail_spp_src_compile
+}
+
+sr

61 matches

Mail list logo