[gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2023-12-24 23:07 Conrad Kostecki
  0 siblings, 0 replies; 34+ messages in thread
From: Conrad Kostecki @ 2023-12-24 23:07 UTC (permalink / raw
  To: gentoo-commits

commit:     64e2366685eff3f91776a4b9f7326f9f1dbcf55c
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sun Dec 17 14:27:21 2023 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sun Dec 24 23:04:26 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64e23666

net-mail/vpopmail: add missing toolchain-funcs inherit, fix LICENSE, use https

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/34329
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
index 2a9ab5bd36aa..94425547fce5 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools fixheadtails qmail
+inherit autotools fixheadtails qmail toolchain-funcs
 
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
+HOMEPAGE="https://www.inter7.com/index.php?page=vpopmail"
 DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 arm ~hppa ~ia64 ppc64 ~s390 sparc x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2023-06-23 18:07 Matt Turner
  0 siblings, 0 replies; 34+ messages in thread
From: Matt Turner @ 2023-06-23 18:07 UTC (permalink / raw
  To: gentoo-commits

commit:     9b9a85d499a3348b6f12ec60561b6dc90ee74006
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 23 17:27:37 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Jun 23 18:07:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b9a85d4

net-mail/vpopmail: Drop ppc keywords

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
index ee9f8d6f2750..2a9ab5bd36aa 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ~ppc ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc64 ~s390 sparc x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2021-08-22 15:14 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2021-08-22 15:14 UTC (permalink / raw
  To: gentoo-commits

commit:     af6acb29940e45a2a97da00fbb32f9ba6bb051d3
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sun Aug 22 08:01:41 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 22 15:13:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af6acb29

net-mail/vpopmail: respect ar and ranlib settings from toolchain

Closes: https://bugs.gentoo.org/809509
Closes: https://bugs.gentoo.org/809512
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../vpopmail/{vpopmail-5.4.33-r8.ebuild => vpopmail-5.4.33-r9.ebuild}  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r8.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
similarity index 98%
rename from net-mail/vpopmail/vpopmail-5.4.33-r8.ebuild
rename to net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
index d932f6d0159..b70518ef178 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r8.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r9.ebuild
@@ -138,6 +138,9 @@ src_configure() {
 		$(use_enable maildrop) \
 		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
 		$(use_enable spamassassin)
+
+	sed "s|'ar |'$(tc-getAR) |;s|'ranlib |'$(tc-getRANLIB) |" -i cdb/Makefile || die
+	sed "/^AR =/s|= .*|= $(tc-getAR)|" -i Makefile || die
 }
 
 src_install() {


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2021-08-22  3:07 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2021-08-22  3:07 UTC (permalink / raw
  To: gentoo-commits

commit:     a9a4e0bd65f170934317c85e0d0de68f82f23b43
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Fri Aug 20 12:45:44 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Aug 22 03:07:07 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9a4e0bd

net-mail/vpopmail: add dependency on virtual/libcrypt

Closes: https://bugs.gentoo.org/809194
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../vpopmail/{vpopmail-5.4.33-r7.ebuild => vpopmail-5.4.33-r8.ebuild}    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r8.ebuild
similarity index 99%
rename from net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
rename to net-mail/vpopmail/vpopmail-5.4.33-r8.ebuild
index b5f30d5092d..d932f6d0159 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r8.ebuild
@@ -18,6 +18,7 @@ REQUIRED_USE="mysql? ( !postgres )"
 DEPEND="
 	acct-group/vpopmail
 	acct-user/vpopmail
+	virtual/libcrypt:=
 	virtual/qmail
 	maildrop? ( mail-filter/maildrop )
 	mysql? ( dev-db/mysql-connector-c:0= )


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2021-05-17 16:36 Sergei Trofimovich
  0 siblings, 0 replies; 34+ messages in thread
From: Sergei Trofimovich @ 2021-05-17 16:36 UTC (permalink / raw
  To: gentoo-commits

commit:     2662e03e3de73c64cf12edb51db03600712f1c22
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Mon May 17 15:17:20 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon May 17 16:36:01 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2662e03e

net-mail/vpopmail: drop old

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

 net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild | 250 ----------------------------
 1 file changed, 250 deletions(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
deleted file mode 100644
index 73511f611bc..00000000000
--- a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools fixheadtails qmail
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
-IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
-REQUIRED_USE="mysql? ( !postgres )"
-
-DEPEND="
-	acct-group/vpopmail
-	acct-user/vpopmail
-	virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( <dev-db/postgresql-9999:=[server] )
-	spamassassin? ( mail-filter/spamassassin )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	"${FILESDIR}"/${PN}-lazy.patch
-	"${FILESDIR}"/${PN}-vpgsql.patch
-	"${FILESDIR}"/${PN}-double-free.patch
-	"${FILESDIR}"/${PN}-5.4.33-vdelivermail-add-static.patch
-	"${FILESDIR}"/${PN}-5.4.33-fix-those-vfork-instances-that-do-more-than-exec.patch
-	"${FILESDIR}"/${PN}-5.4.33-remove-unneeded-forward-declaration.patch
-	"${FILESDIR}"/${PN}-5.4.33-clean-up-calling-maildrop.patch
-	"${FILESDIR}"/${PN}-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch
-	"${FILESDIR}"/${PN}-5.4.33-strncat.patch
-	"${FILESDIR}"/${PN}-5.4.33-unistd.patch
-	"${FILESDIR}"/${PN}-5.4.33-check-crypt-return-value-for-NULL.patch
-	"${FILESDIR}"/${PN}-5.4.33-use-proper-printf-format-strings.patch
-)
-DOCS=(
-	ChangeLog
-	doc/.
-)
-HTML_DOCS=(
-	doc_html/.
-	man_html/.
-)
-
-VPOP_HOME="/var/vpopmail"
-
-pkg_setup() {
-	upgradewarning
-}
-
-src_prepare() {
-	default
-
-	echo 'install-recursive: install-exec-am' \
-		>>"${S}"/Makefile.am || die
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	# automake/autoconf
-	mv "${S}"/configure.{in,ac} || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
-		configure.ac || die
-
-	# _FORTIFY_SOURCE
-	sed -i \
-		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
-		vlistlib.c || die
-
-	eautoreconf
-	ht_fix_file cdb/Makefile
-}
-
-src_configure() {
-	local -a authopts
-	if use mysql; then
-		incdir=$(mysql_config --variable=pkgincludedir || die)
-		libdir=$(mysql_config --variable=pkglibdir || die)
-		authopts+=( "--enable-auth-module=mysql"
-			"--enable-incdir=${incdir}"
-			"--enable-libdir=${libdir}"
-			"--enable-sql-logging"
-			"--enable-valias"
-			"--disable-mysql-replication"
-			"--enable-mysql-limits"
-		)
-	elif use postgres; then
-		libdir=$(pg_config --libdir || die)
-		incdir=$(pg_config --pkgincludedir || die)
-		authopts+=( "--enable-auth-module=pgsql"
-			"--enable-incdir=${incdir}"
-			"--enable-libdir=${libdir}"
-			"--enable-sql-logging"
-			"--enable-valias"
-		)
-	else
-		authopts+=( "--enable-auth-module=cdb" )
-	fi
-
-	econf ${authopts[@]} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
-		$(use_enable spamassassin)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into "${VPOP_HOME}"
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	mv doc/doc_html/ doc/man_html/ . || die
-	einstalldocs
-	rm -r "${D}/${VPOP_HOME}"/doc || die
-
-	# create /etc/vpopmail.conf
-	if use mysql; then
-		insinto /etc
-		newins "${D}${VPOP_HOME}"/etc/vpopmail.mysql vpopmail.conf
-		dosym ../../../etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
-
-		sed 's/^[^#]/# &/' -i "${D}"/etc/vpopmail.conf || die
-		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf || die
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
-		echo '# Write DB' >> "${D}"/etc/vpopmail.conf || die
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
-
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	insinto "${VPOP_HOME}"/etc
-	doins vusagec.conf
-	dosym .."${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
-	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf || die
-
-	einfo "Installing env.d entry"
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "  vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-		elog
-	fi
-
-	# do this for good measure
-	if [[ -e /etc/vpopmail.conf ]]; then
-		chmod 640 /etc/vpopmail.conf || die
-		chown root:vpopmail /etc/vpopmail.conf || die
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	if has_version "<=net-mail/vpopmail-5.2.1-r8"; then
-		ewarn
-		ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-		ewarn "The internal structure of the mail storage has changed for"
-		ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-		ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-		ewarn "to upgrade your system! (It can do conversions both ways)."
-		ewarn "You should be able to run it right away without any changes."
-		ewarn
-	fi
-
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-	elog
-
-	if use mysql; then
-		if has_version "<=net-mail/vpopmail-5.4.17"; then
-			elog
-			elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-			elog "MySQL tables, please see the UPGRADE file in the documentation!"
-			elog
-		fi
-	fi
-
-	ewarn
-	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
-	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
-	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
-	ewarn "Otherwise mail delivery WILL BREAK"
-	ewarn
-}


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2021-05-16  0:07 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2021-05-16  0:07 UTC (permalink / raw
  To: gentoo-commits

commit:     d5cdefb9d68fc8869551e158445045dd545e865d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun May 16 00:06:38 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun May 16 00:06:38 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5cdefb9

net-mail/vpopmail: Stabilize 5.4.33-r7 arm, #790080

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
index 995fa4d5dda..b5f30d5092d 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2021-05-15 19:18 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2021-05-15 19:18 UTC (permalink / raw
  To: gentoo-commits

commit:     7e5d3ee0aac906eb099ebd4566c5578ec10d8feb
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 15 19:18:16 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 15 19:18:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e5d3ee0

net-mail/vpopmail: Stabilize 5.4.33-r7 x86, #790080

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
index 9f21d3f86b8..995fa4d5dda 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2021-05-15  2:01 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2021-05-15  2:01 UTC (permalink / raw
  To: gentoo-commits

commit:     ff6be200b66cf3d2f51c38b817af6f78f2180170
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 15 02:00:49 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 15 02:00:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff6be200

net-mail/vpopmail: Stabilize 5.4.33-r7 amd64, #790080

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
index 4db6ff48010..9f21d3f86b8 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc ~x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2021-05-14 20:54 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2021-05-14 20:54 UTC (permalink / raw
  To: gentoo-commits

commit:     210763ca8c413cfebb1c5e745acc0bed573dafa9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 20:54:26 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 14 20:54:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=210763ca

net-mail/vpopmail: Stabilize 5.4.33-r7 ppc64, #790080

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
index 5cdebaea49d..4db6ff48010 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ppc ppc64 ~s390 sparc ~x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2021-05-14 20:54 Sam James
  0 siblings, 0 replies; 34+ messages in thread
From: Sam James @ 2021-05-14 20:54 UTC (permalink / raw
  To: gentoo-commits

commit:     70395ea8f851a6110fe3ea75b222d39e508f39bc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri May 14 20:54:09 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 14 20:54:09 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70395ea8

net-mail/vpopmail: Stabilize 5.4.33-r7 ppc, #790080

Signed-off-by: Sam James <sam <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
index e360455eb0e..5cdebaea49d 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2021-05-14 20:34 Sergei Trofimovich
  0 siblings, 0 replies; 34+ messages in thread
From: Sergei Trofimovich @ 2021-05-14 20:34 UTC (permalink / raw
  To: gentoo-commits

commit:     d32e8b00c56fabe5460577b0081f0794e95e56d7
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Fri May 14 20:13:40 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri May 14 20:34:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d32e8b00

net-mail/vpopmail: stable 5.4.33-r7 for sparc, bug #790080

Package-Manager: Portage-3.0.18, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
index ce3584c722a..e360455eb0e 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 sparc ~x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2020-05-27  7:56 Sergei Trofimovich
  0 siblings, 0 replies; 34+ messages in thread
From: Sergei Trofimovich @ 2020-05-27  7:56 UTC (permalink / raw
  To: gentoo-commits

commit:     e44efeeb61a98f235564aa5ec7d04af0a9c334a0
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 07:55:42 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed May 27 07:56:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e44efeeb

net-mail/vpopmail: drop down to ~hppa

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
index a4eca3315ec..73511f611bc 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86"
+KEYWORDS="amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2020-03-21 11:13 Mikle Kolyada
  0 siblings, 0 replies; 34+ messages in thread
From: Mikle Kolyada @ 2020-03-21 11:13 UTC (permalink / raw
  To: gentoo-commits

commit:     480b98dd7a9313c39c53e2e68db7940aacb5e4e2
Author:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 21 11:12:48 2020 +0000
Commit:     Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Mar 21 11:12:48 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=480b98dd

net-mail/vpopmail: Drop old

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33.ebuild | 246 -------------------------------
 1 file changed, 246 deletions(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
deleted file mode 100644
index a38b01a0082..00000000000
--- a/net-mail/vpopmail/vpopmail-5.4.33.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools eutils fixheadtails qmail user
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86"
-IUSE="clearpasswd ipalias maildrop mysql spamassassin"
-
-DEPEND="
-	acct-group/vpopmail
-	acct-user/vpopmail
-	virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( virtual/mysql )
-	spamassassin? ( mail-filter/spamassassin )"
-RDEPEND="${DEPEND}"
-
-# This makes sure the variable is set, and that it isn't null.
-VPOP_DEFAULT_HOME="/var/vpopmail"
-
-vpopmail_set_homedir() {
-	VPOP_HOME=$(egethome vpopmail)
-	if [[ -z "${VPOP_HOME}" ]]; then
-		eerror "vpopmail's home directory is null in passwd data!"
-		eerror "You probably want to check that out."
-		eerror "Continuing with default."
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	epatch "${FILESDIR}"/${PN}-lazy.patch
-	epatch "${FILESDIR}"/${PN}-double-free.patch
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	# automake/autoconf
-	mv -f "${S}"/configure.{in,ac} || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
-	        configure.ac || die
-
-	# _FORTIFY_SOURCE
-	sed -i \
-		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
-		vlistlib.c || die
-
-	eautoreconf
-	ht_fix_file cdb/Makefile
-}
-
-src_configure() {
-	vpopmail_set_homedir
-
-	local authopts
-	if use mysql; then
-		incdir=$(mysql_config --variable=pkgincludedir)
-		libdir=$(mysql_config --variable=pkglibdir)
-		authopts+=" --enable-auth-module=mysql"
-		authopts+=" --enable-incdir=${incdir}"
-		authopts+=" --enable-libdir=${libdir}"
-		authopts+=" --enable-sql-logging"
-		authopts+=" --enable-valias"
-		authopts+=" --disable-mysql-replication"
-		authopts+=" --enable-mysql-limits"
-	else
-		authopts="--enable-auth-module=cdb"
-	fi
-
-	econf ${authopts} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
-		$(use_enable spamassassin)
-}
-
-src_install() {
-	vpopmail_set_homedir
-
-	# bug #277764
-	emake -j1 DESTDIR="${D}" install
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into "${VPOP_HOME}"
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README*
-	dohtml doc/doc_html/* doc/man_html/*
-	rm -rf "${D}/${VPOP_HOME}"/doc
-	dosym \
-		$(realpath --relative-to "${D}/${VPOP_HOME}"/ "${D}"/usr/share/doc/${PF}/) \
-		"${VPOP_HOME}"/doc
-
-	# create /etc/vpopmail.conf
-	if use mysql; then
-		dodir /etc
-		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
-		dosym \
-			$(realpath --relative-to "${D}/${VPOP_HOME}"/etc/ "${D}"/etc/vpopmail.conf) \
-			"${VPOP_HOME}"/etc/vpopmail.mysql
-
-		sed -e '12d' -i "${D}"/etc/vpopmail.conf
-		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	insinto "${VPOP_HOME}"/etc
-	doins vusagec.conf
-	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
-	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners root:0 -R "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "  vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-		elog
-	fi
-
-	# do this for good measure
-	if [[ -e /etc/vpopmail.conf ]]; then
-		chmod 640 /etc/vpopmail.conf
-		chown root:vpopmail /etc/vpopmail.conf
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	vpopmail_set_homedir
-
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	ewarn
-	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-	ewarn "The internal structure of the mail storage has changed for"
-	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-	ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-	ewarn "to upgrade your system! (It can do conversions both ways)."
-	ewarn "You should be able to run it right away without any changes."
-	ewarn
-
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-	elog
-
-	if use mysql; then
-		elog
-		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-		elog "MySQL tables:"
-		elog
-		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
-		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
-		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
-		elog
-	fi
-
-	ewarn
-	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
-	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
-	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
-	ewarn "Otherwise mail delivery WILL BREAK"
-	ewarn
-}


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2020-03-03  8:05 Sergei Trofimovich
  0 siblings, 0 replies; 34+ messages in thread
From: Sergei Trofimovich @ 2020-03-03  8:05 UTC (permalink / raw
  To: gentoo-commits

commit:     9d296ebe0d2429bc64a24842ae44d4e6adf8e977
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Mar  3 06:26:59 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Mar  3 08:04:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d296ebe

net-mail/vpopmail: stable 5.4.33-r6 for amd64, bug #710482

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
index c256dddbb9a..94742bbf88c 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2020-03-03  8:05 Sergei Trofimovich
  0 siblings, 0 replies; 34+ messages in thread
From: Sergei Trofimovich @ 2020-03-03  8:05 UTC (permalink / raw
  To: gentoo-commits

commit:     b8a235cf47063ee5f9eb11e42e173b46c3175fe0
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Mar  3 06:25:40 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Mar  3 08:04:53 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8a235cf

net-mail/vpopmail: move stable keywords forward

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

 net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
index 6baa607e05c..c256dddbb9a 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2020-03-03  8:05 Sergei Trofimovich
  0 siblings, 0 replies; 34+ messages in thread
From: Sergei Trofimovich @ 2020-03-03  8:05 UTC (permalink / raw
  To: gentoo-commits

commit:     7c86edf65ecb56677efe78a161dc1eacec0357e3
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Mar  3 06:30:51 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Mar  3 08:04:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c86edf6

net-mail/vpopmail: drop old

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

 net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild | 250 ----------------------------
 1 file changed, 250 deletions(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
deleted file mode 100644
index 612564bb900..00000000000
--- a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
+++ /dev/null
@@ -1,250 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools fixheadtails qmail
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
-IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
-REQUIRED_USE="mysql? ( !postgres )"
-
-DEPEND="
-	acct-group/vpopmail
-	acct-user/vpopmail
-	virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql:=[server] )
-	spamassassin? ( mail-filter/spamassassin )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	"${FILESDIR}"/${PN}-lazy.patch
-	"${FILESDIR}"/${PN}-vpgsql.patch
-	"${FILESDIR}"/${PN}-double-free.patch
-	"${FILESDIR}"/${PN}-5.4.33-vdelivermail-add-static.patch
-	"${FILESDIR}"/${PN}-5.4.33-fix-those-vfork-instances-that-do-more-than-exec.patch
-	"${FILESDIR}"/${PN}-5.4.33-remove-unneeded-forward-declaration.patch
-	"${FILESDIR}"/${PN}-5.4.33-clean-up-calling-maildrop.patch
-	"${FILESDIR}"/${PN}-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch
-	"${FILESDIR}"/${PN}-5.4.33-strncat.patch
-	"${FILESDIR}"/${PN}-5.4.33-unistd.patch
-	"${FILESDIR}"/${PN}-5.4.33-check-crypt-return-value-for-NULL.patch
-	"${FILESDIR}"/${PN}-5.4.33-use-proper-printf-format-strings.patch
-)
-DOCS=(
-	ChangeLog
-	doc/.
-)
-HTML_DOCS=(
-	doc_html/.
-	man_html/.
-)
-
-VPOP_HOME="/var/vpopmail"
-
-pkg_setup() {
-	upgradewarning
-}
-
-src_prepare() {
-	default
-
-	echo 'install-recursive: install-exec-am' \
-		>>"${S}"/Makefile.am || die
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	# automake/autoconf
-	mv "${S}"/configure.{in,ac} || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
-		configure.ac || die
-
-	# _FORTIFY_SOURCE
-	sed -i \
-		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
-		vlistlib.c || die
-
-	eautoreconf
-	ht_fix_file cdb/Makefile
-}
-
-src_configure() {
-	local -a authopts
-	if use mysql; then
-		incdir=$(mysql_config --variable=pkgincludedir || die)
-		libdir=$(mysql_config --variable=pkglibdir || die)
-		authopts+=( "--enable-auth-module=mysql"
-			"--enable-incdir=${incdir}"
-			"--enable-libdir=${libdir}"
-			"--enable-sql-logging"
-			"--enable-valias"
-			"--disable-mysql-replication"
-			"--enable-mysql-limits"
-		)
-	elif use postgres; then
-		libdir=$(pg_config --libdir || die)
-		incdir=$(pg_config --pkgincludedir || die)
-		authopts+=( "--enable-auth-module=pgsql"
-			"--enable-incdir=${incdir}"
-			"--enable-libdir=${libdir}"
-			"--enable-sql-logging"
-			"--enable-valias"
-		)
-	else
-		authopts+=( "--enable-auth-module=cdb" )
-	fi
-
-	econf ${authopts[@]} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
-		$(use_enable spamassassin)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into "${VPOP_HOME}"
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	mv doc/doc_html/ doc/man_html/ . || die
-	einstalldocs
-	rm -r "${D}/${VPOP_HOME}"/doc || die
-
-	# create /etc/vpopmail.conf
-	if use mysql; then
-		insinto /etc
-		newins "${D}${VPOP_HOME}"/etc/vpopmail.mysql vpopmail.conf
-		dosym ../../etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
-
-		sed 's/^[^#]/# &/' -i "${D}"/etc/vpopmail.conf || die
-		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf || die
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
-		echo '# Write DB' >> "${D}"/etc/vpopmail.conf || die
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
-
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	insinto "${VPOP_HOME}"/etc
-	doins vusagec.conf
-	dosym .."${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
-	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf || die
-
-	einfo "Installing env.d entry"
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "  vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-		elog
-	fi
-
-	# do this for good measure
-	if [[ -e /etc/vpopmail.conf ]]; then
-		chmod 640 /etc/vpopmail.conf || die
-		chown root:vpopmail /etc/vpopmail.conf || die
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	if has_version "<=net-mail/vpopmail-5.2.1-r8"; then
-		ewarn
-		ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-		ewarn "The internal structure of the mail storage has changed for"
-		ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-		ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-		ewarn "to upgrade your system! (It can do conversions both ways)."
-		ewarn "You should be able to run it right away without any changes."
-		ewarn
-	fi
-
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-	elog
-
-	if use mysql; then
-		if has_version "<=net-mail/vpopmail-5.4.17"; then
-			elog
-			elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-			elog "MySQL tables, please see the UPGRADE file in the documentation!"
-			elog
-		fi
-	fi
-
-	ewarn
-	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
-	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
-	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
-	ewarn "Otherwise mail delivery WILL BREAK"
-	ewarn
-}


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2020-03-02 11:34 Sergei Trofimovich
  0 siblings, 0 replies; 34+ messages in thread
From: Sergei Trofimovich @ 2020-03-02 11:34 UTC (permalink / raw
  To: gentoo-commits

commit:     c0ff1c1b6a2055bee91b60d045b383e522a42450
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  2 11:32:45 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Mar  2 11:32:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ff1c1b

net-mail/vpopmail: stable 5.4.33-r5 for ppc64, bug #710482

Package-Manager: Portage-2.3.88, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
index b86d320a845..612564bb900 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2020-03-02 11:22 Sergei Trofimovich
  0 siblings, 0 replies; 34+ messages in thread
From: Sergei Trofimovich @ 2020-03-02 11:22 UTC (permalink / raw
  To: gentoo-commits

commit:     6ff7178b1a26d75c5f048875243c70b5cb407d79
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  2 11:18:20 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Mar  2 11:18:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ff7178b

net-mail/vpopmail: stable 5.4.33-r5 for ppc, bug #710482

Package-Manager: Portage-2.3.88, Repoman-2.3.20
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
index 988e31b12f2..b86d320a845 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~amd64 arm hppa ia64 ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2020-03-02 11:04 Sergei Trofimovich
  0 siblings, 0 replies; 34+ messages in thread
From: Sergei Trofimovich @ 2020-03-02 11:04 UTC (permalink / raw
  To: gentoo-commits

commit:     14d63f7d954c55a2c6c2edd58b07f398f4c634db
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Mon Mar  2 11:03:42 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Mar  2 11:03:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14d63f7d

net-mail/vpopmail: stable 5.4.33-r5 for ia64, bug #710482

Package-Manager: Portage-2.3.88, Repoman-2.3.20
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
index 46dde6bd5e1..988e31b12f2 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~amd64 arm hppa ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2020-02-25 21:29 Sergei Trofimovich
  0 siblings, 0 replies; 34+ messages in thread
From: Sergei Trofimovich @ 2020-02-25 21:29 UTC (permalink / raw
  To: gentoo-commits

commit:     264b28523b9afd79eac7b9a0a969693e800ad616
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sat Jan 25 10:31:00 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 21:29:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=264b2852

net-mail/vpopmail: enable onchange script

If there is no script put there by the user then this simply does nothing as
before.

This also drops the dependency on postgresql[server] as I see no reason that
this would not work with a remote server.

Closes: https://bugs.gentoo.org/516100
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/14441
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild | 251 ++++++++++++++++++++++++++++
 1 file changed, 251 insertions(+)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
new file mode 100644
index 00000000000..ceca711c4a4
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild
@@ -0,0 +1,251 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fixheadtails qmail
+
+HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
+DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
+REQUIRED_USE="mysql? ( !postgres )"
+
+DEPEND="
+	acct-group/vpopmail
+	acct-user/vpopmail
+	virtual/qmail
+	maildrop? ( mail-filter/maildrop )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( dev-db/postgresql:= )
+	spamassassin? ( mail-filter/spamassassin )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.9-access.violation.patch
+	"${FILESDIR}"/${PN}-lazy.patch
+	"${FILESDIR}"/${PN}-vpgsql.patch
+	"${FILESDIR}"/${PN}-double-free.patch
+	"${FILESDIR}"/${PN}-5.4.33-vdelivermail-add-static.patch
+	"${FILESDIR}"/${PN}-5.4.33-fix-those-vfork-instances-that-do-more-than-exec.patch
+	"${FILESDIR}"/${PN}-5.4.33-remove-unneeded-forward-declaration.patch
+	"${FILESDIR}"/${PN}-5.4.33-clean-up-calling-maildrop.patch
+	"${FILESDIR}"/${PN}-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch
+	"${FILESDIR}"/${PN}-5.4.33-strncat.patch
+	"${FILESDIR}"/${PN}-5.4.33-unistd.patch
+	"${FILESDIR}"/${PN}-5.4.33-check-crypt-return-value-for-NULL.patch
+	"${FILESDIR}"/${PN}-5.4.33-use-proper-printf-format-strings.patch
+)
+DOCS=(
+	ChangeLog
+	doc/.
+)
+HTML_DOCS=(
+	doc_html/.
+	man_html/.
+)
+
+VPOP_HOME="/var/vpopmail"
+
+pkg_setup() {
+	upgradewarning
+}
+
+src_prepare() {
+	default
+
+	echo 'install-recursive: install-exec-am' \
+		>>"${S}"/Makefile.am || die
+
+	# fix maildir paths
+	sed -i -e 's|Maildir|.maildir|g' \
+		vchkpw.c vconvert.c vdelivermail.c \
+		vpopbull.c vpopmail.c vqmaillocal.c \
+		vuserinfo.c maildirquota.c || die
+
+	# remove vpopmail advertisement
+	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
+		vdelivermail.c vpopbull.c vqmaillocal.c || die
+
+	# automake/autoconf
+	mv "${S}"/configure.{in,ac} || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
+		configure.ac || die
+
+	# _FORTIFY_SOURCE
+	sed -i \
+		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
+		vlistlib.c || die
+
+	eautoreconf
+	ht_fix_file cdb/Makefile
+}
+
+src_configure() {
+	local -a authopts
+	if use mysql; then
+		incdir=$(mysql_config --variable=pkgincludedir || die)
+		libdir=$(mysql_config --variable=pkglibdir || die)
+		authopts+=( "--enable-auth-module=mysql"
+			"--enable-incdir=${incdir}"
+			"--enable-libdir=${libdir}"
+			"--enable-sql-logging"
+			"--enable-valias"
+			"--disable-mysql-replication"
+			"--enable-mysql-limits"
+		)
+	elif use postgres; then
+		libdir=$(pg_config --libdir || die)
+		incdir=$(pg_config --pkgincludedir || die)
+		authopts+=( "--enable-auth-module=pgsql"
+			"--enable-incdir=${incdir}"
+			"--enable-libdir=${libdir}"
+			"--enable-sql-logging"
+			"--enable-valias"
+		)
+	else
+		authopts+=( "--enable-auth-module=cdb" )
+	fi
+
+	econf ${authopts[@]} \
+		--sysconfdir=${VPOP_HOME}/etc \
+		--enable-non-root-build \
+		--enable-qmaildir=${QMAIL_HOME} \
+		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
+		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
+		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		--enable-many-domains \
+		--enable-file-locking \
+		--enable-file-sync \
+		--enable-md5-passwords \
+		--enable-logging \
+		--enable-auth-logging \
+		--enable-log-name=vpopmail \
+		--enable-qmail-ext \
+		--enable-onchange-script \
+		--disable-tcpserver-file \
+		--disable-roaming-users \
+		$(use_enable ipalias ip-alias-domains) \
+		$(use_enable clearpasswd clear-passwd) \
+		$(use_enable maildrop) \
+		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
+		$(use_enable spamassassin)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	keepdir "${VPOP_HOME}"/domains
+
+	# install helper script for maildir conversion
+	into "${VPOP_HOME}"
+	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
+	into /usr
+
+	mv doc/doc_html/ doc/man_html/ . || die
+	einstalldocs
+	rm -r "${D}/${VPOP_HOME}"/doc || die
+
+	# create /etc/vpopmail.conf
+	if use mysql; then
+		insinto /etc
+		newins "${D}${VPOP_HOME}"/etc/vpopmail.mysql vpopmail.conf
+		dosym ../../../etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
+
+		sed 's/^[^#]/# &/' -i "${D}"/etc/vpopmail.conf || die
+		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf || die
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
+		echo '# Write DB' >> "${D}"/etc/vpopmail.conf || die
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
+
+		# lock down perms
+		fperms 640 /etc/vpopmail.conf
+		fowners root:vpopmail /etc/vpopmail.conf
+	fi
+
+	insinto "${VPOP_HOME}"/etc
+	doins vusagec.conf
+	dosym .."${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
+	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf || die
+
+	einfo "Installing env.d entry"
+	doenvd "${FILESDIR}"/99vpopmail
+
+	einfo "Locking down vpopmail permissions"
+	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
+	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
+	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog
+		elog "You have 'mysql' turned on in your USE"
+		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
+		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
+		elog
+		elog "First log into mysql as your mysql root user and pass. Then:"
+		elog "> create database vpopmail;"
+		elog "> use mysql;"
+		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
+		elog "  vpopmail@localhost identified by 'your password';"
+		elog "> flush privileges;"
+		elog
+		elog "If you have problems with vpopmail not accepting mail properly,"
+		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
+		elog "owned by root:vpopmail"
+		elog
+	fi
+
+	# do this for good measure
+	if [[ -e /etc/vpopmail.conf ]]; then
+		chmod 640 /etc/vpopmail.conf || die
+		chown root:vpopmail /etc/vpopmail.conf || die
+	fi
+
+	upgradewarning
+}
+
+pkg_postrm() {
+	elog "The vpopmail DATA will NOT be removed automatically."
+	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
+}
+
+upgradewarning() {
+	if has_version "<=net-mail/vpopmail-5.2.1-r8"; then
+		ewarn
+		ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
+		ewarn "The internal structure of the mail storage has changed for"
+		ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
+		ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
+		ewarn "to upgrade your system! (It can do conversions both ways)."
+		ewarn "You should be able to run it right away without any changes."
+		ewarn
+	fi
+
+	elog
+	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
+	elog "using net-mail/relay-ctrl instead."
+	elog
+
+	if use mysql; then
+		if has_version "<=net-mail/vpopmail-5.4.17"; then
+			elog
+			elog "If you are upgrading from 5.4.17 or older, you have to fix your"
+			elog "MySQL tables, please see the UPGRADE file in the documentation!"
+			elog
+		fi
+	fi
+
+	ewarn
+	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
+	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
+	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
+	ewarn "Otherwise mail delivery WILL BREAK"
+	ewarn
+}


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2020-02-25 21:29 Sergei Trofimovich
  0 siblings, 0 replies; 34+ messages in thread
From: Sergei Trofimovich @ 2020-02-25 21:29 UTC (permalink / raw
  To: gentoo-commits

commit:     23ff32e5b75dc23471f8c8c3049ceb3004cc9965
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sun Feb 23 12:54:29 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue Feb 25 21:29:22 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23ff32e5

net-mail/vpopmail: fix broken symlink for USE=mysql

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/14749
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild | 250 ++++++++++++++++++++++++++++
 1 file changed, 250 insertions(+)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
new file mode 100644
index 00000000000..6baa607e05c
--- /dev/null
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r6.ebuild
@@ -0,0 +1,250 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools fixheadtails qmail
+
+HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
+DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
+IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
+REQUIRED_USE="mysql? ( !postgres )"
+
+DEPEND="
+	acct-group/vpopmail
+	acct-user/vpopmail
+	virtual/qmail
+	maildrop? ( mail-filter/maildrop )
+	mysql? ( dev-db/mysql-connector-c:0= )
+	postgres? ( <dev-db/postgresql-9999:=[server] )
+	spamassassin? ( mail-filter/spamassassin )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.9-access.violation.patch
+	"${FILESDIR}"/${PN}-lazy.patch
+	"${FILESDIR}"/${PN}-vpgsql.patch
+	"${FILESDIR}"/${PN}-double-free.patch
+	"${FILESDIR}"/${PN}-5.4.33-vdelivermail-add-static.patch
+	"${FILESDIR}"/${PN}-5.4.33-fix-those-vfork-instances-that-do-more-than-exec.patch
+	"${FILESDIR}"/${PN}-5.4.33-remove-unneeded-forward-declaration.patch
+	"${FILESDIR}"/${PN}-5.4.33-clean-up-calling-maildrop.patch
+	"${FILESDIR}"/${PN}-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch
+	"${FILESDIR}"/${PN}-5.4.33-strncat.patch
+	"${FILESDIR}"/${PN}-5.4.33-unistd.patch
+	"${FILESDIR}"/${PN}-5.4.33-check-crypt-return-value-for-NULL.patch
+	"${FILESDIR}"/${PN}-5.4.33-use-proper-printf-format-strings.patch
+)
+DOCS=(
+	ChangeLog
+	doc/.
+)
+HTML_DOCS=(
+	doc_html/.
+	man_html/.
+)
+
+VPOP_HOME="/var/vpopmail"
+
+pkg_setup() {
+	upgradewarning
+}
+
+src_prepare() {
+	default
+
+	echo 'install-recursive: install-exec-am' \
+		>>"${S}"/Makefile.am || die
+
+	# fix maildir paths
+	sed -i -e 's|Maildir|.maildir|g' \
+		vchkpw.c vconvert.c vdelivermail.c \
+		vpopbull.c vpopmail.c vqmaillocal.c \
+		vuserinfo.c maildirquota.c || die
+
+	# remove vpopmail advertisement
+	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
+		vdelivermail.c vpopbull.c vqmaillocal.c || die
+
+	# automake/autoconf
+	mv "${S}"/configure.{in,ac} || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
+		configure.ac || die
+
+	# _FORTIFY_SOURCE
+	sed -i \
+		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
+		vlistlib.c || die
+
+	eautoreconf
+	ht_fix_file cdb/Makefile
+}
+
+src_configure() {
+	local -a authopts
+	if use mysql; then
+		incdir=$(mysql_config --variable=pkgincludedir || die)
+		libdir=$(mysql_config --variable=pkglibdir || die)
+		authopts+=( "--enable-auth-module=mysql"
+			"--enable-incdir=${incdir}"
+			"--enable-libdir=${libdir}"
+			"--enable-sql-logging"
+			"--enable-valias"
+			"--disable-mysql-replication"
+			"--enable-mysql-limits"
+		)
+	elif use postgres; then
+		libdir=$(pg_config --libdir || die)
+		incdir=$(pg_config --pkgincludedir || die)
+		authopts+=( "--enable-auth-module=pgsql"
+			"--enable-incdir=${incdir}"
+			"--enable-libdir=${libdir}"
+			"--enable-sql-logging"
+			"--enable-valias"
+		)
+	else
+		authopts+=( "--enable-auth-module=cdb" )
+	fi
+
+	econf ${authopts[@]} \
+		--sysconfdir=${VPOP_HOME}/etc \
+		--enable-non-root-build \
+		--enable-qmaildir=${QMAIL_HOME} \
+		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
+		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
+		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
+		--enable-vpopuser=vpopmail \
+		--enable-vpopgroup=vpopmail \
+		--enable-many-domains \
+		--enable-file-locking \
+		--enable-file-sync \
+		--enable-md5-passwords \
+		--enable-logging \
+		--enable-auth-logging \
+		--enable-log-name=vpopmail \
+		--enable-qmail-ext \
+		--disable-tcpserver-file \
+		--disable-roaming-users \
+		$(use_enable ipalias ip-alias-domains) \
+		$(use_enable clearpasswd clear-passwd) \
+		$(use_enable maildrop) \
+		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
+		$(use_enable spamassassin)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	keepdir "${VPOP_HOME}"/domains
+
+	# install helper script for maildir conversion
+	into "${VPOP_HOME}"
+	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
+	into /usr
+
+	mv doc/doc_html/ doc/man_html/ . || die
+	einstalldocs
+	rm -r "${D}/${VPOP_HOME}"/doc || die
+
+	# create /etc/vpopmail.conf
+	if use mysql; then
+		insinto /etc
+		newins "${D}${VPOP_HOME}"/etc/vpopmail.mysql vpopmail.conf
+		dosym ../../../etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
+
+		sed 's/^[^#]/# &/' -i "${D}"/etc/vpopmail.conf || die
+		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf || die
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
+		echo '# Write DB' >> "${D}"/etc/vpopmail.conf || die
+		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf || die
+
+		# lock down perms
+		fperms 640 /etc/vpopmail.conf
+		fowners root:vpopmail /etc/vpopmail.conf
+	fi
+
+	insinto "${VPOP_HOME}"/etc
+	doins vusagec.conf
+	dosym .."${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
+	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf || die
+
+	einfo "Installing env.d entry"
+	doenvd "${FILESDIR}"/99vpopmail
+
+	einfo "Locking down vpopmail permissions"
+	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
+	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
+	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
+}
+
+pkg_postinst() {
+	if use mysql ; then
+		elog
+		elog "You have 'mysql' turned on in your USE"
+		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
+		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
+		elog
+		elog "First log into mysql as your mysql root user and pass. Then:"
+		elog "> create database vpopmail;"
+		elog "> use mysql;"
+		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
+		elog "  vpopmail@localhost identified by 'your password';"
+		elog "> flush privileges;"
+		elog
+		elog "If you have problems with vpopmail not accepting mail properly,"
+		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
+		elog "owned by root:vpopmail"
+		elog
+	fi
+
+	# do this for good measure
+	if [[ -e /etc/vpopmail.conf ]]; then
+		chmod 640 /etc/vpopmail.conf || die
+		chown root:vpopmail /etc/vpopmail.conf || die
+	fi
+
+	upgradewarning
+}
+
+pkg_postrm() {
+	elog "The vpopmail DATA will NOT be removed automatically."
+	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
+}
+
+upgradewarning() {
+	if has_version "<=net-mail/vpopmail-5.2.1-r8"; then
+		ewarn
+		ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
+		ewarn "The internal structure of the mail storage has changed for"
+		ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
+		ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
+		ewarn "to upgrade your system! (It can do conversions both ways)."
+		ewarn "You should be able to run it right away without any changes."
+		ewarn
+	fi
+
+	elog
+	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
+	elog "using net-mail/relay-ctrl instead."
+	elog
+
+	if use mysql; then
+		if has_version "<=net-mail/vpopmail-5.4.17"; then
+			elog
+			elog "If you are upgrading from 5.4.17 or older, you have to fix your"
+			elog "MySQL tables, please see the UPGRADE file in the documentation!"
+			elog
+		fi
+	fi
+
+	ewarn
+	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
+	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
+	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
+	ewarn "Otherwise mail delivery WILL BREAK"
+	ewarn
+}


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2020-02-24 12:49 Agostino Sarubbo
  0 siblings, 0 replies; 34+ messages in thread
From: Agostino Sarubbo @ 2020-02-24 12:49 UTC (permalink / raw
  To: gentoo-commits

commit:     eca7cd0c0acf73334e55573627f6a8c040db404b
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 12:49:08 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 12:49:08 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eca7cd0c

net-mail/vpopmail: x86 stable wrt bug #710482

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
index fa4538fe5b3..46dde6bd5e1 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2020-02-24 10:07 Agostino Sarubbo
  0 siblings, 0 replies; 34+ messages in thread
From: Agostino Sarubbo @ 2020-02-24 10:07 UTC (permalink / raw
  To: gentoo-commits

commit:     1dfc56d80c7186ce6984bbffa511b64553ea2394
Author:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 24 10:06:49 2020 +0000
Commit:     Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 10:06:49 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dfc56d8

net-mail/vpopmail: arm stable wrt bug #710482

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="arm"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
index 9525a220ddb..fa4538fe5b3 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="~amd64 arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2020-02-24  8:20 Sergei Trofimovich
  0 siblings, 0 replies; 34+ messages in thread
From: Sergei Trofimovich @ 2020-02-24  8:20 UTC (permalink / raw
  To: gentoo-commits

commit:     c5fc97626e3e962599dceefbfacea99b2d55ce4c
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Mon Feb 24 06:48:31 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 08:20:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5fc9762

net-mail/vpopmail: stable 5.4.33-r5 for hppa, bug #710482

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="hppa"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
index 9d145b9a012..9525a220ddb 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
+KEYWORDS="~amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2020-02-23  8:54 Sergei Trofimovich
  0 siblings, 0 replies; 34+ messages in thread
From: Sergei Trofimovich @ 2020-02-23  8:54 UTC (permalink / raw
  To: gentoo-commits

commit:     2eb7f0d42380b0716e4ceb96f380fd0605e4d81b
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sun Feb 23 08:46:50 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun Feb 23 08:54:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2eb7f0d4

net-mail/vpopmail: stable 5.4.33-r5 for sparc, bug #710482

Package-Manager: Portage-2.3.84, Repoman-2.3.20
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
index 8041e162208..9d145b9a012 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r5.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
 IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
 REQUIRED_USE="mysql? ( !postgres )"
 


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2020-02-22 14:19 Sergei Trofimovich
  0 siblings, 0 replies; 34+ messages in thread
From: Sergei Trofimovich @ 2020-02-22 14:19 UTC (permalink / raw
  To: gentoo-commits

commit:     a1f4c9fda98a8c24d121f95007c950d41df12472
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sat Feb 22 12:36:56 2020 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Feb 22 14:19:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1f4c9fd

net-mail/vpopmail: drop old

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

 net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild | 252 ----------------------------
 1 file changed, 252 deletions(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
deleted file mode 100644
index 6e9edf574f8..00000000000
--- a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools eutils fixheadtails qmail
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
-REQUIRED_USE="mysql? ( !postgres )"
-
-DEPEND="
-	acct-group/vpopmail
-	acct-user/vpopmail
-	virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql:=[server] )
-	spamassassin? ( mail-filter/spamassassin )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	"${FILESDIR}"/${PN}-lazy.patch
-	"${FILESDIR}"/${PN}-vpgsql.patch
-	"${FILESDIR}"/${PN}-double-free.patch
-	"${FILESDIR}"/${PN}-5.4.33-vdelivermail-add-static.patch
-	"${FILESDIR}"/${PN}-5.4.33-fix-those-vfork-instances-that-do-more-than-exec.patch
-	"${FILESDIR}"/${PN}-5.4.33-remove-unneeded-forward-declaration.patch
-	"${FILESDIR}"/${PN}-5.4.33-clean-up-calling-maildrop.patch
-	"${FILESDIR}"/${PN}-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch
-	"${FILESDIR}"/${PN}-5.4.33-strncat.patch
-	"${FILESDIR}"/${PN}-5.4.33-unistd.patch
-)
-DOCS=(
-	ChangeLog
-	doc/.
-)
-HTML_DOCS=(
-	doc_html/.
-	man_html/.
-)
-
-VPOP_HOME="/var/vpopmail"
-
-pkg_setup() {
-	upgradewarning
-}
-
-src_prepare() {
-	default
-
-	echo 'install-recursive: install-exec-am' \
-		>>"${S}"/Makefile.am
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	# automake/autoconf
-	mv -f "${S}"/configure.{in,ac} || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
-		configure.ac || die
-
-	# _FORTIFY_SOURCE
-	sed -i \
-		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
-		vlistlib.c || die
-
-	eautoreconf
-	ht_fix_file cdb/Makefile
-}
-
-src_configure() {
-	local authopts
-	if use mysql; then
-		incdir=$(mysql_config --variable=pkgincludedir || die)
-		libdir=$(mysql_config --variable=pkglibdir || die)
-		authopts+=" --enable-auth-module=mysql"
-		authopts+=" --enable-incdir=${incdir}"
-		authopts+=" --enable-libdir=${libdir}"
-		authopts+=" --enable-sql-logging"
-		authopts+=" --enable-valias"
-		authopts+=" --disable-mysql-replication"
-		authopts+=" --enable-mysql-limits"
-	elif use postgres; then
-		libdir=$(pg_config --libdir || die)
-		incdir=$(pg_config --pkgincludedir || die)
-		authopts+=" --enable-auth-module=pgsql"
-		authopts+=" --enable-incdir=${incdir}"
-		authopts+=" --enable-libdir=${libdir}"
-		authopts+=" --enable-sql-logging"
-		authopts+=" --enable-valias"
-	else
-		authopts+=" --enable-auth-module=cdb"
-	fi
-
-	econf ${authopts} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
-		$(use_enable spamassassin)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into "${VPOP_HOME}"
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	mv doc/doc_html/ doc/man_html/ . || die
-	einstalldocs
-	rm -r "${D}/${VPOP_HOME}"/doc || die
-	dosym \
-		$(realpath --relative-to "${D}/${VPOP_HOME}"/ "${D}"/usr/share/doc/${PF}/ || die) \
-		"${VPOP_HOME}"/doc
-
-	# create /etc/vpopmail.conf
-	if use mysql; then
-		insinto /etc
-		newins "${D}${VPOP_HOME}"/etc/vpopmail.mysql vpopmail.conf
-		dosym \
-			$(realpath --relative-to "${D}/${VPOP_HOME}"/etc/ "${D}"/etc/vpopmail.conf || die) \
-			"${VPOP_HOME}"/etc/vpopmail.mysql
-
-		sed -e '12d' -i "${D}"/etc/vpopmail.conf || die
-		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	insinto "${VPOP_HOME}"/etc
-	doins vusagec.conf
-	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
-	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf || die
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "  vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-		elog
-	fi
-
-	# do this for good measure
-	if [[ -e /etc/vpopmail.conf ]]; then
-		chmod 640 /etc/vpopmail.conf || die
-		chown root:vpopmail /etc/vpopmail.conf || die
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	if has_version "<=net-mail/vpopmail-5.2.1-r8"; then
-		ewarn
-		ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-		ewarn "The internal structure of the mail storage has changed for"
-		ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-		ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-		ewarn "to upgrade your system! (It can do conversions both ways)."
-		ewarn "You should be able to run it right away without any changes."
-		ewarn
-	fi
-
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-	elog
-
-	if use mysql; then
-		if has_version "<=net-mail/vpopmail-5.4.17"; then
-			elog
-			elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-			elog "MySQL tables, please see the UPGRADE file in the documentation!"
-			elog
-		fi
-	fi
-
-	ewarn
-	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
-	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
-	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
-	ewarn "Otherwise mail delivery WILL BREAK"
-	ewarn
-}


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2019-11-17  9:30 Michał Górny
  0 siblings, 0 replies; 34+ messages in thread
From: Michał Górny @ 2019-11-17  9:30 UTC (permalink / raw
  To: gentoo-commits

commit:     d45a0acb6acc504ba1f528074180f3b35b823db6
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Sun Nov 17 08:05:52 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 09:30:36 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d45a0acb

net-mail/vpopmail: also depend on acct-user/vpopmail

Was left out by accident.

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/13450
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild | 1 +
 net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild | 1 +
 net-mail/vpopmail/vpopmail-5.4.33.ebuild    | 1 +
 3 files changed, 3 insertions(+)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
index fc5ea8ec421..6e9edf574f8 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
@@ -17,6 +17,7 @@ REQUIRED_USE="mysql? ( !postgres )"
 
 DEPEND="
 	acct-group/vpopmail
+	acct-user/vpopmail
 	virtual/qmail
 	maildrop? ( mail-filter/maildrop )
 	mysql? ( dev-db/mysql-connector-c:0= )

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
index 3b183346bb9..8041e162208 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r5.ebuild
@@ -17,6 +17,7 @@ REQUIRED_USE="mysql? ( !postgres )"
 
 DEPEND="
 	acct-group/vpopmail
+	acct-user/vpopmail
 	virtual/qmail
 	maildrop? ( mail-filter/maildrop )
 	mysql? ( dev-db/mysql-connector-c:0= )

diff --git a/net-mail/vpopmail/vpopmail-5.4.33.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
index e91114dbf41..a38b01a0082 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
@@ -16,6 +16,7 @@ IUSE="clearpasswd ipalias maildrop mysql spamassassin"
 
 DEPEND="
 	acct-group/vpopmail
+	acct-user/vpopmail
 	virtual/qmail
 	maildrop? ( mail-filter/maildrop )
 	mysql? ( virtual/mysql )


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2019-10-23 13:46 Joonas Niilola
  0 siblings, 0 replies; 34+ messages in thread
From: Joonas Niilola @ 2019-10-23 13:46 UTC (permalink / raw
  To: gentoo-commits

commit:     0988016f9d479df15a83e5267fe741e4e2db32af
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Oct 22 14:50:21 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Oct 23 13:46:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0988016f

net-mail/vpopmail: limit upgrade warnings to affected versions

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/13382
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
index 3cbfe467136..fc5ea8ec421 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
@@ -217,14 +217,16 @@ pkg_postrm() {
 }
 
 upgradewarning() {
-	ewarn
-	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-	ewarn "The internal structure of the mail storage has changed for"
-	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-	ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-	ewarn "to upgrade your system! (It can do conversions both ways)."
-	ewarn "You should be able to run it right away without any changes."
-	ewarn
+	if has_version "<=net-mail/vpopmail-5.2.1-r8"; then
+		ewarn
+		ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
+		ewarn "The internal structure of the mail storage has changed for"
+		ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
+		ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
+		ewarn "to upgrade your system! (It can do conversions both ways)."
+		ewarn "You should be able to run it right away without any changes."
+		ewarn
+	fi
 
 	elog
 	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
@@ -232,10 +234,12 @@ upgradewarning() {
 	elog
 
 	if use mysql; then
-		elog
-		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-		elog "MySQL tables, please see the UPGRADE file in the documentation!"
-		elog
+		if has_version "<=net-mail/vpopmail-5.4.17"; then
+			elog
+			elog "If you are upgrading from 5.4.17 or older, you have to fix your"
+			elog "MySQL tables, please see the UPGRADE file in the documentation!"
+			elog
+		fi
 	fi
 
 	ewarn


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2019-10-04  4:38 Joonas Niilola
  0 siblings, 0 replies; 34+ messages in thread
From: Joonas Niilola @ 2019-10-04  4:38 UTC (permalink / raw
  To: gentoo-commits

commit:     9783b0fa207904be50354a7a2e3119f36ae5d83c
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Tue Oct  1 17:24:04 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Oct  4 04:37:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9783b0fa

net-mail/vpopmail: remove old (5.4.33-r3)

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

 net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild | 304 ----------------------------
 1 file changed, 304 deletions(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild
deleted file mode 100644
index eca83681371..00000000000
--- a/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils fixheadtails qmail user
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="clearpasswd ipalias maildrop mysql postgres spamassassin"
-REQUIRED_USE="mysql? ( !postgres )"
-
-DEPEND="
-	acct-group/vpopmail
-	virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( dev-db/mysql-connector-c:0= )
-	postgres? ( dev-db/postgresql:=[server] )
-	spamassassin? ( mail-filter/spamassassin )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	"${FILESDIR}"/${PN}-lazy.patch
-	"${FILESDIR}"/${PN}-vpgsql.patch
-	"${FILESDIR}"/${PN}-double-free.patch
-)
-DOCS=(
-	ChangeLog
-	doc/AUTHORS
-	doc/FAQ
-	doc/INSTALL
-	doc/README.activedirectory
-	doc/README.authvchkpw
-	doc/README.filelocking
-	doc/README.ipaliasdomains
-	doc/README.ldap
-	doc/README.maildrop
-	doc/README.mysql
-	doc/README.onchange
-	doc/README.oracle
-	doc/README.pgsql
-	doc/README.qmail-default
-	doc/README.quotas
-	doc/README.roamingusers
-	doc/README.spamassassin
-	doc/README.sybase
-	doc/README.vdelivermail
-	doc/README.vlimits
-	doc/README.vpopmaild
-	doc/README.vqmaillocal
-)
-HTML_DOCS=(
-	doc/doc_html/vpopmail5.abw
-	doc/doc_html/vpopmailapi.png
-	doc/doc_html/vpopmail.html
-	doc/man_html/clearopensmtp.html
-	doc/man_html/index.html
-	doc/man_html/vaddaliasdomain.html
-	doc/man_html/vadddomain.html
-	doc/man_html/vadduser.html
-	doc/man_html/vchkpw.html
-	doc/man_html/vconvert.html
-	doc/man_html/vdeldomain.html
-	doc/man_html/vdelivermail.html
-	doc/man_html/vdeluser.html
-	doc/man_html/vpasswd.html
-	doc/man_html/vpopbull.html
-	doc/man_html/vsetuserquota.html
-)
-
-# This makes sure the variable is set, and that it isn't null.
-VPOP_DEFAULT_HOME="/var/vpopmail"
-
-vpopmail_set_homedir() {
-	VPOP_HOME=$(egethome vpopmail)
-	if [[ -z "${VPOP_HOME}" ]]; then
-		eerror "vpopmail's home directory is null in passwd data!"
-		eerror "You probably want to check that out."
-		eerror "Continuing with default."
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_prepare() {
-	default
-
-	echo 'install-recursive: install-exec-am' \
-		>>"${S}"/Makefile.am
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	# automake/autoconf
-	mv -f "${S}"/configure.{in,ac} || die
-	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' \
-	        configure.ac || die
-
-	# _FORTIFY_SOURCE
-	sed -i \
-		-e 's/\(snprintf(\s*\(LI->[a-zA-Z_]\+\),\s*\)[a-zA-Z_]\+,/\1 sizeof(\2),/' \
-		vlistlib.c || die
-
-	eautoreconf
-	ht_fix_file cdb/Makefile
-}
-
-src_configure() {
-	vpopmail_set_homedir
-
-	local authopts
-	if use mysql; then
-		incdir=$(mysql_config --variable=pkgincludedir)
-		libdir=$(mysql_config --variable=pkglibdir)
-		authopts+=" --enable-auth-module=mysql"
-		authopts+=" --enable-incdir=${incdir}"
-		authopts+=" --enable-libdir=${libdir}"
-		authopts+=" --enable-sql-logging"
-		authopts+=" --enable-valias"
-		authopts+=" --disable-mysql-replication"
-		authopts+=" --enable-mysql-limits"
-	elif use postgres; then
-		libdir=$(pg_config --libdir)
-		incdir=$(pg_config --pkgincludedir)
-		authopts+=" --enable-auth-module=pgsql"
-		authopts+=" --enable-incdir=${incdir}"
-		authopts+=" --enable-libdir=${libdir}"
-		authopts+=" --enable-sql-logging"
-		authopts+=" --enable-valias"
-	else
-		authopts+=" --enable-auth-module=cdb"
-	fi
-
-	econf ${authopts} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
-		$(use_enable spamassassin)
-}
-
-src_install() {
-	vpopmail_set_homedir
-
-	emake DESTDIR="${D}" install
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into "${VPOP_HOME}"
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	einstalldocs
-	rm -rf "${D}/${VPOP_HOME}"/doc
-	dosym \
-		$(realpath --relative-to "${D}/${VPOP_HOME}"/ "${D}"/usr/share/doc/${PF}/) \
-		"${VPOP_HOME}"/doc
-
-	# create /etc/vpopmail.conf
-	if use mysql; then
-		dodir /etc
-		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
-		dosym \
-			$(realpath --relative-to "${D}/${VPOP_HOME}"/etc/ "${D}"/etc/vpopmail.conf) \
-			"${VPOP_HOME}"/etc/vpopmail.mysql
-
-		sed -e '12d' -i "${D}"/etc/vpopmail.conf
-		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	insinto "${VPOP_HOME}"/etc
-	doins vusagec.conf
-	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
-	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners -R root:0 "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "  vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-		elog
-	fi
-
-	# do this for good measure
-	if [[ -e /etc/vpopmail.conf ]]; then
-		chmod 640 /etc/vpopmail.conf
-		chown root:vpopmail /etc/vpopmail.conf
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	vpopmail_set_homedir
-
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	ewarn
-	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-	ewarn "The internal structure of the mail storage has changed for"
-	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-	ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-	ewarn "to upgrade your system! (It can do conversions both ways)."
-	ewarn "You should be able to run it right away without any changes."
-	ewarn
-
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-	elog
-
-	if use mysql; then
-		elog
-		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-		elog "MySQL tables:"
-		elog
-		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
-		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
-		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
-		elog
-	fi
-
-	ewarn
-	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
-	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
-	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
-	ewarn "Otherwise mail delivery WILL BREAK"
-	ewarn
-}


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2019-09-28  6:46 Joonas Niilola
  0 siblings, 0 replies; 34+ messages in thread
From: Joonas Niilola @ 2019-09-28  6:46 UTC (permalink / raw
  To: gentoo-commits

commit:     4a1b9aba414abe2f31da43724ba71f38e076dde0
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Thu Sep 26 20:26:32 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Sep 28 06:46:15 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a1b9aba

net-mail/vpopmail: use acct-user/vpopmail

Since this introduces a change if the user actually changed the home directory
of that user in an older version it is only used in the most recent ebuild.

Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de>
Closes: https://github.com/gentoo/gentoo/pull/13049
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild | 25 +++----------------------
 1 file changed, 3 insertions(+), 22 deletions(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
index 4b291b71351..3cbfe467136 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools eutils fixheadtails qmail user
+inherit autotools eutils fixheadtails qmail
 
 HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
 DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
@@ -38,6 +38,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.4.33-unistd.patch
 )
 DOCS=(
+	ChangeLog
 	doc/.
 )
 HTML_DOCS=(
@@ -45,23 +46,9 @@ HTML_DOCS=(
 	man_html/.
 )
 
-# This makes sure the variable is set, and that it isn't null.
-VPOP_DEFAULT_HOME="/var/vpopmail"
-
-vpopmail_set_homedir() {
-	VPOP_HOME=$(egethome vpopmail)
-	if [[ -z "${VPOP_HOME}" ]]; then
-		eerror "vpopmail's home directory is null in passwd data!"
-		eerror "You probably want to check that out."
-		eerror "Continuing with default."
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
+VPOP_HOME="/var/vpopmail"
 
 pkg_setup() {
-	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
 	upgradewarning
 }
 
@@ -96,8 +83,6 @@ src_prepare() {
 }
 
 src_configure() {
-	vpopmail_set_homedir
-
 	local authopts
 	if use mysql; then
 		incdir=$(mysql_config --variable=pkgincludedir || die)
@@ -148,8 +133,6 @@ src_configure() {
 }
 
 src_install() {
-	vpopmail_set_homedir
-
 	emake DESTDIR="${D}" install
 	keepdir "${VPOP_HOME}"/domains
 
@@ -229,8 +212,6 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	vpopmail_set_homedir
-
 	elog "The vpopmail DATA will NOT be removed automatically."
 	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
 }


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2019-09-19 16:21 Joonas Niilola
  0 siblings, 0 replies; 34+ messages in thread
From: Joonas Niilola @ 2019-09-19 16:21 UTC (permalink / raw
  To: gentoo-commits

commit:     a611a2ddc99b1bffafca22260ed2265191877683
Author:     Rolf Eike Beer <eike <AT> sf-mail <DOT> de>
AuthorDate: Wed Sep 18 19:58:42 2019 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 16:12:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a611a2dd

net-mail/vpopmail: take it

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

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

diff --git a/net-mail/vpopmail/metadata.xml b/net-mail/vpopmail/metadata.xml
index 75187aec0ef..f9b2c9fab97 100644
--- a/net-mail/vpopmail/metadata.xml
+++ b/net-mail/vpopmail/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>gentoo-bug@opensource.sf-tec.de</email>
+		<name>Rolf Eike Beer</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="clearpasswd">Enables cleartext password storage in the
 			vpasswd files</flag>


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2019-02-18 21:30 Brian Evans
  0 siblings, 0 replies; 34+ messages in thread
From: Brian Evans @ 2019-02-18 21:30 UTC (permalink / raw
  To: gentoo-commits

commit:     e32903fe23f3508695d791c416a8439d1064e22f
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 18 21:27:43 2019 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Mon Feb 18 21:29:54 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e32903fe

net-mail/vpopmail: Revbump to change dependencies

Do not depend on mariadb-connector-c[mysqlcompat] especially in a
an "OR" dependency.  It is broken this way.

Bug: https://bugs.gentoo.org/666002
Package-Manager: Portage-2.3.61, Repoman-2.3.12
Signed-off-by: Brian Evans <grknight <AT> gentoo.org>

 .../vpopmail/{vpopmail-5.4.33-r2.ebuild => vpopmail-5.4.33-r3.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild
similarity index 98%
rename from net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild
rename to net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild
index 244a0119098..11ed896e628 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r3.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=6
@@ -17,7 +17,7 @@ REQUIRED_USE="mysql? ( !postgres )"
 
 DEPEND="virtual/qmail
 	maildrop? ( mail-filter/maildrop )
-	mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c[mysqlcompat] ) )
+	mysql? ( dev-db/mysql-connector-c:0= )
 	postgres? ( dev-db/postgresql:=[server] )
 	spamassassin? ( mail-filter/spamassassin )"
 RDEPEND="${DEPEND}"


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2018-06-08  5:11 Robin H. Johnson
  0 siblings, 0 replies; 34+ messages in thread
From: Robin H. Johnson @ 2018-06-08  5:11 UTC (permalink / raw
  To: gentoo-commits

commit:     ce73e9fc91ec8bdf6e238987ee4f765f64bcd73d
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  6 21:16:26 2018 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Jun  8 05:11:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce73e9fc

net-mail/vpopmail: fix linking

Bug: https://bugs.gentoo.org/526590
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
Package-Manager: Portage-2.3.33, Repoman-2.3.9

 net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild        | 15 +++++++-------
 ...-5.4.33-r1.ebuild => vpopmail-5.4.33-r2.ebuild} | 23 ++++++++++++----------
 net-mail/vpopmail/vpopmail-5.4.33.ebuild           | 15 +++++++-------
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
index ecc09b21af2..a41fd4be75c 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -82,14 +82,15 @@ src_configure() {
 
 	local authopts
 	if use mysql; then
-		mysqlinc=$(mysql_config --include)
-		authopts="--enable-incdir=${mysqlinc#-I}"
+		incdir=$(mysql_config --variable=pkgincludedir)
+		libdir=$(mysql_config --variable=pkglibdir)
 		authopts+=" --enable-auth-module=mysql"
-		authopts+="	--enable-libdir=/usr/$(get_libdir)/mysql"
-		authopts+="	--enable-sql-logging"
+		authopts+=" --enable-incdir=${incdir}"
+		authopts+=" --enable-libdir=${libdir}"
+		authopts+=" --enable-sql-logging"
 		authopts+=" --enable-valias"
-		authopts+="	--disable-mysql-replication"
-		authopts+="	--enable-mysql-limits"
+		authopts+=" --disable-mysql-replication"
+		authopts+=" --enable-mysql-limits"
 	elif use postgres; then
 		pglibdir=$(pg_config --libdir)
 		authopts+=" --enable-auth-module=pgsql"

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild
similarity index 92%
copy from net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
copy to net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild
index ecc09b21af2..498c53bc733 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -17,7 +17,7 @@ REQUIRED_USE="mysql? ( !postgres )"
 
 DEPEND="virtual/qmail
 	maildrop? ( mail-filter/maildrop )
-	mysql? ( virtual/mysql )
+	mysql? ( || ( dev-db/mysql-connector-c dev-db/mariadb-connector-c[mysqlcompat] ) )
 	postgres? ( dev-db/postgresql[server] )
 	spamassassin? ( mail-filter/spamassassin )"
 RDEPEND="${DEPEND}"
@@ -82,18 +82,21 @@ src_configure() {
 
 	local authopts
 	if use mysql; then
-		mysqlinc=$(mysql_config --include)
-		authopts="--enable-incdir=${mysqlinc#-I}"
+		incdir=$(mysql_config --variable=pkgincludedir)
+		libdir=$(mysql_config --variable=pkglibdir)
 		authopts+=" --enable-auth-module=mysql"
-		authopts+="	--enable-libdir=/usr/$(get_libdir)/mysql"
-		authopts+="	--enable-sql-logging"
+		authopts+=" --enable-incdir=${incdir}"
+		authopts+=" --enable-libdir=${libdir}"
+		authopts+=" --enable-sql-logging"
 		authopts+=" --enable-valias"
-		authopts+="	--disable-mysql-replication"
-		authopts+="	--enable-mysql-limits"
+		authopts+=" --disable-mysql-replication"
+		authopts+=" --enable-mysql-limits"
 	elif use postgres; then
-		pglibdir=$(pg_config --libdir)
+		libdir=$(pg_config --libdir)
+		incdir=$(pg_config --pkgincludedir)
 		authopts+=" --enable-auth-module=pgsql"
-		authopts+=" --enable-libdir=${pglibdir}"
+		authopts+=" --enable-incdir=${incdir}"
+		authopts+=" --enable-libdir=${libdir}"
 		authopts+=" --enable-sql-logging"
 		authopts+=" --enable-valias"
 	else

diff --git a/net-mail/vpopmail/vpopmail-5.4.33.ebuild b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
index 0084ce003a7..e98c76b20ef 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -76,14 +76,15 @@ src_configure() {
 
 	local authopts
 	if use mysql; then
-		authopts="$(mysql_config --include)"
-		authopts="--enable-incdir=${authopts#-I}"
+		incdir=$(mysql_config --variable=pkgincludedir)
+		libdir=$(mysql_config --variable=pkglibdir)
 		authopts+=" --enable-auth-module=mysql"
-		authopts+="	--enable-libdir=/usr/$(get_libdir)/mysql"
-		authopts+="	--enable-sql-logging"
+		authopts+=" --enable-incdir=${incdir}"
+		authopts+=" --enable-libdir=${libdir}"
+		authopts+=" --enable-sql-logging"
 		authopts+=" --enable-valias"
-		authopts+="	--disable-mysql-replication"
-		authopts+="	--enable-mysql-limits"
+		authopts+=" --disable-mysql-replication"
+		authopts+=" --enable-mysql-limits"
 	else
 		authopts="--enable-auth-module=cdb"
 	fi


^ permalink raw reply related	[flat|nested] 34+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/
@ 2016-04-16 21:12 Manuel Rüger
  0 siblings, 0 replies; 34+ messages in thread
From: Manuel Rüger @ 2016-04-16 21:12 UTC (permalink / raw
  To: gentoo-commits

commit:     97c489acf95f4d030c5562ad7308e95c25e0173b
Author:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 16 21:09:25 2016 +0000
Commit:     Manuel Rüger <mrueg <AT> gentoo <DOT> org>
CommitDate: Sat Apr 16 21:09:25 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97c489ac

net-mail/vpopmail: Remove old

Package-Manager: portage-2.2.28

 net-mail/vpopmail/Manifest                  |   2 -
 net-mail/vpopmail/vpopmail-5.4.16.ebuild    | 246 ----------------------------
 net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild | 231 --------------------------
 net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild | 233 --------------------------
 4 files changed, 712 deletions(-)

diff --git a/net-mail/vpopmail/Manifest b/net-mail/vpopmail/Manifest
index 80fd5b4..e3fff79 100644
--- a/net-mail/vpopmail/Manifest
+++ b/net-mail/vpopmail/Manifest
@@ -1,3 +1 @@
-DIST vpopmail-5.4.16.tar.gz 453019 SHA256 c1ea76e404082a116795dc3c49933b26f79cdbb49bca5ebc4fa170403a5e3c7a SHA512 a7ce5640a59ee7f216869d08cb681eb323910f4fd7dcc9f644fe9bcb842c6703745edbbd5bb95ab44dc59b4684a8e29b115a3aeb893ef7514fdc28eab46328d0 WHIRLPOOL 10bc8c4f05b11cabaaf69e49f42006bd8b46d671f189c4e5d8258e3fb88bffb76e086398792dc655b3a02d6f59efcb48727602b50273138a3b35940725faeba3
-DIST vpopmail-5.4.30.tar.gz 609358 SHA256 38239ca6f9dda25f70cc46106f3ffe8b9d3b95907ced54c15eb942c2ff387acc SHA512 62bb677cb2f928d37fff1346a7aa7a6f9f7900159d1edcf0f471bf252c59f19e2b8605c27033e9123339a75dc4058b4fd21ea5e05684590e50c94a1431d91c7b WHIRLPOOL 0a4caafe23dd649e6c5917bac6fa414dd702b8631231c94385a2afc24e977b3ea07e6cdf71261935e4a7df2e7508edad40124c15cfab2e02308c060c5d50e44a
 DIST vpopmail-5.4.33.tar.gz 612271 SHA256 383c7436dfb18e773336f608f1771fc08559143c4f3938a5807a0cc5994c44f4 SHA512 abd5060d709c661d95ca442c6f77c4c27cf30a3c6790fc36d76ccf379ed2e08c1f0af697b2bcc57176a2cdb2cb67f6c27236d7b3fa69a135fa87f45a5df208ab WHIRLPOOL 9b49635984e541880528e56da9932a74e1a0988ef0b82f0f15538b6f9744c3bf1e86da45dd5de0c55af714669547c48d1f13830c8480e6760bc548b5047520f3

diff --git a/net-mail/vpopmail/vpopmail-5.4.16.ebuild b/net-mail/vpopmail/vpopmail-5.4.16.ebuild
deleted file mode 100644
index 920037a..0000000
--- a/net-mail/vpopmail/vpopmail-5.4.16.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils fixheadtails autotools user
-
-# TODO: all ldap, sybase support
-#MY_PV=${PV/_/-}
-#MY_P=${PN}-${MY_PV}
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ~ia64 ppc s390 sh sparc x86"
-IUSE="mysql ipalias clearpasswd"
-# vpopmail will NOT build if non-root.
-RESTRICT="userpriv"
-
-DEPEND_COMMON="virtual/qmail
-	mysql? ( virtual/mysql )"
-DEPEND="sys-apps/sed
-	sys-apps/ucspi-tcp
-	${DEPEND_COMMON}"
-RDEPEND="${DEPEND_COMMON}
-	virtual/cron"
-
-# S="${WORKDIR}/${MY_P}"
-
-# Define vpopmail home dir in /etc/password if different
-VPOP_DEFAULT_HOME="/var/vpopmail"
-VPOP_HOME="$VPOP_DEFAULT_HOME"
-
-# This makes sure the variable is set, and that it isn't null.
-vpopmail_set_homedir() {
-	VPOP_HOME=$(egethome vpopmail)
-	if [ -z "$VPOP_HOME" ]; then
-		echo -ne "\a"
-		eerror "vpopmail's home directory is null in passwd data!"
-		eerror "You probably want to check that out."
-		eerror "Continuing with default."
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	enewgroup vpopmail 89
-	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_unpack() {
-	# cd ${WORKDIR}
-	# unpack ${MY_P}.tar.gz
-	unpack ${A}
-	cd ${S}
-
-	epatch ${FILESDIR}/${PN}-5.4.9-access.violation.patch || die "failed to patch."
-	epatch ${FILESDIR}/${PN}-lazy.patch || die "failed to patch."
-
-	sed -i \
-		's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c \
-		|| die "failed to change Maildir to .maildir"
-	sed -i \
-		'/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c \
-		|| die "failed to remove vpopmail advertisement"
-
-	eautoreconf
-	ht_fix_file ${S}/cdb/Makefile || die "failed to fix file"
-}
-
-src_compile() {
-	vpopmail_set_homedir
-
-	use ipalias \
-		&& myopts="${myopts} --enable-ip-alias-domains=y" \
-		|| myopts="${myopts} --enable-ip-alias-domains=n"
-
-	use mysql \
-		&& myopts="${myopts} --enable-auth-module=mysql \
-			--enable-libs=/usr/include/mysql \
-			--enable-libdir=/usr/lib/mysql \
-			--enable-sql-logging=y \
-			--enable-auth-logging=y \
-			--enable-valias=y \
-			--enable-mysql-replication=n \
-			--enable-mysql-limits"
-
-	# Bug 20127
-	use clearpasswd \
-		&& myopts="${myopts} --enable-clear-passwd=y" \
-		|| myopts="${myopts} --enable-clear-passwd=n"
-
-	econf \
-		${myopts} \
-		--sbindir=/usr/sbin \
-		--bindir=/usr/bin \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-qmaildir=/var/qmail \
-		--enable-qmail-newu=/var/qmail/bin/qmail-newu \
-		--enable-qmail-inject=/var/qmail/bin/qmail-inject \
-		--enable-qmail-newmrh=/var/qmail/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-many-domains=y \
-		--enable-vpopgroup=vpopmail \
-		--enable-file-locking=y \
-		--enable-file-sync=y \
-		--enable-md5-passwords=y \
-		--enable-logging=y \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcp-rules-prog --disable-tcpserver-file --disable-roaming-users \
-		|| die
-
-	# TCPRULES for relaying is now considered obsolete, use relay-ctrl instead
-	#--enable-tcprules-prog=/usr/bin/tcprules --enable-tcpserver-file=/etc/tcp.smtp \
-	#--enable-roaming-users=y --enable-relay-clear-minutes=60 \
-	#--disable-rebuild-tcpserver-file \
-
-	emake || die "Make failed."
-}
-
-src_install() {
-	vpopmail_set_homedir
-
-	make DESTDIR=${D} install || die
-	dosed ${VPOP_HOME}/etc/inc_deps
-	dosed ${VPOP_HOME}/etc/lib_deps
-
-	into /var/vpopmail
-	dobin ${FILESDIR}/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	# Install documentation.
-	dodoc AUTHORS ChangeLog FAQ INSTALL README*
-	dodoc doc/doc_html/* doc/man_html/*
-	rm -rf ${D}/${VPOP_HOME}/doc
-	dosym /usr/share/doc/${PF}/ ${VPOP_HOME}/doc
-
-	# Create /etc/vpopmail.conf
-	if use mysql ; then
-		einfo "Installing vpopmail mysql configuration file"
-		dodir /etc
-		#config file position
-		mv ${D}/var/vpopmail/etc/vpopmail.mysql ${D}/etc/vpopmail.conf
-		dosym /etc/vpopmail.conf /var/vpopmail/etc/vpopmail.mysql
-		sed -e '12d' -i ${D}/etc/vpopmail.conf
-		echo '# Read-only DB' >>${D}/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >>${D}/etc/vpopmail.conf
-		echo '# Write DB' >>${D}/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >>${D}/etc/vpopmail.conf
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	# Install a proper cronjob instead of the old nastiness
-	#einfo "Installing cronjob"
-	#dodir /etc/cron.hourly
-	#insinto /etc/cron.hourly
-	#doins ${FILESDIR}/vpopmail.clearopensmtp
-	#fperms +x /etc/cron.hourly/vpopmail.clearopensmtp
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	doenvd ${FILESDIR}/99vpopmail
-
-	# Configure b0rked. We'll do this manually
-	#echo "-I${VPOP_HOME}/include" > ${D}/${VPOP_HOME}/etc/inc_deps
-	#local libs_extra
-	#use mysql && libs_extra="-L/usr/lib/mysql -lmysqlclient -lz" || libs_extra=""
-	#echo "-L${VPOP_HOME}/lib -lvpopmail ${libs_extra}" > ${D}/${VPOP_HOME}/etc/lib_deps
-
-	einfo "Locking down vpopmail permissions"
-	# secure things more, i don't want the vpopmail user being able to write this stuff!
-	chown -R root:0 ${D}${VPOP_HOME}/{bin,etc,include}
-	chown root:vpopmail ${D}${VPOP_HOME}/bin/vchkpw
-	chmod 4711 ${D}${VPOP_HOME}/bin/vchkpw
-}
-
-pkg_preinst() {
-	vpopmail_set_homedir
-
-	# Keep DATA
-	keepdir ${VPOP_HOME}/domains
-
-	# This is a workaround until portage handles binary packages+users better.
-	pkg_setup
-
-	upgradewarning
-}
-
-pkg_postinst() {
-	einfo "Performing post-installation routines for ${P}."
-
-	if use mysql ; then
-		echo
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "	 vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-	fi
-	# do this for good measure
-	if [ -e /etc/vpopmail.conf ] ; then
-		chmod 640 /etc/vpopmail.conf
-		chown root:vpopmail /etc/vpopmail.conf
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	vpopmail_set_homedir
-
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-	ewarn "The internal structure of the mail storage has changed for"
-	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-	ewarn "script at /var/vpopmail/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-	ewarn "to upgrade your system! (It can do conversions both ways)."
-	ewarn "You should be able to run it right away without any changes."
-	echo
-	einfo "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	einfo "using net-mail/relay-ctrl instead."
-}

diff --git a/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild b/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild
deleted file mode 100644
index 87b3197..0000000
--- a/net-mail/vpopmail/vpopmail-5.4.30-r1.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit autotools eutils fixheadtails qmail user
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ia64 ppc s390 sh sparc x86"
-IUSE="clearpasswd ipalias maildrop mysql"
-
-DEPEND="virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( virtual/mysql )"
-RDEPEND="${DEPEND}"
-
-# This makes sure the variable is set, and that it isn't null.
-VPOP_DEFAULT_HOME="/var/vpopmail"
-
-vpopmail_set_homedir() {
-	VPOP_HOME=$(egethome vpopmail)
-	if [[ -z "${VPOP_HOME}" ]]; then
-		ebeep
-		eerror "vpopmail's home directory is null in passwd data!"
-		eerror "You probably want to check that out."
-		eerror "Continuing with default."
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	enewgroup vpopmail 89
-	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	epatch "${FILESDIR}"/${PN}-lazy.patch
-	epatch "${FILESDIR}"/${PN}-double-free.patch
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	eautoreconf
-	ht_fix_file cdb/Makefile
-}
-
-src_configure() {
-	vpopmail_set_homedir
-
-	if use mysql; then
-		authopts=" \
-			--enable-auth-module=mysql \
-			--enable-libdir=/usr/lib/mysql \
-			--enable-sql-logging \
-			--enable-valias \
-			--disable-mysql-replication \
-			--enable-mysql-limits"
-	else
-		authopts="--enable-auth-module=cdb"
-	fi
-
-	econf ${authopts} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		$(use_enable maildrop maildrop-prog /usr/bin/maildrop)
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	vpopmail_set_homedir
-
-	# bug #277764
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into "${VPOP_HOME}"
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README*
-	dohtml doc/doc_html/* doc/man_html/*
-	rm -rf "${D}/${VPOP_HOME}"/doc
-	dosym /usr/share/doc/${PF}/ "${VPOP_HOME}"/doc
-
-	# create /etc/vpopmail.conf
-	if use mysql; then
-		dodir /etc
-		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
-		dosym /etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
-
-		sed -e '12d' -i "${D}"/etc/vpopmail.conf
-		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	insinto "${VPOP_HOME}"/etc
-	doins vusagec.conf
-	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
-	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners root:0 -R "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "  vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-		elog
-	fi
-
-	# do this for good measure
-	if [[ -e /etc/vpopmail.conf ]]; then
-		chmod 640 /etc/vpopmail.conf
-		chown root:vpopmail /etc/vpopmail.conf
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	vpopmail_set_homedir
-
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	ewarn
-	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-	ewarn "The internal structure of the mail storage has changed for"
-	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-	ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-	ewarn "to upgrade your system! (It can do conversions both ways)."
-	ewarn "You should be able to run it right away without any changes."
-	ewarn
-
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-	elog
-
-	if use mysql; then
-		elog
-		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-		elog "MySQL tables:"
-		elog
-		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
-		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
-		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
-		elog
-	fi
-
-	ewarn
-	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
-	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
-	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
-	ewarn "Otherwise mail delivery WILL BREAK"
-	ewarn
-}

diff --git a/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild b/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild
deleted file mode 100644
index 59ddd96..0000000
--- a/net-mail/vpopmail/vpopmail-5.4.30-r2.ebuild
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit autotools eutils fixheadtails qmail user
-
-HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail"
-DESCRIPTION="A collection of programs to manage virtual email domains and accounts on your Qmail mail servers"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="clearpasswd ipalias maildrop mysql spamassassin"
-
-DEPEND="virtual/qmail
-	maildrop? ( mail-filter/maildrop )
-	mysql? ( virtual/mysql )
-	spamassassin? ( mail-filter/spamassassin )"
-RDEPEND="${DEPEND}"
-
-# This makes sure the variable is set, and that it isn't null.
-VPOP_DEFAULT_HOME="/var/vpopmail"
-
-vpopmail_set_homedir() {
-	VPOP_HOME=$(egethome vpopmail)
-	if [[ -z "${VPOP_HOME}" ]]; then
-		ebeep
-		eerror "vpopmail's home directory is null in passwd data!"
-		eerror "You probably want to check that out."
-		eerror "Continuing with default."
-		VPOP_HOME="${VPOP_DEFAULT_HOME}"
-	else
-		einfo "Setting VPOP_HOME to: $VPOP_HOME"
-	fi
-}
-
-pkg_setup() {
-	enewgroup vpopmail 89
-	enewuser vpopmail 89 -1 ${VPOP_DEFAULT_HOME} vpopmail
-	upgradewarning
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-5.4.9-access.violation.patch
-	epatch "${FILESDIR}"/${PN}-lazy.patch
-	epatch "${FILESDIR}"/${PN}-double-free.patch
-
-	# fix maildir paths
-	sed -i -e 's|Maildir|.maildir|g' \
-		vchkpw.c vconvert.c vdelivermail.c \
-		vpopbull.c vpopmail.c vqmaillocal.c \
-		vuserinfo.c maildirquota.c || die
-
-	# remove vpopmail advertisement
-	sed -i -e '/printf.*vpopmail/s:vpopmail (:(:' \
-		vdelivermail.c vpopbull.c vqmaillocal.c || die
-
-	eautoreconf
-	ht_fix_file cdb/Makefile
-}
-
-src_configure() {
-	vpopmail_set_homedir
-
-	if use mysql; then
-		authopts=" \
-			--enable-auth-module=mysql \
-			--enable-libdir=/usr/lib/mysql \
-			--enable-sql-logging \
-			--enable-valias \
-			--disable-mysql-replication \
-			--enable-mysql-limits"
-	else
-		authopts="--enable-auth-module=cdb"
-	fi
-
-	econf ${authopts} \
-		--sysconfdir=${VPOP_HOME}/etc \
-		--enable-non-root-build \
-		--enable-qmaildir=${QMAIL_HOME} \
-		--enable-qmail-newu=${QMAIL_HOME}/bin/qmail-newu \
-		--enable-qmail-inject=${QMAIL_HOME}/bin/qmail-inject \
-		--enable-qmail-newmrh=${QMAIL_HOME}/bin/qmail-newmrh \
-		--enable-vpopuser=vpopmail \
-		--enable-vpopgroup=vpopmail \
-		--enable-many-domains \
-		--enable-file-locking \
-		--enable-file-sync \
-		--enable-md5-passwords \
-		--enable-logging \
-		--enable-auth-logging \
-		--enable-log-name=vpopmail \
-		--enable-qmail-ext \
-		--disable-tcpserver-file \
-		--disable-roaming-users \
-		$(use_enable ipalias ip-alias-domains) \
-		$(use_enable clearpasswd clear-passwd) \
-		$(use_enable maildrop) \
-		$(use_enable maildrop maildrop-prog /usr/bin/maildrop) \
-		$(use_enable spamassassin)
-}
-
-src_compile() {
-	emake || die "make failed"
-}
-
-src_install() {
-	vpopmail_set_homedir
-
-	# bug #277764
-	emake -j1 DESTDIR="${D}" install || die "make install failed"
-	keepdir "${VPOP_HOME}"/domains
-
-	# install helper script for maildir conversion
-	into "${VPOP_HOME}"
-	dobin "${FILESDIR}"/vpopmail-Maildir-dotmaildir-fix.sh
-	into /usr
-
-	dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README*
-	dohtml doc/doc_html/* doc/man_html/*
-	rm -rf "${D}/${VPOP_HOME}"/doc
-	dosym /usr/share/doc/${PF}/ "${VPOP_HOME}"/doc
-
-	# create /etc/vpopmail.conf
-	if use mysql; then
-		dodir /etc
-		mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql "${D}"/etc/vpopmail.conf
-		dosym /etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
-
-		sed -e '12d' -i "${D}"/etc/vpopmail.conf
-		echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-		echo '# Write DB' >> "${D}"/etc/vpopmail.conf
-		echo 'localhost|0|vpopmail|secret|vpopmail' >> "${D}"/etc/vpopmail.conf
-
-		# lock down perms
-		fperms 640 /etc/vpopmail.conf
-		fowners root:vpopmail /etc/vpopmail.conf
-	fi
-
-	insinto "${VPOP_HOME}"/etc
-	doins vusagec.conf
-	dosym "${VPOP_HOME}"/etc/vusagec.conf /etc/vusagec.conf
-	sed -i 's/Disable = False;/Disable = True;/g' "${D}${VPOP_HOME}"/etc/vusagec.conf
-
-	einfo "Installing env.d entry"
-	dodir /etc/env.d
-	doenvd "${FILESDIR}"/99vpopmail
-
-	einfo "Locking down vpopmail permissions"
-	fowners root:0 -R "${VPOP_HOME}"/{bin,etc,include}
-	fowners root:vpopmail "${VPOP_HOME}"/bin/vchkpw
-	fperms 4711 "${VPOP_HOME}"/bin/vchkpw
-}
-
-pkg_postinst() {
-	if use mysql ; then
-		elog
-		elog "You have 'mysql' turned on in your USE"
-		elog "Vpopmail needs a VALID MySQL USER. Let's call it 'vpopmail'"
-		elog "You MUST add it and then specify its passwd in the /etc/vpopmail.conf file"
-		elog
-		elog "First log into mysql as your mysql root user and pass. Then:"
-		elog "> create database vpopmail;"
-		elog "> use mysql;"
-		elog "> grant select, insert, update, delete, create, drop on vpopmail.* to"
-		elog "  vpopmail@localhost identified by 'your password';"
-		elog "> flush privileges;"
-		elog
-		elog "If you have problems with vpopmail not accepting mail properly,"
-		elog "please ensure that /etc/vpopmail.conf is chmod 640 and"
-		elog "owned by root:vpopmail"
-		elog
-	fi
-
-	# do this for good measure
-	if [[ -e /etc/vpopmail.conf ]]; then
-		chmod 640 /etc/vpopmail.conf
-		chown root:vpopmail /etc/vpopmail.conf
-	fi
-
-	upgradewarning
-}
-
-pkg_postrm() {
-	vpopmail_set_homedir
-
-	elog "The vpopmail DATA will NOT be removed automatically."
-	elog "You can delete them manually by removing the ${VPOP_HOME} directory."
-}
-
-upgradewarning() {
-	ewarn
-	ewarn "Massive important warning if you are upgrading to 5.2.1-r8 or older"
-	ewarn "The internal structure of the mail storage has changed for"
-	ewarn "consistancy with the rest of Gentoo! Please review and utilize the "
-	ewarn "script at ${VPOP_HOME}/bin/vpopmail-Maildir-dotmaildir-fix.sh"
-	ewarn "to upgrade your system! (It can do conversions both ways)."
-	ewarn "You should be able to run it right away without any changes."
-	ewarn
-
-	elog
-	elog "Use of vpopmail's tcp.smtp[.cdb] is also deprecated now, consider"
-	elog "using net-mail/relay-ctrl instead."
-	elog
-
-	if use mysql; then
-		elog
-		elog "If you are upgrading from 5.4.17 or older, you have to fix your"
-		elog "MySQL tables:"
-		elog
-		elog 'ALTER TABLE `dir_control` CHANGE `domain` `domain` CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `ip_alias_map` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `lastauth` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `valias` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vlog` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `vpopmail` CHANGE domain domain CHAR(96) NOT NULL;'
-		elog 'ALTER TABLE `limits` CHANGE domain domain CHAR(96) NOT NULL,'
-		elog '    ADD `disable_spamassassin` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_smtp`,'
-		elog '    ADD `delete_spam` TINYINT(1) DEFAULT '0' NOT NULL AFTER `disable_spamassassin`;'
-		elog
-	fi
-
-	ewarn
-	ewarn "Newer versions of vpopmail contain a quota daemon called vusaged."
-	ewarn "This ebuild DOES NOT INSTALL vusaged and has therefore disabled"
-	ewarn "its usage in ${VPOP_HOME}/etc/vusagec.conf. DO NOT ENABLE!"
-	ewarn "Otherwise mail delivery WILL BREAK"
-	ewarn
-}


^ permalink raw reply related	[flat|nested] 34+ messages in thread

end of thread, other threads:[~2023-12-24 23:07 UTC | newest]

Thread overview: 34+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-24 23:07 [gentoo-commits] repo/gentoo:master commit in: net-mail/vpopmail/ Conrad Kostecki
  -- strict thread matches above, loose matches on Subject: below --
2023-06-23 18:07 Matt Turner
2021-08-22 15:14 Sam James
2021-08-22  3:07 Sam James
2021-05-17 16:36 Sergei Trofimovich
2021-05-16  0:07 Sam James
2021-05-15 19:18 Sam James
2021-05-15  2:01 Sam James
2021-05-14 20:54 Sam James
2021-05-14 20:54 Sam James
2021-05-14 20:34 Sergei Trofimovich
2020-05-27  7:56 Sergei Trofimovich
2020-03-21 11:13 Mikle Kolyada
2020-03-03  8:05 Sergei Trofimovich
2020-03-03  8:05 Sergei Trofimovich
2020-03-03  8:05 Sergei Trofimovich
2020-03-02 11:34 Sergei Trofimovich
2020-03-02 11:22 Sergei Trofimovich
2020-03-02 11:04 Sergei Trofimovich
2020-02-25 21:29 Sergei Trofimovich
2020-02-25 21:29 Sergei Trofimovich
2020-02-24 12:49 Agostino Sarubbo
2020-02-24 10:07 Agostino Sarubbo
2020-02-24  8:20 Sergei Trofimovich
2020-02-23  8:54 Sergei Trofimovich
2020-02-22 14:19 Sergei Trofimovich
2019-11-17  9:30 Michał Górny
2019-10-23 13:46 Joonas Niilola
2019-10-04  4:38 Joonas Niilola
2019-09-28  6:46 Joonas Niilola
2019-09-19 16:21 Joonas Niilola
2019-02-18 21:30 Brian Evans
2018-06-08  5:11 Robin H. Johnson
2016-04-16 21:12 Manuel Rüger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox