commit: aabed522aad1d11f21f585fec92c13355fdfac95 Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de> AuthorDate: Fri Jul 31 20:15:01 2020 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Fri Jul 31 20:42:08 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aabed522
net-mail/vpopmail: fix build with PostgreSQL and onchange script Closes: https://bugs.gentoo.org/734884 Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de> Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> .../files/vpopmail-5.4.33-vpgsql-onchange.patch | 26 ++++++++++++++++++++++ net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild | 1 + 2 files changed, 27 insertions(+) diff --git a/net-mail/vpopmail/files/vpopmail-5.4.33-vpgsql-onchange.patch b/net-mail/vpopmail/files/vpopmail-5.4.33-vpgsql-onchange.patch new file mode 100644 index 00000000000..4fcd3a51a0b --- /dev/null +++ b/net-mail/vpopmail/files/vpopmail-5.4.33-vpgsql-onchange.patch @@ -0,0 +1,26 @@ +From c317829c750438fbb16867cbadb196328f3ba567 Mon Sep 17 00:00:00 2001 +From: Rolf Eike Beer <[email protected]> +Date: Fri, 31 Jul 2020 22:09:50 +0200 +Subject: [PATCH] fix build when using PostgreSQL and --enable-onchange-script + +This obviously has never worked. +--- + vpgsql.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/vpgsql.c b/vpgsql.c +index b5dd40b..7d8e5c0 100644 +--- a/vpgsql.c ++++ b/vpgsql.c +@@ -1456,7 +1456,7 @@ int valias_delete_domain( char *domain) + #ifdef ONCHANGE_SCRIPT + if( allow_onchange ) { + /* tell other programs that data has changed */ +- snprintf ( onchange_buf, MAX_BUFF, "%s@%s - %s", alias, domain, alias_line); ++ snprintf ( onchange_buf, MAX_BUFF, "%s", domain ); + call_onchange ( "valias_delete_domain" ); + } + #endif +-- +2.26.2 + diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild index face2fb6b99..ce3584c722a 100644 --- a/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild +++ b/net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild @@ -39,6 +39,7 @@ PATCHES=( "${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 + "${FILESDIR}"/${PN}-5.4.33-vpgsql-onchange.patch ) DOCS=( ChangeLog
