From 145b02cb8226fe3257e06614559dfa3a7c24aa01 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Mon, 30 Jan 2017 20:08:03 +0100 Subject: 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(-) delete mode 100644 mail-filter/procmail/files/procmail-3.22-interix.patch (limited to 'mail-filter') 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 a24c052f3d2b..000000000000 --- 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 b125c79ae274..13e4791de0bb 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 c23229b27816..2e41c2082bc2 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 } -- cgit v1.2.3-65-gdbad