| 1 |
commit: 145b02cb8226fe3257e06614559dfa3a7c24aa01 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 30 19:08:03 2017 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 30 19:08:03 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=145b02cb |
| 7 |
|
| 8 |
mail-filter/procmail: drop Interix patch/fixes |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.3 |
| 11 |
|
| 12 |
mail-filter/procmail/files/procmail-3.22-interix.patch | 16 ---------------- |
| 13 |
mail-filter/procmail/procmail-3.22-r10.ebuild | 5 +---- |
| 14 |
mail-filter/procmail/procmail-3.22-r11.ebuild | 5 +---- |
| 15 |
3 files changed, 2 insertions(+), 24 deletions(-) |
| 16 |
|
| 17 |
diff --git a/mail-filter/procmail/files/procmail-3.22-interix.patch b/mail-filter/procmail/files/procmail-3.22-interix.patch |
| 18 |
deleted file mode 100644 |
| 19 |
index a24c052..00000000 |
| 20 |
--- a/mail-filter/procmail/files/procmail-3.22-interix.patch |
| 21 |
+++ /dev/null |
| 22 |
@@ -1,16 +0,0 @@ |
| 23 |
-diff -ru procmail-3.22.orig/src/setid.c procmail-3.22/src/setid.c |
| 24 |
---- procmail-3.22.orig/src/setid.c 2010-02-04 10:05:43 +0100 |
| 25 |
-+++ procmail-3.22/src/setid.c 2010-02-04 10:11:18 +0100 |
| 26 |
-@@ -15,7 +15,11 @@ |
| 27 |
- return EX_USAGE; |
| 28 |
- } |
| 29 |
- endpwent(); |
| 30 |
-- if(initgroups(argv[1],p->pw_gid)||setgid(p->pw_gid)||setuid(p->pw_uid)) |
| 31 |
-+ if( |
| 32 |
-+#ifndef __INTERIX |
| 33 |
-+ initgroups(argv[1],p->pw_gid)|| |
| 34 |
-+#endif |
| 35 |
-+ setgid(p->pw_gid)||setuid(p->pw_uid)) |
| 36 |
- return EX_OSERR; |
| 37 |
- if(fopen(CHECK_FILE,"r")) |
| 38 |
- { struct stat stbuf; |
| 39 |
|
| 40 |
diff --git a/mail-filter/procmail/procmail-3.22-r10.ebuild b/mail-filter/procmail/procmail-3.22-r10.ebuild |
| 41 |
index b125c79..13e4791 100644 |
| 42 |
--- a/mail-filter/procmail/procmail-3.22-r10.ebuild |
| 43 |
+++ b/mail-filter/procmail/procmail-3.22-r10.ebuild |
| 44 |
@@ -37,7 +37,7 @@ src_unpack() { |
| 45 |
fi |
| 46 |
|
| 47 |
# Do not use lazy bindings on lockfile and procmail |
| 48 |
- if [[ ${CHOST} != *-darwin* && ${CHOST} != *-interix* ]]; then |
| 49 |
+ if [[ ${CHOST} != *-darwin* ]]; then |
| 50 |
epatch "${FILESDIR}/${PN}-lazy-bindings.diff" |
| 51 |
fi |
| 52 |
|
| 53 |
@@ -56,9 +56,6 @@ src_unpack() { |
| 54 |
|
| 55 |
# Fix for bug #270551 |
| 56 |
epatch "${FILESDIR}/${PN}-3.22-glibc-2.10.patch" |
| 57 |
- |
| 58 |
- # Fix for x86-interix - doesn't have initgroups |
| 59 |
- epatch "${FILESDIR}"/${P}-interix.patch |
| 60 |
} |
| 61 |
|
| 62 |
src_compile() { |
| 63 |
|
| 64 |
diff --git a/mail-filter/procmail/procmail-3.22-r11.ebuild b/mail-filter/procmail/procmail-3.22-r11.ebuild |
| 65 |
index c23229b..2e41c20 100644 |
| 66 |
--- a/mail-filter/procmail/procmail-3.22-r11.ebuild |
| 67 |
+++ b/mail-filter/procmail/procmail-3.22-r11.ebuild |
| 68 |
@@ -36,7 +36,7 @@ src_prepare() { |
| 69 |
fi |
| 70 |
|
| 71 |
# Do not use lazy bindings on lockfile and procmail |
| 72 |
- if [[ ${CHOST} != *-darwin* && ${CHOST} != *-interix* ]]; then |
| 73 |
+ if [[ ${CHOST} != *-darwin* ]]; then |
| 74 |
eapply -p0 "${FILESDIR}/${PN}-lazy-bindings.diff" |
| 75 |
fi |
| 76 |
|
| 77 |
@@ -56,9 +56,6 @@ src_prepare() { |
| 78 |
# Fix for bug #270551 |
| 79 |
eapply "${FILESDIR}/${PN}-3.22-glibc-2.10.patch" |
| 80 |
|
| 81 |
- # Fix for x86-interix - doesn't have initgroups |
| 82 |
- eapply "${FILESDIR}"/${P}-interix.patch |
| 83 |
- |
| 84 |
eapply_user |
| 85 |
} |
Archives