summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRolf Eike Beer <eike@sf-mail.de>2019-09-15 14:46:22 +0200
committerMichał Górny <mgorny@gentoo.org>2019-09-15 17:19:26 +0200
commitcf9877fcfdad14fd1c2dff9736b951a55637de08 (patch)
tree1d0f8fa007b02d7445f2e3b0eaad68d0aaec5b7f /net-mail/vpopmail
parentthirdpartymirrors: Remove unused 'opera' mirror (diff)
downloadgentoo-cf9877fcfdad14fd1c2dff9736b951a55637de08.tar.gz
gentoo-cf9877fcfdad14fd1c2dff9736b951a55637de08.tar.bz2
gentoo-cf9877fcfdad14fd1c2dff9736b951a55637de08.zip
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>
Diffstat (limited to 'net-mail/vpopmail')
-rw-r--r--net-mail/vpopmail/files/vpopmail-5.4.9-access.violation.patch4
-rw-r--r--net-mail/vpopmail/files/vpopmail-double-free.patch4
-rw-r--r--net-mail/vpopmail/files/vpopmail-lazy.patch4
-rw-r--r--net-mail/vpopmail/files/vpopmail-vpgsql.patch4
-rw-r--r--net-mail/vpopmail/vpopmail-5.4.33-r3.ebuild2
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 7a31fa9a3d3e..ed7c62e76396 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.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 16a40b82c4f4..3e238f3303d8 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 e47bbaa9d4ba..4f4888ea6ba6 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.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 1d387e43f59d..8869356c7e42 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.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 11ed896e6283..9aec8fe2f04e 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