[gentoo-commits] repo/gentoo:master commit in: mail-filter/procmail/, mail-filter/procmail/files/

[Fabian Groffen]

commit:     145b02cb8226fe3257e06614559dfa3a7c24aa01
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 19:08:03 2017 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 19:08:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=145b02cb

mail-filter/procmail: drop Interix patch/fixes

Package-Manager: portage-2.3.3

 mail-filter/procmail/files/procmail-3.22-interix.patch | 16 ----------------
 mail-filter/procmail/procmail-3.22-r10.ebuild          |  5 +----
 mail-filter/procmail/procmail-3.22-r11.ebuild          |  5 +----
 3 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/mail-filter/procmail/files/procmail-3.22-interix.patch 
b/mail-filter/procmail/files/procmail-3.22-interix.patch
deleted file mode 100644
index a24c052..00000000
--- a/mail-filter/procmail/files/procmail-3.22-interix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru procmail-3.22.orig/src/setid.c procmail-3.22/src/setid.c
---- procmail-3.22.orig/src/setid.c     2010-02-04 10:05:43 +0100
-+++ procmail-3.22/src/setid.c  2010-02-04 10:11:18 +0100
-@@ -15,7 +15,11 @@
-      return EX_USAGE;
-    }
-   endpwent();
--  if(initgroups(argv[1],p->pw_gid)||setgid(p->pw_gid)||setuid(p->pw_uid))
-+  if(
-+#ifndef __INTERIX
-+      initgroups(argv[1],p->pw_gid)||
-+#endif
-+      setgid(p->pw_gid)||setuid(p->pw_uid))
-      return EX_OSERR;
-   if(fopen(CHECK_FILE,"r"))
-    { struct stat stbuf;

diff --git a/mail-filter/procmail/procmail-3.22-r10.ebuild 
b/mail-filter/procmail/procmail-3.22-r10.ebuild
index b125c79..13e4791 100644
--- a/mail-filter/procmail/procmail-3.22-r10.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r10.ebuild
@@ -37,7 +37,7 @@ src_unpack() {
        fi
 
        # Do not use lazy bindings on lockfile and procmail
-       if [[ ${CHOST} != *-darwin* && ${CHOST} != *-interix* ]]; then
+       if [[ ${CHOST} != *-darwin* ]]; then
                epatch "${FILESDIR}/${PN}-lazy-bindings.diff"
        fi
 
@@ -56,9 +56,6 @@ src_unpack() {
 
        # Fix for bug #270551
        epatch "${FILESDIR}/${PN}-3.22-glibc-2.10.patch"
-
-       # Fix for x86-interix - doesn't have initgroups
-       epatch "${FILESDIR}"/${P}-interix.patch
 }
 
 src_compile() {

diff --git a/mail-filter/procmail/procmail-3.22-r11.ebuild 
b/mail-filter/procmail/procmail-3.22-r11.ebuild
index c23229b..2e41c20 100644
--- a/mail-filter/procmail/procmail-3.22-r11.ebuild
+++ b/mail-filter/procmail/procmail-3.22-r11.ebuild
@@ -36,7 +36,7 @@ src_prepare() {
        fi
 
        # Do not use lazy bindings on lockfile and procmail
-       if [[ ${CHOST} != *-darwin* && ${CHOST} != *-interix* ]]; then
+       if [[ ${CHOST} != *-darwin* ]]; then
                eapply -p0 "${FILESDIR}/${PN}-lazy-bindings.diff"
        fi
 
@@ -56,9 +56,6 @@ src_prepare() {
        # Fix for bug #270551
        eapply "${FILESDIR}/${PN}-3.22-glibc-2.10.patch"
 
-       # Fix for x86-interix - doesn't have initgroups
-       eapply "${FILESDIR}"/${P}-interix.patch
-
        eapply_user
 }