summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRolf Eike Beer <eike@sf-mail.de>2020-07-31 22:15:01 +0200
committerSergei Trofimovich <slyfox@gentoo.org>2020-07-31 21:42:08 +0100
commitaabed522aad1d11f21f585fec92c13355fdfac95 (patch)
treeda01b653595760906fe0e06f4ffc1772928309c2
parenttoolchain.eclass: drop java binary renames for <gcc-4 (diff)
downloadgentoo-aabed522aad1d11f21f585fec92c13355fdfac95.tar.gz
gentoo-aabed522aad1d11f21f585fec92c13355fdfac95.tar.bz2
gentoo-aabed522aad1d11f21f585fec92c13355fdfac95.zip
net-mail/vpopmail: fix build with PostgreSQL and onchange script
Closes: https://bugs.gentoo.org/734884 Signed-off-by: Rolf Eike Beer <eike@sf-mail.de> Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
-rw-r--r--net-mail/vpopmail/files/vpopmail-5.4.33-vpgsql-onchange.patch26
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.33-r7.ebuild1
2 files changed, 27 insertions, 0 deletions
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 000000000000..4fcd3a51a0bc
--- /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 <eike@sf-mail.de>
+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 face2fb6b996..ce3584c722a0 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