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

2019-10-01 Thread Joonas Niilola 
commit: d4ab9229494efcc56997227dd3d27dadd2ae0121
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Tue Oct  1 14:55:51 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Oct  1 16:10:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4ab9229

net-mail/vpopmail: clean up patch headers

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

 net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch | 2 +-
 net-mail/vpopmail/files/vpopmail-lazy.patch   | 2 +-
 net-mail/vpopmail/files/vpopmail-vpgsql.patch | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch 
b/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch
index ed7c62e7639..5363267a21a 100644
--- a/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch
+++ b/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch
@@ -1,4 +1,4 @@
 a/configure.in.org 2004-06-30 22:11:08.0 -0700
+--- a/configure.in 2004-06-30 22:11:08.0 -0700
 +++ b/configure.in 2004-08-22 16:45:36.279473008 -0700
 @@ -463,16 +463,16 @@
if test ! -d $vpopmaildir

diff --git a/net-mail/vpopmail/files/vpopmail-lazy.patch 
b/net-mail/vpopmail/files/vpopmail-lazy.patch
index 4f4888ea6ba..7db04f8af46 100644
--- a/net-mail/vpopmail/files/vpopmail-lazy.patch
+++ b/net-mail/vpopmail/files/vpopmail-lazy.patch
@@ -1,4 +1,4 @@
 a/Makefile.am.orig 2005-11-18 03:19:43.0 +0100
+--- a/Makefile.am  2005-11-18 03:19:43.0 +0100
 +++ b/Makefile.am  2005-11-18 03:20:18.0 +0100
 @@ -33,6 +33,7 @@
  

diff --git a/net-mail/vpopmail/files/vpopmail-vpgsql.patch 
b/net-mail/vpopmail/files/vpopmail-vpgsql.patch
index 8869356c7e4..941cd9708ae 100644
--- a/net-mail/vpopmail/files/vpopmail-vpgsql.patch
+++ b/net-mail/vpopmail/files/vpopmail-vpgsql.patch
@@ -1,4 +1,4 @@
 a/vpgsql.c.2   2011-02-28 18:00:45.0 +0100
+--- a/vpgsql.c 2011-02-28 18:00:45.0 +0100
 +++ b/vpgsql.c 2011-08-06 05:46:49.959717911 +0200
 @@ -392,10 +392,10 @@
  #endif

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

2019-09-26 Thread Joonas Niilola 
commit: fc4c22fc0de9daba8b528c57a7f515a5da7bc332
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sat Sep 21 18:08:04 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Sep 26 15:59:56 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc4c22fc

net-mail/vpopmail: add some more patches

I have been running all but the strncat patch on my server for years now. The
strncat patch was taken from upstream bugtracker and looks sane to me.

While at it also package the upgrade instructions and let the user look them up
there.

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

 ...vpopmail-5.4.33-clean-up-calling-maildrop.patch |  74 ++
 ...n-case-spamassassin-changed-the-file-size.patch |  96 
 ...se-vfork-instances-that-do-more-than-exec.patch |  77 ++
 4.33-remove-unneeded-forward-declaration.patch |  24 ++
 .../vpopmail/files/vpopmail-5.4.33-strncat.patch   | 166 +
 .../vpopmail/files/vpopmail-5.4.33-unistd.patch|   9 +
 .../vpopmail-5.4.33-vdelivermail-add-static.patch  |  34 +++
 net-mail/vpopmail/vpopmail-5.4.33-r4.ebuild| 266 +
 8 files changed, 746 insertions(+)

diff --git 
a/net-mail/vpopmail/files/vpopmail-5.4.33-clean-up-calling-maildrop.patch 
b/net-mail/vpopmail/files/vpopmail-5.4.33-clean-up-calling-maildrop.patch
new file mode 100644
index 000..c85c1b3150d
--- /dev/null
+++ b/net-mail/vpopmail/files/vpopmail-5.4.33-clean-up-calling-maildrop.patch
@@ -0,0 +1,74 @@
+From 692e6f75056d93f0e9a024e3638259d5ba0fe398 Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer 
+Date: Thu, 21 Aug 2014 17:55:27 +0200
+Subject: [PATCH 4/5] clean up calling maildrop
+
+-add const for arguments
+-do not prepend "| " to call for preline, run_command() will then just skip
+ over this anyway
+-put the buffer for the maildrop command in the most local scope
+---
+ vdelivermail.c | 14 ++
+ 1 file changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/vpopmail-5.4.33/vdelivermail.c b/vpopmail-5.4.33/vdelivermail.c
+index be83a2a..2ad2e12 100644
+--- a/vdelivermail.c
 b/vdelivermail.c
+@@ -94,7 +94,7 @@ ssize_t get_message_size();
+ void deliver_mail(char *address, char *quota);
+ int check_forward_deliver(char *dir);
+ int is_looping( char *address );
+-void run_command(char *prog);
++static void run_command(const char *prog);
+ void checkuser(void);
+ void usernotfound(void);
+ int is_loop_match( const char *dt, const char *address);
+@@ -360,9 +360,6 @@ static int fdcopy (int write_fd, int read_fd, const char 
*extra_headers, size_t
+   long unsigned pid;
+   int  pim[2];
+ #endif
+-#ifdef MAILDROP
+-  char maildrop_command[256];
+-#endif
+ 
+ /* write the Return-Path: and Delivered-To: headers */
+ if (headerlen > 0) {
+@@ -409,7 +406,8 @@ static int fdcopy (int write_fd, int read_fd, const char 
*extra_headers, size_t
+ #ifdef MAILDROP
+   if ( limits.disable_maildrop==0 && vpw!=NULL &&
+!(vpw->pw_gid & NO_MAILDROP) ) {
+-  sprintf(maildrop_command, "| preline %s", MAILDROP_PROG);
++  char maildrop_command[256];
++  sprintf(maildrop_command, "preline %s", MAILDROP_PROG);
+   run_command(maildrop_command);
+   DeleteMail = 1;
+   return(0);
+@@ -896,13 +894,13 @@ void (*f)();
+ /* open a pipe to a command 
+  * return the pid or -1 if error
+  */
+-void run_command(char *prog)
++void run_command(const char *prog)
+ {
+ 
+ #define MAX_ENV_BUFF 100
+ 
+  int child;
+- char *(args[4]);
++ const char *(args[4]);
+  int wstat;
+ 
+  while ((*prog == ' ') || (*prog == '|')) ++prog;
+@@ -915,7 +913,7 @@ void run_command(char *prog)
+case 0:
+  
+  putenv("SHELL=/bin/sh");
+- args[0] = "/bin/sh"; args[1] = "-c"; args[2] = prog; args[3] = 0;
++ args[0] = "/bin/sh"; args[1] = "-c"; args[2] = prog; args[3] = NULL;
+  sig_catch(SIGPIPE,SIG_DFL);
+  execv(*args,args);
+  printf("Unable to run /bin/sh: %d.", errno);
+-- 
+1.8.4.5
+

diff --git 
a/net-mail/vpopmail/files/vpopmail-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch
 
b/net-mail/vpopmail/files/vpopmail-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch
new file mode 100644
index 000..db22a6efde4
--- /dev/null
+++ 
b/net-mail/vpopmail/files/vpopmail-5.4.33-fix-S-tag-in-case-spamassassin-changed-the-file-size.patch
@@ -0,0 +1,96 @@
+From fd0a1034e3842ceb573851e62547b26a2b389263 Mon Sep 17 00:00:00 2001
+From: Rolf Eike Beer 
+Date: Thu, 21 Aug 2014 18:48:52 +0200
+Subject: [PATCH 5/5] fix ,S= tag in case spamassassin changed the file size
+
+---
+ vdelivermail.c | 24 +---
+ 1 file changed, 21 insertions(+), 3 deletions(-)
+
+diff --git a/vpopmail-5.4.33/vdelivermail.c b/vpopmail-5.4.33/vdelivermail.c
+index 2ad2e12..3631c3c 100644
+---

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

2019-09-15 Thread Michał Górny 
commit: cf9877fcfdad14fd1c2dff9736b951a55637de08
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Sun Sep 15 12:46:22 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Sep 15 15:19:26 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf9877fc

net-mail/vpopmail: make patches apply with -p1

Both ebuilds still are able to apply them afterwards.

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

 net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch | 4 ++--
 net-mail/vpopmail/files/vpopmail-double-free.patch| 4 ++--
 net-mail/vpopmail/files/vpopmail-lazy.patch   | 4 ++--
 net-mail/vpopmail/files/vpopmail-vpgsql.patch | 4 ++--
 net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild   | 2 --
 5 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch 
b/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch
index 7a31fa9a3d3..ed7c62e7639 100644
--- a/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch
+++ b/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch
@@ -1,5 +1,5 @@
 configure.in.org   2004-06-30 22:11:08.0 -0700
-+++ configure.in   2004-08-22 16:45:36.279473008 -0700
+--- a/configure.in.org 2004-06-30 22:11:08.0 -0700
 b/configure.in 2004-08-22 16:45:36.279473008 -0700
 @@ -463,16 +463,16 @@
if test ! -d $vpopmaildir
then

diff --git a/net-mail/vpopmail/files/vpopmail-double-free.patch 
b/net-mail/vpopmail/files/vpopmail-double-free.patch
index 16a40b82c4f..3e238f3303d 100644
--- a/net-mail/vpopmail/files/vpopmail-double-free.patch
+++ b/net-mail/vpopmail/files/vpopmail-double-free.patch
@@ -1,7 +1,7 @@
 diff --git a/trunk/vpalias.c b/trunk/vpalias.c
 index 9853f14..e9bd81f 100644
 vpalias.c
-+++ vpalias.c
+--- a/vpalias.c
 b/vpalias.c
 @@ -369,7 +369,7 @@ char *valias_select_names( char *domain )
  }
}

diff --git a/net-mail/vpopmail/files/vpopmail-lazy.patch 
b/net-mail/vpopmail/files/vpopmail-lazy.patch
index e47bbaa9d4b..4f4888ea6ba 100644
--- a/net-mail/vpopmail/files/vpopmail-lazy.patch
+++ b/net-mail/vpopmail/files/vpopmail-lazy.patch
@@ -1,5 +1,5 @@
 Makefile.am.orig   2005-11-18 03:19:43.0 +0100
-+++ Makefile.am2005-11-18 03:20:18.0 +0100
+--- a/Makefile.am.orig 2005-11-18 03:19:43.0 +0100
 b/Makefile.am  2005-11-18 03:20:18.0 +0100
 @@ -33,6 +33,7 @@
  
  vchkpw_SOURCES = vchkpw.c md5.c hmac_md5.c

diff --git a/net-mail/vpopmail/files/vpopmail-vpgsql.patch 
b/net-mail/vpopmail/files/vpopmail-vpgsql.patch
index 1d387e43f59..8869356c7e4 100644
--- a/net-mail/vpopmail/files/vpopmail-vpgsql.patch
+++ b/net-mail/vpopmail/files/vpopmail-vpgsql.patch
@@ -1,5 +1,5 @@
 vpgsql.c.2 2011-02-28 18:00:45.0 +0100
-+++ vpgsql.c   2011-08-06 05:46:49.959717911 +0200
+--- a/vpgsql.c.2   2011-02-28 18:00:45.0 +0100
 b/vpgsql.c 2011-08-06 05:46:49.959717911 +0200
 @@ -392,10 +392,10 @@
  #endif
  

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild 
b/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild
index 11ed896e628..9aec8fe2f04 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild
@@ -23,8 +23,6 @@ DEPEND="virtual/qmail
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-   "-p0"
-   "--"
"${FILESDIR}"/${PN}-5.4.9-access.violation.patch
"${FILESDIR}"/${PN}-lazy.patch
"${FILESDIR}"/${PN}-vpgsql.patch

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

2018-06-07 Thread Robin H. Johnson 
commit: 66059885d224eca79b8ede013342cef091704566
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Fri Jun  8 05:09:20 2018 +
Commit: Robin H. Johnson  gentoo  org>
CommitDate: Fri Jun  8 05:11:42 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66059885

net-mail/vpopmail: cleanup some outstanding bugs

- Compile fix: MySQL include dir (#526590)
- Remove ebeep (#646174)
- Repoman warnings for dosym
- EAPI=6 ebuild

Closes: https://bugs.gentoo.org/526590
Closes: https://bugs.gentoo.org/646174
Signed-off-by: Robin H. Johnson  gentoo.org>
Package-Manager: Portage-2.3.33, Repoman-2.3.9

 net-mail/vpopmail/files/vpopmail-double-free.patch |  4 +-
 net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild| 13 ++--
 net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild| 75 ++
 net-mail/vpopmail/vpopmail-5.4.33.ebuild   | 11 ++--
 4 files changed, 80 insertions(+), 23 deletions(-)

diff --git a/net-mail/vpopmail/files/vpopmail-double-free.patch 
b/net-mail/vpopmail/files/vpopmail-double-free.patch
index d7d118578d7..16a40b82c4f 100644
--- a/net-mail/vpopmail/files/vpopmail-double-free.patch
+++ b/net-mail/vpopmail/files/vpopmail-double-free.patch
@@ -1,7 +1,7 @@
 diff --git a/trunk/vpalias.c b/trunk/vpalias.c
 index 9853f14..e9bd81f 100644
 a/trunk/vpalias.c
-+++ b/trunk/vpalias.c
+--- vpalias.c
 vpalias.c
 @@ -369,7 +369,7 @@ char *valias_select_names( char *domain )
  }
}

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild 
b/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
index a41fd4be75c..78bc92f714e 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit autotools eutils fixheadtails qmail user
 
 HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail;
-DESCRIPTION="A collection of programs to manage virtual email domains and 
accounts on your Qmail mail servers"
+DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -18,7 +18,7 @@ REQUIRED_USE="mysql? ( !postgres )"
 DEPEND="virtual/qmail
maildrop? ( mail-filter/maildrop )
mysql? ( virtual/mysql )
-   postgres? ( dev-db/postgresql[server] )
+   postgres? ( dev-db/postgresql:=[server] )
spamassassin? ( mail-filter/spamassassin )"
 RDEPEND="${DEPEND}"
 
@@ -28,7 +28,6 @@ VPOP_DEFAULT_HOME="/var/vpopmail"
 vpopmail_set_homedir() {
VPOP_HOME=$(egethome vpopmail)
if [[ -z "${VPOP_HOME}" ]]; then
-   ebeep
eerror "vpopmail's home directory is null in passwd data!"
eerror "You probably want to check that out."
eerror "Continuing with default."
@@ -141,13 +140,17 @@ src_install() {
dodoc doc/AUTHORS ChangeLog doc/FAQ doc/INSTALL doc/README*
dohtml doc/doc_html/* doc/man_html/*
rm -rf "${D}/${VPOP_HOME}"/doc
-   dosym /usr/share/doc/${PF}/ "${VPOP_HOME}"/doc
+   dosym \
+   $(realpath --relative-to "${D}/${VPOP_HOME}"/ 
"${D}"/usr/share/doc/${PF}/) \
+   "${VPOP_HOME}"/doc
 
# create /etc/vpopmail.conf
if use mysql; then
dodir /etc
mv "${D}${VPOP_HOME}"/etc/vpopmail.mysql 
"${D}"/etc/vpopmail.conf
-   dosym /etc/vpopmail.conf "${VPOP_HOME}"/etc/vpopmail.mysql
+   dosym \
+   $(realpath --relative-to "${D}/${VPOP_HOME}"/etc/ 
"${D}"/etc/vpopmail.conf) \
+   "${VPOP_HOME}"/etc/vpopmail.mysql
 
sed -e '12d' -i "${D}"/etc/vpopmail.conf
echo '# Read-only DB' >> "${D}"/etc/vpopmail.conf

diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild 
b/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild
index 498c53bc733..244a0119098 100644
--- a/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit autotools eutils fixheadtails qmail user
 
 HOMEPAGE="http://www.inter7.com/index.php?page=vpopmail;
-DESCRIPTION="A collection of programs to manage virtual email domains and 
accounts on your Qmail mail servers"
+DESCRIPTION="Collection of programs to manage virtual email on Qmail servers"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -18,17 +18,68 @@ REQUIRED_USE="mysql? ( !postgres )"
 DEPEND="virtual/qmail
maildrop? ( mail-filter/maildrop )
mysql? ( || ( dev-db/mysql-connector-c 
dev-db/mariadb-connector-c[mysqlcompat] ) )
-   postgres? ( dev-db/postgresql[server] )
+   postgres? ( dev-db/postgresql:=[server] )
spamassassin? ( mail-filter/spamassassin )"
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+   "-p0"
+   "--"
+