| 1 |
commit: cf9877fcfdad14fd1c2dff9736b951a55637de08 |
| 2 |
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de> |
| 3 |
AuthorDate: Sun Sep 15 12:46:22 2019 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Sep 15 15:19:26 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf9877fc |
| 7 |
|
| 8 |
net-mail/vpopmail: make patches apply with -p1 |
| 9 |
|
| 10 |
Both ebuilds still are able to apply them afterwards. |
| 11 |
|
| 12 |
Signed-off-by: Rolf Eike Beer <eike <AT> sf-mail.de> |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/12929 |
| 14 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 15 |
|
| 16 |
net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch | 4 ++-- |
| 17 |
net-mail/vpopmail/files/vpopmail-double-free.patch | 4 ++-- |
| 18 |
net-mail/vpopmail/files/vpopmail-lazy.patch | 4 ++-- |
| 19 |
net-mail/vpopmail/files/vpopmail-vpgsql.patch | 4 ++-- |
| 20 |
net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild | 2 -- |
| 21 |
5 files changed, 8 insertions(+), 10 deletions(-) |
| 22 |
|
| 23 |
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 |
| 24 |
index 7a31fa9a3d3..ed7c62e7639 100644 |
| 25 |
--- a/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch |
| 26 |
+++ b/net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch |
| 27 |
@@ -1,5 +1,5 @@ |
| 28 |
---- configure.in.org 2004-06-30 22:11:08.000000000 -0700 |
| 29 |
-+++ configure.in 2004-08-22 16:45:36.279473008 -0700 |
| 30 |
+--- a/configure.in.org 2004-06-30 22:11:08.000000000 -0700 |
| 31 |
++++ b/configure.in 2004-08-22 16:45:36.279473008 -0700 |
| 32 |
@@ -463,16 +463,16 @@ |
| 33 |
if test ! -d $vpopmaildir |
| 34 |
then |
| 35 |
|
| 36 |
diff --git a/net-mail/vpopmail/files/vpopmail-double-free.patch b/net-mail/vpopmail/files/vpopmail-double-free.patch |
| 37 |
index 16a40b82c4f..3e238f3303d 100644 |
| 38 |
--- a/net-mail/vpopmail/files/vpopmail-double-free.patch |
| 39 |
+++ b/net-mail/vpopmail/files/vpopmail-double-free.patch |
| 40 |
@@ -1,7 +1,7 @@ |
| 41 |
diff --git a/trunk/vpalias.c b/trunk/vpalias.c |
| 42 |
index 9853f14..e9bd81f 100644 |
| 43 |
---- vpalias.c |
| 44 |
-+++ vpalias.c |
| 45 |
+--- a/vpalias.c |
| 46 |
++++ b/vpalias.c |
| 47 |
@@ -369,7 +369,7 @@ char *valias_select_names( char *domain ) |
| 48 |
} |
| 49 |
} |
| 50 |
|
| 51 |
diff --git a/net-mail/vpopmail/files/vpopmail-lazy.patch b/net-mail/vpopmail/files/vpopmail-lazy.patch |
| 52 |
index e47bbaa9d4b..4f4888ea6ba 100644 |
| 53 |
--- a/net-mail/vpopmail/files/vpopmail-lazy.patch |
| 54 |
+++ b/net-mail/vpopmail/files/vpopmail-lazy.patch |
| 55 |
@@ -1,5 +1,5 @@ |
| 56 |
---- Makefile.am.orig 2005-11-18 03:19:43.000000000 +0100 |
| 57 |
-+++ Makefile.am 2005-11-18 03:20:18.000000000 +0100 |
| 58 |
+--- a/Makefile.am.orig 2005-11-18 03:19:43.000000000 +0100 |
| 59 |
++++ b/Makefile.am 2005-11-18 03:20:18.000000000 +0100 |
| 60 |
@@ -33,6 +33,7 @@ |
| 61 |
|
| 62 |
vchkpw_SOURCES = vchkpw.c md5.c hmac_md5.c |
| 63 |
|
| 64 |
diff --git a/net-mail/vpopmail/files/vpopmail-vpgsql.patch b/net-mail/vpopmail/files/vpopmail-vpgsql.patch |
| 65 |
index 1d387e43f59..8869356c7e4 100644 |
| 66 |
--- a/net-mail/vpopmail/files/vpopmail-vpgsql.patch |
| 67 |
+++ b/net-mail/vpopmail/files/vpopmail-vpgsql.patch |
| 68 |
@@ -1,5 +1,5 @@ |
| 69 |
---- vpgsql.c.2 2011-02-28 18:00:45.000000000 +0100 |
| 70 |
-+++ vpgsql.c 2011-08-06 05:46:49.959717911 +0200 |
| 71 |
+--- a/vpgsql.c.2 2011-02-28 18:00:45.000000000 +0100 |
| 72 |
++++ b/vpgsql.c 2011-08-06 05:46:49.959717911 +0200 |
| 73 |
@@ -392,10 +392,10 @@ |
| 74 |
#endif |
| 75 |
|
| 76 |
|
| 77 |
diff --git a/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild b/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild |
| 78 |
index 11ed896e628..9aec8fe2f04 100644 |
| 79 |
--- a/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild |
| 80 |
+++ b/net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild |
| 81 |
@@ -23,8 +23,6 @@ DEPEND="virtual/qmail |
| 82 |
RDEPEND="${DEPEND}" |
| 83 |
|
| 84 |
PATCHES=( |
| 85 |
- "-p0" |
| 86 |
- "--" |
| 87 |
"${FILESDIR}"/${PN}-5.4.9-access.violation.patch |
| 88 |
"${FILESDIR}"/${PN}-lazy.patch |
| 89 |
"${FILESDIR}"/${PN}-vpgsql.patch |
Archives