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

Both ebuilds still are able to apply them afterwards.

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

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 7a31fa9a3d3e9cf97e1d66022047964232062a8b..ed7c62e763968cc56917640ec389f5a60ee20c32 100644 (file)
--- 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.000000000 -0700
-+++ configure.in       2004-08-22 16:45:36.279473008 -0700
+--- a/configure.in.org 2004-06-30 22:11:08.000000000 -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 16a40b82c4f433635ebc07d87bb86bbc18dec708..3e238f3303d8c18efa0ee2786e6fac5c04f6f851 100644 (file)
--- 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 e47bbaa9d4bae71094fc79967bfa93ae1b4aa9e2..4f4888ea6ba6a4e967a984bb4b72554ebe3c00de 100644 (file)
--- 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.000000000 +0100
-+++ Makefile.am        2005-11-18 03:20:18.000000000 +0100
+--- a/Makefile.am.orig 2005-11-18 03:19:43.000000000 +0100
++++ b/Makefile.am      2005-11-18 03:20:18.000000000 +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 1d387e43f59de448df5ef6597d5dd898e499f89c..8869356c7e429026ccfd65d5b52e048acf302827 100644 (file)
--- 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.000000000 +0100
-+++ vpgsql.c   2011-08-06 05:46:49.959717911 +0200
+--- a/vpgsql.c.2       2011-02-28 18:00:45.000000000 +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 11ed896e6283b66be7926dbe4e69a398deb71071..9aec8fe2f04ed604f3cee998b7d9f04d7d87df6a 100644 (file)
--- 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